From ec4336bcc445db4d0e9721e363615141a4f24a7f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 26 Aug 2011 15:11:41 +0800
Subject: [PATCH 0001/2585] - support for name, port & shutdown parameters for
 the different types   of ECE instances  
 (fai_{presentation,editor,search}_{name,port,shutdown} - next steps string is
 now accumulated throughout the lifespan of one   ece-install run. - added
 generic method for updating/setting a setting in a   .conf/.properties file -
 made set_ece_instance_conf use this new method

---
 usr/sbin/ece-install | 135 +++++++++++++++++++++++++++----------------
 1 file changed, 86 insertions(+), 49 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 93279362..275aad33 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -23,7 +23,7 @@ java_home=/usr/lib/jvm/java-6-sun
 id="[$(basename $0)]"
 pid_file=/var/run/$(basename $0).pid
 download_dir=/tmp/ece-downloads
-log=/tmp/$(basename $0).log
+log=/var/log/$(basename $0).log
 conf_file=$HOME/.ece-install.conf
 common_nursery_dir=/etc/escenic/engine/common
 
@@ -475,6 +475,24 @@ org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localh
 EOF
 }
 
+# Parameters:
+# $1 is the property
+# $2 is the value
+# $3 is the file
+function set_conf_file_value()
+{
+    if [ -r $3 ]; then
+        if [ $(grep $1 $3 | wc -l) -gt 0 ]; then
+            # TODO update existing values of the property instead of
+            # removing & appending it.
+            cat $3 | grep -v ^$1 > $3.tmp
+            mv $3.tmp $3
+        fi
+    fi
+    
+    echo "$1=$2" >> $3
+}
+
 # The function accepts the following parameters:
 # $1 is the property
 # $2 is the value
@@ -484,17 +502,7 @@ EOF
 function set_ece_instance_conf()
 {
     instance_conf_file=/etc/escenic/ece-$instance_name.conf
-    
-    if [ -r $instance_conf_file ]; then
-        if [ $(grep $1 $instance_conf_file | wc -l) -gt 0 ]; then
-            # TODO update existing values of the property instead of
-            # removing & appending it.
-            cat $instance_conf_file | grep -v ^$1 > $instance_conf_file.tmp
-            mv $instance_conf_file.tmp $instance_conf_file
-        fi
-    fi
-    
-    echo "$1=$2" >> $instance_conf_file
+    set_conf_file_value $1 $2 $instance_conf_file
 }
 
 # Installs third party packages needed by the ECE (i.e. Java related).
@@ -543,22 +551,31 @@ function set_up_app_server
         print "Or enter: <port> <shutdown port>, e.g.: '8180 8105'"
         echo -n "Your choice [8080 8005]> "
         read user_ports
+        
+        if [ -z "$user_ports" ]; then
+            appserver_port=$(echo $user_ports | cut -d' ' -f1)
+            shutdown_port=$(echo $user_ports | cut -d' ' -f2)
+        fi
     else
-        user_ports=$(get_conf_value fai_editor_port)
-        if [ -n "${user_ports}" ]; then
-            user_ports=$user_ports" "$(get_conf_value fai_editor_shutdown)
+        if [ $install_profile_number -eq $PROFILE_EDITORIAL_SERVER ]; then
+            appserver_port=$(get_conf_value fai_editor_port)
+            shutdown_port=$(get_conf_value fai_editor_shutdown)
+        elif [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ]; then
+            appserver_port=$(get_conf_value fai_presentation_port)
+            shutdown_port=$(get_conf_value fai_presentation_shutdown)
+        elif [ $install_profile_number -eq $PROFILE_SEARCH_SERVER ]; then
+            appserver_port=$(get_conf_value fai_search_port)
+            shutdown_port=$(get_conf_value fai_search_shutdown)
         fi
     fi
 
-    if [ -z "$user_ports" ]; then
+    if [ -z "$appserver_port" ]; then
         appserver_port=8080
-        shutdown_port=8005
-    else
-        appserver_port=$(echo $user_ports | cut -d' ' -f1)
-        shutdown_port=$(echo $user_ports | cut -d' ' -f2)
+    elif [ -z "$appserver_shutdown" ]; then
+        appserver_shutdown=8005
     fi
     
-    debug "user_ports=[${user_ports}] appserver_port=$appserver_port shutdown_port=$shutdown_port"
+    debug "appserver_port=$appserver_port shutdown_port=$shutdown_port"
     
     if [ $fai_enabled -eq 0 ]; then
         print "Another question: Where does the database run?"
@@ -822,29 +839,12 @@ function print_status_and_next_steps()
     print "The basic setup of $instance_name is now completed!"
     print "It took" ${days}d ${hours}h ${minutes}m ${seconds_left}s
 
-    if [ $install_profile_number -eq $PROFILE_CACHE_SERVER ]; then
-        echo "The cache server up and running at http://${HOSTNAME}:80/"
-    fi
+    print "You're next steps on ${HOSTNAME} will be:"
+    echo $next_steps
     
-    if [ $install_profile_number -eq $PROFILE_EDITORIAL_SERVER -o \
-        $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ]; then
-        print "Your app server is running on"\ "http://${HOSTNAME}:$appserver_port"
-        print ""
-        versions="ece -i $instance_name -t $type versions"
-        print "You can now switch to the $ece_user and type:"
-        print "     $versions"
-        print "to see the Escenic software I have installed for you."
-
-        print ""
-        print "You're next steps on ${HOSTNAME} will be:"
-        print "- configure the instances you want to be started at boot time"
-        print "  in /etc/default/ece"
-        print "- include $instance_name in your RMI hub configuration."
-        print ""
-        print "Enjoy your time with Escenic Content Engine!"
-        print ""
-        print "-Vizrt Online"
-    fi
+    print "Enjoy your time with Escenic Content Engine!"
+    print ""
+    print "-Vizrt Online"
 }
 
 # Based on Erik Mogensen's work:
@@ -1167,7 +1167,7 @@ function read_user_input()
 {
     echo "Hi, which server profile do you wish to install?"
     echo ""
-    echo "Select 1-7 and press ENTER"
+    echo "Select 1-9 and press ENTER"
     echo ""
     echo "  $PROFILE_ALL_IN_ONE - All in one, the full stack on one host. "
     echo "      Suitable for development and test environments."
@@ -1215,6 +1215,11 @@ function assert_correct_runtime_environment()
     else
         echo $BASHPID > $pid_file
     fi
+
+    if [ ! -e "$conf_file" ]; then
+        print $conf_file "doesn't exist, I cannot live without it :-("
+        exit 1
+    fi
 }
 
 function common_pre_install()
@@ -1305,6 +1310,15 @@ function install_cache_server()
     fi
 
     set_up_varnish $backend_servers
+
+    add_next_step "The cache server up and running at http://${HOSTNAME}:80/"
+}
+
+# Parameters:
+# $1 : your added line
+function add_next_step()
+{
+    next_steps=${next_steps}${NEW_LINE}${1}
 }
 
 function install_database_server()
@@ -1368,6 +1382,14 @@ function ask_for_instance_name()
         print "Press ENTER to accept the default instance name, $1."
         echo -n "Your choice [$1]> "
         read instance_name
+    else
+        if [ $install_profile_number -eq $PROFILE_EDITORIAL_SERVER ]; then
+            instance_name=$(get_conf_value fai_editor_name)
+        elif [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ]; then
+            instance_name=$(get_conf_value fai_presentation_name)
+        elif [ $install_profile_number -eq $PROFILE_SEARCH_SERVER ]; then
+            instance_name=$(get_conf_value fai_search_name)
+        fi
     fi
 
     if [ -z "$instance_name" ]; then
@@ -1405,6 +1427,11 @@ EOF
     
     set_correct_permissions
     assemble_deploy_and_restart_type
+    
+    add_next_step "New ECE instance $instance_name installed."
+    add_next_step "It's running at http://$HOSTNAME:$appserver_port"
+    add_next_step "You can view all installed plugin & engine versions with:"
+    add_next_step "ece -i $instance_name versions"
 }
 
 function install_presentation_server()
@@ -1502,15 +1529,26 @@ function install_rmi_hub()
     file=$file/neo/io/managers/HubConnectionManager.properties
 
     make_dir $(basename $file)
-    echo "hub=rmi://${hub_host}:1099/hub/Hub" > $file
+    set_conf_file_value hub \
+        "rmi://${hub_host}:1099/hub/Hub" \
+        $file
 
     cat > common/io/api/EventManager.properties <<EOF
 clientConfiguration=/neo/io/services/HubConnection
 pingTime=10000
 EOF
 
-    print "TBD : not finished"
-    
+    next_step="- Restart all your instances to make the hub seem them"
+    next_steps=${next_steps}${NEW_LINE}${next_step}
+    for el in /etc/escenic/engine/instance/*; do
+        instance_name=$(basename $el)
+        next_step="   * $ ece -i ${instance_name} restart"
+        next_steps=${next_steps}${NEW_LINE}${next_step}
+    done
+
+    print "Starting the RMI-hub on $HOSTNAME ..."
+    ece_command="ece -t rmi-hub restart"
+    su - $ece_user -c "$ece_command" 1>>$log 2>>$log
 }
 
 # reads the value of the desired setting from $conf_file
@@ -1521,8 +1559,7 @@ function get_conf_value()
 {
     if [ ! -e "$conf_file" ]; then
         print $conf_file "doesn't exist."
-        echo ""
-        return
+        exit 1
     fi
 
     if [ $(grep $1 $conf_file | grep -v ^# | wc -l) -gt 0 ]; then

From 1df7bf3a33752445db66476ce08770d7f92456d3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 26 Aug 2011 16:29:53 +0800
Subject: [PATCH 0002/2585] - made exit_on_error better by accepting more than
 one argument as the   error string.

---
 usr/bin/ece | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 24575a55..4fade9de 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -71,7 +71,7 @@ java_home
 function exit_on_error()
 {
     if [ $? -eq 1 ]; then
-        print $1 "FAILED, exiting :-("
+        print $@ "FAILED, exiting :-("
         exit 1
     fi
 }

From 049850a52dd8f296dab343f159cae23d6dd4d35a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 26 Aug 2011 16:39:57 +0800
Subject: [PATCH 0003/2585] - made drop-and-create-ecedb safer by putting
 everything into   functions. - it's now sourced by ece-install and
 create_ecedb is called   explicitly

---
 usr/sbin/drop-and-create-ecedb | 151 ++++++++++++++++++++-------------
 1 file changed, 92 insertions(+), 59 deletions(-)

diff --git a/usr/sbin/drop-and-create-ecedb b/usr/sbin/drop-and-create-ecedb
index de52738c..7f6b1414 100644
--- a/usr/sbin/drop-and-create-ecedb
+++ b/usr/sbin/drop-and-create-ecedb
@@ -14,12 +14,12 @@
 # -torstein@escenic.com
 
 drop_db_first=0
-user=ece5user
-password=ece5password
-db=ece5db
-host=localhost
+db_user=ece5user
+db_password=ece5password
+db_schema=ece5db
+db_host=localhost
 ece_home=/opt/escenic/engine
-dbproduct=mysql
+db_product=mysql
 id="[`basename $0`]"
 
 # oracle specific settings
@@ -28,17 +28,35 @@ tablespace_data=ece5_data
 tablespace_index=ece5_index
 oracle_data_dir=/home/oracle/app/oracle/oradata/orcl
 
+debug=0
+
+function debug()
+{
+    if [ $debug -eq 1 ]; then
+        echo $id $1
+    fi
+    
+}
+
+function exit_on_error()
+{
+    if [ $? -eq 1 ]; then
+        echo $id $@ "FAILED, exiting :-("
+        exit 1
+    fi
+}
+
 function create_oracle_ece_user() {
     sqlplus /nolog << EOF
       connect /as sysdba;
-      create user $user
-        identified by $password
+      create user $db_user
+        identified by $db_password
         default tablespace $tablespace_data
         quota unlimited on $tablespace_data;
-      grant connect to $user;
-      grant resource to $user;
-      grant create any view to $user;
-      grant execute on ctx_ddl to $user;
+      grant connect to $db_user;
+      grant resource to $db_user;
+      grant create any view to $db_user;
+      grant execute on ctx_ddl to $db_user;
 EOF
 }
 
@@ -46,62 +64,68 @@ function run_db_scripts()
 {
     for el in $db_fn_list; do
         file=$1/$el.sql
-        echo $id "running $file ..."
+        debug "running $file ..."
         if [ -e $1/$el.sql ]; then
-            if [ $dbproduct = "oracle" ]; then
-                sqlplus $user/$password @$file
+            if [ $db_product = "oracle" ]; then
+                sqlplus $db_user/$db_password @$file
             else
-                mysql -u $user -p$password -h $host $db < $file
+                mysql -u $db_user -p$db_password -h $db_host $db_schema < $file
             fi
         fi
+        exit_on_error "running $el"
     done
 }
 
-if [ $create_oracle_user -eq 1 ]; then
-    create_oracle_ece_user
-fi
+function pre_install_new_ecedb()
+{
+    if [ $create_oracle_user -eq 1 ]; then
+        create_oracle_ece_user
+    fi
 
-if [ $drop_db_first -eq 1 ]; then
-    echo $id "dropping and re-creating $db on $host ..."
-    if [ $dbproduct = "mysql" ]; then
-        mysql -h $host << EOF
-          drop database $db;
+    if [ $drop_db_first -eq 1 ]; then
+        debug "dropping and re-creating $db_schema on $db_host ..."
+        if [ $db_product = "mysql" ]; then
+            mysql -h $db_host << EOF
+drop database $db_schema;
 EOF
-    else
-        sqlplus /nolog << EOF
-          connect /as sysdba;
-          drop tablespace $tablespace_data including contents;
-          drop tablespace $tablespace_index including contents;
+        else
+            sqlplus /nolog << EOF
+connect /as sysdba;
+drop tablespace $tablespace_data including contents;
+drop tablespace $tablespace_index including contents;
 EOF
+        fi
     fi
-fi
-
-# we first create the DB (or, if drop_db_first is 1, we've just
-# dropped it above) before running the SQL scripts.
-if [ $dbproduct = "mysql" ]; then
-    mysql -h $host << EOF
-        create database $db character set utf8 collate utf8_general_ci;
-        grant all on $db.* to $user@'%' identified by '$password';
-        grant all on $db.* to $user@'localhost' identified by '$password';
-EOF
-else
-    sqlplus /nolog << EOF
-        connect /as sysdba;
-          
-        create tablespace $tablespace_data 
-        datafile '$oracle_data_dir/${tablespace_data}01.dbf'
-        size 200M reuse
-        autoextend on next 50M maxsize 2047M
-        extent management local autoallocate;
-
-        create tablespace $tablespace_index
-        datafile '$oracle_data_dir/${tablespace_index}01.dbf'
-        size 100M reuse
-        autoextend on next 50M maxsize 2047M
-        extent management local autoallocate;          
+}
+    
+function create_schema()
+{
+    # we first create the DB (or, if drop_db_first is 1, we've just
+    # dropped it above) before running the SQL scripts.
+    if [ $db_product = "mysql" ]; then
+        mysql -h $db_host << EOF
+create database $db_schema character set utf8 collate utf8_general_ci;
+grant all on $db_schema.* to $db_user@'%' identified by '$db_password';
+grant all on $db_schema.* to $db_user@'localhost' identified by '$db_password';
 EOF
-fi
+    else
+        sqlplus /nolog << EOF
+connect /as sysdba;
+  
+create tablespace $tablespace_data 
+datafile '$oracle_data_dir/${tablespace_data}01.dbf'
+size 200M reuse
+autoextend on next 50M maxsize 2047M
+extent management local autoallocate;
 
+create tablespace $tablespace_index
+datafile '$oracle_data_dir/${tablespace_index}01.dbf'
+size 100M reuse
+autoextend on next 50M maxsize 2047M
+extent management local autoallocate;          
+EOF
+    fi
+}
 
 db_fn_list="
 tables
@@ -114,10 +138,19 @@ indexes
 history
 "
 
-run_db_scripts $ece_home/database/$dbproduct
+function create_ecedb()
+{
+    create_schema
+    run_db_scripts $ece_home/database/$db_product
+
+    if [ -e $ece_home/plugins ]; then
+        for el in `find -L $ece_home/plugins -name $db_product`; do
+            run_db_scripts $el
+        done
+    fi
 
-for el in `find -L $ece_home/plugins -name $dbproduct`; do
-    run_db_scripts $el
-done
+    echo "${id} ${db_product}://${db_host}/${db_schema} is now ready for ${db_user}/${db_password}"
+}
 
-echo "${id} ${dbproduct}://${host}/${db} is now ready for ${user}/${password}"
+# pre_install_new_ecedb
+# create_ecedb

From 51d5272ad388d5dfebb7db64be70369aa616df8b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 26 Aug 2011 17:12:11 +0800
Subject: [PATCH 0004/2585] - final status is now written on debug

---
 usr/sbin/drop-and-create-ecedb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/drop-and-create-ecedb b/usr/sbin/drop-and-create-ecedb
index 7f6b1414..f10a5d14 100644
--- a/usr/sbin/drop-and-create-ecedb
+++ b/usr/sbin/drop-and-create-ecedb
@@ -149,7 +149,7 @@ function create_ecedb()
         done
     fi
 
-    echo "${id} ${db_product}://${db_host}/${db_schema} is now ready for ${db_user}/${db_password}"
+    debug "${id} ${db_product}://${db_host}/${db_schema} is now ready for ${db_user}/${db_password}"
 }
 
 # pre_install_new_ecedb

From a794a9b42816bf7e97e2e5e3ceae8d18b50bdf7a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 26 Aug 2011 17:45:25 +0800
Subject: [PATCH 0005/2585] - added exit_on_fail - more user/installation
 reports - get_asterixes (to be used later for (not) displaying the password)

---
 usr/sbin/ece-install | 72 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 54 insertions(+), 18 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 275aad33..31f0d69b 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -55,6 +55,14 @@ function print()
     echo $id $@
 }
 
+function exit_on_error()
+{
+    if [ $? -eq 1 ]; then
+        echo $id $@ "FAILED, exiting :-("
+        exit 1
+    fi
+}
+
 technet_download_list="
 http://technet.escenic.com/downloads/assemblytool-2.0.2.zip
 http://technet.escenic.com/downloads/release/53/analysis-engine-2.3.6.0.zip
@@ -357,11 +365,32 @@ function set_up_ecedb()
             ln -s $directory
         fi
     done
+
+    source /usr/sbin/drop-and-create-ecedb
+    # TODO in future, it'll be possible to override db_user,
+    # db_password and db_schema here by reading these via
+    # get_conf_value
+    create_ecedb
+    exit_on_error "create_ecedb"
     
-    bash /usr/sbin/drop-and-create-ecedb \
-        1>>$log 2>>$log
     cd ~/
     rm -rf /opt/escenic/engine/plugins
+
+    add_next_step "- DB is now set up on $HOSTNAME:3306"
+}
+
+# returns a string of asterixes with the same lenght as the inputted
+# string.
+function get_asterixes()
+{
+    s=""
+    j=$(echo $1 | wc -c)
+
+    # wc -c always returns the length + 1, hence we start on index=1
+    for (( i=1; i<$j; i++ )); do
+        s=${s}"-"
+    done
+    echo "$s"
 }
 
 function set_up_basic_nursery_configuration()
@@ -836,12 +865,11 @@ function print_status_and_next_steps()
     minutes=$(( seconds_left / 60 ))
     seconds_left=$(( seconds_left - $minutes * 60 ))
 
-    print "The basic setup of $instance_name is now completed!"
-    print "It took" ${days}d ${hours}h ${minutes}m ${seconds_left}s
+    print "The installation is now completed!"
+    print "- It took" ${days}d ${hours}h ${minutes}m ${seconds_left}s
+    echo "$next_steps"
 
-    print "You're next steps on ${HOSTNAME} will be:"
-    echo $next_steps
-    
+    print ""
     print "Enjoy your time with Escenic Content Engine!"
     print ""
     print "-Vizrt Online"
@@ -1311,14 +1339,18 @@ function install_cache_server()
 
     set_up_varnish $backend_servers
 
-    add_next_step "The cache server up and running at http://${HOSTNAME}:80/"
+    add_next_step "- Cache server is up and running at http://${HOSTNAME}:80/"
 }
 
 # Parameters:
 # $1 : your added line
 function add_next_step()
 {
-    next_steps=${next_steps}${NEW_LINE}${1}
+    if [ -n "$next_steps" ]; then
+        next_steps=${next_steps}${NEW_LINE}${id}" "${1}
+    else
+        next_steps=${id}" "${1}
+    fi
 }
 
 function install_database_server()
@@ -1427,11 +1459,12 @@ EOF
     
     set_correct_permissions
     assemble_deploy_and_restart_type
-    
-    add_next_step "New ECE instance $instance_name installed."
-    add_next_step "It's running at http://$HOSTNAME:$appserver_port"
-    add_next_step "You can view all installed plugin & engine versions with:"
-    add_next_step "ece -i $instance_name versions"
+
+    admin_uri=http://$HOSTNAME:${appserver_port}/escenic-admin
+    add_next_step "- New ECE instance $instance_name installed."
+    add_next_step "- Its admin interface is available at $admin_uri"
+    add_next_step "- You can view all installed plugin & engine versions with:"
+    add_next_step "  ece -i $instance_name versions"
 }
 
 function install_presentation_server()
@@ -1504,6 +1537,8 @@ function create_publication()
     # above.
     create_publication_in_db $publication_war
     assemble_deploy_and_restart_type
+
+    add_next_step "- a new publication $publication_name has been created"
 }
 
 function install_editorial_server()
@@ -1538,12 +1573,10 @@ clientConfiguration=/neo/io/services/HubConnection
 pingTime=10000
 EOF
 
-    next_step="- Restart all your instances to make the hub seem them"
-    next_steps=${next_steps}${NEW_LINE}${next_step}
+    add_next_step "- Restart all your instances to make the hub seem them:"
     for el in /etc/escenic/engine/instance/*; do
         instance_name=$(basename $el)
-        next_step="   * $ ece -i ${instance_name} restart"
-        next_steps=${next_steps}${NEW_LINE}${next_step}
+        add_next_step "   - $ ece -i ${instance_name} restart"
     done
 
     print "Starting the RMI-hub on $HOSTNAME ..."
@@ -1665,6 +1698,9 @@ EOF
     fi
     
     cp -r $wf_dist_dir/misc/siteconfig/* $common_nursery_dir/
+
+    add_next_step "- Widget Framework has been installed into your local" 
+    add_next_step "  Maven repository and its ECE components have been installed"
 }
 
 function install_search_instance()

From 57b5f44f3492a1f1b15f4a4d61ac079c1d13dda7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 26 Aug 2011 17:46:23 +0800
Subject: [PATCH 0006/2585] - changed enable_rmi_hub to use 0/1 as the other
 switches.

---
 etc/default/ece | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/etc/default/ece b/etc/default/ece
index f7b2368b..a6983116 100644
--- a/etc/default/ece
+++ b/etc/default/ece
@@ -4,13 +4,13 @@
 # instances. If you only have one # instance, use "default" as its
 # name. If you don't have any instances of that type on this host,
 # then just set the variable to an empty string.
-engine_instance_list="app1 app2"
+engine_instance_list="editor1 web1"
 search_instance_list="search1"
-analysis_instance_list="analysis1"
+analysis_instance_list=""
 
 # You only need one hub in an ECE cluster, so only set this one to
-# true on one host.
-enable_rmi_hub=true
+# true on one host. 1 means on, 0 means off.
+enable_rmi_hub=0
 
 # The location of the ece script, default is /usr/bin/ece
 ece_script=/usr/bin/ece

From 88c85d08005e1bed827712a75d621670ffb9ceb1 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 26 Aug 2011 17:46:31 +0800
Subject: [PATCH 0007/2585] - changed enable_rmi_hub to use 0/1 as the other
 switches.

---
 etc/init.d/ece | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/etc/init.d/ece b/etc/init.d/ece
index dc2a515c..1ee0751e 100755
--- a/etc/init.d/ece
+++ b/etc/init.d/ece
@@ -37,12 +37,14 @@ dir_list="
 
 ece_script=/usr/bin/ece
 
-# the values above may be overidden a file named the same as this
-# init.d script, located in:
+# The values above may be overidden a file named the same as this
+# init.d script. This init.d configuration must also hold the
+# variables controlling which ECE instances to start. The list of
+# locations per default caters (at least) for Debian & Gentoo based
+# systems:
 conf_file_location_list="
 /etc/default
 /etc/conf.d
-/tmp
 "
 
 function read_conf_file()
@@ -85,7 +87,7 @@ function ensure_ece_script_is_ok()
 
 function execute_command()
 {
-    if [ $enable_rmi_hub = "true" ]; then
+    if [ $enable_rmi_hub -eq 1 ]; then
         su - $ece_unix_user -c "$ece_script -t rmi-hub $1"
     fi
     

From 89dac88d79dc6de46942718c7ddfbc7524bb648c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 26 Aug 2011 17:47:05 +0800
Subject: [PATCH 0008/2585] - updated installation guide with more details on
 the DB   installation.

---
 usr/share/doc/escenic/ece-install-guide.html | 295 +++++++++++++++----
 usr/share/doc/escenic/ece-install-guide.org  | 137 ++++++---
 usr/share/doc/escenic/ece-install-guide.txt  | 218 ++++++++++----
 3 files changed, 503 insertions(+), 147 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.html b/usr/share/doc/escenic/ece-install-guide.html
index 659f7c18..e8837245 100644
--- a/usr/share/doc/escenic/ece-install-guide.html
+++ b/usr/share/doc/escenic/ece-install-guide.html
@@ -7,7 +7,7 @@
 <title>Welcome to the /usr/sbin/ece-install Guide</title>
 <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
 <meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2011-08-25 22:02:19 CST"/>
+<meta name="generated" content="2011-08-26 17:45:45 CST"/>
 <meta name="author" content="Torstein Krause Johansen"/>
 <meta name="description" content=""/>
 <meta name="keywords" content=""/>
@@ -213,7 +213,7 @@ <h1>Welcome to the /usr/sbin/ece-install Guide</h1>
 <h2>Table of Contents</h2>
 <div id="text-table-of-contents">
 <ul>
-<li><a href="#sec-1">1 Supported operating systems </a>
+<li><a href="#sec-1">1 Supported Operating Systems </a>
 <ul>
 <li>
 <ul>
@@ -222,33 +222,48 @@ <h2>Table of Contents</h2>
 </ul></li>
 </ul>
 </li>
-<li><a href="#sec-2">2 A note on running ece-install on non-GNU/Linux systems </a></li>
-<li><a href="#sec-3">3 Downloading the ece-install script </a></li>
-<li><a href="#sec-4">4 Running the ece-install script </a></li>
-<li><a href="#sec-5">5 Available server profiles </a>
+<li><a href="#sec-2">2 A Note on Running Ece-Install On Non-GNU/Linux Systems </a></li>
+<li><a href="#sec-3">3 Downloading the ece-install Script </a></li>
+<li><a href="#sec-4">4 Running the ece-install Script </a></li>
+<li><a href="#sec-5">5 Available Server Profiles </a>
 <ul>
-<li><a href="#sec-5-1">5.1 Common for editorial, presentation and search instances </a></li>
-<li><a href="#sec-5-2">5.2 1 - Full stack on one host </a></li>
-<li><a href="#sec-5-3">5.3 2 - Editorial server (publication server) </a></li>
-<li><a href="#sec-5-4">5.4 3 - Presentation server </a></li>
-<li><a href="#sec-5-5">5.5 4 - Database server </a></li>
-<li><a href="#sec-5-6">5.6 5 - Cache server </a></li>
+<li><a href="#sec-5-1">5.1 Common for Editorial, Presentation and Search Instances </a>
+<ul>
+<li><a href="#sec-5-1-1">5.1.1 Sun Java 6 </a></li>
+<li><a href="#sec-5-1-2">5.1.2 Apache Tomcat application server </a></li>
+<li><a href="#sec-5-1-3">5.1.3 Basic Escenic Nursery configuration </a></li>
+<li><a href="#sec-5-1-4">5.1.4 APR, native library for optimal Tomcat I/O performance </a></li>
+<li><a href="#sec-5-1-5">5.1.5 Escenic Assembly environment </a></li>
+<li><a href="#sec-5-1-6">5.1.6 Database driver </a></li>
+<li><a href="#sec-5-1-7">5.1.7 Compression of content </a></li>
+</ul>
+</li>
+<li><a href="#sec-5-2">5.2 1 - Full Stack on One Host </a></li>
+<li><a href="#sec-5-3">5.3 2 - Editorial Server (Publication Server) </a></li>
+<li><a href="#sec-5-4">5.4 3 - Presentation Server </a></li>
+<li><a href="#sec-5-5">5.5 4 - Database Server </a></li>
+<li><a href="#sec-5-6">5.6 5 - Cache Server </a></li>
 <li><a href="#sec-5-7">5.7 8 - Install Widget Framework </a></li>
 <li><a href="#sec-5-8">5.8 9 - Create Publication </a></li>
 </ul>
 </li>
 <li><a href="#sec-6">6 Full Automatic Install (FAI) </a></li>
-<li><a href="#sec-7">7 Running more than one installation process </a></li>
-<li><a href="#sec-8">8 Re-running ece-install </a></li>
-<li><a href="#sec-9">9 Overview of file paths used by the ece-install script </a></li>
-<li><a href="#sec-10">10 Uninstalling everything that the ece-install set up </a></li>
-<li><a href="#sec-11">11 Example Output </a></li>
+<li><a href="#sec-7">7 Running More Than One Installation Process </a></li>
+<li><a href="#sec-8">8 Re-running ece-install (and How To Speed It Up) </a></li>
+<li><a href="#sec-9">9 Overview of File Paths Used by the ece-install script </a></li>
+<li><a href="#sec-10">10 Assumptions </a>
+<ul>
+<li><a href="#sec-10-1">10.1 /etc/esecenic is shared </a></li>
+</ul>
+</li>
+<li><a href="#sec-11">11 Uninstalling everything That the ece-install Set Up </a></li>
+<li><a href="#sec-12">12 Example Output </a></li>
 </ul>
 </div>
 </div>
 
 <div id="outline-container-1" class="outline-2">
-<h2 id="sec-1"><span class="section-number-2">1</span> Supported operating systems </h2>
+<h2 id="sec-1"><span class="section-number-2">1</span> Supported Operating Systems </h2>
 <div class="outline-text-2" id="text-1">
 
 <p>For the best experience, run this script on Debian Squeeze (or newer),
@@ -291,7 +306,7 @@ <h4 id="sec-1-2"><span class="section-number-4">1.2</span> Other GNU/Linux and U
 </div>
 
 <div id="outline-container-2" class="outline-2">
-<h2 id="sec-2"><span class="section-number-2">2</span> A note on running ece-install on non-GNU/Linux systems </h2>
+<h2 id="sec-2"><span class="section-number-2">2</span> A Note on Running Ece-Install On Non-GNU/Linux Systems </h2>
 <div class="outline-text-2" id="text-2">
 
 <p>Please note, it's assumed that the OS uses GNU's tools, i.e. find, cp
@@ -305,7 +320,7 @@ <h2 id="sec-2"><span class="section-number-2">2</span> A note on running ece-ins
 </div>
 
 <div id="outline-container-3" class="outline-2">
-<h2 id="sec-3"><span class="section-number-2">3</span> Downloading the ece-install script </h2>
+<h2 id="sec-3"><span class="section-number-2">3</span> Downloading the ece-install Script </h2>
 <div class="outline-text-2" id="text-3">
 
 <p>The ece-install script can be downloaded from:
@@ -326,7 +341,7 @@ <h2 id="sec-3"><span class="section-number-2">3</span> Downloading the ece-insta
 </div>
 
 <div id="outline-container-4" class="outline-2">
-<h2 id="sec-4"><span class="section-number-2">4</span> Running the ece-install script </h2>
+<h2 id="sec-4"><span class="section-number-2">4</span> Running the ece-install Script </h2>
 <div class="outline-text-2" id="text-4">
 
 <p>You must run the script as the root user.  If you start the script as
@@ -362,12 +377,93 @@ <h2 id="sec-4"><span class="section-number-2">4</span> Running the ece-install s
 
 
 
+
+<p>
+You will need access to <a href="http://technet.escenic.com">http://technet.escenic.com</a> and put these
+credentials in the root user's $HOME/.ece-install.conf, normally this
+means <i>root</i>.ece-install.conf, the script will also tell you this if
+you forget to provide such a configuration file:
+</p>
+
+
+<pre class="example">[ece-install] /root/.ece-install.conf doesn't exist, I cannot live without it :-(
+
+</pre>
+
+
+
+
+<p>
+As for the technet credentials, the script will also tell you if it
+cannot find what it's looking for:
+</p>
+
+
+<pre class="example">[ece-install] Be sure to set technet_user and technet_password
+[ece-install] in /root/.ece-install.conf
+
+</pre>
+
+
+
+
+<p>
+The minimum .ece-install.conf file is thus:
+</p>
+
+
+<pre class="example">technet_user=&lt;user&gt;
+technet_password=&lt;password&gt;
+
+</pre>
+
+
+
+
+<p>
+If you're installing WF as well, you'll need additional credentials
+for this, see the Widget Framwork section below, and if you want to
+runn a fully automatic install without any user interaction, you'll
+need to specify some FAI specific parameters, see the FAI section
+below. 
+</p>
+<p>
+With the configuration file in place, you're now ready to run it:
+</p>
+
+
+<pre class="example"># bash ece-install [-v|--verbose]
+
+</pre>
+
+
+
+
+<p>
+If something goes astray with the script, and the log file cannot give
+you enough clues, the ultimate way of debugging this is to run the
+BASH interpreter with the -x flag:
+</p>
+
+
+<pre class="example"># bash -x ece-install
+
+</pre>
+
+
+
+
+<p>
+Here you can see everything that BASH does when running the script,
+how the wildcard variables expand and so on. Normally, having a tail
+on /var/log/ece-install.log should be sufficient, though.
+</p>
 </div>
 
 </div>
 
 <div id="outline-container-5" class="outline-2">
-<h2 id="sec-5"><span class="section-number-2">5</span> Available server profiles </h2>
+<h2 id="sec-5"><span class="section-number-2">5</span> Available Server Profiles </h2>
 <div class="outline-text-2" id="text-5">
 
 <p>When starting the script, it will ask you which server profile you
@@ -398,16 +494,27 @@ <h2 id="sec-5"><span class="section-number-2">5</span> Available server profiles
 </div>
 
 <div id="outline-container-5-1" class="outline-3">
-<h3 id="sec-5-1"><span class="section-number-3">5.1</span> Common for editorial, presentation and search instances </h3>
+<h3 id="sec-5-1"><span class="section-number-3">5.1</span> Common for Editorial, Presentation and Search Instances </h3>
 <div class="outline-text-3" id="text-5-1">
 
-<ul>
-<li>Sun Java 6
-</li>
-<li>Apache Tomcat application server:
+
+</div>
+
+<div id="outline-container-5-1-1" class="outline-4">
+<h4 id="sec-5-1-1"><span class="section-number-4">5.1.1</span> Sun Java 6 </h4>
+<div class="outline-text-4" id="text-5-1-1">
+
+</div>
+
+</div>
+
+<div id="outline-container-5-1-2" class="outline-4">
+<h4 id="sec-5-1-2"><span class="section-number-4">5.1.2</span> Apache Tomcat application server </h4>
+<div class="outline-text-4" id="text-5-1-2">
+
 <ul>
 <li>Compression of textual content (previously, this was typically set
-    up with Apache and its mod_deflate module).
+  up with Apache and its mod_deflate module).
 </li>
 <li>pooling set up tweaked for high read/write performance.
 </li>
@@ -415,31 +522,72 @@ <h3 id="sec-5-1"><span class="section-number-3">5.1</span> Common for editorial,
 </li>
 <li>routing information in the cookies
 </li>
-<li>access log
-
+<li>application server access log
 </li>
 </ul>
 
-</li>
-<li>APR, native library for optimal Tomcat I/O performance
-</li>
-<li>Escenic Assembly environment
-</li>
-<li>Database driver
+</div>
 
-</li>
-<li>Compression of content (what was previously accomplished with
-  Apache/mod_deflate) 
-</li>
-</ul>
+</div>
+
+<div id="outline-container-5-1-3" class="outline-4">
+<h4 id="sec-5-1-3"><span class="section-number-4">5.1.3</span> Basic Escenic Nursery configuration </h4>
+<div class="outline-text-4" id="text-5-1-3">
+
+<p>The basic Nursery configuration is taken care of for you, including RMI,
+  database, search and application server/URIs. 
+</p></div>
+
+</div>
+
+<div id="outline-container-5-1-4" class="outline-4">
+<h4 id="sec-5-1-4"><span class="section-number-4">5.1.4</span> APR, native library for optimal Tomcat I/O performance </h4>
+<div class="outline-text-4" id="text-5-1-4">
+
+</div>
+
+</div>
+
+<div id="outline-container-5-1-5" class="outline-4">
+<h4 id="sec-5-1-5"><span class="section-number-4">5.1.5</span> Escenic Assembly environment </h4>
+<div class="outline-text-4" id="text-5-1-5">
 
+<p>The reason why ece-install sets this up on each host, is to make the
+installation process as smooth as possible. The assembly environment
+may be removed after the installation if you want to.
+</p>
+</div>
 
 </div>
 
+<div id="outline-container-5-1-6" class="outline-4">
+<h4 id="sec-5-1-6"><span class="section-number-4">5.1.6</span> Database driver </h4>
+<div class="outline-text-4" id="text-5-1-6">
+
+
+</div>
+
+</div>
+
+<div id="outline-container-5-1-7" class="outline-4">
+<h4 id="sec-5-1-7"><span class="section-number-4">5.1.7</span> Compression of content </h4>
+<div class="outline-text-4" id="text-5-1-7">
+
+<p>This was was previously accomplished by having a web server in fron t
+of the application server (or cache server if you used ESI). A typical
+system architecture would contain Apache with mod_deflate. However,
+this is no longer necessary as Varnish can handles ESI parsing of
+compressed content (and many other things that we before needed Apache
+for). Thus, we'll let the application server do the compression for us
+now.
+</p>
+</div>
+</div>
+
 </div>
 
 <div id="outline-container-5-2" class="outline-3">
-<h3 id="sec-5-2"><span class="section-number-3">5.2</span> 1 - Full stack on one host </h3>
+<h3 id="sec-5-2"><span class="section-number-3">5.2</span> 1 - Full Stack on One Host </h3>
 <div class="outline-text-3" id="text-5-2">
 
 <p>This profile is suitable for developers and admins wanting to set up a
@@ -457,7 +605,7 @@ <h3 id="sec-5-2"><span class="section-number-3">5.2</span> 1 - Full stack on one
 </div>
 
 <div id="outline-container-5-3" class="outline-3">
-<h3 id="sec-5-3"><span class="section-number-3">5.3</span> 2 - Editorial server (publication server) </h3>
+<h3 id="sec-5-3"><span class="section-number-3">5.3</span> 2 - Editorial Server (Publication Server) </h3>
 <div class="outline-text-3" id="text-5-3">
 
 
@@ -467,7 +615,7 @@ <h3 id="sec-5-3"><span class="section-number-3">5.3</span> 2 - Editorial server
 </div>
 
 <div id="outline-container-5-4" class="outline-3">
-<h3 id="sec-5-4"><span class="section-number-3">5.4</span> 3 - Presentation server </h3>
+<h3 id="sec-5-4"><span class="section-number-3">5.4</span> 3 - Presentation Server </h3>
 <div class="outline-text-3" id="text-5-4">
 
 <p>This will set up a typical presentation server:
@@ -488,7 +636,7 @@ <h3 id="sec-5-4"><span class="section-number-3">5.4</span> 3 - Presentation serv
 </div>
 
 <div id="outline-container-5-5" class="outline-3">
-<h3 id="sec-5-5"><span class="section-number-3">5.5</span> 4 - Database server </h3>
+<h3 id="sec-5-5"><span class="section-number-3">5.5</span> 4 - Database Server </h3>
 <div class="outline-text-3" id="text-5-5">
 
 <p>If ece-install is run on a support version of Debian or Ubuntu, this
@@ -506,15 +654,26 @@ <h3 id="sec-5-5"><span class="section-number-3">5.5</span> 4 - Database server <
 directory as the ece-intall script itself.
 </p>
 <p>
-If you wish to change the DB's host, user or password, you must update
-the drop-and-create-ecedb script prior to running ece-install. 
+The script will fail by itself if the DB already exists:
 </p>
+
+
+<pre class="example">[ece-install] Setting up the ECE database schema ...
+ERROR 1007 (HY000) at line 1: Can't create database 'ece5db'; database exists
+ERROR 1050 (42S01) at line 2: Table 'DBChangeLog' already exists
+[ece-install] running tables FAILED, exiting :-(
+
+</pre>
+
+
+
+
 </div>
 
 </div>
 
 <div id="outline-container-5-6" class="outline-3">
-<h3 id="sec-5-6"><span class="section-number-3">5.6</span> 5 - Cache server </h3>
+<h3 id="sec-5-6"><span class="section-number-3">5.6</span> 5 - Cache Server </h3>
 <div class="outline-text-3" id="text-5-6">
 
 <p>If ece-install is run on a support version of Debian or Ubuntu, it
@@ -578,12 +737,12 @@ <h3 id="sec-5-7"><span class="section-number-3">5.7</span> 8 - Install Widget Fr
 these, please contact support@escenic.com. 
 </p>
 <p>
-If you don't have these ready in your .escenicrc, ece-install will
+If you don't have these ready in your .ece-install.conf, ece-install will
 complain:
 </p>
 
 
-<pre class="example">[ece-install] Be sure to set wf_user and wf_password in /root/.escenicrc
+<pre class="example">[ece-install] Be sure to set wf_user and wf_password in /root/.ece-install.conf
 [ece-install] If you don't have these, please contact support@escenic.com
 
 </pre>
@@ -696,7 +855,7 @@ <h2 id="sec-6"><span class="section-number-2">6</span> Full Automatic Install (F
 </div>
 
 <div id="outline-container-7" class="outline-2">
-<h2 id="sec-7"><span class="section-number-2">7</span> Running more than one installation process </h2>
+<h2 id="sec-7"><span class="section-number-2">7</span> Running More Than One Installation Process </h2>
 <div class="outline-text-2" id="text-7">
 
 <p>If the script believes there's already an ece-intall process running,
@@ -719,7 +878,7 @@ <h2 id="sec-7"><span class="section-number-2">7</span> Running more than one ins
 </div>
 
 <div id="outline-container-8" class="outline-2">
-<h2 id="sec-8"><span class="section-number-2">8</span> Re-running ece-install </h2>
+<h2 id="sec-8"><span class="section-number-2">8</span> Re-running ece-install (and How To Speed It Up) </h2>
 <div class="outline-text-2" id="text-8">
 
 <p>Although the initial thought behind ece-install, is to run it on a
@@ -759,7 +918,7 @@ <h2 id="sec-8"><span class="section-number-2">8</span> Re-running ece-install </
 </div>
 
 <div id="outline-container-9" class="outline-2">
-<h2 id="sec-9"><span class="section-number-2">9</span> Overview of file paths used by the ece-install script </h2>
+<h2 id="sec-9"><span class="section-number-2">9</span> Overview of File Paths Used by the ece-install script </h2>
 <div class="outline-text-2" id="text-9">
 
 <p>There are of course other paths involved when setting up your system,
@@ -811,9 +970,29 @@ <h2 id="sec-9"><span class="section-number-2">9</span> Overview of file paths us
 </div>
 
 <div id="outline-container-10" class="outline-2">
-<h2 id="sec-10"><span class="section-number-2">10</span> Uninstalling everything that the ece-install set up </h2>
+<h2 id="sec-10"><span class="section-number-2">10</span> Assumptions </h2>
 <div class="outline-text-2" id="text-10">
 
+
+</div>
+
+<div id="outline-container-10-1" class="outline-3">
+<h3 id="sec-10-1"><span class="section-number-3">10.1</span> /etc/esecenic is shared </h3>
+<div class="outline-text-3" id="text-10-1">
+
+<p>It's assumed that the /etc/escenic directory is either on a shared
+file system or rsync-ed among the hosts that are running the ECE
+instances (the exception being database and cache servers).
+</p>
+</div>
+</div>
+
+</div>
+
+<div id="outline-container-11" class="outline-2">
+<h2 id="sec-11"><span class="section-number-2">11</span> Uninstalling everything That the ece-install Set Up </h2>
+<div class="outline-text-2" id="text-11">
+
 <p>WARNING: this is potentially dangerous as some of these components may
 be used by other pieces of software you have running on your
 host. However, this may be useful if you're installing a clean
@@ -830,9 +1009,9 @@ <h2 id="sec-10"><span class="section-number-2">10</span> Uninstalling everything
 
 </div>
 
-<div id="outline-container-11" class="outline-2">
-<h2 id="sec-11"><span class="section-number-2">11</span> Example Output </h2>
-<div class="outline-text-2" id="text-11">
+<div id="outline-container-12" class="outline-2">
+<h2 id="sec-12"><span class="section-number-2">12</span> Example Output </h2>
+<div class="outline-text-2" id="text-12">
 
 <p>Below is an example output of running ece-install, installing the
 all-in-one profile.
@@ -846,7 +1025,7 @@ <h2 id="sec-11"><span class="section-number-2">11</span> Example Output </h2>
 <hr/>
 <p class="author">
   Author: Torstein Krause Johansen (<a href="mailto:tkj@vizrt.com">tkj@vizrt.com</a>)
-  Date: 2011-08-25 22:02:19 CST
+  Date: 2011-08-26 17:45:45 CST
 </p></div>
 </div>
 </body>
diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 9cd730a5..19141e0b 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -1,6 +1,6 @@
 Welcome to the /usr/sbin/ece-install Guide
 
-* Supported operating systems
+* Supported Operating Systems
 For the best experience, run this script on Debian Squeeze (or newer),
 the latest Ubuntu LTS or most other Debian based operating systems,
 but it should work without any problems on any Unix like system that
@@ -21,14 +21,14 @@ You may also look inside the ece-install script for all calls to the
 'assert\_pre\_prequesite' method and you'll get a list of the binaries
 ece-install assumes are present.
 
-* A note on running ece-install on non-GNU/Linux systems
+* A Note on Running Ece-Install On Non-GNU/Linux Systems
 Please note, it's assumed that the OS uses GNU's tools, i.e. find, cp
 & tar. If you're running a system which has a different set of core
 tools, such as any of the BSDs (including Mac OS X) or Solaris, make
 sure that GNU's tools take precedence in the command PATH offered to
 ece-install.
 
-* Downloading the ece-install script
+* Downloading the ece-install Script
 The ece-install script can be downloaded from:
 https://raw.github.com/skybert/ece-scripts/master/usr/sbin/ece-install
 or be downloaded together with the other ece-scripts using git:
@@ -36,7 +36,7 @@ or be downloaded together with the other ece-scripts using git:
 $ git clone git@github.com:skybert/ece-scripts.git
 #+END_SRC
 
-* Running the ece-install script
+* Running the ece-install Script
 You must run the script as the root user.  If you start the script as
 a regular user, it will complain:
 #+BEGIN_SRC sh
@@ -50,7 +50,51 @@ On all other Unix like system, do:
 #+BEGIN_SRC sh
    $ su
 #+END_SRC
-* Available server profiles
+
+You will need access to http://technet.escenic.com and put these
+credentials in the root user's $HOME/.ece-install.conf, normally this
+means /root/.ece-install.conf, the script will also tell you this if
+you forget to provide such a configuration file:
+#+BEGIN_SRC sh
+[ece-install] /root/.ece-install.conf doesn't exist, I cannot live without it :-(
+#+END_SRC
+
+As for the technet credentials, the script will also tell you if it
+cannot find what it's looking for:
+#+BEGIN_SRC sh
+[ece-install] Be sure to set technet_user and technet_password
+[ece-install] in /root/.ece-install.conf
+#+END_SRC
+
+The minimum .ece-install.conf file is thus:
+#+BEGIN_SRC sh
+technet_user=<user>
+technet_password=<password>
+#+END_SRC
+
+If you're installing WF as well, you'll need additional credentials
+for this, see the Widget Framwork section below, and if you want to
+runn a fully automatic install without any user interaction, you'll
+need to specify some FAI specific parameters, see the FAI section
+below. 
+
+With the configuration file in place, you're now ready to run it:
+#+BEGIN_SRC sh
+# bash ece-install [-v|--verbose]
+#+END_SRC
+
+If something goes astray with the script, and the log file cannot give
+you enough clues, the ultimate way of debugging this is to run the
+BASH interpreter with the -x flag:
+#+BEGIN_SRC sh
+# bash -x ece-install
+#+END_SRC
+
+Here you can see everything that BASH does when running the script,
+how the wildcard variables expand and so on. Normally, having a tail
+on /var/log/ece-install.log should be sufficient, though.
+
+* Available Server Profiles
 When starting the script, it will ask you which server profile you
 want to install:
 #+BEGIN_SRC sh
@@ -69,24 +113,36 @@ Select 1-7 and press ENTER
   8 - Install Widget Framework. This will also set up a WF based 
       publication for you (repo.escenic.com user/pass required).
 #+END_SRC
-** Common for editorial, presentation and search instances
-- Sun Java 6
-- Apache Tomcat application server:
-  * Compression of textual content (previously, this was typically set
-    up with Apache and its mod\_deflate module).
-  * pooling set up tweaked for high read/write performance.
-  * proper logging configuration directing solr messages to its own log.
-  * routing information in the cookies
-  * access log
-
-- APR, native library for optimal Tomcat I/O performance
-- Escenic Assembly environment
-- Database driver
-
-- Compression of content (what was previously accomplished with
-  Apache/mod\_deflate) 
-
-** 1 - Full stack on one host
+** Common for Editorial, Presentation and Search Instances
+*** Sun Java 6
+*** Apache Tomcat application server
+- Compression of textual content (previously, this was typically set
+  up with Apache and its mod\_deflate module).
+- pooling set up tweaked for high read/write performance.
+- proper logging configuration directing solr messages to its own log.
+- routing information in the cookies
+- application server access log
+*** Basic Escenic Nursery configuration
+The basic Nursery configuration is taken care of for you, including RMI,
+  database, search and application server/URIs. 
+*** APR, native library for optimal Tomcat I/O performance
+*** Escenic Assembly environment
+The reason why ece-install sets this up on each host, is to make the
+installation process as smooth as possible. The assembly environment
+may be removed after the installation if you want to.
+
+*** Database driver
+
+*** Compression of content 
+This was was previously accomplished by having a web server in fron t
+of the application server (or cache server if you used ESI). A typical
+system architecture would contain Apache with mod\_deflate. However,
+this is no longer necessary as Varnish can handles ESI parsing of
+compressed content (and many other things that we before needed Apache
+for). Thus, we'll let the application server do the compression for us
+now.
+
+** 1 - Full Stack on One Host
 This profile is suitable for developers and admins wanting to set up a
 test environment. It will install the full stack including caching
 server, application server, ECE, assembly host, database, Widget
@@ -96,10 +152,10 @@ For further details on each of the different server components, see
 the different profile descriptions bellow.
 
 
-** 2 - Editorial server (publication server)
+** 2 - Editorial Server (Publication Server)
 
 
-** 3 - Presentation server
+** 3 - Presentation Server
 This will set up a typical presentation server:
 - Memcached, distributed memory cache
 - Escenic Assembly environment (which may be removed after the
@@ -107,7 +163,7 @@ This will set up a typical presentation server:
 - Deployment setup to only deploy escenic-admin and the
   publication(s).
 
-** 4 - Database server
+** 4 - Database Server
 If ece-install is run on a support version of Debian or Ubuntu, this
 will install the excellent Percona distribution of MySQL with their
 set of high performance patches.
@@ -120,10 +176,15 @@ SQL files contained inside the distribution bundles. To accomplish
 this, the script will make a call to drop-and-create-ecedb in the same
 directory as the ece-intall script itself.
 
-If you wish to change the DB's host, user or password, you must update
-the drop-and-create-ecedb script prior to running ece-install. 
+The script will fail by itself if the DB already exists:
+#+BEGIN_SRC sh
+[ece-install] Setting up the ECE database schema ...
+ERROR 1007 (HY000) at line 1: Can't create database 'ece5db'; database exists
+ERROR 1050 (42S01) at line 2: Table 'DBChangeLog' already exists
+[ece-install] running tables FAILED, exiting :-(
+#+END_SRC
 
-** 5 - Cache server
+** 5 - Cache Server
 If ece-install is run on a support version of Debian or Ubuntu, it
 will install the latest Varnish 3.0 caching server from the Varnish
 APT repository.
@@ -161,10 +222,10 @@ repo.escenic.com Maven repository. You should get these credentials
 when you bought Widget Framework. If you for some reason do not have
 these, please contact support@escenic.com. 
 
-If you don't have these ready in your .escenicrc, ece-install will
+If you don't have these ready in your .ece-install.conf, ece-install will
 complain:
 #+BEGIN_SRC sh
-[ece-install] Be sure to set wf_user and wf_password in /root/.escenicrc
+[ece-install] Be sure to set wf_user and wf_password in /root/.ece-install.conf
 [ece-install] If you don't have these, please contact support@escenic.com
 #+END_SRC
 ** 9 - Create Publication
@@ -229,7 +290,7 @@ When FAI is enabled, ece-install will report:
 [ece-install] All user input will be read from /root/.ece-install.conf
 #+END_SRC
 
-* Running more than one installation process
+* Running More Than One Installation Process
 If the script believes there's already an ece-intall process running,
 it will abort:
 #+BEGIN_SRC sh
@@ -239,7 +300,7 @@ it will abort:
 [ece-install] run ece-install again.
 #+END_SRC
 
-* Re-running ece-install
+* Re-running ece-install (and How To Speed It Up)
 Although the initial thought behind ece-install, is to run it on a
 clean system to get up and running as soon as possible. However, you
 may want to re-run ece-install on the same host, for instance to add
@@ -263,7 +324,7 @@ following variables:
 - wf\_download\_list
 - tomcat\_download
 
-* Overview of file paths used by the ece-install script
+* Overview of File Paths Used by the ece-install script
 There are of course other paths involved when setting up your system,
 but these should be the most interesting ones.
 
@@ -300,7 +361,13 @@ but these should be the most interesting ones.
 
 *) Applies only to Debian based systems.
 
-* Uninstalling everything that the ece-install set up
+* Assumptions
+** /etc/esecenic is shared
+It's assumed that the /etc/escenic directory is either on a shared
+file system or rsync-ed among the hosts that are running the ECE
+instances (the exception being database and cache servers).
+ 
+* Uninstalling everything That the ece-install Set Up
 WARNING: this is potentially dangerous as some of these components may
 be used by other pieces of software you have running on your
 host. However, this may be useful if you're installing a clean
diff --git a/usr/share/doc/escenic/ece-install-guide.txt b/usr/share/doc/escenic/ece-install-guide.txt
index 830ef88c..abfecb97 100644
--- a/usr/share/doc/escenic/ece-install-guide.txt
+++ b/usr/share/doc/escenic/ece-install-guide.txt
@@ -2,35 +2,44 @@
               ==========================================
 
 Author: Torstein Krause Johansen
-Date: 2011-08-25 22:02:21 CST
+Date: 2011-08-26 17:45:48 CST
 
 
 Table of Contents
 =================
-1 Supported operating systems 
+1 Supported Operating Systems 
         1.1 Debian based operating systems 
         1.2 Other GNU/Linux and Unix systems 
-2 A note on running ece-install on non-GNU/Linux systems 
-3 Downloading the ece-install script 
-4 Running the ece-install script 
-5 Available server profiles 
-    5.1 Common for editorial, presentation and search instances 
-    5.2 1 - Full stack on one host 
-    5.3 2 - Editorial server (publication server) 
-    5.4 3 - Presentation server 
-    5.5 4 - Database server 
-    5.6 5 - Cache server 
+2 A Note on Running Ece-Install On Non-GNU/Linux Systems 
+3 Downloading the ece-install Script 
+4 Running the ece-install Script 
+5 Available Server Profiles 
+    5.1 Common for Editorial, Presentation and Search Instances 
+        5.1.1 Sun Java 6 
+        5.1.2 Apache Tomcat application server 
+        5.1.3 Basic Escenic Nursery configuration 
+        5.1.4 APR, native library for optimal Tomcat I/O performance 
+        5.1.5 Escenic Assembly environment 
+        5.1.6 Database driver 
+        5.1.7 Compression of content 
+    5.2 1 - Full Stack on One Host 
+    5.3 2 - Editorial Server (Publication Server) 
+    5.4 3 - Presentation Server 
+    5.5 4 - Database Server 
+    5.6 5 - Cache Server 
     5.7 8 - Install Widget Framework 
     5.8 9 - Create Publication 
 6 Full Automatic Install (FAI) 
-7 Running more than one installation process 
-8 Re-running ece-install 
-9 Overview of file paths used by the ece-install script 
-10 Uninstalling everything that the ece-install set up 
-11 Example Output 
+7 Running More Than One Installation Process 
+8 Re-running ece-install (and How To Speed It Up) 
+9 Overview of File Paths Used by the ece-install script 
+10 Assumptions 
+    10.1 /etc/esecenic is shared 
+11 Uninstalling everything That the ece-install Set Up 
+12 Example Output 
 
 
-1 Supported operating systems 
+1 Supported Operating Systems 
 ------------------------------
 For the best experience, run this script on Debian Squeeze (or newer),
 the latest Ubuntu LTS or most other Debian based operating systems,
@@ -54,7 +63,7 @@ You may also look inside the ece-install script for all calls to the
 'assert\_pre\_prequesite' method and you'll get a list of the binaries
 ece-install assumes are present.
 
-2 A note on running ece-install on non-GNU/Linux systems 
+2 A Note on Running Ece-Install On Non-GNU/Linux Systems 
 ---------------------------------------------------------
 Please note, it's assumed that the OS uses GNU's tools, i.e. find, cp
 & tar. If you're running a system which has a different set of core
@@ -62,7 +71,7 @@ tools, such as any of the BSDs (including Mac OS X) or Solaris, make
 sure that GNU's tools take precedence in the command PATH offered to
 ece-install.
 
-3 Downloading the ece-install script 
+3 Downloading the ece-install Script 
 -------------------------------------
 The ece-install script can be downloaded from:
 [https://raw.github.com/skybert/ece-scripts/master/usr/sbin/ece-install]
@@ -74,7 +83,7 @@ or be downloaded together with the other ece-scripts using git:
 
 
 
-4 Running the ece-install script 
+4 Running the ece-install Script 
 ---------------------------------
 You must run the script as the root user.  If you start the script as
 a regular user, it will complain:
@@ -98,7 +107,66 @@ On all other Unix like system, do:
 
 
 
-5 Available server profiles 
+
+You will need access to [http://technet.escenic.com] and put these
+credentials in the root user's $HOME/.ece-install.conf, normally this
+means /root/.ece-install.conf, the script will also tell you this if
+you forget to provide such a configuration file:
+
+
+  [ece-install] /root/.ece-install.conf doesn't exist, I cannot live without it :-(
+
+
+
+
+As for the technet credentials, the script will also tell you if it
+cannot find what it's looking for:
+
+
+  [ece-install] Be sure to set technet_user and technet_password
+  [ece-install] in /root/.ece-install.conf
+
+
+
+
+The minimum .ece-install.conf file is thus:
+
+
+  technet_user=<user>
+  technet_password=<password>
+
+
+
+
+If you're installing WF as well, you'll need additional credentials
+for this, see the Widget Framwork section below, and if you want to
+runn a fully automatic install without any user interaction, you'll
+need to specify some FAI specific parameters, see the FAI section
+below. 
+
+With the configuration file in place, you're now ready to run it:
+
+
+  # bash ece-install [-v|--verbose]
+
+
+
+
+If something goes astray with the script, and the log file cannot give
+you enough clues, the ultimate way of debugging this is to run the
+BASH interpreter with the -x flag:
+
+
+  # bash -x ece-install
+
+
+
+
+Here you can see everything that BASH does when running the script,
+how the wildcard variables expand and so on. Normally, having a tail
+on /var/log/ece-install.log should be sufficient, though.
+
+5 Available Server Profiles 
 ----------------------------
 When starting the script, it will ask you which server profile you
 want to install:
@@ -121,25 +189,49 @@ want to install:
 
 
 
-5.1 Common for editorial, presentation and search instances 
+5.1 Common for Editorial, Presentation and Search Instances 
 ============================================================
-- Sun Java 6
-- Apache Tomcat application server:
-  * Compression of textual content (previously, this was typically set
-    up with Apache and its mod\_deflate module).
-  * pooling set up tweaked for high read/write performance.
-  * proper logging configuration directing solr messages to its own log.
-  * routing information in the cookies
-  * access log
-
-- APR, native library for optimal Tomcat I/O performance
-- Escenic Assembly environment
-- Database driver
-
-- Compression of content (what was previously accomplished with
-  Apache/mod\_deflate) 
-
-5.2 1 - Full stack on one host 
+
+5.1.1 Sun Java 6 
+~~~~~~~~~~~~~~~~~
+
+5.1.2 Apache Tomcat application server 
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+- Compression of textual content (previously, this was typically set
+  up with Apache and its mod\_deflate module).
+- pooling set up tweaked for high read/write performance.
+- proper logging configuration directing solr messages to its own log.
+- routing information in the cookies
+- application server access log
+
+5.1.3 Basic Escenic Nursery configuration 
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The basic Nursery configuration is taken care of for you, including RMI,
+  database, search and application server/URIs. 
+
+5.1.4 APR, native library for optimal Tomcat I/O performance 
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+5.1.5 Escenic Assembly environment 
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The reason why ece-install sets this up on each host, is to make the
+installation process as smooth as possible. The assembly environment
+may be removed after the installation if you want to.
+
+5.1.6 Database driver 
+~~~~~~~~~~~~~~~~~~~~~~
+
+5.1.7 Compression of content 
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+This was was previously accomplished by having a web server in fron t
+of the application server (or cache server if you used ESI). A typical
+system architecture would contain Apache with mod\_deflate. However,
+this is no longer necessary as Varnish can handles ESI parsing of
+compressed content (and many other things that we before needed Apache
+for). Thus, we'll let the application server do the compression for us
+now.
+
+5.2 1 - Full Stack on One Host 
 ===============================
 This profile is suitable for developers and admins wanting to set up a
 test environment. It will install the full stack including caching
@@ -150,11 +242,11 @@ For further details on each of the different server components, see
 the different profile descriptions bellow.
 
 
-5.3 2 - Editorial server (publication server) 
+5.3 2 - Editorial Server (Publication Server) 
 ==============================================
 
 
-5.4 3 - Presentation server 
+5.4 3 - Presentation Server 
 ============================
 This will set up a typical presentation server:
 - Memcached, distributed memory cache
@@ -163,7 +255,7 @@ This will set up a typical presentation server:
 - Deployment setup to only deploy escenic-admin and the
   publication(s).
 
-5.5 4 - Database server 
+5.5 4 - Database Server 
 ========================
 If ece-install is run on a support version of Debian or Ubuntu, this
 will install the excellent Percona distribution of MySQL with their
@@ -177,10 +269,18 @@ SQL files contained inside the distribution bundles. To accomplish
 this, the script will make a call to drop-and-create-ecedb in the same
 directory as the ece-intall script itself.
 
-If you wish to change the DB's host, user or password, you must update
-the drop-and-create-ecedb script prior to running ece-install. 
+The script will fail by itself if the DB already exists:
+
+
+  [ece-install] Setting up the ECE database schema ...
+  ERROR 1007 (HY000) at line 1: Can't create database 'ece5db'; database exists
+  ERROR 1050 (42S01) at line 2: Table 'DBChangeLog' already exists
+  [ece-install] running tables FAILED, exiting :-(
 
-5.6 5 - Cache server 
+
+
+
+5.6 5 - Cache Server 
 =====================
 If ece-install is run on a support version of Debian or Ubuntu, it
 will install the latest Varnish 3.0 caching server from the Varnish
@@ -220,11 +320,11 @@ repo.escenic.com Maven repository. You should get these credentials
 when you bought Widget Framework. If you for some reason do not have
 these, please contact support@escenic.com. 
 
-If you don't have these ready in your .escenicrc, ece-install will
+If you don't have these ready in your .ece-install.conf, ece-install will
 complain:
 
 
-  [ece-install] Be sure to set wf_user and wf_password in /root/.escenicrc
+  [ece-install] Be sure to set wf_user and wf_password in /root/.ece-install.conf
   [ece-install] If you don't have these, please contact support@escenic.com
 
 
@@ -298,7 +398,7 @@ When FAI is enabled, ece-install will report:
 
 
 
-7 Running more than one installation process 
+7 Running More Than One Installation Process 
 ---------------------------------------------
 If the script believes there's already an ece-intall process running,
 it will abort:
@@ -312,8 +412,8 @@ it will abort:
 
 
 
-8 Re-running ece-install 
--------------------------
+8 Re-running ece-install (and How To Speed It Up) 
+--------------------------------------------------
 Although the initial thought behind ece-install, is to run it on a
 clean system to get up and running as soon as possible. However, you
 may want to re-run ece-install on the same host, for instance to add
@@ -337,7 +437,7 @@ following variables:
 - wf\_download\_list
 - tomcat\_download
 
-9 Overview of file paths used by the ece-install script 
+9 Overview of File Paths Used by the ece-install script 
 --------------------------------------------------------
 There are of course other paths involved when setting up your system,
 but these should be the most interesting ones.
@@ -373,7 +473,17 @@ but these should be the most interesting ones.
 
 *) Applies only to Debian based systems.
 
-10 Uninstalling everything that the ece-install set up 
+10 Assumptions 
+---------------
+
+10.1 /etc/esecenic is shared 
+=============================
+It's assumed that the /etc/escenic directory is either on a shared
+file system or rsync-ed among the hosts that are running the ECE
+instances (the exception being database and cache servers).
+ 
+
+11 Uninstalling everything That the ece-install Set Up 
 -------------------------------------------------------
 WARNING: this is potentially dangerous as some of these components may
 be used by other pieces of software you have running on your
@@ -386,7 +496,7 @@ function, it has copy and pastable commands for undoing most/all
 things set up by the script.
 
 
-11 Example Output 
+12 Example Output 
 ------------------
 Below is an example output of running ece-install, installing the
 all-in-one profile.

From 6cb3348cd11a94f9919a380f137341bea2cf1b98 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 26 Aug 2011 18:29:42 +0800
Subject: [PATCH 0009/2585] - updated install guide with FAI output - minor
 wording change to ece-install output

---
 usr/sbin/ece-install                         |  2 +-
 usr/share/doc/escenic/ece-install-guide.html | 87 ++++++++++++++++++--
 usr/share/doc/escenic/ece-install-guide.org  | 17 +++-
 usr/share/doc/escenic/ece-install-guide.txt  | 81 ++++++++++++++++--
 4 files changed, 169 insertions(+), 18 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 31f0d69b..e3863e58 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -865,7 +865,7 @@ function print_status_and_next_steps()
     minutes=$(( seconds_left / 60 ))
     seconds_left=$(( seconds_left - $minutes * 60 ))
 
-    print "The installation is now completed!"
+    print "The installation is now complete!"
     print "- It took" ${days}d ${hours}h ${minutes}m ${seconds_left}s
     echo "$next_steps"
 
diff --git a/usr/share/doc/escenic/ece-install-guide.html b/usr/share/doc/escenic/ece-install-guide.html
index e8837245..975b9bb5 100644
--- a/usr/share/doc/escenic/ece-install-guide.html
+++ b/usr/share/doc/escenic/ece-install-guide.html
@@ -7,7 +7,7 @@
 <title>Welcome to the /usr/sbin/ece-install Guide</title>
 <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
 <meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2011-08-26 17:45:45 CST"/>
+<meta name="generated" content="2011-08-26 18:28:21 CST"/>
 <meta name="author" content="Torstein Krause Johansen"/>
 <meta name="description" content=""/>
 <meta name="keywords" content=""/>
@@ -257,7 +257,7 @@ <h2>Table of Contents</h2>
 </ul>
 </li>
 <li><a href="#sec-11">11 Uninstalling everything That the ece-install Set Up </a></li>
-<li><a href="#sec-12">12 Example Output </a></li>
+<li><a href="#sec-12">12 Example Output FAI </a></li>
 </ul>
 </div>
 </div>
@@ -1010,22 +1010,95 @@ <h2 id="sec-11"><span class="section-number-2">11</span> Uninstalling everything
 </div>
 
 <div id="outline-container-12" class="outline-2">
-<h2 id="sec-12"><span class="section-number-2">12</span> Example Output </h2>
+<h2 id="sec-12"><span class="section-number-2">12</span> Example Output FAI </h2>
 <div class="outline-text-2" id="text-12">
 
-<p>Below is an example output of running ece-install, installing the
-all-in-one profile.
+<p>The ece-install will often be run in FAI mode where all the settings
+are read from ~/.ece-install.conf. Given the following entries in this
+file: 
 </p>
+
+
+<pre class="example">technet_user=apples
+technet_password=andoranges
+wf_user=foo
+wf_password=bar
+
+fai_enabled=1
+fai_all_install=1
+
+</pre>
+
+
+
+
 <p>
-CANNOT INCLUDE FILE /tmp/ece-install.out
+The following output is produced from ece-install:
 </p>
+
+
+<pre class="example">root@ubiquitous:~# bash ece-install 
+[ece-install] Full Automatic Install (FAI) enabled.
+[ece-install] All user input will be read from /root/.ece-install.conf
+[ece-install] I'm logging to /var/log/ece-install.log
+[ece-install] Setting correct permissions on all ECE related directories ...
+[ece-install] Stopping conflicting processes ...
+[ece-install] Installing 3rd party packages needed by ece-install ...
+[ece-install] Setting up the ece UNIX scripts ...
+[ece-install] Adding the ece init.d script to the default run levels...
+[ece-install] Setting up the escenic user's UNIX environment ...
+[ece-install] Installing an all-in-one environment on ubiquitous ...
+[ece-install] Installing the database server on ubiquitous ...
+[ece-install] Installing the Percona database ...
+[ece-install] Downloading Escenic software from technet.escenic.com ...
+[ece-install] Setting up the Escenic Content Engine &amp; its plugins ...
+[ece-install] Setting up the ECE database schema ...
+[ece-install] Installing 3rd party packages needed by ECE ...
+[ece-install] Setting up the Assembly Tool ...
+[ece-install] Setting up the basic Nursery configuration ...
+[ece-install] Setting up the application server ...
+[ece-install] Setting up proper log4j &amp; Java logging configuration ...
+[ece-install] Setting correct permissions on all ECE related directories ...
+[ece-install] Assembling, deploying &amp; starting dev1 ...
+[ece-install] Installing a caching server on ubiquitous ...
+[ece-install] Setting up Varnish to match your environment ...
+[ece-install] Setting up solr ...
+[ece-install] Creating a Maven settings file: /root/.m2/settings.xml ...
+[ece-install] Downloading Widget Framework from technet.escenic.com ...
+[ece-install] Installing Widget Framework into your local Maven repository ...
+[ece-install] Getting ready to create a new publiation ...
+[ece-install] Setting up the mypub publication ...
+[ece-install] Basing mypub.war on the Widget Framework Demo ...
+[ece-install] Creating publication mypub using dev1 ...
+[ece-install] Assembling, deploying &amp; starting dev1 ...
+[ece-install] The installation is now complete!
+[ece-install] - It took 0d 0h 29m 40s
+[ece-install] - DB is now set up on ubiquitous:3306
+[ece-install] - New ECE instance dev1 installed.
+[ece-install] - Its admin interface is available at http://ubiquitous:8080/escenic-admin
+[ece-install] - You can view all installed plugin &amp; engine versions with:
+[ece-install]   ece -i dev1 versions
+[ece-install] - Cache server is up and running at http://ubiquitous:80/
+[ece-install] - Widget Framework has been installed into your local
+[ece-install]   Maven repository and its ECE components have been installed
+[ece-install] - a new publication mypub has been created
+[ece-install]
+[ece-install] Enjoy your time with Escenic Content Engine!
+[ece-install]
+[ece-install] -Vizrt Online
+
+</pre>
+
+
+
+
 </div>
 </div>
 <div id="postamble">
 <hr/>
 <p class="author">
   Author: Torstein Krause Johansen (<a href="mailto:tkj@vizrt.com">tkj@vizrt.com</a>)
-  Date: 2011-08-26 17:45:45 CST
+  Date: 2011-08-26 18:28:21 CST
 </p></div>
 </div>
 </body>
diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 19141e0b..7dd12512 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -379,9 +379,20 @@ function, it has copy and pastable commands for undoing most/all
 things set up by the script.
 
 
-* Example Output
-Below is an example output of running ece-install, installing the
-all-in-one profile.
+* Example Output FAI
+The ece-install will often be run in FAI mode where all the settings
+are read from ~/.ece-install.conf. Given the following entries in this
+file: 
+#+BEGIN_SRC sh
+technet_user=apples
+technet_password=andoranges
+wf_user=foo
+wf_password=bar
+
+fai_enabled=1
+fai_all_install=1
+#+END_SRC
 
+The following output is produced from ece-install:
 #+INCLUDE: "/tmp/ece-install.out" src text
 
diff --git a/usr/share/doc/escenic/ece-install-guide.txt b/usr/share/doc/escenic/ece-install-guide.txt
index abfecb97..37809d3e 100644
--- a/usr/share/doc/escenic/ece-install-guide.txt
+++ b/usr/share/doc/escenic/ece-install-guide.txt
@@ -2,7 +2,7 @@
               ==========================================
 
 Author: Torstein Krause Johansen
-Date: 2011-08-26 17:45:48 CST
+Date: 2011-08-26 18:28:17 CST
 
 
 Table of Contents
@@ -36,7 +36,7 @@ Table of Contents
 10 Assumptions 
     10.1 /etc/esecenic is shared 
 11 Uninstalling everything That the ece-install Set Up 
-12 Example Output 
+12 Example Output FAI 
 
 
 1 Supported Operating Systems 
@@ -496,10 +496,77 @@ function, it has copy and pastable commands for undoing most/all
 things set up by the script.
 
 
-12 Example Output 
-------------------
-Below is an example output of running ece-install, installing the
-all-in-one profile.
+12 Example Output FAI 
+----------------------
+The ece-install will often be run in FAI mode where all the settings
+are read from ~/.ece-install.conf. Given the following entries in this
+file: 
+
+
+  technet_user=apples
+  technet_password=andoranges
+  wf_user=foo
+  wf_password=bar
+  
+  fai_enabled=1
+  fai_all_install=1
+
+
+
+
+The following output is produced from ece-install:
+
+
+  root@ubiquitous:~# bash ece-install 
+  [ece-install] Full Automatic Install (FAI) enabled.
+  [ece-install] All user input will be read from /root/.ece-install.conf
+  [ece-install] I'm logging to /var/log/ece-install.log
+  [ece-install] Setting correct permissions on all ECE related directories ...
+  [ece-install] Stopping conflicting processes ...
+  [ece-install] Installing 3rd party packages needed by ece-install ...
+  [ece-install] Setting up the ece UNIX scripts ...
+  [ece-install] Adding the ece init.d script to the default run levels...
+  [ece-install] Setting up the escenic user's UNIX environment ...
+  [ece-install] Installing an all-in-one environment on ubiquitous ...
+  [ece-install] Installing the database server on ubiquitous ...
+  [ece-install] Installing the Percona database ...
+  [ece-install] Downloading Escenic software from technet.escenic.com ...
+  [ece-install] Setting up the Escenic Content Engine & its plugins ...
+  [ece-install] Setting up the ECE database schema ...
+  [ece-install] Installing 3rd party packages needed by ECE ...
+  [ece-install] Setting up the Assembly Tool ...
+  [ece-install] Setting up the basic Nursery configuration ...
+  [ece-install] Setting up the application server ...
+  [ece-install] Setting up proper log4j & Java logging configuration ...
+  [ece-install] Setting correct permissions on all ECE related directories ...
+  [ece-install] Assembling, deploying & starting dev1 ...
+  [ece-install] Installing a caching server on ubiquitous ...
+  [ece-install] Setting up Varnish to match your environment ...
+  [ece-install] Setting up solr ...
+  [ece-install] Creating a Maven settings file: /root/.m2/settings.xml ...
+  [ece-install] Downloading Widget Framework from technet.escenic.com ...
+  [ece-install] Installing Widget Framework into your local Maven repository ...
+  [ece-install] Getting ready to create a new publiation ...
+  [ece-install] Setting up the mypub publication ...
+  [ece-install] Basing mypub.war on the Widget Framework Demo ...
+  [ece-install] Creating publication mypub using dev1 ...
+  [ece-install] Assembling, deploying & starting dev1 ...
+  [ece-install] The installation is now complete!
+  [ece-install] - It took 0d 0h 29m 40s
+  [ece-install] - DB is now set up on ubiquitous:3306
+  [ece-install] - New ECE instance dev1 installed.
+  [ece-install] - Its admin interface is available at http://ubiquitous:8080/escenic-admin
+  [ece-install] - You can view all installed plugin & engine versions with:
+  [ece-install]   ece -i dev1 versions
+  [ece-install] - Cache server is up and running at http://ubiquitous:80/
+  [ece-install] - Widget Framework has been installed into your local
+  [ece-install]   Maven repository and its ECE components have been installed
+  [ece-install] - a new publication mypub has been created
+  [ece-install]
+  [ece-install] Enjoy your time with Escenic Content Engine!
+  [ece-install]
+  [ece-install] -Vizrt Online
+
+
 
-CANNOT INCLUDE FILE /tmp/ece-install.out
 

From c122e6f2182e50195de8f6cbde6509e0af5c3517 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 26 Aug 2011 18:32:28 +0800
Subject: [PATCH 0010/2585] - getting pernickety here

---
 usr/share/doc/escenic/ece-install-guide.html | 8 ++++----
 usr/share/doc/escenic/ece-install-guide.org  | 2 +-
 usr/share/doc/escenic/ece-install-guide.txt  | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.html b/usr/share/doc/escenic/ece-install-guide.html
index 975b9bb5..b6c4647a 100644
--- a/usr/share/doc/escenic/ece-install-guide.html
+++ b/usr/share/doc/escenic/ece-install-guide.html
@@ -7,7 +7,7 @@
 <title>Welcome to the /usr/sbin/ece-install Guide</title>
 <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
 <meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2011-08-26 18:28:21 CST"/>
+<meta name="generated" content="2011-08-26 18:32:09 CST"/>
 <meta name="author" content="Torstein Krause Johansen"/>
 <meta name="description" content=""/>
 <meta name="keywords" content=""/>
@@ -256,7 +256,7 @@ <h2>Table of Contents</h2>
 <li><a href="#sec-10-1">10.1 /etc/esecenic is shared </a></li>
 </ul>
 </li>
-<li><a href="#sec-11">11 Uninstalling everything That the ece-install Set Up </a></li>
+<li><a href="#sec-11">11 Uninstalling Everything That the ece-install Set Up </a></li>
 <li><a href="#sec-12">12 Example Output FAI </a></li>
 </ul>
 </div>
@@ -990,7 +990,7 @@ <h3 id="sec-10-1"><span class="section-number-3">10.1</span> /etc/esecenic is sh
 </div>
 
 <div id="outline-container-11" class="outline-2">
-<h2 id="sec-11"><span class="section-number-2">11</span> Uninstalling everything That the ece-install Set Up </h2>
+<h2 id="sec-11"><span class="section-number-2">11</span> Uninstalling Everything That the ece-install Set Up </h2>
 <div class="outline-text-2" id="text-11">
 
 <p>WARNING: this is potentially dangerous as some of these components may
@@ -1098,7 +1098,7 @@ <h2 id="sec-12"><span class="section-number-2">12</span> Example Output FAI </h2
 <hr/>
 <p class="author">
   Author: Torstein Krause Johansen (<a href="mailto:tkj@vizrt.com">tkj@vizrt.com</a>)
-  Date: 2011-08-26 18:28:21 CST
+  Date: 2011-08-26 18:32:09 CST
 </p></div>
 </div>
 </body>
diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 7dd12512..81aef24d 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -367,7 +367,7 @@ It's assumed that the /etc/escenic directory is either on a shared
 file system or rsync-ed among the hosts that are running the ECE
 instances (the exception being database and cache servers).
  
-* Uninstalling everything That the ece-install Set Up
+* Uninstalling Everything That the ece-install Set Up
 WARNING: this is potentially dangerous as some of these components may
 be used by other pieces of software you have running on your
 host. However, this may be useful if you're installing a clean
diff --git a/usr/share/doc/escenic/ece-install-guide.txt b/usr/share/doc/escenic/ece-install-guide.txt
index 37809d3e..83a22be5 100644
--- a/usr/share/doc/escenic/ece-install-guide.txt
+++ b/usr/share/doc/escenic/ece-install-guide.txt
@@ -2,7 +2,7 @@
               ==========================================
 
 Author: Torstein Krause Johansen
-Date: 2011-08-26 18:28:17 CST
+Date: 2011-08-26 18:32:11 CST
 
 
 Table of Contents
@@ -35,7 +35,7 @@ Table of Contents
 9 Overview of File Paths Used by the ece-install script 
 10 Assumptions 
     10.1 /etc/esecenic is shared 
-11 Uninstalling everything That the ece-install Set Up 
+11 Uninstalling Everything That the ece-install Set Up 
 12 Example Output FAI 
 
 
@@ -483,7 +483,7 @@ file system or rsync-ed among the hosts that are running the ECE
 instances (the exception being database and cache servers).
  
 
-11 Uninstalling everything That the ece-install Set Up 
+11 Uninstalling Everything That the ece-install Set Up 
 -------------------------------------------------------
 WARNING: this is potentially dangerous as some of these components may
 be used by other pieces of software you have running on your

From 3821b13668323347795c0d3cfdeee2b191e2b46b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 8 Sep 2011 13:21:56 +0800
Subject: [PATCH 0011/2585] - added unzip to the pre-requisite binaries - added
 script specific time stamps - removed publication creation in the editorial
 server profile, now it   corresponds to the help screen.

---
 usr/sbin/ece-install | 53 +++++++++++++++++++++++++++-----------------
 1 file changed, 33 insertions(+), 20 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index e3863e58..16c5f631 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -4,6 +4,10 @@
 # five minutes. The setup the user is getting is suitable for a
 # production environment, except for the fact that with this script,
 # all ECE components are set up on the same host.
+#
+# BUG: if creating a publication and WF is downloaded, but not
+# installed, then the pub is built from WF, but WF is not added to the
+# plugins. This _is_ a corner case, but should still be fixed.
 
 # by tkj@vizrt.com
 
@@ -14,13 +18,13 @@ ece_user=escenic
 ece_group=escenic
 jdbc_driver=/usr/share/java/mysql.jar
 debug=0
+tomcat_download=http://ftp.nsysu.edu.tw/Apache/tomcat/tomcat-6/v6.0.32/bin/apache-tomcat-6.0.32.tar.gz
 
 # don't touch this one if you're installing on a Debian based system
 # as it'll be set up for you by the script itself.
 java_home=/usr/lib/jvm/java-6-sun
 #####################################################################
 
-id="[$(basename $0)]"
 pid_file=/var/run/$(basename $0).pid
 download_dir=/tmp/ece-downloads
 log=/var/log/$(basename $0).log
@@ -43,6 +47,13 @@ NEW_LINE="
 # components.
 next_steps=""
 
+
+function get_id()
+{
+    id="[$(basename $0)-$(get_seconds_since_start)]"
+    echo $id
+}
+
 function debug()
 {
     if [ $debug -eq 1 ]; then
@@ -52,7 +63,7 @@ function debug()
 
 function print()
 {
-    echo $id $@
+    echo $(get_id) $@
 }
 
 function exit_on_error()
@@ -80,7 +91,6 @@ http://technet.escenic.com/downloads/release/53/xml-editor-dist-2.1.0.0.zip
 wf_download_list="
 http://technet.escenic.com/downloads/widget-framework/widget-framework-core-1.10.0.0.zip
 "
-tomcat_download=http://ftp.nsysu.edu.tw/Apache/tomcat/tomcat-6/v6.0.32/bin/apache-tomcat-6.0.32.tar.gz
 
 PROFILE_ALL_IN_ONE=1
 PROFILE_CACHE_SERVER=5
@@ -193,13 +203,13 @@ function install_common_os_packages()
             git_package=git
         fi
 
-        packages="curl $git_package wget"
+        packages="curl $git_package wget unzip"
         install_packages_if_missing $packages
     fi
 
-    assert_pre_prequesite curl
-    assert_pre_prequesite wget
-    assert_pre_prequesite git
+    for el in curl wget git unzip; do
+        assert_pre_prequesite $el
+    done
 }
 
 make_dir $ece_directories
@@ -822,7 +832,7 @@ EOF
 # last, give the control back to the ECE user & group 
 function set_correct_permissions()
 {
-    print "Setting correct permissions on all ECE related directories ..."
+    print "Setting correct permissions on ECE related directories ..."
 
     if [ $(grep $ece_user /etc/passwd | wc -l) -lt 1 ]; then
         # TODO add support for useradd
@@ -850,6 +860,13 @@ function set_correct_permissions()
     fi
 }
 
+function get_seconds_since_start()
+{
+    now=`date +%s`
+    started=`stat -c %Y $pid_file`
+    seconds=$(( now - started ))
+    echo "$seconds"
+}
 
 function print_status_and_next_steps()
 {
@@ -1202,8 +1219,7 @@ function read_user_input()
     echo "      It will install caching server, ECE, assembly host, database &"
     echo "      Widget Framework as well as set up a new publication."
     echo "  $PROFILE_EDITORIAL_SERVER - Editorial (publication) server."
-    echo "      This will install ECE, an assembly host & as well as "
-    echo "      creating and set up a new publication."
+    echo "      This will install ECE and an assembly host."
     echo -n "  $PROFILE_PRESENTATION_SERVER - Presentation server "
     echo "(ECE, memcached)."
     echo "  $PROFILE_DB_SERVER - Database server."
@@ -1235,13 +1251,14 @@ function assert_correct_runtime_environment()
     fi
     
     if [ -e $pid_file ]; then
-        print "There's already one $(basename $0) process running. If you believe"
-        print "this is wrong, e.g. if a previous run of $(basename $0) was aborted"
-        print "before it completed, you may delete ${pid_file} and "
-        print "run $(basename $0) again."
+        print "There's already one $(basename $0) process running."
+        print "If you blelieve this is wrong, e.g. if a previous run of" 
+        print "$(basename $0) was aborted before it completed, you"
+        print "may remove ${pid_file} and run $(basename $0) again."
         exit 1
     else
         echo $BASHPID > $pid_file
+        started=`stat -c %Y $pid_file`
     fi
 
     if [ ! -e "$conf_file" ]; then
@@ -1347,9 +1364,9 @@ function install_cache_server()
 function add_next_step()
 {
     if [ -n "$next_steps" ]; then
-        next_steps=${next_steps}${NEW_LINE}${id}" "${1}
+        next_steps=${next_steps}${NEW_LINE}$(get_id)" "${1}
     else
-        next_steps=${id}" "${1}
+        next_steps=$(get_id)" "${1}
     fi
 }
 
@@ -1546,10 +1563,6 @@ function install_editorial_server()
     print "Installing an editorial server on $HOSTNAME ..."
 
     install_ece_instance "editor1" 0
-    type=engine
-    ece_command="ece -i $instance_name -t $type assemble deploy restart"
-    su - $ece_user -c "$ece_command" 1>>$log 2>>$log
-    create_publication
 }
 
 function install_rmi_hub()

From 4cfd1aa0a4bcfca27794c9485d5f0c0a9d940988 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 8 Sep 2011 13:36:25 +0800
Subject: [PATCH 0012/2585] - added support for host names containing dashes
 (Varnish doesn't   accept backend names with dashes). This is highly relevant
 for (at   least) Amazon cloud hosts which get assigned host names containing 
  dashes.

  Thanks to mogsie for this fix: c588e2d91f9eaebe3ba7a84f62a154d9aa26254f
---
 usr/sbin/ece-install | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 16c5f631..563bc3a6 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -1095,10 +1095,7 @@ function set_up_varnish()
     /etc/init.d/varnish stop 1>>$log 2>>$log
 
     file=/etc/default/varnish
-    cat $file | \
-        sed 's/6081/80/g' \
-        > $file.tmp
-    mv $file.tmp $file
+    sed -i -e 's/6081/80/g' -e 's/^START=no$/START=yes/' $file
 
     cat > /etc/varnish/default.vcl <<EOF
 /* Varnish configuration for Escenic Content Engine              -*- java -*- */
@@ -1127,11 +1124,12 @@ acl adactus {
 EOF
 
     for el in $backend_servers; do
+        appserver_id=$(echo $el | cut -d':' -f1 | sed 's/-/_/g' )
         appserver_host=$(echo $el | cut -d':' -f1)
         appserver_port=$(echo $el | cut -d':' -f2)
 
         cat >> /etc/varnish/default.vcl <<EOF
-backend $appserver_host {
+backend $appserver_id {
   .host = "$appserver_host";
   .port = "$appserver_port";
 }
@@ -1145,10 +1143,10 @@ EOF
 director webdirector client {
 EOF
     for el in $backend_servers; do
-        appserver_host=$(echo $el | cut -d':' -f1)
+	      appserver_id=$(echo $el | cut -d':' -f1 | sed 's/-/_/g' )        
         cat >> /etc/varnish/default.vcl <<EOF
   {
-     .backend = $appserver_host;
+     .backend = $appserver_id;
      .weight = 1;
   }
 EOF

From 2a88e39dad9277a9be0e5c5f8462d16922ba76fd Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 8 Sep 2011 14:52:33 +0800
Subject: [PATCH 0013/2585] - common_pre_install now reads .ece-install.conf by
 sourcing it. This   is far easier than cat/grep/cut-ing the values. It also
 makes it   easy for the user to override any defaults, such as
 tomcat_download   and git_source.

  This change is inspired by mogsie's changes to allow using a fork-ed
  ece-install.
---
 usr/sbin/ece-install | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 563bc3a6..97a36eea 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -30,6 +30,7 @@ download_dir=/tmp/ece-downloads
 log=/var/log/$(basename $0).log
 conf_file=$HOME/.ece-install.conf
 common_nursery_dir=/etc/escenic/engine/common
+git_source=git://github.com/skybert/ece-scripts.git
 
 # globals will be set to correct values in run-time.
 appserver_port=8080
@@ -224,7 +225,6 @@ function set_up_assembly_tool()
     if [ -e $download_dir/assemblytool*zip ]; then
         unzip -u $download_dir/assemblytool*zip \
             1>>$log 2>>$log
-        mv $download_dir/assemblytool*zip /tmp/
     fi
 
     # adding an instance layer to the Nursery configuration
@@ -238,7 +238,6 @@ fileSystemRoot = /etc/escenic/engine/instance/\${com.escenic.instance}/
 EOF
     echo "" >> Nursery.properties
     echo "layer.06 = /layers/instance/Layer" >> Nursery.properties
-    echo "come here" > /tmp/tkj
     
     # set up which plugins to use
     cd /opt/escenic/assemblytool/
@@ -295,16 +294,20 @@ function set_up_engine_and_plugins()
         fi
     
         ln -s engine-* engine
-        mv $download_dir/engine*.zip /tmp
     else
         debug "engine-<version> is already there, skipping to next step."
     fi
     
-    # now, there's only plugins left in the download dir
     # we extract them in /opt/escenic as we want to re-use
     # them between minor updates of ECE.
     cd /opt/escenic/
     for el in $download_dir/*.zip; do
+        if [ "${el/engine*}" == "" ] ; then
+          continue
+        elif [ "${el/assemblytool*}" == "" ] ; then
+          continue
+        fi
+        
         unzip -u $el \
             1>>$log 2>>$log
     done
@@ -321,7 +324,7 @@ function set_up_ece_scripts()
         (cd ece-scripts
             git pull 1>>$log 2>>$log)
     else
-        git clone git://github.com/skybert/ece-scripts.git \
+        git clone $git_source \
             1>>$log 2>>$log
     fi
     
@@ -1260,7 +1263,8 @@ function assert_correct_runtime_environment()
     fi
 
     if [ ! -e "$conf_file" ]; then
-        print $conf_file "doesn't exist, I cannot live without it :-("
+        print $conf_file "doesn't exist."
+        print "I cannot live without it, so I'm exiting :-("
         exit 1
     fi
 }
@@ -1269,8 +1273,7 @@ function common_pre_install()
 {
     print "I'm logging to $log"
 
-    technet_user=`grep technet_user $conf_file 2>/dev/null | cut -d'=' -f2`
-    technet_password=`grep technet_password $conf_file 2>/dev/null | cut -d'=' -f2`
+    source $conf_file
 
     if [ -z "$technet_user" -o -z "$technet_password" ]; then
         print "Be sure to set technet_user and technet_password "

From 14622abb20b210d32a1e379818c9a22945e68303 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 8 Sep 2011 15:50:17 +0800
Subject: [PATCH 0014/2585] - added hardening to (almost) all commands executed
 from within the   script. They now use a wrapping function, cmd() which will
 call   exit_on_error after the command is executed.

  This in effect, means that ece-install will exit as soon as an error
  is spotted during its execution. The script will output messages
  like:

  [ece-install-1] The command [adduser does -p does] FAILED, exiting :-(
  [ece-install-1] See /var/log/ece-install.log for further details.
---
 usr/sbin/ece-install | 161 +++++++++++++++++++++----------------------
 1 file changed, 78 insertions(+), 83 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 97a36eea..a99d8f1e 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -12,7 +12,8 @@
 # by tkj@vizrt.com
 
 #####################################################################
-# User definable variables (the defaults are fine in most cases).
+# User definable variables (the defaults are fine in most cases). Any
+# of these may be overridden in the .ece-isntall.conf file
 #####################################################################
 ece_user=escenic
 ece_group=escenic
@@ -70,11 +71,18 @@ function print()
 function exit_on_error()
 {
     if [ $? -eq 1 ]; then
-        echo $id $@ "FAILED, exiting :-("
+        print "The command ["$@"] FAILED, exiting :-("
+        print "See $log for further details."
         exit 1
     fi
 }
 
+function run()
+{
+    $@ 1>>$log 2>>$log
+    exit_on_error $@
+}
+
 technet_download_list="
 http://technet.escenic.com/downloads/assemblytool-2.0.2.zip
 http://technet.escenic.com/downloads/release/53/analysis-engine-2.3.6.0.zip
@@ -121,7 +129,7 @@ $common_nursery_dir
 function make_dir()
 {
     if [ ! -d $1 ]; then
-        mkdir -p $1
+        run mkdir -p $1
     fi
 }
 
@@ -132,7 +140,7 @@ done
 function make_ln()
 {
     if [ -e $1 -a ! -h $(basename $1) ]; then
-        ln -s $1
+        run ln -s $1
     elif [ ! -e $1 ]; then
         print "Tried to make a symlink to $1, but it doesn't exist"
         exit 1
@@ -156,7 +164,7 @@ function download_escenic_components()
             continue
         fi
         
-        wget --continue \
+        run wget --continue \
             --http-user $technet_user \
             --http-password $technet_password \
             $el \
@@ -187,7 +195,7 @@ install_packages_if_missing()
             return
         fi
         
-        apt-get install -y $@ 1>>$log 2>>$log
+        run apt-get install -y $@ 1>>$log 2>>$log
     fi
 }
 
@@ -223,7 +231,7 @@ function set_up_assembly_tool()
     cd /opt/escenic/assemblytool/
     
     if [ -e $download_dir/assemblytool*zip ]; then
-        unzip -u $download_dir/assemblytool*zip \
+        run unzip -u $download_dir/assemblytool*zip \
             1>>$log 2>>$log
     fi
 
@@ -261,18 +269,13 @@ EOF
         make_ln $directory
     done
 
-    cd /opt/escenic/assemblytool/
-    ant -q initialize \
+    run cd /opt/escenic/assemblytool/
+    run ant -q initialize \
         1>>$log 2>>$log
-    cat assemble.properties | \
-        sed 's/#\ engine.root\ =\ \./engine.root=\/opt\/escenic\/engine/g' \
-        > assemble.properties.tmp
-    mv assemble.properties.tmp assemble.properties
-
-    cat assemble.properties | \
-        sed 's/\#\# plugins\ =\ \/path\/to\/plugins/plugins=\/opt\/escenic\/assemblytool\/plugins/g' \
-        > assemble.properties.tmp
-    mv assemble.properties.tmp assemble.properties
+    run sed -i 's/#\ engine.root\ =\ \./engine.root=\/opt\/escenic\/engine/g' \
+        assemble.properties 
+    run sed -i 's/\#\# plugins\ =\ \/path\/to\/plugins/plugins=\/opt\/escenic\/assemblytool\/plugins/g' \
+        assemble.properties
 }
 
 function set_up_engine_and_plugins()
@@ -287,13 +290,13 @@ function set_up_engine_and_plugins()
     cd /opt/escenic/
 
     if [ ! -d engine-* ]; then
-        unzip -u $download_dir/engine*.zip \
+        run unzip -u $download_dir/engine*.zip \
             1>>$log 2>>$log
         if [ -h engine ]; then
-            rm engine
+            run rm engine
         fi
     
-        ln -s engine-* engine
+        run ln -s engine-* engine
     else
         debug "engine-<version> is already there, skipping to next step."
     fi
@@ -308,7 +311,7 @@ function set_up_engine_and_plugins()
           continue
         fi
         
-        unzip -u $el \
+        run unzip -u $el \
             1>>$log 2>>$log
     done
 
@@ -319,17 +322,17 @@ function set_up_ece_scripts()
 {
     print "Setting up the ece UNIX scripts ..." 
 
-    cd $download_dir
+    run cd $download_dir
     if [ -d ece-scripts ]; then
         (cd ece-scripts
             git pull 1>>$log 2>>$log)
     else
-        git clone $git_source \
+        run git clone $git_source \
             1>>$log 2>>$log
     fi
     
-    cp -r ece-scripts/usr/* /usr/
-    cp -r ece-scripts/etc/* /etc/
+    run cp -r ece-scripts/usr/* /usr/
+    run cp -r ece-scripts/etc/* /etc/
 
     # no need to add init.d scripts to the runlevel(s) for these
     # profiles
@@ -342,7 +345,7 @@ function set_up_ece_scripts()
 
     if [ $on_debian_or_derivative ]; then
         print "Adding the ece init.d script to the default run levels..."
-        update-rc.d ece defaults \
+        run update-rc.d ece defaults \
             1>>$log 2>>$log
     else
         print "You remember to add /etc/intit.d/ece to the desired runlevels" 
@@ -358,7 +361,7 @@ function set_up_ecedb()
     print "Setting up the ECE database schema ..."
 
     make_dir /opt/escenic/engine/plugins
-    cd /opt/escenic/engine/plugins
+    run cd /opt/escenic/engine/plugins
     
     find ../../ -maxdepth 1 -type d | \
         grep -v assemblytool | \
@@ -375,7 +378,7 @@ function set_up_ecedb()
         fi
 
         if [ ! -h $(basename $directory) ]; then
-            ln -s $directory
+            run ln -s $directory
         fi
     done
 
@@ -384,10 +387,9 @@ function set_up_ecedb()
     # db_password and db_schema here by reading these via
     # get_conf_value
     create_ecedb
-    exit_on_error "create_ecedb"
     
     cd ~/
-    rm -rf /opt/escenic/engine/plugins
+    run rm -rf /opt/escenic/engine/plugins
 
     add_next_step "- DB is now set up on $HOSTNAME:3306"
 }
@@ -410,9 +412,9 @@ function set_up_basic_nursery_configuration()
 {
     print "Setting up the basic Nursery configuration ..."
     
-    cp -r /opt/escenic/engine/siteconfig/config-skeleton/* \
+    run cp -r /opt/escenic/engine/siteconfig/config-skeleton/* \
         $common_nursery_dir/
-    cp -r /opt/escenic/engine/security/ \
+    run cp -r /opt/escenic/engine/security/ \
         $common_nursery_dir/
 
     make_dir /etc/escenic/engine/instance
@@ -422,25 +424,21 @@ function set_up_basic_nursery_configuration()
             continue
         fi
 
-        cp -r $el/misc/siteconfig/* $common_nursery_dir/
-        
+        run cp -r $el/misc/siteconfig/* $common_nursery_dir/
     done
 
-    cat > $common_nursery_dir/ServerConfig.properties <<EOF
+    run cat > $common_nursery_dir/ServerConfig.properties <<EOF
 databaseProductName=MySQL
 filePublicationRoot=/var/lib/escenic/engine/
 webPublicationRoot=http://$HOSTNAME:${appserver_port}/
 EOF
-    cat > $common_nursery_dir/neo/io/managers/ContentManager.properties <<EOF
+    run cat > $common_nursery_dir/neo/io/managers/ContentManager.properties <<EOF
 readConnector=/connector/ReadConnector
 updateConnector=/connector/UpdateConnector
 EOF
 
     file=$common_nursery_dir/com/escenic/community/CommunityEngine.properties
-    cat $file | \
-        sed 's/jdbc\/ecome/jdbc\/ECE_UPDATE_DS/g' \
-        > $file.tmp
-    mv $file.tmp $file
+    sed -i 's/jdbc\/ecome/jdbc\/ECE_UPDATE_DS/g' $file
 
     file=$common_nursery_dir/com/escenic/webstart/StudioConfig.properties
     cat >> $file <<EOF
@@ -458,7 +456,7 @@ function set_up_instance_specific_nursery_configuration()
        i=$(( i + 1 ))
        if [ $(basename $el) = $instance_name ]; then
            rmi_port="8${i}23"
-           echo "port=$rmi_port" > $el/RMI.properties
+           run echo "port=$rmi_port" > $el/RMI.properties
        fi
     done
 
@@ -468,7 +466,7 @@ function set_up_instance_specific_nursery_configuration()
     
     # we don't touch it if the file already exists.
     if [ ! -e $file ]; then
-        echo "hostname=$HOSTNAME" >> $file
+        run echo "hostname=$HOSTNAME" >> $file
     fi
     
 }
@@ -486,7 +484,7 @@ log4j.appender.ECELOG.layout.ConversionPattern=%d %5p [%t] %x (%c) %m%n
 EOF
     cd $tomcat_base/lib/
     make_ln $common_nursery_dir/trace.properties
-    ln -sf trace.properties log4j.properies
+    run ln -sf trace.properties log4j.properies
 
     cat > $tomcat_base/conf/logging.properties <<EOF
 handlers = 1catalina.org.apache.juli.FileHandler, 2localhost.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler, 6localhost.org.apache.juli.FileHandler
@@ -662,19 +660,18 @@ function set_up_app_server
         search_port=$(echo $user_search | cut -d':' -f2)
     fi
     
-    cd $download_dir
-    wget --continue $tomcat_download \
+    run cd $download_dir
+    run wget --continue $tomcat_download \
         1>>$log 2>>$log
     
-    cd /opt/
-    
-    tar xzf $download_dir/apache-tomcat*.tar.gz
-    ln -sf apache-tomcat* tomcat
+    run cd /opt/
+    run tar xzf $download_dir/apache-tomcat*.tar.gz
+    run ln -sf apache-tomcat* tomcat
     
     tomcat_base=/opt/tomcat-${instance_name}
     make_dir $tomcat_base
 
-    cp -r /opt/apache-tomcat*/conf/ $tomcat_base
+    run cp -r /opt/apache-tomcat*/conf/ $tomcat_base
     for el in bin escenic/lib lib work logs temp webapps; do
         make_dir $tomcat_base/$el
     done
@@ -682,13 +679,11 @@ function set_up_app_server
     set_ece_instance_conf tomcat_base $tomcat_base   
     set_ece_instance_conf tomcat_home /opt/tomcat   
    
-    cd $tomcat_base/lib
+    run cd $tomcat_base/lib
     make_ln $jdbc_driver
 
-    cat $tomcat_base/conf/catalina.properties | \
-        sed 's/common.loader=/common.loader=\$\{catalina.base\}\/escenic\/lib\/\*\.jar\,/g' \
-        > $tomcat_base/conf/catalina.properties.tmp
-    mv $tomcat_base/conf/catalina.properties.tmp $tomcat_base/conf/catalina.properties
+    run sed -i 's/common.loader=/common.loader=\$\{catalina.base\}\/escenic\/lib\/\*\.jar\,/g' \
+        > $tomcat_base/conf/catalina.properties
     
     cat > $tomcat_base/conf/server.xml <<EOF
 <?xml version='1.0' encoding='utf-8'?>
@@ -839,26 +834,26 @@ function set_correct_permissions()
 
     if [ $(grep $ece_user /etc/passwd | wc -l) -lt 1 ]; then
         # TODO add support for useradd
-        adduser $ece_user
+        run adduser $ece_user -p $ece_user
     fi
     if [ $(grep $ece_group /etc/group | wc -l) -lt 1 ]; then
-        addgroup $ece_group
+        run addgroup $ece_group
     fi
 
     for el in $dir_list; do
         if [ -d $el ]; then
-            chown -R ${ece_user}:${ece_group} $el \
+            run chown -R ${ece_user}:${ece_group} $el \
                 1>>$log 2>>$log                
         fi
     done
     
     if [ -d "$tomcat_base" ]; then
-        chown -R ${ece_user}:${ece_group} $tomcat_base \
+        run chown -R ${ece_user}:${ece_group} $tomcat_base \
         1>>$log 2>>$log
     fi
 
     if [ $(ls /tmp | grep ^ece | wc -l) -gt 0 ]; then
-        chown -R ${ece_user}:${ece_group} /tmp/ece-* \
+        run chown -R ${ece_user}:${ece_group} /tmp/ece-* \
             1>>$log 2>>$log
     fi
 }
@@ -912,14 +907,14 @@ function create_publication_in_db()
         exit 1;
     fi
 
-    curl --silent \
+    run curl --silent \
         -F "type=webapp" \
         -F "resourceFile=@${1}" \
         --cookie JSESSIONID="$cookie" \
         "${ece_admin_uri}/do/publication/resource" \
         1>>$log 2>>$log
     
-    curl --silent  \
+    run curl --silent  \
         -F "name=${publication_name}" \
         -F "publisherName=Escenic" \
         -F "adminPassword=${publication_name}" \
@@ -948,7 +943,7 @@ function create_publication_definition_and_war()
 
     print "Setting up the ${publication_name} publication ..."
     make_dir /opt/escenic/assemblytool/publications/
-    cd /opt/escenic/assemblytool/publications/
+    run cd /opt/escenic/assemblytool/publications/
     cat > /opt/escenic/assemblytool/publications/${publication_name}.properties <<EOF
 name: ${publication_name}
 source-war: ${publication_name}.war
@@ -958,13 +953,13 @@ EOF
     publication_war=/opt/escenic/assemblytool/publications/${publication_name}.war
     if [ -d /opt/escenic/widget-framework-core-* ]; then
         print "Basing ${publication_name}.war on the Widget Framework Demo ..."
-        cd /opt/escenic/widget-framework-core-*/publications/demo-core
-        mvn package \
+        run cd /opt/escenic/widget-framework-core-*/publications/demo-core
+        run mvn package \
             1>>$log 2>>$log
-        cp target/demo-core-*.war ${publication_war}
+        run cp target/demo-core-*.war ${publication_war}
     else
         print "Basing your ${publication_name}.war on ECE/demo-clean ..."
-        cp /opt/escenic/engine/contrib/wars/demo-clean.war ${publication_war}
+        run cp /opt/escenic/engine/contrib/wars/demo-clean.war ${publication_war}
     fi
     
 }
@@ -1018,10 +1013,10 @@ function set_up_user_enviornment()
      # TODO get this from ece.conf and other magic
 
     if [ $(grep JAVA_HOME /home/$ece_user/.bashrc | wc -l) -lt 1 ]; then
-        echo JAVA_HOME=$java_home >> /home/$ece_user/.bashrc
+        run echo JAVA_HOME=$java_home >> /home/$ece_user/.bashrc
     fi
     if [ $(grep JAVA_HOME /root/.bashrc | wc -l) -lt 1 ]; then
-        echo JAVA_HOME=$java_home >> /root/.bashrc
+        run echo JAVA_HOME=$java_home >> /root/.bashrc
     fi
 
     if [ $on_debian_or_derivative -eq 1 ]; then
@@ -1030,7 +1025,7 @@ function set_up_user_enviornment()
 
     if [ $(grep bash_completion.d/ece /home/$ece_user/.bashrc | wc -l) -lt 1 ]
     then
-        echo ". /etc/bash_completion.d/ece" \
+        run echo ". /etc/bash_completion.d/ece" \
             >> /home/$ece_user/.bashrc
     fi
 }
@@ -1039,13 +1034,13 @@ function set_up_solr()
 {
     print "Setting up solr ..."
     if [ ! -d /etc/escenic/solr ]; then
-        cp -r  /opt/escenic/engine/solr/conf /etc/escenic/solr
+        run cp -r /opt/escenic/engine/solr/conf /etc/escenic/solr
     fi
     
     make_dir /var/lib/escenic/solr/
-    cd /var/lib/escenic/solr/
+    run cd /var/lib/escenic/solr/
     if  [ ! -h conf ]; then
-        ln -s /etc/escenic/solr conf
+        run ln -s /etc/escenic/solr conf
     fi
 }
 
@@ -1098,7 +1093,7 @@ function set_up_varnish()
     /etc/init.d/varnish stop 1>>$log 2>>$log
 
     file=/etc/default/varnish
-    sed -i -e 's/6081/80/g' -e 's/^START=no$/START=yes/' $file
+    run sed -i -e 's/6081/80/g' -e 's/^START=no$/START=yes/' $file
 
     cat > /etc/varnish/default.vcl <<EOF
 /* Varnish configuration for Escenic Content Engine              -*- java -*- */
@@ -1273,7 +1268,7 @@ function common_pre_install()
 {
     print "I'm logging to $log"
 
-    source $conf_file
+    run source $conf_file
 
     if [ -z "$technet_user" -o -z "$technet_password" ]; then
         print "Be sure to set technet_user and technet_password "
@@ -1313,10 +1308,10 @@ function add_apt_source()
     escenic_sources=/etc/apt/sources.list.d/escenic.list
     if [ ! -e $escenic_sources ]; then
         echo "$@" >> $escenic_sources
-        apt-get update 1>>$log 2>>$log
+        run apt-get update 1>>$log 2>>$log
     elif [ $(grep "$@" $escenic_sources | wc -l) -lt 1 ]; then
         echo "$@" >> $escenic_sources
-        apt-get update 1>>$log 2>>$log
+        run apt-get update 1>>$log 2>>$log
     fi
 }
 
@@ -1325,7 +1320,7 @@ function install_cache_server()
     print "Installing a caching server on $HOSTNAME ..."
 
     if [ $on_debian_or_derivative -eq 1 ]; then
-        curl http://repo.varnish-cache.org/debian/GPG-key.txt 2>>$log | \
+        run curl http://repo.varnish-cache.org/debian/GPG-key.txt 2>>$log | \
             apt-key add - 1>>$log 2>>$log
     fi
     
@@ -1389,17 +1384,17 @@ function install_database_server()
         
          # some how, this is to install Percona 5.5
         if [ -e /var/lib/mysql/debian-*.flag ]; then
-            rm /var/lib/mysql/debian-*.flag
+            run rm /var/lib/mysql/debian-*.flag
         fi
         
         if [ $supported_code_name -eq 1 ]; then
             print "Installing the Percona database ..."
 
             if [ $(apt-key list| grep CD2EFD2A | wc -l) -lt 1 ]; then
-                gpg --keyserver hkp://keys.gnupg.net \
+                run gpg --keyserver hkp://keys.gnupg.net \
                     --recv-keys 1C4CBDCDCD2EFD2A \
                     1>>$log 2>>$log
-                gpg -a --export CD2EFD2A | apt-key add - \
+                run gpg -a --export CD2EFD2A | apt-key add - \
                     1>>$log 2>>$log
             fi
             add_apt_source "deb http://repo.percona.com/apt ${code_name} main"
@@ -1570,7 +1565,7 @@ function install_rmi_hub()
 {
     make_dir /etc/escenic/rmi-hub
     
-    cp -r /opt/escenic/engine/contrib/rmi-hub/config/* \
+    run cp -r /opt/escenic/engine/contrib/rmi-hub/config/* \
         /etc/escenic/rmi-hub/
 
     hub_host=$HOSTNAME

From 7e9470cf662ee21323f2e6d86eb628200c21886b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 8 Sep 2011 15:54:39 +0800
Subject: [PATCH 0015/2585] - added doc about fail fast

---
 usr/share/doc/escenic/ece-install-guide.org | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 81aef24d..e764d43d 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -83,9 +83,16 @@ With the configuration file in place, you're now ready to run it:
 # bash ece-install [-v|--verbose]
 #+END_SRC
 
-If something goes astray with the script, and the log file cannot give
-you enough clues, the ultimate way of debugging this is to run the
-BASH interpreter with the -x flag:
+ece-install will try to "fail fast", exiting as soon as it detects an
+error during its execution:
+#+BEGIN_SRC sh
+[ece-install-1] The command [cd /does/not/exist] FAILED, exiting :-(
+[ece-install-1] See /var/log/ece-install.log for further details.
+#+END_SRC
+
+As a last resort, if something goes astray with the script, and the
+log file cannot give you enough clues, the ultimate way of debugging
+this is to run the BASH interpreter with the -x flag:
 #+BEGIN_SRC sh
 # bash -x ece-install
 #+END_SRC

From 528b01b16a8c3249e0284c2b6e04028897d67978 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 8 Sep 2011 15:55:33 +0800
Subject: [PATCH 0016/2585] - updated generated TXT and HTML

---
 usr/share/doc/escenic/ece-install-guide.html | 82 +++++---------------
 usr/share/doc/escenic/ece-install-guide.txt  | 73 ++++-------------
 2 files changed, 35 insertions(+), 120 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.html b/usr/share/doc/escenic/ece-install-guide.html
index b6c4647a..f50bec49 100644
--- a/usr/share/doc/escenic/ece-install-guide.html
+++ b/usr/share/doc/escenic/ece-install-guide.html
@@ -7,7 +7,7 @@
 <title>Welcome to the /usr/sbin/ece-install Guide</title>
 <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
 <meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2011-08-26 18:32:09 CST"/>
+<meta name="generated" content="2011-09-08 15:54:44 CST"/>
 <meta name="author" content="Torstein Krause Johansen"/>
 <meta name="description" content=""/>
 <meta name="keywords" content=""/>
@@ -440,9 +440,23 @@ <h2 id="sec-4"><span class="section-number-2">4</span> Running the ece-install S
 
 
 <p>
-If something goes astray with the script, and the log file cannot give
-you enough clues, the ultimate way of debugging this is to run the
-BASH interpreter with the -x flag:
+ece-install will try to "fail fast", exiting as soon as it detects an
+error during its execution:
+</p>
+
+
+<pre class="example">[ece-install-1] The command [cd /does/not/exist] FAILED, exiting :-(
+[ece-install-1] See /var/log/ece-install.log for further details.
+
+</pre>
+
+
+
+
+<p>
+As a last resort, if something goes astray with the script, and the
+log file cannot give you enough clues, the ultimate way of debugging
+this is to run the BASH interpreter with the -x flag:
 </p>
 
 
@@ -1034,71 +1048,15 @@ <h2 id="sec-12"><span class="section-number-2">12</span> Example Output FAI </h2
 
 <p>
 The following output is produced from ece-install:
+CANNOT INCLUDE FILE /tmp/ece-install.out
 </p>
-
-
-<pre class="example">root@ubiquitous:~# bash ece-install 
-[ece-install] Full Automatic Install (FAI) enabled.
-[ece-install] All user input will be read from /root/.ece-install.conf
-[ece-install] I'm logging to /var/log/ece-install.log
-[ece-install] Setting correct permissions on all ECE related directories ...
-[ece-install] Stopping conflicting processes ...
-[ece-install] Installing 3rd party packages needed by ece-install ...
-[ece-install] Setting up the ece UNIX scripts ...
-[ece-install] Adding the ece init.d script to the default run levels...
-[ece-install] Setting up the escenic user's UNIX environment ...
-[ece-install] Installing an all-in-one environment on ubiquitous ...
-[ece-install] Installing the database server on ubiquitous ...
-[ece-install] Installing the Percona database ...
-[ece-install] Downloading Escenic software from technet.escenic.com ...
-[ece-install] Setting up the Escenic Content Engine &amp; its plugins ...
-[ece-install] Setting up the ECE database schema ...
-[ece-install] Installing 3rd party packages needed by ECE ...
-[ece-install] Setting up the Assembly Tool ...
-[ece-install] Setting up the basic Nursery configuration ...
-[ece-install] Setting up the application server ...
-[ece-install] Setting up proper log4j &amp; Java logging configuration ...
-[ece-install] Setting correct permissions on all ECE related directories ...
-[ece-install] Assembling, deploying &amp; starting dev1 ...
-[ece-install] Installing a caching server on ubiquitous ...
-[ece-install] Setting up Varnish to match your environment ...
-[ece-install] Setting up solr ...
-[ece-install] Creating a Maven settings file: /root/.m2/settings.xml ...
-[ece-install] Downloading Widget Framework from technet.escenic.com ...
-[ece-install] Installing Widget Framework into your local Maven repository ...
-[ece-install] Getting ready to create a new publiation ...
-[ece-install] Setting up the mypub publication ...
-[ece-install] Basing mypub.war on the Widget Framework Demo ...
-[ece-install] Creating publication mypub using dev1 ...
-[ece-install] Assembling, deploying &amp; starting dev1 ...
-[ece-install] The installation is now complete!
-[ece-install] - It took 0d 0h 29m 40s
-[ece-install] - DB is now set up on ubiquitous:3306
-[ece-install] - New ECE instance dev1 installed.
-[ece-install] - Its admin interface is available at http://ubiquitous:8080/escenic-admin
-[ece-install] - You can view all installed plugin &amp; engine versions with:
-[ece-install]   ece -i dev1 versions
-[ece-install] - Cache server is up and running at http://ubiquitous:80/
-[ece-install] - Widget Framework has been installed into your local
-[ece-install]   Maven repository and its ECE components have been installed
-[ece-install] - a new publication mypub has been created
-[ece-install]
-[ece-install] Enjoy your time with Escenic Content Engine!
-[ece-install]
-[ece-install] -Vizrt Online
-
-</pre>
-
-
-
-
 </div>
 </div>
 <div id="postamble">
 <hr/>
 <p class="author">
   Author: Torstein Krause Johansen (<a href="mailto:tkj@vizrt.com">tkj@vizrt.com</a>)
-  Date: 2011-08-26 18:32:09 CST
+  Date: 2011-09-08 15:54:44 CST
 </p></div>
 </div>
 </body>
diff --git a/usr/share/doc/escenic/ece-install-guide.txt b/usr/share/doc/escenic/ece-install-guide.txt
index 83a22be5..5fe2f9cd 100644
--- a/usr/share/doc/escenic/ece-install-guide.txt
+++ b/usr/share/doc/escenic/ece-install-guide.txt
@@ -2,7 +2,7 @@
               ==========================================
 
 Author: Torstein Krause Johansen
-Date: 2011-08-26 18:32:11 CST
+Date: 2011-09-08 15:54:43 CST
 
 
 Table of Contents
@@ -152,9 +152,19 @@ With the configuration file in place, you're now ready to run it:
 
 
 
-If something goes astray with the script, and the log file cannot give
-you enough clues, the ultimate way of debugging this is to run the
-BASH interpreter with the -x flag:
+ece-install will try to "fail fast", exiting as soon as it detects an
+error during its execution:
+
+
+  [ece-install-1] The command [cd /does/not/exist] FAILED, exiting :-(
+  [ece-install-1] See /var/log/ece-install.log for further details.
+
+
+
+
+As a last resort, if something goes astray with the script, and the
+log file cannot give you enough clues, the ultimate way of debugging
+this is to run the BASH interpreter with the -x flag:
 
 
   # bash -x ece-install
@@ -515,58 +525,5 @@ file:
 
 
 The following output is produced from ece-install:
-
-
-  root@ubiquitous:~# bash ece-install 
-  [ece-install] Full Automatic Install (FAI) enabled.
-  [ece-install] All user input will be read from /root/.ece-install.conf
-  [ece-install] I'm logging to /var/log/ece-install.log
-  [ece-install] Setting correct permissions on all ECE related directories ...
-  [ece-install] Stopping conflicting processes ...
-  [ece-install] Installing 3rd party packages needed by ece-install ...
-  [ece-install] Setting up the ece UNIX scripts ...
-  [ece-install] Adding the ece init.d script to the default run levels...
-  [ece-install] Setting up the escenic user's UNIX environment ...
-  [ece-install] Installing an all-in-one environment on ubiquitous ...
-  [ece-install] Installing the database server on ubiquitous ...
-  [ece-install] Installing the Percona database ...
-  [ece-install] Downloading Escenic software from technet.escenic.com ...
-  [ece-install] Setting up the Escenic Content Engine & its plugins ...
-  [ece-install] Setting up the ECE database schema ...
-  [ece-install] Installing 3rd party packages needed by ECE ...
-  [ece-install] Setting up the Assembly Tool ...
-  [ece-install] Setting up the basic Nursery configuration ...
-  [ece-install] Setting up the application server ...
-  [ece-install] Setting up proper log4j & Java logging configuration ...
-  [ece-install] Setting correct permissions on all ECE related directories ...
-  [ece-install] Assembling, deploying & starting dev1 ...
-  [ece-install] Installing a caching server on ubiquitous ...
-  [ece-install] Setting up Varnish to match your environment ...
-  [ece-install] Setting up solr ...
-  [ece-install] Creating a Maven settings file: /root/.m2/settings.xml ...
-  [ece-install] Downloading Widget Framework from technet.escenic.com ...
-  [ece-install] Installing Widget Framework into your local Maven repository ...
-  [ece-install] Getting ready to create a new publiation ...
-  [ece-install] Setting up the mypub publication ...
-  [ece-install] Basing mypub.war on the Widget Framework Demo ...
-  [ece-install] Creating publication mypub using dev1 ...
-  [ece-install] Assembling, deploying & starting dev1 ...
-  [ece-install] The installation is now complete!
-  [ece-install] - It took 0d 0h 29m 40s
-  [ece-install] - DB is now set up on ubiquitous:3306
-  [ece-install] - New ECE instance dev1 installed.
-  [ece-install] - Its admin interface is available at http://ubiquitous:8080/escenic-admin
-  [ece-install] - You can view all installed plugin & engine versions with:
-  [ece-install]   ece -i dev1 versions
-  [ece-install] - Cache server is up and running at http://ubiquitous:80/
-  [ece-install] - Widget Framework has been installed into your local
-  [ece-install]   Maven repository and its ECE components have been installed
-  [ece-install] - a new publication mypub has been created
-  [ece-install]
-  [ece-install] Enjoy your time with Escenic Content Engine!
-  [ece-install]
-  [ece-install] -Vizrt Online
-
-
-
+CANNOT INCLUDE FILE /tmp/ece-install.out
 

From fd0aa2a5e300c65b86ae48b7ed399be5ae1eaef5 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 8 Sep 2011 16:19:05 +0800
Subject: [PATCH 0017/2585] - set_correct_permissions will now create a user
 non interactively if   ece_user doesn't exist on the system.

  the user will be prompted to set the password for the given user at
  the end of the installation process.

  Note that the new user is already usable as he can be used with SSH
  keys or via "su - $ece_user -c <command> , as is the case with
  /etc/init.d/ece.

  This should close https://github.com/skybert/ece-scripts/issues/7,
  thanks goes to mogsie for pointing this one out.
---
 usr/sbin/ece-install | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index a99d8f1e..375bf12f 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -834,7 +834,10 @@ function set_correct_permissions()
 
     if [ $(grep $ece_user /etc/passwd | wc -l) -lt 1 ]; then
         # TODO add support for useradd
-        run adduser $ece_user -p $ece_user
+        run adduser $ece_user \
+            --disabled-password \
+            --gecos "Escenic-user,Room,Work,Home,Other"
+        add_next_step "- Set a password for the new $ece_user (passwd $ece_user)"
     fi
     if [ $(grep $ece_group /etc/group | wc -l) -lt 1 ]; then
         run addgroup $ece_group

From 2ab70f1b8571f3a3ba6dc07ca2d3b67c9fe228bc Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 8 Sep 2011 17:34:06 +0800
Subject: [PATCH 0018/2585] - added set_up_engine_directories to
 install_ece_instance - added /var/lib/escenic/solr/data/index to the
 dir_list, this should   fix https://github.com/skybert/ece-scripts/issues/10
 - changed sed stanzas from using cmd() to instead have a manual call   to
 exit_on_error, passing string arguments inside sub calls got too   difficult
 for me :-)

---
 usr/sbin/ece-install | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 375bf12f..9b9c82ec 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -113,7 +113,7 @@ PROFILE_CREATE_PUBLICATION=9
 
 # Because of issue VF-3559, we also create the default family and host
 # directories.
-dir_list="
+engine_dir_list="
 $common_nursery_dir
 /etc/escenic/engine/family/default
 /etc/escenic/engine/host/localhost
@@ -121,6 +121,7 @@ $common_nursery_dir
 /var/cache/escenic
 /var/crash/escenic
 /var/lib/escenic
+/var/lib/escenic/solr/data/index
 /var/log/escenic
 /var/run/escenic
 /var/spool/escenic/migration
@@ -133,10 +134,6 @@ function make_dir()
     fi
 }
 
-for el in $dir_list; do
-    make_dir $el
-done
-
 function make_ln()
 {
     if [ -e $1 -a ! -h $(basename $1) ]; then
@@ -147,6 +144,13 @@ function make_ln()
     fi
 }
 
+function set_up_engine_directories()
+{
+    for el in $engine_dir_list; do
+        make_dir $el
+    done
+}
+
 # TODO download documentation to
 # /usr/share/doc/escenic/content-engine-<version>/
 
@@ -272,10 +276,15 @@ EOF
     run cd /opt/escenic/assemblytool/
     run ant -q initialize \
         1>>$log 2>>$log
-    run sed -i 's/#\ engine.root\ =\ \./engine.root=\/opt\/escenic\/engine/g' \
-        assemble.properties 
-    run sed -i 's/\#\# plugins\ =\ \/path\/to\/plugins/plugins=\/opt\/escenic\/assemblytool\/plugins/g' \
-        assemble.properties
+    sed -i 's/#\ engine.root\ =\ \./engine.root=\/opt\/escenic\/engine/g' \
+        assemble.properties \
+        1>>$log 2>>$log
+    exit_on_error "sed on assemble.properties"
+
+    sed -i 's/\#\# plugins\ =\ \/path\/to\/plugins/plugins=\/opt\/escenic\/assemblytool\/plugins/g' \
+        assemble.properties \
+        1>>$log 2>>$log
+    exit_on_error "sed on assemble.properties"
 }
 
 function set_up_engine_and_plugins()
@@ -439,6 +448,7 @@ EOF
 
     file=$common_nursery_dir/com/escenic/community/CommunityEngine.properties
     sed -i 's/jdbc\/ecome/jdbc\/ECE_UPDATE_DS/g' $file
+    exit_on_error "sed on $file"
 
     file=$common_nursery_dir/com/escenic/webstart/StudioConfig.properties
     cat >> $file <<EOF
@@ -682,7 +692,7 @@ function set_up_app_server
     run cd $tomcat_base/lib
     make_ln $jdbc_driver
 
-    run sed -i 's/common.loader=/common.loader=\$\{catalina.base\}\/escenic\/lib\/\*\.jar\,/g' \
+    sed -i 's/common.loader=/common.loader=\$\{catalina.base\}\/escenic\/lib\/\*\.jar\,/g' \
         > $tomcat_base/conf/catalina.properties
     
     cat > $tomcat_base/conf/server.xml <<EOF
@@ -1096,7 +1106,8 @@ function set_up_varnish()
     /etc/init.d/varnish stop 1>>$log 2>>$log
 
     file=/etc/default/varnish
-    run sed -i -e 's/6081/80/g' -e 's/^START=no$/START=yes/' $file
+    sed -i -e 's/6081/80/g' -e 's/^START=no$/START=yes/' $file
+    exit_on_error "sed on $file"
 
     cat > /etc/varnish/default.vcl <<EOF
 /* Varnish configuration for Escenic Content Engine              -*- java -*- */
@@ -1456,6 +1467,7 @@ function install_ece_instance()
     download_escenic_components
     check_for_required_downloads
 
+    set_up_engine_directories
     set_up_engine_and_plugins
     set_up_assembly_tool
     set_up_basic_nursery_configuration

From 54ff756f6281595e668697371d3a3168f60844e5 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 8 Sep 2011 17:56:55 +0800
Subject: [PATCH 0019/2585] - fixed sed bug in catalina.properties (improving
 old code often   introduces new bugs, funny that). - (re)added hint on
 editing /etc/default/ece to set the ECE/search/RMI hub   instances you want
 to start. ece-install will now include this in   the next step list:

  [ece-install-38] - Edit /etc/default/ece to configure the instances
  [ece-install-39]   on ubiquitous-0-0-7 you want to start at boot time.
---
 usr/sbin/ece-install | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 9b9c82ec..70b8d64f 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -692,8 +692,11 @@ function set_up_app_server
     run cd $tomcat_base/lib
     make_ln $jdbc_driver
 
+    file=$tomcat_base/conf/catalina.properties
     sed -i 's/common.loader=/common.loader=\$\{catalina.base\}\/escenic\/lib\/\*\.jar\,/g' \
-        > $tomcat_base/conf/catalina.properties
+        $file \
+        1>>$log 2>>$log
+    exit_on_error "sed on $file"
     
     cat > $tomcat_base/conf/server.xml <<EOF
 <?xml version='1.0' encoding='utf-8'?>
@@ -893,8 +896,8 @@ function print_status_and_next_steps()
     minutes=$(( seconds_left / 60 ))
     seconds_left=$(( seconds_left - $minutes * 60 ))
 
-    print "The installation is now complete!"
-    print "- It took" ${days}d ${hours}h ${minutes}m ${seconds_left}s
+    s="- The installation is now complete!"
+    print $s" It took" ${days}d ${hours}h ${minutes}m ${seconds_left}s
     echo "$next_steps"
 
     print ""
@@ -1490,9 +1493,12 @@ EOF
 
     admin_uri=http://$HOSTNAME:${appserver_port}/escenic-admin
     add_next_step "- New ECE instance $instance_name installed."
-    add_next_step "- Its admin interface is available at $admin_uri"
+    add_next_step "- Its admin interface is available at"
+    add_next_step "  $admin_uri"
     add_next_step "- You can view all installed plugin & engine versions with:"
     add_next_step "  ece -i $instance_name versions"
+    add_next_step "- Edit /etc/default/ece to configure the instances "
+    add_next_step "  on $HOSTNAME you want to start at boot time."
 }
 
 function install_presentation_server()

From 12bcb6cae7a30c235a84194e4480a17406ea8a8b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 9 Sep 2011 14:30:52 +0800
Subject: [PATCH 0020/2585] - added update_type_instances_to_start_up, based on
 idea & code by   mogsie: 70d00024f5091a76468f33dd9aa79630fa5b11ad. I've added
 support   for the search instance list too (and analysis & rmi hub should  
 follow at some point). - improved set_conf_file_value, it now updates current
 values in   place, instead of removing the old value and appending the new to
   the end of the file. "sed -i" rocks!

---
 usr/sbin/ece-install | 53 ++++++++++++++++++++++++++++++++++++++------
 1 file changed, 46 insertions(+), 7 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 70b8d64f..efe3e0ff 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -532,15 +532,12 @@ EOF
 function set_conf_file_value()
 {
     if [ -r $3 ]; then
-        if [ $(grep $1 $3 | wc -l) -gt 0 ]; then
-            # TODO update existing values of the property instead of
-            # removing & appending it.
-            cat $3 | grep -v ^$1 > $3.tmp
-            mv $3.tmp $3
+        if [ $(grep ^$1 $3 | wc -l) -gt 0 ]; then
+            sed -i "s/$1=.*/$1=$2/g" $3
+        else
+            echo "$1=$2" >> $3
         fi
     fi
-    
-    echo "$1=$2" >> $3
 }
 
 # The function accepts the following parameters:
@@ -1460,6 +1457,46 @@ function ask_for_instance_name()
     make_dir /etc/escenic/engine/instance/${instance_name}
 }
 
+# Will update /etc/default/instance with the type instances which are
+# installed on the given host. This method should work for engine,
+# search and analysis instances.
+function update_type_instances_to_start_up()
+{
+    if [ $type = "engine" ]; then
+        for el in $(/etc/escenic/ece-*.conf); do
+            if [ $(echo el | grep analysis | wc -l) -gt 0 ]; then
+                continue
+            elif [ $(echo el | grep search | wc -l) -gt 0 ]; then
+                continue
+            fi
+
+            current_instance=$(basename ${el} | \
+                sed -e 's/ece-//g' -e 's/engine-//g' | \
+                cut -d'.' -f1)
+            all_instances="$all_instances $current_instance"
+
+            set_conf_file_value engine_instance_list \
+                "$all_instances" \
+                /etc/default/ece
+        done
+    elif [ $type = "search" ]; then
+        for el in $(/etc/escenic/ece-*.conf); do
+            if [ $(echo el | grep search | wc -l) -lt 1 ]; then
+                continue
+            fi
+
+            current_instance=$(basename ${el} | \
+                sed -e 's/ece-//g' -e 's/search-//g' | \
+                cut -d'.' -f1)
+            all_instances="$all_instances $current_instance"
+
+            set_conf_file_value search_instance_list \
+                "$all_instances" \
+                /etc/default/ece
+        done
+    fi
+}
+
 # $1=<default instance name>
 # $2=<editorial server=0 | presentation server=1>
 function install_ece_instance()
@@ -1490,6 +1527,8 @@ EOF
     
     set_correct_permissions
     assemble_deploy_and_restart_type
+    update_type_instances_to_start_up
+    
 
     admin_uri=http://$HOSTNAME:${appserver_port}/escenic-admin
     add_next_step "- New ECE instance $instance_name installed."

From 85cc17324bcfaf9584998f77761216222f95b35c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 9 Sep 2011 19:04:26 +0800
Subject: [PATCH 0021/2585] - fixed problem with multi value fields in
 set_conf_file_value - added switching on Varnish versions, this should make
 the   configuration work for both the latest 2 and 3 versions, as well as  
 making such switching easier later on. - fixed a bug in exit_on_error as some
 programs (notably tar) return 2   and not 1 when they fail. This provides
 more fail fast behaviour. - update default tomcat bundle to the latest stable
 6.x version - fixed bug in set_up_engine_directories - fixed some weeeiiird
 bug with the script $id always returning 'l'   until the fifth function. -
 fixed a weird bug with wget which all of a sudden started to use   IPv6 on my
 Ubuntu test system. - fixed bugs introduced with the hardening of all
 commands (sigh!) - fixed bug in update_type_instances_to_start_up (although
 it still   seemed to work). - added some more hardening to
 install_presentation_server - removed TODO, doesn't apply anymore.

---
 usr/sbin/ece-install | 81 +++++++++++++++++++++++++-------------------
 1 file changed, 46 insertions(+), 35 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index efe3e0ff..8da8b7d8 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -19,7 +19,7 @@ ece_user=escenic
 ece_group=escenic
 jdbc_driver=/usr/share/java/mysql.jar
 debug=0
-tomcat_download=http://ftp.nsysu.edu.tw/Apache/tomcat/tomcat-6/v6.0.32/bin/apache-tomcat-6.0.32.tar.gz
+tomcat_download=http://apache.stu.edu.tw/tomcat/tomcat-6/v6.0.33/bin/apache-tomcat-6.0.33.tar.gz
 
 # don't touch this one if you're installing on a Debian based system
 # as it'll be set up for you by the script itself.
@@ -50,10 +50,18 @@ NEW_LINE="
 next_steps=""
 
 
+function get_seconds_since_start()
+{
+    now=`date +%s`
+    started=`stat -c %Y $pid_file`
+    seconds=$(( now - started ))
+    echo "$seconds"
+}
+
 function get_id()
 {
-    id="[$(basename $0)-$(get_seconds_since_start)]"
-    echo $id
+    timestamp=$(get_seconds_since_start)
+    echo "[$(basename $0)-${timestamp}]"
 }
 
 function debug()
@@ -70,7 +78,7 @@ function print()
 
 function exit_on_error()
 {
-    if [ $? -eq 1 ]; then
+    if [ $? -gt 0 ]; then
         print "The command ["$@"] FAILED, exiting :-("
         print "See $log for further details."
         exit 1
@@ -169,10 +177,10 @@ function download_escenic_components()
         fi
         
         run wget --continue \
+            --inet4-only \
             --http-user $technet_user \
             --http-password $technet_password \
-            $el \
-            1>>$log 2>>$log
+            $el 
     done
 
 }
@@ -436,12 +444,12 @@ function set_up_basic_nursery_configuration()
         run cp -r $el/misc/siteconfig/* $common_nursery_dir/
     done
 
-    run cat > $common_nursery_dir/ServerConfig.properties <<EOF
+    cat > $common_nursery_dir/ServerConfig.properties <<EOF
 databaseProductName=MySQL
 filePublicationRoot=/var/lib/escenic/engine/
 webPublicationRoot=http://$HOSTNAME:${appserver_port}/
 EOF
-    run cat > $common_nursery_dir/neo/io/managers/ContentManager.properties <<EOF
+    cat > $common_nursery_dir/neo/io/managers/ContentManager.properties <<EOF
 readConnector=/connector/ReadConnector
 updateConnector=/connector/UpdateConnector
 EOF
@@ -533,10 +541,12 @@ function set_conf_file_value()
 {
     if [ -r $3 ]; then
         if [ $(grep ^$1 $3 | wc -l) -gt 0 ]; then
-            sed -i "s/$1=.*/$1=$2/g" $3
+            sed -i "s/$1=.*/$1=\"$2\"/g" $3
         else
-            echo "$1=$2" >> $3
+            echo "$1=\"$2\"" >> $3
         fi
+    else
+        echo "$1=\"$2\"" >> $3
     fi
 }
 
@@ -668,13 +678,12 @@ function set_up_app_server
     fi
     
     run cd $download_dir
-    run wget --continue $tomcat_download \
-        1>>$log 2>>$log
+    run wget --continue --inet4-only $tomcat_download
     
     run cd /opt/
     run tar xzf $download_dir/apache-tomcat*.tar.gz
     run ln -sf apache-tomcat* tomcat
-    
+
     tomcat_base=/opt/tomcat-${instance_name}
     make_dir $tomcat_base
 
@@ -853,7 +862,7 @@ function set_correct_permissions()
         run addgroup $ece_group
     fi
 
-    for el in $dir_list; do
+    for el in $engine_dir_list; do
         if [ -d $el ]; then
             run chown -R ${ece_user}:${ece_group} $el \
                 1>>$log 2>>$log                
@@ -871,14 +880,6 @@ function set_correct_permissions()
     fi
 }
 
-function get_seconds_since_start()
-{
-    now=`date +%s`
-    started=`stat -c %Y $pid_file`
-    seconds=$(( now - started ))
-    echo "$seconds"
-}
-
 function print_status_and_next_steps()
 {
     # su - $ece_user -c "ece versions" 1>>$log 2>>$log
@@ -1088,9 +1089,6 @@ function un_install_ece()
         sun-java6-jdk
     
     apt-get clean
-    
-     # prepare for new install
-    mv /tmp/*.zip /tmp/ece-downloads/
 }
 
 function stop_conflicting_processes()
@@ -1105,6 +1103,10 @@ function set_up_varnish()
     print "Setting up Varnish to match your environment ..."
     /etc/init.d/varnish stop 1>>$log 2>>$log
 
+    # we need to swap standard err and standard out here as varnishd
+    # -V for some reason writes to standard error.
+    using_varnish_3=$(varnishd -V 3>&1 1>&2 2>&3 | grep varnish-3 | wc -l)
+    
     file=/etc/default/varnish
     sed -i -e 's/6081/80/g' -e 's/^START=no$/START=yes/' $file
     exit_on_error "sed on $file"
@@ -1134,9 +1136,8 @@ acl adactus {
 }
 
 EOF
-
     for el in $backend_servers; do
-        appserver_id=$(echo $el | cut -d':' -f1 | sed 's/-/_/g' )
+        appserver_id=$(echo $el | cut -d':' -f1 | sed 's/-/_/g')
         appserver_host=$(echo $el | cut -d':' -f1)
         appserver_port=$(echo $el | cut -d':' -f2)
 
@@ -1206,7 +1207,18 @@ sub vcl_deliver {
    * URL has been fetched from cache or not.
    */
   if (obj.hits > 0) {
+EOF
+    if [ $using_varnish_3 -gt 0 ]; then
+        cat >> /etc/varnish/default.vcl <<EOF
     set resp.http.X-Cache = "HIT #" + obj.hits;
+EOF
+    else
+        cat >> /etc/varnish/default.vcl <<EOF
+    set resp.http.X-Cache = "HIT #" obj.hits;
+EOF
+    fi
+    
+    cat >> /etc/varnish/default.vcl <<EOF
   }
   else {
     set resp.http.X-Cache = "MISS";
@@ -1302,7 +1314,6 @@ function common_pre_install()
     fi
 
     make_dir $download_dir
-    set_correct_permissions
     stop_conflicting_processes
     install_common_os_packages
     set_up_ece_scripts
@@ -1463,7 +1474,7 @@ function ask_for_instance_name()
 function update_type_instances_to_start_up()
 {
     if [ $type = "engine" ]; then
-        for el in $(/etc/escenic/ece-*.conf); do
+        for el in /etc/escenic/ece-*.conf; do
             if [ $(echo el | grep analysis | wc -l) -gt 0 ]; then
                 continue
             elif [ $(echo el | grep search | wc -l) -gt 0 ]; then
@@ -1480,7 +1491,7 @@ function update_type_instances_to_start_up()
                 /etc/default/ece
         done
     elif [ $type = "search" ]; then
-        for el in $(/etc/escenic/ece-*.conf); do
+        for el in /etc/escenic/ece-*.conf; do
             if [ $(echo el | grep search | wc -l) -lt 1 ]; then
                 continue
             fi
@@ -1524,11 +1535,10 @@ function install_ece_instance()
 deploy_webapp_white_list="escenic-admin ${publication_name}"
 EOF
     fi
-    
+
     set_correct_permissions
     assemble_deploy_and_restart_type
     update_type_instances_to_start_up
-    
 
     admin_uri=http://$HOSTNAME:${appserver_port}/escenic-admin
     add_next_step "- New ECE instance $instance_name installed."
@@ -1536,8 +1546,8 @@ EOF
     add_next_step "  $admin_uri"
     add_next_step "- You can view all installed plugin & engine versions with:"
     add_next_step "  ece -i $instance_name versions"
-    add_next_step "- Edit /etc/default/ece to configure the instances "
-    add_next_step "  on $HOSTNAME you want to start at boot time."
+    add_next_step "- Verify that /etc/default/ece lists all the instances "
+    add_next_step "  on $HOSTNAME you wish to start at boot time."
 }
 
 function install_presentation_server()
@@ -1562,6 +1572,7 @@ function assemble_deploy_and_restart_type()
     # removal of existing publications.
     ece_command="ece -i $instance_name -t $type assemble deploy restart"
     su - $ece_user -c "$ece_command" 1>>$log 2>>$log
+    exit_on_error "su - $ece_user -c \"$ece_command\""
 }
 
 function ensure_that_instance_is_running()
@@ -1701,7 +1712,6 @@ function install_widget_framework()
     fi
 
     print "Creating a Maven settings file: $HOME/.m2/settings.xml ..."
-    # TODO consider /<home|Users>/${ece_user} instead
     make_dir $HOME/.m2
     cat > $HOME/.m2/settings.xml <<EOF
 <?xml version="1.0" encoding="UTF-8"?>
@@ -1741,6 +1751,7 @@ EOF
     for el in $wf_download_list; do
         cd $download_dir
         wget --continue \
+            --inet4-only \
             --http-user $technet_user \
             --http-password $technet_password \
             $el \

From 820a0744bb9677ccecb3035e69e4839814be3114 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 12 Sep 2011 11:49:01 +0800
Subject: [PATCH 0022/2585] - set_up_user_enviornment would print to error
 messages if the   ece_user or root didn't have an .bashrc.

  This should fix https://github.com/skybert/ece-scripts/issues/14

- removed TODO which has been done (java_home can be read from the
  configuration file).
---
 usr/sbin/ece-install | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 8da8b7d8..d18b2eb5 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -1024,21 +1024,19 @@ function set_up_user_enviornment()
 {
     print "Setting up the ${ece_user} user's UNIX environment ..."
 
-     # TODO get this from ece.conf and other magic
-
-    if [ $(grep JAVA_HOME /home/$ece_user/.bashrc | wc -l) -lt 1 ]; then
+    if [ $(grep JAVA_HOME /home/$ece_user/.bashrc 2>/dev/null | wc -l) \
+        -lt 1 ]; then
         run echo JAVA_HOME=$java_home >> /home/$ece_user/.bashrc
     fi
-    if [ $(grep JAVA_HOME /root/.bashrc | wc -l) -lt 1 ]; then
+    
+    if [ $(grep JAVA_HOME /root/.bashrc 2>/dev/null | wc -l) -lt 1 ]; then
         run echo JAVA_HOME=$java_home >> /root/.bashrc
     fi
 
-    if [ $on_debian_or_derivative -eq 1 ]; then
-        export JAVA_HOME=$java_home
-    fi
+    export JAVA_HOME=$java_home
 
-    if [ $(grep bash_completion.d/ece /home/$ece_user/.bashrc | wc -l) -lt 1 ]
-    then
+    if [ $(grep bash_completion.d/ece /home/$ece_user/.bashrc 2>/dev/null | \
+        wc -l) -lt 1 ]; then
         run echo ". /etc/bash_completion.d/ece" \
             >> /home/$ece_user/.bashrc
     fi

From 8bf004389c430e406249503f895e54b3b989cf9a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 12 Sep 2011 12:39:20 +0800
Subject: [PATCH 0023/2585] - the skip-tests for assemblytool and engine in  
 set_up_engine_and_plugins wasn't working and hence extracted   assemblytool
 in /opt/escenic as well as re-extracting engine. The   skip-tests have been
 re-written.

  This should fix https://github.com/skybert/ece-scripts/issues/16

- added comment inside set_up_engine_and_plugins to  clarify that
  we're only extracting plugins in the for loop.
---
 usr/sbin/ece-install | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index d18b2eb5..6ec43229 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -317,15 +317,15 @@ function set_up_engine_and_plugins()
     else
         debug "engine-<version> is already there, skipping to next step."
     fi
-    
-    # we extract them in /opt/escenic as we want to re-use
-    # them between minor updates of ECE.
+
+    # we now extract all the plugins. We extract them in /opt/escenic
+    # as we want to re-use them between minor updates of ECE.
     cd /opt/escenic/
     for el in $download_dir/*.zip; do
-        if [ "${el/engine*}" == "" ] ; then
-          continue
-        elif [ "${el/assemblytool*}" == "" ] ; then
-          continue
+        if [ $(basename $el | grep ^engine-.*.zip | wc -l) -gt 0 ]; then
+            continue
+        elif [ $(basename $el | grep ^assemblytool-.*.zip | wc -l) -gt 0 ]; then
+            continue
         fi
         
         run unzip -u $el \

From dca92e0365808789b466bc8878c2887b6c73386e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 12 Sep 2011 13:34:56 +0800
Subject: [PATCH 0024/2585] - all ece-install profiles now get

[ece-install-116] - The installation is now complete! It took 0d 0h 1m 56s
[ece-install-116] - See /usr/share/doc/escenic/ece-install-guide.txt for
[ece-install-116]   a full overview of files and directories set up by
[ece-install-116]   ece-install
[ece-install-116] - For further reading, in-depth guides on installing,
[ece-install-116]   configuring and developing Escenic web sites can be
[ece-install-116]   fount at http://documentation.vizrt.com/ece-5.3.html

- ECE instance profiles additionally get:

[ece-install-114] - New ECE instance editor1 installed.
[ece-install-114] - Its admin interface is available at
[ece-install-115]   http://ubiquitous-7:8180/escenic-admin
[ece-install-115] - You can view all installed plugin & engine versions with:
[ece-install-115]   ece -i editor1 versions
[ece-install-115] - type 'ece help' to see all the options of this script
[ece-install-115]   which allows you to control all the Escenic components.
[ece-install-115]   Also, see /usr/share/doc/escenic/ece-guide.txt for
[ece-install-116]   further information on the ece script.
[ece-install-115] - Verify that /etc/default/ece lists all the instances
[ece-install-115]   on ubiquitous-7 you wish to start at boot time.
---
 usr/sbin/ece-install | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 6ec43229..c74ae23f 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -882,8 +882,6 @@ function set_correct_permissions()
 
 function print_status_and_next_steps()
 {
-    # su - $ece_user -c "ece versions" 1>>$log 2>>$log
-
     now=`date +%s`
     started=`stat -c %Y $pid_file`
     seconds=$(( now - started ))
@@ -896,6 +894,18 @@ function print_status_and_next_steps()
 
     s="- The installation is now complete!"
     print $s" It took" ${days}d ${hours}h ${minutes}m ${seconds_left}s
+    add_next_step "- See /usr/share/doc/escenic/ece-install-guide.txt for"
+    add_next_step "  a full overview of files and directories set up by"
+    add_next_step "  $(basename $0)"
+    add_next_step "- type 'ece help' to see all the options of this script"
+    add_next_step "  which allows you to control all the Escenic components."
+    add_next_step "  Also, see /usr/share/doc/escenic/ece-guide.txt for"
+    add_next_step "  further information on the ece script."
+    add_next_step "- For further reading, in-depth guides on installing, "
+    add_next_step "  configuring and developing Escenic web sites can be "
+    add_next_step "  fount at http://documentation.vizrt.com/ece-5.3.html"
+
+
     echo "$next_steps"
 
     print ""
@@ -1544,6 +1554,10 @@ EOF
     add_next_step "  $admin_uri"
     add_next_step "- You can view all installed plugin & engine versions with:"
     add_next_step "  ece -i $instance_name versions"
+    add_next_step "- type 'ece help' to see all the options of this script"
+    add_next_step "  which allows you to control all the Escenic components."
+    add_next_step "  Also, see /usr/share/doc/escenic/ece-guide.txt for"
+    add_next_step "  addtional information on the ece script."
     add_next_step "- Verify that /etc/default/ece lists all the instances "
     add_next_step "  on $HOSTNAME you wish to start at boot time."
 }
@@ -1813,6 +1827,7 @@ EOF
 
     set_up_solr
     assemble_deploy_and_restart_type
+    
 }
 
 # useful for development and test environments.

From 468d4c0aa2aa07465c9f9e8245618972c391c4ee Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 12 Sep 2011 16:58:26 +0800
Subject: [PATCH 0025/2585] - fixed bug in set_conf_file_value which would fail
 to update values   with slashes '/':

  sed: -e expression #1, char 32: unknown option to `s'

  The fix was to use a different delimiter for the sed fields. I chose
  tilde, '~' as this is the most unlikely character I could think of
  during my massive two minute brain search.
---
 usr/sbin/ece-install | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index c74ae23f..34763e26 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -444,10 +444,26 @@ function set_up_basic_nursery_configuration()
         run cp -r $el/misc/siteconfig/* $common_nursery_dir/
     done
 
+    public_host_name=$HOSTNAME:${appserver_port}
+    if [ $fai_enabled -eq 1 ]; then
+        if [ -n "$fai_public_host_name" ]; then
+            public_host_name=$fai_public_host_name
+        fi
+    else
+        print "What is the public address of your website?"
+        print "Press ENTER to use the default ($public_host_name)"
+        echo -n "Your choice [$public_host_name]> "
+        read user_host_name
+    fi
+
+    if [ -n "$user_host_name" ]; then
+        public_host_name=$user_host_name
+    fi
+    
     cat > $common_nursery_dir/ServerConfig.properties <<EOF
 databaseProductName=MySQL
 filePublicationRoot=/var/lib/escenic/engine/
-webPublicationRoot=http://$HOSTNAME:${appserver_port}/
+webPublicationRoot=http://${public_host_name}/
 EOF
     cat > $common_nursery_dir/neo/io/managers/ContentManager.properties <<EOF
 readConnector=/connector/ReadConnector
@@ -541,7 +557,7 @@ function set_conf_file_value()
 {
     if [ -r $3 ]; then
         if [ $(grep ^$1 $3 | wc -l) -gt 0 ]; then
-            sed -i "s/$1=.*/$1=\"$2\"/g" $3
+            sed -i "s~$1=.*~$1=\"$2\"~g" $3
         else
             echo "$1=\"$2\"" >> $3
         fi
@@ -604,12 +620,12 @@ function set_up_app_server
 
     if [ $fai_enabled -eq 0 ]; then
         print "On which ports do you wish to run the app server on?"
-        print "Press ENTER to accept the default (port 8080, shutdown port 8005)"
+        print "Press ENTER to accept port 8080 and shutdown port 8005"
         print "Or enter: <port> <shutdown port>, e.g.: '8180 8105'"
         echo -n "Your choice [8080 8005]> "
         read user_ports
         
-        if [ -z "$user_ports" ]; then
+        if [ -n "$user_ports" ]; then
             appserver_port=$(echo $user_ports | cut -d' ' -f1)
             shutdown_port=$(echo $user_ports | cut -d' ' -f2)
         fi

From 48acf0da4da42e2d8c1ee1a1da1fc02d1054215f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 12 Sep 2011 17:31:43 +0800
Subject: [PATCH 0026/2585] - added note on the new fai_public_host_name
 option.

---
 usr/share/doc/escenic/ece-install-guide.org | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index e764d43d..f72ec349 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -264,6 +264,7 @@ $HOME/.ece-install.conf file of the root user:
 | fai\_editor\_port              |             8080 | HTTP port of the editor instance              |
 | fai\_editor\_shutdown          |             8005 | Shutdown port of the editor instance          |
 | fai\_enabled                   |                0 | Whether or not to run ece-install in FAI mode |
+| fai\_public\_host\_name        | ${HOSTNAME}:8080 | The public address for your website           |
 | fai\_presentation\_install     |                0 | Install the presentation server profile       |
 | fai\_presentation\_name        |             web1 | Name of the presentation server instance      |
 | fai\_presentation\_port        |             8080 | HTTP port of the presentation server instance |

From 77faae287d6bcf12912cb2e62b6bac36820eec00 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 12 Sep 2011 17:33:12 +0800
Subject: [PATCH 0027/2585] - updated txt and html guides

---
 usr/share/doc/escenic/ece-install-guide.html | 15 ++++++++++++---
 usr/share/doc/escenic/ece-install-guide.txt  | 10 ++++++++--
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.html b/usr/share/doc/escenic/ece-install-guide.html
index f50bec49..aa572bec 100644
--- a/usr/share/doc/escenic/ece-install-guide.html
+++ b/usr/share/doc/escenic/ece-install-guide.html
@@ -7,7 +7,7 @@
 <title>Welcome to the /usr/sbin/ece-install Guide</title>
 <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
 <meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2011-09-08 15:54:44 CST"/>
+<meta name="generated" content="2011-09-12 17:32:07 CST"/>
 <meta name="author" content="Torstein Krause Johansen"/>
 <meta name="description" content=""/>
 <meta name="keywords" content=""/>
@@ -814,6 +814,7 @@ <h2 id="sec-6"><span class="section-number-2">6</span> Full Automatic Install (F
 <tr><td class="left">fai_editor_port</td><td class="right">8080</td><td class="left">HTTP port of the editor instance</td></tr>
 <tr><td class="left">fai_editor_shutdown</td><td class="right">8005</td><td class="left">Shutdown port of the editor instance</td></tr>
 <tr><td class="left">fai_enabled</td><td class="right">0</td><td class="left">Whether or not to run ece-install in FAI mode</td></tr>
+<tr><td class="left">fai_public_host_name</td><td class="right">${HOSTNAME}:8080</td><td class="left">The public address for your website</td></tr>
 <tr><td class="left">fai_presentation_install</td><td class="right">0</td><td class="left">Install the presentation server profile</td></tr>
 <tr><td class="left">fai_presentation_name</td><td class="right">web1</td><td class="left">Name of the presentation server instance</td></tr>
 <tr><td class="left">fai_presentation_port</td><td class="right">8080</td><td class="left">HTTP port of the presentation server instance</td></tr>
@@ -1048,15 +1049,23 @@ <h2 id="sec-12"><span class="section-number-2">12</span> Example Output FAI </h2
 
 <p>
 The following output is produced from ece-install:
-CANNOT INCLUDE FILE /tmp/ece-install.out
 </p>
+
+
+<pre class="example">hei
+
+</pre>
+
+
+
+
 </div>
 </div>
 <div id="postamble">
 <hr/>
 <p class="author">
   Author: Torstein Krause Johansen (<a href="mailto:tkj@vizrt.com">tkj@vizrt.com</a>)
-  Date: 2011-09-08 15:54:44 CST
+  Date: 2011-09-12 17:32:07 CST
 </p></div>
 </div>
 </body>
diff --git a/usr/share/doc/escenic/ece-install-guide.txt b/usr/share/doc/escenic/ece-install-guide.txt
index 5fe2f9cd..a198d473 100644
--- a/usr/share/doc/escenic/ece-install-guide.txt
+++ b/usr/share/doc/escenic/ece-install-guide.txt
@@ -2,7 +2,7 @@
               ==========================================
 
 Author: Torstein Krause Johansen
-Date: 2011-09-08 15:54:43 CST
+Date: 2011-09-12 17:32:03 CST
 
 
 Table of Contents
@@ -370,6 +370,7 @@ $HOME/.ece-install.conf file of the root user:
   fai\_editor\_port                            8080   HTTP port of the editor instance               
   fai\_editor\_shutdown                        8005   Shutdown port of the editor instance           
   fai\_enabled                                    0   Whether or not to run ece-install in FAI mode  
+  fai\_public\_host\_name          ${HOSTNAME}:8080   The public address for your website            
   fai\_presentation\_install                      0   Install the presentation server profile        
   fai\_presentation\_name                      web1   Name of the presentation server instance       
   fai\_presentation\_port                      8080   HTTP port of the presentation server instance  
@@ -525,5 +526,10 @@ file:
 
 
 The following output is produced from ece-install:
-CANNOT INCLUDE FILE /tmp/ece-install.out
+
+
+  hei
+
+
+
 

From e4a162e77ab560c1df8ab39439cdf41677ddf9d7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 12 Sep 2011 17:34:03 +0800
Subject: [PATCH 0028/2585] - renamed exit_on_(the_first)_error and my_id so
 that sourcing and   running the script doesn't lead to name conflict with
 ece-install.

---
 usr/sbin/drop-and-create-ecedb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/usr/sbin/drop-and-create-ecedb b/usr/sbin/drop-and-create-ecedb
index f10a5d14..9eb9c574 100644
--- a/usr/sbin/drop-and-create-ecedb
+++ b/usr/sbin/drop-and-create-ecedb
@@ -20,7 +20,7 @@ db_schema=ece5db
 db_host=localhost
 ece_home=/opt/escenic/engine
 db_product=mysql
-id="[`basename $0`]"
+my_id="[`basename $0`]"
 
 # oracle specific settings
 create_oracle_user=0
@@ -33,15 +33,15 @@ debug=0
 function debug()
 {
     if [ $debug -eq 1 ]; then
-        echo $id $1
+        echo $my_id $1
     fi
     
 }
 
-function exit_on_error()
+function exit_on_the_first_error()
 {
     if [ $? -eq 1 ]; then
-        echo $id $@ "FAILED, exiting :-("
+        echo $my_id $@ "FAILED, exiting :-("
         exit 1
     fi
 }
@@ -72,7 +72,7 @@ function run_db_scripts()
                 mysql -u $db_user -p$db_password -h $db_host $db_schema < $file
             fi
         fi
-        exit_on_error "running $el"
+        exit_on_the_first_error "running $el"
     done
 }
 

From 48bd4da2189dc463e3a0c3f2c6755c6daebd13b6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 12 Sep 2011 17:55:27 +0800
Subject: [PATCH 0029/2585] - added checking of the user not being root to
 sanity_check. ece will   now complain if you try to run it as root:

[ece#engine] Sorry, you cannot be root when running ece
[ece#engine] The root user can only use /etc/init.d/ece
---
 usr/bin/ece | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/usr/bin/ece b/usr/bin/ece
index 4fade9de..09f6a536 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -380,6 +380,12 @@ function set_instance_settings()
 
 function sanity_check()
 {
+    if [ $(whoami) = "root" ]; then
+        print "Sorry, you cannot be root when running $(basename $0)"
+        print "The root user can only use /etc/init.d/ece"
+        exit 1
+    fi
+    
     verify_that_directory_and_file_are_writeable $log_file
     verify_that_directory_and_file_are_writeable $pid_file
 

From 241557f42055340e6ded312c93f4653f04fc7005 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 12 Sep 2011 18:15:13 +0800
Subject: [PATCH 0030/2585] - added installation section with overview of the
 different files used   by ece - added note on running this script as a
 non-root user

---
 usr/share/doc/escenic/ece-guide.org | 56 +++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/usr/share/doc/escenic/ece-guide.org b/usr/share/doc/escenic/ece-guide.org
index f4f8e808..0b50e445 100644
--- a/usr/share/doc/escenic/ece-guide.org
+++ b/usr/share/doc/escenic/ece-guide.org
@@ -81,3 +81,59 @@ The following commands are available:
 
 *) only applicable if type is 'engine'
 #+END_SRC
+
+* Installation
+The ece script and ece.conf may be used on any Unix like system that
+has a fairly recent version of BASH installed.
+
+** Overview of File Paths Used by the ece script
+These are recommended files and locations for using the ece script:
+
+|----------------------------------+-----------------------------|
+| Path                             | Explanation                 |
+|----------------------------------+-----------------------------|
+| /usr/bin/ece                     | The script itself           |
+| /etc/escenic/ece.conf            | The main configuration file |
+| /etc/escenic/ece-<instance>.conf | Instance specific settings  |
+|----------------------------------+-----------------------------|
+
+As you can see in ece.conf, there are a number of default locations
+dealing with log files, pid files, crash files as well as application
+server files. The defaults all follow the File Hierarchy Standard, but
+you may of course change these to your liking.
+
+If you wish to put the .conf files in other places, you may like to know
+that the ece script has preset list of locations where it looks for
+the .conf files mentioned above, namely:
+
+- current working directory
+- /etc/escenic/<type>/instance/<instance name>
+- /etc/escenic/<type>/host/<hostname>
+- /etc/escenic/<type>/common
+- /etc/escenic/<type>
+- /etc/escenic
+- <current working direcotry>/../etc
+
+You may override this list of locations by setting the
+this environment variable in your .bashrc or similar:
+#+BEGIN_SRC sh
+ECE_CONF_LOCATIONS 
+#+END_SRC
+
+The reason for having so many options is because various Escenic
+consultants, partners and customers have requested these locations to
+fit their systems. As you can see, fitting everyone's fancy adds up
+over time :-)
+
+* Running the ece script
+You must be normal user to run the ece script, otherwise it will
+complain:
+#+BEGIN_SRC sh
+[ece#engine] Sorry, you cannot be root when running ece
+[ece#engine] The root user can only use /etc/init.d/ece
+#+END_SRC
+
+As it mentions, the root user may use the init.d script and the
+accompanying /etc/default/ece to command the different ECE, EAE and
+RMI hub instances on your system.
+

From 4fe3054d9e16f58b404dfd1486514224f8e1dc6a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 12 Sep 2011 18:15:35 +0800
Subject: [PATCH 0031/2585] - update html and text

---
 usr/share/doc/escenic/ece-guide.html | 127 +++++++++++++++++++++++++--
 usr/share/doc/escenic/ece-guide.txt  | 124 ++++++++++++++++++++++++--
 2 files changed, 236 insertions(+), 15 deletions(-)

diff --git a/usr/share/doc/escenic/ece-guide.html b/usr/share/doc/escenic/ece-guide.html
index c9a95efc..c0903d8c 100644
--- a/usr/share/doc/escenic/ece-guide.html
+++ b/usr/share/doc/escenic/ece-guide.html
@@ -7,7 +7,7 @@
 <title>Guide for the /usr/bin/ece Script</title>
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
 <meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2011-08-25 12:08:05 CST"/>
+<meta name="generated" content="2011-09-12 18:14:44 CST"/>
 <meta name="author" content="Torstein Krause Johansen"/>
 <meta name="description" content=""/>
 <meta name="keywords" content=""/>
@@ -221,6 +221,12 @@ <h2>Table of Contents</h2>
 </ul>
 </li>
 <li><a href="#sec-2">2 Getting an overview of all available options </a></li>
+<li><a href="#sec-3">3 Installation </a>
+<ul>
+<li><a href="#sec-3-1">3.1 Overview of File Paths Used by the ece script </a></li>
+</ul>
+</li>
+<li><a href="#sec-4">4 Running the ece script </a></li>
 </ul>
 </div>
 </div>
@@ -363,14 +369,123 @@ <h2 id="sec-2"><span class="section-number-2">2</span> Getting an overview of al
 
 
 
+
 </div>
+
 </div>
-<div id="postamble">
-<p class="date">Date: 2011-08-25 12:08:05 CST</p>
-<p class="author">Author: Torstein Krause Johansen</p>
-<p class="creator">Org version 7.6 with Emacs version 23</p>
-<a href="http://validator.w3.org/check?uri=referer">Validate XHTML 1.0</a>
+
+<div id="outline-container-3" class="outline-2">
+<h2 id="sec-3"><span class="section-number-2">3</span> Installation </h2>
+<div class="outline-text-2" id="text-3">
+
+<p>The ece script and ece.conf may be used on any Unix like system that
+has a fairly recent version of BASH installed.
+</p>
+
 </div>
+
+<div id="outline-container-3-1" class="outline-3">
+<h3 id="sec-3-1"><span class="section-number-3">3.1</span> Overview of File Paths Used by the ece script </h3>
+<div class="outline-text-3" id="text-3-1">
+
+<p>These are recommended files and locations for using the ece script:
+</p>
+<table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
+<caption></caption>
+<colgroup><col class="left" /><col class="left" />
+</colgroup>
+<thead>
+<tr><th scope="col" class="left">Path</th><th scope="col" class="left">Explanation</th></tr>
+</thead>
+<tbody>
+<tr><td class="left">/usr/bin/ece</td><td class="left">The script itself</td></tr>
+<tr><td class="left">/etc/escenic/ece.conf</td><td class="left">The main configuration file</td></tr>
+<tr><td class="left">/etc/escenic/ece-&lt;instance&gt;.conf</td><td class="left">Instance specific settings</td></tr>
+</tbody>
+</table>
+
+
+<p>
+As you can see in ece.conf, there are a number of default locations
+dealing with log files, pid files, crash files as well as application
+server files. The defaults all follow the File Hierarchy Standard, but
+you may of course change these to your liking.
+</p>
+<p>
+If you wish to put the .conf files in other places, you may like to know
+that the ece script has preset list of locations where it looks for
+the .conf files mentioned above, namely:
+</p>
+<ul>
+<li>current working directory
+</li>
+<li>/etc/escenic/&lt;type&gt;/instance/&lt;instance name&gt;
+</li>
+<li>/etc/escenic/&lt;type&gt;/host/&lt;hostname&gt;
+</li>
+<li>/etc/escenic/&lt;type&gt;/common
+</li>
+<li>/etc/escenic/&lt;type&gt;
+</li>
+<li><i>etc/escenic - &lt;current working direcotry&gt;</i>../etc
+</li>
+</ul>
+
+
+<p>
+You may override this list of locations by setting the
+this environment variable in your .bashrc or similar:
+</p>
+
+
+<pre class="example">ECE_CONF_LOCATIONS 
+
+</pre>
+
+
+
+
+<p>
+The reason for having so many options is because various Escenic
+consultants, partners and customers have requested these locations to
+fit their systems. As you can see, fitting everyone's fancy adds up
+over time :-)
+</p>
+</div>
+</div>
+
+</div>
+
+<div id="outline-container-4" class="outline-2">
+<h2 id="sec-4"><span class="section-number-2">4</span> Running the ece script </h2>
+<div class="outline-text-2" id="text-4">
+
+<p>You must be normal user to run the ece script, otherwise it will
+complain:
+</p>
+
+
+<pre class="example">[ece#engine] Sorry, you cannot be root when running ece
+[ece#engine] The root user can only use /etc/init.d/ece
+
+</pre>
+
+
+
+
+<p>
+As it mentions, the root user may use the init.d script and the
+accompanying /etc/default/ece to command the different ECE, EAE and
+RMI hub instances on your system.
+</p>
+</div>
+</div>
+<div id="postamble">
+<hr/>
+<p class="author">
+  Author: Torstein Krause Johansen (<a href="mailto:tkj@vizrt.com">tkj@vizrt.com</a>)
+  Date: 2011-09-12 18:14:44 CST
+</p></div>
 </div>
 </body>
 </html>
diff --git a/usr/share/doc/escenic/ece-guide.txt b/usr/share/doc/escenic/ece-guide.txt
index d4fefd5d..d3ee7c8d 100644
--- a/usr/share/doc/escenic/ece-guide.txt
+++ b/usr/share/doc/escenic/ece-guide.txt
@@ -1,8 +1,8 @@
-                       Guide for the ece Script
-                       ========================
+                  Guide for the /usr/bin/ece Script
+                  =================================
 
 Author: Torstein Krause Johansen
-Date: 2011-08-24 13:30:04 CST
+Date: 2011-09-12 18:14:41 CST
 
 
 Table of Contents
@@ -12,6 +12,9 @@ Table of Contents
     1.2 Completing types of servers the ece scripts can operate on 
     1.3 Completing the publication resources available 
 2 Getting an overview of all available options 
+3 Installation 
+    3.1 Overview of File Paths Used by the ece script 
+4 Running the ece script 
 
 
 1 TAB completion 
@@ -26,7 +29,6 @@ You will find yourself using this regularly, both for speed, but also
 to remember all the different options and their correct wording:
 
 
-
   $ ece TAB TAB
   applog      deploy      log         start       threaddump  
   assemble    help        outlog      status      update      
@@ -34,7 +36,6 @@ to remember all the different options and their correct wording:
 
 
 
-
 The commands are all described in detail in "ece help"
 
 1.2 Completing types of servers the ece scripts can operate on 
@@ -56,19 +57,124 @@ To help selecting the correct publication resource, you can make ece
 list and complete the available resource names:
 
 
-
   $ ece -p mypub -r TAB TAB
   content-type   image-version  layout-group   
   feature        layout         menu
 
 
 
-
 2 Getting an overview of all available options 
 -----------------------------------------------
 
 
   $ ece help
-
-
+  Usage: /home/torstein/bin/ece [-t <type>] [-i <instance>] <command>
+  
+  DESCRIPTION
+   -t --type <type>
+        The following types are available:
+        engine  -  The Escenic Content Engine, this is the default
+                   and is the assumed type if none is specified.
+        search  -  A standalone search indexer and solr instance
+        rmi-hub -  The RMI hub responsible for the internal 
+                   communication between the ECE instances.
+        analysis - The Escenic Analysis Engine also knows as 'Stats'
+  
+   -i --instance <instance>
+        The type instance, such as editor1, web1 or search1
+  
+   -p --publication <publication>
+        Needed only for updating publication resources
+  
+   -r --resource <resource>
+        Used for updating publication resources.
+        Must be one of: content-type, feature, layout, layout-group
+                        image-version, menu
+  
+   -v --verbose
+        Prints out debug statements, useful for debugging.
+  
+  The following commands are available:
+     applog     the type's app server log
+     assemble   runs the Assembly Tool *)
+     clean      removes temporary files created by /home/torstein/bin/ece *)
+     deploy     deploys the assembled EAR *)
+     help       prints this help screen
+     kill       uses force to stop the type
+     log        the type's Log4J log
+     outlog     the [ece#engine] script log (system out log)
+     restart    restarts the type
+     start      starts the type
+     status     checks if the type is running
+     stop       stops the type
+     threaddump write a thread dump to standard out (system out log)
+     update     update publication resources
+     versions   lists the ECE component versions
+  
+  *) only applicable if type is 'engine'
+
+
+
+
+3 Installation 
+---------------
+The ece script and ece.conf may be used on any Unix like system that
+has a fairly recent version of BASH installed.
+
+3.1 Overview of File Paths Used by the ece script 
+==================================================
+These are recommended files and locations for using the ece script:
+
+  Path                               Explanation                  
+ ----------------------------------+-----------------------------
+  /usr/bin/ece                       The script itself            
+  /etc/escenic/ece.conf              The main configuration file  
+  /etc/escenic/ece-<instance>.conf   Instance specific settings   
+
+As you can see in ece.conf, there are a number of default locations
+dealing with log files, pid files, crash files as well as application
+server files. The defaults all follow the File Hierarchy Standard, but
+you may of course change these to your liking.
+
+If you wish to put the .conf files in other places, you may like to know
+that the ece script has preset list of locations where it looks for
+the .conf files mentioned above, namely:
+
+- current working directory
+- /etc/escenic/<type>/instance/<instance name>
+- /etc/escenic/<type>/host/<hostname>
+- /etc/escenic/<type>/common
+- /etc/escenic/<type>
+- /etc/escenic
+- <current working direcotry>/../etc
+
+You may override this list of locations by setting the
+this environment variable in your .bashrc or similar:
+
+
+  ECE_CONF_LOCATIONS
+
+
+
+
+The reason for having so many options is because various Escenic
+consultants, partners and customers have requested these locations to
+fit their systems. As you can see, fitting everyone's fancy adds up
+over time :-)
+
+4 Running the ece script 
+-------------------------
+You must be normal user to run the ece script, otherwise it will
+complain:
+
+
+  [ece#engine] Sorry, you cannot be root when running ece
+  [ece#engine] The root user can only use /etc/init.d/ece
+
+
+
+
+As it mentions, the root user may use the init.d script and the
+accompanying /etc/default/ece to command the different ECE, EAE and
+RMI hub instances on your system.
 

From 16d6fb604c56ee3a57b299687a1f2b9dcdf79df6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 12 Sep 2011 19:00:04 +0800
Subject: [PATCH 0032/2585] - escaped an underscore in the .ece-install.conf
 table

---
 usr/share/doc/escenic/ece-install-guide.org | 56 ++++++++++-----------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index f72ec349..d44993cb 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -250,34 +250,34 @@ The ece-install script has support for doing a full automatic install
 The ece-install script understands for the following settings in the
 $HOME/.ece-install.conf file of the root user:
 
-|--------------------------------+------------------+-----------------------------------------------|
-| Parameter                      |          Default | Description                                   |
-|--------------------------------+------------------+-----------------------------------------------|
-| fai\_all\_install              |                0 | Install all components on your server.        |
-| fai\_cache\_install            |                0 | Install cache server profile                  |
-| fai\_cache\_backends           | ${HOSTNAME}:8080 | Space separated, e.g. "app1:8080 app2:8080"   |
-| fai\_db\_install               |                0 | Install db profile                            |
-| fai\_db\_host                  |        $HOSTNAME | Useful for editor & presentation profiles     |
-| fai\_db\_port                  |             3306 | Useful for editor & presentation profiles     |
-| fai\_editor\_install           |                0 | Install the editorial profile                 |
-| fai\_editor\_name              |          editor1 | Name of the editor instance                   |
-| fai\_editor\_port              |             8080 | HTTP port of the editor instance              |
-| fai\_editor\_shutdown          |             8005 | Shutdown port of the editor instance          |
-| fai\_enabled                   |                0 | Whether or not to run ece-install in FAI mode |
-| fai\_public\_host\_name        | ${HOSTNAME}:8080 | The public address for your website           |
-| fai\_presentation\_install     |                0 | Install the presentation server profile       |
-| fai\_presentation\_name        |             web1 | Name of the presentation server instance      |
-| fai\_presentation\_port        |             8080 | HTTP port of the presentation server instance |
-| fai\_presentation\_shutdown    |             8005 | Shutdown port of the presentation instance    |
-| fai\_publication\_create       |                0 | Create a new publication                      |
-| fai\_publication\_name         |            mypub | Name of the publication                       |
-| fai\_publication\_use_instance |             dev1 | Name of local instance to use for creation    |
-| fai\_rmi\_install              |                0 | Install RMI hub profile                       |
-| fai\_search\_name              |          search1 | Name of the search instance                   |
-| fai\_search\_port              |             8080 | HTTP port of the search instance              |
-| fai\_search\_shutdown          |             8005 | Shutdown port of the search instance          |
-| fai\_wf\_install               |                0 | Install Widget Framework profile              |
-|--------------------------------+------------------+-----------------------------------------------|
+|---------------------------------+------------------+-----------------------------------------------|
+| Parameter                       |          Default | Description                                   |
+|---------------------------------+------------------+-----------------------------------------------|
+| fai\_all\_install               |                0 | Install all components on your server.        |
+| fai\_cache\_install             |                0 | Install cache server profile                  |
+| fai\_cache\_backends            | ${HOSTNAME}:8080 | Space separated, e.g. "app1:8080 app2:8080"   |
+| fai\_db\_install                |                0 | Install db profile                            |
+| fai\_db\_host                   |        $HOSTNAME | Useful for editor & presentation profiles     |
+| fai\_db\_port                   |             3306 | Useful for editor & presentation profiles     |
+| fai\_editor\_install            |                0 | Install the editorial profile                 |
+| fai\_editor\_name               |          editor1 | Name of the editor instance                   |
+| fai\_editor\_port               |             8080 | HTTP port of the editor instance              |
+| fai\_editor\_shutdown           |             8005 | Shutdown port of the editor instance          |
+| fai\_enabled                    |                0 | Whether or not to run ece-install in FAI mode |
+| fai\_public\_host\_name         | ${HOSTNAME}:8080 | The public address for your website           |
+| fai\_presentation\_install      |                0 | Install the presentation server profile       |
+| fai\_presentation\_name         |             web1 | Name of the presentation server instance      |
+| fai\_presentation\_port         |             8080 | HTTP port of the presentation server instance |
+| fai\_presentation\_shutdown     |             8005 | Shutdown port of the presentation instance    |
+| fai\_publication\_create        |                0 | Create a new publication                      |
+| fai\_publication\_name          |            mypub | Name of the publication                       |
+| fai\_publication\_use\_instance |             dev1 | Name of local instance to use for creation    |
+| fai\_rmi\_install               |                0 | Install RMI hub profile                       |
+| fai\_search\_name               |          search1 | Name of the search instance                   |
+| fai\_search\_port               |             8080 | HTTP port of the search instance              |
+| fai\_search\_shutdown           |             8005 | Shutdown port of the search instance          |
+| fai\_wf\_install                |                0 | Install Widget Framework profile              |
+|---------------------------------+------------------+-----------------------------------------------|
 
 As you've probably have guessed, 0 means "false" and 1 means "true" :-)
 

From 49bce2b7e45f801553edba42dea4e76b8e6b56a3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 12 Sep 2011 19:01:01 +0800
Subject: [PATCH 0033/2585] - removed capitalising ece-script.

---
 usr/share/doc/escenic/ece-install-guide.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index d44993cb..12b6f5be 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -21,7 +21,7 @@ You may also look inside the ece-install script for all calls to the
 'assert\_pre\_prequesite' method and you'll get a list of the binaries
 ece-install assumes are present.
 
-* A Note on Running Ece-Install On Non-GNU/Linux Systems
+* A Note on Running ece-install On Non-GNU/Linux Systems
 Please note, it's assumed that the OS uses GNU's tools, i.e. find, cp
 & tar. If you're running a system which has a different set of core
 tools, such as any of the BSDs (including Mac OS X) or Solaris, make

From 8503d8a9cd93875894bda56b375fe37576923592 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 12 Sep 2011 19:03:50 +0800
Subject: [PATCH 0034/2585] - newly generated with FAI output included so that
 readers can see   what information ece-install gives back.

---
 usr/share/doc/escenic/ece-install-guide.html |  76 +++++++++++-
 usr/share/doc/escenic/ece-install-guide.txt  | 123 ++++++++++++++-----
 2 files changed, 163 insertions(+), 36 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.html b/usr/share/doc/escenic/ece-install-guide.html
index aa572bec..d4ad2eca 100644
--- a/usr/share/doc/escenic/ece-install-guide.html
+++ b/usr/share/doc/escenic/ece-install-guide.html
@@ -7,7 +7,7 @@
 <title>Welcome to the /usr/sbin/ece-install Guide</title>
 <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
 <meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2011-09-12 17:32:07 CST"/>
+<meta name="generated" content="2011-09-12 19:02:48 CST"/>
 <meta name="author" content="Torstein Krause Johansen"/>
 <meta name="description" content=""/>
 <meta name="keywords" content=""/>
@@ -222,7 +222,7 @@ <h2>Table of Contents</h2>
 </ul></li>
 </ul>
 </li>
-<li><a href="#sec-2">2 A Note on Running Ece-Install On Non-GNU/Linux Systems </a></li>
+<li><a href="#sec-2">2 A Note on Running ece-install On Non-GNU/Linux Systems </a></li>
 <li><a href="#sec-3">3 Downloading the ece-install Script </a></li>
 <li><a href="#sec-4">4 Running the ece-install Script </a></li>
 <li><a href="#sec-5">5 Available Server Profiles </a>
@@ -306,7 +306,7 @@ <h4 id="sec-1-2"><span class="section-number-4">1.2</span> Other GNU/Linux and U
 </div>
 
 <div id="outline-container-2" class="outline-2">
-<h2 id="sec-2"><span class="section-number-2">2</span> A Note on Running Ece-Install On Non-GNU/Linux Systems </h2>
+<h2 id="sec-2"><span class="section-number-2">2</span> A Note on Running ece-install On Non-GNU/Linux Systems </h2>
 <div class="outline-text-2" id="text-2">
 
 <p>Please note, it's assumed that the OS uses GNU's tools, i.e. find, cp
@@ -821,7 +821,7 @@ <h2 id="sec-6"><span class="section-number-2">6</span> Full Automatic Install (F
 <tr><td class="left">fai_presentation_shutdown</td><td class="right">8005</td><td class="left">Shutdown port of the presentation instance</td></tr>
 <tr><td class="left">fai_publication_create</td><td class="right">0</td><td class="left">Create a new publication</td></tr>
 <tr><td class="left">fai_publication_name</td><td class="right">mypub</td><td class="left">Name of the publication</td></tr>
-<tr><td class="left">fai_publication_use<sub>instance</sub></td><td class="right">dev1</td><td class="left">Name of local instance to use for creation</td></tr>
+<tr><td class="left">fai_publication_use_instance</td><td class="right">dev1</td><td class="left">Name of local instance to use for creation</td></tr>
 <tr><td class="left">fai_rmi_install</td><td class="right">0</td><td class="left">Install RMI hub profile</td></tr>
 <tr><td class="left">fai_search_name</td><td class="right">search1</td><td class="left">Name of the search instance</td></tr>
 <tr><td class="left">fai_search_port</td><td class="right">8080</td><td class="left">HTTP port of the search instance</td></tr>
@@ -1052,7 +1052,71 @@ <h2 id="sec-12"><span class="section-number-2">12</span> Example Output FAI </h2
 </p>
 
 
-<pre class="example">hei
+<pre class="example">root@ubiquitous-7:~# bash ece-install
+[ece-install-0] Full Automatic Install (FAI) enabled.
+[ece-install-0] All user input will be read from /root/.ece-install.conf
+[ece-install-0] I'm logging to /var/log/ece-install.log
+[ece-install-1] Stopping conflicting processes ...
+[ece-install-1] Installing 3rd party packages needed by ece-install ...
+[ece-install-2] Setting up the ece UNIX scripts ...
+[ece-install-5] Adding the ece init.d script to the default run levels...
+[ece-install-5] Setting up the doesnt user's UNIX environment ...
+[ece-install-5] Installing an all-in-one environment on ubiquitous-7 ...
+[ece-install-5] Installing the database server on ubiquitous-7 ...
+[ece-install-5] Installing the Percona database ...
+[ece-install-65] Downloading Escenic software from technet.escenic.com ...
+[ece-install-66] Setting up the Escenic Content Engine &amp; its plugins ...
+[ece-install-76] Setting up the ECE database schema ...
+[ece-install-90] Installing 3rd party packages needed by ECE ...
+[ece-install-106] Setting up the Assembly Tool ...
+[ece-install-110] Setting up the basic Nursery configuration ...
+[ece-install-110] Setting up the application server ...
+[ece-install-116] Setting up proper log4j &amp; Java logging configuration ...
+[ece-install-116] Setting correct permissions on ECE related directories ...
+[ece-install-116] Assembling, deploying &amp; starting dev1 ...
+[ece-install-183] Installing a caching server on ubiquitous-7 ...
+[ece-install-215] Setting up Varnish to match your environment ...
+[ece-install-220] Setting up solr ...
+[ece-install-221] Creating a Maven settings file: /root/.m2/settings.xml ...
+[ece-install-221] Downloading Widget Framework from technet.escenic.com ...
+[ece-install-259] Installing Widget Framework into your local Maven repository ...
+[ece-install-318] Getting ready to create a new publiation ...
+[ece-install-318] Setting up the mypub publication ...
+[ece-install-318] Basing mypub.war on the Widget Framework Demo ...
+[ece-install-344] Creating publication mypub using dev1 ...
+[ece-install-382] Assembling, deploying &amp; starting dev1 ...
+[ece-install-503] - The installation is now complete! It took 0d 0h 8m 22s
+[ece-install-90] - DB is now set up on ubiquitous-7:3306
+[ece-install-181] - New ECE instance dev1 installed.
+[ece-install-181] - Its admin interface is available at
+[ece-install-181]   http://ubiquitous-7:8080/escenic-admin
+[ece-install-181] - You can view all installed plugin &amp; engine versions with:
+[ece-install-181]   ece -i dev1 versions
+[ece-install-182] - type 'ece help' to see all the options of this script
+[ece-install-182]   which allows you to control all the Escenic components.
+[ece-install-182]   Also, see /usr/share/doc/escenic/ece-guide.txt for
+[ece-install-182]   addtional information on the ece script.
+[ece-install-183] - Verify that /etc/default/ece lists all the instances 
+[ece-install-183]   on ubiquitous-7 you wish to start at boot time.
+[ece-install-220] - Cache server is up and running at http://ubiquitous-7:80/
+[ece-install-317] - Widget Framework has been installed into your local
+[ece-install-318]   Maven repository and its ECE components have been installed
+[ece-install-502] - a new publication mypub has been created
+[ece-install-503] - See /usr/share/doc/escenic/ece-install-guide.txt for
+[ece-install-503]   a full overview of files and directories set up by
+[ece-install-504]   ece-install
+[ece-install-504] - type 'ece help' to see all the options of this script
+[ece-install-504]   which allows you to control all the Escenic components.
+[ece-install-504]   Also, see /usr/share/doc/escenic/ece-guide.txt for
+[ece-install-505]   further information on the ece script.
+[ece-install-505] - For further reading, in-depth guides on installing, 
+[ece-install-505]   configuring and developing Escenic web sites can be 
+[ece-install-505]   fount at http://documentation.vizrt.com/ece-5.3.html
+[ece-install-506]
+[ece-install-506] Enjoy your time with Escenic Content Engine!
+[ece-install-506]
+[ece-install-506] -Vizrt Online
+
 
 </pre>
 
@@ -1065,7 +1129,7 @@ <h2 id="sec-12"><span class="section-number-2">12</span> Example Output FAI </h2
 <hr/>
 <p class="author">
   Author: Torstein Krause Johansen (<a href="mailto:tkj@vizrt.com">tkj@vizrt.com</a>)
-  Date: 2011-09-12 17:32:07 CST
+  Date: 2011-09-12 19:02:48 CST
 </p></div>
 </div>
 </body>
diff --git a/usr/share/doc/escenic/ece-install-guide.txt b/usr/share/doc/escenic/ece-install-guide.txt
index a198d473..ce9cb86a 100644
--- a/usr/share/doc/escenic/ece-install-guide.txt
+++ b/usr/share/doc/escenic/ece-install-guide.txt
@@ -2,7 +2,7 @@
               ==========================================
 
 Author: Torstein Krause Johansen
-Date: 2011-09-12 17:32:03 CST
+Date: 2011-09-12 19:02:40 CST
 
 
 Table of Contents
@@ -10,7 +10,7 @@ Table of Contents
 1 Supported Operating Systems 
         1.1 Debian based operating systems 
         1.2 Other GNU/Linux and Unix systems 
-2 A Note on Running Ece-Install On Non-GNU/Linux Systems 
+2 A Note on Running ece-install On Non-GNU/Linux Systems 
 3 Downloading the ece-install Script 
 4 Running the ece-install Script 
 5 Available Server Profiles 
@@ -63,7 +63,7 @@ You may also look inside the ece-install script for all calls to the
 'assert\_pre\_prequesite' method and you'll get a list of the binaries
 ece-install assumes are present.
 
-2 A Note on Running Ece-Install On Non-GNU/Linux Systems 
+2 A Note on Running ece-install On Non-GNU/Linux Systems 
 ---------------------------------------------------------
 Please note, it's assumed that the OS uses GNU's tools, i.e. find, cp
 & tar. If you're running a system which has a different set of core
@@ -357,32 +357,32 @@ The ece-install script has support for doing a full automatic install
 The ece-install script understands for the following settings in the
 $HOME/.ece-install.conf file of the root user:
 
-  Parameter                                 Default   Description                                    
- --------------------------------+------------------+-----------------------------------------------
-  fai\_all\_install                               0   Install all components on your server.         
-  fai\_cache\_install                             0   Install cache server profile                   
-  fai\_cache\_backends             ${HOSTNAME}:8080   Space separated, e.g. "app1:8080 app2:8080"    
-  fai\_db\_install                                0   Install db profile                             
-  fai\_db\_host                           $HOSTNAME   Useful for editor & presentation profiles      
-  fai\_db\_port                                3306   Useful for editor & presentation profiles      
-  fai\_editor\_install                            0   Install the editorial profile                  
-  fai\_editor\_name                         editor1   Name of the editor instance                    
-  fai\_editor\_port                            8080   HTTP port of the editor instance               
-  fai\_editor\_shutdown                        8005   Shutdown port of the editor instance           
-  fai\_enabled                                    0   Whether or not to run ece-install in FAI mode  
-  fai\_public\_host\_name          ${HOSTNAME}:8080   The public address for your website            
-  fai\_presentation\_install                      0   Install the presentation server profile        
-  fai\_presentation\_name                      web1   Name of the presentation server instance       
-  fai\_presentation\_port                      8080   HTTP port of the presentation server instance  
-  fai\_presentation\_shutdown                  8005   Shutdown port of the presentation instance     
-  fai\_publication\_create                        0   Create a new publication                       
-  fai\_publication\_name                      mypub   Name of the publication                        
-  fai\_publication\_use_instance               dev1   Name of local instance to use for creation     
-  fai\_rmi\_install                               0   Install RMI hub profile                        
-  fai\_search\_name                         search1   Name of the search instance                    
-  fai\_search\_port                            8080   HTTP port of the search instance               
-  fai\_search\_shutdown                        8005   Shutdown port of the search instance           
-  fai\_wf\_install                                0   Install Widget Framework profile               
+  Parameter                                  Default   Description                                    
+ ---------------------------------+------------------+-----------------------------------------------
+  fai\_all\_install                                0   Install all components on your server.         
+  fai\_cache\_install                              0   Install cache server profile                   
+  fai\_cache\_backends              ${HOSTNAME}:8080   Space separated, e.g. "app1:8080 app2:8080"    
+  fai\_db\_install                                 0   Install db profile                             
+  fai\_db\_host                            $HOSTNAME   Useful for editor & presentation profiles      
+  fai\_db\_port                                 3306   Useful for editor & presentation profiles      
+  fai\_editor\_install                             0   Install the editorial profile                  
+  fai\_editor\_name                          editor1   Name of the editor instance                    
+  fai\_editor\_port                             8080   HTTP port of the editor instance               
+  fai\_editor\_shutdown                         8005   Shutdown port of the editor instance           
+  fai\_enabled                                     0   Whether or not to run ece-install in FAI mode  
+  fai\_public\_host\_name           ${HOSTNAME}:8080   The public address for your website            
+  fai\_presentation\_install                       0   Install the presentation server profile        
+  fai\_presentation\_name                       web1   Name of the presentation server instance       
+  fai\_presentation\_port                       8080   HTTP port of the presentation server instance  
+  fai\_presentation\_shutdown                   8005   Shutdown port of the presentation instance     
+  fai\_publication\_create                         0   Create a new publication                       
+  fai\_publication\_name                       mypub   Name of the publication                        
+  fai\_publication\_use\_instance               dev1   Name of local instance to use for creation     
+  fai\_rmi\_install                                0   Install RMI hub profile                        
+  fai\_search\_name                          search1   Name of the search instance                    
+  fai\_search\_port                             8080   HTTP port of the search instance               
+  fai\_search\_shutdown                         8005   Shutdown port of the search instance           
+  fai\_wf\_install                                 0   Install Widget Framework profile               
 
 As you've probably have guessed, 0 means "false" and 1 means "true" :-)
 
@@ -528,7 +528,70 @@ file:
 The following output is produced from ece-install:
 
 
-  hei
+  root@ubiquitous-7:~# bash ece-install
+  [ece-install-0] Full Automatic Install (FAI) enabled.
+  [ece-install-0] All user input will be read from /root/.ece-install.conf
+  [ece-install-0] I'm logging to /var/log/ece-install.log
+  [ece-install-1] Stopping conflicting processes ...
+  [ece-install-1] Installing 3rd party packages needed by ece-install ...
+  [ece-install-2] Setting up the ece UNIX scripts ...
+  [ece-install-5] Adding the ece init.d script to the default run levels...
+  [ece-install-5] Setting up the doesnt user's UNIX environment ...
+  [ece-install-5] Installing an all-in-one environment on ubiquitous-7 ...
+  [ece-install-5] Installing the database server on ubiquitous-7 ...
+  [ece-install-5] Installing the Percona database ...
+  [ece-install-65] Downloading Escenic software from technet.escenic.com ...
+  [ece-install-66] Setting up the Escenic Content Engine & its plugins ...
+  [ece-install-76] Setting up the ECE database schema ...
+  [ece-install-90] Installing 3rd party packages needed by ECE ...
+  [ece-install-106] Setting up the Assembly Tool ...
+  [ece-install-110] Setting up the basic Nursery configuration ...
+  [ece-install-110] Setting up the application server ...
+  [ece-install-116] Setting up proper log4j & Java logging configuration ...
+  [ece-install-116] Setting correct permissions on ECE related directories ...
+  [ece-install-116] Assembling, deploying & starting dev1 ...
+  [ece-install-183] Installing a caching server on ubiquitous-7 ...
+  [ece-install-215] Setting up Varnish to match your environment ...
+  [ece-install-220] Setting up solr ...
+  [ece-install-221] Creating a Maven settings file: /root/.m2/settings.xml ...
+  [ece-install-221] Downloading Widget Framework from technet.escenic.com ...
+  [ece-install-259] Installing Widget Framework into your local Maven repository ...
+  [ece-install-318] Getting ready to create a new publiation ...
+  [ece-install-318] Setting up the mypub publication ...
+  [ece-install-318] Basing mypub.war on the Widget Framework Demo ...
+  [ece-install-344] Creating publication mypub using dev1 ...
+  [ece-install-382] Assembling, deploying & starting dev1 ...
+  [ece-install-503] - The installation is now complete! It took 0d 0h 8m 22s
+  [ece-install-90] - DB is now set up on ubiquitous-7:3306
+  [ece-install-181] - New ECE instance dev1 installed.
+  [ece-install-181] - Its admin interface is available at
+  [ece-install-181]   http://ubiquitous-7:8080/escenic-admin
+  [ece-install-181] - You can view all installed plugin & engine versions with:
+  [ece-install-181]   ece -i dev1 versions
+  [ece-install-182] - type 'ece help' to see all the options of this script
+  [ece-install-182]   which allows you to control all the Escenic components.
+  [ece-install-182]   Also, see /usr/share/doc/escenic/ece-guide.txt for
+  [ece-install-182]   addtional information on the ece script.
+  [ece-install-183] - Verify that /etc/default/ece lists all the instances 
+  [ece-install-183]   on ubiquitous-7 you wish to start at boot time.
+  [ece-install-220] - Cache server is up and running at http://ubiquitous-7:80/
+  [ece-install-317] - Widget Framework has been installed into your local
+  [ece-install-318]   Maven repository and its ECE components have been installed
+  [ece-install-502] - a new publication mypub has been created
+  [ece-install-503] - See /usr/share/doc/escenic/ece-install-guide.txt for
+  [ece-install-503]   a full overview of files and directories set up by
+  [ece-install-504]   ece-install
+  [ece-install-504] - type 'ece help' to see all the options of this script
+  [ece-install-504]   which allows you to control all the Escenic components.
+  [ece-install-504]   Also, see /usr/share/doc/escenic/ece-guide.txt for
+  [ece-install-505]   further information on the ece script.
+  [ece-install-505] - For further reading, in-depth guides on installing, 
+  [ece-install-505]   configuring and developing Escenic web sites can be 
+  [ece-install-505]   fount at http://documentation.vizrt.com/ece-5.3.html
+  [ece-install-506]
+  [ece-install-506] Enjoy your time with Escenic Content Engine!
+  [ece-install-506]
+  [ece-install-506] -Vizrt Online
 
 
 

From 22ddfb33129c38465d33425378d7d2b6e39c2773 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 12 Sep 2011 19:13:45 +0800
Subject: [PATCH 0035/2585] no need to have time stamps in the next step
 messages.

---
 usr/sbin/ece-install | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 34763e26..8f3ba037 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -1409,9 +1409,9 @@ function install_cache_server()
 function add_next_step()
 {
     if [ -n "$next_steps" ]; then
-        next_steps=${next_steps}${NEW_LINE}$(get_id)" "${1}
+        next_steps=${next_steps}${NEW_LINE}"[$(basename $0)] "${1}
     else
-        next_steps=$(get_id)" "${1}
+        next_steps="[$(basename $0)] "${1}
     fi
 }
 

From 10f959078615438ed52495463d3c6cf156f015d5 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 13 Sep 2011 16:17:28 +0800
Subject: [PATCH 0036/2585] - added munin node for all installation profiles
 (called in   common_post_install) - the install_munin_node method download's
 mogise's escenic_jstat   plugin and patches it for use with the new ece
 scripts. - added munin gatherer to the web cache profile - added web server
 to the web cache profile. This web server will be   used for the
 Adactus/Mobilze access point, optionally serving static   content as well as
 accessing the munin data.

---
 usr/sbin/ece-install | 186 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 154 insertions(+), 32 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 8f3ba037..c74fa89d 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -4,10 +4,6 @@
 # five minutes. The setup the user is getting is suitable for a
 # production environment, except for the fact that with this script,
 # all ECE components are set up on the same host.
-#
-# BUG: if creating a publication and WF is downloaded, but not
-# installed, then the pub is built from WF, but WF is not added to the
-# plugins. This _is_ a corner case, but should still be fixed.
 
 # by tkj@vizrt.com
 
@@ -21,8 +17,10 @@ jdbc_driver=/usr/share/java/mysql.jar
 debug=0
 tomcat_download=http://apache.stu.edu.tw/tomcat/tomcat-6/v6.0.33/bin/apache-tomcat-6.0.33.tar.gz
 
-# don't touch this one if you're installing on a Debian based system
-# as it'll be set up for you by the script itself.
+# The script will install the sun-java6-jdk package on Debian based
+# systems and this is the path of the JAVA home with this package. If
+# you're using a different system or have other preferences, change
+# java_home here.
 java_home=/usr/lib/jvm/java-6-sun
 #####################################################################
 
@@ -49,7 +47,6 @@ NEW_LINE="
 # components.
 next_steps=""
 
-
 function get_seconds_since_start()
 {
     now=`date +%s`
@@ -144,11 +141,20 @@ function make_dir()
 
 function make_ln()
 {
-    if [ -e $1 -a ! -h $(basename $1) ]; then
-        run ln -s $1
-    elif [ ! -e $1 ]; then
-        print "Tried to make a symlink to $1, but it doesn't exist"
-        exit 1
+    if [ $2 ]; then
+        if [ -e $1 -a ! -h $2 ]; then
+            run ln -s $1 $2
+        elif [ ! -e $1 ]; then
+            print "Tried to make a symlink to $1, but it doesn't exist"
+            exit 1
+        fi
+    else
+        if [ -e $1 -a ! -h $(basename $1) ]; then
+            run ln -s $1
+        elif [ ! -e $1 ]; then
+            print "Tried to make a symlink to $1, but it doesn't exist"
+            exit 1
+        fi
     fi
 }
 
@@ -1102,14 +1108,15 @@ function un_install_ece()
         /var/run/ece-install.pid
 
     apt-get --yes --purge remove \
-        varnish \
-        percona* \
-        maven2 \
         ant \
         ant-contrib \
         ant-optional \
         libmysql-java \
+        maven2 \
         memcached \
+        munin* \
+        percona* \
+        varnish \
         sun-java6-jdk
     
     apt-get clean
@@ -1563,6 +1570,8 @@ EOF
     set_correct_permissions
     assemble_deploy_and_restart_type
     update_type_instances_to_start_up
+    set_conf_file_value ece_unix_user $ece_user /etc/default/ece
+    set_conf_file_value ece_unix_group $ece_group /etc/default/ece
 
     admin_uri=http://$HOSTNAME:${appserver_port}/escenic-admin
     add_next_step "- New ECE instance $instance_name installed."
@@ -1581,7 +1590,7 @@ EOF
 function install_presentation_server()
 {
     print "Installing a presentation server on $HOSTNAME ..."
-
+    type=engine
     install_ece_instance "web1" 1
 }
 
@@ -1589,10 +1598,6 @@ function assemble_deploy_and_restart_type()
 {
     print "Assembling, deploying & starting $instance_name ..."
 
-    if [ -z "$type" ]; then
-        type=engine
-    fi
-    
     # TODO clear strategy on when to add 'clean' to the command list
     # For now, we'll omit it to make the install script run as fast as
     # possible. It should in most cases work just fine, the exception
@@ -1656,7 +1661,7 @@ function create_publication()
 function install_editorial_server()
 {
     print "Installing an editorial server on $HOSTNAME ..."
-
+    type=engine
     install_ece_instance "editor1" 0
 }
 
@@ -1813,7 +1818,7 @@ EOF
 
 function install_search_instance()
 {
-    type=search1
+    type=search
     install_ece_instance "search1" 0
     
     file=/etc/escenic/ece-${instance_name}.conf
@@ -1850,18 +1855,136 @@ EOF
 function install_all_in_one_environment()
 {
     print "Installing an all-in-one environment on $HOSTNAME ..."
-
+    type=engine
     install_database_server
     install_ece_instance "dev1" 0
     install_cache_server
+    install_web_server
+    install_munin_gatherer
     set_up_solr
 
     install_widget_framework
     create_publication
 }
 
+function install_web_server()
+{
+    print "Installing a web server on $HOSTNAME ..."
+
+    if [ $on_debian_or_derivative -eq 1 ]; then
+        packages="nginx"
+        install_packages_if_missing $packages
+    else
+        debug "Web server installation not supported on your system."
+        return
+    fi
+    
+    file=/etc/nginx/sites-available/default
+    run mv $file $file.orig
+    cat > $file <<EOF
+server {
+  listen 81 default;
+  access_log  /var/log/nginx/localhost.access.log;
+  location / {
+    root /var/cache/munin/www;
+    index index.html;
+  }
+
+  # Typical endpoint for Adactus/Mobilize to get the videos to
+  # transcode.
+  location /binary {
+    root /var/lib/escenic;
+    index index.html;
+  }
+}
+EOF
+    /etc/init.d/nginx restart 1>>$log 2>>$log
+
+    add_next_step "- Web server is install on http://${HOSTNAME}:81/"
+    add_next_step "  http://${HOSTNAME}:81/ gives you the munin interface"
+    add_next_step "  http://${HOSTNAME}:81/binary gives you the Adactus endpoint"
+}
+
+function install_munin_gatherer()
+{
+    print "Installing a Munin gatherer on $HOSTNAME ..."
+
+    if [ $on_debian_or_derivative -eq 1 ]; then
+        packages="munin"
+        install_packages_if_missing $packages
+    else
+        print "Munin gatherer installation not supported on your system :-("
+        print "You will have to install it manually."
+        return
+    fi
+
+    # TODO ask user/read fai_munin_node_list
+    # TODO has a hard dependency on install_web_server, should perhaps
+    # be called from this one?
+
+    add_next_step "- Munin interface available at http://$HOSTNAME:81/"
+}
+
+function install_munin_node()
+{
+    print "Installing a Munin node on $HOSTNAME ..."
+
+    if [ $on_debian_or_derivative -eq 1 ]; then
+        packages="munin-node munin-plugins-extra munin-java-plugins"
+        install_packages_if_missing $packages
+    else
+        print "Munin node installation not supported on your system"
+        print "You will have to install it manually."
+        return
+    fi
+
+    # install the escenic_jstat munin plugin
+    file=/usr/share/munin/plugins/escenic_jstat_
+    wget https://github.com/mogsie/escenic-munin/raw/master/escenic_jstat_ \
+        -O $file \
+        1>>$log 2>>$log
+    run chmod 755 $file
+
+    # TODO hack to get escenic_jstat to work with the new ece scripts.
+    cd $(dirname $file)
+    run patch -p1 < $download_dir/escenic_jstat_.diff
+
+    escenic_jstat_modules="_gc _gcoverhead _heap _uptime"
+    for el in /etc/escenic/ece-*.conf; do
+        current_instance=$(basename ${el} | \
+            sed -e 's/ece-//g' -e 's/engine-//g' | \
+            cut -d'.' -f1)
+        for module in $escenic_jstat_modules; do
+	          cd /usr/share/munin/plugins/
+	          make_ln escenic_jstat_ escenic_jstat_${current_instance}${module}
+        done
+
+        # we need to hack a bit since escenic_jstat_ looks for
+        # instance PIDs in /var/run/escenic ece-<instance>.pid. It's
+        # now <type>-<instance>.pid
+        file=/var/run/escenic/$type-${instance_name}.pid
+        if [ ! -e $file ]; then
+            run touch $file
+        fi
+
+        # enabling the instance specific munin entries:
+        for el in /usr/share/munin/plugins/escenic_jstat_[a-z]*; do
+            run cd /etc/munin/plugins
+            make_ln $el
+        done
+    done
+    
+    if [ $on_debian_or_derivative -eq 1 ]; then
+        service munin-node restart \
+            1>>$log 2>>$log
+    fi
+
+    add_next_step "- A Munin node has been installed on $HOSTNAME"
+}
+
 function common_post_install()
 {
+    install_munin_node
     print_status_and_next_steps
     rm $pid_file
 }
@@ -1880,47 +2003,44 @@ if [ $fai_enabled -eq 1 ]; then
     print "Full Automatic Install (FAI) enabled."
     print "All user input will be read from $conf_file"
     
+    common_pre_install
+    
     if [ $(get_boolean_conf_value fai_all_install) -eq 1 ]; then
         install_profile_number=$PROFILE_ALL_IN_ONE
-        common_pre_install
         install_all_in_one_environment
         common_post_install
     elif [ $(get_boolean_conf_value fai_editor_install) -eq 1 ]; then
         install_profile_number=$PROFILE_EDITORIAL_SERVER
-        common_pre_install
         install_editorial_server
         common_post_install
     elif [ $(get_boolean_conf_value fai_db_install) -eq 1 ]; then
         install_profile_number=$PROFILE_DB_SERVER
-        common_pre_install
         install_database_server
         common_post_install
     elif [ $(get_boolean_conf_value fai_cache_install) -eq 1 ]; then
         install_profile_number=$PROFILE_CACHE_SERVER
-        common_pre_install
         install_cache_server
-        common_post_install
+        install_web_server
+        install_munin_gatherer
     elif [ $(get_boolean_conf_value fai_rmi_install) -eq 1 ]; then
         install_profile_number=$PROFILE_RMI_HUB
         common_pre_install
         install_rmi_hub
-        common_post_install
     elif [ $(get_boolean_conf_value fai_wf_install) -eq 1 ]; then
         install_profile_number=$PROFILE_WIDGET_FRAMEWORK
         common_pre_install
         install_widget_framework
-        common_post_install
     elif [ $(get_boolean_conf_value fai_presentation_install) -eq 1 ]; then
         install_profile_number=$PROFILE_PRESENTATION_SERVER
         common_pre_install
         install_presentation_server
-        common_post_install
     elif [ $(get_boolean_conf_value fai_publication_create) -eq 1 ]; then
         install_profile_number=$PROFILE_CREATE_PUBLICATION
         common_pre_install
         create_publication
-        common_post_install
     fi
+    
+    common_post_install
 else
     read_user_input
     common_pre_install
@@ -1930,6 +2050,8 @@ else
         ;;
         $PROFILE_CACHE_SERVER)
         install_cache_server
+        install_web_server
+        install_munin_gatherer
         ;;
         $PROFILE_DB_SERVER)
         install_database_server

From 80ba4894494a8c21139cc3321392847fdce84fae Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 14 Sep 2011 13:02:04 +0200
Subject: [PATCH 0037/2585] - one of the PGP keys for Percona was not added to
 the APT key chain, at least   under some circumstances.

---
 usr/sbin/ece-install | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index c74fa89d..86435d81 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -1448,7 +1448,9 @@ function install_database_server()
 
             if [ $(apt-key list| grep CD2EFD2A | wc -l) -lt 1 ]; then
                 run gpg --keyserver hkp://keys.gnupg.net \
-                    --recv-keys 1C4CBDCDCD2EFD2A \
+                    -a \
+                    --export 1C4CBDCDCD2EFD2A | \
+                    apt-key add - \
                     1>>$log 2>>$log
                 run gpg -a --export CD2EFD2A | apt-key add - \
                     1>>$log 2>>$log

From 34db77269e0e73932c885b866ff2922f9cc671e0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 15 Sep 2011 15:28:37 +0800
Subject: [PATCH 0038/2585] - commands with pipes cannot be wrapped with the
 run function(), this   caused problems especially with the GPG/apt-key
 handling - added removal of GPG keys to the un_install_ece method - all
 commands passed to the run() wrapper should _not_ re-direct   standard out
 and standard error as run() does this for them. This   hid some error
 messages. This is fixed now. - moved run level code into its own function,
 add_server_to_runlevels,   and the code is now run from common_post_install
 instead of   common_pre_install - fixed problem in un_install_ece if you
 haven't installed all   profiles on one box. This shouldn't have affected
 most users,   though. - made curl silent.

---
 usr/sbin/ece-install | 129 ++++++++++++++++++++++---------------------
 1 file changed, 65 insertions(+), 64 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 86435d81..c844233f 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -213,7 +213,7 @@ install_packages_if_missing()
             return
         fi
         
-        run apt-get install -y $@ 1>>$log 2>>$log
+        run apt-get install -y $@
     fi
 }
 
@@ -249,8 +249,7 @@ function set_up_assembly_tool()
     cd /opt/escenic/assemblytool/
     
     if [ -e $download_dir/assemblytool*zip ]; then
-        run unzip -u $download_dir/assemblytool*zip \
-            1>>$log 2>>$log
+        run unzip -u $download_dir/assemblytool*zip
     fi
 
     # adding an instance layer to the Nursery configuration
@@ -288,8 +287,7 @@ EOF
     done
 
     run cd /opt/escenic/assemblytool/
-    run ant -q initialize \
-        1>>$log 2>>$log
+    run ant -q initialize
     sed -i 's/#\ engine.root\ =\ \./engine.root=\/opt\/escenic\/engine/g' \
         assemble.properties \
         1>>$log 2>>$log
@@ -313,8 +311,7 @@ function set_up_engine_and_plugins()
     cd /opt/escenic/
 
     if [ ! -d engine-* ]; then
-        run unzip -u $download_dir/engine*.zip \
-            1>>$log 2>>$log
+        run unzip -u $download_dir/engine*.zip
         if [ -h engine ]; then
             run rm engine
         fi
@@ -334,8 +331,7 @@ function set_up_engine_and_plugins()
             continue
         fi
         
-        run unzip -u $el \
-            1>>$log 2>>$log
+        run unzip -u $el
     done
 
     ece_software_setup_completed=1
@@ -350,33 +346,11 @@ function set_up_ece_scripts()
         (cd ece-scripts
             git pull 1>>$log 2>>$log)
     else
-        run git clone $git_source \
-            1>>$log 2>>$log
+        run git clone $git_source
     fi
     
     run cp -r ece-scripts/usr/* /usr/
     run cp -r ece-scripts/etc/* /etc/
-
-    # no need to add init.d scripts to the runlevel(s) for these
-    # profiles
-    if [ $install_profile_number -eq $PROFILE_WIDGET_FRAMEWORK -o \
-         $install_profile_number -eq $PROFILE_SEARCH_SERVER -o \
-         $install_profile_number -eq $PROFILE_DB_SERVER -o \
-         $install_profile_number -eq $PROFILE_CACHE_SERVER ]; then
-        return
-    fi
-
-    if [ $on_debian_or_derivative ]; then
-        print "Adding the ece init.d script to the default run levels..."
-        run update-rc.d ece defaults \
-            1>>$log 2>>$log
-    else
-        print "You remember to add /etc/intit.d/ece to the desired runlevels" 
-        # TODO add init.d to the default runlevels, for other
-        # distributions too:
-        # - RedHat/chekcconfig
-        # - Gentoo: rc-update add ece default
-    fi
 }
 
 function set_up_ecedb()
@@ -892,13 +866,11 @@ function set_correct_permissions()
     done
     
     if [ -d "$tomcat_base" ]; then
-        run chown -R ${ece_user}:${ece_group} $tomcat_base \
-        1>>$log 2>>$log
+        run chown -R ${ece_user}:${ece_group} $tomcat_base
     fi
 
     if [ $(ls /tmp | grep ^ece | wc -l) -gt 0 ]; then
-        run chown -R ${ece_user}:${ece_group} /tmp/ece-* \
-            1>>$log 2>>$log
+        run chown -R ${ece_user}:${ece_group} /tmp/ece-*
     fi
 }
 
@@ -957,8 +929,7 @@ function create_publication_in_db()
         -F "type=webapp" \
         -F "resourceFile=@${1}" \
         --cookie JSESSIONID="$cookie" \
-        "${ece_admin_uri}/do/publication/resource" \
-        1>>$log 2>>$log
+        "${ece_admin_uri}/do/publication/resource"
     
     run curl --silent  \
         -F "name=${publication_name}" \
@@ -966,8 +937,7 @@ function create_publication_in_db()
         -F "adminPassword=${publication_name}" \
         -F "adminPasswordConfirm=${publication_name}" \
         --cookie JSESSIONID="$cookie" \
-        "${ece_admin_uri}/do/publication/insert" \
-        1>>$log 2>>$log
+        "${ece_admin_uri}/do/publication/insert"
 }
 
 function create_publication_definition_and_war()
@@ -1000,8 +970,7 @@ EOF
     if [ -d /opt/escenic/widget-framework-core-* ]; then
         print "Basing ${publication_name}.war on the Widget Framework Demo ..."
         run cd /opt/escenic/widget-framework-core-*/publications/demo-core
-        run mvn package \
-            1>>$log 2>>$log
+        run mvn package
         run cp target/demo-core-*.war ${publication_war}
     else
         print "Basing your ${publication_name}.war on ECE/demo-clean ..."
@@ -1069,8 +1038,7 @@ function set_up_user_enviornment()
 
     if [ $(grep bash_completion.d/ece /home/$ece_user/.bashrc 2>/dev/null | \
         wc -l) -lt 1 ]; then
-        run echo ". /etc/bash_completion.d/ece" \
-            >> /home/$ece_user/.bashrc
+        run echo ". /etc/bash_completion.d/ece"
     fi
 }
 
@@ -1104,10 +1072,15 @@ function un_install_ece()
         /usr/bin/ece \
         /var/log/escenic/ \
         /etc/apt/sources.list.d/escenic.list \
-#        $HOME/.m2 \
         /var/run/ece-install.pid
+#        $HOME/.m2 \
+
+    # remove the Varnish key
+    apt-key remove C4DEFFEB
+    # remove the Percona key
+    apt-key remove CD2EFD2A
 
-    apt-get --yes --purge remove \
+    for el in \
         ant \
         ant-contrib \
         ant-optional \
@@ -1117,7 +1090,10 @@ function un_install_ece()
         munin* \
         percona* \
         varnish \
-        sun-java6-jdk
+        sun-java6-jdk \
+        ; do
+        apt-get --yes --purge remove $el
+    done
     
     apt-get clean
 }
@@ -1364,10 +1340,10 @@ function add_apt_source()
     escenic_sources=/etc/apt/sources.list.d/escenic.list
     if [ ! -e $escenic_sources ]; then
         echo "$@" >> $escenic_sources
-        run apt-get update 1>>$log 2>>$log
+        run apt-get update
     elif [ $(grep "$@" $escenic_sources | wc -l) -lt 1 ]; then
         echo "$@" >> $escenic_sources
-        run apt-get update 1>>$log 2>>$log
+        run apt-get update
     fi
 }
 
@@ -1376,8 +1352,12 @@ function install_cache_server()
     print "Installing a caching server on $HOSTNAME ..."
 
     if [ $on_debian_or_derivative -eq 1 ]; then
-        run curl http://repo.varnish-cache.org/debian/GPG-key.txt 2>>$log | \
-            apt-key add - 1>>$log 2>>$log
+        curl --silent \
+            http://repo.varnish-cache.org/debian/GPG-key.txt \
+            2>> $log | \
+            apt-key add - \
+            1>>$log 2>>$log
+        run apt-get update
     fi
     
     if [ $on_debian -eq 1 ]; then
@@ -1447,13 +1427,14 @@ function install_database_server()
             print "Installing the Percona database ..."
 
             if [ $(apt-key list| grep CD2EFD2A | wc -l) -lt 1 ]; then
-                run gpg --keyserver hkp://keys.gnupg.net \
+                gpg --keyserver hkp://keys.gnupg.net \
                     -a \
                     --export 1C4CBDCDCD2EFD2A | \
                     apt-key add - \
                     1>>$log 2>>$log
-                run gpg -a --export CD2EFD2A | apt-key add - \
+                gpg -a --export CD2EFD2A | apt-key add - \
                     1>>$log 2>>$log
+                run apt-get update
             fi
             add_apt_source "deb http://repo.percona.com/apt ${code_name} main"
             packages="percona-server-server percona-server-client"
@@ -1800,7 +1781,7 @@ EOF
     assert_pre_prequesite mvn
     wf_maven_dir=$(echo /opt/escenic/widget-framework-core-*/maven)
     cd $wf_maven_dir
-    print "Installing Widget Framework into your local Maven repository ..."
+    print "Installing Widget Framework into your Maven repository ..."
     export JAVA_HOME=$java_home
     mvn install \
         1>>$log 2>>$log
@@ -1942,15 +1923,13 @@ function install_munin_node()
 
     # install the escenic_jstat munin plugin
     file=/usr/share/munin/plugins/escenic_jstat_
-    wget https://github.com/mogsie/escenic-munin/raw/master/escenic_jstat_ \
-        -O $file \
-        1>>$log 2>>$log
+    run wget \
+        --continue \
+        --inet4-only \
+        https://github.com/mogsie/escenic-munin/raw/master/escenic_jstat_ \
+        -O $file
     run chmod 755 $file
 
-    # TODO hack to get escenic_jstat to work with the new ece scripts.
-    cd $(dirname $file)
-    run patch -p1 < $download_dir/escenic_jstat_.diff
-
     escenic_jstat_modules="_gc _gcoverhead _heap _uptime"
     for el in /etc/escenic/ece-*.conf; do
         current_instance=$(basename ${el} | \
@@ -1984,8 +1963,33 @@ function install_munin_node()
     add_next_step "- A Munin node has been installed on $HOSTNAME"
 }
 
+function add_server_to_runlevels()
+{
+    # no need to add init.d scripts to the runlevel(s) for these
+    # profiles
+    if [ $install_profile_number -eq $PROFILE_WIDGET_FRAMEWORK -o \
+         $install_profile_number -eq $PROFILE_SEARCH_SERVER -o \
+         $install_profile_number -eq $PROFILE_DB_SERVER -o \
+         $install_profile_number -eq $PROFILE_CACHE_SERVER ]; then
+        return
+    fi
+
+    if [ $on_debian_or_derivative ]; then
+        print "Adding the ece init.d script to the default run levels ..."
+        run update-rc.d ece defaults
+    else
+        add_next_step "- Remember to add /etc/intit.d/ece to the desired"
+        add_next_step "  run levels." 
+        # TODO add init.d to the default runlevels, for other
+        # distributions too:
+        # - RedHat/chekcconfig
+        # - Gentoo: rc-update add ece default
+    fi
+}
+
 function common_post_install()
 {
+    add_server_to_runlevels
     install_munin_node
     print_status_and_next_steps
     rm $pid_file
@@ -2010,15 +2014,12 @@ if [ $fai_enabled -eq 1 ]; then
     if [ $(get_boolean_conf_value fai_all_install) -eq 1 ]; then
         install_profile_number=$PROFILE_ALL_IN_ONE
         install_all_in_one_environment
-        common_post_install
     elif [ $(get_boolean_conf_value fai_editor_install) -eq 1 ]; then
         install_profile_number=$PROFILE_EDITORIAL_SERVER
         install_editorial_server
-        common_post_install
     elif [ $(get_boolean_conf_value fai_db_install) -eq 1 ]; then
         install_profile_number=$PROFILE_DB_SERVER
         install_database_server
-        common_post_install
     elif [ $(get_boolean_conf_value fai_cache_install) -eq 1 ]; then
         install_profile_number=$PROFILE_CACHE_SERVER
         install_cache_server

From 3f8806735c5209c427b60cf9257e85f6caa0f6b6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 15 Sep 2011 15:29:50 +0800
Subject: [PATCH 0039/2585] - added information about the web server and Munin

---
 usr/share/doc/escenic/ece-install-guide.org | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 12b6f5be..d8e572a3 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -120,6 +120,14 @@ Select 1-7 and press ENTER
   8 - Install Widget Framework. This will also set up a WF based 
       publication for you (repo.escenic.com user/pass required).
 #+END_SRC
+** Common for All Server Profiles
+The script will install a Munin node on the host. It will also
+install the Escenic specific Munin plugins on hosts where there are
+any Escenic server components.
+
+TBD: there is currently an issue with the Escenic plugins not working
+properly with the new ece/ece-install scripts. We're working on this.
+
 ** Common for Editorial, Presentation and Search Instances
 *** Sun Java 6
 *** Apache Tomcat application server
@@ -200,6 +208,7 @@ If ece-install is run on a different platform, the admin must install
 Varnish 3.x prior to running ece-install.
 
 The script will configure Varnish for a typical Escenic site:
+- it will set up the cache server on port 80
 - will set up an access control lists of IPs which may access the
   privileged web applications such as /escenic-admin, /escenic and
   /webservice.
@@ -215,13 +224,18 @@ The script will configure Varnish for a typical Escenic site:
   different backend servers that will serve the web site.
 - will set up configuration to strip away cookies from static
   resources, such as CSS, JS and pictures.
+- will install the nginx web server for serving static content and
+  will configure Varnish accordingly. This will be very useful for
+  Adactus servers wanting to pull content from your ECEs.
+- will install a Munin gatherer and make its interface available 
+  when accesssing the web server directly (port 81) 
 
 TBD:
 - If run on a Linux platform, the script will tweak the kernel
   parameters for optimal TCP handling for a web facing server.
-- Will install the nginx web server for serving static content and
-  will configure Varnish accordingly. This will be very useful for
-  Adactus servers wanting to pull content from your ECEs.
+- let the /munin run through on port 80, requiring the connecting IPs
+  to be in the staff network ACL, defined in the Varnish
+  configuration. 
 
 ** 8 - Install Widget Framework
 You'll need a user name and password for accessing the

From c9a8bc45f742d2f51e7201062f447047e5a9e316 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 15 Sep 2011 15:30:19 +0800
Subject: [PATCH 0040/2585] - updated the HTML and TXT

---
 usr/share/doc/escenic/ece-install-guide.html | 226 ++++++++-----------
 usr/share/doc/escenic/ece-install-guide.txt  | 154 +++++--------
 2 files changed, 141 insertions(+), 239 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.html b/usr/share/doc/escenic/ece-install-guide.html
index d4ad2eca..7b7ba0cf 100644
--- a/usr/share/doc/escenic/ece-install-guide.html
+++ b/usr/share/doc/escenic/ece-install-guide.html
@@ -7,7 +7,7 @@
 <title>Welcome to the /usr/sbin/ece-install Guide</title>
 <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
 <meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2011-09-12 19:02:48 CST"/>
+<meta name="generated" content="2011-09-15 15:29:55 CST"/>
 <meta name="author" content="Torstein Krause Johansen"/>
 <meta name="description" content=""/>
 <meta name="keywords" content=""/>
@@ -227,24 +227,25 @@ <h2>Table of Contents</h2>
 <li><a href="#sec-4">4 Running the ece-install Script </a></li>
 <li><a href="#sec-5">5 Available Server Profiles </a>
 <ul>
-<li><a href="#sec-5-1">5.1 Common for Editorial, Presentation and Search Instances </a>
+<li><a href="#sec-5-1">5.1 Common for All Server Profiles </a></li>
+<li><a href="#sec-5-2">5.2 Common for Editorial, Presentation and Search Instances </a>
 <ul>
-<li><a href="#sec-5-1-1">5.1.1 Sun Java 6 </a></li>
-<li><a href="#sec-5-1-2">5.1.2 Apache Tomcat application server </a></li>
-<li><a href="#sec-5-1-3">5.1.3 Basic Escenic Nursery configuration </a></li>
-<li><a href="#sec-5-1-4">5.1.4 APR, native library for optimal Tomcat I/O performance </a></li>
-<li><a href="#sec-5-1-5">5.1.5 Escenic Assembly environment </a></li>
-<li><a href="#sec-5-1-6">5.1.6 Database driver </a></li>
-<li><a href="#sec-5-1-7">5.1.7 Compression of content </a></li>
+<li><a href="#sec-5-2-1">5.2.1 Sun Java 6 </a></li>
+<li><a href="#sec-5-2-2">5.2.2 Apache Tomcat application server </a></li>
+<li><a href="#sec-5-2-3">5.2.3 Basic Escenic Nursery configuration </a></li>
+<li><a href="#sec-5-2-4">5.2.4 APR, native library for optimal Tomcat I/O performance </a></li>
+<li><a href="#sec-5-2-5">5.2.5 Escenic Assembly environment </a></li>
+<li><a href="#sec-5-2-6">5.2.6 Database driver </a></li>
+<li><a href="#sec-5-2-7">5.2.7 Compression of content </a></li>
 </ul>
 </li>
-<li><a href="#sec-5-2">5.2 1 - Full Stack on One Host </a></li>
-<li><a href="#sec-5-3">5.3 2 - Editorial Server (Publication Server) </a></li>
-<li><a href="#sec-5-4">5.4 3 - Presentation Server </a></li>
-<li><a href="#sec-5-5">5.5 4 - Database Server </a></li>
-<li><a href="#sec-5-6">5.6 5 - Cache Server </a></li>
-<li><a href="#sec-5-7">5.7 8 - Install Widget Framework </a></li>
-<li><a href="#sec-5-8">5.8 9 - Create Publication </a></li>
+<li><a href="#sec-5-3">5.3 1 - Full Stack on One Host </a></li>
+<li><a href="#sec-5-4">5.4 2 - Editorial Server (Publication Server) </a></li>
+<li><a href="#sec-5-5">5.5 3 - Presentation Server </a></li>
+<li><a href="#sec-5-6">5.6 4 - Database Server </a></li>
+<li><a href="#sec-5-7">5.7 5 - Cache Server </a></li>
+<li><a href="#sec-5-8">5.8 8 - Install Widget Framework </a></li>
+<li><a href="#sec-5-9">5.9 9 - Create Publication </a></li>
 </ul>
 </li>
 <li><a href="#sec-6">6 Full Automatic Install (FAI) </a></li>
@@ -508,23 +509,39 @@ <h2 id="sec-5"><span class="section-number-2">5</span> Available Server Profiles
 </div>
 
 <div id="outline-container-5-1" class="outline-3">
-<h3 id="sec-5-1"><span class="section-number-3">5.1</span> Common for Editorial, Presentation and Search Instances </h3>
+<h3 id="sec-5-1"><span class="section-number-3">5.1</span> Common for All Server Profiles </h3>
 <div class="outline-text-3" id="text-5-1">
 
+<p>The script will install a Munin node on the host. It will also
+install the Escenic specific Munin plugins on hosts where there are
+any Escenic server components.
+</p>
+<p>
+TBD: there is currently an issue with the Escenic plugins not working
+properly with the new ece/ece-install scripts. We're working on this.
+</p>
+</div>
 
 </div>
 
-<div id="outline-container-5-1-1" class="outline-4">
-<h4 id="sec-5-1-1"><span class="section-number-4">5.1.1</span> Sun Java 6 </h4>
-<div class="outline-text-4" id="text-5-1-1">
+<div id="outline-container-5-2" class="outline-3">
+<h3 id="sec-5-2"><span class="section-number-3">5.2</span> Common for Editorial, Presentation and Search Instances </h3>
+<div class="outline-text-3" id="text-5-2">
+
+
+</div>
+
+<div id="outline-container-5-2-1" class="outline-4">
+<h4 id="sec-5-2-1"><span class="section-number-4">5.2.1</span> Sun Java 6 </h4>
+<div class="outline-text-4" id="text-5-2-1">
 
 </div>
 
 </div>
 
-<div id="outline-container-5-1-2" class="outline-4">
-<h4 id="sec-5-1-2"><span class="section-number-4">5.1.2</span> Apache Tomcat application server </h4>
-<div class="outline-text-4" id="text-5-1-2">
+<div id="outline-container-5-2-2" class="outline-4">
+<h4 id="sec-5-2-2"><span class="section-number-4">5.2.2</span> Apache Tomcat application server </h4>
+<div class="outline-text-4" id="text-5-2-2">
 
 <ul>
 <li>Compression of textual content (previously, this was typically set
@@ -544,9 +561,9 @@ <h4 id="sec-5-1-2"><span class="section-number-4">5.1.2</span> Apache Tomcat app
 
 </div>
 
-<div id="outline-container-5-1-3" class="outline-4">
-<h4 id="sec-5-1-3"><span class="section-number-4">5.1.3</span> Basic Escenic Nursery configuration </h4>
-<div class="outline-text-4" id="text-5-1-3">
+<div id="outline-container-5-2-3" class="outline-4">
+<h4 id="sec-5-2-3"><span class="section-number-4">5.2.3</span> Basic Escenic Nursery configuration </h4>
+<div class="outline-text-4" id="text-5-2-3">
 
 <p>The basic Nursery configuration is taken care of for you, including RMI,
   database, search and application server/URIs. 
@@ -554,17 +571,17 @@ <h4 id="sec-5-1-3"><span class="section-number-4">5.1.3</span> Basic Escenic Nur
 
 </div>
 
-<div id="outline-container-5-1-4" class="outline-4">
-<h4 id="sec-5-1-4"><span class="section-number-4">5.1.4</span> APR, native library for optimal Tomcat I/O performance </h4>
-<div class="outline-text-4" id="text-5-1-4">
+<div id="outline-container-5-2-4" class="outline-4">
+<h4 id="sec-5-2-4"><span class="section-number-4">5.2.4</span> APR, native library for optimal Tomcat I/O performance </h4>
+<div class="outline-text-4" id="text-5-2-4">
 
 </div>
 
 </div>
 
-<div id="outline-container-5-1-5" class="outline-4">
-<h4 id="sec-5-1-5"><span class="section-number-4">5.1.5</span> Escenic Assembly environment </h4>
-<div class="outline-text-4" id="text-5-1-5">
+<div id="outline-container-5-2-5" class="outline-4">
+<h4 id="sec-5-2-5"><span class="section-number-4">5.2.5</span> Escenic Assembly environment </h4>
+<div class="outline-text-4" id="text-5-2-5">
 
 <p>The reason why ece-install sets this up on each host, is to make the
 installation process as smooth as possible. The assembly environment
@@ -574,18 +591,18 @@ <h4 id="sec-5-1-5"><span class="section-number-4">5.1.5</span> Escenic Assembly
 
 </div>
 
-<div id="outline-container-5-1-6" class="outline-4">
-<h4 id="sec-5-1-6"><span class="section-number-4">5.1.6</span> Database driver </h4>
-<div class="outline-text-4" id="text-5-1-6">
+<div id="outline-container-5-2-6" class="outline-4">
+<h4 id="sec-5-2-6"><span class="section-number-4">5.2.6</span> Database driver </h4>
+<div class="outline-text-4" id="text-5-2-6">
 
 
 </div>
 
 </div>
 
-<div id="outline-container-5-1-7" class="outline-4">
-<h4 id="sec-5-1-7"><span class="section-number-4">5.1.7</span> Compression of content </h4>
-<div class="outline-text-4" id="text-5-1-7">
+<div id="outline-container-5-2-7" class="outline-4">
+<h4 id="sec-5-2-7"><span class="section-number-4">5.2.7</span> Compression of content </h4>
+<div class="outline-text-4" id="text-5-2-7">
 
 <p>This was was previously accomplished by having a web server in fron t
 of the application server (or cache server if you used ESI). A typical
@@ -600,9 +617,9 @@ <h4 id="sec-5-1-7"><span class="section-number-4">5.1.7</span> Compression of co
 
 </div>
 
-<div id="outline-container-5-2" class="outline-3">
-<h3 id="sec-5-2"><span class="section-number-3">5.2</span> 1 - Full Stack on One Host </h3>
-<div class="outline-text-3" id="text-5-2">
+<div id="outline-container-5-3" class="outline-3">
+<h3 id="sec-5-3"><span class="section-number-3">5.3</span> 1 - Full Stack on One Host </h3>
+<div class="outline-text-3" id="text-5-3">
 
 <p>This profile is suitable for developers and admins wanting to set up a
 test environment. It will install the full stack including caching
@@ -618,9 +635,9 @@ <h3 id="sec-5-2"><span class="section-number-3">5.2</span> 1 - Full Stack on One
 
 </div>
 
-<div id="outline-container-5-3" class="outline-3">
-<h3 id="sec-5-3"><span class="section-number-3">5.3</span> 2 - Editorial Server (Publication Server) </h3>
-<div class="outline-text-3" id="text-5-3">
+<div id="outline-container-5-4" class="outline-3">
+<h3 id="sec-5-4"><span class="section-number-3">5.4</span> 2 - Editorial Server (Publication Server) </h3>
+<div class="outline-text-3" id="text-5-4">
 
 
 
@@ -628,9 +645,9 @@ <h3 id="sec-5-3"><span class="section-number-3">5.3</span> 2 - Editorial Server
 
 </div>
 
-<div id="outline-container-5-4" class="outline-3">
-<h3 id="sec-5-4"><span class="section-number-3">5.4</span> 3 - Presentation Server </h3>
-<div class="outline-text-3" id="text-5-4">
+<div id="outline-container-5-5" class="outline-3">
+<h3 id="sec-5-5"><span class="section-number-3">5.5</span> 3 - Presentation Server </h3>
+<div class="outline-text-3" id="text-5-5">
 
 <p>This will set up a typical presentation server:
 </p><ul>
@@ -649,9 +666,9 @@ <h3 id="sec-5-4"><span class="section-number-3">5.4</span> 3 - Presentation Serv
 
 </div>
 
-<div id="outline-container-5-5" class="outline-3">
-<h3 id="sec-5-5"><span class="section-number-3">5.5</span> 4 - Database Server </h3>
-<div class="outline-text-3" id="text-5-5">
+<div id="outline-container-5-6" class="outline-3">
+<h3 id="sec-5-6"><span class="section-number-3">5.6</span> 4 - Database Server </h3>
+<div class="outline-text-3" id="text-5-6">
 
 <p>If ece-install is run on a support version of Debian or Ubuntu, this
 will install the excellent Percona distribution of MySQL with their
@@ -686,9 +703,9 @@ <h3 id="sec-5-5"><span class="section-number-3">5.5</span> 4 - Database Server <
 
 </div>
 
-<div id="outline-container-5-6" class="outline-3">
-<h3 id="sec-5-6"><span class="section-number-3">5.6</span> 5 - Cache Server </h3>
-<div class="outline-text-3" id="text-5-6">
+<div id="outline-container-5-7" class="outline-3">
+<h3 id="sec-5-7"><span class="section-number-3">5.7</span> 5 - Cache Server </h3>
+<div class="outline-text-3" id="text-5-7">
 
 <p>If ece-install is run on a support version of Debian or Ubuntu, it
 will install the latest Varnish 3.0 caching server from the Varnish
@@ -701,6 +718,8 @@ <h3 id="sec-5-6"><span class="section-number-3">5.6</span> 5 - Cache Server </h3
 <p>
 The script will configure Varnish for a typical Escenic site:
 </p><ul>
+<li>it will set up the cache server on port 80
+</li>
 <li>will set up an access control lists of IPs which may access the
   privileged web applications such as /escenic-admin, /escenic and
   /webservice.
@@ -721,6 +740,13 @@ <h3 id="sec-5-6"><span class="section-number-3">5.6</span> 5 - Cache Server </h3
 <li>will set up configuration to strip away cookies from static
   resources, such as CSS, JS and pictures.
 </li>
+<li>will install the nginx web server for serving static content and
+  will configure Varnish accordingly. This will be very useful for
+  Adactus servers wanting to pull content from your ECEs.
+</li>
+<li>will install a Munin gatherer and make its interface available 
+  when accesssing the web server directly (port 81) 
+</li>
 </ul>
 
 
@@ -730,9 +756,9 @@ <h3 id="sec-5-6"><span class="section-number-3">5.6</span> 5 - Cache Server </h3
 <li>If run on a Linux platform, the script will tweak the kernel
   parameters for optimal TCP handling for a web facing server.
 </li>
-<li>Will install the nginx web server for serving static content and
-  will configure Varnish accordingly. This will be very useful for
-  Adactus servers wanting to pull content from your ECEs.
+<li>let the /munin run through on port 80, requiring the connecting IPs
+  to be in the staff network ACL, defined in the Varnish
+  configuration. 
 </li>
 </ul>
 
@@ -741,9 +767,9 @@ <h3 id="sec-5-6"><span class="section-number-3">5.6</span> 5 - Cache Server </h3
 
 </div>
 
-<div id="outline-container-5-7" class="outline-3">
-<h3 id="sec-5-7"><span class="section-number-3">5.7</span> 8 - Install Widget Framework </h3>
-<div class="outline-text-3" id="text-5-7">
+<div id="outline-container-5-8" class="outline-3">
+<h3 id="sec-5-8"><span class="section-number-3">5.8</span> 8 - Install Widget Framework </h3>
+<div class="outline-text-3" id="text-5-8">
 
 <p>You'll need a user name and password for accessing the
 repo.escenic.com Maven repository. You should get these credentials
@@ -767,9 +793,9 @@ <h3 id="sec-5-7"><span class="section-number-3">5.7</span> 8 - Install Widget Fr
 
 </div>
 
-<div id="outline-container-5-8" class="outline-3">
-<h3 id="sec-5-8"><span class="section-number-3">5.8</span> 9 - Create Publication </h3>
-<div class="outline-text-3" id="text-5-8">
+<div id="outline-container-5-9" class="outline-3">
+<h3 id="sec-5-9"><span class="section-number-3">5.9</span> 9 - Create Publication </h3>
+<div class="outline-text-3" id="text-5-9">
 
 <p>This profile will create a publication for you, only asking you the
 name of the publication and which ECE instance to use for its
@@ -1049,87 +1075,15 @@ <h2 id="sec-12"><span class="section-number-2">12</span> Example Output FAI </h2
 
 <p>
 The following output is produced from ece-install:
+CANNOT INCLUDE FILE /tmp/ece-install.out
 </p>
-
-
-<pre class="example">root@ubiquitous-7:~# bash ece-install
-[ece-install-0] Full Automatic Install (FAI) enabled.
-[ece-install-0] All user input will be read from /root/.ece-install.conf
-[ece-install-0] I'm logging to /var/log/ece-install.log
-[ece-install-1] Stopping conflicting processes ...
-[ece-install-1] Installing 3rd party packages needed by ece-install ...
-[ece-install-2] Setting up the ece UNIX scripts ...
-[ece-install-5] Adding the ece init.d script to the default run levels...
-[ece-install-5] Setting up the doesnt user's UNIX environment ...
-[ece-install-5] Installing an all-in-one environment on ubiquitous-7 ...
-[ece-install-5] Installing the database server on ubiquitous-7 ...
-[ece-install-5] Installing the Percona database ...
-[ece-install-65] Downloading Escenic software from technet.escenic.com ...
-[ece-install-66] Setting up the Escenic Content Engine &amp; its plugins ...
-[ece-install-76] Setting up the ECE database schema ...
-[ece-install-90] Installing 3rd party packages needed by ECE ...
-[ece-install-106] Setting up the Assembly Tool ...
-[ece-install-110] Setting up the basic Nursery configuration ...
-[ece-install-110] Setting up the application server ...
-[ece-install-116] Setting up proper log4j &amp; Java logging configuration ...
-[ece-install-116] Setting correct permissions on ECE related directories ...
-[ece-install-116] Assembling, deploying &amp; starting dev1 ...
-[ece-install-183] Installing a caching server on ubiquitous-7 ...
-[ece-install-215] Setting up Varnish to match your environment ...
-[ece-install-220] Setting up solr ...
-[ece-install-221] Creating a Maven settings file: /root/.m2/settings.xml ...
-[ece-install-221] Downloading Widget Framework from technet.escenic.com ...
-[ece-install-259] Installing Widget Framework into your local Maven repository ...
-[ece-install-318] Getting ready to create a new publiation ...
-[ece-install-318] Setting up the mypub publication ...
-[ece-install-318] Basing mypub.war on the Widget Framework Demo ...
-[ece-install-344] Creating publication mypub using dev1 ...
-[ece-install-382] Assembling, deploying &amp; starting dev1 ...
-[ece-install-503] - The installation is now complete! It took 0d 0h 8m 22s
-[ece-install-90] - DB is now set up on ubiquitous-7:3306
-[ece-install-181] - New ECE instance dev1 installed.
-[ece-install-181] - Its admin interface is available at
-[ece-install-181]   http://ubiquitous-7:8080/escenic-admin
-[ece-install-181] - You can view all installed plugin &amp; engine versions with:
-[ece-install-181]   ece -i dev1 versions
-[ece-install-182] - type 'ece help' to see all the options of this script
-[ece-install-182]   which allows you to control all the Escenic components.
-[ece-install-182]   Also, see /usr/share/doc/escenic/ece-guide.txt for
-[ece-install-182]   addtional information on the ece script.
-[ece-install-183] - Verify that /etc/default/ece lists all the instances 
-[ece-install-183]   on ubiquitous-7 you wish to start at boot time.
-[ece-install-220] - Cache server is up and running at http://ubiquitous-7:80/
-[ece-install-317] - Widget Framework has been installed into your local
-[ece-install-318]   Maven repository and its ECE components have been installed
-[ece-install-502] - a new publication mypub has been created
-[ece-install-503] - See /usr/share/doc/escenic/ece-install-guide.txt for
-[ece-install-503]   a full overview of files and directories set up by
-[ece-install-504]   ece-install
-[ece-install-504] - type 'ece help' to see all the options of this script
-[ece-install-504]   which allows you to control all the Escenic components.
-[ece-install-504]   Also, see /usr/share/doc/escenic/ece-guide.txt for
-[ece-install-505]   further information on the ece script.
-[ece-install-505] - For further reading, in-depth guides on installing, 
-[ece-install-505]   configuring and developing Escenic web sites can be 
-[ece-install-505]   fount at http://documentation.vizrt.com/ece-5.3.html
-[ece-install-506]
-[ece-install-506] Enjoy your time with Escenic Content Engine!
-[ece-install-506]
-[ece-install-506] -Vizrt Online
-
-
-</pre>
-
-
-
-
 </div>
 </div>
 <div id="postamble">
 <hr/>
 <p class="author">
   Author: Torstein Krause Johansen (<a href="mailto:tkj@vizrt.com">tkj@vizrt.com</a>)
-  Date: 2011-09-12 19:02:48 CST
+  Date: 2011-09-15 15:29:55 CST
 </p></div>
 </div>
 </body>
diff --git a/usr/share/doc/escenic/ece-install-guide.txt b/usr/share/doc/escenic/ece-install-guide.txt
index ce9cb86a..a4a85655 100644
--- a/usr/share/doc/escenic/ece-install-guide.txt
+++ b/usr/share/doc/escenic/ece-install-guide.txt
@@ -2,7 +2,7 @@
               ==========================================
 
 Author: Torstein Krause Johansen
-Date: 2011-09-12 19:02:40 CST
+Date: 2011-09-15 15:29:53 CST
 
 
 Table of Contents
@@ -14,21 +14,22 @@ Table of Contents
 3 Downloading the ece-install Script 
 4 Running the ece-install Script 
 5 Available Server Profiles 
-    5.1 Common for Editorial, Presentation and Search Instances 
-        5.1.1 Sun Java 6 
-        5.1.2 Apache Tomcat application server 
-        5.1.3 Basic Escenic Nursery configuration 
-        5.1.4 APR, native library for optimal Tomcat I/O performance 
-        5.1.5 Escenic Assembly environment 
-        5.1.6 Database driver 
-        5.1.7 Compression of content 
-    5.2 1 - Full Stack on One Host 
-    5.3 2 - Editorial Server (Publication Server) 
-    5.4 3 - Presentation Server 
-    5.5 4 - Database Server 
-    5.6 5 - Cache Server 
-    5.7 8 - Install Widget Framework 
-    5.8 9 - Create Publication 
+    5.1 Common for All Server Profiles 
+    5.2 Common for Editorial, Presentation and Search Instances 
+        5.2.1 Sun Java 6 
+        5.2.2 Apache Tomcat application server 
+        5.2.3 Basic Escenic Nursery configuration 
+        5.2.4 APR, native library for optimal Tomcat I/O performance 
+        5.2.5 Escenic Assembly environment 
+        5.2.6 Database driver 
+        5.2.7 Compression of content 
+    5.3 1 - Full Stack on One Host 
+    5.4 2 - Editorial Server (Publication Server) 
+    5.5 3 - Presentation Server 
+    5.6 4 - Database Server 
+    5.7 5 - Cache Server 
+    5.8 8 - Install Widget Framework 
+    5.9 9 - Create Publication 
 6 Full Automatic Install (FAI) 
 7 Running More Than One Installation Process 
 8 Re-running ece-install (and How To Speed It Up) 
@@ -199,13 +200,22 @@ want to install:
 
 
 
-5.1 Common for Editorial, Presentation and Search Instances 
+5.1 Common for All Server Profiles 
+===================================
+The script will install a Munin node on the host. It will also
+install the Escenic specific Munin plugins on hosts where there are
+any Escenic server components.
+
+TBD: there is currently an issue with the Escenic plugins not working
+properly with the new ece/ece-install scripts. We're working on this.
+
+5.2 Common for Editorial, Presentation and Search Instances 
 ============================================================
 
-5.1.1 Sun Java 6 
+5.2.1 Sun Java 6 
 ~~~~~~~~~~~~~~~~~
 
-5.1.2 Apache Tomcat application server 
+5.2.2 Apache Tomcat application server 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 - Compression of textual content (previously, this was typically set
   up with Apache and its mod\_deflate module).
@@ -214,24 +224,24 @@ want to install:
 - routing information in the cookies
 - application server access log
 
-5.1.3 Basic Escenic Nursery configuration 
+5.2.3 Basic Escenic Nursery configuration 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 The basic Nursery configuration is taken care of for you, including RMI,
   database, search and application server/URIs. 
 
-5.1.4 APR, native library for optimal Tomcat I/O performance 
+5.2.4 APR, native library for optimal Tomcat I/O performance 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-5.1.5 Escenic Assembly environment 
+5.2.5 Escenic Assembly environment 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 The reason why ece-install sets this up on each host, is to make the
 installation process as smooth as possible. The assembly environment
 may be removed after the installation if you want to.
 
-5.1.6 Database driver 
+5.2.6 Database driver 
 ~~~~~~~~~~~~~~~~~~~~~~
 
-5.1.7 Compression of content 
+5.2.7 Compression of content 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 This was was previously accomplished by having a web server in fron t
 of the application server (or cache server if you used ESI). A typical
@@ -241,7 +251,7 @@ compressed content (and many other things that we before needed Apache
 for). Thus, we'll let the application server do the compression for us
 now.
 
-5.2 1 - Full Stack on One Host 
+5.3 1 - Full Stack on One Host 
 ===============================
 This profile is suitable for developers and admins wanting to set up a
 test environment. It will install the full stack including caching
@@ -252,11 +262,11 @@ For further details on each of the different server components, see
 the different profile descriptions bellow.
 
 
-5.3 2 - Editorial Server (Publication Server) 
+5.4 2 - Editorial Server (Publication Server) 
 ==============================================
 
 
-5.4 3 - Presentation Server 
+5.5 3 - Presentation Server 
 ============================
 This will set up a typical presentation server:
 - Memcached, distributed memory cache
@@ -265,7 +275,7 @@ This will set up a typical presentation server:
 - Deployment setup to only deploy escenic-admin and the
   publication(s).
 
-5.5 4 - Database Server 
+5.6 4 - Database Server 
 ========================
 If ece-install is run on a support version of Debian or Ubuntu, this
 will install the excellent Percona distribution of MySQL with their
@@ -290,7 +300,7 @@ The script will fail by itself if the DB already exists:
 
 
 
-5.6 5 - Cache Server 
+5.7 5 - Cache Server 
 =====================
 If ece-install is run on a support version of Debian or Ubuntu, it
 will install the latest Varnish 3.0 caching server from the Varnish
@@ -300,6 +310,7 @@ If ece-install is run on a different platform, the admin must install
 Varnish 3.x prior to running ece-install.
 
 The script will configure Varnish for a typical Escenic site:
+- it will set up the cache server on port 80
 - will set up an access control lists of IPs which may access the
   privileged web applications such as /escenic-admin, /escenic and
   /webservice.
@@ -315,15 +326,20 @@ The script will configure Varnish for a typical Escenic site:
   different backend servers that will serve the web site.
 - will set up configuration to strip away cookies from static
   resources, such as CSS, JS and pictures.
+- will install the nginx web server for serving static content and
+  will configure Varnish accordingly. This will be very useful for
+  Adactus servers wanting to pull content from your ECEs.
+- will install a Munin gatherer and make its interface available 
+  when accesssing the web server directly (port 81) 
 
 TBD:
 - If run on a Linux platform, the script will tweak the kernel
   parameters for optimal TCP handling for a web facing server.
-- Will install the nginx web server for serving static content and
-  will configure Varnish accordingly. This will be very useful for
-  Adactus servers wanting to pull content from your ECEs.
+- let the /munin run through on port 80, requiring the connecting IPs
+  to be in the staff network ACL, defined in the Varnish
+  configuration. 
 
-5.7 8 - Install Widget Framework 
+5.8 8 - Install Widget Framework 
 =================================
 You'll need a user name and password for accessing the
 repo.escenic.com Maven repository. You should get these credentials
@@ -339,7 +355,7 @@ complain:
 
 
 
-5.8 9 - Create Publication 
+5.9 9 - Create Publication 
 ===========================
 This profile will create a publication for you, only asking you the
 name of the publication and which ECE instance to use for its
@@ -526,73 +542,5 @@ file:
 
 
 The following output is produced from ece-install:
-
-
-  root@ubiquitous-7:~# bash ece-install
-  [ece-install-0] Full Automatic Install (FAI) enabled.
-  [ece-install-0] All user input will be read from /root/.ece-install.conf
-  [ece-install-0] I'm logging to /var/log/ece-install.log
-  [ece-install-1] Stopping conflicting processes ...
-  [ece-install-1] Installing 3rd party packages needed by ece-install ...
-  [ece-install-2] Setting up the ece UNIX scripts ...
-  [ece-install-5] Adding the ece init.d script to the default run levels...
-  [ece-install-5] Setting up the doesnt user's UNIX environment ...
-  [ece-install-5] Installing an all-in-one environment on ubiquitous-7 ...
-  [ece-install-5] Installing the database server on ubiquitous-7 ...
-  [ece-install-5] Installing the Percona database ...
-  [ece-install-65] Downloading Escenic software from technet.escenic.com ...
-  [ece-install-66] Setting up the Escenic Content Engine & its plugins ...
-  [ece-install-76] Setting up the ECE database schema ...
-  [ece-install-90] Installing 3rd party packages needed by ECE ...
-  [ece-install-106] Setting up the Assembly Tool ...
-  [ece-install-110] Setting up the basic Nursery configuration ...
-  [ece-install-110] Setting up the application server ...
-  [ece-install-116] Setting up proper log4j & Java logging configuration ...
-  [ece-install-116] Setting correct permissions on ECE related directories ...
-  [ece-install-116] Assembling, deploying & starting dev1 ...
-  [ece-install-183] Installing a caching server on ubiquitous-7 ...
-  [ece-install-215] Setting up Varnish to match your environment ...
-  [ece-install-220] Setting up solr ...
-  [ece-install-221] Creating a Maven settings file: /root/.m2/settings.xml ...
-  [ece-install-221] Downloading Widget Framework from technet.escenic.com ...
-  [ece-install-259] Installing Widget Framework into your local Maven repository ...
-  [ece-install-318] Getting ready to create a new publiation ...
-  [ece-install-318] Setting up the mypub publication ...
-  [ece-install-318] Basing mypub.war on the Widget Framework Demo ...
-  [ece-install-344] Creating publication mypub using dev1 ...
-  [ece-install-382] Assembling, deploying & starting dev1 ...
-  [ece-install-503] - The installation is now complete! It took 0d 0h 8m 22s
-  [ece-install-90] - DB is now set up on ubiquitous-7:3306
-  [ece-install-181] - New ECE instance dev1 installed.
-  [ece-install-181] - Its admin interface is available at
-  [ece-install-181]   http://ubiquitous-7:8080/escenic-admin
-  [ece-install-181] - You can view all installed plugin & engine versions with:
-  [ece-install-181]   ece -i dev1 versions
-  [ece-install-182] - type 'ece help' to see all the options of this script
-  [ece-install-182]   which allows you to control all the Escenic components.
-  [ece-install-182]   Also, see /usr/share/doc/escenic/ece-guide.txt for
-  [ece-install-182]   addtional information on the ece script.
-  [ece-install-183] - Verify that /etc/default/ece lists all the instances 
-  [ece-install-183]   on ubiquitous-7 you wish to start at boot time.
-  [ece-install-220] - Cache server is up and running at http://ubiquitous-7:80/
-  [ece-install-317] - Widget Framework has been installed into your local
-  [ece-install-318]   Maven repository and its ECE components have been installed
-  [ece-install-502] - a new publication mypub has been created
-  [ece-install-503] - See /usr/share/doc/escenic/ece-install-guide.txt for
-  [ece-install-503]   a full overview of files and directories set up by
-  [ece-install-504]   ece-install
-  [ece-install-504] - type 'ece help' to see all the options of this script
-  [ece-install-504]   which allows you to control all the Escenic components.
-  [ece-install-504]   Also, see /usr/share/doc/escenic/ece-guide.txt for
-  [ece-install-505]   further information on the ece script.
-  [ece-install-505] - For further reading, in-depth guides on installing, 
-  [ece-install-505]   configuring and developing Escenic web sites can be 
-  [ece-install-505]   fount at http://documentation.vizrt.com/ece-5.3.html
-  [ece-install-506]
-  [ece-install-506] Enjoy your time with Escenic Content Engine!
-  [ece-install-506]
-  [ece-install-506] -Vizrt Online
-
-
-
+CANNOT INCLUDE FILE /tmp/ece-install.out
 

From a95beaf3c97125f4ee2b617840bddc7da4ca145b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 15 Sep 2011 18:40:08 +0800
Subject: [PATCH 0041/2585] - updated start screen example

---
 usr/share/doc/escenic/ece-install-guide.org | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index d8e572a3..499e6b59 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -107,18 +107,24 @@ want to install:
 #+BEGIN_SRC sh
 Hi, which server profile do you wish to install?
 
-Select 1-7 and press ENTER
-
-  1 - The full stack on one host. Suitable for development and
-      test environments (cache, ECE, assembly host & database).
-  2 - Editorial (publication) server (ECE, assembly host).
+Select 1-9 and press ENTER
+
+  1 - All in one, the full stack on one host. 
+      Suitable for development and test environments.
+      It will install caching server, ECE, assembly host, database &
+      Widget Framework as well as set up a new publication.
+  2 - Editorial (publication) server.
+      This will install ECE and an assembly host.
   3 - Presentation server (ECE, memcached).
   4 - Database server.
   5 - Cache server (cache & web server).
   6 - RMI hub.
   7 - Standalone search instance (solr + indexer-webapp).
-  8 - Install Widget Framework. This will also set up a WF based 
-      publication for you (repo.escenic.com user/pass required).
+  8 - Install the Widget Framework.
+      (You need user/pass for repo.escenic.com for this).
+  9 - Create a new publication.
+      This profile will create new publication based on WF
+      (if available) or ECE/clean-demo.
 #+END_SRC
 ** Common for All Server Profiles
 The script will install a Munin node on the host. It will also

From 60ca5fbc19b07359c706de63ed7a262fe6595795 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 16 Sep 2011 13:37:33 +0800
Subject: [PATCH 0042/2585] - added get_base_dir_from_bundle - this method is
 used to extract exactly the bundles downloaded   instead of using wildcards.
 This solves the problem when you already   have downloaded the same
 artifacts, but with different   versions. E.g. when you have a previous
 version of Tomcat or Content   Engine installed. - now only added the varnish
 repository if there's an APT repository   for the version of the OS you're
 running.

---
 usr/sbin/ece-install | 58 ++++++++++++++++++++++++++++++++++----------
 1 file changed, 45 insertions(+), 13 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index c844233f..691f9d95 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -35,6 +35,7 @@ git_source=git://github.com/skybert/ece-scripts.git
 appserver_port=8080
 on_debian_or_derivative=0
 on_debian=0
+on_ubuntu=0
 
 # because the all in one profile will run database, search and app
 # server profiles, all of which needs downloading and setting up the
@@ -310,15 +311,21 @@ function set_up_engine_and_plugins()
     make_dir /opt/escenic
     cd /opt/escenic/
 
-    if [ ! -d engine-* ]; then
-        run unzip -u $download_dir/engine*.zip
+    for el in $technet_download_list; do
+        if [ $(basename $el | grep ^engine-[0-9] | wc -l) -gt 0 ]; then
+            engine_dir=$(get_base_dir_from_bundle $el)
+        fi
+    done
+    
+    if [ ! -d ${engine_dir} ]; then
+        run unzip -u $download_dir/${engine_dir}.zip
         if [ -h engine ]; then
             run rm engine
         fi
     
-        run ln -s engine-* engine
+        run ln -s ${engine_dir} engine
     else
-        debug "engine-<version> is already there, skipping to next step."
+        debug "${engine_dir} is already there, skipping to next step."
     fi
 
     # we now extract all the plugins. We extract them in /opt/escenic
@@ -594,6 +601,16 @@ function install_ece_third_party_packages
     done
 }
 
+function get_base_dir_from_bundle()
+{
+    file_name=$(basename $1)
+    for el in .tar.gz .tar.bz2 .zip; do
+        file_name=${file_name%$el}
+    done
+
+    echo $file_name
+}
+
 function set_up_app_server
 {
     print "Setting up the application server ..."
@@ -675,15 +692,20 @@ function set_up_app_server
     
     run cd $download_dir
     run wget --continue --inet4-only $tomcat_download
+    tomcat_dir=$(get_base_dir_from_bundle $tomcat_download)
     
     run cd /opt/
-    run tar xzf $download_dir/apache-tomcat*.tar.gz
-    run ln -sf apache-tomcat* tomcat
+    run tar xzf $download_dir/${tomcat_dir}.tar.gz
+
+    if [ -e tomcat ]; then
+        run rm tomcat
+    fi
+    run ln -sf ${tomcat_dir} tomcat
 
     tomcat_base=/opt/tomcat-${instance_name}
     make_dir $tomcat_base
 
-    run cp -r /opt/apache-tomcat*/conf/ $tomcat_base
+    run cp -r /opt/${tomcat_dir}/ $tomcat_base
     for el in bin escenic/lib lib work logs temp webapps; do
         make_dir $tomcat_base/$el
     done
@@ -1359,10 +1381,21 @@ function install_cache_server()
             1>>$log 2>>$log
         run apt-get update
     fi
+
+    code_name=$(lsb_release -s -c)
+        
+    supported_code_name=0
+    # list taken from http://repo.varnish-cache.org/debian/dists/
+    supported_list="lenny squeeze hardy lucid"
+    for el in $supported_list; do
+        if [ $code_name = $el ]; then
+            supported_code_name=1
+        fi
+    done
     
-    if [ $on_debian -eq 1 ]; then
+    if [ $supported_code_name -eq 1 -a $on_debian -eq 1 ]; then
         add_apt_source "deb http://repo.varnish-cache.org/debian/ $(lsb_release -s -c) varnish-3.0"
-    elif [ $on_ubuntu -eq 1 ]; then
+    elif [ $supported_code_name -eq 1 -a $on_ubuntu -eq 1 ]; then
         add_apt_source "deb http://repo.varnish-cache.org/ubuntu/ $(lsb_release -s -c) varnish-3.0"
     fi
 
@@ -1440,10 +1473,9 @@ function install_database_server()
             packages="percona-server-server percona-server-client"
             install_packages_if_missing $packages
         else
-            print -n "The Percona APT repsository "
-            print "doesn't have packages for your Debian (or derivative) "
-            print "version with code name $code_name. I will use vanilla "
-            print "MySQL instead."
+            print "The Percona APT repsository fdoesn't have packages for your"
+            print "Debian (or derivative) version with code name $code_name. "
+            print "I will use vanilla MySQL instead."
 
             packages="mysql-server mysql-client libmysql-java"
             install_packages_if_missing $packages

From 42baeffe36a2abf6aef485bbe5bc434b9d785db4 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 16 Sep 2011 13:48:59 +0800
Subject: [PATCH 0043/2585] - speling - made one output entry fit on 80
 character terminals

---
 usr/sbin/ece-install | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 691f9d95..8491f644 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -1473,7 +1473,7 @@ function install_database_server()
             packages="percona-server-server percona-server-client"
             install_packages_if_missing $packages
         else
-            print "The Percona APT repsository fdoesn't have packages for your"
+            print "The Percona APT repsository doesn't have packages for your"
             print "Debian (or derivative) version with code name $code_name. "
             print "I will use vanilla MySQL instead."
 
@@ -1754,7 +1754,7 @@ function install_widget_framework()
     wf_password=$(get_conf_value wf_password)
 
     if [ -z "$wf_user" -o -z "$wf_password" ]; then
-        print "Be sure to set wf_user and wf_password in $conf_file"
+        print "Missing wf_user and wf_password in $conf_file"
         print "If you don't have these, please contact support@escenic.com"
         exit 1
     fi

From 8577a827b8922c9a48760f1b6cfc9ab92a074acf Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 16 Sep 2011 18:25:26 +0800
Subject: [PATCH 0044/2585] - added check for the callee being root - chown now
 runs with the --changes options, only reporting when it   actually changes
 something.

---
 etc/init.d/ece | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/etc/init.d/ece b/etc/init.d/ece
index 1ee0751e..d5976036 100755
--- a/etc/init.d/ece
+++ b/etc/init.d/ece
@@ -25,6 +25,11 @@
 #  would be: update-rc.d ece defaults
 #######################################################################
 
+if [ $(whoami) != "root" ]; then
+    echo "Sorry, you must be root for running $0"
+    exit 1
+fi
+
 #######################################################################
 # Default values
 #######################################################################
@@ -69,7 +74,7 @@ function ensure_dirs_are_ok()
         if [ ! -d $el ]; then
             mkdir -p $el
         fi
-        chown -R $ece_unix_user:$ece_unix_group $el
+        chown --changes -R $ece_unix_user:$ece_unix_group $el
     done
 }
 

From c8f4373cbfc0a9224a0f6c247914737d6b26ca90 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 16 Sep 2011 18:51:00 +0800
Subject: [PATCH 0045/2585] - added static backend to varnish setup - the Munin
 Gatherer can now be accessed on the public host /munin,   e.g.
 http://mysite.com/munin - /munin added to the privileged list of URIs in the
 Varnish   configuration.

---
 usr/sbin/ece-install | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 8491f644..6fc6a5a6 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -1164,6 +1164,11 @@ acl adactus {
   "203.33.232.216";
 }
 
+/* Our web server for serving static content */
+backend static {
+  .host = "localhost";
+  .port = "81";
+}
 EOF
     for el in $backend_servers; do
         appserver_id=$(echo $el | cut -d':' -f1 | sed 's/-/_/g')
@@ -1203,6 +1208,7 @@ sub vcl_recv {
   if (!client.ip ~ staff &&
       (req.url ~ "^/escenic" ||
        req.url ~ "^/studio" ||
+       req.url ~ "^/munin" ||
        req.url ~ "^/webservice" ||
        req.url ~ "^/escenic-admin")) {
      error 405 "Not allowed.";
@@ -1214,7 +1220,13 @@ sub vcl_recv {
     error 405 "Not allowed.";
   }
 
-  set req.backend = webdirector;
+  if (req.url ~ "^/munin") {
+    set req.url = regsub(req.url, "^/munin", "/");
+    set req.backend = static;
+  }
+  else {
+    set req.backend = webdirector;
+  }
 
   if (req.url ~ "\.(png|gif|jpg|css|js)$" || req.url == "/favicon.ico") { 
     remove req.http.Cookie;
@@ -1986,6 +1998,17 @@ function install_munin_node()
             make_ln $el
         done
     done
+
+    # TODO in which version(s) of munin is this directory called
+    # client-conf.d?
+    file=/etc/munin/plugin-conf.d/munin-node
+    if [ -e $file ]; then
+        cat >> $file <<EOF
+
+[escenic*]
+user $ece_user
+
+EOF
     
     if [ $on_debian_or_derivative -eq 1 ]; then
         service munin-node restart \

From a3daf4e7ac11e5503de1f7f5cfa427afa08c4a2d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 16 Sep 2011 19:06:29 +0800
Subject: [PATCH 0046/2585] - removed the munin gatherer from the cache server
 profile (it's still   in the install all profile). - added missing 'fi',
 argh! - added munin gatherer profile, it's not fully integrated everywhere,  
 but the basic gatherer should get installed.

  TODO: make sure VCL is sane
  - support for fai_munin_gather_host
---
 usr/sbin/ece-install | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 6fc6a5a6..2e9af2ef 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -116,6 +116,7 @@ PROFILE_RMI_HUB=6
 PROFILE_SEARCH_SERVER=7
 PROFILE_WIDGET_FRAMEWORK=8
 PROFILE_CREATE_PUBLICATION=9
+PROFILE_MUNIN_GATHERER=10
 
 # Because of issue VF-3559, we also create the default family and host
 # directories.
@@ -1275,7 +1276,7 @@ function read_user_input()
 {
     echo "Hi, which server profile do you wish to install?"
     echo ""
-    echo "Select 1-9 and press ENTER"
+    echo "Select 1-10 and press ENTER"
     echo ""
     echo "  $PROFILE_ALL_IN_ONE - All in one, the full stack on one host. "
     echo "      Suitable for development and test environments."
@@ -1296,6 +1297,7 @@ function read_user_input()
     echo "  $PROFILE_CREATE_PUBLICATION - Create a new publication."
     echo "      This profile will create new publication based on WF"
     echo "      (if available) or ECE/clean-demo."
+    echo -n "  $PROFILE_MUNIN_GATHERER - The Munin gatherer."
     echo ""
     echo -n "Your choice [1]> "
     read install_profile_number
@@ -2004,11 +2006,11 @@ function install_munin_node()
     file=/etc/munin/plugin-conf.d/munin-node
     if [ -e $file ]; then
         cat >> $file <<EOF
-
 [escenic*]
 user $ece_user
 
 EOF
+    fi
     
     if [ $on_debian_or_derivative -eq 1 ]; then
         service munin-node restart \
@@ -2079,23 +2081,21 @@ if [ $fai_enabled -eq 1 ]; then
         install_profile_number=$PROFILE_CACHE_SERVER
         install_cache_server
         install_web_server
-        install_munin_gatherer
     elif [ $(get_boolean_conf_value fai_rmi_install) -eq 1 ]; then
         install_profile_number=$PROFILE_RMI_HUB
-        common_pre_install
         install_rmi_hub
     elif [ $(get_boolean_conf_value fai_wf_install) -eq 1 ]; then
         install_profile_number=$PROFILE_WIDGET_FRAMEWORK
-        common_pre_install
         install_widget_framework
     elif [ $(get_boolean_conf_value fai_presentation_install) -eq 1 ]; then
         install_profile_number=$PROFILE_PRESENTATION_SERVER
-        common_pre_install
         install_presentation_server
     elif [ $(get_boolean_conf_value fai_publication_create) -eq 1 ]; then
         install_profile_number=$PROFILE_CREATE_PUBLICATION
-        common_pre_install
         create_publication
+    elif [ $(get_boolean_conf_value fai_munin_gatherer_create) -eq 1 ]; then
+        install_profile_number=$PROFILE_MUNIN_GATHERER
+        install_munin_gatherer
     fi
     
     common_post_install
@@ -2132,6 +2132,9 @@ else
         $PROFILE_CREATE_PUBLICATION)
         create_publication
         ;;
+        $PROFILE_MUNIN_GATHERER)
+        install_munin_gatherer
+        ;;
         default)
             print "You must select 1-7"
             exit 1

From 5acf28abde711124fff41c98287a1466691caac5 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 19 Sep 2011 19:45:20 +0800
Subject: [PATCH 0047/2585] - fixed bug introduced in
 60ca5fbc19b07359c706de63ed7a262fe6595795,   instead of just copying the conf
 directory of tomcat_home to _base,   the entire tomcat_home was copied into
 _base.

---
 usr/sbin/ece-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 2e9af2ef..e525bd45 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -706,7 +706,7 @@ function set_up_app_server
     tomcat_base=/opt/tomcat-${instance_name}
     make_dir $tomcat_base
 
-    run cp -r /opt/${tomcat_dir}/ $tomcat_base
+    run cp -r /opt/${tomcat_dir}/conf $tomcat_base
     for el in bin escenic/lib lib work logs temp webapps; do
         make_dir $tomcat_base/$el
     done

From 86f6497fdbe0aa2f1e04630e71629cc600384d16 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 20 Sep 2011 12:08:51 +0800
Subject: [PATCH 0048/2585] - sometimes, the GPG key ring doesn't work when
 running as root, this   should hopefully fix it (problem: installing Percona)

---
 usr/sbin/ece-install | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index e525bd45..a4cfdea7 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -1474,13 +1474,13 @@ function install_database_server()
             print "Installing the Percona database ..."
 
             if [ $(apt-key list| grep CD2EFD2A | wc -l) -lt 1 ]; then
-                gpg --keyserver hkp://keys.gnupg.net \
+                run gpg --keyserver hkp://keys.gnupg.net \
+                    --recv-keys 1C4CBDCDCD2EFD2A
+                gpg --armor \
                     -a \
                     --export 1C4CBDCDCD2EFD2A | \
                     apt-key add - \
                     1>>$log 2>>$log
-                gpg -a --export CD2EFD2A | apt-key add - \
-                    1>>$log 2>>$log
                 run apt-get update
             fi
             add_apt_source "deb http://repo.percona.com/apt ${code_name} main"

From 92713e818222932cd98550332a7ab00716a98d30 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 20 Sep 2011 13:14:53 +0800
Subject: [PATCH 0049/2585] - added create_user_and_group_if_not_present,
 called from   common_pre_install - user and groups no longer created in
 set_correct_permissions (it's   too late!)

---
 usr/sbin/ece-install | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index a4cfdea7..178227d7 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -865,22 +865,28 @@ EOF
 
 }
 
+function create_user_and_group_if_not_present()
+{
+   if [ $(grep $ece_user /etc/passwd | wc -l) -lt 1 ]; then
+       print "Creating UNIX user $ece_user ..."
+        # TODO add support for useradd
+       run adduser $ece_user \
+           --disabled-password \
+           --gecos "Escenic-user,Room,Work,Home,Other"
+       add_next_step "- Set a password for the new $ece_user (passwd $ece_user)"
+   fi
+   
+   if [ $(grep $ece_group /etc/group | wc -l) -lt 1 ]; then
+       print "Creating UNIX group $ece_group ..."
+       run addgroup $ece_group
+   fi
+ }
+
 # last, give the control back to the ECE user & group 
 function set_correct_permissions()
 {
     print "Setting correct permissions on ECE related directories ..."
 
-    if [ $(grep $ece_user /etc/passwd | wc -l) -lt 1 ]; then
-        # TODO add support for useradd
-        run adduser $ece_user \
-            --disabled-password \
-            --gecos "Escenic-user,Room,Work,Home,Other"
-        add_next_step "- Set a password for the new $ece_user (passwd $ece_user)"
-    fi
-    if [ $(grep $ece_group /etc/group | wc -l) -lt 1 ]; then
-        run addgroup $ece_group
-    fi
-
     for el in $engine_dir_list; do
         if [ -d $el ]; then
             run chown -R ${ece_user}:${ece_group} $el \
@@ -1360,6 +1366,7 @@ function common_pre_install()
     stop_conflicting_processes
     install_common_os_packages
     set_up_ece_scripts
+    create_user_and_group_if_not_present
     set_up_user_enviornment
 }
 

From 850df5a952e23970dd07c39db1b6a69a4dfbcbd6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 20 Sep 2011 15:35:30 +0800
Subject: [PATCH 0050/2585] - added more help on setting the ECE user's
 password.

---
 usr/sbin/ece-install | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 178227d7..8754875b 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -873,7 +873,8 @@ function create_user_and_group_if_not_present()
        run adduser $ece_user \
            --disabled-password \
            --gecos "Escenic-user,Room,Work,Home,Other"
-       add_next_step "- Set a password for the new $ece_user (passwd $ece_user)"
+       add_next_step "- Set a password for the new UNIX user $ece_user"
+       add_next_step "  You can do this by running [passwd $ece_user]"
    fi
    
    if [ $(grep $ece_group /etc/group | wc -l) -lt 1 ]; then

From 8df58773cecb9fd08049ed0b9bedfabca10efcf4 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 20 Sep 2011 16:33:07 +0800
Subject: [PATCH 0051/2585] - added new command to ece, loglist which will
 produce output like:

ece -i dev1 loglist
[ece#engine-dev1] System out log: /var/log/escenic/engine-dev1.out
[ece#engine-dev1] App server log: /opt/tomcat-dev1/logs/localhost.2011-09-20.log
[ece#engine-dev1] log4j log: /var/log/escenic/messages

- added -q/--quiet option to ece, will suppress all user information
  from ece. This is also useful for the loglist command as it will
  then only output the paths without any prefix or information.

- removed pager from "ece help"
---
 usr/share/doc/escenic/ece-guide.org | 32 +++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/usr/share/doc/escenic/ece-guide.org b/usr/share/doc/escenic/ece-guide.org
index 0b50e445..c5b63f48 100644
--- a/usr/share/doc/escenic/ece-guide.org
+++ b/usr/share/doc/escenic/ece-guide.org
@@ -82,6 +82,38 @@ The following commands are available:
 *) only applicable if type is 'engine'
 #+END_SRC
 
+* Tailing log files
+The script has a number of options to let you keep track of what's
+going on on your system.
+
+** Tailing the logs
+There are three different logs, which ece will let you tail. When
+tailing the log file, ece will also first print out where the file is
+located on the file system so you can open it later for further
+inspection. 
+
+#+BEGIN_SRC sh
+$ ece -i dev1 outlog
+[ece#engine-dev1] Tailing the system out log /var/log/escenic/engine-dev1.out
+#+END_SRC
+
+** Getting an overview of the log files
+The ece script will be more than happy to tell you about the log files
+on your system that are of interest to your instance:
+#+BEGIN_SRC sh
+$ ece -i dev1 loglist
+[ece#engine-dev1] System out log: /var/log/escenic/engine-dev1.out
+[ece#engine-dev1] App server log: /opt/tomcat-dev1/logs/localhost.2011-09-20.log
+[ece#engine-dev1] log4j log: /var/log/escenic/messages
+#+END_SRC
+
+If you wish to pass the log files onto another pipe, for instance to
+grep all the log files for a certain exception or error message, you
+will find the -q parameter useful:
+#+BEGIN_SRC sh
+$ ece -i dev1 -q loglist | xargs grep IllegalArgumentException
+#+END_SRC
+
 * Installation
 The ece script and ece.conf may be used on any Unix like system that
 has a fairly recent version of BASH installed.

From eb2116714aff7146e5442ad917e6405fb815434c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 20 Sep 2011 16:33:46 +0800
Subject: [PATCH 0052/2585] - added new command to ece, loglist which will
 produce output like:

$ ece -i dev1 loglist
[ece#engine-dev1] System out log: /var/log/escenic/engine-dev1.out
[ece#engine-dev1] App server log: /opt/tomcat-dev1/logs/localhost.2011-09-20.log
[ece#engine-dev1] log4j log: /var/log/escenic/messages

- added -q/--quiet option to ece, will suppress all user information
  from ece. This is also useful for the loglist command as it will
  then only output the paths without any prefix or information.

- removed pager from "ece help"
---
 usr/bin/ece | 77 ++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 55 insertions(+), 22 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 09f6a536..02fec993 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -12,6 +12,7 @@
 ######################################################################
 verbose=0
 force_ipv4=0
+quiet=0
 
 ######################################################################
 # Dear user, don't touch anyting in this script, especially below this
@@ -88,7 +89,9 @@ function debug()
 
 function print()
 {
-    echo "$id" $@
+    if [ $quiet -eq 0 ]; then
+        echo "$id" $@
+    fi
 }
 
 function log()
@@ -729,15 +732,22 @@ function assemble()
     debug $assemblytool_home/dist/engine.ear "is now ready"
 }
 
-function tail_messages_log()
+function get_log4j_log()
 {
     for el in $log_file_list; do
         if [ -r $el ]; then
-            print "tailing $el"
-            tail -f $el
-            break
+            echo $el
         fi
     done
+
+    echo ""
+}
+
+function tail_messages_log()
+{
+    log4j_log=$(get_log4j_log)
+    print "tailing $log4j_log"
+    tail -f $log4j_log
 }
 
 function tail_out_log()
@@ -751,13 +761,8 @@ function tail_out_log()
     tail -f $tail_list
 }
 
-function tail_app_log()
+function get_app_log()
 {
-    if [ $type = "rmi-hub" ]; then
-        print "There is no application server log for $type"
-        exit 1
-    fi
-    
     if [ $appserver = "tomcat" ]; then
         log_file=$tomcat_base/logs/localhost.`date +%F`.log
     elif [ $appserver = "resin" -a -e $resin_home/log/jvm-default.log ]; then
@@ -768,9 +773,20 @@ function tail_app_log()
         print "tail_app_log()"
         exit 1
     fi
+
+    echo $log_file
+}
+
+
+function tail_app_log()
+{
+    if [ $type = "rmi-hub" ]; then
+        print "There is no application server log for $type"
+        exit 1
+    fi
     
     print "Tailing the application server log $log_file"
-    tail -f $log_file
+    tail -f $(get_app_log)
 }
 
 function make_thread_dump()
@@ -803,6 +819,10 @@ function set_type_command_and_instance()
             verbose=1
             continue
         fi
+        if [ $el = "-q" -o $el = "--quiet" ]; then
+            quiet=1
+            continue
+        fi
         if [ $el = "--help" ]; then
             command=help
             continue
@@ -878,7 +898,7 @@ function clean_up()
     tmp_dir_prefix="`basename $0`-"
     if [ `ls  $tmp_dir | grep $tmp_dir_prefix | wc -l` -gt 0 ]; then
         print "Cleaning up generated files in $tmp_dir ..." 
-        rm -rf $tmp_dir/$tmp_dir_prefix-[0-9]* \
+        rm -rf $tmp_dir/$tmp_dir_prefix[0-9]* \
             1>>$log_file \
             2>>$log_file
     fi
@@ -1015,6 +1035,19 @@ function update_publication_resources()
         
 }
 
+function show_all_log_paths()
+{
+    if [ $quiet -eq 0 ]; then
+        print "System out log: "$log_file
+        print "App server log: "$(get_app_log)
+        print "log4j log:  "$(get_log4j_log)
+    else
+        echo $log_file
+        echo $(get_app_log)
+        echo $(get_log4j_log)
+    fi
+}
+
 set_type_command_and_instance $@
 set_id
 set_common_settings
@@ -1046,6 +1079,8 @@ function print_help()
     echo "      Used for updating publication resources."
     echo "      Must be one of: content-type, feature, layout, layout-group"
     echo "                      image-version, menu"
+    echo " -q --quiet"
+    echo "      Makes $(basename $0) as quiet as possible."
     echo ""
     echo " -v --verbose"
     echo "      Prints out debug statements, useful for debugging."
@@ -1057,7 +1092,8 @@ function print_help()
     echo "   deploy     deploys the assembled EAR *)"
     echo "   help       prints this help screen"
     echo "   kill       uses force to stop the type"
-    echo "   log        the type's Log4J log"
+    echo "   log        the type's log4j log **)"
+    echo "   loglist    list all the log paths"
     echo "   outlog     the $id script log (system out log)"
     echo "   restart    restarts the type"
     echo "   start      starts the type"
@@ -1068,6 +1104,7 @@ function print_help()
     echo "   versions   lists the ECE component versions"
     echo ""
     echo "*) only applicable if type is 'engine'"
+    echo "**) not applicable if type is 'rmi-hub'"
 }    
 
 for el in $command; do
@@ -1087,6 +1124,9 @@ for el in $command; do
         log)
             tail_messages_log
             ;;
+        loglist)
+            show_all_log_paths
+            ;;
         outlog)
             tail_out_log
             ;;
@@ -1115,14 +1155,7 @@ for el in $command; do
             update_publication_resources
             ;;
         help)
-            if [ -x $(which less) ]; then
-                print_help | less
-            elif [ -x $(which more) ]; then
-                print_help | more
-            else
-                print_help
-            fi
-            
+            print_help
             ;;
         *)
             print "Invalid command: '$el' :-("

From d3432d420225d0b72493034b23320bf2ec1ae98a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 20 Sep 2011 16:35:52 +0800
Subject: [PATCH 0053/2585] - added loglist to command completions

---
 etc/bash_completion.d/ece | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/bash_completion.d/ece b/etc/bash_completion.d/ece
index f22da95f..cdaec16d 100644
--- a/etc/bash_completion.d/ece
+++ b/etc/bash_completion.d/ece
@@ -4,7 +4,7 @@ _ece_commands()
     local cur=${COMP_WORDS[COMP_CWORD]}
     local prev=${COMP_WORDS[COMP_CWORD-1]}
 
-    commands="applog assemble clean deploy help kill log outlog restart start status stop threaddump update versions"
+    commands="applog assemble clean deploy help kill log loglist outlog restart start status stop threaddump update versions"
     resources="content-type feature layout layout-group image-version menu"
     types="engine search analysis rmi-hub"
 

From 7bac9bddbd8d99bb232878be9d0cd2a6796e1bdc Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 21 Sep 2011 12:55:27 +0800
Subject: [PATCH 0054/2585] - ece nows use different options to ps to determine
 the type PID,   depending on running on Linux (auxww) or other Unix systems
 (-ef).

  Using auxww on Linux systems make the script also return correctly
  when running in non-optimal shell environments, which default wise
  would cut off the process list enough for the ece to fail finding
  the running ECE processes.
---
 usr/bin/ece | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 02fec993..726e4f68 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -224,6 +224,12 @@ function set_type_settings()
 
 function set_type_pid()
 {
+    if [ $(uname) = "Linux" ]; then
+        ps_options="auxww"
+    else
+        ps_options="-ef"
+    fi
+    
     # Get a hold of the PID of the process. Although we've got the PID
     # file, we stil get the PID from the OS here as we used it for
     # sanity checking later on, see stop_type().
@@ -231,11 +237,11 @@ function set_type_pid()
         # we need to be able to differentiate between an ECE instance
         # and an rmi hub, for this we use java.security.policy which
         # the hub doesn't have.
-        type_pid=`ps -ef | grep -v java.security.policy | \
+        type_pid=`ps $ps_options | grep -v java.security.policy | \
             awk "/Djava.rmi.server.hostname=$ece_server_hostname / && \
             !/awk/"' {print $2}'`
     else
-        type_pid=`ps -ef | awk "/Descenic.server=$ece_server / && !/awk/"' {print $2}'`
+        type_pid=`ps $ps_options | awk "/Descenic.server=$ece_server / && !/awk/"' {print $2}'`
     fi
 
     debug "type_pid is now=$type_pid"

From 798b7eb5b1e378794805641c829eff4d7dd05188 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 21 Sep 2011 13:56:13 +0800
Subject: [PATCH 0055/2585] - tail_app_log now prints the correct log file name

---
 usr/bin/ece | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 726e4f68..cfdd68e0 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -791,7 +791,7 @@ function tail_app_log()
         exit 1
     fi
     
-    print "Tailing the application server log $log_file"
+    print "Tailing the application server log $(get_app_log)"
     tail -f $(get_app_log)
 }
 

From 98be4ae9b6071da825bd2064cbc23de8f123a73a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 21 Sep 2011 14:53:16 +0800
Subject: [PATCH 0056/2585] - it's important to append (and not pre-pend) the
 ECE libraries so   that things put it in the standard loader behaves as
 expected,   such as log4j configuration put in ${tomcat.base}/lib.

  This change in set_up_app_server, made the app server pick up the
  log4j configuration in tomcat/lib properly.
---
 usr/sbin/ece-install | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 8754875b..1fbe65d7 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -612,6 +612,19 @@ function get_base_dir_from_bundle()
     echo $file_name
 }
 
+# Returns an escaped string useful for sed and other BASH commands.
+#
+# $1 :  the string
+function get_escaped_bash_string()
+{
+    result=$(echo $1 | \
+        sed -e 's/\$/\\$/g' \
+        -e 's/\*/\\*/g' \
+        -e 's#/#\\/#g' \
+        -e 's/\./\\./g')
+    echo $result
+}
+
 function set_up_app_server
 {
     print "Setting up the application server ..."
@@ -717,9 +730,15 @@ function set_up_app_server
     run cd $tomcat_base/lib
     make_ln $jdbc_driver
 
+    # it's important to append (and not pre-pend) the ECE libraries so
+    # that things put it in the standard loader behaves as expected,
+    # such as log4j configuration put in ${tomcat.base}/lib.
     file=$tomcat_base/conf/catalina.properties
-    sed -i 's/common.loader=/common.loader=\$\{catalina.base\}\/escenic\/lib\/\*\.jar\,/g' \
-        $file \
+    common_loader=$(grep ^common.loader $file)
+    escenic_loader=",$\{catalina.base\}/escenic/lib/*.jar"
+    old=$(get_escaped_bash_string ${common_loader})
+    new=${escaped_common_loader}$(get_escaped_bash_string ${escenic_loader})
+    sed -i "s#${old}#${new}#g" $file \
         1>>$log 2>>$log
     exit_on_error "sed on $file"
     

From 988d98a443e409832855e357e32ec4d8827429cd Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 22 Sep 2011 11:09:03 +0800
Subject: [PATCH 0057/2585] - removed TBD: we no longer have an issue with the
 Escenic Munin plugin

---
 usr/share/doc/escenic/ece-install-guide.org | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 499e6b59..d992d898 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -131,9 +131,6 @@ The script will install a Munin node on the host. It will also
 install the Escenic specific Munin plugins on hosts where there are
 any Escenic server components.
 
-TBD: there is currently an issue with the Escenic plugins not working
-properly with the new ece/ece-install scripts. We're working on this.
-
 ** Common for Editorial, Presentation and Search Instances
 *** Sun Java 6
 *** Apache Tomcat application server
@@ -421,6 +418,9 @@ fai_enabled=1
 fai_all_install=1
 #+END_SRC
 
+All the different components described in this guide are installed on
+the host that runs the install script.
+
 The following output is produced from ece-install:
-#+INCLUDE: "/tmp/ece-install.out" src text
+#+INCLUDE: "~/tmp/ece-install.out" src text
 

From 4a3abf57f8a669e0f4312b9f901593f8aa7813eb Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 22 Sep 2011 11:19:21 +0800
Subject: [PATCH 0058/2585] - added section on the Monitoring Server profile

---
 usr/share/doc/escenic/ece-install-guide.org | 28 ++++++++++++---------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index d992d898..1649637a 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -160,7 +160,7 @@ compressed content (and many other things that we before needed Apache
 for). Thus, we'll let the application server do the compression for us
 now.
 
-** 1 - Full Stack on One Host
+** Profile - Full Stack on One Host
 This profile is suitable for developers and admins wanting to set up a
 test environment. It will install the full stack including caching
 server, application server, ECE, assembly host, database, Widget
@@ -170,18 +170,17 @@ For further details on each of the different server components, see
 the different profile descriptions bellow.
 
 
-** 2 - Editorial Server (Publication Server)
+** Profile - Editorial Server (Publication Server)
+Will set up a typical editorial server (often referred to as the
+publication server in Escenic literature).
 
-
-** 3 - Presentation Server
+** Profile - Presentation Server
 This will set up a typical presentation server:
 - Memcached, distributed memory cache
-- Escenic Assembly environment (which may be removed after the
-  installation). 
 - Deployment setup to only deploy escenic-admin and the
   publication(s).
 
-** 4 - Database Server
+** Profile - Database Server
 If ece-install is run on a support version of Debian or Ubuntu, this
 will install the excellent Percona distribution of MySQL with their
 set of high performance patches.
@@ -202,7 +201,7 @@ ERROR 1050 (42S01) at line 2: Table 'DBChangeLog' already exists
 [ece-install] running tables FAILED, exiting :-(
 #+END_SRC
 
-** 5 - Cache Server
+** Profile - Cache Server
 If ece-install is run on a support version of Debian or Ubuntu, it
 will install the latest Varnish 3.0 caching server from the Varnish
 APT repository.
@@ -230,8 +229,6 @@ The script will configure Varnish for a typical Escenic site:
 - will install the nginx web server for serving static content and
   will configure Varnish accordingly. This will be very useful for
   Adactus servers wanting to pull content from your ECEs.
-- will install a Munin gatherer and make its interface available 
-  when accesssing the web server directly (port 81) 
 
 TBD:
 - If run on a Linux platform, the script will tweak the kernel
@@ -240,7 +237,7 @@ TBD:
   to be in the staff network ACL, defined in the Varnish
   configuration. 
 
-** 8 - Install Widget Framework
+** Profile - Install Widget Framework
 You'll need a user name and password for accessing the
 repo.escenic.com Maven repository. You should get these credentials
 when you bought Widget Framework. If you for some reason do not have
@@ -252,7 +249,7 @@ complain:
 [ece-install] Be sure to set wf_user and wf_password in /root/.ece-install.conf
 [ece-install] If you don't have these, please contact support@escenic.com
 #+END_SRC
-** 9 - Create Publication
+** Profile - Create Publication
 This profile will create a publication for you, only asking you the
 name of the publication and which ECE instance to use for its
 creation.
@@ -260,6 +257,13 @@ creation.
 This installation profile will base the publication on the Widget
 Framework if its present on the system, if not, ECE's clean demo WAR
 is used as a basis.  
+** Profile - Monitoring Server
+This will install a Munin gatherer and make its interface available 
+when accesssing the web server directly (port 81).
+
+TBD: This profile will also install the Nagios interface for
+monitoring the different nodes. 
+
 * Full Automatic Install (FAI)
 The ece-install script has support for doing a full automatic install
 (FAI).

From d3fe20e297c1858abbc7a5666d016732bd0514ed Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 22 Sep 2011 11:21:04 +0800
Subject: [PATCH 0059/2585] - renamed munin gatherer profile to Monitoring
 server.

---
 usr/sbin/ece-install | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 1fbe65d7..0badc2b1 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -116,7 +116,7 @@ PROFILE_RMI_HUB=6
 PROFILE_SEARCH_SERVER=7
 PROFILE_WIDGET_FRAMEWORK=8
 PROFILE_CREATE_PUBLICATION=9
-PROFILE_MUNIN_GATHERER=10
+PROFILE_MONITORING_SERVER=10
 
 # Because of issue VF-3559, we also create the default family and host
 # directories.
@@ -1323,7 +1323,8 @@ function read_user_input()
     echo "  $PROFILE_CREATE_PUBLICATION - Create a new publication."
     echo "      This profile will create new publication based on WF"
     echo "      (if available) or ECE/clean-demo."
-    echo -n "  $PROFILE_MUNIN_GATHERER - The Munin gatherer."
+    echo -n "  $PROFILE_MONITORING_SERVER - A monitoring server."
+    echo "     This will install the Munin gatherer"
     echo ""
     echo -n "Your choice [1]> "
     read install_profile_number
@@ -2121,7 +2122,7 @@ if [ $fai_enabled -eq 1 ]; then
         install_profile_number=$PROFILE_CREATE_PUBLICATION
         create_publication
     elif [ $(get_boolean_conf_value fai_munin_gatherer_create) -eq 1 ]; then
-        install_profile_number=$PROFILE_MUNIN_GATHERER
+        install_profile_number=$PROFILE_MONITORING_SERVER
         install_munin_gatherer
     fi
     
@@ -2159,7 +2160,7 @@ else
         $PROFILE_CREATE_PUBLICATION)
         create_publication
         ;;
-        $PROFILE_MUNIN_GATHERER)
+        $PROFILE_MONITORING_SERVER)
         install_munin_gatherer
         ;;
         default)

From f71d30ab736650c9d2ad6a60b34ce4ee1aa7fc5f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 26 Sep 2011 12:49:51 +0800
Subject: [PATCH 0060/2585] - added support for updating the VCE security
 resource

---
 usr/bin/ece | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index cfdd68e0..fe589ab1 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -1023,11 +1023,12 @@ function update_publication_resources()
         menu)
             url=${url}/${publication}/escenic/plugin/menu
             ;;
-        
+        security)
+            url=${url}/${publication}/escenic/plugin/community/security
+            ;;
         *)
             print "Invalid resource: $(basename $resource) :-("
             exit 1
-        
     esac        
 
     print "Updating the $(basename $resource) resource for the $publication" \

From 97ad92c4a68607c8945de298bea0f5d3a1dcdf68 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 27 Sep 2011 20:20:44 +0800
Subject: [PATCH 0061/2585] - corrected log4j log file name, now in accordance
 with the log files   created by ece-install - fixed a wee error which would
 list all log4j files if there were   more than one match.

---
 usr/bin/ece | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/usr/bin/ece b/usr/bin/ece
index fe589ab1..2a34e817 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -186,6 +186,7 @@ function set_common_settings()
     fi
 
     log_file_list="
+      $log_dir/${HOSTNAME}-${instance}-messages
       $log_dir/messages
       $log_dir/Escenic-error.log
     "
@@ -743,6 +744,7 @@ function get_log4j_log()
     for el in $log_file_list; do
         if [ -r $el ]; then
             echo $el
+            return
         fi
     done
 

From 04a8b966831922079a58bee26739c3e01751300f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 27 Sep 2011 20:21:50 +0800
Subject: [PATCH 0062/2585] - added note and hints on adding community widget
 WF support to   ece-install

---
 usr/sbin/ece-install | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 0badc2b1..27e2c2a2 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -1025,7 +1025,15 @@ EOF
         print "Basing your ${publication_name}.war on ECE/demo-clean ..."
         run cp /opt/escenic/engine/contrib/wars/demo-clean.war ${publication_war}
     fi
-    
+
+    # TODO add support for the community widgets
+    #
+    # 1 - add the core widgets to the
+    # publications/demo-community/pom.xml
+    # 
+    # 2 - add the <ui:group name="core-widgets"/> definition for core
+    # widgets in:
+    # publications/demo-community/src/main/webapp/META-INF/escenic/publication-resources/escenic/content-type
 }
 
 function check_for_required_downloads()

From feb604c530d1a1a459e2192e22b720568fd1957a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 27 Sep 2011 20:27:49 +0800
Subject: [PATCH 0063/2585] - updated the user guide on the log file goodness

---
 usr/share/doc/escenic/ece-guide.org | 32 ++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/usr/share/doc/escenic/ece-guide.org b/usr/share/doc/escenic/ece-guide.org
index c5b63f48..0a2200e3 100644
--- a/usr/share/doc/escenic/ece-guide.org
+++ b/usr/share/doc/escenic/ece-guide.org
@@ -86,7 +86,17 @@ The following commands are available:
 The script has a number of options to let you keep track of what's
 going on on your system.
 
-** Tailing the logs
+** Getting an overview of the log files
+The ece script will be more than happy to tell you about the log files
+on your system that are of interest to your instance:
+#+BEGIN_SRC sh
+$ ece -i dev1 loglist
+[ece#engine-dev1] System out log: /var/log/escenic/engine-dev1.out
+[ece#engine-dev1] App server log: /opt/tomcat-dev1/logs/localhost.2011-09-20.log
+[ece#engine-dev1] log4j log: /var/log/escenic/messages
+#+END_SRC
+
+** Commands for tailing the log files
 There are three different logs, which ece will let you tail. When
 tailing the log file, ece will also first print out where the file is
 located on the file system so you can open it later for further
@@ -97,16 +107,12 @@ $ ece -i dev1 outlog
 [ece#engine-dev1] Tailing the system out log /var/log/escenic/engine-dev1.out
 #+END_SRC
 
-** Getting an overview of the log files
-The ece script will be more than happy to tell you about the log files
-on your system that are of interest to your instance:
-#+BEGIN_SRC sh
-$ ece -i dev1 loglist
-[ece#engine-dev1] System out log: /var/log/escenic/engine-dev1.out
-[ece#engine-dev1] App server log: /opt/tomcat-dev1/logs/localhost.2011-09-20.log
-[ece#engine-dev1] log4j log: /var/log/escenic/messages
-#+END_SRC
+The available log file commands are:
+- outlog :: the system out log
+- applog :: the app server log 
+- log :: the log4j log
 
+** Piping the log files to another command
 If you wish to pass the log files onto another pipe, for instance to
 grep all the log files for a certain exception or error message, you
 will find the -q parameter useful:
@@ -114,6 +120,12 @@ will find the -q parameter useful:
 $ ece -i dev1 -q loglist | xargs grep IllegalArgumentException
 #+END_SRC
 
+This approach is also useful if you wish to tail all the log files at
+once: 
+#+BEGIN_SRC sh
+$ ece -i dev1 -q loglist | xargs tail -f
+#+END_SRC
+
 * Installation
 The ece script and ece.conf may be used on any Unix like system that
 has a fairly recent version of BASH installed.

From da60c0638b8c4f77245508a544b190ba609ed2cb Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 27 Sep 2011 20:28:57 +0800
Subject: [PATCH 0064/2585] - updated HTML and TXT guides

---
 usr/share/doc/escenic/ece-guide.html | 188 ++++++++++++++++++++-------
 usr/share/doc/escenic/ece-guide.txt  |  78 ++++++++---
 2 files changed, 202 insertions(+), 64 deletions(-)

diff --git a/usr/share/doc/escenic/ece-guide.html b/usr/share/doc/escenic/ece-guide.html
index c0903d8c..aadeb8b0 100644
--- a/usr/share/doc/escenic/ece-guide.html
+++ b/usr/share/doc/escenic/ece-guide.html
@@ -7,7 +7,7 @@
 <title>Guide for the /usr/bin/ece Script</title>
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
 <meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2011-09-12 18:14:44 CST"/>
+<meta name="generated" content="2011-09-27 20:28:00 CST"/>
 <meta name="author" content="Torstein Krause Johansen"/>
 <meta name="description" content=""/>
 <meta name="keywords" content=""/>
@@ -44,6 +44,12 @@
   dt { font-weight: bold; }
   div.figure { padding: 0.5em; }
   div.figure p { text-align: center; }
+  div.inlinetask {
+    padding:10px;
+    border:2px solid gray;
+    margin:10px;
+    background: #ffffcc;
+  }
   textarea { overflow-x: auto; }
   .linenr { font-size:smaller }
   .code-highlighted {background-color:#ffff00;}
@@ -161,8 +167,8 @@
 
 </head>
 <body>
-<div id="content">
 
+<div id="preamble">
 <svg
         id="vizrt-logo"
         version="1.1"
@@ -207,7 +213,12 @@
     </g> 
   </g> 
 </svg>
-<h1>Guide for the /usr/bin/ece Script</h1>
+
+</div>
+
+<div id="content">
+<h1 class="title">Guide for the /usr/bin/ece Script</h1>
+
 
 <div id="table-of-contents">
 <h2>Table of Contents</h2>
@@ -221,12 +232,19 @@ <h2>Table of Contents</h2>
 </ul>
 </li>
 <li><a href="#sec-2">2 Getting an overview of all available options </a></li>
-<li><a href="#sec-3">3 Installation </a>
+<li><a href="#sec-3">3 Tailing log files </a>
 <ul>
-<li><a href="#sec-3-1">3.1 Overview of File Paths Used by the ece script </a></li>
+<li><a href="#sec-3-1">3.1 Getting an overview of the log files </a></li>
+<li><a href="#sec-3-2">3.2 Commands for tailing the log files </a></li>
+<li><a href="#sec-3-3">3.3 Piping the log files to another command </a></li>
 </ul>
 </li>
-<li><a href="#sec-4">4 Running the ece script </a></li>
+<li><a href="#sec-4">4 Installation </a>
+<ul>
+<li><a href="#sec-4-1">4.1 Overview of File Paths Used by the ece script </a></li>
+</ul>
+</li>
+<li><a href="#sec-5">5 Running the ece script </a></li>
 </ul>
 </div>
 </div>
@@ -251,15 +269,12 @@ <h3 id="sec-1-1"><span class="section-number-3">1.1</span> Completing ece comman
 </p>
 
 
-<pre class="example">$ ece TAB TAB
+<pre class="src src-sh">$ ece TAB TAB
 applog      deploy      log         start       threaddump  
 assemble    help        outlog      status      update      
 clean       kill        restart     stop        versions 
-
 </pre>
 
-
-
 <p>
 The commands are all described in detail in "ece help"
 </p>
@@ -274,14 +289,11 @@ <h3 id="sec-1-2"><span class="section-number-3">1.2</span> Completing types of s
 
 
 
-<pre class="example">$ ece -t TAB TAB
+<pre class="src src-sh">$ ece -t TAB TAB
 analysis  engine    rmi-hub   search 
-
 </pre>
 
 
-
-
 </div>
 
 </div>
@@ -299,14 +311,11 @@ <h3 id="sec-1-3"><span class="section-number-3">1.3</span> Completing the public
 </p>
 
 
-<pre class="example">$ ece -p mypub -r TAB TAB
+<pre class="src src-sh">$ ece -p mypub -r TAB TAB
 content-type   image-version  layout-group   
 feature        layout         menu
-
 </pre>
 
-
-
 </div>
 </div>
 
@@ -319,7 +328,7 @@ <h2 id="sec-2"><span class="section-number-2">2</span> Getting an overview of al
 
 
 
-<pre class="example">$ ece help
+<pre class="src src-sh">$ ece help
 Usage: /home/torstein/bin/ece [-t &lt;type&gt;] [-i &lt;instance&gt;] &lt;command&gt;
 
 DESCRIPTION
@@ -330,7 +339,7 @@ <h2 id="sec-2"><span class="section-number-2">2</span> Getting an overview of al
       search  -  A standalone search indexer and solr instance
       rmi-hub -  The RMI hub responsible for the internal 
                  communication between the ECE instances.
-      analysis - The Escenic Analysis Engine also knows as 'Stats'
+      analysis - The Escenic Analysis Engine also knows as <span style="color: #8b2252;">'Stats'</span>
 
  -i --instance &lt;instance&gt;
       The type instance, such as editor1, web1 or search1
@@ -347,13 +356,13 @@ <h2 id="sec-2"><span class="section-number-2">2</span> Getting an overview of al
       Prints out debug statements, useful for debugging.
 
 The following commands are available:
-   applog     the type's app server log
-   assemble   runs the Assembly Tool *)
-   clean      removes temporary files created by /home/torstein/bin/ece *)
-   deploy     deploys the assembled EAR *)
-   help       prints this help screen
-   kill       uses force to stop the type
-   log        the type's Log4J log
+   applog     the type<span style="color: #8b2252;">'s app server log</span>
+<span style="color: #8b2252;">   assemble   runs the Assembly Tool *)</span>
+<span style="color: #8b2252;">   clean      removes temporary files created by /home/torstein/bin/ece *)</span>
+<span style="color: #8b2252;">   deploy     deploys the assembled EAR *)</span>
+<span style="color: #8b2252;">   help       prints this help screen</span>
+<span style="color: #8b2252;">   kill       uses force to stop the type</span>
+<span style="color: #8b2252;">   log        the type'</span>s Log4J log
    outlog     the [ece#engine] script log (system out log)
    restart    restarts the type
    start      starts the type
@@ -363,20 +372,109 @@ <h2 id="sec-2"><span class="section-number-2">2</span> Getting an overview of al
    update     update publication resources
    versions   lists the ECE component versions
 
-*) only applicable if type is 'engine'
+*) only applicable if type is <span style="color: #8b2252;">'engine'</span>
+</pre>
+
+
+</div>
+
+</div>
+
+<div id="outline-container-3" class="outline-2">
+<h2 id="sec-3"><span class="section-number-2">3</span> Tailing log files </h2>
+<div class="outline-text-2" id="text-3">
+
+<p>The script has a number of options to let you keep track of what's
+going on on your system.
+</p>
+
+</div>
+
+<div id="outline-container-3-1" class="outline-3">
+<h3 id="sec-3-1"><span class="section-number-3">3.1</span> Getting an overview of the log files </h3>
+<div class="outline-text-3" id="text-3-1">
+
+<p>The ece script will be more than happy to tell you about the log files
+on your system that are of interest to your instance:
+</p>
+
 
+<pre class="src src-sh">$ ece -i dev1 loglist
+[ece#engine-dev1] System out log: /var/log/escenic/engine-dev1.out
+[ece#engine-dev1] App server log: /opt/tomcat-dev1/logs/localhost.2011-09-20.log
+[ece#engine-dev1] log4j log: /var/log/escenic/messages
 </pre>
 
 
+</div>
+
+</div>
+
+<div id="outline-container-3-2" class="outline-3">
+<h3 id="sec-3-2"><span class="section-number-3">3.2</span> Commands for tailing the log files </h3>
+<div class="outline-text-3" id="text-3-2">
+
+<p>There are three different logs, which ece will let you tail. When
+tailing the log file, ece will also first print out where the file is
+located on the file system so you can open it later for further
+inspection. 
+</p>
+
+
+
+<pre class="src src-sh">$ ece -i dev1 outlog
+[ece#engine-dev1] Tailing the system out log /var/log/escenic/engine-dev1.out
+</pre>
+
+
+<p>
+The available log file commands are:
+</p><dl>
+<dt>outlog</dt><dd>the system out log
+</dd>
+<dt>applog</dt><dd>the app server log 
+</dd>
+<dt>log</dt><dd>the log4j log
+</dd>
+</dl>
 
 
 </div>
 
 </div>
 
-<div id="outline-container-3" class="outline-2">
-<h2 id="sec-3"><span class="section-number-2">3</span> Installation </h2>
-<div class="outline-text-2" id="text-3">
+<div id="outline-container-3-3" class="outline-3">
+<h3 id="sec-3-3"><span class="section-number-3">3.3</span> Piping the log files to another command </h3>
+<div class="outline-text-3" id="text-3-3">
+
+<p>If you wish to pass the log files onto another pipe, for instance to
+grep all the log files for a certain exception or error message, you
+will find the -q parameter useful:
+</p>
+
+
+<pre class="src src-sh">$ ece -i dev1 -q loglist | xargs grep IllegalArgumentException
+</pre>
+
+
+<p>
+This approach is also useful if you wish to tail all the log files at
+once: 
+</p>
+
+
+<pre class="src src-sh">$ ece -i dev1 -q loglist | xargs tail -f
+</pre>
+
+
+</div>
+</div>
+
+</div>
+
+<div id="outline-container-4" class="outline-2">
+<h2 id="sec-4"><span class="section-number-2">4</span> Installation </h2>
+<div class="outline-text-2" id="text-4">
 
 <p>The ece script and ece.conf may be used on any Unix like system that
 has a fairly recent version of BASH installed.
@@ -384,9 +482,9 @@ <h2 id="sec-3"><span class="section-number-2">3</span> Installation </h2>
 
 </div>
 
-<div id="outline-container-3-1" class="outline-3">
-<h3 id="sec-3-1"><span class="section-number-3">3.1</span> Overview of File Paths Used by the ece script </h3>
-<div class="outline-text-3" id="text-3-1">
+<div id="outline-container-4-1" class="outline-3">
+<h3 id="sec-4-1"><span class="section-number-3">4.1</span> Overview of File Paths Used by the ece script </h3>
+<div class="outline-text-3" id="text-4-1">
 
 <p>These are recommended files and locations for using the ece script:
 </p>
@@ -438,13 +536,10 @@ <h3 id="sec-3-1"><span class="section-number-3">3.1</span> Overview of File Path
 </p>
 
 
-<pre class="example">ECE_CONF_LOCATIONS 
-
+<pre class="src src-sh">ECE_CONF_LOCATIONS 
 </pre>
 
 
-
-
 <p>
 The reason for having so many options is because various Escenic
 consultants, partners and customers have requested these locations to
@@ -456,23 +551,20 @@ <h3 id="sec-3-1"><span class="section-number-3">3.1</span> Overview of File Path
 
 </div>
 
-<div id="outline-container-4" class="outline-2">
-<h2 id="sec-4"><span class="section-number-2">4</span> Running the ece script </h2>
-<div class="outline-text-2" id="text-4">
+<div id="outline-container-5" class="outline-2">
+<h2 id="sec-5"><span class="section-number-2">5</span> Running the ece script </h2>
+<div class="outline-text-2" id="text-5">
 
 <p>You must be normal user to run the ece script, otherwise it will
 complain:
 </p>
 
 
-<pre class="example">[ece#engine] Sorry, you cannot be root when running ece
+<pre class="src src-sh">[ece#engine] Sorry, you cannot be root when running ece
 [ece#engine] The root user can only use /etc/init.d/ece
-
 </pre>
 
 
-
-
 <p>
 As it mentions, the root user may use the init.d script and the
 accompanying /etc/default/ece to command the different ECE, EAE and
@@ -480,12 +572,14 @@ <h2 id="sec-4"><span class="section-number-2">4</span> Running the ece script </
 </p>
 </div>
 </div>
+</div>
+
 <div id="postamble">
 <hr/>
 <p class="author">
   Author: Torstein Krause Johansen (<a href="mailto:tkj@vizrt.com">tkj@vizrt.com</a>)
-  Date: 2011-09-12 18:14:44 CST
-</p></div>
+  Date: 2011-09-27 20:28:00 CST
+</p>
 </div>
 </body>
 </html>
diff --git a/usr/share/doc/escenic/ece-guide.txt b/usr/share/doc/escenic/ece-guide.txt
index d3ee7c8d..4b053049 100644
--- a/usr/share/doc/escenic/ece-guide.txt
+++ b/usr/share/doc/escenic/ece-guide.txt
@@ -2,7 +2,7 @@
                   =================================
 
 Author: Torstein Krause Johansen
-Date: 2011-09-12 18:14:41 CST
+Date: 2011-09-27 20:27:57 CST
 
 
 Table of Contents
@@ -12,9 +12,13 @@ Table of Contents
     1.2 Completing types of servers the ece scripts can operate on 
     1.3 Completing the publication resources available 
 2 Getting an overview of all available options 
-3 Installation 
-    3.1 Overview of File Paths Used by the ece script 
-4 Running the ece script 
+3 Tailing log files 
+    3.1 Getting an overview of the log files 
+    3.2 Commands for tailing the log files 
+    3.3 Piping the log files to another command 
+4 Installation 
+    4.1 Overview of File Paths Used by the ece script 
+5 Running the ece script 
 
 
 1 TAB completion 
@@ -34,8 +38,6 @@ to remember all the different options and their correct wording:
   assemble    help        outlog      status      update      
   clean       kill        restart     stop        versions
 
-
-
 The commands are all described in detail in "ece help"
 
 1.2 Completing types of servers the ece scripts can operate on 
@@ -46,8 +48,6 @@ The commands are all described in detail in "ece help"
   analysis  engine    rmi-hub   search
 
 
-
-
 1.3 Completing the publication resources available 
 ===================================================
 The ece script can update the publication resources for a given
@@ -61,8 +61,6 @@ list and complete the available resource names:
   content-type   image-version  layout-group   
   feature        layout         menu
 
-
-
 2 Getting an overview of all available options 
 -----------------------------------------------
 
@@ -114,14 +112,64 @@ list and complete the available resource names:
   *) only applicable if type is 'engine'
 
 
+3 Tailing log files 
+--------------------
+The script has a number of options to let you keep track of what's
+going on on your system.
+
+3.1 Getting an overview of the log files 
+=========================================
+The ece script will be more than happy to tell you about the log files
+on your system that are of interest to your instance:
+
+
+  $ ece -i dev1 loglist
+  [ece#engine-dev1] System out log: /var/log/escenic/engine-dev1.out
+  [ece#engine-dev1] App server log: /opt/tomcat-dev1/logs/localhost.2011-09-20.log
+  [ece#engine-dev1] log4j log: /var/log/escenic/messages
+
+
+3.2 Commands for tailing the log files 
+=======================================
+There are three different logs, which ece will let you tail. When
+tailing the log file, ece will also first print out where the file is
+located on the file system so you can open it later for further
+inspection. 
+
+
+
+  $ ece -i dev1 outlog
+  [ece#engine-dev1] Tailing the system out log /var/log/escenic/engine-dev1.out
 
 
-3 Installation 
+The available log file commands are:
+outlog: the system out log
+applog: the app server log 
+log: the log4j log
+
+3.3 Piping the log files to another command 
+============================================
+If you wish to pass the log files onto another pipe, for instance to
+grep all the log files for a certain exception or error message, you
+will find the -q parameter useful:
+
+
+  $ ece -i dev1 -q loglist | xargs grep IllegalArgumentException
+
+
+This approach is also useful if you wish to tail all the log files at
+once: 
+
+
+  $ ece -i dev1 -q loglist | xargs tail -f
+
+
+4 Installation 
 ---------------
 The ece script and ece.conf may be used on any Unix like system that
 has a fairly recent version of BASH installed.
 
-3.1 Overview of File Paths Used by the ece script 
+4.1 Overview of File Paths Used by the ece script 
 ==================================================
 These are recommended files and locations for using the ece script:
 
@@ -155,14 +203,12 @@ this environment variable in your .bashrc or similar:
   ECE_CONF_LOCATIONS
 
 
-
-
 The reason for having so many options is because various Escenic
 consultants, partners and customers have requested these locations to
 fit their systems. As you can see, fitting everyone's fancy adds up
 over time :-)
 
-4 Running the ece script 
+5 Running the ece script 
 -------------------------
 You must be normal user to run the ece script, otherwise it will
 complain:
@@ -172,8 +218,6 @@ complain:
   [ece#engine] The root user can only use /etc/init.d/ece
 
 
-
-
 As it mentions, the root user may use the init.d script and the
 accompanying /etc/default/ece to command the different ECE, EAE and
 RMI hub instances on your system.

From 7c877d4b471adb6fb1cfa251b7c627326b4c8a87 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 29 Sep 2011 13:11:59 +0800
Subject: [PATCH 0065/2585] - added backup command which will run as follows:

$ ece -i dev1 backup
[ece#engine-dev1] Cleaning up generated files in /opt/escenic/assemblytool ...
[ece#engine-dev1] Backing up the dev1 instance of engine on quanah ...
[ece#engine-dev1] Database dumped: /var/backups/escenic/ece5db-2011-09-29.sql.gz
[ece#engine-dev1] Creating snapshot ... (this will take a while)
[ece#engine-dev1] Backup ready: /tmp/engine-dev1-backup-2011-09-29.tar.gz
[ece#engine-dev1] The backup arhcive includes:
[ece#engine-dev1] - Database snapshot
[ece#engine-dev1] - All Solr & Escenic data files from /var/lib/escenic
[ece#engine-dev1] - All app servers in /opt
[ece#engine-dev1] - All Escenic binaries & publication templates in /opt/escenic
[ece#engine-dev1] - All Escenic configuration in /etc/escenic and /etc/default/ece
[ece#engine-dev1] - All Escenic bootstrap scripts from /etc/init.d
[ece#engine-dev1] Enjoy!

- the DB settings are read from the instance application server
  configuration. Currently, only Tomcat is supported.
---
 usr/bin/ece | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 106 insertions(+)

diff --git a/usr/bin/ece b/usr/bin/ece
index 2a34e817..8813b373 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -524,6 +524,107 @@ function deploy()
     esac
 }
 
+function backup_type()
+{
+   message="Backing up the $instance instance of $type on $HOSTNAME ..."
+   print $message
+   log $message
+
+   if [ $type = "rmi-hub" ]; then
+       ensure_that_required_fields_are_set $hub_required_fields
+   elif [ $type = "search" ]; then
+        # TODO trim & tun the default parameters for the search
+        # instance.
+       ensure_that_required_fields_are_set $engine_required_fields
+   elif [ $type = "engine" ]; then
+       ensure_that_required_fields_are_set $engine_required_fields
+   elif [ $type = "analysis" ]; then
+       ensure_that_required_fields_are_set $analysis_required_fields
+   fi
+    
+   # TODO add support for backup_dir in ece.conf
+   if [ -z "$backup_dir" ]; then
+       backup_dir=/var/backups/escenic
+   fi
+   if [ ! -w $backup_dir ]; then
+       print $backup_dir "must exist & be write-able for $USER"
+       exit 1
+   fi
+
+   if [ $appserver = "tomcat" ]; then
+       connect_string=$(find $tomcat_base/conf | xargs \
+           grep jdbc | \
+           grep url | \
+           head -1 | \
+           cut -d'"' -f2)
+       db_port=$(echo $connect_string | cut -d':' -f4 | cut -d'/' -f1)
+       db=$(echo $connect_string | cut -d'/' -f4 | cut -d'?' -f1)
+       db_host=$(echo $connect_string | cut -d'/' -f3- | cut -d':' -f1)
+
+       db_user=$(find $tomcat_base/conf -name "*.xml" | \
+           grep -v tomcat-users.xml | xargs \
+           grep username | \
+           grep -v \<user | \
+           head -1 | \
+           cut -d'"' -f2)
+       db_password=$(find $tomcat_base/conf -name "*.xml" | \
+           grep -v tomcat-users.xml | xargs \
+           grep password | \
+           head -1 | \
+           cut -d'"' -f2)
+
+       db_backup_file=$backup_dir/${db}-$(date --iso).sql.gz
+       mysqldump -u ${db_user} \
+           -p${db_password} \
+           -h ${db_host} \
+           -P ${db_port} ${db} | \
+           gzip - \
+           > $db_backup_file
+
+       print "Database dumped: $db_backup_file"
+   fi
+   
+   archive_dir=/tmp
+   archive_file=/tmp/${type}-${instance}-backup-$(date --iso).tar.gz
+   possible_backup="
+/etc/escenic 
+/opt/escenic 
+/etc/init.d/ece
+/etc/default/ece
+/etc/inti.d/rmi-hub
+/var/lib/escenic
+"
+   actual_backup=""
+   for el in $possible_backup; do
+       if [ -r $el ]; then
+           actual_backup="$el $actual_backup"
+       fi
+   done
+
+   if [ $appserver = "tomcat" ]; then
+       actual_backup="$tomcat_home $tomcat_base $actual_backup"
+   fi
+
+   print "Creating snapshot ... (this will take a while)"
+   tar czf $archive_file \
+       $actual_backup \
+       $db_backup_file \
+       1>>$log_file \
+       2>>$log_file
+
+   message="Backup ready: $archive_file"
+   print $message
+   log $message
+   print "The backup arhcive includes:"
+   print "- Database snapshot"
+   print "- All Solr & Escenic data files from /var/lib/escenic"
+   print "- All app servers in /opt"
+   print "- All Escenic binaries & publication templates in /opt/escenic"
+   print "- All Escenic configuration in /etc/escenic and /etc/default/ece"
+   print "- All Escenic bootstrap scripts from /etc/init.d"
+   print "Enjoy!"
+ }
+
 
 function start_type()
 {
@@ -1097,6 +1198,7 @@ function print_help()
     echo "The following commands are available:"
     echo "   applog     the type's app server log"
     echo "   assemble   runs the Assembly Tool *)"
+    echo "   backup     backs up an entire instance (takes time)"
     echo "   clean      removes temporary files created by $0 *)"
     echo "   deploy     deploys the assembled EAR *)"
     echo "   help       prints this help screen"
@@ -1163,6 +1265,10 @@ for el in $command; do
         update)
             update_publication_resources
             ;;
+        backup)
+            clean_up
+            backup_type
+            ;;
         help)
             print_help
             ;;

From cc3e6f513898d1e9826f5b939b94df8ef1a2300c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 29 Sep 2011 13:12:17 +0800
Subject: [PATCH 0066/2585] - added the backup command

---
 etc/bash_completion.d/ece | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/bash_completion.d/ece b/etc/bash_completion.d/ece
index cdaec16d..6d816e29 100644
--- a/etc/bash_completion.d/ece
+++ b/etc/bash_completion.d/ece
@@ -4,7 +4,7 @@ _ece_commands()
     local cur=${COMP_WORDS[COMP_CWORD]}
     local prev=${COMP_WORDS[COMP_CWORD-1]}
 
-    commands="applog assemble clean deploy help kill log loglist outlog restart start status stop threaddump update versions"
+    commands="applog assemble backup clean deploy help kill log loglist outlog restart start status stop threaddump update versions"
     resources="content-type feature layout layout-group image-version menu"
     types="engine search analysis rmi-hub"
 

From 67313ca6dbd18ceeb6a0a21b9d7f092d2bfe96be Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 29 Sep 2011 13:12:34 +0800
Subject: [PATCH 0067/2585] - added backup_dir where ece backup will put its
 files

---
 etc/escenic/ece.conf | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/etc/escenic/ece.conf b/etc/escenic/ece.conf
index 2f3ad3bf..9b1e771e 100644
--- a/etc/escenic/ece.conf
+++ b/etc/escenic/ece.conf
@@ -126,3 +126,9 @@ is_production=1
 #####################################################################
 enable_heap_dump=1
 heap_dump_dir=/var/crash/escenic
+
+#####################################################################
+# Where 'ece -i <instance> backup' will put its snapshot
+# backups. Default is /var/backups/escenic.
+#####################################################################
+backup_dir=/var/backups/escenic

From c29b77587015c7263ef4cbfe01e6afa1e1386526 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 29 Sep 2011 13:16:59 +0800
Subject: [PATCH 0068/2585] - added some hardening to ece backup if the
 ece.conf isn't sane or   it's running with a non existent instance

---
 usr/bin/ece | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/usr/bin/ece b/usr/bin/ece
index 8813b373..306712e8 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -552,6 +552,12 @@ function backup_type()
    fi
 
    if [ $appserver = "tomcat" ]; then
+       if [ ! -d $tomcat_base/conf ]; then
+           print $tomcat_base/conf "doesn't exist :-("
+           print "check your ece.conf the $instance instance of type $type"
+           exit 1
+       fi
+       
        connect_string=$(find $tomcat_base/conf | xargs \
            grep jdbc | \
            grep url | \

From 259db6e0677bed9a46d66fd7d252b4719fed43cf Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 7 Oct 2011 15:03:12 +0800
Subject: [PATCH 0069/2585] - the backup archive is now put in
 /var/backups/escenic (where the SQL   backup is as well).

---
 usr/bin/ece | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 306712e8..f085f83f 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -590,8 +590,7 @@ function backup_type()
        print "Database dumped: $db_backup_file"
    fi
    
-   archive_dir=/tmp
-   archive_file=/tmp/${type}-${instance}-backup-$(date --iso).tar.gz
+   archive_file=$backup_dir/${type}-${instance}-backup-$(date --iso).tar.gz
    possible_backup="
 /etc/escenic 
 /opt/escenic 

From abd475e1362e118d88eb15d83c9963f58a30378f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 7 Oct 2011 15:21:52 +0800
Subject: [PATCH 0070/2585] - moved setting of port from set_common_settings to
 its own method,   set_type_port, which is then called from set_type_settings
 (which is   more logical).

---
 usr/bin/ece | 54 ++++++++++++++++++++++++++++-------------------------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index f085f83f..6a7f2000 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -190,30 +190,6 @@ function set_common_settings()
       $log_dir/messages
       $log_dir/Escenic-error.log
     "
-
-    host=localhost
-    if [ $appserver != "tomcat" ]; then
-        debug "Only tomcat is supported for reading host/port right now, "
-        debug "trying to make an educated guess"
-        port=8080
-    else
-        if [ -r $tomcat_base/logs/catalina.out ]; then
-            # for tomcat6-user packaged tomcats (and perhaps others)
-            out_log=$tomcat_base/logs/catalina.out
-        else
-            out_log=$log_file
-        fi
-
-        if [ -r $out_log ]; then
-            port=$(grep "INFO: Starting Coyote HTTP/1.1 on http-" \
-                $out_log | \
-                tail -1 | \
-                cut -d'-' -f2
-            )
-        fi
-        
-    fi
-    
 }
 
 function set_type_settings()
@@ -248,6 +224,33 @@ function set_type_pid()
     debug "type_pid is now=$type_pid"
 }
 
+function set_type_port()
+{
+    host=localhost
+    if [ $appserver != "tomcat" ]; then
+        debug "Only tomcat is supported for reading host/port right now, "
+        debug "trying to make an educated guess"
+        port=8080
+    else
+        if [ -r $tomcat_base/logs/catalina.out ]; then
+            # for tomcat6-user packaged tomcats (and perhaps others)
+            out_log=$tomcat_base/logs/catalina.out
+        else
+            out_log=$log_file
+        fi
+
+        if [ -r $out_log ]; then
+            port=$(grep "INFO: Starting Coyote HTTP/1.1 on http-" \
+                $out_log | \
+                tail -1 | \
+                cut -d'-' -f2
+            )
+        fi
+    fi
+
+    debug "set_type_port=$port"
+}
+
 function set_instance_settings()
 {
     # optional: possible to have instance specific conf files,
@@ -277,6 +280,8 @@ function set_instance_settings()
     fi
 
     set_type_pid
+
+    set_type_port
     
     # if type is rmi-hub, we don't' need more configuration.
     if [ $type = "rmi-hub" ]; then
@@ -385,7 +390,6 @@ function set_instance_settings()
     debug ECE_HOME=$ECE_HOME
     debug JAVA_HOME=$JAVA_HOME
     debug JAVA_OPTS=$JAVA_OPTS
-
 }
 
 function sanity_check()

From ba67153709412b5bfbab140898e2ad521ca66177 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 7 Oct 2011 15:33:40 +0800
Subject: [PATCH 0071/2585] - fixed debian_or_derivative test bug in
 add_server_to_runlevels and   install_packages_if_missing. The first one
 would lead to update-rc.d   was running for all distributions.

  Thanks to adarshdeshratnam for getting me on to this.
---
 usr/sbin/ece-install | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 27e2c2a2..ca419aa2 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -200,7 +200,7 @@ function download_escenic_components()
 # $1 : space separated string of package names 
 install_packages_if_missing()
 {
-    if [ $on_debian_or_derivative ]; then
+    if [ $on_debian_or_derivative -eq 1 ]; then
         some_are_missing=0
         for el in $@; do
             # we don't need to grep away "No packages found matching
@@ -2067,7 +2067,7 @@ function add_server_to_runlevels()
         return
     fi
 
-    if [ $on_debian_or_derivative ]; then
+    if [ $on_debian_or_derivative -eq 1 ]; then
         print "Adding the ece init.d script to the default run levels ..."
         run update-rc.d ece defaults
     else

From cd82cf37a22bd7a7995761741f7387474de533c0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 7 Oct 2011 16:48:25 +0800
Subject: [PATCH 0072/2585] - added section on assembly when upgrading ECE
 and/or plugins.

---
 usr/share/doc/escenic/ece-guide.org | 43 ++++++++++++++++++++++++-----
 1 file changed, 36 insertions(+), 7 deletions(-)

diff --git a/usr/share/doc/escenic/ece-guide.org b/usr/share/doc/escenic/ece-guide.org
index 0a2200e3..80ba055b 100644
--- a/usr/share/doc/escenic/ece-guide.org
+++ b/usr/share/doc/escenic/ece-guide.org
@@ -126,6 +126,33 @@ once:
 $ ece -i dev1 -q loglist | xargs tail -f
 #+END_SRC
 
+* Assembling a new EAR
+The script will quite happily assemble your EAR file. Please note that
+you need to run 
+#+BEGIN_SRC sh
+$ ece clean assemble
+#+END_SRC
+whenever you've upgraded either ECE or one of its plugins. The script
+will try to take care of you though and warn you of such duplication:
+#+BEGIN_SRC sh
+[ece#engine] Multiple versions of ECE and/or 3rd party libraries found.
+[ece#engine] Remember, you need to run 'ece clean assemble' when
+[ece#engine] upgrading either ECE or one of the plugins.
+[ece#engine] Press ENTER to run 'ece clean assemble'
+#+END_SRC
+The script will then re-run the assembly by itself.
+
+If you're just re-running the assembly after just adding a new plugin
+or want to re-build your publications after template changes, you can
+omit the clean command and just run:
+#+BEGIN_SRC sh
+$ ece assembly
+#+END_SRC
+
+The EAR produced is now ready to be deployed with
+#+BEGIN_SRC sh
+$ ece [-i <instance>] deploy
+#+END_SRC
 * Installation
 The ece script and ece.conf may be used on any Unix like system that
 has a fairly recent version of BASH installed.
@@ -133,13 +160,15 @@ has a fairly recent version of BASH installed.
 ** Overview of File Paths Used by the ece script
 These are recommended files and locations for using the ece script:
 
-|----------------------------------+-----------------------------|
-| Path                             | Explanation                 |
-|----------------------------------+-----------------------------|
-| /usr/bin/ece                     | The script itself           |
-| /etc/escenic/ece.conf            | The main configuration file |
-| /etc/escenic/ece-<instance>.conf | Instance specific settings  |
-|----------------------------------+-----------------------------|
+|----------------------------------+----------------------------------|
+| Path                             | Explanation                      |
+|----------------------------------+----------------------------------|
+| /usr/bin/ece                     | The script itself                |
+| /etc/escenic/ece.conf            | The main configuration file      |
+| /etc/escenic/ece-<instance>.conf | Instance specific settings       |
+| /var/cache/escenic               | Directory of assembled EAR files |
+| /tmp                             | Directory for temporary files    |
+|----------------------------------+----------------------------------|
 
 As you can see in ece.conf, there are a number of default locations
 dealing with log files, pid files, crash files as well as application

From e1796839a5e0e84484258f56ca1c40bb3ec10e4f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 7 Oct 2011 16:48:35 +0800
Subject: [PATCH 0073/2585] - updated

---
 usr/share/doc/escenic/ece-guide.html | 81 +++++++++++++++++++++++-----
 1 file changed, 67 insertions(+), 14 deletions(-)

diff --git a/usr/share/doc/escenic/ece-guide.html b/usr/share/doc/escenic/ece-guide.html
index aadeb8b0..ac540c65 100644
--- a/usr/share/doc/escenic/ece-guide.html
+++ b/usr/share/doc/escenic/ece-guide.html
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
                "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 lang="en" xml:lang="en">
 <head>
 <title>Guide for the /usr/bin/ece Script</title>
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
+<meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
 <meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2011-09-27 20:28:00 CST"/>
+<meta name="generated" content="2011-10-07 16:47:40 CST"/>
 <meta name="author" content="Torstein Krause Johansen"/>
 <meta name="description" content=""/>
 <meta name="keywords" content=""/>
@@ -239,12 +239,13 @@ <h2>Table of Contents</h2>
 <li><a href="#sec-3-3">3.3 Piping the log files to another command </a></li>
 </ul>
 </li>
-<li><a href="#sec-4">4 Installation </a>
+<li><a href="#sec-4">4 Assembling a new EAR </a></li>
+<li><a href="#sec-5">5 Installation </a>
 <ul>
-<li><a href="#sec-4-1">4.1 Overview of File Paths Used by the ece script </a></li>
+<li><a href="#sec-5-1">5.1 Overview of File Paths Used by the ece script </a></li>
 </ul>
 </li>
-<li><a href="#sec-5">5 Running the ece script </a></li>
+<li><a href="#sec-6">6 Running the ece script </a></li>
 </ul>
 </div>
 </div>
@@ -473,18 +474,68 @@ <h3 id="sec-3-3"><span class="section-number-3">3.3</span> Piping the log files
 </div>
 
 <div id="outline-container-4" class="outline-2">
-<h2 id="sec-4"><span class="section-number-2">4</span> Installation </h2>
+<h2 id="sec-4"><span class="section-number-2">4</span> Assembling a new EAR </h2>
 <div class="outline-text-2" id="text-4">
 
+<p>The script will quite happily assemble your EAR file. Please note that
+you need to run 
+</p>
+
+
+<pre class="src src-sh">$ ece clean assemble
+</pre>
+
+<p>
+whenever you've upgraded either ECE or one of its plugins. The script
+will try to take care of you though and warn you of such duplication:
+</p>
+
+
+<pre class="src src-sh">[ece#engine] Multiple versions of ECE and/or 3rd party libraries found.
+[ece#engine] Remember, you need to run <span style="color: #8b2252;">'ece clean assemble'</span> when
+[ece#engine] upgrading either ECE or one of the plugins.
+[ece#engine] Press ENTER to run <span style="color: #8b2252;">'ece clean assemble'</span>
+</pre>
+
+<p>
+The script will then re-run the assembly by itself.
+</p>
+<p>
+If you're just re-running the assembly after just adding a new plugin
+or want to re-build your publications after template changes, you can
+omit the clean command and just run:
+</p>
+
+
+<pre class="src src-sh">$ ece assembly
+</pre>
+
+
+<p>
+The EAR produced is now ready to be deployed with
+</p>
+
+
+<pre class="src src-sh">$ ece [-i &lt;instance&gt;] deploy
+</pre>
+
+</div>
+
+</div>
+
+<div id="outline-container-5" class="outline-2">
+<h2 id="sec-5"><span class="section-number-2">5</span> Installation </h2>
+<div class="outline-text-2" id="text-5">
+
 <p>The ece script and ece.conf may be used on any Unix like system that
 has a fairly recent version of BASH installed.
 </p>
 
 </div>
 
-<div id="outline-container-4-1" class="outline-3">
-<h3 id="sec-4-1"><span class="section-number-3">4.1</span> Overview of File Paths Used by the ece script </h3>
-<div class="outline-text-3" id="text-4-1">
+<div id="outline-container-5-1" class="outline-3">
+<h3 id="sec-5-1"><span class="section-number-3">5.1</span> Overview of File Paths Used by the ece script </h3>
+<div class="outline-text-3" id="text-5-1">
 
 <p>These are recommended files and locations for using the ece script:
 </p>
@@ -499,6 +550,8 @@ <h3 id="sec-4-1"><span class="section-number-3">4.1</span> Overview of File Path
 <tr><td class="left">/usr/bin/ece</td><td class="left">The script itself</td></tr>
 <tr><td class="left">/etc/escenic/ece.conf</td><td class="left">The main configuration file</td></tr>
 <tr><td class="left">/etc/escenic/ece-&lt;instance&gt;.conf</td><td class="left">Instance specific settings</td></tr>
+<tr><td class="left">/var/cache/escenic</td><td class="left">Directory of assembled EAR files</td></tr>
+<tr><td class="left">/tmp</td><td class="left">Directory for temporary files</td></tr>
 </tbody>
 </table>
 
@@ -551,9 +604,9 @@ <h3 id="sec-4-1"><span class="section-number-3">4.1</span> Overview of File Path
 
 </div>
 
-<div id="outline-container-5" class="outline-2">
-<h2 id="sec-5"><span class="section-number-2">5</span> Running the ece script </h2>
-<div class="outline-text-2" id="text-5">
+<div id="outline-container-6" class="outline-2">
+<h2 id="sec-6"><span class="section-number-2">6</span> Running the ece script </h2>
+<div class="outline-text-2" id="text-6">
 
 <p>You must be normal user to run the ece script, otherwise it will
 complain:
@@ -578,7 +631,7 @@ <h2 id="sec-5"><span class="section-number-2">5</span> Running the ece script </
 <hr/>
 <p class="author">
   Author: Torstein Krause Johansen (<a href="mailto:tkj@vizrt.com">tkj@vizrt.com</a>)
-  Date: 2011-09-27 20:28:00 CST
+  Date: 2011-10-07 16:47:40 CST
 </p>
 </div>
 </body>

From aef01987d0e17da65d263b722cc37bb6615a47b6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 7 Oct 2011 16:48:42 +0800
Subject: [PATCH 0074/2585] - updated

---
 usr/share/doc/escenic/ece-guide.txt | 59 +++++++++++++++++++++++------
 1 file changed, 47 insertions(+), 12 deletions(-)

diff --git a/usr/share/doc/escenic/ece-guide.txt b/usr/share/doc/escenic/ece-guide.txt
index 4b053049..8d7f9e5a 100644
--- a/usr/share/doc/escenic/ece-guide.txt
+++ b/usr/share/doc/escenic/ece-guide.txt
@@ -2,7 +2,7 @@
                   =================================
 
 Author: Torstein Krause Johansen
-Date: 2011-09-27 20:27:57 CST
+Date: 2011-10-07 16:47:42 CST
 
 
 Table of Contents
@@ -16,9 +16,10 @@ Table of Contents
     3.1 Getting an overview of the log files 
     3.2 Commands for tailing the log files 
     3.3 Piping the log files to another command 
-4 Installation 
-    4.1 Overview of File Paths Used by the ece script 
-5 Running the ece script 
+4 Assembling a new EAR 
+5 Installation 
+    5.1 Overview of File Paths Used by the ece script 
+6 Running the ece script 
 
 
 1 TAB completion 
@@ -164,20 +165,54 @@ once:
   $ ece -i dev1 -q loglist | xargs tail -f
 
 
-4 Installation 
+4 Assembling a new EAR 
+-----------------------
+The script will quite happily assemble your EAR file. Please note that
+you need to run 
+
+
+  $ ece clean assemble
+
+whenever you've upgraded either ECE or one of its plugins. The script
+will try to take care of you though and warn you of such duplication:
+
+
+  [ece#engine] Multiple versions of ECE and/or 3rd party libraries found.
+  [ece#engine] Remember, you need to run 'ece clean assemble' when
+  [ece#engine] upgrading either ECE or one of the plugins.
+  [ece#engine] Press ENTER to run 'ece clean assemble'
+
+The script will then re-run the assembly by itself.
+
+If you're just re-running the assembly after just adding a new plugin
+or want to re-build your publications after template changes, you can
+omit the clean command and just run:
+
+
+  $ ece assembly
+
+
+The EAR produced is now ready to be deployed with
+
+
+  $ ece [-i <instance>] deploy
+
+5 Installation 
 ---------------
 The ece script and ece.conf may be used on any Unix like system that
 has a fairly recent version of BASH installed.
 
-4.1 Overview of File Paths Used by the ece script 
+5.1 Overview of File Paths Used by the ece script 
 ==================================================
 These are recommended files and locations for using the ece script:
 
-  Path                               Explanation                  
- ----------------------------------+-----------------------------
-  /usr/bin/ece                       The script itself            
-  /etc/escenic/ece.conf              The main configuration file  
-  /etc/escenic/ece-<instance>.conf   Instance specific settings   
+  Path                               Explanation                       
+ ----------------------------------+----------------------------------
+  /usr/bin/ece                       The script itself                 
+  /etc/escenic/ece.conf              The main configuration file       
+  /etc/escenic/ece-<instance>.conf   Instance specific settings        
+  /var/cache/escenic                 Directory of assembled EAR files  
+  /tmp                               Directory for temporary files     
 
 As you can see in ece.conf, there are a number of default locations
 dealing with log files, pid files, crash files as well as application
@@ -208,7 +243,7 @@ consultants, partners and customers have requested these locations to
 fit their systems. As you can see, fitting everyone's fancy adds up
 over time :-)
 
-5 Running the ece script 
+6 Running the ece script 
 -------------------------
 You must be normal user to run the ece script, otherwise it will
 complain:

From 885e2232cc6d5e24f2d8f4273b3bb922a576e905 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 7 Oct 2011 16:52:45 +0800
Subject: [PATCH 0075/2585] - 'ece assemble' will now tell you if the generated
 EAR file contains   duplicates libraries and if yes, offer you to re-run the
 assembly   after cleaning up:

    [ece#engine] Multiple versions of ECE and/or 3rd party libraries found.
    [ece#engine] Remember, you need to run 'ece clean assemble' when
    [ece#engine] upgrading either ECE or one of the plugins.
    [ece#engine] Press ENTER to run 'ece clean assemble'
---
 usr/bin/ece | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/usr/bin/ece b/usr/bin/ece
index 6a7f2000..c0f599ca 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -840,6 +840,33 @@ function assemble()
         2>>$log_file
     exit_on_error "$message"
 
+    # test to see if the new versions of ECE & plugins are upgrades of
+    # the previous ones
+    duplicates_found=0
+    known_unharmful_duplicates="activation- $'\n' ehcache-$'\n' stax-api-$'\n'"
+    
+    cd $assemblytool_home/dist/.work/ear/lib
+    for el in *.jar; do
+        jar=$(basename $(echo $el | sed  -e  's/[0-9]//g') .jar | sed 's/\.//g')
+        if [ $(echo $known_unharmful_duplicates | grep $jar | wc -l) -gt 0 ]; then
+            continue
+        fi
+        if [ $(\ls *.jar | grep "$jar[0-9]" | wc -l) -gt 1 ]; then
+            duplicates_found=1
+            debug "More than one version of $jar"
+        fi
+    done
+
+    if [ $duplicates_found -eq 1 ]; then
+        print "Multiple versions of ECE and/or 3rd party libraries found."
+        print "Remember, you need to run '$(basename $0) clean assemble' when "
+        print "upgrading either ECE or one of the plugins."
+        print "Press ENTER to run '$(basename $0) clean assemble'"
+        read ok
+        clean_up
+        assemble
+    fi
+    
     mkdir -p $ear_cache_dir/
     exit_on_error "creating $ear_cache_dir"
 

From a494c0a0812e1478ba2887d2fcd8ab1d6ba93217 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 10 Oct 2011 13:01:54 +0800
Subject: [PATCH 0076/2585] - added check to sanity_check: a check if the user
 is using the   default instance when he/she really wants to start one of the 
  instances installed on the system. - new method get_instance_list, makes an
 educated guess of the   instances installed. Works only if the system is
 installed with   recommended paths.

  This change produces output like this on systems that have one or
  more instances installed:

    $ ece status
    [ece#engine] You must specify the instance with -i <instance>
    [ece#engine] e.g. ece -i dev1 status
    [ece#engine] Instances available on quanah: dev1
---
 usr/bin/ece | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/usr/bin/ece b/usr/bin/ece
index c0f599ca..63b9d13d 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -155,6 +155,20 @@ function read_conf_file()
     done
 }
 
+# If the system is installed using the recommended paths, the method
+# will return a list of the instances configured in
+# /etc/escenic/engine/instance
+function get_instance_list()
+{
+    instance_list=""
+
+    if [ -r /etc/escenic/engine/instance ]; then
+        instance_list=$(ls /etc/escenic/engine/instance)
+    fi
+
+    echo $instance_list
+}
+
 function set_common_settings()
 {
     # This behaviour can be overridden by specifying a list of
@@ -407,6 +421,19 @@ function sanity_check()
         print "You must specificy a command, see 'ece help'."
         exit 1
     fi
+
+    # checks if the user is using the default instance when he/she
+    # really wants to start one of the instances installed on the
+    # system.
+    if [ $instance = "default" -a $type = "engine" ]; then
+        instance_list=$(get_instance_list)
+        if [ -n "$instance_list" ]; then
+            print "You must specify the instance with -i <instance>"
+            print "e.g. ece -i $(echo $instance_list | cut -d' ' -f1) $command"
+            print "Instances available on $HOSTNAME: $instance_list"
+            exit 1
+        fi
+    fi
 }
 
 function deploy()

From 1d65314ebc6fa2b967c33b0817da5e1d87459257 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 10 Oct 2011 13:11:57 +0800
Subject: [PATCH 0077/2585] - renamed git_source -> ece_scripts_git_source

---
 usr/sbin/ece-install | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index ca419aa2..9115ca2e 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -29,7 +29,7 @@ download_dir=/tmp/ece-downloads
 log=/var/log/$(basename $0).log
 conf_file=$HOME/.ece-install.conf
 common_nursery_dir=/etc/escenic/engine/common
-git_source=git://github.com/skybert/ece-scripts.git
+ece_scripts_git_source=git://github.com/skybert/ece-scripts.git
 
 # globals will be set to correct values in run-time.
 appserver_port=8080
@@ -354,7 +354,7 @@ function set_up_ece_scripts()
         (cd ece-scripts
             git pull 1>>$log 2>>$log)
     else
-        run git clone $git_source
+        run git clone $ece_scripts_git_source
     fi
     
     run cp -r ece-scripts/usr/* /usr/

From d9bcd13f1134af8d0d58096886e2e33ca935fc4e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 10 Oct 2011 14:40:15 +0800
Subject: [PATCH 0078/2585] - New logic to: ece assemble

  If multiple versions of dependencies are detected, ece will try to
  sort it out for the user without any interaction, as follows:

$ ece assemble -i dev1
[ece#engine-dev1] Assembling your EAR file ...
[ece#engine-dev1] Multiple versions of ECE and/or 3rd party libraries found.
[ece#engine-dev1] Remember, you need to run 'ece clean assemble' when
[ece#engine-dev1] upgrading either ECE or one of the plugins.
[ece#engine-dev1] I will now clean it up for you and re-run the assembly.
[ece#engine-dev1] Cleaning up generated files in /opt/escenic/assemblytool ...
[ece#engine-dev1] Assembling your EAR file ...

  The change is in the assemble() function and will work regardless
  of the commands issued to the ece script. For the user, this means
  that this will work when assemble is just one of a line of commands
  passed to ece, e.g.: ece assemble stop deploy start
---
 usr/bin/ece | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 63b9d13d..53208a67 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -888,8 +888,7 @@ function assemble()
         print "Multiple versions of ECE and/or 3rd party libraries found."
         print "Remember, you need to run '$(basename $0) clean assemble' when "
         print "upgrading either ECE or one of the plugins."
-        print "Press ENTER to run '$(basename $0) clean assemble'"
-        read ok
+        print "I will now clean it up for you and re-run the assembly."
         clean_up
         assemble
     fi

From 87a744667a2880f7eabcafd71affa41172816f14 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 10 Oct 2011 14:57:49 +0800
Subject: [PATCH 0079/2585] - updated documentation on assembly - added section
 describing the difference between the default instance   and the name
 instances.

---
 usr/share/doc/escenic/ece-guide.org | 37 ++++++++++++++++++++++++++---
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/usr/share/doc/escenic/ece-guide.org b/usr/share/doc/escenic/ece-guide.org
index 80ba055b..aa1e8a37 100644
--- a/usr/share/doc/escenic/ece-guide.org
+++ b/usr/share/doc/escenic/ece-guide.org
@@ -130,7 +130,7 @@ $ ece -i dev1 -q loglist | xargs tail -f
 The script will quite happily assemble your EAR file. Please note that
 you need to run 
 #+BEGIN_SRC sh
-$ ece clean assemble
+$ ece -i clean assemble
 #+END_SRC
 whenever you've upgraded either ECE or one of its plugins. The script
 will try to take care of you though and warn you of such duplication:
@@ -138,9 +138,10 @@ will try to take care of you though and warn you of such duplication:
 [ece#engine] Multiple versions of ECE and/or 3rd party libraries found.
 [ece#engine] Remember, you need to run 'ece clean assemble' when
 [ece#engine] upgrading either ECE or one of the plugins.
-[ece#engine] Press ENTER to run 'ece clean assemble'
+[ece#engine] I will now clean it up for you and re-run the assembly.
+[ece#engine] Cleaning up generated files in /opt/escenic/assemblytool ...
+[ece#engine] Assembling your EAR file ...
 #+END_SRC
-The script will then re-run the assembly by itself.
 
 If you're just re-running the assembly after just adding a new plugin
 or want to re-build your publications after template changes, you can
@@ -199,6 +200,7 @@ fit their systems. As you can see, fitting everyone's fancy adds up
 over time :-)
 
 * Running the ece script
+** You must run it as a non-privileged user
 You must be normal user to run the ece script, otherwise it will
 complain:
 #+BEGIN_SRC sh
@@ -209,4 +211,33 @@ complain:
 As it mentions, the root user may use the init.d script and the
 accompanying /etc/default/ece to command the different ECE, EAE and
 RMI hub instances on your system.
+** Specifying instance
 
+*** Specifying the instance
+The script is made for being easy to use with multiple instances on
+the same host. You specify the instance you want to operate on using the
+-i parameter. E.g. to assemble and deploy the editor1 instance, you'd
+do:
+#+BEGIN_SRC sh
+$ ece -i editor1 assemble deploy restart
+#+END_SRC
+
+*** Using the default instance 
+However, on development systems and perhaps even test systems, you
+probably want to just use one instance on your host, though, and this
+is where the "default" instance comes in.
+
+To use the default instance, you must only have one instance installed
+on your system. More specifically, there must no instance specific
+configuration files in
+#+BEGIN_SRC sh
+/etc/escenic/engine/instance
+#+END_SRC 
+and that ece.conf, typically located in:
+#+BEGIN_SRC sh
+/etc/escenic/ece.conf
+#+END_SRC
+must contain all the settings required to run the instance.
+
+If you've ticked all these boxes, you can issue all ece commands
+without the -i parameter.

From 1cf5f953523ea790b5a5e3cfbabbff8ad908c693 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 10 Oct 2011 18:12:25 +0800
Subject: [PATCH 0080/2585] - fixed bug in set_up_app_server where the a BASH
 escaped variable   never was set (probably deleted by me coding one hour too
 late one   day), leading to Catalina's loader lacking the essential/core
 Tomcat   libraries.

- about 50% done with the code handling recovery (from backup)
- added user interaction and FAI configuration reading regarding the
  Munin gatherer, the Munin gatherer profile is the one which lacks
  the most right now, though.
---
 usr/sbin/ece-install | 93 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 92 insertions(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 9115ca2e..0a43013f 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -117,6 +117,7 @@ PROFILE_SEARCH_SERVER=7
 PROFILE_WIDGET_FRAMEWORK=8
 PROFILE_CREATE_PUBLICATION=9
 PROFILE_MONITORING_SERVER=10
+PROFILE_RESTORE_FROM_BACKUP=11
 
 # Because of issue VF-3559, we also create the default family and host
 # directories.
@@ -735,6 +736,7 @@ function set_up_app_server
     # such as log4j configuration put in ${tomcat.base}/lib.
     file=$tomcat_base/conf/catalina.properties
     common_loader=$(grep ^common.loader $file)
+    escaped_common_loader=$(get_escaped_bash_string ${common_loader})
     escenic_loader=",$\{catalina.base\}/escenic/lib/*.jar"
     old=$(get_escaped_bash_string ${common_loader})
     new=${escaped_common_loader}$(get_escaped_bash_string ${escenic_loader})
@@ -1984,6 +1986,20 @@ function install_munin_gatherer()
     fi
 
     # TODO ask user/read fai_munin_node_list
+    if [ $fai_enabled -eq 0 ]; then
+        print "Which nodes shall this Munin monitor gather from?"
+        print "Separate your hosts with a space, e.g.: 'editor01 db01 web01'"
+        echo -n "Your choice> "
+        read user_munin_nodes
+        
+        if [ -n "$user_munin_nodes" ]; then
+            node_list=$user_munin_nodes
+        fi
+    else
+        node_list=$(get_conf_value fai_munin_node_list)
+    fi
+    
+    
     # TODO has a hard dependency on install_web_server, should perhaps
     # be called from this one?
 
@@ -2080,6 +2096,79 @@ function add_server_to_runlevels()
     fi
 }
 
+function restore_from_backup()
+{
+    # locals
+    restore_db=0
+    restore_binaries=0
+    restore_data_files=0
+    restore_conf=0
+    backup_file=""
+    
+    if [ $fai_enabled -eq 1 -a $fai_restore_from_backup -eq 1 ]; then
+        backup_file=${fai_restore_from_file}
+        
+        if [ $fai_restore_db -eq 1 -o $fai_restore_all -eq 1 ]; then
+            restore_db=1
+        fi
+        if [ $fai_restore_data_files -eq 1 -o $fai_restore_all -eq 1 ]; then
+            restore_data_files=1
+        fi
+        if [ $fai_restore_software_binaries -eq 1 -o $fai_restore_all -eq 1 ]; then
+            restore_binaries=1
+        fi
+        if [ $fai_restore_configuration -eq 1 -o $fai_restore_all -eq 1 ]; then
+            restore_conf=1
+        fi
+    else
+        print "From which dataset do you wish to backup?"
+        # TODO
+    fi
+
+    if [ ! -r $backup_file ]; then
+        print $backup_file "either doesn't exist or cannot be read."
+        print "I cannot restore from it :-("
+        exit 1
+    fi
+    
+    dir=$(mktemp -d)
+    
+    if [ $restore_db -eq 1 ]; then
+        install_database_server
+        run cd $dir
+        run tar xzf $backup_file --wildcards var/backups/escenic/*.sql.gz
+        # picking the DB backup file to restore
+        sql_file=$(ls -tra var/backups/escenic/*.sql.gz | tail -1)
+        print "Selected the most recent database dump " $sql_file
+        run mysql < $sql_file
+        print "Database restored on $HOSTNAME from $sql_file"
+    fi
+    
+    if [ $restore_data_files -eq 1 ]; then
+        run cd $dir
+        run tar xzf $backup_file var/lib/escenic
+        run mv var/lib/escenic /var/lib
+        print "Restored data files on $HOSTNAME from $backup_file"
+        print "Check /var/lib/escenic to to see they're all there"
+    fi
+    
+    if [ $restore_conf -eq 1 ]; then
+        run cd $dir
+        run tar xzf $backup_file etc
+        run mv etc /
+        print "Restored configuration files on $HOSTNAME from $backup_file"
+        print "Check /etc to see that they're all there".
+    fi
+    
+    if [ $restore_binaries -eq 1 ]; then
+        run cd $dir
+        run tar xzf $backup_file opt
+        run mv opt /
+        print "Restored software binaries on $HOSTNAME from $backup_file"
+        print "Check /opt to see that they're all there".
+    fi
+}
+
 function common_post_install()
 {
     add_server_to_runlevels
@@ -2132,6 +2221,9 @@ if [ $fai_enabled -eq 1 ]; then
     elif [ $(get_boolean_conf_value fai_munin_gatherer_create) -eq 1 ]; then
         install_profile_number=$PROFILE_MONITORING_SERVER
         install_munin_gatherer
+    elif [ $(get_boolean_conf_value fai_restore_from_backup) -eq 1 ]; then
+        install_profile_number=$PROFILE_RESTORE_FROM_BACKUP
+        restore_from_backup
     fi
     
     common_post_install
@@ -2145,7 +2237,6 @@ else
         $PROFILE_CACHE_SERVER)
         install_cache_server
         install_web_server
-        install_munin_gatherer
         ;;
         $PROFILE_DB_SERVER)
         install_database_server

From a9c6942a66af526bf6dbe8a1524c27b258f89ee7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 10 Oct 2011 19:27:34 +0800
Subject: [PATCH 0081/2585] - added missing quote in create_schema(), goodness
 knows how long this   bug has been there.

---
 usr/sbin/drop-and-create-ecedb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/sbin/drop-and-create-ecedb b/usr/sbin/drop-and-create-ecedb
index 9eb9c574..5c0d13e6 100644
--- a/usr/sbin/drop-and-create-ecedb
+++ b/usr/sbin/drop-and-create-ecedb
@@ -108,6 +108,7 @@ create database $db_schema character set utf8 collate utf8_general_ci;
 grant all on $db_schema.* to $db_user@'%' identified by '$db_password';
 grant all on $db_schema.* to $db_user@'localhost' identified by '$db_password';
 EOF
+        exit_on_the_first_error "create db"
     else
         sqlplus /nolog << EOF
 connect /as sysdba;

From 5435df7fc5ef7be0bd0c61d8933b519e93379aec Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 11 Oct 2011 15:41:44 +0800
Subject: [PATCH 0082/2585] - recovery from backup tarball made with "ece
 backup" now works in FAI   mode! Given these three settings in
 .ece-install.conf:

    fai_enabled=1
    fai_restore_from_backup=1
    fai_restore_all=1
    fai_restore_from_file=/var/backups/escenic/engine-dev1-backup-2011-10-10.tar.gz

  ece-install will do the following (standard output from common
  ece-install tasks & user feedback omitted):

[ece-install-8] Restoring the database contents on ubiquitous ...
[ece-install-21] Selecting the most recent database dump ece5db-2011-10-10.sql.gz
[ece-install-22] Successfully restored DB on ubiquitous from ece5db-2011-10-10.sql.gz
[ece-install-23] Restoring the Solr & ECE data files on ubiquitous ...
[ece-install-35] Successfully restored Solr & ECE data files on ubiquitous
[ece-install-35] from backup: engine-dev1-backup-2011-10-10.tar.gz
[ece-install-35] Check /var/lib/escenic to verify they're all there
[ece-install-36] Restoring the ECE configuration files on ubiquitous ...
[ece-install-49] Successfully restored ECE configuration files on ubiquitous
[ece-install-49] from backup: engine-dev1-backup-2011-10-10.tar.gz
[ece-install-49] Check /etc to verify that they're all there.
[ece-install-49] Restoring the Escenic & Tomcat binaries on ubiquitous ...
[ece-install-69] Successfully restored Escenic & Tomcat binaries on ubiquitous
[ece-install-69] from backup: engine-dev1-backup-2011-10-10.tar.gz
[ece-install-69] Check /opt to verify that they're all there.

   The same tarball can be used on multiple hosts, choosing to only
   backup parts of the contents by replacing fai_restore_all=1 with
   one of:

   fai_restore_db=1
   fai_restore_data_files=1
   fai_restore_configuration=1
   fai_restore_software_binaries=1
---
 usr/sbin/ece-install | 102 ++++++++++++++++++++++++++++++-------------
 1 file changed, 72 insertions(+), 30 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 0a43013f..5c1bc03d 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -388,7 +388,6 @@ function set_up_ecedb()
         fi
     done
 
-    source /usr/sbin/drop-and-create-ecedb
     # TODO in future, it'll be possible to override db_user,
     # db_password and db_schema here by reading these via
     # get_conf_value
@@ -1335,6 +1334,8 @@ function read_user_input()
     echo "      (if available) or ECE/clean-demo."
     echo -n "  $PROFILE_MONITORING_SERVER - A monitoring server."
     echo "     This will install the Munin gatherer"
+    echo -n "  $PROFILE_RESTORE_FROM_BACKUP - Restore from a backup."
+    echo "     Allows you to restore parts of or an entire system."
     echo ""
     echo -n "Your choice [1]> "
     read install_profile_number
@@ -1487,10 +1488,14 @@ function add_next_step()
     fi
 }
 
+# $1 : optional parameter, binaries_only. If passed, $1=binaries_only,
+#      the ECE DB schema is not set up. 
 function install_database_server()
 {
     print "Installing the database server on $HOSTNAME ..."
 
+    source /usr/sbin/drop-and-create-ecedb
+
     if [ $on_debian_or_derivative -eq 1 ]; then
 
         code_name=$(lsb_release -s -c)
@@ -1535,10 +1540,12 @@ function install_database_server()
     fi
 
     assert_pre_prequesite mysql
-    
-    download_escenic_components
-    set_up_engine_and_plugins
-    set_up_ecedb
+
+    if [ -z "$1" ]; then
+        download_escenic_components
+        set_up_engine_and_plugins
+        set_up_ecedb
+    fi
 }
 
 # $1 is the default instance name, the calee is responsible for
@@ -2028,6 +2035,13 @@ function install_munin_node()
         -O $file
     run chmod 755 $file
 
+    if [ ! -e /etc/escenic/ece-*.conf -o -z "$type" -o -z "$instance" ]; then
+        print "No ECE instances found on $HOSTNAME, so I'm not adding"
+        print "additional Munin configuration"  
+        add_next_step "- A Munin node has been installed on $HOSTNAME"
+        return
+    fi
+    
     escenic_jstat_modules="_gc _gcoverhead _heap _uptime"
     for el in /etc/escenic/ece-*.conf; do
         current_instance=$(basename ${el} | \
@@ -2105,28 +2119,40 @@ function restore_from_backup()
     restore_conf=0
     backup_file=""
     
-    if [ $fai_enabled -eq 1 -a $fai_restore_from_backup -eq 1 ]; then
+    if [ $(get_boolean_conf_value fai_enabled) -eq 1 -a \
+        $(get_boolean_conf_value fai_restore_from_backup) -eq 1 ]; then
         backup_file=${fai_restore_from_file}
+
+        if [ -z "$backup_file" ]; then
+            print "You must specifify fai_restore_from_file"
+            exit 1
+        fi
         
-        if [ $fai_restore_db -eq 1 -o $fai_restore_all -eq 1 ]; then
+        if [ $(get_boolean_conf_value fai_restore_db) -eq 1 -o \
+            $(get_boolean_conf_value fai_restore_all) -eq 1 ]; then
             restore_db=1
         fi
-        if [ $fai_restore_data_files -eq 1 -o $fai_restore_all -eq 1 ]; then
+        
+        if [ $(get_boolean_conf_value fai_restore_data_files) -eq 1 -o \
+            $(get_boolean_conf_value fai_restore_all) -eq 1 ]; then
             restore_data_files=1
         fi
-        if [ $fai_restore_software_binaries -eq 1 -o $fai_restore_all -eq 1 ]; then
+        
+        if [ $(get_boolean_conf_value fai_restore_software_binaries) -eq 1 -o \
+            $(get_boolean_conf_value fai_restore_all) -eq 1 ]; then
             restore_binaries=1
         fi
-        if [ $fai_restore_configuration -eq 1 -o $fai_restore_all -eq 1 ]; then
+        if [ $(get_boolean_conf_value fai_restore_configuration) -eq 1 -o \
+            $(get_boolean_conf_value fai_restore_all) -eq 1 ]; then
             restore_conf=1
         fi
-    else
+    elif [ $(get_boolean_conf_value fai_enabled) -eq 0 ]; then
         print "From which dataset do you wish to backup?"
         # TODO
     fi
 
-    if [ ! -r $backup_file ]; then
-        print $backup_file "either doesn't exist or cannot be read."
+    if [ ! -r "$backup_file" ]; then
+        print "$backup_file either doesn't exist or cannot be read."
         print "I cannot restore from it :-("
         exit 1
     fi
@@ -2134,38 +2160,51 @@ function restore_from_backup()
     dir=$(mktemp -d)
     
     if [ $restore_db -eq 1 ]; then
-        install_database_server
+        install_database_server "binaries_only"
+        print "Restoring the database contents on $HOSTNAME ..."
         run cd $dir
         run tar xzf $backup_file --wildcards var/backups/escenic/*.sql.gz
         # picking the DB backup file to restore
         sql_file=$(ls -tra var/backups/escenic/*.sql.gz | tail -1)
-        print "Selected the most recent database dump " $sql_file
-        run mysql < $sql_file
-        print "Database restored on $HOSTNAME from $sql_file"
+        print "Selecting the most recent database dump " $(basename $sql_file)
+
+        # methods in drop-and-create-ecedb to set up the database
+        # schema & user
+        pre_install_new_ecedb
+        create_schema
+
+        # db_schema is defined in drop-and-create-ecedb
+        gunzip < $sql_file | mysql $db_schema
+        exit_on_error "restoring from $sql_file"
+        
+        print "Successfully restored DB on $HOSTNAME from" $(basename $sql_file)
     fi
     
     if [ $restore_data_files -eq 1 ]; then
+        print "Restoring the Solr & ECE data files on $HOSTNAME ..."
         run cd $dir
-        run tar xzf $backup_file var/lib/escenic
-        run mv var/lib/escenic /var/lib
-        print "Restored data files on $HOSTNAME from $backup_file"
-        print "Check /var/lib/escenic to to see they're all there"
+        run tar -C / -xzf $backup_file var/lib/escenic
+        print "Successfully restored Solr & ECE data files on $HOSTNAME"
+        print "from backup:  $(basename $backup_file)"
+        print "Check /var/lib/escenic to verify they're all there"
     fi
     
     if [ $restore_conf -eq 1 ]; then
+        print "Restoring the ECE configuration files on $HOSTNAME ..."
         run cd $dir
-        run tar xzf $backup_file etc
-        run mv etc /
-        print "Restored configuration files on $HOSTNAME from $backup_file"
-        print "Check /etc to see that they're all there".
+        run tar -C / -xzf $backup_file etc
+        print "Successfully restored ECE configuration files on $HOSTNAME"
+        print "from backup: $(basename $backup_file)"
+        print "Check /etc to verify that they're all there".
     fi
     
     if [ $restore_binaries -eq 1 ]; then
+        print "Restoring the Escenic & Tomcat binaries on $HOSTNAME ..."
         run cd $dir
-        run tar xzf $backup_file opt
-        run mv opt /
-        print "Restored software binaries on $HOSTNAME from $backup_file"
-        print "Check /opt to see that they're all there".
+        run tar -C / -xzf $backup_file opt
+        print "Successfully restored Escenic & Tomcat binaries on $HOSTNAME"
+        print "from backup: $(basename $backup_file)"
+        print "Check /opt to verify that they're all there".
     fi
 }
 
@@ -2262,8 +2301,11 @@ else
         $PROFILE_MONITORING_SERVER)
         install_munin_gatherer
         ;;
+        $PROFILE_RESTORE_FROM_BACKUP)
+        restore_from_backup
+        ;;
         default)
-            print "You must select 1-7"
+            print "You must select 1-11"
             exit 1
             ;;
     esac

From f0ee508e4432563bb7ae23e3d4523a01b144480d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 11 Oct 2011 18:38:06 +0800
Subject: [PATCH 0083/2585] - updated ece-install guide with a big section on
 (backup &) restore   as well as giving more examples on how to use FAI.

---
 usr/share/doc/escenic/ece-install-guide.org | 90 ++++++++++++++++++++-
 1 file changed, 89 insertions(+), 1 deletion(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 1649637a..8937bb2c 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -266,8 +266,13 @@ monitoring the different nodes.
 
 * Full Automatic Install (FAI)
 The ece-install script has support for doing a full automatic install
-(FAI).
+(FAI). You can only install one profile at a time. The profiles are
+the parameters with "install" in their name, such as:
+#+BEGIN_SRC sh
+fai_editor_install
+#+END_SRC
 
+** Overview of All FAI Parameters
 The ece-install script understands for the following settings in the
 $HOME/.ece-install.conf file of the root user:
 
@@ -302,6 +307,8 @@ $HOME/.ece-install.conf file of the root user:
 
 As you've probably have guessed, 0 means "false" and 1 means "true" :-)
 
+** Examples
+*** Installing an Editorial Server & Create a Publication
 To automatically install an editorial server and create a publication
 called "jollygood", the minimal configuration in .ece-install.conf
 would be:
@@ -313,6 +320,29 @@ fai_publication_create=1
 fai_publication_name=jollygood
 #+END_SRC
 
+*** Installing Two Presentation Servers On a Single Host
+If you wish to only install two presentation servers called "web1" and
+"web2" on your host, you will first run ece-install with:
+#+BEGIN_SRC sh
+fai_enabled=1
+fai_presentation_install=1
+fai_presentation_name=web1
+#+END_SRC 
+
+And then re-issue ece-install with the following configuration:
+#+BEGIN_SRC sh
+fai_enabled=1
+fai_presentation_install=1
+fai_presentation_name=web2
+fai_presentation_port=8081
+fai_presentation_shutdown=8105
+#+END_SRC
+Notice that this configuration has some extra options since the
+previous run of ece-install could run with the default settings,
+whereas the second one needs to override these.
+
+
+** Verifying That the Script Is Running In FAI Mode
 When FAI is enabled, ece-install will report:
 #+BEGIN_SRC sh
 [ece-install] Full Automatic Install (FAI) enabled.
@@ -428,3 +458,61 @@ the host that runs the install script.
 The following output is produced from ece-install:
 #+INCLUDE: "~/tmp/ece-install.out" src text
 
+* Restoring from backup
+ece-install can restore from a backup made by the ece script:
+#+BEGIN_SRC sh
+$ ece -i <instance> backup
+#+END_SRC
+
+As stated in the ece guide, this backup may contain (depending on
+what's available on the host where it's run):
+- database dump of the instance
+- data files (pictures, video files and so on). This is often referred
+  to as the "multimedia archive" in Escenic literature.
+- ECE, cache and web server configuration
+- Escenic software
+
+** Location of the backup file
+
+*** Running interactively
+The ece script will put backups in 
+#+BEGIN_SRC sh
+/var/backups/escenic
+#+END_SRC
+and the ece-install script will hence expect to find them here (when
+running interactively), asking you from which one you wish to restore
+the system:
+
+#+BEGIN_SRC sh
+[ece-install-5] From which dataset do you wish to backup?
+    1 - engine-dev1-backup-2011-10-10.tar.gz
+    2 - engine-dev1-backup-2011-10-11.tar.gz
+[ece-install-5] Enter the number next to the tarball, from 1 to 2
+Your choice [1]>
+#+END_SRC
+
+*** Running in FAI mode
+If you're running in FAI mode, you specify the file to restore from
+with:
+#+BEGIN_SRC sh
+fai_restore_from_file=/var/backups/escenic/engine-dev1-backup-2011-10-10.tar.gz
+#+END_SRC
+
+** Data security
+You should take heed when running restore, so that you're not
+restoring a system which you didn't want to change (yes, this mishap
+does happen).
+
+The ece-install script will help you a bit on the way, but the final
+responsibility always lies with you as the user. 
+
+If you're trying to restore the DB and the ECE schema already exists,
+the restore will fail:
+#+BEGIN_SRC sh
+[ece-install-8] Restoring the database contents on ubiquitous ...
+[ece-install-24] Selecting the most recent database dump ece5db-2011-10-10.sql.gz
+ERROR 1007 (HY000) at line 1: Can't create database 'ece5db'; database exists
+ERROR 1050 (42S01) at line 25: Table '`ece5db`.`AccessControlList`' already exists
+[ece-install-24] The command [restoring from var/backups/escenic/ece5db-2011-10-10.sql.gz] FAILED, exiting :-(
+[ece-install-24] See /var/log/ece-install.log for further details.
+#+END_SRC

From c7d8e36357cbfebdb1b58ba08b340106e909d402 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 11 Oct 2011 18:38:20 +0800
Subject: [PATCH 0084/2585] - updated HTML from .org

---
 usr/share/doc/escenic/ece-install-guide.html | 447 +++++++++++++------
 1 file changed, 320 insertions(+), 127 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.html b/usr/share/doc/escenic/ece-install-guide.html
index 7b7ba0cf..ef403455 100644
--- a/usr/share/doc/escenic/ece-install-guide.html
+++ b/usr/share/doc/escenic/ece-install-guide.html
@@ -7,7 +7,7 @@
 <title>Welcome to the /usr/sbin/ece-install Guide</title>
 <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
 <meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2011-09-15 15:29:55 CST"/>
+<meta name="generated" content="2011-10-11 18:35:36 CST"/>
 <meta name="author" content="Torstein Krause Johansen"/>
 <meta name="description" content=""/>
 <meta name="keywords" content=""/>
@@ -44,6 +44,12 @@
   dt { font-weight: bold; }
   div.figure { padding: 0.5em; }
   div.figure p { text-align: center; }
+  div.inlinetask {
+    padding:10px;
+    border:2px solid gray;
+    margin:10px;
+    background: #ffffcc;
+  }
   textarea { overflow-x: auto; }
   .linenr { font-size:smaller }
   .code-highlighted {background-color:#ffff00;}
@@ -161,8 +167,8 @@
 
 </head>
 <body>
-<div id="content">
 
+<div id="preamble">
 <svg
         id="vizrt-logo"
         version="1.1"
@@ -207,7 +213,12 @@
     </g> 
   </g> 
 </svg>
-<h1>Welcome to the /usr/sbin/ece-install Guide</h1>
+
+</div>
+
+<div id="content">
+<h1 class="title">Welcome to the /usr/sbin/ece-install Guide</h1>
+
 
 <div id="table-of-contents">
 <h2>Table of Contents</h2>
@@ -239,16 +250,28 @@ <h2>Table of Contents</h2>
 <li><a href="#sec-5-2-7">5.2.7 Compression of content </a></li>
 </ul>
 </li>
-<li><a href="#sec-5-3">5.3 1 - Full Stack on One Host </a></li>
-<li><a href="#sec-5-4">5.4 2 - Editorial Server (Publication Server) </a></li>
-<li><a href="#sec-5-5">5.5 3 - Presentation Server </a></li>
-<li><a href="#sec-5-6">5.6 4 - Database Server </a></li>
-<li><a href="#sec-5-7">5.7 5 - Cache Server </a></li>
-<li><a href="#sec-5-8">5.8 8 - Install Widget Framework </a></li>
-<li><a href="#sec-5-9">5.9 9 - Create Publication </a></li>
+<li><a href="#sec-5-3">5.3 Profile - Full Stack on One Host </a></li>
+<li><a href="#sec-5-4">5.4 Profile - Editorial Server (Publication Server) </a></li>
+<li><a href="#sec-5-5">5.5 Profile - Presentation Server </a></li>
+<li><a href="#sec-5-6">5.6 Profile - Database Server </a></li>
+<li><a href="#sec-5-7">5.7 Profile - Cache Server </a></li>
+<li><a href="#sec-5-8">5.8 Profile - Install Widget Framework </a></li>
+<li><a href="#sec-5-9">5.9 Profile - Create Publication </a></li>
+<li><a href="#sec-5-10">5.10 Profile - Monitoring Server </a></li>
+</ul>
+</li>
+<li><a href="#sec-6">6 Full Automatic Install (FAI) </a>
+<ul>
+<li><a href="#sec-6-1">6.1 Overview of All FAI Parameters </a></li>
+<li><a href="#sec-6-2">6.2 Examples </a>
+<ul>
+<li><a href="#sec-6-2-1">6.2.1 Installing an Editorial Server &amp; Create a Publication </a></li>
+<li><a href="#sec-6-2-2">6.2.2 Installing Two Presentation Servers On a Single Host </a></li>
+</ul>
+</li>
+<li><a href="#sec-6-3">6.3 Verifying That the Script Is Running In FAI Mode </a></li>
 </ul>
 </li>
-<li><a href="#sec-6">6 Full Automatic Install (FAI) </a></li>
 <li><a href="#sec-7">7 Running More Than One Installation Process </a></li>
 <li><a href="#sec-8">8 Re-running ece-install (and How To Speed It Up) </a></li>
 <li><a href="#sec-9">9 Overview of File Paths Used by the ece-install script </a></li>
@@ -259,6 +282,17 @@ <h2>Table of Contents</h2>
 </li>
 <li><a href="#sec-11">11 Uninstalling Everything That the ece-install Set Up </a></li>
 <li><a href="#sec-12">12 Example Output FAI </a></li>
+<li><a href="#sec-13">13 Restoring from backup </a>
+<ul>
+<li><a href="#sec-13-1">13.1 Location of the backup file </a>
+<ul>
+<li><a href="#sec-13-1-1">13.1.1 Running interactively </a></li>
+<li><a href="#sec-13-1-2">13.1.2 Running in FAI mode </a></li>
+</ul>
+</li>
+<li><a href="#sec-13-2">13.2 Data security </a></li>
+</ul>
+</li>
 </ul>
 </div>
 </div>
@@ -330,13 +364,10 @@ <h2 id="sec-3"><span class="section-number-2">3</span> Downloading the ece-insta
 </p>
 
 
-<pre class="example">$ git clone git@github.com:skybert/ece-scripts.git
-
+<pre class="src src-sh">$ git clone git@github.com:skybert/ece-scripts.git
 </pre>
 
 
-
-
 </div>
 
 </div>
@@ -350,35 +381,26 @@ <h2 id="sec-4"><span class="section-number-2">4</span> Running the ece-install S
 </p>
 
 
-<pre class="example">[ece-install] You must be root when running ece-install
-
+<pre class="src src-sh">[ece-install] You must be root when running ece-install
 </pre>
 
-
-
 <p>
 To become root on Ubuntu based systems and Mac OS X, do:
 </p>
 
 
-<pre class="example">$ sudo su
-
+<pre class="src src-sh">$ sudo su
 </pre>
 
-
-
 <p>
 On all other Unix like system, do:
 </p>
 
 
-<pre class="example">$ su
-
+<pre class="src src-sh">$ su
 </pre>
 
 
-
-
 <p>
 You will need access to <a href="http://technet.escenic.com">http://technet.escenic.com</a> and put these
 credentials in the root user's $HOME/.ece-install.conf, normally this
@@ -387,40 +409,31 @@ <h2 id="sec-4"><span class="section-number-2">4</span> Running the ece-install S
 </p>
 
 
-<pre class="example">[ece-install] /root/.ece-install.conf doesn't exist, I cannot live without it :-(
-
+<pre class="src src-sh">[ece-install] /root/.ece-install.conf doesn<span style="color: #8b2252;">'t exist, I cannot live without it :-(</span>
 </pre>
 
 
-
-
 <p>
 As for the technet credentials, the script will also tell you if it
 cannot find what it's looking for:
 </p>
 
 
-<pre class="example">[ece-install] Be sure to set technet_user and technet_password
-[ece-install] in /root/.ece-install.conf
-
+<pre class="src src-sh">[ece-install] Be sure to set technet_user and technet_password
+[ece-install]<span style="color: #a020f0;"> in</span> /root/.ece-install.conf
 </pre>
 
 
-
-
 <p>
 The minimum .ece-install.conf file is thus:
 </p>
 
 
-<pre class="example">technet_user=&lt;user&gt;
-technet_password=&lt;password&gt;
-
+<pre class="src src-sh"><span style="color: #a0522d;">technet_user</span>=&lt;user&gt;
+<span style="color: #a0522d;">technet_password</span>=&lt;password&gt;
 </pre>
 
 
-
-
 <p>
 If you're installing WF as well, you'll need additional credentials
 for this, see the Widget Framwork section below, and if you want to
@@ -433,27 +446,21 @@ <h2 id="sec-4"><span class="section-number-2">4</span> Running the ece-install S
 </p>
 
 
-<pre class="example"># bash ece-install [-v|--verbose]
-
+<pre class="src src-sh"><span style="color: #b22222;"># </span><span style="color: #b22222;">bash ece-install [-v|--verbose]</span>
 </pre>
 
 
-
-
 <p>
 ece-install will try to "fail fast", exiting as soon as it detects an
 error during its execution:
 </p>
 
 
-<pre class="example">[ece-install-1] The command [cd /does/not/exist] FAILED, exiting :-(
+<pre class="src src-sh">[ece-install-1] The command [cd /does/not/exist] FAILED, exiting :-(
 [ece-install-1] See /var/log/ece-install.log for further details.
-
 </pre>
 
 
-
-
 <p>
 As a last resort, if something goes astray with the script, and the
 log file cannot give you enough clues, the ultimate way of debugging
@@ -461,13 +468,10 @@ <h2 id="sec-4"><span class="section-number-2">4</span> Running the ece-install S
 </p>
 
 
-<pre class="example"># bash -x ece-install
-
+<pre class="src src-sh"><span style="color: #b22222;"># </span><span style="color: #b22222;">bash -x ece-install</span>
 </pre>
 
 
-
-
 <p>
 Here you can see everything that BASH does when running the script,
 how the wildcard variables expand and so on. Normally, having a tail
@@ -486,26 +490,29 @@ <h2 id="sec-5"><span class="section-number-2">5</span> Available Server Profiles
 </p>
 
 
-<pre class="example">Hi, which server profile do you wish to install?
+<pre class="src src-sh">Hi, which server profile do you wish to install?
 
-Select 1-7 and press ENTER
+Select 1-9 and press ENTER
 
-  1 - The full stack on one host. Suitable for development and
-      test environments (cache, ECE, assembly host &amp; database).
-  2 - Editorial (publication) server (ECE, assembly host).
-  3 - Presentation server (ECE, memcached).
+  1 - All<span style="color: #a020f0;"> in</span> one, the full stack on one host. 
+      Suitable for development and test environments.
+      It will install caching server, ECE, assembly host, database &amp;
+      Widget Framework as well as set up a new publication.
+  2 - Editorial (publication) server.
+      This will install ECE and an assembly host.
+  3 - Presentation server (ECE, memcached)<span style="color: #7a378b;">.</span>
   4 - Database server.
-  5 - Cache server (cache &amp; web server).
+  5 - Cache server (cache &amp; web server)<span style="color: #7a378b;">.</span>
   6 - RMI hub.
-  7 - Standalone search instance (solr + indexer-webapp).
-  8 - Install Widget Framework. This will also set up a WF based 
-      publication for you (repo.escenic.com user/pass required).
-
+  7 - Standalone search instance (solr + indexer-webapp)<span style="color: #7a378b;">.</span>
+  8 - Install the Widget Framework.
+      (You need user/pass for repo.escenic.com for this)<span style="color: #7a378b;">.</span>
+  9 - Create a new publication.
+      This profile will create new publication based on WF
+      (<span style="color: #a020f0;">if</span> available) or ECE/clean-demo.
 </pre>
 
 
-
-
 </div>
 
 <div id="outline-container-5-1" class="outline-3">
@@ -516,10 +523,6 @@ <h3 id="sec-5-1"><span class="section-number-3">5.1</span> Common for All Server
 install the Escenic specific Munin plugins on hosts where there are
 any Escenic server components.
 </p>
-<p>
-TBD: there is currently an issue with the Escenic plugins not working
-properly with the new ece/ece-install scripts. We're working on this.
-</p>
 </div>
 
 </div>
@@ -618,7 +621,7 @@ <h4 id="sec-5-2-7"><span class="section-number-4">5.2.7</span> Compression of co
 </div>
 
 <div id="outline-container-5-3" class="outline-3">
-<h3 id="sec-5-3"><span class="section-number-3">5.3</span> 1 - Full Stack on One Host </h3>
+<h3 id="sec-5-3"><span class="section-number-3">5.3</span> Profile - Full Stack on One Host </h3>
 <div class="outline-text-3" id="text-5-3">
 
 <p>This profile is suitable for developers and admins wanting to set up a
@@ -636,26 +639,24 @@ <h3 id="sec-5-3"><span class="section-number-3">5.3</span> 1 - Full Stack on One
 </div>
 
 <div id="outline-container-5-4" class="outline-3">
-<h3 id="sec-5-4"><span class="section-number-3">5.4</span> 2 - Editorial Server (Publication Server) </h3>
+<h3 id="sec-5-4"><span class="section-number-3">5.4</span> Profile - Editorial Server (Publication Server) </h3>
 <div class="outline-text-3" id="text-5-4">
 
-
-
+<p>Will set up a typical editorial server (often referred to as the
+publication server in Escenic literature).
+</p>
 </div>
 
 </div>
 
 <div id="outline-container-5-5" class="outline-3">
-<h3 id="sec-5-5"><span class="section-number-3">5.5</span> 3 - Presentation Server </h3>
+<h3 id="sec-5-5"><span class="section-number-3">5.5</span> Profile - Presentation Server </h3>
 <div class="outline-text-3" id="text-5-5">
 
 <p>This will set up a typical presentation server:
 </p><ul>
 <li>Memcached, distributed memory cache
 </li>
-<li>Escenic Assembly environment (which may be removed after the
-  installation). 
-</li>
 <li>Deployment setup to only deploy escenic-admin and the
   publication(s).
 </li>
@@ -667,7 +668,7 @@ <h3 id="sec-5-5"><span class="section-number-3">5.5</span> 3 - Presentation Serv
 </div>
 
 <div id="outline-container-5-6" class="outline-3">
-<h3 id="sec-5-6"><span class="section-number-3">5.6</span> 4 - Database Server </h3>
+<h3 id="sec-5-6"><span class="section-number-3">5.6</span> Profile - Database Server </h3>
 <div class="outline-text-3" id="text-5-6">
 
 <p>If ece-install is run on a support version of Debian or Ubuntu, this
@@ -689,22 +690,19 @@ <h3 id="sec-5-6"><span class="section-number-3">5.6</span> 4 - Database Server <
 </p>
 
 
-<pre class="example">[ece-install] Setting up the ECE database schema ...
-ERROR 1007 (HY000) at line 1: Can't create database 'ece5db'; database exists
-ERROR 1050 (42S01) at line 2: Table 'DBChangeLog' already exists
-[ece-install] running tables FAILED, exiting :-(
-
+<pre class="src src-sh">[ece-install] Setting up the ECE database schema ...
+ERROR 1007 (HY000) at line 1: Can<span style="color: #8b2252;">'t create database '</span>ece5db<span style="color: #8b2252;">'; database exists</span>
+<span style="color: #8b2252;">ERROR 1050 (42S01) at line 2: Table '</span>DBChangeLog<span style="color: #8b2252;">' already exists</span>
+<span style="color: #8b2252;">[ece-install] running tables FAILED, exiting :-(</span>
 </pre>
 
 
-
-
 </div>
 
 </div>
 
 <div id="outline-container-5-7" class="outline-3">
-<h3 id="sec-5-7"><span class="section-number-3">5.7</span> 5 - Cache Server </h3>
+<h3 id="sec-5-7"><span class="section-number-3">5.7</span> Profile - Cache Server </h3>
 <div class="outline-text-3" id="text-5-7">
 
 <p>If ece-install is run on a support version of Debian or Ubuntu, it
@@ -744,9 +742,6 @@ <h3 id="sec-5-7"><span class="section-number-3">5.7</span> 5 - Cache Server </h3
   will configure Varnish accordingly. This will be very useful for
   Adactus servers wanting to pull content from your ECEs.
 </li>
-<li>will install a Munin gatherer and make its interface available 
-  when accesssing the web server directly (port 81) 
-</li>
 </ul>
 
 
@@ -768,7 +763,7 @@ <h3 id="sec-5-7"><span class="section-number-3">5.7</span> 5 - Cache Server </h3
 </div>
 
 <div id="outline-container-5-8" class="outline-3">
-<h3 id="sec-5-8"><span class="section-number-3">5.8</span> 8 - Install Widget Framework </h3>
+<h3 id="sec-5-8"><span class="section-number-3">5.8</span> Profile - Install Widget Framework </h3>
 <div class="outline-text-3" id="text-5-8">
 
 <p>You'll need a user name and password for accessing the
@@ -782,19 +777,16 @@ <h3 id="sec-5-8"><span class="section-number-3">5.8</span> 8 - Install Widget Fr
 </p>
 
 
-<pre class="example">[ece-install] Be sure to set wf_user and wf_password in /root/.ece-install.conf
-[ece-install] If you don't have these, please contact support@escenic.com
-
+<pre class="src src-sh">[ece-install] Be sure to set wf_user and wf_password<span style="color: #a020f0;"> in</span> /root/.ece-install.conf
+[ece-install] If you don<span style="color: #8b2252;">'t have these, please contact support@escenic.com</span>
 </pre>
 
-
-
 </div>
 
 </div>
 
 <div id="outline-container-5-9" class="outline-3">
-<h3 id="sec-5-9"><span class="section-number-3">5.9</span> 9 - Create Publication </h3>
+<h3 id="sec-5-9"><span class="section-number-3">5.9</span> Profile - Create Publication </h3>
 <div class="outline-text-3" id="text-5-9">
 
 <p>This profile will create a publication for you, only asking you the
@@ -806,6 +798,21 @@ <h3 id="sec-5-9"><span class="section-number-3">5.9</span> 9 - Create Publicatio
 Framework if its present on the system, if not, ECE's clean demo WAR
 is used as a basis.  
 </p></div>
+
+</div>
+
+<div id="outline-container-5-10" class="outline-3">
+<h3 id="sec-5-10"><span class="section-number-3">5.10</span> Profile - Monitoring Server </h3>
+<div class="outline-text-3" id="text-5-10">
+
+<p>This will install a Munin gatherer and make its interface available 
+when accesssing the web server directly (port 81).
+</p>
+<p>
+TBD: This profile will also install the Nagios interface for
+monitoring the different nodes. 
+</p>
+</div>
 </div>
 
 </div>
@@ -815,10 +822,23 @@ <h2 id="sec-6"><span class="section-number-2">6</span> Full Automatic Install (F
 <div class="outline-text-2" id="text-6">
 
 <p>The ece-install script has support for doing a full automatic install
-(FAI).
+(FAI). You can only install one profile at a time. The profiles are
+the parameters with "install" in their name, such as:
 </p>
-<p>
-The ece-install script understands for the following settings in the
+
+
+<pre class="src src-sh">fai_editor_install
+</pre>
+
+
+
+</div>
+
+<div id="outline-container-6-1" class="outline-3">
+<h3 id="sec-6-1"><span class="section-number-3">6.1</span> Overview of All FAI Parameters </h3>
+<div class="outline-text-3" id="text-6-1">
+
+<p>The ece-install script understands for the following settings in the
 $HOME/.ece-install.conf file of the root user:
 </p>
 <table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
@@ -860,37 +880,91 @@ <h2 id="sec-6"><span class="section-number-2">6</span> Full Automatic Install (F
 <p>
 As you've probably have guessed, 0 means "false" and 1 means "true" :-)
 </p>
-<p>
-To automatically install an editorial server and create a publication
+</div>
+
+</div>
+
+<div id="outline-container-6-2" class="outline-3">
+<h3 id="sec-6-2"><span class="section-number-3">6.2</span> Examples </h3>
+<div class="outline-text-3" id="text-6-2">
+
+
+</div>
+
+<div id="outline-container-6-2-1" class="outline-4">
+<h4 id="sec-6-2-1"><span class="section-number-4">6.2.1</span> Installing an Editorial Server &amp; Create a Publication </h4>
+<div class="outline-text-4" id="text-6-2-1">
+
+<p>To automatically install an editorial server and create a publication
 called "jollygood", the minimal configuration in .ece-install.conf
 would be:
 </p>
 
 
 
-<pre class="example">fai_enabled=1
-fai_editor_install=1
-fai_publication_create=1
-fai_publication_name=jollygood
+<pre class="src src-sh"><span style="color: #a0522d;">fai_enabled</span>=1
+<span style="color: #a0522d;">fai_editor_install</span>=1
+<span style="color: #a0522d;">fai_publication_create</span>=1
+<span style="color: #a0522d;">fai_publication_name</span>=jollygood
+</pre>
+
+
+</div>
+
+</div>
+
+<div id="outline-container-6-2-2" class="outline-4">
+<h4 id="sec-6-2-2"><span class="section-number-4">6.2.2</span> Installing Two Presentation Servers On a Single Host </h4>
+<div class="outline-text-4" id="text-6-2-2">
 
+<p>If you wish to only install two presentation servers called "web1" and
+"web2" on your host, you will first run ece-install with:
+</p>
+
+
+<pre class="src src-sh"><span style="color: #a0522d;">fai_enabled</span>=1
+<span style="color: #a0522d;">fai_presentation_install</span>=1
+<span style="color: #a0522d;">fai_presentation_name</span>=web1
 </pre>
 
 
+<p>
+And then re-issue ece-install with the following configuration:
+</p>
+
 
+<pre class="src src-sh"><span style="color: #a0522d;">fai_enabled</span>=1
+<span style="color: #a0522d;">fai_presentation_install</span>=1
+<span style="color: #a0522d;">fai_presentation_name</span>=web2
+<span style="color: #a0522d;">fai_presentation_port</span>=8081
+<span style="color: #a0522d;">fai_presentation_shutdown</span>=8105
+</pre>
 
 <p>
-When FAI is enabled, ece-install will report:
+Notice that this configuration has some extra options since the
+previous run of ece-install could run with the default settings,
+whereas the second one needs to override these.
 </p>
 
+</div>
+</div>
 
-<pre class="example">[ece-install] Full Automatic Install (FAI) enabled.
-[ece-install] All user input will be read from /root/.ece-install.conf
+</div>
 
-</pre>
+<div id="outline-container-6-3" class="outline-3">
+<h3 id="sec-6-3"><span class="section-number-3">6.3</span> Verifying That the Script Is Running In FAI Mode </h3>
+<div class="outline-text-3" id="text-6-3">
+
+<p>When FAI is enabled, ece-install will report:
+</p>
 
 
+<pre class="src src-sh">[ece-install] Full Automatic Install (FAI) enabled.
+[ece-install] All user input will be read from /root/.ece-install.conf
+</pre>
 
 
+</div>
 </div>
 
 </div>
@@ -904,16 +978,13 @@ <h2 id="sec-7"><span class="section-number-2">7</span> Running More Than One Ins
 </p>
 
 
-<pre class="example">[ece-install] There's already one ece-install process running. If you believe
-[ece-install] this is wrong, e.g. if a previous run of ece-install was aborted
-[ece-install] before it completed, you may delete /var/run/ece-install.pid and
-[ece-install] run ece-install again.
-
+<pre class="src src-sh">[ece-install] There<span style="color: #8b2252;">'s already one ece-install process running. If you believe</span>
+<span style="color: #8b2252;">[ece-install] this is wrong, e.g. if a previous run of ece-install was aborted</span>
+<span style="color: #8b2252;">[ece-install] before it completed, you may delete /var/run/ece-install.pid and</span>
+<span style="color: #8b2252;">[ece-install] run ece-install again.</span>
 </pre>
 
 
-
-
 </div>
 
 </div>
@@ -1060,31 +1131,153 @@ <h2 id="sec-12"><span class="section-number-2">12</span> Example Output FAI </h2
 </p>
 
 
-<pre class="example">technet_user=apples
-technet_password=andoranges
-wf_user=foo
-wf_password=bar
+<pre class="src src-sh"><span style="color: #a0522d;">technet_user</span>=apples
+<span style="color: #a0522d;">technet_password</span>=andoranges
+<span style="color: #a0522d;">wf_user</span>=foo
+<span style="color: #a0522d;">wf_password</span>=bar
+
+<span style="color: #a0522d;">fai_enabled</span>=1
+<span style="color: #a0522d;">fai_all_install</span>=1
+</pre>
 
-fai_enabled=1
-fai_all_install=1
 
+<p>
+All the different components described in this guide are installed on
+the host that runs the install script.
+</p>
+<p>
+The following output is produced from ece-install:
+CANNOT INCLUDE FILE ~/tmp/ece-install.out
+</p>
+</div>
+
+</div>
+
+<div id="outline-container-13" class="outline-2">
+<h2 id="sec-13"><span class="section-number-2">13</span> Restoring from backup </h2>
+<div class="outline-text-2" id="text-13">
+
+<p>ece-install can restore from a backup made by the ece script:
+</p>
+
+
+<pre class="src src-sh">$ ece -i &lt;instance&gt; backup
 </pre>
 
 
+<p>
+As stated in the ece guide, this backup may contain (depending on
+what's available on the host where it's run):
+</p><ul>
+<li>database dump of the instance
+</li>
+<li>data files (pictures, video files and so on). This is often referred
+  to as the "multimedia archive" in Escenic literature.
+</li>
+<li>ECE, cache and web server configuration
+</li>
+<li>Escenic software
+</li>
+</ul>
+
+
+
+</div>
 
+<div id="outline-container-13-1" class="outline-3">
+<h3 id="sec-13-1"><span class="section-number-3">13.1</span> Location of the backup file </h3>
+<div class="outline-text-3" id="text-13-1">
+
+
+
+</div>
+
+<div id="outline-container-13-1-1" class="outline-4">
+<h4 id="sec-13-1-1"><span class="section-number-4">13.1.1</span> Running interactively </h4>
+<div class="outline-text-4" id="text-13-1-1">
+
+<p>The ece script will put backups in 
+</p>
+
+
+<pre class="src src-sh">/var/backups/escenic
+</pre>
 
 <p>
-The following output is produced from ece-install:
-CANNOT INCLUDE FILE /tmp/ece-install.out
+and the ece-install script will hence expect to find them here (when
+running interactively), asking you from which one you wish to restore
+the system:
+</p>
+
+
+
+<pre class="src src-sh">[ece-install-5] From which dataset do you wish to backup?
+    1 - engine-dev1-backup-2011-10-10.tar.gz
+    2 - engine-dev1-backup-2011-10-11.tar.gz
+[ece-install-5] Enter the number next to the tarball, from 1 to 2
+Your choice [1]&gt;
+</pre>
+
+
+</div>
+
+</div>
+
+<div id="outline-container-13-1-2" class="outline-4">
+<h4 id="sec-13-1-2"><span class="section-number-4">13.1.2</span> Running in FAI mode </h4>
+<div class="outline-text-4" id="text-13-1-2">
+
+<p>If you're running in FAI mode, you specify the file to restore from
+with:
+</p>
+
+
+<pre class="src src-sh"><span style="color: #a0522d;">fai_restore_from_file</span>=/var/backups/escenic/engine-dev1-backup-2011-10-10.tar.gz
+</pre>
+
+
+</div>
+</div>
+
+</div>
+
+<div id="outline-container-13-2" class="outline-3">
+<h3 id="sec-13-2"><span class="section-number-3">13.2</span> Data security </h3>
+<div class="outline-text-3" id="text-13-2">
+
+<p>You should take heed when running restore, so that you're not
+restoring a system which you didn't want to change (yes, this mishap
+does happen).
+</p>
+<p>
+The ece-install script will help you a bit on the way, but the final
+responsibility always lies with you as the user. 
+</p>
+<p>
+If you're trying to restore the DB and the ECE schema already exists,
+the restore will fail:
 </p>
+
+
+<pre class="src src-sh">[ece-install-8] Restoring the database contents on ubiquitous ...
+[ece-install-24] Selecting the most recent database dump ece5db-2011-10-10.sql.gz
+ERROR 1007 (HY000) at line 1: Can<span style="color: #8b2252;">'t create database '</span>ece5db<span style="color: #8b2252;">'; database exists</span>
+<span style="color: #8b2252;">ERROR 1050 (42S01) at line 25: Table '</span><span style="color: #ff00ff;">`ece5db`</span><span style="color: #7a378b;">.</span><span style="color: #ff00ff;">`AccessControlList`</span><span style="color: #8b2252;">' already exists</span>
+<span style="color: #8b2252;">[ece-install-24] The command [restoring from var/backups/escenic/ece5db-2011-10-10.sql.gz] FAILED, exiting :-(</span>
+<span style="color: #8b2252;">[ece-install-24] See /var/log/ece-install.log for further details.</span>
+</pre>
+
+</div>
+</div>
 </div>
 </div>
+
 <div id="postamble">
 <hr/>
 <p class="author">
   Author: Torstein Krause Johansen (<a href="mailto:tkj@vizrt.com">tkj@vizrt.com</a>)
-  Date: 2011-09-15 15:29:55 CST
-</p></div>
+  Date: 2011-10-11 18:35:36 CST
+</p>
 </div>
 </body>
 </html>

From eb6bfcf2830c454746d07624a32e85613b189a5a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 11 Oct 2011 18:38:37 +0800
Subject: [PATCH 0085/2585] - updated .txt from .org

---
 usr/share/doc/escenic/ece-install-guide.txt | 233 ++++++++++++++------
 1 file changed, 164 insertions(+), 69 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.txt b/usr/share/doc/escenic/ece-install-guide.txt
index a4a85655..06d7190e 100644
--- a/usr/share/doc/escenic/ece-install-guide.txt
+++ b/usr/share/doc/escenic/ece-install-guide.txt
@@ -2,7 +2,7 @@
               ==========================================
 
 Author: Torstein Krause Johansen
-Date: 2011-09-15 15:29:53 CST
+Date: 2011-10-11 18:38:25 CST
 
 
 Table of Contents
@@ -23,14 +23,20 @@ Table of Contents
         5.2.5 Escenic Assembly environment 
         5.2.6 Database driver 
         5.2.7 Compression of content 
-    5.3 1 - Full Stack on One Host 
-    5.4 2 - Editorial Server (Publication Server) 
-    5.5 3 - Presentation Server 
-    5.6 4 - Database Server 
-    5.7 5 - Cache Server 
-    5.8 8 - Install Widget Framework 
-    5.9 9 - Create Publication 
+    5.3 Profile - Full Stack on One Host 
+    5.4 Profile - Editorial Server (Publication Server) 
+    5.5 Profile - Presentation Server 
+    5.6 Profile - Database Server 
+    5.7 Profile - Cache Server 
+    5.8 Profile - Install Widget Framework 
+    5.9 Profile - Create Publication 
+    5.10 Profile - Monitoring Server 
 6 Full Automatic Install (FAI) 
+    6.1 Overview of All FAI Parameters 
+    6.2 Examples 
+        6.2.1 Installing an Editorial Server & Create a Publication 
+        6.2.2 Installing Two Presentation Servers On a Single Host 
+    6.3 Verifying That the Script Is Running In FAI Mode 
 7 Running More Than One Installation Process 
 8 Re-running ece-install (and How To Speed It Up) 
 9 Overview of File Paths Used by the ece-install script 
@@ -38,6 +44,11 @@ Table of Contents
     10.1 /etc/esecenic is shared 
 11 Uninstalling Everything That the ece-install Set Up 
 12 Example Output FAI 
+13 Restoring from backup 
+    13.1 Location of the backup file 
+        13.1.1 Running interactively 
+        13.1.2 Running in FAI mode 
+    13.2 Data security 
 
 
 1 Supported Operating Systems 
@@ -82,8 +93,6 @@ or be downloaded together with the other ece-scripts using git:
   $ git clone git@github.com:skybert/ece-scripts.git
 
 
-
-
 4 Running the ece-install Script 
 ---------------------------------
 You must run the script as the root user.  If you start the script as
@@ -92,23 +101,17 @@ a regular user, it will complain:
 
   [ece-install] You must be root when running ece-install
 
-
-
 To become root on Ubuntu based systems and Mac OS X, do:
 
 
   $ sudo su
 
-
-
 On all other Unix like system, do:
 
 
   $ su
 
 
-
-
 You will need access to [http://technet.escenic.com] and put these
 credentials in the root user's $HOME/.ece-install.conf, normally this
 means /root/.ece-install.conf, the script will also tell you this if
@@ -118,8 +121,6 @@ you forget to provide such a configuration file:
   [ece-install] /root/.ece-install.conf doesn't exist, I cannot live without it :-(
 
 
-
-
 As for the technet credentials, the script will also tell you if it
 cannot find what it's looking for:
 
@@ -128,8 +129,6 @@ cannot find what it's looking for:
   [ece-install] in /root/.ece-install.conf
 
 
-
-
 The minimum .ece-install.conf file is thus:
 
 
@@ -137,8 +136,6 @@ The minimum .ece-install.conf file is thus:
   technet_password=<password>
 
 
-
-
 If you're installing WF as well, you'll need additional credentials
 for this, see the Widget Framwork section below, and if you want to
 runn a fully automatic install without any user interaction, you'll
@@ -151,8 +148,6 @@ With the configuration file in place, you're now ready to run it:
   # bash ece-install [-v|--verbose]
 
 
-
-
 ece-install will try to "fail fast", exiting as soon as it detects an
 error during its execution:
 
@@ -161,8 +156,6 @@ error during its execution:
   [ece-install-1] See /var/log/ece-install.log for further details.
 
 
-
-
 As a last resort, if something goes astray with the script, and the
 log file cannot give you enough clues, the ultimate way of debugging
 this is to run the BASH interpreter with the -x flag:
@@ -171,8 +164,6 @@ this is to run the BASH interpreter with the -x flag:
   # bash -x ece-install
 
 
-
-
 Here you can see everything that BASH does when running the script,
 how the wildcard variables expand and so on. Normally, having a tail
 on /var/log/ece-install.log should be sufficient, though.
@@ -185,20 +176,24 @@ want to install:
 
   Hi, which server profile do you wish to install?
   
-  Select 1-7 and press ENTER
+  Select 1-9 and press ENTER
   
-    1 - The full stack on one host. Suitable for development and
-        test environments (cache, ECE, assembly host & database).
-    2 - Editorial (publication) server (ECE, assembly host).
+    1 - All in one, the full stack on one host. 
+        Suitable for development and test environments.
+        It will install caching server, ECE, assembly host, database &
+        Widget Framework as well as set up a new publication.
+    2 - Editorial (publication) server.
+        This will install ECE and an assembly host.
     3 - Presentation server (ECE, memcached).
     4 - Database server.
     5 - Cache server (cache & web server).
     6 - RMI hub.
     7 - Standalone search instance (solr + indexer-webapp).
-    8 - Install Widget Framework. This will also set up a WF based 
-        publication for you (repo.escenic.com user/pass required).
-
-
+    8 - Install the Widget Framework.
+        (You need user/pass for repo.escenic.com for this).
+    9 - Create a new publication.
+        This profile will create new publication based on WF
+        (if available) or ECE/clean-demo.
 
 5.1 Common for All Server Profiles 
 ===================================
@@ -206,9 +201,6 @@ The script will install a Munin node on the host. It will also
 install the Escenic specific Munin plugins on hosts where there are
 any Escenic server components.
 
-TBD: there is currently an issue with the Escenic plugins not working
-properly with the new ece/ece-install scripts. We're working on this.
-
 5.2 Common for Editorial, Presentation and Search Instances 
 ============================================================
 
@@ -251,8 +243,8 @@ compressed content (and many other things that we before needed Apache
 for). Thus, we'll let the application server do the compression for us
 now.
 
-5.3 1 - Full Stack on One Host 
-===============================
+5.3 Profile - Full Stack on One Host 
+=====================================
 This profile is suitable for developers and admins wanting to set up a
 test environment. It will install the full stack including caching
 server, application server, ECE, assembly host, database, Widget
@@ -262,21 +254,20 @@ For further details on each of the different server components, see
 the different profile descriptions bellow.
 
 
-5.4 2 - Editorial Server (Publication Server) 
-==============================================
+5.4 Profile - Editorial Server (Publication Server) 
+====================================================
+Will set up a typical editorial server (often referred to as the
+publication server in Escenic literature).
 
-
-5.5 3 - Presentation Server 
-============================
+5.5 Profile - Presentation Server 
+==================================
 This will set up a typical presentation server:
 - Memcached, distributed memory cache
-- Escenic Assembly environment (which may be removed after the
-  installation). 
 - Deployment setup to only deploy escenic-admin and the
   publication(s).
 
-5.6 4 - Database Server 
-========================
+5.6 Profile - Database Server 
+==============================
 If ece-install is run on a support version of Debian or Ubuntu, this
 will install the excellent Percona distribution of MySQL with their
 set of high performance patches.
@@ -298,10 +289,8 @@ The script will fail by itself if the DB already exists:
   [ece-install] running tables FAILED, exiting :-(
 
 
-
-
-5.7 5 - Cache Server 
-=====================
+5.7 Profile - Cache Server 
+===========================
 If ece-install is run on a support version of Debian or Ubuntu, it
 will install the latest Varnish 3.0 caching server from the Varnish
 APT repository.
@@ -329,8 +318,6 @@ The script will configure Varnish for a typical Escenic site:
 - will install the nginx web server for serving static content and
   will configure Varnish accordingly. This will be very useful for
   Adactus servers wanting to pull content from your ECEs.
-- will install a Munin gatherer and make its interface available 
-  when accesssing the web server directly (port 81) 
 
 TBD:
 - If run on a Linux platform, the script will tweak the kernel
@@ -339,8 +326,8 @@ TBD:
   to be in the staff network ACL, defined in the Varnish
   configuration. 
 
-5.8 8 - Install Widget Framework 
-=================================
+5.8 Profile - Install Widget Framework 
+=======================================
 You'll need a user name and password for accessing the
 repo.escenic.com Maven repository. You should get these credentials
 when you bought Widget Framework. If you for some reason do not have
@@ -353,10 +340,8 @@ complain:
   [ece-install] Be sure to set wf_user and wf_password in /root/.ece-install.conf
   [ece-install] If you don't have these, please contact support@escenic.com
 
-
-
-5.9 9 - Create Publication 
-===========================
+5.9 Profile - Create Publication 
+=================================
 This profile will create a publication for you, only asking you the
 name of the publication and which ECE instance to use for its
 creation.
@@ -365,11 +350,26 @@ This installation profile will base the publication on the Widget
 Framework if its present on the system, if not, ECE's clean demo WAR
 is used as a basis.  
 
+5.10 Profile - Monitoring Server 
+=================================
+This will install a Munin gatherer and make its interface available 
+when accesssing the web server directly (port 81).
+
+TBD: This profile will also install the Nagios interface for
+monitoring the different nodes. 
+
 6 Full Automatic Install (FAI) 
 -------------------------------
 The ece-install script has support for doing a full automatic install
-(FAI).
+(FAI). You can only install one profile at a time. The profiles are
+the parameters with "install" in their name, such as:
 
+
+  fai_editor_install
+
+
+6.1 Overview of All FAI Parameters 
+===================================
 The ece-install script understands for the following settings in the
 $HOME/.ece-install.conf file of the root user:
 
@@ -402,6 +402,11 @@ $HOME/.ece-install.conf file of the root user:
 
 As you've probably have guessed, 0 means "false" and 1 means "true" :-)
 
+6.2 Examples 
+=============
+
+6.2.1 Installing an Editorial Server & Create a Publication 
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 To automatically install an editorial server and create a publication
 called "jollygood", the minimal configuration in .ece-install.conf
 would be:
@@ -414,8 +419,33 @@ would be:
   fai_publication_name=jollygood
 
 
+6.2.2 Installing Two Presentation Servers On a Single Host 
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+If you wish to only install two presentation servers called "web1" and
+"web2" on your host, you will first run ece-install with:
 
 
+  fai_enabled=1
+  fai_presentation_install=1
+  fai_presentation_name=web1
+
+
+And then re-issue ece-install with the following configuration:
+
+
+  fai_enabled=1
+  fai_presentation_install=1
+  fai_presentation_name=web2
+  fai_presentation_port=8081
+  fai_presentation_shutdown=8105
+
+Notice that this configuration has some extra options since the
+previous run of ece-install could run with the default settings,
+whereas the second one needs to override these.
+
+
+6.3 Verifying That the Script Is Running In FAI Mode 
+=====================================================
 When FAI is enabled, ece-install will report:
 
 
@@ -423,8 +453,6 @@ When FAI is enabled, ece-install will report:
   [ece-install] All user input will be read from /root/.ece-install.conf
 
 
-
-
 7 Running More Than One Installation Process 
 ---------------------------------------------
 If the script believes there's already an ece-intall process running,
@@ -437,8 +465,6 @@ it will abort:
   [ece-install] run ece-install again.
 
 
-
-
 8 Re-running ece-install (and How To Speed It Up) 
 --------------------------------------------------
 Although the initial thought behind ece-install, is to run it on a
@@ -539,8 +565,77 @@ file:
   fai_all_install=1
 
 
-
+All the different components described in this guide are installed on
+the host that runs the install script.
 
 The following output is produced from ece-install:
-CANNOT INCLUDE FILE /tmp/ece-install.out
+CANNOT INCLUDE FILE ~/tmp/ece-install.out
+
+13 Restoring from backup 
+-------------------------
+ece-install can restore from a backup made by the ece script:
+
+
+  $ ece -i <instance> backup
+
+
+As stated in the ece guide, this backup may contain (depending on
+what's available on the host where it's run):
+- database dump of the instance
+- data files (pictures, video files and so on). This is often referred
+  to as the "multimedia archive" in Escenic literature.
+- ECE, cache and web server configuration
+- Escenic software
+
+13.1 Location of the backup file 
+=================================
+
+13.1.1 Running interactively 
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The ece script will put backups in 
+
+
+  /var/backups/escenic
+
+and the ece-install script will hence expect to find them here (when
+running interactively), asking you from which one you wish to restore
+the system:
+
+
+
+  [ece-install-5] From which dataset do you wish to backup?
+      1 - engine-dev1-backup-2011-10-10.tar.gz
+      2 - engine-dev1-backup-2011-10-11.tar.gz
+  [ece-install-5] Enter the number next to the tarball, from 1 to 2
+  Your choice [1]>
+
+
+13.1.2 Running in FAI mode 
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+If you're running in FAI mode, you specify the file to restore from
+with:
+
+
+  fai_restore_from_file=/var/backups/escenic/engine-dev1-backup-2011-10-10.tar.gz
+
+
+13.2 Data security 
+===================
+You should take heed when running restore, so that you're not
+restoring a system which you didn't want to change (yes, this mishap
+does happen).
+
+The ece-install script will help you a bit on the way, but the final
+responsibility always lies with you as the user. 
+
+If you're trying to restore the DB and the ECE schema already exists,
+the restore will fail:
+
+
+  [ece-install-8] Restoring the database contents on ubiquitous ...
+  [ece-install-24] Selecting the most recent database dump ece5db-2011-10-10.sql.gz
+  ERROR 1007 (HY000) at line 1: Can't create database 'ece5db'; database exists
+  ERROR 1050 (42S01) at line 25: Table '`ece5db`.`AccessControlList`' already exists
+  [ece-install-24] The command [restoring from var/backups/escenic/ece5db-2011-10-10.sql.gz] FAILED, exiting :-(
+  [ece-install-24] See /var/log/ece-install.log for further details.
 

From b0055dbe05e42e0250af2553aaaa5e23349741ba Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 11 Oct 2011 19:05:19 +0800
Subject: [PATCH 0086/2585] - simplified the restore section structure

---
 usr/share/doc/escenic/ece-install-guide.org | 29 ++++++++++++++++-----
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 8937bb2c..1aad0602 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -472,9 +472,7 @@ what's available on the host where it's run):
 - ECE, cache and web server configuration
 - Escenic software
 
-** Location of the backup file
-
-*** Running interactively
+** Running interactively
 The ece script will put backups in 
 #+BEGIN_SRC sh
 /var/backups/escenic
@@ -491,10 +489,29 @@ the system:
 Your choice [1]>
 #+END_SRC
 
-*** Running in FAI mode
-If you're running in FAI mode, you specify the file to restore from
-with:
+** Running in FAI mode
+If you're running in FAI mode, you can choose between these settings
+to decide what to restore and where to find the backup file to
+restore from:
+
+|----------------------------------+---------+------------------------------------------------|
+| Parameter                        | Default | Description                                    |
+|----------------------------------+---------+------------------------------------------------|
+| fai\_restore\_all                |       0 | Restore everything found in the backup file    |
+| fai\_restore\_db                 |       0 | Install the DB server & restore its contents   |
+| fai\_restore\_data\_files        |       0 | Restore the Solr & ECE data files              |
+| fai\_restore\_configuration      |       0 | Restore the Solr & ECE configuration files     |
+| fai\_restore\_software\_binaries |       0 | Restore the Escenic and Apache Tomcat software |
+| fai\_restore\_from\_file         |      "" | The .tar.gz produced by "ece -i <instance> backup" |
+|----------------------------------+---------+------------------------------------------------|
+
+For example, to restore everything possible from a given tarball, you
+need this in your .ece-install.conf:
 #+BEGIN_SRC sh
+fai_enabled=1
+
+fai_restore_from_backup=1
+fai_restore_all=1
 fai_restore_from_file=/var/backups/escenic/engine-dev1-backup-2011-10-10.tar.gz
 #+END_SRC
 

From 144140b816ff7d2491b09dffc4913ca50abc517a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 11 Oct 2011 19:05:26 +0800
Subject: [PATCH 0087/2585] - updated html

---
 usr/share/doc/escenic/ece-install-guide.html | 70 ++++++++++++--------
 1 file changed, 42 insertions(+), 28 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.html b/usr/share/doc/escenic/ece-install-guide.html
index ef403455..06c41428 100644
--- a/usr/share/doc/escenic/ece-install-guide.html
+++ b/usr/share/doc/escenic/ece-install-guide.html
@@ -7,7 +7,7 @@
 <title>Welcome to the /usr/sbin/ece-install Guide</title>
 <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
 <meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2011-10-11 18:35:36 CST"/>
+<meta name="generated" content="2011-10-11 19:04:29 CST"/>
 <meta name="author" content="Torstein Krause Johansen"/>
 <meta name="description" content=""/>
 <meta name="keywords" content=""/>
@@ -284,13 +284,9 @@ <h2>Table of Contents</h2>
 <li><a href="#sec-12">12 Example Output FAI </a></li>
 <li><a href="#sec-13">13 Restoring from backup </a>
 <ul>
-<li><a href="#sec-13-1">13.1 Location of the backup file </a>
-<ul>
-<li><a href="#sec-13-1-1">13.1.1 Running interactively </a></li>
-<li><a href="#sec-13-1-2">13.1.2 Running in FAI mode </a></li>
-</ul>
-</li>
-<li><a href="#sec-13-2">13.2 Data security </a></li>
+<li><a href="#sec-13-1">13.1 Running interactively </a></li>
+<li><a href="#sec-13-2">13.2 Running in FAI mode </a></li>
+<li><a href="#sec-13-3">13.3 Data security </a></li>
 </ul>
 </li>
 </ul>
@@ -1185,17 +1181,9 @@ <h2 id="sec-13"><span class="section-number-2">13</span> Restoring from backup <
 </div>
 
 <div id="outline-container-13-1" class="outline-3">
-<h3 id="sec-13-1"><span class="section-number-3">13.1</span> Location of the backup file </h3>
+<h3 id="sec-13-1"><span class="section-number-3">13.1</span> Running interactively </h3>
 <div class="outline-text-3" id="text-13-1">
 
-
-
-</div>
-
-<div id="outline-container-13-1-1" class="outline-4">
-<h4 id="sec-13-1-1"><span class="section-number-4">13.1.1</span> Running interactively </h4>
-<div class="outline-text-4" id="text-13-1-1">
-
 <p>The ece script will put backups in 
 </p>
 
@@ -1223,27 +1211,53 @@ <h4 id="sec-13-1-1"><span class="section-number-4">13.1.1</span> Running interac
 
 </div>
 
-<div id="outline-container-13-1-2" class="outline-4">
-<h4 id="sec-13-1-2"><span class="section-number-4">13.1.2</span> Running in FAI mode </h4>
-<div class="outline-text-4" id="text-13-1-2">
+<div id="outline-container-13-2" class="outline-3">
+<h3 id="sec-13-2"><span class="section-number-3">13.2</span> Running in FAI mode </h3>
+<div class="outline-text-3" id="text-13-2">
 
-<p>If you're running in FAI mode, you specify the file to restore from
-with:
+<p>If you're running in FAI mode, you can choose between these settings
+to decide what to restore and where to find the backup file to
+restore from:
+</p>
+<table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
+<caption></caption>
+<colgroup><col class="left" /><col class="right" /><col class="left" />
+</colgroup>
+<thead>
+<tr><th scope="col" class="left">Parameter</th><th scope="col" class="right">Default</th><th scope="col" class="left">Description</th></tr>
+</thead>
+<tbody>
+<tr><td class="left">fai_restore_all</td><td class="right">0</td><td class="left">Restore everything found in the backup file</td></tr>
+<tr><td class="left">fai_restore_db</td><td class="right">0</td><td class="left">Install the DB server &amp; restore its contents</td></tr>
+<tr><td class="left">fai_restore_data_files</td><td class="right">0</td><td class="left">Restore the Solr &amp; ECE data files</td></tr>
+<tr><td class="left">fai_restore_configuration</td><td class="right">0</td><td class="left">Restore the Solr &amp; ECE configuration files</td></tr>
+<tr><td class="left">fai_restore_software_binaries</td><td class="right">0</td><td class="left">Restore the Escenic and Apache Tomcat software</td></tr>
+<tr><td class="left">fai_restore_from_file</td><td class="right">""</td><td class="left">The .tar.gz produced by "ece -i &lt;instance&gt; backup"</td></tr>
+</tbody>
+</table>
+
+
+<p>
+For example, to restore everything possible from a given tarball, you
+need this in your .ece-install.conf:
 </p>
 
 
-<pre class="src src-sh"><span style="color: #a0522d;">fai_restore_from_file</span>=/var/backups/escenic/engine-dev1-backup-2011-10-10.tar.gz
+<pre class="src src-sh"><span style="color: #a0522d;">fai_enabled</span>=1
+
+<span style="color: #a0522d;">fai_restore_from_backup</span>=1
+<span style="color: #a0522d;">fai_restore_all</span>=1
+<span style="color: #a0522d;">fai_restore_from_file</span>=/var/backups/escenic/engine-dev1-backup-2011-10-10.tar.gz
 </pre>
 
 
-</div>
 </div>
 
 </div>
 
-<div id="outline-container-13-2" class="outline-3">
-<h3 id="sec-13-2"><span class="section-number-3">13.2</span> Data security </h3>
-<div class="outline-text-3" id="text-13-2">
+<div id="outline-container-13-3" class="outline-3">
+<h3 id="sec-13-3"><span class="section-number-3">13.3</span> Data security </h3>
+<div class="outline-text-3" id="text-13-3">
 
 <p>You should take heed when running restore, so that you're not
 restoring a system which you didn't want to change (yes, this mishap
@@ -1276,7 +1290,7 @@ <h3 id="sec-13-2"><span class="section-number-3">13.2</span> Data security </h3>
 <hr/>
 <p class="author">
   Author: Torstein Krause Johansen (<a href="mailto:tkj@vizrt.com">tkj@vizrt.com</a>)
-  Date: 2011-10-11 18:35:36 CST
+  Date: 2011-10-11 19:04:29 CST
 </p>
 </div>
 </body>

From 629d219e1a489aec921a368e3845025dd73ecc9e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 11 Oct 2011 19:08:41 +0800
Subject: [PATCH 0088/2585] - interactively selecting the backup to use now
 works.

---
 usr/sbin/ece-install | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 5c1bc03d..d3be5432 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -1332,10 +1332,10 @@ function read_user_input()
     echo "  $PROFILE_CREATE_PUBLICATION - Create a new publication."
     echo "      This profile will create new publication based on WF"
     echo "      (if available) or ECE/clean-demo."
-    echo -n "  $PROFILE_MONITORING_SERVER - A monitoring server."
-    echo "     This will install the Munin gatherer"
-    echo -n "  $PROFILE_RESTORE_FROM_BACKUP - Restore from a backup."
-    echo "     Allows you to restore parts of or an entire system."
+    echo "  $PROFILE_MONITORING_SERVER - A monitoring server."
+    echo "       This will install the Munin gatherer."
+    echo "  $PROFILE_RESTORE_FROM_BACKUP - Restore from backup. Allows you to"
+    echo "       restore DB, data files, binaries & publication templates."
     echo ""
     echo -n "Your choice [1]> "
     read install_profile_number
@@ -2118,6 +2118,7 @@ function restore_from_backup()
     restore_data_files=0
     restore_conf=0
     backup_file=""
+    backup_dir=/var/backups/escenic
     
     if [ $(get_boolean_conf_value fai_enabled) -eq 1 -a \
         $(get_boolean_conf_value fai_restore_from_backup) -eq 1 ]; then
@@ -2148,7 +2149,30 @@ function restore_from_backup()
         fi
     elif [ $(get_boolean_conf_value fai_enabled) -eq 0 ]; then
         print "From which dataset do you wish to backup?"
-        # TODO
+        if [ ! -d $backup_dir ]; then
+            print "Backup directory $backup_dir doesn't exist or insn't readable"
+            exit 1
+        fi
+
+        i=0
+        tarball_array=($(ls $backup_dir/*.tar.gz))
+        
+        for (( i = 0; i <${#tarball_array[@]}; i++ )); do
+            echo "   " $(( ${i} + 1 )) "-" $(basename  ${tarball_array[$i]})
+        done
+
+        print "Enter the number next to the tarball, from 1 to $i"
+        echo -n "Your choice [1]> "
+        read user_tarball
+
+        if [ -z "$user_tarball" ]; then
+            user_tarball=1
+        fi
+
+        backup_file=${tarball_array[$(( ${user_tarball} - 1 ))]}
+
+        print "Which part of the system do you wish to restore?"
+        
     fi
 
     if [ ! -r "$backup_file" ]; then

From c13cba0ae972b1f89d8803e53dba2229b5a02e11 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 11 Oct 2011 19:08:54 +0800
Subject: [PATCH 0089/2585] - updated

---
 usr/share/doc/escenic/ece-guide.html | 97 +++++++++++++++++++++++++---
 1 file changed, 89 insertions(+), 8 deletions(-)

diff --git a/usr/share/doc/escenic/ece-guide.html b/usr/share/doc/escenic/ece-guide.html
index ac540c65..57839ec2 100644
--- a/usr/share/doc/escenic/ece-guide.html
+++ b/usr/share/doc/escenic/ece-guide.html
@@ -7,7 +7,7 @@
 <title>Guide for the /usr/bin/ece Script</title>
 <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
 <meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2011-10-07 16:47:40 CST"/>
+<meta name="generated" content="2011-10-10 14:56:44 CST"/>
 <meta name="author" content="Torstein Krause Johansen"/>
 <meta name="description" content=""/>
 <meta name="keywords" content=""/>
@@ -245,7 +245,17 @@ <h2>Table of Contents</h2>
 <li><a href="#sec-5-1">5.1 Overview of File Paths Used by the ece script </a></li>
 </ul>
 </li>
-<li><a href="#sec-6">6 Running the ece script </a></li>
+<li><a href="#sec-6">6 Running the ece script </a>
+<ul>
+<li><a href="#sec-6-1">6.1 You must run it as a non-privileged user </a></li>
+<li><a href="#sec-6-2">6.2 Specifying instance </a>
+<ul>
+<li><a href="#sec-6-2-1">6.2.1 Specifying the instance </a></li>
+<li><a href="#sec-6-2-2">6.2.2 Using the default instance </a></li>
+</ul>
+</li>
+</ul>
+</li>
 </ul>
 </div>
 </div>
@@ -482,7 +492,7 @@ <h2 id="sec-4"><span class="section-number-2">4</span> Assembling a new EAR </h2
 </p>
 
 
-<pre class="src src-sh">$ ece clean assemble
+<pre class="src src-sh">$ ece -i clean assemble
 </pre>
 
 <p>
@@ -494,12 +504,12 @@ <h2 id="sec-4"><span class="section-number-2">4</span> Assembling a new EAR </h2
 <pre class="src src-sh">[ece#engine] Multiple versions of ECE and/or 3rd party libraries found.
 [ece#engine] Remember, you need to run <span style="color: #8b2252;">'ece clean assemble'</span> when
 [ece#engine] upgrading either ECE or one of the plugins.
-[ece#engine] Press ENTER to run <span style="color: #8b2252;">'ece clean assemble'</span>
+[ece#engine] I will now clean it up for you and re-run the assembly.
+[ece#engine] Cleaning up generated files<span style="color: #a020f0;"> in</span> /opt/escenic/assemblytool ...
+[ece#engine] Assembling your EAR file ...
 </pre>
 
-<p>
-The script will then re-run the assembly by itself.
-</p>
+
 <p>
 If you're just re-running the assembly after just adding a new plugin
 or want to re-build your publications after template changes, you can
@@ -608,6 +618,13 @@ <h3 id="sec-5-1"><span class="section-number-3">5.1</span> Overview of File Path
 <h2 id="sec-6"><span class="section-number-2">6</span> Running the ece script </h2>
 <div class="outline-text-2" id="text-6">
 
+
+</div>
+
+<div id="outline-container-6-1" class="outline-3">
+<h3 id="sec-6-1"><span class="section-number-3">6.1</span> You must run it as a non-privileged user </h3>
+<div class="outline-text-3" id="text-6-1">
+
 <p>You must be normal user to run the ece script, otherwise it will
 complain:
 </p>
@@ -622,7 +639,71 @@ <h2 id="sec-6"><span class="section-number-2">6</span> Running the ece script </
 As it mentions, the root user may use the init.d script and the
 accompanying /etc/default/ece to command the different ECE, EAE and
 RMI hub instances on your system.
+</p></div>
+
+</div>
+
+<div id="outline-container-6-2" class="outline-3">
+<h3 id="sec-6-2"><span class="section-number-3">6.2</span> Specifying instance </h3>
+<div class="outline-text-3" id="text-6-2">
+
+
+
+</div>
+
+<div id="outline-container-6-2-1" class="outline-4">
+<h4 id="sec-6-2-1"><span class="section-number-4">6.2.1</span> Specifying the instance </h4>
+<div class="outline-text-4" id="text-6-2-1">
+
+<p>The script is made for being easy to use with multiple instances on
+the same host. You specify the instance you want to operate on using the
+-i parameter. E.g. to assemble and deploy the editor1 instance, you'd
+do:
 </p>
+
+
+<pre class="src src-sh">$ ece -i editor1 assemble deploy restart
+</pre>
+
+
+</div>
+
+</div>
+
+<div id="outline-container-6-2-2" class="outline-4">
+<h4 id="sec-6-2-2"><span class="section-number-4">6.2.2</span> Using the default instance </h4>
+<div class="outline-text-4" id="text-6-2-2">
+
+<p>However, on development systems and perhaps even test systems, you
+probably want to just use one instance on your host, though, and this
+is where the "default" instance comes in.
+</p>
+<p>
+To use the default instance, you must only have one instance installed
+on your system. More specifically, there must no instance specific
+configuration files in
+</p>
+
+
+<pre class="src src-sh">/etc/escenic/engine/instance
+</pre>
+
+<p>
+and that ece.conf, typically located in:
+</p>
+
+
+<pre class="src src-sh">/etc/escenic/ece.conf
+</pre>
+
+<p>
+must contain all the settings required to run the instance.
+</p>
+<p>
+If you've ticked all these boxes, you can issue all ece commands
+without the -i parameter.
+</p></div>
+</div>
 </div>
 </div>
 </div>
@@ -631,7 +712,7 @@ <h2 id="sec-6"><span class="section-number-2">6</span> Running the ece script </
 <hr/>
 <p class="author">
   Author: Torstein Krause Johansen (<a href="mailto:tkj@vizrt.com">tkj@vizrt.com</a>)
-  Date: 2011-10-07 16:47:40 CST
+  Date: 2011-10-10 14:56:44 CST
 </p>
 </div>
 </body>

From eabb765238957122bd074808e01915a9da6347c2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 12 Oct 2011 16:05:14 +0800
Subject: [PATCH 0090/2585] - first version of the interactive restore routine
 - fixed bug when running in FAI mode and not having selected any  
 installation profile in .ece-install.conf

---
 usr/sbin/ece-install | 35 ++++++++++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index d3be5432..4f177ae7 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -2154,13 +2154,12 @@ function restore_from_backup()
             exit 1
         fi
 
-        i=0
-        tarball_array=($(ls $backup_dir/*.tar.gz))
+        tarball_array=($(ls -t $backup_dir/*.tar.gz))
         
         for (( i = 0; i <${#tarball_array[@]}; i++ )); do
             echo "   " $(( ${i} + 1 )) "-" $(basename  ${tarball_array[$i]})
         done
-
+        
         print "Enter the number next to the tarball, from 1 to $i"
         echo -n "Your choice [1]> "
         read user_tarball
@@ -2172,7 +2171,33 @@ function restore_from_backup()
         backup_file=${tarball_array[$(( ${user_tarball} - 1 ))]}
 
         print "Which part of the system do you wish to restore?"
+        restore_profiles=(
+            "The database"
+            "The Solr and ECE data files (multimedia archive)"
+            "The ECE configuration files"
+            "The Escenic and Tomcat software binaries + publication templates"
+        )
+        for (( i = 0; i <${#restore_profiles[@]}; i++ )); do
+            echo "   " $(( ${i} + 1 )) "-" ${restore_profiles[$i]}
+        done
         
+        print "Enter the number next to the tarball, from 1 to $i"
+        echo -n "Your choice [1]> "
+        read user_restore_profile
+
+        if [ -z "$user_restore_profile" ]; then
+            user_restore_profile=1
+        fi
+
+        if [ $user_restore_profile -eq 1 ]; then
+            restore_db=1
+        elif [ $user_restore_profile -eq 2 ]; then
+            restore_data_files=1
+        elif [ $user_restore_profile -eq 3 ]; then
+            restore_conf=1
+        elif [ $user_restore_profile -eq 4 ]; then
+            restore_binaries=1
+        fi
     fi
 
     if [ ! -r "$backup_file" ]; then
@@ -2287,6 +2312,10 @@ if [ $fai_enabled -eq 1 ]; then
     elif [ $(get_boolean_conf_value fai_restore_from_backup) -eq 1 ]; then
         install_profile_number=$PROFILE_RESTORE_FROM_BACKUP
         restore_from_backup
+    else
+        print "No install profile selected, be sure to have one of the "
+        print "fai_<profile>_install=1 in your $conf_file"
+        exit 1
     fi
     
     common_post_install

From 18c615725451f760a6516753a399079344443e1b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 12 Oct 2011 17:25:25 +0800
Subject: [PATCH 0091/2585] - added /var/backups/escenic to dir_list, so the
 init.d script takes   care of creating it and setting the correct permissions
 on it.

---
 etc/init.d/ece | 1 +
 1 file changed, 1 insertion(+)

diff --git a/etc/init.d/ece b/etc/init.d/ece
index d5976036..f4cce807 100755
--- a/etc/init.d/ece
+++ b/etc/init.d/ece
@@ -35,6 +35,7 @@ fi
 #######################################################################
 dir_list="
 /var/cache/escenic
+/var/backups/escenic
 /var/crash/escenic
 /var/log/escenic
 /var/run/escenic

From 90cf6a229c531903bd36761808fd5dc9a197d881 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 12 Oct 2011 17:44:43 +0800
Subject: [PATCH 0092/2585] - fixed bug in "ece clean" if
 /opt/escenic/assemblytool doesn't exist - added run() from ece-install, this
 simplified the code for fixing - the above bug and will further simplify (and
 harden) the rest of the   script once it's applied.

---
 usr/bin/ece | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 53208a67..e1fd1e0a 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -77,6 +77,12 @@ function exit_on_error()
     fi
 }
 
+function run()
+{
+    $@ 1>>$log_file 2>>$log_file
+    exit_on_error $@
+}
+
 ####################################################################
 # debug/verbose method
 ####################################################################
@@ -656,8 +662,8 @@ function backup_type()
    print "- All Solr & Escenic data files from /var/lib/escenic"
    print "- All app servers in /opt"
    print "- All Escenic binaries & publication templates in /opt/escenic"
-   print "- All Escenic configuration in /etc/escenic and /etc/default/ece"
-   print "- All Escenic bootstrap scripts from /etc/init.d"
+   print "- All configuration in /etc/escenic and /etc/default/ece"
+   print "- All bootstrap scripts from /etc/init.d"
    print "Enjoy!"
  }
 
@@ -1060,10 +1066,8 @@ function clean_up()
 {
     if [ $type = "engine" ]; then
         print "Cleaning up generated files in $assemblytool_home ..." 
-        cd $assemblytool_home
-        ant clean \
-            1>>$log_file \
-            2>>$log_file
+        run cd $assemblytool_home
+        run ant clean
     fi
 
     tmp_dir_prefix="`basename $0`-"

From 22419535017e7aaa2d94b79f2d519cdeffe427b2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 12 Oct 2011 18:58:49 +0800
Subject: [PATCH 0093/2585] - restore of both DB and data files seem to work
 reliably!

---
 usr/sbin/ece-install | 95 +++++++++++++++++++++++++++-----------------
 1 file changed, 58 insertions(+), 37 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 4f177ae7..12daa801 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -1,15 +1,21 @@
 #! /usr/bin/env bash
 
-# The goal of this script, is to have an ECE up and running within
-# five minutes. The setup the user is getting is suitable for a
-# production environment, except for the fact that with this script,
-# all ECE components are set up on the same host.
+# The goal of this script is install a complete production environment
+# for web sites using on Escenic Content Engine as their CMS. The
+# script is equally well suited for installing development, testing
+# and staging environments, in addition to recover from backups create
+# with the "ece -i <instance> backup" command.
+#
+# Always check for the latest version at
+# http://github.com/skybert/ece-scripts
 
-# by tkj@vizrt.com
+# echo comments and suggestions > tkj@vizrt.com
+# echo frustrations > /dev/null
 
 #####################################################################
-# User definable variables (the defaults are fine in most cases). Any
-# of these may be overridden in the .ece-isntall.conf file
+# User definable variables (the defaults are fine in most
+# cases). These are the most likely variables you want to change and
+# they can all be set in the .ece-isntall.conf file
 #####################################################################
 ece_user=escenic
 ece_group=escenic
@@ -20,7 +26,7 @@ tomcat_download=http://apache.stu.edu.tw/tomcat/tomcat-6/v6.0.33/bin/apache-tomc
 # The script will install the sun-java6-jdk package on Debian based
 # systems and this is the path of the JAVA home with this package. If
 # you're using a different system or have other preferences, change
-# java_home here.
+# java_home.
 java_home=/usr/lib/jvm/java-6-sun
 #####################################################################
 
@@ -168,9 +174,6 @@ function set_up_engine_directories()
     done
 }
 
-# TODO download documentation to
-# /usr/share/doc/escenic/content-engine-<version>/
-
 function download_escenic_components()
 {
     if [ $ece_software_setup_completed -eq 1 ]; then
@@ -194,7 +197,7 @@ function download_escenic_components()
 
 }
 
-# will intall the passed packages if these are not installed from
+# will install the passed packages if these are not installed from
 # before.
 #
 # parameters:
@@ -938,17 +941,22 @@ function print_status_and_next_steps()
 
     s="- The installation is now complete!"
     print $s" It took" ${days}d ${hours}h ${minutes}m ${seconds_left}s
-    add_next_step "- See /usr/share/doc/escenic/ece-install-guide.txt for"
-    add_next_step "  a full overview of files and directories set up by"
-    add_next_step "  $(basename $0)"
-    add_next_step "- type 'ece help' to see all the options of this script"
-    add_next_step "  which allows you to control all the Escenic components."
-    add_next_step "  Also, see /usr/share/doc/escenic/ece-guide.txt for"
-    add_next_step "  further information on the ece script."
-    add_next_step "- For further reading, in-depth guides on installing, "
-    add_next_step "  configuring and developing Escenic web sites can be "
-    add_next_step "  fount at http://documentation.vizrt.com/ece-5.3.html"
 
+    if [ $install_profile_number -ne $PROFILE_RESTORE_FROM_BACKUP -a \
+        $install_profile_number -ne $PROFILE_CACHE_SERVER -a \
+        $install_profile_number -ne $PROFILE_WIDGET_FRAMEWORK ]; then
+        add_next_step "- See /usr/share/doc/escenic/ece-install-guide.txt for"
+        add_next_step "  a full overview of files and directories set up by"
+        add_next_step "  $(basename $0)"
+        add_next_step "- type 'ece help' to see all the options of this script"
+        add_next_step "  which allows you to control all the ECE components."
+        add_next_step "  Also, see /usr/share/doc/escenic/ece-guide.txt for"
+        add_next_step "  further information on the ece script."
+        add_next_step "- For further reading, in-depth guides on installing, "
+        add_next_step "  configuring and developing Escenic web sites can be "
+        add_next_step "  fount at http://documentation.vizrt.com/ece-5.3.html"
+    fi
+    
 
     echo "$next_steps"
 
@@ -1160,7 +1168,9 @@ function stop_conflicting_processes()
 {
     print "Stopping conflicting processes ..."
      # TODO this is dirty
-    killall java 1>>$log 2>>$log
+    if [ $install_profile_number -ne $PROFILE_RESTORE_FROM_BACKUP ]; then
+        killall java 1>>$log 2>>$log
+    fi
 }
 
 function set_up_varnish()
@@ -2035,7 +2045,7 @@ function install_munin_node()
         -O $file
     run chmod 755 $file
 
-    if [ ! -e /etc/escenic/ece-*.conf -o -z "$type" -o -z "$instance" ]; then
+    if [ ! -e /etc/escenic -o ! -e /etc/escenic/ece-*.conf ]; then
         print "No ECE instances found on $HOSTNAME, so I'm not adding"
         print "additional Munin configuration"  
         add_next_step "- A Munin node has been installed on $HOSTNAME"
@@ -2215,7 +2225,7 @@ function restore_from_backup()
         run tar xzf $backup_file --wildcards var/backups/escenic/*.sql.gz
         # picking the DB backup file to restore
         sql_file=$(ls -tra var/backups/escenic/*.sql.gz | tail -1)
-        print "Selecting the most recent database dump " $(basename $sql_file)
+        print "Selecting the most recent database dump $(basename $sql_file)"
 
         # methods in drop-and-create-ecedb to set up the database
         # schema & user
@@ -2226,41 +2236,52 @@ function restore_from_backup()
         gunzip < $sql_file | mysql $db_schema
         exit_on_error "restoring from $sql_file"
         
-        print "Successfully restored DB on $HOSTNAME from" $(basename $sql_file)
+        add_next_step "Successfully restored DB from $(basename $sql_file)"
     fi
     
     if [ $restore_data_files -eq 1 ]; then
         print "Restoring the Solr & ECE data files on $HOSTNAME ..."
         run cd $dir
         run tar -C / -xzf $backup_file var/lib/escenic
-        print "Successfully restored Solr & ECE data files on $HOSTNAME"
-        print "from backup:  $(basename $backup_file)"
-        print "Check /var/lib/escenic to verify they're all there"
+        add_next_step "Successfully restored Solr & ECE data files"
+        add_next_step "from backup:  $(basename $backup_file)"
+        add_next_step "Check /var/lib/escenic to verify they're all there"
     fi
     
     if [ $restore_conf -eq 1 ]; then
         print "Restoring the ECE configuration files on $HOSTNAME ..."
         run cd $dir
         run tar -C / -xzf $backup_file etc
-        print "Successfully restored ECE configuration files on $HOSTNAME"
-        print "from backup: $(basename $backup_file)"
-        print "Check /etc to verify that they're all there".
+        add_next_step "Successfully restored ECE configuration files"
+        add_next_step "from backup: $(basename $backup_file)"
+        add_next_step "Check /etc to verify that they're all there".
     fi
     
     if [ $restore_binaries -eq 1 ]; then
         print "Restoring the Escenic & Tomcat binaries on $HOSTNAME ..."
         run cd $dir
         run tar -C / -xzf $backup_file opt
-        print "Successfully restored Escenic & Tomcat binaries on $HOSTNAME"
-        print "from backup: $(basename $backup_file)"
-        print "Check /opt to verify that they're all there".
+        add_next_step "Successfully restored Escenic & Tomcat binaries"
+        add_next_step "from backup: $(basename $backup_file)"
+        add_next_step "Check /opt to verify that they're all there".
     fi
 }
 
 function common_post_install()
 {
-    add_server_to_runlevels
-    install_munin_node
+    if [ $install_profile_number -eq $PROFILE_ALL_IN_ONE -o \
+        $install_profile_number -eq $PROFILE_PRESENTATION_SERVER -o \
+        $install_profile_number -eq $PROFILE_RMI_HUB -o \
+        $install_profile_number -eq $PROFILE_EDITORIAL_SERVER ]; then
+        add_server_to_runlevels
+    fi
+
+    if [ $install_profile_number -ne $PROFILE_WIDGET_FRAMEWORK -a \
+        $install_profile_number -ne $PROFILE_CREATE_PUBLICATION -a \
+        $install_profile_number -ne $PROFILE_RESTORE_FROM_BACKUP ]; then
+        install_munin_node
+    fi
+
     print_status_and_next_steps
     rm $pid_file
 }

From 9e6a0e6c13fb0b55ee401f0307ed804be4c40f03 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 13 Oct 2011 12:39:23 +0800
Subject: [PATCH 0094/2585] - I hate inconsistent feedback, fixed backup ->
 restore

---
 usr/sbin/ece-install | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 12daa801..367c1906 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -2158,9 +2158,9 @@ function restore_from_backup()
             restore_conf=1
         fi
     elif [ $(get_boolean_conf_value fai_enabled) -eq 0 ]; then
-        print "From which dataset do you wish to backup?"
+        print "From which dataset do you wish to restore?"
         if [ ! -d $backup_dir ]; then
-            print "Backup directory $backup_dir doesn't exist or insn't readable"
+            print "Directory $backup_dir doesn't exist or isn't readable"
             exit 1
         fi
 

From e834b354fb9724a08ca4a8009ae21d4ca217646e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 13 Oct 2011 13:44:15 +0800
Subject: [PATCH 0095/2585] - cleaner listing of installation profiles, making
 it easier to add   new profiles without forgetting to update the total number
 of   options on the opening screen.

---
 usr/sbin/ece-install | 64 +++++++++++++++++++++-----------------------
 1 file changed, 31 insertions(+), 33 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 367c1906..6f2806e7 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -939,7 +939,7 @@ function print_status_and_next_steps()
     minutes=$(( seconds_left / 60 ))
     seconds_left=$(( seconds_left - $minutes * 60 ))
 
-    s="- The installation is now complete!"
+    s="The installation is now complete!"
     print $s" It took" ${days}d ${hours}h ${minutes}m ${seconds_left}s
 
     if [ $install_profile_number -ne $PROFILE_RESTORE_FROM_BACKUP -a \
@@ -948,7 +948,7 @@ function print_status_and_next_steps()
         add_next_step "- See /usr/share/doc/escenic/ece-install-guide.txt for"
         add_next_step "  a full overview of files and directories set up by"
         add_next_step "  $(basename $0)"
-        add_next_step "- type 'ece help' to see all the options of this script"
+        add_next_step "- Type 'ece help' to see all the options of this script"
         add_next_step "  which allows you to control all the ECE components."
         add_next_step "  Also, see /usr/share/doc/escenic/ece-guide.txt for"
         add_next_step "  further information on the ece script."
@@ -1319,41 +1319,37 @@ EOF
 
 function read_user_input()
 {
-    echo "Hi, which server profile do you wish to install?"
-    echo ""
-    echo "Select 1-10 and press ENTER"
-    echo ""
-    echo "  $PROFILE_ALL_IN_ONE - All in one, the full stack on one host. "
-    echo "      Suitable for development and test environments."
-    echo "      It will install caching server, ECE, assembly host, database &"
-    echo "      Widget Framework as well as set up a new publication."
-    echo "  $PROFILE_EDITORIAL_SERVER - Editorial (publication) server."
-    echo "      This will install ECE and an assembly host."
-    echo -n "  $PROFILE_PRESENTATION_SERVER - Presentation server "
-    echo "(ECE, memcached)."
-    echo "  $PROFILE_DB_SERVER - Database server."
-    echo -n "  $PROFILE_CACHE_SERVER - Cache server "
-    echo "(cache & web server)."
-    echo "  $PROFILE_RMI_HUB - RMI hub."
-    echo -n "  $PROFILE_SEARCH_SERVER - Standalone search instance "
-    echo "(solr + indexer-webapp)."
-    echo "  $PROFILE_WIDGET_FRAMEWORK - Install the Widget Framework."
-    echo "      (You need user/pass for repo.escenic.com for this)."
-    echo "  $PROFILE_CREATE_PUBLICATION - Create a new publication."
-    echo "      This profile will create new publication based on WF"
-    echo "      (if available) or ECE/clean-demo."
-    echo "  $PROFILE_MONITORING_SERVER - A monitoring server."
-    echo "       This will install the Munin gatherer."
-    echo "  $PROFILE_RESTORE_FROM_BACKUP - Restore from backup. Allows you to"
-    echo "       restore DB, data files, binaries & publication templates."
-    echo ""
+    installation_profiles=(
+      "$PROFILE_ALL_IN_ONE - All in one, full stack on one host,"\
+" suitable for dev & test environments"
+      "$PROFILE_EDITORIAL_SERVER - Editorial (publication) server"
+      "$PROFILE_PRESENTATION_SERVER - Presentation server (ECE + memcached)."
+      "$PROFILE_DB_SERVER - Database server"
+      "$PROFILE_CACHE_SERVER - Cache server (cache and web server)"
+      "$PROFILE_RMI_HUB - RMI hub"
+      "$PROFILE_SEARCH_SERVER - Search server (Solr + indexer-webapp)"
+      "$PROFILE_WIDGET_FRAMEWORK - Install Widget Framework."
+      "$PROFILE_CREATE_PUBLICATION - Create a new publication"\
+" based on WF if available, ECE/clean-demo if not"
+      "$PROFILE_MONITORING_SERVER - A monitoring server (web server +"\
+" Munin gatherer)"
+      "$PROFILE_RESTORE_FROM_BACKUP - Restore from backup"\
+" (DB, data files, binaries, conf & publications)"
+    )
+    
+    echo "Hi, which server profile do you wish to install?"$'\n'
+
+    for (( i = 0; i < ${#installation_profiles[@]}; i++ )); do
+        echo "  " ${installation_profiles[$i]}
+    done
+
+    echo $'\n'"Select 1-${#installation_profiles[@]} and press ENTER"
     echo -n "Your choice [1]> "
     read install_profile_number
     
     if [ -z "$install_profile_number" ]; then
         install_profile_number=$PROFILE_ALL_IN_ONE
     fi
-    
 }
 
 function assert_correct_runtime_environment()
@@ -1492,9 +1488,11 @@ function install_cache_server()
 function add_next_step()
 {
     if [ -n "$next_steps" ]; then
-        next_steps=${next_steps}${NEW_LINE}"[$(basename $0)] "${1}
+        # next_steps=${next_steps}${NEW_LINE}"[$(basename $0)] "${1}
+        next_steps=${next_steps}${NEW_LINE}"${1}"
     else
-        next_steps="[$(basename $0)] "${1}
+        # next_steps="[$(basename $0)] "${1}
+        next_steps=${1}
     fi
 }
 

From 1016072ddb906abc45e08ec1848ad611077aefa7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 13 Oct 2011 15:08:10 +0800
Subject: [PATCH 0096/2585] - added --exclude-binaries to the backup command.
 This will exclude   the app server and Escenic binaries from the backup,
 significantly   reducing the size of the backup.

---
 usr/bin/ece | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index e1fd1e0a..8402a3fd 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -21,6 +21,7 @@ quiet=0
 type=engine
 instance=default
 command=""
+backup_exclude_binaries=0
 
 type_list="
 engine
@@ -638,21 +639,21 @@ function backup_type()
 "
    actual_backup=""
    for el in $possible_backup; do
-       if [ -r $el ]; then
+       if [ $el = "/opt/escenic" -a $backup_exclude_binaries -eq 1 ]; then
+           continue
+       elif [ -r $el ]; then
            actual_backup="$el $actual_backup"
        fi
    done
 
-   if [ $appserver = "tomcat" ]; then
+   if [ $appserver = "tomcat" -a $backup_exclude_binaries -eq 0 ]; then
        actual_backup="$tomcat_home $tomcat_base $actual_backup"
    fi
 
    print "Creating snapshot ... (this will take a while)"
-   tar czf $archive_file \
+   run tar czf $archive_file \
        $actual_backup \
-       $db_backup_file \
-       1>>$log_file \
-       2>>$log_file
+       $db_backup_file
 
    message="Backup ready: $archive_file"
    print $message
@@ -660,8 +661,12 @@ function backup_type()
    print "The backup arhcive includes:"
    print "- Database snapshot"
    print "- All Solr & Escenic data files from /var/lib/escenic"
-   print "- All app servers in /opt"
-   print "- All Escenic binaries & publication templates in /opt/escenic"
+
+   if [ $backup_exclude_binaries -eq 0 ]; then
+       print "- All app servers in /opt"
+       print "- All Escenic binaries & publication templates in /opt/escenic"
+   fi
+   
    print "- All configuration in /etc/escenic and /etc/default/ece"
    print "- All bootstrap scripts from /etc/init.d"
    print "Enjoy!"
@@ -1056,6 +1061,11 @@ function set_type_command_and_instance()
         else
             next_is_resource=0
         fi
+
+        if [ $el = "--exclude-binaries" ]; then
+            backup_exclude_binaries=1
+            continue
+        fi
         
         # the only thing left at this point, is the command
         command="$command $el"

From 902a242ba949d51ca03b3aff266d6b9120cecfd2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 13 Oct 2011 15:27:47 +0800
Subject: [PATCH 0097/2585] - added BASH completion for instances (-i) and
 publications (-p) - added BASH completion for backup's --exclude-binaries
 option

---
 etc/bash_completion.d/ece | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/etc/bash_completion.d/ece b/etc/bash_completion.d/ece
index 6d816e29..54d5ae2c 100644
--- a/etc/bash_completion.d/ece
+++ b/etc/bash_completion.d/ece
@@ -11,13 +11,28 @@ _ece_commands()
     # default completions is the list of commands
     completions=$commands
 
-    long_options="--help"
-
-    # TODO make educated guesses on these.
     instances=""
+    dir=/etc/escenic/engine/instance
+    if [ -r $dir ] ; then
+        cd $dir
+        for el in *; do
+            instances=${el}" "$instances
+        done
+    fi
+    
     publications=""
+    dir=/opt/escenic/assemblytool/publications
+    if [ -r $dir ] ; then
+        cd $dir
+        for el in *.properties; do
+            publications=$(basename $el .properties)" "$publications
+        done
+    fi
 
     case "$prev" in
+        backup)
+            completions="--exclude-binaries"
+            ;;
         -t)
             completions=$types
             ;;

From 13367f7ec70e8d97f4e0c416d11786fb025cd2e0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 13 Oct 2011 16:27:44 +0800
Subject: [PATCH 0098/2585] - fixed bug in "ece assemble" where assemble would
 enter an eternal   loop of "ece clean assemble" when duplicate plugins were
 to be found   in the plugins directory.

  Now, the ece script fails with a message telling the user what to
  do:

   [ece#engine-dev1] I've tried to assemble twice now and FAILED :-(
   [ece#engine-dev1] You probably have multiple versions of one or more plugins
   [ece#engine-dev1] Check your plugins directory, sort it out and try again.
---
 usr/bin/ece | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/usr/bin/ece b/usr/bin/ece
index 8402a3fd..070f6da4 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -861,8 +861,18 @@ function restart_type()
     start_type
 }    
 
+assemble_attempts=0
+
 function assemble()
 {
+    if [ $assemble_attempts -gt 1 ]; then
+        print "I've tried to assemble twice now and FAILED :-("
+        print "You probably have multiple versions of one or more plugins"
+        print "Check your plugins directory, sort it out and try again."
+        exit 1
+    fi
+    assemble_attempts=$(( $assemble_attempts + 1 ))
+    
     if [ ! $type = "engine" ]; then
         print "You cannot assemble $type"
         exit 1

From 949b142b2bb8d83be8d89d48120c046eba816409 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 13 Oct 2011 17:05:34 +0800
Subject: [PATCH 0099/2585] - changed the way next_steps is accumulated. It's
 now an array where   elements get added in the add_next_step method (as
 before).

  However, having an array makes it easier to display the messages in
  tidier manner with the ece-install-<timestamp> when they are
  printed in the report and not when they are added to the next_steps.

- made the user feedback more compact. The report screen was getting
  too big IMO. Now it's short and sweet, people might even want to
  read it :-)

  Example report screen:

[ece-install-77] The installation is now complete! It took 0d 0h 1m 17s
[ece-install-77] - New ECE instance web1 installed.
[ece-install-77] - Admin interface: http://quanah:8080/escenic-admin/
[ece-install-77] - View installed versions with: ece -i web1 versions
[ece-install-77] - Type 'ece help' to see all the options of this script
[ece-install-77] - Read its guide: /usr/share/doc/escenic/ece-guide.txt
[ece-install-78] - /etc/default/ece lists all instances started at boot time
[ece-install-78] - A Munin node has been installed on quanah
[ece-install-78] - More info: /usr/share/doc/escenic/ece-install-guide.txt
[ece-install-78] - Guide books: http://documentation.vizrt.com/ece-5.3.html
[ece-install-78] Enjoy your time with Escenic Content Engine!
[ece-install-78] -Vizrt Online

- added a slash to the /escenic-admin url printed to the user in the
  installation report. Without the trailing slash, the URL cannot be
  copy and pasted -> success.
---
 usr/sbin/ece-install | 107 +++++++++++++++++++------------------------
 1 file changed, 48 insertions(+), 59 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 6f2806e7..76405e4a 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -52,7 +52,7 @@ NEW_LINE="
 "
 # the next steps printed when the user has installed his/her
 # components.
-next_steps=""
+next_steps=()
 
 function get_seconds_since_start()
 {
@@ -399,7 +399,7 @@ function set_up_ecedb()
     cd ~/
     run rm -rf /opt/escenic/engine/plugins
 
-    add_next_step "- DB is now set up on $HOSTNAME:3306"
+    add_next_step "DB is now set up on $HOSTNAME:3306"
 }
 
 # returns a string of asterixes with the same lenght as the inputted
@@ -896,8 +896,8 @@ function create_user_and_group_if_not_present()
        run adduser $ece_user \
            --disabled-password \
            --gecos "Escenic-user,Room,Work,Home,Other"
-       add_next_step "- Set a password for the new UNIX user $ece_user"
-       add_next_step "  You can do this by running [passwd $ece_user]"
+       add_next_step "Set a password for the new UNIX user $ece_user "\
+"(passwd $ece_user)"
    fi
    
    if [ $(grep $ece_group /etc/group | wc -l) -lt 1 ]; then
@@ -939,30 +939,25 @@ function print_status_and_next_steps()
     minutes=$(( seconds_left / 60 ))
     seconds_left=$(( seconds_left - $minutes * 60 ))
 
-    s="The installation is now complete!"
+    if [ $install_profile_number -ne $PROFILE_RESTORE_FROM_BACKUP ]; then
+        s="The installation is now complete!"
+    else
+        s="The restore is now complete!"
+    fi
     print $s" It took" ${days}d ${hours}h ${minutes}m ${seconds_left}s
 
     if [ $install_profile_number -ne $PROFILE_RESTORE_FROM_BACKUP -a \
         $install_profile_number -ne $PROFILE_CACHE_SERVER -a \
         $install_profile_number -ne $PROFILE_WIDGET_FRAMEWORK ]; then
-        add_next_step "- See /usr/share/doc/escenic/ece-install-guide.txt for"
-        add_next_step "  a full overview of files and directories set up by"
-        add_next_step "  $(basename $0)"
-        add_next_step "- Type 'ece help' to see all the options of this script"
-        add_next_step "  which allows you to control all the ECE components."
-        add_next_step "  Also, see /usr/share/doc/escenic/ece-guide.txt for"
-        add_next_step "  further information on the ece script."
-        add_next_step "- For further reading, in-depth guides on installing, "
-        add_next_step "  configuring and developing Escenic web sites can be "
-        add_next_step "  fount at http://documentation.vizrt.com/ece-5.3.html"
+        add_next_step "More info: /usr/share/doc/escenic/ece-install-guide.txt"
+        add_next_step "Guide books: http://documentation.vizrt.com/ece-5.3.html"
     fi
     
+    for (( i = 0; i < ${#next_steps[@]}; i++ )); do
+        print "  - " ${next_steps[$i]}
+    done
 
-    echo "$next_steps"
-
-    print ""
-    print "Enjoy your time with Escenic Content Engine!"
-    print ""
+    print $'\n'"Enjoy your time with Escenic Content Engine!"$'\n'
     print "-Vizrt Online"
 }
 
@@ -1480,19 +1475,20 @@ function install_cache_server()
 
     set_up_varnish $backend_servers
 
-    add_next_step "- Cache server is up and running at http://${HOSTNAME}:80/"
+    add_next_step "Cache server is up and running at http://${HOSTNAME}:80/"
 }
 
 # Parameters:
 # $1 : your added line
 function add_next_step()
 {
+    next_steps[${#next_steps[@]}]="${1}"
+    return
+    
     if [ -n "$next_steps" ]; then
-        # next_steps=${next_steps}${NEW_LINE}"[$(basename $0)] "${1}
-        next_steps=${next_steps}${NEW_LINE}"${1}"
+        next_steps=${next_steps}${NEW_LINE}"[$(basename $0)] "${1}
     else
-        # next_steps="[$(basename $0)] "${1}
-        next_steps=${1}
+         next_steps="[$(basename $0)] "${1}
     fi
 }
 
@@ -1655,18 +1651,14 @@ EOF
     set_conf_file_value ece_unix_user $ece_user /etc/default/ece
     set_conf_file_value ece_unix_group $ece_group /etc/default/ece
 
-    admin_uri=http://$HOSTNAME:${appserver_port}/escenic-admin
-    add_next_step "- New ECE instance $instance_name installed."
-    add_next_step "- Its admin interface is available at"
-    add_next_step "  $admin_uri"
-    add_next_step "- You can view all installed plugin & engine versions with:"
-    add_next_step "  ece -i $instance_name versions"
-    add_next_step "- type 'ece help' to see all the options of this script"
-    add_next_step "  which allows you to control all the Escenic components."
-    add_next_step "  Also, see /usr/share/doc/escenic/ece-guide.txt for"
-    add_next_step "  addtional information on the ece script."
-    add_next_step "- Verify that /etc/default/ece lists all the instances "
-    add_next_step "  on $HOSTNAME you wish to start at boot time."
+    admin_uri=http://$HOSTNAME:${appserver_port}/escenic-admin/
+    add_next_step "New ECE instance $instance_name installed."
+    add_next_step "Admin interface: $admin_uri"
+    add_next_step "View installed versions with:"\
+" ece -i $instance_name versions"
+    add_next_step "Type 'ece help' to see all the options of this script"
+    add_next_step "Read its guide: /usr/share/doc/escenic/ece-guide.txt"
+    add_next_step "/etc/default/ece lists all instances started at boot time"
 }
 
 function install_presentation_server()
@@ -1737,7 +1729,7 @@ function create_publication()
     create_publication_in_db $publication_war
     assemble_deploy_and_restart_type
 
-    add_next_step "- a new publication $publication_name has been created"
+    add_next_step "A new publication $publication_name has been created."
 }
 
 function install_editorial_server()
@@ -1768,11 +1760,7 @@ clientConfiguration=/neo/io/services/HubConnection
 pingTime=10000
 EOF
 
-    add_next_step "- Restart all your instances to make the hub seem them:"
-    for el in /etc/escenic/engine/instance/*; do
-        instance_name=$(basename $el)
-        add_next_step "   - $ ece -i ${instance_name} restart"
-    done
+    add_next_step "Restart all your instances to make the hub see them."
 
     print "Starting the RMI-hub on $HOSTNAME ..."
     ece_command="ece -t rmi-hub restart"
@@ -1894,8 +1882,8 @@ EOF
     
     cp -r $wf_dist_dir/misc/siteconfig/* $common_nursery_dir/
 
-    add_next_step "- Widget Framework has been installed into your local" 
-    add_next_step "  Maven repository and its ECE components have been installed"
+    add_next_step "Widget Framework has been installed into your local"\
+" Maven repository"
 }
 
 function install_search_instance()
@@ -1982,9 +1970,9 @@ server {
 EOF
     /etc/init.d/nginx restart 1>>$log 2>>$log
 
-    add_next_step "- Web server is install on http://${HOSTNAME}:81/"
-    add_next_step "  http://${HOSTNAME}:81/ gives you the munin interface"
-    add_next_step "  http://${HOSTNAME}:81/binary gives you the Adactus endpoint"
+    add_next_step "Web server is install on http://${HOSTNAME}:81/"
+    add_next_step "http://${HOSTNAME}:81/ gives you the munin interface"
+    add_next_step "http://${HOSTNAME}:81/binary gives you the Adactus endpoint"
 }
 
 function install_munin_gatherer()
@@ -2018,7 +2006,7 @@ function install_munin_gatherer()
     # TODO has a hard dependency on install_web_server, should perhaps
     # be called from this one?
 
-    add_next_step "- Munin interface available at http://$HOSTNAME:81/"
+    add_next_step "Munin interface is available at http://$HOSTNAME:81/"
 }
 
 function install_munin_node()
@@ -2043,10 +2031,11 @@ function install_munin_node()
         -O $file
     run chmod 755 $file
 
-    if [ ! -e /etc/escenic -o ! -e /etc/escenic/ece-*.conf ]; then
+    if [ ! -e /etc/escenic -o \
+        $(ls /etc/escenic/ | grep ece- | wc -l) -lt 1 ]; then
         print "No ECE instances found on $HOSTNAME, so I'm not adding"
         print "additional Munin configuration"  
-        add_next_step "- A Munin node has been installed on $HOSTNAME"
+        add_next_step "A Munin node has been installed on $HOSTNAME"
         return
     fi
     
@@ -2091,7 +2080,7 @@ EOF
             1>>$log 2>>$log
     fi
 
-    add_next_step "- A Munin node has been installed on $HOSTNAME"
+    add_next_step "A Munin node has been installed on $HOSTNAME"
 }
 
 function add_server_to_runlevels()
@@ -2109,8 +2098,8 @@ function add_server_to_runlevels()
         print "Adding the ece init.d script to the default run levels ..."
         run update-rc.d ece defaults
     else
-        add_next_step "- Remember to add /etc/intit.d/ece to the desired"
-        add_next_step "  run levels." 
+        add_next_step "Remember to add /etc/intit.d/ece to the desired "\
+"run levels." 
         # TODO add init.d to the default runlevels, for other
         # distributions too:
         # - RedHat/chekcconfig
@@ -2242,8 +2231,8 @@ function restore_from_backup()
         run cd $dir
         run tar -C / -xzf $backup_file var/lib/escenic
         add_next_step "Successfully restored Solr & ECE data files"
-        add_next_step "from backup:  $(basename $backup_file)"
-        add_next_step "Check /var/lib/escenic to verify they're all there"
+        add_next_step "Backup file used:  $(basename $backup_file)"
+        add_next_step "Check /var/lib/escenic to verify they're all there."
     fi
     
     if [ $restore_conf -eq 1 ]; then
@@ -2251,8 +2240,8 @@ function restore_from_backup()
         run cd $dir
         run tar -C / -xzf $backup_file etc
         add_next_step "Successfully restored ECE configuration files"
-        add_next_step "from backup: $(basename $backup_file)"
-        add_next_step "Check /etc to verify that they're all there".
+        add_next_step "Backup file used: $(basename $backup_file)"
+        add_next_step "Check /etc to verify that they're all there."
     fi
     
     if [ $restore_binaries -eq 1 ]; then
@@ -2260,7 +2249,7 @@ function restore_from_backup()
         run cd $dir
         run tar -C / -xzf $backup_file opt
         add_next_step "Successfully restored Escenic & Tomcat binaries"
-        add_next_step "from backup: $(basename $backup_file)"
+        add_next_step "Backup file used: $(basename $backup_file)"
         add_next_step "Check /opt to verify that they're all there".
     fi
 }

From bb84670c1dedd58aa2c0d1d1ec4897986ec05bc8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 13 Oct 2011 18:28:15 +0800
Subject: [PATCH 0100/2585] - fixed bug in the duplicate detection test, making

  commons-httpclient-3.1.jar
  resolvers-commons-httpclient-3.2.jar

  produce false positives. A hat fixed it (^).
---
 usr/bin/ece | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 070f6da4..26a6864f 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -899,7 +899,7 @@ function assemble()
         if [ $(echo $known_unharmful_duplicates | grep $jar | wc -l) -gt 0 ]; then
             continue
         fi
-        if [ $(\ls *.jar | grep "$jar[0-9]" | wc -l) -gt 1 ]; then
+        if [ $(\ls *.jar | grep "^${jar}[0-9]" | wc -l) -gt 1 ]; then
             duplicates_found=1
             debug "More than one version of $jar"
         fi

From 57ed307b8dece5804e4ee541cc4f41ac7e047127 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 14 Oct 2011 19:05:35 +0800
Subject: [PATCH 0101/2585] - on Debian systems, ece-install will now add the
 non-free (and   contrib) pools if they don't already exist in the APT sources
   list. This will make it easier to install the ECE instances, which   all
 require Sun, err, Oracle Java 6 to be installed and this is in   the non-free
 pool.

---
 usr/sbin/ece-install | 75 +++++++++++++++++++++++++++++---------------
 1 file changed, 49 insertions(+), 26 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 76405e4a..9ef7f257 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -240,7 +240,7 @@ function install_common_os_packages()
         install_packages_if_missing $packages
     fi
 
-    for el in curl wget git unzip; do
+    for el in lsb_release curl wget git unzip; do
         assert_pre_prequesite $el
     done
 }
@@ -579,7 +579,18 @@ function install_ece_third_party_packages
     if [ $on_debian_or_derivative -eq 1 ]; then
 
         if [ $on_ubuntu -eq 1 ]; then
-            add_apt_source "deb http://archive.canonical.com/ $(lsb_release -s -c) partner"              
+            add_apt_source "deb http://archive.canonical.com/ $(lsb_release -s -c) partner"
+        elif [ $on_debian -eq 1 ]; then
+            code_name=$(lsb_release -s -c)
+            has_non_free=$(grep $(lsb_release -s  -c) \
+                /etc/apt/sources.list | \
+                egrep -v "^#|deb-src" | \
+                grep -v security | \
+                grep non-free | \
+                wc -l)
+            if [ $has_non_free -eq 0 ]; then
+                add_apt_source "deb http://ftp.tw.debian.org/debian/ $(lsb_release -s -c) contrib non-free"
+            fi
         fi
         
         echo "sun-java6-jdk shared/accepted-sun-dlj-v1-1 boolean true" | \
@@ -949,7 +960,7 @@ function print_status_and_next_steps()
     if [ $install_profile_number -ne $PROFILE_RESTORE_FROM_BACKUP -a \
         $install_profile_number -ne $PROFILE_CACHE_SERVER -a \
         $install_profile_number -ne $PROFILE_WIDGET_FRAMEWORK ]; then
-        add_next_step "More info: /usr/share/doc/escenic/ece-install-guide.txt"
+        add_next_step "Install info: "\ "/usr/share/doc/escenic/ece-install-guide.txt"
         add_next_step "Guide books: http://documentation.vizrt.com/ece-5.3.html"
     fi
     
@@ -1389,6 +1400,13 @@ function common_pre_install()
         export DEBIAN_FRONTEND=noninteractive
     fi
 
+    # chicken and the egg problem, we need lsb_release to install the
+    # packages later on, hence as soon as we know we've got a Debian
+    # based platform, we install lsb-release. Also note, the
+    # executable, lsb_release, is in the list of required binaries in
+    # install_common_os_packages.
+    install_packages_if_missing "lsb-release"
+    
     if [ $(lsb_release -i | grep Ubuntu | wc -l) -gt 0 ]; then
         on_ubuntu=1
     elif [ $(lsb_release -i | grep Debian | wc -l) -gt 0 ]; then
@@ -2110,6 +2128,7 @@ function add_server_to_runlevels()
 function restore_from_backup()
 {
     # locals
+    restore_all=0
     restore_db=0
     restore_binaries=0
     restore_data_files=0
@@ -2125,23 +2144,17 @@ function restore_from_backup()
             print "You must specifify fai_restore_from_file"
             exit 1
         fi
-        
-        if [ $(get_boolean_conf_value fai_restore_db) -eq 1 -o \
-            $(get_boolean_conf_value fai_restore_all) -eq 1 ]; then
+
+        if [ $(get_boolean_conf_value fai_restore_all) -eq 1 ]; then
+            restore_all=1
+        elif [ $(get_boolean_conf_value fai_restore_db) -eq 1 ]; then
             restore_db=1
-        fi
-        
-        if [ $(get_boolean_conf_value fai_restore_data_files) -eq 1 -o \
-            $(get_boolean_conf_value fai_restore_all) -eq 1 ]; then
+        elif [ $(get_boolean_conf_value fai_restore_data_files) -eq 1 ]; then
             restore_data_files=1
-        fi
-        
-        if [ $(get_boolean_conf_value fai_restore_software_binaries) -eq 1 -o \
-            $(get_boolean_conf_value fai_restore_all) -eq 1 ]; then
+        elif [ $(get_boolean_conf_value fai_restore_software_binaries) -eq 1 ]
+        then
             restore_binaries=1
-        fi
-        if [ $(get_boolean_conf_value fai_restore_configuration) -eq 1 -o \
-            $(get_boolean_conf_value fai_restore_all) -eq 1 ]; then
+        elif [ $(get_boolean_conf_value fai_restore_configuration) -eq 1 ]; then
             restore_conf=1
         fi
     elif [ $(get_boolean_conf_value fai_enabled) -eq 0 ]; then
@@ -2151,7 +2164,12 @@ function restore_from_backup()
             exit 1
         fi
 
-        tarball_array=($(ls -t $backup_dir/*.tar.gz))
+        if [ $(ls $backup_dir | grep .tar | wc -l) -lt 1 ]; then
+            print "No backup files (.tar) found in $backup_dir, exiting."
+            exit 0
+        fi
+        
+        tarball_array=($(ls -t $backup_dir/*.tar))
         
         for (( i = 0; i <${#tarball_array[@]}; i++ )); do
             echo "   " $(( ${i} + 1 )) "-" $(basename  ${tarball_array[$i]})
@@ -2173,6 +2191,7 @@ function restore_from_backup()
             "The Solr and ECE data files (multimedia archive)"
             "The ECE configuration files"
             "The Escenic and Tomcat software binaries + publication templates"
+            "Restore everything of the above"
         )
         for (( i = 0; i <${#restore_profiles[@]}; i++ )); do
             echo "   " $(( ${i} + 1 )) "-" ${restore_profiles[$i]}
@@ -2194,6 +2213,8 @@ function restore_from_backup()
             restore_conf=1
         elif [ $user_restore_profile -eq 4 ]; then
             restore_binaries=1
+        elif [ $user_restore_profile -eq 5 ]; then
+            restore_all=1
         fi
     fi
 
@@ -2205,11 +2226,11 @@ function restore_from_backup()
     
     dir=$(mktemp -d)
     
-    if [ $restore_db -eq 1 ]; then
+    if [ $restore_db -eq 1 -o $restore_all -eq 1 ]; then
         install_database_server "binaries_only"
         print "Restoring the database contents on $HOSTNAME ..."
         run cd $dir
-        run tar xzf $backup_file --wildcards var/backups/escenic/*.sql.gz
+        run tar xf $backup_file --wildcards var/backups/escenic/*.sql.gz
         # picking the DB backup file to restore
         sql_file=$(ls -tra var/backups/escenic/*.sql.gz | tail -1)
         print "Selecting the most recent database dump $(basename $sql_file)"
@@ -2226,31 +2247,32 @@ function restore_from_backup()
         add_next_step "Successfully restored DB from $(basename $sql_file)"
     fi
     
-    if [ $restore_data_files -eq 1 ]; then
+    if [ $restore_data_files -eq 1 -o $restore_all -eq 1 ]; then
         print "Restoring the Solr & ECE data files on $HOSTNAME ..."
         run cd $dir
-        run tar -C / -xzf $backup_file var/lib/escenic
+        run tar -C / -xf $backup_file var/lib/escenic
         add_next_step "Successfully restored Solr & ECE data files"
         add_next_step "Backup file used:  $(basename $backup_file)"
         add_next_step "Check /var/lib/escenic to verify they're all there."
     fi
     
-    if [ $restore_conf -eq 1 ]; then
+    if [ $restore_conf -eq 1 -o $restore_all -eq 1 ]; then
         print "Restoring the ECE configuration files on $HOSTNAME ..."
         run cd $dir
-        run tar -C / -xzf $backup_file etc
+        run tar -C / -xf $backup_file etc
         add_next_step "Successfully restored ECE configuration files"
         add_next_step "Backup file used: $(basename $backup_file)"
         add_next_step "Check /etc to verify that they're all there."
     fi
     
-    if [ $restore_binaries -eq 1 ]; then
+    if [ $restore_binaries -eq 1 -o $restore_all -eq 1 ]; then
         print "Restoring the Escenic & Tomcat binaries on $HOSTNAME ..."
         run cd $dir
-        run tar -C / -xzf $backup_file opt
+        run tar -C / -xf $backup_file opt
         add_next_step "Successfully restored Escenic & Tomcat binaries"
         add_next_step "Backup file used: $(basename $backup_file)"
         add_next_step "Check /opt to verify that they're all there".
+        install_ece_third_party_packages
     fi
 }
 
@@ -2330,6 +2352,7 @@ if [ $fai_enabled -eq 1 ]; then
 else
     read_user_input
     common_pre_install
+    
     case $install_profile_number in
         $PROFILE_ALL_IN_ONE)
         install_all_in_one_environment

From 4947c197f6938180266c9fdc2b3a0a63675f0d04 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 14 Oct 2011 22:24:33 +0800
Subject: [PATCH 0102/2585] - changed backup format to .tar instead of .tar.gz
 as I discovered   some problems extracting such a big (~6GB) archive on two  
 servers. Will revise this if some light can shed as to why this can   be a
 problem.

  The change to uncompressed tarballs significantly speeds up the
  backup and recovery, so I might keep it.

- added get_actual_file for sorting out members of the backup being
  variables holding links to the actual contents (like /opt/tomcat ->
  apache-tomcat...)

  Returns the file (can be a directory) passed to the function only
  if it's the actual file/directory and not a link to it. If the
  passed file is a link, the link target is returned instead.
---
 usr/bin/ece | 37 ++++++++++++++++++++++++++++++++++---
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 26a6864f..e6963e46 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -562,6 +562,37 @@ function deploy()
     esac
 }
 
+# Returns the file (can be a directory) passed to the function only
+# if it's the actual file/directory and not a link to it. If the
+# passed file is a link, the link target is returned instead.
+#
+# $1 - the file (which could be a link)
+function get_actual_file()
+{
+    if [ -h ${1} ]; then
+        dir=$(dirname $1)
+        real_file=$(ls -l ${1} | awk '{print $11}')
+
+        # Because of the test if the file we want to returns is
+        # absolute, we go to the root before testing. We want to
+        # preserve the cwd, therefore, we're doing the "cd /" in a
+        # subshell.
+        real_file=$(
+            cd / 
+            if [ ! -e ${real_file} ]; then
+                real_file=${dir}/${real_file}
+            fi
+
+            # this is the return value from the sub process
+            echo ${real_file}
+        )
+    else
+        real_file=${1}
+    fi
+    
+    echo ${real_file}
+}
+
 function backup_type()
 {
    message="Backing up the $instance instance of $type on $HOSTNAME ..."
@@ -628,7 +659,7 @@ function backup_type()
        print "Database dumped: $db_backup_file"
    fi
    
-   archive_file=$backup_dir/${type}-${instance}-backup-$(date --iso).tar.gz
+   archive_file=$backup_dir/${type}-${instance}-backup-$(date --iso).tar
    possible_backup="
 /etc/escenic 
 /opt/escenic 
@@ -647,11 +678,11 @@ function backup_type()
    done
 
    if [ $appserver = "tomcat" -a $backup_exclude_binaries -eq 0 ]; then
-       actual_backup="$tomcat_home $tomcat_base $actual_backup"
+       actual_backup="$(get_actual_file $tomcat_home) $tomcat_base $actual_backup"
    fi
 
    print "Creating snapshot ... (this will take a while)"
-   run tar czf $archive_file \
+   run tar cf $archive_file \
        $actual_backup \
        $db_backup_file
 

From 9e3d604543829e36700e381a73b146422df81079 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 14 Oct 2011 22:25:36 +0800
Subject: [PATCH 0103/2585] - simplification of feedback on DB dump selected
 for restore. The   rationale is that I want to confuse the user as little as
 possible,   simply stating which DB backup was used is hopefully enough.

---
 usr/sbin/ece-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 9ef7f257..ea2ba879 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -2233,7 +2233,7 @@ function restore_from_backup()
         run tar xf $backup_file --wildcards var/backups/escenic/*.sql.gz
         # picking the DB backup file to restore
         sql_file=$(ls -tra var/backups/escenic/*.sql.gz | tail -1)
-        print "Selecting the most recent database dump $(basename $sql_file)"
+        print "Selecting database dump: $(basename $sql_file)"
 
         # methods in drop-and-create-ecedb to set up the database
         # schema & user

From 829dbd058ed3cef18dbe1576c2a4dbca22de52da Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 18 Oct 2011 10:53:11 +0800
Subject: [PATCH 0104/2585] - removed the is_production setting for ece{.conf}.
 If set to 1, it   would add the "-server" parameter to the JVM options.

  However, the "-server" VM server class is the only one available on
  64bits systems on Java 6 and since all systems these days are both
  64bit and use Java 6, this setting can be omitted.

  Trivia: The original idea behind the is_production was to allow a number of
  production specific settings/switches to ece, however as the script
  grew, more specific options were added and a general
  is_production_environment/is_development_environment switch became
  redundant.
---
 etc/escenic/ece.conf | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/etc/escenic/ece.conf b/etc/escenic/ece.conf
index 9b1e771e..be5ded7d 100644
--- a/etc/escenic/ece.conf
+++ b/etc/escenic/ece.conf
@@ -116,11 +116,6 @@ remote_monitoring_port=5792
 #####################################################################
 force_ipv4=0
 
-#####################################################################
-# Is this a production system?
-#####################################################################
-is_production=1
-
 #####################################################################
 # Ask the JVM to create a heap dump when/if it crashes. 
 #####################################################################

From b3788599637eb9079280f8738f26341b696a4ae1 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 18 Oct 2011 10:53:26 +0800
Subject: [PATCH 0105/2585] - removed the is_production setting for ece{.conf}.
 If set to 1, it   would add the "-server" parameter to the JVM options.

  However, the "-server" VM server class is the only one available on
  64bits systems on Java 6 and since all systems these days are both
  64bit and use Java 6, this setting can be omitted.

  Trivia: The original idea behind the is_production was to allow a number of
  production specific settings/switches to ece, however as the script
  grew, more specific options were added and a general
  is_production_environment/is_development_environment switch became
  redundant.
---
 usr/bin/ece | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index e6963e46..5f33d14a 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -51,7 +51,6 @@ ece_security_configuration_dir
 enable_heap_dump
 enable_remote_debugging
 enable_remote_monitoring
-is_production
 java_home
 solr_home
 "
@@ -352,11 +351,6 @@ function set_instance_settings()
         ece_args=$ece_args" -XX:MaxPermSize=$max_permgen_size"
     fi
     
-    # settings specific to a production environment
-    if [ $is_production -eq 1 ]; then
-        ece_args=$ece_args" -server"
-    fi
-    
     if [ $jvm_encoding ]; then
         ece_args=$ece_args" -Dsun.jnu.encoding=$jvm_encoding"
         ece_args=$ece_args" -Dfile.encoding=$jvm_encoding"

From 69e20997d802ff9e2fdde42a934cfafd4c178cd8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 19 Oct 2011 12:54:58 +0800
Subject: [PATCH 0106/2585] - ece-install/restore now reads the ece UNIX user &
 group from the   restored /etc/default/ece - if exists - and based on that,
 sets the   correct permissions, as well as creating the user & group if they 
  don't exist on the system. - getting the Percona APT key has failed several
 times now during the   last six months. Therefore, I've added logic to the  
 install_database_server method, that it will force the installation   of
 Percona if the key couldn't be retrieved. A warning message about   this is
 logged. - bug fix to the test for existent tarballs - added log and
 print_and_log methods

---
 usr/sbin/ece-install | 89 ++++++++++++++++++++++++++++++++++++++------
 1 file changed, 77 insertions(+), 12 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index ea2ba879..76b90734 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -42,6 +42,7 @@ appserver_port=8080
 on_debian_or_derivative=0
 on_debian=0
 on_ubuntu=0
+force_packages=0
 
 # because the all in one profile will run database, search and app
 # server profiles, all of which needs downloading and setting up the
@@ -80,6 +81,17 @@ function print()
     echo $(get_id) $@
 }
 
+function log()
+{
+    echo $(get_id) $@ >> $log
+}
+
+function print_and_log()
+{
+    print "$@"
+    log "$@"
+}
+
 function exit_on_error()
 {
     if [ $? -gt 0 ]; then
@@ -218,8 +230,12 @@ install_packages_if_missing()
         if [ $some_are_missing -eq 0 ]; then
             return
         fi
-        
-        run apt-get install -y $@
+
+        if [ $force_packages -eq 1 ]; then
+            run apt-get install --assume-yes --force-yes $@
+        else
+            run apt-get install --assume-yes $@
+        fi
     fi
 }
 
@@ -907,8 +923,8 @@ function create_user_and_group_if_not_present()
        run adduser $ece_user \
            --disabled-password \
            --gecos "Escenic-user,Room,Work,Home,Other"
-       add_next_step "Set a password for the new UNIX user $ece_user "\
-"(passwd $ece_user)"
+       add_next_step "I created a new UNIX user called $ece_user"
+       add_next_step "and you must set a password using: passwd $ece_user"
    fi
    
    if [ $(grep $ece_group /etc/group | wc -l) -lt 1 ]; then
@@ -1539,18 +1555,35 @@ function install_database_server()
             print "Installing the Percona database ..."
 
             if [ $(apt-key list| grep CD2EFD2A | wc -l) -lt 1 ]; then
-                run gpg --keyserver hkp://keys.gnupg.net \
-                    --recv-keys 1C4CBDCDCD2EFD2A
-                gpg --armor \
-                    -a \
-                    --export 1C4CBDCDCD2EFD2A | \
-                    apt-key add - \
-                    1>>$log 2>>$log
+                gpg --keyserver hkp://keys.gnupg.net \
+                    --recv-keys 1C4CBDCDCD2EFD2A \
+                     1>>$log 2>>$log
+                
+                # There has been twice now, during six months, that
+                # the key cannot be retrieved from
+                # keys.gnupg.net. Therefore, we're checking if it
+                # failed and if yes, force the package installation.
+                if [ $? -gt 0 ]; then
+                    s="Failed retrieving the Percona key from keys.gnupg.net"
+                    print_and_log $s
+                    s="Will install the Percona packages without the GPG key"
+                    print_and_log $s
+                    force_packages=1
+                else
+                    gpg --armor \
+                        -a \
+                        --export 1C4CBDCDCD2EFD2A | \
+                        apt-key add - \
+                        1>>$log 2>>$log
+                fi
+
                 run apt-get update
             fi
+            
             add_apt_source "deb http://repo.percona.com/apt ${code_name} main"
             packages="percona-server-server percona-server-client"
             install_packages_if_missing $packages
+            force_packages=0
         else
             print "The Percona APT repsository doesn't have packages for your"
             print "Debian (or derivative) version with code name $code_name. "
@@ -2164,7 +2197,7 @@ function restore_from_backup()
             exit 1
         fi
 
-        if [ $(ls $backup_dir | grep .tar | wc -l) -lt 1 ]; then
+        if [ $(ls $backup_dir | grep ".tar$" | wc -l) -lt 1 ]; then
             print "No backup files (.tar) found in $backup_dir, exiting."
             exit 0
         fi
@@ -2273,6 +2306,38 @@ function restore_from_backup()
         add_next_step "Backup file used: $(basename $backup_file)"
         add_next_step "Check /opt to verify that they're all there".
         install_ece_third_party_packages
+        set_up_engine_directories
+
+        # doing some educated guessing on which tomcat_base/home as
+        # well as UNIX user/group to use for this.
+        file=/etc/default/ece
+        if [ -r $file ]; then
+            ece_user=$(grep ^ece_unix_user $file | \
+                cut -d'=' -f2 | \
+                sed -e "s/'//g" -e 's/"//g'
+            )
+            ece_group=$(grep ^ece_unix_group $file | \
+                cut -d'=' -f2 | \
+                sed -e "s/'//g" -e 's/"//g'
+            )
+            create_user_and_group_if_not_present
+            
+            if [ -d /etc/escenic -a \
+                $(ls /etc/escenic/ | grep ^ece- | wc -l) -gt 0 -a \
+                $(grep ^tomcat_base /etc/escenic/ece*.conf | wc -l) -gt 0 ]; then
+                directories=$(grep ^tomcat_base /etc/escenic/ece*.conf | \
+                    cut -d'=' -f2 | \
+                    sed -e "s/'//g" -e 's/"//g'
+                )
+                s="Setting file permissions according to /etc/default/ece"
+                print_and_log $s
+                s="and /etc/escenic/ece*.conf"
+                print_and_log $s
+                run chown -R ${ece_user}:${ece_group} ${directories}
+            fi
+        fi
+        
+        set_correct_permissions
     fi
 }
 

From 9c311874b8c2576f7b22919471ceeec029c03048 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 19 Oct 2011 13:17:55 +0800
Subject: [PATCH 0107/2585] - added calls to remove_pid_and_exit_in_error all
 places where exit 1   previously was called. This means that re-running
 ece-install after   a (controlled) failed attempt can proceed without needing
 to remove   the PID file first. - added remove_pid_and_exit_in_error - added
 hardening to the user input checking (selecting profile number   to install).
 - added is_number method

---
 usr/sbin/ece-install | 69 ++++++++++++++++++++++++++++++--------------
 1 file changed, 48 insertions(+), 21 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 76b90734..1a9ec57e 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -92,12 +92,18 @@ function print_and_log()
     log "$@"
 }
 
+function remove_pid_and_exit_in_error()
+{
+    rm $pid_file
+    exit 1
+}
+
 function exit_on_error()
 {
     if [ $? -gt 0 ]; then
         print "The command ["$@"] FAILED, exiting :-("
         print "See $log for further details."
-        exit 1
+        remove_pid_and_exit_in_error
     fi
 }
 
@@ -107,6 +113,22 @@ function run()
     exit_on_error $@
 }
 
+# Returns 1 if the passed value is a number, 0 if not
+#
+# $1 : what you want to test
+function is_number()
+{
+    if [ -z $1 ]; then
+        echo 0
+    elif [ $(echo $1 | grep [a-z] | wc -l) -gt 0 ]; then
+        echo 0
+    elif [ $(echo $1 | grep [A-Z] | wc -l) -gt 0 ]; then
+        echo 0
+    else
+        echo 1
+    fi
+}
+
 technet_download_list="
 http://technet.escenic.com/downloads/assemblytool-2.0.2.zip
 http://technet.escenic.com/downloads/release/53/analysis-engine-2.3.6.0.zip
@@ -167,14 +189,14 @@ function make_ln()
             run ln -s $1 $2
         elif [ ! -e $1 ]; then
             print "Tried to make a symlink to $1, but it doesn't exist"
-            exit 1
+            remove_pid_and_exit_in_error
         fi
     else
         if [ -e $1 -a ! -h $(basename $1) ]; then
             run ln -s $1
         elif [ ! -e $1 ]; then
             print "Tried to make a symlink to $1, but it doesn't exist"
-            exit 1
+            remove_pid_and_exit_in_error
         fi
     fi
 }
@@ -1002,7 +1024,7 @@ function create_publication_in_db()
 
     if [ "$cookie" == "" ] ; then
         print "Unable to get a session cookie."
-        exit 1;
+        remove_pid_and_exit_in_error;
     fi
 
     run curl --silent \
@@ -1085,7 +1107,7 @@ function check_for_required_downloads()
             wc -l) \
             -lt 1 ]; then
             print "Couldn't find $el* in $download_dir"
-            exit 1
+            remove_pid_and_exit_in_error
         fi
     done
 }
@@ -1372,13 +1394,18 @@ function read_user_input()
     if [ -z "$install_profile_number" ]; then
         install_profile_number=$PROFILE_ALL_IN_ONE
     fi
+
+    if [ $(is_number $install_profile_number) -eq 0 ]; then
+        print "The profile number, $install_profile_number, is not a number"
+        remove_pid_and_exit_in_error
+    fi
 }
 
 function assert_correct_runtime_environment()
 {
     if [ $(whoami) != "root" ]; then
         print "You must be root when running $(basename $0)"
-        exit 1
+        remove_pid_and_exit_in_error
     fi
     
     if [ -e $pid_file ]; then
@@ -1386,7 +1413,7 @@ function assert_correct_runtime_environment()
         print "If you blelieve this is wrong, e.g. if a previous run of" 
         print "$(basename $0) was aborted before it completed, you"
         print "may remove ${pid_file} and run $(basename $0) again."
-        exit 1
+        remove_pid_and_exit_in_error
     else
         echo $BASHPID > $pid_file
         started=`stat -c %Y $pid_file`
@@ -1395,7 +1422,7 @@ function assert_correct_runtime_environment()
     if [ ! -e "$conf_file" ]; then
         print $conf_file "doesn't exist."
         print "I cannot live without it, so I'm exiting :-("
-        exit 1
+        remove_pid_and_exit_in_error
     fi
 }
 
@@ -1408,7 +1435,7 @@ function common_pre_install()
     if [ -z "$technet_user" -o -z "$technet_password" ]; then
         print "Be sure to set technet_user and technet_password "
         print "in $conf_file"
-        exit 1
+        remove_pid_and_exit_in_error
     fi
 
     if [ -e /etc/debian_version -a -x /usr/bin/dpkg ]; then
@@ -1441,7 +1468,7 @@ function assert_pre_prequesite()
 {
     if [ $(which $1 | wc -l) -lt 1 ]; then
         print "Please install $1 and then run $(basename $0) again."
-        exit 1
+        remove_pid_and_exit_in_error
     fi
 }
 
@@ -1750,7 +1777,7 @@ function create_publication()
         ! -e /opt/escenic/assemblytool ]; then
         print "Please install ECE and an assembly environment before"
         print "running this installation profile again."
-        exit 1
+        remove_pid_and_exit_in_error
     fi
 
     print "Getting ready to create a new publiation ..."
@@ -1826,7 +1853,7 @@ function get_conf_value()
 {
     if [ ! -e "$conf_file" ]; then
         print $conf_file "doesn't exist."
-        exit 1
+        remove_pid_and_exit_in_error
     fi
 
     if [ $(grep $1 $conf_file | grep -v ^# | wc -l) -gt 0 ]; then
@@ -1836,7 +1863,7 @@ function get_conf_value()
 
 # returns 0 for false, 1 for true
 #
-# paramaters: $1 : the conf key, see get_conf_value
+# parameters: $1 : the conf key, see get_conf_value
 function get_boolean_conf_value()
 {
     value=$(get_conf_value $1)
@@ -1862,7 +1889,7 @@ function install_widget_framework()
     if [ -z "$wf_user" -o -z "$wf_password" ]; then
         print "Missing wf_user and wf_password in $conf_file"
         print "If you don't have these, please contact support@escenic.com"
-        exit 1
+        remove_pid_and_exit_in_error
     fi
 
     print "Creating a Maven settings file: $HOME/.m2/settings.xml ..."
@@ -2175,7 +2202,7 @@ function restore_from_backup()
 
         if [ -z "$backup_file" ]; then
             print "You must specifify fai_restore_from_file"
-            exit 1
+            remove_pid_and_exit_in_error
         fi
 
         if [ $(get_boolean_conf_value fai_restore_all) -eq 1 ]; then
@@ -2194,7 +2221,7 @@ function restore_from_backup()
         print "From which dataset do you wish to restore?"
         if [ ! -d $backup_dir ]; then
             print "Directory $backup_dir doesn't exist or isn't readable"
-            exit 1
+            remove_pid_and_exit_in_error
         fi
 
         if [ $(ls $backup_dir | grep ".tar$" | wc -l) -lt 1 ]; then
@@ -2254,7 +2281,7 @@ function restore_from_backup()
     if [ ! -r "$backup_file" ]; then
         print "$backup_file either doesn't exist or cannot be read."
         print "I cannot restore from it :-("
-        exit 1
+        remove_pid_and_exit_in_error
     fi
     
     dir=$(mktemp -d)
@@ -2410,7 +2437,7 @@ if [ $fai_enabled -eq 1 ]; then
     else
         print "No install profile selected, be sure to have one of the "
         print "fai_<profile>_install=1 in your $conf_file"
-        exit 1
+        remove_pid_and_exit_in_error
     fi
     
     common_post_install
@@ -2453,9 +2480,9 @@ else
         $PROFILE_RESTORE_FROM_BACKUP)
         restore_from_backup
         ;;
-        default)
-            print "You must select 1-11"
-            exit 1
+        *)
+            print "Invalid profile number $install_profile_number, must be 1-11"
+            remove_pid_and_exit_in_error
             ;;
     esac
     common_post_install

From c4a613cbf333157e02492230d7daf2fcc46fb5e8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 20 Oct 2011 18:28:18 +0800
Subject: [PATCH 0108/2585] - the install_munin_node function called from
 common_post_install now   prompts the user for the IP of the monitoring
 server (if the profile   is not monitoring of course!) or, if run in FAI
 mode, reads the new   settings:

      fai_monitoring_server_install
      fai_monitoring_server_ip

  If set/passed, this IP is then used in the node configuration to
  grant access to that nodes data (from the monitoring server).
- added parameters to install_web_server so that it can be used by
  multiple profiles: cache server,  monitoring server and both
  (i.e. currently three).
- fixed bug in the RMI hub install profile
- added method get_ip(host_name)
- added method get_perl_escaped(string), needed because of Munin's
  dependency of Perl and some short coming in one of its default
  libraries.
---
 usr/sbin/ece-install | 145 ++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 131 insertions(+), 14 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 1a9ec57e..13d17b89 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -1240,7 +1240,7 @@ EOF
     w | cut -d' ' -f7 | sort | uniq | while read l; do
         if [ $(echo $l | wc -c) -gt 8 ]; then
     cat >> /etc/varnish/default.vcl <<EOF
-  # The host which conducted the ece-install"
+  # The host which conducted the ece-install
   "${l}";
 EOF
         fi
@@ -1833,7 +1833,7 @@ function install_rmi_hub()
         "rmi://${hub_host}:1099/hub/Hub" \
         $file
 
-    cat > common/io/api/EventManager.properties <<EOF
+    cat > $common_nursery_dir/io/api/EventManager.properties <<EOF
 clientConfiguration=/neo/io/services/HubConnection
 pingTime=10000
 EOF
@@ -2007,7 +2007,7 @@ function install_all_in_one_environment()
     install_database_server
     install_ece_instance "dev1" 0
     install_cache_server
-    install_web_server
+    install_web_server 2
     install_munin_gatherer
     set_up_solr
 
@@ -2015,6 +2015,11 @@ function install_all_in_one_environment()
     create_publication
 }
 
+# parameters:
+# $1 - what kind of webserver. Available options are:
+#      * 0 - cache server
+#      * 1 - monitoring server
+#      * 2 - both cache & monitoring server
 function install_web_server()
 {
     print "Installing a web server on $HOSTNAME ..."
@@ -2029,10 +2034,42 @@ function install_web_server()
     
     file=/etc/nginx/sites-available/default
     run mv $file $file.orig
-    cat > $file <<EOF
+
+    if [ $1 -eq 0 ]; then
+        port=81
+        cat > $file <<EOF
+server {
+  listen ${port} default;
+  access_log  /var/log/nginx/localhost.access.log;
+
+  # Typical endpoint for Adactus/Mobilize to get the videos to
+  # transcode.
+  location /binary {
+    root /var/lib/escenic;
+    index index.html;
+  }
+}
+EOF
+    elif [ $1 -eq 1 ]; then
+        port=80
+        cat > $file <<EOF
 server {
-  listen 81 default;
+  listen ${port} default;
   access_log  /var/log/nginx/localhost.access.log;
+
+  location / {
+    root /var/cache/munin/www;
+    index index.html;
+  }
+}
+EOF
+    elif [ $1 -eq 3 ]; then
+        port=81
+        cat > $file <<EOF
+server {
+  listen ${port} default;
+  access_log  /var/log/nginx/localhost.access.log;
+
   location / {
     root /var/cache/munin/www;
     index index.html;
@@ -2046,11 +2083,18 @@ server {
   }
 }
 EOF
+    fi
+    
     /etc/init.d/nginx restart 1>>$log 2>>$log
 
-    add_next_step "Web server is install on http://${HOSTNAME}:81/"
-    add_next_step "http://${HOSTNAME}:81/ gives you the munin interface"
-    add_next_step "http://${HOSTNAME}:81/binary gives you the Adactus endpoint"
+    if [ $1 -eq 0 ]; then
+        add_next_step "http://${HOSTNAME}:${port}/binary gives the Adactus endpoint"
+    elif [ $1 -eq 1 ]; then
+        add_next_step "http://${HOSTNAME}:${port}/ gives the Munin interface"
+    elif [ $2 -eq 1 ]; then
+        add_next_step "http://${HOSTNAME}:${port}/       gives the Munin interface"
+        add_next_step "http://${HOSTNAME}:${port}/binary gives the Adactus endpoint"
+    fi
 }
 
 function install_munin_gatherer()
@@ -2080,17 +2124,77 @@ function install_munin_gatherer()
         node_list=$(get_conf_value fai_munin_node_list)
     fi
     
+    if [ -z "$node_list" ]; then
+        return
+    fi
+
+    for el in $node_list; do
+        print "Adding ${el} to the Muning gatherer on ${HOSTNAME} ..."
+        file=/etc/munin/munin-conf.d/escenic.conf
+        cat >> $file <<EOF
+[${el}]
+    address $(get_ip $el)
+    use_node_name yes
+EOF
+    done
+
+    add_next_step "Munin gatherer installed on $HOSTNAME."
+    add_next_step "Make sure all nodes allows my IP to connect to them."
+}
+
+# will return the IP of the host name. If not found, the host name
+# passed to the function will be returned.
+# parameters: $1 the host name
+function get_ip()
+{
+    ip=$(ping -c 1 $1 2>/dev/null | \
+        grep "bytes from" | \
+        cut -d'(' -f2 | \
+        cut -d ')' -f1)
     
-    # TODO has a hard dependency on install_web_server, should perhaps
-    # be called from this one?
+    if [ -z "$ip" ]; then
+        echo $1
+    fi
 
-    add_next_step "Munin interface is available at http://$HOSTNAME:81/"
+    echo $ip
+}
+
+# munin nodes need the IP of the munin gatherer to be escaped. Hence this function.
+# $parameters:
+# $1 : the IP
+function get_perl_escaped()
+{
+    local escaped_input=$(
+        echo $1 | sed 's/\./\\./g'
+    )
+    echo "^${escaped_input}$"
 }
 
 function install_munin_node()
 {
     print "Installing a Munin node on $HOSTNAME ..."
 
+    # the IP of the monitoring server
+    local default_ip=127.0.0.1
+    if [ $fai_enabled -eq 1 ]; then
+        if [ -n "fai_monitoring_server_ip" ]; then
+            monitoring_server_ip=${fai_monitoring_server_ip}
+        fi
+    elif [ $install_profile_number -ne $PROFILE_MONITORING_SERVER ]; then
+        print "What is the IP of your monitoring server? If you don't know"
+        print "this, don't worry and just press ENTER"
+        echo -n "Your choice [${default_ip}]> "
+        read user_monitoring_server
+
+        if [ -n "$user_monitoring_server" ]; then
+            monitoring_server_ip=$user_monitoring_server
+        fi
+    fi
+
+    if [ -z "$monitoring_server_ip" ]; then
+        monitoring_server_ip=$default_ip
+    fi
+    
     if [ $on_debian_or_derivative -eq 1 ]; then
         packages="munin-node munin-plugins-extra munin-java-plugins"
         install_packages_if_missing $packages
@@ -2100,6 +2204,17 @@ function install_munin_node()
         return
     fi
 
+    if [ -n "$monitoring_server_ip" ]; then
+        escaped_munin_gather_ip=$(get_perl_escaped ${monitoring_server_ip})
+        file=/etc/munin/munin-node.conf
+        cat >> $file <<EOF
+
+# added by ece-install $(date)
+allow ${escaped_munin_gather_ip}
+EOF
+    fi
+    
+
     # install the escenic_jstat munin plugin
     file=/usr/share/munin/plugins/escenic_jstat_
     run wget \
@@ -2415,7 +2530,7 @@ if [ $fai_enabled -eq 1 ]; then
     elif [ $(get_boolean_conf_value fai_cache_install) -eq 1 ]; then
         install_profile_number=$PROFILE_CACHE_SERVER
         install_cache_server
-        install_web_server
+        install_web_server 0
     elif [ $(get_boolean_conf_value fai_rmi_install) -eq 1 ]; then
         install_profile_number=$PROFILE_RMI_HUB
         install_rmi_hub
@@ -2428,9 +2543,10 @@ if [ $fai_enabled -eq 1 ]; then
     elif [ $(get_boolean_conf_value fai_publication_create) -eq 1 ]; then
         install_profile_number=$PROFILE_CREATE_PUBLICATION
         create_publication
-    elif [ $(get_boolean_conf_value fai_munin_gatherer_create) -eq 1 ]; then
+    elif [ $(get_boolean_conf_value fai_monitoring_install) -eq 1 ]; then
         install_profile_number=$PROFILE_MONITORING_SERVER
         install_munin_gatherer
+        install_web_server 1
     elif [ $(get_boolean_conf_value fai_restore_from_backup) -eq 1 ]; then
         install_profile_number=$PROFILE_RESTORE_FROM_BACKUP
         restore_from_backup
@@ -2451,7 +2567,7 @@ else
         ;;
         $PROFILE_CACHE_SERVER)
         install_cache_server
-        install_web_server
+        install_web_server 0
         ;;
         $PROFILE_DB_SERVER)
         install_database_server
@@ -2476,6 +2592,7 @@ else
         ;;
         $PROFILE_MONITORING_SERVER)
         install_munin_gatherer
+        install_web_server 1
         ;;
         $PROFILE_RESTORE_FROM_BACKUP)
         restore_from_backup

From 308bda6aa623fac4f5d9bb84cf42ddbf11a97da9 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 20 Oct 2011 18:32:32 +0800
Subject: [PATCH 0109/2585] - updated guide to include the FAI options of the
 monitoring server

---
 usr/share/doc/escenic/ece-install-guide.org | 106 ++++++++++++--------
 1 file changed, 66 insertions(+), 40 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 1aad0602..d094fd63 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -194,7 +194,7 @@ this, the script will make a call to drop-and-create-ecedb in the same
 directory as the ece-intall script itself.
 
 The script will fail by itself if the DB already exists:
-#+BEGIN_SRC sh
+#+BEGIN_SRC conf
 [ece-install] Setting up the ECE database schema ...
 ERROR 1007 (HY000) at line 1: Can't create database 'ece5db'; database exists
 ERROR 1050 (42S01) at line 2: Table 'DBChangeLog' already exists
@@ -258,8 +258,8 @@ This installation profile will base the publication on the Widget
 Framework if its present on the system, if not, ECE's clean demo WAR
 is used as a basis.  
 ** Profile - Monitoring Server
-This will install a Munin gatherer and make its interface available 
-when accesssing the web server directly (port 81).
+This will install a Munin gatherer and web server. The latter for
+accessing the reports generated by the former.
 
 TBD: This profile will also install the Nagios interface for
 monitoring the different nodes. 
@@ -276,34 +276,36 @@ fai_editor_install
 The ece-install script understands for the following settings in the
 $HOME/.ece-install.conf file of the root user:
 
-|---------------------------------+------------------+-----------------------------------------------|
-| Parameter                       |          Default | Description                                   |
-|---------------------------------+------------------+-----------------------------------------------|
-| fai\_all\_install               |                0 | Install all components on your server.        |
-| fai\_cache\_install             |                0 | Install cache server profile                  |
-| fai\_cache\_backends            | ${HOSTNAME}:8080 | Space separated, e.g. "app1:8080 app2:8080"   |
-| fai\_db\_install                |                0 | Install db profile                            |
-| fai\_db\_host                   |        $HOSTNAME | Useful for editor & presentation profiles     |
-| fai\_db\_port                   |             3306 | Useful for editor & presentation profiles     |
-| fai\_editor\_install            |                0 | Install the editorial profile                 |
-| fai\_editor\_name               |          editor1 | Name of the editor instance                   |
-| fai\_editor\_port               |             8080 | HTTP port of the editor instance              |
-| fai\_editor\_shutdown           |             8005 | Shutdown port of the editor instance          |
-| fai\_enabled                    |                0 | Whether or not to run ece-install in FAI mode |
-| fai\_public\_host\_name         | ${HOSTNAME}:8080 | The public address for your website           |
-| fai\_presentation\_install      |                0 | Install the presentation server profile       |
-| fai\_presentation\_name         |             web1 | Name of the presentation server instance      |
-| fai\_presentation\_port         |             8080 | HTTP port of the presentation server instance |
-| fai\_presentation\_shutdown     |             8005 | Shutdown port of the presentation instance    |
-| fai\_publication\_create        |                0 | Create a new publication                      |
-| fai\_publication\_name          |            mypub | Name of the publication                       |
-| fai\_publication\_use\_instance |             dev1 | Name of local instance to use for creation    |
-| fai\_rmi\_install               |                0 | Install RMI hub profile                       |
-| fai\_search\_name               |          search1 | Name of the search instance                   |
-| fai\_search\_port               |             8080 | HTTP port of the search instance              |
-| fai\_search\_shutdown           |             8005 | Shutdown port of the search instance          |
-| fai\_wf\_install                |                0 | Install Widget Framework profile              |
-|---------------------------------+------------------+-----------------------------------------------|
+|----------------------------------+------------------+-----------------------------------------------|
+| Parameter                        |          Default | Description                                   |
+|----------------------------------+------------------+-----------------------------------------------|
+| fai\_all\_install                |                0 | Install all components on your server.        |
+| fai\_cache\_install              |                0 | Install cache server profile                  |
+| fai\_cache\_backends             | ${HOSTNAME}:8080 | Space separated, e.g. "app1:8080 app2:8080"   |
+| fai\_db\_install                 |                0 | Install db profile                            |
+| fai\_db\_host                    |        $HOSTNAME | Useful for editor & presentation profiles     |
+| fai\_db\_port                    |             3306 | Useful for editor & presentation profiles     |
+| fai\_editor\_install             |                0 | Install the editorial profile                 |
+| fai\_editor\_name                |          editor1 | Name of the editor instance                   |
+| fai\_editor\_port                |             8080 | HTTP port of the editor instance              |
+| fai\_editor\_shutdown            |             8005 | Shutdown port of the editor instance          |
+| fai\_enabled                     |                0 | Whether or not to run ece-install in FAI mode |
+| fai\_public\_host\_name          | ${HOSTNAME}:8080 | The public address for your website           |
+| fai\_presentation\_install       |                0 | Install the presentation server profile       |
+| fai\_monitoring\_server\_install |                0 | Install the monitoring server profile.        |
+| fai\_monitoring\_server\_ip      |        127.0.0.1 | The IP of the monitoring server.              |
+| fai\_presentation\_name          |             web1 | Name of the presentation server instance      |
+| fai\_presentation\_port          |             8080 | HTTP port of the presentation server instance |
+| fai\_presentation\_shutdown      |             8005 | Shutdown port of the presentation instance    |
+| fai\_publication\_create         |                0 | Create a new publication                      |
+| fai\_publication\_name           |            mypub | Name of the publication                       |
+| fai\_publication\_use\_instance  |             dev1 | Name of local instance to use for creation    |
+| fai\_rmi\_install                |                0 | Install RMI hub profile                       |
+| fai\_search\_name                |          search1 | Name of the search instance                   |
+| fai\_search\_port                |             8080 | HTTP port of the search instance              |
+| fai\_search\_shutdown            |             8005 | Shutdown port of the search instance          |
+| fai\_wf\_install                 |                0 | Install Widget Framework profile              |
+|----------------------------------+------------------+-----------------------------------------------|
 
 As you've probably have guessed, 0 means "false" and 1 means "true" :-)
 
@@ -473,15 +475,14 @@ what's available on the host where it's run):
 - Escenic software
 
 ** Running interactively
-The ece script will put backups in 
-#+BEGIN_SRC sh
-/var/backups/escenic
+*** Start ece-install and choose the Option, "Restore from backup"
+#+BEGIN_SRC text
+# ece-install
 #+END_SRC
-and the ece-install script will hence expect to find them here (when
-running interactively), asking you from which one you wish to restore
-the system:
 
-#+BEGIN_SRC sh
+*** Select Which Backup to Restore
+
+#+BEGIN_SRC text
 [ece-install-5] From which dataset do you wish to backup?
     1 - engine-dev1-backup-2011-10-10.tar.gz
     2 - engine-dev1-backup-2011-10-11.tar.gz
@@ -489,6 +490,31 @@ the system:
 Your choice [1]>
 #+END_SRC
 
+The ece script mentioned above will create backups in
+#+BEGIN_SRC sh
+/var/backups/escenic
+#+END_SRC
+and the ece-install script will hence expect to find them here.
+
+*** Choose What to Restore
+#+BEGIN_SRC text
+[ece-install-12] Which part of the system do you wish to restore?
+    1 - The database
+    2 - The Solr and ECE data files (multimedia archive)
+    3 - The ECE configuration files
+    4 - The Escenic and Tomcat software binaries + publication templates
+Your choice [1]> 2
+#+END_SRC
+
+*** Sit Back and Watch ece-install Restore the Data for You
+#+BEGIN_SRC text
+[ece-install-13] Restoring the Solr & ECE data files on ubiquitous ...
+[ece-install-21] - The installation is now complete! It took 0d 0h 0m 20s
+[ece-install] Successfully restored Solr & ECE data files
+[ece-install] from backup:  engine-dev1-backup-2011-10-12.tar.gz
+[ece-install] Check /var/lib/escenic to verify they're all there
+#+END_SRC
+
 ** Running in FAI mode
 If you're running in FAI mode, you can choose between these settings
 to decide what to restore and where to find the backup file to
@@ -507,7 +533,7 @@ restore from:
 
 For example, to restore everything possible from a given tarball, you
 need this in your .ece-install.conf:
-#+BEGIN_SRC sh
+#+BEGIN_SRC conf
 fai_enabled=1
 
 fai_restore_from_backup=1
@@ -525,7 +551,7 @@ responsibility always lies with you as the user.
 
 If you're trying to restore the DB and the ECE schema already exists,
 the restore will fail:
-#+BEGIN_SRC sh
+#+BEGIN_SRC text
 [ece-install-8] Restoring the database contents on ubiquitous ...
 [ece-install-24] Selecting the most recent database dump ece5db-2011-10-10.sql.gz
 ERROR 1007 (HY000) at line 1: Can't create database 'ece5db'; database exists

From 0b8e2a850ebb27aed006a473f6cd84626e8107e5 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 20 Oct 2011 18:33:18 +0800
Subject: [PATCH 0110/2585] - updated HTML and TEXT versions of the guide

---
 usr/share/doc/escenic/ece-install-guide.html | 115 ++++++++++++---
 usr/share/doc/escenic/ece-install-guide.txt  | 145 +++++++++++++------
 2 files changed, 191 insertions(+), 69 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.html b/usr/share/doc/escenic/ece-install-guide.html
index 06c41428..a87f6504 100644
--- a/usr/share/doc/escenic/ece-install-guide.html
+++ b/usr/share/doc/escenic/ece-install-guide.html
@@ -7,7 +7,7 @@
 <title>Welcome to the /usr/sbin/ece-install Guide</title>
 <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
 <meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2011-10-11 19:04:29 CST"/>
+<meta name="generated" content="2011-10-20 18:33:00 CST"/>
 <meta name="author" content="Torstein Krause Johansen"/>
 <meta name="description" content=""/>
 <meta name="keywords" content=""/>
@@ -284,7 +284,14 @@ <h2>Table of Contents</h2>
 <li><a href="#sec-12">12 Example Output FAI </a></li>
 <li><a href="#sec-13">13 Restoring from backup </a>
 <ul>
-<li><a href="#sec-13-1">13.1 Running interactively </a></li>
+<li><a href="#sec-13-1">13.1 Running interactively </a>
+<ul>
+<li><a href="#sec-13-1-1">13.1.1 Start ece-install and choose the Option, "Restore from backup" </a></li>
+<li><a href="#sec-13-1-2">13.1.2 Select Which Backup to Restore </a></li>
+<li><a href="#sec-13-1-3">13.1.3 Choose What to Restore </a></li>
+<li><a href="#sec-13-1-4">13.1.4 Sit Back and Watch ece-install Restore the Data for You </a></li>
+</ul>
+</li>
 <li><a href="#sec-13-2">13.2 Running in FAI mode </a></li>
 <li><a href="#sec-13-3">13.3 Data security </a></li>
 </ul>
@@ -686,8 +693,8 @@ <h3 id="sec-5-6"><span class="section-number-3">5.6</span> Profile - Database Se
 </p>
 
 
-<pre class="src src-sh">[ece-install] Setting up the ECE database schema ...
-ERROR 1007 (HY000) at line 1: Can<span style="color: #8b2252;">'t create database '</span>ece5db<span style="color: #8b2252;">'; database exists</span>
+<pre class="src src-conf">[<span style="color: #228b22;">ece-install</span>] Setting up the ECE database schema ...
+<span style="color: #a0522d;">ERROR 1007 (HY000) at line 1</span>: Can<span style="color: #8b2252;">'t create database '</span>ece5db<span style="color: #8b2252;">'; database exists</span>
 <span style="color: #8b2252;">ERROR 1050 (42S01) at line 2: Table '</span>DBChangeLog<span style="color: #8b2252;">' already exists</span>
 <span style="color: #8b2252;">[ece-install] running tables FAILED, exiting :-(</span>
 </pre>
@@ -801,8 +808,8 @@ <h3 id="sec-5-9"><span class="section-number-3">5.9</span> Profile - Create Publ
 <h3 id="sec-5-10"><span class="section-number-3">5.10</span> Profile - Monitoring Server </h3>
 <div class="outline-text-3" id="text-5-10">
 
-<p>This will install a Munin gatherer and make its interface available 
-when accesssing the web server directly (port 81).
+<p>This will install a Munin gatherer and web server. The latter for
+accessing the reports generated by the former.
 </p>
 <p>
 TBD: This profile will also install the Nagios interface for
@@ -858,6 +865,8 @@ <h3 id="sec-6-1"><span class="section-number-3">6.1</span> Overview of All FAI P
 <tr><td class="left">fai_enabled</td><td class="right">0</td><td class="left">Whether or not to run ece-install in FAI mode</td></tr>
 <tr><td class="left">fai_public_host_name</td><td class="right">${HOSTNAME}:8080</td><td class="left">The public address for your website</td></tr>
 <tr><td class="left">fai_presentation_install</td><td class="right">0</td><td class="left">Install the presentation server profile</td></tr>
+<tr><td class="left">fai_monitoring_server_install</td><td class="right">0</td><td class="left">Install the monitoring server profile.</td></tr>
+<tr><td class="left">fai_monitoring_server_ip</td><td class="right">127.0.0.1</td><td class="left">The IP of the monitoring server.</td></tr>
 <tr><td class="left">fai_presentation_name</td><td class="right">web1</td><td class="left">Name of the presentation server instance</td></tr>
 <tr><td class="left">fai_presentation_port</td><td class="right">8080</td><td class="left">HTTP port of the presentation server instance</td></tr>
 <tr><td class="left">fai_presentation_shutdown</td><td class="right">8005</td><td class="left">Shutdown port of the presentation instance</td></tr>
@@ -1184,22 +1193,33 @@ <h2 id="sec-13"><span class="section-number-2">13</span> Restoring from backup <
 <h3 id="sec-13-1"><span class="section-number-3">13.1</span> Running interactively </h3>
 <div class="outline-text-3" id="text-13-1">
 
-<p>The ece script will put backups in 
-</p>
 
+</div>
 
-<pre class="src src-sh">/var/backups/escenic
+<div id="outline-container-13-1-1" class="outline-4">
+<h4 id="sec-13-1-1"><span class="section-number-4">13.1.1</span> Start ece-install and choose the Option, "Restore from backup" </h4>
+<div class="outline-text-4" id="text-13-1-1">
+
+
+
+
+<pre class="src src-text"># ece-install
 </pre>
 
-<p>
-and the ece-install script will hence expect to find them here (when
-running interactively), asking you from which one you wish to restore
-the system:
-</p>
+
+</div>
+
+</div>
+
+<div id="outline-container-13-1-2" class="outline-4">
+<h4 id="sec-13-1-2"><span class="section-number-4">13.1.2</span> Select Which Backup to Restore </h4>
+<div class="outline-text-4" id="text-13-1-2">
 
 
 
-<pre class="src src-sh">[ece-install-5] From which dataset do you wish to backup?
+
+
+<pre class="src src-text">[ece-install-5] From which dataset do you wish to backup?
     1 - engine-dev1-backup-2011-10-10.tar.gz
     2 - engine-dev1-backup-2011-10-11.tar.gz
 [ece-install-5] Enter the number next to the tarball, from 1 to 2
@@ -1207,6 +1227,57 @@ <h3 id="sec-13-1"><span class="section-number-3">13.1</span> Running interactive
 </pre>
 
 
+<p>
+The ece script mentioned above will create backups in
+</p>
+
+
+<pre class="src src-sh">/var/backups/escenic
+</pre>
+
+<p>
+and the ece-install script will hence expect to find them here.
+</p>
+</div>
+
+</div>
+
+<div id="outline-container-13-1-3" class="outline-4">
+<h4 id="sec-13-1-3"><span class="section-number-4">13.1.3</span> Choose What to Restore </h4>
+<div class="outline-text-4" id="text-13-1-3">
+
+
+
+
+<pre class="src src-text">[ece-install-12] Which part of the system do you wish to restore?
+    1 - The database
+    2 - The Solr and ECE data files (multimedia archive)
+    3 - The ECE configuration files
+    4 - The Escenic and Tomcat software binaries + publication templates
+Your choice [1]&gt; 2
+</pre>
+
+
+</div>
+
+</div>
+
+<div id="outline-container-13-1-4" class="outline-4">
+<h4 id="sec-13-1-4"><span class="section-number-4">13.1.4</span> Sit Back and Watch ece-install Restore the Data for You </h4>
+<div class="outline-text-4" id="text-13-1-4">
+
+
+
+
+<pre class="src src-text">[ece-install-13] Restoring the Solr &amp; ECE data files on ubiquitous ...
+[ece-install-21] - The installation is now complete! It took 0d 0h 0m 20s
+[ece-install] Successfully restored Solr &amp; ECE data files
+[ece-install] from backup:  engine-dev1-backup-2011-10-12.tar.gz
+[ece-install] Check /var/lib/escenic to verify they're all there
+</pre>
+
+
+</div>
 </div>
 
 </div>
@@ -1243,7 +1314,7 @@ <h3 id="sec-13-2"><span class="section-number-3">13.2</span> Running in FAI mode
 </p>
 
 
-<pre class="src src-sh"><span style="color: #a0522d;">fai_enabled</span>=1
+<pre class="src src-conf"><span style="color: #a0522d;">fai_enabled</span>=1
 
 <span style="color: #a0522d;">fai_restore_from_backup</span>=1
 <span style="color: #a0522d;">fai_restore_all</span>=1
@@ -1273,12 +1344,12 @@ <h3 id="sec-13-3"><span class="section-number-3">13.3</span> Data security </h3>
 </p>
 
 
-<pre class="src src-sh">[ece-install-8] Restoring the database contents on ubiquitous ...
+<pre class="src src-text">[ece-install-8] Restoring the database contents on ubiquitous ...
 [ece-install-24] Selecting the most recent database dump ece5db-2011-10-10.sql.gz
-ERROR 1007 (HY000) at line 1: Can<span style="color: #8b2252;">'t create database '</span>ece5db<span style="color: #8b2252;">'; database exists</span>
-<span style="color: #8b2252;">ERROR 1050 (42S01) at line 25: Table '</span><span style="color: #ff00ff;">`ece5db`</span><span style="color: #7a378b;">.</span><span style="color: #ff00ff;">`AccessControlList`</span><span style="color: #8b2252;">' already exists</span>
-<span style="color: #8b2252;">[ece-install-24] The command [restoring from var/backups/escenic/ece5db-2011-10-10.sql.gz] FAILED, exiting :-(</span>
-<span style="color: #8b2252;">[ece-install-24] See /var/log/ece-install.log for further details.</span>
+ERROR 1007 (HY000) at line 1: Can't create database 'ece5db'; database exists
+ERROR 1050 (42S01) at line 25: Table '`ece5db`.`AccessControlList`' already exists
+[ece-install-24] The command [restoring from var/backups/escenic/ece5db-2011-10-10.sql.gz] FAILED, exiting :-(
+[ece-install-24] See /var/log/ece-install.log for further details.
 </pre>
 
 </div>
@@ -1290,7 +1361,7 @@ <h3 id="sec-13-3"><span class="section-number-3">13.3</span> Data security </h3>
 <hr/>
 <p class="author">
   Author: Torstein Krause Johansen (<a href="mailto:tkj@vizrt.com">tkj@vizrt.com</a>)
-  Date: 2011-10-11 19:04:29 CST
+  Date: 2011-10-20 18:33:00 CST
 </p>
 </div>
 </body>
diff --git a/usr/share/doc/escenic/ece-install-guide.txt b/usr/share/doc/escenic/ece-install-guide.txt
index 06d7190e..2e955d8f 100644
--- a/usr/share/doc/escenic/ece-install-guide.txt
+++ b/usr/share/doc/escenic/ece-install-guide.txt
@@ -2,7 +2,7 @@
               ==========================================
 
 Author: Torstein Krause Johansen
-Date: 2011-10-11 18:38:25 CST
+Date: 2011-10-20 18:33:13 CST
 
 
 Table of Contents
@@ -45,10 +45,13 @@ Table of Contents
 11 Uninstalling Everything That the ece-install Set Up 
 12 Example Output FAI 
 13 Restoring from backup 
-    13.1 Location of the backup file 
-        13.1.1 Running interactively 
-        13.1.2 Running in FAI mode 
-    13.2 Data security 
+    13.1 Running interactively 
+        13.1.1 Start ece-install and choose the Option, "Restore from backup" 
+        13.1.2 Select Which Backup to Restore 
+        13.1.3 Choose What to Restore 
+        13.1.4 Sit Back and Watch ece-install Restore the Data for You 
+    13.2 Running in FAI mode 
+    13.3 Data security 
 
 
 1 Supported Operating Systems 
@@ -352,8 +355,8 @@ is used as a basis.
 
 5.10 Profile - Monitoring Server 
 =================================
-This will install a Munin gatherer and make its interface available 
-when accesssing the web server directly (port 81).
+This will install a Munin gatherer and web server. The latter for
+accessing the reports generated by the former.
 
 TBD: This profile will also install the Nagios interface for
 monitoring the different nodes. 
@@ -373,32 +376,34 @@ the parameters with "install" in their name, such as:
 The ece-install script understands for the following settings in the
 $HOME/.ece-install.conf file of the root user:
 
-  Parameter                                  Default   Description                                    
- ---------------------------------+------------------+-----------------------------------------------
-  fai\_all\_install                                0   Install all components on your server.         
-  fai\_cache\_install                              0   Install cache server profile                   
-  fai\_cache\_backends              ${HOSTNAME}:8080   Space separated, e.g. "app1:8080 app2:8080"    
-  fai\_db\_install                                 0   Install db profile                             
-  fai\_db\_host                            $HOSTNAME   Useful for editor & presentation profiles      
-  fai\_db\_port                                 3306   Useful for editor & presentation profiles      
-  fai\_editor\_install                             0   Install the editorial profile                  
-  fai\_editor\_name                          editor1   Name of the editor instance                    
-  fai\_editor\_port                             8080   HTTP port of the editor instance               
-  fai\_editor\_shutdown                         8005   Shutdown port of the editor instance           
-  fai\_enabled                                     0   Whether or not to run ece-install in FAI mode  
-  fai\_public\_host\_name           ${HOSTNAME}:8080   The public address for your website            
-  fai\_presentation\_install                       0   Install the presentation server profile        
-  fai\_presentation\_name                       web1   Name of the presentation server instance       
-  fai\_presentation\_port                       8080   HTTP port of the presentation server instance  
-  fai\_presentation\_shutdown                   8005   Shutdown port of the presentation instance     
-  fai\_publication\_create                         0   Create a new publication                       
-  fai\_publication\_name                       mypub   Name of the publication                        
-  fai\_publication\_use\_instance               dev1   Name of local instance to use for creation     
-  fai\_rmi\_install                                0   Install RMI hub profile                        
-  fai\_search\_name                          search1   Name of the search instance                    
-  fai\_search\_port                             8080   HTTP port of the search instance               
-  fai\_search\_shutdown                         8005   Shutdown port of the search instance           
-  fai\_wf\_install                                 0   Install Widget Framework profile               
+  Parameter                                   Default   Description                                    
+ ----------------------------------+------------------+-----------------------------------------------
+  fai\_all\_install                                 0   Install all components on your server.         
+  fai\_cache\_install                               0   Install cache server profile                   
+  fai\_cache\_backends               ${HOSTNAME}:8080   Space separated, e.g. "app1:8080 app2:8080"    
+  fai\_db\_install                                  0   Install db profile                             
+  fai\_db\_host                             $HOSTNAME   Useful for editor & presentation profiles      
+  fai\_db\_port                                  3306   Useful for editor & presentation profiles      
+  fai\_editor\_install                              0   Install the editorial profile                  
+  fai\_editor\_name                           editor1   Name of the editor instance                    
+  fai\_editor\_port                              8080   HTTP port of the editor instance               
+  fai\_editor\_shutdown                          8005   Shutdown port of the editor instance           
+  fai\_enabled                                      0   Whether or not to run ece-install in FAI mode  
+  fai\_public\_host\_name            ${HOSTNAME}:8080   The public address for your website            
+  fai\_presentation\_install                        0   Install the presentation server profile        
+  fai\_monitoring\_server\_install                  0   Install the monitoring server profile.         
+  fai\_monitoring\_server\_ip               127.0.0.1   The IP of the monitoring server.               
+  fai\_presentation\_name                        web1   Name of the presentation server instance       
+  fai\_presentation\_port                        8080   HTTP port of the presentation server instance  
+  fai\_presentation\_shutdown                    8005   Shutdown port of the presentation instance     
+  fai\_publication\_create                          0   Create a new publication                       
+  fai\_publication\_name                        mypub   Name of the publication                        
+  fai\_publication\_use\_instance                dev1   Name of local instance to use for creation     
+  fai\_rmi\_install                                 0   Install RMI hub profile                        
+  fai\_search\_name                           search1   Name of the search instance                    
+  fai\_search\_port                              8080   HTTP port of the search instance               
+  fai\_search\_shutdown                          8005   Shutdown port of the search instance           
+  fai\_wf\_install                                  0   Install Widget Framework profile               
 
 As you've probably have guessed, 0 means "false" and 1 means "true" :-)
 
@@ -587,19 +592,18 @@ what's available on the host where it's run):
 - ECE, cache and web server configuration
 - Escenic software
 
-13.1 Location of the backup file 
-=================================
+13.1 Running interactively 
+===========================
 
-13.1.1 Running interactively 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The ece script will put backups in 
+13.1.1 Start ece-install and choose the Option, "Restore from backup" 
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 
-  /var/backups/escenic
+  # ece-install
+
 
-and the ece-install script will hence expect to find them here (when
-running interactively), asking you from which one you wish to restore
-the system:
+13.1.2 Select Which Backup to Restore 
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 
 
@@ -610,16 +614,63 @@ the system:
   Your choice [1]>
 
 
-13.1.2 Running in FAI mode 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-If you're running in FAI mode, you specify the file to restore from
-with:
+The ece script mentioned above will create backups in
+
+
+  /var/backups/escenic
+
+and the ece-install script will hence expect to find them here.
+
+13.1.3 Choose What to Restore 
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 
+  [ece-install-12] Which part of the system do you wish to restore?
+      1 - The database
+      2 - The Solr and ECE data files (multimedia archive)
+      3 - The ECE configuration files
+      4 - The Escenic and Tomcat software binaries + publication templates
+  Your choice [1]> 2
 
+
+13.1.4 Sit Back and Watch ece-install Restore the Data for You 
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+  [ece-install-13] Restoring the Solr & ECE data files on ubiquitous ...
+  [ece-install-21] - The installation is now complete! It took 0d 0h 0m 20s
+  [ece-install] Successfully restored Solr & ECE data files
+  [ece-install] from backup:  engine-dev1-backup-2011-10-12.tar.gz
+  [ece-install] Check /var/lib/escenic to verify they're all there
+
+
+13.2 Running in FAI mode 
+=========================
+If you're running in FAI mode, you can choose between these settings
+to decide what to restore and where to find the backup file to
+restore from:
+
+  Parameter                          Default   Description                                         
+ ----------------------------------+---------+----------------------------------------------------
+  fai\_restore\_all                        0   Restore everything found in the backup file         
+  fai\_restore\_db                         0   Install the DB server & restore its contents        
+  fai\_restore\_data\_files                0   Restore the Solr & ECE data files                   
+  fai\_restore\_configuration              0   Restore the Solr & ECE configuration files          
+  fai\_restore\_software\_binaries         0   Restore the Escenic and Apache Tomcat software      
+  fai\_restore\_from\_file                ""   The .tar.gz produced by "ece -i <instance> backup"  
+
+For example, to restore everything possible from a given tarball, you
+need this in your .ece-install.conf:
+
+
+  fai_enabled=1
+  
+  fai_restore_from_backup=1
+  fai_restore_all=1
   fai_restore_from_file=/var/backups/escenic/engine-dev1-backup-2011-10-10.tar.gz
 
 
-13.2 Data security 
+13.3 Data security 
 ===================
 You should take heed when running restore, so that you're not
 restoring a system which you didn't want to change (yes, this mishap

From 45e15abdc8c24b41ded4c50365c07349af312b00 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 20 Oct 2011 18:37:29 +0800
Subject: [PATCH 0111/2585] - moved restore profile description to where the
 other profile   descriptions are - updated the start up screen for
 ece-install - updated generate .txt and .html version

---
 usr/share/doc/escenic/ece-install-guide.html | 459 +++++++++----------
 usr/share/doc/escenic/ece-install-guide.org  | 230 +++++-----
 usr/share/doc/escenic/ece-install-guide.txt  | 276 ++++++-----
 3 files changed, 475 insertions(+), 490 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.html b/usr/share/doc/escenic/ece-install-guide.html
index a87f6504..feb244ab 100644
--- a/usr/share/doc/escenic/ece-install-guide.html
+++ b/usr/share/doc/escenic/ece-install-guide.html
@@ -7,7 +7,7 @@
 <title>Welcome to the /usr/sbin/ece-install Guide</title>
 <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
 <meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2011-10-20 18:33:00 CST"/>
+<meta name="generated" content="2011-10-20 18:36:20 CST"/>
 <meta name="author" content="Torstein Krause Johansen"/>
 <meta name="description" content=""/>
 <meta name="keywords" content=""/>
@@ -258,6 +258,17 @@ <h2>Table of Contents</h2>
 <li><a href="#sec-5-8">5.8 Profile - Install Widget Framework </a></li>
 <li><a href="#sec-5-9">5.9 Profile - Create Publication </a></li>
 <li><a href="#sec-5-10">5.10 Profile - Monitoring Server </a></li>
+<li><a href="#sec-5-11">5.11 Profile - Restoring from backup </a></li>
+<li><a href="#sec-5-12">5.12 Running interactively </a>
+<ul>
+<li><a href="#sec-5-12-1">5.12.1 Start ece-install and choose the Option, "Restore from backup" </a></li>
+<li><a href="#sec-5-12-2">5.12.2 Select Which Backup to Restore </a></li>
+<li><a href="#sec-5-12-3">5.12.3 Choose What to Restore </a></li>
+<li><a href="#sec-5-12-4">5.12.4 Sit Back and Watch ece-install Restore the Data for You </a></li>
+</ul>
+</li>
+<li><a href="#sec-5-13">5.13 Running in FAI mode </a></li>
+<li><a href="#sec-5-14">5.14 Data security </a></li>
 </ul>
 </li>
 <li><a href="#sec-6">6 Full Automatic Install (FAI) </a>
@@ -282,20 +293,6 @@ <h2>Table of Contents</h2>
 </li>
 <li><a href="#sec-11">11 Uninstalling Everything That the ece-install Set Up </a></li>
 <li><a href="#sec-12">12 Example Output FAI </a></li>
-<li><a href="#sec-13">13 Restoring from backup </a>
-<ul>
-<li><a href="#sec-13-1">13.1 Running interactively </a>
-<ul>
-<li><a href="#sec-13-1-1">13.1.1 Start ece-install and choose the Option, "Restore from backup" </a></li>
-<li><a href="#sec-13-1-2">13.1.2 Select Which Backup to Restore </a></li>
-<li><a href="#sec-13-1-3">13.1.3 Choose What to Restore </a></li>
-<li><a href="#sec-13-1-4">13.1.4 Sit Back and Watch ece-install Restore the Data for You </a></li>
-</ul>
-</li>
-<li><a href="#sec-13-2">13.2 Running in FAI mode </a></li>
-<li><a href="#sec-13-3">13.3 Data security </a></li>
-</ul>
-</li>
 </ul>
 </div>
 </div>
@@ -495,24 +492,20 @@ <h2 id="sec-5"><span class="section-number-2">5</span> Available Server Profiles
 
 <pre class="src src-sh">Hi, which server profile do you wish to install?
 
-Select 1-9 and press ENTER
-
-  1 - All<span style="color: #a020f0;"> in</span> one, the full stack on one host. 
-      Suitable for development and test environments.
-      It will install caching server, ECE, assembly host, database &amp;
-      Widget Framework as well as set up a new publication.
-  2 - Editorial (publication) server.
-      This will install ECE and an assembly host.
-  3 - Presentation server (ECE, memcached)<span style="color: #7a378b;">.</span>
-  4 - Database server.
-  5 - Cache server (cache &amp; web server)<span style="color: #7a378b;">.</span>
-  6 - RMI hub.
-  7 - Standalone search instance (solr + indexer-webapp)<span style="color: #7a378b;">.</span>
-  8 - Install the Widget Framework.
-      (You need user/pass for repo.escenic.com for this)<span style="color: #7a378b;">.</span>
-  9 - Create a new publication.
-      This profile will create new publication based on WF
-      (<span style="color: #a020f0;">if</span> available) or ECE/clean-demo.
+   1 - All<span style="color: #a020f0;"> in</span> one, full stack on one host, suitable for dev &amp; <span style="color: #7a378b;">test</span> environments
+   2 - Editorial (publication) server
+   3 - Presentation server (ECE + memcached)<span style="color: #7a378b;">.</span>
+   4 - Database server
+   5 - Cache server (cache and web server)
+   6 - RMI hub
+   7 - Search server (Solr + indexer-webapp)
+   8 - Install Widget Framework.
+   9 - Create a new publication based on WF if available, ECE/clean-demo if not
+   10 - A monitoring server (web server + Munin gatherer)
+   11 - Restore from backup (DB, data files, binaries, conf &amp; publications)
+
+Select 1-11 and press ENTER
+Your choice [1]&gt; 
 </pre>
 
 
@@ -815,6 +808,205 @@ <h3 id="sec-5-10"><span class="section-number-3">5.10</span> Profile - Monitorin
 TBD: This profile will also install the Nagios interface for
 monitoring the different nodes. 
 </p>
+</div>
+
+</div>
+
+<div id="outline-container-5-11" class="outline-3">
+<h3 id="sec-5-11"><span class="section-number-3">5.11</span> Profile - Restoring from backup </h3>
+<div class="outline-text-3" id="text-5-11">
+
+<p>ece-install can restore from a backup made by the ece script:
+</p>
+
+
+<pre class="src src-sh">$ ece -i &lt;instance&gt; backup
+</pre>
+
+
+<p>
+As stated in the ece guide, this backup may contain (depending on
+what's available on the host where it's run):
+</p><ul>
+<li>database dump of the instance
+</li>
+<li>data files (pictures, video files and so on). This is often referred
+  to as the "multimedia archive" in Escenic literature.
+</li>
+<li>ECE, cache and web server configuration
+</li>
+<li>Escenic software
+</li>
+</ul>
+
+
+</div>
+
+</div>
+
+<div id="outline-container-5-12" class="outline-3">
+<h3 id="sec-5-12"><span class="section-number-3">5.12</span> Running interactively </h3>
+<div class="outline-text-3" id="text-5-12">
+
+
+</div>
+
+<div id="outline-container-5-12-1" class="outline-4">
+<h4 id="sec-5-12-1"><span class="section-number-4">5.12.1</span> Start ece-install and choose the Option, "Restore from backup" </h4>
+<div class="outline-text-4" id="text-5-12-1">
+
+
+
+
+<pre class="src src-text"># ece-install
+</pre>
+
+
+</div>
+
+</div>
+
+<div id="outline-container-5-12-2" class="outline-4">
+<h4 id="sec-5-12-2"><span class="section-number-4">5.12.2</span> Select Which Backup to Restore </h4>
+<div class="outline-text-4" id="text-5-12-2">
+
+
+
+
+
+<pre class="src src-text">[ece-install-5] From which dataset do you wish to backup?
+    1 - engine-dev1-backup-2011-10-10.tar.gz
+    2 - engine-dev1-backup-2011-10-11.tar.gz
+[ece-install-5] Enter the number next to the tarball, from 1 to 2
+Your choice [1]&gt;
+</pre>
+
+
+<p>
+The ece script mentioned above will create backups in
+</p>
+
+
+<pre class="src src-sh">/var/backups/escenic
+</pre>
+
+<p>
+and the ece-install script will hence expect to find them here.
+</p>
+</div>
+
+</div>
+
+<div id="outline-container-5-12-3" class="outline-4">
+<h4 id="sec-5-12-3"><span class="section-number-4">5.12.3</span> Choose What to Restore </h4>
+<div class="outline-text-4" id="text-5-12-3">
+
+
+
+
+<pre class="src src-text">[ece-install-12] Which part of the system do you wish to restore?
+    1 - The database
+    2 - The Solr and ECE data files (multimedia archive)
+    3 - The ECE configuration files
+    4 - The Escenic and Tomcat software binaries + publication templates
+Your choice [1]&gt; 2
+</pre>
+
+
+</div>
+
+</div>
+
+<div id="outline-container-5-12-4" class="outline-4">
+<h4 id="sec-5-12-4"><span class="section-number-4">5.12.4</span> Sit Back and Watch ece-install Restore the Data for You </h4>
+<div class="outline-text-4" id="text-5-12-4">
+
+
+
+
+<pre class="src src-text">[ece-install-13] Restoring the Solr &amp; ECE data files on ubiquitous ...
+[ece-install-21] - The installation is now complete! It took 0d 0h 0m 20s
+[ece-install] Successfully restored Solr &amp; ECE data files
+[ece-install] from backup:  engine-dev1-backup-2011-10-12.tar.gz
+[ece-install] Check /var/lib/escenic to verify they're all there
+</pre>
+
+
+</div>
+</div>
+
+</div>
+
+<div id="outline-container-5-13" class="outline-3">
+<h3 id="sec-5-13"><span class="section-number-3">5.13</span> Running in FAI mode </h3>
+<div class="outline-text-3" id="text-5-13">
+
+<p>If you're running in FAI mode, you can choose between these settings
+to decide what to restore and where to find the backup file to
+restore from:
+</p>
+<table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
+<caption></caption>
+<colgroup><col class="left" /><col class="right" /><col class="left" />
+</colgroup>
+<thead>
+<tr><th scope="col" class="left">Parameter</th><th scope="col" class="right">Default</th><th scope="col" class="left">Description</th></tr>
+</thead>
+<tbody>
+<tr><td class="left">fai_restore_all</td><td class="right">0</td><td class="left">Restore everything found in the backup file</td></tr>
+<tr><td class="left">fai_restore_db</td><td class="right">0</td><td class="left">Install the DB server &amp; restore its contents</td></tr>
+<tr><td class="left">fai_restore_data_files</td><td class="right">0</td><td class="left">Restore the Solr &amp; ECE data files</td></tr>
+<tr><td class="left">fai_restore_configuration</td><td class="right">0</td><td class="left">Restore the Solr &amp; ECE configuration files</td></tr>
+<tr><td class="left">fai_restore_software_binaries</td><td class="right">0</td><td class="left">Restore the Escenic and Apache Tomcat software</td></tr>
+<tr><td class="left">fai_restore_from_file</td><td class="right">""</td><td class="left">The .tar.gz produced by "ece -i &lt;instance&gt; backup"</td></tr>
+</tbody>
+</table>
+
+
+<p>
+For example, to restore everything possible from a given tarball, you
+need this in your .ece-install.conf:
+</p>
+
+
+<pre class="src src-conf"><span style="color: #a0522d;">fai_enabled</span>=1
+
+<span style="color: #a0522d;">fai_restore_from_backup</span>=1
+<span style="color: #a0522d;">fai_restore_all</span>=1
+<span style="color: #a0522d;">fai_restore_from_file</span>=/var/backups/escenic/engine-dev1-backup-2011-10-10.tar.gz
+</pre>
+
+
+</div>
+
+</div>
+
+<div id="outline-container-5-14" class="outline-3">
+<h3 id="sec-5-14"><span class="section-number-3">5.14</span> Data security </h3>
+<div class="outline-text-3" id="text-5-14">
+
+<p>You should take heed when running restore, so that you're not
+restoring a system which you didn't want to change (yes, this mishap
+does happen).
+</p>
+<p>
+The ece-install script will help you a bit on the way, but the final
+responsibility always lies with you as the user. 
+</p>
+<p>
+If you're trying to restore the DB and the ECE schema already exists,
+the restore will fail:
+</p>
+
+
+<pre class="src src-text">[ece-install-8] Restoring the database contents on ubiquitous ...
+[ece-install-24] Selecting the most recent database dump ece5db-2011-10-10.sql.gz
+ERROR 1007 (HY000) at line 1: Can't create database 'ece5db'; database exists
+ERROR 1050 (42S01) at line 25: Table '`ece5db`.`AccessControlList`' already exists
+[ece-install-24] The command [restoring from var/backups/escenic/ece5db-2011-10-10.sql.gz] FAILED, exiting :-(
+[ece-install-24] See /var/log/ece-install.log for further details.
+</pre>
+
 </div>
 </div>
 
@@ -1155,205 +1347,6 @@ <h2 id="sec-12"><span class="section-number-2">12</span> Example Output FAI </h2
 CANNOT INCLUDE FILE ~/tmp/ece-install.out
 </p>
 </div>
-
-</div>
-
-<div id="outline-container-13" class="outline-2">
-<h2 id="sec-13"><span class="section-number-2">13</span> Restoring from backup </h2>
-<div class="outline-text-2" id="text-13">
-
-<p>ece-install can restore from a backup made by the ece script:
-</p>
-
-
-<pre class="src src-sh">$ ece -i &lt;instance&gt; backup
-</pre>
-
-
-<p>
-As stated in the ece guide, this backup may contain (depending on
-what's available on the host where it's run):
-</p><ul>
-<li>database dump of the instance
-</li>
-<li>data files (pictures, video files and so on). This is often referred
-  to as the "multimedia archive" in Escenic literature.
-</li>
-<li>ECE, cache and web server configuration
-</li>
-<li>Escenic software
-</li>
-</ul>
-
-
-
-</div>
-
-<div id="outline-container-13-1" class="outline-3">
-<h3 id="sec-13-1"><span class="section-number-3">13.1</span> Running interactively </h3>
-<div class="outline-text-3" id="text-13-1">
-
-
-</div>
-
-<div id="outline-container-13-1-1" class="outline-4">
-<h4 id="sec-13-1-1"><span class="section-number-4">13.1.1</span> Start ece-install and choose the Option, "Restore from backup" </h4>
-<div class="outline-text-4" id="text-13-1-1">
-
-
-
-
-<pre class="src src-text"># ece-install
-</pre>
-
-
-</div>
-
-</div>
-
-<div id="outline-container-13-1-2" class="outline-4">
-<h4 id="sec-13-1-2"><span class="section-number-4">13.1.2</span> Select Which Backup to Restore </h4>
-<div class="outline-text-4" id="text-13-1-2">
-
-
-
-
-
-<pre class="src src-text">[ece-install-5] From which dataset do you wish to backup?
-    1 - engine-dev1-backup-2011-10-10.tar.gz
-    2 - engine-dev1-backup-2011-10-11.tar.gz
-[ece-install-5] Enter the number next to the tarball, from 1 to 2
-Your choice [1]&gt;
-</pre>
-
-
-<p>
-The ece script mentioned above will create backups in
-</p>
-
-
-<pre class="src src-sh">/var/backups/escenic
-</pre>
-
-<p>
-and the ece-install script will hence expect to find them here.
-</p>
-</div>
-
-</div>
-
-<div id="outline-container-13-1-3" class="outline-4">
-<h4 id="sec-13-1-3"><span class="section-number-4">13.1.3</span> Choose What to Restore </h4>
-<div class="outline-text-4" id="text-13-1-3">
-
-
-
-
-<pre class="src src-text">[ece-install-12] Which part of the system do you wish to restore?
-    1 - The database
-    2 - The Solr and ECE data files (multimedia archive)
-    3 - The ECE configuration files
-    4 - The Escenic and Tomcat software binaries + publication templates
-Your choice [1]&gt; 2
-</pre>
-
-
-</div>
-
-</div>
-
-<div id="outline-container-13-1-4" class="outline-4">
-<h4 id="sec-13-1-4"><span class="section-number-4">13.1.4</span> Sit Back and Watch ece-install Restore the Data for You </h4>
-<div class="outline-text-4" id="text-13-1-4">
-
-
-
-
-<pre class="src src-text">[ece-install-13] Restoring the Solr &amp; ECE data files on ubiquitous ...
-[ece-install-21] - The installation is now complete! It took 0d 0h 0m 20s
-[ece-install] Successfully restored Solr &amp; ECE data files
-[ece-install] from backup:  engine-dev1-backup-2011-10-12.tar.gz
-[ece-install] Check /var/lib/escenic to verify they're all there
-</pre>
-
-
-</div>
-</div>
-
-</div>
-
-<div id="outline-container-13-2" class="outline-3">
-<h3 id="sec-13-2"><span class="section-number-3">13.2</span> Running in FAI mode </h3>
-<div class="outline-text-3" id="text-13-2">
-
-<p>If you're running in FAI mode, you can choose between these settings
-to decide what to restore and where to find the backup file to
-restore from:
-</p>
-<table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
-<caption></caption>
-<colgroup><col class="left" /><col class="right" /><col class="left" />
-</colgroup>
-<thead>
-<tr><th scope="col" class="left">Parameter</th><th scope="col" class="right">Default</th><th scope="col" class="left">Description</th></tr>
-</thead>
-<tbody>
-<tr><td class="left">fai_restore_all</td><td class="right">0</td><td class="left">Restore everything found in the backup file</td></tr>
-<tr><td class="left">fai_restore_db</td><td class="right">0</td><td class="left">Install the DB server &amp; restore its contents</td></tr>
-<tr><td class="left">fai_restore_data_files</td><td class="right">0</td><td class="left">Restore the Solr &amp; ECE data files</td></tr>
-<tr><td class="left">fai_restore_configuration</td><td class="right">0</td><td class="left">Restore the Solr &amp; ECE configuration files</td></tr>
-<tr><td class="left">fai_restore_software_binaries</td><td class="right">0</td><td class="left">Restore the Escenic and Apache Tomcat software</td></tr>
-<tr><td class="left">fai_restore_from_file</td><td class="right">""</td><td class="left">The .tar.gz produced by "ece -i &lt;instance&gt; backup"</td></tr>
-</tbody>
-</table>
-
-
-<p>
-For example, to restore everything possible from a given tarball, you
-need this in your .ece-install.conf:
-</p>
-
-
-<pre class="src src-conf"><span style="color: #a0522d;">fai_enabled</span>=1
-
-<span style="color: #a0522d;">fai_restore_from_backup</span>=1
-<span style="color: #a0522d;">fai_restore_all</span>=1
-<span style="color: #a0522d;">fai_restore_from_file</span>=/var/backups/escenic/engine-dev1-backup-2011-10-10.tar.gz
-</pre>
-
-
-</div>
-
-</div>
-
-<div id="outline-container-13-3" class="outline-3">
-<h3 id="sec-13-3"><span class="section-number-3">13.3</span> Data security </h3>
-<div class="outline-text-3" id="text-13-3">
-
-<p>You should take heed when running restore, so that you're not
-restoring a system which you didn't want to change (yes, this mishap
-does happen).
-</p>
-<p>
-The ece-install script will help you a bit on the way, but the final
-responsibility always lies with you as the user. 
-</p>
-<p>
-If you're trying to restore the DB and the ECE schema already exists,
-the restore will fail:
-</p>
-
-
-<pre class="src src-text">[ece-install-8] Restoring the database contents on ubiquitous ...
-[ece-install-24] Selecting the most recent database dump ece5db-2011-10-10.sql.gz
-ERROR 1007 (HY000) at line 1: Can't create database 'ece5db'; database exists
-ERROR 1050 (42S01) at line 25: Table '`ece5db`.`AccessControlList`' already exists
-[ece-install-24] The command [restoring from var/backups/escenic/ece5db-2011-10-10.sql.gz] FAILED, exiting :-(
-[ece-install-24] See /var/log/ece-install.log for further details.
-</pre>
-
-</div>
-</div>
 </div>
 </div>
 
@@ -1361,7 +1354,7 @@ <h3 id="sec-13-3"><span class="section-number-3">13.3</span> Data security </h3>
 <hr/>
 <p class="author">
   Author: Torstein Krause Johansen (<a href="mailto:tkj@vizrt.com">tkj@vizrt.com</a>)
-  Date: 2011-10-20 18:33:00 CST
+  Date: 2011-10-20 18:36:20 CST
 </p>
 </div>
 </body>
diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index d094fd63..b4d5b071 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -107,24 +107,20 @@ want to install:
 #+BEGIN_SRC sh
 Hi, which server profile do you wish to install?
 
-Select 1-9 and press ENTER
-
-  1 - All in one, the full stack on one host. 
-      Suitable for development and test environments.
-      It will install caching server, ECE, assembly host, database &
-      Widget Framework as well as set up a new publication.
-  2 - Editorial (publication) server.
-      This will install ECE and an assembly host.
-  3 - Presentation server (ECE, memcached).
-  4 - Database server.
-  5 - Cache server (cache & web server).
-  6 - RMI hub.
-  7 - Standalone search instance (solr + indexer-webapp).
-  8 - Install the Widget Framework.
-      (You need user/pass for repo.escenic.com for this).
-  9 - Create a new publication.
-      This profile will create new publication based on WF
-      (if available) or ECE/clean-demo.
+   1 - All in one, full stack on one host, suitable for dev & test environments
+   2 - Editorial (publication) server
+   3 - Presentation server (ECE + memcached).
+   4 - Database server
+   5 - Cache server (cache and web server)
+   6 - RMI hub
+   7 - Search server (Solr + indexer-webapp)
+   8 - Install Widget Framework.
+   9 - Create a new publication based on WF if available, ECE/clean-demo if not
+   10 - A monitoring server (web server + Munin gatherer)
+   11 - Restore from backup (DB, data files, binaries, conf & publications)
+
+Select 1-11 and press ENTER
+Your choice [1]> 
 #+END_SRC
 ** Common for All Server Profiles
 The script will install a Munin node on the host. It will also
@@ -264,6 +260,105 @@ accessing the reports generated by the former.
 TBD: This profile will also install the Nagios interface for
 monitoring the different nodes. 
 
+** Profile - Restoring from backup
+ece-install can restore from a backup made by the ece script:
+#+BEGIN_SRC sh
+$ ece -i <instance> backup
+#+END_SRC
+
+As stated in the ece guide, this backup may contain (depending on
+what's available on the host where it's run):
+- database dump of the instance
+- data files (pictures, video files and so on). This is often referred
+  to as the "multimedia archive" in Escenic literature.
+- ECE, cache and web server configuration
+- Escenic software
+
+** Running interactively
+*** Start ece-install and choose the Option, "Restore from backup"
+#+BEGIN_SRC text
+# ece-install
+#+END_SRC
+
+*** Select Which Backup to Restore
+
+#+BEGIN_SRC text
+[ece-install-5] From which dataset do you wish to backup?
+    1 - engine-dev1-backup-2011-10-10.tar.gz
+    2 - engine-dev1-backup-2011-10-11.tar.gz
+[ece-install-5] Enter the number next to the tarball, from 1 to 2
+Your choice [1]>
+#+END_SRC
+
+The ece script mentioned above will create backups in
+#+BEGIN_SRC sh
+/var/backups/escenic
+#+END_SRC
+and the ece-install script will hence expect to find them here.
+
+*** Choose What to Restore
+#+BEGIN_SRC text
+[ece-install-12] Which part of the system do you wish to restore?
+    1 - The database
+    2 - The Solr and ECE data files (multimedia archive)
+    3 - The ECE configuration files
+    4 - The Escenic and Tomcat software binaries + publication templates
+Your choice [1]> 2
+#+END_SRC
+
+*** Sit Back and Watch ece-install Restore the Data for You
+#+BEGIN_SRC text
+[ece-install-13] Restoring the Solr & ECE data files on ubiquitous ...
+[ece-install-21] - The installation is now complete! It took 0d 0h 0m 20s
+[ece-install] Successfully restored Solr & ECE data files
+[ece-install] from backup:  engine-dev1-backup-2011-10-12.tar.gz
+[ece-install] Check /var/lib/escenic to verify they're all there
+#+END_SRC
+
+** Running in FAI mode
+If you're running in FAI mode, you can choose between these settings
+to decide what to restore and where to find the backup file to
+restore from:
+
+|----------------------------------+---------+------------------------------------------------|
+| Parameter                        | Default | Description                                    |
+|----------------------------------+---------+------------------------------------------------|
+| fai\_restore\_all                |       0 | Restore everything found in the backup file    |
+| fai\_restore\_db                 |       0 | Install the DB server & restore its contents   |
+| fai\_restore\_data\_files        |       0 | Restore the Solr & ECE data files              |
+| fai\_restore\_configuration      |       0 | Restore the Solr & ECE configuration files     |
+| fai\_restore\_software\_binaries |       0 | Restore the Escenic and Apache Tomcat software |
+| fai\_restore\_from\_file         |      "" | The .tar.gz produced by "ece -i <instance> backup" |
+|----------------------------------+---------+------------------------------------------------|
+
+For example, to restore everything possible from a given tarball, you
+need this in your .ece-install.conf:
+#+BEGIN_SRC conf
+fai_enabled=1
+
+fai_restore_from_backup=1
+fai_restore_all=1
+fai_restore_from_file=/var/backups/escenic/engine-dev1-backup-2011-10-10.tar.gz
+#+END_SRC
+
+** Data security
+You should take heed when running restore, so that you're not
+restoring a system which you didn't want to change (yes, this mishap
+does happen).
+
+The ece-install script will help you a bit on the way, but the final
+responsibility always lies with you as the user. 
+
+If you're trying to restore the DB and the ECE schema already exists,
+the restore will fail:
+#+BEGIN_SRC text
+[ece-install-8] Restoring the database contents on ubiquitous ...
+[ece-install-24] Selecting the most recent database dump ece5db-2011-10-10.sql.gz
+ERROR 1007 (HY000) at line 1: Can't create database 'ece5db'; database exists
+ERROR 1050 (42S01) at line 25: Table '`ece5db`.`AccessControlList`' already exists
+[ece-install-24] The command [restoring from var/backups/escenic/ece5db-2011-10-10.sql.gz] FAILED, exiting :-(
+[ece-install-24] See /var/log/ece-install.log for further details.
+#+END_SRC
 * Full Automatic Install (FAI)
 The ece-install script has support for doing a full automatic install
 (FAI). You can only install one profile at a time. The profiles are
@@ -460,102 +555,3 @@ the host that runs the install script.
 The following output is produced from ece-install:
 #+INCLUDE: "~/tmp/ece-install.out" src text
 
-* Restoring from backup
-ece-install can restore from a backup made by the ece script:
-#+BEGIN_SRC sh
-$ ece -i <instance> backup
-#+END_SRC
-
-As stated in the ece guide, this backup may contain (depending on
-what's available on the host where it's run):
-- database dump of the instance
-- data files (pictures, video files and so on). This is often referred
-  to as the "multimedia archive" in Escenic literature.
-- ECE, cache and web server configuration
-- Escenic software
-
-** Running interactively
-*** Start ece-install and choose the Option, "Restore from backup"
-#+BEGIN_SRC text
-# ece-install
-#+END_SRC
-
-*** Select Which Backup to Restore
-
-#+BEGIN_SRC text
-[ece-install-5] From which dataset do you wish to backup?
-    1 - engine-dev1-backup-2011-10-10.tar.gz
-    2 - engine-dev1-backup-2011-10-11.tar.gz
-[ece-install-5] Enter the number next to the tarball, from 1 to 2
-Your choice [1]>
-#+END_SRC
-
-The ece script mentioned above will create backups in
-#+BEGIN_SRC sh
-/var/backups/escenic
-#+END_SRC
-and the ece-install script will hence expect to find them here.
-
-*** Choose What to Restore
-#+BEGIN_SRC text
-[ece-install-12] Which part of the system do you wish to restore?
-    1 - The database
-    2 - The Solr and ECE data files (multimedia archive)
-    3 - The ECE configuration files
-    4 - The Escenic and Tomcat software binaries + publication templates
-Your choice [1]> 2
-#+END_SRC
-
-*** Sit Back and Watch ece-install Restore the Data for You
-#+BEGIN_SRC text
-[ece-install-13] Restoring the Solr & ECE data files on ubiquitous ...
-[ece-install-21] - The installation is now complete! It took 0d 0h 0m 20s
-[ece-install] Successfully restored Solr & ECE data files
-[ece-install] from backup:  engine-dev1-backup-2011-10-12.tar.gz
-[ece-install] Check /var/lib/escenic to verify they're all there
-#+END_SRC
-
-** Running in FAI mode
-If you're running in FAI mode, you can choose between these settings
-to decide what to restore and where to find the backup file to
-restore from:
-
-|----------------------------------+---------+------------------------------------------------|
-| Parameter                        | Default | Description                                    |
-|----------------------------------+---------+------------------------------------------------|
-| fai\_restore\_all                |       0 | Restore everything found in the backup file    |
-| fai\_restore\_db                 |       0 | Install the DB server & restore its contents   |
-| fai\_restore\_data\_files        |       0 | Restore the Solr & ECE data files              |
-| fai\_restore\_configuration      |       0 | Restore the Solr & ECE configuration files     |
-| fai\_restore\_software\_binaries |       0 | Restore the Escenic and Apache Tomcat software |
-| fai\_restore\_from\_file         |      "" | The .tar.gz produced by "ece -i <instance> backup" |
-|----------------------------------+---------+------------------------------------------------|
-
-For example, to restore everything possible from a given tarball, you
-need this in your .ece-install.conf:
-#+BEGIN_SRC conf
-fai_enabled=1
-
-fai_restore_from_backup=1
-fai_restore_all=1
-fai_restore_from_file=/var/backups/escenic/engine-dev1-backup-2011-10-10.tar.gz
-#+END_SRC
-
-** Data security
-You should take heed when running restore, so that you're not
-restoring a system which you didn't want to change (yes, this mishap
-does happen).
-
-The ece-install script will help you a bit on the way, but the final
-responsibility always lies with you as the user. 
-
-If you're trying to restore the DB and the ECE schema already exists,
-the restore will fail:
-#+BEGIN_SRC text
-[ece-install-8] Restoring the database contents on ubiquitous ...
-[ece-install-24] Selecting the most recent database dump ece5db-2011-10-10.sql.gz
-ERROR 1007 (HY000) at line 1: Can't create database 'ece5db'; database exists
-ERROR 1050 (42S01) at line 25: Table '`ece5db`.`AccessControlList`' already exists
-[ece-install-24] The command [restoring from var/backups/escenic/ece5db-2011-10-10.sql.gz] FAILED, exiting :-(
-[ece-install-24] See /var/log/ece-install.log for further details.
-#+END_SRC
diff --git a/usr/share/doc/escenic/ece-install-guide.txt b/usr/share/doc/escenic/ece-install-guide.txt
index 2e955d8f..e1078ee3 100644
--- a/usr/share/doc/escenic/ece-install-guide.txt
+++ b/usr/share/doc/escenic/ece-install-guide.txt
@@ -2,7 +2,7 @@
               ==========================================
 
 Author: Torstein Krause Johansen
-Date: 2011-10-20 18:33:13 CST
+Date: 2011-10-20 18:37:17 CST
 
 
 Table of Contents
@@ -31,6 +31,14 @@ Table of Contents
     5.8 Profile - Install Widget Framework 
     5.9 Profile - Create Publication 
     5.10 Profile - Monitoring Server 
+    5.11 Profile - Restoring from backup 
+    5.12 Running interactively 
+        5.12.1 Start ece-install and choose the Option, "Restore from backup" 
+        5.12.2 Select Which Backup to Restore 
+        5.12.3 Choose What to Restore 
+        5.12.4 Sit Back and Watch ece-install Restore the Data for You 
+    5.13 Running in FAI mode 
+    5.14 Data security 
 6 Full Automatic Install (FAI) 
     6.1 Overview of All FAI Parameters 
     6.2 Examples 
@@ -44,14 +52,6 @@ Table of Contents
     10.1 /etc/esecenic is shared 
 11 Uninstalling Everything That the ece-install Set Up 
 12 Example Output FAI 
-13 Restoring from backup 
-    13.1 Running interactively 
-        13.1.1 Start ece-install and choose the Option, "Restore from backup" 
-        13.1.2 Select Which Backup to Restore 
-        13.1.3 Choose What to Restore 
-        13.1.4 Sit Back and Watch ece-install Restore the Data for You 
-    13.2 Running in FAI mode 
-    13.3 Data security 
 
 
 1 Supported Operating Systems 
@@ -179,24 +179,20 @@ want to install:
 
   Hi, which server profile do you wish to install?
   
-  Select 1-9 and press ENTER
+     1 - All in one, full stack on one host, suitable for dev & test environments
+     2 - Editorial (publication) server
+     3 - Presentation server (ECE + memcached).
+     4 - Database server
+     5 - Cache server (cache and web server)
+     6 - RMI hub
+     7 - Search server (Solr + indexer-webapp)
+     8 - Install Widget Framework.
+     9 - Create a new publication based on WF if available, ECE/clean-demo if not
+     10 - A monitoring server (web server + Munin gatherer)
+     11 - Restore from backup (DB, data files, binaries, conf & publications)
   
-    1 - All in one, the full stack on one host. 
-        Suitable for development and test environments.
-        It will install caching server, ECE, assembly host, database &
-        Widget Framework as well as set up a new publication.
-    2 - Editorial (publication) server.
-        This will install ECE and an assembly host.
-    3 - Presentation server (ECE, memcached).
-    4 - Database server.
-    5 - Cache server (cache & web server).
-    6 - RMI hub.
-    7 - Standalone search instance (solr + indexer-webapp).
-    8 - Install the Widget Framework.
-        (You need user/pass for repo.escenic.com for this).
-    9 - Create a new publication.
-        This profile will create new publication based on WF
-        (if available) or ECE/clean-demo.
+  Select 1-11 and press ENTER
+  Your choice [1]>
 
 5.1 Common for All Server Profiles 
 ===================================
@@ -361,6 +357,120 @@ accessing the reports generated by the former.
 TBD: This profile will also install the Nagios interface for
 monitoring the different nodes. 
 
+5.11 Profile - Restoring from backup 
+=====================================
+ece-install can restore from a backup made by the ece script:
+
+
+  $ ece -i <instance> backup
+
+
+As stated in the ece guide, this backup may contain (depending on
+what's available on the host where it's run):
+- database dump of the instance
+- data files (pictures, video files and so on). This is often referred
+  to as the "multimedia archive" in Escenic literature.
+- ECE, cache and web server configuration
+- Escenic software
+
+5.12 Running interactively 
+===========================
+
+5.12.1 Start ece-install and choose the Option, "Restore from backup" 
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+  # ece-install
+
+
+5.12.2 Select Which Backup to Restore 
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+
+  [ece-install-5] From which dataset do you wish to backup?
+      1 - engine-dev1-backup-2011-10-10.tar.gz
+      2 - engine-dev1-backup-2011-10-11.tar.gz
+  [ece-install-5] Enter the number next to the tarball, from 1 to 2
+  Your choice [1]>
+
+
+The ece script mentioned above will create backups in
+
+
+  /var/backups/escenic
+
+and the ece-install script will hence expect to find them here.
+
+5.12.3 Choose What to Restore 
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+  [ece-install-12] Which part of the system do you wish to restore?
+      1 - The database
+      2 - The Solr and ECE data files (multimedia archive)
+      3 - The ECE configuration files
+      4 - The Escenic and Tomcat software binaries + publication templates
+  Your choice [1]> 2
+
+
+5.12.4 Sit Back and Watch ece-install Restore the Data for You 
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+  [ece-install-13] Restoring the Solr & ECE data files on ubiquitous ...
+  [ece-install-21] - The installation is now complete! It took 0d 0h 0m 20s
+  [ece-install] Successfully restored Solr & ECE data files
+  [ece-install] from backup:  engine-dev1-backup-2011-10-12.tar.gz
+  [ece-install] Check /var/lib/escenic to verify they're all there
+
+
+5.13 Running in FAI mode 
+=========================
+If you're running in FAI mode, you can choose between these settings
+to decide what to restore and where to find the backup file to
+restore from:
+
+  Parameter                          Default   Description                                         
+ ----------------------------------+---------+----------------------------------------------------
+  fai\_restore\_all                        0   Restore everything found in the backup file         
+  fai\_restore\_db                         0   Install the DB server & restore its contents        
+  fai\_restore\_data\_files                0   Restore the Solr & ECE data files                   
+  fai\_restore\_configuration              0   Restore the Solr & ECE configuration files          
+  fai\_restore\_software\_binaries         0   Restore the Escenic and Apache Tomcat software      
+  fai\_restore\_from\_file                ""   The .tar.gz produced by "ece -i <instance> backup"  
+
+For example, to restore everything possible from a given tarball, you
+need this in your .ece-install.conf:
+
+
+  fai_enabled=1
+  
+  fai_restore_from_backup=1
+  fai_restore_all=1
+  fai_restore_from_file=/var/backups/escenic/engine-dev1-backup-2011-10-10.tar.gz
+
+
+5.14 Data security 
+===================
+You should take heed when running restore, so that you're not
+restoring a system which you didn't want to change (yes, this mishap
+does happen).
+
+The ece-install script will help you a bit on the way, but the final
+responsibility always lies with you as the user. 
+
+If you're trying to restore the DB and the ECE schema already exists,
+the restore will fail:
+
+
+  [ece-install-8] Restoring the database contents on ubiquitous ...
+  [ece-install-24] Selecting the most recent database dump ece5db-2011-10-10.sql.gz
+  ERROR 1007 (HY000) at line 1: Can't create database 'ece5db'; database exists
+  ERROR 1050 (42S01) at line 25: Table '`ece5db`.`AccessControlList`' already exists
+  [ece-install-24] The command [restoring from var/backups/escenic/ece5db-2011-10-10.sql.gz] FAILED, exiting :-(
+  [ece-install-24] See /var/log/ece-install.log for further details.
+
 6 Full Automatic Install (FAI) 
 -------------------------------
 The ece-install script has support for doing a full automatic install
@@ -576,117 +686,3 @@ the host that runs the install script.
 The following output is produced from ece-install:
 CANNOT INCLUDE FILE ~/tmp/ece-install.out
 
-13 Restoring from backup 
--------------------------
-ece-install can restore from a backup made by the ece script:
-
-
-  $ ece -i <instance> backup
-
-
-As stated in the ece guide, this backup may contain (depending on
-what's available on the host where it's run):
-- database dump of the instance
-- data files (pictures, video files and so on). This is often referred
-  to as the "multimedia archive" in Escenic literature.
-- ECE, cache and web server configuration
-- Escenic software
-
-13.1 Running interactively 
-===========================
-
-13.1.1 Start ece-install and choose the Option, "Restore from backup" 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-  # ece-install
-
-
-13.1.2 Select Which Backup to Restore 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-
-  [ece-install-5] From which dataset do you wish to backup?
-      1 - engine-dev1-backup-2011-10-10.tar.gz
-      2 - engine-dev1-backup-2011-10-11.tar.gz
-  [ece-install-5] Enter the number next to the tarball, from 1 to 2
-  Your choice [1]>
-
-
-The ece script mentioned above will create backups in
-
-
-  /var/backups/escenic
-
-and the ece-install script will hence expect to find them here.
-
-13.1.3 Choose What to Restore 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-  [ece-install-12] Which part of the system do you wish to restore?
-      1 - The database
-      2 - The Solr and ECE data files (multimedia archive)
-      3 - The ECE configuration files
-      4 - The Escenic and Tomcat software binaries + publication templates
-  Your choice [1]> 2
-
-
-13.1.4 Sit Back and Watch ece-install Restore the Data for You 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-  [ece-install-13] Restoring the Solr & ECE data files on ubiquitous ...
-  [ece-install-21] - The installation is now complete! It took 0d 0h 0m 20s
-  [ece-install] Successfully restored Solr & ECE data files
-  [ece-install] from backup:  engine-dev1-backup-2011-10-12.tar.gz
-  [ece-install] Check /var/lib/escenic to verify they're all there
-
-
-13.2 Running in FAI mode 
-=========================
-If you're running in FAI mode, you can choose between these settings
-to decide what to restore and where to find the backup file to
-restore from:
-
-  Parameter                          Default   Description                                         
- ----------------------------------+---------+----------------------------------------------------
-  fai\_restore\_all                        0   Restore everything found in the backup file         
-  fai\_restore\_db                         0   Install the DB server & restore its contents        
-  fai\_restore\_data\_files                0   Restore the Solr & ECE data files                   
-  fai\_restore\_configuration              0   Restore the Solr & ECE configuration files          
-  fai\_restore\_software\_binaries         0   Restore the Escenic and Apache Tomcat software      
-  fai\_restore\_from\_file                ""   The .tar.gz produced by "ece -i <instance> backup"  
-
-For example, to restore everything possible from a given tarball, you
-need this in your .ece-install.conf:
-
-
-  fai_enabled=1
-  
-  fai_restore_from_backup=1
-  fai_restore_all=1
-  fai_restore_from_file=/var/backups/escenic/engine-dev1-backup-2011-10-10.tar.gz
-
-
-13.3 Data security 
-===================
-You should take heed when running restore, so that you're not
-restoring a system which you didn't want to change (yes, this mishap
-does happen).
-
-The ece-install script will help you a bit on the way, but the final
-responsibility always lies with you as the user. 
-
-If you're trying to restore the DB and the ECE schema already exists,
-the restore will fail:
-
-
-  [ece-install-8] Restoring the database contents on ubiquitous ...
-  [ece-install-24] Selecting the most recent database dump ece5db-2011-10-10.sql.gz
-  ERROR 1007 (HY000) at line 1: Can't create database 'ece5db'; database exists
-  ERROR 1050 (42S01) at line 25: Table '`ece5db`.`AccessControlList`' already exists
-  [ece-install-24] The command [restoring from var/backups/escenic/ece5db-2011-10-10.sql.gz] FAILED, exiting :-(
-  [ece-install-24] See /var/log/ece-install.log for further details.
-

From 7f085aba448e023dd4fcda24f2b4473d430d01b2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 25 Oct 2011 15:43:06 +0800
Subject: [PATCH 0112/2585] - small change to the log message so that failed
 "ece assemble"-s   are not confusing.

---
 usr/bin/ece | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 5f33d14a..8ad8e684 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -903,9 +903,9 @@ function assemble()
         exit 1
     fi
 
-    message="Assembling your EAR file ..."
-    print $message
-    log $message >> $log_file
+    message="Assembling your EAR file"
+    print $message ".."
+    log $message "..." >> $log_file
     
     cd $assemblytool_home && \
         ant -q ear -DskipRedundancyCheck=true \

From 5db9b7a3df7d1ba0ebb18930ae7ca6df5a693017 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 26 Oct 2011 12:53:53 +0800
Subject: [PATCH 0113/2585] - if help is one of the commands, the instance test
 is omitted. This   means you can do "ece help" or indeed "ece
 <manyotherthings> help"   without specifying the instance.

---
 usr/bin/ece | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 8ad8e684..d1c51004 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -426,7 +426,9 @@ function sanity_check()
     # checks if the user is using the default instance when he/she
     # really wants to start one of the instances installed on the
     # system.
-    if [ $instance = "default" -a $type = "engine" ]; then
+    if [ $instance = "default" -a \
+        $type = "engine" -a \
+        $(echo $command | grep help | wc -l) -eq 0 ]; then
         instance_list=$(get_instance_list)
         if [ -n "$instance_list" ]; then
             print "You must specify the instance with -i <instance>"

From 206bb9553b77857530099be23cc38ccc04eca637 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 26 Oct 2011 13:02:17 +0800
Subject: [PATCH 0114/2585] - removed hyphen which produced invalid email link
 on github. - referred to ece-guide instead of listing the script's features
 in   the README - added referrals to ece-install and system-info too

---
 README | 68 +++++++++++++++++-----------------------------------------
 1 file changed, 20 insertions(+), 48 deletions(-)

diff --git a/README b/README
index d5ca69e6..ba9c8455 100644
--- a/README
+++ b/README
@@ -13,60 +13,32 @@ The file structure ressembles where you'd typically put the various
 scripts and configuration files. That's all it is, only for
 documentational purposes :-)
 
-==========================
-Features of the ece script
-==========================
-$ ece help
-Usage: /usr/bin/ece [-t <type>] [-i <instance>] <command>
-
-DESCRIPTION
- -t --type <type>
-      The following types are available:
-      engine  - The Escenic Content Engine, this is the default
-                and is the assumed type if none is specified.
-      search  - A standalone search indexer and solr instance
-      rmi-hub - The RMI hub responsible for the internal 
-                communication between the ECE instances.
-                
- -i --instance <instance>
-      The type instance, such as editor1, web1 or search1
-      
- -p --publication <publication>
-      Needed only for updating publication resources
-      
- -r --resource <resource>
-      Needed only for updating publication resources.
-      Must be one of: content-type, feature, layout, layout-group
-                      image-version, menu
- -v --verbose
-      Prints out debug statements, useful for debugging.
-
-The following commands are available:
-   applog     the type's app server log
-   assemble   runs the Assembly Tool *)
-   clean      removes temporary files created by /home/torstein/bin/ece *)
-   deploy     deploys the assembled EAR *)
-   help       prints this help screen
-   kill       uses force to stop the type
-   log        the type's Log4J log
-   outlog     the [ece#engine] script log (system out log)
-   restart    restarts the type
-   start      starts the type
-   status     checks if the type is running
-   stop       stops the type
-   threaddump write a thread dump to standard out (system out log)
-   update     update publication resources
-   versions   lists the ECE component versions
-
-*) only applicable if type is 'engine'
+===================================
+Features of the /usr/bin/ece script
+===================================
+https://github.com/skybert/ece-scripts/blob/master/usr/share/doc/escenic/ece-guide.org
+
+============================================
+Features of the /usr/sbin/ece-install script
+============================================
+https://github.com/skybert/ece-scripts/blob/master/usr/share/doc/escenic/ece-install-guide.org
+
+===========================================
+Features of the /usr/bin/system-info script
+===========================================
+Gives a overview of your system, especially useful when contacting
+Vizrt Online/Escenic Support.
+
+The script default wise produces a plain text report, but if you pass
+-c or --confluence to it, it will generate Confluence Wiki markup
+instead.
 
 ==========================
 Feedback
 ==========================
-
 Hope you enjoy the ece /usr/bin and intit.d scripts. All feedback,
 come hither!
 
--torstein@escenic.com
+torstein@escenic.com
 
 

From 9abaea1728251f054a5b8f6a71d96163baf355ed Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 26 Oct 2011 13:18:49 +0800
Subject: [PATCH 0115/2585] - added a guide for the system-info, it's so dead
 easy!

---
 usr/share/doc/escenic/system-info-guide.org | 78 +++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 usr/share/doc/escenic/system-info-guide.org

diff --git a/usr/share/doc/escenic/system-info-guide.org b/usr/share/doc/escenic/system-info-guide.org
new file mode 100644
index 00000000..9119a40d
--- /dev/null
+++ b/usr/share/doc/escenic/system-info-guide.org
@@ -0,0 +1,78 @@
+Welcome to the /usr/bin/system-info Guide
+
+This wee script gives a overview of your system, especially useful
+when contacting Vizrt Online/Escenic Support.
+
+The script will default wise produce a plain text report, but if you
+pass -c or --confluence to it, it will generate Confluence Wiki markup
+instead.
+
+* Example
+Here you can see an example of the output generated from system-info:
+
+#+BEGIN_SRC text
+#########################################################################
+System details for quanah
+#########################################################################
+
+#########################################################################
+Kernel version
+#########################################################################
+Linux quanah 3.0.0-1-amd64 #1 SMP Sat Aug 27 16:21:11 UTC 2011 x86_64 GNU/Linux
+
+#########################################################################
+Distribution information
+#########################################################################
+Debian or derivate, version wheezy/sid
+
+#########################################################################
+Database details
+#########################################################################
+/usr/sbin/mysqld  Ver 5.1.58-1 for debian-linux-gnu on x86_64 ((Debian))
+
+#########################################################################
+Java version
+#########################################################################
+java version "1.6.0_26"
+Java(TM) SE Runtime Environment (build 1.6.0_26-b03)
+Java HotSpot(TM) 64-Bit Server VM (build 20.1-b02, mixed mode)
+
+#########################################################################
+Important packages
+#########################################################################
+ant                                      1.8.2-4                              Java based build tool like make
+libapr1                                  1.4.5-1                              Apache Portable Runtime Library
+libmysql-java                            5.1.16-2                             Java database (JDBC) driver for MySQL
+libtcnative-1                            1.1.22-1                             Tomcat native library using the apache portable runtime
+maven2                                   2.2.1-10                             Java software project management and comprehension tool
+mysql-server                             5.1.58-1                             MySQL database server (metapackage depending on the latest version)
+nginx                                    1.1.4-2                              small, but very powerful and efficient web server and mail proxy
+sun-java6-jdk                            6.26-3                               Sun Java(TM) Development Kit (JDK) 6
+sun-java6-jre                            6.26-3                               Sun Java(TM) Runtime Environment (JRE) 6 (architecture independent files)
+tomcat6-user                             6.0.32-6                             Servlet and JSP engine -- tools to create user instances
+varnish                                  3.0.1-1~squeeze1                     state of the art, high-performance web accelerator
+
+#########################################################################
+Processors
+#########################################################################
+Processor type:  Intel(R) Core(TM)2 Duo CPU P8600 @ 2.40GHz
+Number of processors/cores: 1
+
+#########################################################################
+Memory
+#########################################################################
+Total memory:  3792504 kB
+Free memory:  339096 kB
+
+#########################################################################
+Disk Storage
+#########################################################################
+Filesystem     Type     Size  Used Avail Use% Mounted on
+/dev/sda3      ext3     141G  127G  7.2G  95% /
+tmpfs          tmpfs    5.0M  8.0K  5.0M   1% /lib/init/rw
+tmpfs          tmpfs    371M  812K  370M   1% /run
+udev           tmpfs    1.9G     0  1.9G   0% /dev
+tmpfs          tmpfs    741M  420K  741M   1% /run/shm
+shmfs          tmpfs    1.9G   12K  1.9G   1% /lib/init/rw/splashy
+/dev/sda2      hfsplus   96G   89G  6.3G  94% /mnt/mac
+#+END_SRC

From 0aaff3646ab8dd548fa837634fb89535a2f56f21 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 26 Oct 2011 13:19:01 +0800
Subject: [PATCH 0116/2585] - added .HTML version as well

---
 usr/share/doc/escenic/system-info-guide.html | 327 +++++++++++++++++++
 1 file changed, 327 insertions(+)
 create mode 100644 usr/share/doc/escenic/system-info-guide.html

diff --git a/usr/share/doc/escenic/system-info-guide.html b/usr/share/doc/escenic/system-info-guide.html
new file mode 100644
index 00000000..579bb72f
--- /dev/null
+++ b/usr/share/doc/escenic/system-info-guide.html
@@ -0,0 +1,327 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+               "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+lang="en" xml:lang="en">
+<head>
+<title>Welcome to the /usr/bin/system-info Guide</title>
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
+<meta name="generator" content="Org-mode"/>
+<meta name="generated" content="2011-10-26 13:18:12 CST"/>
+<meta name="author" content="Torstein Krause Johansen"/>
+<meta name="description" content=""/>
+<meta name="keywords" content=""/>
+<style type="text/css">
+ <!--/*--><![CDATA[/*><!--*/
+  html { font-family: Times, serif; font-size: 12pt; }
+  .title  { text-align: center; }
+  .todo   { color: red; }
+  .done   { color: green; }
+  .tag    { background-color: #add8e6; font-weight:normal }
+  .target { }
+  .timestamp { color: #bebebe; }
+  .timestamp-kwd { color: #5f9ea0; }
+  .right  {margin-left:auto; margin-right:0px;  text-align:right;}
+  .left   {margin-left:0px;  margin-right:auto; text-align:left;}
+  .center {margin-left:auto; margin-right:auto; text-align:center;}
+  p.verse { margin-left: 3% }
+  pre {
+	border: 1pt solid #AEBDCC;
+	background-color: #F3F5F7;
+	padding: 5pt;
+	font-family: courier, monospace;
+        font-size: 90%;
+        overflow:auto;
+  }
+  table { border-collapse: collapse; }
+  td, th { vertical-align: top;  }
+  th.right  { text-align:center;  }
+  th.left   { text-align:center;   }
+  th.center { text-align:center; }
+  td.right  { text-align:right;  }
+  td.left   { text-align:left;   }
+  td.center { text-align:center; }
+  dt { font-weight: bold; }
+  div.figure { padding: 0.5em; }
+  div.figure p { text-align: center; }
+  div.inlinetask {
+    padding:10px;
+    border:2px solid gray;
+    margin:10px;
+    background: #ffffcc;
+  }
+  textarea { overflow-x: auto; }
+  .linenr { font-size:smaller }
+  .code-highlighted {background-color:#ffff00;}
+  .org-info-js_info-navigation { border-style:none; }
+  #org-info-js_console-label { font-size:10px; font-weight:bold;
+                               white-space:nowrap; }
+  .org-info-js_search-highlight {background-color:#ffff00; color:#000000;
+                                 font-weight:bold; }
+  /*]]>*/-->
+</style><style type="text/css">
+body {
+  font-family: Arial, Helvetica, sans-serif;
+  font-size: small;
+  #width : 600;
+  margin: 70px 70px 0px 50px;
+}
+
+h1, h2 {
+  color: #e88424;
+}
+
+h1 {
+  font-size: 150%;
+}
+
+h2 {
+  font-size: 120%;
+  margin-top: 3em;
+  margin-bottom: 0em;
+}
+
+h3, h4, h5, h6 {
+  font-weight: bold;
+  margin-top: 2em;
+  margin-bottom: 0.2em;
+}
+
+h3, h4, h5 {
+  font-size: 110%;
+}
+
+h6 {
+  font-size: 80%;
+}
+
+a {
+  color: #333;
+  font-weight: bold;
+  text-decoration: none;
+}
+
+a:hover {
+  text-decoration: underline;
+}
+
+p, dl {
+  font-size: 95%;
+}
+
+p {
+  margin-top: 0em;
+  margin-bottom: 0.6em;
+}
+
+pre.programlisting {
+  margin-top: 0em;
+  background-color: #ffddaa;
+  padding-top: 0.5em;
+  padding-bottom: 0.5em;
+  padding-left: 0.5em;
+  padding-right: 0.5em;
+}
+
+em {
+  font-weight: bold;
+  font-style: normal;
+}
+
+em.replaceable {
+  font-weight: normal;
+  font-style: italic;
+}
+
+div.note {
+  background-color: #ffddaa;
+  padding-top: 0.5em;
+  padding-bottom: 0.5em;
+  padding-left: 0.5em;
+  padding-right: 0.5em;
+}
+</style>
+
+<script type="text/javascript">
+<!--/*--><![CDATA[/*><!--*/
+ function CodeHighlightOn(elem, id)
+ {
+   var target = document.getElementById(id);
+   if(null != target) {
+     elem.cacheClassElem = elem.className;
+     elem.cacheClassTarget = target.className;
+     target.className = "code-highlighted";
+     elem.className   = "code-highlighted";
+   }
+ }
+ function CodeHighlightOff(elem, id)
+ {
+   var target = document.getElementById(id);
+   if(elem.cacheClassElem)
+     elem.className = elem.cacheClassElem;
+   if(elem.cacheClassTarget)
+     target.className = elem.cacheClassTarget;
+ }
+/*]]>*///-->
+</script>
+
+</head>
+<body>
+
+<div id="preamble">
+<svg
+        id="vizrt-logo"
+        version="1.1"
+        width="138"
+        height="84"
+        > 
+  <g
+          id="g12"
+          transform="matrix(1.25,0,0,-1.25,-451.34003,425.24315)"> 
+    <g
+            id="g14"
+            transform="matrix(0.0246257,0,0,0.02458666,313.76213,231.21317)"> 
+      <path
+              d="m 3060.56,3437.2 -209.9,-593.4 -207.05,593.4 -215.82,0 326.08,-866.38 184.92,0 332.24,866.38 -210.47,0"
+              style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
+              id="path16"/> 
+      <path
+              d="m 3473.3,2569.82 193.547,0 0,866.531 -193.547,0 0,-866.531 z"
+              style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
+              id="path18"/> 
+      <path
+              d="m 3916.16,3436.36 -0.14,-177.24 364.23,0 -372.91,-554.74 0,-133.56 616.08,0 0,175.25 -374.66,0 366.68,550.78 0,139.51 -599.28,0"
+              style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
+              id="path20"/> 
+      <path
+              d="m 4961.8,3436.66 c -56.15,0 -99.9,-9.02 -144.01,-53.04 -42.13,-42.13 -63.55,-93.63 -63.55,-153.7 l 0,-658.85 193.26,0 0,629.18 c 0,16.39 5.76,30.04 17.53,41.82 9.79,9.87 32.16,17.44 52.18,17.44 l 161.49,0 0,177.15 -216.9,0"
+              style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
+              id="path22"/> 
+      <path
+              d="m 5367.91,3699.54 0,-915.91 c 0,-58.68 20.75,-109.43 62.13,-150.8 43.31,-43.47 85.57,-62.01 141.03,-62.01 l 212.69,0 0,174.7 -158.78,0 c -15.96,0 -28.96,5.5 -40.72,16.87 -11.19,11.53 -16.76,24.5 -16.76,40.65 l 0,456.42 216.26,0 0,176.39 -216.26,0 0,263.69 -199.59,0"
+              style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
+              id="path24"/> 
+      <path
+              d="m 1921.16,3066.86 c -0.39,-514.15 173.24,-988.49 465.56,-1367.51 l 69.26,204.63 c -205.49,300.61 -333.44,658.06 -355.3,1043.68 l -179.52,119.2"
+              style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
+              id="path26"/> 
+      <path
+              d="m 6404.28,3065.28 c 0.49,513.97 -173.17,988.55 -465.37,1367.26 l -69.46,-204.34 c 205.52,-300.7 333.61,-658.34 355.24,-1043.68 l 179.59,-119.24"
+              style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
+              id="path28"/> 
+ 
+    </g> 
+  </g> 
+</svg>
+
+</div>
+
+<div id="content">
+<h1 class="title">Welcome to the /usr/bin/system-info Guide</h1>
+
+<p>This wee script gives a overview of your system, especially useful
+when contacting Vizrt Online/Escenic Support.
+</p>
+<p>
+The script will default wise produce a plain text report, but if you
+pass -c or &ndash;confluence to it, it will generate Confluence Wiki markup
+instead.
+</p>
+
+<div id="table-of-contents">
+<h2>Table of Contents</h2>
+<div id="text-table-of-contents">
+<ul>
+<li><a href="#sec-1">1 Example </a></li>
+</ul>
+</div>
+</div>
+
+<div id="outline-container-1" class="outline-2">
+<h2 id="sec-1"><span class="section-number-2">1</span> Example </h2>
+<div class="outline-text-2" id="text-1">
+
+<p>Here you can see an example of the output generated from system-info:
+</p>
+
+
+
+<pre class="src src-text">#########################################################################
+System details for quanah
+#########################################################################
+
+#########################################################################
+Kernel version
+#########################################################################
+Linux quanah 3.0.0-1-amd64 #1 SMP Sat Aug 27 16:21:11 UTC 2011 x86_64 GNU/Linux
+
+#########################################################################
+Distribution information
+#########################################################################
+Debian or derivate, version wheezy/sid
+
+#########################################################################
+Database details
+#########################################################################
+/usr/sbin/mysqld  Ver 5.1.58-1 for debian-linux-gnu on x86_64 ((Debian))
+
+#########################################################################
+Java version
+#########################################################################
+java version "1.6.0_26"
+Java(TM) SE Runtime Environment (build 1.6.0_26-b03)
+Java HotSpot(TM) 64-Bit Server VM (build 20.1-b02, mixed mode)
+
+#########################################################################
+Important packages
+#########################################################################
+ant                                      1.8.2-4                              Java based build tool like make
+libapr1                                  1.4.5-1                              Apache Portable Runtime Library
+libmysql-java                            5.1.16-2                             Java database (JDBC) driver for MySQL
+libtcnative-1                            1.1.22-1                             Tomcat native library using the apache portable runtime
+maven2                                   2.2.1-10                             Java software project management and comprehension tool
+mysql-server                             5.1.58-1                             MySQL database server (metapackage depending on the latest version)
+nginx                                    1.1.4-2                              small, but very powerful and efficient web server and mail proxy
+sun-java6-jdk                            6.26-3                               Sun Java(TM) Development Kit (JDK) 6
+sun-java6-jre                            6.26-3                               Sun Java(TM) Runtime Environment (JRE) 6 (architecture independent files)
+tomcat6-user                             6.0.32-6                             Servlet and JSP engine -- tools to create user instances
+varnish                                  3.0.1-1~squeeze1                     state of the art, high-performance web accelerator
+
+#########################################################################
+Processors
+#########################################################################
+Processor type:  Intel(R) Core(TM)2 Duo CPU P8600 @ 2.40GHz
+Number of processors/cores: 1
+
+#########################################################################
+Memory
+#########################################################################
+Total memory:  3792504 kB
+Free memory:  339096 kB
+
+#########################################################################
+Disk Storage
+#########################################################################
+Filesystem     Type     Size  Used Avail Use% Mounted on
+/dev/sda3      ext3     141G  127G  7.2G  95% /
+tmpfs          tmpfs    5.0M  8.0K  5.0M   1% /lib/init/rw
+tmpfs          tmpfs    371M  812K  370M   1% /run
+udev           tmpfs    1.9G     0  1.9G   0% /dev
+tmpfs          tmpfs    741M  420K  741M   1% /run/shm
+shmfs          tmpfs    1.9G   12K  1.9G   1% /lib/init/rw/splashy
+/dev/sda2      hfsplus   96G   89G  6.3G  94% /mnt/mac
+</pre>
+
+</div>
+</div>
+</div>
+
+<div id="postamble">
+<hr/>
+<p class="author">
+  Author: Torstein Krause Johansen (<a href="mailto:tkj@vizrt.com">tkj@vizrt.com</a>)
+  Date: 2011-10-26 13:18:12 CST
+</p>
+</div>
+</body>
+</html>

From c3365a968da296f831f6393125d55950d01d4aee Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 26 Oct 2011 13:19:52 +0800
Subject: [PATCH 0117/2585] - system-info now has its own guie

---
 README | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/README b/README
index ba9c8455..7a85bc50 100644
--- a/README
+++ b/README
@@ -26,16 +26,11 @@ https://github.com/skybert/ece-scripts/blob/master/usr/share/doc/escenic/ece-ins
 ===========================================
 Features of the /usr/bin/system-info script
 ===========================================
-Gives a overview of your system, especially useful when contacting
-Vizrt Online/Escenic Support.
+https://github.com/skybert/ece-scripts/blob/master/usr/share/doc/escenic/system-info-guide.org
 
-The script default wise produces a plain text report, but if you pass
--c or --confluence to it, it will generate Confluence Wiki markup
-instead.
-
-==========================
+========
 Feedback
-==========================
+========
 Hope you enjoy the ece /usr/bin and intit.d scripts. All feedback,
 come hither!
 

From e7215aa82c20d956916177a8de3595460c373f07 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 26 Oct 2011 14:45:13 +0800
Subject: [PATCH 0118/2585] - the help message of threaddump always listed
 instance as "default":

[ece#engine-dev1] Thread dump (PID 19776) written to system out log.
[ece#engine-dev1] Type 'ece -t engine -i default outlog' to see it or view
[ece#engine-dev1] /var/log/escenic/engine-dev1.out directly.

  This has been fixed now:

[ece#engine-dev1] Thread dump (PID 19776) written to system out log.
[ece#engine-dev1] Type 'ece -t engine -i dev1 outlog' to see it or view
[ece#engine-dev1] /var/log/escenic/engine-dev1.out directly.
---
 usr/bin/ece | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index d1c51004..d8171633 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -1013,7 +1013,7 @@ function make_thread_dump()
 
     if [ -n "$type_pid" ]; then
         print "Thread dump (PID" $type_pid") written to system out log."
-        print "Type 'ece -t $type -i default outlog' to see it or view"
+        print "Type 'ece -t $type -i $instance outlog' to see it or view"
         print $log_file "directly."
 
         if [ -x $java_home/bin/jstack ]; then

From 854249102a5c874f95851b19c57cb1de378f24eb Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 27 Oct 2011 10:50:21 +0800
Subject: [PATCH 0119/2585] - set_type_port is now only called when the port
 number is needed,   right now this means update_publication_resources and  
 list_versions.

  Before, ece would also grep through the system out log file for
  getting the port number, regardless if the command needed it or
  not. This will no longer happen. If you have a huge system out file,
  this fix should speed up the general operation of using the ece
  script.

  This closes https://github.com/skybert/ece-scripts/issues/25
---
 usr/bin/ece | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index d8171633..079af1f9 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -300,9 +300,7 @@ function set_instance_settings()
     fi
 
     set_type_pid
-
-    set_type_port
-    
+   
     # if type is rmi-hub, we don't' need more configuration.
     if [ $type = "rmi-hub" ]; then
         return
@@ -1187,6 +1185,8 @@ function list_versions()
         exit 1
     fi
     
+    set_type_port
+    
     version_manager=escenic-admin/browser/Global/neo/io/managers/VersionManager
     url=http://$host:$port/$version_manager
         
@@ -1208,8 +1208,6 @@ function list_versions()
 
 function update_publication_resources()
 {
-    url=http://${host}:${port}/escenic-admin/publication-resources
-
     if [ ! -r $resource ]; then
         print $resource "doesn't exist. I will exit :-("
         exit 1
@@ -1220,6 +1218,9 @@ function update_publication_resources()
         exit 1
     fi
     
+    set_type_port
+    url=http://${host}:${port}/escenic-admin/publication-resources
+
     case "$(basename $resource)" in
         content-type)
             url=${url}/${publication}/escenic/content-type

From 28121315e6a8e962069e99c44ed2014ca10df054 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 28 Oct 2011 16:25:25 +0800
Subject: [PATCH 0120/2585] - As Mogsie says: Solr complains if it doesn't get
 to create the index   directory itself...

  Hence, simplifying the solr data dir in the engine_dir_list

  https://github.com/skybert/ece-scripts/issues/10
---
 usr/sbin/ece-install | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 13d17b89..750080d5 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -134,7 +134,7 @@ http://technet.escenic.com/downloads/assemblytool-2.0.2.zip
 http://technet.escenic.com/downloads/release/53/analysis-engine-2.3.6.0.zip
 http://technet.escenic.com/downloads/release/53/community-engine-3.6.1.0.zip
 http://technet.escenic.com/downloads/release/53/dashboard-1.0.0.0.zip
-http://technet.escenic.com/downloads/release/53/engine-5.3.2.2.zip
+http://technet.escenic.com/downloads/release/53/engine-5.3.3.2.zip
 http://technet.escenic.com/downloads/release/53/forum-3.0.0.0.zip
 http://technet.escenic.com/downloads/release/53/inpage-1.3.0.0.zip
 http://technet.escenic.com/downloads/release/53/lucy-dist-4.1.6.0.zip
@@ -169,7 +169,7 @@ $common_nursery_dir
 /var/cache/escenic
 /var/crash/escenic
 /var/lib/escenic
-/var/lib/escenic/solr/data/index
+/var/lib/escenic/solr/data
 /var/log/escenic
 /var/run/escenic
 /var/spool/escenic/migration

From 24968abe0684aad7a96bc649b510444c4c78103f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 2 Nov 2011 11:22:57 +0800
Subject: [PATCH 0121/2585] - the test for publication in
 update_publication_resources was -x (!)

---
 usr/bin/ece | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 079af1f9..54cd7457 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -906,7 +906,7 @@ function assemble()
     message="Assembling your EAR file"
     print $message ".."
     log $message "..." >> $log_file
-    
+
     cd $assemblytool_home && \
         ant -q ear -DskipRedundancyCheck=true \
         1>>$log_file \
@@ -1213,7 +1213,7 @@ function update_publication_resources()
         exit 1
     fi
 
-    if [ -x $publication ]; then
+    if [ -z $publication ]; then
         print "You must specify which publication to update (-p <publication>)"
         exit 1
     fi

From 1de951840bbd1fd46d5dcc52a01312d41e3a634b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 2 Nov 2011 12:03:16 +0800
Subject: [PATCH 0122/2585] - added an edit command to ece in the context of a
 publication to easy   update a publication resource:

  $ ece -i dev1 -p ip -r layout-group edit

  Here, ece will use the "dev1" instance and "ip" publication to
  download the layout-group resource to a temporary directory. ece
  will then open this file for you with the editor defined in the
  EDITOR environment variable.

  After editing & exiting from your editor, ece will update the
  resource, if the checksum of the file has changed after first
  downloading it.
---
 usr/bin/ece | 35 ++++++++++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 54cd7457..4c41fde1 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -1208,7 +1208,7 @@ function list_versions()
 
 function update_publication_resources()
 {
-    if [ ! -r $resource ]; then
+    if [[ ! -r $resource && -z "$1" ]]; then
         print $resource "doesn't exist. I will exit :-("
         exit 1
     fi
@@ -1248,15 +1248,41 @@ function update_publication_resources()
             exit 1
     esac        
 
+    local tmp_dir=$(mktemp -d)
+    
+    if [ $1 ]; then
+        if [[ -z "$EDITOR" || ! -x $(which $EDITOR) ]]; then
+            print "You must have a valid editor defined in your EDITOR variable"
+            exit 1
+        fi
+        
+        run cd $tmp_dir;
+        run wget $url
+        md5sum ${resource} > ${resource}.md5sum
+        exit_on_error "md5sum ${resource}"
+
+        $EDITOR ${resource}
+        md5sum -c ${resource}.md5sum \
+            1>>$log_file \
+            2>>$log_file
+        if [ $? -eq 0 ]; then
+            print "You didn't make any changes to ${resource}, I will exit."
+            exit 1
+        fi
+    fi
+    
     print "Updating the $(basename $resource) resource for the $publication" \
-        "publication"
+        "publication ..."
     
     debug POSTing $resource to $url
     wget -O - \
         --post-file ${resource} \
         $url \
         1>>$log_file 2>>$log_file
-        
+
+    if [ -d $tmp_dir ]; then
+        run rm -rf $tmp_dir
+    fi
 }
 
 function show_all_log_paths()
@@ -1379,6 +1405,9 @@ for el in $command; do
         update)
             update_publication_resources
             ;;
+        edit)
+            update_publication_resources "edit_first"
+            ;;
         backup)
             clean_up
             backup_type

From 0c4e05453096aae7e90deb77ca696d0850da206d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 2 Nov 2011 13:29:47 +0800
Subject: [PATCH 0123/2585] - added edit to the help screen

---
 usr/bin/ece | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/bin/ece b/usr/bin/ece
index 4c41fde1..159bc511 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -1341,6 +1341,7 @@ function print_help()
     echo "   backup     backs up an entire instance (takes time)"
     echo "   clean      removes temporary files created by $0 *)"
     echo "   deploy     deploys the assembled EAR *)"
+    echo "   edit       lets you edit a publication resource"
     echo "   help       prints this help screen"
     echo "   kill       uses force to stop the type"
     echo "   log        the type's log4j log **)"

From ee55e316089e1804993ec280d26959ec8b7a2501 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 2 Nov 2011 13:29:58 +0800
Subject: [PATCH 0124/2585] - added autocompletion for the edit command

---
 etc/bash_completion.d/ece | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/etc/bash_completion.d/ece b/etc/bash_completion.d/ece
index 54d5ae2c..a5810d1e 100644
--- a/etc/bash_completion.d/ece
+++ b/etc/bash_completion.d/ece
@@ -1,10 +1,11 @@
 # auto completion for the /usr/bin/ece command.
+
 _ece_commands()
 {
     local cur=${COMP_WORDS[COMP_CWORD]}
     local prev=${COMP_WORDS[COMP_CWORD-1]}
 
-    commands="applog assemble backup clean deploy help kill log loglist outlog restart start status stop threaddump update versions"
+    commands="applog assemble backup clean deploy edit help kill log loglist outlog restart start status stop threaddump update versions"
     resources="content-type feature layout layout-group image-version menu"
     types="engine search analysis rmi-hub"
 
@@ -14,17 +15,15 @@ _ece_commands()
     instances=""
     dir=/etc/escenic/engine/instance
     if [ -r $dir ] ; then
-        cd $dir
-        for el in *; do
-            instances=${el}" "$instances
+        for el in ${dir}/*; do
+            instances=$(basename ${el})" "$instances
         done
     fi
     
     publications=""
     dir=/opt/escenic/assemblytool/publications
     if [ -r $dir ] ; then
-        cd $dir
-        for el in *.properties; do
+        for el in ${dir}/*.properties; do
             publications=$(basename $el .properties)" "$publications
         done
     fi

From 459f77ff04fcc6b89a1b73d9925ac13b9cc67ceb Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 2 Nov 2011 16:56:52 +0800
Subject: [PATCH 0125/2585] - added auto completion of option switches - added
 auto completion of option values, also for the long versions   of the option
 names.

---
 etc/bash_completion.d/ece | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/etc/bash_completion.d/ece b/etc/bash_completion.d/ece
index a5810d1e..6c5cc56e 100644
--- a/etc/bash_completion.d/ece
+++ b/etc/bash_completion.d/ece
@@ -5,12 +5,15 @@ _ece_commands()
     local cur=${COMP_WORDS[COMP_CWORD]}
     local prev=${COMP_WORDS[COMP_CWORD-1]}
 
-    commands="applog assemble backup clean deploy edit help kill log loglist outlog restart start status stop threaddump update versions"
+    commands="applog assemble backup clean deploy edit help kill log loglist \
+              outlog restart start status stop threaddump update versions"
+    options="-i --instance -p --publication -r --publication-resource \
+             -t --type"
     resources="content-type feature layout layout-group image-version menu"
     types="engine search analysis rmi-hub"
 
     # default completions is the list of commands
-    completions=$commands
+    completions=$commands" "$options
 
     instances=""
     dir=/etc/escenic/engine/instance
@@ -32,16 +35,16 @@ _ece_commands()
         backup)
             completions="--exclude-binaries"
             ;;
-        -t)
+        -t|--type)
             completions=$types
             ;;
-        -i)
+        -i|--instance)
             completions=$instances
             ;;
-        -p)
+        -p|--publication)
             completions=$publications
             ;;
-        -r)
+        -r|--publication-resource)
             completions=$resources
             ;;
     esac

From cbf67297c8851a6704766adace852943483852f2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 3 Nov 2011 18:57:29 +0800
Subject: [PATCH 0126/2585] - added auto completion of ECOME's security
 resource

---
 etc/bash_completion.d/ece | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/etc/bash_completion.d/ece b/etc/bash_completion.d/ece
index 6c5cc56e..c7ce8ee9 100644
--- a/etc/bash_completion.d/ece
+++ b/etc/bash_completion.d/ece
@@ -8,8 +8,9 @@ _ece_commands()
     commands="applog assemble backup clean deploy edit help kill log loglist \
               outlog restart start status stop threaddump update versions"
     options="-i --instance -p --publication -r --publication-resource \
-             -t --type"
-    resources="content-type feature layout layout-group image-version menu"
+             -t --type -u --user -w --password"
+    resources="content-type feature layout layout-group image-version menu \
+               security"
     types="engine search analysis rmi-hub"
 
     # default completions is the list of commands

From f3e451b39b3471a7ff44c8a6685fdbcc78225463 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 9 Nov 2011 08:02:53 +0800
Subject: [PATCH 0127/2585] - added the chance to change the section parameters
 for the root   section:

  ece -i dev1 -p mypub -r root-section-parameters edit

- added -u/--user and -w/--password options to the script. When set,
  the commands which use curl and wget behind the scences will use
  these values for doing the HTTP operations.
---
 usr/bin/ece | 66 +++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 59 insertions(+), 7 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 159bc511..6d454d62 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -22,6 +22,10 @@ type=engine
 instance=default
 command=""
 backup_exclude_binaries=0
+http_user=""
+http_password=""
+wget_auth=""
+curl_auth=""
 
 type_list="
 engine
@@ -210,6 +214,11 @@ function set_common_settings()
       $log_dir/messages
       $log_dir/Escenic-error.log
     "
+
+    if [[ -n "$http_user" && -n "$http_password" ]]; then
+        wget_auth="--http-user $http_user --http-password $http_password"
+        curl_auth="-u ${http_user}:${http_password}"
+    fi
 }
 
 function set_type_settings()
@@ -904,7 +913,7 @@ function assemble()
     fi
 
     message="Assembling your EAR file"
-    print $message ".."
+    print $message "..."
     log $message "..." >> $log_file
 
     cd $assemblytool_home && \
@@ -1030,16 +1039,20 @@ function set_type_command_and_instance()
     next_is_instance=0
     next_is_publication=0
     next_is_resource=0
+    next_is_http_user=0
+    next_is_http_password=0
     
     for el in $@; do
         if [ $el = "-v" -o $el = "--verbose" ]; then
             verbose=1
             continue
         fi
+        
         if [ $el = "-q" -o $el = "--quiet" ]; then
             quiet=1
             continue
         fi
+        
         if [ $el = "--help" ]; then
             command=help
             continue
@@ -1051,6 +1064,18 @@ function set_type_command_and_instance()
             continue
         fi
         
+        if [ $next_is_http_user -eq 1 ]; then
+            http_user=$el
+            next_is_http_user=0
+            continue
+        fi
+        
+        if [ $next_is_http_password -eq 1 ]; then
+            http_password=$el
+            next_is_http_password=0
+            continue
+        fi
+        
         if [ $next_is_instance -eq 1 ]; then
             instance=$el
             next_is_instance=0
@@ -1096,6 +1121,20 @@ function set_type_command_and_instance()
         else
             next_is_resource=0
         fi
+        
+        if [ $el = "-u" -o $el = "--user" ]; then
+            next_is_http_user=1
+            continue
+        else
+            next_is_http_user=0
+        fi
+        
+        if [ $el = "-w" -o $el = "--password" ]; then
+            next_is_http_password=1
+            continue
+        else
+            next_is_http_password=0
+        fi
 
         if [ $el = "--exclude-binaries" ]; then
             backup_exclude_binaries=1
@@ -1191,7 +1230,7 @@ function list_versions()
     url=http://$host:$port/$version_manager
         
     print "Installed on the ${type} running on ${host}:${port} is:"
-    wget -O - $url  2>/dev/null | \
+    wget $wget_auth -O - $url  2>/dev/null | \
         grep "\[\[" | \
         sed 's/\[//g' | \
         sed 's/\]//g' | \
@@ -1243,6 +1282,11 @@ function update_publication_resources()
         security)
             url=${url}/${publication}/escenic/plugin/community/security
             ;;
+        root-section-parameters)
+            do_put=true
+            url=http://${host}:${port}/escenic-admin
+            url=${url}/section-parameters-declared/${publication}
+            ;;
         *)
             print "Invalid resource: $(basename $resource) :-("
             exit 1
@@ -1257,7 +1301,7 @@ function update_publication_resources()
         fi
         
         run cd $tmp_dir;
-        run wget $url
+        run wget $wget_auth $url -O ${resource}
         md5sum ${resource} > ${resource}.md5sum
         exit_on_error "md5sum ${resource}"
 
@@ -1275,10 +1319,18 @@ function update_publication_resources()
         "publication ..."
     
     debug POSTing $resource to $url
-    wget -O - \
-        --post-file ${resource} \
-        $url \
-        1>>$log_file 2>>$log_file
+    if [[ -n "$do_put" && $do_put = "true" ]]; then
+        curl -T ${resource} \
+          ${curl_auth} \
+            ${url} \
+            1>>$log_file 2>>$log_file
+    else
+        wget $wget_auth \
+            -O - \
+            --post-file ${resource} \
+            $url \
+            1>>$log_file 2>>$log_file
+    fi
 
     if [ -d $tmp_dir ]; then
         run rm -rf $tmp_dir

From 2e715cc0014b3f5212d8e7e1acfdb7ce634f42a4 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 9 Nov 2011 08:03:26 +0800
Subject: [PATCH 0128/2585] - added root-section-parameters to the auto
 completion of   -r/--publication-resource

---
 etc/bash_completion.d/ece | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/bash_completion.d/ece b/etc/bash_completion.d/ece
index c7ce8ee9..d34877d1 100644
--- a/etc/bash_completion.d/ece
+++ b/etc/bash_completion.d/ece
@@ -10,7 +10,7 @@ _ece_commands()
     options="-i --instance -p --publication -r --publication-resource \
              -t --type -u --user -w --password"
     resources="content-type feature layout layout-group image-version menu \
-               security"
+               security root-section-parameters"
     types="engine search analysis rmi-hub"
 
     # default completions is the list of commands

From 4e83ca491c5b14ad646aeebebbaec8f11590b9b8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 9 Nov 2011 08:11:53 +0800
Subject: [PATCH 0129/2585] - updated HTML

---
 usr/share/doc/escenic/ece-guide.html | 115 ++++++++++++++++++++++-----
 1 file changed, 95 insertions(+), 20 deletions(-)

diff --git a/usr/share/doc/escenic/ece-guide.html b/usr/share/doc/escenic/ece-guide.html
index 57839ec2..92e080c3 100644
--- a/usr/share/doc/escenic/ece-guide.html
+++ b/usr/share/doc/escenic/ece-guide.html
@@ -7,7 +7,7 @@
 <title>Guide for the /usr/bin/ece Script</title>
 <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
 <meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2011-10-10 14:56:44 CST"/>
+<meta name="generated" content="2011-11-09 08:11:44 CST"/>
 <meta name="author" content="Torstein Krause Johansen"/>
 <meta name="description" content=""/>
 <meta name="keywords" content=""/>
@@ -251,11 +251,12 @@ <h2>Table of Contents</h2>
 <li><a href="#sec-6-2">6.2 Specifying instance </a>
 <ul>
 <li><a href="#sec-6-2-1">6.2.1 Specifying the instance </a></li>
-<li><a href="#sec-6-2-2">6.2.2 Using the default instance </a></li>
 </ul>
 </li>
+<li><a href="#sec-6-3">6.3 TAB completion </a></li>
 </ul>
 </li>
+<li><a href="#sec-7">7 Backup </a></li>
 </ul>
 </div>
 </div>
@@ -666,44 +667,118 @@ <h4 id="sec-6-2-1"><span class="section-number-4">6.2.1</span> Specifying the in
 </pre>
 
 
+<p>
+The script's TAB completion will also help you with completing the
+available instances on your system, so you can just type:
+</p>
+
+
+<pre class="src src-sh">$ ece -i TAB TAB
+mypub myotherpub
+</pre>
+
+
+<p>
+For this to work, the script assumes that you have installed the
+instance specific configuration in /etc/escenic/engine/instance, as is
+described in the Escenic Content Engine Installation Guide.
+</p>
+
+</div>
 </div>
 
 </div>
 
-<div id="outline-container-6-2-2" class="outline-4">
-<h4 id="sec-6-2-2"><span class="section-number-4">6.2.2</span> Using the default instance </h4>
-<div class="outline-text-4" id="text-6-2-2">
+<div id="outline-container-6-3" class="outline-3">
+<h3 id="sec-6-3"><span class="section-number-3">6.3</span> TAB completion </h3>
+<div class="outline-text-3" id="text-6-3">
 
-<p>However, on development systems and perhaps even test systems, you
-probably want to just use one instance on your host, though, and this
-is where the "default" instance comes in.
+<p>The ece script offers TAB completion of all commands, options and
+option values. For this to work, you need the completion file loaded
+from your .bashrc. 
+</p>
+<p>
+This can either be done by enabling all BASH completions on your
+system (some systems have this set up per default), refer to your OS
+documentation for this.
 </p>
 <p>
-To use the default instance, you must only have one instance installed
-on your system. More specifically, there must no instance specific
-configuration files in
+Alternatively, to just enable the ece completion, simply add the
+following line to your .bashrc:
 </p>
 
 
-<pre class="src src-sh">/etc/escenic/engine/instance
+<pre class="src src-sh"><span style="color: #7a378b;">.</span> /etc/bash_completion.d/ece
 </pre>
 
 <p>
-and that ece.conf, typically located in:
+Naturally, the bash<sub>comletion</sub>.d needs to be in the above location :-)
+</p></div>
+</div>
+
+</div>
+
+<div id="outline-container-7" class="outline-2">
+<h2 id="sec-7"><span class="section-number-2">7</span> Backup </h2>
+<div class="outline-text-2" id="text-7">
+
+<p>One of the many features of the ece script, is that you can take a
+snapshot of your current running system, which can then be restored
+using the /usr/sbin/ece-install script. 
+</p>
+<p>
+The backup will include the database, the Nursery configuration, the
+DB configuration, the Varnish configuration, the nginx congiguration,
+all the Escenic software binaries, your publication and your
+application servers.
+</p>
+<p>
+To create the backup, you'll simply do:
 </p>
 
 
-<pre class="src src-sh">/etc/escenic/ece.conf
+<pre class="src src-sh">$ ece -i editor1 backup
 </pre>
 
+
 <p>
-must contain all the settings required to run the instance.
+It will then create tarball with everything and put it in 
 </p>
+
+
+<pre class="src src-sh">/var/backups/escenic
+</pre>
+
+
 <p>
-If you've ticked all these boxes, you can issue all ece commands
-without the -i parameter.
-</p></div>
-</div>
+Sometimes, you only want to take a backup of the data files and are
+not so concerned with the Escenic and application server binaries as
+these are easily installed from elsewhere. If so, you may do the
+following:
+</p>
+
+
+<pre class="src src-sh">$ ece -i editor1 backup --exclude-binaries
+</pre>
+
+
+<p>
+When running in a production environment, it's advised to first stop
+the search instance which runs the Solr indexer, so that the Solr
+index isn't corrupted:
+</p>
+
+
+<pre class="src src-sh">$ ece -i search1 stop
+$ ece -i editor1 backup
+</pre>
+
+
+
+
+
+
+
 </div>
 </div>
 </div>
@@ -712,7 +787,7 @@ <h4 id="sec-6-2-2"><span class="section-number-4">6.2.2</span> Using the default
 <hr/>
 <p class="author">
   Author: Torstein Krause Johansen (<a href="mailto:tkj@vizrt.com">tkj@vizrt.com</a>)
-  Date: 2011-10-10 14:56:44 CST
+  Date: 2011-11-09 08:11:44 CST
 </p>
 </div>
 </body>

From 5a1a200e3e80791261e8aae300f94fdd10936c4e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 9 Nov 2011 08:14:34 +0800
Subject: [PATCH 0130/2585] - don't want to generate the .txt all the time

---
 usr/share/doc/escenic/ece-guide.txt | 262 +---------------------------
 1 file changed, 4 insertions(+), 258 deletions(-)

diff --git a/usr/share/doc/escenic/ece-guide.txt b/usr/share/doc/escenic/ece-guide.txt
index 8d7f9e5a..25725614 100644
--- a/usr/share/doc/escenic/ece-guide.txt
+++ b/usr/share/doc/escenic/ece-guide.txt
@@ -1,259 +1,5 @@
-                  Guide for the /usr/bin/ece Script
-                  =================================
-
-Author: Torstein Krause Johansen
-Date: 2011-10-07 16:47:42 CST
-
-
-Table of Contents
-=================
-1 TAB completion 
-    1.1 Completing ece commands 
-    1.2 Completing types of servers the ece scripts can operate on 
-    1.3 Completing the publication resources available 
-2 Getting an overview of all available options 
-3 Tailing log files 
-    3.1 Getting an overview of the log files 
-    3.2 Commands for tailing the log files 
-    3.3 Piping the log files to another command 
-4 Assembling a new EAR 
-5 Installation 
-    5.1 Overview of File Paths Used by the ece script 
-6 Running the ece script 
-
-
-1 TAB completion 
------------------
-The ece script offers TAB completion, given that your version of BASH
-supports this and that you have enabled it (some distributions hasn't
-turned on BASH completion per default).
-
-1.1 Completing ece commands 
-============================
-You will find yourself using this regularly, both for speed, but also
-to remember all the different options and their correct wording:
-
-
-  $ ece TAB TAB
-  applog      deploy      log         start       threaddump  
-  assemble    help        outlog      status      update      
-  clean       kill        restart     stop        versions
-
-The commands are all described in detail in "ece help"
-
-1.2 Completing types of servers the ece scripts can operate on 
-===============================================================
-
-
-  $ ece -t TAB TAB
-  analysis  engine    rmi-hub   search
-
-
-1.3 Completing the publication resources available 
-===================================================
-The ece script can update the publication resources for a given
-publication.
-
-To help selecting the correct publication resource, you can make ece
-list and complete the available resource names:
-
-
-  $ ece -p mypub -r TAB TAB
-  content-type   image-version  layout-group   
-  feature        layout         menu
-
-2 Getting an overview of all available options 
------------------------------------------------
-
-
-  $ ece help
-  Usage: /home/torstein/bin/ece [-t <type>] [-i <instance>] <command>
-  
-  DESCRIPTION
-   -t --type <type>
-        The following types are available:
-        engine  -  The Escenic Content Engine, this is the default
-                   and is the assumed type if none is specified.
-        search  -  A standalone search indexer and solr instance
-        rmi-hub -  The RMI hub responsible for the internal 
-                   communication between the ECE instances.
-        analysis - The Escenic Analysis Engine also knows as 'Stats'
-  
-   -i --instance <instance>
-        The type instance, such as editor1, web1 or search1
-  
-   -p --publication <publication>
-        Needed only for updating publication resources
-  
-   -r --resource <resource>
-        Used for updating publication resources.
-        Must be one of: content-type, feature, layout, layout-group
-                        image-version, menu
-  
-   -v --verbose
-        Prints out debug statements, useful for debugging.
-  
-  The following commands are available:
-     applog     the type's app server log
-     assemble   runs the Assembly Tool *)
-     clean      removes temporary files created by /home/torstein/bin/ece *)
-     deploy     deploys the assembled EAR *)
-     help       prints this help screen
-     kill       uses force to stop the type
-     log        the type's Log4J log
-     outlog     the [ece#engine] script log (system out log)
-     restart    restarts the type
-     start      starts the type
-     status     checks if the type is running
-     stop       stops the type
-     threaddump write a thread dump to standard out (system out log)
-     update     update publication resources
-     versions   lists the ECE component versions
-  
-  *) only applicable if type is 'engine'
-
-
-3 Tailing log files 
---------------------
-The script has a number of options to let you keep track of what's
-going on on your system.
-
-3.1 Getting an overview of the log files 
-=========================================
-The ece script will be more than happy to tell you about the log files
-on your system that are of interest to your instance:
-
-
-  $ ece -i dev1 loglist
-  [ece#engine-dev1] System out log: /var/log/escenic/engine-dev1.out
-  [ece#engine-dev1] App server log: /opt/tomcat-dev1/logs/localhost.2011-09-20.log
-  [ece#engine-dev1] log4j log: /var/log/escenic/messages
-
-
-3.2 Commands for tailing the log files 
-=======================================
-There are three different logs, which ece will let you tail. When
-tailing the log file, ece will also first print out where the file is
-located on the file system so you can open it later for further
-inspection. 
-
-
-
-  $ ece -i dev1 outlog
-  [ece#engine-dev1] Tailing the system out log /var/log/escenic/engine-dev1.out
-
-
-The available log file commands are:
-outlog: the system out log
-applog: the app server log 
-log: the log4j log
-
-3.3 Piping the log files to another command 
-============================================
-If you wish to pass the log files onto another pipe, for instance to
-grep all the log files for a certain exception or error message, you
-will find the -q parameter useful:
-
-
-  $ ece -i dev1 -q loglist | xargs grep IllegalArgumentException
-
-
-This approach is also useful if you wish to tail all the log files at
-once: 
-
-
-  $ ece -i dev1 -q loglist | xargs tail -f
-
-
-4 Assembling a new EAR 
------------------------
-The script will quite happily assemble your EAR file. Please note that
-you need to run 
-
-
-  $ ece clean assemble
-
-whenever you've upgraded either ECE or one of its plugins. The script
-will try to take care of you though and warn you of such duplication:
-
-
-  [ece#engine] Multiple versions of ECE and/or 3rd party libraries found.
-  [ece#engine] Remember, you need to run 'ece clean assemble' when
-  [ece#engine] upgrading either ECE or one of the plugins.
-  [ece#engine] Press ENTER to run 'ece clean assemble'
-
-The script will then re-run the assembly by itself.
-
-If you're just re-running the assembly after just adding a new plugin
-or want to re-build your publications after template changes, you can
-omit the clean command and just run:
-
-
-  $ ece assembly
-
-
-The EAR produced is now ready to be deployed with
-
-
-  $ ece [-i <instance>] deploy
-
-5 Installation 
----------------
-The ece script and ece.conf may be used on any Unix like system that
-has a fairly recent version of BASH installed.
-
-5.1 Overview of File Paths Used by the ece script 
-==================================================
-These are recommended files and locations for using the ece script:
-
-  Path                               Explanation                       
- ----------------------------------+----------------------------------
-  /usr/bin/ece                       The script itself                 
-  /etc/escenic/ece.conf              The main configuration file       
-  /etc/escenic/ece-<instance>.conf   Instance specific settings        
-  /var/cache/escenic                 Directory of assembled EAR files  
-  /tmp                               Directory for temporary files     
-
-As you can see in ece.conf, there are a number of default locations
-dealing with log files, pid files, crash files as well as application
-server files. The defaults all follow the File Hierarchy Standard, but
-you may of course change these to your liking.
-
-If you wish to put the .conf files in other places, you may like to know
-that the ece script has preset list of locations where it looks for
-the .conf files mentioned above, namely:
-
-- current working directory
-- /etc/escenic/<type>/instance/<instance name>
-- /etc/escenic/<type>/host/<hostname>
-- /etc/escenic/<type>/common
-- /etc/escenic/<type>
-- /etc/escenic
-- <current working direcotry>/../etc
-
-You may override this list of locations by setting the
-this environment variable in your .bashrc or similar:
-
-
-  ECE_CONF_LOCATIONS
-
-
-The reason for having so many options is because various Escenic
-consultants, partners and customers have requested these locations to
-fit their systems. As you can see, fitting everyone's fancy adds up
-over time :-)
-
-6 Running the ece script 
--------------------------
-You must be normal user to run the ece script, otherwise it will
-complain:
-
-
-  [ece#engine] Sorry, you cannot be root when running ece
-  [ece#engine] The root user can only use /etc/init.d/ece
-
-
-As it mentions, the root user may use the init.d script and the
-accompanying /etc/default/ece to command the different ECE, EAE and
-RMI hub instances on your system.
+See:
+https://github.com/skybert/ece-scripts/blob/master/usr/share/doc/escenic/ece-guide.org
 
+Or for the HTML version:
+http://download.escenic.com/ece-scripts/ece-install-guide.html

From a1063c14d31df1142bc05c6ec5375774414dc163 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 9 Nov 2011 08:31:02 +0800
Subject: [PATCH 0131/2585] - added section on creating backups

---
 usr/share/doc/escenic/ece-guide.org | 77 +++++++++++++++++++++++------
 1 file changed, 63 insertions(+), 14 deletions(-)

diff --git a/usr/share/doc/escenic/ece-guide.org b/usr/share/doc/escenic/ece-guide.org
index aa1e8a37..76739185 100644
--- a/usr/share/doc/escenic/ece-guide.org
+++ b/usr/share/doc/escenic/ece-guide.org
@@ -222,22 +222,71 @@ do:
 $ ece -i editor1 assemble deploy restart
 #+END_SRC
 
-*** Using the default instance 
-However, on development systems and perhaps even test systems, you
-probably want to just use one instance on your host, though, and this
-is where the "default" instance comes in.
+The script's TAB completion will also help you with completing the
+available instances on your system, so you can just type:
+#+BEGIN_SRC sh
+$ ece -i TAB TAB
+mypub myotherpub
+#+END_SRC
+
+For this to work, the script assumes that you have installed the
+instance specific configuration in /etc/escenic/engine/instance, as is
+described in the Escenic Content Engine Installation Guide.
+
+
+** TAB completion
+The ece script offers TAB completion of all commands, options and
+option values. For this to work, you need the completion file loaded
+from your .bashrc. 
+
+This can either be done by enabling all BASH completions on your
+system (some systems have this set up per default), refer to your OS
+documentation for this.
 
-To use the default instance, you must only have one instance installed
-on your system. More specifically, there must no instance specific
-configuration files in
+Alternatively, to just enable the ece completion, simply add the
+following line to your .bashrc:
 #+BEGIN_SRC sh
-/etc/escenic/engine/instance
-#+END_SRC 
-and that ece.conf, typically located in:
+. /etc/bash_completion.d/ece
+#+END_SRC
+Naturally, the bash_comletion.d needs to be in the above location :-)
+* Backup
+One of the many features of the ece script, is that you can take a
+snapshot of your current running system, which can then be restored
+using the /usr/sbin/ece-install script. 
+
+The backup will include the database, the Nursery configuration, the
+DB configuration, the Varnish configuration, the nginx congiguration,
+all the Escenic software binaries, your publication and your
+application servers.
+
+To create the backup, you'll simply do:
 #+BEGIN_SRC sh
-/etc/escenic/ece.conf
+$ ece -i editor1 backup
 #+END_SRC
-must contain all the settings required to run the instance.
 
-If you've ticked all these boxes, you can issue all ece commands
-without the -i parameter.
+It will then create tarball with everything and put it in 
+#+BEGIN_SRC sh
+/var/backups/escenic
+#+END_SRC
+
+Sometimes, you only want to take a backup of the data files and are
+not so concerned with the Escenic and application server binaries as
+these are easily installed from elsewhere. If so, you may do the
+following:
+#+BEGIN_SRC sh
+$ ece -i editor1 backup --exclude-binaries
+#+END_SRC
+
+When running in a production environment, it's advised to first stop
+the search instance which runs the Solr indexer, so that the Solr
+index isn't corrupted:
+#+BEGIN_SRC sh
+$ ece -i search1 stop
+$ ece -i editor1 backup
+#+END_SRC
+
+
+
+
+
+

From 81c07b364acc76fc5f3595db27a3dcdd9fbcc24a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 9 Nov 2011 08:31:16 +0800
Subject: [PATCH 0132/2585] - updated HTML

---
 usr/share/doc/escenic/ece-guide.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/doc/escenic/ece-guide.html b/usr/share/doc/escenic/ece-guide.html
index 92e080c3..4546c90e 100644
--- a/usr/share/doc/escenic/ece-guide.html
+++ b/usr/share/doc/escenic/ece-guide.html
@@ -7,7 +7,7 @@
 <title>Guide for the /usr/bin/ece Script</title>
 <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
 <meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2011-11-09 08:11:44 CST"/>
+<meta name="generated" content="2011-11-09 08:31:08 CST"/>
 <meta name="author" content="Torstein Krause Johansen"/>
 <meta name="description" content=""/>
 <meta name="keywords" content=""/>
@@ -787,7 +787,7 @@ <h2 id="sec-7"><span class="section-number-2">7</span> Backup </h2>
 <hr/>
 <p class="author">
   Author: Torstein Krause Johansen (<a href="mailto:tkj@vizrt.com">tkj@vizrt.com</a>)
-  Date: 2011-11-09 08:11:44 CST
+  Date: 2011-11-09 08:31:08 CST
 </p>
 </div>
 </body>

From ac3b9dd64fe98f97dfc3ba8e483d5c7563040c76 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 9 Nov 2011 16:45:25 +0800
Subject: [PATCH 0133/2585] - added support for .ecerc. If the user has this
 file in his/her home   directory, he/she can define default values for the
 settings (like):

  http_user=admin
  http_password=nottellingyou

  These settings can still be overridden on the command line using the
  -u/--user and -w/--password options.
---
 usr/bin/ece | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/usr/bin/ece b/usr/bin/ece
index 6d454d62..35d5971d 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -1350,6 +1350,15 @@ function show_all_log_paths()
     fi
 }
 
+function read_rc_file_if_present()
+{
+    local rc_file=$HOME/.ecerc
+    if [ -r $rc_file ]; then
+        source $rc_file
+    fi
+}
+
+read_rc_file_if_present
 set_type_command_and_instance $@
 set_id
 set_common_settings

From a8328e922b16a2b843d82759d9984f734e46bd42 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 10 Nov 2011 18:07:50 +0800
Subject: [PATCH 0134/2585] - fixed error in adding a next step in the
 install_web_server function   when profile=all - fixed typo in message
 printed to non-Debian/Ubuntu users about   adding ECE to the desired
 runlevels.

---
 usr/sbin/ece-install | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 750080d5..3810d47b 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -2091,7 +2091,7 @@ EOF
         add_next_step "http://${HOSTNAME}:${port}/binary gives the Adactus endpoint"
     elif [ $1 -eq 1 ]; then
         add_next_step "http://${HOSTNAME}:${port}/ gives the Munin interface"
-    elif [ $2 -eq 1 ]; then
+    elif [ $1 -eq 2 ]; then
         add_next_step "http://${HOSTNAME}:${port}/       gives the Munin interface"
         add_next_step "http://${HOSTNAME}:${port}/binary gives the Adactus endpoint"
     fi
@@ -2291,7 +2291,7 @@ function add_server_to_runlevels()
         print "Adding the ece init.d script to the default run levels ..."
         run update-rc.d ece defaults
     else
-        add_next_step "Remember to add /etc/intit.d/ece to the desired "\
+        add_next_step "Remember to add /etc/init.d/ece to the desired "\
 "run levels." 
         # TODO add init.d to the default runlevels, for other
         # distributions too:

From 24429b12c52cf0e2cbd31028262b1d065064fbc5 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 10 Nov 2011 18:48:08 +0800
Subject: [PATCH 0135/2585] - added maven_opts variable, for now filled with
 --batch-mode to avoid   download progress status updates.

---
 usr/sbin/ece-install | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 3810d47b..28699ad9 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -36,6 +36,7 @@ log=/var/log/$(basename $0).log
 conf_file=$HOME/.ece-install.conf
 common_nursery_dir=/etc/escenic/engine/common
 ece_scripts_git_source=git://github.com/skybert/ece-scripts.git
+maven_opts="--batch-mode"
 
 # globals will be set to correct values in run-time.
 appserver_port=8080
@@ -1072,7 +1073,7 @@ EOF
     if [ -d /opt/escenic/widget-framework-core-* ]; then
         print "Basing ${publication_name}.war on the Widget Framework Demo ..."
         run cd /opt/escenic/widget-framework-core-*/publications/demo-core
-        run mvn package
+        run mvn $maven_opts package
         run cp target/demo-core-*.war ${publication_war}
     else
         print "Basing your ${publication_name}.war on ECE/demo-clean ..."
@@ -1948,7 +1949,7 @@ EOF
     cd $wf_maven_dir
     print "Installing Widget Framework into your Maven repository ..."
     export JAVA_HOME=$java_home
-    mvn install \
+    mvn $maven_opts install \
         1>>$log 2>>$log
 
     # installing the widget-framework-common as a ECE plugin

From 98b90ed0d5194002b70a66de328bc07db84c5872 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 10 Nov 2011 19:23:27 +0800
Subject: [PATCH 0136/2585] -  the MySQL JDBC driver was installed in the
 install_database_server,    which was wrong. It should be installed (only) in
    install_ece_third_party_packages

---
 usr/sbin/ece-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 28699ad9..8f530344 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -1617,7 +1617,7 @@ function install_database_server()
             print "Debian (or derivative) version with code name $code_name. "
             print "I will use vanilla MySQL instead."
 
-            packages="mysql-server mysql-client libmysql-java"
+            packages="mysql-server mysql-client"
             install_packages_if_missing $packages
         fi
     fi

From 4da9bdaef47ca466c4784532969e5940be413a2d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 11 Nov 2011 12:07:37 +0800
Subject: [PATCH 0137/2585] - for clarity, added sample execution of the
 script.

---
 usr/share/doc/escenic/system-info-guide.org | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/usr/share/doc/escenic/system-info-guide.org b/usr/share/doc/escenic/system-info-guide.org
index 9119a40d..4eff23f7 100644
--- a/usr/share/doc/escenic/system-info-guide.org
+++ b/usr/share/doc/escenic/system-info-guide.org
@@ -3,6 +3,10 @@ Welcome to the /usr/bin/system-info Guide
 This wee script gives a overview of your system, especially useful
 when contacting Vizrt Online/Escenic Support.
 
+#+BEGIN_SRC sh
+$ system-info
+#+END_SRC
+
 The script will default wise produce a plain text report, but if you
 pass -c or --confluence to it, it will generate Confluence Wiki markup
 instead.

From b00c62316768360ca47cc1cb54685b6f3de18ce4 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 11 Nov 2011 12:07:43 +0800
Subject: [PATCH 0138/2585] - updated HTML

---
 usr/share/doc/escenic/system-info-guide.html | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/usr/share/doc/escenic/system-info-guide.html b/usr/share/doc/escenic/system-info-guide.html
index 579bb72f..d458d9e0 100644
--- a/usr/share/doc/escenic/system-info-guide.html
+++ b/usr/share/doc/escenic/system-info-guide.html
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
                "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 lang="en" xml:lang="en">
 <head>
 <title>Welcome to the /usr/bin/system-info Guide</title>
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
+<meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
 <meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2011-10-26 13:18:12 CST"/>
+<meta name="generated" content="2011-11-11 12:07:19 CST"/>
 <meta name="author" content="Torstein Krause Johansen"/>
 <meta name="description" content=""/>
 <meta name="keywords" content=""/>
@@ -222,6 +222,13 @@ <h1 class="title">Welcome to the /usr/bin/system-info Guide</h1>
 <p>This wee script gives a overview of your system, especially useful
 when contacting Vizrt Online/Escenic Support.
 </p>
+
+
+
+<pre class="src src-sh">$ system-info
+</pre>
+
+
 <p>
 The script will default wise produce a plain text report, but if you
 pass -c or &ndash;confluence to it, it will generate Confluence Wiki markup
@@ -320,7 +327,7 @@ <h2 id="sec-1"><span class="section-number-2">1</span> Example </h2>
 <hr/>
 <p class="author">
   Author: Torstein Krause Johansen (<a href="mailto:tkj@vizrt.com">tkj@vizrt.com</a>)
-  Date: 2011-10-26 13:18:12 CST
+  Date: 2011-11-11 12:07:19 CST
 </p>
 </div>
 </body>

From fc5afe7dd984b95d70b7ad5c817a51a64338b705 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 11 Nov 2011 12:10:45 +0800
Subject: [PATCH 0139/2585] - removed .txt versions of the guides

---
 usr/share/doc/escenic/ece-guide.txt         |   5 -
 usr/share/doc/escenic/ece-install-guide.txt | 688 --------------------
 2 files changed, 693 deletions(-)
 delete mode 100644 usr/share/doc/escenic/ece-guide.txt
 delete mode 100644 usr/share/doc/escenic/ece-install-guide.txt

diff --git a/usr/share/doc/escenic/ece-guide.txt b/usr/share/doc/escenic/ece-guide.txt
deleted file mode 100644
index 25725614..00000000
--- a/usr/share/doc/escenic/ece-guide.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-See:
-https://github.com/skybert/ece-scripts/blob/master/usr/share/doc/escenic/ece-guide.org
-
-Or for the HTML version:
-http://download.escenic.com/ece-scripts/ece-install-guide.html
diff --git a/usr/share/doc/escenic/ece-install-guide.txt b/usr/share/doc/escenic/ece-install-guide.txt
deleted file mode 100644
index e1078ee3..00000000
--- a/usr/share/doc/escenic/ece-install-guide.txt
+++ /dev/null
@@ -1,688 +0,0 @@
-              Welcome to the /usr/sbin/ece-install Guide
-              ==========================================
-
-Author: Torstein Krause Johansen
-Date: 2011-10-20 18:37:17 CST
-
-
-Table of Contents
-=================
-1 Supported Operating Systems 
-        1.1 Debian based operating systems 
-        1.2 Other GNU/Linux and Unix systems 
-2 A Note on Running ece-install On Non-GNU/Linux Systems 
-3 Downloading the ece-install Script 
-4 Running the ece-install Script 
-5 Available Server Profiles 
-    5.1 Common for All Server Profiles 
-    5.2 Common for Editorial, Presentation and Search Instances 
-        5.2.1 Sun Java 6 
-        5.2.2 Apache Tomcat application server 
-        5.2.3 Basic Escenic Nursery configuration 
-        5.2.4 APR, native library for optimal Tomcat I/O performance 
-        5.2.5 Escenic Assembly environment 
-        5.2.6 Database driver 
-        5.2.7 Compression of content 
-    5.3 Profile - Full Stack on One Host 
-    5.4 Profile - Editorial Server (Publication Server) 
-    5.5 Profile - Presentation Server 
-    5.6 Profile - Database Server 
-    5.7 Profile - Cache Server 
-    5.8 Profile - Install Widget Framework 
-    5.9 Profile - Create Publication 
-    5.10 Profile - Monitoring Server 
-    5.11 Profile - Restoring from backup 
-    5.12 Running interactively 
-        5.12.1 Start ece-install and choose the Option, "Restore from backup" 
-        5.12.2 Select Which Backup to Restore 
-        5.12.3 Choose What to Restore 
-        5.12.4 Sit Back and Watch ece-install Restore the Data for You 
-    5.13 Running in FAI mode 
-    5.14 Data security 
-6 Full Automatic Install (FAI) 
-    6.1 Overview of All FAI Parameters 
-    6.2 Examples 
-        6.2.1 Installing an Editorial Server & Create a Publication 
-        6.2.2 Installing Two Presentation Servers On a Single Host 
-    6.3 Verifying That the Script Is Running In FAI Mode 
-7 Running More Than One Installation Process 
-8 Re-running ece-install (and How To Speed It Up) 
-9 Overview of File Paths Used by the ece-install script 
-10 Assumptions 
-    10.1 /etc/esecenic is shared 
-11 Uninstalling Everything That the ece-install Set Up 
-12 Example Output FAI 
-
-
-1 Supported Operating Systems 
-------------------------------
-For the best experience, run this script on Debian Squeeze (or newer),
-the latest Ubuntu LTS or most other Debian based operating systems,
-but it should work without any problems on any Unix like system that
-has a recent version of BASH.
-
-1.1 Debian based operating systems 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-If running on a Debian based operating system, ece-install will take
-care of installing all required third party software, such as database
-& caching server.
-
-1.2 Other GNU/Linux and Unix systems 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-If you're installing on another Linux or Unix system, you must first
-make sure that these 3rd party components are installed. ece-install
-will tell you which ones it cannot find and tell you to install these,
-so you can simply run it to find out which ones you need.
-
-You may also look inside the ece-install script for all calls to the
-'assert\_pre\_prequesite' method and you'll get a list of the binaries
-ece-install assumes are present.
-
-2 A Note on Running ece-install On Non-GNU/Linux Systems 
----------------------------------------------------------
-Please note, it's assumed that the OS uses GNU's tools, i.e. find, cp
-& tar. If you're running a system which has a different set of core
-tools, such as any of the BSDs (including Mac OS X) or Solaris, make
-sure that GNU's tools take precedence in the command PATH offered to
-ece-install.
-
-3 Downloading the ece-install Script 
--------------------------------------
-The ece-install script can be downloaded from:
-[https://raw.github.com/skybert/ece-scripts/master/usr/sbin/ece-install]
-or be downloaded together with the other ece-scripts using git:
-
-
-  $ git clone git@github.com:skybert/ece-scripts.git
-
-
-4 Running the ece-install Script 
----------------------------------
-You must run the script as the root user.  If you start the script as
-a regular user, it will complain:
-
-
-  [ece-install] You must be root when running ece-install
-
-To become root on Ubuntu based systems and Mac OS X, do:
-
-
-  $ sudo su
-
-On all other Unix like system, do:
-
-
-  $ su
-
-
-You will need access to [http://technet.escenic.com] and put these
-credentials in the root user's $HOME/.ece-install.conf, normally this
-means /root/.ece-install.conf, the script will also tell you this if
-you forget to provide such a configuration file:
-
-
-  [ece-install] /root/.ece-install.conf doesn't exist, I cannot live without it :-(
-
-
-As for the technet credentials, the script will also tell you if it
-cannot find what it's looking for:
-
-
-  [ece-install] Be sure to set technet_user and technet_password
-  [ece-install] in /root/.ece-install.conf
-
-
-The minimum .ece-install.conf file is thus:
-
-
-  technet_user=<user>
-  technet_password=<password>
-
-
-If you're installing WF as well, you'll need additional credentials
-for this, see the Widget Framwork section below, and if you want to
-runn a fully automatic install without any user interaction, you'll
-need to specify some FAI specific parameters, see the FAI section
-below. 
-
-With the configuration file in place, you're now ready to run it:
-
-
-  # bash ece-install [-v|--verbose]
-
-
-ece-install will try to "fail fast", exiting as soon as it detects an
-error during its execution:
-
-
-  [ece-install-1] The command [cd /does/not/exist] FAILED, exiting :-(
-  [ece-install-1] See /var/log/ece-install.log for further details.
-
-
-As a last resort, if something goes astray with the script, and the
-log file cannot give you enough clues, the ultimate way of debugging
-this is to run the BASH interpreter with the -x flag:
-
-
-  # bash -x ece-install
-
-
-Here you can see everything that BASH does when running the script,
-how the wildcard variables expand and so on. Normally, having a tail
-on /var/log/ece-install.log should be sufficient, though.
-
-5 Available Server Profiles 
-----------------------------
-When starting the script, it will ask you which server profile you
-want to install:
-
-
-  Hi, which server profile do you wish to install?
-  
-     1 - All in one, full stack on one host, suitable for dev & test environments
-     2 - Editorial (publication) server
-     3 - Presentation server (ECE + memcached).
-     4 - Database server
-     5 - Cache server (cache and web server)
-     6 - RMI hub
-     7 - Search server (Solr + indexer-webapp)
-     8 - Install Widget Framework.
-     9 - Create a new publication based on WF if available, ECE/clean-demo if not
-     10 - A monitoring server (web server + Munin gatherer)
-     11 - Restore from backup (DB, data files, binaries, conf & publications)
-  
-  Select 1-11 and press ENTER
-  Your choice [1]>
-
-5.1 Common for All Server Profiles 
-===================================
-The script will install a Munin node on the host. It will also
-install the Escenic specific Munin plugins on hosts where there are
-any Escenic server components.
-
-5.2 Common for Editorial, Presentation and Search Instances 
-============================================================
-
-5.2.1 Sun Java 6 
-~~~~~~~~~~~~~~~~~
-
-5.2.2 Apache Tomcat application server 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-- Compression of textual content (previously, this was typically set
-  up with Apache and its mod\_deflate module).
-- pooling set up tweaked for high read/write performance.
-- proper logging configuration directing solr messages to its own log.
-- routing information in the cookies
-- application server access log
-
-5.2.3 Basic Escenic Nursery configuration 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The basic Nursery configuration is taken care of for you, including RMI,
-  database, search and application server/URIs. 
-
-5.2.4 APR, native library for optimal Tomcat I/O performance 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-5.2.5 Escenic Assembly environment 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The reason why ece-install sets this up on each host, is to make the
-installation process as smooth as possible. The assembly environment
-may be removed after the installation if you want to.
-
-5.2.6 Database driver 
-~~~~~~~~~~~~~~~~~~~~~~
-
-5.2.7 Compression of content 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-This was was previously accomplished by having a web server in fron t
-of the application server (or cache server if you used ESI). A typical
-system architecture would contain Apache with mod\_deflate. However,
-this is no longer necessary as Varnish can handles ESI parsing of
-compressed content (and many other things that we before needed Apache
-for). Thus, we'll let the application server do the compression for us
-now.
-
-5.3 Profile - Full Stack on One Host 
-=====================================
-This profile is suitable for developers and admins wanting to set up a
-test environment. It will install the full stack including caching
-server, application server, ECE, assembly host, database, Widget
-Framework, as well as creating a publication for you.
-
-For further details on each of the different server components, see
-the different profile descriptions bellow.
-
-
-5.4 Profile - Editorial Server (Publication Server) 
-====================================================
-Will set up a typical editorial server (often referred to as the
-publication server in Escenic literature).
-
-5.5 Profile - Presentation Server 
-==================================
-This will set up a typical presentation server:
-- Memcached, distributed memory cache
-- Deployment setup to only deploy escenic-admin and the
-  publication(s).
-
-5.6 Profile - Database Server 
-==============================
-If ece-install is run on a support version of Debian or Ubuntu, this
-will install the excellent Percona distribution of MySQL with their
-set of high performance patches.
-
-If not, MySQL or Percona must be installed in advance.
-
-Given that the mysqld is install, this profile will download all the
-Escenic components and install the ECE database schema based from the
-SQL files contained inside the distribution bundles. To accomplish
-this, the script will make a call to drop-and-create-ecedb in the same
-directory as the ece-intall script itself.
-
-The script will fail by itself if the DB already exists:
-
-
-  [ece-install] Setting up the ECE database schema ...
-  ERROR 1007 (HY000) at line 1: Can't create database 'ece5db'; database exists
-  ERROR 1050 (42S01) at line 2: Table 'DBChangeLog' already exists
-  [ece-install] running tables FAILED, exiting :-(
-
-
-5.7 Profile - Cache Server 
-===========================
-If ece-install is run on a support version of Debian or Ubuntu, it
-will install the latest Varnish 3.0 caching server from the Varnish
-APT repository.
-
-If ece-install is run on a different platform, the admin must install
-Varnish 3.x prior to running ece-install.
-
-The script will configure Varnish for a typical Escenic site:
-- it will set up the cache server on port 80
-- will set up an access control lists of IPs which may access the
-  privileged web applications such as /escenic-admin, /escenic and
-  /webservice.
-
-  ece-install will also add the host from which you connect, making
-  sure that if you've SSH-ed into the server to conduct the install,
-  you'll automatically be included in the "staff" ACL and can access
-  all the web applications without editing these ACLs (or disabling
-  security as many does).
-
-- will set up sticky sessions/session binding
-- will set up a backend cluster and allow the user to enter the
-  different backend servers that will serve the web site.
-- will set up configuration to strip away cookies from static
-  resources, such as CSS, JS and pictures.
-- will install the nginx web server for serving static content and
-  will configure Varnish accordingly. This will be very useful for
-  Adactus servers wanting to pull content from your ECEs.
-
-TBD:
-- If run on a Linux platform, the script will tweak the kernel
-  parameters for optimal TCP handling for a web facing server.
-- let the /munin run through on port 80, requiring the connecting IPs
-  to be in the staff network ACL, defined in the Varnish
-  configuration. 
-
-5.8 Profile - Install Widget Framework 
-=======================================
-You'll need a user name and password for accessing the
-repo.escenic.com Maven repository. You should get these credentials
-when you bought Widget Framework. If you for some reason do not have
-these, please contact support@escenic.com. 
-
-If you don't have these ready in your .ece-install.conf, ece-install will
-complain:
-
-
-  [ece-install] Be sure to set wf_user and wf_password in /root/.ece-install.conf
-  [ece-install] If you don't have these, please contact support@escenic.com
-
-5.9 Profile - Create Publication 
-=================================
-This profile will create a publication for you, only asking you the
-name of the publication and which ECE instance to use for its
-creation.
-
-This installation profile will base the publication on the Widget
-Framework if its present on the system, if not, ECE's clean demo WAR
-is used as a basis.  
-
-5.10 Profile - Monitoring Server 
-=================================
-This will install a Munin gatherer and web server. The latter for
-accessing the reports generated by the former.
-
-TBD: This profile will also install the Nagios interface for
-monitoring the different nodes. 
-
-5.11 Profile - Restoring from backup 
-=====================================
-ece-install can restore from a backup made by the ece script:
-
-
-  $ ece -i <instance> backup
-
-
-As stated in the ece guide, this backup may contain (depending on
-what's available on the host where it's run):
-- database dump of the instance
-- data files (pictures, video files and so on). This is often referred
-  to as the "multimedia archive" in Escenic literature.
-- ECE, cache and web server configuration
-- Escenic software
-
-5.12 Running interactively 
-===========================
-
-5.12.1 Start ece-install and choose the Option, "Restore from backup" 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-  # ece-install
-
-
-5.12.2 Select Which Backup to Restore 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-
-  [ece-install-5] From which dataset do you wish to backup?
-      1 - engine-dev1-backup-2011-10-10.tar.gz
-      2 - engine-dev1-backup-2011-10-11.tar.gz
-  [ece-install-5] Enter the number next to the tarball, from 1 to 2
-  Your choice [1]>
-
-
-The ece script mentioned above will create backups in
-
-
-  /var/backups/escenic
-
-and the ece-install script will hence expect to find them here.
-
-5.12.3 Choose What to Restore 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-  [ece-install-12] Which part of the system do you wish to restore?
-      1 - The database
-      2 - The Solr and ECE data files (multimedia archive)
-      3 - The ECE configuration files
-      4 - The Escenic and Tomcat software binaries + publication templates
-  Your choice [1]> 2
-
-
-5.12.4 Sit Back and Watch ece-install Restore the Data for You 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-  [ece-install-13] Restoring the Solr & ECE data files on ubiquitous ...
-  [ece-install-21] - The installation is now complete! It took 0d 0h 0m 20s
-  [ece-install] Successfully restored Solr & ECE data files
-  [ece-install] from backup:  engine-dev1-backup-2011-10-12.tar.gz
-  [ece-install] Check /var/lib/escenic to verify they're all there
-
-
-5.13 Running in FAI mode 
-=========================
-If you're running in FAI mode, you can choose between these settings
-to decide what to restore and where to find the backup file to
-restore from:
-
-  Parameter                          Default   Description                                         
- ----------------------------------+---------+----------------------------------------------------
-  fai\_restore\_all                        0   Restore everything found in the backup file         
-  fai\_restore\_db                         0   Install the DB server & restore its contents        
-  fai\_restore\_data\_files                0   Restore the Solr & ECE data files                   
-  fai\_restore\_configuration              0   Restore the Solr & ECE configuration files          
-  fai\_restore\_software\_binaries         0   Restore the Escenic and Apache Tomcat software      
-  fai\_restore\_from\_file                ""   The .tar.gz produced by "ece -i <instance> backup"  
-
-For example, to restore everything possible from a given tarball, you
-need this in your .ece-install.conf:
-
-
-  fai_enabled=1
-  
-  fai_restore_from_backup=1
-  fai_restore_all=1
-  fai_restore_from_file=/var/backups/escenic/engine-dev1-backup-2011-10-10.tar.gz
-
-
-5.14 Data security 
-===================
-You should take heed when running restore, so that you're not
-restoring a system which you didn't want to change (yes, this mishap
-does happen).
-
-The ece-install script will help you a bit on the way, but the final
-responsibility always lies with you as the user. 
-
-If you're trying to restore the DB and the ECE schema already exists,
-the restore will fail:
-
-
-  [ece-install-8] Restoring the database contents on ubiquitous ...
-  [ece-install-24] Selecting the most recent database dump ece5db-2011-10-10.sql.gz
-  ERROR 1007 (HY000) at line 1: Can't create database 'ece5db'; database exists
-  ERROR 1050 (42S01) at line 25: Table '`ece5db`.`AccessControlList`' already exists
-  [ece-install-24] The command [restoring from var/backups/escenic/ece5db-2011-10-10.sql.gz] FAILED, exiting :-(
-  [ece-install-24] See /var/log/ece-install.log for further details.
-
-6 Full Automatic Install (FAI) 
--------------------------------
-The ece-install script has support for doing a full automatic install
-(FAI). You can only install one profile at a time. The profiles are
-the parameters with "install" in their name, such as:
-
-
-  fai_editor_install
-
-
-6.1 Overview of All FAI Parameters 
-===================================
-The ece-install script understands for the following settings in the
-$HOME/.ece-install.conf file of the root user:
-
-  Parameter                                   Default   Description                                    
- ----------------------------------+------------------+-----------------------------------------------
-  fai\_all\_install                                 0   Install all components on your server.         
-  fai\_cache\_install                               0   Install cache server profile                   
-  fai\_cache\_backends               ${HOSTNAME}:8080   Space separated, e.g. "app1:8080 app2:8080"    
-  fai\_db\_install                                  0   Install db profile                             
-  fai\_db\_host                             $HOSTNAME   Useful for editor & presentation profiles      
-  fai\_db\_port                                  3306   Useful for editor & presentation profiles      
-  fai\_editor\_install                              0   Install the editorial profile                  
-  fai\_editor\_name                           editor1   Name of the editor instance                    
-  fai\_editor\_port                              8080   HTTP port of the editor instance               
-  fai\_editor\_shutdown                          8005   Shutdown port of the editor instance           
-  fai\_enabled                                      0   Whether or not to run ece-install in FAI mode  
-  fai\_public\_host\_name            ${HOSTNAME}:8080   The public address for your website            
-  fai\_presentation\_install                        0   Install the presentation server profile        
-  fai\_monitoring\_server\_install                  0   Install the monitoring server profile.         
-  fai\_monitoring\_server\_ip               127.0.0.1   The IP of the monitoring server.               
-  fai\_presentation\_name                        web1   Name of the presentation server instance       
-  fai\_presentation\_port                        8080   HTTP port of the presentation server instance  
-  fai\_presentation\_shutdown                    8005   Shutdown port of the presentation instance     
-  fai\_publication\_create                          0   Create a new publication                       
-  fai\_publication\_name                        mypub   Name of the publication                        
-  fai\_publication\_use\_instance                dev1   Name of local instance to use for creation     
-  fai\_rmi\_install                                 0   Install RMI hub profile                        
-  fai\_search\_name                           search1   Name of the search instance                    
-  fai\_search\_port                              8080   HTTP port of the search instance               
-  fai\_search\_shutdown                          8005   Shutdown port of the search instance           
-  fai\_wf\_install                                  0   Install Widget Framework profile               
-
-As you've probably have guessed, 0 means "false" and 1 means "true" :-)
-
-6.2 Examples 
-=============
-
-6.2.1 Installing an Editorial Server & Create a Publication 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-To automatically install an editorial server and create a publication
-called "jollygood", the minimal configuration in .ece-install.conf
-would be:
-
-
-
-  fai_enabled=1
-  fai_editor_install=1
-  fai_publication_create=1
-  fai_publication_name=jollygood
-
-
-6.2.2 Installing Two Presentation Servers On a Single Host 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-If you wish to only install two presentation servers called "web1" and
-"web2" on your host, you will first run ece-install with:
-
-
-  fai_enabled=1
-  fai_presentation_install=1
-  fai_presentation_name=web1
-
-
-And then re-issue ece-install with the following configuration:
-
-
-  fai_enabled=1
-  fai_presentation_install=1
-  fai_presentation_name=web2
-  fai_presentation_port=8081
-  fai_presentation_shutdown=8105
-
-Notice that this configuration has some extra options since the
-previous run of ece-install could run with the default settings,
-whereas the second one needs to override these.
-
-
-6.3 Verifying That the Script Is Running In FAI Mode 
-=====================================================
-When FAI is enabled, ece-install will report:
-
-
-  [ece-install] Full Automatic Install (FAI) enabled.
-  [ece-install] All user input will be read from /root/.ece-install.conf
-
-
-7 Running More Than One Installation Process 
----------------------------------------------
-If the script believes there's already an ece-intall process running,
-it will abort:
-
-
-  [ece-install] There's already one ece-install process running. If you believe
-  [ece-install] this is wrong, e.g. if a previous run of ece-install was aborted
-  [ece-install] before it completed, you may delete /var/run/ece-install.pid and
-  [ece-install] run ece-install again.
-
-
-8 Re-running ece-install (and How To Speed It Up) 
---------------------------------------------------
-Although the initial thought behind ece-install, is to run it on a
-clean system to get up and running as soon as possible. However, you
-may want to re-run ece-install on the same host, for instance to add
-another instance of ECE, set up Widget Framework or create another
-publication.
-
-ece-install has a number of features which will try to minimise the
-time it takes to run it on consecutive runs. If running on Debian
-based systems, it will check if you already have installed
-pre-requisite 3rd party libraries and only if any are missing will it
-ask the package manager to fetch it.
-
-Likewise, ece-install will see if the Escenic artifacts or application
-server that you need are already present in the /tmp/ece-downloads
-folder, and only download the missing ones (if any).
-
-To get a list of the artifacts it'll pull from
-[http://technet.escenic.com] and http://tomcat.apache.org search for the
-following variables:
-- technet\_download\_list
-- wf\_download\_list
-- tomcat\_download
-
-9 Overview of File Paths Used by the ece-install script 
---------------------------------------------------------
-There are of course other paths involved when setting up your system,
-but these should be the most interesting ones.
-
-  Path                                          Explanation                                                       
- ---------------------------------------------+------------------------------------------------------------------
-  /etc/apt/sources.list.d/escenic.list          3rd party APT repositories added by ece-install *)                
-  /etc/default/ece                              The configuration file for the ece init.d script                  
-  /etc/escenic/ece-<instance>.conf              Instance specific settings for /usr/bin/ece                       
-  /etc/escenic/ece.conf                         Common ece.conf file for /usr/bin/ece                             
-  /etc/escenic/engine/common                    Common Nursery configuration layer                                
-  /etc/escenic/engine/common/security           Common security configuration for all ECE instances.              
-  /etc/escenic/engine/common/trace.properties   Log4j configuration, produces instance specific log files.        
-  /etc/escenic/engine/instance/<instance>       Instance specific Nursery configuration                           
-  /etc/escenic/solr                             ECE specific Solr configuration                                   
-  /etc/init.d/mysql[d]                          For starting and stopping MySQL/Percona                           
-  /etc/init.d/varnish                           For starting and stopping Varnish                                 
-  /etc/intit.d/ece                              The init.d script managing _all_ the ECE instances on your host.  
-  /etc/varnish/default.vcl                      The Varnish configuration                                         
-  /opt/escenic                                  All ECE components can be found here                              
-  /opt/escenic/assemblytool                     The assembly tool                                                 
-  /opt/escenic/assemblytool/plugins             Contains symlinks to all plugins in /opt/escenic                  
-  /opt/escenic/engine                           Symlink pointing to the current ECE                               
-  /opt/tomcat                                   Symlink pointing to the install Apache Tomcat (catalina\_home)    
-  /opt/tomcat-<instance>                        Instance specific Tomcat files (catalina\_base)                   
-  /usr/bin/ece                                  Script for operating all ECE instances + RMI hub and EAE          
-  /usr/sbin/drop-and-create-ecedb               DB script used by the ece-install script                          
-  /usr/sbin/ece-install                         The installation script described in this guide                   
-  /var/log/escenic/<type>-<instance>.log        The instance's log4j  log                                         
-  /var/log/escenic/<type>-<instance>.out        The instance system out log                                       
-  /var/log/escenic/solr.<date>.log              The Solr log (not in standard out!)                               
-  /var/run/escenic/<type>-<instance>.pid        The instance's  PID file                                          
-
-*) Applies only to Debian based systems.
-
-10 Assumptions 
----------------
-
-10.1 /etc/esecenic is shared 
-=============================
-It's assumed that the /etc/escenic directory is either on a shared
-file system or rsync-ed among the hosts that are running the ECE
-instances (the exception being database and cache servers).
- 
-
-11 Uninstalling Everything That the ece-install Set Up 
--------------------------------------------------------
-WARNING: this is potentially dangerous as some of these components may
-be used by other pieces of software you have running on your
-host. However, this may be useful if you're installing a clean
-environment and want to e.g. undo your previous install to install a
-different profile.
-
-Open the ece-install script and look for the "un\_install\_ece"
-function, it has copy and pastable commands for undoing most/all
-things set up by the script.
-
-
-12 Example Output FAI 
-----------------------
-The ece-install will often be run in FAI mode where all the settings
-are read from ~/.ece-install.conf. Given the following entries in this
-file: 
-
-
-  technet_user=apples
-  technet_password=andoranges
-  wf_user=foo
-  wf_password=bar
-  
-  fai_enabled=1
-  fai_all_install=1
-
-
-All the different components described in this guide are installed on
-the host that runs the install script.
-
-The following output is produced from ece-install:
-CANNOT INCLUDE FILE ~/tmp/ece-install.out
-

From 7a804a5e9e0fcf5055734d870ab92df147176134 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 11 Nov 2011 16:27:28 +0800
Subject: [PATCH 0140/2585] - added more logic to get_base_dir_from_bundle to
 do actually that   with .zip files containing a different root directory than
 their   file name.

  .tar.gz. and tar.bz2 files are still assumed to have the same root
  directory as their base file name.

- this made it possible to add support for using trunk snapshots of
  the engine distribution. This is very handy for Escenic R&D and QA.
  Now, you can replace the URL to the official engine distribution on
  technet with the one from hudson, e.g.:

  http://hudson.dev.escenic.com/job/Engine-dist/ws/target/engine-trunk-SNAPSHOT-bin.zip

  instead of

  http://technet.escenic.com/downloads/release/53/engine-5.3.3.2.zip
---
 usr/sbin/ece-install | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 8f530344..d4dc91ef 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -135,7 +135,7 @@ http://technet.escenic.com/downloads/assemblytool-2.0.2.zip
 http://technet.escenic.com/downloads/release/53/analysis-engine-2.3.6.0.zip
 http://technet.escenic.com/downloads/release/53/community-engine-3.6.1.0.zip
 http://technet.escenic.com/downloads/release/53/dashboard-1.0.0.0.zip
-http://technet.escenic.com/downloads/release/53/engine-5.3.3.2.zip
+http://hudson.dev.escenic.com/job/Engine-dist/ws/target/engine-trunk-SNAPSHOT-bin.zip
 http://technet.escenic.com/downloads/release/53/forum-3.0.0.0.zip
 http://technet.escenic.com/downloads/release/53/inpage-1.3.0.0.zip
 http://technet.escenic.com/downloads/release/53/lucy-dist-4.1.6.0.zip
@@ -356,13 +356,15 @@ function set_up_engine_and_plugins()
     cd /opt/escenic/
 
     for el in $technet_download_list; do
-        if [ $(basename $el | grep ^engine-[0-9] | wc -l) -gt 0 ]; then
+        if [ $(basename $el | \
+            grep -E "^engine-[0-9|^engine-trunk-SNAPSHOT"] | wc -l) -gt 0 ]; then
             engine_dir=$(get_base_dir_from_bundle $el)
+            engine_file=$(basename $el)
         fi
     done
     
     if [ ! -d ${engine_dir} ]; then
-        run unzip -u $download_dir/${engine_dir}.zip
+        run unzip -u $download_dir/${engine_file}
         if [ -h engine ]; then
             run rm engine
         fi
@@ -657,11 +659,26 @@ function install_ece_third_party_packages
 
 function get_base_dir_from_bundle()
 {
-    file_name=$(basename $1)
-    for el in .tar.gz .tar.bz2 .zip; do
-        file_name=${file_name%$el}
-    done
-
+    local file_name=$(basename $1)
+    suffix=${file_name##*.}
+
+    if [ ${suffix} = "zip" ]; then
+        # we'll look inside the archive to determine the base_dir
+        file_name=$(
+            unzip -t ${download_dir}/$file_name | \
+            awk '{print $2}' | \
+            cut -d'/' -f1 | \
+            sort | \
+            uniq | \
+            grep -v errors | \
+            grep [a-z]
+        )
+    else
+        for el in .tar.gz .tar.bz2 .zip; do
+            file_name=${file_name%$el}
+        done
+    fi
+    
     echo $file_name
 }
 

From f65690f89bf20f14e4a834fd7988898ce6263208 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 11 Nov 2011 16:34:25 +0800
Subject: [PATCH 0141/2585] - added -f/--conf-file <conf file> option to
 ece-install. Using this   parameter, the callee can specify a configuration
 file for   ece-install, overriding the default /root/.ece-install.conf

---
 usr/sbin/ece-install | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index d4dc91ef..29456508 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -2523,6 +2523,11 @@ function common_post_install()
 for el in $@; do
     if [ $el = "-v" -o $el = "--verbose" ]; then
         debug=1
+    elif [ $el = "-f" -o $el = "--conf-file" ]; then
+        next_is_conf_file=1
+    elif [[ -n $next_is_conf_file && $next_is_conf_file -eq 1 ]]; then
+        conf_file=$el
+        next_is_conf_file=0
     fi
 done
 

From a3ff72433f0c6ae56ee0317f8d6ba9650d5dbf94 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 11 Nov 2011 16:37:27 +0800
Subject: [PATCH 0142/2585] - updated the ECE bundle to version 5.3.4.3

---
 usr/sbin/ece-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 29456508..ac8a1efc 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -135,7 +135,7 @@ http://technet.escenic.com/downloads/assemblytool-2.0.2.zip
 http://technet.escenic.com/downloads/release/53/analysis-engine-2.3.6.0.zip
 http://technet.escenic.com/downloads/release/53/community-engine-3.6.1.0.zip
 http://technet.escenic.com/downloads/release/53/dashboard-1.0.0.0.zip
-http://hudson.dev.escenic.com/job/Engine-dist/ws/target/engine-trunk-SNAPSHOT-bin.zip
+http://technet.escenic.com/downloads/release/53/engine-5.3.4.3.zip
 http://technet.escenic.com/downloads/release/53/forum-3.0.0.0.zip
 http://technet.escenic.com/downloads/release/53/inpage-1.3.0.0.zip
 http://technet.escenic.com/downloads/release/53/lucy-dist-4.1.6.0.zip

From e3ab87bf87c729cd68dea0daed830da43f03dabb Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 11 Nov 2011 16:43:39 +0800
Subject: [PATCH 0143/2585] - added FAI support for search instances:

  fai_search_install

  The full list of search FAI variables is then:

  fai_search_install
  fai_search_port
  fai_search_shutdown
  fai_search_name
---
 usr/sbin/ece-install | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index ac8a1efc..0008d57c 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -1982,7 +1982,7 @@ EOF
 " Maven repository"
 }
 
-function install_search_instance()
+function install_search_server()
 {
     type=search
     install_ece_instance "search1" 0
@@ -2547,6 +2547,9 @@ if [ $fai_enabled -eq 1 ]; then
     elif [ $(get_boolean_conf_value fai_editor_install) -eq 1 ]; then
         install_profile_number=$PROFILE_EDITORIAL_SERVER
         install_editorial_server
+    elif [ $(get_boolean_conf_value fai_search_install) -eq 1 ]; then
+        install_profile_number=$PROFILE_SEARCH_SERVER
+        install_search_server
     elif [ $(get_boolean_conf_value fai_db_install) -eq 1 ]; then
         install_profile_number=$PROFILE_DB_SERVER
         install_database_server
@@ -2602,7 +2605,7 @@ else
         install_presentation_server
         ;;
         $PROFILE_SEARCH_SERVER)
-        install_search_instance
+        install_search_server
         ;;
         $PROFILE_RMI_HUB)
         install_rmi_hub

From f889d32f0f6c9a37789e99345d04b20790c2cb47 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 11 Nov 2011 17:05:40 +0800
Subject: [PATCH 0144/2585] - hardened reading of conf file from the command
 line when running the   script from a location not being in PATH (i.e.
 running   /my/long/path/ece-install instead of just "ece-install"). - if
 there's no ece-install PID for some reason, there would be one   error
 message per `print` output as get_seconds_since_start would   query the PID
 file. This has now been fixed. - fixed remove_pid_and_exit_in_error when
 there would be no PID, for   some abnormal reason. - hardened
 stop_conflicting_processes in case something prior to these   (in
 get_conf_value particularly) have created phony values.

---
 usr/sbin/ece-install | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 0008d57c..b7b98ace 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -58,9 +58,14 @@ next_steps=()
 
 function get_seconds_since_start()
 {
-    now=`date +%s`
-    started=`stat -c %Y $pid_file`
-    seconds=$(( now - started ))
+    local seconds="n/a"
+    
+    if [ -r $pid_file ]; then
+        now=`date +%s`
+        started=`stat -c %Y $pid_file`
+        seconds=$(( now - started ))
+    fi
+    
     echo "$seconds"
 }
 
@@ -95,7 +100,10 @@ function print_and_log()
 
 function remove_pid_and_exit_in_error()
 {
-    rm $pid_file
+    if [ -e $pid_file ]; then
+        rm $pid_file
+    fi
+
     exit 1
 }
 
@@ -1230,7 +1238,8 @@ function stop_conflicting_processes()
 {
     print "Stopping conflicting processes ..."
      # TODO this is dirty
-    if [ $install_profile_number -ne $PROFILE_RESTORE_FROM_BACKUP ]; then
+    if [[ -n "$install_profile_number" && \
+        $install_profile_number -ne $PROFILE_RESTORE_FROM_BACKUP ]]; then
         killall java 1>>$log 2>>$log
     fi
 }
@@ -2527,6 +2536,10 @@ for el in $@; do
         next_is_conf_file=1
     elif [[ -n $next_is_conf_file && $next_is_conf_file -eq 1 ]]; then
         conf_file=$el
+        if [ ! -e $conf_file ]; then
+            conf_file=$(pwd)/${conf_file}
+        fi
+
         next_is_conf_file=0
     fi
 done

From ac5866ebcb1d3040e9c07fee3c0bd3b76547bbda Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 11 Nov 2011 17:11:21 +0800
Subject: [PATCH 0145/2585] - added support for assembling search instances

---
 usr/bin/ece | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 35d5971d..6db7966b 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -907,8 +907,8 @@ function assemble()
     fi
     assemble_attempts=$(( $assemble_attempts + 1 ))
     
-    if [ ! $type = "engine" ]; then
-        print "You cannot assemble $type"
+    if [[ $type != "engine" && $type != "search" ]]; then
+        print "You cannot assemble instances of type $type"
         exit 1
     fi
 

From 142351b190e58b2c69b3d2e5e1a12c7d45e8aaf7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 11 Nov 2011 17:22:48 +0800
Subject: [PATCH 0146/2585] - fixed (at least) one error in
 install_search_server where it   wouldn't create the necessary directory for
 the Lucy Nursery   configuration. - added information message about
 installing a search server,   consistent with the other installation
 profiles.

---
 usr/sbin/ece-install | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index b7b98ace..37eb63e2 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -1993,6 +1993,7 @@ EOF
 
 function install_search_server()
 {
+    print "Installing a search server on $HOSTNAME ..."
     type=search
     install_ece_instance "search1" 0
     
@@ -2004,7 +2005,7 @@ EOF
 
     # TODO update instead of append
     dir=$common_nursery_dir/com/escenic/framework/search/solr
-    make_dir dir
+    make_dir $dir
     echo "solrServerURI=http://${search_host}:${search_port}/solr" \
         >>  $dir/SolrSearchEngine.properties
     
@@ -2014,16 +2015,17 @@ EOF
         >> $dir/DelegatingSearchEngine.properties
 
     dir=$common_nursery_dir/com/escenic/lucy
+    make_dir $dir
     echo "solrURI=http://${search_host}:${search_port}/solr" \
         >> $dir/LucySearchEngine.properties
 
     dir=$common_nursery_dir/com/escenic/forum/search/lucy
+    make_dir $dir
     echo "solrURI=http://${search_host}:${search_port}/solr" \
         >> $dir/SearchEngine.properties
 
     set_up_solr
     assemble_deploy_and_restart_type
-    
 }
 
 # useful for development and test environments.

From 5e38e605494d3bcbbc947ac07b122aa18d0b9315 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 11 Nov 2011 17:28:23 +0800
Subject: [PATCH 0147/2585] - for Escenic R&D and QA: support for engine
 distributions directly   from the Maven repository.

---
 usr/sbin/ece-install | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 37eb63e2..3f9c1bb8 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -365,7 +365,8 @@ function set_up_engine_and_plugins()
 
     for el in $technet_download_list; do
         if [ $(basename $el | \
-            grep -E "^engine-[0-9|^engine-trunk-SNAPSHOT"] | wc -l) -gt 0 ]; then
+            grep -E "^engine-[0-9|^engine-trunk-SNAPSHOT|^engine-dist"] | \
+            wc -l) -gt 0 ]; then
             engine_dir=$(get_base_dir_from_bundle $el)
             engine_file=$(basename $el)
         fi

From 5b2986c6e0894f8e35aa32b69e744f3d600702e3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 11 Nov 2011 18:02:06 +0800
Subject: [PATCH 0148/2585] - set_up_engine_and_plugins: fixed error in grep
 range - experimental support for installing multiple profiles in one go (FAI 
  mode).

---
 usr/sbin/ece-install | 59 +++++++++++++++++++++++++++++++++++---------
 1 file changed, 47 insertions(+), 12 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 3f9c1bb8..ebd20cf9 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -365,7 +365,7 @@ function set_up_engine_and_plugins()
 
     for el in $technet_download_list; do
         if [ $(basename $el | \
-            grep -E "^engine-[0-9|^engine-trunk-SNAPSHOT|^engine-dist"] | \
+            grep -E "^engine-[0-9]|^engine-trunk-SNAPSHOT|^engine-dist" | \
             wc -l) -gt 0 ]; then
             engine_dir=$(get_base_dir_from_bundle $el)
             engine_file=$(basename $el)
@@ -2556,43 +2556,78 @@ if [ $fai_enabled -eq 1 ]; then
     print "All user input will be read from $conf_file"
     
     common_pre_install
+
+    no_fai_profile=1
     
     if [ $(get_boolean_conf_value fai_all_install) -eq 1 ]; then
         install_profile_number=$PROFILE_ALL_IN_ONE
         install_all_in_one_environment
-    elif [ $(get_boolean_conf_value fai_editor_install) -eq 1 ]; then
+        no_fai_profile=0
+    fi
+    
+    if [ $(get_boolean_conf_value fai_editor_install) -eq 1 ]; then
         install_profile_number=$PROFILE_EDITORIAL_SERVER
         install_editorial_server
-    elif [ $(get_boolean_conf_value fai_search_install) -eq 1 ]; then
+        no_fai_profile=0
+    fi
+    
+    if [ $(get_boolean_conf_value fai_search_install) -eq 1 ]; then
         install_profile_number=$PROFILE_SEARCH_SERVER
         install_search_server
-    elif [ $(get_boolean_conf_value fai_db_install) -eq 1 ]; then
+        no_fai_profile=0
+    fi
+    
+    if [ $(get_boolean_conf_value fai_db_install) -eq 1 ]; then
         install_profile_number=$PROFILE_DB_SERVER
         install_database_server
-    elif [ $(get_boolean_conf_value fai_cache_install) -eq 1 ]; then
+        no_fai_profile=0
+    fi
+    
+    if [ $(get_boolean_conf_value fai_cache_install) -eq 1 ]; then
         install_profile_number=$PROFILE_CACHE_SERVER
         install_cache_server
         install_web_server 0
-    elif [ $(get_boolean_conf_value fai_rmi_install) -eq 1 ]; then
+        no_fai_profile=0
+    fi
+    
+    if [ $(get_boolean_conf_value fai_rmi_install) -eq 1 ]; then
         install_profile_number=$PROFILE_RMI_HUB
         install_rmi_hub
-    elif [ $(get_boolean_conf_value fai_wf_install) -eq 1 ]; then
+        no_fai_profile=0
+    fi
+    
+    if [ $(get_boolean_conf_value fai_wf_install) -eq 1 ]; then
         install_profile_number=$PROFILE_WIDGET_FRAMEWORK
         install_widget_framework
-    elif [ $(get_boolean_conf_value fai_presentation_install) -eq 1 ]; then
+        no_fai_profile=0
+    fi
+    
+    if [ $(get_boolean_conf_value fai_presentation_install) -eq 1 ]; then
         install_profile_number=$PROFILE_PRESENTATION_SERVER
         install_presentation_server
-    elif [ $(get_boolean_conf_value fai_publication_create) -eq 1 ]; then
+        no_fai_profile=0
+    fi
+    
+    if [ $(get_boolean_conf_value fai_publication_create) -eq 1 ]; then
         install_profile_number=$PROFILE_CREATE_PUBLICATION
         create_publication
-    elif [ $(get_boolean_conf_value fai_monitoring_install) -eq 1 ]; then
+        no_fai_profile=0
+    fi
+    
+    if [ $(get_boolean_conf_value fai_monitoring_install) -eq 1 ]; then
         install_profile_number=$PROFILE_MONITORING_SERVER
         install_munin_gatherer
         install_web_server 1
-    elif [ $(get_boolean_conf_value fai_restore_from_backup) -eq 1 ]; then
+        no_fai_profile=0
+    fi
+    
+    if [ $(get_boolean_conf_value fai_restore_from_backup) -eq 1 ]; then
         install_profile_number=$PROFILE_RESTORE_FROM_BACKUP
         restore_from_backup
-    else
+        no_fai_profile=0
+    fi
+    
+    if [ $no_fai_profile -eq 1 ]; then
         print "No install profile selected, be sure to have one of the "
         print "fai_<profile>_install=1 in your $conf_file"
         remove_pid_and_exit_in_error

From 8ca5b6b8d60cc7f522a5e79a0a54d6339c9377a0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 11 Nov 2011 18:29:51 +0800
Subject: [PATCH 0149/2585] - introduced wget_opts to carry the common wget
 options - added --quiet to the wget options.

---
 usr/sbin/ece-install | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index ebd20cf9..259abc0b 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -37,6 +37,7 @@ conf_file=$HOME/.ece-install.conf
 common_nursery_dir=/etc/escenic/engine/common
 ece_scripts_git_source=git://github.com/skybert/ece-scripts.git
 maven_opts="--batch-mode"
+wget_opts="--continue --inet4-only --quiet"
 
 # globals will be set to correct values in run-time.
 appserver_port=8080
@@ -231,8 +232,7 @@ function download_escenic_components()
             continue
         fi
         
-        run wget --continue \
-            --inet4-only \
+        run wget $wget_opts \
             --http-user $technet_user \
             --http-password $technet_password \
             $el 
@@ -784,7 +784,7 @@ function set_up_app_server
     fi
     
     run cd $download_dir
-    run wget --continue --inet4-only $tomcat_download
+    run wget $wget_opts $tomcat_download
     tomcat_dir=$(get_base_dir_from_bundle $tomcat_download)
     
     run cd /opt/
@@ -1808,7 +1808,7 @@ function create_publication()
         remove_pid_and_exit_in_error
     fi
 
-    print "Getting ready to create a new publiation ..."
+    print "Getting ready to create a new publication ..."
     create_publication_definition_and_war
 
     # TODO make educated guesses about the available instances on
@@ -1959,8 +1959,7 @@ EOF
     print "Downloading Widget Framework from technet.escenic.com ..."
     for el in $wf_download_list; do
         cd $download_dir
-        wget --continue \
-            --inet4-only \
+        wget $wget_opts \
             --http-user $technet_user \
             --http-password $technet_password \
             $el \
@@ -2247,9 +2246,7 @@ EOF
 
     # install the escenic_jstat munin plugin
     file=/usr/share/munin/plugins/escenic_jstat_
-    run wget \
-        --continue \
-        --inet4-only \
+    run wget $wget_opts \
         https://github.com/mogsie/escenic-munin/raw/master/escenic_jstat_ \
         -O $file
     run chmod 755 $file

From cdda6e2be935da9ae8e02d79810dd46bc5f5dd2b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 16 Nov 2011 11:57:45 +0800
Subject: [PATCH 0150/2585] - If the user didn't specify which instance to use
 and if there's    only one available instance, use that instead of asking the
 user   to provide it in sanity_check.

  This means that if there's only one instance available in
  /etc/escenic/engine/instance, the ece script will set it itself.

  E.g. when /etc/escenic/engine/instance/ has only editor1,

       ece status

       and

       ece -i editor1 status

  will be equivalent.
---
 usr/bin/ece | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 6db7966b..6582c501 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -437,7 +437,8 @@ function sanity_check()
         $type = "engine" -a \
         $(echo $command | grep help | wc -l) -eq 0 ]; then
         instance_list=$(get_instance_list)
-        if [ -n "$instance_list" ]; then
+        if [[ -n "$instance_list" && \
+            $(echo $instance_list | grep ' ' | wc -l) -gt 0 ]]; then
             print "You must specify the instance with -i <instance>"
             print "e.g. ece -i $(echo $instance_list | cut -d' ' -f1) $command"
             print "Instances available on $HOSTNAME: $instance_list"
@@ -1144,6 +1145,18 @@ function set_type_command_and_instance()
         # the only thing left at this point, is the command
         command="$command $el"
     done
+
+    # If the user didn't specify which instance to use and if there's
+    # only one available instance, use that instead of asking the user
+    # to provide it in sanity_check.
+    if [ $instance = "default" ]; then
+        local instance_list=$(get_instance_list)
+        
+        if [ $(echo $instance_list | grep ' ' | wc -l) -eq 0 ]; then
+            instance=$instance_list
+            debug "setting instance=$instance as there's only one"
+        fi
+    fi
 }
 
 function clean_up()

From edd61d6b89f9a2865840133e8d0e5d3a1383ae1d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 18 Nov 2011 11:36:06 +0800
Subject: [PATCH 0151/2585] - removed TODO about clear strategy when to run
 "clean" when doing a   new assembly as ece now takes care of this for us.

---
 usr/sbin/ece-install | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 259abc0b..3dbb9ca8 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -1732,10 +1732,11 @@ function install_ece_instance()
     ask_for_instance_name $1
     download_escenic_components
     check_for_required_downloads
-
+    
     set_up_engine_directories
     set_up_engine_and_plugins
     set_up_assembly_tool
+    
     set_up_basic_nursery_configuration
     set_up_instance_specific_nursery_configuration
     
@@ -1778,11 +1779,6 @@ function assemble_deploy_and_restart_type()
 {
     print "Assembling, deploying & starting $instance_name ..."
 
-    # TODO clear strategy on when to add 'clean' to the command list
-    # For now, we'll omit it to make the install script run as fast as
-    # possible. It should in most cases work just fine, the exception
-    # being if the script is to cater for ECE/plugin upgrades and
-    # removal of existing publications.
     ece_command="ece -i $instance_name -t $type assemble deploy restart"
     su - $ece_user -c "$ece_command" 1>>$log 2>>$log
     exit_on_error "su - $ece_user -c \"$ece_command\""

From 9362ce27b6acc2d1e494da076be84d579527816d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 21 Nov 2011 18:58:11 +0800
Subject: [PATCH 0152/2585] - added support for bundle based installation (EAR
 + configuration   bundle), drastically speeding up installation of ECE
 instances. The   two new options are:

  fai_<profile>_ear
  fai_<profile>_conf_archive

  e.g.:

  fai_presentation_ear=/tmp/engine.ear
  fai_presentation_conf_archive=/tmp/nursery-skeleton-and-security.tar.gz

  You can see in the ece-install output that it's using the supplied
  archives:

  [ece-install-4] Setting up the basic Nursery configuration ...
  [ece-install-4] Using the supplied Nursery & JAAS configuration from bundle:
  [ece-install-4] /tmp/nursery-skeleton-and-security.tar.gz

  [..]

  [ece-install-6] Assembling, deploying & starting pres1 ...
  [ece-install-7] Using the supplied EAR instead of running an assembly.

- new method: verify_that_files_exist_and_are_readable which accepts
  passing multiple files/directories
---
 usr/sbin/ece-install | 96 +++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 87 insertions(+), 9 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 3dbb9ca8..9a23afa5 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -33,7 +33,7 @@ java_home=/usr/lib/jvm/java-6-sun
 pid_file=/var/run/$(basename $0).pid
 download_dir=/tmp/ece-downloads
 log=/var/log/$(basename $0).log
-conf_file=$HOME/.ece-install.conf
+conf_file=$HOME/ece-install.conf
 common_nursery_dir=/etc/escenic/engine/common
 ece_scripts_git_source=git://github.com/skybert/ece-scripts.git
 maven_opts="--batch-mode"
@@ -469,15 +469,26 @@ function get_asterixes()
 function set_up_basic_nursery_configuration()
 {
     print "Setting up the basic Nursery configuration ..."
+
+    local escenic_home=/opt/escenic
     
-    run cp -r /opt/escenic/engine/siteconfig/config-skeleton/* \
+    if [ $(is_installing_from_archives) -eq 1 ]; then
+        print "Using the supplied Nursery & JAAS configuration from bundle:"
+        print "$ece_instance_conf_archive"
+        local dir=$(mktemp -d)
+        escenic_home=$dir
+        run cd $dir
+        run tar xzf $ece_instance_conf_archive
+    fi
+    
+    run cp -r $escenic_home/engine/siteconfig/config-skeleton/* \
         $common_nursery_dir/
-    run cp -r /opt/escenic/engine/security/ \
+    run cp -r $escenic_home/engine/security/ \
         $common_nursery_dir/
 
     make_dir /etc/escenic/engine/instance
 
-    for el in /opt/escenic/assemblytool/plugins/*; do
+    for el in $escenic_home/assemblytool/plugins/*; do
         if [ ! -d $el/misc/siteconfig/ ]; then
             continue
         fi
@@ -1723,6 +1734,57 @@ function update_type_instances_to_start_up()
     fi
 }
 
+ece_instance_ear_file=""
+ece_instance_conf_archive=""
+
+function set_archive_files_depending_on_profile()
+{
+    if [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ]; then
+        ece_instance_ear_file=$fai_presentation_ear
+        ece_instance_conf_archive=$fai_presentation_conf_archive
+    elif [ $install_profile_number -eq $PROFILE_EDITORIAL_SERVER ]; then
+        ece_instance_ear_file=$fai_editor_ear
+        ece_instance_conf_archive=$fai_editor_conf_archive
+    elif [ $install_profile_number -eq $PROFILE_SEARCH_SERVER ]; then
+        ece_instance_ear_file=$fai_search_ear
+        ece_instance_conf_archive=$fai_search_conf_archive
+    fi
+}
+
+
+# Returns 1 if we're installing the ECE instances from a provided EAR
+# file and tarball with Nursery & JAAS configuration.
+#
+function is_installing_from_archives()
+{
+    log install_profile_number=$install_profile_number
+    log ece_instance_ear_file=$ece_instance_ear_file
+    log ece_instance_conf_archive=$ece_instance_conf_archive
+
+    if [[ -z "$ece_instance_ear_file" || -z "$ece_instance_conf_archive" ]]; then
+        echo 0
+    fi
+
+    echo 1
+}
+
+# verifies that the passed file(s) exist and are readable, depends on
+# set_archive_files_depending_on_profile
+function verify_that_files_exist_and_are_readable()
+{
+    debug "Verifying that the file(s) exist(s) and are readable: $@"
+    
+    for el in $@; do
+        if [ ! -e $el ]; then
+            print "The file" $el "doesn't exist. I will exit now."
+            remove_pid_and_exit_in_error
+        elif [ ! -r $el ]; then
+            print "The file" $el "isn't readable. I will exit now."
+            remove_pid_and_exit_in_error
+        fi
+    done
+}   
+        
 # $1=<default instance name>
 # $2=<editorial server=0 | presentation server=1>
 function install_ece_instance()
@@ -1730,12 +1792,22 @@ function install_ece_instance()
     install_ece_third_party_packages
     
     ask_for_instance_name $1
-    download_escenic_components
-    check_for_required_downloads
-    
     set_up_engine_directories
-    set_up_engine_and_plugins
-    set_up_assembly_tool
+
+    set_archive_files_depending_on_profile
+    
+    # most likely, the user is _not_ installing from archives (EAR +
+    # configuration bundle), hence the false test goes first.
+    if [ $(is_installing_from_archives) -eq 0 ]; then
+        download_escenic_components
+        check_for_required_downloads
+        set_up_engine_and_plugins
+        set_up_assembly_tool
+    else
+        verify_that_files_exist_and_are_readable \
+            $ece_instance_ear_file \
+            $ece_instance_conf_archive
+    fi
     
     set_up_basic_nursery_configuration
     set_up_instance_specific_nursery_configuration
@@ -1780,6 +1852,12 @@ function assemble_deploy_and_restart_type()
     print "Assembling, deploying & starting $instance_name ..."
 
     ece_command="ece -i $instance_name -t $type assemble deploy restart"
+    if [ $(is_installing_from_archives) -eq 1 ]; then
+        run cp $ece_instance_ear_file /var/cache/escenic/engine.ear
+        ece_command="ece -i $instance_name -t $type deploy restart"
+        print "Using the supplied EAR instead of running an assembly."
+    fi
+    
     su - $ece_user -c "$ece_command" 1>>$log 2>>$log
     exit_on_error "su - $ece_user -c \"$ece_command\""
 }

From 3189e2f04e8612da3a9cea71a0cca2ac1e9b856a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 21 Nov 2011 19:24:25 +0800
Subject: [PATCH 0153/2585] - added documentation for the "installation from
 EAR file" feature.

---
 usr/share/doc/escenic/ece-install-guide.org | 112 ++++++++++++++------
 1 file changed, 82 insertions(+), 30 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index b4d5b071..59f1266d 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -367,40 +367,92 @@ the parameters with "install" in their name, such as:
 fai_editor_install
 #+END_SRC
 
+** Installing from EARs instead of Binaries
+It is possible to get ece-install to use a supplied EAR and
+configuration archive instead of using the files provided with the
+Escenic Content Engine & plugins.
+
+The EAR to provide is the one you generate with:
+#+BEGIN_SRC sh
+$ ece -i <instance> assemble 
+#+END_SRC
+Normally, the EAR will then be available in:
+#+BEGIN_SRC sh
+/var/cache/escenic/engine.ear
+#+END_SRC
+
+The configuration bundle must contain:
+#+BEGIN_SRC sh
+engine/security
+engine/siteconfig/bootstrap-skeleton
+engine/siteconfig/config-skeleton
+assemblytool/plugins/<plugin>/siteconfig
+#+END_SRC
+
+A simple way to create this bundle, is to use a server which has the
+assembly environment set up and then do:
+
+#+BEGIN_SRC sh
+$ cd /opt/escenic/engine
+$ tar czf /tmp/nursery-skeleton-and-security.tar.gz \
+  engine/security \
+  engine/siteconfig/config-skeleton/ \
+  engine/siteconfig/bootstrap-skeleton/ \
+  `find -L  assemblytool/plugins/ -name siteconfig`
+#+END_SRC
+
+/tmp/nursery-skeleton-and-security.tar.gz should now have everything
+you need. You can now configure your FAI installation to use these by,
+e.g.:
+
+#+BEGIN_SRC sh
+fai_presentation_ear=/tmp/engine.ear
+fai_presentation_conf_archive=/tmp/nursery-skeleton-and-security.tar.gz
+#+END_SRC
+
+Corresponding configuration options are available for the other server
+profiles, see the table below.
+
 ** Overview of All FAI Parameters
 The ece-install script understands for the following settings in the
 $HOME/.ece-install.conf file of the root user:
 
-|----------------------------------+------------------+-----------------------------------------------|
-| Parameter                        |          Default | Description                                   |
-|----------------------------------+------------------+-----------------------------------------------|
-| fai\_all\_install                |                0 | Install all components on your server.        |
-| fai\_cache\_install              |                0 | Install cache server profile                  |
-| fai\_cache\_backends             | ${HOSTNAME}:8080 | Space separated, e.g. "app1:8080 app2:8080"   |
-| fai\_db\_install                 |                0 | Install db profile                            |
-| fai\_db\_host                    |        $HOSTNAME | Useful for editor & presentation profiles     |
-| fai\_db\_port                    |             3306 | Useful for editor & presentation profiles     |
-| fai\_editor\_install             |                0 | Install the editorial profile                 |
-| fai\_editor\_name                |          editor1 | Name of the editor instance                   |
-| fai\_editor\_port                |             8080 | HTTP port of the editor instance              |
-| fai\_editor\_shutdown            |             8005 | Shutdown port of the editor instance          |
-| fai\_enabled                     |                0 | Whether or not to run ece-install in FAI mode |
-| fai\_public\_host\_name          | ${HOSTNAME}:8080 | The public address for your website           |
-| fai\_presentation\_install       |                0 | Install the presentation server profile       |
-| fai\_monitoring\_server\_install |                0 | Install the monitoring server profile.        |
-| fai\_monitoring\_server\_ip      |        127.0.0.1 | The IP of the monitoring server.              |
-| fai\_presentation\_name          |             web1 | Name of the presentation server instance      |
-| fai\_presentation\_port          |             8080 | HTTP port of the presentation server instance |
-| fai\_presentation\_shutdown      |             8005 | Shutdown port of the presentation instance    |
-| fai\_publication\_create         |                0 | Create a new publication                      |
-| fai\_publication\_name           |            mypub | Name of the publication                       |
-| fai\_publication\_use\_instance  |             dev1 | Name of local instance to use for creation    |
-| fai\_rmi\_install                |                0 | Install RMI hub profile                       |
-| fai\_search\_name                |          search1 | Name of the search instance                   |
-| fai\_search\_port                |             8080 | HTTP port of the search instance              |
-| fai\_search\_shutdown            |             8005 | Shutdown port of the search instance          |
-| fai\_wf\_install                 |                0 | Install Widget Framework profile              |
-|----------------------------------+------------------+-----------------------------------------------|
+|----------------------------------+------------------+-----------------------------------------------------|
+| Parameter                        |          Default | Description                                         |
+|----------------------------------+------------------+-----------------------------------------------------|
+| fai\_all\_install                |                0 | Install all components on your server.              |
+| fai\_cache\_backends             | ${HOSTNAME}:8080 | Space separated, e.g. "app1:8080 app2:8080"         |
+| fai\_cache\_install              |                0 | Install cache server profile                        |
+| fai\_db\_host                    |        $HOSTNAME | Useful for editor & presentation profiles           |
+| fai\_db\_install                 |                0 | Install db profile                                  |
+| fai\_db\_port                    |             3306 | Useful for editor & presentation profiles           |
+| fai\_editor\_conf\_archive       |               "" | conf.tar.gz to use for Nursery & JAAS configuration |
+| fai\_editor\_ear                 |               "" | EAR to use instead of the Escenic binaries          |
+| fai\_editor\_install             |                0 | Install the editorial profile                       |
+| fai\_editor\_name                |          editor1 | Name of the editor instance                         |
+| fai\_editor\_port                |             8080 | HTTP port of the editor instance                    |
+| fai\_editor\_shutdown            |             8005 | Shutdown port of the editor instance                |
+| fai\_enabled                     |                0 | Whether or not to run ece-install in FAI mode       |
+| fai\_monitoring\_server\_install |                0 | Install the monitoring server profile.              |
+| fai\_monitoring\_server\_ip      |        127.0.0.1 | The IP of the monitoring server.                    |
+| fai\_presentation\_conf\_archive |               "" | conf.tar.gz to use for Nursery & JAAS configuration |
+| fai\_presentation\_ear           |               "" | EAR to use instead of the Escenic binaries          |
+| fai\_presentation\_install       |                0 | Install the presentation server profile             |
+| fai\_presentation\_name          |             web1 | Name of the presentation server instance            |
+| fai\_presentation\_port          |             8080 | HTTP port of the presentation server instance       |
+| fai\_presentation\_shutdown      |             8005 | Shutdown port of the presentation instance          |
+| fai\_public\_host\_name          | ${HOSTNAME}:8080 | The public address for your website                 |
+| fai\_publication\_create         |                0 | Create a new publication                            |
+| fai\_publication\_name           |            mypub | Name of the publication                             |
+| fai\_publication\_use\_instance  |             dev1 | Name of local instance to use for creation          |
+| fai\_rmi\_install                |                0 | Install RMI hub profile                             |
+| fai\_search\_conf\_archive       |               "" | conf.tar.gz to use for Nursery & JAAS configuration |
+| fai\_search\_ear                 |               "" | EAR to use instead of the Escenic binaries          |
+| fai\_search\_name                |          search1 | Name of the search instance                         |
+| fai\_search\_port                |             8080 | HTTP port of the search instance                    |
+| fai\_search\_shutdown            |             8005 | Shutdown port of the search instance                |
+| fai\_wf\_install                 |                0 | Install Widget Framework profile                    |
+|----------------------------------+------------------+-----------------------------------------------------|
 
 As you've probably have guessed, 0 means "false" and 1 means "true" :-)
 

From 24f3f8e06643421c112d0503bed32c0fdd7970bd Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 21 Nov 2011 19:24:48 +0800
Subject: [PATCH 0154/2585] - updated HTML

---
 usr/share/doc/escenic/ece-install-guide.html | 171 ++++++++++++++++---
 1 file changed, 144 insertions(+), 27 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.html b/usr/share/doc/escenic/ece-install-guide.html
index feb244ab..b24855ba 100644
--- a/usr/share/doc/escenic/ece-install-guide.html
+++ b/usr/share/doc/escenic/ece-install-guide.html
@@ -7,7 +7,7 @@
 <title>Welcome to the /usr/sbin/ece-install Guide</title>
 <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
 <meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2011-10-20 18:36:20 CST"/>
+<meta name="generated" content="2011-11-21 19:24:36 CST"/>
 <meta name="author" content="Torstein Krause Johansen"/>
 <meta name="description" content=""/>
 <meta name="keywords" content=""/>
@@ -273,14 +273,15 @@ <h2>Table of Contents</h2>
 </li>
 <li><a href="#sec-6">6 Full Automatic Install (FAI) </a>
 <ul>
-<li><a href="#sec-6-1">6.1 Overview of All FAI Parameters </a></li>
-<li><a href="#sec-6-2">6.2 Examples </a>
+<li><a href="#sec-6-1">6.1 Installing from EARs instead of Binaries </a></li>
+<li><a href="#sec-6-2">6.2 Overview of All FAI Parameters </a></li>
+<li><a href="#sec-6-3">6.3 Examples </a>
 <ul>
-<li><a href="#sec-6-2-1">6.2.1 Installing an Editorial Server &amp; Create a Publication </a></li>
-<li><a href="#sec-6-2-2">6.2.2 Installing Two Presentation Servers On a Single Host </a></li>
+<li><a href="#sec-6-3-1">6.3.1 Installing an Editorial Server &amp; Create a Publication </a></li>
+<li><a href="#sec-6-3-2">6.3.2 Installing Two Presentation Servers On a Single Host </a></li>
 </ul>
 </li>
-<li><a href="#sec-6-3">6.3 Verifying That the Script Is Running In FAI Mode </a></li>
+<li><a href="#sec-6-4">6.4 Verifying That the Script Is Running In FAI Mode </a></li>
 </ul>
 </li>
 <li><a href="#sec-7">7 Running More Than One Installation Process </a></li>
@@ -492,9 +493,9 @@ <h2 id="sec-5"><span class="section-number-2">5</span> Available Server Profiles
 
 <pre class="src src-sh">Hi, which server profile do you wish to install?
 
-   1 - All<span style="color: #a020f0;"> in</span> one, full stack on one host, suitable for dev &amp; <span style="color: #7a378b;">test</span> environments
+   1 - All<span style="color: #a020f0;"> in</span> one, full stack on one host, suitable for dev &amp; <span style="color: #483d8b;">test</span> environments
    2 - Editorial (publication) server
-   3 - Presentation server (ECE + memcached)<span style="color: #7a378b;">.</span>
+   3 - Presentation server (ECE + memcached)<span style="color: #483d8b;">.</span>
    4 - Database server
    5 - Cache server (cache and web server)
    6 - RMI hub
@@ -1030,9 +1031,83 @@ <h2 id="sec-6"><span class="section-number-2">6</span> Full Automatic Install (F
 </div>
 
 <div id="outline-container-6-1" class="outline-3">
-<h3 id="sec-6-1"><span class="section-number-3">6.1</span> Overview of All FAI Parameters </h3>
+<h3 id="sec-6-1"><span class="section-number-3">6.1</span> Installing from EARs instead of Binaries </h3>
 <div class="outline-text-3" id="text-6-1">
 
+<p>It is possible to get ece-install to use a supplied EAR and
+configuration archive instead of using the files provided with the
+Escenic Content Engine &amp; plugins.
+</p>
+<p>
+The EAR to provide is the one you generate with:
+</p>
+
+
+<pre class="src src-sh">$ ece -i &lt;instance&gt; assemble 
+</pre>
+
+<p>
+Normally, the EAR will then be available in:
+</p>
+
+
+<pre class="src src-sh">/var/cache/escenic/engine.ear
+</pre>
+
+
+<p>
+The configuration bundle must contain:
+</p>
+
+
+<pre class="src src-sh">engine/security
+engine/siteconfig/bootstrap-skeleton
+engine/siteconfig/config-skeleton
+assemblytool/plugins/&lt;plugin&gt;/siteconfig
+</pre>
+
+
+<p>
+A simple way to create this bundle, is to use a server which has the
+assembly environment set up and then do:
+</p>
+
+
+
+<pre class="src src-sh">$ cd /opt/escenic/engine
+$ tar czf /tmp/nursery-skeleton-and-security.tar.gz <span style="color: #8b2252;">\</span>
+  engine/security <span style="color: #8b2252;">\</span>
+  engine/siteconfig/config-skeleton/ <span style="color: #8b2252;">\</span>
+  engine/siteconfig/bootstrap-skeleton/ <span style="color: #8b2252;">\</span>
+  <span style="color: #ff00ff;">`find -L  assemblytool/plugins/ -name siteconfig`</span>
+</pre>
+
+
+<p>
+/tmp/nursery-skeleton-and-security.tar.gz should now have everything
+you need. You can now configure your FAI installation to use these by,
+e.g.:
+</p>
+
+
+
+<pre class="src src-sh"><span style="color: #a0522d;">fai_presentation_ear</span>=/tmp/engine.ear
+<span style="color: #a0522d;">fai_presentation_conf_archive</span>=/tmp/nursery-skeleton-and-security.tar.gz
+</pre>
+
+
+<p>
+Corresponding configuration options are available for the other server
+profiles, see the table below.
+</p>
+</div>
+
+</div>
+
+<div id="outline-container-6-2" class="outline-3">
+<h3 id="sec-6-2"><span class="section-number-3">6.2</span> Overview of All FAI Parameters </h3>
+<div class="outline-text-3" id="text-6-2">
+
 <p>The ece-install script understands for the following settings in the
 $HOME/.ece-install.conf file of the root user:
 </p>
@@ -1045,27 +1120,33 @@ <h3 id="sec-6-1"><span class="section-number-3">6.1</span> Overview of All FAI P
 </thead>
 <tbody>
 <tr><td class="left">fai_all_install</td><td class="right">0</td><td class="left">Install all components on your server.</td></tr>
-<tr><td class="left">fai_cache_install</td><td class="right">0</td><td class="left">Install cache server profile</td></tr>
 <tr><td class="left">fai_cache_backends</td><td class="right">${HOSTNAME}:8080</td><td class="left">Space separated, e.g. "app1:8080 app2:8080"</td></tr>
-<tr><td class="left">fai_db_install</td><td class="right">0</td><td class="left">Install db profile</td></tr>
+<tr><td class="left">fai_cache_install</td><td class="right">0</td><td class="left">Install cache server profile</td></tr>
 <tr><td class="left">fai_db_host</td><td class="right">$HOSTNAME</td><td class="left">Useful for editor &amp; presentation profiles</td></tr>
+<tr><td class="left">fai_db_install</td><td class="right">0</td><td class="left">Install db profile</td></tr>
 <tr><td class="left">fai_db_port</td><td class="right">3306</td><td class="left">Useful for editor &amp; presentation profiles</td></tr>
+<tr><td class="left">fai_editor_conf_archive</td><td class="right">""</td><td class="left">conf.tar.gz to use for Nursery &amp; JAAS configuration</td></tr>
+<tr><td class="left">fai_editor_ear</td><td class="right">""</td><td class="left">EAR to use instead of the Escenic binaries</td></tr>
 <tr><td class="left">fai_editor_install</td><td class="right">0</td><td class="left">Install the editorial profile</td></tr>
 <tr><td class="left">fai_editor_name</td><td class="right">editor1</td><td class="left">Name of the editor instance</td></tr>
 <tr><td class="left">fai_editor_port</td><td class="right">8080</td><td class="left">HTTP port of the editor instance</td></tr>
 <tr><td class="left">fai_editor_shutdown</td><td class="right">8005</td><td class="left">Shutdown port of the editor instance</td></tr>
 <tr><td class="left">fai_enabled</td><td class="right">0</td><td class="left">Whether or not to run ece-install in FAI mode</td></tr>
-<tr><td class="left">fai_public_host_name</td><td class="right">${HOSTNAME}:8080</td><td class="left">The public address for your website</td></tr>
-<tr><td class="left">fai_presentation_install</td><td class="right">0</td><td class="left">Install the presentation server profile</td></tr>
 <tr><td class="left">fai_monitoring_server_install</td><td class="right">0</td><td class="left">Install the monitoring server profile.</td></tr>
 <tr><td class="left">fai_monitoring_server_ip</td><td class="right">127.0.0.1</td><td class="left">The IP of the monitoring server.</td></tr>
+<tr><td class="left">fai_presentation_conf_archive</td><td class="right">""</td><td class="left">conf.tar.gz to use for Nursery &amp; JAAS configuration</td></tr>
+<tr><td class="left">fai_presentation_ear</td><td class="right">""</td><td class="left">EAR to use instead of the Escenic binaries</td></tr>
+<tr><td class="left">fai_presentation_install</td><td class="right">0</td><td class="left">Install the presentation server profile</td></tr>
 <tr><td class="left">fai_presentation_name</td><td class="right">web1</td><td class="left">Name of the presentation server instance</td></tr>
 <tr><td class="left">fai_presentation_port</td><td class="right">8080</td><td class="left">HTTP port of the presentation server instance</td></tr>
 <tr><td class="left">fai_presentation_shutdown</td><td class="right">8005</td><td class="left">Shutdown port of the presentation instance</td></tr>
+<tr><td class="left">fai_public_host_name</td><td class="right">${HOSTNAME}:8080</td><td class="left">The public address for your website</td></tr>
 <tr><td class="left">fai_publication_create</td><td class="right">0</td><td class="left">Create a new publication</td></tr>
 <tr><td class="left">fai_publication_name</td><td class="right">mypub</td><td class="left">Name of the publication</td></tr>
 <tr><td class="left">fai_publication_use_instance</td><td class="right">dev1</td><td class="left">Name of local instance to use for creation</td></tr>
 <tr><td class="left">fai_rmi_install</td><td class="right">0</td><td class="left">Install RMI hub profile</td></tr>
+<tr><td class="left">fai_search_conf_archive</td><td class="right">""</td><td class="left">conf.tar.gz to use for Nursery &amp; JAAS configuration</td></tr>
+<tr><td class="left">fai_search_ear</td><td class="right">""</td><td class="left">EAR to use instead of the Escenic binaries</td></tr>
 <tr><td class="left">fai_search_name</td><td class="right">search1</td><td class="left">Name of the search instance</td></tr>
 <tr><td class="left">fai_search_port</td><td class="right">8080</td><td class="left">HTTP port of the search instance</td></tr>
 <tr><td class="left">fai_search_shutdown</td><td class="right">8005</td><td class="left">Shutdown port of the search instance</td></tr>
@@ -1081,16 +1162,16 @@ <h3 id="sec-6-1"><span class="section-number-3">6.1</span> Overview of All FAI P
 
 </div>
 
-<div id="outline-container-6-2" class="outline-3">
-<h3 id="sec-6-2"><span class="section-number-3">6.2</span> Examples </h3>
-<div class="outline-text-3" id="text-6-2">
+<div id="outline-container-6-3" class="outline-3">
+<h3 id="sec-6-3"><span class="section-number-3">6.3</span> Examples </h3>
+<div class="outline-text-3" id="text-6-3">
 
 
 </div>
 
-<div id="outline-container-6-2-1" class="outline-4">
-<h4 id="sec-6-2-1"><span class="section-number-4">6.2.1</span> Installing an Editorial Server &amp; Create a Publication </h4>
-<div class="outline-text-4" id="text-6-2-1">
+<div id="outline-container-6-3-1" class="outline-4">
+<h4 id="sec-6-3-1"><span class="section-number-4">6.3.1</span> Installing an Editorial Server &amp; Create a Publication </h4>
+<div class="outline-text-4" id="text-6-3-1">
 
 <p>To automatically install an editorial server and create a publication
 called "jollygood", the minimal configuration in .ece-install.conf
@@ -1110,9 +1191,9 @@ <h4 id="sec-6-2-1"><span class="section-number-4">6.2.1</span> Installing an Edi
 
 </div>
 
-<div id="outline-container-6-2-2" class="outline-4">
-<h4 id="sec-6-2-2"><span class="section-number-4">6.2.2</span> Installing Two Presentation Servers On a Single Host </h4>
-<div class="outline-text-4" id="text-6-2-2">
+<div id="outline-container-6-3-2" class="outline-4">
+<h4 id="sec-6-3-2"><span class="section-number-4">6.3.2</span> Installing Two Presentation Servers On a Single Host </h4>
+<div class="outline-text-4" id="text-6-3-2">
 
 <p>If you wish to only install two presentation servers called "web1" and
 "web2" on your host, you will first run ece-install with:
@@ -1148,9 +1229,9 @@ <h4 id="sec-6-2-2"><span class="section-number-4">6.2.2</span> Installing Two Pr
 
 </div>
 
-<div id="outline-container-6-3" class="outline-3">
-<h3 id="sec-6-3"><span class="section-number-3">6.3</span> Verifying That the Script Is Running In FAI Mode </h3>
-<div class="outline-text-3" id="text-6-3">
+<div id="outline-container-6-4" class="outline-3">
+<h3 id="sec-6-4"><span class="section-number-3">6.4</span> Verifying That the Script Is Running In FAI Mode </h3>
+<div class="outline-text-3" id="text-6-4">
 
 <p>When FAI is enabled, ece-install will report:
 </p>
@@ -1344,8 +1425,44 @@ <h2 id="sec-12"><span class="section-number-2">12</span> Example Output FAI </h2
 </p>
 <p>
 The following output is produced from ece-install:
-CANNOT INCLUDE FILE ~/tmp/ece-install.out
 </p>
+
+
+<pre class="src src-text">[ece-install-0] Full Automatic Install (FAI) enabled.
+[ece-install-0] All user input will be read from /root/ece-install.conf
+[ece-install-0] I'm logging to /var/log/ece-install.log
+[ece-install-1] Stopping conflicting processes ...
+[ece-install-1] Installing 3rd party packages needed by ece-install ...
+[ece-install-1] Setting up the ece UNIX scripts ...
+[ece-install-2] Setting up the torstein user's UNIX environment ...
+[ece-install-2] Installing a presentation server on quanah ...
+[ece-install-2] Installing 3rd party packages needed by ECE ...
+[ece-install-4] Setting up the basic Nursery configuration ...
+[ece-install-4] Using the supplied Nursery &amp; JAAS configuration
+[ece-install-4] from the bundle: /tmp/nursery-skeleton-and-security.tar.gz
+[ece-install-4] Setting up the application server ...
+[ece-install-5] Setting up proper log4j &amp; Java logging configuration ...
+[ece-install-5] Setting correct permissions on ECE related directories ...
+[ece-install-6] Assembling, deploying &amp; starting pres1 ...
+[ece-install-7] I'm using the supplied EAR instead of running an assembly.
+[ece-install-24] Adding the ece init.d script to the default run levels ...
+[ece-install-24] Installing a Munin node on quanah ...
+[ece-install-30] The installation is now complete! It took 0d 0h 0m 30s
+[ece-install-30] - New ECE instance pres1 installed.
+[ece-install-30] - Admin interface: http://quanah:9980/escenic-admin/
+[ece-install-30] - View installed versions with: ece -i pres1 versions
+[ece-install-30] - Type 'ece help' to see all the options of this script
+[ece-install-30] - Read its guide: /usr/share/doc/escenic/ece-guide.txt
+[ece-install-30] - /etc/default/ece lists all instances started at boot time
+[ece-install-30] - A Munin node has been installed on quanah
+[ece-install-30] - Install info: /usr/share/doc/escenic/ece-install-guide.txt
+[ece-install-30] - Guide books: http://documentation.vizrt.com/ece-5.3.html
+[ece-install-30] Enjoy your time with Escenic Content Engine!
+[ece-install-30] -Vizrt Online
+
+</pre>
+
+
 </div>
 </div>
 </div>
@@ -1354,7 +1471,7 @@ <h2 id="sec-12"><span class="section-number-2">12</span> Example Output FAI </h2
 <hr/>
 <p class="author">
   Author: Torstein Krause Johansen (<a href="mailto:tkj@vizrt.com">tkj@vizrt.com</a>)
-  Date: 2011-10-20 18:36:20 CST
+  Date: 2011-11-21 19:24:36 CST
 </p>
 </div>
 </body>

From 6cb28b0dfb6469ace73e2e26675487557c6e9a7c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 21 Nov 2011 19:34:56 +0800
Subject: [PATCH 0155/2585] - .ece-install.conf -> ece-install.conf

---
 usr/share/doc/escenic/ece-install-guide.org | 24 ++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 59f1266d..b25e0af0 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -52,21 +52,21 @@ On all other Unix like system, do:
 #+END_SRC
 
 You will need access to http://technet.escenic.com and put these
-credentials in the root user's $HOME/.ece-install.conf, normally this
-means /root/.ece-install.conf, the script will also tell you this if
+credentials in the root user's $HOME/ece-install.conf, normally this
+means /root/ece-install.conf, the script will also tell you this if
 you forget to provide such a configuration file:
 #+BEGIN_SRC sh
-[ece-install] /root/.ece-install.conf doesn't exist, I cannot live without it :-(
+[ece-install] /root/ece-install.conf doesn't exist, I cannot live without it :-(
 #+END_SRC
 
 As for the technet credentials, the script will also tell you if it
 cannot find what it's looking for:
 #+BEGIN_SRC sh
 [ece-install] Be sure to set technet_user and technet_password
-[ece-install] in /root/.ece-install.conf
+[ece-install] in /root/ece-install.conf
 #+END_SRC
 
-The minimum .ece-install.conf file is thus:
+The minimum ece-install.conf file is thus:
 #+BEGIN_SRC sh
 technet_user=<user>
 technet_password=<password>
@@ -239,10 +239,10 @@ repo.escenic.com Maven repository. You should get these credentials
 when you bought Widget Framework. If you for some reason do not have
 these, please contact support@escenic.com. 
 
-If you don't have these ready in your .ece-install.conf, ece-install will
+If you don't have these ready in your ece-install.conf, ece-install will
 complain:
 #+BEGIN_SRC sh
-[ece-install] Be sure to set wf_user and wf_password in /root/.ece-install.conf
+[ece-install] Be sure to set wf_user and wf_password in /root/ece-install.conf
 [ece-install] If you don't have these, please contact support@escenic.com
 #+END_SRC
 ** Profile - Create Publication
@@ -332,7 +332,7 @@ restore from:
 |----------------------------------+---------+------------------------------------------------|
 
 For example, to restore everything possible from a given tarball, you
-need this in your .ece-install.conf:
+need this in your ece-install.conf:
 #+BEGIN_SRC conf
 fai_enabled=1
 
@@ -415,7 +415,7 @@ profiles, see the table below.
 
 ** Overview of All FAI Parameters
 The ece-install script understands for the following settings in the
-$HOME/.ece-install.conf file of the root user:
+$HOME/ece-install.conf file of the root user:
 
 |----------------------------------+------------------+-----------------------------------------------------|
 | Parameter                        |          Default | Description                                         |
@@ -459,7 +459,7 @@ As you've probably have guessed, 0 means "false" and 1 means "true" :-)
 ** Examples
 *** Installing an Editorial Server & Create a Publication
 To automatically install an editorial server and create a publication
-called "jollygood", the minimal configuration in .ece-install.conf
+called "jollygood", the minimal configuration in ece-install.conf
 would be:
 
 #+BEGIN_SRC sh
@@ -495,7 +495,7 @@ whereas the second one needs to override these.
 When FAI is enabled, ece-install will report:
 #+BEGIN_SRC sh
 [ece-install] Full Automatic Install (FAI) enabled.
-[ece-install] All user input will be read from /root/.ece-install.conf
+[ece-install] All user input will be read from /root/ece-install.conf
 #+END_SRC
 
 * Running More Than One Installation Process
@@ -589,7 +589,7 @@ things set up by the script.
 
 * Example Output FAI
 The ece-install will often be run in FAI mode where all the settings
-are read from ~/.ece-install.conf. Given the following entries in this
+are read from ~/ece-install.conf. Given the following entries in this
 file: 
 #+BEGIN_SRC sh
 technet_user=apples

From 6288be28f3f872af805ba598a90c8073e18be3ee Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 21 Nov 2011 19:38:30 +0800
Subject: [PATCH 0156/2585] - added section on using a customer configuration
 file

---
 usr/share/doc/escenic/ece-install-guide.org | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index b25e0af0..74c773d9 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -532,6 +532,16 @@ following variables:
 - wf\_download\_list
 - tomcat\_download
 
+Two other ways of speeding up the installation is (of course) to use
+the backup/restore feature or install from a EAR and configuration
+bundle, see the FAI section.
+
+* Using a Custom Configuration File for ece-install
+You can specify a different configuration by using the -f parameter: 
+#+BEGIN_SRC sh
+$ ece-install -f ece-install-presentation-server.conf
+#+END_SRC
+
 * Overview of File Paths Used by the ece-install script
 There are of course other paths involved when setting up your system,
 but these should be the most interesting ones.

From 51c8e9632a7b5d5815e992fc0af732e388d163f3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 21 Nov 2011 19:39:05 +0800
Subject: [PATCH 0157/2585] - updated HTML

---
 usr/share/doc/escenic/ece-install-guide.html | 86 ++++++++++++--------
 1 file changed, 54 insertions(+), 32 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.html b/usr/share/doc/escenic/ece-install-guide.html
index b24855ba..8c58f4e7 100644
--- a/usr/share/doc/escenic/ece-install-guide.html
+++ b/usr/share/doc/escenic/ece-install-guide.html
@@ -7,7 +7,7 @@
 <title>Welcome to the /usr/sbin/ece-install Guide</title>
 <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
 <meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2011-11-21 19:24:36 CST"/>
+<meta name="generated" content="2011-11-21 19:38:40 CST"/>
 <meta name="author" content="Torstein Krause Johansen"/>
 <meta name="description" content=""/>
 <meta name="keywords" content=""/>
@@ -286,14 +286,15 @@ <h2>Table of Contents</h2>
 </li>
 <li><a href="#sec-7">7 Running More Than One Installation Process </a></li>
 <li><a href="#sec-8">8 Re-running ece-install (and How To Speed It Up) </a></li>
-<li><a href="#sec-9">9 Overview of File Paths Used by the ece-install script </a></li>
-<li><a href="#sec-10">10 Assumptions </a>
+<li><a href="#sec-9">9 Using a Custom Configuration File for ece-install </a></li>
+<li><a href="#sec-10">10 Overview of File Paths Used by the ece-install script </a></li>
+<li><a href="#sec-11">11 Assumptions </a>
 <ul>
-<li><a href="#sec-10-1">10.1 /etc/esecenic is shared </a></li>
+<li><a href="#sec-11-1">11.1 /etc/esecenic is shared </a></li>
 </ul>
 </li>
-<li><a href="#sec-11">11 Uninstalling Everything That the ece-install Set Up </a></li>
-<li><a href="#sec-12">12 Example Output FAI </a></li>
+<li><a href="#sec-12">12 Uninstalling Everything That the ece-install Set Up </a></li>
+<li><a href="#sec-13">13 Example Output FAI </a></li>
 </ul>
 </div>
 </div>
@@ -404,13 +405,13 @@ <h2 id="sec-4"><span class="section-number-2">4</span> Running the ece-install S
 
 <p>
 You will need access to <a href="http://technet.escenic.com">http://technet.escenic.com</a> and put these
-credentials in the root user's $HOME/.ece-install.conf, normally this
-means <i>root</i>.ece-install.conf, the script will also tell you this if
+credentials in the root user's $HOME/ece-install.conf, normally this
+means /root/ece-install.conf, the script will also tell you this if
 you forget to provide such a configuration file:
 </p>
 
 
-<pre class="src src-sh">[ece-install] /root/.ece-install.conf doesn<span style="color: #8b2252;">'t exist, I cannot live without it :-(</span>
+<pre class="src src-sh">[ece-install] /root/ece-install.conf doesn<span style="color: #8b2252;">'t exist, I cannot live without it :-(</span>
 </pre>
 
 
@@ -421,12 +422,12 @@ <h2 id="sec-4"><span class="section-number-2">4</span> Running the ece-install S
 
 
 <pre class="src src-sh">[ece-install] Be sure to set technet_user and technet_password
-[ece-install]<span style="color: #a020f0;"> in</span> /root/.ece-install.conf
+[ece-install]<span style="color: #a020f0;"> in</span> /root/ece-install.conf
 </pre>
 
 
 <p>
-The minimum .ece-install.conf file is thus:
+The minimum ece-install.conf file is thus:
 </p>
 
 
@@ -769,12 +770,12 @@ <h3 id="sec-5-8"><span class="section-number-3">5.8</span> Profile - Install Wid
 these, please contact support@escenic.com. 
 </p>
 <p>
-If you don't have these ready in your .ece-install.conf, ece-install will
+If you don't have these ready in your ece-install.conf, ece-install will
 complain:
 </p>
 
 
-<pre class="src src-sh">[ece-install] Be sure to set wf_user and wf_password<span style="color: #a020f0;"> in</span> /root/.ece-install.conf
+<pre class="src src-sh">[ece-install] Be sure to set wf_user and wf_password<span style="color: #a020f0;"> in</span> /root/ece-install.conf
 [ece-install] If you don<span style="color: #8b2252;">'t have these, please contact support@escenic.com</span>
 </pre>
 
@@ -966,7 +967,7 @@ <h3 id="sec-5-13"><span class="section-number-3">5.13</span> Running in FAI mode
 
 <p>
 For example, to restore everything possible from a given tarball, you
-need this in your .ece-install.conf:
+need this in your ece-install.conf:
 </p>
 
 
@@ -1109,7 +1110,7 @@ <h3 id="sec-6-2"><span class="section-number-3">6.2</span> Overview of All FAI P
 <div class="outline-text-3" id="text-6-2">
 
 <p>The ece-install script understands for the following settings in the
-$HOME/.ece-install.conf file of the root user:
+$HOME/ece-install.conf file of the root user:
 </p>
 <table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
 <caption></caption>
@@ -1174,7 +1175,7 @@ <h4 id="sec-6-3-1"><span class="section-number-4">6.3.1</span> Installing an Edi
 <div class="outline-text-4" id="text-6-3-1">
 
 <p>To automatically install an editorial server and create a publication
-called "jollygood", the minimal configuration in .ece-install.conf
+called "jollygood", the minimal configuration in ece-install.conf
 would be:
 </p>
 
@@ -1238,7 +1239,7 @@ <h3 id="sec-6-4"><span class="section-number-3">6.4</span> Verifying That the Sc
 
 
 <pre class="src src-sh">[ece-install] Full Automatic Install (FAI) enabled.
-[ece-install] All user input will be read from /root/.ece-install.conf
+[ece-install] All user input will be read from /root/ece-install.conf
 </pre>
 
 
@@ -1303,14 +1304,35 @@ <h2 id="sec-8"><span class="section-number-2">8</span> Re-running ece-install (a
 </ul>
 
 
+<p>
+Two other ways of speeding up the installation is (of course) to use
+the backup/restore feature or install from a EAR and configuration
+bundle, see the FAI section.
+</p>
 </div>
 
 </div>
 
 <div id="outline-container-9" class="outline-2">
-<h2 id="sec-9"><span class="section-number-2">9</span> Overview of File Paths Used by the ece-install script </h2>
+<h2 id="sec-9"><span class="section-number-2">9</span> Using a Custom Configuration File for ece-install </h2>
 <div class="outline-text-2" id="text-9">
 
+<p>You can specify a different configuration by using the -f parameter: 
+</p>
+
+
+<pre class="src src-sh">$ ece-install -f ece-install-presentation-server.conf
+</pre>
+
+
+</div>
+
+</div>
+
+<div id="outline-container-10" class="outline-2">
+<h2 id="sec-10"><span class="section-number-2">10</span> Overview of File Paths Used by the ece-install script </h2>
+<div class="outline-text-2" id="text-10">
+
 <p>There are of course other paths involved when setting up your system,
 but these should be the most interesting ones.
 </p>
@@ -1359,16 +1381,16 @@ <h2 id="sec-9"><span class="section-number-2">9</span> Overview of File Paths Us
 
 </div>
 
-<div id="outline-container-10" class="outline-2">
-<h2 id="sec-10"><span class="section-number-2">10</span> Assumptions </h2>
-<div class="outline-text-2" id="text-10">
+<div id="outline-container-11" class="outline-2">
+<h2 id="sec-11"><span class="section-number-2">11</span> Assumptions </h2>
+<div class="outline-text-2" id="text-11">
 
 
 </div>
 
-<div id="outline-container-10-1" class="outline-3">
-<h3 id="sec-10-1"><span class="section-number-3">10.1</span> /etc/esecenic is shared </h3>
-<div class="outline-text-3" id="text-10-1">
+<div id="outline-container-11-1" class="outline-3">
+<h3 id="sec-11-1"><span class="section-number-3">11.1</span> /etc/esecenic is shared </h3>
+<div class="outline-text-3" id="text-11-1">
 
 <p>It's assumed that the /etc/escenic directory is either on a shared
 file system or rsync-ed among the hosts that are running the ECE
@@ -1379,9 +1401,9 @@ <h3 id="sec-10-1"><span class="section-number-3">10.1</span> /etc/esecenic is sh
 
 </div>
 
-<div id="outline-container-11" class="outline-2">
-<h2 id="sec-11"><span class="section-number-2">11</span> Uninstalling Everything That the ece-install Set Up </h2>
-<div class="outline-text-2" id="text-11">
+<div id="outline-container-12" class="outline-2">
+<h2 id="sec-12"><span class="section-number-2">12</span> Uninstalling Everything That the ece-install Set Up </h2>
+<div class="outline-text-2" id="text-12">
 
 <p>WARNING: this is potentially dangerous as some of these components may
 be used by other pieces of software you have running on your
@@ -1399,12 +1421,12 @@ <h2 id="sec-11"><span class="section-number-2">11</span> Uninstalling Everything
 
 </div>
 
-<div id="outline-container-12" class="outline-2">
-<h2 id="sec-12"><span class="section-number-2">12</span> Example Output FAI </h2>
-<div class="outline-text-2" id="text-12">
+<div id="outline-container-13" class="outline-2">
+<h2 id="sec-13"><span class="section-number-2">13</span> Example Output FAI </h2>
+<div class="outline-text-2" id="text-13">
 
 <p>The ece-install will often be run in FAI mode where all the settings
-are read from ~/.ece-install.conf. Given the following entries in this
+are read from ~/ece-install.conf. Given the following entries in this
 file: 
 </p>
 
@@ -1471,7 +1493,7 @@ <h2 id="sec-12"><span class="section-number-2">12</span> Example Output FAI </h2
 <hr/>
 <p class="author">
   Author: Torstein Krause Johansen (<a href="mailto:tkj@vizrt.com">tkj@vizrt.com</a>)
-  Date: 2011-11-21 19:24:36 CST
+  Date: 2011-11-21 19:38:40 CST
 </p>
 </div>
 </body>

From 93ea0e615232d5970b89a046f6b280aab468f2fa Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 24 Nov 2011 17:51:07 +0800
Subject: [PATCH 0158/2585] - fixed bug in is_installing_from_archives, for
 false tests, it would   always return two values :-( - fixed exit behaviour
 (sanity check) to be in accordance with the   message given.

---
 usr/sbin/ece-install | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 9a23afa5..5a521c0c 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -38,6 +38,7 @@ common_nursery_dir=/etc/escenic/engine/common
 ece_scripts_git_source=git://github.com/skybert/ece-scripts.git
 maven_opts="--batch-mode"
 wget_opts="--continue --inet4-only --quiet"
+apt_opts="--no-install-recommends"
 
 # globals will be set to correct values in run-time.
 appserver_port=8080
@@ -263,9 +264,9 @@ install_packages_if_missing()
         fi
 
         if [ $force_packages -eq 1 ]; then
-            run apt-get install --assume-yes --force-yes $@
+            run apt-get install $apt_opts --assume-yes --force-yes $@
         else
-            run apt-get install --assume-yes $@
+            run apt-get install $apt_opts --assume-yes $@
         fi
     fi
 }
@@ -1452,7 +1453,7 @@ function assert_correct_runtime_environment()
         print "If you blelieve this is wrong, e.g. if a previous run of" 
         print "$(basename $0) was aborted before it completed, you"
         print "may remove ${pid_file} and run $(basename $0) again."
-        remove_pid_and_exit_in_error
+        exit 1
     else
         echo $BASHPID > $pid_file
         started=`stat -c %Y $pid_file`
@@ -1763,6 +1764,7 @@ function is_installing_from_archives()
 
     if [[ -z "$ece_instance_ear_file" || -z "$ece_instance_conf_archive" ]]; then
         echo 0
+        return
     fi
 
     echo 1

From 2a3c1a33a4a5b628f828ee14c155ef7222825e6c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 24 Nov 2011 20:07:13 +0800
Subject: [PATCH 0159/2585] - added notes on using sudo (in general on systems
 using sudo) & nohup   (when running in FAI mode).

---
 usr/share/doc/escenic/ece-install-guide.org | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 74c773d9..f4f089ab 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -83,6 +83,13 @@ With the configuration file in place, you're now ready to run it:
 # bash ece-install [-v|--verbose]
 #+END_SRC
 
+If your systmem uses sudo to provide access to the root user, we
+recommend becoming root before running ece-install. To become root on
+a system using sudo, do:
+#+BEGIN_SRC sh
+$ sudo su -
+#+END_SRC
+
 ece-install will try to "fail fast", exiting as soon as it detects an
 error during its execution:
 #+BEGIN_SRC sh
@@ -367,6 +374,20 @@ the parameters with "install" in their name, such as:
 fai_editor_install
 #+END_SRC
 
+When running in FAI mode, you probably want to redirect standard
+output to a log file for easy reading later on:
+#+BEGIN_SRC sh
+# bash ece-install > ece-install.out &
+#+END_SRC
+
+Alternatively, you may do:
+#+BEGIN_SRC sh
+# nohup bash ece-install > ece-install.out &
+#+END_SRC
+The "nohup" at the beginning and the ampersand at the end lets you log
+out of the SSH/X session to your Linux/Unix box while the script keeps
+running in the background.
+
 ** Installing from EARs instead of Binaries
 It is possible to get ece-install to use a supplied EAR and
 configuration archive instead of using the files provided with the

From edc2be293a8ba700205812cd13a04b6364d4d501 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 24 Nov 2011 20:13:04 +0800
Subject: [PATCH 0160/2585] - removed duplicate mention of sudo precautions. -
 added note to initial sudo usage comment on just using sudo   <command>

---
 usr/share/doc/escenic/ece-install-guide.org | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index f4f089ab..640362dd 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -46,9 +46,11 @@ To become root on Ubuntu based systems and Mac OS X, do:
 #+BEGIN_SRC sh
    $ sudo su
 #+END_SRC
+Please note that just doing "sudo ece-install" may not work.
+
 On all other Unix like system, do:
 #+BEGIN_SRC sh
-   $ su
+   $ su -
 #+END_SRC
 
 You will need access to http://technet.escenic.com and put these
@@ -83,13 +85,6 @@ With the configuration file in place, you're now ready to run it:
 # bash ece-install [-v|--verbose]
 #+END_SRC
 
-If your systmem uses sudo to provide access to the root user, we
-recommend becoming root before running ece-install. To become root on
-a system using sudo, do:
-#+BEGIN_SRC sh
-$ sudo su -
-#+END_SRC
-
 ece-install will try to "fail fast", exiting as soon as it detects an
 error during its execution:
 #+BEGIN_SRC sh

From 0e28fc098208ba2f6ad094d22c40490666a09b2c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 24 Nov 2011 20:29:40 +0800
Subject: [PATCH 0161/2585] - fixed bug in create_publication_in_db where the
 Perl command HEAD   was used to get the cookie from ECE. However, this Perl
 command   isn't always installed, e.g. on a clean Debian Net install.

  Now, using "curl -I" instead, which is guaranteed to be installed at
  this point in the install script

- added logging of most of the messages formerly only outputted to
  the user/system out. This makes it easier to get a complete account
  of everything that's happened in the install process.
---
 usr/sbin/ece-install | 191 ++++++++++++++++++++++---------------------
 1 file changed, 99 insertions(+), 92 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 5a521c0c..5969f7f5 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -39,6 +39,7 @@ ece_scripts_git_source=git://github.com/skybert/ece-scripts.git
 maven_opts="--batch-mode"
 wget_opts="--continue --inet4-only --quiet"
 apt_opts="--no-install-recommends"
+curl_opts="--silent"
 
 # globals will be set to correct values in run-time.
 appserver_port=8080
@@ -199,14 +200,14 @@ function make_ln()
         if [ -e $1 -a ! -h $2 ]; then
             run ln -s $1 $2
         elif [ ! -e $1 ]; then
-            print "Tried to make a symlink to $1, but it doesn't exist"
+            print_and_log "Tried to make a symlink to $1, but it doesn't exist"
             remove_pid_and_exit_in_error
         fi
     else
         if [ -e $1 -a ! -h $(basename $1) ]; then
             run ln -s $1
         elif [ ! -e $1 ]; then
-            print "Tried to make a symlink to $1, but it doesn't exist"
+            print_and_log "Tried to make a symlink to $1, but it doesn't exist"
             remove_pid_and_exit_in_error
         fi
     fi
@@ -225,7 +226,7 @@ function download_escenic_components()
         return
     fi
     
-    print "Downloading Escenic software from technet.escenic.com ..."
+    print_and_log "Downloading Escenic software from technet.escenic.com ..."
     
     cd $download_dir
     for el in $technet_download_list; do
@@ -274,7 +275,7 @@ install_packages_if_missing()
 
 function install_common_os_packages()
 {
-    print "Installing 3rd party packages needed by $(basename $0) ..."
+    print_and_log "Installing 3rd party packages needed by $(basename $0) ..."
 
     if [ $on_debian_or_derivative -eq 1 ]; then
         # Ubuntu doesn't have git (!) but only git-core.
@@ -297,7 +298,7 @@ make_dir $ece_directories
 
 function set_up_assembly_tool()
 {
-    print "Setting up the Assembly Tool ..."
+    print_and_log "Setting up the Assembly Tool ..."
     
     make_dir /opt/escenic/assemblytool/
     cd /opt/escenic/assemblytool/
@@ -359,7 +360,7 @@ function set_up_engine_and_plugins()
         return
     fi
     
-    print "Setting up the Escenic Content Engine & its plugins ..."
+    print_and_log "Setting up the Escenic Content Engine & its plugins ..."
 
     make_dir /opt/escenic
     cd /opt/escenic/
@@ -402,7 +403,7 @@ function set_up_engine_and_plugins()
 
 function set_up_ece_scripts()
 {
-    print "Setting up the ece UNIX scripts ..." 
+    print_and_log "Setting up the ece UNIX scripts ..." 
 
     run cd $download_dir
     if [ -d ece-scripts ]; then
@@ -418,7 +419,7 @@ function set_up_ece_scripts()
 
 function set_up_ecedb()
 {
-    print "Setting up the ECE database schema ..."
+    print_and_log "Setting up the ECE database schema ..."
 
     make_dir /opt/escenic/engine/plugins
     run cd /opt/escenic/engine/plugins
@@ -469,13 +470,13 @@ function get_asterixes()
 
 function set_up_basic_nursery_configuration()
 {
-    print "Setting up the basic Nursery configuration ..."
+    print_and_log "Setting up the basic Nursery configuration ..."
 
     local escenic_home=/opt/escenic
     
     if [ $(is_installing_from_archives) -eq 1 ]; then
-        print "Using the supplied Nursery & JAAS configuration from bundle:"
-        print "$ece_instance_conf_archive"
+        print_and_log "Using the supplied Nursery & JAAS configuration from" 
+        print_and_log "bundle: $ece_instance_conf_archive"
         local dir=$(mktemp -d)
         escenic_home=$dir
         run cd $dir
@@ -560,7 +561,7 @@ function set_up_instance_specific_nursery_configuration()
 
 function set_up_proper_logging_configuration()
 {
-    print "Setting up proper log4j & Java logging configuration ..."
+    print_and_log "Setting up proper log4j & Java logging configuration ..."
     
     cat > $common_nursery_dir/trace.properties <<EOF
 log4j.rootLogger=ERROR, ECELOG
@@ -636,7 +637,7 @@ function set_ece_instance_conf()
 # servers in the architecture.
 function install_ece_third_party_packages
 {
-    print "Installing 3rd party packages needed by ECE ..."
+    print_and_log "Installing 3rd party packages needed by ECE ..."
     
     if [ $on_debian_or_derivative -eq 1 ]; then
 
@@ -718,7 +719,7 @@ function get_escaped_bash_string()
 
 function set_up_app_server
 {
-    print "Setting up the application server ..."
+    print_and_log "Setting up the application server ..."
 
     if [ $fai_enabled -eq 0 ]; then
         print "On which ports do you wish to run the app server on?"
@@ -979,7 +980,7 @@ EOF
 function create_user_and_group_if_not_present()
 {
    if [ $(grep $ece_user /etc/passwd | wc -l) -lt 1 ]; then
-       print "Creating UNIX user $ece_user ..."
+       print_and_log "Creating UNIX user $ece_user ..."
         # TODO add support for useradd
        run adduser $ece_user \
            --disabled-password \
@@ -989,7 +990,7 @@ function create_user_and_group_if_not_present()
    fi
    
    if [ $(grep $ece_group /etc/group | wc -l) -lt 1 ]; then
-       print "Creating UNIX group $ece_group ..."
+       print_and_log "Creating UNIX group $ece_group ..."
        run addgroup $ece_group
    fi
  }
@@ -997,7 +998,7 @@ function create_user_and_group_if_not_present()
 # last, give the control back to the ECE user & group 
 function set_correct_permissions()
 {
-    print "Setting correct permissions on ECE related directories ..."
+    print_and_log "Setting correct permissions on ECE related directories ..."
 
     for el in $engine_dir_list; do
         if [ -d $el ]; then
@@ -1032,7 +1033,7 @@ function print_status_and_next_steps()
     else
         s="The restore is now complete!"
     fi
-    print $s" It took" ${days}d ${hours}h ${minutes}m ${seconds_left}s
+    print_and_log $s" It took" ${days}d ${hours}h ${minutes}m ${seconds_left}s
 
     if [ $install_profile_number -ne $PROFILE_RESTORE_FROM_BACKUP -a \
         $install_profile_number -ne $PROFILE_CACHE_SERVER -a \
@@ -1053,26 +1054,26 @@ function print_status_and_next_steps()
 # //depot/branches/personal/mogsie/fromscratch/create-publication.sh
 function create_publication_in_db()
 {
-    print "Creating publication ${publication_name} using $instance_name ..."
+    print_and_log "Creating ${publication_name} using $instance_name ..."
 
     ece_admin_uri=http://$HOSTNAME:${appserver_port}/escenic-admin
     
-    cookie=$(HEAD $ece_admin_uri | \
+    cookie=$(curl ${curl_opts} -I ${ece_admin_uri}/ | \
         grep -i "^Set-Cookie" | \
         sed s/.*'JSESSIONID=\([^;]*\).*'/'\1'/)
 
     if [ "$cookie" == "" ] ; then
-        print "Unable to get a session cookie."
+        print_and_log "Unable to get a session cookie."
         remove_pid_and_exit_in_error;
     fi
 
-    run curl --silent \
+    run curl ${curl_opts} \
         -F "type=webapp" \
         -F "resourceFile=@${1}" \
         --cookie JSESSIONID="$cookie" \
         "${ece_admin_uri}/do/publication/resource"
     
-    run curl --silent  \
+    run curl ${curl_opts}  \
         -F "name=${publication_name}" \
         -F "publisherName=Escenic" \
         -F "adminPassword=${publication_name}" \
@@ -1098,7 +1099,7 @@ function create_publication_definition_and_war()
         publication_name=mypub
     fi
 
-    print "Setting up the ${publication_name} publication ..."
+    print_and_log "Setting up the ${publication_name} publication ..."
     make_dir /opt/escenic/assemblytool/publications/
     run cd /opt/escenic/assemblytool/publications/
     cat > /opt/escenic/assemblytool/publications/${publication_name}.properties <<EOF
@@ -1109,12 +1110,12 @@ EOF
 
     publication_war=/opt/escenic/assemblytool/publications/${publication_name}.war
     if [ -d /opt/escenic/widget-framework-core-* ]; then
-        print "Basing ${publication_name}.war on the Widget Framework Demo ..."
+        print_and_log "Basing ${publication_name}.war on Widget Framework Demo ..."
         run cd /opt/escenic/widget-framework-core-*/publications/demo-core
         run mvn $maven_opts package
         run cp target/demo-core-*.war ${publication_war}
     else
-        print "Basing your ${publication_name}.war on ECE/demo-clean ..."
+        print_and_log "Basing your ${publication_name}.war on ECE/demo-clean ..."
         run cp /opt/escenic/engine/contrib/wars/demo-clean.war ${publication_war}
     fi
 
@@ -1134,7 +1135,7 @@ function check_for_required_downloads()
         return
     fi
     
-    print "Asserting that required downloads succeeded ..."
+    print_and_log "Asserting that required downloads succeeded ..."
     required_escenic_packages="engine assemblytool"
 
     for el in $required_escenic_packages; do
@@ -1145,7 +1146,7 @@ function check_for_required_downloads()
             grep .zip$ | \
             wc -l) \
             -lt 1 ]; then
-            print "Couldn't find $el* in $download_dir"
+            print_and_log "Couldn't find $el* in $download_dir"
             remove_pid_and_exit_in_error
         fi
     done
@@ -1172,7 +1173,7 @@ EOF
 
 function set_up_user_enviornment()
 {
-    print "Setting up the ${ece_user} user's UNIX environment ..."
+    print_and_log "Setting up the ${ece_user} user's UNIX environment ..."
 
     if [ $(grep JAVA_HOME /home/$ece_user/.bashrc 2>/dev/null | wc -l) \
         -lt 1 ]; then
@@ -1193,7 +1194,7 @@ function set_up_user_enviornment()
 
 function set_up_solr()
 {
-    print "Setting up solr ..."
+    print_and_log "Setting up solr ..."
     if [ ! -d /etc/escenic/solr ]; then
         run cp -r /opt/escenic/engine/solr/conf /etc/escenic/solr
     fi
@@ -1210,7 +1211,7 @@ function set_up_solr()
 # command later, though.
 function un_install_ece()
 {
-    print "Uninstalling ECE ..."
+    print_and_log "Uninstalling ECE ..."
      # TODO safety, warnings++
     rm -rf /etc/escenic/ \
         /opt/*tomcat* \
@@ -1237,6 +1238,7 @@ function un_install_ece()
         maven2 \
         memcached \
         munin* \
+        nginx \
         percona* \
         varnish \
         sun-java6-jdk \
@@ -1249,7 +1251,7 @@ function un_install_ece()
 
 function stop_conflicting_processes()
 {
-    print "Stopping conflicting processes ..."
+    print_and_log "Stopping conflicting processes ..."
      # TODO this is dirty
     if [[ -n "$install_profile_number" && \
         $install_profile_number -ne $PROFILE_RESTORE_FROM_BACKUP ]]; then
@@ -1259,7 +1261,7 @@ function stop_conflicting_processes()
 
 function set_up_varnish()
 {
-    print "Setting up Varnish to match your environment ..."
+    print_and_log "Setting up Varnish to match your environment ..."
     /etc/init.d/varnish stop 1>>$log 2>>$log
 
     # we need to swap standard err and standard out here as varnishd
@@ -1436,7 +1438,7 @@ function read_user_input()
     fi
 
     if [ $(is_number $install_profile_number) -eq 0 ]; then
-        print "The profile number, $install_profile_number, is not a number"
+        print_and_log "Profile number, $install_profile_number, is not a number"
         remove_pid_and_exit_in_error
     fi
 }
@@ -1444,7 +1446,7 @@ function read_user_input()
 function assert_correct_runtime_environment()
 {
     if [ $(whoami) != "root" ]; then
-        print "You must be root when running $(basename $0)"
+        print_and_log "You must be root when running $(basename $0)"
         remove_pid_and_exit_in_error
     fi
     
@@ -1473,8 +1475,8 @@ function common_pre_install()
     run source $conf_file
 
     if [ -z "$technet_user" -o -z "$technet_password" ]; then
-        print "Be sure to set technet_user and technet_password "
-        print "in $conf_file"
+        print_and_log "Be sure to set technet_user and technet_password "
+        print_and_log "in $conf_file"
         remove_pid_and_exit_in_error
     fi
 
@@ -1507,7 +1509,7 @@ function common_pre_install()
 function assert_pre_prequesite()
 {
     if [ $(which $1 | wc -l) -lt 1 ]; then
-        print "Please install $1 and then run $(basename $0) again."
+        print_and_log "Please install $1 and then run $(basename $0) again."
         remove_pid_and_exit_in_error
     fi
 }
@@ -1526,10 +1528,10 @@ function add_apt_source()
 
 function install_cache_server()
 {
-    print "Installing a caching server on $HOSTNAME ..."
+    print_and_log "Installing a caching server on $HOSTNAME ..."
 
     if [ $on_debian_or_derivative -eq 1 ]; then
-        curl --silent \
+        curl ${curl_opts} \
             http://repo.varnish-cache.org/debian/GPG-key.txt \
             2>> $log | \
             apt-key add - \
@@ -1597,7 +1599,7 @@ function add_next_step()
 #      the ECE DB schema is not set up. 
 function install_database_server()
 {
-    print "Installing the database server on $HOSTNAME ..."
+    print_and_log "Installing the database server on $HOSTNAME ..."
 
     source /usr/sbin/drop-and-create-ecedb
 
@@ -1619,7 +1621,7 @@ function install_database_server()
         fi
         
         if [ $supported_code_name -eq 1 ]; then
-            print "Installing the Percona database ..."
+            print_and_log "Installing the Percona database ..."
 
             if [ $(apt-key list| grep CD2EFD2A | wc -l) -lt 1 ]; then
                 gpg --keyserver hkp://keys.gnupg.net \
@@ -1652,9 +1654,10 @@ function install_database_server()
             install_packages_if_missing $packages
             force_packages=0
         else
-            print "The Percona APT repsository doesn't have packages for your"
-            print "Debian (or derivative) version with code name $code_name. "
-            print "I will use vanilla MySQL instead."
+            print_and_log "The Percona APT repsository doesn't have packages" 
+            print_and_log "for your Debian (or derivative) version with code"
+            print_and_log "name $code_name. "
+            print_and_log "I will use vanilla MySQL instead."
 
             packages="mysql-server mysql-client"
             install_packages_if_missing $packages
@@ -1778,10 +1781,10 @@ function verify_that_files_exist_and_are_readable()
     
     for el in $@; do
         if [ ! -e $el ]; then
-            print "The file" $el "doesn't exist. I will exit now."
+            print_and_log "The file" $el "doesn't exist. I will exit now."
             remove_pid_and_exit_in_error
         elif [ ! -r $el ]; then
-            print "The file" $el "isn't readable. I will exit now."
+            print_and_log "The file" $el "isn't readable. I will exit now."
             remove_pid_and_exit_in_error
         fi
     done
@@ -1820,7 +1823,7 @@ function install_ece_instance()
     # special treatment for presentation servers
     if [ $2 -eq $PROFILE_PRESENTATION_SERVER ]; then
         file=/etc/escenic/ece-${instance_name}.conf
-        print "Creating instance specific conf: $file ..."
+        print_and_log "Creating instance specific conf: $file ..."
         cat >> $file <<EOF
 deploy_webapp_white_list="escenic-admin ${publication_name}"
 EOF
@@ -1844,20 +1847,20 @@ EOF
 
 function install_presentation_server()
 {
-    print "Installing a presentation server on $HOSTNAME ..."
+    print_and_log "Installing a presentation server on $HOSTNAME ..."
     type=engine
     install_ece_instance "web1" 1
 }
 
 function assemble_deploy_and_restart_type()
 {
-    print "Assembling, deploying & starting $instance_name ..."
+    print_and_log "Assembling, deploying & starting $instance_name ..."
 
     ece_command="ece -i $instance_name -t $type assemble deploy restart"
     if [ $(is_installing_from_archives) -eq 1 ]; then
         run cp $ece_instance_ear_file /var/cache/escenic/engine.ear
         ece_command="ece -i $instance_name -t $type deploy restart"
-        print "Using the supplied EAR instead of running an assembly."
+        print_and_log "Using the supplied EAR instead of running an assembly."
     fi
     
     su - $ece_user -c "$ece_command" 1>>$log 2>>$log
@@ -1879,12 +1882,12 @@ function create_publication()
 {
     if [ ! -e /opt/escenic/engine -o \
         ! -e /opt/escenic/assemblytool ]; then
-        print "Please install ECE and an assembly environment before"
-        print "running this installation profile again."
+        print_and_log "Please install ECE and an assembly environment before"
+        print_and_log "running this installation profile again."
         remove_pid_and_exit_in_error
     fi
 
-    print "Getting ready to create a new publication ..."
+    print_and_log "Getting ready to create a new publication ..."
     create_publication_definition_and_war
 
     # TODO make educated guesses about the available instances on
@@ -1916,7 +1919,7 @@ function create_publication()
 
 function install_editorial_server()
 {
-    print "Installing an editorial server on $HOSTNAME ..."
+    print_and_log "Installing an editorial server on $HOSTNAME ..."
     type=engine
     install_ece_instance "editor1" 0
 }
@@ -1944,7 +1947,7 @@ EOF
 
     add_next_step "Restart all your instances to make the hub see them."
 
-    print "Starting the RMI-hub on $HOSTNAME ..."
+    print_and_log "Starting the RMI-hub on $HOSTNAME ..."
     ece_command="ece -t rmi-hub restart"
     su - $ece_user -c "$ece_command" 1>>$log 2>>$log
 }
@@ -1956,7 +1959,7 @@ EOF
 function get_conf_value()
 {
     if [ ! -e "$conf_file" ]; then
-        print $conf_file "doesn't exist."
+        print_and_log $conf_file "doesn't exist."
         remove_pid_and_exit_in_error
     fi
 
@@ -1984,6 +1987,7 @@ function get_boolean_conf_value()
 
 function install_widget_framework()
 {
+    print_and_log "Installing Widget Framework on $HOSTNAME ..."
     # TODO java.lang.NoClassDefFoundError:
     # Lcom/escenic/framework/captcha/ReCaptchaConfig;
     
@@ -1991,12 +1995,12 @@ function install_widget_framework()
     wf_password=$(get_conf_value wf_password)
 
     if [ -z "$wf_user" -o -z "$wf_password" ]; then
-        print "Missing wf_user and wf_password in $conf_file"
-        print "If you don't have these, please contact support@escenic.com"
+        print_and_log "Missing wf_user and wf_password in ${conf_file}. If you"
+        print_and_log "don't have these, please contact support@escenic.com"
         remove_pid_and_exit_in_error
     fi
 
-    print "Creating a Maven settings file: $HOME/.m2/settings.xml ..."
+    print_and_log "Creating a Maven settings file: $HOME/.m2/settings.xml ..."
     make_dir $HOME/.m2
     cat > $HOME/.m2/settings.xml <<EOF
 <?xml version="1.0" encoding="UTF-8"?>
@@ -2032,7 +2036,7 @@ function install_widget_framework()
 </settings>
 EOF
 
-    print "Downloading Widget Framework from technet.escenic.com ..."
+    print_and_log "Downloading Widget Framework from technet.escenic.com ..."
     for el in $wf_download_list; do
         cd $download_dir
         wget $wget_opts \
@@ -2047,10 +2051,13 @@ EOF
     done
 
     assert_pre_prequesite mvn
-    wf_maven_dir=$(echo /opt/escenic/widget-framework-core-*/maven)
-    cd $wf_maven_dir
-    print "Installing Widget Framework into your Maven repository ..."
     export JAVA_HOME=$java_home
+    wf_maven_dir=$(echo /opt/escenic/widget-framework-core-*/maven)
+    run cd $wf_maven_dir
+    
+    print_and_log "Installing Widget Framework into your Maven repository ..."
+    log "JAVA_HOME=$JAVA_HOME"
+    
     mvn $maven_opts install \
         1>>$log 2>>$log
 
@@ -2069,12 +2076,12 @@ EOF
 
 function install_search_server()
 {
-    print "Installing a search server on $HOSTNAME ..."
+    print_and_log "Installing a search server on $HOSTNAME ..."
     type=search
     install_ece_instance "search1" 0
     
     file=/etc/escenic/ece-${instance_name}.conf
-    print "Creating instance specific conf: $file ..."
+    print_and_log "Creating instance specific conf: $file ..."
     cat >> $file <<EOF
 deploy_webapp_white_list="escenic-admin solr indexer-webapp"
 EOF
@@ -2107,7 +2114,7 @@ EOF
 # useful for development and test environments.
 function install_all_in_one_environment()
 {
-    print "Installing an all-in-one environment on $HOSTNAME ..."
+    print_and_log "Installing an all-in-one environment on $HOSTNAME ..."
     type=engine
     install_database_server
     install_ece_instance "dev1" 0
@@ -2127,7 +2134,7 @@ function install_all_in_one_environment()
 #      * 2 - both cache & monitoring server
 function install_web_server()
 {
-    print "Installing a web server on $HOSTNAME ..."
+    print_and_log "Installing a web server on $HOSTNAME ..."
 
     if [ $on_debian_or_derivative -eq 1 ]; then
         packages="nginx"
@@ -2204,14 +2211,14 @@ EOF
 
 function install_munin_gatherer()
 {
-    print "Installing a Munin gatherer on $HOSTNAME ..."
+    print_and_log "Installing a Munin gatherer on $HOSTNAME ..."
 
     if [ $on_debian_or_derivative -eq 1 ]; then
         packages="munin"
         install_packages_if_missing $packages
     else
-        print "Munin gatherer installation not supported on your system :-("
-        print "You will have to install it manually."
+        print_and_log "Munin gatherer installation not supported on your"
+        print_and_log "system :-( You will have to install it manually."
         return
     fi
 
@@ -2234,7 +2241,7 @@ function install_munin_gatherer()
     fi
 
     for el in $node_list; do
-        print "Adding ${el} to the Muning gatherer on ${HOSTNAME} ..."
+        print_and_log "Adding ${el} to the Muning gatherer on ${HOSTNAME} ..."
         file=/etc/munin/munin-conf.d/escenic.conf
         cat >> $file <<EOF
 [${el}]
@@ -2277,7 +2284,7 @@ function get_perl_escaped()
 
 function install_munin_node()
 {
-    print "Installing a Munin node on $HOSTNAME ..."
+    print_and_log "Installing a Munin node on $HOSTNAME ..."
 
     # the IP of the monitoring server
     local default_ip=127.0.0.1
@@ -2304,8 +2311,8 @@ function install_munin_node()
         packages="munin-node munin-plugins-extra munin-java-plugins"
         install_packages_if_missing $packages
     else
-        print "Munin node installation not supported on your system"
-        print "You will have to install it manually."
+        print_and_log "Munin node installation not supported on your system"
+        print_and_log "You will have to install it manually."
         return
     fi
 
@@ -2329,8 +2336,8 @@ EOF
 
     if [ ! -e /etc/escenic -o \
         $(ls /etc/escenic/ | grep ece- | wc -l) -lt 1 ]; then
-        print "No ECE instances found on $HOSTNAME, so I'm not adding"
-        print "additional Munin configuration"  
+        print_and_log "No ECE instances found on $HOSTNAME, so I'm not adding"
+        print_and_log "additional Munin configuration"  
         add_next_step "A Munin node has been installed on $HOSTNAME"
         return
     fi
@@ -2391,7 +2398,7 @@ function add_server_to_runlevels()
     fi
 
     if [ $on_debian_or_derivative -eq 1 ]; then
-        print "Adding the ece init.d script to the default run levels ..."
+        print_and_log "Adding the ece init.d script to the default run levels ..."
         run update-rc.d ece defaults
     else
         add_next_step "Remember to add /etc/init.d/ece to the desired "\
@@ -2419,7 +2426,7 @@ function restore_from_backup()
         backup_file=${fai_restore_from_file}
 
         if [ -z "$backup_file" ]; then
-            print "You must specifify fai_restore_from_file"
+            print_and_log "You must specifify fai_restore_from_file"
             remove_pid_and_exit_in_error
         fi
 
@@ -2438,12 +2445,12 @@ function restore_from_backup()
     elif [ $(get_boolean_conf_value fai_enabled) -eq 0 ]; then
         print "From which dataset do you wish to restore?"
         if [ ! -d $backup_dir ]; then
-            print "Directory $backup_dir doesn't exist or isn't readable"
+            print_and_log "Directory $backup_dir doesn't exist or isn't readable"
             remove_pid_and_exit_in_error
         fi
 
         if [ $(ls $backup_dir | grep ".tar$" | wc -l) -lt 1 ]; then
-            print "No backup files (.tar) found in $backup_dir, exiting."
+            print_and_log "No backup files (.tar) found in $backup_dir, exiting."
             exit 0
         fi
         
@@ -2497,8 +2504,8 @@ function restore_from_backup()
     fi
 
     if [ ! -r "$backup_file" ]; then
-        print "$backup_file either doesn't exist or cannot be read."
-        print "I cannot restore from it :-("
+        print_and_log "$backup_file either doesn't exist or cannot be read."
+        print_and_log "I cannot restore from it :-("
         remove_pid_and_exit_in_error
     fi
     
@@ -2506,12 +2513,12 @@ function restore_from_backup()
     
     if [ $restore_db -eq 1 -o $restore_all -eq 1 ]; then
         install_database_server "binaries_only"
-        print "Restoring the database contents on $HOSTNAME ..."
+        print_and_log "Restoring the database contents on $HOSTNAME ..."
         run cd $dir
         run tar xf $backup_file --wildcards var/backups/escenic/*.sql.gz
         # picking the DB backup file to restore
         sql_file=$(ls -tra var/backups/escenic/*.sql.gz | tail -1)
-        print "Selecting database dump: $(basename $sql_file)"
+        print_and_log "Selecting database dump: $(basename $sql_file)"
 
         # methods in drop-and-create-ecedb to set up the database
         # schema & user
@@ -2526,7 +2533,7 @@ function restore_from_backup()
     fi
     
     if [ $restore_data_files -eq 1 -o $restore_all -eq 1 ]; then
-        print "Restoring the Solr & ECE data files on $HOSTNAME ..."
+        print_and_log "Restoring the Solr & ECE data files on $HOSTNAME ..."
         run cd $dir
         run tar -C / -xf $backup_file var/lib/escenic
         add_next_step "Successfully restored Solr & ECE data files"
@@ -2535,7 +2542,7 @@ function restore_from_backup()
     fi
     
     if [ $restore_conf -eq 1 -o $restore_all -eq 1 ]; then
-        print "Restoring the ECE configuration files on $HOSTNAME ..."
+        print_and_log "Restoring the ECE configuration files on $HOSTNAME ..."
         run cd $dir
         run tar -C / -xf $backup_file etc
         add_next_step "Successfully restored ECE configuration files"
@@ -2544,7 +2551,7 @@ function restore_from_backup()
     fi
     
     if [ $restore_binaries -eq 1 -o $restore_all -eq 1 ]; then
-        print "Restoring the Escenic & Tomcat binaries on $HOSTNAME ..."
+        print_and_log "Restoring the Escenic & Tomcat binaries on $HOSTNAME ..."
         run cd $dir
         run tar -C / -xf $backup_file opt
         add_next_step "Successfully restored Escenic & Tomcat binaries"
@@ -2625,8 +2632,8 @@ assert_correct_runtime_environment
 fai_enabled=$(get_boolean_conf_value fai_enabled)
 
 if [ $fai_enabled -eq 1 ]; then
-    print "Full Automatic Install (FAI) enabled."
-    print "All user input will be read from $conf_file"
+    print_and_log "Full Automatic Install (FAI) enabled."
+    print_and_log "All user input will be read from $conf_file"
     
     common_pre_install
 
@@ -2701,8 +2708,8 @@ if [ $fai_enabled -eq 1 ]; then
     fi
     
     if [ $no_fai_profile -eq 1 ]; then
-        print "No install profile selected, be sure to have one of the "
-        print "fai_<profile>_install=1 in your $conf_file"
+        print_and_log "No install profile selected, be sure to have one of the "
+        print_and_log "fai_<profile>_install=1 in your $conf_file"
         remove_pid_and_exit_in_error
     fi
     

From 3c1f510613d21329beb8125f8d5712286b4762c4 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 24 Nov 2011 21:15:17 +0800
Subject: [PATCH 0162/2585] - fitting output onto standard terminal width

---
 usr/sbin/ece-install | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 5969f7f5..94171339 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -2070,8 +2070,8 @@ EOF
     
     cp -r $wf_dist_dir/misc/siteconfig/* $common_nursery_dir/
 
-    add_next_step "Widget Framework has been installed into your local"\
-" Maven repository"
+    add_next_step "Widget Framework has been installed into your "\
+" Maven repo"
 }
 
 function install_search_server()

From c93983b4c86850a0fbed05a3be9d2809f0df25ae Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 25 Nov 2011 12:06:30 +0800
Subject: [PATCH 0163/2585] - added get_info_for_type which provides the 'info'
 command giving the   user information about the selected instance like this:

$ ece info --instance editor2
[ece#engine-editor2] Current instance: editor2
[ece#engine-editor2] Instances available on quanah: dev1 editor2 pres1
[ece#engine-editor2] Conf files parsed: /etc/escenic/ece-editor2.conf /etc/escenic/ece.conf
[ece#engine-editor2] ECE location: /opt/escenic/engine
[ece#engine-editor2] Assembly Tool location: /opt/escenic/assemblytool
[ece#engine-editor2] Java location: /usr/lib/jvm/java-6-sun
[ece#engine-editor2] Application server: tomcat
[ece#engine-editor2] Tomcat home: /opt/tomcat
[ece#engine-editor2] Tomcat base: /opt/tomcat-editor2
---
 etc/bash_completion.d/ece |  2 +-
 usr/bin/ece               | 44 +++++++++++++++++++++++++++++++++++++--
 2 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/etc/bash_completion.d/ece b/etc/bash_completion.d/ece
index d34877d1..69431562 100644
--- a/etc/bash_completion.d/ece
+++ b/etc/bash_completion.d/ece
@@ -5,7 +5,7 @@ _ece_commands()
     local cur=${COMP_WORDS[COMP_CWORD]}
     local prev=${COMP_WORDS[COMP_CWORD-1]}
 
-    commands="applog assemble backup clean deploy edit help kill log loglist \
+    commands="applog assemble backup clean deploy edit help info kill log loglist \
               outlog restart start status stop threaddump update versions"
     options="-i --instance -p --publication -r --publication-resource \
              -t --type -u --user -w --password"
diff --git a/usr/bin/ece b/usr/bin/ece
index 6582c501..91d88d69 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -154,12 +154,15 @@ function ensure_that_required_fields_are_set()
     fi
 }
 
+ece_conf_files_read=()
+
 function read_conf_file()
 {
     for el in $conf_file_location_list; do
         if [ -r $el/$1 ]; then
             debug "found $1 in $el, reading it"
             source $el/$1
+            ece_conf_files_read=($el/$1 ${ece_conf_files_read})
             break
         fi
     done
@@ -435,7 +438,7 @@ function sanity_check()
     # system.
     if [ $instance = "default" -a \
         $type = "engine" -a \
-        $(echo $command | grep help | wc -l) -eq 0 ]; then
+        $(echo $command | egrep 'help' | wc -l) -eq 0 ]; then
         instance_list=$(get_instance_list)
         if [[ -n "$instance_list" && \
             $(echo $instance_list | grep ' ' | wc -l) -gt 0 ]]; then
@@ -872,6 +875,39 @@ function kill_type()
     exit_on_error "kill_type"
 }
 
+function get_info_for_type()
+{
+    print "Current instance:    ${instance}"
+    print "Instances available on $HOSTNAME: $(get_instance_list)"
+    print "Conf files parsed: ${ece_conf_files_read[@]}"
+    
+    if [ -n "${ece_home}" ]; then
+        print "ECE location: $ece_home"
+    fi
+    if [[ -n "${assemblytool_home}" && -e "${assemblytool_home}" ]]; then
+        print "Assembly Tool location: $assemblytool_home"
+    fi
+    if [ -n "${java_home}" ]; then
+        print "Java location: $java_home"
+    fi
+    if [ -n "${appserver}" ]; then
+        print "Application server: $appserver"
+        case "$appserver" in
+            tomcat)
+                if [ -n "${tomcat_home}" ]; then
+                    print "Tomcat home:" $tomcat_home
+                    print "Tomcat base:" $tomcat_base
+                fi
+            ;;
+            resin)
+                if [ -n "${resin_home}" ]; then
+                    print "Resin home:" $resin_home
+                fi
+                ;;
+        esac
+    fi
+}
+
 function restart_type()
 {
     stop_type
@@ -881,7 +917,7 @@ function restart_type()
     # properly before starting the new one.
     sleep 8
 
-    # sometimes the JVM refuses to shot down when doing a graceful
+    # sometimes the JVM refuses to shut down when doing a graceful
     # kill, therefore, if it's still running after the sleep above, we
     # use brute force to kill it.
     set_type_pid
@@ -1417,6 +1453,7 @@ function print_help()
     echo "   deploy     deploys the assembled EAR *)"
     echo "   edit       lets you edit a publication resource"
     echo "   help       prints this help screen"
+    echo "   info       prints various info about the selected ECE instance"
     echo "   kill       uses force to stop the type"
     echo "   log        the type's log4j log **)"
     echo "   loglist    list all the log paths"
@@ -1447,6 +1484,9 @@ for el in $command; do
         restart)
             restart_type
             ;;
+        info)
+            get_info_for_type
+            ;;
         log)
             tail_messages_log
             ;;

From bf4a2026b4d4704838b97028a20388569d09f8dc Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 25 Nov 2011 12:51:20 +0800
Subject: [PATCH 0164/2585] - removed any default instances, both engine and
 search   instances. This to prevent confusion when installing a fresh system,
   getting errors at boot time (or when invoking the init.d) because   the
 local instances don't correspond to the ones given in   /etc/default/ece.

---
 etc/default/ece | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/default/ece b/etc/default/ece
index a6983116..d021aaa4 100644
--- a/etc/default/ece
+++ b/etc/default/ece
@@ -4,8 +4,8 @@
 # instances. If you only have one # instance, use "default" as its
 # name. If you don't have any instances of that type on this host,
 # then just set the variable to an empty string.
-engine_instance_list="editor1 web1"
-search_instance_list="search1"
+engine_instance_list=""
+search_instance_list=""
 analysis_instance_list=""
 
 # You only need one hub in an ECE cluster, so only set this one to

From 4be921766831ad28854ab12610c3de4afd64eaf7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 28 Nov 2011 12:29:16 +0800
Subject: [PATCH 0165/2585] - removed get_asterixes, it hasn't been used since
 its inception and   having it lingering around till it does is a waste of
 pixels. The   git log has it.

---
 usr/sbin/ece-install | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 94171339..069fbe60 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -454,20 +454,6 @@ function set_up_ecedb()
     add_next_step "DB is now set up on $HOSTNAME:3306"
 }
 
-# returns a string of asterixes with the same lenght as the inputted
-# string.
-function get_asterixes()
-{
-    s=""
-    j=$(echo $1 | wc -c)
-
-    # wc -c always returns the length + 1, hence we start on index=1
-    for (( i=1; i<$j; i++ )); do
-        s=${s}"-"
-    done
-    echo "$s"
-}
-
 function set_up_basic_nursery_configuration()
 {
     print_and_log "Setting up the basic Nursery configuration ..."

From 06b0c7e4f25fe3ea62f38a1f973055cf4ef9f64e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 28 Nov 2011 16:19:24 +0800
Subject: [PATCH 0166/2585] - added "ece flush" to flush all the ECE caches.  
 This is the same as going to /escenic-admin -> "Clear all caches" ->  
 clicking on "Confirm". - added get_escenic_admin_url and made every method
 that needs the   /escenic-admin call it.

---
 etc/bash_completion.d/ece |  2 +-
 usr/bin/ece               | 36 +++++++++++++++++++++++++++++++-----
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/etc/bash_completion.d/ece b/etc/bash_completion.d/ece
index 69431562..8a8b6a4d 100644
--- a/etc/bash_completion.d/ece
+++ b/etc/bash_completion.d/ece
@@ -6,7 +6,7 @@ _ece_commands()
     local prev=${COMP_WORDS[COMP_CWORD-1]}
 
     commands="applog assemble backup clean deploy edit help info kill log loglist \
-              outlog restart start status stop threaddump update versions"
+              flush outlog restart start status stop threaddump update versions"
     options="-i --instance -p --publication -r --publication-resource \
              -t --type -u --user -w --password"
     resources="content-type feature layout layout-group image-version menu \
diff --git a/usr/bin/ece b/usr/bin/ece
index 91d88d69..aa6b06a4 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -1275,8 +1275,8 @@ function list_versions()
     
     set_type_port
     
-    version_manager=escenic-admin/browser/Global/neo/io/managers/VersionManager
-    url=http://$host:$port/$version_manager
+    version_manager=browser/Global/neo/io/managers/VersionManager
+    url=$(get_escenic_admin_url)/$version_manager
         
     print "Installed on the ${type} running on ${host}:${port} is:"
     wget $wget_auth -O - $url  2>/dev/null | \
@@ -1306,8 +1306,7 @@ function update_publication_resources()
         exit 1
     fi
     
-    set_type_port
-    url=http://${host}:${port}/escenic-admin/publication-resources
+    local url=$(get_escenic_admin_url)/publication-resources
 
     case "$(basename $resource)" in
         content-type)
@@ -1333,7 +1332,7 @@ function update_publication_resources()
             ;;
         root-section-parameters)
             do_put=true
-            url=http://${host}:${port}/escenic-admin
+            url=$(get_escenic_admin_url)
             url=${url}/section-parameters-declared/${publication}
             ;;
         *)
@@ -1407,6 +1406,29 @@ function read_rc_file_if_present()
     fi
 }
 
+function get_escenic_admin_url()
+{
+    set_type_port
+    local url=http://${host}:${port}/escenic-admin
+    echo ${url}
+}
+
+function flush_caches()
+{
+    if [ ${type} != "engine" ]; then
+        print "You cannot flush the caches of a ${type} instance"
+        return
+    fi
+    
+    print "Flushing all of ${instance}'s caches on $HOSTNAME"
+    local url=$(get_escenic_admin_url)/do/publication/clearallcaches
+    wget $wget_auth \
+        -O - \
+        --post-data='confirm=Confirm' \
+        $url \
+        1>>$log_file 2>>$log_file
+}
+
 read_rc_file_if_present
 set_type_command_and_instance $@
 set_id
@@ -1452,6 +1474,7 @@ function print_help()
     echo "   clean      removes temporary files created by $0 *)"
     echo "   deploy     deploys the assembled EAR *)"
     echo "   edit       lets you edit a publication resource"
+    echo "   flush      flushes all ECE caches ('Clear all caches') *)"
     echo "   help       prints this help screen"
     echo "   info       prints various info about the selected ECE instance"
     echo "   kill       uses force to stop the type"
@@ -1527,6 +1550,9 @@ for el in $command; do
             clean_up
             backup_type
             ;;
+        flush)
+            flush_caches
+            ;;
         help)
             print_help
             ;;

From bfc4d4cad8c3923b94e1ccb3be2a94acb9be4ab5 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 1 Dec 2011 13:38:47 +0800
Subject: [PATCH 0167/2585] - added mention on when the --instance/-i can be
 omitted and the   importance of specifying it when using /usr/bin/ece in your
 own   scripting.

---
 usr/share/doc/escenic/ece-guide.org | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/usr/share/doc/escenic/ece-guide.org b/usr/share/doc/escenic/ece-guide.org
index 76739185..514220d0 100644
--- a/usr/share/doc/escenic/ece-guide.org
+++ b/usr/share/doc/escenic/ece-guide.org
@@ -211,9 +211,7 @@ complain:
 As it mentions, the root user may use the init.d script and the
 accompanying /etc/default/ece to command the different ECE, EAE and
 RMI hub instances on your system.
-** Specifying instance
-
-*** Specifying the instance
+** Specifying the instance
 The script is made for being easy to use with multiple instances on
 the same host. You specify the instance you want to operate on using the
 -i parameter. E.g. to assemble and deploy the editor1 instance, you'd
@@ -233,6 +231,12 @@ For this to work, the script assumes that you have installed the
 instance specific configuration in /etc/escenic/engine/instance, as is
 described in the Escenic Content Engine Installation Guide.
 
+If you only have one instance installed, you may omit the
+--instance/-i parameter. However, if you're running ece from another
+script (e.g. an init.d or a deployment script), we recommend you to
+always specify the --instance/-i parameter to make sure that future
+additions of instances don't break your old scripts which assumed that
+only one instance was installed.
 
 ** TAB completion
 The ece script offers TAB completion of all commands, options and

From 7bfb081684f736bd2108f1784e435ae6412c45b7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 1 Dec 2011 13:40:59 +0800
Subject: [PATCH 0168/2585] - avoid wiki stupidifcation

---
 usr/share/doc/escenic/ece-guide.org | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/doc/escenic/ece-guide.org b/usr/share/doc/escenic/ece-guide.org
index 514220d0..3bd8cca3 100644
--- a/usr/share/doc/escenic/ece-guide.org
+++ b/usr/share/doc/escenic/ece-guide.org
@@ -214,7 +214,7 @@ RMI hub instances on your system.
 ** Specifying the instance
 The script is made for being easy to use with multiple instances on
 the same host. You specify the instance you want to operate on using the
--i parameter. E.g. to assemble and deploy the editor1 instance, you'd
+ -i parameter. E.g. to assemble and deploy the editor1 instance, you'd
 do:
 #+BEGIN_SRC sh
 $ ece -i editor1 assemble deploy restart
@@ -232,7 +232,7 @@ instance specific configuration in /etc/escenic/engine/instance, as is
 described in the Escenic Content Engine Installation Guide.
 
 If you only have one instance installed, you may omit the
---instance/-i parameter. However, if you're running ece from another
+ --instance/-i parameter. However, if you're running ece from another
 script (e.g. an init.d or a deployment script), we recommend you to
 always specify the --instance/-i parameter to make sure that future
 additions of instances don't break your old scripts which assumed that

From d1237ac1f7828eaa9d53e3345cb878520400de73 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 1 Dec 2011 13:41:52 +0800
Subject: [PATCH 0169/2585] - argh!, org/github/wiki

---
 usr/share/doc/escenic/ece-guide.org | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/usr/share/doc/escenic/ece-guide.org b/usr/share/doc/escenic/ece-guide.org
index 3bd8cca3..ebfb7676 100644
--- a/usr/share/doc/escenic/ece-guide.org
+++ b/usr/share/doc/escenic/ece-guide.org
@@ -213,8 +213,8 @@ accompanying /etc/default/ece to command the different ECE, EAE and
 RMI hub instances on your system.
 ** Specifying the instance
 The script is made for being easy to use with multiple instances on
-the same host. You specify the instance you want to operate on using the
- -i parameter. E.g. to assemble and deploy the editor1 instance, you'd
+the same host. You specify the instance you want to operate on using
+the -i parameter. E.g. to assemble and deploy the editor1 instance, you'd
 do:
 #+BEGIN_SRC sh
 $ ece -i editor1 assemble deploy restart
@@ -231,8 +231,8 @@ For this to work, the script assumes that you have installed the
 instance specific configuration in /etc/escenic/engine/instance, as is
 described in the Escenic Content Engine Installation Guide.
 
-If you only have one instance installed, you may omit the
- --instance/-i parameter. However, if you're running ece from another
+If you only have one instance installed, you may omit
+the --instance/-i parameter. However, if you're running ece from another
 script (e.g. an init.d or a deployment script), we recommend you to
 always specify the --instance/-i parameter to make sure that future
 additions of instances don't break your old scripts which assumed that

From 4eb18b4c81cd040b31d212932c25653b8ed9637e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 2 Dec 2011 10:55:48 +0800
Subject: [PATCH 0170/2585] - added configuration option fai_publication_war so
 that the user can   at install time provide the WAR to base the new
 publication   on. Default is still the WF demo (if WF installed) or the  
 demo shipped with the ECE distribution. - fixed bug in
 set_up_user_enviornment where the BASH auto completion   of ece wasn't
 actually written to the user's .bashrc

---
 usr/sbin/ece-install | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 069fbe60..32b833d3 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -1095,7 +1095,10 @@ context-root: ${publication_name}
 EOF
 
     publication_war=/opt/escenic/assemblytool/publications/${publication_name}.war
-    if [ -d /opt/escenic/widget-framework-core-* ]; then
+    if [[ $fai_enabled -eq 1 && -n "${fai_publication_war}" ]]; then
+        print_and_log "Basing ${publication_name}.war on the one specified in $conf_file"
+        run cp ${fai_publication_war} ${publication_war}
+    elif [ -d /opt/escenic/widget-framework-core-* ]; then
         print_and_log "Basing ${publication_name}.war on Widget Framework Demo ..."
         run cd /opt/escenic/widget-framework-core-*/publications/demo-core
         run mvn $maven_opts package
@@ -1172,9 +1175,10 @@ function set_up_user_enviornment()
 
     export JAVA_HOME=$java_home
 
-    if [ $(grep bash_completion.d/ece /home/$ece_user/.bashrc 2>/dev/null | \
+    bashrc=/home/${ece_user}/.bashrc
+    if [ $(grep bash_completion.d/ece ${bashrc}  2>/dev/null | \
         wc -l) -lt 1 ]; then
-        run echo ". /etc/bash_completion.d/ece"
+        echo ". /etc/bash_completion.d/ece" > ${bashrc}
     fi
 }
 

From 84e22c430a8912ffc429204168277f193f910c30 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 2 Dec 2011 11:06:52 +0800
Subject: [PATCH 0171/2585] - added fai_publication_war to the list of
 available FAI options.

---
 usr/share/doc/escenic/ece-install-guide.org | 73 +++++++++++----------
 1 file changed, 37 insertions(+), 36 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 640362dd..e248c140 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -433,42 +433,43 @@ profiles, see the table below.
 The ece-install script understands for the following settings in the
 $HOME/ece-install.conf file of the root user:
 
-|----------------------------------+------------------+-----------------------------------------------------|
-| Parameter                        |          Default | Description                                         |
-|----------------------------------+------------------+-----------------------------------------------------|
-| fai\_all\_install                |                0 | Install all components on your server.              |
-| fai\_cache\_backends             | ${HOSTNAME}:8080 | Space separated, e.g. "app1:8080 app2:8080"         |
-| fai\_cache\_install              |                0 | Install cache server profile                        |
-| fai\_db\_host                    |        $HOSTNAME | Useful for editor & presentation profiles           |
-| fai\_db\_install                 |                0 | Install db profile                                  |
-| fai\_db\_port                    |             3306 | Useful for editor & presentation profiles           |
-| fai\_editor\_conf\_archive       |               "" | conf.tar.gz to use for Nursery & JAAS configuration |
-| fai\_editor\_ear                 |               "" | EAR to use instead of the Escenic binaries          |
-| fai\_editor\_install             |                0 | Install the editorial profile                       |
-| fai\_editor\_name                |          editor1 | Name of the editor instance                         |
-| fai\_editor\_port                |             8080 | HTTP port of the editor instance                    |
-| fai\_editor\_shutdown            |             8005 | Shutdown port of the editor instance                |
-| fai\_enabled                     |                0 | Whether or not to run ece-install in FAI mode       |
-| fai\_monitoring\_server\_install |                0 | Install the monitoring server profile.              |
-| fai\_monitoring\_server\_ip      |        127.0.0.1 | The IP of the monitoring server.                    |
-| fai\_presentation\_conf\_archive |               "" | conf.tar.gz to use for Nursery & JAAS configuration |
-| fai\_presentation\_ear           |               "" | EAR to use instead of the Escenic binaries          |
-| fai\_presentation\_install       |                0 | Install the presentation server profile             |
-| fai\_presentation\_name          |             web1 | Name of the presentation server instance            |
-| fai\_presentation\_port          |             8080 | HTTP port of the presentation server instance       |
-| fai\_presentation\_shutdown      |             8005 | Shutdown port of the presentation instance          |
-| fai\_public\_host\_name          | ${HOSTNAME}:8080 | The public address for your website                 |
-| fai\_publication\_create         |                0 | Create a new publication                            |
-| fai\_publication\_name           |            mypub | Name of the publication                             |
-| fai\_publication\_use\_instance  |             dev1 | Name of local instance to use for creation          |
-| fai\_rmi\_install                |                0 | Install RMI hub profile                             |
-| fai\_search\_conf\_archive       |               "" | conf.tar.gz to use for Nursery & JAAS configuration |
-| fai\_search\_ear                 |               "" | EAR to use instead of the Escenic binaries          |
-| fai\_search\_name                |          search1 | Name of the search instance                         |
-| fai\_search\_port                |             8080 | HTTP port of the search instance                    |
-| fai\_search\_shutdown            |             8005 | Shutdown port of the search instance                |
-| fai\_wf\_install                 |                0 | Install Widget Framework profile                    |
-|----------------------------------+------------------+-----------------------------------------------------|
+|----------------------------------+----------------------+-----------------------------------------------------|
+| Parameter                        |              Default | Description                                         |
+|----------------------------------+----------------------+-----------------------------------------------------|
+| fai\_all\_install                |                    0 | Install all components on your server.              |
+| fai\_cache\_backends             |     ${HOSTNAME}:8080 | Space separated, e.g. "app1:8080 app2:8080"         |
+| fai\_cache\_install              |                    0 | Install cache server profile                        |
+| fai\_db\_host                    |            $HOSTNAME | Useful for editor & presentation profiles           |
+| fai\_db\_install                 |                    0 | Install db profile                                  |
+| fai\_db\_port                    |                 3306 | Useful for editor & presentation profiles           |
+| fai\_editor\_conf\_archive       |                   "" | conf.tar.gz to use for Nursery & JAAS configuration |
+| fai\_editor\_ear                 |                   "" | EAR to use instead of the Escenic binaries          |
+| fai\_editor\_install             |                    0 | Install the editorial profile                       |
+| fai\_editor\_name                |              editor1 | Name of the editor instance                         |
+| fai\_editor\_port                |                 8080 | HTTP port of the editor instance                    |
+| fai\_editor\_shutdown            |                 8005 | Shutdown port of the editor instance                |
+| fai\_enabled                     |                    0 | Whether or not to run ece-install in FAI mode       |
+| fai\_monitoring\_server\_install |                    0 | Install the monitoring server profile.              |
+| fai\_monitoring\_server\_ip      |            127.0.0.1 | The IP of the monitoring server.                    |
+| fai\_presentation\_conf\_archive |                   "" | conf.tar.gz to use for Nursery & JAAS configuration |
+| fai\_presentation\_ear           |                   "" | EAR to use instead of the Escenic binaries          |
+| fai\_presentation\_install       |                    0 | Install the presentation server profile             |
+| fai\_presentation\_name          |                 web1 | Name of the presentation server instance            |
+| fai\_presentation\_port          |                 8080 | HTTP port of the presentation server instance       |
+| fai\_presentation\_shutdown      |                 8005 | Shutdown port of the presentation instance          |
+| fai\_public\_host\_name          |     ${HOSTNAME}:8080 | The public address for your website                 |
+| fai\_publication\_create         |                    0 | Create a new publication                            |
+| fai\_publication\_name           |                mypub | Name of the publication                             |
+| fai\_publication\_use\_instance  |                 dev1 | Name of local instance to use for creation          |
+| fai\_publication\_war            | "WF or ECE demo WAR" | WAR to to base the new publication on               |
+| fai\_rmi\_install                |                    0 | Install RMI hub profile                             |
+| fai\_search\_conf\_archive       |                   "" | conf.tar.gz to use for Nursery & JAAS configuration |
+| fai\_search\_ear                 |                   "" | EAR to use instead of the Escenic binaries          |
+| fai\_search\_name                |              search1 | Name of the search instance                         |
+| fai\_search\_port                |                 8080 | HTTP port of the search instance                    |
+| fai\_search\_shutdown            |                 8005 | Shutdown port of the search instance                |
+| fai\_wf\_install                 |                    0 | Install Widget Framework profile                    |
+|----------------------------------+----------------------+-----------------------------------------------------|
 
 As you've probably have guessed, 0 means "false" and 1 means "true" :-)
 

From 9fe5ed916c0644de6949691e601a1fa58ec31c66 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 2 Dec 2011 11:07:14 +0800
Subject: [PATCH 0172/2585] - updated HTML

---
 usr/share/doc/escenic/ece-install-guide.html | 33 ++++++++++++++++++--
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.html b/usr/share/doc/escenic/ece-install-guide.html
index 8c58f4e7..4d455d22 100644
--- a/usr/share/doc/escenic/ece-install-guide.html
+++ b/usr/share/doc/escenic/ece-install-guide.html
@@ -7,7 +7,7 @@
 <title>Welcome to the /usr/sbin/ece-install Guide</title>
 <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
 <meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2011-11-21 19:38:40 CST"/>
+<meta name="generated" content="2011-12-02 11:07:01 CST"/>
 <meta name="author" content="Torstein Krause Johansen"/>
 <meta name="description" content=""/>
 <meta name="keywords" content=""/>
@@ -394,12 +394,15 @@ <h2 id="sec-4"><span class="section-number-2">4</span> Running the ece-install S
 <pre class="src src-sh">$ sudo su
 </pre>
 
+<p>
+Please note that just doing "sudo ece-install" may not work.
+</p>
 <p>
 On all other Unix like system, do:
 </p>
 
 
-<pre class="src src-sh">$ su
+<pre class="src src-sh">$ su -
 </pre>
 
 
@@ -1028,6 +1031,29 @@ <h2 id="sec-6"><span class="section-number-2">6</span> Full Automatic Install (F
 </pre>
 
 
+<p>
+When running in FAI mode, you probably want to redirect standard
+output to a log file for easy reading later on:
+</p>
+
+
+<pre class="src src-sh"><span style="color: #b22222;"># </span><span style="color: #b22222;">bash ece-install &gt; ece-install.out &amp;</span>
+</pre>
+
+
+<p>
+Alternatively, you may do:
+</p>
+
+
+<pre class="src src-sh"><span style="color: #b22222;"># </span><span style="color: #b22222;">nohup bash ece-install &gt; ece-install.out &amp;</span>
+</pre>
+
+<p>
+The "nohup" at the beginning and the ampersand at the end lets you log
+out of the SSH/X session to your Linux/Unix box while the script keeps
+running in the background.
+</p>
 
 </div>
 
@@ -1145,6 +1171,7 @@ <h3 id="sec-6-2"><span class="section-number-3">6.2</span> Overview of All FAI P
 <tr><td class="left">fai_publication_create</td><td class="right">0</td><td class="left">Create a new publication</td></tr>
 <tr><td class="left">fai_publication_name</td><td class="right">mypub</td><td class="left">Name of the publication</td></tr>
 <tr><td class="left">fai_publication_use_instance</td><td class="right">dev1</td><td class="left">Name of local instance to use for creation</td></tr>
+<tr><td class="left">fai_publication_war</td><td class="right">"WF or ECE demo WAR"</td><td class="left">WAR to to base the new publication on</td></tr>
 <tr><td class="left">fai_rmi_install</td><td class="right">0</td><td class="left">Install RMI hub profile</td></tr>
 <tr><td class="left">fai_search_conf_archive</td><td class="right">""</td><td class="left">conf.tar.gz to use for Nursery &amp; JAAS configuration</td></tr>
 <tr><td class="left">fai_search_ear</td><td class="right">""</td><td class="left">EAR to use instead of the Escenic binaries</td></tr>
@@ -1493,7 +1520,7 @@ <h2 id="sec-13"><span class="section-number-2">13</span> Example Output FAI </h2
 <hr/>
 <p class="author">
   Author: Torstein Krause Johansen (<a href="mailto:tkj@vizrt.com">tkj@vizrt.com</a>)
-  Date: 2011-11-21 19:38:40 CST
+  Date: 2011-12-02 11:07:01 CST
 </p>
 </div>
 </body>

From 6f459b257f257412f19e7e7c635e65d736a76faf Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 5 Dec 2011 15:42:17 +0800
Subject: [PATCH 0173/2585] - now tests to see if the
 CommunityEngine.properties file is present   in /etc/escenic, if not, an
 informative error message is given:

[ece-install#23] Could not find/write to /etc/escenic/engine/common/com/escenic/community/CommunityEngine.properties"
[ece-install#23] Have you installed the Community Engine plugin?"
---
 usr/sbin/ece-install | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 32b833d3..f4fcff1d 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -511,8 +511,14 @@ updateConnector=/connector/UpdateConnector
 EOF
 
     file=$common_nursery_dir/com/escenic/community/CommunityEngine.properties
-    sed -i 's/jdbc\/ecome/jdbc\/ECE_UPDATE_DS/g' $file
-    exit_on_error "sed on $file"
+    if [ -w ${file} ]; then
+        sed -i 's/jdbc\/ecome/jdbc\/ECE_UPDATE_DS/g' $file
+        exit_on_error "sed on $file"
+    else
+        print_and_log "Could not find/write to ${file},"
+        print_and_log "have you installed the Community Engine plugin?"
+        remove_pid_and_exit_in_error
+    fi
 
     file=$common_nursery_dir/com/escenic/webstart/StudioConfig.properties
     cat >> $file <<EOF

From 3f44c5e968c7f08b380d643d89c046814fd7c41b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 5 Dec 2011 16:20:48 +0800
Subject: [PATCH 0174/2585] - since ece-install now is supporting installing
 multiple profiles at   the same time (from the same invocation of
 ece-install), the install   of the DB profile will be executed first and the
 RMI hub last. This   way, it's possible to define both installing a DB and an
 ECE   instance like the editorial server profile in the same  
 ece-install.conf:

  fai_enabled=1
  fai_db_install=1
  fai_editor_install=1
---
 usr/sbin/ece-install | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index f4fcff1d..fee4dcac 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -2641,6 +2641,12 @@ if [ $fai_enabled -eq 1 ]; then
         no_fai_profile=0
     fi
     
+    if [ $(get_boolean_conf_value fai_db_install) -eq 1 ]; then
+        install_profile_number=$PROFILE_DB_SERVER
+        install_database_server
+        no_fai_profile=0
+    fi
+    
     if [ $(get_boolean_conf_value fai_editor_install) -eq 1 ]; then
         install_profile_number=$PROFILE_EDITORIAL_SERVER
         install_editorial_server
@@ -2653,12 +2659,6 @@ if [ $fai_enabled -eq 1 ]; then
         no_fai_profile=0
     fi
     
-    if [ $(get_boolean_conf_value fai_db_install) -eq 1 ]; then
-        install_profile_number=$PROFILE_DB_SERVER
-        install_database_server
-        no_fai_profile=0
-    fi
-    
     if [ $(get_boolean_conf_value fai_cache_install) -eq 1 ]; then
         install_profile_number=$PROFILE_CACHE_SERVER
         install_cache_server
@@ -2666,12 +2666,6 @@ if [ $fai_enabled -eq 1 ]; then
         no_fai_profile=0
     fi
     
-    if [ $(get_boolean_conf_value fai_rmi_install) -eq 1 ]; then
-        install_profile_number=$PROFILE_RMI_HUB
-        install_rmi_hub
-        no_fai_profile=0
-    fi
-    
     if [ $(get_boolean_conf_value fai_wf_install) -eq 1 ]; then
         install_profile_number=$PROFILE_WIDGET_FRAMEWORK
         install_widget_framework
@@ -2703,6 +2697,12 @@ if [ $fai_enabled -eq 1 ]; then
         no_fai_profile=0
     fi
     
+    if [ $(get_boolean_conf_value fai_rmi_install) -eq 1 ]; then
+        install_profile_number=$PROFILE_RMI_HUB
+        install_rmi_hub
+        no_fai_profile=0
+    fi
+    
     if [ $no_fai_profile -eq 1 ]; then
         print_and_log "No install profile selected, be sure to have one of the "
         print_and_log "fai_<profile>_install=1 in your $conf_file"

From b95f401e5a602a0d75e0cf411028b7475eba6832 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 13 Dec 2011 12:07:49 +0800
Subject: [PATCH 0175/2585] - added script for creating Debian and RedHat
 packages - added DEBIAN control file

---
 usr/local/src/create-packages       | 23 +++++++++++++++++++++++
 usr/local/src/debian/DEBIAN/control | 10 ++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 usr/local/src/create-packages
 create mode 100644 usr/local/src/debian/DEBIAN/control

diff --git a/usr/local/src/create-packages b/usr/local/src/create-packages
new file mode 100644
index 00000000..f0276e3a
--- /dev/null
+++ b/usr/local/src/create-packages
@@ -0,0 +1,23 @@
+#! /usr/bin/env bash
+
+rm -rf debian/{etc,usr}
+
+target_dir=debian
+package_name=escenic-content-engine-installer
+version=5.3.3.3
+
+cp -r ../../../etc $target_dir
+
+mkdir -p $target_dir/usr
+cp -r ../../../usr/bin $target_dir/usr
+cp -r ../../../usr/sbin $target_dir/usr
+cp -r ../../../usr/share $target_dir/usr
+
+sed -i "s#VERSION#${version}#g" $target_dir/DEBIAN/control
+
+dpkg-deb --build debian
+mv debian.deb ${package_name}-${version}.deb
+
+if [[ -x /usr/bin/alien && -x /usr/bin/fakeroot ]]; then
+    fakeroot alien --to-rpm --scripts ${package_name}-${version}.deb
+fi
diff --git a/usr/local/src/debian/DEBIAN/control b/usr/local/src/debian/DEBIAN/control
new file mode 100644
index 00000000..8e74d6ec
--- /dev/null
+++ b/usr/local/src/debian/DEBIAN/control
@@ -0,0 +1,10 @@
+Package: escenic-content-engine-installer
+Version: 5.3.3.3
+Section: base
+Priority: optional
+Architecture: all
+Maintainer: Torstein Krause Johansen <tkj@vizrt.com>
+Description: The Escenic Content Engine Installer.
+  This script lets you install the Escenic Content Engine, its plugins
+  and Widget Framwork. It will also allow you to install the database,
+  cache and web servers.

From 9560ee98ed6f3b7115c86a5e29635f8cb0ae0782 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 13 Dec 2011 12:56:00 +0800
Subject: [PATCH 0176/2585] - implemented a "package" command which generates
 DEB and RPM packages   for the EAR installed.

  'ece package' will use the tomcat_base & instance information
  available on its own host.

  Example run:

  $ ece -i editor2 package
  [ece#engine-editor2] RPM package of your editor2 engine instance with with build
  [ece#engine-editor2] version 1323752034 is now available in /var/cache/escenic
  [ece#engine-editor2] DEB package of your editor2 engine instance with with build
  [ece#engine-editor2] version 1323752034 is now available in /var/cache/escenic

  $ ls /var/cache/escenic/*.{rpm,deb}
  -rw-r--r-- 1 torstein torstein 106M Dec 13 12:54 /var/cache/escenic/escenic-engine-editor2-1323752034-2.noarch.rpm
  -rw-r--r-- 1 torstein torstein 106M Dec 13 12:54 /var/cache/escenic/escenic-engine-editor2-1323752034.deb
---
 usr/bin/ece | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 87 insertions(+)

diff --git a/usr/bin/ece b/usr/bin/ece
index aa6b06a4..fccdaa3b 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -994,6 +994,90 @@ function assemble()
     debug $assemblytool_home/dist/engine.ear "is now ready"
 }
 
+# creates DEB and RPM packages suitable for deploying any kind of ECE
+# instance that was previously assembled.
+function create_packages()
+{
+    local ear=$cache_dir/engine.ear
+    if [ ! -e $ear ]; then
+        print "$ear does not exist. Did you run '"`basename $0`" assemble'?"
+        exit 1
+    fi
+
+    local dir=$(mktemp -d)
+    local package_dir=$dir/debian
+    local package_name=escenic-${type}-${instance}
+    # TODO the version might be a bit on the extreme side. Could come
+    # from the SCM (if available)
+    local version=$(date +%s)
+
+    run mkdir -p $package_dir/DEBIAN
+    cat > $package_dir/DEBIAN/control <<EOF
+Package: $package_name
+Version: $version
+Section: base
+Priority: optional
+Architecture: all
+Maintainer: Torstein Krause Johansen <tkj@vizrt.com>
+Description: The Escenic Content Engine of type ${type}
+  for the ${instance} instance. Built on $HOSTNAME
+EOF
+
+    case $appserver in
+        tomcat)
+            local tomcat_dir=${package_dir}${tomcat_base}
+            local tomcat_escenic_dir=${tomcat_dir}/escenic
+
+            # lib
+            run mkdir -p ${tomcat_escenic_dir}
+            run cd ${tomcat_escenic_dir}
+            run jar xf ${ear} lib
+
+            # war
+            run mkdir -p ${tomcat_dir}/webapps
+            run cd ${tomcat_dir}/webapps
+            for el in $(jar tf ${ear} | grep .war$); do
+                if [ -n "${deploy_webapp_white_list}" ]; then
+                    for ele in $deploy_webapp_white_list; do
+                        if [ ${el} = ${ele} ]; then
+                            run jar xf ${ear} ${el}
+                        fi
+                    done
+                else
+                    run jar xf ${ear} ${el}
+                fi
+            done
+
+            # copy these from the current configuration: bin, conf
+            run cp -r ${tomcat_base}/{bin,conf} ${tomcat_dir}
+
+            # these just need to be there: logs, temp
+            run mkdir ${tomcat_dir}/{logs,temp}
+
+            # build the packages
+            cd ${dir}
+            run dpkg-deb --build debian
+            run mv debian.deb ${package_name}-${version}.deb
+            
+            if [[ -x /usr/bin/alien && -x /usr/bin/fakeroot ]]; then
+                run fakeroot alien --to-rpm --scripts ${package_name}-${version}.deb
+                mv *.rpm ${cache_dir}
+                print "RPM package of your $instance $type instance with with build"
+                print "version $version is now available in ${cache_dir}"
+            fi
+            
+            mv *.deb ${cache_dir}
+            print "DEB package of your $instance $type instance with with build"
+            print "version $version is now available in ${cache_dir}"
+            ;;
+        *)
+            print "Only supported on Tomcat so far"
+            ;;
+    esac
+    
+    run -rf ${dir}
+}
+
 function get_log4j_log()
 {
     for el in $log_file_list; do
@@ -1534,6 +1618,9 @@ for el in $command; do
         assemble)
             assemble
             ;;
+        package)
+            create_packages
+            ;;
         clean)
             clean_up
             ;;

From dc516b5052e485d852dbdf4f8dde68e6e7b9671d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 13 Dec 2011 12:56:30 +0800
Subject: [PATCH 0177/2585] - added package to possible completions

---
 etc/bash_completion.d/ece | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/bash_completion.d/ece b/etc/bash_completion.d/ece
index 8a8b6a4d..78a4a254 100644
--- a/etc/bash_completion.d/ece
+++ b/etc/bash_completion.d/ece
@@ -6,7 +6,7 @@ _ece_commands()
     local prev=${COMP_WORDS[COMP_CWORD-1]}
 
     commands="applog assemble backup clean deploy edit help info kill log loglist \
-              flush outlog restart start status stop threaddump update versions"
+              flush outlog package restart start status stop threaddump update versions"
     options="-i --instance -p --publication -r --publication-resource \
              -t --type -u --user -w --password"
     resources="content-type feature layout layout-group image-version menu \

From fe5d58ca14d32d5db22d8b6424931f708c073f3e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 13 Dec 2011 13:32:25 +0800
Subject: [PATCH 0178/2585] - added simple postinst script

---
 usr/local/src/debian/DEBIAN/postinst | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 usr/local/src/debian/DEBIAN/postinst

diff --git a/usr/local/src/debian/DEBIAN/postinst b/usr/local/src/debian/DEBIAN/postinst
new file mode 100644
index 00000000..d22cabda
--- /dev/null
+++ b/usr/local/src/debian/DEBIAN/postinst
@@ -0,0 +1,4 @@
+#! /usr/bin/env bash
+set -e
+
+/usr/sbin/ece-install

From 28c1b63ebc2d539e98534062c0681721e9c3461c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 13 Dec 2011 13:36:41 +0800
Subject: [PATCH 0179/2585] - making sure installed scripts are executable

---
 usr/local/src/debian/DEBIAN/postinst | 4 ++++
 1 file changed, 4 insertions(+)
 mode change 100644 => 100755 usr/local/src/debian/DEBIAN/postinst

diff --git a/usr/local/src/debian/DEBIAN/postinst b/usr/local/src/debian/DEBIAN/postinst
old mode 100644
new mode 100755
index d22cabda..2b37fbca
--- a/usr/local/src/debian/DEBIAN/postinst
+++ b/usr/local/src/debian/DEBIAN/postinst
@@ -1,4 +1,8 @@
 #! /usr/bin/env bash
 set -e
 
+chmod +x /usr/sbin/ece-install /usr/bin/{ece,system-info}
 /usr/sbin/ece-install
+
+exit 0
+

From 6d91a315477cd3a3b078176a94ff0d82b498c74a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 13 Dec 2011 21:02:35 +0800
Subject: [PATCH 0180/2585] - simplified the postinst

---
 usr/local/src/debian/DEBIAN/postinst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/local/src/debian/DEBIAN/postinst b/usr/local/src/debian/DEBIAN/postinst
index 2b37fbca..fe550beb 100755
--- a/usr/local/src/debian/DEBIAN/postinst
+++ b/usr/local/src/debian/DEBIAN/postinst
@@ -2,7 +2,7 @@
 set -e
 
 chmod +x /usr/sbin/ece-install /usr/bin/{ece,system-info}
-/usr/sbin/ece-install
+echo "You can now run ece-install to install Escenic Content Engine & friends"
 
 exit 0
 

From 8cabf4091a8f60ee48f5bd3384658c15ae4254d4 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 14 Dec 2011 12:34:39 +0800
Subject: [PATCH 0181/2585] - improved package names in "ece package", the
 command will now create   names like:

        escenic-content-engine-<instance>-<version>
        escenic-search-engine-<instance>-<version>
        escenic-analysis-engine-<instance>-<version>

  based on the instance type
- fixed bug in the deploy_webapp_white_list filtering inside
  create_packages.
- fixed cleanup(), now all EARs, DEBs and RPMs in /var/cache/escenic
  are cleaned when doing "ece clean".
---
 usr/bin/ece | 40 ++++++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index fccdaa3b..cbc99cc4 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -1006,7 +1006,18 @@ function create_packages()
 
     local dir=$(mktemp -d)
     local package_dir=$dir/debian
-    local package_name=escenic-${type}-${instance}
+    local package_name=""
+    
+    if [ $type = "engine" ]; then
+        package_name="escenic-content-engine-${instance}"
+    elif [ $type = "search" ]; then
+        package_name="escenic-search-engine-${instance}"
+    elif [ $type = "rmi-hub" ]; then
+        package_name="escenic-rmi-hub"
+    elif [ $type = "analysis" ]; then
+        package_name="escenic-analysis-engine-${instance}"
+    fi
+    
     # TODO the version might be a bit on the extreme side. Could come
     # from the SCM (if available)
     local version=$(date +%s)
@@ -1039,7 +1050,7 @@ EOF
             for el in $(jar tf ${ear} | grep .war$); do
                 if [ -n "${deploy_webapp_white_list}" ]; then
                     for ele in $deploy_webapp_white_list; do
-                        if [ ${el} = ${ele} ]; then
+                        if [ ${el} = ${ele}.war ]; then
                             run jar xf ${ear} ${el}
                         fi
                     done
@@ -1057,25 +1068,28 @@ EOF
             # build the packages
             cd ${dir}
             run dpkg-deb --build debian
-            run mv debian.deb ${package_name}-${version}.deb
+            local deb_package=${package_name}-${version}.deb
+            run mv debian.deb ${deb_package}
             
             if [[ -x /usr/bin/alien && -x /usr/bin/fakeroot ]]; then
-                run fakeroot alien --to-rpm --scripts ${package_name}-${version}.deb
+                run fakeroot alien --to-rpm --scripts ${deb_package}
                 mv *.rpm ${cache_dir}
                 print "RPM package of your $instance $type instance with with build"
-                print "version $version is now available in ${cache_dir}"
+                print "version $version is now available:"
+                print $(echo /var/cache/escenic/${package_name}-${version}*.rpm)
             fi
             
             mv *.deb ${cache_dir}
             print "DEB package of your $instance $type instance with with build"
-            print "version $version is now available in ${cache_dir}"
+            print "version $version is now available:"
+            print /var/cache/escenic/${deb_package}
             ;;
         *)
-            print "Only supported on Tomcat so far"
+            print "Package creation is only supported on Tomcat so far."
             ;;
     esac
-    
-    run -rf ${dir}
+
+    run rm -rf ${dir}
 }
 
 function get_log4j_log()
@@ -1295,14 +1309,12 @@ function clean_up()
             2>>$log_file
     fi
     
-    if [ -e /var/cache/escenic/ -a \
-        `ls  /var/cache/escenic | grep ece- | wc -l` -gt 0 ]; then
-        print "Cleaning up "`basename $0`" files in /var/cache/escenic/ ..." 
-        rm -rf /var/cache/escenic/* \
+    if [ -d /var/cache/escenic ]; then
+        print "Cleaning up ear, deb and rpm files in /var/cache/escenic ..." 
+        rm -rf /var/cache/escenic/*.{rpm,deb,ear} \
             1>>$log_file \
             2>>$log_file
     fi
-    
 }
 
 function set_id()

From 694c73f2c02c121db88d35724d05f2ddf405f7d3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 15 Dec 2011 18:36:37 +0800
Subject: [PATCH 0182/2585] - ece will now honour appserver_port when set in
 any of the .conf   files. - default wise, the /etc/escenic/ece.conf will ship
 with   appserver_port=8080 - the appserver_port is unset, ece will (continue
 to) use the system   out log on Tomcat to determine the port. - for other
 appservers, if the appserver_port is unset, ece will   default to port 8080.
 - this should hopefully close the rather old  
 https://github.com/skybert/ece-scripts/issues/25 :-)

---
 etc/escenic/ece.conf |  9 +++++++-
 usr/bin/ece          | 49 +++++++++++++++++++++++++++++++++++++-------
 2 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/etc/escenic/ece.conf b/etc/escenic/ece.conf
index be5ded7d..3f5ddc0c 100644
--- a/etc/escenic/ece.conf
+++ b/etc/escenic/ece.conf
@@ -1,4 +1,4 @@
-# ece script configruation                                 -*- sh -*-
+# ece script configruation                                 -*- conf -*-
 
 #          version: $Revision: #1 $ $Date: 2011/02/18 $
 #           author: torstein@escenic.com
@@ -33,6 +33,13 @@ java_home=/usr/lib/jvm/java-6-sun
 ########################################################################
 appserver=tomcat
 
+########################################################################
+# App server port. If this variable is unset, ece will try to figure
+# out the port number by itself. ece-<instance>.conf should override
+# this when there's more than one ECE instance on the same host.
+########################################################################
+appserver_port=8080
+
 ########################################################################
 # Section II: Variables that are sensible defaults but may be changed
 # to accommodate the conventions or tastes of your OS or company.
diff --git a/usr/bin/ece b/usr/bin/ece
index cbc99cc4..a871108e 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -13,6 +13,7 @@
 verbose=0
 force_ipv4=0
 quiet=0
+everything_but_the_kitchen_sink=0
 
 ######################################################################
 # Dear user, don't touch anyting in this script, especially below this
@@ -259,7 +260,11 @@ function set_type_pid()
 function set_type_port()
 {
     host=localhost
-    if [ $appserver != "tomcat" ]; then
+    # port set in ece[-instance].conf takes precedence
+    if [ -n "${appserver_port}" ]; then
+        port=${appserver_port}
+        debug "appserver_port set in .conf files=${port}"
+    elif [ $appserver != "tomcat" ]; then
         debug "Only tomcat is supported for reading host/port right now, "
         debug "trying to make an educated guess"
         port=8080
@@ -1036,8 +1041,8 @@ EOF
 
     case $appserver in
         tomcat)
-            local tomcat_dir=${package_dir}${tomcat_base}
-            local tomcat_escenic_dir=${tomcat_dir}/escenic
+            local tomcat_base_dir=${package_dir}${tomcat_base}
+            local tomcat_escenic_dir=${tomcat_base_dir}/escenic
 
             # lib
             run mkdir -p ${tomcat_escenic_dir}
@@ -1045,8 +1050,8 @@ EOF
             run jar xf ${ear} lib
 
             # war
-            run mkdir -p ${tomcat_dir}/webapps
-            run cd ${tomcat_dir}/webapps
+            run mkdir -p ${tomcat_base_dir}/webapps
+            run cd ${tomcat_base_dir}/webapps
             for el in $(jar tf ${ear} | grep .war$); do
                 if [ -n "${deploy_webapp_white_list}" ]; then
                     for ele in $deploy_webapp_white_list; do
@@ -1059,11 +1064,36 @@ EOF
                 fi
             done
 
+            # putting this block here so that anything overridden in
+            # tomcat_base takes precedence over tomcat_home
+            if [ ${everything_but_the_kitchen_sink} -eq 1 ]; then
+                (
+                    local tomcat_home_dir=${package_dir}${tomcat_home}
+                    run mkdir -p ${tomcat_home_dir}
+                    run cd ${tomcat_home_dir}
+                    run cp -r ${tomcat_home}/{bin,lib} ${tomcat_home_dir}
+
+                    local etc_escenic_dir=${package_dir}/etc/escenic
+                    run mkdir -p ${etc_escenic_dir}
+                    cd ${etc_escenic_dir}
+                    run cp -r /etc/escenic/{ece,ece-${instance}}.conf \
+                        ${etc_escenic_dir}
+
+                    run mkdir -p ${etc_escenic_dir}/engine
+                    run cp -r /etc/escenic/engine/common \
+                        ${etc_escenic_dir}
+                    
+                    run mkdir -p ${etc_escenic_dir}/engine/instance
+                    run cp -r /etc/escenic/engine/instance/${instance} \
+                        ${etc_escenic_dir}
+                )
+            fi
+            
             # copy these from the current configuration: bin, conf
-            run cp -r ${tomcat_base}/{bin,conf} ${tomcat_dir}
+            run cp -r ${tomcat_base}/{bin,conf} ${tomcat_base_dir}
 
             # these just need to be there: logs, temp
-            run mkdir ${tomcat_dir}/{logs,temp}
+            run mkdir ${tomcat_base_dir}/{logs,temp}
 
             # build the packages
             cd ${dir}
@@ -1183,6 +1213,11 @@ function set_type_command_and_instance()
             continue
         fi
         
+        if [ $el  = "--full" ]; then
+            everything_but_the_kitchen_sink=1
+            continue
+        fi
+        
         if [ $el = "-q" -o $el = "--quiet" ]; then
             quiet=1
             continue

From c094801e6e352f55f089fdf0a9e096dbed37dc21 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 15 Dec 2011 18:36:58 +0800
Subject: [PATCH 0183/2585] - added Emacs mode line

---
 etc/bash_completion.d/ece | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/bash_completion.d/ece b/etc/bash_completion.d/ece
index 78a4a254..ad53165e 100644
--- a/etc/bash_completion.d/ece
+++ b/etc/bash_completion.d/ece
@@ -1,4 +1,4 @@
-# auto completion for the /usr/bin/ece command.
+# auto completion for the /usr/bin/ece command.       Emacs: -*- sh -*- mode
 
 _ece_commands()
 {

From 51a3a8ba883397200f6265987a3768a197b44e41 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 15 Dec 2011 18:37:28 +0800
Subject: [PATCH 0184/2585] - fixed  permissions on DEBIAN/postinst

---
 usr/local/src/create-packages | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/usr/local/src/create-packages b/usr/local/src/create-packages
index f0276e3a..f362f618 100644
--- a/usr/local/src/create-packages
+++ b/usr/local/src/create-packages
@@ -15,6 +15,9 @@ cp -r ../../../usr/share $target_dir/usr
 
 sed -i "s#VERSION#${version}#g" $target_dir/DEBIAN/control
 
+# fix permissions
+chmod 755 $target_dir/DEBIAN/postinst
+
 dpkg-deb --build debian
 mv debian.deb ${package_name}-${version}.deb
 

From c390397302af3611836c1f0762889bc8acac35f4 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 15 Dec 2011 19:22:13 +0800
Subject: [PATCH 0185/2585] - to support the change in ece  
 (694c73f2c02c121db88d35724d05f2ddf405f7d3), ece-install will also   populate
 the appserver_port parameter in ece-<instance>.conf at the   time of
 installation. Change done in set_up_app_server

- fixed bug in is_installing_from_archives where it would return 1
  (true) whenever installing (presentation) server interactively.

- fixed bug in install_ece_instance where the presentation server
  server specific appendices to ece-<instance>.conf wouldn't be
  written because it was checking against a hard value '2', instead of
  INSTALL_PRESENTATION_SERVER constant.
---
 usr/sbin/ece-install | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index fee4dcac..a37505c5 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -146,7 +146,7 @@ http://technet.escenic.com/downloads/assemblytool-2.0.2.zip
 http://technet.escenic.com/downloads/release/53/analysis-engine-2.3.6.0.zip
 http://technet.escenic.com/downloads/release/53/community-engine-3.6.1.0.zip
 http://technet.escenic.com/downloads/release/53/dashboard-1.0.0.0.zip
-http://technet.escenic.com/downloads/release/53/engine-5.3.4.3.zip
+http://technet.escenic.com/downloads/release/53/engine-5.3.4.7.zip
 http://technet.escenic.com/downloads/release/53/forum-3.0.0.0.zip
 http://technet.escenic.com/downloads/release/53/inpage-1.3.0.0.zip
 http://technet.escenic.com/downloads/release/53/lucy-dist-4.1.6.0.zip
@@ -810,6 +810,7 @@ function set_up_app_server
 
     set_ece_instance_conf tomcat_base $tomcat_base   
     set_ece_instance_conf tomcat_home /opt/tomcat   
+    set_ece_instance_conf appserver_port $appserver_port
    
     run cd $tomcat_base/lib
     make_ln $jdbc_driver
@@ -1761,7 +1762,9 @@ function is_installing_from_archives()
     log ece_instance_ear_file=$ece_instance_ear_file
     log ece_instance_conf_archive=$ece_instance_conf_archive
 
-    if [[ -z "$ece_instance_ear_file" || -z "$ece_instance_conf_archive" ]]; then
+    if [[ -z "$ece_instance_ear_file" || \
+        -z "$ece_instance_conf_archive" || \
+        $fai_enabled -eq 0 ]]; then
         echo 0
         return
     fi
@@ -1845,7 +1848,7 @@ function install_presentation_server()
 {
     print_and_log "Installing a presentation server on $HOSTNAME ..."
     type=engine
-    install_ece_instance "web1" 1
+    install_ece_instance "web1" $PROFILE_PRESENTATION_SERVER
 }
 
 function assemble_deploy_and_restart_type()

From e2b39bbe513d1d2969825ad7a48d8cc13f366ac4 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 15 Dec 2011 19:44:34 +0800
Subject: [PATCH 0186/2585] - now sets name & email dynamically in the DEB/RPM
 packages depending   on the user running the create-packages script.

---
 usr/local/src/create-packages | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/usr/local/src/create-packages b/usr/local/src/create-packages
index f362f618..34330868 100644
--- a/usr/local/src/create-packages
+++ b/usr/local/src/create-packages
@@ -4,7 +4,26 @@ rm -rf debian/{etc,usr}
 
 target_dir=debian
 package_name=escenic-content-engine-installer
-version=5.3.3.3
+
+function get_version()
+{
+    engine_file=$(grep http ../../sbin/ece-install | grep "/engine")
+    version=$(basename $engine_file .zip | cut -d'-' -f2)
+    echo $version
+}
+
+function get_name()
+{
+    name=$(grep $USER /etc/passwd | cut -d':' -f5 | cut -d',' -f1)
+    echo "${name}"
+}
+
+function get_email()
+{
+    echo ${USER}@${HOSTNAME}
+}
+
+version=$(get_version)
 
 cp -r ../../../etc $target_dir
 
@@ -13,7 +32,11 @@ cp -r ../../../usr/bin $target_dir/usr
 cp -r ../../../usr/sbin $target_dir/usr
 cp -r ../../../usr/share $target_dir/usr
 
+cp $target_dir/DEBIAN/control $target_dir/DEBIAN/control.orig
+
 sed -i "s#VERSION#${version}#g" $target_dir/DEBIAN/control
+sed -i "s#MAINTAINER_NAME#$(get_name)#g" $target_dir/DEBIAN/control
+sed -i "s#MAINTAINER_EMAIL#$(get_email)#g" $target_dir/DEBIAN/control
 
 # fix permissions
 chmod 755 $target_dir/DEBIAN/postinst
@@ -24,3 +47,6 @@ mv debian.deb ${package_name}-${version}.deb
 if [[ -x /usr/bin/alien && -x /usr/bin/fakeroot ]]; then
     fakeroot alien --to-rpm --scripts ${package_name}-${version}.deb
 fi
+
+# cleanup
+cp $target_dir/DEBIAN/control.orig $target_dir/DEBIAN/control

From 759cc08c5b70910eb732ba5db1e57b826520664c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 15 Dec 2011 19:44:54 +0800
Subject: [PATCH 0187/2585] - now prompts the user if he/she wants to run the
 installation script   after installation.

---
 usr/local/src/debian/DEBIAN/postinst | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/usr/local/src/debian/DEBIAN/postinst b/usr/local/src/debian/DEBIAN/postinst
index fe550beb..d8b24474 100755
--- a/usr/local/src/debian/DEBIAN/postinst
+++ b/usr/local/src/debian/DEBIAN/postinst
@@ -1,8 +1,19 @@
 #! /usr/bin/env bash
-set -e
+# set -e
 
 chmod +x /usr/sbin/ece-install /usr/bin/{ece,system-info}
-echo "You can now run ece-install to install Escenic Content Engine & friends"
+
+echo "Do you wish to run the Escenic Content Engine installer now?"
+
+answer=no
+echo -n "Your choice: yes/[no] "
+read answer
+
+if [ "$answer" = "yes" ]; then
+    ece-install
+else
+    echo "Run the Escenic Content Engine installer by typing 'ece-install'"
+fi
 
 exit 0
 

From 03d984be0f2d3bf5f0fbc13e26374182ec9ca11b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 15 Dec 2011 19:49:14 +0800
Subject: [PATCH 0188/2585] - added guard on dpkg-deb

---
 usr/local/src/create-packages | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/usr/local/src/create-packages b/usr/local/src/create-packages
index 34330868..7a1a7236 100644
--- a/usr/local/src/create-packages
+++ b/usr/local/src/create-packages
@@ -41,6 +41,11 @@ sed -i "s#MAINTAINER_EMAIL#$(get_email)#g" $target_dir/DEBIAN/control
 # fix permissions
 chmod 755 $target_dir/DEBIAN/postinst
 
+if [ ! -x /usr/bin/dpkg-deb ]; then
+    echo "You must have dpkg-deb installed"
+    exit 1
+fi
+
 dpkg-deb --build debian
 mv debian.deb ${package_name}-${version}.deb
 

From 590086f8b3e055e4cf266769cd1c08b41b4fa499 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 15 Dec 2011 19:51:09 +0800
Subject: [PATCH 0189/2585] - added user friendly messages if the host system
 has insufficient   packages for creating any of the packages.

---
 usr/local/src/create-packages | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/usr/local/src/create-packages b/usr/local/src/create-packages
index 7a1a7236..c94d7daa 100644
--- a/usr/local/src/create-packages
+++ b/usr/local/src/create-packages
@@ -42,7 +42,7 @@ sed -i "s#MAINTAINER_EMAIL#$(get_email)#g" $target_dir/DEBIAN/control
 chmod 755 $target_dir/DEBIAN/postinst
 
 if [ ! -x /usr/bin/dpkg-deb ]; then
-    echo "You must have dpkg-deb installed"
+    echo "You must have dpkg-deb installed :-("
     exit 1
 fi
 
@@ -51,6 +51,8 @@ mv debian.deb ${package_name}-${version}.deb
 
 if [[ -x /usr/bin/alien && -x /usr/bin/fakeroot ]]; then
     fakeroot alien --to-rpm --scripts ${package_name}-${version}.deb
+else
+    echo "You must have 'alien' and 'fakeroot' installed to create RPMs"
 fi
 
 # cleanup

From 4f7edae396e5757c435fe35831cc28c3468a65a0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 15 Dec 2011 20:00:54 +0800
Subject: [PATCH 0190/2585] - added more description

---
 usr/local/src/debian/DEBIAN/control | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/usr/local/src/debian/DEBIAN/control b/usr/local/src/debian/DEBIAN/control
index 8e74d6ec..78ba42f0 100644
--- a/usr/local/src/debian/DEBIAN/control
+++ b/usr/local/src/debian/DEBIAN/control
@@ -1,10 +1,14 @@
 Package: escenic-content-engine-installer
-Version: 5.3.3.3
+Version: VERSION
 Section: base
 Priority: optional
 Architecture: all
-Maintainer: Torstein Krause Johansen <tkj@vizrt.com>
+Maintainer: MAINTAINER_NAME <MAINTAINER_EMAIL>
 Description: The Escenic Content Engine Installer.
-  This script lets you install the Escenic Content Engine, its plugins
-  and Widget Framwork. It will also allow you to install the database,
-  cache and web servers.
+  The ece-install script lets you install the Escenic Content Engine,
+  its plugins and Widget Framwork. It will also allow you to install
+  the database, cache and web servers.
+  .
+  The script can run in both interactive or full automatic mode (FAI). See the
+  documentation in /usr/share/doc/escenic/ for further details.
+ 
\ No newline at end of file

From 31c3e377fdc81fdbd28f643a117114fce26d9b67 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 11 Jan 2012 18:04:38 +0800
Subject: [PATCH 0191/2585] - added the of two new variables: escenic_root_dir
 and   escenic_conf_dir which can be overridden in ece-install.conf.

  The defaults will work fine in most cases and the default paths are
  the ones recommended by Escenic/Vizrt Online and are the ones used
  in the documentation:

  escenic_root_dir=/opt/escenic
  escenic_conf_dir=/etc/escenic
---
 usr/sbin/ece-install | 130 ++++++++++++++++++++++---------------------
 1 file changed, 66 insertions(+), 64 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index a37505c5..940f64d6 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -15,13 +15,15 @@
 #####################################################################
 # User definable variables (the defaults are fine in most
 # cases). These are the most likely variables you want to change and
-# they can all be set in the .ece-isntall.conf file
+# they can all be set in the ece-install.conf file
 #####################################################################
 ece_user=escenic
 ece_group=escenic
 jdbc_driver=/usr/share/java/mysql.jar
 debug=0
 tomcat_download=http://apache.stu.edu.tw/tomcat/tomcat-6/v6.0.33/bin/apache-tomcat-6.0.33.tar.gz
+escenic_root_dir=/opt/escenic
+escenic_conf_dir=/etc/escenic
 
 # The script will install the sun-java6-jdk package on Debian based
 # systems and this is the path of the JAVA home with this package. If
@@ -175,9 +177,9 @@ PROFILE_RESTORE_FROM_BACKUP=11
 # directories.
 engine_dir_list="
 $common_nursery_dir
-/etc/escenic/engine/family/default
-/etc/escenic/engine/host/localhost
-/opt/escenic
+$escenic_conf_dir/engine/family/default
+$escenic_conf_dir/engine/host/localhost
+$escenic_root_dir
 /var/cache/escenic
 /var/crash/escenic
 /var/lib/escenic
@@ -300,27 +302,27 @@ function set_up_assembly_tool()
 {
     print_and_log "Setting up the Assembly Tool ..."
     
-    make_dir /opt/escenic/assemblytool/
-    cd /opt/escenic/assemblytool/
+    make_dir $escenic_root_dir/assemblytool/
+    cd $escenic_root_dir/assemblytool/
     
     if [ -e $download_dir/assemblytool*zip ]; then
         run unzip -u $download_dir/assemblytool*zip
     fi
 
     # adding an instance layer to the Nursery configuration
-    cp -r /opt/escenic/engine/siteconfig/bootstrap-skeleton \
-        /opt/escenic/assemblytool/conf
-    cd /opt/escenic/assemblytool/conf/
+    cp -r $escenic_root_dir/engine/siteconfig/bootstrap-skeleton \
+        $escenic_root_dir/assemblytool/conf
+    cd $escenic_root_dir/assemblytool/conf/
     cp -r layers/host layers/instance
     cat > layers/instance/Files.properties <<EOF
 \$class=neo.nursery.FileSystemDepot
-fileSystemRoot = /etc/escenic/engine/instance/\${com.escenic.instance}/
+fileSystemRoot = $escenic_conf_dir/engine/instance/\${com.escenic.instance}/
 EOF
     echo "" >> Nursery.properties
     echo "layer.06 = /layers/instance/Layer" >> Nursery.properties
     
     # set up which plugins to use
-    cd /opt/escenic/assemblytool/
+    cd $escenic_root_dir/assemblytool/
     make_dir plugins
     cd plugins
     find ../../ -maxdepth 1 -type d | \
@@ -341,7 +343,7 @@ EOF
         make_ln $directory
     done
 
-    run cd /opt/escenic/assemblytool/
+    run cd $escenic_root_dir/assemblytool/
     run ant -q initialize
     sed -i 's/#\ engine.root\ =\ \./engine.root=\/opt\/escenic\/engine/g' \
         assemble.properties \
@@ -362,8 +364,8 @@ function set_up_engine_and_plugins()
     
     print_and_log "Setting up the Escenic Content Engine & its plugins ..."
 
-    make_dir /opt/escenic
-    cd /opt/escenic/
+    make_dir $escenic_root_dir
+    cd $escenic_root_dir/
 
     for el in $technet_download_list; do
         if [ $(basename $el | \
@@ -385,9 +387,9 @@ function set_up_engine_and_plugins()
         debug "${engine_dir} is already there, skipping to next step."
     fi
 
-    # we now extract all the plugins. We extract them in /opt/escenic
+    # we now extract all the plugins. We extract them in $escenic_root_dir
     # as we want to re-use them between minor updates of ECE.
-    cd /opt/escenic/
+    cd $escenic_root_dir/
     for el in $download_dir/*.zip; do
         if [ $(basename $el | grep ^engine-.*.zip | wc -l) -gt 0 ]; then
             continue
@@ -421,8 +423,8 @@ function set_up_ecedb()
 {
     print_and_log "Setting up the ECE database schema ..."
 
-    make_dir /opt/escenic/engine/plugins
-    run cd /opt/escenic/engine/plugins
+    make_dir $escenic_root_dir/engine/plugins
+    run cd $escenic_root_dir/engine/plugins
     
     find ../../ -maxdepth 1 -type d | \
         grep -v assemblytool | \
@@ -449,7 +451,7 @@ function set_up_ecedb()
     create_ecedb
     
     cd ~/
-    run rm -rf /opt/escenic/engine/plugins
+    run rm -rf $escenic_root_dir/engine/plugins
 
     add_next_step "DB is now set up on $HOSTNAME:3306"
 }
@@ -458,25 +460,25 @@ function set_up_basic_nursery_configuration()
 {
     print_and_log "Setting up the basic Nursery configuration ..."
 
-    local escenic_home=/opt/escenic
+    local escenic_root_dir=$escenic_root_dir
     
     if [ $(is_installing_from_archives) -eq 1 ]; then
         print_and_log "Using the supplied Nursery & JAAS configuration from" 
         print_and_log "bundle: $ece_instance_conf_archive"
         local dir=$(mktemp -d)
-        escenic_home=$dir
+        escenic_root_dir=$dir
         run cd $dir
         run tar xzf $ece_instance_conf_archive
     fi
     
-    run cp -r $escenic_home/engine/siteconfig/config-skeleton/* \
+    run cp -r $escenic_root_dir/engine/siteconfig/config-skeleton/* \
         $common_nursery_dir/
-    run cp -r $escenic_home/engine/security/ \
+    run cp -r $escenic_root_dir/engine/security/ \
         $common_nursery_dir/
 
-    make_dir /etc/escenic/engine/instance
+    make_dir $escenic_conf_dir/engine/instance
 
-    for el in $escenic_home/assemblytool/plugins/*; do
+    for el in $escenic_root_dir/assemblytool/plugins/*; do
         if [ ! -d $el/misc/siteconfig/ ]; then
             continue
         fi
@@ -532,7 +534,7 @@ EOF
 
 function set_up_instance_specific_nursery_configuration()
 {
-    for el in /etc/escenic/engine/instance/*; do
+    for el in $escenic_conf_dir/engine/instance/*; do
        i=$(( i + 1 ))
        if [ $(basename $el) = $instance_name ]; then
            rmi_port="8${i}23"
@@ -541,7 +543,7 @@ function set_up_instance_specific_nursery_configuration()
     done
 
     nursery_context=neo/io/managers/HubConnectionManager.properties
-    file=/etc/escenic/engine/instance/$instance_name/$nursery_context
+    file=$escenic_conf_dir/engine/instance/$instance_name/$nursery_context
     make_dir $(dirname $file)
     
     # we don't touch it if the file already exists.
@@ -620,7 +622,7 @@ function set_conf_file_value()
 # the value already is set, it will replace it with this one.
 function set_ece_instance_conf()
 {
-    instance_conf_file=/etc/escenic/ece-$instance_name.conf
+    instance_conf_file=$escenic_conf_dir/ece-$instance_name.conf
     set_conf_file_value $1 $2 $instance_conf_file
 }
 
@@ -1093,26 +1095,26 @@ function create_publication_definition_and_war()
     fi
 
     print_and_log "Setting up the ${publication_name} publication ..."
-    make_dir /opt/escenic/assemblytool/publications/
-    run cd /opt/escenic/assemblytool/publications/
-    cat > /opt/escenic/assemblytool/publications/${publication_name}.properties <<EOF
+    make_dir $escenic_root_dir/assemblytool/publications/
+    run cd $escenic_root_dir/assemblytool/publications/
+    cat > $escenic_root_dir/assemblytool/publications/${publication_name}.properties <<EOF
 name: ${publication_name}
 source-war: ${publication_name}.war
 context-root: ${publication_name}
 EOF
 
-    publication_war=/opt/escenic/assemblytool/publications/${publication_name}.war
+    publication_war=$escenic_root_dir/assemblytool/publications/${publication_name}.war
     if [[ $fai_enabled -eq 1 && -n "${fai_publication_war}" ]]; then
         print_and_log "Basing ${publication_name}.war on the one specified in $conf_file"
         run cp ${fai_publication_war} ${publication_war}
-    elif [ -d /opt/escenic/widget-framework-core-* ]; then
+    elif [ -d $escenic_root_dir/widget-framework-core-* ]; then
         print_and_log "Basing ${publication_name}.war on Widget Framework Demo ..."
-        run cd /opt/escenic/widget-framework-core-*/publications/demo-core
+        run cd $escenic_root_dir/widget-framework-core-*/publications/demo-core
         run mvn $maven_opts package
         run cp target/demo-core-*.war ${publication_war}
     else
         print_and_log "Basing your ${publication_name}.war on ECE/demo-clean ..."
-        run cp /opt/escenic/engine/contrib/wars/demo-clean.war ${publication_war}
+        run cp $escenic_root_dir/engine/contrib/wars/demo-clean.war ${publication_war}
     fi
 
     # TODO add support for the community widgets
@@ -1158,7 +1160,7 @@ function install_memcached()
      # 2) configure PresenationArticle cache for the publication
      # 3) build and re-deploy
     
-    cat >> /etc/escenic/engine/common/Initial.properties <<EOF
+    cat >> $escenic_conf_dir/engine/common/Initial.properties <<EOF
 
 # using memcached
 service.0.0-memcached-socket-pool=/com/danga/SockIOPool
@@ -1192,14 +1194,14 @@ function set_up_user_enviornment()
 function set_up_solr()
 {
     print_and_log "Setting up solr ..."
-    if [ ! -d /etc/escenic/solr ]; then
-        run cp -r /opt/escenic/engine/solr/conf /etc/escenic/solr
+    if [ ! -d $escenic_conf_dir/solr ]; then
+        run cp -r $escenic_root_dir/engine/solr/conf $escenic_conf_dir/solr
     fi
     
     make_dir /var/lib/escenic/solr/
     run cd /var/lib/escenic/solr/
     if  [ ! -h conf ]; then
-        run ln -s /etc/escenic/solr conf
+        run ln -s $escenic_conf_dir/solr conf
     fi
 }
 
@@ -1210,12 +1212,12 @@ function un_install_ece()
 {
     print_and_log "Uninstalling ECE ..."
      # TODO safety, warnings++
-    rm -rf /etc/escenic/ \
+    rm -rf $escenic_conf_dir/ \
         /opt/*tomcat* \
-        /opt/escenic \
+        $escenic_root_dir \
         /var/lib/escenic \
         /var/run/escenic/ \
-        /etc/escenic/ \
+        $escenic_conf_dir/ \
         /usr/bin/ece \
         /var/log/escenic/ \
         /etc/apt/sources.list.d/escenic.list \
@@ -1692,7 +1694,7 @@ function ask_for_instance_name()
     if [ -z "$instance_name" ]; then
         instance_name=$1
     fi
-    make_dir /etc/escenic/engine/instance/${instance_name}
+    make_dir $escenic_conf_dir/engine/instance/${instance_name}
 }
 
 # Will update /etc/default/instance with the type instances which are
@@ -1701,7 +1703,7 @@ function ask_for_instance_name()
 function update_type_instances_to_start_up()
 {
     if [ $type = "engine" ]; then
-        for el in /etc/escenic/ece-*.conf; do
+        for el in $escenic_conf_dir/ece-*.conf; do
             if [ $(echo el | grep analysis | wc -l) -gt 0 ]; then
                 continue
             elif [ $(echo el | grep search | wc -l) -gt 0 ]; then
@@ -1718,7 +1720,7 @@ function update_type_instances_to_start_up()
                 /etc/default/ece
         done
     elif [ $type = "search" ]; then
-        for el in /etc/escenic/ece-*.conf; do
+        for el in $escenic_conf_dir/ece-*.conf; do
             if [ $(echo el | grep search | wc -l) -lt 1 ]; then
                 continue
             fi
@@ -1821,7 +1823,7 @@ function install_ece_instance()
 
     # special treatment for presentation servers
     if [ $2 -eq $PROFILE_PRESENTATION_SERVER ]; then
-        file=/etc/escenic/ece-${instance_name}.conf
+        file=$escenic_conf_dir/ece-${instance_name}.conf
         print_and_log "Creating instance specific conf: $file ..."
         cat >> $file <<EOF
 deploy_webapp_white_list="escenic-admin ${publication_name}"
@@ -1879,8 +1881,8 @@ function ensure_that_instance_is_running()
 
 function create_publication()
 {
-    if [ ! -e /opt/escenic/engine -o \
-        ! -e /opt/escenic/assemblytool ]; then
+    if [ ! -e $escenic_root_dir/engine -o \
+        ! -e $escenic_root_dir/assemblytool ]; then
         print_and_log "Please install ECE and an assembly environment before"
         print_and_log "running this installation profile again."
         remove_pid_and_exit_in_error
@@ -1890,7 +1892,7 @@ function create_publication()
     create_publication_definition_and_war
 
     # TODO make educated guesses about the available instances on
-    # $HOSTNAME by looking in /etc/escenic/ece-*.conf
+    # $HOSTNAME by looking in $escenic_conf_dir/ece-*.conf
     
     default_instance=dev1
 
@@ -1925,10 +1927,10 @@ function install_editorial_server()
 
 function install_rmi_hub()
 {
-    make_dir /etc/escenic/rmi-hub
+    make_dir $escenic_conf_dir/rmi-hub
     
-    run cp -r /opt/escenic/engine/contrib/rmi-hub/config/* \
-        /etc/escenic/rmi-hub/
+    run cp -r $escenic_root_dir/engine/contrib/rmi-hub/config/* \
+        $escenic_conf_dir/rmi-hub/
 
     hub_host=$HOSTNAME
     file=$common_nursery_dir
@@ -2044,14 +2046,14 @@ EOF
             $el \
             1>>$log 2>>$log
         
-        cd /opt/escenic/
+        cd $escenic_root_dir/
         unzip -u $download_dir/$(basename $el) \
             1>>$log 2>>$log
     done
 
     assert_pre_prequesite mvn
     export JAVA_HOME=$java_home
-    wf_maven_dir=$(echo /opt/escenic/widget-framework-core-*/maven)
+    wf_maven_dir=$(echo $escenic_root_dir/widget-framework-core-*/maven)
     run cd $wf_maven_dir
     
     print_and_log "Installing Widget Framework into your Maven repository ..."
@@ -2062,7 +2064,7 @@ EOF
 
     # installing the widget-framework-common as a ECE plugin
     wf_dist_dir=$(echo $wf_maven_dir/widget-framework-common/target/widget-framework-common-*-dist/widget-framework-common-*)
-    cd /opt/escenic/assemblytool/plugins
+    cd $escenic_root_dir/assemblytool/plugins
     if [ ! -h $(basename $wf_dist_dir) ]; then
         ln -s $wf_dist_dir
     fi
@@ -2079,7 +2081,7 @@ function install_search_server()
     type=search
     install_ece_instance "search1" 0
     
-    file=/etc/escenic/ece-${instance_name}.conf
+    file=$escenic_conf_dir/ece-${instance_name}.conf
     print_and_log "Creating instance specific conf: $file ..."
     cat >> $file <<EOF
 deploy_webapp_white_list="escenic-admin solr indexer-webapp"
@@ -2333,8 +2335,8 @@ EOF
         -O $file
     run chmod 755 $file
 
-    if [ ! -e /etc/escenic -o \
-        $(ls /etc/escenic/ | grep ece- | wc -l) -lt 1 ]; then
+    if [ ! -e $escenic_conf_dir -o \
+        $(ls $escenic_conf_dir/ | grep ece- | wc -l) -lt 1 ]; then
         print_and_log "No ECE instances found on $HOSTNAME, so I'm not adding"
         print_and_log "additional Munin configuration"  
         add_next_step "A Munin node has been installed on $HOSTNAME"
@@ -2342,7 +2344,7 @@ EOF
     fi
     
     escenic_jstat_modules="_gc _gcoverhead _heap _uptime"
-    for el in /etc/escenic/ece-*.conf; do
+    for el in $escenic_conf_dir/ece-*.conf; do
         current_instance=$(basename ${el} | \
             sed -e 's/ece-//g' -e 's/engine-//g' | \
             cut -d'.' -f1)
@@ -2573,16 +2575,16 @@ function restore_from_backup()
             )
             create_user_and_group_if_not_present
             
-            if [ -d /etc/escenic -a \
-                $(ls /etc/escenic/ | grep ^ece- | wc -l) -gt 0 -a \
-                $(grep ^tomcat_base /etc/escenic/ece*.conf | wc -l) -gt 0 ]; then
-                directories=$(grep ^tomcat_base /etc/escenic/ece*.conf | \
+            if [ -d $escenic_conf_dir -a \
+                $(ls $escenic_conf_dir/ | grep ^ece- | wc -l) -gt 0 -a \
+                $(grep ^tomcat_base $escenic_conf_dir/ece*.conf | wc -l) -gt 0 ]; then
+                directories=$(grep ^tomcat_base $escenic_conf_dir/ece*.conf | \
                     cut -d'=' -f2 | \
                     sed -e "s/'//g" -e 's/"//g'
                 )
                 s="Setting file permissions according to /etc/default/ece"
                 print_and_log $s
-                s="and /etc/escenic/ece*.conf"
+                s="and $escenic_conf_dir/ece*.conf"
                 print_and_log $s
                 run chown -R ${ece_user}:${ece_group} ${directories}
             fi

From 4fa3deeda6718954f808b77165aef68d4d740eac Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 11 Jan 2012 18:23:46 +0800
Subject: [PATCH 0192/2585] - updated documentation, added description of
 escenic_root_dir and   escenic_conf_dir to the file path chapter.

---
 usr/share/doc/escenic/ece-install-guide.org | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index e248c140..d7873521 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -596,6 +596,20 @@ but these should be the most interesting ones.
 
 *) Applies only to Debian based systems.
 
+The root directory of all Escenic software binaries, /opt/escenic,
+together with the root directory for the configuration files may be
+overwritten in ece-install.conf by setting these variables:
+
+#+BEGIN_SRC sh
+escenic_root_dir=/opt/escenic-parallel-env
+escenic_conf_dir=/etc/escenic-parallel-env
+#+END_SRC
+
+Note, this is only needed if you are running two completely separate
+environments on the same host. A use case is if you're setting up a
+test environment and want to separate stacks of Escenic Content Engine
+and plugins.
+
 * Assumptions
 ** /etc/esecenic is shared
 It's assumed that the /etc/escenic directory is either on a shared

From 235c17b0ad42c003692fdebcf37f2bc71b85a3ac Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 11 Jan 2012 18:25:30 +0800
Subject: [PATCH 0193/2585] - updated HTML

---
 usr/share/doc/escenic/ece-install-guide.html | 121 +++++++++++--------
 1 file changed, 70 insertions(+), 51 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.html b/usr/share/doc/escenic/ece-install-guide.html
index 4d455d22..0c873aed 100644
--- a/usr/share/doc/escenic/ece-install-guide.html
+++ b/usr/share/doc/escenic/ece-install-guide.html
@@ -7,7 +7,7 @@
 <title>Welcome to the /usr/sbin/ece-install Guide</title>
 <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
 <meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2011-12-02 11:07:01 CST"/>
+<meta name="generated" content="2012-01-11 18:24:53 CST"/>
 <meta name="author" content="Torstein Krause Johansen"/>
 <meta name="description" content=""/>
 <meta name="keywords" content=""/>
@@ -414,7 +414,7 @@ <h2 id="sec-4"><span class="section-number-2">4</span> Running the ece-install S
 </p>
 
 
-<pre class="src src-sh">[ece-install] /root/ece-install.conf doesn<span style="color: #8b2252;">'t exist, I cannot live without it :-(</span>
+<pre class="src src-sh">[ece-install] /root/ece-install.conf doesn<span style="color: #ffa07a;">'t exist, I cannot live without it :-(</span>
 </pre>
 
 
@@ -425,7 +425,7 @@ <h2 id="sec-4"><span class="section-number-2">4</span> Running the ece-install S
 
 
 <pre class="src src-sh">[ece-install] Be sure to set technet_user and technet_password
-[ece-install]<span style="color: #a020f0;"> in</span> /root/ece-install.conf
+[ece-install]<span style="color: #00ffff;"> in</span> /root/ece-install.conf
 </pre>
 
 
@@ -434,8 +434,8 @@ <h2 id="sec-4"><span class="section-number-2">4</span> Running the ece-install S
 </p>
 
 
-<pre class="src src-sh"><span style="color: #a0522d;">technet_user</span>=&lt;user&gt;
-<span style="color: #a0522d;">technet_password</span>=&lt;password&gt;
+<pre class="src src-sh"><span style="color: #f0dfaf;">technet_user</span>=&lt;user&gt;
+<span style="color: #f0dfaf;">technet_password</span>=&lt;password&gt;
 </pre>
 
 
@@ -451,7 +451,7 @@ <h2 id="sec-4"><span class="section-number-2">4</span> Running the ece-install S
 </p>
 
 
-<pre class="src src-sh"><span style="color: #b22222;"># </span><span style="color: #b22222;">bash ece-install [-v|--verbose]</span>
+<pre class="src src-sh"><span style="color: #7f9f7f; font-style: italic;"># </span><span style="color: #7f9f7f; font-style: italic;">bash ece-install [-v|--verbose]</span>
 </pre>
 
 
@@ -473,7 +473,7 @@ <h2 id="sec-4"><span class="section-number-2">4</span> Running the ece-install S
 </p>
 
 
-<pre class="src src-sh"><span style="color: #b22222;"># </span><span style="color: #b22222;">bash -x ece-install</span>
+<pre class="src src-sh"><span style="color: #7f9f7f; font-style: italic;"># </span><span style="color: #7f9f7f; font-style: italic;">bash -x ece-install</span>
 </pre>
 
 
@@ -497,9 +497,9 @@ <h2 id="sec-5"><span class="section-number-2">5</span> Available Server Profiles
 
 <pre class="src src-sh">Hi, which server profile do you wish to install?
 
-   1 - All<span style="color: #a020f0;"> in</span> one, full stack on one host, suitable for dev &amp; <span style="color: #483d8b;">test</span> environments
+   1 - All<span style="color: #00ffff;"> in</span> one, full stack on one host, suitable for dev &amp; <span style="color: #b0c4de;">test</span> environments
    2 - Editorial (publication) server
-   3 - Presentation server (ECE + memcached)<span style="color: #483d8b;">.</span>
+   3 - Presentation server (ECE + memcached)<span style="color: #b0c4de;">.</span>
    4 - Database server
    5 - Cache server (cache and web server)
    6 - RMI hub
@@ -691,10 +691,10 @@ <h3 id="sec-5-6"><span class="section-number-3">5.6</span> Profile - Database Se
 </p>
 
 
-<pre class="src src-conf">[<span style="color: #228b22;">ece-install</span>] Setting up the ECE database schema ...
-<span style="color: #a0522d;">ERROR 1007 (HY000) at line 1</span>: Can<span style="color: #8b2252;">'t create database '</span>ece5db<span style="color: #8b2252;">'; database exists</span>
-<span style="color: #8b2252;">ERROR 1050 (42S01) at line 2: Table '</span>DBChangeLog<span style="color: #8b2252;">' already exists</span>
-<span style="color: #8b2252;">[ece-install] running tables FAILED, exiting :-(</span>
+<pre class="src src-conf">[<span style="color: #98fb98;">ece-install</span>] Setting up the ECE database schema ...
+<span style="color: #f0dfaf;">ERROR 1007 (HY000) at line 1</span>: Can<span style="color: #ffa07a;">'t create database '</span>ece5db<span style="color: #ffa07a;">'; database exists</span>
+<span style="color: #ffa07a;">ERROR 1050 (42S01) at line 2: Table '</span>DBChangeLog<span style="color: #ffa07a;">' already exists</span>
+<span style="color: #ffa07a;">[ece-install] running tables FAILED, exiting :-(</span>
 </pre>
 
 
@@ -778,8 +778,8 @@ <h3 id="sec-5-8"><span class="section-number-3">5.8</span> Profile - Install Wid
 </p>
 
 
-<pre class="src src-sh">[ece-install] Be sure to set wf_user and wf_password<span style="color: #a020f0;"> in</span> /root/ece-install.conf
-[ece-install] If you don<span style="color: #8b2252;">'t have these, please contact support@escenic.com</span>
+<pre class="src src-sh">[ece-install] Be sure to set wf_user and wf_password<span style="color: #00ffff;"> in</span> /root/ece-install.conf
+[ece-install] If you don<span style="color: #ffa07a;">'t have these, please contact support@escenic.com</span>
 </pre>
 
 </div>
@@ -974,11 +974,11 @@ <h3 id="sec-5-13"><span class="section-number-3">5.13</span> Running in FAI mode
 </p>
 
 
-<pre class="src src-conf"><span style="color: #a0522d;">fai_enabled</span>=1
+<pre class="src src-conf"><span style="color: #f0dfaf;">fai_enabled</span>=1
 
-<span style="color: #a0522d;">fai_restore_from_backup</span>=1
-<span style="color: #a0522d;">fai_restore_all</span>=1
-<span style="color: #a0522d;">fai_restore_from_file</span>=/var/backups/escenic/engine-dev1-backup-2011-10-10.tar.gz
+<span style="color: #f0dfaf;">fai_restore_from_backup</span>=1
+<span style="color: #f0dfaf;">fai_restore_all</span>=1
+<span style="color: #f0dfaf;">fai_restore_from_file</span>=/var/backups/escenic/engine-dev1-backup-2011-10-10.tar.gz
 </pre>
 
 
@@ -1037,7 +1037,7 @@ <h2 id="sec-6"><span class="section-number-2">6</span> Full Automatic Install (F
 </p>
 
 
-<pre class="src src-sh"><span style="color: #b22222;"># </span><span style="color: #b22222;">bash ece-install &gt; ece-install.out &amp;</span>
+<pre class="src src-sh"><span style="color: #7f9f7f; font-style: italic;"># </span><span style="color: #7f9f7f; font-style: italic;">bash ece-install &gt; ece-install.out &amp;</span>
 </pre>
 
 
@@ -1046,7 +1046,7 @@ <h2 id="sec-6"><span class="section-number-2">6</span> Full Automatic Install (F
 </p>
 
 
-<pre class="src src-sh"><span style="color: #b22222;"># </span><span style="color: #b22222;">nohup bash ece-install &gt; ece-install.out &amp;</span>
+<pre class="src src-sh"><span style="color: #7f9f7f; font-style: italic;"># </span><span style="color: #7f9f7f; font-style: italic;">nohup bash ece-install &gt; ece-install.out &amp;</span>
 </pre>
 
 <p>
@@ -1102,11 +1102,11 @@ <h3 id="sec-6-1"><span class="section-number-3">6.1</span> Installing from EARs
 
 
 <pre class="src src-sh">$ cd /opt/escenic/engine
-$ tar czf /tmp/nursery-skeleton-and-security.tar.gz <span style="color: #8b2252;">\</span>
-  engine/security <span style="color: #8b2252;">\</span>
-  engine/siteconfig/config-skeleton/ <span style="color: #8b2252;">\</span>
-  engine/siteconfig/bootstrap-skeleton/ <span style="color: #8b2252;">\</span>
-  <span style="color: #ff00ff;">`find -L  assemblytool/plugins/ -name siteconfig`</span>
+$ tar czf /tmp/nursery-skeleton-and-security.tar.gz <span style="color: #ffa07a;">\</span>
+  engine/security <span style="color: #ffa07a;">\</span>
+  engine/siteconfig/config-skeleton/ <span style="color: #ffa07a;">\</span>
+  engine/siteconfig/bootstrap-skeleton/ <span style="color: #ffa07a;">\</span>
+  <span style="color: #fa8072;">`find -L  assemblytool/plugins/ -name siteconfig`</span>
 </pre>
 
 
@@ -1118,8 +1118,8 @@ <h3 id="sec-6-1"><span class="section-number-3">6.1</span> Installing from EARs
 
 
 
-<pre class="src src-sh"><span style="color: #a0522d;">fai_presentation_ear</span>=/tmp/engine.ear
-<span style="color: #a0522d;">fai_presentation_conf_archive</span>=/tmp/nursery-skeleton-and-security.tar.gz
+<pre class="src src-sh"><span style="color: #f0dfaf;">fai_presentation_ear</span>=/tmp/engine.ear
+<span style="color: #f0dfaf;">fai_presentation_conf_archive</span>=/tmp/nursery-skeleton-and-security.tar.gz
 </pre>
 
 
@@ -1208,10 +1208,10 @@ <h4 id="sec-6-3-1"><span class="section-number-4">6.3.1</span> Installing an Edi
 
 
 
-<pre class="src src-sh"><span style="color: #a0522d;">fai_enabled</span>=1
-<span style="color: #a0522d;">fai_editor_install</span>=1
-<span style="color: #a0522d;">fai_publication_create</span>=1
-<span style="color: #a0522d;">fai_publication_name</span>=jollygood
+<pre class="src src-sh"><span style="color: #f0dfaf;">fai_enabled</span>=1
+<span style="color: #f0dfaf;">fai_editor_install</span>=1
+<span style="color: #f0dfaf;">fai_publication_create</span>=1
+<span style="color: #f0dfaf;">fai_publication_name</span>=jollygood
 </pre>
 
 
@@ -1228,9 +1228,9 @@ <h4 id="sec-6-3-2"><span class="section-number-4">6.3.2</span> Installing Two Pr
 </p>
 
 
-<pre class="src src-sh"><span style="color: #a0522d;">fai_enabled</span>=1
-<span style="color: #a0522d;">fai_presentation_install</span>=1
-<span style="color: #a0522d;">fai_presentation_name</span>=web1
+<pre class="src src-sh"><span style="color: #f0dfaf;">fai_enabled</span>=1
+<span style="color: #f0dfaf;">fai_presentation_install</span>=1
+<span style="color: #f0dfaf;">fai_presentation_name</span>=web1
 </pre>
 
 
@@ -1239,11 +1239,11 @@ <h4 id="sec-6-3-2"><span class="section-number-4">6.3.2</span> Installing Two Pr
 </p>
 
 
-<pre class="src src-sh"><span style="color: #a0522d;">fai_enabled</span>=1
-<span style="color: #a0522d;">fai_presentation_install</span>=1
-<span style="color: #a0522d;">fai_presentation_name</span>=web2
-<span style="color: #a0522d;">fai_presentation_port</span>=8081
-<span style="color: #a0522d;">fai_presentation_shutdown</span>=8105
+<pre class="src src-sh"><span style="color: #f0dfaf;">fai_enabled</span>=1
+<span style="color: #f0dfaf;">fai_presentation_install</span>=1
+<span style="color: #f0dfaf;">fai_presentation_name</span>=web2
+<span style="color: #f0dfaf;">fai_presentation_port</span>=8081
+<span style="color: #f0dfaf;">fai_presentation_shutdown</span>=8105
 </pre>
 
 <p>
@@ -1284,10 +1284,10 @@ <h2 id="sec-7"><span class="section-number-2">7</span> Running More Than One Ins
 </p>
 
 
-<pre class="src src-sh">[ece-install] There<span style="color: #8b2252;">'s already one ece-install process running. If you believe</span>
-<span style="color: #8b2252;">[ece-install] this is wrong, e.g. if a previous run of ece-install was aborted</span>
-<span style="color: #8b2252;">[ece-install] before it completed, you may delete /var/run/ece-install.pid and</span>
-<span style="color: #8b2252;">[ece-install] run ece-install again.</span>
+<pre class="src src-sh">[ece-install] There<span style="color: #ffa07a;">'s already one ece-install process running. If you believe</span>
+<span style="color: #ffa07a;">[ece-install] this is wrong, e.g. if a previous run of ece-install was aborted</span>
+<span style="color: #ffa07a;">[ece-install] before it completed, you may delete /var/run/ece-install.pid and</span>
+<span style="color: #ffa07a;">[ece-install] run ece-install again.</span>
 </pre>
 
 
@@ -1404,6 +1404,25 @@ <h2 id="sec-10"><span class="section-number-2">10</span> Overview of File Paths
 <p>
 *) Applies only to Debian based systems.
 </p>
+<p>
+The root directory of all Escenic software binaries, /opt/escenic,
+together with the root directory for the configuration files may be
+overwritten in ece-install.conf by setting these variables:
+</p>
+
+
+
+<pre class="src src-sh"><span style="color: #f0dfaf;">escenic_root_dir</span>=/opt/escenic-parallel-env
+<span style="color: #f0dfaf;">escenic_conf_dir</span>=/etc/escenic-parallel-env
+</pre>
+
+
+<p>
+Note, this is only needed if you are running two completely separate
+environments on the same host. A use case is if you're setting up a
+test environment and want to separate stacks of Escenic Content Engine
+and plugins.
+</p>
 </div>
 
 </div>
@@ -1458,13 +1477,13 @@ <h2 id="sec-13"><span class="section-number-2">13</span> Example Output FAI </h2
 </p>
 
 
-<pre class="src src-sh"><span style="color: #a0522d;">technet_user</span>=apples
-<span style="color: #a0522d;">technet_password</span>=andoranges
-<span style="color: #a0522d;">wf_user</span>=foo
-<span style="color: #a0522d;">wf_password</span>=bar
+<pre class="src src-sh"><span style="color: #f0dfaf;">technet_user</span>=apples
+<span style="color: #f0dfaf;">technet_password</span>=andoranges
+<span style="color: #f0dfaf;">wf_user</span>=foo
+<span style="color: #f0dfaf;">wf_password</span>=bar
 
-<span style="color: #a0522d;">fai_enabled</span>=1
-<span style="color: #a0522d;">fai_all_install</span>=1
+<span style="color: #f0dfaf;">fai_enabled</span>=1
+<span style="color: #f0dfaf;">fai_all_install</span>=1
 </pre>
 
 
@@ -1520,7 +1539,7 @@ <h2 id="sec-13"><span class="section-number-2">13</span> Example Output FAI </h2
 <hr/>
 <p class="author">
   Author: Torstein Krause Johansen (<a href="mailto:tkj@vizrt.com">tkj@vizrt.com</a>)
-  Date: 2011-12-02 11:07:01 CST
+  Date: 2012-01-11 18:24:53 CST
 </p>
 </div>
 </body>

From d9d517e0d75439b1e47d5fbd8d4f81fde85da3d7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 11 Jan 2012 18:56:52 +0800
Subject: [PATCH 0194/2585] - added the following variables to override
 installation, log, run &   data directories from ece-install.conf:

  escenic_log_dir=/var/log/escenic
  escenic_data_dir=/var/lib/escenic
  escenic_run_dir=/var/run/escenic
  escenic_backups_dir=/var/backups/escenic
  appserver_root_dir=/opt

  in addition, there's already escenic_root_dir and escenic_conf_dir

- changed the entire script to use these variables
- changed the sed expressions in set_up_assembly_tool

  TODO: test that there's no false friends/mis-replaced paths in the
  script.
---
 usr/sbin/ece-install | 64 +++++++++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 28 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 940f64d6..987f3599 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -22,8 +22,16 @@ ece_group=escenic
 jdbc_driver=/usr/share/java/mysql.jar
 debug=0
 tomcat_download=http://apache.stu.edu.tw/tomcat/tomcat-6/v6.0.33/bin/apache-tomcat-6.0.33.tar.gz
+
+# These variables govern where software is installed and data and run
+# time files are written.
 escenic_root_dir=/opt/escenic
 escenic_conf_dir=/etc/escenic
+escenic_log_dir=/var/log/escenic
+escenic_data_dir=/var/lib/escenic
+escenic_run_dir=/var/run/escenic
+escenic_backups_dir=/var/backups/escenic
+appserver_root_dir=/opt
 
 # The script will install the sun-java6-jdk package on Debian based
 # systems and this is the path of the JAVA home with this package. If
@@ -182,10 +190,10 @@ $escenic_conf_dir/engine/host/localhost
 $escenic_root_dir
 /var/cache/escenic
 /var/crash/escenic
-/var/lib/escenic
-/var/lib/escenic/solr/data
-/var/log/escenic
-/var/run/escenic
+$escenic_data_dir
+$escenic_data_dir/solr/data
+$escenic_log_dir
+$escenic_run_dir
 /var/spool/escenic/migration
 "
 
@@ -345,12 +353,12 @@ EOF
 
     run cd $escenic_root_dir/assemblytool/
     run ant -q initialize
-    sed -i 's/#\ engine.root\ =\ \./engine.root=\/opt\/escenic\/engine/g' \
+    sed -i "s~#\ engine.root\ =\ \.~engine.root=${escenic_root_dir}/engine~g" \
         assemble.properties \
         1>>$log 2>>$log
     exit_on_error "sed on assemble.properties"
 
-    sed -i 's/\#\# plugins\ =\ \/path\/to\/plugins/plugins=\/opt\/escenic\/assemblytool\/plugins/g' \
+    sed -i "s~\#\# plugins\ =\ /path/to/plugins~plugins=${escenic_root_dir}/assemblytool/plugins~g" \
         assemble.properties \
         1>>$log 2>>$log
     exit_on_error "sed on assemble.properties"
@@ -504,7 +512,7 @@ function set_up_basic_nursery_configuration()
     
     cat > $common_nursery_dir/ServerConfig.properties <<EOF
 databaseProductName=MySQL
-filePublicationRoot=/var/lib/escenic/engine/
+filePublicationRoot=$escenic_data_dir/engine/
 webPublicationRoot=http://${public_host_name}/
 EOF
     cat > $common_nursery_dir/neo/io/managers/ContentManager.properties <<EOF
@@ -560,7 +568,7 @@ function set_up_proper_logging_configuration()
     cat > $common_nursery_dir/trace.properties <<EOF
 log4j.rootLogger=ERROR, ECELOG
 log4j.appender.ECELOG=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.ECELOG.File=/var/log/escenic/\${escenic.server}-messages
+log4j.appender.ECELOG.File=$escenic_log_dir/\${escenic.server}-messages
 log4j.appender.ECELOG.layout=org.apache.log4j.PatternLayout
 log4j.appender.ECELOG.layout.ConversionPattern=%d %5p [%t] %x (%c) %m%n
 EOF
@@ -585,7 +593,7 @@ java.util.logging.ConsoleHandler.level = FINE
 java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
 
 6localhost.org.apache.juli.FileHandler.level = FINE
-6localhost.org.apache.juli.FileHandler.directory = /var/log/escenic
+6localhost.org.apache.juli.FileHandler.directory = $escenic_log_dir
 6localhost.org.apache.juli.FileHandler.prefix = solr.
 
 org.apache.solr.level=INFO
@@ -794,7 +802,7 @@ function set_up_app_server
     run wget $wget_opts $tomcat_download
     tomcat_dir=$(get_base_dir_from_bundle $tomcat_download)
     
-    run cd /opt/
+    run cd $appserver_root_dir
     run tar xzf $download_dir/${tomcat_dir}.tar.gz
 
     if [ -e tomcat ]; then
@@ -802,16 +810,16 @@ function set_up_app_server
     fi
     run ln -sf ${tomcat_dir} tomcat
 
-    tomcat_base=/opt/tomcat-${instance_name}
+    tomcat_base=${appserver_root_dir}-${instance_name}
     make_dir $tomcat_base
 
-    run cp -r /opt/${tomcat_dir}/conf $tomcat_base
+    run cp -r ${appserver_root_dir}/${tomcat_dir}/conf $tomcat_base
     for el in bin escenic/lib lib work logs temp webapps; do
         make_dir $tomcat_base/$el
     done
 
     set_ece_instance_conf tomcat_base $tomcat_base   
-    set_ece_instance_conf tomcat_home /opt/tomcat   
+    set_ece_instance_conf tomcat_home ${appserver_root_dir/tomcat   
     set_ece_instance_conf appserver_port $appserver_port
    
     run cd $tomcat_base/lib
@@ -957,13 +965,13 @@ EOF
 
   <Environment
       name="escenic/head-tail-storage-file"
-      value="/var/lib/escenic/engine/head-tail.index"
+      value="$escenic_data_dir/engine/head-tail.index"
       type="java.lang.String"
       override="false"/>
 
   <Environment
       name="escenic/failing-documents-storage-file"
-      value="/var/lib/escenic/engine/failures.index"
+      value="$escenic_data_dir/engine/failures.index"
       type="java.lang.String"
       override="false"/>
 
@@ -1198,8 +1206,8 @@ function set_up_solr()
         run cp -r $escenic_root_dir/engine/solr/conf $escenic_conf_dir/solr
     fi
     
-    make_dir /var/lib/escenic/solr/
-    run cd /var/lib/escenic/solr/
+    make_dir $escenic_data_dir/solr/
+    run cd $escenic_data_dir/solr/
     if  [ ! -h conf ]; then
         run ln -s $escenic_conf_dir/solr conf
     fi
@@ -1213,13 +1221,13 @@ function un_install_ece()
     print_and_log "Uninstalling ECE ..."
      # TODO safety, warnings++
     rm -rf $escenic_conf_dir/ \
-        /opt/*tomcat* \
+        ${appserver_root_dir}/*tomcat* \
         $escenic_root_dir \
-        /var/lib/escenic \
-        /var/run/escenic/ \
+        $escenic_data_dir \
+        $escenic_run_dir/ \
         $escenic_conf_dir/ \
         /usr/bin/ece \
-        /var/log/escenic/ \
+        $escenic_log_dir/ \
         /etc/apt/sources.list.d/escenic.list \
         /var/run/ece-install.pid
 #        $HOME/.m2 \
@@ -2158,7 +2166,7 @@ server {
   # Typical endpoint for Adactus/Mobilize to get the videos to
   # transcode.
   location /binary {
-    root /var/lib/escenic;
+    root $escenic_data_dir;
     index index.html;
   }
 }
@@ -2191,7 +2199,7 @@ server {
   # Typical endpoint for Adactus/Mobilize to get the videos to
   # transcode.
   location /binary {
-    root /var/lib/escenic;
+    root $escenic_data_dir;
     index index.html;
   }
 }
@@ -2354,9 +2362,9 @@ EOF
         done
 
         # we need to hack a bit since escenic_jstat_ looks for
-        # instance PIDs in /var/run/escenic ece-<instance>.pid. It's
+        # instance PIDs in $escenic_run_dir ece-<instance>.pid. It's
         # now <type>-<instance>.pid
-        file=/var/run/escenic/$type-${instance_name}.pid
+        file=$escenic_run_dir/$type-${instance_name}.pid
         if [ ! -e $file ]; then
             run touch $file
         fi
@@ -2420,7 +2428,7 @@ function restore_from_backup()
     restore_data_files=0
     restore_conf=0
     backup_file=""
-    backup_dir=/var/backups/escenic
+    backup_dir=$escenic_backups_dir
     
     if [ $(get_boolean_conf_value fai_enabled) -eq 1 -a \
         $(get_boolean_conf_value fai_restore_from_backup) -eq 1 ]; then
@@ -2539,7 +2547,7 @@ function restore_from_backup()
         run tar -C / -xf $backup_file var/lib/escenic
         add_next_step "Successfully restored Solr & ECE data files"
         add_next_step "Backup file used:  $(basename $backup_file)"
-        add_next_step "Check /var/lib/escenic to verify they're all there."
+        add_next_step "Check $escenic_data_dir to verify they're all there."
     fi
     
     if [ $restore_conf -eq 1 -o $restore_all -eq 1 ]; then
@@ -2557,7 +2565,7 @@ function restore_from_backup()
         run tar -C / -xf $backup_file opt
         add_next_step "Successfully restored Escenic & Tomcat binaries"
         add_next_step "Backup file used: $(basename $backup_file)"
-        add_next_step "Check /opt to verify that they're all there".
+        add_next_step "Check ${appserver_root_dir} to verify that they're all there".
         install_ece_third_party_packages
         set_up_engine_directories
 

From d14793dd73bfe4009db0421ab250b514d59fc915 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 12 Jan 2012 12:55:47 +0800
Subject: [PATCH 0195/2585] - fixed syntax error in set_up_app_server,
 regression after   yesterday's parameterisation.

---
 usr/sbin/ece-install | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 987f3599..3790ef7b 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -304,8 +304,6 @@ function install_common_os_packages()
     done
 }
 
-make_dir $ece_directories
-
 function set_up_assembly_tool()
 {
     print_and_log "Setting up the Assembly Tool ..."
@@ -819,7 +817,7 @@ function set_up_app_server
     done
 
     set_ece_instance_conf tomcat_base $tomcat_base   
-    set_ece_instance_conf tomcat_home ${appserver_root_dir/tomcat   
+    set_ece_instance_conf tomcat_home ${appserver_root_dir}/tomcat   
     set_ece_instance_conf appserver_port $appserver_port
    
     run cd $tomcat_base/lib

From 750839ce1436b958afcb7d1bd5ec61115296b6aa Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 12 Jan 2012 14:17:47 +0800
Subject: [PATCH 0196/2585] -  added these options to ece-install.conf:

   escenic_spool_dir=/var/spool/escenic
   escenic_cache_dir=/var/cache/escenic
   escenic_crash_dir=/var/crash/escenic

- moved the setting of engine_dir_list to common_pre_install as this
  list is comprised of variables settable in ece-install.conf

- fixed corner case if you install nginx, and the sites available file
  is not available. This is really obscure, but it happened for me, so
  it can happen for others too.
---
 usr/sbin/ece-install | 48 ++++++++++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 3790ef7b..ab21abd8 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -31,6 +31,9 @@ escenic_log_dir=/var/log/escenic
 escenic_data_dir=/var/lib/escenic
 escenic_run_dir=/var/run/escenic
 escenic_backups_dir=/var/backups/escenic
+escenic_spool_dir=/var/spool/escenic
+escenic_cache_dir=/var/cache/escenic
+escenic_crash_dir=/var/crash/escenic
 appserver_root_dir=/opt
 
 # The script will install the sun-java6-jdk package on Debian based
@@ -44,7 +47,6 @@ pid_file=/var/run/$(basename $0).pid
 download_dir=/tmp/ece-downloads
 log=/var/log/$(basename $0).log
 conf_file=$HOME/ece-install.conf
-common_nursery_dir=/etc/escenic/engine/common
 ece_scripts_git_source=git://github.com/skybert/ece-scripts.git
 maven_opts="--batch-mode"
 wget_opts="--continue --inet4-only --quiet"
@@ -181,22 +183,6 @@ PROFILE_CREATE_PUBLICATION=9
 PROFILE_MONITORING_SERVER=10
 PROFILE_RESTORE_FROM_BACKUP=11
 
-# Because of issue VF-3559, we also create the default family and host
-# directories.
-engine_dir_list="
-$common_nursery_dir
-$escenic_conf_dir/engine/family/default
-$escenic_conf_dir/engine/host/localhost
-$escenic_root_dir
-/var/cache/escenic
-/var/crash/escenic
-$escenic_data_dir
-$escenic_data_dir/solr/data
-$escenic_log_dir
-$escenic_run_dir
-/var/spool/escenic/migration
-"
-
 function make_dir()
 {
     if [ ! -d $1 ]; then
@@ -1479,6 +1465,26 @@ function common_pre_install()
 
     run source $conf_file
 
+    # These variables are placed here as all the directories can be
+    # overridden in ece-install.conf
+    common_nursery_dir=$escenic_conf_dir/engine/common
+    
+    # Because of issue VF-3559, we also
+    # create the default family and host directories.
+    engine_dir_list="
+      $common_nursery_dir
+      $escenic_conf_dir/engine/family/default
+      $escenic_conf_dir/engine/host/localhost
+      $escenic_root_dir
+      $escenic_cache_dir
+      $escenic_crash_dir
+      $escenic_data_dir
+      $escenic_data_dir/solr/data
+      $escenic_log_dir
+      $escenic_run_dir
+      $escenic_spool_dir/migration
+    "
+    
     if [ -z "$technet_user" -o -z "$technet_password" ]; then
         print_and_log "Be sure to set technet_user and technet_password "
         print_and_log "in $conf_file"
@@ -1865,7 +1871,7 @@ function assemble_deploy_and_restart_type()
 
     ece_command="ece -i $instance_name -t $type assemble deploy restart"
     if [ $(is_installing_from_archives) -eq 1 ]; then
-        run cp $ece_instance_ear_file /var/cache/escenic/engine.ear
+        run cp $ece_instance_ear_file $escenic_cache_dir/engine.ear
         ece_command="ece -i $instance_name -t $type deploy restart"
         print_and_log "Using the supplied EAR instead of running an assembly."
     fi
@@ -2152,7 +2158,11 @@ function install_web_server()
     fi
     
     file=/etc/nginx/sites-available/default
-    run mv $file $file.orig
+    # in some very unusual cases, this file will not exist (can occur
+    # when re-running ece-install several times).
+    if [ -e $file ]; then
+        run mv $file $file.orig
+    fi
 
     if [ $1 -eq 0 ]; then
         port=81

From 6245ab208a7f31d6011cd83d967ebb517ca49160 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 12 Jan 2012 14:20:10 +0800
Subject: [PATCH 0197/2585] - added all directory paths

---
 usr/share/doc/escenic/ece-install-guide.org | 80 ++++++++++++---------
 1 file changed, 45 insertions(+), 35 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index d7873521..7f726e50 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -32,24 +32,24 @@ ece-install.
 The ece-install script can be downloaded from:
 https://raw.github.com/skybert/ece-scripts/master/usr/sbin/ece-install
 or be downloaded together with the other ece-scripts using git:
-#+BEGIN_SRC sh
+#+BEGIN_SRC conf
 $ git clone git@github.com:skybert/ece-scripts.git
 #+END_SRC
 
 * Running the ece-install Script
 You must run the script as the root user.  If you start the script as
 a regular user, it will complain:
-#+BEGIN_SRC sh
+#+BEGIN_SRC conf
 [ece-install] You must be root when running ece-install
 #+END_SRC
 To become root on Ubuntu based systems and Mac OS X, do:
-#+BEGIN_SRC sh
+#+BEGIN_SRC conf
    $ sudo su
 #+END_SRC
 Please note that just doing "sudo ece-install" may not work.
 
 On all other Unix like system, do:
-#+BEGIN_SRC sh
+#+BEGIN_SRC conf
    $ su -
 #+END_SRC
 
@@ -57,19 +57,19 @@ You will need access to http://technet.escenic.com and put these
 credentials in the root user's $HOME/ece-install.conf, normally this
 means /root/ece-install.conf, the script will also tell you this if
 you forget to provide such a configuration file:
-#+BEGIN_SRC sh
+#+BEGIN_SRC conf
 [ece-install] /root/ece-install.conf doesn't exist, I cannot live without it :-(
 #+END_SRC
 
 As for the technet credentials, the script will also tell you if it
 cannot find what it's looking for:
-#+BEGIN_SRC sh
+#+BEGIN_SRC conf
 [ece-install] Be sure to set technet_user and technet_password
 [ece-install] in /root/ece-install.conf
 #+END_SRC
 
 The minimum ece-install.conf file is thus:
-#+BEGIN_SRC sh
+#+BEGIN_SRC conf
 technet_user=<user>
 technet_password=<password>
 #+END_SRC
@@ -81,13 +81,13 @@ need to specify some FAI specific parameters, see the FAI section
 below. 
 
 With the configuration file in place, you're now ready to run it:
-#+BEGIN_SRC sh
+#+BEGIN_SRC conf
 # bash ece-install [-v|--verbose]
 #+END_SRC
 
 ece-install will try to "fail fast", exiting as soon as it detects an
 error during its execution:
-#+BEGIN_SRC sh
+#+BEGIN_SRC conf
 [ece-install-1] The command [cd /does/not/exist] FAILED, exiting :-(
 [ece-install-1] See /var/log/ece-install.log for further details.
 #+END_SRC
@@ -95,7 +95,7 @@ error during its execution:
 As a last resort, if something goes astray with the script, and the
 log file cannot give you enough clues, the ultimate way of debugging
 this is to run the BASH interpreter with the -x flag:
-#+BEGIN_SRC sh
+#+BEGIN_SRC conf
 # bash -x ece-install
 #+END_SRC
 
@@ -106,7 +106,7 @@ on /var/log/ece-install.log should be sufficient, though.
 * Available Server Profiles
 When starting the script, it will ask you which server profile you
 want to install:
-#+BEGIN_SRC sh
+#+BEGIN_SRC conf
 Hi, which server profile do you wish to install?
 
    1 - All in one, full stack on one host, suitable for dev & test environments
@@ -243,7 +243,7 @@ these, please contact support@escenic.com.
 
 If you don't have these ready in your ece-install.conf, ece-install will
 complain:
-#+BEGIN_SRC sh
+#+BEGIN_SRC conf
 [ece-install] Be sure to set wf_user and wf_password in /root/ece-install.conf
 [ece-install] If you don't have these, please contact support@escenic.com
 #+END_SRC
@@ -264,7 +264,7 @@ monitoring the different nodes.
 
 ** Profile - Restoring from backup
 ece-install can restore from a backup made by the ece script:
-#+BEGIN_SRC sh
+#+BEGIN_SRC conf
 $ ece -i <instance> backup
 #+END_SRC
 
@@ -293,7 +293,7 @@ Your choice [1]>
 #+END_SRC
 
 The ece script mentioned above will create backups in
-#+BEGIN_SRC sh
+#+BEGIN_SRC conf
 /var/backups/escenic
 #+END_SRC
 and the ece-install script will hence expect to find them here.
@@ -365,18 +365,18 @@ ERROR 1050 (42S01) at line 25: Table '`ece5db`.`AccessControlList`' already exis
 The ece-install script has support for doing a full automatic install
 (FAI). You can only install one profile at a time. The profiles are
 the parameters with "install" in their name, such as:
-#+BEGIN_SRC sh
+#+BEGIN_SRC conf
 fai_editor_install
 #+END_SRC
 
 When running in FAI mode, you probably want to redirect standard
 output to a log file for easy reading later on:
-#+BEGIN_SRC sh
+#+BEGIN_SRC conf
 # bash ece-install > ece-install.out &
 #+END_SRC
 
 Alternatively, you may do:
-#+BEGIN_SRC sh
+#+BEGIN_SRC conf
 # nohup bash ece-install > ece-install.out &
 #+END_SRC
 The "nohup" at the beginning and the ampersand at the end lets you log
@@ -389,16 +389,16 @@ configuration archive instead of using the files provided with the
 Escenic Content Engine & plugins.
 
 The EAR to provide is the one you generate with:
-#+BEGIN_SRC sh
+#+BEGIN_SRC conf
 $ ece -i <instance> assemble 
 #+END_SRC
 Normally, the EAR will then be available in:
-#+BEGIN_SRC sh
+#+BEGIN_SRC conf
 /var/cache/escenic/engine.ear
 #+END_SRC
 
 The configuration bundle must contain:
-#+BEGIN_SRC sh
+#+BEGIN_SRC conf
 engine/security
 engine/siteconfig/bootstrap-skeleton
 engine/siteconfig/config-skeleton
@@ -408,7 +408,7 @@ assemblytool/plugins/<plugin>/siteconfig
 A simple way to create this bundle, is to use a server which has the
 assembly environment set up and then do:
 
-#+BEGIN_SRC sh
+#+BEGIN_SRC conf
 $ cd /opt/escenic/engine
 $ tar czf /tmp/nursery-skeleton-and-security.tar.gz \
   engine/security \
@@ -421,7 +421,7 @@ $ tar czf /tmp/nursery-skeleton-and-security.tar.gz \
 you need. You can now configure your FAI installation to use these by,
 e.g.:
 
-#+BEGIN_SRC sh
+#+BEGIN_SRC conf
 fai_presentation_ear=/tmp/engine.ear
 fai_presentation_conf_archive=/tmp/nursery-skeleton-and-security.tar.gz
 #+END_SRC
@@ -479,7 +479,7 @@ To automatically install an editorial server and create a publication
 called "jollygood", the minimal configuration in ece-install.conf
 would be:
 
-#+BEGIN_SRC sh
+#+BEGIN_SRC conf
 fai_enabled=1
 fai_editor_install=1
 fai_publication_create=1
@@ -489,14 +489,14 @@ fai_publication_name=jollygood
 *** Installing Two Presentation Servers On a Single Host
 If you wish to only install two presentation servers called "web1" and
 "web2" on your host, you will first run ece-install with:
-#+BEGIN_SRC sh
+#+BEGIN_SRC conf
 fai_enabled=1
 fai_presentation_install=1
 fai_presentation_name=web1
 #+END_SRC 
 
 And then re-issue ece-install with the following configuration:
-#+BEGIN_SRC sh
+#+BEGIN_SRC conf
 fai_enabled=1
 fai_presentation_install=1
 fai_presentation_name=web2
@@ -510,7 +510,7 @@ whereas the second one needs to override these.
 
 ** Verifying That the Script Is Running In FAI Mode
 When FAI is enabled, ece-install will report:
-#+BEGIN_SRC sh
+#+BEGIN_SRC conf
 [ece-install] Full Automatic Install (FAI) enabled.
 [ece-install] All user input will be read from /root/ece-install.conf
 #+END_SRC
@@ -518,7 +518,7 @@ When FAI is enabled, ece-install will report:
 * Running More Than One Installation Process
 If the script believes there's already an ece-intall process running,
 it will abort:
-#+BEGIN_SRC sh
+#+BEGIN_SRC conf
 [ece-install] There's already one ece-install process running. If you believe
 [ece-install] this is wrong, e.g. if a previous run of ece-install was aborted
 [ece-install] before it completed, you may delete /var/run/ece-install.pid and
@@ -555,7 +555,7 @@ bundle, see the FAI section.
 
 * Using a Custom Configuration File for ece-install
 You can specify a different configuration by using the -f parameter: 
-#+BEGIN_SRC sh
+#+BEGIN_SRC conf
 $ ece-install -f ece-install-presentation-server.conf
 #+END_SRC
 
@@ -596,13 +596,23 @@ but these should be the most interesting ones.
 
 *) Applies only to Debian based systems.
 
-The root directory of all Escenic software binaries, /opt/escenic,
-together with the root directory for the configuration files may be
-overwritten in ece-install.conf by setting these variables:
+* Overriding the Escenic directories
+All of the Escenic specific directories may be overwritten in
+ece-install.conf. Here's an example of changing all the paths possible
+with the same suffix.
 
-#+BEGIN_SRC sh
-escenic_root_dir=/opt/escenic-parallel-env
-escenic_conf_dir=/etc/escenic-parallel-env
+#+BEGIN_SRC conf
+suffix=escenic-parallel
+
+escenic_root_dir=/opt/$suffix
+escenic_conf_dir=/etc/$suffix
+escenic_log_dir=/var/log/$suffix
+escenic_data_dir=/var/lib/$suffix
+escenic_run_dir=/var/run/$suffix
+escenic_backups_dir=/var/backups/$suffix
+escenic_spool_dir=/var/spool/$suffix
+escenic_cache_dir=/var/cache/$suffix
+escenic_crash_dir=/var/crash/$suffix
 #+END_SRC
 
 Note, this is only needed if you are running two completely separate
@@ -632,7 +642,7 @@ things set up by the script.
 The ece-install will often be run in FAI mode where all the settings
 are read from ~/ece-install.conf. Given the following entries in this
 file: 
-#+BEGIN_SRC sh
+#+BEGIN_SRC conf
 technet_user=apples
 technet_password=andoranges
 wf_user=foo

From fdc32d7a2a91f528f234a6b8de194c4f8233dee4 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 12 Jan 2012 14:20:35 +0800
Subject: [PATCH 0198/2585] - updated HTML

---
 usr/share/doc/escenic/ece-install-guide.html | 173 ++++++++++---------
 1 file changed, 95 insertions(+), 78 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.html b/usr/share/doc/escenic/ece-install-guide.html
index 0c873aed..2aee0d45 100644
--- a/usr/share/doc/escenic/ece-install-guide.html
+++ b/usr/share/doc/escenic/ece-install-guide.html
@@ -7,7 +7,7 @@
 <title>Welcome to the /usr/sbin/ece-install Guide</title>
 <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
 <meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2012-01-11 18:24:53 CST"/>
+<meta name="generated" content="2012-01-12 14:20:21 CST"/>
 <meta name="author" content="Torstein Krause Johansen"/>
 <meta name="description" content=""/>
 <meta name="keywords" content=""/>
@@ -288,13 +288,14 @@ <h2>Table of Contents</h2>
 <li><a href="#sec-8">8 Re-running ece-install (and How To Speed It Up) </a></li>
 <li><a href="#sec-9">9 Using a Custom Configuration File for ece-install </a></li>
 <li><a href="#sec-10">10 Overview of File Paths Used by the ece-install script </a></li>
-<li><a href="#sec-11">11 Assumptions </a>
+<li><a href="#sec-11">11 Overriding the Escenic directories </a></li>
+<li><a href="#sec-12">12 Assumptions </a>
 <ul>
-<li><a href="#sec-11-1">11.1 /etc/esecenic is shared </a></li>
+<li><a href="#sec-12-1">12.1 /etc/esecenic is shared </a></li>
 </ul>
 </li>
-<li><a href="#sec-12">12 Uninstalling Everything That the ece-install Set Up </a></li>
-<li><a href="#sec-13">13 Example Output FAI </a></li>
+<li><a href="#sec-13">13 Uninstalling Everything That the ece-install Set Up </a></li>
+<li><a href="#sec-14">14 Example Output FAI </a></li>
 </ul>
 </div>
 </div>
@@ -366,7 +367,7 @@ <h2 id="sec-3"><span class="section-number-2">3</span> Downloading the ece-insta
 </p>
 
 
-<pre class="src src-sh">$ git clone git@github.com:skybert/ece-scripts.git
+<pre class="src src-conf"><span style="color: #f0dfaf;">$ git clone git@github.com</span>:skybert/ece-scripts.git
 </pre>
 
 
@@ -383,7 +384,7 @@ <h2 id="sec-4"><span class="section-number-2">4</span> Running the ece-install S
 </p>
 
 
-<pre class="src src-sh">[ece-install] You must be root when running ece-install
+<pre class="src src-conf">[<span style="color: #98fb98;">ece-install</span>] You must be root when running ece-install
 </pre>
 
 <p>
@@ -391,7 +392,7 @@ <h2 id="sec-4"><span class="section-number-2">4</span> Running the ece-install S
 </p>
 
 
-<pre class="src src-sh">$ sudo su
+<pre class="src src-conf"><span style="color: #f0dfaf;">$</span> sudo su
 </pre>
 
 <p>
@@ -402,7 +403,7 @@ <h2 id="sec-4"><span class="section-number-2">4</span> Running the ece-install S
 </p>
 
 
-<pre class="src src-sh">$ su -
+<pre class="src src-conf"><span style="color: #f0dfaf;">$</span> su -
 </pre>
 
 
@@ -414,7 +415,7 @@ <h2 id="sec-4"><span class="section-number-2">4</span> Running the ece-install S
 </p>
 
 
-<pre class="src src-sh">[ece-install] /root/ece-install.conf doesn<span style="color: #ffa07a;">'t exist, I cannot live without it :-(</span>
+<pre class="src src-conf">[<span style="color: #98fb98;">ece-install</span>] /root/ece-install.conf doesn<span style="color: #ffa07a;">'t exist, I cannot live without it :-(</span>
 </pre>
 
 
@@ -424,8 +425,8 @@ <h2 id="sec-4"><span class="section-number-2">4</span> Running the ece-install S
 </p>
 
 
-<pre class="src src-sh">[ece-install] Be sure to set technet_user and technet_password
-[ece-install]<span style="color: #00ffff;"> in</span> /root/ece-install.conf
+<pre class="src src-conf">[<span style="color: #98fb98;">ece-install</span>] Be sure to set technet_user and technet_password
+[<span style="color: #98fb98;">ece-install</span>] in /root/ece-install.conf
 </pre>
 
 
@@ -434,7 +435,7 @@ <h2 id="sec-4"><span class="section-number-2">4</span> Running the ece-install S
 </p>
 
 
-<pre class="src src-sh"><span style="color: #f0dfaf;">technet_user</span>=&lt;user&gt;
+<pre class="src src-conf"><span style="color: #f0dfaf;">technet_user</span>=&lt;user&gt;
 <span style="color: #f0dfaf;">technet_password</span>=&lt;password&gt;
 </pre>
 
@@ -451,7 +452,7 @@ <h2 id="sec-4"><span class="section-number-2">4</span> Running the ece-install S
 </p>
 
 
-<pre class="src src-sh"><span style="color: #7f9f7f; font-style: italic;"># </span><span style="color: #7f9f7f; font-style: italic;">bash ece-install [-v|--verbose]</span>
+<pre class="src src-conf"><span style="color: #7f9f7f; font-style: italic;"># </span><span style="color: #7f9f7f; font-style: italic;">bash ece-install [-v|--verbose]</span>
 </pre>
 
 
@@ -461,8 +462,8 @@ <h2 id="sec-4"><span class="section-number-2">4</span> Running the ece-install S
 </p>
 
 
-<pre class="src src-sh">[ece-install-1] The command [cd /does/not/exist] FAILED, exiting :-(
-[ece-install-1] See /var/log/ece-install.log for further details.
+<pre class="src src-conf">[<span style="color: #98fb98;">ece-install-1] The command [cd /does/not/exist</span>] FAILED, exiting :-(
+[<span style="color: #98fb98;">ece-install-1</span>] See /var/log/ece-install.log for further details.
 </pre>
 
 
@@ -473,7 +474,7 @@ <h2 id="sec-4"><span class="section-number-2">4</span> Running the ece-install S
 </p>
 
 
-<pre class="src src-sh"><span style="color: #7f9f7f; font-style: italic;"># </span><span style="color: #7f9f7f; font-style: italic;">bash -x ece-install</span>
+<pre class="src src-conf"><span style="color: #7f9f7f; font-style: italic;"># </span><span style="color: #7f9f7f; font-style: italic;">bash -x ece-install</span>
 </pre>
 
 
@@ -495,22 +496,22 @@ <h2 id="sec-5"><span class="section-number-2">5</span> Available Server Profiles
 </p>
 
 
-<pre class="src src-sh">Hi, which server profile do you wish to install?
+<pre class="src src-conf"><span style="color: #f0dfaf;">Hi,</span> which server profile do you wish to install?
 
-   1 - All<span style="color: #00ffff;"> in</span> one, full stack on one host, suitable for dev &amp; <span style="color: #b0c4de;">test</span> environments
-   2 - Editorial (publication) server
-   3 - Presentation server (ECE + memcached)<span style="color: #b0c4de;">.</span>
-   4 - Database server
-   5 - Cache server (cache and web server)
-   6 - RMI hub
-   7 - Search server (Solr + indexer-webapp)
-   8 - Install Widget Framework.
-   9 - Create a new publication based on WF if available, ECE/clean-demo if not
-   10 - A monitoring server (web server + Munin gatherer)
-   11 - Restore from backup (DB, data files, binaries, conf &amp; publications)
+   <span style="color: #f0dfaf;">1</span> - All in one, full stack on one host, suitable for dev &amp; test environments
+   <span style="color: #f0dfaf;">2</span> - Editorial (publication) server
+   <span style="color: #f0dfaf;">3</span> - Presentation server (ECE + memcached).
+   <span style="color: #f0dfaf;">4</span> - Database server
+   <span style="color: #f0dfaf;">5</span> - Cache server (cache and web server)
+   <span style="color: #f0dfaf;">6</span> - RMI hub
+   <span style="color: #f0dfaf;">7</span> - Search server (Solr + indexer-webapp)
+   <span style="color: #f0dfaf;">8</span> - Install Widget Framework.
+   <span style="color: #f0dfaf;">9</span> - Create a new publication based on WF if available, ECE/clean-demo if not
+   <span style="color: #f0dfaf;">10</span> - A monitoring server (web server + Munin gatherer)
+   <span style="color: #f0dfaf;">11</span> - Restore from backup (DB, data files, binaries, conf &amp; publications)
 
-Select 1-11 and press ENTER
-Your choice [1]&gt; 
+<span style="color: #f0dfaf;">Select</span> 1-11 and press ENTER
+<span style="color: #f0dfaf;">Your</span> choice [1]&gt; 
 </pre>
 
 
@@ -778,8 +779,8 @@ <h3 id="sec-5-8"><span class="section-number-3">5.8</span> Profile - Install Wid
 </p>
 
 
-<pre class="src src-sh">[ece-install] Be sure to set wf_user and wf_password<span style="color: #00ffff;"> in</span> /root/ece-install.conf
-[ece-install] If you don<span style="color: #ffa07a;">'t have these, please contact support@escenic.com</span>
+<pre class="src src-conf">[<span style="color: #98fb98;">ece-install</span>] Be sure to set wf_user and wf_password in /root/ece-install.conf
+[<span style="color: #98fb98;">ece-install</span>] If you don<span style="color: #ffa07a;">'t have these, please contact support@escenic.com</span>
 </pre>
 
 </div>
@@ -825,7 +826,7 @@ <h3 id="sec-5-11"><span class="section-number-3">5.11</span> Profile - Restoring
 </p>
 
 
-<pre class="src src-sh">$ ece -i &lt;instance&gt; backup
+<pre class="src src-conf"><span style="color: #f0dfaf;">$</span> ece -i &lt;instance&gt; backup
 </pre>
 
 
@@ -892,7 +893,7 @@ <h4 id="sec-5-12-2"><span class="section-number-4">5.12.2</span> Select Which Ba
 </p>
 
 
-<pre class="src src-sh">/var/backups/escenic
+<pre class="src src-conf"><span style="color: #f0dfaf;">/var/backups/escenic</span>
 </pre>
 
 <p>
@@ -1027,7 +1028,7 @@ <h2 id="sec-6"><span class="section-number-2">6</span> Full Automatic Install (F
 </p>
 
 
-<pre class="src src-sh">fai_editor_install
+<pre class="src src-conf"><span style="color: #f0dfaf;">fai_editor_install</span>
 </pre>
 
 
@@ -1037,7 +1038,7 @@ <h2 id="sec-6"><span class="section-number-2">6</span> Full Automatic Install (F
 </p>
 
 
-<pre class="src src-sh"><span style="color: #7f9f7f; font-style: italic;"># </span><span style="color: #7f9f7f; font-style: italic;">bash ece-install &gt; ece-install.out &amp;</span>
+<pre class="src src-conf"><span style="color: #7f9f7f; font-style: italic;"># </span><span style="color: #7f9f7f; font-style: italic;">bash ece-install &gt; ece-install.out &amp;</span>
 </pre>
 
 
@@ -1046,7 +1047,7 @@ <h2 id="sec-6"><span class="section-number-2">6</span> Full Automatic Install (F
 </p>
 
 
-<pre class="src src-sh"><span style="color: #7f9f7f; font-style: italic;"># </span><span style="color: #7f9f7f; font-style: italic;">nohup bash ece-install &gt; ece-install.out &amp;</span>
+<pre class="src src-conf"><span style="color: #7f9f7f; font-style: italic;"># </span><span style="color: #7f9f7f; font-style: italic;">nohup bash ece-install &gt; ece-install.out &amp;</span>
 </pre>
 
 <p>
@@ -1070,7 +1071,7 @@ <h3 id="sec-6-1"><span class="section-number-3">6.1</span> Installing from EARs
 </p>
 
 
-<pre class="src src-sh">$ ece -i &lt;instance&gt; assemble 
+<pre class="src src-conf"><span style="color: #f0dfaf;">$</span> ece -i &lt;instance&gt; assemble 
 </pre>
 
 <p>
@@ -1078,7 +1079,7 @@ <h3 id="sec-6-1"><span class="section-number-3">6.1</span> Installing from EARs
 </p>
 
 
-<pre class="src src-sh">/var/cache/escenic/engine.ear
+<pre class="src src-conf"><span style="color: #f0dfaf;">/var/cache/escenic/engine.ear</span>
 </pre>
 
 
@@ -1087,10 +1088,10 @@ <h3 id="sec-6-1"><span class="section-number-3">6.1</span> Installing from EARs
 </p>
 
 
-<pre class="src src-sh">engine/security
-engine/siteconfig/bootstrap-skeleton
-engine/siteconfig/config-skeleton
-assemblytool/plugins/&lt;plugin&gt;/siteconfig
+<pre class="src src-conf"><span style="color: #f0dfaf;">engine/security</span>
+<span style="color: #f0dfaf;">engine/siteconfig/bootstrap-skeleton</span>
+<span style="color: #f0dfaf;">engine/siteconfig/config-skeleton</span>
+<span style="color: #f0dfaf;">assemblytool/plugins/&lt;plugin&gt;/siteconfig</span>
 </pre>
 
 
@@ -1101,12 +1102,12 @@ <h3 id="sec-6-1"><span class="section-number-3">6.1</span> Installing from EARs
 
 
 
-<pre class="src src-sh">$ cd /opt/escenic/engine
-$ tar czf /tmp/nursery-skeleton-and-security.tar.gz <span style="color: #ffa07a;">\</span>
-  engine/security <span style="color: #ffa07a;">\</span>
-  engine/siteconfig/config-skeleton/ <span style="color: #ffa07a;">\</span>
-  engine/siteconfig/bootstrap-skeleton/ <span style="color: #ffa07a;">\</span>
-  <span style="color: #fa8072;">`find -L  assemblytool/plugins/ -name siteconfig`</span>
+<pre class="src src-conf"><span style="color: #f0dfaf;">$</span> cd /opt/escenic/engine
+<span style="color: #f0dfaf;">$</span> tar czf /tmp/nursery-skeleton-and-security.tar.gz \
+  <span style="color: #f0dfaf;">engine/security</span> \
+  <span style="color: #f0dfaf;">engine/siteconfig/config-skeleton/</span> \
+  <span style="color: #f0dfaf;">engine/siteconfig/bootstrap-skeleton/</span> \
+  <span style="color: #f0dfaf;">`find</span> -L  assemblytool/plugins/ -name siteconfig`
 </pre>
 
 
@@ -1118,7 +1119,7 @@ <h3 id="sec-6-1"><span class="section-number-3">6.1</span> Installing from EARs
 
 
 
-<pre class="src src-sh"><span style="color: #f0dfaf;">fai_presentation_ear</span>=/tmp/engine.ear
+<pre class="src src-conf"><span style="color: #f0dfaf;">fai_presentation_ear</span>=/tmp/engine.ear
 <span style="color: #f0dfaf;">fai_presentation_conf_archive</span>=/tmp/nursery-skeleton-and-security.tar.gz
 </pre>
 
@@ -1208,7 +1209,7 @@ <h4 id="sec-6-3-1"><span class="section-number-4">6.3.1</span> Installing an Edi
 
 
 
-<pre class="src src-sh"><span style="color: #f0dfaf;">fai_enabled</span>=1
+<pre class="src src-conf"><span style="color: #f0dfaf;">fai_enabled</span>=1
 <span style="color: #f0dfaf;">fai_editor_install</span>=1
 <span style="color: #f0dfaf;">fai_publication_create</span>=1
 <span style="color: #f0dfaf;">fai_publication_name</span>=jollygood
@@ -1228,7 +1229,7 @@ <h4 id="sec-6-3-2"><span class="section-number-4">6.3.2</span> Installing Two Pr
 </p>
 
 
-<pre class="src src-sh"><span style="color: #f0dfaf;">fai_enabled</span>=1
+<pre class="src src-conf"><span style="color: #f0dfaf;">fai_enabled</span>=1
 <span style="color: #f0dfaf;">fai_presentation_install</span>=1
 <span style="color: #f0dfaf;">fai_presentation_name</span>=web1
 </pre>
@@ -1239,7 +1240,7 @@ <h4 id="sec-6-3-2"><span class="section-number-4">6.3.2</span> Installing Two Pr
 </p>
 
 
-<pre class="src src-sh"><span style="color: #f0dfaf;">fai_enabled</span>=1
+<pre class="src src-conf"><span style="color: #f0dfaf;">fai_enabled</span>=1
 <span style="color: #f0dfaf;">fai_presentation_install</span>=1
 <span style="color: #f0dfaf;">fai_presentation_name</span>=web2
 <span style="color: #f0dfaf;">fai_presentation_port</span>=8081
@@ -1265,8 +1266,8 @@ <h3 id="sec-6-4"><span class="section-number-3">6.4</span> Verifying That the Sc
 </p>
 
 
-<pre class="src src-sh">[ece-install] Full Automatic Install (FAI) enabled.
-[ece-install] All user input will be read from /root/ece-install.conf
+<pre class="src src-conf">[<span style="color: #98fb98;">ece-install</span>] Full Automatic Install (FAI) enabled.
+[<span style="color: #98fb98;">ece-install</span>] All user input will be read from /root/ece-install.conf
 </pre>
 
 
@@ -1284,7 +1285,7 @@ <h2 id="sec-7"><span class="section-number-2">7</span> Running More Than One Ins
 </p>
 
 
-<pre class="src src-sh">[ece-install] There<span style="color: #ffa07a;">'s already one ece-install process running. If you believe</span>
+<pre class="src src-conf">[<span style="color: #98fb98;">ece-install</span>] There<span style="color: #ffa07a;">'s already one ece-install process running. If you believe</span>
 <span style="color: #ffa07a;">[ece-install] this is wrong, e.g. if a previous run of ece-install was aborted</span>
 <span style="color: #ffa07a;">[ece-install] before it completed, you may delete /var/run/ece-install.pid and</span>
 <span style="color: #ffa07a;">[ece-install] run ece-install again.</span>
@@ -1348,7 +1349,7 @@ <h2 id="sec-9"><span class="section-number-2">9</span> Using a Custom Configurat
 </p>
 
 
-<pre class="src src-sh">$ ece-install -f ece-install-presentation-server.conf
+<pre class="src src-conf"><span style="color: #f0dfaf;">$</span> ece-install -f ece-install-presentation-server.conf
 </pre>
 
 
@@ -1404,16 +1405,32 @@ <h2 id="sec-10"><span class="section-number-2">10</span> Overview of File Paths
 <p>
 *) Applies only to Debian based systems.
 </p>
-<p>
-The root directory of all Escenic software binaries, /opt/escenic,
-together with the root directory for the configuration files may be
-overwritten in ece-install.conf by setting these variables:
+</div>
+
+</div>
+
+<div id="outline-container-11" class="outline-2">
+<h2 id="sec-11"><span class="section-number-2">11</span> Overriding the Escenic directories </h2>
+<div class="outline-text-2" id="text-11">
+
+<p>All of the Escenic specific directories may be overwritten in
+ece-install.conf. Here's an example of changing all the paths possible
+with the same suffix.
 </p>
 
 
 
-<pre class="src src-sh"><span style="color: #f0dfaf;">escenic_root_dir</span>=/opt/escenic-parallel-env
-<span style="color: #f0dfaf;">escenic_conf_dir</span>=/etc/escenic-parallel-env
+<pre class="src src-conf"><span style="color: #f0dfaf;">suffix</span>=escenic-parallel
+
+<span style="color: #f0dfaf;">escenic_root_dir</span>=/opt/$suffix
+<span style="color: #f0dfaf;">escenic_conf_dir</span>=/etc/$suffix
+<span style="color: #f0dfaf;">escenic_log_dir</span>=/var/log/$suffix
+<span style="color: #f0dfaf;">escenic_data_dir</span>=/var/lib/$suffix
+<span style="color: #f0dfaf;">escenic_run_dir</span>=/var/run/$suffix
+<span style="color: #f0dfaf;">escenic_backups_dir</span>=/var/backups/$suffix
+<span style="color: #f0dfaf;">escenic_spool_dir</span>=/var/spool/$suffix
+<span style="color: #f0dfaf;">escenic_cache_dir</span>=/var/cache/$suffix
+<span style="color: #f0dfaf;">escenic_crash_dir</span>=/var/crash/$suffix
 </pre>
 
 
@@ -1427,16 +1444,16 @@ <h2 id="sec-10"><span class="section-number-2">10</span> Overview of File Paths
 
 </div>
 
-<div id="outline-container-11" class="outline-2">
-<h2 id="sec-11"><span class="section-number-2">11</span> Assumptions </h2>
-<div class="outline-text-2" id="text-11">
+<div id="outline-container-12" class="outline-2">
+<h2 id="sec-12"><span class="section-number-2">12</span> Assumptions </h2>
+<div class="outline-text-2" id="text-12">
 
 
 </div>
 
-<div id="outline-container-11-1" class="outline-3">
-<h3 id="sec-11-1"><span class="section-number-3">11.1</span> /etc/esecenic is shared </h3>
-<div class="outline-text-3" id="text-11-1">
+<div id="outline-container-12-1" class="outline-3">
+<h3 id="sec-12-1"><span class="section-number-3">12.1</span> /etc/esecenic is shared </h3>
+<div class="outline-text-3" id="text-12-1">
 
 <p>It's assumed that the /etc/escenic directory is either on a shared
 file system or rsync-ed among the hosts that are running the ECE
@@ -1447,9 +1464,9 @@ <h3 id="sec-11-1"><span class="section-number-3">11.1</span> /etc/esecenic is sh
 
 </div>
 
-<div id="outline-container-12" class="outline-2">
-<h2 id="sec-12"><span class="section-number-2">12</span> Uninstalling Everything That the ece-install Set Up </h2>
-<div class="outline-text-2" id="text-12">
+<div id="outline-container-13" class="outline-2">
+<h2 id="sec-13"><span class="section-number-2">13</span> Uninstalling Everything That the ece-install Set Up </h2>
+<div class="outline-text-2" id="text-13">
 
 <p>WARNING: this is potentially dangerous as some of these components may
 be used by other pieces of software you have running on your
@@ -1467,9 +1484,9 @@ <h2 id="sec-12"><span class="section-number-2">12</span> Uninstalling Everything
 
 </div>
 
-<div id="outline-container-13" class="outline-2">
-<h2 id="sec-13"><span class="section-number-2">13</span> Example Output FAI </h2>
-<div class="outline-text-2" id="text-13">
+<div id="outline-container-14" class="outline-2">
+<h2 id="sec-14"><span class="section-number-2">14</span> Example Output FAI </h2>
+<div class="outline-text-2" id="text-14">
 
 <p>The ece-install will often be run in FAI mode where all the settings
 are read from ~/ece-install.conf. Given the following entries in this
@@ -1477,7 +1494,7 @@ <h2 id="sec-13"><span class="section-number-2">13</span> Example Output FAI </h2
 </p>
 
 
-<pre class="src src-sh"><span style="color: #f0dfaf;">technet_user</span>=apples
+<pre class="src src-conf"><span style="color: #f0dfaf;">technet_user</span>=apples
 <span style="color: #f0dfaf;">technet_password</span>=andoranges
 <span style="color: #f0dfaf;">wf_user</span>=foo
 <span style="color: #f0dfaf;">wf_password</span>=bar
@@ -1539,7 +1556,7 @@ <h2 id="sec-13"><span class="section-number-2">13</span> Example Output FAI </h2
 <hr/>
 <p class="author">
   Author: Torstein Krause Johansen (<a href="mailto:tkj@vizrt.com">tkj@vizrt.com</a>)
-  Date: 2012-01-11 18:24:53 CST
+  Date: 2012-01-12 14:20:21 CST
 </p>
 </div>
 </body>

From ef5b30b07396f311cb7e1c3208ed3d471dbfd91f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 13 Jan 2012 11:17:27 +0800
Subject: [PATCH 0199/2585] - now runs unzip with --quiet - replaced short with
 long --update option switch to unzip -> self   documenting. - added country
 code switch for (Debian) mirror, will/can be used for   the other mirrors
 too.

  mirror_country_suffix=jp
---
 usr/sbin/ece-install | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index ab21abd8..e9ad2520 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -36,6 +36,8 @@ escenic_cache_dir=/var/cache/escenic
 escenic_crash_dir=/var/crash/escenic
 appserver_root_dir=/opt
 
+mirror_country_suffix=jp
+
 # The script will install the sun-java6-jdk package on Debian based
 # systems and this is the path of the JAVA home with this package. If
 # you're using a different system or have other preferences, change
@@ -298,7 +300,7 @@ function set_up_assembly_tool()
     cd $escenic_root_dir/assemblytool/
     
     if [ -e $download_dir/assemblytool*zip ]; then
-        run unzip -u $download_dir/assemblytool*zip
+        run unzip --quiet --update $download_dir/assemblytool*zip
     fi
 
     # adding an instance layer to the Nursery configuration
@@ -369,7 +371,7 @@ function set_up_engine_and_plugins()
     done
     
     if [ ! -d ${engine_dir} ]; then
-        run unzip -u $download_dir/${engine_file}
+        run unzip --quiet --update $download_dir/${engine_file}
         if [ -h engine ]; then
             run rm engine
         fi
@@ -389,7 +391,7 @@ function set_up_engine_and_plugins()
             continue
         fi
         
-        run unzip -u $el
+        run unzip --quiet --update $el
     done
 
     ece_software_setup_completed=1
@@ -638,7 +640,7 @@ function install_ece_third_party_packages
                 grep non-free | \
                 wc -l)
             if [ $has_non_free -eq 0 ]; then
-                add_apt_source "deb http://ftp.tw.debian.org/debian/ $(lsb_release -s -c) contrib non-free"
+                add_apt_source "deb http://ftp.${mirror_country_suffix}.debian.org/debian/ $(lsb_release -s -c) contrib non-free"
             fi
         fi
         
@@ -1484,7 +1486,7 @@ function common_pre_install()
       $escenic_run_dir
       $escenic_spool_dir/migration
     "
-    
+
     if [ -z "$technet_user" -o -z "$technet_password" ]; then
         print_and_log "Be sure to set technet_user and technet_password "
         print_and_log "in $conf_file"
@@ -2059,7 +2061,7 @@ EOF
             1>>$log 2>>$log
         
         cd $escenic_root_dir/
-        unzip -u $download_dir/$(basename $el) \
+        unzip --quiet --update $download_dir/$(basename $el) \
             1>>$log 2>>$log
     done
 

From 4bc5f848962cd22f03943b5ddb880070a1414e56 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 13 Jan 2012 11:25:09 +0800
Subject: [PATCH 0200/2585] - fixed regression from
 d9d517e0d75439b1e47d5fbd8d4f81fde85da3d7,   tomcat_base became
 ${appserver_root_dir}-${instance}, instead of  
 ${appserver_root_dir}/tomcat-${instance}.

---
 usr/sbin/ece-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index e9ad2520..dfd3d2ad 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -796,7 +796,7 @@ function set_up_app_server
     fi
     run ln -sf ${tomcat_dir} tomcat
 
-    tomcat_base=${appserver_root_dir}-${instance_name}
+    tomcat_base=${appserver_root_dir}/tomcat-${instance_name}
     make_dir $tomcat_base
 
     run cp -r ${appserver_root_dir}/${tomcat_dir}/conf $tomcat_base

From e73a2f1c938ba18e8e388157e1c757351c7111bf Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 13 Jan 2012 11:25:49 +0800
Subject: [PATCH 0201/2585] - added header signature

---
 usr/local/src/create-packages | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/usr/local/src/create-packages b/usr/local/src/create-packages
index c94d7daa..89f2056f 100644
--- a/usr/local/src/create-packages
+++ b/usr/local/src/create-packages
@@ -1,5 +1,10 @@
 #! /usr/bin/env bash
 
+# script fro creating DEB and RPM packages of the ece-install and ece
+# scripts.
+
+# by tkj@vizrt.com
+
 rm -rf debian/{etc,usr}
 
 target_dir=debian

From 47d96443a3959ba4cde612b41f0036140e78d257 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 13 Jan 2012 17:10:23 +0800
Subject: [PATCH 0202/2585] - --quiet --udpate -> -q -u

---
 usr/sbin/ece-install | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index dfd3d2ad..6c8084e4 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -300,7 +300,7 @@ function set_up_assembly_tool()
     cd $escenic_root_dir/assemblytool/
     
     if [ -e $download_dir/assemblytool*zip ]; then
-        run unzip --quiet --update $download_dir/assemblytool*zip
+        run unzip -q -u $download_dir/assemblytool*zip
     fi
 
     # adding an instance layer to the Nursery configuration
@@ -327,7 +327,7 @@ EOF
             continue
         fi
         
-          # nuisance to get the community engine, but not the engine
+        # nuisance to get the community engine, but not the engine
         if [ $(echo $directory | grep engine | wc -l) -gt 0 ]; then
             if [ $(echo $directory | grep community | wc -l) -lt 1 ]; then
                 continue
@@ -371,7 +371,7 @@ function set_up_engine_and_plugins()
     done
     
     if [ ! -d ${engine_dir} ]; then
-        run unzip --quiet --update $download_dir/${engine_file}
+        run unzip -q -u $download_dir/${engine_file}
         if [ -h engine ]; then
             run rm engine
         fi
@@ -391,7 +391,7 @@ function set_up_engine_and_plugins()
             continue
         fi
         
-        run unzip --quiet --update $el
+        run unzip -q -u $el
     done
 
     ece_software_setup_completed=1
@@ -510,9 +510,12 @@ EOF
     if [ -w ${file} ]; then
         sed -i 's/jdbc\/ecome/jdbc\/ECE_UPDATE_DS/g' $file
         exit_on_error "sed on $file"
+    elif [ ! -e ${file} ]; then
+        print_and_log "Could not find ${file},"
+        print_and_log "I assume you have not installed Community Engine."
     else
-        print_and_log "Could not find/write to ${file},"
-        print_and_log "have you installed the Community Engine plugin?"
+        print_and_log "Could not write to ${file},"
+        print_and_log "Community Engine might not work because of this. "
         remove_pid_and_exit_in_error
     fi
 
@@ -1167,9 +1170,14 @@ function set_up_user_enviornment()
 {
     print_and_log "Setting up the ${ece_user} user's UNIX environment ..."
 
-    if [ $(grep JAVA_HOME /home/$ece_user/.bashrc 2>/dev/null | wc -l) \
+    local bashrc=/home/${ece_user}/.bashrc
+    if [ $(uname -s) = "Darwin" ]; then
+        bashrc=/Users/${ece_user}/.bashrc
+    fi
+    
+    if [ $(grep JAVA_HOME ${bashrc} 2>/dev/null | wc -l) \
         -lt 1 ]; then
-        run echo JAVA_HOME=$java_home >> /home/$ece_user/.bashrc
+        run echo JAVA_HOME=$java_home >> ${bashrc}
     fi
     
     if [ $(grep JAVA_HOME /root/.bashrc 2>/dev/null | wc -l) -lt 1 ]; then
@@ -1178,11 +1186,14 @@ function set_up_user_enviornment()
 
     export JAVA_HOME=$java_home
 
-    bashrc=/home/${ece_user}/.bashrc
     if [ $(grep bash_completion.d/ece ${bashrc}  2>/dev/null | \
         wc -l) -lt 1 ]; then
         echo ". /etc/bash_completion.d/ece" > ${bashrc}
     fi
+
+    if [ $(grep ECE_CONF_LOCATIONS ${bashrc} | wc -l) -eq 0 ]; then
+        echo "export ECE_CONF_LOCATIONS=\"$escenic_conf_dir\"" > ${bashrc}
+    fi
 }
 
 function set_up_solr()
@@ -2061,7 +2072,7 @@ EOF
             1>>$log 2>>$log
         
         cd $escenic_root_dir/
-        unzip --quiet --update $download_dir/$(basename $el) \
+        unzip -q -u $download_dir/$(basename $el) \
             1>>$log 2>>$log
     done
 

From 12f380218e29f35b5a2fb44382181dc54358684d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 13 Jan 2012 17:45:12 +0800
Subject: [PATCH 0203/2585] - removed adding JAVA_HOME to .bashrc, this
 shouldn't be needed as ece   sorts this out by itself. - moved from
 common_pre_install set_up_ece_scripts to   install_ece_instance as this makes
 more sense and non-standard   installs would otherwise get ece.conf copied to
 the wrong place.

---
 usr/sbin/ece-install | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 6c8084e4..5733c826 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -410,7 +410,7 @@ function set_up_ece_scripts()
     fi
     
     run cp -r ece-scripts/usr/* /usr/
-    run cp -r ece-scripts/etc/* /etc/
+    run cp -r ece-scripts/etc/escenic/* ${escenic_conf_dir}/
 }
 
 function set_up_ecedb()
@@ -511,7 +511,7 @@ EOF
         sed -i 's/jdbc\/ecome/jdbc\/ECE_UPDATE_DS/g' $file
         exit_on_error "sed on $file"
     elif [ ! -e ${file} ]; then
-        print_and_log "Could not find ${file},"
+        print_and_log "I Could not find ECOME configuration file,"
         print_and_log "I assume you have not installed Community Engine."
     else
         print_and_log "Could not write to ${file},"
@@ -1175,24 +1175,13 @@ function set_up_user_enviornment()
         bashrc=/Users/${ece_user}/.bashrc
     fi
     
-    if [ $(grep JAVA_HOME ${bashrc} 2>/dev/null | wc -l) \
-        -lt 1 ]; then
-        run echo JAVA_HOME=$java_home >> ${bashrc}
-    fi
-    
-    if [ $(grep JAVA_HOME /root/.bashrc 2>/dev/null | wc -l) -lt 1 ]; then
-        run echo JAVA_HOME=$java_home >> /root/.bashrc
-    fi
-
-    export JAVA_HOME=$java_home
-
     if [ $(grep bash_completion.d/ece ${bashrc}  2>/dev/null | \
         wc -l) -lt 1 ]; then
-        echo ". /etc/bash_completion.d/ece" > ${bashrc}
+        echo ". /etc/bash_completion.d/ece" >> ${bashrc}
     fi
 
     if [ $(grep ECE_CONF_LOCATIONS ${bashrc} | wc -l) -eq 0 ]; then
-        echo "export ECE_CONF_LOCATIONS=\"$escenic_conf_dir\"" > ${bashrc}
+        echo "export ECE_CONF_LOCATIONS=\"$escenic_conf_dir\"" >> ${bashrc}
     fi
 }
 
@@ -1525,7 +1514,6 @@ function common_pre_install()
     make_dir $download_dir
     stop_conflicting_processes
     install_common_os_packages
-    set_up_ece_scripts
     create_user_and_group_if_not_present
     set_up_user_enviornment
 }
@@ -1824,6 +1812,7 @@ function install_ece_instance()
     
     ask_for_instance_name $1
     set_up_engine_directories
+    set_up_ece_scripts
 
     set_archive_files_depending_on_profile
     

From 6e17d34e0faa3ee170993fdefd4fb0fcbdde231a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 13 Jan 2012 18:42:56 +0800
Subject: [PATCH 0204/2585] - now, set_up_ece_scripts also updates the ece.conf
 according to the   directory path variables.

---
 usr/sbin/ece-install | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 5733c826..9a879d6a 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -411,6 +411,20 @@ function set_up_ece_scripts()
     
     run cp -r ece-scripts/usr/* /usr/
     run cp -r ece-scripts/etc/escenic/* ${escenic_conf_dir}/
+
+    local file=${escenic_conf_dir}/ece.conf
+    set_conf_file_value assemblytool_home ${escenic_root_dir}/assemblytool $file
+    set_conf_file_value backup_dir ${escenic_backups_dir} $file
+    set_conf_file_value cache_dir ${escenic_cache_dir} ${file}
+    set_conf_file_value ece_home ${escenic_root_dir}/engine ${file}
+    set_conf_file_value heap_dump_dir ${escenic_crash_dir} ${file}
+    set_conf_file_value log_dir ${escenic_log_dir} ${file}
+    set_conf_file_value pid_dir ${escenic_run_dir} ${file}
+    set_conf_file_value rmi_hub_conf ${escenic_conf_dir}/rmi-hub ${file}
+    set_conf_file_value solr_home ${escenic_data_dir}/solr ${file}
+    set_conf_file_value ece_security_configuration_dir \
+        ${escenic_conf_dir}/engine/common/security \
+        ${file}
 }
 
 function set_up_ecedb()
@@ -511,7 +525,7 @@ EOF
         sed -i 's/jdbc\/ecome/jdbc\/ECE_UPDATE_DS/g' $file
         exit_on_error "sed on $file"
     elif [ ! -e ${file} ]; then
-        print_and_log "I Could not find ECOME configuration file,"
+        print_and_log "I Could not find an ECOME configuration file,"
         print_and_log "I assume you have not installed Community Engine."
     else
         print_and_log "Could not write to ${file},"

From 1a40822ed80eeba09ee1bec479a48e2d5d8d2a86 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 16 Jan 2012 11:19:03 +0800
Subject: [PATCH 0205/2585] - regression: now copies bash completion - now, the
 directories used in the bash completion is populated from

---
 usr/sbin/ece-install | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 9a879d6a..b830a754 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -411,7 +411,8 @@ function set_up_ece_scripts()
     
     run cp -r ece-scripts/usr/* /usr/
     run cp -r ece-scripts/etc/escenic/* ${escenic_conf_dir}/
-
+    run cp -r ece-scripts/bash_completion.d/ece /etc/bash_completion.d/
+    
     local file=${escenic_conf_dir}/ece.conf
     set_conf_file_value assemblytool_home ${escenic_root_dir}/assemblytool $file
     set_conf_file_value backup_dir ${escenic_backups_dir} $file
@@ -425,6 +426,9 @@ function set_up_ece_scripts()
     set_conf_file_value ece_security_configuration_dir \
         ${escenic_conf_dir}/engine/common/security \
         ${file}
+
+    run sed -i "s#/etc/escenic#${escenic_conf_dir}#g" /etc/bash_completion.d/ece
+    run sed -i "s#/opt/escenic#${escenic_root_dir}#g" /etc/bash_completion.d/ece
 }
 
 function set_up_ecedb()

From 4508a8a8dacc023c460b8735179bff140b7fbc59 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 16 Jan 2012 11:26:39 +0800
Subject: [PATCH 0206/2585] - set_up_assembly_tool to fixes the path to the
 Nursery configuration   according to escenic_conf_dir which may have been
 overridden by the   user.

---
 usr/sbin/ece-install | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index b830a754..742a896c 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -314,6 +314,13 @@ fileSystemRoot = $escenic_conf_dir/engine/instance/\${com.escenic.instance}/
 EOF
     echo "" >> Nursery.properties
     echo "layer.06 = /layers/instance/Layer" >> Nursery.properties
+
+    # fixing the path to the Nursery configuration according to
+    # escenic_conf_dir which may have been overridden by the user.
+    for el in $(find $escenic_root_dir/assemblytool/conf -name Files.properties)
+    do
+        sed -i "s#/etc/escenic#${escenic_conf_dir}#g" $el
+    done
     
     # set up which plugins to use
     cd $escenic_root_dir/assemblytool/

From 949515b27937b9687ed6c820461954e07a321235 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 16 Jan 2012 11:58:53 +0800
Subject: [PATCH 0207/2585] - fixed path to bash_completion.d

---
 usr/sbin/ece-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 742a896c..891df663 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -418,7 +418,7 @@ function set_up_ece_scripts()
     
     run cp -r ece-scripts/usr/* /usr/
     run cp -r ece-scripts/etc/escenic/* ${escenic_conf_dir}/
-    run cp -r ece-scripts/bash_completion.d/ece /etc/bash_completion.d/
+    run cp -r ece-scripts/etc/bash_completion.d/ece /etc/bash_completion.d/
     
     local file=${escenic_conf_dir}/ece.conf
     set_conf_file_value assemblytool_home ${escenic_root_dir}/assemblytool $file

From 2b91b89d753fb122a4022a2c7a6019210e846f1a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 17 Jan 2012 12:23:11 +0800
Subject: [PATCH 0208/2585] - removed common_settings_list it isn't used
 anymore (and haven't for   a long time).

---
 usr/bin/ece | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index a871108e..8f6ac818 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -34,13 +34,6 @@ search
 rmi-hub
 "
 
-common_settings_list="
-ece_home
-java_home
-log_dir
-pid_dir
-"
-
 hub_required_fields="
 ece_server_hostname
 rmi_hub_conf

From 8539feaaa661c960ea0cf0232c086973a9f19d82 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 17 Jan 2012 12:36:43 +0800
Subject: [PATCH 0209/2585] - introduced escenic_conf_dir (yes, escenic, not
 ece as this holds   both RMI hub, Analysis Engine and ECE configuration
 files). - the default is /etc/escenic, but this can be overridden in any of  
 the .conf files.

  Since this is a bit chicken and the egg problem, in order to load a
  .conf file which overrides it, you must set the

        ECE_CONF_LOCATIONS

  environment variable, e.g.:

        export ECE_CONF_LOCATIONS=/etc/escenic-parallel

  In which you define escenic_conf_dir=/etc/escenic-parallel to be
  used by all other calls to the script.
---
 etc/escenic/ece.conf |  6 ++++--
 usr/bin/ece          | 30 ++++++++++++++++--------------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/etc/escenic/ece.conf b/etc/escenic/ece.conf
index 3f5ddc0c..09cb959b 100644
--- a/etc/escenic/ece.conf
+++ b/etc/escenic/ece.conf
@@ -50,10 +50,12 @@ appserver_port=8080
 ########################################################################
 assemblytool_home=/opt/escenic/assemblytool
 cache_dir=/var/cache/escenic
-ece_security_configuration_dir=/etc/escenic/engine/common/security
+# The root of all Escenic configuration files (not only ECE)
+escenic_conf_dir=/etc/escenic
+ece_security_configuration_dir=${escenic_conf_dir}/engine/common/security
 log_dir=/var/log/escenic
 pid_dir=/var/run/escenic
-rmi_hub_conf=/etc/escenic/rmi-hub
+rmi_hub_conf=${escenic_conf_dir}/rmi-hub
 rmi_hub_home=$ece_home/contrib/rmi-hub
 solr_home=/var/lib/escenic/solr
 tmp_dir=/tmp
diff --git a/usr/bin/ece b/usr/bin/ece
index 8f6ac818..ed3dc60b 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -14,6 +14,7 @@ verbose=0
 force_ipv4=0
 quiet=0
 everything_but_the_kitchen_sink=0
+escenic_conf_dir=/etc/escenic
 
 ######################################################################
 # Dear user, don't touch anyting in this script, especially below this
@@ -44,6 +45,7 @@ engine_required_fields="
 appserver
 assemblytool_home
 cache_dir
+escenic_conf_dir
 ece_home
 ece_security_configuration_dir
 enable_heap_dump
@@ -164,13 +166,13 @@ function read_conf_file()
 
 # If the system is installed using the recommended paths, the method
 # will return a list of the instances configured in
-# /etc/escenic/engine/instance
+# ${escenic_conf_dir}/engine/instance
 function get_instance_list()
 {
     instance_list=""
 
-    if [ -r /etc/escenic/engine/instance ]; then
-        instance_list=$(ls /etc/escenic/engine/instance)
+    if [ -r ${escenic_conf_dir}/engine/instance ]; then
+        instance_list=$(ls ${escenic_conf_dir}/engine/instance)
     fi
 
     echo $instance_list
@@ -185,11 +187,11 @@ function set_common_settings()
     else
         conf_file_location_list="
           `dirname $0`
-          /etc/escenic/$type/instance/$instance
-          /etc/escenic/$type/host/`echo $HOSTNAME | tr '[A-Z]' '[a-z]'`
-          /etc/escenic/$type/common
-          /etc/escenic/$type
-          /etc/escenic
+          ${escenic_conf_dir}/$type/instance/$instance
+          ${escenic_conf_dir}/$type/host/`echo $HOSTNAME | tr '[A-Z]' '[a-z]'`
+          ${escenic_conf_dir}/$type/common
+          ${escenic_conf_dir}/$type
+          ${escenic_conf_dir}
           `dirname $0`/../etc
         "
     fi
@@ -666,7 +668,7 @@ function backup_type()
    
    archive_file=$backup_dir/${type}-${instance}-backup-$(date --iso).tar
    possible_backup="
-/etc/escenic 
+${escenic_conf_dir} 
 /opt/escenic 
 /etc/init.d/ece
 /etc/default/ece
@@ -703,7 +705,7 @@ function backup_type()
        print "- All Escenic binaries & publication templates in /opt/escenic"
    fi
    
-   print "- All configuration in /etc/escenic and /etc/default/ece"
+   print "- All configuration in ${escenic_conf_dir} and /etc/default/ece"
    print "- All bootstrap scripts from /etc/init.d"
    print "Enjoy!"
  }
@@ -1066,18 +1068,18 @@ EOF
                     run cd ${tomcat_home_dir}
                     run cp -r ${tomcat_home}/{bin,lib} ${tomcat_home_dir}
 
-                    local etc_escenic_dir=${package_dir}/etc/escenic
+                    local etc_escenic_dir=${package_dir}${escenic_conf_dir}
                     run mkdir -p ${etc_escenic_dir}
                     cd ${etc_escenic_dir}
-                    run cp -r /etc/escenic/{ece,ece-${instance}}.conf \
+                    run cp -r ${escenic_conf_dir}/{ece,ece-${instance}}.conf \
                         ${etc_escenic_dir}
 
                     run mkdir -p ${etc_escenic_dir}/engine
-                    run cp -r /etc/escenic/engine/common \
+                    run cp -r ${escenic_conf_dir}/engine/common \
                         ${etc_escenic_dir}
                     
                     run mkdir -p ${etc_escenic_dir}/engine/instance
-                    run cp -r /etc/escenic/engine/instance/${instance} \
+                    run cp -r ${escenic_conf_dir}/engine/instance/${instance} \
                         ${etc_escenic_dir}
                 )
             fi

From 9f20b03bc5cc0c1a7424cba2a82c8d63298277af Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 17 Jan 2012 12:38:24 +0800
Subject: [PATCH 0210/2585] - ece now supports escenic_conf_dir, so the
 ece-install now sets this   in the install ece.conf file.

---
 usr/sbin/ece-install | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 891df663..6c17d8fc 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -425,6 +425,7 @@ function set_up_ece_scripts()
     set_conf_file_value backup_dir ${escenic_backups_dir} $file
     set_conf_file_value cache_dir ${escenic_cache_dir} ${file}
     set_conf_file_value ece_home ${escenic_root_dir}/engine ${file}
+    set_conf_file_value escenic_conf_dir ${escenic_conf_dir} ${file}
     set_conf_file_value heap_dump_dir ${escenic_crash_dir} ${file}
     set_conf_file_value log_dir ${escenic_log_dir} ${file}
     set_conf_file_value pid_dir ${escenic_run_dir} ${file}

From a31c5674ea0631aa88c42f335634120e015c5135 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 17 Jan 2012 19:45:18 +0800
Subject: [PATCH 0211/2585] - added configuration of DB creation parameters:

  fai_db_install=1
  fai_db_user=myuser
  fai_db_password=mypassword
  fai_db_schema=mydb
  fai_db_host=localhost
  fai_db_drop_old_db_first=1
---
 usr/share/doc/escenic/ece-install-guide.org | 78 +++++++++++----------
 1 file changed, 41 insertions(+), 37 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 7f726e50..7f7c502a 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -433,43 +433,47 @@ profiles, see the table below.
 The ece-install script understands for the following settings in the
 $HOME/ece-install.conf file of the root user:
 
-|----------------------------------+----------------------+-----------------------------------------------------|
-| Parameter                        |              Default | Description                                         |
-|----------------------------------+----------------------+-----------------------------------------------------|
-| fai\_all\_install                |                    0 | Install all components on your server.              |
-| fai\_cache\_backends             |     ${HOSTNAME}:8080 | Space separated, e.g. "app1:8080 app2:8080"         |
-| fai\_cache\_install              |                    0 | Install cache server profile                        |
-| fai\_db\_host                    |            $HOSTNAME | Useful for editor & presentation profiles           |
-| fai\_db\_install                 |                    0 | Install db profile                                  |
-| fai\_db\_port                    |                 3306 | Useful for editor & presentation profiles           |
-| fai\_editor\_conf\_archive       |                   "" | conf.tar.gz to use for Nursery & JAAS configuration |
-| fai\_editor\_ear                 |                   "" | EAR to use instead of the Escenic binaries          |
-| fai\_editor\_install             |                    0 | Install the editorial profile                       |
-| fai\_editor\_name                |              editor1 | Name of the editor instance                         |
-| fai\_editor\_port                |                 8080 | HTTP port of the editor instance                    |
-| fai\_editor\_shutdown            |                 8005 | Shutdown port of the editor instance                |
-| fai\_enabled                     |                    0 | Whether or not to run ece-install in FAI mode       |
-| fai\_monitoring\_server\_install |                    0 | Install the monitoring server profile.              |
-| fai\_monitoring\_server\_ip      |            127.0.0.1 | The IP of the monitoring server.                    |
-| fai\_presentation\_conf\_archive |                   "" | conf.tar.gz to use for Nursery & JAAS configuration |
-| fai\_presentation\_ear           |                   "" | EAR to use instead of the Escenic binaries          |
-| fai\_presentation\_install       |                    0 | Install the presentation server profile             |
-| fai\_presentation\_name          |                 web1 | Name of the presentation server instance            |
-| fai\_presentation\_port          |                 8080 | HTTP port of the presentation server instance       |
-| fai\_presentation\_shutdown      |                 8005 | Shutdown port of the presentation instance          |
-| fai\_public\_host\_name          |     ${HOSTNAME}:8080 | The public address for your website                 |
-| fai\_publication\_create         |                    0 | Create a new publication                            |
-| fai\_publication\_name           |                mypub | Name of the publication                             |
-| fai\_publication\_use\_instance  |                 dev1 | Name of local instance to use for creation          |
-| fai\_publication\_war            | "WF or ECE demo WAR" | WAR to to base the new publication on               |
-| fai\_rmi\_install                |                    0 | Install RMI hub profile                             |
-| fai\_search\_conf\_archive       |                   "" | conf.tar.gz to use for Nursery & JAAS configuration |
-| fai\_search\_ear                 |                   "" | EAR to use instead of the Escenic binaries          |
-| fai\_search\_name                |              search1 | Name of the search instance                         |
-| fai\_search\_port                |                 8080 | HTTP port of the search instance                    |
-| fai\_search\_shutdown            |                 8005 | Shutdown port of the search instance                |
-| fai\_wf\_install                 |                    0 | Install Widget Framework profile                    |
-|----------------------------------+----------------------+-----------------------------------------------------|
+|----------------------------------+----------------------+----------------------------------------------------------------------|
+| Parameter                        |              Default | Description                                                          |
+|----------------------------------+----------------------+----------------------------------------------------------------------|
+| fai\_all\_install                |                    0 | Install all components on your server.                               |
+| fai\_cache\_backends             |     ${HOSTNAME}:8080 | Space separated, e.g. "app1:8080 app2:8080"                          |
+| fai\_cache\_install              |                    0 | Install cache server profile                                         |
+| fai\_db\_host                    |            $HOSTNAME | Useful for editor & presentation profiles                            |
+| fai\_db\_drop_old_db_first       |                    0 | Warning: this will drop the old database before installing a new one |
+| fai\_db\_install                 |                    0 | Install db profile                                                   |
+| fai\_db\_password                | read-the-source-luke | Useful for DB installation profile                                   |
+| fai\_db\_port                    |                 3306 | Useful for editor & presentation profiles                            |
+| fai\_db\_schema                  |               ece5db | Useful for DB installation profile                                   |
+| fai\_db\_user                    |             ece5user | Useful for DB installation profile                                   |
+| fai\_editor\_conf\_archive       |                   "" | conf.tar.gz to use for Nursery & JAAS configuration                  |
+| fai\_editor\_ear                 |                   "" | EAR to use instead of the Escenic binaries                           |
+| fai\_editor\_install             |                    0 | Install the editorial profile                                        |
+| fai\_editor\_name                |              editor1 | Name of the editor instance                                          |
+| fai\_editor\_port                |                 8080 | HTTP port of the editor instance                                     |
+| fai\_editor\_shutdown            |                 8005 | Shutdown port of the editor instance                                 |
+| fai\_enabled                     |                    0 | Whether or not to run ece-install in FAI mode                        |
+| fai\_monitoring\_server\_install |                    0 | Install the monitoring server profile.                               |
+| fai\_monitoring\_server\_ip      |            127.0.0.1 | The IP of the monitoring server.                                     |
+| fai\_presentation\_conf\_archive |                   "" | conf.tar.gz to use for Nursery & JAAS configuration                  |
+| fai\_presentation\_ear           |                   "" | EAR to use instead of the Escenic binaries                           |
+| fai\_presentation\_install       |                    0 | Install the presentation server profile                              |
+| fai\_presentation\_name          |                 web1 | Name of the presentation server instance                             |
+| fai\_presentation\_port          |                 8080 | HTTP port of the presentation server instance                        |
+| fai\_presentation\_shutdown      |                 8005 | Shutdown port of the presentation instance                           |
+| fai\_public\_host\_name          |     ${HOSTNAME}:8080 | The public address for your website                                  |
+| fai\_publication\_create         |                    0 | Create a new publication                                             |
+| fai\_publication\_name           |                mypub | Name of the publication                                              |
+| fai\_publication\_use\_instance  |                 dev1 | Name of local instance to use for creation                           |
+| fai\_publication\_war            | "WF or ECE demo WAR" | WAR to to base the new publication on                                |
+| fai\_rmi\_install                |                    0 | Install RMI hub profile                                              |
+| fai\_search\_conf\_archive       |                   "" | conf.tar.gz to use for Nursery & JAAS configuration                  |
+| fai\_search\_ear                 |                   "" | EAR to use instead of the Escenic binaries                           |
+| fai\_search\_name                |              search1 | Name of the search instance                                          |
+| fai\_search\_port                |                 8080 | HTTP port of the search instance                                     |
+| fai\_search\_shutdown            |                 8005 | Shutdown port of the search instance                                 |
+| fai\_wf\_install                 |                    0 | Install Widget Framework profile                                     |
+|----------------------------------+----------------------+----------------------------------------------------------------------|
 
 As you've probably have guessed, 0 means "false" and 1 means "true" :-)
 

From 2e55412c5074723a417390e4f679159a14c5757f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 17 Jan 2012 19:46:01 +0800
Subject: [PATCH 0212/2585] - added configuration of DB parameters:

  fai_db_install=1
  fai_db_user=myuser
  fai_db_password=mypassword
  fai_db_schema=mydb
  fai_db_host=localhost
  fai_db_drop_old_db_first=1
---
 usr/sbin/ece-install | 41 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 6c17d8fc..4de97e73 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -465,15 +465,42 @@ function set_up_ecedb()
         fi
     done
 
-    # TODO in future, it'll be possible to override db_user,
-    # db_password and db_schema here by reading these via
-    # get_conf_value
+    # the user may override standard DB settings in ece-install.conf
+    if [ -n "${fai_db_host}" ]; then
+        db_host=${fai_db_host}
+    fi
+    if [ -n "${fai_db_user}" ]; then
+        db_user=${fai_db_user}
+    fi
+    if [ -n "${fai_db_password}" ]; then
+        db_password=${fai_db_password}
+    fi
+    if [ -n "${fai_db_schema}" ]; then
+        db_schema=${fai_db_schema}
+    fi
+    if [ -n "${fai_db_drop_old_db_first}" ]; then
+        drop_db_first=${fai_db_drop_old_db_first}
+        print_and_log "WARNING: I hope you know what you're doing!"
+        print_and_log "WARNING: fai_db_drop_old_db_first is 1 (true)"
+    fi
+    ece_home=${escenic_root_dir}/engine
+
+    # the port isn't fully supported. The user must himself update the
+    # mysql configuration to run it on a non standard port.
+    
+    if [ -n "${fai_db_port}" ]; then
+        db_port=${fai_db_port}
+    else
+        db_port=3306
+    fi
+    
+    pre_install_new_ecedb
     create_ecedb
     
     cd ~/
     run rm -rf $escenic_root_dir/engine/plugins
 
-    add_next_step "DB is now set up on $HOSTNAME:3306"
+    add_next_step "DB is now set up on ${db_host}:${db_port}"
 }
 
 function set_up_basic_nursery_configuration()
@@ -877,11 +904,11 @@ function set_up_app_server
         maxIdle="8"
         maxWait="2000"
         initialSize="20"
-        username="ece5user"
-        password="ece5password"
+        username="${db_user}"
+        password="${db_password}"
         driverClassName="com.mysql.jdbc.Driver"
 
-url="jdbc:mysql://localhost:3306/ece5db?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;characterSetResults=UTF-8"
+url="jdbc:mysql://${db_host}:${db_port}/${db_schema}?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;characterSetResults=UTF-8"
         removeAbandoned="true"
         removeAbandonedTimeout="120"
         logAbandoned="true"

From 3f1feb6952654723b1f37742b08403a1a33d56b8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 17 Jan 2012 19:49:40 +0800
Subject: [PATCH 0213/2585] - pernickety

---
 usr/sbin/ece-install | 1 -
 1 file changed, 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 4de97e73..2bbd0767 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -487,7 +487,6 @@ function set_up_ecedb()
 
     # the port isn't fully supported. The user must himself update the
     # mysql configuration to run it on a non standard port.
-    
     if [ -n "${fai_db_port}" ]; then
         db_port=${fai_db_port}
     else

From 45f07261e5fe1a6983e719642159c1eb53a921f4 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 18 Jan 2012 10:45:42 +0800
Subject: [PATCH 0214/2585] - forgot to set DB host/port in
 set_up_app_server/ECE_UPDATE_DS from   local variables.

---
 usr/sbin/ece-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 2bbd0767..65113946 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -930,7 +930,7 @@ url="jdbc:mysql://${db_host}:${db_port}/${db_schema}?autoReconnect=true&amp;useU
         username="ece5user"
         password="ece5password"
         driverClassName="com.mysql.jdbc.Driver"
-        url="jdbc:mysql://localhost:3306/ece5db?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;characterSetResults=UTF-8"
+        url="jdbc:mysql://${db_host}:${db_port}/${db_schema}?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;characterSetResults=UTF-8"
         removeAbandoned="true"
         removeAbandonedTimeout="120"
         logAbandoned="true"

From de4aa1f723e06e77a6aa362be538e884c7c287e4 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 18 Jan 2012 12:11:03 +0800
Subject: [PATCH 0215/2585] - added set_db_settings_from_fai_conf, called from
 set_up_ecedb - added set_db_defaults_if_not_set, called from both
 set_up_app_server   and set_up_ecedb.

  This method sets defaults for all DB variables if not set:
  * host - localhost
  * port - 3306
  * schema - ece5db
  * user - ece5usr
  * password - read-the-source-luke
---
 usr/sbin/ece-install | 110 +++++++++++++++++++++++++++----------------
 1 file changed, 70 insertions(+), 40 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 65113946..5e129476 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -439,6 +439,63 @@ function set_up_ece_scripts()
     run sed -i "s#/opt/escenic#${escenic_root_dir}#g" /etc/bash_completion.d/ece
 }
 
+
+# Method used both from interactive mode to set any missing values
+# (defaults)
+function set_db_defaults_if_not_set()
+{
+    if [ -z "$db_host" ]; then
+        db_host=localhost
+    fi
+    
+    if [ -z "$db_port" ]; then
+        db_port=3306
+    fi
+    
+    if [ -z "$db_user" ]; then
+        db_user=ece5user
+    fi
+    
+    if [ -z "$db_password" ]; then
+        db_user=ece5password
+    fi
+    
+    if [ -z "$db_schema" ]; then
+        db_schema=ece5db
+    fi
+}
+
+function set_db_settings_from_fai_conf()
+{
+    # the port isn't fully supported. The user must himself update the
+    # mysql configuration to run it on a non standard port.
+    if [ -n "${fai_db_port}" ]; then
+        db_port=${fai_db_port}
+    fi
+    
+    if [ -n "${fai_db_host}" ]; then
+        db_host=${fai_db_host}
+    fi
+    
+    if [ -n "${fai_db_user}" ]; then
+        db_user=${fai_db_user}
+    fi
+    
+    if [ -n "${fai_db_password}" ]; then
+        db_password=${fai_db_password}
+    fi
+    
+    if [ -n "${fai_db_schema}" ]; then
+        db_schema=${fai_db_schema}
+    fi
+    
+    if [ -n "${fai_db_drop_old_db_first}" ]; then
+        drop_db_first=${fai_db_drop_old_db_first}
+        print_and_log "WARNING: I hope you know what you're doing!"
+        print_and_log "WARNING: fai_db_drop_old_db_first is 1 (true)"
+    fi
+}
+
 function set_up_ecedb()
 {
     print_and_log "Setting up the ECE database schema ..."
@@ -466,33 +523,11 @@ function set_up_ecedb()
     done
 
     # the user may override standard DB settings in ece-install.conf
-    if [ -n "${fai_db_host}" ]; then
-        db_host=${fai_db_host}
-    fi
-    if [ -n "${fai_db_user}" ]; then
-        db_user=${fai_db_user}
-    fi
-    if [ -n "${fai_db_password}" ]; then
-        db_password=${fai_db_password}
-    fi
-    if [ -n "${fai_db_schema}" ]; then
-        db_schema=${fai_db_schema}
-    fi
-    if [ -n "${fai_db_drop_old_db_first}" ]; then
-        drop_db_first=${fai_db_drop_old_db_first}
-        print_and_log "WARNING: I hope you know what you're doing!"
-        print_and_log "WARNING: fai_db_drop_old_db_first is 1 (true)"
-    fi
-    ece_home=${escenic_root_dir}/engine
+    set_db_settings_from_fai_conf
+    set_db_defaults_if_not_set
 
-    # the port isn't fully supported. The user must himself update the
-    # mysql configuration to run it on a non standard port.
-    if [ -n "${fai_db_port}" ]; then
-        db_port=${fai_db_port}
-    else
-        db_port=3306
-    fi
-    
+    # the methods in drop-and-create-ecedb needs ece_home to be set
+    ece_home=${escenic_root_dir}/engine
     pre_install_new_ecedb
     create_ecedb
     
@@ -798,25 +833,20 @@ function set_up_app_server
     
     if [ $fai_enabled -eq 0 ]; then
         print "Another question: Where does the database run?"
-        print "Press ENTER to accept the default ($HOSTNAME:3306)"
-        print "Or enter: <host>:<port>, e.g.: 'db1:3306'"
-        echo -n "Your choice [$HOSTNAME:3306]> "
+        print "Press ENTER to accept the default ($HOSTNAME:3306:ece5db)"
+        print "Or enter: <host>:<port>:<schema>, e.g.: 'db1:3306:mydb'"
+        echo -n "Your choice [$HOSTNAME:3306:schema]> "
         read user_database
-    else
-        user_database=$(get_conf_value fai_db_host)
-        if [ -n "${user_database}" ]; then
-            user_database=$user_database":"$(get_conf_value fai_db_port)
-        fi
-    fi
-
-    if [ -z "$user_database" ]; then
-        db_host=$HOSTNAME
-        db_port=3306
-    else
+        
         db_host=$(echo $user_database | cut -d':' -f1)
         db_port=$(echo $user_database | cut -d':' -f2)
+        db_schema=$(echo $user_database | cut -d':' -f3)
+    else
+        set_db_settings_from_fai_conf
     fi
 
+    set_db_defaults_if_not_set
+
     if [ $fai_enabled -eq 0 ]; then
         print "Last question: Where does the search instance run?"
         print "Press ENTER to accept the default ($HOSTNAME:8080)"

From 905c6a9e041f14bc118d4012eadc8d7e9461db54 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 18 Jan 2012 13:15:58 +0800
Subject: [PATCH 0216/2585] - updated HTML

---
 usr/share/doc/escenic/ece-install-guide.html | 78 ++++++++++----------
 1 file changed, 41 insertions(+), 37 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.html b/usr/share/doc/escenic/ece-install-guide.html
index 2aee0d45..ef9e1c5d 100644
--- a/usr/share/doc/escenic/ece-install-guide.html
+++ b/usr/share/doc/escenic/ece-install-guide.html
@@ -7,7 +7,7 @@
 <title>Welcome to the /usr/sbin/ece-install Guide</title>
 <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
 <meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2012-01-12 14:20:21 CST"/>
+<meta name="generated" content="2012-01-18 13:15:34 CST"/>
 <meta name="author" content="Torstein Krause Johansen"/>
 <meta name="description" content=""/>
 <meta name="keywords" content=""/>
@@ -1141,45 +1141,49 @@ <h3 id="sec-6-2"><span class="section-number-3">6.2</span> Overview of All FAI P
 </p>
 <table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
 <caption></caption>
-<colgroup><col class="left" /><col class="right" /><col class="left" />
+<colgroup><col class="left" /><col class="left" /><col class="left" />
 </colgroup>
 <thead>
-<tr><th scope="col" class="left">Parameter</th><th scope="col" class="right">Default</th><th scope="col" class="left">Description</th></tr>
+<tr><th scope="col" class="left">Parameter</th><th scope="col" class="left">Default</th><th scope="col" class="left">Description</th></tr>
 </thead>
 <tbody>
-<tr><td class="left">fai_all_install</td><td class="right">0</td><td class="left">Install all components on your server.</td></tr>
-<tr><td class="left">fai_cache_backends</td><td class="right">${HOSTNAME}:8080</td><td class="left">Space separated, e.g. "app1:8080 app2:8080"</td></tr>
-<tr><td class="left">fai_cache_install</td><td class="right">0</td><td class="left">Install cache server profile</td></tr>
-<tr><td class="left">fai_db_host</td><td class="right">$HOSTNAME</td><td class="left">Useful for editor &amp; presentation profiles</td></tr>
-<tr><td class="left">fai_db_install</td><td class="right">0</td><td class="left">Install db profile</td></tr>
-<tr><td class="left">fai_db_port</td><td class="right">3306</td><td class="left">Useful for editor &amp; presentation profiles</td></tr>
-<tr><td class="left">fai_editor_conf_archive</td><td class="right">""</td><td class="left">conf.tar.gz to use for Nursery &amp; JAAS configuration</td></tr>
-<tr><td class="left">fai_editor_ear</td><td class="right">""</td><td class="left">EAR to use instead of the Escenic binaries</td></tr>
-<tr><td class="left">fai_editor_install</td><td class="right">0</td><td class="left">Install the editorial profile</td></tr>
-<tr><td class="left">fai_editor_name</td><td class="right">editor1</td><td class="left">Name of the editor instance</td></tr>
-<tr><td class="left">fai_editor_port</td><td class="right">8080</td><td class="left">HTTP port of the editor instance</td></tr>
-<tr><td class="left">fai_editor_shutdown</td><td class="right">8005</td><td class="left">Shutdown port of the editor instance</td></tr>
-<tr><td class="left">fai_enabled</td><td class="right">0</td><td class="left">Whether or not to run ece-install in FAI mode</td></tr>
-<tr><td class="left">fai_monitoring_server_install</td><td class="right">0</td><td class="left">Install the monitoring server profile.</td></tr>
-<tr><td class="left">fai_monitoring_server_ip</td><td class="right">127.0.0.1</td><td class="left">The IP of the monitoring server.</td></tr>
-<tr><td class="left">fai_presentation_conf_archive</td><td class="right">""</td><td class="left">conf.tar.gz to use for Nursery &amp; JAAS configuration</td></tr>
-<tr><td class="left">fai_presentation_ear</td><td class="right">""</td><td class="left">EAR to use instead of the Escenic binaries</td></tr>
-<tr><td class="left">fai_presentation_install</td><td class="right">0</td><td class="left">Install the presentation server profile</td></tr>
-<tr><td class="left">fai_presentation_name</td><td class="right">web1</td><td class="left">Name of the presentation server instance</td></tr>
-<tr><td class="left">fai_presentation_port</td><td class="right">8080</td><td class="left">HTTP port of the presentation server instance</td></tr>
-<tr><td class="left">fai_presentation_shutdown</td><td class="right">8005</td><td class="left">Shutdown port of the presentation instance</td></tr>
-<tr><td class="left">fai_public_host_name</td><td class="right">${HOSTNAME}:8080</td><td class="left">The public address for your website</td></tr>
-<tr><td class="left">fai_publication_create</td><td class="right">0</td><td class="left">Create a new publication</td></tr>
-<tr><td class="left">fai_publication_name</td><td class="right">mypub</td><td class="left">Name of the publication</td></tr>
-<tr><td class="left">fai_publication_use_instance</td><td class="right">dev1</td><td class="left">Name of local instance to use for creation</td></tr>
-<tr><td class="left">fai_publication_war</td><td class="right">"WF or ECE demo WAR"</td><td class="left">WAR to to base the new publication on</td></tr>
-<tr><td class="left">fai_rmi_install</td><td class="right">0</td><td class="left">Install RMI hub profile</td></tr>
-<tr><td class="left">fai_search_conf_archive</td><td class="right">""</td><td class="left">conf.tar.gz to use for Nursery &amp; JAAS configuration</td></tr>
-<tr><td class="left">fai_search_ear</td><td class="right">""</td><td class="left">EAR to use instead of the Escenic binaries</td></tr>
-<tr><td class="left">fai_search_name</td><td class="right">search1</td><td class="left">Name of the search instance</td></tr>
-<tr><td class="left">fai_search_port</td><td class="right">8080</td><td class="left">HTTP port of the search instance</td></tr>
-<tr><td class="left">fai_search_shutdown</td><td class="right">8005</td><td class="left">Shutdown port of the search instance</td></tr>
-<tr><td class="left">fai_wf_install</td><td class="right">0</td><td class="left">Install Widget Framework profile</td></tr>
+<tr><td class="left">fai_all_install</td><td class="left">0</td><td class="left">Install all components on your server.</td></tr>
+<tr><td class="left">fai_cache_backends</td><td class="left">${HOSTNAME}:8080</td><td class="left">Space separated, e.g. "app1:8080 app2:8080"</td></tr>
+<tr><td class="left">fai_cache_install</td><td class="left">0</td><td class="left">Install cache server profile</td></tr>
+<tr><td class="left">fai_db_host</td><td class="left">$HOSTNAME</td><td class="left">Useful for editor &amp; presentation profiles</td></tr>
+<tr><td class="left">fai_db_drop<sub>old</sub><sub>db</sub><sub>first</sub></td><td class="left">0</td><td class="left">Warning: this will drop the old database before installing a new one</td></tr>
+<tr><td class="left">fai_db_install</td><td class="left">0</td><td class="left">Install db profile</td></tr>
+<tr><td class="left">fai_db_password</td><td class="left">read-the-source-luke</td><td class="left">Useful for DB installation profile</td></tr>
+<tr><td class="left">fai_db_port</td><td class="left">3306</td><td class="left">Useful for editor &amp; presentation profiles</td></tr>
+<tr><td class="left">fai_db_schema</td><td class="left">ece5db</td><td class="left">Useful for DB installation profile</td></tr>
+<tr><td class="left">fai_db_user</td><td class="left">ece5user</td><td class="left">Useful for DB installation profile</td></tr>
+<tr><td class="left">fai_editor_conf_archive</td><td class="left">""</td><td class="left">conf.tar.gz to use for Nursery &amp; JAAS configuration</td></tr>
+<tr><td class="left">fai_editor_ear</td><td class="left">""</td><td class="left">EAR to use instead of the Escenic binaries</td></tr>
+<tr><td class="left">fai_editor_install</td><td class="left">0</td><td class="left">Install the editorial profile</td></tr>
+<tr><td class="left">fai_editor_name</td><td class="left">editor1</td><td class="left">Name of the editor instance</td></tr>
+<tr><td class="left">fai_editor_port</td><td class="left">8080</td><td class="left">HTTP port of the editor instance</td></tr>
+<tr><td class="left">fai_editor_shutdown</td><td class="left">8005</td><td class="left">Shutdown port of the editor instance</td></tr>
+<tr><td class="left">fai_enabled</td><td class="left">0</td><td class="left">Whether or not to run ece-install in FAI mode</td></tr>
+<tr><td class="left">fai_monitoring_server_install</td><td class="left">0</td><td class="left">Install the monitoring server profile.</td></tr>
+<tr><td class="left">fai_monitoring_server_ip</td><td class="left">127.0.0.1</td><td class="left">The IP of the monitoring server.</td></tr>
+<tr><td class="left">fai_presentation_conf_archive</td><td class="left">""</td><td class="left">conf.tar.gz to use for Nursery &amp; JAAS configuration</td></tr>
+<tr><td class="left">fai_presentation_ear</td><td class="left">""</td><td class="left">EAR to use instead of the Escenic binaries</td></tr>
+<tr><td class="left">fai_presentation_install</td><td class="left">0</td><td class="left">Install the presentation server profile</td></tr>
+<tr><td class="left">fai_presentation_name</td><td class="left">web1</td><td class="left">Name of the presentation server instance</td></tr>
+<tr><td class="left">fai_presentation_port</td><td class="left">8080</td><td class="left">HTTP port of the presentation server instance</td></tr>
+<tr><td class="left">fai_presentation_shutdown</td><td class="left">8005</td><td class="left">Shutdown port of the presentation instance</td></tr>
+<tr><td class="left">fai_public_host_name</td><td class="left">${HOSTNAME}:8080</td><td class="left">The public address for your website</td></tr>
+<tr><td class="left">fai_publication_create</td><td class="left">0</td><td class="left">Create a new publication</td></tr>
+<tr><td class="left">fai_publication_name</td><td class="left">mypub</td><td class="left">Name of the publication</td></tr>
+<tr><td class="left">fai_publication_use_instance</td><td class="left">dev1</td><td class="left">Name of local instance to use for creation</td></tr>
+<tr><td class="left">fai_publication_war</td><td class="left">"WF or ECE demo WAR"</td><td class="left">WAR to to base the new publication on</td></tr>
+<tr><td class="left">fai_rmi_install</td><td class="left">0</td><td class="left">Install RMI hub profile</td></tr>
+<tr><td class="left">fai_search_conf_archive</td><td class="left">""</td><td class="left">conf.tar.gz to use for Nursery &amp; JAAS configuration</td></tr>
+<tr><td class="left">fai_search_ear</td><td class="left">""</td><td class="left">EAR to use instead of the Escenic binaries</td></tr>
+<tr><td class="left">fai_search_name</td><td class="left">search1</td><td class="left">Name of the search instance</td></tr>
+<tr><td class="left">fai_search_port</td><td class="left">8080</td><td class="left">HTTP port of the search instance</td></tr>
+<tr><td class="left">fai_search_shutdown</td><td class="left">8005</td><td class="left">Shutdown port of the search instance</td></tr>
+<tr><td class="left">fai_wf_install</td><td class="left">0</td><td class="left">Install Widget Framework profile</td></tr>
 </tbody>
 </table>
 
@@ -1556,7 +1560,7 @@ <h2 id="sec-14"><span class="section-number-2">14</span> Example Output FAI </h2
 <hr/>
 <p class="author">
   Author: Torstein Krause Johansen (<a href="mailto:tkj@vizrt.com">tkj@vizrt.com</a>)
-  Date: 2012-01-12 14:20:21 CST
+  Date: 2012-01-18 13:15:34 CST
 </p>
 </div>
 </body>

From f8507592eb6c65bfc91021b0d668e9b57a4bce75 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 18 Jan 2012 15:40:56 +0800
Subject: [PATCH 0217/2585] - fai_db_drop_old_db_first=0 would give warning
 (only =1 should   do). Now fixed.

---
 usr/sbin/ece-install | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 5e129476..9f19161f 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -491,8 +491,10 @@ function set_db_settings_from_fai_conf()
     
     if [ -n "${fai_db_drop_old_db_first}" ]; then
         drop_db_first=${fai_db_drop_old_db_first}
-        print_and_log "WARNING: I hope you know what you're doing!"
-        print_and_log "WARNING: fai_db_drop_old_db_first is 1 (true)"
+        if [ $fai_db_drop_old_db_first -eq 1 ]; then
+            print_and_log "WARNING: I hope you know what you're doing!"
+            print_and_log "WARNING: fai_db_drop_old_db_first is 1 (true)"
+        fi
     fi
 }
 

From 493d5f215fa419befd9b9fb3b82cb3b8070b7ab7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 18 Jan 2012 18:35:27 +0800
Subject: [PATCH 0218/2585] - added fai_publication_war_uri_list configuration
 option:

  Publication WARs used for setting up Assembly tool.

  This is a list of URIs, the following formats are supported:

    * http://my.build.server.com/build/234234/mypub.war
    * https://my.build.server.com/build/234234/mypub.war
    * file:///var/cache/build/234234/mypub.war
    * /var/cache/build/234234/mypub.war

  When set, AT will set up these publication definitions and
  download/copy the WAR file to <assembly tool
  home>/publications.
---
 usr/sbin/ece-install | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 9f19161f..b4db5e91 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -355,6 +355,39 @@ EOF
         assemble.properties \
         1>>$log 2>>$log
     exit_on_error "sed on assemble.properties"
+
+    make_dir $escenic_root_dir/assemblytool/publications
+
+    # set up user publication definitions
+    if [ -n "${fai_publication_war_uri_list}" ]; then
+        run cd $escenic_root_dir/assemblytool/publications
+        
+        for el in ${fai_publication_war_uri_list}; do
+            if [[ $el == http* ]]; then
+                run wget $wget_opts $el
+            elif [[ $el == file://* ]]; then
+                local file_with_path=$(echo $el | sed "s#file://##g")
+                run cp $file_with_path .
+            else
+                run cp ${el} .
+            fi
+            
+            if [ ! -e $(basename $el) ]; then
+                print_and_log "Failed to get user publication $el."
+                print_and_log "I will skip it and continue to the next one."
+                continue
+            fi
+
+            local short_name=$(basename $el .war)
+            cat > ${short_name}.properties <<EOF
+name: ${short_name}
+source-war: ${short_name}.war
+context-root: ${short_name}
+EOF
+            
+        done
+    fi
+    
 }
 
 function set_up_engine_and_plugins()

From e6e9241353784a505f4028cf6fd081ac58692690 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 18 Jan 2012 18:35:53 +0800
Subject: [PATCH 0219/2585] * usr/share/doc/escenic/ece-install-guide.org: add
 documentation for fai_publication_war_uri_list

---
 usr/share/doc/escenic/ece-install-guide.org | 83 +++++++++++----------
 1 file changed, 42 insertions(+), 41 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 7f7c502a..a5fd6387 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -433,47 +433,48 @@ profiles, see the table below.
 The ece-install script understands for the following settings in the
 $HOME/ece-install.conf file of the root user:
 
-|----------------------------------+----------------------+----------------------------------------------------------------------|
-| Parameter                        |              Default | Description                                                          |
-|----------------------------------+----------------------+----------------------------------------------------------------------|
-| fai\_all\_install                |                    0 | Install all components on your server.                               |
-| fai\_cache\_backends             |     ${HOSTNAME}:8080 | Space separated, e.g. "app1:8080 app2:8080"                          |
-| fai\_cache\_install              |                    0 | Install cache server profile                                         |
-| fai\_db\_host                    |            $HOSTNAME | Useful for editor & presentation profiles                            |
-| fai\_db\_drop_old_db_first       |                    0 | Warning: this will drop the old database before installing a new one |
-| fai\_db\_install                 |                    0 | Install db profile                                                   |
-| fai\_db\_password                | read-the-source-luke | Useful for DB installation profile                                   |
-| fai\_db\_port                    |                 3306 | Useful for editor & presentation profiles                            |
-| fai\_db\_schema                  |               ece5db | Useful for DB installation profile                                   |
-| fai\_db\_user                    |             ece5user | Useful for DB installation profile                                   |
-| fai\_editor\_conf\_archive       |                   "" | conf.tar.gz to use for Nursery & JAAS configuration                  |
-| fai\_editor\_ear                 |                   "" | EAR to use instead of the Escenic binaries                           |
-| fai\_editor\_install             |                    0 | Install the editorial profile                                        |
-| fai\_editor\_name                |              editor1 | Name of the editor instance                                          |
-| fai\_editor\_port                |                 8080 | HTTP port of the editor instance                                     |
-| fai\_editor\_shutdown            |                 8005 | Shutdown port of the editor instance                                 |
-| fai\_enabled                     |                    0 | Whether or not to run ece-install in FAI mode                        |
-| fai\_monitoring\_server\_install |                    0 | Install the monitoring server profile.                               |
-| fai\_monitoring\_server\_ip      |            127.0.0.1 | The IP of the monitoring server.                                     |
-| fai\_presentation\_conf\_archive |                   "" | conf.tar.gz to use for Nursery & JAAS configuration                  |
-| fai\_presentation\_ear           |                   "" | EAR to use instead of the Escenic binaries                           |
-| fai\_presentation\_install       |                    0 | Install the presentation server profile                              |
-| fai\_presentation\_name          |                 web1 | Name of the presentation server instance                             |
-| fai\_presentation\_port          |                 8080 | HTTP port of the presentation server instance                        |
-| fai\_presentation\_shutdown      |                 8005 | Shutdown port of the presentation instance                           |
-| fai\_public\_host\_name          |     ${HOSTNAME}:8080 | The public address for your website                                  |
-| fai\_publication\_create         |                    0 | Create a new publication                                             |
-| fai\_publication\_name           |                mypub | Name of the publication                                              |
-| fai\_publication\_use\_instance  |                 dev1 | Name of local instance to use for creation                           |
-| fai\_publication\_war            | "WF or ECE demo WAR" | WAR to to base the new publication on                                |
-| fai\_rmi\_install                |                    0 | Install RMI hub profile                                              |
-| fai\_search\_conf\_archive       |                   "" | conf.tar.gz to use for Nursery & JAAS configuration                  |
-| fai\_search\_ear                 |                   "" | EAR to use instead of the Escenic binaries                           |
-| fai\_search\_name                |              search1 | Name of the search instance                                          |
-| fai\_search\_port                |                 8080 | HTTP port of the search instance                                     |
-| fai\_search\_shutdown            |                 8005 | Shutdown port of the search instance                                 |
-| fai\_wf\_install                 |                    0 | Install Widget Framework profile                                     |
-|----------------------------------+----------------------+----------------------------------------------------------------------|
+|----------------------------------+----------------------+---------------------------------------------------------------------------------------------------------------------------------------|
+| Parameter                        | Default              | Description                                                                                                                           |
+|----------------------------------+----------------------+---------------------------------------------------------------------------------------------------------------------------------------|
+| fai\_all\_install                | 0                    | Install all components on your server.                                                                                                |
+| fai\_cache\_backends             | ${HOSTNAME}:8080     | Space separated, e.g. "app1:8080 app2:8080"                                                                                           |
+| fai\_cache\_install              | 0                    | Install cache server profile                                                                                                          |
+| fai\_db\_host                    | $HOSTNAME            | Useful for editor & presentation profiles                                                                                             |
+| fai\_db\_drop\_old\_db\_first    | 0                    | Warning: this will drop the old database before installing a new one                                                                  |
+| fai\_db\_install                 | 0                    | Install db profile                                                                                                                    |
+| fai\_db\_password                | read-the-source-luke | Useful for DB installation profile                                                                                                    |
+| fai\_db\_port                    | 3306                 | Useful for editor & presentation profiles                                                                                             |
+| fai\_db\_schema                  | ece5db               | Useful for DB installation profile                                                                                                    |
+| fai\_db\_user                    | ece5user             | Useful for DB installation profile                                                                                                    |
+| fai\_editor\_conf\_archive       | ""                   | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
+| fai\_editor\_ear                 | ""                   | EAR to use instead of the Escenic binaries                                                                                            |
+| fai\_editor\_install             | 0                    | Install the editorial profile                                                                                                         |
+| fai\_editor\_name                | editor1              | Name of the editor instance                                                                                                           |
+| fai\_editor\_port                | 8080                 | HTTP port of the editor instance                                                                                                      |
+| fai\_editor\_shutdown            | 8005                 | Shutdown port of the editor instance                                                                                                  |
+| fai\_enabled                     | 0                    | Whether or not to run ece-install in FAI mode                                                                                         |
+| fai\_monitoring\_server\_install | 0                    | Install the monitoring server profile.                                                                                                |
+| fai\_monitoring\_server\_ip      | 127.0.0.1            | The IP of the monitoring server.                                                                                                      |
+| fai\_presentation\_conf\_archive | ""                   | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
+| fai\_presentation\_ear           | ""                   | EAR to use instead of the Escenic binaries                                                                                            |
+| fai\_presentation\_install       | 0                    | Install the presentation server profile                                                                                               |
+| fai\_presentation\_name          | web1                 | Name of the presentation server instance                                                                                              |
+| fai\_presentation\_port          | 8080                 | HTTP port of the presentation server instance                                                                                         |
+| fai\_presentation\_shutdown      | 8005                 | Shutdown port of the presentation instance                                                                                            |
+| fai\_public\_host\_name          | ${HOSTNAME}:8080     | The public address for your website                                                                                                   |
+| fai\_publication\_create         | 0                    | Create a new publication                                                                                                              |
+| fai\_publication\_name           | mypub                | Name of the publication                                                                                                               |
+| fai\_publication\_use\_instance  | dev1                 | Name of local instance to use for creation                                                                                            |
+| fai\_publication\_war            | "WF or ECE demo WAR" | WAR to base the new publication on                                                                                                 |
+| fai\_publication\_war\_uri\_list | ""                   | Publication WARs used for setting up Assembly tool. Supported: http[s]://tmp.com/mypub.war, file:///tmp/mypub.war and /tmp/mypub.war. |
+| fai\_rmi\_install                | 0                    | Install RMI hub profile                                                                                                               |
+| fai\_search\_conf\_archive       | ""                   | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
+| fai\_search\_ear                 | ""                   | EAR to use instead of the Escenic binaries                                                                                            |
+| fai\_search\_name                | search1              | Name of the search instance                                                                                                           |
+| fai\_search\_port                | 8080                 | HTTP port of the search instance                                                                                                      |
+| fai\_search\_shutdown            | 8005                 | Shutdown port of the search instance                                                                                                  |
+| fai\_wf\_install                 | 0                    | Install Widget Framework profile                                                                                                      |
+|----------------------------------+----------------------+---------------------------------------------------------------------------------------------------------------------------------------|
 
 As you've probably have guessed, 0 means "false" and 1 means "true" :-)
 

From 6c66f9d94705724edd91046bbc4a13e0afff6e05 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 19 Jan 2012 11:35:16 +0800
Subject: [PATCH 0220/2585] - forgot setting user name and password through
 variables in   ECE_UPDATE_DS

---
 usr/sbin/ece-install | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index b4db5e91..c7c6849b 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -992,8 +992,8 @@ url="jdbc:mysql://${db_host}:${db_port}/${db_schema}?autoReconnect=true&amp;useU
         maxIdle="8"
         maxWait="2000"
         initialSize="20"
-        username="ece5user"
-        password="ece5password"
+        username="${db_user}"
+        password="${db_password}"
         driverClassName="com.mysql.jdbc.Driver"
         url="jdbc:mysql://${db_host}:${db_port}/${db_schema}?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;characterSetResults=UTF-8"
         removeAbandoned="true"

From 6431a21b2d4d8116e9fde632f7bd1969830e3540 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 19 Jan 2012 13:12:55 +0800
Subject: [PATCH 0221/2585] - changed set_conf_file_value to accept any number
 of value arguments:   e.g.:

  set_conf_file_value \
    mykey \
    myvalue1 myvalue2 myvalue3 \
    /etc/myfile.conf

- added get_deploy_white_list() which returns correct white lists for
  presentation and search servers. For presentation servers, this
  means that all publications defined in <assembly home>/publications
  are included in the white list.

- install_search_server and install_ece_instance now use
  get_deploy_white_list()
---
 usr/sbin/ece-install | 75 ++++++++++++++++++++++++++++++++++----------
 1 file changed, 59 insertions(+), 16 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index c7c6849b..14697756 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -718,18 +718,34 @@ EOF
 
 # Parameters:
 # $1 is the property
-# $2 is the value
-# $3 is the file
+# $2 ... to the (last - 1) is the value
+# The last argument is the file
+#
+# e.g.:
+# set_conf_file_value \
+#   mykey \
+#   myvalue1 myvalue2 myvalue3 \
+#   /etc/myfile.conf
+
 function set_conf_file_value()
 {
-    if [ -r $3 ]; then
-        if [ $(grep ^$1 $3 | wc -l) -gt 0 ]; then
-            sed -i "s~$1=.*~$1=\"$2\"~g" $3
+    if [ $# -lt 3 ]; then
+        return
+    fi
+    
+    local file=${@:${#@}}
+    local key=${@:1:1}
+    local value_end_index=$(( $# - 2 ))
+    local value=${@:2:${value_end_index}}
+    
+    if [ -r $file ]; then
+        if [ $(grep ^$1 $file | wc -l) -gt 0 ]; then
+            sed -i "s~$key=.*~$key=\"$value\"~g" $file
         else
-            echo "$1=\"$2\"" >> $3
+            echo "$key=\"$value\"" >> $file
         fi
     else
-        echo "$1=\"$2\"" >> $3
+        echo "$key=\"$value\"" >> $file
     fi
 }
 
@@ -1952,13 +1968,15 @@ function install_ece_instance()
     set_up_app_server
     set_up_proper_logging_configuration
 
-    # special treatment for presentation servers
-    if [ $2 -eq $PROFILE_PRESENTATION_SERVER ]; then
+    # We set a WAR white list for all profiles except all in one
+    if [ $install_profile_number -ne $PROFILE_ALL_IN_ONE -a \
+        $install_profile_number -ne $PROFILE_EDITORIAL_SERVER ]; then
         file=$escenic_conf_dir/ece-${instance_name}.conf
-        print_and_log "Creating instance specific conf: $file ..."
-        cat >> $file <<EOF
-deploy_webapp_white_list="escenic-admin ${publication_name}"
-EOF
+        print_and_log "Creating deployment white list in $file ..."
+        set_conf_file_value \
+            deploy_webapp_white_list \
+            $(get_deploy_white_list) \
+            $file
     fi
 
     set_correct_permissions
@@ -1977,6 +1995,30 @@ EOF
     add_next_step "/etc/default/ece lists all instances started at boot time"
 }
 
+function get_deploy_white_list()
+{
+    local white_list="escenic_admin"
+    if [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER \
+        -a -n "${publication_name}" ]; then
+        white_list="${white_list} ${publication_name} "
+    elif [ $install_profile_number -eq $PROFILE_SEARCH_SERVER ]; then 
+        white_list="${white_list} solr indexer-webapp"
+    elif [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ]; then
+        local publication_def_dir=${escenic_root_dir}/assemblytool/publications
+        if [ $(ls ${publication_def_dir} | grep .properties$ | wc -l) -eq 0 ]; then
+            echo ${white_list}
+            return
+        fi
+
+        for el in $(find ${publication_def_dir} -name "*.properties"); do
+            local short_name=$(basename $el .properties)
+            white_list="${white_list} ${short_name}"
+        done
+    fi
+
+    echo ${white_list}
+}
+
 function install_presentation_server()
 {
     print_and_log "Installing a presentation server on $HOSTNAME ..."
@@ -2214,9 +2256,10 @@ function install_search_server()
     
     file=$escenic_conf_dir/ece-${instance_name}.conf
     print_and_log "Creating instance specific conf: $file ..."
-    cat >> $file <<EOF
-deploy_webapp_white_list="escenic-admin solr indexer-webapp"
-EOF
+    set_conf_file_value \
+        deploy_webapp_white_list \
+        $(get_deploy_white_list) \
+        $file
 
     # TODO update instead of append
     dir=$common_nursery_dir/com/escenic/framework/search/solr

From f4f5ef548fa75673716f7848ddb8df6d4518b240 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 19 Jan 2012 13:22:58 +0800
Subject: [PATCH 0222/2585] - now, EAE is included in the plugin (symlinks)
 Assembly Tool knows about.

---
 usr/sbin/ece-install | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 14697756..b8d98329 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -334,13 +334,16 @@ EOF
             continue
         fi
         
-        # nuisance to get the community engine, but not the engine
-        if [ $(echo $directory | grep engine | wc -l) -gt 0 ]; then
-            if [ $(echo $directory | grep community | wc -l) -lt 1 ]; then
-                continue
-            fi
+        # nuisance to get the community engine and analysis engine,
+        # but not the engine
+        if [ $(echo $directory | \
+            grep engine | \
+            grep -v community | \
+            grep -v analysis | \
+            wc -l) -gt 0 ]; then
+            continue
         fi
-        
+
         make_ln $directory
     done
 

From 4f10b3137ca09ccc1da6d7b57f24310ee9347313 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 19 Jan 2012 13:26:31 +0800
Subject: [PATCH 0223/2585] - added missing fai_search_install from FAI
 parameter overview.

---
 usr/share/doc/escenic/ece-install-guide.org | 77 +++++++++++----------
 1 file changed, 39 insertions(+), 38 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index a5fd6387..a48dc6b3 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -434,46 +434,47 @@ The ece-install script understands for the following settings in the
 $HOME/ece-install.conf file of the root user:
 
 |----------------------------------+----------------------+---------------------------------------------------------------------------------------------------------------------------------------|
-| Parameter                        | Default              | Description                                                                                                                           |
+| Parameter                        |              Default | Description                                                                                                                           |
 |----------------------------------+----------------------+---------------------------------------------------------------------------------------------------------------------------------------|
-| fai\_all\_install                | 0                    | Install all components on your server.                                                                                                |
-| fai\_cache\_backends             | ${HOSTNAME}:8080     | Space separated, e.g. "app1:8080 app2:8080"                                                                                           |
-| fai\_cache\_install              | 0                    | Install cache server profile                                                                                                          |
-| fai\_db\_host                    | $HOSTNAME            | Useful for editor & presentation profiles                                                                                             |
-| fai\_db\_drop\_old\_db\_first    | 0                    | Warning: this will drop the old database before installing a new one                                                                  |
-| fai\_db\_install                 | 0                    | Install db profile                                                                                                                    |
+| fai\_all\_install                |                    0 | Install all components on your server.                                                                                                |
+| fai\_cache\_backends             |     ${HOSTNAME}:8080 | Space separated, e.g. "app1:8080 app2:8080"                                                                                           |
+| fai\_cache\_install              |                    0 | Install cache server profile                                                                                                          |
+| fai\_db\_host                    |            $HOSTNAME | Useful for editor & presentation profiles                                                                                             |
+| fai\_db\_drop\_old\_db\_first    |                    0 | Warning: this will drop the old database before installing a new one                                                                  |
+| fai\_db\_install                 |                    0 | Install db profile                                                                                                                    |
 | fai\_db\_password                | read-the-source-luke | Useful for DB installation profile                                                                                                    |
-| fai\_db\_port                    | 3306                 | Useful for editor & presentation profiles                                                                                             |
-| fai\_db\_schema                  | ece5db               | Useful for DB installation profile                                                                                                    |
-| fai\_db\_user                    | ece5user             | Useful for DB installation profile                                                                                                    |
-| fai\_editor\_conf\_archive       | ""                   | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
-| fai\_editor\_ear                 | ""                   | EAR to use instead of the Escenic binaries                                                                                            |
-| fai\_editor\_install             | 0                    | Install the editorial profile                                                                                                         |
-| fai\_editor\_name                | editor1              | Name of the editor instance                                                                                                           |
-| fai\_editor\_port                | 8080                 | HTTP port of the editor instance                                                                                                      |
-| fai\_editor\_shutdown            | 8005                 | Shutdown port of the editor instance                                                                                                  |
-| fai\_enabled                     | 0                    | Whether or not to run ece-install in FAI mode                                                                                         |
-| fai\_monitoring\_server\_install | 0                    | Install the monitoring server profile.                                                                                                |
-| fai\_monitoring\_server\_ip      | 127.0.0.1            | The IP of the monitoring server.                                                                                                      |
-| fai\_presentation\_conf\_archive | ""                   | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
-| fai\_presentation\_ear           | ""                   | EAR to use instead of the Escenic binaries                                                                                            |
-| fai\_presentation\_install       | 0                    | Install the presentation server profile                                                                                               |
-| fai\_presentation\_name          | web1                 | Name of the presentation server instance                                                                                              |
-| fai\_presentation\_port          | 8080                 | HTTP port of the presentation server instance                                                                                         |
-| fai\_presentation\_shutdown      | 8005                 | Shutdown port of the presentation instance                                                                                            |
-| fai\_public\_host\_name          | ${HOSTNAME}:8080     | The public address for your website                                                                                                   |
-| fai\_publication\_create         | 0                    | Create a new publication                                                                                                              |
-| fai\_publication\_name           | mypub                | Name of the publication                                                                                                               |
-| fai\_publication\_use\_instance  | dev1                 | Name of local instance to use for creation                                                                                            |
-| fai\_publication\_war            | "WF or ECE demo WAR" | WAR to base the new publication on                                                                                                 |
-| fai\_publication\_war\_uri\_list | ""                   | Publication WARs used for setting up Assembly tool. Supported: http[s]://tmp.com/mypub.war, file:///tmp/mypub.war and /tmp/mypub.war. |
-| fai\_rmi\_install                | 0                    | Install RMI hub profile                                                                                                               |
-| fai\_search\_conf\_archive       | ""                   | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
-| fai\_search\_ear                 | ""                   | EAR to use instead of the Escenic binaries                                                                                            |
-| fai\_search\_name                | search1              | Name of the search instance                                                                                                           |
-| fai\_search\_port                | 8080                 | HTTP port of the search instance                                                                                                      |
-| fai\_search\_shutdown            | 8005                 | Shutdown port of the search instance                                                                                                  |
-| fai\_wf\_install                 | 0                    | Install Widget Framework profile                                                                                                      |
+| fai\_db\_port                    |                 3306 | Useful for editor & presentation profiles                                                                                             |
+| fai\_db\_schema                  |               ece5db | Useful for DB installation profile                                                                                                    |
+| fai\_db\_user                    |             ece5user | Useful for DB installation profile                                                                                                    |
+| fai\_editor\_conf\_archive       |                   "" | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
+| fai\_editor\_ear                 |                   "" | EAR to use instead of the Escenic binaries                                                                                            |
+| fai\_editor\_install             |                    0 | Install the editorial profile                                                                                                         |
+| fai\_editor\_name                |              editor1 | Name of the editor instance                                                                                                           |
+| fai\_editor\_port                |                 8080 | HTTP port of the editor instance                                                                                                      |
+| fai\_editor\_shutdown            |                 8005 | Shutdown port of the editor instance                                                                                                  |
+| fai\_enabled                     |                    0 | Whether or not to run ece-install in FAI mode                                                                                         |
+| fai\_monitoring\_server\_install |                    0 | Install the monitoring server profile.                                                                                                |
+| fai\_monitoring\_server\_ip      |            127.0.0.1 | The IP of the monitoring server.                                                                                                      |
+| fai\_presentation\_conf\_archive |                   "" | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
+| fai\_presentation\_ear           |                   "" | EAR to use instead of the Escenic binaries                                                                                            |
+| fai\_presentation\_install       |                    0 | Install the presentation server profile                                                                                               |
+| fai\_presentation\_name          |                 web1 | Name of the presentation server instance                                                                                              |
+| fai\_presentation\_port          |                 8080 | HTTP port of the presentation server instance                                                                                         |
+| fai\_presentation\_shutdown      |                 8005 | Shutdown port of the presentation instance                                                                                            |
+| fai\_public\_host\_name          |     ${HOSTNAME}:8080 | The public address for your website                                                                                                   |
+| fai\_publication\_create         |                    0 | Create a new publication                                                                                                              |
+| fai\_publication\_name           |                mypub | Name of the publication                                                                                                               |
+| fai\_publication\_use\_instance  |                 dev1 | Name of local instance to use for creation                                                                                            |
+| fai\_publication\_war            | "WF or ECE demo WAR" | WAR to base the new publication on                                                                                                    |
+| fai\_publication\_war\_uri\_list |                   "" | Publication WARs used for setting up Assembly tool. Supported: http[s]://tmp.com/mypub.war, file:///tmp/mypub.war and /tmp/mypub.war. |
+| fai\_rmi\_install                |                    0 | Install RMI hub profile                                                                                                               |
+| fai\_search\_conf\_archive       |                   "" | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
+| fai\_search\_ear                 |                   "" | EAR to use instead of the Escenic binaries                                                                                            |
+| fai\_search\_install             |                    0 | Install the search server profile (Solr + indexer)                                                                                    |
+| fai\_search\_name                |              search1 | Name of the search instance                                                                                                           |
+| fai\_search\_port                |                 8080 | HTTP port of the search instance                                                                                                      |
+| fai\_search\_shutdown            |                 8005 | Shutdown port of the search instance                                                                                                  |
+| fai\_wf\_install                 |                    0 | Install Widget Framework profile                                                                                                      |
 |----------------------------------+----------------------+---------------------------------------------------------------------------------------------------------------------------------------|
 
 As you've probably have guessed, 0 means "false" and 1 means "true" :-)

From 11bcfd229ec4e0ca25ec0ec96ebe4949bcc11c64 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 19 Jan 2012 20:31:14 +0800
Subject: [PATCH 0224/2585] - implemented run_hook, adding the possibility to
 plugin in hooks at   different places in ece-install.

  The default location for ece-install scripts is $HOME/ece-scripts.d
  of the root user.

  The hook names are inspired by the Debian package scripts:

  * <ece-install method>.preinst  (pre install)
  * <ece-install method>.postinst (post install)

- added two hooks:

  * install_analysis_server.preinst
  * install_analysis_server.postinst

- first implementation of EAE profile. The ece-install.conf option
  fai_analysis_install=1 is now available, together with _host and
  _port.

  This profile will configure the EAE Reporter with the values from
  fai_analysis_host and fai_analysis_port, with localhost and 8080 as
  faill backs.
---
 usr/sbin/ece-install | 79 +++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 75 insertions(+), 4 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index b8d98329..121b0613 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -21,8 +21,8 @@ ece_user=escenic
 ece_group=escenic
 jdbc_driver=/usr/share/java/mysql.jar
 debug=0
-tomcat_download=http://apache.stu.edu.tw/tomcat/tomcat-6/v6.0.33/bin/apache-tomcat-6.0.33.tar.gz
-
+tomcat_download=http://ftp.mirror.tw/pub/apache/tomcat/tomcat-6/v6.0.35/bin/apache-tomcat-6.0.35.tar.gz
+                
 # These variables govern where software is installed and data and run
 # time files are written.
 escenic_root_dir=/opt/escenic
@@ -36,6 +36,7 @@ escenic_cache_dir=/var/cache/escenic
 escenic_crash_dir=/var/crash/escenic
 appserver_root_dir=/opt
 
+# country code for selecting the correct (APT) mirror.
 mirror_country_suffix=jp
 
 # The script will install the sun-java6-jdk package on Debian based
@@ -55,6 +56,10 @@ wget_opts="--continue --inet4-only --quiet"
 apt_opts="--no-install-recommends"
 curl_opts="--silent"
 
+# hook scripts
+ece_install_scripts_dir=$HOME/ece-install.d
+
+
 # globals will be set to correct values in run-time.
 appserver_port=8080
 on_debian_or_derivative=0
@@ -184,6 +189,7 @@ PROFILE_WIDGET_FRAMEWORK=8
 PROFILE_CREATE_PUBLICATION=9
 PROFILE_MONITORING_SERVER=10
 PROFILE_RESTORE_FROM_BACKUP=11
+PROFILE_ANALYSIS_SERVER=12
 
 function make_dir()
 {
@@ -849,7 +855,7 @@ function get_escaped_bash_string()
     echo $result
 }
 
-function set_up_app_server
+function set_up_app_server()
 {
     print_and_log "Setting up the application server ..."
 
@@ -874,6 +880,9 @@ function set_up_app_server
         elif [ $install_profile_number -eq $PROFILE_SEARCH_SERVER ]; then
             appserver_port=$(get_conf_value fai_search_port)
             shutdown_port=$(get_conf_value fai_search_shutdown)
+        elif [ $install_profile_number -eq $PROFILE_ANALYSIS_SERVER ]; then
+            appserver_port=$(get_conf_value fai_analysis_port)
+            shutdown_port=$(get_conf_value fai_analysis_shutdown)
         fi
     fi
 
@@ -1983,7 +1992,11 @@ function install_ece_instance()
     fi
 
     set_correct_permissions
-    assemble_deploy_and_restart_type
+
+    if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER ]; then
+        assemble_deploy_and_restart_type
+    fi
+    
     update_type_instances_to_start_up
     set_conf_file_value ece_unix_user $ece_user /etc/default/ece
     set_conf_file_value ece_unix_group $ece_group /etc/default/ece
@@ -2101,6 +2114,58 @@ function install_editorial_server()
     install_ece_instance "editor1" 0
 }
 
+function run_hook()
+{
+    if [ -e $ece_install_scripts_dir -a \
+        ${ece_install_scripts_dir}/{$1} ]; then
+        print_and_log "Started hook  $1 ..."
+        bash ${ece_install_scripts_dir}/${1}
+        print_and_log "Finished hook $1 ..."
+    fi
+}
+
+function install_analysis_server()
+{
+    run_hook install_analysis_server.preinst
+    
+    print_and_log "Installing an analysis server on $HOSTNAME ..."
+    type=analysis
+    
+    install_ece_instance "analysis1"
+
+    run cp ${escenic_root_dir}/analysis-engine-*/wars/*.war \
+        ${tomcat_base}/webapps
+
+    local analysis_host=localhost
+    if [ -n "${fai_analysis_host}" ]; then
+        analysis_host=${fai_analysis_host}
+    fi
+    
+    
+    # deploy the EAE WARs
+    run cp ${escenic_root_dir}/analysis-engine-*/wars/*.war \
+        ${tomcat_base}/webapps
+
+    local ece_command="ece -i ${instance_name} -t ${type} start"
+    su - $ece_user -c "$ece_command" \
+        1>>$log 2>>$log
+    exit_on_error "su - $ece_user -c \"$ece_command\""
+
+    local seconds=3
+    print_and_log "Waiting ${seconds} seconds for EAE to come up ..."
+    sleep 10
+    
+    # set QS host:port in EAE Reports
+    print_and_log "Configuring EAE Reports ..."
+    local file=${tomcat_base}/webapps/analysis-reports/WEB-INF/config/reports.cfg
+    sed -i "s#host:port#${analysis_host}:${appserver_port}#g" $file \
+        1>>$log 2>>$log
+    exit_on_error "Configuring EAE Reports in $file"
+    
+    run touch ${tomcat_base}/webapps/analysis-reports/WEB-INF/web.xml
+    run_hook install_analysis_server.postinst
+}
+
 function install_rmi_hub()
 {
     make_dir $escenic_conf_dir/rmi-hub
@@ -2888,6 +2953,12 @@ if [ $fai_enabled -eq 1 ]; then
         install_rmi_hub
         no_fai_profile=0
     fi
+
+    if [ $(get_boolean_conf_value fai_analysis_install) -eq 1 ]; then
+        install_profile_number=$PROFILE_ANALYSIS_SERVER
+        install_analysis_server
+        no_fai_profile=0
+    fi
     
     if [ $no_fai_profile -eq 1 ]; then
         print_and_log "No install profile selected, be sure to have one of the "

From 77500d7cba2c45165d131540cffbcf441ddb76f3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 20 Jan 2012 11:03:33 +0800
Subject: [PATCH 0225/2585] - with with -> with

---
 usr/bin/ece | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index ed3dc60b..ebb3e0b1 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -1099,7 +1099,7 @@ EOF
             if [[ -x /usr/bin/alien && -x /usr/bin/fakeroot ]]; then
                 run fakeroot alien --to-rpm --scripts ${deb_package}
                 mv *.rpm ${cache_dir}
-                print "RPM package of your $instance $type instance with with build"
+                print "RPM package of your $instance $type instance with build"
                 print "version $version is now available:"
                 print $(echo /var/cache/escenic/${package_name}-${version}*.rpm)
             fi

From 9e00bee71768311277a6fda59cf4fb4394b5cdfb Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 20 Jan 2012 11:35:13 +0800
Subject: [PATCH 0226/2585] - argh! webapp white list contained escenic_admin
 instead of escenic-admin.

---
 usr/sbin/ece-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 121b0613..0041d0c6 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -2013,7 +2013,7 @@ function install_ece_instance()
 
 function get_deploy_white_list()
 {
-    local white_list="escenic_admin"
+    local white_list="escenic-admin"
     if [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER \
         -a -n "${publication_name}" ]; then
         white_list="${white_list} ${publication_name} "

From c8f057b9812dc09a6a636cc9ea4874d6e3e0d960 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 20 Jan 2012 12:11:05 +0800
Subject: [PATCH 0227/2585] - optimisation in set_correct_permissions, when
 setting the   permissions of the escenic_data_dir, it will now check if the
 root   directory has correct permissions and if yes, skip all its child  
 directories.

  This is because existing multimedia archives normally will be
  several GBs and the script will hence linger unnecessarily long on
  this step - even though it's strictly speaking "more correct" to do
  this thoroughly.
---
 usr/sbin/ece-install | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 0041d0c6..3c56ce39 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -1138,10 +1138,24 @@ function set_correct_permissions()
     print_and_log "Setting correct permissions on ECE related directories ..."
 
     for el in $engine_dir_list; do
-        if [ -d $el ]; then
-            run chown -R ${ece_user}:${ece_group} $el \
-                1>>$log 2>>$log                
+        if [ ! -d $el ]; then
+            continue
         fi
+        
+        if [ ${el} = ${escenic_data_dir} ]; then
+            local correct_permission=$(find ${el} \
+                -maxdepth 0 \
+                -user ${ece_user} | \
+                wc -l)
+            if [ $correct_permission -gt 0 ]; then
+                print_and_log "Data directory root, $el,"
+                print_and_log "has correct permissions, skiping sub directories."
+                continue
+            fi
+        fi
+
+        run chown -R ${ece_user}:${ece_group} $el \
+            1>>$log 2>>$log                
     done
     
     if [ -d "$tomcat_base" ]; then

From 7807c6a6e0670fe9aac47cc59e30f250df18146e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 20 Jan 2012 19:10:32 +0800
Subject: [PATCH 0228/2585] - moved set_correct_permissions to two places &
 removed the old   places: it's now called inside
 assemble_deploy_and_restart_type   which is where it's really needed during
 the course of the   ece-install life span.

  The second place is in common_post_install

- applied patch by Stefan Norman:

  * new method is_using_conf_archive
  * renamed is_installing_from_archives to is_installing_from_ear
  * this is to make use of the passed configuration bundle without
    also having to use an EAR
  * added LDAP support:

    Note: if this is the only thing which will allow ece-install to
    work on ECE 5.2, I'll keep it. If there will be others, I'll
    remove it as I don't want the script to more than necessary and
    it's really scoped for ECE 5.3 and up.
---
 usr/sbin/ece-install | 41 ++++++++++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 3c56ce39..df77b83c 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -162,7 +162,7 @@ function is_number()
 
 technet_download_list="
 http://technet.escenic.com/downloads/assemblytool-2.0.2.zip
-http://technet.escenic.com/downloads/release/53/analysis-engine-2.3.6.0.zip
+http://technet.escenic.com/downloads/release/53/analysis-engine-2.3.7.0.zip
 http://technet.escenic.com/downloads/release/53/community-engine-3.6.1.0.zip
 http://technet.escenic.com/downloads/release/53/dashboard-1.0.0.0.zip
 http://technet.escenic.com/downloads/release/53/engine-5.3.4.7.zip
@@ -587,7 +587,7 @@ function set_up_basic_nursery_configuration()
 
     local escenic_root_dir=$escenic_root_dir
     
-    if [ $(is_installing_from_archives) -eq 1 ]; then
+    if [ $(is_using_conf_archive) -eq 1 ]; then
         print_and_log "Using the supplied Nursery & JAAS configuration from" 
         print_and_log "bundle: $ece_instance_conf_archive"
         local dir=$(mktemp -d)
@@ -631,6 +631,10 @@ function set_up_basic_nursery_configuration()
 databaseProductName=MySQL
 filePublicationRoot=$escenic_data_dir/engine/
 webPublicationRoot=http://${public_host_name}/
+
+# These two LDAP settings can be ignored on systems with ECE >= 5.3
+ldapProductName=OpenLdap
+ldapProductVersion=2.2.26
 EOF
     cat > $common_nursery_dir/neo/io/managers/ContentManager.properties <<EOF
 readConnector=/connector/ReadConnector
@@ -1928,16 +1932,27 @@ function set_archive_files_depending_on_profile()
 
 
 # Returns 1 if we're installing the ECE instances from a provided EAR
-# file and tarball with Nursery & JAAS configuration.
-#
-function is_installing_from_archives()
+# file
+function is_installing_from_ear()
 {
     log install_profile_number=$install_profile_number
     log ece_instance_ear_file=$ece_instance_ear_file
-    log ece_instance_conf_archive=$ece_instance_conf_archive
 
     if [[ -z "$ece_instance_ear_file" || \
-        -z "$ece_instance_conf_archive" || \
+        $fai_enabled -eq 0 ]]; then
+        echo 0
+        return
+    fi
+
+    echo 1
+}
+
+# Returns 1 if we're using a tarball with the Nursery & JAAS configuration.
+function is_using_conf_archive(){
+    log install_profile_number=$install_profile_number
+    log ece_instance_conf_archive=$ece_instance_conf_archive
+
+    if [[ -z "$ece_instance_conf_archive" || \
         $fai_enabled -eq 0 ]]; then
         echo 0
         return
@@ -1977,7 +1992,7 @@ function install_ece_instance()
     
     # most likely, the user is _not_ installing from archives (EAR +
     # configuration bundle), hence the false test goes first.
-    if [ $(is_installing_from_archives) -eq 0 ]; then
+    if [ $(is_installing_from_ear) -eq 0 ]; then
         download_escenic_components
         check_for_required_downloads
         set_up_engine_and_plugins
@@ -2005,8 +2020,6 @@ function install_ece_instance()
             $file
     fi
 
-    set_correct_permissions
-
     if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER ]; then
         assemble_deploy_and_restart_type
     fi
@@ -2059,9 +2072,11 @@ function install_presentation_server()
 function assemble_deploy_and_restart_type()
 {
     print_and_log "Assembling, deploying & starting $instance_name ..."
+    
+    set_correct_permissions
 
     ece_command="ece -i $instance_name -t $type assemble deploy restart"
-    if [ $(is_installing_from_archives) -eq 1 ]; then
+    if [ $(is_installing_from_ear) -eq 1 ]; then
         run cp $ece_instance_ear_file $escenic_cache_dir/engine.ear
         ece_command="ece -i $instance_name -t $type deploy restart"
         print_and_log "Using the supplied EAR instead of running an assembly."
@@ -2849,8 +2864,6 @@ function restore_from_backup()
                 run chown -R ${ece_user}:${ece_group} ${directories}
             fi
         fi
-        
-        set_correct_permissions
     fi
 }
 
@@ -2869,6 +2882,8 @@ function common_post_install()
         install_munin_node
     fi
 
+    set_correct_permissions
+    
     print_status_and_next_steps
     rm $pid_file
 }

From 28700f71a3ef61baff1a892ad95f8755ff02d8da Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 20 Jan 2012 19:29:51 +0800
Subject: [PATCH 0229/2585] - added print_and_log - made use of run when moving
 RPM files, this makes it easier to spot   bugs in "ece package"

---
 usr/bin/ece | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index ebb3e0b1..de6da17d 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -105,6 +105,12 @@ function log()
     echo "$id" `date` $@ 2>/dev/null >> $log_file 
 }
 
+function print_and_log()
+{
+    print "$@"
+    log "$@"
+}
+
 function verify_that_directory_and_file_are_writeable()
 {
     dir=`dirname $1`
@@ -454,7 +460,8 @@ function deploy()
 {
     ear=$cache_dir/engine.ear
     if [ ! -e $ear ]; then
-        print "$ear does not exist. Did you run '"`basename $0`" assemble'?"
+        print_and_log "$ear does not exist. "
+        print_and_log "Did you run '"`basename $0`" -i" $instance "assemble'?"
         exit 1
     fi
     
@@ -1000,7 +1007,8 @@ function create_packages()
 {
     local ear=$cache_dir/engine.ear
     if [ ! -e $ear ]; then
-        print "$ear does not exist. Did you run '"`basename $0`" assemble'?"
+        print_and_log "$ear does not exist. "
+        print_and_log "Did you run '"`basename $0`" -i" $instance "assemble'?"
         exit 1
     fi
 
@@ -1098,7 +1106,7 @@ EOF
             
             if [[ -x /usr/bin/alien && -x /usr/bin/fakeroot ]]; then
                 run fakeroot alien --to-rpm --scripts ${deb_package}
-                mv *.rpm ${cache_dir}
+                run mv *.rpm ${cache_dir}
                 print "RPM package of your $instance $type instance with build"
                 print "version $version is now available:"
                 print $(echo /var/cache/escenic/${package_name}-${version}*.rpm)

From 1a228ac177491b1b1d427322ced631ccc4038a2b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 23 Jan 2012 16:57:36 +0800
Subject: [PATCH 0230/2585] - now running the "clean" ece target in  
 assemble_deploy_and_restart_type, this should fix problems with   profiles
 getting WARs and libraries from the previous run of   installing a profile.

  This is only an issue when running multiple installation profiles in
  the same ece-install process.
---
 usr/sbin/ece-install | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index df77b83c..0c869369 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -2075,7 +2075,9 @@ function assemble_deploy_and_restart_type()
     
     set_correct_permissions
 
-    ece_command="ece -i $instance_name -t $type assemble deploy restart"
+    # need to run clean here since we might be running multiple
+    # profiles in the same ece-install process.
+    ece_command="ece -i $instance_name -t $type clean assemble deploy restart"
     if [ $(is_installing_from_ear) -eq 1 ]; then
         run cp $ece_instance_ear_file $escenic_cache_dir/engine.ear
         ece_command="ece -i $instance_name -t $type deploy restart"

From 99c619612527772b597e88dcb5613c3e8b928b79 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 23 Jan 2012 17:12:41 +0800
Subject: [PATCH 0231/2585] - hooks can now pick up ece-install member
 variables by looking in   $escenic_cache_dir/ece-install.env - fixed bug in
 run_hook where the desired hook wasn't evaluated   properly.

---
 usr/sbin/ece-install | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 0c869369..e4ed8252 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -58,7 +58,7 @@ curl_opts="--silent"
 
 # hook scripts
 ece_install_scripts_dir=$HOME/ece-install.d
-
+ece_install_env=${escenic_cache_dir}/$(basename $0).env
 
 # globals will be set to correct values in run-time.
 appserver_port=8080
@@ -2148,7 +2148,15 @@ function install_editorial_server()
 function run_hook()
 {
     if [ -e $ece_install_scripts_dir -a \
-        ${ece_install_scripts_dir}/{$1} ]; then
+        -e ${ece_install_scripts_dir}/${1} ]; then
+
+        # Dumping all set variables (no functions) to a file from
+        # which the hooks can pick them up. We do this to avoid
+        # running "export" in front of all local variables which may
+        # or may not be useful. Furthermore, we filter out upper case
+        # variables as these are environment variables.
+        set | grep ^[a-z] | grep \= > ${ece_install_env}
+        
         print_and_log "Started hook  $1 ..."
         bash ${ece_install_scripts_dir}/${1}
         print_and_log "Finished hook $1 ..."

From 4ffe3c3e2259631d50533854aac53abf19ec1d59 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 23 Jan 2012 19:50:30 +0800
Subject: [PATCH 0232/2585] - added JNDI configuration based on installation
 profile, currently   switching on EAE and the rest (either or) - added
 set_correct_permissions to install_analysis_server. - sets a number of best
 practice defaults in the EAE reports.cfg and   logger.cfg configuration
 files. - added global appserver_host, just like we already have _port - added
 hack to set_conf_file_value, dont_quote_conf_values=1, since   EAE isn't able
 to handle quoted values in its .cfg files (!)

---
 usr/sbin/ece-install | 187 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 153 insertions(+), 34 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index e4ed8252..2a0e601c 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -61,6 +61,7 @@ ece_install_scripts_dir=$HOME/ece-install.d
 ece_install_env=${escenic_cache_dir}/$(basename $0).env
 
 # globals will be set to correct values in run-time.
+appserver_host=localhost
 appserver_port=8080
 on_debian_or_derivative=0
 on_debian=0
@@ -729,6 +730,11 @@ org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localh
 EOF
 }
 
+# don't quote values when setting conf file values with
+# set_conf_file_value. This is a hack-ish variable due to EAE's
+# handling of .cfg files.
+dont_quote_conf_values=0
+
 # Parameters:
 # $1 is the property
 # $2 ... to the (last - 1) is the value
@@ -739,7 +745,6 @@ EOF
 #   mykey \
 #   myvalue1 myvalue2 myvalue3 \
 #   /etc/myfile.conf
-
 function set_conf_file_value()
 {
     if [ $# -lt 3 ]; then
@@ -750,15 +755,34 @@ function set_conf_file_value()
     local key=${@:1:1}
     local value_end_index=$(( $# - 2 ))
     local value=${@:2:${value_end_index}}
+
+    local parent_dir=$(dirname $file)
+    if [ ! -d ${parent_dir} ]; then
+        print ${parent_dir} "doesn't exist, something is wrong :-("
+        remove_pid_and_exit_in_error
+    fi
     
     if [ -r $file ]; then
         if [ $(grep ^$1 $file | wc -l) -gt 0 ]; then
-            sed -i "s~$key=.*~$key=\"$value\"~g" $file
+            if [ $dont_quote_conf_values -eq 0 ]; then
+                sed -i "s~$key=.*~$key=\"$value\"~g" $file
+            else
+                sed -i "s~$key=.*~$key=$value~g" $file
+            fi    
         else
-            echo "$key=\"$value\"" >> $file
+            if [ $dont_quote_conf_values -eq 0 ]; then
+                echo "$key=\"$value\"" >> $file
+            else
+                echo "$key=$value" >> $file
+            fi
+            
         fi
     else
-        echo "$key=\"$value\"" >> $file
+        if [ $dont_quote_conf_values -eq 0 ]; then
+            echo "$key=\"$value\"" >> $file
+        else
+            echo "$key=$value" >> $file
+        fi
     fi
 }
 
@@ -991,7 +1015,11 @@ function set_up_app_server()
               type="org.apache.catalina.UserDatabase"
               description="User database that can be updated and saved"
               factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
-              pathname="conf/tomcat-users.xml" />
+              pathname="conf/tomcat-users.xml"
+    />
+EOF
+    if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER ]; then
+        cat >> $tomcat_base/conf/server.xml <<EOF
     <Resource
         name="jdbc/ECE_READ_DS"
         auth="Container"
@@ -1003,8 +1031,7 @@ function set_up_app_server()
         username="${db_user}"
         password="${db_password}"
         driverClassName="com.mysql.jdbc.Driver"
-
-url="jdbc:mysql://${db_host}:${db_port}/${db_schema}?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;characterSetResults=UTF-8"
+        url="jdbc:mysql://${db_host}:${db_port}/${db_schema}?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;characterSetResults=UTF-8"
         removeAbandoned="true"
         removeAbandonedTimeout="120"
         logAbandoned="true"
@@ -1015,7 +1042,7 @@ url="jdbc:mysql://${db_host}:${db_port}/${db_schema}?autoReconnect=true&amp;useU
         minEvictableIdleTimeMillis="30000"
         testWhileIdle="true"
         validationQuery="select now()"
-        />
+    />
     <Resource
         name="jdbc/ECE_UPDATE_DS"
         auth="Container"
@@ -1038,7 +1065,60 @@ url="jdbc:mysql://${db_host}:${db_port}/${db_schema}?autoReconnect=true&amp;useU
         minEvictableIdleTimeMillis="30000"
         testWhileIdle="true"
         validationQuery="select now()"
-        />
+    />
+EOF
+    else
+        cat >> $tomcat_base/conf/server.xml <<EOF
+    <Resource
+        name="jdbc/eae-qs/qs"
+        auth="Container"
+        type="javax.sql.DataSource"
+        maxActive="400"
+        maxIdle="8"
+        maxWait="2000"
+        initialSize="20"
+        username="${db_user}"
+        password="${db_password}"
+        driverClassName="com.mysql.jdbc.Driver"
+        url="jdbc:mysql://${db_host}:${db_port}/${db_schema}?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;characterSetResults=UTF-8"
+        removeAbandoned="true"
+        removeAbandonedTimeout="120"
+        logAbandoned="true"
+        testOnBorrow="false"
+        testOnReturn="false"
+        timeBetweenEvictionRunsMillis="60000"
+        numTestsPerEvictionRun="5"
+        minEvictableIdleTimeMillis="30000"
+        testWhileIdle="true"
+        validationQuery="select now()"
+    />
+    <Resource
+        name="jdbc/eae-logger/logger"
+        auth="Container"
+        type="javax.sql.DataSource"
+        maxActive="100"
+        maxIdle="8"
+        maxWait="2000"
+        initialSize="20"
+        username="${db_user}"
+        password="${db_password}"
+        driverClassName="com.mysql.jdbc.Driver"
+        url="jdbc:mysql://${db_host}:${db_port}/${db_schema}?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;characterSetResults=UTF-8"
+        removeAbandoned="true"
+        removeAbandonedTimeout="120"
+        logAbandoned="true"
+        testOnBorrow="false"
+        testOnReturn="false"
+        timeBetweenEvictionRunsMillis="60000"
+        numTestsPerEvictionRun="5"
+        minEvictableIdleTimeMillis="30000"
+        testWhileIdle="true"
+        validationQuery="select now()"
+    />
+EOF
+    fi
+    
+    cat >> $tomcat_base/conf/server.xml <<EOF
   </GlobalNamingResources>
 
   <Service name="Catalina">
@@ -1047,7 +1127,8 @@ url="jdbc:mysql://${db_host}:${db_port}/${db_schema}?autoReconnect=true&amp;useU
                connectionTimeout="20000" 
                URIEncoding="UTF-8"
                compression="on"
-               redirectPort="8543" />
+               redirectPort="8543"
+    />
     <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
       <Valve className="org.apache.catalina.valves.AccessLogValve"
              prefix="access."
@@ -1072,50 +1153,67 @@ EOF
 <Context>
 
   <WatchedResource>WEB-INF/web.xml</WatchedResource>
+EOF
 
+    if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER ]; then
+        cat >> $tomcat_base/conf/context.xml <<EOF
   <ResourceLink
       global="jdbc/ECE_READ_DS"
       name="jdbc/ECE_READ_DS"
-      type="javax.sql.DataSource"/>
-  
+      type="javax.sql.DataSource"
+  />
   <ResourceLink
       global="jdbc/ECE_UPDATE_DS"
       name="jdbc/ECE_UPDATE_DS"
-      type="javax.sql.DataSource"/>
-  
+      type="javax.sql.DataSource"
+  />
   <Environment
       name="escenic/indexer-webservice"
-      value="http://localhost:${appserver_port}/indexer-webservice/index/"
+      value="http://${search_host}:${search_port}/indexer-webservice/index/"
       type="java.lang.String"
-      override="false"/>
-
+      override="false"
+  />
   <Environment
       name="escenic/index-update-uri"
       value="http://${search_host}:${search_port}/solr/update/"
       type="java.lang.String"
-      override="false"/>
-
+      override="false"
+  />
   <Environment
       name="escenic/solr-base-uri"
       value="http://${search_host}:${search_port}/solr/"
       type="java.lang.String"
-      override="false"/>
-
+      override="false"
+  />
   <Environment
       name="escenic/head-tail-storage-file"
       value="$escenic_data_dir/engine/head-tail.index"
       type="java.lang.String"
-      override="false"/>
-
+      override="false"
+  />
   <Environment
       name="escenic/failing-documents-storage-file"
       value="$escenic_data_dir/engine/failures.index"
       type="java.lang.String"
-      override="false"/>
-
+      override="false"
+  />
 </Context>
 EOF
-
+    else
+        cat >> $tomcat_base/conf/context.xml <<EOF
+  <ResourceLink
+      global="jdbc/eae-logger/logger"
+      name="jdbc/eae-logger/logger"
+      type="javax.sql.DataSource"
+  />
+  <ResourceLink
+      global="jdbc/eae-qs/qs"
+      name="jdbc/ECE_UPDATE_DS"
+      type="javax.sql.DataSource"
+  />
+</Context>
+EOF
+    fi
 }
 
 function create_user_and_group_if_not_present()
@@ -1411,7 +1509,7 @@ function stop_conflicting_processes()
      # TODO this is dirty
     if [[ -n "$install_profile_number" && \
         $install_profile_number -ne $PROFILE_RESTORE_FROM_BACKUP ]]; then
-        killall java 1>>$log 2>>$log
+        killall -9 java 1>>$log 2>>$log
     fi
 }
 
@@ -2175,16 +2273,19 @@ function install_analysis_server()
     run cp ${escenic_root_dir}/analysis-engine-*/wars/*.war \
         ${tomcat_base}/webapps
 
-    local analysis_host=localhost
     if [ -n "${fai_analysis_host}" ]; then
-        analysis_host=${fai_analysis_host}
+        appserver_host=${fai_analysis_host}
+    fi
+    if [ -n "${fai_analysis_port}" ]; then
+        appserver_port=${fai_analysis_port}
     fi
-    
     
     # deploy the EAE WARs
     run cp ${escenic_root_dir}/analysis-engine-*/wars/*.war \
         ${tomcat_base}/webapps
 
+    set_correct_permissions
+    
     local ece_command="ece -i ${instance_name} -t ${type} start"
     su - $ece_user -c "$ece_command" \
         1>>$log 2>>$log
@@ -2194,12 +2295,30 @@ function install_analysis_server()
     print_and_log "Waiting ${seconds} seconds for EAE to come up ..."
     sleep 10
     
-    # set QS host:port in EAE Reports
+    # EAE cannot handle .cfg files with quotes values (!)
+    dont_quote_conf_values=1
+    
     print_and_log "Configuring EAE Reports ..."
     local file=${tomcat_base}/webapps/analysis-reports/WEB-INF/config/reports.cfg
-    sed -i "s#host:port#${analysis_host}:${appserver_port}#g" $file \
-        1>>$log 2>>$log
-    exit_on_error "Configuring EAE Reports in $file"
+    set_conf_file_value queryServiceUrl \
+        http://${appserver_host}:${appserver_port}/analysis-qs/QueryService \
+        ${file}
+
+    print_and_log "Configuring EAE Logger ..."
+    local file=${tomcat_base}/webapps/analysis-logger/WEB-INF/config/logger.cfg
+    set_conf_file_value databaseQueueManager.reinsertcount \
+        6 \
+        ${file}
+    set_conf_file_value pageview.maintenance.cron.expr '0 0 4 * * ? *' $file
+    set_conf_file_value pageview.aggr.hour.cron.expr '0 10 * * * ?' $file
+    set_conf_file_value imageResponse false $file
+    set_conf_file_value pageview.maintenance.older.than.months 6 $file
+    set_conf_file_value pageview.aggr.day.older.than.days 7 $file
+    set_conf_file_value pageview.aggr.day.cron.expr '0 0 5 * * ? *' $file
+    set_conf_file_value pageview.aggr.hour.older.than.hours 2 $file
+    set_conf_file_value pageview.maintenance.older.than.days 0 $file
+
+    dont_quote_conf_values=0
     
     run touch ${tomcat_base}/webapps/analysis-reports/WEB-INF/web.xml
     run_hook install_analysis_server.postinst

From 357515d2859fb70e9d70644566b794bc981872c5 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 24 Jan 2012 18:48:28 +0800
Subject: [PATCH 0233/2585] - fixed the setting of non default configuration
 file (-f,   --conf-file). It will now correctly add PWD if the path isn't an 
  absolute one.

  The logic was there before too, but somehow it wasn't working
  (anymore).

  This fixes the problem that ece-install all of a sudden prints out
  n/a in the time elapsed string of the script identifier
  ([ece-install-n/a]) as well as returning errors whenever calling
  get_conf_value: ./ece-install: line 2381: [: [ece-install-n/a]
  ece-install-DEV.conf doesn't exist.: integer expression expected
---
 usr/sbin/ece-install | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 2a0e601c..bbfbe7af 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -3024,10 +3024,14 @@ for el in $@; do
         next_is_conf_file=1
     elif [[ -n $next_is_conf_file && $next_is_conf_file -eq 1 ]]; then
         conf_file=$el
-        if [ ! -e $conf_file ]; then
-            conf_file=$(pwd)/${conf_file}
-        fi
-
+        case ${conf_file} in
+            /*)
+                ;;
+            *)
+                conf_file=$(pwd)/${conf_file}
+                ;;
+        esac
+        
         next_is_conf_file=0
     fi
 done

From f7cb3416542fb7ed656de662c1cc5e7a3d8a901a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 24 Jan 2012 19:25:33 +0800
Subject: [PATCH 0234/2585] - added hook overview, generated by
 create_hook_overview shell script

---
 usr/share/doc/escenic/ece-install-hooks.org | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 usr/share/doc/escenic/ece-install-hooks.org

diff --git a/usr/share/doc/escenic/ece-install-hooks.org b/usr/share/doc/escenic/ece-install-hooks.org
new file mode 100644
index 00000000..1665ae0b
--- /dev/null
+++ b/usr/share/doc/escenic/ece-install-hooks.org
@@ -0,0 +1,3 @@
+
+- install_analysis_server.preinst
+- install_analysis_server.postinst

From c3d695f0fdd511990cbc9b79f7e8c4afb5ad59f3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 24 Jan 2012 19:25:44 +0800
Subject: [PATCH 0235/2585] - added

---
 .../usr/share/doc/escenic/create_hook_overview     | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 usr/local/src/debian/usr/share/doc/escenic/create_hook_overview

diff --git a/usr/local/src/debian/usr/share/doc/escenic/create_hook_overview b/usr/local/src/debian/usr/share/doc/escenic/create_hook_overview
new file mode 100644
index 00000000..b68ce6f3
--- /dev/null
+++ b/usr/local/src/debian/usr/share/doc/escenic/create_hook_overview
@@ -0,0 +1,14 @@
+#! /usr/bin/env bash
+
+dir=~/src/ece-scripts
+
+echo "" > $dir/usr/share/doc/escenic/ece-install-hooks.org
+
+grep run_hook $dir/usr/sbin/ece-install | \
+    grep -v function | \
+    awk '{print $2}' | \
+    while read l; do
+    echo "- $l" >> $dir/usr/share/doc/escenic/ece-install-hooks.org
+done
+
+

From 9d0f5ac9e901e452c5b352a689e731c5d09cba07 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 24 Jan 2012 19:26:18 +0800
Subject: [PATCH 0236/2585] - added

---
 usr/share/doc/escenic/create_hook_overview | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 usr/share/doc/escenic/create_hook_overview

diff --git a/usr/share/doc/escenic/create_hook_overview b/usr/share/doc/escenic/create_hook_overview
new file mode 100644
index 00000000..b68ce6f3
--- /dev/null
+++ b/usr/share/doc/escenic/create_hook_overview
@@ -0,0 +1,14 @@
+#! /usr/bin/env bash
+
+dir=~/src/ece-scripts
+
+echo "" > $dir/usr/share/doc/escenic/ece-install-hooks.org
+
+grep run_hook $dir/usr/sbin/ece-install | \
+    grep -v function | \
+    awk '{print $2}' | \
+    while read l; do
+    echo "- $l" >> $dir/usr/share/doc/escenic/ece-install-hooks.org
+done
+
+

From 02a523f16adead16009cd75e18ce1852e653367a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 24 Jan 2012 19:27:43 +0800
Subject: [PATCH 0237/2585] - added section on writing your own hooks

---
 usr/share/doc/escenic/ece-install-guide.org | 40 +++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index a48dc6b3..25c0ec67 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -626,6 +626,46 @@ environments on the same host. A use case is if you're setting up a
 test environment and want to separate stacks of Escenic Content Engine
 and plugins.
 
+* Extending ece-install by Writing Hooks
+ece-install  has a number of hooks on which you can hook on your own
+scripts. The scripts are to reside in $HOME/ece-conf.d/ and have names
+inspired by Debian's package scripts:
+
+#+BEGIN_SRC conf
+<hook name>.<phase>
+#+END_SRC
+
+e.g.:
+
+#+BEGIN_SRC conf
+install_analysis_server.preinst
+#+END_SRC
+
+Will be run before the body of the hook, just the corresponding
+.postinst hook will be run after.
+
+** Accessing ece-install variables
+Before running the hook, ece-install will make all its local variables
+available in /var/run/escenic/ece-install.env, which can then be used
+by the hook scripts.
+
+** Example hook
+Here is an example hook which will be run after the EAE is installed.
+
+#+BEGIN_SRC sh
+# Put this in is $HOME/ece-install.d/install_analysis_server.postinst
+
+# read ece-install's current variables
+source /var/run/escenic/ece-install.env
+
+# do something useful
+echo "Hello from $0, EAE is installed in ${tomcat_base}" > /tmp/hello.txt
+#+END_SRC
+
+** Available hooks
+Currently, the following hooks are available:
+#+INCLUDE: "ece-install-hooks.org"
+
 * Assumptions
 ** /etc/esecenic is shared
 It's assumed that the /etc/escenic directory is either on a shared

From 40e25b78c27f4b0834612ad6a0d8bf4ccb8e6225 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 24 Jan 2012 19:28:09 +0800
Subject: [PATCH 0238/2585] - changed path of .env variable file to
 escenic_run_dir

---
 usr/sbin/ece-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index bbfbe7af..1873f120 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -58,7 +58,7 @@ curl_opts="--silent"
 
 # hook scripts
 ece_install_scripts_dir=$HOME/ece-install.d
-ece_install_env=${escenic_cache_dir}/$(basename $0).env
+ece_install_env=${escenic_run_dir}/$(basename $0).env
 
 # globals will be set to correct values in run-time.
 appserver_host=localhost

From ca2b1e01e8ae9f0e469f58ab1ec8257b5f57fc11 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 25 Jan 2012 14:02:08 +0800
Subject: [PATCH 0239/2585] - added log_call_stack -
 remove_pid_and_exit_in_error now calls log_call_stack - fixed error handling
 when running script as normal user, it will now   not produce any errors
 becaues it cannot write to the run and log   files.

---
 usr/sbin/ece-install | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 1873f120..597d44bc 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -121,12 +121,26 @@ function print_and_log()
     log "$@"
 }
 
+function log_call_stack()
+{
+    log "Call stack:"
+
+    # skipping i=0 as this is log_call_stack itself
+    for ((i = 1; i < ${#FUNCNAME[@]}; i++)); do
+        echo -n  ${FUNCNAME[$i]}:${BASH_LINENO[$i-1]} " " >> $log
+        sed -n "${BASH_LINENO[$i-1]}p" $0 >> $log
+    done
+}
+
 function remove_pid_and_exit_in_error()
 {
     if [ -e $pid_file ]; then
         rm $pid_file
     fi
 
+    print "Have a look in $log for the error call stack."
+    log_call_stack
+    
     exit 1
 }
 
@@ -1700,8 +1714,8 @@ function read_user_input()
 function assert_correct_runtime_environment()
 {
     if [ $(whoami) != "root" ]; then
-        print_and_log "You must be root when running $(basename $0)"
-        remove_pid_and_exit_in_error
+        print "You must be root when running $(basename $0)"
+        exit 1
     fi
     
     if [ -e $pid_file ]; then

From 272f2dc22f9c92d9999f1c6f0aa25ae80c477c60 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 25 Jan 2012 14:27:39 +0800
Subject: [PATCH 0240/2585] - fixed problem in log_call_stack if you call
 ece-install without an   absolute path.

---
 usr/sbin/ece-install | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 597d44bc..affd571d 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -127,8 +127,12 @@ function log_call_stack()
 
     # skipping i=0 as this is log_call_stack itself
     for ((i = 1; i < ${#FUNCNAME[@]}; i++)); do
-        echo -n  ${FUNCNAME[$i]}:${BASH_LINENO[$i-1]} " " >> $log
-        sed -n "${BASH_LINENO[$i-1]}p" $0 >> $log
+        echo -n  ${0}:${BASH_LINENO[$i-1]}:"inside "${FUNCNAME[$i]}"() " >> $log
+        if [ -e $0 ]; then
+            sed -n "${BASH_LINENO[$i-1]}p" $0 >> log
+        else
+            echo "" >> $log
+        fi
     done
 }
 
@@ -138,7 +142,7 @@ function remove_pid_and_exit_in_error()
         rm $pid_file
     fi
 
-    print "Have a look in $log for the error call stack."
+    print "See $log for the error call stack."
     log_call_stack
     
     exit 1

From 2b0aa70fc8d1f1cb84e4900466e4b4750fab8db3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 25 Jan 2012 15:46:26 +0800
Subject: [PATCH 0241/2585] - used BASH_SOURCE[index] instead of $0, this makes
 the call stack   work when calling external scripts too!

---
 usr/sbin/ece-install | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index affd571d..14d25c1a 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -127,9 +127,9 @@ function log_call_stack()
 
     # skipping i=0 as this is log_call_stack itself
     for ((i = 1; i < ${#FUNCNAME[@]}; i++)); do
-        echo -n  ${0}:${BASH_LINENO[$i-1]}:"inside "${FUNCNAME[$i]}"() " >> $log
-        if [ -e $0 ]; then
-            sed -n "${BASH_LINENO[$i-1]}p" $0 >> log
+        echo -n  ${BASH_SOURCE[$i]}:${BASH_LINENO[$i-1]}:"inside "${FUNCNAME[$i]}"() " >> $log
+        if [ -e ${BASH_SOURCE[$i]} ]; then
+            sed -n "${BASH_LINENO[$i-1]}p" ${BASH_SOURCE[$i]} >> $log
         else
             echo "" >> $log
         fi

From ae8faa4fcb2f2882fad23ec8ee491d3170f8eb3e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 26 Jan 2012 11:46:14 +0800
Subject: [PATCH 0242/2585] - fai_analysis_name is now supported - changed the
 reading of the conf variables and default fallback in   ask_for_instance_name

---
 usr/sbin/ece-install | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 14d25c1a..7b65ca9f 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -127,7 +127,7 @@ function log_call_stack()
 
     # skipping i=0 as this is log_call_stack itself
     for ((i = 1; i < ${#FUNCNAME[@]}; i++)); do
-        echo -n  ${BASH_SOURCE[$i]}:${BASH_LINENO[$i-1]}:"inside "${FUNCNAME[$i]}"() " >> $log
+        echo -n  ${BASH_SOURCE[$i]}:${BASH_LINENO[$i-1]}:${FUNCNAME[$i]}"() => " >> $log
         if [ -e ${BASH_SOURCE[$i]} ]; then
             sed -n "${BASH_LINENO[$i-1]}p" ${BASH_SOURCE[$i]} >> $log
         else
@@ -1975,11 +1975,13 @@ function ask_for_instance_name()
         read instance_name
     else
         if [ $install_profile_number -eq $PROFILE_EDITORIAL_SERVER ]; then
-            instance_name=$(get_conf_value fai_editor_name)
+            instance_name=${fai_editor_name-$1}
         elif [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ]; then
-            instance_name=$(get_conf_value fai_presentation_name)
+            instance_name=${fai_presentation_name-$1}
         elif [ $install_profile_number -eq $PROFILE_SEARCH_SERVER ]; then
-            instance_name=$(get_conf_value fai_search_name)
+            instance_name=${fai_search_name-$1}
+        elif [ $install_profile_number -eq $PROFILE_ANALYSIS_SERVER ]; then
+            instance_name=${fai_analysis_name-$1}
         fi
     fi
 

From 5186698e97f0aad54db0e705ce587531e3eaa65f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 26 Jan 2012 15:15:45 +0800
Subject: [PATCH 0243/2585] - removed stop_conflicting_processes, it was a
 pretty dodgy method and   it's not *really* needed. It's better that the
 script fails than   that it's allowed to kill away.

---
 usr/sbin/ece-install | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 7b65ca9f..1fb06275 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -123,13 +123,15 @@ function print_and_log()
 
 function log_call_stack()
 {
-    log "Call stack:"
+    log "Call stack (top most is the last one, main is the first):"
 
     # skipping i=0 as this is log_call_stack itself
     for ((i = 1; i < ${#FUNCNAME[@]}; i++)); do
-        echo -n  ${BASH_SOURCE[$i]}:${BASH_LINENO[$i-1]}:${FUNCNAME[$i]}"() => " >> $log
+        echo -n  ${BASH_SOURCE[$i]}:${BASH_LINENO[$i-1]}:${FUNCNAME[$i]}"()" >> $log
         if [ -e ${BASH_SOURCE[$i]} ]; then
-            sed -n "${BASH_LINENO[$i-1]}p" ${BASH_SOURCE[$i]} >> $log
+            echo -n " => " >> $log
+            sed -n "${BASH_LINENO[$i-1]}p" ${BASH_SOURCE[$i]} | \
+                sed "s#^[ \t]*##g" >> $log
         else
             echo "" >> $log
         fi
@@ -142,7 +144,6 @@ function remove_pid_and_exit_in_error()
         rm $pid_file
     fi
 
-    print "See $log for the error call stack."
     log_call_stack
     
     exit 1
@@ -1521,16 +1522,6 @@ function un_install_ece()
     apt-get clean
 }
 
-function stop_conflicting_processes()
-{
-    print_and_log "Stopping conflicting processes ..."
-     # TODO this is dirty
-    if [[ -n "$install_profile_number" && \
-        $install_profile_number -ne $PROFILE_RESTORE_FROM_BACKUP ]]; then
-        killall -9 java 1>>$log 2>>$log
-    fi
-}
-
 function set_up_varnish()
 {
     print_and_log "Setting up Varnish to match your environment ..."
@@ -1791,7 +1782,6 @@ function common_pre_install()
     fi
 
     make_dir $download_dir
-    stop_conflicting_processes
     install_common_os_packages
     create_user_and_group_if_not_present
     set_up_user_enviornment

From e138858a1e0c490fcd8944a3f392407549b85477 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 26 Jan 2012 18:09:30 +0800
Subject: [PATCH 0244/2585] - .env never got set correctly if overriden via
 escenci_run_dir in   .conf. Fixed now.

---
 usr/sbin/ece-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 1fb06275..29bc961f 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -58,7 +58,6 @@ curl_opts="--silent"
 
 # hook scripts
 ece_install_scripts_dir=$HOME/ece-install.d
-ece_install_env=${escenic_run_dir}/$(basename $0).env
 
 # globals will be set to correct values in run-time.
 appserver_host=localhost
@@ -1756,6 +1755,7 @@ function common_pre_install()
       $escenic_run_dir
       $escenic_spool_dir/migration
     "
+    ece_install_env=${escenic_run_dir}/$(basename $0).env
 
     if [ -z "$technet_user" -o -z "$technet_password" ]; then
         print_and_log "Be sure to set technet_user and technet_password "

From a3606e4ec5383171d0d8c7bffee19941b94a5c20 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 27 Jan 2012 11:09:46 +0800
Subject: [PATCH 0245/2585] - added tmp_dir to the _required_fields list
 variables.

---
 usr/bin/ece | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/usr/bin/ece b/usr/bin/ece
index de6da17d..7a79f945 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -53,17 +53,20 @@ enable_remote_debugging
 enable_remote_monitoring
 java_home
 solr_home
+tmp_dir
 "
 
 search_required_fields="
 appserver
 java_home
 solr_home
+tmp_dir
 "
 
 analysis_required_fields="
 appserver
 java_home
+tmp_dir
 "
 ####################################################################
 # Will exit the ece execution if the last operation failed. While

From c1a1283007229fff4a4e8493323117423f380fb6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 27 Jan 2012 12:21:26 +0800
Subject: [PATCH 0246/2585] - the editor server profile deployed
 indexer-webapp, which is wrong as   long as we've got the search profile and
 "install all" profile. This   has now been fixed. - added
 get_publication_short_name_list, used by the   get_deploy_white_list when
 switching on presentation and editor   profiles.

---
 usr/sbin/ece-install | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 29bc961f..77b04593 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -2118,8 +2118,7 @@ function install_ece_instance()
     set_up_proper_logging_configuration
 
     # We set a WAR white list for all profiles except all in one
-    if [ $install_profile_number -ne $PROFILE_ALL_IN_ONE -a \
-        $install_profile_number -ne $PROFILE_EDITORIAL_SERVER ]; then
+    if [ $install_profile_number -ne $PROFILE_ALL_IN_ONE ]; then
         file=$escenic_conf_dir/ece-${instance_name}.conf
         print_and_log "Creating deployment white list in $file ..."
         set_conf_file_value \
@@ -2146,25 +2145,38 @@ function install_ece_instance()
     add_next_step "/etc/default/ece lists all instances started at boot time"
 }
 
+function get_publication_short_name_list()
+{
+    local short_name_list=""
+    
+    local publication_def_dir=${escenic_root_dir}/assemblytool/publications
+    if [ $(ls ${publication_def_dir} | grep .properties$ | wc -l) -eq 0 ]; then
+        echo ${short_name_list}
+        return
+    fi
+
+    for el in $(find ${publication_def_dir} -name "*.properties"); do
+        local short_name=$(basename $el .properties)
+        short_name_list="${short_name_list} ${short_name}"
+    done
+
+    echo ${short_name_list}
+ }
+
 function get_deploy_white_list()
 {
     local white_list="escenic-admin"
+    
     if [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER \
         -a -n "${publication_name}" ]; then
         white_list="${white_list} ${publication_name} "
     elif [ $install_profile_number -eq $PROFILE_SEARCH_SERVER ]; then 
         white_list="${white_list} solr indexer-webapp"
     elif [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ]; then
-        local publication_def_dir=${escenic_root_dir}/assemblytool/publications
-        if [ $(ls ${publication_def_dir} | grep .properties$ | wc -l) -eq 0 ]; then
-            echo ${white_list}
-            return
-        fi
-
-        for el in $(find ${publication_def_dir} -name "*.properties"); do
-            local short_name=$(basename $el .properties)
-            white_list="${white_list} ${short_name}"
-        done
+        white_list="${white_list} "$(get_publication_short_name_list)
+    elif [ $install_profile_number -eq $PROFILE_EDITORIAL_SERVER ]; then
+        white_list="${white_list} escenic studio indexer-webservice"
+        white_list="${white_list} "$(get_publication_short_name_list)
     fi
 
     echo ${white_list}

From af9d6474d29568fe55ed091428e53d99d3a92215 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Fri, 27 Jan 2012 09:58:32 +0100
Subject: [PATCH 0247/2585] Hardened by quoting some variables

---
 usr/bin/ece | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index de6da17d..382506d7 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -299,18 +299,18 @@ function set_instance_settings()
     # at this point in the script flow, we have now read all the
     # possible combinations of conf files (common, type and instance)
     # and can now ensure that required fields are set and apply them.
-    if [ $type = "rmi-hub" ]; then
+    if [ "$type" = "rmi-hub" ]; then
         ensure_that_required_fields_are_set $hub_required_fields
-    elif [ $type = "search" ]; then
+    elif [ "$type" = "search" ]; then
         ensure_that_required_fields_are_set $search_required_fields
-    elif [ $type = "engine" ]; then
+    elif [ "$type" = "engine" ]; then
         ensure_that_required_fields_are_set $engine_required_fields
     fi
 
     # We respect ece_server if it's set in any of the configuration
     # files. If it's not set there, it sets some sensible defaults.
-    if [ -z $ece_server ]; then
-        if [ $instance = "default" ]; then
+    if [ -z "$ece_server" ]; then
+        if [ "$instance" = "default" ]; then
             ece_server=${HOSTNAME}
         else
             ece_server=${HOSTNAME}-${instance}
@@ -320,7 +320,7 @@ function set_instance_settings()
     set_type_pid
    
     # if type is rmi-hub, we don't' need more configuration.
-    if [ $type = "rmi-hub" ]; then
+    if [ "$type" = "rmi-hub" ]; then
         return
     fi
 

From 4d2cda07139423f83dc4af9550aedd7b4635f4ad Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Fri, 27 Jan 2012 10:07:33 +0100
Subject: [PATCH 0248/2585] Cleanup

---
 usr/bin/ece | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 382506d7..877ce04a 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -1333,7 +1333,7 @@ function set_type_command_and_instance()
 
 function clean_up()
 {
-    if [ $type = "engine" ]; then
+    if [ "$type" == "engine" ]; then
         print "Cleaning up generated files in $assemblytool_home ..." 
         run cd $assemblytool_home
         run ant clean

From a59effed550c0678b7a48785b8ca0c1f896c4f36 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Fri, 27 Jan 2012 10:43:06 +0100
Subject: [PATCH 0249/2585] Hardening: variables in if tests escaped with
 quotes. Style: single = replaced with double ==.

---
 usr/bin/ece | 160 ++++++++++++++++++++++++++--------------------------
 1 file changed, 80 insertions(+), 80 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 877ce04a..fdb90f81 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -88,14 +88,14 @@ function run()
 ####################################################################
 function debug()
 {
-    if [ $verbose -eq 1 ]; then
+    if [ "$verbose" -eq 1 ]; then
         print $@
     fi
 }
 
 function print()
 {
-    if [ $quiet -eq 0 ]; then
+    if [ "$quiet" -eq 0 ]; then
         echo "$id" $@
     fi
 }
@@ -151,7 +151,7 @@ function ensure_that_required_fields_are_set()
         requirements_failed=1
     done
 
-    if [ $requirements_failed -eq 1 ]; then
+    if [ "$requirements_failed" -eq 1 ]; then
         exit 1
     fi
 }
@@ -206,7 +206,7 @@ function set_common_settings()
     # instance specific ones.
     read_conf_file `basename $0`.conf
 
-    if [ $instance = "default" ]; then
+    if [ "$instance" == "default" ]; then
         log_file=$log_dir/$type.out
         pid_file=$pid_dir/$type.pid
     else
@@ -235,7 +235,7 @@ function set_type_settings()
 
 function set_type_pid()
 {
-    if [ $(uname) = "Linux" ]; then
+    if [ "$(uname)" == "Linux" ]; then
         ps_options="auxww"
     else
         ps_options="-ef"
@@ -244,7 +244,7 @@ function set_type_pid()
     # Get a hold of the PID of the process. Although we've got the PID
     # file, we stil get the PID from the OS here as we used it for
     # sanity checking later on, see stop_type().
-    if [ $type = "rmi-hub" ]; then
+    if [ "$type" == "rmi-hub" ]; then
         # we need to be able to differentiate between an ECE instance
         # and an rmi hub, for this we use java.security.policy which
         # the hub doesn't have.
@@ -265,7 +265,7 @@ function set_type_port()
     if [ -n "${appserver_port}" ]; then
         port=${appserver_port}
         debug "appserver_port set in .conf files=${port}"
-    elif [ $appserver != "tomcat" ]; then
+    elif [ "$appserver" != "tomcat" ]; then
         debug "Only tomcat is supported for reading host/port right now, "
         debug "trying to make an educated guess"
         port=8080
@@ -299,18 +299,18 @@ function set_instance_settings()
     # at this point in the script flow, we have now read all the
     # possible combinations of conf files (common, type and instance)
     # and can now ensure that required fields are set and apply them.
-    if [ "$type" = "rmi-hub" ]; then
+    if [ "$type" == "rmi-hub" ]; then
         ensure_that_required_fields_are_set $hub_required_fields
-    elif [ "$type" = "search" ]; then
+    elif [ "$type" == "search" ]; then
         ensure_that_required_fields_are_set $search_required_fields
-    elif [ "$type" = "engine" ]; then
+    elif [ "$type" == "engine" ]; then
         ensure_that_required_fields_are_set $engine_required_fields
     fi
 
     # We respect ece_server if it's set in any of the configuration
     # files. If it's not set there, it sets some sensible defaults.
     if [ -z "$ece_server" ]; then
-        if [ "$instance" = "default" ]; then
+        if [ "$instance" == "default" ]; then
             ece_server=${HOSTNAME}
         else
             ece_server=${HOSTNAME}-${instance}
@@ -320,7 +320,7 @@ function set_instance_settings()
     set_type_pid
    
     # if type is rmi-hub, we don't' need more configuration.
-    if [ "$type" = "rmi-hub" ]; then
+    if [ "$type" == "rmi-hub" ]; then
         return
     fi
 
@@ -339,63 +339,63 @@ function set_instance_settings()
               -Djava.security.auth.login.config=$ece_security_configuration_dir/jaas.config\
               -Djava.security.policy=$ece_security_configuration_dir/java.policy"
 
-    if [ $instance != "default" ]; then
+    if [ "$instance" != "default" ]; then
         ece_args=$ece_args" -Dcom.escenic.instance=$instance"
     fi
 
-    if [ $ece_server_hostname ]; then
+    if [ "$ece_server_hostname" ]; then
         ece_args=$ece_args" -Djava.rmi.server.hostname=$ece_server_hostname"
     fi
 
-    if [ $apr_lib_dir ]; then
+    if [ "$apr_lib_dir" ]; then
         ece_args=$ece_args" -Djava.library.path=$apr_lib_dir"
     fi
 
-    if [ $min_heap_size ]; then
+    if [ "$min_heap_size" ]; then
         ece_args=$ece_args" -Xms$min_heap_size"
     fi
 
-    if [ $max_heap_size ]; then
+    if [ "$max_heap_size" ]; then
         ece_args=$ece_args" -Xmx$max_heap_size"
     fi
 
-    if [ $min_permgen_size ]; then
+    if [ "$min_permgen_size" ]; then
         ece_args=$ece_args" -XX:PermSize=$min_permgen_size"
     fi
 
-    if [ $max_permgen_size ]; then
+    if [ "$max_permgen_size" ]; then
         ece_args=$ece_args" -XX:MaxPermSize=$max_permgen_size"
     fi
     
-    if [ $jvm_encoding ]; then
+    if [ "$jvm_encoding" ]; then
         ece_args=$ece_args" -Dsun.jnu.encoding=$jvm_encoding"
         ece_args=$ece_args" -Dfile.encoding=$jvm_encoding"
     fi
 
-    if [ $enable_remote_debugging -eq 1 ]; then
+    if [ "$enable_remote_debugging" -eq 1 ]; then
         ece_args=$ece_args" -Xdebug -Xnoagent -Djava.compiler=NONE \
                             -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=$remote_debugging_port"
     fi          
 
-    if [ $enable_remote_monitoring -eq 1 ]; then
+    if [ "$enable_remote_monitoring" -eq 1 ]; then
         ece_args=$ece_args" -Dcom.sun.management.jmxremote"
         ece_args=$ece_args" -Dcom.sun.management.jmxremote.authenticate=false"
         ece_args=$ece_args" -Dcom.sun.management.jmxremote.ssl=false"
         ece_args=$ece_args" -Dcom.sun.management.jmxremote.port=$remote_monitoring_port" 
     fi
 
-    if [ $enable_heap_dump -eq 1 ]; then
+    if [ "$enable_heap_dump" -eq 1 ]; then
         ece_args=$ece_args" -XX:+HeapDumpOnOutOfMemoryError"
         ece_args=$ece_args" -XX:HeapDumpPath=$heap_dump_dir"
     fi
 
-    if [ $force_ipv4 -eq 1 ]; then
+    if [ "$force_ipv4" -eq 1 ]; then
         ece_args=$ece_args" -Djava.net.preferIPv4Stack=true"
     fi
     
     # Resin needs some more arguments as its XML parser is not
     # compatible with ECE.
-    if [ $appserver = "resin" ]; then
+    if [ "$appserver" == "resin" ]; then
         ece_args="$ece_args\
            -Dorg.xml.sax.driver=org.apache.xerces.parsers.SAXParser
            -Djavax.xml.stream.XMLInputFactory=com.sun.xml.stream.ZephyrParserFactory
@@ -404,8 +404,8 @@ function set_instance_settings()
            -Djavax.xml.transform.TransformerFactory=org.apache.xalan.processor.TransformerFactoryImpl"
         debug "resin_home=$resin_home"
 
-    elif [ $appserver = "tomcat" ]; then
-        if [ -z $tomcat_base ]; then
+    elif [ "$appserver" == "tomcat" ]; then
+        if [ -z "$tomcat_base" ]; then
             tomcat_base=$tomcat_home
         else
             export CATALINA_BASE=$tomcat_base
@@ -425,7 +425,7 @@ function set_instance_settings()
 
 function sanity_check()
 {
-    if [ $(whoami) = "root" ]; then
+    if [ "$(whoami)" == "root" ]; then
         print "Sorry, you cannot be root when running $(basename $0)"
         print "The root user can only use /etc/init.d/ece"
         exit 1
@@ -442,8 +442,8 @@ function sanity_check()
     # checks if the user is using the default instance when he/she
     # really wants to start one of the instances installed on the
     # system.
-    if [ $instance = "default" -a \
-        $type = "engine" -a \
+    if [ "$instance" == "default" -a \
+        "$type" == "engine" -a \
         $(echo $command | egrep 'help' | wc -l) -eq 0 ]; then
         instance_list=$(get_instance_list)
         if [[ -n "$instance_list" && \
@@ -459,7 +459,7 @@ function sanity_check()
 function deploy()
 {
     ear=$cache_dir/engine.ear
-    if [ ! -e $ear ]; then
+    if [ ! -e "$ear" ]; then
         print_and_log "$ear does not exist. "
         print_and_log "Did you run '"`basename $0`" -i" $instance "assemble'?"
         exit 1
@@ -539,14 +539,14 @@ function deploy()
                     deploy_this_war=0
 
                     for el in $deploy_webapp_white_list; do
-                        if [ $el = $name ]; then
+                        if [ "$el" == $name ]; then
                             debug "found $war in white list, will deploy it"
                             deploy_this_war=1
                         fi
                     done
                 fi
 
-                if [ $deploy_this_war -eq 0 ]; then
+                if [ "$deploy_this_war" -eq 0 ]; then
                     continue
                 fi
                 
@@ -613,15 +613,15 @@ function backup_type()
    print $message
    log $message
 
-   if [ $type = "rmi-hub" ]; then
+   if [ "$type" == "rmi-hub" ]; then
        ensure_that_required_fields_are_set $hub_required_fields
-   elif [ $type = "search" ]; then
+   elif [ "$type" == "search" ]; then
         # TODO trim & tun the default parameters for the search
         # instance.
        ensure_that_required_fields_are_set $engine_required_fields
-   elif [ $type = "engine" ]; then
+   elif [ "$type" == "engine" ]; then
        ensure_that_required_fields_are_set $engine_required_fields
-   elif [ $type = "analysis" ]; then
+   elif [ "$type" == "analysis" ]; then
        ensure_that_required_fields_are_set $analysis_required_fields
    fi
     
@@ -634,7 +634,7 @@ function backup_type()
        exit 1
    fi
 
-   if [ $appserver = "tomcat" ]; then
+   if [ "$appserver" == "tomcat" ]; then
        if [ ! -d $tomcat_base/conf ]; then
            print $tomcat_base/conf "doesn't exist :-("
            print "check your ece.conf the $instance instance of type $type"
@@ -684,14 +684,14 @@ ${escenic_conf_dir}
 "
    actual_backup=""
    for el in $possible_backup; do
-       if [ $el = "/opt/escenic" -a $backup_exclude_binaries -eq 1 ]; then
+       if [ "$el" == "/opt/escenic" -a $backup_exclude_binaries -eq 1 ]; then
            continue
-       elif [ -r $el ]; then
+       elif [ -r "$el" ]; then
            actual_backup="$el $actual_backup"
        fi
    done
 
-   if [ $appserver = "tomcat" -a $backup_exclude_binaries -eq 0 ]; then
+   if [ "$appserver" == "tomcat" -a "$backup_exclude_binaries" -eq 0 ]; then
        actual_backup="$(get_actual_file $tomcat_home) $tomcat_base $actual_backup"
    fi
 
@@ -707,7 +707,7 @@ ${escenic_conf_dir}
    print "- Database snapshot"
    print "- All Solr & Escenic data files from /var/lib/escenic"
 
-   if [ $backup_exclude_binaries -eq 0 ]; then
+   if [ "$backup_exclude_binaries" -eq 0 ]; then
        print "- All app servers in /opt"
        print "- All Escenic binaries & publication templates in /opt/escenic"
    fi
@@ -725,7 +725,7 @@ function start_type()
     print $message
     log $message
     
-    if [ $type = "rmi-hub" ]; then
+    if [ "$type" == "rmi-hub" ]; then
         ensure_that_required_fields_are_set $hub_required_fields
 
         if [ -r $rmi_hub_conf ]; then
@@ -751,13 +751,13 @@ function start_type()
         echo $pid > $pid_file
         exit 0
 
-    elif [ $type = "search" ]; then
+    elif [ "$type" == "search" ]; then
         # TODO trim & tun the default parameters for the search
         # instance.
         ensure_that_required_fields_are_set $engine_required_fields
-    elif [ $type = "engine" ]; then
+    elif [ "$type" == "engine" ]; then
         ensure_that_required_fields_are_set $engine_required_fields
-    elif [ $type = "analysis" ]; then
+    elif [ "$type" == "analysis" ]; then
         ensure_that_required_fields_are_set $analysis_required_fields
     fi
 
@@ -943,7 +943,7 @@ assemble_attempts=0
 
 function assemble()
 {
-    if [ $assemble_attempts -gt 1 ]; then
+    if [ "$assemble_attempts" -gt 1 ]; then
         print "I've tried to assemble twice now and FAILED :-("
         print "You probably have multiple versions of one or more plugins"
         print "Check your plugins directory, sort it out and try again."
@@ -951,7 +951,7 @@ function assemble()
     fi
     assemble_attempts=$(( $assemble_attempts + 1 ))
     
-    if [[ $type != "engine" && $type != "search" ]]; then
+    if [[ "$type" != "engine" && "$type" != "search" ]]; then
         print "You cannot assemble instances of type $type"
         exit 1
     fi
@@ -983,7 +983,7 @@ function assemble()
         fi
     done
 
-    if [ $duplicates_found -eq 1 ]; then
+    if [ "$duplicates_found" -eq 1 ]; then
         print "Multiple versions of ECE and/or 3rd party libraries found."
         print "Remember, you need to run '$(basename $0) clean assemble' when "
         print "upgrading either ECE or one of the plugins."
@@ -1016,13 +1016,13 @@ function create_packages()
     local package_dir=$dir/debian
     local package_name=""
     
-    if [ $type = "engine" ]; then
+    if [ "$type" == "engine" ]; then
         package_name="escenic-content-engine-${instance}"
-    elif [ $type = "search" ]; then
+    elif [ "$type" == "search" ]; then
         package_name="escenic-search-engine-${instance}"
-    elif [ $type = "rmi-hub" ]; then
+    elif [ "$type" == "rmi-hub" ]; then
         package_name="escenic-rmi-hub"
-    elif [ $type = "analysis" ]; then
+    elif [ "$type" == "analysis" ]; then
         package_name="escenic-analysis-engine-${instance}"
     fi
     
@@ -1058,7 +1058,7 @@ EOF
             for el in $(jar tf ${ear} | grep .war$); do
                 if [ -n "${deploy_webapp_white_list}" ]; then
                     for ele in $deploy_webapp_white_list; do
-                        if [ ${el} = ${ele}.war ]; then
+                        if [ ${el} == ${ele}.war ]; then
                             run jar xf ${ear} ${el}
                         fi
                     done
@@ -1069,7 +1069,7 @@ EOF
 
             # putting this block here so that anything overridden in
             # tomcat_base takes precedence over tomcat_home
-            if [ ${everything_but_the_kitchen_sink} -eq 1 ]; then
+            if [ "${everything_but_the_kitchen_sink}" -eq 1 ]; then
                 (
                     local tomcat_home_dir=${package_dir}${tomcat_home}
                     run mkdir -p ${tomcat_home_dir}
@@ -1157,9 +1157,9 @@ function tail_out_log()
 
 function get_app_log()
 {
-    if [ $appserver = "tomcat" ]; then
+    if [ "$appserver" == "tomcat" ]; then
         log_file=$tomcat_base/logs/localhost.`date +%F`.log
-    elif [ $appserver = "resin" -a -e $resin_home/log/jvm-default.log ]; then
+    elif [ "$appserver" == "resin" -a -e $resin_home/log/jvm-default.log ]; then
         log_file=$resin_home/log/jvm-default.log
     else
         print "I don't know where the logs for $appserver are."
@@ -1174,7 +1174,7 @@ function get_app_log()
 
 function tail_app_log()
 {
-    if [ $type = "rmi-hub" ]; then
+    if [ "$type" == "rmi-hub" ]; then
         print "There is no application server log for $type"
         exit 1
     fi
@@ -1211,105 +1211,105 @@ function set_type_command_and_instance()
     next_is_http_password=0
     
     for el in $@; do
-        if [ $el = "-v" -o $el = "--verbose" ]; then
+        if [ "$el" == "-v" -o "$el" == "--verbose" ]; then
             verbose=1
             continue
         fi
         
-        if [ $el  = "--full" ]; then
+        if [ "$el" == "--full" ]; then
             everything_but_the_kitchen_sink=1
             continue
         fi
         
-        if [ $el = "-q" -o $el = "--quiet" ]; then
+        if [ "$el" == "-q" -o $el == "--quiet" ]; then
             quiet=1
             continue
         fi
         
-        if [ $el = "--help" ]; then
+        if [ "$el" == "--help" ]; then
             command=help
             continue
         fi
 
-        if [ $next_is_type -eq 1 ]; then
+        if [ "$next_is_type" -eq 1 ]; then
             type=$el
             next_is_type=0
             continue
         fi
         
-        if [ $next_is_http_user -eq 1 ]; then
+        if [ "$next_is_http_user" -eq 1 ]; then
             http_user=$el
             next_is_http_user=0
             continue
         fi
         
-        if [ $next_is_http_password -eq 1 ]; then
+        if [ "$next_is_http_password" -eq 1 ]; then
             http_password=$el
             next_is_http_password=0
             continue
         fi
         
-        if [ $next_is_instance -eq 1 ]; then
+        if [ "$next_is_instance" -eq 1 ]; then
             instance=$el
             next_is_instance=0
             continue
         fi
         
-        if [ $next_is_publication -eq 1 ]; then
+        if [ "$next_is_publication" -eq 1 ]; then
             publication=$el
             next_is_publication=0
             continue
         fi
         
-        if [ $next_is_resource -eq 1 ]; then
+        if [ "$next_is_resource" -eq 1 ]; then
             resource=$el
             next_is_resource=0
             continue
         fi
         
-        if [ $el = "-t" -o $el  = "--type" ]; then
+        if [ "$el" == "-t" -o "$el"  == "--type" ]; then
             next_is_type=1
             continue
         else
             next_is_type=0
         fi
 
-        if [ $el = "-i" -o $el = "--instance" ]; then
+        if [ "$el" == "-i" -o "$el" == "--instance" ]; then
             next_is_instance=1
             continue
         else
             next_is_instance=0
         fi
 
-        if [ $el = "-p" -o $el = "--publication" ]; then
+        if [ "$el" == "-p" -o "$el" == "--publication" ]; then
             next_is_publication=1
             continue
         else
             next_is_publication=0
         fi
         
-        if [ $el = "-r" -o $el = "--publication-resource" ]; then
+        if [ "$el" == "-r" -o "$el" == "--publication-resource" ]; then
             next_is_resource=1
             continue
         else
             next_is_resource=0
         fi
         
-        if [ $el = "-u" -o $el = "--user" ]; then
+        if [ "$el" == "-u" -o "$el" == "--user" ]; then
             next_is_http_user=1
             continue
         else
             next_is_http_user=0
         fi
         
-        if [ $el = "-w" -o $el = "--password" ]; then
+        if [ "$el" == "-w" -o "$el" == "--password" ]; then
             next_is_http_password=1
             continue
         else
             next_is_http_password=0
         fi
 
-        if [ $el = "--exclude-binaries" ]; then
+        if [ "$el" == "--exclude-binaries" ]; then
             backup_exclude_binaries=1
             continue
         fi
@@ -1321,7 +1321,7 @@ function set_type_command_and_instance()
     # If the user didn't specify which instance to use and if there's
     # only one available instance, use that instead of asking the user
     # to provide it in sanity_check.
-    if [ $instance = "default" ]; then
+    if [ "$instance" == "default" ]; then
         local instance_list=$(get_instance_list)
         
         if [ $(echo $instance_list | grep ' ' | wc -l) -eq 0 ]; then
@@ -1357,7 +1357,7 @@ function clean_up()
 
 function set_id()
 {
-    if [ $instance = "default" ]; then
+    if [ "$instance" == "default" ]; then
         id="["`basename $0`"#${type}]"
     else
         id="["`basename $0`"#${type}-${instance}]"
@@ -1501,7 +1501,7 @@ function update_publication_resources()
         "publication ..."
     
     debug POSTing $resource to $url
-    if [[ -n "$do_put" && $do_put = "true" ]]; then
+    if [[ -n "$do_put" && "$do_put" == "true" ]]; then
         curl -T ${resource} \
           ${curl_auth} \
             ${url} \
@@ -1521,7 +1521,7 @@ function update_publication_resources()
 
 function show_all_log_paths()
 {
-    if [ $quiet -eq 0 ]; then
+    if [ "$quiet" -eq 0 ]; then
         print "System out log: "$log_file
         print "App server log: "$(get_app_log)
         print "log4j log:  "$(get_log4j_log)
@@ -1549,7 +1549,7 @@ function get_escenic_admin_url()
 
 function flush_caches()
 {
-    if [ ${type} != "engine" ]; then
+    if [ "${type}" != "engine" ]; then
         print "You cannot flush the caches of a ${type} instance"
         return
     fi

From 8132a06dc6b1b58f0d9b75e7c7941a0459fe84b6 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Fri, 27 Jan 2012 11:02:18 +0100
Subject: [PATCH 0250/2585] If no /etc/escenic/engine/instances exist, assume
 the default anyway. Maybe check for ece.conf files instead?

---
 usr/bin/ece | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/usr/bin/ece b/usr/bin/ece
index fdb90f81..3f3bef96 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -1322,10 +1322,14 @@ function set_type_command_and_instance()
     # only one available instance, use that instead of asking the user
     # to provide it in sanity_check.
     if [ "$instance" == "default" ]; then
+        debug "Trying to determine instance name"
         local instance_list=$(get_instance_list)
         
         if [ $(echo $instance_list | grep ' ' | wc -l) -eq 0 ]; then
             instance=$instance_list
+            if [ -z "$instance" ] ; then
+              instance=default
+            fi
             debug "setting instance=$instance as there's only one"
         fi
     fi

From f04a1024ee8e4c30db41f1cccf323600cf94d585 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Fri, 27 Jan 2012 11:14:50 +0100
Subject: [PATCH 0251/2585] Added output of file name that failed being
 writeable, to help figure out why stuff fails

---
 usr/bin/ece | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 3f3bef96..317da94b 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -115,11 +115,11 @@ function verify_that_directory_and_file_are_writeable()
 {
     dir=`dirname $1`
     if [ ! -e $dir ]; then
-        print $dir " doesn't exist"
+        print $1: $dir " doesn't exist"
         exit 1
     fi
     if [ ! -w $dir ]; then
-        print $dir " isn't writable for user $USER"
+        print $1: $dir " isn't writable for user $USER"
         exit 1
     fi
 

From 3d8eea97386e28e7c1107c86aacdbc3d3dd0905c Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Fri, 27 Jan 2012 11:18:24 +0100
Subject: [PATCH 0252/2585] Added log_dir and pid_dir as required inputs from
 ece.conf

---
 usr/bin/ece | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/usr/bin/ece b/usr/bin/ece
index 317da94b..2d0f17b9 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -53,6 +53,8 @@ enable_remote_debugging
 enable_remote_monitoring
 java_home
 solr_home
+log_dir
+pid_dir
 "
 
 search_required_fields="

From 46739914f5b55175723abdef90791af63a926ac5 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Fri, 27 Jan 2012 11:34:12 +0100
Subject: [PATCH 0253/2585] Verify that the ece_security_configuration_dir is
 set to a real directory

---
 usr/bin/ece | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/usr/bin/ece b/usr/bin/ece
index 2d0f17b9..eb992fd9 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -759,6 +759,12 @@ function start_type()
         ensure_that_required_fields_are_set $engine_required_fields
     elif [ "$type" == "engine" ]; then
         ensure_that_required_fields_are_set $engine_required_fields
+        if [ ! -d "$ece_security_configuration_dir" ] ; then
+            print "ece_security_configuration_dir $ece_security_configuration_dir"
+            print "did not exist."
+            print "Exiting :-("
+            exit 1
+        fi
     elif [ "$type" == "analysis" ]; then
         ensure_that_required_fields_are_set $analysis_required_fields
     fi

From ca09d47770cf5f9d328edbab3eb4f5976d054664 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 30 Jan 2012 18:30:56 +0800
Subject: [PATCH 0254/2585] - stop_type will now re-attempt the killing of the
 JVM 6 times   (instead of just one) after sleeping one second to allow the
 JVM to   shut down cleanly.

  After the graceful attempts to shut down the app server, it's
  instead shutdown forcefully (kill -9). This is similar behaviour to
  that of Tomcat's shutdown.sh (which again calls cataline.sh with
  'stop') with the added benefit that it should work for all
  application servers (and rmi-hub for that matter).

- made use of the run() wrapper a few places in stop_type
---
 usr/bin/ece | 39 +++++++++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 7b09a326..e069dce7 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -428,11 +428,11 @@ function set_instance_settings()
 
 function sanity_check()
 {
-    if [ "$(whoami)" == "root" ]; then
-        print "Sorry, you cannot be root when running $(basename $0)"
-        print "The root user can only use /etc/init.d/ece"
-        exit 1
-    fi
+#    if [ "$(whoami)" == "root" ]; then
+#        print "Sorry, you cannot be root when running $(basename $0)"
+#        print "The root user can only use /etc/init.d/ece"
+#        exit 1
+#    fi
     
     verify_that_directory_and_file_are_writeable $log_file
     verify_that_directory_and_file_are_writeable $pid_file
@@ -846,20 +846,35 @@ function stop_type()
                 print "removing dangling PID file $pid_file. "
                 print "In future, be sure to use $0 to start "
                 print "and stop your $type"
-                kill $type_pid 1>>$log_file 2>>$log_file
+                run kill $type_pid
                 rm $pid_file
                 return
             fi
         fi
+
+        for i in {0..5}; do
+            set_type_pid
+            
+            if [ -n "$type_pid" ]; then
+                run kill $type_pid
+            else
+                debug "Previous gracious kill attempt of $instance succeeded."
+                break
+            fi
+            
+            sleep 1
+        done
+
+        set_type_pid
+        if [ -n "$type_pid" ]; then
+            print_and_log "I could not stop $type instance $instance gracefully,"
+            print_and_log "I will now use force."
+            run kill -9 $type_pid
+        fi
         
-        kill $type_pid \
-            1>>$log_file \
-            2>>$log_file
 
         if [ -e $pid_file ]; then
-            rm $pid_file \
-                1>>$log_file \
-                2>>$log_file
+            run rm $pid_file
         fi
     else
         print "The $instance instance of $type on $HOSTNAME is NOT running"

From 4aeaabefa10d080b05b76ec169de9821778bff8e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 30 Jan 2012 19:10:14 +0800
Subject: [PATCH 0255/2585] - removed the sleep 8 in restart_type as stop_type
 now guarantees that   the type instance is stopped

- replaced some legacy print & log with print_and_log
---
 usr/bin/ece | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 7d2eac71..384d792c 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -727,8 +727,7 @@ function start_type()
 {
     unset CLASSPATH
     message="Starting the $instance instance of $type on $HOSTNAME ..."
-    print $message
-    log $message
+    print_and_log $message
     
     if [ "$type" == "rmi-hub" ]; then
         ensure_that_required_fields_are_set $hub_required_fields
@@ -944,11 +943,6 @@ function get_info_for_type()
 function restart_type()
 {
     stop_type
-    
-    # I've tested this with various values, 8 seconds seems to
-    # guarantee that the previous JVM process has stopped
-    # properly before starting the new one.
-    sleep 8
 
     # sometimes the JVM refuses to shut down when doing a graceful
     # kill, therefore, if it's still running after the sleep above, we
@@ -956,9 +950,7 @@ function restart_type()
     set_type_pid
     if [ -n "$type_pid" ]; then
         message="The $instance instance of $type failed to stop gracefully"
-        debug $message
-        log $message >> $log_file
-        print $message
+        print_and_log $message
         kill_type
     fi
     

From 35c55e6f13d992b2e3d284e3a52ccc4151d1cbc8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 1 Feb 2012 10:20:11 +0800
Subject: [PATCH 0256/2585] - fixed resource link to eae-qs in context.xml for
 profile=analysis

---
 usr/sbin/ece-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 77b04593..281e1e14 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -1226,7 +1226,7 @@ EOF
   />
   <ResourceLink
       global="jdbc/eae-qs/qs"
-      name="jdbc/ECE_UPDATE_DS"
+      name="jdbc/eae-qs/qs"
       type="javax.sql.DataSource"
   />
 </Context>

From a77be0670e23a64ab4e4c24b1fb675c3978ca2c5 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 1 Feb 2012 12:29:05 +0800
Subject: [PATCH 0257/2585] - added apr_lib_dir

---
 etc/escenic/ece.conf | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/etc/escenic/ece.conf b/etc/escenic/ece.conf
index 09cb959b..166b5e01 100644
--- a/etc/escenic/ece.conf
+++ b/etc/escenic/ece.conf
@@ -90,6 +90,13 @@ tomcat_home=/usr/share/tomcat6
 # binaries, just with different data.
 # tomcat_base=/opt/tomcat-editor1
 
+#####################################################################
+# If you've compiled or installed APR support (native Tomcat
+# libraries, using the Apache APR library), you specify the install
+# directory here, if not comment it out.
+#####################################################################
+apr_lib_dir=/usr/lib
+
 ########################################################################
 # JVM related (the Java Virtual Machine)
 ########################################################################

From 7eb5c07c9c1d92b7d331e926da5f986d0ec242d7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 1 Feb 2012 17:40:32 +0800
Subject: [PATCH 0258/2585] - for the search profile, it's now configurable
 where the   indexer-webservice shall reside. Introduced new FAI parameter:  
 fai_search_indexer_ws_uri.

  You can e.g. use it like this if you're installing an editor and a
  search instance at the same time:

  fai_editor_name=editor2
  fai_editor_port=8080
  fai_search_install=1
  fai_search_indexer_ws_uri=http://$fai_editor_name:$fai_editor_port/indexer-webservice/index/

- search profile no longer gets data sources in {server,context}.xml
- editor/presentation profiles no longer get search profile specific
  JNDI resources. The only "escenic/*" JNDI parameter set for
  editor/presentation instances is escenic/solr-base-uri:

  | JNDI resource                          | Used by which components | Configured in which Nursery component  |
  |----------------------------------------+--------------------------+----------------------------------------|
  | escenic/indexer-webservice             | indexer-webapp           | /com/escenic/indexer/IndexerConfig     |
  | escenic/index-update-uri               | indexer-webapp           | /com/escenic/indexer/IndexerConfig     |
  | escenic/solr-base-uri                  | indexer-webapp           | /com/escenic/indexer/IndexerConfig     |
  |                                        | engine-presentation      | /neo/xredsys/presentation/TagFacade    |
  |                                        | phoenix-webstudio        | /com/escenic/solr/SolrServer           |
  | escenic/head-tail-storage-file         | indexer-webapp           | /com/escenic/indexer/IndexerConfig     |
  | escenic/failing-documents-storage-file | indexer-webapp           | /com/escenic/indexer/StatisticsService |
---
 usr/sbin/ece-install | 51 ++++++++++++++++++++++++++++++++++----------
 1 file changed, 40 insertions(+), 11 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 281e1e14..1b1964f0 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -957,7 +957,24 @@ function set_up_app_server()
     set_db_defaults_if_not_set
 
     if [ $fai_enabled -eq 0 ]; then
-        print "Last question: Where does the search instance run?"
+        print "Awfully sorry to bug you with so many questions, but:"
+        print "What's the URI to the indexer-webservice? (this is typically"
+        print "something like http://editor1/indexer-webservice/index/)"
+        echo -n "Your choice [http://${HOSTNAME}:8080/indexer-webservice/index/]> "
+        read user_indexer_ws_uri
+    else
+        user_indexer_ws_uri=${fai_search_indexer_ws_uri}
+    fi
+
+    if [ -n "$user_indexer_ws_uri" ]; then
+        indexer_ws_uri=$user_indexer_ws_uri
+    else
+        indexer_ws_uri=http://${HOSTNAME}:${appserver_port}/indexer-webservice/index/
+    fi
+    
+    
+    if [ $fai_enabled -eq 0 ]; then
+        print "Last question, I promise!: Where does the search instance run?"
         print "Press ENTER to accept the default ($HOSTNAME:8080)"
         print "If you're in doubt, just press ENTER :-)"
         print "Or enter: <host>:<port>, e.g.: 'search1:8080'"
@@ -1036,7 +1053,8 @@ function set_up_app_server()
               pathname="conf/tomcat-users.xml"
     />
 EOF
-    if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER ]; then
+    if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER \
+        -a $install_profile_number -ne $PROFILE_SEARCH_SERVER ]; then
         cat >> $tomcat_base/conf/server.xml <<EOF
     <Resource
         name="jdbc/ECE_READ_DS"
@@ -1085,7 +1103,7 @@ EOF
         validationQuery="select now()"
     />
 EOF
-    else
+    elif [ $install_profile_number -eq $PROFILE_ANALYSIS_SERVER ]; then
         cat >> $tomcat_base/conf/server.xml <<EOF
     <Resource
         name="jdbc/eae-qs/qs"
@@ -1173,7 +1191,8 @@ EOF
   <WatchedResource>WEB-INF/web.xml</WatchedResource>
 EOF
 
-    if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER ]; then
+    if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER -a \
+        $install_profile_number -ne $PROFILE_SEARCH_SERVER ]; then
         cat >> $tomcat_base/conf/context.xml <<EOF
   <ResourceLink
       global="jdbc/ECE_READ_DS"
@@ -1185,21 +1204,31 @@ EOF
       name="jdbc/ECE_UPDATE_DS"
       type="javax.sql.DataSource"
   />
+EOF
+    fi
+
+    if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER ]; then
+        cat >> $tomcat_base/conf/context.xml <<EOF
   <Environment
-      name="escenic/indexer-webservice"
-      value="http://${search_host}:${search_port}/indexer-webservice/index/"
+      name="escenic/solr-base-uri"
+      value="http://${search_host}:${search_port}/solr/"
       type="java.lang.String"
       override="false"
   />
+EOF
+    fi
+
+    if [ $install_profile_number -eq $PROFILE_SEARCH_SERVER ]; then
+        cat >> $tomcat_base/conf/context.xml <<EOF
   <Environment
-      name="escenic/index-update-uri"
-      value="http://${search_host}:${search_port}/solr/update/"
+      name="escenic/indexer-webservice"
+      value="http://${indexer_ws_uri}"
       type="java.lang.String"
       override="false"
   />
   <Environment
-      name="escenic/solr-base-uri"
-      value="http://${search_host}:${search_port}/solr/"
+      name="escenic/index-update-uri"
+      value="http://${search_host}:${search_port}/solr/update/"
       type="java.lang.String"
       override="false"
   />
@@ -1217,7 +1246,7 @@ EOF
   />
 </Context>
 EOF
-    else
+    elif [ $install_profile_number -eq $PROFILE_ANALYSIS_SERVER ]; then
         cat >> $tomcat_base/conf/context.xml <<EOF
   <ResourceLink
       global="jdbc/eae-logger/logger"

From 09843637cd40f84c6e6ac8afd43f746c62e0a54d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 1 Feb 2012 18:06:01 +0800
Subject: [PATCH 0259/2585] - embarassing

---
 usr/bin/ece | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 384d792c..74d8e7f4 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -430,11 +430,11 @@ function set_instance_settings()
 
 function sanity_check()
 {
-#    if [ "$(whoami)" == "root" ]; then
-#        print "Sorry, you cannot be root when running $(basename $0)"
-#        print "The root user can only use /etc/init.d/ece"
-#        exit 1
-#    fi
+    if [ "$(whoami)" == "root" ]; then
+        print "Sorry, you cannot be root when running $(basename $0)"
+        print "The root user can only use /etc/init.d/ece"
+        exit 1
+    fi
     
     verify_that_directory_and_file_are_writeable $log_file
     verify_that_directory_and_file_are_writeable $pid_file

From 1b052a7683fc7c5f9e43e7b1da5423180836744f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 2 Feb 2012 15:24:02 +0800
Subject: [PATCH 0260/2585] - ece deploy now cleans up the temporary directory
 it uses, this   closes Vizrt issues VF-2959 and VF-2491

- ece clean no longer cleans up the /tmp/ece-* directories as these no
  longer are created by "ece deploy"

- added run wrapper to "ece clean"'s cleaning of packages
---
 usr/bin/ece | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 74d8e7f4..a05aef36 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -471,7 +471,7 @@ function deploy()
     fi
     
     # extract EAR to a temporary area
-    dir=$tmp_dir/`basename $0`-`date +%s`
+    local dir=$(mktemp -d)
     (mkdir -p $dir && cd $dir && jar xf $ear)
     exit_on_error "extracting $ear to $dir"
 
@@ -579,6 +579,8 @@ function deploy()
             print "Deployment is only implemented for Resin and Tomcat so far."
             ;;
     esac
+
+    run rm -rf ${dir}
 }
 
 # Returns the file (can be a directory) passed to the function only
@@ -1361,19 +1363,9 @@ function clean_up()
         run ant clean
     fi
 
-    tmp_dir_prefix="`basename $0`-"
-    if [ `ls  $tmp_dir | grep $tmp_dir_prefix | wc -l` -gt 0 ]; then
-        print "Cleaning up generated files in $tmp_dir ..." 
-        rm -rf $tmp_dir/$tmp_dir_prefix[0-9]* \
-            1>>$log_file \
-            2>>$log_file
-    fi
-    
     if [ -d /var/cache/escenic ]; then
         print "Cleaning up ear, deb and rpm files in /var/cache/escenic ..." 
-        rm -rf /var/cache/escenic/*.{rpm,deb,ear} \
-            1>>$log_file \
-            2>>$log_file
+        run rm -rf /var/cache/escenic/*.{rpm,deb,ear}
     fi
 }
 

From 79ab854f3128d8f9096308c9b74baeceb26d1e41 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 2 Feb 2012 17:59:26 +0800
Subject: [PATCH 0261/2585] - new FAI variable: fai_search_for_editor. If set
 to 1 (default 0),   the set_up_solr method will set up Solr for use for
 editorial   servers, whereas the value of 0 (default) will make it suitable
 for   presentation servers. - set_up_solr now has .preinst and .postinst
 hooks -> to be used by - users who want their own customisation's to the solr
 configuration   files. - now uses dir_suffix for the directories, merely
 changed for   educational purposes (how to override this is already in the  
 ece-install-guide.org - changed URL to Tomcat download, the old one was
 broken - changed URL to ece-scripts to be the escenic fork. - fix in
 install_ece_instance to make installing search profiles:   it will no longer
 run assemble_deploy_and_restart_type if the   profile is search (as it's done
 later for search profiles inside   install_search_server).

---
 usr/sbin/ece-install | 40 +++++++++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 1b1964f0..dccd6b88 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -7,7 +7,7 @@
 # with the "ece -i <instance> backup" command.
 #
 # Always check for the latest version at
-# http://github.com/skybert/ece-scripts
+# http://github.com/escenic/ece-scripts
 
 # echo comments and suggestions > tkj@vizrt.com
 # echo frustrations > /dev/null
@@ -21,19 +21,20 @@ ece_user=escenic
 ece_group=escenic
 jdbc_driver=/usr/share/java/mysql.jar
 debug=0
-tomcat_download=http://ftp.mirror.tw/pub/apache/tomcat/tomcat-6/v6.0.35/bin/apache-tomcat-6.0.35.tar.gz
-                
+tomcat_download=http://ftp.stut.edu.tw/var/ftp/pub/OpenSource/apache/tomcat/tomcat-6/v6.0.35/bin/apache-tomcat-6.0.35.tar.gz
+
 # These variables govern where software is installed and data and run
 # time files are written.
-escenic_root_dir=/opt/escenic
-escenic_conf_dir=/etc/escenic
-escenic_log_dir=/var/log/escenic
-escenic_data_dir=/var/lib/escenic
-escenic_run_dir=/var/run/escenic
-escenic_backups_dir=/var/backups/escenic
-escenic_spool_dir=/var/spool/escenic
-escenic_cache_dir=/var/cache/escenic
-escenic_crash_dir=/var/crash/escenic
+dir_suffix=escenic
+escenic_root_dir=/opt${dir_suffix}
+escenic_conf_dir=/etc${dir_suffix}
+escenic_log_dir=/var/log${dir_suffix}
+escenic_data_dir=/var/lib${dir_suffix}
+escenic_run_dir=/var/run${dir_suffix}
+escenic_backups_dir=/var/backups${dir_suffix}
+escenic_spool_dir=/var/spool${dir_suffix}
+escenic_cache_dir=/var/cache${dir_suffix}
+escenic_crash_dir=/var/crash${dir_suffix}
 appserver_root_dir=/opt
 
 # country code for selecting the correct (APT) mirror.
@@ -1495,6 +1496,8 @@ function set_up_user_enviornment()
 
 function set_up_solr()
 {
+    run_hook set_up_solr.preinst
+    
     print_and_log "Setting up solr ..."
     if [ ! -d $escenic_conf_dir/solr ]; then
         run cp -r $escenic_root_dir/engine/solr/conf $escenic_conf_dir/solr
@@ -1505,6 +1508,16 @@ function set_up_solr()
     if  [ ! -h conf ]; then
         run ln -s $escenic_conf_dir/solr conf
     fi
+
+    local editorial_search_instance=${fai_search_for_editor-0}
+    local file=$escenic_conf_dir/solr/solrconfig.xml
+    if [ $editorial_search_instance -eq 1 ]; then
+        run sed -i "s#<maxTime>[0-9]*</maxTime>#<maxTime>5000</maxTime>#g" $file
+    else
+        run sed -i "s#<maxTime>[0-9]*</maxTime>#<maxTime>60000</maxTime>#g" $file
+    fi
+
+    run_hook set_up_solr.postinst
 }
 
 # So far, I've used this method for copy/past-ing it into the shell
@@ -2156,7 +2169,8 @@ function install_ece_instance()
             $file
     fi
 
-    if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER ]; then
+    if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER -a \
+        $install_profile_number -ne $PROFILE_SEARCH_SERVER ]; then
         assemble_deploy_and_restart_type
     fi
     

From e665597c5a89a6644087ec36d0f1d74e1cd294c8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Thu, 2 Feb 2012 18:08:31 +0800
Subject: [PATCH 0262/2585] - add documentation for fai_search_indexer_ws_uri
 and   fai_search_for_editor

---
 usr/share/doc/escenic/ece-install-guide.org | 97 +++++++++++----------
 1 file changed, 53 insertions(+), 44 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 25c0ec67..74f80bec 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -433,49 +433,52 @@ profiles, see the table below.
 The ece-install script understands for the following settings in the
 $HOME/ece-install.conf file of the root user:
 
-|----------------------------------+----------------------+---------------------------------------------------------------------------------------------------------------------------------------|
-| Parameter                        |              Default | Description                                                                                                                           |
-|----------------------------------+----------------------+---------------------------------------------------------------------------------------------------------------------------------------|
-| fai\_all\_install                |                    0 | Install all components on your server.                                                                                                |
-| fai\_cache\_backends             |     ${HOSTNAME}:8080 | Space separated, e.g. "app1:8080 app2:8080"                                                                                           |
-| fai\_cache\_install              |                    0 | Install cache server profile                                                                                                          |
-| fai\_db\_host                    |            $HOSTNAME | Useful for editor & presentation profiles                                                                                             |
-| fai\_db\_drop\_old\_db\_first    |                    0 | Warning: this will drop the old database before installing a new one                                                                  |
-| fai\_db\_install                 |                    0 | Install db profile                                                                                                                    |
-| fai\_db\_password                | read-the-source-luke | Useful for DB installation profile                                                                                                    |
-| fai\_db\_port                    |                 3306 | Useful for editor & presentation profiles                                                                                             |
-| fai\_db\_schema                  |               ece5db | Useful for DB installation profile                                                                                                    |
-| fai\_db\_user                    |             ece5user | Useful for DB installation profile                                                                                                    |
-| fai\_editor\_conf\_archive       |                   "" | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
-| fai\_editor\_ear                 |                   "" | EAR to use instead of the Escenic binaries                                                                                            |
-| fai\_editor\_install             |                    0 | Install the editorial profile                                                                                                         |
-| fai\_editor\_name                |              editor1 | Name of the editor instance                                                                                                           |
-| fai\_editor\_port                |                 8080 | HTTP port of the editor instance                                                                                                      |
-| fai\_editor\_shutdown            |                 8005 | Shutdown port of the editor instance                                                                                                  |
-| fai\_enabled                     |                    0 | Whether or not to run ece-install in FAI mode                                                                                         |
-| fai\_monitoring\_server\_install |                    0 | Install the monitoring server profile.                                                                                                |
-| fai\_monitoring\_server\_ip      |            127.0.0.1 | The IP of the monitoring server.                                                                                                      |
-| fai\_presentation\_conf\_archive |                   "" | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
-| fai\_presentation\_ear           |                   "" | EAR to use instead of the Escenic binaries                                                                                            |
-| fai\_presentation\_install       |                    0 | Install the presentation server profile                                                                                               |
-| fai\_presentation\_name          |                 web1 | Name of the presentation server instance                                                                                              |
-| fai\_presentation\_port          |                 8080 | HTTP port of the presentation server instance                                                                                         |
-| fai\_presentation\_shutdown      |                 8005 | Shutdown port of the presentation instance                                                                                            |
-| fai\_public\_host\_name          |     ${HOSTNAME}:8080 | The public address for your website                                                                                                   |
-| fai\_publication\_create         |                    0 | Create a new publication                                                                                                              |
-| fai\_publication\_name           |                mypub | Name of the publication                                                                                                               |
-| fai\_publication\_use\_instance  |                 dev1 | Name of local instance to use for creation                                                                                            |
-| fai\_publication\_war            | "WF or ECE demo WAR" | WAR to base the new publication on                                                                                                    |
-| fai\_publication\_war\_uri\_list |                   "" | Publication WARs used for setting up Assembly tool. Supported: http[s]://tmp.com/mypub.war, file:///tmp/mypub.war and /tmp/mypub.war. |
-| fai\_rmi\_install                |                    0 | Install RMI hub profile                                                                                                               |
-| fai\_search\_conf\_archive       |                   "" | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
-| fai\_search\_ear                 |                   "" | EAR to use instead of the Escenic binaries                                                                                            |
-| fai\_search\_install             |                    0 | Install the search server profile (Solr + indexer)                                                                                    |
-| fai\_search\_name                |              search1 | Name of the search instance                                                                                                           |
-| fai\_search\_port                |                 8080 | HTTP port of the search instance                                                                                                      |
-| fai\_search\_shutdown            |                 8005 | Shutdown port of the search instance                                                                                                  |
-| fai\_wf\_install                 |                    0 | Install Widget Framework profile                                                                                                      |
-|----------------------------------+----------------------+---------------------------------------------------------------------------------------------------------------------------------------|
+|----------------------------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------|
+| Parameter                        |                                           Default | Description                                                                                                                           |
+|----------------------------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------|
+| fai\_all\_install                |                                                 0 | Install all components on your server.                                                                                                |
+| fai\_cache\_backends             |                                  ${HOSTNAME}:8080 | Space separated, e.g. "app1:8080 app2:8080"                                                                                           |
+| fai\_cache\_install              |                                                 0 | Install cache server profile                                                                                                          |
+| fai\_db\_host                    |                                         $HOSTNAME | Useful for editor & presentation profiles                                                                                             |
+| fai\_db\_drop\_old\_db\_first    |                                                 0 | Warning: this will drop the old database before installing a new one                                                                  |
+| fai\_db\_install                 |                                                 0 | Install db profile                                                                                                                    |
+| fai\_db\_password                |                              read-the-source-luke | Useful for DB installation profile                                                                                                    |
+| fai\_db\_port                    |                                              3306 | Useful for editor & presentation profiles                                                                                             |
+| fai\_db\_schema                  |                                            ece5db | Useful for DB installation profile                                                                                                    |
+| fai\_db\_user                    |                                          ece5user | Useful for DB installation profile                                                                                                    |
+| fai\_editor\_conf\_archive       |                                                "" | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
+| fai\_editor\_ear                 |                                                "" | EAR to use instead of the Escenic binaries                                                                                            |
+| fai\_editor\_install             |                                                 0 | Install the editorial profile                                                                                                         |
+| fai\_editor\_name                |                                           editor1 | Name of the editor instance                                                                                                           |
+| fai\_editor\_port                |                                              8080 | HTTP port of the editor instance                                                                                                      |
+| fai\_editor\_shutdown            |                                              8005 | Shutdown port of the editor instance                                                                                                  |
+| fai\_enabled                     |                                                 0 | Whether or not to run ece-install in FAI mode                                                                                         |
+| fai\_monitoring\_server\_install |                                                 0 | Install the monitoring server profile.                                                                                                |
+| fai\_monitoring\_server\_ip      |                                         127.0.0.1 | The IP of the monitoring server.                                                                                                      |
+| fai\_presentation\_conf\_archive |                                                "" | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
+| fai\_presentation\_ear           |                                                "" | EAR to use instead of the Escenic binaries                                                                                            |
+| fai\_presentation\_install       |                                                 0 | Install the presentation server profile                                                                                               |
+| fai\_presentation\_name          |                                              web1 | Name of the presentation server instance                                                                                              |
+| fai\_presentation\_port          |                                              8080 | HTTP port of the presentation server instance                                                                                         |
+| fai\_presentation\_shutdown      |                                              8005 | Shutdown port of the presentation instance                                                                                            |
+| fai\_public\_host\_name          |                                  ${HOSTNAME}:8080 | The public address for your website                                                                                                   |
+| fai\_publication\_create         |                                                 0 | Create a new publication                                                                                                              |
+| fai\_publication\_name           |                                             mypub | Name of the publication                                                                                                               |
+| fai\_publication\_use\_instance  |                                              dev1 | Name of local instance to use for creation                                                                                            |
+| fai\_publication\_war            |                              "WF or ECE demo WAR" | WAR to base the new publication on                                                                                                    |
+| fai\_publication\_war\_uri\_list |                                                "" | Publication WARs used for setting up Assembly tool. Supported: http[s]://tmp.com/mypub.war, file:///tmp/mypub.war and /tmp/mypub.war. |
+| fai\_rmi\_install                |                                                 0 | Install RMI hub profile                                                                                                               |
+| fai\_search\_conf\_archive       |                                                "" | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
+| fai\_search\_ear                 |                                                "" | EAR to use instead of the Escenic binaries                                                                                            |
+| fai\_search\_for\_editor         |                                                 0 | If 1 (true), will configure Solr for use with an editorial server, if not conf for presentation servers will be chosen.               |
+| fai\_search\_indexer\_ws\_uri    | http://${HOSTNAME}:8080/indexer-webservice/index/ | URI of the indexer-webservice that the search instance shall use for knowing what to index.                                           |
+| fai\_search\_install             |                                                 0 | Install the search server profile (Solr + indexer)                                                                                    |
+| fai\_search\_name                |                                           search1 | Name of the search instance                                                                                                           |
+| fai\_search\_port                |                                              8080 | HTTP port of the search instance                                                                                                      |
+| fai\_search\_shutdown            |                                              8005 | Shutdown port of the search instance                                                                                                  |
+| fai\_wf\_install                 |                                                 0 | Install Widget Framework profile                                                                                                      |
+|----------------------------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------|
+#+TBLFM: $2=http://$fai_editor_name:$fai_editor_port/indexer-webservice/index/                   0
 
 As you've probably have guessed, 0 means "false" and 1 means "true" :-)
 
@@ -664,7 +667,13 @@ echo "Hello from $0, EAE is installed in ${tomcat_base}" > /tmp/hello.txt
 
 ** Available hooks
 Currently, the following hooks are available:
-#+INCLUDE: "ece-install-hooks.org"
+
+#+BEGIN_SRC sh
+install_analysis_server.preinst
+install_analysis_server.postinst
+set_up_solr.preinst
+set_up_solr.postinst
+#+END_SRC
 
 * Assumptions
 ** /etc/esecenic is shared

From 62c3905d0dace7a8ecaa02ba4fbcffa593f8bb44 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Fri, 3 Feb 2012 10:59:57 +0800
Subject: [PATCH 0263/2585] - Removed an important slash when in yesterday's
 introduction of   dir_suffix. Man, search and replace is hard.

---
 usr/sbin/ece-install | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index dccd6b88..500fb7b5 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -26,15 +26,15 @@ tomcat_download=http://ftp.stut.edu.tw/var/ftp/pub/OpenSource/apache/tomcat/tomc
 # These variables govern where software is installed and data and run
 # time files are written.
 dir_suffix=escenic
-escenic_root_dir=/opt${dir_suffix}
-escenic_conf_dir=/etc${dir_suffix}
-escenic_log_dir=/var/log${dir_suffix}
-escenic_data_dir=/var/lib${dir_suffix}
-escenic_run_dir=/var/run${dir_suffix}
-escenic_backups_dir=/var/backups${dir_suffix}
-escenic_spool_dir=/var/spool${dir_suffix}
-escenic_cache_dir=/var/cache${dir_suffix}
-escenic_crash_dir=/var/crash${dir_suffix}
+escenic_root_dir=/opt/${dir_suffix}
+escenic_conf_dir=/etc/${dir_suffix}
+escenic_log_dir=/var/log/${dir_suffix}
+escenic_data_dir=/var/lib/${dir_suffix}
+escenic_run_dir=/var/run/${dir_suffix}
+escenic_backups_dir=/var/backups/${dir_suffix}
+escenic_spool_dir=/var/spool/${dir_suffix}
+escenic_cache_dir=/var/cache/${dir_suffix}
+escenic_crash_dir=/var/crash/${dir_suffix}
 appserver_root_dir=/opt
 
 # country code for selecting the correct (APT) mirror.

From 91aa998d2f7a5006815955f136e9139dc9a9b4f0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 3 Feb 2012 16:08:30 +0800
Subject: [PATCH 0264/2585] - new feature: The solr configuration can now be
 included in the   fai_<profile>_conf_archive and used instead of the one
 supplied with   ECE.

  As mentioned in the install guide, the archive should be created
  like this (or similar, the paths are the important thing):

  $ cd /opt/escenic
  $ tar czf /tmp/nursery-skeleton-solr-and-security.tar.gz \
    engine/security \
    engine/siteconfig/config-skeleton/ \
    engine/solr/conf \
    engine/siteconfig/bootstrap-skeleton/ \
    `find -L assemblytool/plugins/ -name siteconfig`

  And then used like this in the ece-install.conf file:

  fai_search_conf_archive=/tmp/nursery-skeleton-solr-and-security.tar.gz

- included profile=search for adding the ece init.d script to the
  default run levels.

- (I believe this must be a) regression bug: /etc/init.d/ece and
  /etc/default/ece wasn't copied out. Fixed.

- updated download link for Tomcat

- now cleans up the temporary directory used for the conf archive.
---
 usr/sbin/ece-install | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 500fb7b5..3386fa14 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -21,7 +21,7 @@ ece_user=escenic
 ece_group=escenic
 jdbc_driver=/usr/share/java/mysql.jar
 debug=0
-tomcat_download=http://ftp.stut.edu.tw/var/ftp/pub/OpenSource/apache/tomcat/tomcat-6/v6.0.35/bin/apache-tomcat-6.0.35.tar.gz
+tomcat_download=http://ftp.mirror.tw/pub/apache/tomcat/tomcat-6/v6.0.35/bin/apache-tomcat-6.0.35.tar.gz
 
 # These variables govern where software is installed and data and run
 # time files are written.
@@ -481,6 +481,8 @@ function set_up_ece_scripts()
     run cp -r ece-scripts/usr/* /usr/
     run cp -r ece-scripts/etc/escenic/* ${escenic_conf_dir}/
     run cp -r ece-scripts/etc/bash_completion.d/ece /etc/bash_completion.d/
+    run cp -r ece-scripts/etc/init.d/* /etc/init.d/
+    run cp -r ece-scripts/etc/default/* /etc/default/
     
     local file=${escenic_conf_dir}/ece.conf
     set_conf_file_value assemblytool_home ${escenic_root_dir}/assemblytool $file
@@ -610,9 +612,9 @@ function set_up_basic_nursery_configuration()
     if [ $(is_using_conf_archive) -eq 1 ]; then
         print_and_log "Using the supplied Nursery & JAAS configuration from" 
         print_and_log "bundle: $ece_instance_conf_archive"
-        local dir=$(mktemp -d)
-        escenic_root_dir=$dir
-        run cd $dir
+        local a_tmp_dir=$(mktemp -d)
+        escenic_root_dir=$a_tmp_dir
+        run cd $a_tmp_dir
         run tar xzf $ece_instance_conf_archive
     fi
     
@@ -631,6 +633,8 @@ function set_up_basic_nursery_configuration()
         run cp -r $el/misc/siteconfig/* $common_nursery_dir/
     done
 
+    run rm -r ${a_tmp_dir}
+
     public_host_name=$HOSTNAME:${appserver_port}
     if [ $fai_enabled -eq 1 ]; then
         if [ -n "$fai_public_host_name" ]; then
@@ -1500,9 +1504,22 @@ function set_up_solr()
     
     print_and_log "Setting up solr ..."
     if [ ! -d $escenic_conf_dir/solr ]; then
-        run cp -r $escenic_root_dir/engine/solr/conf $escenic_conf_dir/solr
+        if [ $(is_using_conf_archive) -eq 1 ]; then
+            print_and_log "Using the supplied Solr configuration from" 
+            print_and_log "bundle: $ece_instance_conf_archive"
+            local a_tmp_dir=$(mktemp -d)
+            run cd $a_tmp_dir
+            run tar xzf $ece_instance_conf_archive engine/solr/conf
+            run cp -r engine/solr/conf $escenic_conf_dir/solr
+            run rm -r $a_tmp_dir
+        else
+            print_and_log "Installing default Solr conf shipped with ECE ..."
+            run cp -r $escenic_root_dir/engine/solr/conf $escenic_conf_dir/solr
+        fi
+    else
+        print_and_log "$escenic_conf_dir/solr already exists, not touching it."
     fi
-    
+
     make_dir $escenic_data_dir/solr/
     run cd $escenic_data_dir/solr/
     if  [ ! -h conf ]; then
@@ -2861,7 +2878,6 @@ function add_server_to_runlevels()
     # no need to add init.d scripts to the runlevel(s) for these
     # profiles
     if [ $install_profile_number -eq $PROFILE_WIDGET_FRAMEWORK -o \
-         $install_profile_number -eq $PROFILE_SEARCH_SERVER -o \
          $install_profile_number -eq $PROFILE_DB_SERVER -o \
          $install_profile_number -eq $PROFILE_CACHE_SERVER ]; then
         return

From de9000232537136dfe1f8ca62893cb8fb5fb6b3f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 3 Feb 2012 16:12:14 +0800
Subject: [PATCH 0265/2585] - updated documentation on
 fai_<profile>_conf_archive, it now includes solr.

---
 usr/share/doc/escenic/ece-install-guide.org | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 74f80bec..6543f911 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -409,26 +409,31 @@ A simple way to create this bundle, is to use a server which has the
 assembly environment set up and then do:
 
 #+BEGIN_SRC conf
-$ cd /opt/escenic/engine
-$ tar czf /tmp/nursery-skeleton-and-security.tar.gz \
+$ cd /opt/escenic
+$ tar czf /tmp/nursery-skeleton-solr-and-security.tar.gz \
   engine/security \
   engine/siteconfig/config-skeleton/ \
+  engine/solr/conf \
   engine/siteconfig/bootstrap-skeleton/ \
-  `find -L  assemblytool/plugins/ -name siteconfig`
+  `find -L assemblytool/plugins/ -name siteconfig`
 #+END_SRC
 
-/tmp/nursery-skeleton-and-security.tar.gz should now have everything
+/tmp/nursery-skeleton-solr-and-security.tar.gz should now have everything
 you need. You can now configure your FAI installation to use these by,
 e.g.:
 
 #+BEGIN_SRC conf
 fai_presentation_ear=/tmp/engine.ear
-fai_presentation_conf_archive=/tmp/nursery-skeleton-and-security.tar.gz
+fai_presentation_conf_archive=/tmp/nursery-skeleton-solr-and-security.tar.gz
 #+END_SRC
 
 Corresponding configuration options are available for the other server
 profiles, see the table below.
 
+The inclusion of the engine/solr directory makes it easy for users to
+provide their own, optimised Solr configuration. In this context, also
+note that a post install hook, set_up_solr.postinst, is available.
+
 ** Overview of All FAI Parameters
 The ece-install script understands for the following settings in the
 $HOME/ece-install.conf file of the root user:

From 07016d990891fe25218c12727e6b9466ce9bc52e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 3 Feb 2012 16:17:45 +0800
Subject: [PATCH 0266/2585] - mentioned that the inclusion of engine/solr/conf
 in the bundle is optional

---
 usr/share/doc/escenic/ece-install-guide.org | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 6543f911..a42eb87b 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -405,6 +405,11 @@ engine/siteconfig/config-skeleton
 assemblytool/plugins/<plugin>/siteconfig
 #+END_SRC
 
+and optionally also:
+#+BEGIN_SRC sh
+engine/solr/conf
+#+END_SRC
+
 A simple way to create this bundle, is to use a server which has the
 assembly environment set up and then do:
 

From bb48cdb975a351fb466f313f9a5c2dcbc21cb8f0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 6 Feb 2012 11:45:45 +0800
Subject: [PATCH 0267/2585] - fixed regression introduced in  
 91aa998d2f7a5006815955f136e9139dc9a9b4f0, this closes  
 https://github.com/skybert/ece-scripts/issues/32

---
 usr/sbin/ece-install | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 3386fa14..f83d4d56 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -633,8 +633,10 @@ function set_up_basic_nursery_configuration()
         run cp -r $el/misc/siteconfig/* $common_nursery_dir/
     done
 
-    run rm -r ${a_tmp_dir}
-
+    if [ -n "${a_tmp_dir}" ]; then
+        run rm -rf ${a_tmp_dir}
+    fi
+    
     public_host_name=$HOSTNAME:${appserver_port}
     if [ $fai_enabled -eq 1 ]; then
         if [ -n "$fai_public_host_name" ]; then

From 374c1ccd08015a4cc2138197f8f19b06f7217847 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 6 Feb 2012 12:11:16 +0800
Subject: [PATCH 0268/2585] - replaced the use of get_conf_value when setting
 the FAI app server   HTTP and shutdown ports, now it uses standard BASH
 evaluation of   fai_<profile>_<port|shutdown> with fallback.

---
 usr/sbin/ece-install | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index f83d4d56..3e8f28bc 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -925,17 +925,17 @@ function set_up_app_server()
         fi
     else
         if [ $install_profile_number -eq $PROFILE_EDITORIAL_SERVER ]; then
-            appserver_port=$(get_conf_value fai_editor_port)
-            shutdown_port=$(get_conf_value fai_editor_shutdown)
+            appserver_port=${fai_editor_port-8080}
+            shutdown_port=${fai_editor_shutdown-8005}
         elif [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ]; then
-            appserver_port=$(get_conf_value fai_presentation_port)
-            shutdown_port=$(get_conf_value fai_presentation_shutdown)
+            appserver_port=${fai_presentation_port-8080}
+            shutdown_port=${fai_presentation_shutdown-8005}
         elif [ $install_profile_number -eq $PROFILE_SEARCH_SERVER ]; then
-            appserver_port=$(get_conf_value fai_search_port)
-            shutdown_port=$(get_conf_value fai_search_shutdown)
+            appserver_port=${fai_search_port-8080}
+            shutdown_port=${fai_search_shutdown-8005}
         elif [ $install_profile_number -eq $PROFILE_ANALYSIS_SERVER ]; then
-            appserver_port=$(get_conf_value fai_analysis_port)
-            shutdown_port=$(get_conf_value fai_analysis_shutdown)
+            appserver_port=${fai_analysis_port-8080}
+            shutdown_port=${fai_analysis_shutdown-8005}
         fi
     fi
 

From a7f864a09bf1cf3263d5b19081fafd56b04902d3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 6 Feb 2012 18:36:04 +0800
Subject: [PATCH 0269/2585] - new feature: support for specifyng the EAE DB's
 details with   dedicated fai_analysis_db_<value>

        fai_analysis_db_host
        fai_analysis_db_password
        fai_analysis_db_port
        fai_analysis_db_schema

  The need for this arises when installing many server profiles with
  the same invocation of ece-install. Normally, when only installing
  one profile at a time, the EAE (analysis) installation profile heeds
  the standard FAI parameters:

        fai_db_host
        fai_db_password
        fai_db_port
        fai_db_schema

   However, if you're installing also an editor profile in the same
   go, i.e. from the same ece-install.conf, you want an additional set
   of DB parameters.

   The EAE profile is very special in that it has its own DB and other
   settings from the ECE instances and it's therefore the only profile
   which has named DB FAI parameters, e.g. there's no
   fai_editor_db_host and so on.

- improved set_db_defaults_if_not_set by using standard BASH fallback
  default values.

- defined default DB settings to be used instead of hard coding the
  values.

- added more comments to the install_analysis_server method explaining
  the hack needed to EAE's cfg files.
---
 usr/sbin/ece-install | 61 ++++++++++++++++++++++++--------------------
 1 file changed, 33 insertions(+), 28 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 3e8f28bc..a8f5d8db 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -503,54 +503,54 @@ function set_up_ece_scripts()
     run sed -i "s#/opt/escenic#${escenic_root_dir}#g" /etc/bash_completion.d/ece
 }
 
+default_db_port=3306
+default_db_host=localhost
+default_db_user=ece5user
+default_db_password=ece5password
+default_db_schema=ece5db
 
 # Method used both from interactive mode to set any missing values
 # (defaults)
 function set_db_defaults_if_not_set()
 {
     if [ -z "$db_host" ]; then
-        db_host=localhost
+        db_host=${default_db_host}
     fi
     
     if [ -z "$db_port" ]; then
-        db_port=3306
+        db_port=${default_db_port}
     fi
     
     if [ -z "$db_user" ]; then
-        db_user=ece5user
+        db_user=${default_db_user}
     fi
     
     if [ -z "$db_password" ]; then
-        db_user=ece5password
+        db_password=${default_db_password}
     fi
     
     if [ -z "$db_schema" ]; then
-        db_schema=ece5db
+        db_schema=${default_db_schema}
     fi
 }
 
 function set_db_settings_from_fai_conf()
 {
-    # the port isn't fully supported. The user must himself update the
-    # mysql configuration to run it on a non standard port.
-    if [ -n "${fai_db_port}" ]; then
-        db_port=${fai_db_port}
-    fi
-    
-    if [ -n "${fai_db_host}" ]; then
-        db_host=${fai_db_host}
-    fi
+    # Note: the port isn't fully supported. The user must himself
+    # update the mysql configuration to run it on a non standard port.
     
-    if [ -n "${fai_db_user}" ]; then
-        db_user=${fai_db_user}
-    fi
-    
-    if [ -n "${fai_db_password}" ]; then
-        db_password=${fai_db_password}
-    fi
-    
-    if [ -n "${fai_db_schema}" ]; then
-        db_schema=${fai_db_schema}
+    if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER ]; then
+        db_port=${fai_db_port-${default_db_port}}
+        db_host=${fai_db_host-${default_db_host}}
+        db_user=${fai_db_user-${default_db_user}}
+        db_password=${fai_db_password-${default_db_password}}
+        db_schema=${fai_db_schema-${default_db_schema}}
+    else
+        db_port=${fai_analysis_db_port-${default_db_port}}
+        db_host=${fai_analysis_db_host-${default_db_host}}
+        db_user=${fai_analysis_db_user-${default_db_user}}
+        db_password=${fai_analysis_db_password-${default_db_password}}
+        db_schema=${fai_analysis_db_schema-${default_db_schema}}
     fi
     
     if [ -n "${fai_db_drop_old_db_first}" ]; then
@@ -949,9 +949,10 @@ function set_up_app_server()
     
     if [ $fai_enabled -eq 0 ]; then
         print "Another question: Where does the database run?"
-        print "Press ENTER to accept the default ($HOSTNAME:3306:ece5db)"
-        print "Or enter: <host>:<port>:<schema>, e.g.: 'db1:3306:mydb'"
-        echo -n "Your choice [$HOSTNAME:3306:schema]> "
+        print "Press ENTER to accept the default " \
+            "($HOSTNAME:${default_db_port}:${default_db_schema})"
+        print "Or enter: <host>:<port>:<schema>, e.g.: 'db1:${default_db_port}:mydb'"
+        echo -n "Your choice [$HOSTNAME:${default_db_port}:schema]> "
         read user_database
         
         db_host=$(echo $user_database | cut -d':' -f1)
@@ -2402,8 +2403,12 @@ function install_analysis_server()
     set_conf_file_value pageview.aggr.hour.older.than.hours 2 $file
     set_conf_file_value pageview.maintenance.older.than.days 0 $file
 
+    # important to turn this off here, it's only for the EAE .cfg
+    # files, see above.
     dont_quote_conf_values=0
-    
+
+    # touching web.xml to trigger a re-deploy of the EAE Reports
+    # application.
     run touch ${tomcat_base}/webapps/analysis-reports/WEB-INF/web.xml
     run_hook install_analysis_server.postinst
 }

From 856a5da306e30b3369fe439e102fa141f40ea533 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 7 Feb 2012 13:13:31 +0800
Subject: [PATCH 0270/2585] - tomcat logging configuration is now only tweaked
 for profile=all and   profile=search. All other profiles get the logging
 configuration   that comes with Tocmat.

  This means that only profile=search & profile=all get a dedicated
  solr log.

- fixed regression introduced in
  7eb5c07c9c1d92b7d331e926da5f986d0ec242d7, when adding different JNDI
  configuration based on profile (the bug was that e.g. editor
  profiles wouldn't get a closing </Context> element in their
  context.xml).

- removed additional setting of deployment white list for
  profile=search as install_ece_instance now has support for this
  through the use of get_deploy_white_list.
---
 usr/sbin/ece-install | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index a8f5d8db..f9ee3467 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -726,7 +726,12 @@ EOF
     make_ln $common_nursery_dir/trace.properties
     run ln -sf trace.properties log4j.properies
 
-    cat > $tomcat_base/conf/logging.properties <<EOF
+
+    # since the solr webapp otherwise will pollute our logs, we ask
+    # Tomcat specifically to make it log to dedicated logger.
+    if [ $install_profile_number -eq $PROFILE_SEARCH_SERVER -o \
+        $install_profile_number -eq $PROFILE_ALL_IN_ONE ]; then
+        cat > $tomcat_base/conf/logging.properties <<EOF
 handlers = 1catalina.org.apache.juli.FileHandler, 2localhost.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler, 6localhost.org.apache.juli.FileHandler
 
 .handlers = 1catalina.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
@@ -751,8 +756,11 @@ org.apache.solr.handlers=6localhost.org.apache.juli.FileHandler
 
 org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
 org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.FileHandler
-
 EOF
+    else
+        run cp $tomcat_home/conf/logging.properties $tomcat_base/conf
+    fi
+    
 }
 
 # don't quote values when setting conf file values with
@@ -1014,7 +1022,8 @@ function set_up_app_server()
         run rm tomcat
     fi
     run ln -sf ${tomcat_dir} tomcat
-
+    
+    tomcat_home=${appserver_root_dir}/tomcat   
     tomcat_base=${appserver_root_dir}/tomcat-${instance_name}
     make_dir $tomcat_base
 
@@ -1024,7 +1033,7 @@ function set_up_app_server()
     done
 
     set_ece_instance_conf tomcat_base $tomcat_base   
-    set_ece_instance_conf tomcat_home ${appserver_root_dir}/tomcat   
+    set_ece_instance_conf tomcat_home $tomcat_home
     set_ece_instance_conf appserver_port $appserver_port
    
     run cd $tomcat_base/lib
@@ -1267,6 +1276,10 @@ EOF
       type="javax.sql.DataSource"
   />
 </Context>
+EOF
+    else 
+        cat >> $tomcat_base/conf/context.xml <<EOF
+</Context>
 EOF
     fi
 }
@@ -2569,13 +2582,6 @@ function install_search_server()
     type=search
     install_ece_instance "search1" 0
     
-    file=$escenic_conf_dir/ece-${instance_name}.conf
-    print_and_log "Creating instance specific conf: $file ..."
-    set_conf_file_value \
-        deploy_webapp_white_list \
-        $(get_deploy_white_list) \
-        $file
-
     # TODO update instead of append
     dir=$common_nursery_dir/com/escenic/framework/search/solr
     make_dir $dir

From 80936cd57f58d270e860c7fad84c9305c9e61c0a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 7 Feb 2012 16:14:50 +0800
Subject: [PATCH 0271/2585] - new feature: the "ece info" command now  also
 includes the status of   the application server. A Typical output now looks
 like this:

          $ ece -i dev1 info
          [ece#engine-dev1] Current instance: dev1
          [ece#engine-dev1] Instances available on quanah: dev1
          [ece#engine-dev1] Conf files parsed: /etc/escenic/ece-dev1.conf /etc/escenic/ece.conf
          [ece#engine-dev1] ECE location: /opt/escenic/engine
          [ece#engine-dev1] Assembly Tool location: /opt/escenic/assemblytool
          [ece#engine-dev1] Java location: /usr/lib/jvm/java-6-sun
          [ece#engine-dev1] Application server: tomcat
   new -> [ece#engine-dev1] Appplication server status: UP 0d 0h 0m 2s
          [ece#engine-dev1] Tomcat home: /opt/tomcat
          [ece#engine-dev1] Tomcat base: /opt/tomcat-dev1

  The "ece status" works as before.

- changed get_status to use echo returns instead of printing out the
  results. This way it's possible to make use of the get_status from
  other places were you don't want the program ID string as a part of
  the result.
---
 usr/bin/ece | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index a05aef36..7cc4da5f 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -926,6 +926,8 @@ function get_info_for_type()
     fi
     if [ -n "${appserver}" ]; then
         print "Application server: $appserver"
+        print "Appplication server status:" $(get_status)
+        
         case "$appserver" in
             tomcat)
                 if [ -n "${tomcat_home}" ]; then
@@ -1217,7 +1219,7 @@ function make_thread_dump()
             kill -QUIT $type_pid >> $log_file
         fi
     else
-        get_status
+        print "$(get_status)"
     fi
 }
 
@@ -1385,19 +1387,19 @@ function set_id()
 function get_status()
 {
     if [ -z "$type_pid" ]; then
-        print "DOWN"
+        echo "DOWN"
         exit 0
     elif [ -r $pid_file ]; then
         
         if [ "$type_pid" != `cat $pid_file` ]; then
-            print "Is running, but was not started with `basename $0`"
-            print "system PID $ece_id differs from the PID in $pid_file"
+            echo "Is running, but was not started with `basename $0`"
+            echo "system PID $ece_id differs from the PID in $pid_file"
             exit 1
         fi
     else
-        print $pid_file "did not exist, "
-        print "the ${instance} instance of ${type} is running with PID $type_pid"
-        print "but hasn't been started properly with `basename $0`"
+        echo $pid_file "did not exist, "
+        echo "the ${instance} instance of ${type} is running with PID $type_pid"
+        echo "but hasn't been started properly with `basename $0`"
         exit 1
     fi
 
@@ -1411,7 +1413,7 @@ function get_status()
     minutes=$(( seconds_left / 60 ))
     seconds_left=$(( seconds_left - $minutes * 60 ))
 
-    print "UP" ${days}d ${hours}h ${minutes}m ${seconds_left}s
+    echo "UP" ${days}d ${hours}h ${minutes}m ${seconds_left}s
 }
 
 function list_versions()
@@ -1647,7 +1649,7 @@ for el in $command; do
             start_type
             ;;
         status)
-            get_status
+            print "$(get_status)"
             ;;
         stop)
             stop_type

From 01248b5dd929aa02d896da1738ddf07959e0f7e4 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 7 Feb 2012 16:24:42 +0800
Subject: [PATCH 0272/2585] - improved "ece info" to also include PID and port.
 Also introduced a   kind of grouping in the appserver info output:

  $ ece -i dev1 info
  [ece#engine-dev1] Current instance: dev1
  [ece#engine-dev1] Instances available on quanah: dev1
  [ece#engine-dev1] Conf files parsed: /etc/escenic/ece-dev1.conf /etc/escenic/ece.conf
  [ece#engine-dev1] ECE location: /opt/escenic/engine
  [ece#engine-dev1] Assembly Tool location: /opt/escenic/assemblytool
  [ece#engine-dev1] Java location: /usr/lib/jvm/java-6-sun
  [ece#engine-dev1] Application server:
  [ece#engine-dev1] |-> Status: UP 0d 0h 10m 30s
  [ece#engine-dev1] |-> Port: 8080
  [ece#engine-dev1] |-> PID: 25518
  [ece#engine-dev1] |-> Type: tomcat
  [ece#engine-dev1] |-> Tomcat home: /opt/tomcat
  [ece#engine-dev1] |-> Tomcat base: /opt/tomcat-dev1
---
 usr/bin/ece | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 7cc4da5f..e3b47195 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -925,19 +925,24 @@ function get_info_for_type()
         print "Java location: $java_home"
     fi
     if [ -n "${appserver}" ]; then
-        print "Application server: $appserver"
-        print "Appplication server status:" $(get_status)
+        print "Application server:"
+        set_type_port
+        set_type_pid
+        print "|-> Status:" $(get_status)
+        print "|-> Port:" $port
+        print "|-> PID:" $type_pid
+        print "|-> Type: " $appserver
         
         case "$appserver" in
             tomcat)
                 if [ -n "${tomcat_home}" ]; then
-                    print "Tomcat home:" $tomcat_home
-                    print "Tomcat base:" $tomcat_base
+                    print "|-> Tomcat home:" $tomcat_home
+                    print "|-> Tomcat base:" $tomcat_base
                 fi
             ;;
             resin)
                 if [ -n "${resin_home}" ]; then
-                    print "Resin home:" $resin_home
+                    print "  |-> Resin home:" $resin_home
                 fi
                 ;;
         esac

From 24f46c7769e88fe7358445647d2b3c02711927a9 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 7 Feb 2012 19:30:50 +0800
Subject: [PATCH 0273/2585] - new feature: ece-install now sets up the virtual
 hosts configuration   for Tomcat application servers if the
 profile=editorial, profile=all   or profile=presentation.

  The user can define one domain for each publication in the following
  FAI parameter:

  fai_publication_domain_mapping_list="
  firepub#fire.escenic.com
  ildpub#ild.escenic.com
  "

  This will produce the following stanzas in server.xml:

      <Host name="fire.escenic.com" appBase="webapps" autoDeploy="false">
        <Context displayName="fire.escenic.com"
                 docBase="firepub"
                 path="/"
        />
      </Host>
      <Host name="ild.escenic.com" appBase="webapps" autoDeploy="false">
        <Context displayName="ild.escenic.com"
                 docBase="ildpub"
                 path="/"
        />
---
 usr/sbin/ece-install | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index f9ee3467..b022c5cf 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -1196,6 +1196,37 @@ EOF
             xmlValidation="false"
             xmlNamespaceAware="false">
       </Host>
+EOF
+    if [[ ($install_profile_number == $PROFILE_EDITORIAL_SERVER || \
+        $install_profile_number == $PROFILE_PRESENTATION_SERVER || \
+        $install_profile_number == $PROFILE_ALL_IN_ONE) && \
+        -n "$fai_publication_domain_mapping_list" ]]; then
+
+        declare -A publication_domain_map
+        
+        for el in ${fai_publication_domain_mapping_list}; do
+            local old_ifs=$IFS
+            # the entries in the fai_publication_domain_mapping_list
+            # are on the form: <publication>#<domain>
+            IFS='#'
+            read publication domain <<< "$el"
+            publication_domain_map[${publication}]="${domain}"
+            IFS=$old_ifs
+        done
+        
+        for el in ${!publication_domain_map[@]}; do
+            cat >> $tomcat_base/conf/server.xml <<EOF
+      <Host name="${publication_domain_map[$el]}" appBase="webapps" autoDeploy="false">
+        <Context displayName="${publication_domain_map[$el]}"
+                 docBase="${el}"
+                 path="/"
+        />
+      </Host>
+EOF
+        done
+    fi
+    
+    cat >> $tomcat_base/conf/server.xml <<EOF
     </Engine>
   </Service>
 </Server>
@@ -2826,7 +2857,6 @@ allow ${escaped_munin_gather_ip}
 EOF
     fi
     
-
     # install the escenic_jstat munin plugin
     file=/usr/share/munin/plugins/escenic_jstat_
     run wget $wget_opts \

From ad23222a4e430aaba83a594c200287c0f5de5b7a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 7 Feb 2012 19:41:21 +0800
Subject: [PATCH 0274/2585] - updated documentation, added section on virtual
 hosts

---
 usr/share/doc/escenic/ece-install-guide.org | 128 +++++++++++++-------
 1 file changed, 83 insertions(+), 45 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index a42eb87b..c9159163 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -439,55 +439,93 @@ The inclusion of the engine/solr directory makes it easy for users to
 provide their own, optimised Solr configuration. In this context, also
 note that a post install hook, set_up_solr.postinst, is available.
 
+** Setting up virtual hosts
+Setting up virtual host definitions in the application server makes a
+some things easier, such as ECE plugins which set cookies based on
+information they get from the app server.
+
+ece-install can set up the virtual hosts configuration for Tomcat
+application servers if the profile is editorial, all presentation.
+
+To use this feature, you must define one domain for each publication
+in the following FAI parameter:
+#+BEGIN_SRC sh
+fai_publication_domain_mapping_list="
+firepub#fire.escenic.com
+ildpub#ild.escenic.com
+"
+#+END_SRC
+
+This will produce the following stanzas in server.xml:
+
+#+BEGIN_SRC nxml
+<Host name="fire.escenic.com" appBase="webapps" autoDeploy="false">
+  <Context displayName="fire.escenic.com"
+           docBase="firepub"
+           path="/"
+  />
+</Host>
+<Host name="ild.escenic.com" appBase="webapps" autoDeploy="false">
+  <Context displayName="ild.escenic.com"
+           docBase="ildpub"
+           path="/"
+  />
+</Host>
+#+END_SRC
+
+You must of course make sure that these host names are resolvable to
+the intended IPs on your system using /etc/hosts or a local DNS.
+
 ** Overview of All FAI Parameters
 The ece-install script understands for the following settings in the
 $HOME/ece-install.conf file of the root user:
 
-|----------------------------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------|
-| Parameter                        |                                           Default | Description                                                                                                                           |
-|----------------------------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------|
-| fai\_all\_install                |                                                 0 | Install all components on your server.                                                                                                |
-| fai\_cache\_backends             |                                  ${HOSTNAME}:8080 | Space separated, e.g. "app1:8080 app2:8080"                                                                                           |
-| fai\_cache\_install              |                                                 0 | Install cache server profile                                                                                                          |
-| fai\_db\_host                    |                                         $HOSTNAME | Useful for editor & presentation profiles                                                                                             |
-| fai\_db\_drop\_old\_db\_first    |                                                 0 | Warning: this will drop the old database before installing a new one                                                                  |
-| fai\_db\_install                 |                                                 0 | Install db profile                                                                                                                    |
-| fai\_db\_password                |                              read-the-source-luke | Useful for DB installation profile                                                                                                    |
-| fai\_db\_port                    |                                              3306 | Useful for editor & presentation profiles                                                                                             |
-| fai\_db\_schema                  |                                            ece5db | Useful for DB installation profile                                                                                                    |
-| fai\_db\_user                    |                                          ece5user | Useful for DB installation profile                                                                                                    |
-| fai\_editor\_conf\_archive       |                                                "" | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
-| fai\_editor\_ear                 |                                                "" | EAR to use instead of the Escenic binaries                                                                                            |
-| fai\_editor\_install             |                                                 0 | Install the editorial profile                                                                                                         |
-| fai\_editor\_name                |                                           editor1 | Name of the editor instance                                                                                                           |
-| fai\_editor\_port                |                                              8080 | HTTP port of the editor instance                                                                                                      |
-| fai\_editor\_shutdown            |                                              8005 | Shutdown port of the editor instance                                                                                                  |
-| fai\_enabled                     |                                                 0 | Whether or not to run ece-install in FAI mode                                                                                         |
-| fai\_monitoring\_server\_install |                                                 0 | Install the monitoring server profile.                                                                                                |
-| fai\_monitoring\_server\_ip      |                                         127.0.0.1 | The IP of the monitoring server.                                                                                                      |
-| fai\_presentation\_conf\_archive |                                                "" | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
-| fai\_presentation\_ear           |                                                "" | EAR to use instead of the Escenic binaries                                                                                            |
-| fai\_presentation\_install       |                                                 0 | Install the presentation server profile                                                                                               |
-| fai\_presentation\_name          |                                              web1 | Name of the presentation server instance                                                                                              |
-| fai\_presentation\_port          |                                              8080 | HTTP port of the presentation server instance                                                                                         |
-| fai\_presentation\_shutdown      |                                              8005 | Shutdown port of the presentation instance                                                                                            |
-| fai\_public\_host\_name          |                                  ${HOSTNAME}:8080 | The public address for your website                                                                                                   |
-| fai\_publication\_create         |                                                 0 | Create a new publication                                                                                                              |
-| fai\_publication\_name           |                                             mypub | Name of the publication                                                                                                               |
-| fai\_publication\_use\_instance  |                                              dev1 | Name of local instance to use for creation                                                                                            |
-| fai\_publication\_war            |                              "WF or ECE demo WAR" | WAR to base the new publication on                                                                                                    |
-| fai\_publication\_war\_uri\_list |                                                "" | Publication WARs used for setting up Assembly tool. Supported: http[s]://tmp.com/mypub.war, file:///tmp/mypub.war and /tmp/mypub.war. |
-| fai\_rmi\_install                |                                                 0 | Install RMI hub profile                                                                                                               |
-| fai\_search\_conf\_archive       |                                                "" | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
-| fai\_search\_ear                 |                                                "" | EAR to use instead of the Escenic binaries                                                                                            |
-| fai\_search\_for\_editor         |                                                 0 | If 1 (true), will configure Solr for use with an editorial server, if not conf for presentation servers will be chosen.               |
-| fai\_search\_indexer\_ws\_uri    | http://${HOSTNAME}:8080/indexer-webservice/index/ | URI of the indexer-webservice that the search instance shall use for knowing what to index.                                           |
-| fai\_search\_install             |                                                 0 | Install the search server profile (Solr + indexer)                                                                                    |
-| fai\_search\_name                |                                           search1 | Name of the search instance                                                                                                           |
-| fai\_search\_port                |                                              8080 | HTTP port of the search instance                                                                                                      |
-| fai\_search\_shutdown            |                                              8005 | Shutdown port of the search instance                                                                                                  |
-| fai\_wf\_install                 |                                                 0 | Install Widget Framework profile                                                                                                      |
-|----------------------------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------|
+|-----------------------------------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------|
+| Parameter                               | Default                                           | Description                                                                                                                           |
+|-----------------------------------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------|
+| fai\_all\_install                       | 0                                                 | Install all components on your server.                                                                                                |
+| fai\_cache\_backends                    | ${HOSTNAME}:8080                                  | Space separated, e.g. "app1:8080 app2:8080"                                                                                           |
+| fai\_cache\_install                     | 0                                                 | Install cache server profile                                                                                                          |
+| fai\_db\_host                           | $HOSTNAME                                         | Useful for editor & presentation profiles                                                                                             |
+| fai\_db\_drop\_old\_db\_first           | 0                                                 | Warning: this will drop the old database before installing a new one                                                                  |
+| fai\_db\_install                        | 0                                                 | Install db profile                                                                                                                    |
+| fai\_db\_password                       | read-the-source-luke                              | Useful for DB installation profile                                                                                                    |
+| fai\_db\_port                           | 3306                                              | Useful for editor & presentation profiles                                                                                             |
+| fai\_db\_schema                         | ece5db                                            | Useful for DB installation profile                                                                                                    |
+| fai\_db\_user                           | ece5user                                          | Useful for DB installation profile                                                                                                    |
+| fai\_editor\_conf\_archive              | ""                                                | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
+| fai\_editor\_ear                        | ""                                                | EAR to use instead of the Escenic binaries                                                                                            |
+| fai\_editor\_install                    | 0                                                 | Install the editorial profile                                                                                                         |
+| fai\_editor\_name                       | editor1                                           | Name of the editor instance                                                                                                           |
+| fai\_editor\_port                       | 8080                                              | HTTP port of the editor instance                                                                                                      |
+| fai\_editor\_shutdown                   | 8005                                              | Shutdown port of the editor instance                                                                                                  |
+| fai\_enabled                            | 0                                                 | Whether or not to run ece-install in FAI mode                                                                                         |
+| fai\_monitoring\_server\_install        | 0                                                 | Install the monitoring server profile.                                                                                                |
+| fai\_monitoring\_server\_ip             | 127.0.0.1                                         | The IP of the monitoring server.                                                                                                      |
+| fai\_presentation\_conf\_archive        | ""                                                | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
+| fai\_presentation\_ear                  | ""                                                | EAR to use instead of the Escenic binaries                                                                                            |
+| fai\_presentation\_install              | 0                                                 | Install the presentation server profile                                                                                               |
+| fai\_presentation\_name                 | web1                                              | Name of the presentation server instance                                                                                              |
+| fai\_presentation\_port                 | 8080                                              | HTTP port of the presentation server instance                                                                                         |
+| fai\_presentation\_shutdown             | 8005                                              | Shutdown port of the presentation instance                                                                                            |
+| fai\_public\_host\_name                 | ${HOSTNAME}:8080                                  | The public address for your website                                                                                                   |
+| fai\_publication\_create                | 0                                                 | Create a new publication                                                                                                              |
+| fai\_publication\_name                  | mypub                                             | Name of the publication                                                                                                               |
+| fai\_publication\_use\_instance         | dev1                                              | Name of local instance to use for creation                                                                                            |
+| fai\_publication\_war                   | "WF or ECE demo WAR"                              | WAR to base the new publication on                                                                                                    |
+| fai\_publication\_war\_uri\_list        | ""                                                | Publication WARs used for setting up Assembly tool. Supported: http[s]://tmp.com/mypub.war, file:///tmp/mypub.war and /tmp/mypub.war. |
+| fai\_publication\_domain\_mapping\_list | ""                                                | Mapping between publication names and their corresponding domains on the form: "one#one.com other#other.com"                          |
+| fai\_rmi\_install                       | 0                                                 | Install RMI hub profile                                                                                                               |
+| fai\_search\_conf\_archive              | ""                                                | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
+| fai\_search\_ear                        | ""                                                | EAR to use instead of the Escenic binaries                                                                                            |
+| fai\_search\_for\_editor                | 0                                                 | If 1 (true), will configure Solr for use with an editorial server, if not conf for presentation servers will be chosen.               |
+| fai\_search\_indexer\_ws\_uri           | http://${HOSTNAME}:8080/indexer-webservice/index/ | URI of the indexer-webservice that the search instance shall use for knowing what to index.                                           |
+| fai\_search\_install                    | 0                                                 | Install the search server profile (Solr + indexer)                                                                                    |
+| fai\_search\_name                       | search1                                           | Name of the search instance                                                                                                           |
+| fai\_search\_port                       | 8080                                              | HTTP port of the search instance                                                                                                      |
+| fai\_search\_shutdown                   | 8005                                              | Shutdown port of the search instance                                                                                                  |
+| fai\_wf\_install                        | 0                                                 | Install Widget Framework profile                                                                                                      |
+|-----------------------------------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------|
 #+TBLFM: $2=http://$fai_editor_name:$fai_editor_port/indexer-webservice/index/                   0
 
 As you've probably have guessed, 0 means "false" and 1 means "true" :-)

From 960dcbdf43ba9373690195c53ea66299e2e698be Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 7 Feb 2012 19:41:37 +0800
Subject: [PATCH 0275/2585] - updated HTML export

---
 usr/share/doc/escenic/ece-install-guide.html | 414 +++++++++++++------
 1 file changed, 294 insertions(+), 120 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.html b/usr/share/doc/escenic/ece-install-guide.html
index ef9e1c5d..e49f7282 100644
--- a/usr/share/doc/escenic/ece-install-guide.html
+++ b/usr/share/doc/escenic/ece-install-guide.html
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
                "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-lang="en" xml:lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
 <title>Welcome to the /usr/sbin/ece-install Guide</title>
 <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
+<meta name="title" content="Welcome to the /usr/sbin/ece-install Guide"/>
 <meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2012-01-18 13:15:34 CST"/>
+<meta name="generated" content="2012-02-07 19:40:37 CST"/>
 <meta name="author" content="Torstein Krause Johansen"/>
 <meta name="description" content=""/>
 <meta name="keywords" content=""/>
@@ -67,6 +67,10 @@
   margin: 70px 70px 0px 50px;
 }
 
+pre {
+  background-color: grey;
+}
+
 h1, h2 {
   color: #e88424;
 }
@@ -224,84 +228,92 @@ <h1 class="title">Welcome to the /usr/sbin/ece-install Guide</h1>
 <h2>Table of Contents</h2>
 <div id="text-table-of-contents">
 <ul>
-<li><a href="#sec-1">1 Supported Operating Systems </a>
+<li><a href="#sec-1">1 Supported Operating Systems</a>
 <ul>
 <li>
 <ul>
-<li><a href="#sec-1-1">1.1 Debian based operating systems </a></li>
-<li><a href="#sec-1-2">1.2 Other GNU/Linux and Unix systems </a></li>
+<li><a href="#sec-1-1">1.1 Debian based operating systems</a></li>
+<li><a href="#sec-1-2">1.2 Other GNU/Linux and Unix systems</a></li>
 </ul></li>
 </ul>
 </li>
-<li><a href="#sec-2">2 A Note on Running ece-install On Non-GNU/Linux Systems </a></li>
-<li><a href="#sec-3">3 Downloading the ece-install Script </a></li>
-<li><a href="#sec-4">4 Running the ece-install Script </a></li>
-<li><a href="#sec-5">5 Available Server Profiles </a>
+<li><a href="#sec-2">2 A Note on Running ece-install On Non-GNU/Linux Systems</a></li>
+<li><a href="#sec-3">3 Downloading the ece-install Script</a></li>
+<li><a href="#sec-4">4 Running the ece-install Script</a></li>
+<li><a href="#sec-5">5 Available Server Profiles</a>
 <ul>
-<li><a href="#sec-5-1">5.1 Common for All Server Profiles </a></li>
-<li><a href="#sec-5-2">5.2 Common for Editorial, Presentation and Search Instances </a>
+<li><a href="#sec-5-1">5.1 Common for All Server Profiles</a></li>
+<li><a href="#sec-5-2">5.2 Common for Editorial, Presentation and Search Instances</a>
 <ul>
-<li><a href="#sec-5-2-1">5.2.1 Sun Java 6 </a></li>
-<li><a href="#sec-5-2-2">5.2.2 Apache Tomcat application server </a></li>
-<li><a href="#sec-5-2-3">5.2.3 Basic Escenic Nursery configuration </a></li>
-<li><a href="#sec-5-2-4">5.2.4 APR, native library for optimal Tomcat I/O performance </a></li>
-<li><a href="#sec-5-2-5">5.2.5 Escenic Assembly environment </a></li>
-<li><a href="#sec-5-2-6">5.2.6 Database driver </a></li>
-<li><a href="#sec-5-2-7">5.2.7 Compression of content </a></li>
+<li><a href="#sec-5-2-1">5.2.1 Sun Java 6</a></li>
+<li><a href="#sec-5-2-2">5.2.2 Apache Tomcat application server</a></li>
+<li><a href="#sec-5-2-3">5.2.3 Basic Escenic Nursery configuration</a></li>
+<li><a href="#sec-5-2-4">5.2.4 APR, native library for optimal Tomcat I/O performance</a></li>
+<li><a href="#sec-5-2-5">5.2.5 Escenic Assembly environment</a></li>
+<li><a href="#sec-5-2-6">5.2.6 Database driver</a></li>
+<li><a href="#sec-5-2-7">5.2.7 Compression of content</a></li>
 </ul>
 </li>
-<li><a href="#sec-5-3">5.3 Profile - Full Stack on One Host </a></li>
-<li><a href="#sec-5-4">5.4 Profile - Editorial Server (Publication Server) </a></li>
-<li><a href="#sec-5-5">5.5 Profile - Presentation Server </a></li>
-<li><a href="#sec-5-6">5.6 Profile - Database Server </a></li>
-<li><a href="#sec-5-7">5.7 Profile - Cache Server </a></li>
-<li><a href="#sec-5-8">5.8 Profile - Install Widget Framework </a></li>
-<li><a href="#sec-5-9">5.9 Profile - Create Publication </a></li>
-<li><a href="#sec-5-10">5.10 Profile - Monitoring Server </a></li>
-<li><a href="#sec-5-11">5.11 Profile - Restoring from backup </a></li>
-<li><a href="#sec-5-12">5.12 Running interactively </a>
+<li><a href="#sec-5-3">5.3 Profile - Full Stack on One Host</a></li>
+<li><a href="#sec-5-4">5.4 Profile - Editorial Server (Publication Server)</a></li>
+<li><a href="#sec-5-5">5.5 Profile - Presentation Server</a></li>
+<li><a href="#sec-5-6">5.6 Profile - Database Server</a></li>
+<li><a href="#sec-5-7">5.7 Profile - Cache Server</a></li>
+<li><a href="#sec-5-8">5.8 Profile - Install Widget Framework</a></li>
+<li><a href="#sec-5-9">5.9 Profile - Create Publication</a></li>
+<li><a href="#sec-5-10">5.10 Profile - Monitoring Server</a></li>
+<li><a href="#sec-5-11">5.11 Profile - Restoring from backup</a></li>
+<li><a href="#sec-5-12">5.12 Running interactively</a>
 <ul>
-<li><a href="#sec-5-12-1">5.12.1 Start ece-install and choose the Option, "Restore from backup" </a></li>
-<li><a href="#sec-5-12-2">5.12.2 Select Which Backup to Restore </a></li>
-<li><a href="#sec-5-12-3">5.12.3 Choose What to Restore </a></li>
-<li><a href="#sec-5-12-4">5.12.4 Sit Back and Watch ece-install Restore the Data for You </a></li>
+<li><a href="#sec-5-12-1">5.12.1 Start ece-install and choose the Option, "Restore from backup"</a></li>
+<li><a href="#sec-5-12-2">5.12.2 Select Which Backup to Restore</a></li>
+<li><a href="#sec-5-12-3">5.12.3 Choose What to Restore</a></li>
+<li><a href="#sec-5-12-4">5.12.4 Sit Back and Watch ece-install Restore the Data for You</a></li>
 </ul>
 </li>
-<li><a href="#sec-5-13">5.13 Running in FAI mode </a></li>
-<li><a href="#sec-5-14">5.14 Data security </a></li>
+<li><a href="#sec-5-13">5.13 Running in FAI mode</a></li>
+<li><a href="#sec-5-14">5.14 Data security</a></li>
 </ul>
 </li>
-<li><a href="#sec-6">6 Full Automatic Install (FAI) </a>
+<li><a href="#sec-6">6 Full Automatic Install (FAI)</a>
 <ul>
-<li><a href="#sec-6-1">6.1 Installing from EARs instead of Binaries </a></li>
-<li><a href="#sec-6-2">6.2 Overview of All FAI Parameters </a></li>
-<li><a href="#sec-6-3">6.3 Examples </a>
+<li><a href="#sec-6-1">6.1 Installing from EARs instead of Binaries</a></li>
+<li><a href="#sec-6-2">6.2 Setting up virtual hosts</a></li>
+<li><a href="#sec-6-3">6.3 Overview of All FAI Parameters</a></li>
+<li><a href="#sec-6-4">6.4 Examples</a>
 <ul>
-<li><a href="#sec-6-3-1">6.3.1 Installing an Editorial Server &amp; Create a Publication </a></li>
-<li><a href="#sec-6-3-2">6.3.2 Installing Two Presentation Servers On a Single Host </a></li>
+<li><a href="#sec-6-4-1">6.4.1 Installing an Editorial Server &amp; Create a Publication</a></li>
+<li><a href="#sec-6-4-2">6.4.2 Installing Two Presentation Servers On a Single Host</a></li>
 </ul>
 </li>
-<li><a href="#sec-6-4">6.4 Verifying That the Script Is Running In FAI Mode </a></li>
+<li><a href="#sec-6-5">6.5 Verifying That the Script Is Running In FAI Mode</a></li>
 </ul>
 </li>
-<li><a href="#sec-7">7 Running More Than One Installation Process </a></li>
-<li><a href="#sec-8">8 Re-running ece-install (and How To Speed It Up) </a></li>
-<li><a href="#sec-9">9 Using a Custom Configuration File for ece-install </a></li>
-<li><a href="#sec-10">10 Overview of File Paths Used by the ece-install script </a></li>
-<li><a href="#sec-11">11 Overriding the Escenic directories </a></li>
-<li><a href="#sec-12">12 Assumptions </a>
+<li><a href="#sec-7">7 Running More Than One Installation Process</a></li>
+<li><a href="#sec-8">8 Re-running ece-install (and How To Speed It Up)</a></li>
+<li><a href="#sec-9">9 Using a Custom Configuration File for ece-install</a></li>
+<li><a href="#sec-10">10 Overview of File Paths Used by the ece-install script</a></li>
+<li><a href="#sec-11">11 Overriding the Escenic directories</a></li>
+<li><a href="#sec-12">12 Extending ece-install by Writing Hooks</a>
 <ul>
-<li><a href="#sec-12-1">12.1 /etc/esecenic is shared </a></li>
+<li><a href="#sec-12-1">12.1 Accessing ece-install variables</a></li>
+<li><a href="#sec-12-2">12.2 Example hook</a></li>
+<li><a href="#sec-12-3">12.3 Available hooks</a></li>
 </ul>
 </li>
-<li><a href="#sec-13">13 Uninstalling Everything That the ece-install Set Up </a></li>
-<li><a href="#sec-14">14 Example Output FAI </a></li>
+<li><a href="#sec-13">13 Assumptions</a>
+<ul>
+<li><a href="#sec-13-1">13.1 /etc/esecenic is shared</a></li>
+</ul>
+</li>
+<li><a href="#sec-14">14 Uninstalling Everything That the ece-install Set Up</a></li>
+<li><a href="#sec-15">15 Example Output FAI</a></li>
 </ul>
 </div>
 </div>
 
 <div id="outline-container-1" class="outline-2">
-<h2 id="sec-1"><span class="section-number-2">1</span> Supported Operating Systems </h2>
+<h2 id="sec-1"><span class="section-number-2">1</span> Supported Operating Systems</h2>
 <div class="outline-text-2" id="text-1">
 
 <p>For the best experience, run this script on Debian Squeeze (or newer),
@@ -313,7 +325,7 @@ <h2 id="sec-1"><span class="section-number-2">1</span> Supported Operating Syste
 </div>
 
 <div id="outline-container-1-1" class="outline-4">
-<h4 id="sec-1-1"><span class="section-number-4">1.1</span> Debian based operating systems </h4>
+<h4 id="sec-1-1"><span class="section-number-4">1.1</span> Debian based operating systems</h4>
 <div class="outline-text-4" id="text-1-1">
 
 <p>If running on a Debian based operating system, ece-install will take
@@ -325,7 +337,7 @@ <h4 id="sec-1-1"><span class="section-number-4">1.1</span> Debian based operatin
 </div>
 
 <div id="outline-container-1-2" class="outline-4">
-<h4 id="sec-1-2"><span class="section-number-4">1.2</span> Other GNU/Linux and Unix systems </h4>
+<h4 id="sec-1-2"><span class="section-number-4">1.2</span> Other GNU/Linux and Unix systems</h4>
 <div class="outline-text-4" id="text-1-2">
 
 <p>If you're installing on another Linux or Unix system, you must first
@@ -344,7 +356,7 @@ <h4 id="sec-1-2"><span class="section-number-4">1.2</span> Other GNU/Linux and U
 </div>
 
 <div id="outline-container-2" class="outline-2">
-<h2 id="sec-2"><span class="section-number-2">2</span> A Note on Running ece-install On Non-GNU/Linux Systems </h2>
+<h2 id="sec-2"><span class="section-number-2">2</span> A Note on Running ece-install On Non-GNU/Linux Systems</h2>
 <div class="outline-text-2" id="text-2">
 
 <p>Please note, it's assumed that the OS uses GNU's tools, i.e. find, cp
@@ -358,7 +370,7 @@ <h2 id="sec-2"><span class="section-number-2">2</span> A Note on Running ece-ins
 </div>
 
 <div id="outline-container-3" class="outline-2">
-<h2 id="sec-3"><span class="section-number-2">3</span> Downloading the ece-install Script </h2>
+<h2 id="sec-3"><span class="section-number-2">3</span> Downloading the ece-install Script</h2>
 <div class="outline-text-2" id="text-3">
 
 <p>The ece-install script can be downloaded from:
@@ -376,7 +388,7 @@ <h2 id="sec-3"><span class="section-number-2">3</span> Downloading the ece-insta
 </div>
 
 <div id="outline-container-4" class="outline-2">
-<h2 id="sec-4"><span class="section-number-2">4</span> Running the ece-install Script </h2>
+<h2 id="sec-4"><span class="section-number-2">4</span> Running the ece-install Script</h2>
 <div class="outline-text-2" id="text-4">
 
 <p>You must run the script as the root user.  If you start the script as
@@ -488,7 +500,7 @@ <h2 id="sec-4"><span class="section-number-2">4</span> Running the ece-install S
 </div>
 
 <div id="outline-container-5" class="outline-2">
-<h2 id="sec-5"><span class="section-number-2">5</span> Available Server Profiles </h2>
+<h2 id="sec-5"><span class="section-number-2">5</span> Available Server Profiles</h2>
 <div class="outline-text-2" id="text-5">
 
 <p>When starting the script, it will ask you which server profile you
@@ -518,7 +530,7 @@ <h2 id="sec-5"><span class="section-number-2">5</span> Available Server Profiles
 </div>
 
 <div id="outline-container-5-1" class="outline-3">
-<h3 id="sec-5-1"><span class="section-number-3">5.1</span> Common for All Server Profiles </h3>
+<h3 id="sec-5-1"><span class="section-number-3">5.1</span> Common for All Server Profiles</h3>
 <div class="outline-text-3" id="text-5-1">
 
 <p>The script will install a Munin node on the host. It will also
@@ -530,14 +542,14 @@ <h3 id="sec-5-1"><span class="section-number-3">5.1</span> Common for All Server
 </div>
 
 <div id="outline-container-5-2" class="outline-3">
-<h3 id="sec-5-2"><span class="section-number-3">5.2</span> Common for Editorial, Presentation and Search Instances </h3>
+<h3 id="sec-5-2"><span class="section-number-3">5.2</span> Common for Editorial, Presentation and Search Instances</h3>
 <div class="outline-text-3" id="text-5-2">
 
 
 </div>
 
 <div id="outline-container-5-2-1" class="outline-4">
-<h4 id="sec-5-2-1"><span class="section-number-4">5.2.1</span> Sun Java 6 </h4>
+<h4 id="sec-5-2-1"><span class="section-number-4">5.2.1</span> Sun Java 6</h4>
 <div class="outline-text-4" id="text-5-2-1">
 
 </div>
@@ -545,7 +557,7 @@ <h4 id="sec-5-2-1"><span class="section-number-4">5.2.1</span> Sun Java 6 </h4>
 </div>
 
 <div id="outline-container-5-2-2" class="outline-4">
-<h4 id="sec-5-2-2"><span class="section-number-4">5.2.2</span> Apache Tomcat application server </h4>
+<h4 id="sec-5-2-2"><span class="section-number-4">5.2.2</span> Apache Tomcat application server</h4>
 <div class="outline-text-4" id="text-5-2-2">
 
 <ul>
@@ -567,7 +579,7 @@ <h4 id="sec-5-2-2"><span class="section-number-4">5.2.2</span> Apache Tomcat app
 </div>
 
 <div id="outline-container-5-2-3" class="outline-4">
-<h4 id="sec-5-2-3"><span class="section-number-4">5.2.3</span> Basic Escenic Nursery configuration </h4>
+<h4 id="sec-5-2-3"><span class="section-number-4">5.2.3</span> Basic Escenic Nursery configuration</h4>
 <div class="outline-text-4" id="text-5-2-3">
 
 <p>The basic Nursery configuration is taken care of for you, including RMI,
@@ -577,7 +589,7 @@ <h4 id="sec-5-2-3"><span class="section-number-4">5.2.3</span> Basic Escenic Nur
 </div>
 
 <div id="outline-container-5-2-4" class="outline-4">
-<h4 id="sec-5-2-4"><span class="section-number-4">5.2.4</span> APR, native library for optimal Tomcat I/O performance </h4>
+<h4 id="sec-5-2-4"><span class="section-number-4">5.2.4</span> APR, native library for optimal Tomcat I/O performance</h4>
 <div class="outline-text-4" id="text-5-2-4">
 
 </div>
@@ -585,7 +597,7 @@ <h4 id="sec-5-2-4"><span class="section-number-4">5.2.4</span> APR, native libra
 </div>
 
 <div id="outline-container-5-2-5" class="outline-4">
-<h4 id="sec-5-2-5"><span class="section-number-4">5.2.5</span> Escenic Assembly environment </h4>
+<h4 id="sec-5-2-5"><span class="section-number-4">5.2.5</span> Escenic Assembly environment</h4>
 <div class="outline-text-4" id="text-5-2-5">
 
 <p>The reason why ece-install sets this up on each host, is to make the
@@ -597,7 +609,7 @@ <h4 id="sec-5-2-5"><span class="section-number-4">5.2.5</span> Escenic Assembly
 </div>
 
 <div id="outline-container-5-2-6" class="outline-4">
-<h4 id="sec-5-2-6"><span class="section-number-4">5.2.6</span> Database driver </h4>
+<h4 id="sec-5-2-6"><span class="section-number-4">5.2.6</span> Database driver</h4>
 <div class="outline-text-4" id="text-5-2-6">
 
 
@@ -606,7 +618,7 @@ <h4 id="sec-5-2-6"><span class="section-number-4">5.2.6</span> Database driver <
 </div>
 
 <div id="outline-container-5-2-7" class="outline-4">
-<h4 id="sec-5-2-7"><span class="section-number-4">5.2.7</span> Compression of content </h4>
+<h4 id="sec-5-2-7"><span class="section-number-4">5.2.7</span> Compression of content</h4>
 <div class="outline-text-4" id="text-5-2-7">
 
 <p>This was was previously accomplished by having a web server in fron t
@@ -623,7 +635,7 @@ <h4 id="sec-5-2-7"><span class="section-number-4">5.2.7</span> Compression of co
 </div>
 
 <div id="outline-container-5-3" class="outline-3">
-<h3 id="sec-5-3"><span class="section-number-3">5.3</span> Profile - Full Stack on One Host </h3>
+<h3 id="sec-5-3"><span class="section-number-3">5.3</span> Profile - Full Stack on One Host</h3>
 <div class="outline-text-3" id="text-5-3">
 
 <p>This profile is suitable for developers and admins wanting to set up a
@@ -641,7 +653,7 @@ <h3 id="sec-5-3"><span class="section-number-3">5.3</span> Profile - Full Stack
 </div>
 
 <div id="outline-container-5-4" class="outline-3">
-<h3 id="sec-5-4"><span class="section-number-3">5.4</span> Profile - Editorial Server (Publication Server) </h3>
+<h3 id="sec-5-4"><span class="section-number-3">5.4</span> Profile - Editorial Server (Publication Server)</h3>
 <div class="outline-text-3" id="text-5-4">
 
 <p>Will set up a typical editorial server (often referred to as the
@@ -652,7 +664,7 @@ <h3 id="sec-5-4"><span class="section-number-3">5.4</span> Profile - Editorial S
 </div>
 
 <div id="outline-container-5-5" class="outline-3">
-<h3 id="sec-5-5"><span class="section-number-3">5.5</span> Profile - Presentation Server </h3>
+<h3 id="sec-5-5"><span class="section-number-3">5.5</span> Profile - Presentation Server</h3>
 <div class="outline-text-3" id="text-5-5">
 
 <p>This will set up a typical presentation server:
@@ -670,7 +682,7 @@ <h3 id="sec-5-5"><span class="section-number-3">5.5</span> Profile - Presentatio
 </div>
 
 <div id="outline-container-5-6" class="outline-3">
-<h3 id="sec-5-6"><span class="section-number-3">5.6</span> Profile - Database Server </h3>
+<h3 id="sec-5-6"><span class="section-number-3">5.6</span> Profile - Database Server</h3>
 <div class="outline-text-3" id="text-5-6">
 
 <p>If ece-install is run on a support version of Debian or Ubuntu, this
@@ -704,7 +716,7 @@ <h3 id="sec-5-6"><span class="section-number-3">5.6</span> Profile - Database Se
 </div>
 
 <div id="outline-container-5-7" class="outline-3">
-<h3 id="sec-5-7"><span class="section-number-3">5.7</span> Profile - Cache Server </h3>
+<h3 id="sec-5-7"><span class="section-number-3">5.7</span> Profile - Cache Server</h3>
 <div class="outline-text-3" id="text-5-7">
 
 <p>If ece-install is run on a support version of Debian or Ubuntu, it
@@ -765,7 +777,7 @@ <h3 id="sec-5-7"><span class="section-number-3">5.7</span> Profile - Cache Serve
 </div>
 
 <div id="outline-container-5-8" class="outline-3">
-<h3 id="sec-5-8"><span class="section-number-3">5.8</span> Profile - Install Widget Framework </h3>
+<h3 id="sec-5-8"><span class="section-number-3">5.8</span> Profile - Install Widget Framework</h3>
 <div class="outline-text-3" id="text-5-8">
 
 <p>You'll need a user name and password for accessing the
@@ -788,7 +800,7 @@ <h3 id="sec-5-8"><span class="section-number-3">5.8</span> Profile - Install Wid
 </div>
 
 <div id="outline-container-5-9" class="outline-3">
-<h3 id="sec-5-9"><span class="section-number-3">5.9</span> Profile - Create Publication </h3>
+<h3 id="sec-5-9"><span class="section-number-3">5.9</span> Profile - Create Publication</h3>
 <div class="outline-text-3" id="text-5-9">
 
 <p>This profile will create a publication for you, only asking you the
@@ -804,7 +816,7 @@ <h3 id="sec-5-9"><span class="section-number-3">5.9</span> Profile - Create Publ
 </div>
 
 <div id="outline-container-5-10" class="outline-3">
-<h3 id="sec-5-10"><span class="section-number-3">5.10</span> Profile - Monitoring Server </h3>
+<h3 id="sec-5-10"><span class="section-number-3">5.10</span> Profile - Monitoring Server</h3>
 <div class="outline-text-3" id="text-5-10">
 
 <p>This will install a Munin gatherer and web server. The latter for
@@ -819,7 +831,7 @@ <h3 id="sec-5-10"><span class="section-number-3">5.10</span> Profile - Monitorin
 </div>
 
 <div id="outline-container-5-11" class="outline-3">
-<h3 id="sec-5-11"><span class="section-number-3">5.11</span> Profile - Restoring from backup </h3>
+<h3 id="sec-5-11"><span class="section-number-3">5.11</span> Profile - Restoring from backup</h3>
 <div class="outline-text-3" id="text-5-11">
 
 <p>ece-install can restore from a backup made by the ece script:
@@ -851,14 +863,14 @@ <h3 id="sec-5-11"><span class="section-number-3">5.11</span> Profile - Restoring
 </div>
 
 <div id="outline-container-5-12" class="outline-3">
-<h3 id="sec-5-12"><span class="section-number-3">5.12</span> Running interactively </h3>
+<h3 id="sec-5-12"><span class="section-number-3">5.12</span> Running interactively</h3>
 <div class="outline-text-3" id="text-5-12">
 
 
 </div>
 
 <div id="outline-container-5-12-1" class="outline-4">
-<h4 id="sec-5-12-1"><span class="section-number-4">5.12.1</span> Start ece-install and choose the Option, "Restore from backup" </h4>
+<h4 id="sec-5-12-1"><span class="section-number-4">5.12.1</span> Start ece-install and choose the Option, "Restore from backup"</h4>
 <div class="outline-text-4" id="text-5-12-1">
 
 
@@ -873,7 +885,7 @@ <h4 id="sec-5-12-1"><span class="section-number-4">5.12.1</span> Start ece-insta
 </div>
 
 <div id="outline-container-5-12-2" class="outline-4">
-<h4 id="sec-5-12-2"><span class="section-number-4">5.12.2</span> Select Which Backup to Restore </h4>
+<h4 id="sec-5-12-2"><span class="section-number-4">5.12.2</span> Select Which Backup to Restore</h4>
 <div class="outline-text-4" id="text-5-12-2">
 
 
@@ -904,7 +916,7 @@ <h4 id="sec-5-12-2"><span class="section-number-4">5.12.2</span> Select Which Ba
 </div>
 
 <div id="outline-container-5-12-3" class="outline-4">
-<h4 id="sec-5-12-3"><span class="section-number-4">5.12.3</span> Choose What to Restore </h4>
+<h4 id="sec-5-12-3"><span class="section-number-4">5.12.3</span> Choose What to Restore</h4>
 <div class="outline-text-4" id="text-5-12-3">
 
 
@@ -924,7 +936,7 @@ <h4 id="sec-5-12-3"><span class="section-number-4">5.12.3</span> Choose What to
 </div>
 
 <div id="outline-container-5-12-4" class="outline-4">
-<h4 id="sec-5-12-4"><span class="section-number-4">5.12.4</span> Sit Back and Watch ece-install Restore the Data for You </h4>
+<h4 id="sec-5-12-4"><span class="section-number-4">5.12.4</span> Sit Back and Watch ece-install Restore the Data for You</h4>
 <div class="outline-text-4" id="text-5-12-4">
 
 
@@ -944,7 +956,7 @@ <h4 id="sec-5-12-4"><span class="section-number-4">5.12.4</span> Sit Back and Wa
 </div>
 
 <div id="outline-container-5-13" class="outline-3">
-<h3 id="sec-5-13"><span class="section-number-3">5.13</span> Running in FAI mode </h3>
+<h3 id="sec-5-13"><span class="section-number-3">5.13</span> Running in FAI mode</h3>
 <div class="outline-text-3" id="text-5-13">
 
 <p>If you're running in FAI mode, you can choose between these settings
@@ -988,7 +1000,7 @@ <h3 id="sec-5-13"><span class="section-number-3">5.13</span> Running in FAI mode
 </div>
 
 <div id="outline-container-5-14" class="outline-3">
-<h3 id="sec-5-14"><span class="section-number-3">5.14</span> Data security </h3>
+<h3 id="sec-5-14"><span class="section-number-3">5.14</span> Data security</h3>
 <div class="outline-text-3" id="text-5-14">
 
 <p>You should take heed when running restore, so that you're not
@@ -1019,7 +1031,7 @@ <h3 id="sec-5-14"><span class="section-number-3">5.14</span> Data security </h3>
 </div>
 
 <div id="outline-container-6" class="outline-2">
-<h2 id="sec-6"><span class="section-number-2">6</span> Full Automatic Install (FAI) </h2>
+<h2 id="sec-6"><span class="section-number-2">6</span> Full Automatic Install (FAI)</h2>
 <div class="outline-text-2" id="text-6">
 
 <p>The ece-install script has support for doing a full automatic install
@@ -1059,7 +1071,7 @@ <h2 id="sec-6"><span class="section-number-2">6</span> Full Automatic Install (F
 </div>
 
 <div id="outline-container-6-1" class="outline-3">
-<h3 id="sec-6-1"><span class="section-number-3">6.1</span> Installing from EARs instead of Binaries </h3>
+<h3 id="sec-6-1"><span class="section-number-3">6.1</span> Installing from EARs instead of Binaries</h3>
 <div class="outline-text-3" id="text-6-1">
 
 <p>It is possible to get ece-install to use a supplied EAR and
@@ -1095,6 +1107,15 @@ <h3 id="sec-6-1"><span class="section-number-3">6.1</span> Installing from EARs
 </pre>
 
 
+<p>
+and optionally also:
+</p>
+
+
+<pre class="src src-sh">engine/solr/conf
+</pre>
+
+
 <p>
 A simple way to create this bundle, is to use a server which has the
 assembly environment set up and then do:
@@ -1102,17 +1123,18 @@ <h3 id="sec-6-1"><span class="section-number-3">6.1</span> Installing from EARs
 
 
 
-<pre class="src src-conf"><span style="color: #f0dfaf;">$</span> cd /opt/escenic/engine
-<span style="color: #f0dfaf;">$</span> tar czf /tmp/nursery-skeleton-and-security.tar.gz \
+<pre class="src src-conf"><span style="color: #f0dfaf;">$</span> cd /opt/escenic
+<span style="color: #f0dfaf;">$</span> tar czf /tmp/nursery-skeleton-solr-and-security.tar.gz \
   <span style="color: #f0dfaf;">engine/security</span> \
   <span style="color: #f0dfaf;">engine/siteconfig/config-skeleton/</span> \
+  <span style="color: #f0dfaf;">engine/solr/conf</span> \
   <span style="color: #f0dfaf;">engine/siteconfig/bootstrap-skeleton/</span> \
-  <span style="color: #f0dfaf;">`find</span> -L  assemblytool/plugins/ -name siteconfig`
+  <span style="color: #f0dfaf;">`find</span> -L assemblytool/plugins/ -name siteconfig`
 </pre>
 
 
 <p>
-/tmp/nursery-skeleton-and-security.tar.gz should now have everything
+/tmp/nursery-skeleton-solr-and-security.tar.gz should now have everything
 you need. You can now configure your FAI installation to use these by,
 e.g.:
 </p>
@@ -1120,7 +1142,7 @@ <h3 id="sec-6-1"><span class="section-number-3">6.1</span> Installing from EARs
 
 
 <pre class="src src-conf"><span style="color: #f0dfaf;">fai_presentation_ear</span>=/tmp/engine.ear
-<span style="color: #f0dfaf;">fai_presentation_conf_archive</span>=/tmp/nursery-skeleton-and-security.tar.gz
+<span style="color: #f0dfaf;">fai_presentation_conf_archive</span>=/tmp/nursery-skeleton-solr-and-security.tar.gz
 </pre>
 
 
@@ -1128,14 +1150,73 @@ <h3 id="sec-6-1"><span class="section-number-3">6.1</span> Installing from EARs
 Corresponding configuration options are available for the other server
 profiles, see the table below.
 </p>
+<p>
+The inclusion of the engine/solr directory makes it easy for users to
+provide their own, optimised Solr configuration. In this context, also
+note that a post install hook, set<sub>up</sub><sub>solr</sub>.postinst, is available.
+</p>
 </div>
 
 </div>
 
 <div id="outline-container-6-2" class="outline-3">
-<h3 id="sec-6-2"><span class="section-number-3">6.2</span> Overview of All FAI Parameters </h3>
+<h3 id="sec-6-2"><span class="section-number-3">6.2</span> Setting up virtual hosts</h3>
 <div class="outline-text-3" id="text-6-2">
 
+<p>Setting up virtual host definitions in the application server makes a
+some things easier, such as ECE plugins which set cookies based on
+information they get from the app server.
+</p>
+<p>
+ece-install can set up the virtual hosts configuration for Tomcat
+application servers if the profile is editorial, all presentation.
+</p>
+<p>
+To use this feature, you must define one domain for each publication
+in the following FAI parameter:
+</p>
+
+
+<pre class="src src-sh"><span style="color: #f0dfaf;">fai_publication_domain_mapping_list</span>=<span style="color: #ffa07a;">"</span>
+<span style="color: #ffa07a;">firepub#fire.escenic.com</span>
+<span style="color: #ffa07a;">ildpub#ild.escenic.com</span>
+<span style="color: #ffa07a;">"</span>
+</pre>
+
+
+<p>
+This will produce the following stanzas in server.xml:
+</p>
+
+
+
+<pre class="src src-nxml">&lt;<span style="color: #8cd0d3;">Host</span> <span style="color: #f0dfaf;">name</span>=<span style="color: #ffa07a;">"</span><span style="color: #ffa07a;">fire.escenic.com</span><span style="color: #ffa07a;">"</span> <span style="color: #f0dfaf;">appBase</span>=<span style="color: #ffa07a;">"</span><span style="color: #ffa07a;">webapps</span><span style="color: #ffa07a;">"</span> <span style="color: #f0dfaf;">autoDeploy</span>=<span style="color: #ffa07a;">"</span><span style="color: #ffa07a;">false</span><span style="color: #ffa07a;">"</span>&gt;
+  &lt;<span style="color: #8cd0d3;">Context</span> <span style="color: #f0dfaf;">displayName</span>=<span style="color: #ffa07a;">"</span><span style="color: #ffa07a;">fire.escenic.com</span><span style="color: #ffa07a;">"</span>
+           <span style="color: #f0dfaf;">docBase</span>=<span style="color: #ffa07a;">"</span><span style="color: #ffa07a;">firepub</span><span style="color: #ffa07a;">"</span>
+           <span style="color: #f0dfaf;">path</span>=<span style="color: #ffa07a;">"</span><span style="color: #ffa07a;">/</span><span style="color: #ffa07a;">"</span>
+  /&gt;
+&lt;/<span style="color: #8cd0d3;">Host</span>&gt;
+&lt;<span style="color: #8cd0d3;">Host</span> <span style="color: #f0dfaf;">name</span>=<span style="color: #ffa07a;">"</span><span style="color: #ffa07a;">ild.escenic.com</span><span style="color: #ffa07a;">"</span> <span style="color: #f0dfaf;">appBase</span>=<span style="color: #ffa07a;">"</span><span style="color: #ffa07a;">webapps</span><span style="color: #ffa07a;">"</span> <span style="color: #f0dfaf;">autoDeploy</span>=<span style="color: #ffa07a;">"</span><span style="color: #ffa07a;">false</span><span style="color: #ffa07a;">"</span>&gt;
+  &lt;<span style="color: #8cd0d3;">Context</span> <span style="color: #f0dfaf;">displayName</span>=<span style="color: #ffa07a;">"</span><span style="color: #ffa07a;">ild.escenic.com</span><span style="color: #ffa07a;">"</span>
+           <span style="color: #f0dfaf;">docBase</span>=<span style="color: #ffa07a;">"</span><span style="color: #ffa07a;">ildpub</span><span style="color: #ffa07a;">"</span>
+           <span style="color: #f0dfaf;">path</span>=<span style="color: #ffa07a;">"</span><span style="color: #ffa07a;">/</span><span style="color: #ffa07a;">"</span>
+  /&gt;
+&lt;/<span style="color: #8cd0d3;">Host</span>&gt;
+</pre>
+
+
+<p>
+You must of course make sure that these host names are resolvable to
+the intended IPs on your system using /etc/hosts or a local DNS.
+</p>
+</div>
+
+</div>
+
+<div id="outline-container-6-3" class="outline-3">
+<h3 id="sec-6-3"><span class="section-number-3">6.3</span> Overview of All FAI Parameters</h3>
+<div class="outline-text-3" id="text-6-3">
+
 <p>The ece-install script understands for the following settings in the
 $HOME/ece-install.conf file of the root user:
 </p>
@@ -1151,7 +1232,7 @@ <h3 id="sec-6-2"><span class="section-number-3">6.2</span> Overview of All FAI P
 <tr><td class="left">fai_cache_backends</td><td class="left">${HOSTNAME}:8080</td><td class="left">Space separated, e.g. "app1:8080 app2:8080"</td></tr>
 <tr><td class="left">fai_cache_install</td><td class="left">0</td><td class="left">Install cache server profile</td></tr>
 <tr><td class="left">fai_db_host</td><td class="left">$HOSTNAME</td><td class="left">Useful for editor &amp; presentation profiles</td></tr>
-<tr><td class="left">fai_db_drop<sub>old</sub><sub>db</sub><sub>first</sub></td><td class="left">0</td><td class="left">Warning: this will drop the old database before installing a new one</td></tr>
+<tr><td class="left">fai_db_drop_old_db_first</td><td class="left">0</td><td class="left">Warning: this will drop the old database before installing a new one</td></tr>
 <tr><td class="left">fai_db_install</td><td class="left">0</td><td class="left">Install db profile</td></tr>
 <tr><td class="left">fai_db_password</td><td class="left">read-the-source-luke</td><td class="left">Useful for DB installation profile</td></tr>
 <tr><td class="left">fai_db_port</td><td class="left">3306</td><td class="left">Useful for editor &amp; presentation profiles</td></tr>
@@ -1176,10 +1257,15 @@ <h3 id="sec-6-2"><span class="section-number-3">6.2</span> Overview of All FAI P
 <tr><td class="left">fai_publication_create</td><td class="left">0</td><td class="left">Create a new publication</td></tr>
 <tr><td class="left">fai_publication_name</td><td class="left">mypub</td><td class="left">Name of the publication</td></tr>
 <tr><td class="left">fai_publication_use_instance</td><td class="left">dev1</td><td class="left">Name of local instance to use for creation</td></tr>
-<tr><td class="left">fai_publication_war</td><td class="left">"WF or ECE demo WAR"</td><td class="left">WAR to to base the new publication on</td></tr>
+<tr><td class="left">fai_publication_war</td><td class="left">"WF or ECE demo WAR"</td><td class="left">WAR to base the new publication on</td></tr>
+<tr><td class="left">fai_publication_war_uri_list</td><td class="left">""</td><td class="left">Publication WARs used for setting up Assembly tool. Supported: http[s]://tmp.com/mypub.war, <a href="file:////tmp/mypub.war">///tmp/mypub.war</a> and /tmp/mypub.war.</td></tr>
+<tr><td class="left">fai_publication_domain_mapping_list</td><td class="left">""</td><td class="left">Mapping between publication names and their corresponding domains on the form: one#one.com other#other.com</td></tr>
 <tr><td class="left">fai_rmi_install</td><td class="left">0</td><td class="left">Install RMI hub profile</td></tr>
 <tr><td class="left">fai_search_conf_archive</td><td class="left">""</td><td class="left">conf.tar.gz to use for Nursery &amp; JAAS configuration</td></tr>
 <tr><td class="left">fai_search_ear</td><td class="left">""</td><td class="left">EAR to use instead of the Escenic binaries</td></tr>
+<tr><td class="left">fai_search_for_editor</td><td class="left">0</td><td class="left">If 1 (true), will configure Solr for use with an editorial server, if not conf for presentation servers will be chosen.</td></tr>
+<tr><td class="left">fai_search_indexer_ws_uri</td><td class="left"><a href="http://${HOSTNAME}:8080/indexer-webservice/index/">http://${HOSTNAME}:8080/indexer-webservice/index/</a></td><td class="left">URI of the indexer-webservice that the search instance shall use for knowing what to index.</td></tr>
+<tr><td class="left">fai_search_install</td><td class="left">0</td><td class="left">Install the search server profile (Solr + indexer)</td></tr>
 <tr><td class="left">fai_search_name</td><td class="left">search1</td><td class="left">Name of the search instance</td></tr>
 <tr><td class="left">fai_search_port</td><td class="left">8080</td><td class="left">HTTP port of the search instance</td></tr>
 <tr><td class="left">fai_search_shutdown</td><td class="left">8005</td><td class="left">Shutdown port of the search instance</td></tr>
@@ -1195,16 +1281,16 @@ <h3 id="sec-6-2"><span class="section-number-3">6.2</span> Overview of All FAI P
 
 </div>
 
-<div id="outline-container-6-3" class="outline-3">
-<h3 id="sec-6-3"><span class="section-number-3">6.3</span> Examples </h3>
-<div class="outline-text-3" id="text-6-3">
+<div id="outline-container-6-4" class="outline-3">
+<h3 id="sec-6-4"><span class="section-number-3">6.4</span> Examples</h3>
+<div class="outline-text-3" id="text-6-4">
 
 
 </div>
 
-<div id="outline-container-6-3-1" class="outline-4">
-<h4 id="sec-6-3-1"><span class="section-number-4">6.3.1</span> Installing an Editorial Server &amp; Create a Publication </h4>
-<div class="outline-text-4" id="text-6-3-1">
+<div id="outline-container-6-4-1" class="outline-4">
+<h4 id="sec-6-4-1"><span class="section-number-4">6.4.1</span> Installing an Editorial Server &amp; Create a Publication</h4>
+<div class="outline-text-4" id="text-6-4-1">
 
 <p>To automatically install an editorial server and create a publication
 called "jollygood", the minimal configuration in ece-install.conf
@@ -1224,9 +1310,9 @@ <h4 id="sec-6-3-1"><span class="section-number-4">6.3.1</span> Installing an Edi
 
 </div>
 
-<div id="outline-container-6-3-2" class="outline-4">
-<h4 id="sec-6-3-2"><span class="section-number-4">6.3.2</span> Installing Two Presentation Servers On a Single Host </h4>
-<div class="outline-text-4" id="text-6-3-2">
+<div id="outline-container-6-4-2" class="outline-4">
+<h4 id="sec-6-4-2"><span class="section-number-4">6.4.2</span> Installing Two Presentation Servers On a Single Host</h4>
+<div class="outline-text-4" id="text-6-4-2">
 
 <p>If you wish to only install two presentation servers called "web1" and
 "web2" on your host, you will first run ece-install with:
@@ -1262,9 +1348,9 @@ <h4 id="sec-6-3-2"><span class="section-number-4">6.3.2</span> Installing Two Pr
 
 </div>
 
-<div id="outline-container-6-4" class="outline-3">
-<h3 id="sec-6-4"><span class="section-number-3">6.4</span> Verifying That the Script Is Running In FAI Mode </h3>
-<div class="outline-text-3" id="text-6-4">
+<div id="outline-container-6-5" class="outline-3">
+<h3 id="sec-6-5"><span class="section-number-3">6.5</span> Verifying That the Script Is Running In FAI Mode</h3>
+<div class="outline-text-3" id="text-6-5">
 
 <p>When FAI is enabled, ece-install will report:
 </p>
@@ -1281,7 +1367,7 @@ <h3 id="sec-6-4"><span class="section-number-3">6.4</span> Verifying That the Sc
 </div>
 
 <div id="outline-container-7" class="outline-2">
-<h2 id="sec-7"><span class="section-number-2">7</span> Running More Than One Installation Process </h2>
+<h2 id="sec-7"><span class="section-number-2">7</span> Running More Than One Installation Process</h2>
 <div class="outline-text-2" id="text-7">
 
 <p>If the script believes there's already an ece-intall process running,
@@ -1301,7 +1387,7 @@ <h2 id="sec-7"><span class="section-number-2">7</span> Running More Than One Ins
 </div>
 
 <div id="outline-container-8" class="outline-2">
-<h2 id="sec-8"><span class="section-number-2">8</span> Re-running ece-install (and How To Speed It Up) </h2>
+<h2 id="sec-8"><span class="section-number-2">8</span> Re-running ece-install (and How To Speed It Up)</h2>
 <div class="outline-text-2" id="text-8">
 
 <p>Although the initial thought behind ece-install, is to run it on a
@@ -1324,7 +1410,7 @@ <h2 id="sec-8"><span class="section-number-2">8</span> Re-running ece-install (a
 </p>
 <p>
 To get a list of the artifacts it'll pull from
-<a href="http://technet.escenic.com">http://technet.escenic.com</a> and http://tomcat.apache.org search for the
+<a href="http://technet.escenic.com">http://technet.escenic.com</a> and <a href="http://tomcat.apache.org">http://tomcat.apache.org</a> search for the
 following variables:
 </p><ul>
 <li>technet_download_list
@@ -1346,7 +1432,7 @@ <h2 id="sec-8"><span class="section-number-2">8</span> Re-running ece-install (a
 </div>
 
 <div id="outline-container-9" class="outline-2">
-<h2 id="sec-9"><span class="section-number-2">9</span> Using a Custom Configuration File for ece-install </h2>
+<h2 id="sec-9"><span class="section-number-2">9</span> Using a Custom Configuration File for ece-install</h2>
 <div class="outline-text-2" id="text-9">
 
 <p>You can specify a different configuration by using the -f parameter: 
@@ -1362,7 +1448,7 @@ <h2 id="sec-9"><span class="section-number-2">9</span> Using a Custom Configurat
 </div>
 
 <div id="outline-container-10" class="outline-2">
-<h2 id="sec-10"><span class="section-number-2">10</span> Overview of File Paths Used by the ece-install script </h2>
+<h2 id="sec-10"><span class="section-number-2">10</span> Overview of File Paths Used by the ece-install script</h2>
 <div class="outline-text-2" id="text-10">
 
 <p>There are of course other paths involved when setting up your system,
@@ -1414,7 +1500,7 @@ <h2 id="sec-10"><span class="section-number-2">10</span> Overview of File Paths
 </div>
 
 <div id="outline-container-11" class="outline-2">
-<h2 id="sec-11"><span class="section-number-2">11</span> Overriding the Escenic directories </h2>
+<h2 id="sec-11"><span class="section-number-2">11</span> Overriding the Escenic directories</h2>
 <div class="outline-text-2" id="text-11">
 
 <p>All of the Escenic specific directories may be overwritten in
@@ -1449,16 +1535,104 @@ <h2 id="sec-11"><span class="section-number-2">11</span> Overriding the Escenic
 </div>
 
 <div id="outline-container-12" class="outline-2">
-<h2 id="sec-12"><span class="section-number-2">12</span> Assumptions </h2>
+<h2 id="sec-12"><span class="section-number-2">12</span> Extending ece-install by Writing Hooks</h2>
 <div class="outline-text-2" id="text-12">
 
+<p>ece-install  has a number of hooks on which you can hook on your own
+scripts. The scripts are to reside in $HOME/ece-conf.d/ and have names
+inspired by Debian's package scripts:
+</p>
+
+
+
+<pre class="src src-conf"><span style="color: #f0dfaf;">&lt;hook</span> name&gt;.&lt;phase&gt;
+</pre>
+
+
+<p>
+e.g.:
+</p>
+
+
+
+<pre class="src src-conf"><span style="color: #f0dfaf;">install_analysis_server.preinst</span>
+</pre>
+
+
+<p>
+Will be run before the body of the hook, just the corresponding
+.postinst hook will be run after.
+</p>
 
 </div>
 
 <div id="outline-container-12-1" class="outline-3">
-<h3 id="sec-12-1"><span class="section-number-3">12.1</span> /etc/esecenic is shared </h3>
+<h3 id="sec-12-1"><span class="section-number-3">12.1</span> Accessing ece-install variables</h3>
 <div class="outline-text-3" id="text-12-1">
 
+<p>Before running the hook, ece-install will make all its local variables
+available in /var/run/escenic/ece-install.env, which can then be used
+by the hook scripts.
+</p>
+</div>
+
+</div>
+
+<div id="outline-container-12-2" class="outline-3">
+<h3 id="sec-12-2"><span class="section-number-3">12.2</span> Example hook</h3>
+<div class="outline-text-3" id="text-12-2">
+
+<p>Here is an example hook which will be run after the EAE is installed.
+</p>
+
+
+
+<pre class="src src-sh"><span style="color: #7f9f7f; font-style: italic;"># </span><span style="color: #7f9f7f; font-style: italic;">Put this in is $HOME/ece-install.d/install_analysis_server.postinst</span>
+
+<span style="color: #7f9f7f; font-style: italic;"># </span><span style="color: #7f9f7f; font-style: italic;">read ece-install's current variables</span>
+<span style="color: #b0c4de;">source</span> /var/run/escenic/ece-install.env
+
+<span style="color: #7f9f7f; font-style: italic;"># </span><span style="color: #7f9f7f; font-style: italic;">do something useful</span>
+<span style="color: #b0c4de;">echo</span> <span style="color: #ffa07a;">"Hello from $0, EAE is installed in ${tomcat_base}"</span> &gt; /tmp/hello.txt
+</pre>
+
+
+</div>
+
+</div>
+
+<div id="outline-container-12-3" class="outline-3">
+<h3 id="sec-12-3"><span class="section-number-3">12.3</span> Available hooks</h3>
+<div class="outline-text-3" id="text-12-3">
+
+<p>Currently, the following hooks are available:
+</p>
+
+
+
+<pre class="src src-sh">install_analysis_server.preinst
+install_analysis_server.postinst
+set_up_solr.preinst
+set_up_solr.postinst
+</pre>
+
+
+</div>
+</div>
+
+</div>
+
+<div id="outline-container-13" class="outline-2">
+<h2 id="sec-13"><span class="section-number-2">13</span> Assumptions</h2>
+<div class="outline-text-2" id="text-13">
+
+
+</div>
+
+<div id="outline-container-13-1" class="outline-3">
+<h3 id="sec-13-1"><span class="section-number-3">13.1</span> /etc/esecenic is shared</h3>
+<div class="outline-text-3" id="text-13-1">
+
 <p>It's assumed that the /etc/escenic directory is either on a shared
 file system or rsync-ed among the hosts that are running the ECE
 instances (the exception being database and cache servers).
@@ -1468,9 +1642,9 @@ <h3 id="sec-12-1"><span class="section-number-3">12.1</span> /etc/esecenic is sh
 
 </div>
 
-<div id="outline-container-13" class="outline-2">
-<h2 id="sec-13"><span class="section-number-2">13</span> Uninstalling Everything That the ece-install Set Up </h2>
-<div class="outline-text-2" id="text-13">
+<div id="outline-container-14" class="outline-2">
+<h2 id="sec-14"><span class="section-number-2">14</span> Uninstalling Everything That the ece-install Set Up</h2>
+<div class="outline-text-2" id="text-14">
 
 <p>WARNING: this is potentially dangerous as some of these components may
 be used by other pieces of software you have running on your
@@ -1488,9 +1662,9 @@ <h2 id="sec-13"><span class="section-number-2">13</span> Uninstalling Everything
 
 </div>
 
-<div id="outline-container-14" class="outline-2">
-<h2 id="sec-14"><span class="section-number-2">14</span> Example Output FAI </h2>
-<div class="outline-text-2" id="text-14">
+<div id="outline-container-15" class="outline-2">
+<h2 id="sec-15"><span class="section-number-2">15</span> Example Output FAI</h2>
+<div class="outline-text-2" id="text-15">
 
 <p>The ece-install will often be run in FAI mode where all the settings
 are read from ~/ece-install.conf. Given the following entries in this
@@ -1560,7 +1734,7 @@ <h2 id="sec-14"><span class="section-number-2">14</span> Example Output FAI </h2
 <hr/>
 <p class="author">
   Author: Torstein Krause Johansen (<a href="mailto:tkj@vizrt.com">tkj@vizrt.com</a>)
-  Date: 2012-01-18 13:15:34 CST
+  Date: 2012-02-07 19:40:37 CST
 </p>
 </div>
 </body>

From 74c8d0bc485b704065c613801e2d0c50fc60b5de Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 8 Feb 2012 13:09:42 +0800
Subject: [PATCH 0276/2585] - added exit 0 at the end of the script.

---
 usr/sbin/ece-install | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index b022c5cf..18667081 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -3301,4 +3301,5 @@ else
     common_post_install
 fi
 
+exit 0
 

From 4411daa4eb0ffa9e31a034c2e9792363950b5104 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 8 Feb 2012 19:26:56 +0800
Subject: [PATCH 0277/2585] - new feature: set_up_app_server will now call new
 method   ensure_domain_is_known_to_local_host. This method will add entries  
 to /etc/hosts if the domain names mentioned in  
 fai_publication_domain_mapping_list are not resolvable to your local   host
 (neither localhost or the IP of your $HOSTNAME).

  This can be quickly identified in /etc/hosts by search by the
  comments pre-pended to the host entries:

  # added by ece-install @ Wed Feb 8 19:21:49 CST 2012
  127.0.1.1 fire.escenic.com

  # added by ece-install @ Wed Feb  8 19:21:51 CST 2012
  127.0.1.1 ild.escenic.com
---
 usr/sbin/ece-install | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 18667081..8bb9769a 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -908,7 +908,7 @@ function get_base_dir_from_bundle()
 # $1 :  the string
 function get_escaped_bash_string()
 {
-    result=$(echo $1 | \
+    local result=$(echo $1 | \
         sed -e 's/\$/\\$/g' \
         -e 's/\*/\\*/g' \
         -e 's#/#\\/#g' \
@@ -916,6 +916,40 @@ function get_escaped_bash_string()
     echo $result
 }
 
+# $1 the domain
+#
+# The method will ensure that the passed domain is resolvable by the
+# host on which ece-install is run.
+function ensure_domain_is_known_to_local_host()
+{
+    if [ -z "$1" ]; then
+        return 1
+    fi
+    
+    local localhost_ip=$(ping -c 1 localhost 2>/dev/null | \
+        head -1 | \
+        cut -d'(' -f2 | \
+        cut -d')' -f1)
+    local hostname_ip=$(ping -c 1 $HOSTNAME 2>/dev/null | \
+        head -1 | \
+        cut -d'(' -f2 | \
+        cut -d')' -f1)
+    local domain_ip=$(ping -c 1 $1 2>/dev/null | \
+        head -1 | \
+        cut -d'(' -f2 | \
+        cut -d')' -f1)
+
+    if [[ $domain_ip != $localhost_ip && $domain_ip != hostname_ip ]]; then
+        print_and_log "The domain name ${1} is not resolvable to this host"
+        print_and_log "I will remedy this by adding it to /etc/hosts"
+        cat >> /etc/hosts <<EOF
+
+# added by $(basename $0) @ $(date)
+127.0.1.1 ${1}
+EOF
+    fi
+}
+
 function set_up_app_server()
 {
     print_and_log "Setting up the application server ..."
@@ -1212,6 +1246,8 @@ EOF
             read publication domain <<< "$el"
             publication_domain_map[${publication}]="${domain}"
             IFS=$old_ifs
+
+            ensure_domain_is_known_to_local_host ${domain}
         done
         
         for el in ${!publication_domain_map[@]}; do

From 3803d115eec9f23937bd0e57c9b54312ea872887 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 8 Feb 2012 19:27:11 +0800
Subject: [PATCH 0278/2585] - documented behaviour of
 ensure_domain_is_known_to_local_host

---
 usr/share/doc/escenic/ece-install-guide.org | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index c9159163..e5d23e77 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -473,8 +473,16 @@ This will produce the following stanzas in server.xml:
 </Host>
 #+END_SRC
 
-You must of course make sure that these host names are resolvable to
-the intended IPs on your system using /etc/hosts or a local DNS.
+Furthermore, if these host names are  not resolvable to your local
+host (neither localhost or the IP of your $HOSTNAME), ece-install will
+add entries for these domains in the machine's /etc/hosts:
+#+BEGIN_SRC sh
+# added by ece-install @ Wed Feb  8 19:21:49 CST 2012
+127.0.1.1 fire.escenic.com
+
+# added by ece-install @ Wed Feb  8 19:21:51 CST 2012
+127.0.1.1 ild.escenic.com
+#+END_SRC
 
 ** Overview of All FAI Parameters
 The ece-install script understands for the following settings in the

From 9fb69dd1de87de0fb746bc6952b5f66afdd68f71 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 9 Feb 2012 12:59:20 +0800
Subject: [PATCH 0279/2585] - added documentation on fai_keep_off_etc_hosts=1 -
 sorted setting keys in the FAI overview table

---
 usr/share/doc/escenic/ece-install-guide.org | 88 +++++++++++----------
 1 file changed, 46 insertions(+), 42 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index e5d23e77..32b169c4 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -484,55 +484,59 @@ add entries for these domains in the machine's /etc/hosts:
 127.0.1.1 ild.escenic.com
 #+END_SRC
 
+If you do not want ece-install to touch your /etc/hosts, you can set
+fai_keep_off_etc_hosts=1 in your ece-install.conf
+
 ** Overview of All FAI Parameters
 The ece-install script understands for the following settings in the
 $HOME/ece-install.conf file of the root user:
 
 |-----------------------------------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------|
-| Parameter                               | Default                                           | Description                                                                                                                           |
+| Parameter                               |                                           Default | Description                                                                                                                           |
 |-----------------------------------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------|
-| fai\_all\_install                       | 0                                                 | Install all components on your server.                                                                                                |
-| fai\_cache\_backends                    | ${HOSTNAME}:8080                                  | Space separated, e.g. "app1:8080 app2:8080"                                                                                           |
-| fai\_cache\_install                     | 0                                                 | Install cache server profile                                                                                                          |
-| fai\_db\_host                           | $HOSTNAME                                         | Useful for editor & presentation profiles                                                                                             |
-| fai\_db\_drop\_old\_db\_first           | 0                                                 | Warning: this will drop the old database before installing a new one                                                                  |
-| fai\_db\_install                        | 0                                                 | Install db profile                                                                                                                    |
-| fai\_db\_password                       | read-the-source-luke                              | Useful for DB installation profile                                                                                                    |
-| fai\_db\_port                           | 3306                                              | Useful for editor & presentation profiles                                                                                             |
-| fai\_db\_schema                         | ece5db                                            | Useful for DB installation profile                                                                                                    |
-| fai\_db\_user                           | ece5user                                          | Useful for DB installation profile                                                                                                    |
-| fai\_editor\_conf\_archive              | ""                                                | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
-| fai\_editor\_ear                        | ""                                                | EAR to use instead of the Escenic binaries                                                                                            |
-| fai\_editor\_install                    | 0                                                 | Install the editorial profile                                                                                                         |
-| fai\_editor\_name                       | editor1                                           | Name of the editor instance                                                                                                           |
-| fai\_editor\_port                       | 8080                                              | HTTP port of the editor instance                                                                                                      |
-| fai\_editor\_shutdown                   | 8005                                              | Shutdown port of the editor instance                                                                                                  |
-| fai\_enabled                            | 0                                                 | Whether or not to run ece-install in FAI mode                                                                                         |
-| fai\_monitoring\_server\_install        | 0                                                 | Install the monitoring server profile.                                                                                                |
-| fai\_monitoring\_server\_ip             | 127.0.0.1                                         | The IP of the monitoring server.                                                                                                      |
-| fai\_presentation\_conf\_archive        | ""                                                | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
-| fai\_presentation\_ear                  | ""                                                | EAR to use instead of the Escenic binaries                                                                                            |
-| fai\_presentation\_install              | 0                                                 | Install the presentation server profile                                                                                               |
-| fai\_presentation\_name                 | web1                                              | Name of the presentation server instance                                                                                              |
-| fai\_presentation\_port                 | 8080                                              | HTTP port of the presentation server instance                                                                                         |
-| fai\_presentation\_shutdown             | 8005                                              | Shutdown port of the presentation instance                                                                                            |
-| fai\_public\_host\_name                 | ${HOSTNAME}:8080                                  | The public address for your website                                                                                                   |
-| fai\_publication\_create                | 0                                                 | Create a new publication                                                                                                              |
-| fai\_publication\_name                  | mypub                                             | Name of the publication                                                                                                               |
-| fai\_publication\_use\_instance         | dev1                                              | Name of local instance to use for creation                                                                                            |
-| fai\_publication\_war                   | "WF or ECE demo WAR"                              | WAR to base the new publication on                                                                                                    |
-| fai\_publication\_war\_uri\_list        | ""                                                | Publication WARs used for setting up Assembly tool. Supported: http[s]://tmp.com/mypub.war, file:///tmp/mypub.war and /tmp/mypub.war. |
-| fai\_publication\_domain\_mapping\_list | ""                                                | Mapping between publication names and their corresponding domains on the form: "one#one.com other#other.com"                          |
-| fai\_rmi\_install                       | 0                                                 | Install RMI hub profile                                                                                                               |
-| fai\_search\_conf\_archive              | ""                                                | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
-| fai\_search\_ear                        | ""                                                | EAR to use instead of the Escenic binaries                                                                                            |
-| fai\_search\_for\_editor                | 0                                                 | If 1 (true), will configure Solr for use with an editorial server, if not conf for presentation servers will be chosen.               |
+| fai\_all\_install                       |                                                 0 | Install all components on your server.                                                                                                |
+| fai\_cache\_backends                    |                                  ${HOSTNAME}:8080 | Space separated, e.g. "app1:8080 app2:8080"                                                                                           |
+| fai\_cache\_install                     |                                                 0 | Install cache server profile                                                                                                          |
+| fai\_db\_host                           |                                         $HOSTNAME | Useful for editor & presentation profiles                                                                                             |
+| fai\_db\_drop\_old\_db\_first           |                                                 0 | Warning: this will drop the old database before installing a new one                                                                  |
+| fai\_db\_install                        |                                                 0 | Install db profile                                                                                                                    |
+| fai\_db\_password                       |                              read-the-source-luke | Useful for DB installation profile                                                                                                    |
+| fai\_db\_port                           |                                              3306 | Useful for editor & presentation profiles                                                                                             |
+| fai\_db\_schema                         |                                            ece5db | Useful for DB installation profile                                                                                                    |
+| fai\_db\_user                           |                                          ece5user | Useful for DB installation profile                                                                                                    |
+| fai\_editor\_conf\_archive              |                                                "" | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
+| fai\_editor\_ear                        |                                                "" | EAR to use instead of the Escenic binaries                                                                                            |
+| fai\_editor\_install                    |                                                 0 | Install the editorial profile                                                                                                         |
+| fai\_editor\_name                       |                                           editor1 | Name of the editor instance                                                                                                           |
+| fai\_editor\_port                       |                                              8080 | HTTP port of the editor instance                                                                                                      |
+| fai\_editor\_shutdown                   |                                              8005 | Shutdown port of the editor instance                                                                                                  |
+| fai\_enabled                            |                                                 0 | Whether or not to run ece-install in FAI mode                                                                                         |
+| fai\_monitoring\_server\_install        |                                                 0 | Install the monitoring server profile.                                                                                                |
+| fai\_monitoring\_server\_ip             |                                         127.0.0.1 | The IP of the monitoring server.                                                                                                      |
+| fai\_presentation\_conf\_archive        |                                                "" | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
+| fai\_presentation\_ear                  |                                                "" | EAR to use instead of the Escenic binaries                                                                                            |
+| fai\_presentation\_install              |                                                 0 | Install the presentation server profile                                                                                               |
+| fai\_presentation\_name                 |                                              web1 | Name of the presentation server instance                                                                                              |
+| fai\_presentation\_port                 |                                              8080 | HTTP port of the presentation server instance                                                                                         |
+| fai\_presentation\_shutdown             |                                              8005 | Shutdown port of the presentation instance                                                                                            |
+| fai\_public\_host\_name                 |                                  ${HOSTNAME}:8080 | The public address for your website                                                                                                   |
+| fai\_publication\_create                |                                                 0 | Create a new publication                                                                                                              |
+| fai\_publication\_name                  |                                             mypub | Name of the publication                                                                                                               |
+| fai\_publication\_use\_instance         |                                              dev1 | Name of local instance to use for creation                                                                                            |
+| fai\_publication\_war                   |                              "WF or ECE demo WAR" | WAR to base the new publication on                                                                                                    |
+| fai\_publication\_war\_uri\_list        |                                                "" | Publication WARs used for setting up Assembly tool. Supported: http[s]://tmp.com/mypub.war, file:///tmp/mypub.war and /tmp/mypub.war. |
+| fai\_publication\_domain\_mapping\_list |                                                "" | Mapping between publication names and their corresponding domains on the form: "one#one.com other#other.com"                          |
+| fai\_rmi\_install                       |                                                 0 | Install RMI hub profile                                                                                                               |
+| fai\_search\_conf\_archive              |                                                "" | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
+| fai\_search\_ear                        |                                                "" | EAR to use instead of the Escenic binaries                                                                                            |
+| fai\_search\_for\_editor                |                                                 0 | If 1 (true), will configure Solr for use with an editorial server, if not conf for presentation servers will be chosen.               |
 | fai\_search\_indexer\_ws\_uri           | http://${HOSTNAME}:8080/indexer-webservice/index/ | URI of the indexer-webservice that the search instance shall use for knowing what to index.                                           |
-| fai\_search\_install                    | 0                                                 | Install the search server profile (Solr + indexer)                                                                                    |
-| fai\_search\_name                       | search1                                           | Name of the search instance                                                                                                           |
-| fai\_search\_port                       | 8080                                              | HTTP port of the search instance                                                                                                      |
-| fai\_search\_shutdown                   | 8005                                              | Shutdown port of the search instance                                                                                                  |
-| fai\_wf\_install                        | 0                                                 | Install Widget Framework profile                                                                                                      |
+| fai\_search\_install                    |                                                 0 | Install the search server profile (Solr + indexer)                                                                                    |
+| fai\_search\_name                       |                                           search1 | Name of the search instance                                                                                                           |
+| fai\_search\_port                       |                                              8080 | HTTP port of the search instance                                                                                                      |
+| fai\_search\_shutdown                   |                                              8005 | Shutdown port of the search instance                                                                                                  |
+| fai\_keep\_off\_etc\_hosts              |                                                 0 | Set this to 1 if you don't want ece-install adding entries to /etc/hosts                                                              |
+| fai\_wf\_install                        |                                                 0 | Install Widget Framework profile                                                                                                      |
 |-----------------------------------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------|
 #+TBLFM: $2=http://$fai_editor_name:$fai_editor_port/indexer-webservice/index/                   0
 

From 156c6b231aff730037b27294e54ee4430f23ba12 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 9 Feb 2012 13:02:16 +0800
Subject: [PATCH 0280/2585] - added fai_keep_off_etc_hosts: If you do not want
 ece-install to   touch your /etc/hosts, you can set fai_keep_off_etc_hosts=1
 in   your ece-install.conf

  Right now, the only time ece-install will do this is when setting
  the virtual host configuration in Tomcat, via the
  fai_publication_domain_mapping_list. In future, this keep off
  setting may be used for other places too, if it's logical that
  ece-install otherwise would manipulate the host's /etc/hosts.
---
 usr/sbin/ece-install | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 8bb9769a..d424c2b9 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -939,7 +939,10 @@ function ensure_domain_is_known_to_local_host()
         cut -d'(' -f2 | \
         cut -d')' -f1)
 
-    if [[ $domain_ip != $localhost_ip && $domain_ip != hostname_ip ]]; then
+    local keep_off_etc_hosts=${fai_keep_off_etc_hosts-0}
+    if [[ $domain_ip != $localhost_ip && \
+        $domain_ip != hostname_ip && \
+        $keep_off_etc_hosts -ne 1 ]]; then
         print_and_log "The domain name ${1} is not resolvable to this host"
         print_and_log "I will remedy this by adding it to /etc/hosts"
         cat >> /etc/hosts <<EOF
@@ -948,6 +951,12 @@ function ensure_domain_is_known_to_local_host()
 127.0.1.1 ${1}
 EOF
     fi
+    if [[ $domain_ip != $localhost_ip && \
+        $domain_ip != hostname_ip && \
+        $keep_off_etc_hosts -eq 1 ]]; then
+        print_and_log "The domain name ${1} is not resolvable to this host"
+        print_and_log "but I will keep off /etc/hosts as you've requested."
+    fi
 }
 
 function set_up_app_server()

From 9a0bdb7c3bfb02a3535a1c38704767a8ebef21f6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 9 Feb 2012 13:02:32 +0800
Subject: [PATCH 0281/2585] - more documentation on fai_keep_off_etc_hosts

---
 usr/share/doc/escenic/ece-install-guide.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 32b169c4..5a9dc8d8 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -485,7 +485,7 @@ add entries for these domains in the machine's /etc/hosts:
 #+END_SRC
 
 If you do not want ece-install to touch your /etc/hosts, you can set
-fai_keep_off_etc_hosts=1 in your ece-install.conf
+fai\_keep\_off\_etc\_hosts=1 in your ece-install.conf
 
 ** Overview of All FAI Parameters
 The ece-install script understands for the following settings in the

From aea57f25056ca83e4269dff49fd5876340bc4d26 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 9 Feb 2012 13:14:58 +0800
Subject: [PATCH 0282/2585] - new feature: garbage collection log is now set up
 for all types and   instances. For example the dev1 instance of type engine
 will get its   log in:

  /var/log/escenic/engine-dev1-gc.log
---
 usr/bin/ece | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index e3b47195..0f8dd362 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -342,7 +342,10 @@ function set_instance_settings()
               -Dsolr.solr.home=$solr_home\
               -Djava.awt.headless=true\
               -Djava.security.auth.login.config=$ece_security_configuration_dir/jaas.config\
-              -Djava.security.policy=$ece_security_configuration_dir/java.policy"
+              -Djava.security.policy=$ece_security_configuration_dir/java.policy\
+              -XX:+PrintGCTimeStamps\
+              -XX:+PrintGCDetails\
+              -Xloggc:${log_dir}/${type}-${instance}-gc.log"
 
     if [ "$instance" != "default" ]; then
         ece_args=$ece_args" -Dcom.escenic.instance=$instance"

From 8ad0fba44cb814177af376e0152a6b7f7bbe9446 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 9 Feb 2012 13:17:40 +0800
Subject: [PATCH 0283/2585] - added documentation on why garbage collection is
 added to the   default JVM parameters.

---
 usr/bin/ece | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/usr/bin/ece b/usr/bin/ece
index 0f8dd362..a361bcf3 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -338,6 +338,8 @@ function set_instance_settings()
     # * java.awt.headless is to avoid potential problems with graphics
     #   handling/generation, causing 0x0 bitmaps etc.
     # * java.security for configuring the Java security framework with ECE.
+    # * garbage collection log: this is paramount to keep an eye on
+    #   when running in production.
     ece_args="-Descenic.server=$ece_server\
               -Dsolr.solr.home=$solr_home\
               -Djava.awt.headless=true\

From afc39cc789e9799f27d7d37857c4173df6e192d7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 10 Feb 2012 16:39:37 +0800
Subject: [PATCH 0284/2585] - fix for Ubuntu 11.10 & upcoming Debian stable;
 since the Sun Java   packages have been removed, we can no longer rely on
 that installing the   java-6-sun-* packages actually does that. To handle
 migration issues   (other packages depending on this package), the Debian
 (/and   Ubuntu?) developers have decided to let this package now provide  
 Open JDK. However, ECE doesn't support this one yet (there are weird   issues
 with serialization objects which we use in the ECE <-> ECS   communication),
 so until then, we must insist on using Sun Java.

  ece-install will now, if Sun Java isn't already installed, pull down
  the binary distribution from Oracle,  build Debian packages of it
  and set up a local repository.

  This seems to work well on both Ubuntu and Debian. Tested on: Ubuntu
  11.10 server edition and Debian Squeeze testing/unstable.

  This feature stands on the shoulders of
  http://github.com/flexiondotorg/oab-java6 , which again stands on
  the shoulders of https://github.com/rraptorr/sun-java6

  This closes https://github.com/skybert/ece-scripts/issues/30

- fixed problem with ant pulling down OpenJDK on systems where Sun
  Java isn't already installed.

- removed some redundant 1 & 2 redirects (the run wrapper takes care
  of this).

- introduced the run wrapper a few more places: removing lines of code
  feels good!

- new feature in create_publication running in interactive mode: added
  a list of instances installed on the host when the script prompts
  the user for which ECE instance to user for creating the
  publication.
---
 usr/sbin/ece-install | 128 +++++++++++++++++++++++++++++++------------
 1 file changed, 94 insertions(+), 34 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index d424c2b9..3b5be0ca 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -379,7 +379,7 @@ EOF
         assemble.properties \
         1>>$log 2>>$log
     exit_on_error "sed on assemble.properties"
-
+    
     sed -i "s~\#\# plugins\ =\ /path/to/plugins~plugins=${escenic_root_dir}/assemblytool/plugins~g" \
         assemble.properties \
         1>>$log 2>>$log
@@ -472,8 +472,10 @@ function set_up_ece_scripts()
 
     run cd $download_dir
     if [ -d ece-scripts ]; then
-        (cd ece-scripts
-            git pull 1>>$log 2>>$log)
+        (
+            run cd ece-scripts
+            run git pull
+        )
     else
         run git clone $ece_scripts_git_source
     fi
@@ -831,17 +833,54 @@ function set_ece_instance_conf()
     set_conf_file_value $1 $2 $instance_conf_file
 }
 
+function create_java_deb_packages_and_repo()
+{
+    install_packages_if_missing $git_package
+
+    print $(lsb_release -i | cut -d':' -f2) \
+        $(lsb_release -r | cut -d':' -f2) \
+        "doesn't have official Sun/Oracle Java packages,"
+    print "I'm creating packages & local repo for you ..."
+    
+    local tmp_dir=$(mktemp -d)
+    (
+        run cd $tmp_dir
+        run git clone https://github.com/flexiondotorg/oab-java6.git
+        run cd oab-java6
+        run bash oab-java6.sh
+        run rm -rf $tmp_dir
+    )
+
+    add_next_step "Local APT repository with Sun/Oracle Java packages"
+    add_next_step "has been installed at /var/local/oab/deb and added"
+    add_next_step "to your APT system with /etc/apt/sources.list.d/oab.list"
+}
+
+function has_sun_java_installed()
+{
+    if [[ -x /usr/lib/jvm/java-6-sun/bin/java || \
+        $(java -version 2>&1 > /dev/null | grep HotSpot | wc -l) -gt 0 ]]; then
+        echo 1
+    else
+        echo 0
+    fi
+}
+
 # Installs third party packages needed by the ECE (i.e. Java related).
 # Also see install_common_os_packages for packages common to all
 # servers in the architecture.
 function install_ece_third_party_packages
 {
-    print_and_log "Installing 3rd party packages needed by ECE ..."
+    run_hook install_ece_third_party_packages.preinst
     
     if [ $on_debian_or_derivative -eq 1 ]; then
-
         if [ $on_ubuntu -eq 1 ]; then
-            add_apt_source "deb http://archive.canonical.com/ $(lsb_release -s -c) partner"
+            # Sun Java was removed in Ubuntu in 11.10 
+            local version_needs_local_java_deb=1110
+            local version=$(lsb_release -s -r | sed "s#\.##g")
+            
+            add_apt_source \
+                "deb http://archive.canonical.com/ $(lsb_release -s -c) partner"
         elif [ $on_debian -eq 1 ]; then
             code_name=$(lsb_release -s -c)
             has_non_free=$(grep $(lsb_release -s  -c) \
@@ -851,13 +890,28 @@ function install_ece_third_party_packages
                 grep non-free | \
                 wc -l)
             if [ $has_non_free -eq 0 ]; then
-                add_apt_source "deb http://ftp.${mirror_country_suffix}.debian.org/debian/ $(lsb_release -s -c) contrib non-free"
+                add_apt_source "deb http://ftp.${mirror_country_suffix}.debian.org/debian/" \
+                    $(lsb_release -s -c) \
+                    "contrib non-free"
             fi
+
+            # Sun Java was removed in Debian 6.0.4 (TODO verify this version)
+            local version_needs_local_java_deb=604
+            local version=$(lsb_release -s -r |  sed "s#\.##g")
+        fi
+        
+        if [ $version -ge $version_needs_local_java_deb -a \
+            $(has_sun_java_installed) -eq 0 ]; then
+            create_java_deb_packages_and_repo
         fi
         
         echo "sun-java6-jdk shared/accepted-sun-dlj-v1-1 boolean true" | \
             debconf-set-selections
 
+        # install sun-java6-jdk first so that ant doesn't pull down OpenJDK
+        local packages="sun-java6-jdk"
+        install_packages_if_missing $packages
+
         packages="
           ant
           ant-contrib
@@ -867,9 +921,9 @@ function install_ece_third_party_packages
           libmysql-java
           memcached
           maven2
-          sun-java6-jdk
           wget"
 
+        print_and_log "Installing 3rd party packages needed by ECE ..."
         install_packages_if_missing $packages
     fi
     
@@ -1091,9 +1145,7 @@ function set_up_app_server()
     escenic_loader=",$\{catalina.base\}/escenic/lib/*.jar"
     old=$(get_escaped_bash_string ${common_loader})
     new=${escaped_common_loader}$(get_escaped_bash_string ${escenic_loader})
-    sed -i "s#${old}#${new}#g" $file \
-        1>>$log 2>>$log
-    exit_on_error "sed on $file"
+    run sed -i "s#${old}#${new}#g" $file 
     
     cat > $tomcat_base/conf/server.xml <<EOF
 <?xml version='1.0' encoding='utf-8'?>
@@ -1400,8 +1452,7 @@ function set_correct_permissions()
             fi
         fi
 
-        run chown -R ${ece_user}:${ece_group} $el \
-            1>>$log 2>>$log                
+        run chown -R ${ece_user}:${ece_group} $el
     done
     
     if [ -d "$tomcat_base" ]; then
@@ -1675,7 +1726,7 @@ function un_install_ece()
 function set_up_varnish()
 {
     print_and_log "Setting up Varnish to match your environment ..."
-    /etc/init.d/varnish stop 1>>$log 2>>$log
+    run /etc/init.d/varnish stop
 
     # we need to swap standard err and standard out here as varnishd
     # -V for some reason writes to standard error.
@@ -1813,7 +1864,7 @@ EOF
   set resp.http.X-Cache-Backend = req.backend;
 }
 EOF
-    /etc/init.d/varnish start 1>>$log 2>>$log
+    run /etc/init.d/varnish start
 }
 
 function read_user_input()
@@ -2056,9 +2107,8 @@ function install_database_server()
             print_and_log "Installing the Percona database ..."
 
             if [ $(apt-key list| grep CD2EFD2A | wc -l) -lt 1 ]; then
-                gpg --keyserver hkp://keys.gnupg.net \
-                    --recv-keys 1C4CBDCDCD2EFD2A \
-                     1>>$log 2>>$log
+                run gpg --keyserver hkp://keys.gnupg.net \
+                    --recv-keys 1C4CBDCDCD2EFD2A
                 
                 # There has been twice now, during six months, that
                 # the key cannot be retrieved from
@@ -2371,6 +2421,20 @@ function ensure_that_instance_is_running()
     fi
 }
 
+# If the system is installed using the recommended paths, the method
+# will return a list of the instances configured in
+# ${escenic_conf_dir}/engine/instance
+function get_instance_list()
+{
+    local instance_list=""
+
+    if [ -r ${escenic_conf_dir}/engine/instance ]; then
+        instance_list=$(ls ${escenic_conf_dir}/engine/instance)
+    fi
+
+    echo $instance_list
+}
+
 function create_publication()
 {
     if [ ! -e $escenic_root_dir/engine -o \
@@ -2385,11 +2449,13 @@ function create_publication()
 
     # TODO make educated guesses about the available instances on
     # $HOSTNAME by looking in $escenic_conf_dir/ece-*.conf
-    
-    default_instance=dev1
+
+    local instance_list=$(get_instance_list)
+    local default_instance=$(echo ${instance_list} | cut -d' ' -f1)
 
     if [ $fai_enabled -eq 0 ]; then
         print "Which ECE instance do you wish to use to create it?"
+        print "These instances are available: $instance_list"
         echo -n "Your choice [$default_instance]> "
         read instance_name
     else
@@ -2461,8 +2527,7 @@ function install_analysis_server()
     set_correct_permissions
     
     local ece_command="ece -i ${instance_name} -t ${type} start"
-    su - $ece_user -c "$ece_command" \
-        1>>$log 2>>$log
+    su - $ece_user -c "$ece_command" 1>>$log 2>>$log
     exit_on_error "su - $ece_user -c \"$ece_command\""
 
     local seconds=3
@@ -2617,15 +2682,12 @@ EOF
     print_and_log "Downloading Widget Framework from technet.escenic.com ..."
     for el in $wf_download_list; do
         cd $download_dir
-        wget $wget_opts \
+        run wget $wget_opts \
             --http-user $technet_user \
             --http-password $technet_password \
-            $el \
-            1>>$log 2>>$log
-        
-        cd $escenic_root_dir/
-        unzip -q -u $download_dir/$(basename $el) \
-            1>>$log 2>>$log
+            $el
+        run cd $escenic_root_dir/
+        run unzip -q -u $download_dir/$(basename $el)
     done
 
     assert_pre_prequesite mvn
@@ -2636,8 +2698,7 @@ EOF
     print_and_log "Installing Widget Framework into your Maven repository ..."
     log "JAVA_HOME=$JAVA_HOME"
     
-    mvn $maven_opts install \
-        1>>$log 2>>$log
+    run mvn $maven_opts install
 
     # installing the widget-framework-common as a ECE plugin
     wf_dist_dir=$(echo $wf_maven_dir/widget-framework-common/target/widget-framework-common-*-dist/widget-framework-common-*)
@@ -2773,7 +2834,7 @@ server {
 EOF
     fi
     
-    /etc/init.d/nginx restart 1>>$log 2>>$log
+    run /etc/init.d/nginx restart
 
     if [ $1 -eq 0 ]; then
         add_next_step "http://${HOSTNAME}:${port}/binary gives the Adactus endpoint"
@@ -2954,8 +3015,7 @@ EOF
     fi
     
     if [ $on_debian_or_derivative -eq 1 ]; then
-        service munin-node restart \
-            1>>$log 2>>$log
+        run service munin-node restart
     fi
 
     add_next_step "A Munin node has been installed on $HOSTNAME"

From 5aa363811fd80485c227af8a8876917e32b2429b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 10 Feb 2012 16:55:32 +0800
Subject: [PATCH 0285/2585] - removed two TODOs, they're HAVEDONEs!

---
 usr/sbin/ece-install | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 3b5be0ca..16771a6e 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -2447,9 +2447,6 @@ function create_publication()
     print_and_log "Getting ready to create a new publication ..."
     create_publication_definition_and_war
 
-    # TODO make educated guesses about the available instances on
-    # $HOSTNAME by looking in $escenic_conf_dir/ece-*.conf
-
     local instance_list=$(get_instance_list)
     local default_instance=$(echo ${instance_list} | cut -d' ' -f1)
 
@@ -2468,8 +2465,6 @@ function create_publication()
 
     type=engine
     ensure_that_instance_is_running $instance_name
-    # TODO set the appserver_port based on the instance_name chosen
-    # above.
     create_publication_in_db $publication_war
     assemble_deploy_and_restart_type
 

From b909d696fbf92b5dac9981c194938a99a89715e8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 10 Feb 2012 17:01:22 +0800
Subject: [PATCH 0286/2585] - Java packages in sqeeze/6.0 are fine, putting
 test for self build   packages to 6.1 (perhaps changed to 7.0 later when
 wheezy's version   number is announced).

---
 usr/sbin/ece-install | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 16771a6e..a90a4b11 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -895,8 +895,10 @@ function install_ece_third_party_packages
                     "contrib non-free"
             fi
 
-            # Sun Java was removed in Debian 6.0.4 (TODO verify this version)
-            local version_needs_local_java_deb=604
+            # Sun Java will be removed in the next Debian stable,
+            # wheezy (either 6.1 or 7.0 not announced yet, current in
+            # squeeze/6.0, hence setting 6.1 here).
+            local version_needs_local_java_deb=610
             local version=$(lsb_release -s -r |  sed "s#\.##g")
         fi
         

From 16263129c30d165da50c7b767b068b235180f19c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 14 Feb 2012 20:08:41 +0800
Subject: [PATCH 0287/2585] - first working version of automatic setup of
 icinga (enhanced Nagios   fork) server and client. The server is a part of
 the   profile=monitoring.

  When installing the clients, which means pretty much all the server
  profiles, the parameter fai_monitoring_host_ip is respected as the
  one which may enter and collect the Nagios data (icinga uses
  Nagios's plugins, the client has only vanilla Nagios software
  installed) and the Munin data.

  When installing the monitoring server, the following parameters are
  implemented and have value:

  fai_monitoring_install=1
  fai_monitoring_host_list="fire:192.168.1.109 wind:192.168.1.108"
  fai_monitoring_ece_host_list="fire wind"

  This will create logical service groups for "ece-hosts", as well as
  setting up general overview of the fire and wind hosts. The meaning
  of ece-hosts can be expanded upon to have more
  triggers/probles/nagios:service definitions to gather information
  especially interesting for ECE hosts.

  Likewise, I envision (not yet implemented) to have host groups
  fai_monitoring_cache_list, fai_monitoring_search_list,
  fai_monitoring_db_list
---
 usr/sbin/ece-install | 178 ++++++++++++++++++++++++++++++++++++-------
 1 file changed, 150 insertions(+), 28 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index a90a4b11..819fc0a9 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -2856,7 +2856,6 @@ function install_munin_gatherer()
         return
     fi
 
-    # TODO ask user/read fai_munin_node_list
     if [ $fai_enabled -eq 0 ]; then
         print "Which nodes shall this Munin monitor gather from?"
         print "Separate your hosts with a space, e.g.: 'editor01 db01 web01'"
@@ -2867,7 +2866,7 @@ function install_munin_gatherer()
             node_list=$user_munin_nodes
         fi
     else
-        node_list=$(get_conf_value fai_munin_node_list)
+        node_list=${fai_munin_node_list}
     fi
     
     if [ -z "$node_list" ]; then
@@ -2876,7 +2875,7 @@ function install_munin_gatherer()
 
     for el in $node_list; do
         print_and_log "Adding ${el} to the Muning gatherer on ${HOSTNAME} ..."
-        file=/etc/munin/munin-conf.d/escenic.conf
+        local file=/etc/munin/munin-conf.d/escenic.conf
         cat >> $file <<EOF
 [${el}]
     address $(get_ip $el)
@@ -2884,6 +2883,10 @@ function install_munin_gatherer()
 EOF
     done
 
+    # TODO add the priveleged network to the Allowed stanza (i.e. the
+    # network wich will do the monitoring of the servers.
+    local file=/etc/apache2/conf.d/munin
+
     add_next_step "Munin gatherer installed on $HOSTNAME."
     add_next_step "Make sure all nodes allows my IP to connect to them."
 }
@@ -2905,6 +2908,91 @@ function get_ip()
     echo $ip
 }
 
+## Installs the Icinga monitoring server.
+function monitoring_install_icinga_server()
+{
+    print "Installing an icinga server on $HOSTNAME ..."
+    
+    # TODO consider apache2 in seperate method
+    if [ $on_debian_or_derivative -eq 1 ]; then
+        install_packages_if_missing apache2 icinga nagios-nrpe-plugin icinga-doc
+    fi
+
+    # set password for the icingaadmin
+    print "Setting user/pass for icinga admin ..."
+    local file=/etc/icinga/htpasswd.users
+    run htpasswd -b -c $file icingaadmin admin
+    
+    # enable remote commands
+    local file=/etc/icinga/icinga.cfg
+    dont_quote_conf_values=1
+    set_conf_file_value check_external_commands 1 $file
+    dont_quote_conf_values=0
+
+    for el in $fai_monitoring_host_list; do
+        set_up_icinga_host $el
+    done
+
+    set_up_icinga_host_groups \
+        "ece-hosts" \
+        'Hosts running one or more ECE' \
+        ${fai_monitoring_ece_host_list}
+
+    run /etc/init.d/icinga restart
+    run /etc/init.d/apache2 reload
+}
+
+## $1 <host name>:<ip>, e.g.: fire:192.168.1.100
+function set_up_icinga_host()
+{
+    local old_ifs=$IFS
+    IFS=':'
+    read host_name ip <<< "$1"
+    local file=/etc/icinga/objects/${host_name}_icinga.cfg
+    IFS=$old_ifs
+
+
+    if [ $(grep "host_name $host_name" $file | wc -l) -gt 0 ]; then
+        print "Icinga host" $host_name "already defined, skipping it."
+        return
+    fi
+    
+    cat >> $file <<EOF
+define host {
+  use generic-host
+  host_name $host_name
+  alias $host_name
+  address $ip
+}
+
+define service {
+  use generic-service
+  host_name $host_name
+  service_description CPU load
+  check_command check_nrpe_1arg!check_load
+}
+EOF
+
+}
+
+function install_icinga_client()
+{
+    print "Installing an icinga client on $HOSTNAME ..."
+    if [ $on_debian_or_derivative -eq 1 ]; then
+        install_packages_if_missing nagios-nrpe-server nagios-plugins
+    fi
+    
+    local file=/etc/nagios/nrpe.cfg
+    dont_quote_conf_values=1
+    set_conf_file_value \
+        allowed_hosts \
+        127.0.0.1,${fai_monitoring_server_ip} \
+        $file
+    dont_quote_conf_values=0
+
+    run /etc/init.d/nagios-nrpe-server restart
+}
+
 # munin nodes need the IP of the munin gatherer to be escaped. Hence this function.
 # $parameters:
 # $1 : the IP
@@ -3222,6 +3310,35 @@ function restore_from_backup()
     fi
 }
 
+function set_up_icinga_host_groups()
+{
+    local file=/etc/icinga/objects/hostgroups_icinga.cfg
+    local host_group_name=$1
+    local host_group_alias=$2
+    local host_group_member_list=${@:3:$(( $# - 2 ))}
+
+    if [ $(grep "hostgroup_name $host_group_name" $file | wc -l) -gt 0 ]; then
+        print "Icinga group member" \
+            $host_group_name \
+            "already defined, skipping it."
+        return
+    fi
+    
+    cat >> $file <<EOF
+define hostgroup {
+  hostgroup_name $host_group_name
+  alias $host_group_alias
+EOF
+    echo -n "  members" >> $file
+    for el in $host_group_member_list; do
+        echo -n " ${el}," >> $file
+    done
+    cat >> $file <<EOF
+
+}
+EOF
+}
+
 function common_post_install()
 {
     if [ $install_profile_number -eq $PROFILE_ALL_IN_ONE -o \
@@ -3235,6 +3352,10 @@ function common_post_install()
         $install_profile_number -ne $PROFILE_CREATE_PUBLICATION -a \
         $install_profile_number -ne $PROFILE_RESTORE_FROM_BACKUP ]; then
         install_munin_node
+
+        if [ $install_profile_number -ne $PROFILE_MONITORING_SERVER ]; then
+            install_icinga_client
+        fi
     fi
 
     set_correct_permissions
@@ -3325,8 +3446,9 @@ if [ $fai_enabled -eq 1 ]; then
     
     if [ $(get_boolean_conf_value fai_monitoring_install) -eq 1 ]; then
         install_profile_number=$PROFILE_MONITORING_SERVER
+        monitoring_install_icinga_server
         install_munin_gatherer
-        install_web_server 1
+        # install_web_server 1
         no_fai_profile=0
     fi
     
@@ -3361,40 +3483,40 @@ else
     
     case $install_profile_number in
         $PROFILE_ALL_IN_ONE)
-        install_all_in_one_environment
-        ;;
+            install_all_in_one_environment
+            ;;
         $PROFILE_CACHE_SERVER)
-        install_cache_server
-        install_web_server 0
-        ;;
+            install_cache_server
+            install_web_server 0
+            ;;
         $PROFILE_DB_SERVER)
-        install_database_server
-        ;;
+            install_database_server
+            ;;
         $PROFILE_EDITORIAL_SERVER)
-        install_editorial_server
-        ;;
+            install_editorial_server
+            ;;
         $PROFILE_PRESENTATION_SERVER)
-        install_presentation_server
-        ;;
+            install_presentation_server
+            ;;
         $PROFILE_SEARCH_SERVER)
-        install_search_server
-        ;;
+            install_search_server
+            ;;
         $PROFILE_RMI_HUB)
-        install_rmi_hub
-        ;;
+            install_rmi_hub
+            ;;
         $PROFILE_WIDGET_FRAMEWORK)
-        install_widget_framework
-        ;;
+            install_widget_framework
+            ;;
         $PROFILE_CREATE_PUBLICATION)
-        create_publication
-        ;;
+            create_publication
+            ;;
         $PROFILE_MONITORING_SERVER)
-        install_munin_gatherer
-        install_web_server 1
-        ;;
+            install_munin_gatherer
+            install_web_server 1
+            ;;
         $PROFILE_RESTORE_FROM_BACKUP)
-        restore_from_backup
-        ;;
+            restore_from_backup
+            ;;
         *)
             print "Invalid profile number $install_profile_number, must be 1-11"
             remove_pid_and_exit_in_error

From 697e628374ad064b471445d9289a3848c0beebc3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 14 Feb 2012 20:13:50 +0800
Subject: [PATCH 0288/2585] - support for fai_monitoring_admin_password, with
 fallback.

---
 usr/sbin/ece-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 819fc0a9..9fde345e 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -2921,7 +2921,7 @@ function monitoring_install_icinga_server()
     # set password for the icingaadmin
     print "Setting user/pass for icinga admin ..."
     local file=/etc/icinga/htpasswd.users
-    run htpasswd -b -c $file icingaadmin admin
+    run htpasswd -b -c $file icingaadmin ${fai_monitoring_admin_password-admin}
     
     # enable remote commands
     local file=/etc/icinga/icinga.cfg

From 80b8e86dbae6cc2e131dda6e2d2415f9897a9309 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 15 Feb 2012 12:05:05 +0800
Subject: [PATCH 0289/2585] - calls to add_apt_source must be on one line, or
 else the grep string   might be wrong.

---
 usr/sbin/ece-install | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 9fde345e..ee862508 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -883,23 +883,21 @@ function install_ece_third_party_packages
                 "deb http://archive.canonical.com/ $(lsb_release -s -c) partner"
         elif [ $on_debian -eq 1 ]; then
             code_name=$(lsb_release -s -c)
-            has_non_free=$(grep $(lsb_release -s  -c) \
+            has_non_free=$(grep $(lsb_release -s -c) \
                 /etc/apt/sources.list | \
                 egrep -v "^#|deb-src" | \
                 grep -v security | \
                 grep non-free | \
                 wc -l)
             if [ $has_non_free -eq 0 ]; then
-                add_apt_source "deb http://ftp.${mirror_country_suffix}.debian.org/debian/" \
-                    $(lsb_release -s -c) \
-                    "contrib non-free"
+                add_apt_source "deb http://ftp.${mirror_country_suffix}.debian.org/debian/ $(lsb_release -s -c) contrib non-free"
             fi
 
             # Sun Java will be removed in the next Debian stable,
             # wheezy (either 6.1 or 7.0 not announced yet, current in
             # squeeze/6.0, hence setting 6.1 here).
             local version_needs_local_java_deb=610
-            local version=$(lsb_release -s -r |  sed "s#\.##g")
+            local version=$(lsb_release -s -r | sed "s#\.##g")
         fi
         
         if [ $version -ge $version_needs_local_java_deb -a \
@@ -932,6 +930,9 @@ function install_ece_third_party_packages
     for el in ant mvn java; do
         assert_pre_prequesite $el
     done
+    
+    exit 0
+    
 }
 
 function get_base_dir_from_bundle()
@@ -3049,25 +3050,22 @@ EOF
     fi
     
     # install the escenic_jstat munin plugin
-    file=/usr/share/munin/plugins/escenic_jstat_
+    local file=/usr/share/munin/plugins/escenic_jstat_
     run wget $wget_opts \
         https://github.com/mogsie/escenic-munin/raw/master/escenic_jstat_ \
         -O $file
     run chmod 755 $file
 
-    if [ ! -e $escenic_conf_dir -o \
-        $(ls $escenic_conf_dir/ | grep ece- | wc -l) -lt 1 ]; then
+    local instance_list=$(get_instance_list)
+    if [ -z ${instance_list} ]; then
         print_and_log "No ECE instances found on $HOSTNAME, so I'm not adding"
         print_and_log "additional Munin configuration"  
         add_next_step "A Munin node has been installed on $HOSTNAME"
         return
     fi
     
-    escenic_jstat_modules="_gc _gcoverhead _heap _uptime"
-    for el in $escenic_conf_dir/ece-*.conf; do
-        current_instance=$(basename ${el} | \
-            sed -e 's/ece-//g' -e 's/engine-//g' | \
-            cut -d'.' -f1)
+    local escenic_jstat_modules="_gc _gcoverhead _heap _uptime"
+    for current_instance in $instance_list; do
         for module in $escenic_jstat_modules; do
 	          cd /usr/share/munin/plugins/
 	          make_ln escenic_jstat_ escenic_jstat_${current_instance}${module}

From a94b41970685145de9954b7ffae7b1673f9b9397 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 15 Feb 2012 18:54:38 +0800
Subject: [PATCH 0290/2585] - fixed the permissions of the ece_user's .bashrc

- new feature: when installing the monitoring server profile, you can
  choose between vanilla Nagios 3 and the icinga fork.

  New setting: fai_monitoring_nagios_flavour has two supported values,
  "nagios" and "icinga". Default is icinga.

  New setting: fai_monitoring_privileged_hosts a string with the hosts
  which should be allowed to access the monitoring server.

- the monitoring server profile now generates a start page for all the
  monitoring services, accessible on the monitoring host's /
  resource.

- added installation report info about the icinga/nagios interface(s).
---
 usr/sbin/ece-install | 169 +++++++++++++++++++++++++++++++++----------
 1 file changed, 129 insertions(+), 40 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index ee862508..988df325 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -930,9 +930,6 @@ function install_ece_third_party_packages
     for el in ant mvn java; do
         assert_pre_prequesite $el
     done
-    
-    exit 0
-    
 }
 
 function get_base_dir_from_bundle()
@@ -1641,6 +1638,7 @@ function set_up_user_enviornment()
 
     if [ $(grep ECE_CONF_LOCATIONS ${bashrc} | wc -l) -eq 0 ]; then
         echo "export ECE_CONF_LOCATIONS=\"$escenic_conf_dir\"" >> ${bashrc}
+        run chown ${ece_user}:${ece_group} ${bashrc}
     fi
 }
 
@@ -2867,7 +2865,7 @@ function install_munin_gatherer()
             node_list=$user_munin_nodes
         fi
     else
-        node_list=${fai_munin_node_list}
+        node_list=${fai_monitoring_munin_node_list}
     fi
     
     if [ -z "$node_list" ]; then
@@ -2875,7 +2873,7 @@ function install_munin_gatherer()
     fi
 
     for el in $node_list; do
-        print_and_log "Adding ${el} to the Muning gatherer on ${HOSTNAME} ..."
+        print_and_log "Adding ${el} to the Munin gatherer on ${HOSTNAME} ..."
         local file=/etc/munin/munin-conf.d/escenic.conf
         cat >> $file <<EOF
 [${el}]
@@ -2887,9 +2885,20 @@ EOF
     # TODO add the priveleged network to the Allowed stanza (i.e. the
     # network wich will do the monitoring of the servers.
     local file=/etc/apache2/conf.d/munin
+    if [ -n "${fai_monitoring_privileged_hosts}" ]; then
+        local privileged_hosts=$(
+            echo ${fai_monitoring_privileged_hosts} | \
+                sed "s#\ #\\\ #g"
+        )
+        sed -i "s#Allow\ from\ localhost#Allow\ from\ ${privileged_hosts}\ localhost#g" \
+            $file
+        exit_on_error "Failed adding ${fai_monitoring_privileged_hosts} to" \
+            "Munin's allowed addresses."
+        run /etc/init.d/apache2 reload
+    fi
 
-    add_next_step "Munin gatherer installed on $HOSTNAME."
-    add_next_step "Make sure all nodes allows my IP to connect to them."
+    add_next_step "Munin gatherer admin interface: http://${HOSTNAME}/munin"
+    add_next_step "Make sure all nodes allows its IP to connect to them."
 }
 
 # will return the IP of the host name. If not found, the host name
@@ -2909,52 +2918,92 @@ function get_ip()
     echo $ip
 }
 
-## Installs the Icinga monitoring server.
-function monitoring_install_icinga_server()
+## Installs the Nagios monitoring server.
+## $1 the nagios vendor/falvour, "nagios" and "icinga" are supported.
+function install_nagios_monitoring_server()
 {
-    print "Installing an icinga server on $HOSTNAME ..."
+    print "Installing an $1 server on $HOSTNAME ..."
+    local monitoring_vendor=$1
     
-    # TODO consider apache2 in seperate method
     if [ $on_debian_or_derivative -eq 1 ]; then
-        install_packages_if_missing apache2 icinga nagios-nrpe-plugin icinga-doc
+        if [[ $monitoring_vendor == $MONITORING_VENDOR_NAGIOS ]]; then
+            install_packages_if_missing apache2 nagios3 nagios-nrpe-plugin
+        else
+            install_packages_if_missing \
+                apache2 icinga nagios-nrpe-plugin icinga-doc
+        fi
     fi
 
-    # set password for the icingaadmin
-    print "Setting user/pass for icinga admin ..."
-    local file=/etc/icinga/htpasswd.users
-    run htpasswd -b -c $file icingaadmin ${fai_monitoring_admin_password-admin}
+    if [[ $monitoring_vendor == $MONITORING_VENDOR_ICINGA ]]; then
+        print "Setting user/pass for icinga admin ..."
+        local file=/etc/icinga/htpasswd.users
+        run htpasswd -b -c $file icingaadmin \
+            ${fai_monitoring_admin_password-admin}
+    fi
     
     # enable remote commands
-    local file=/etc/icinga/icinga.cfg
+    if [[ $monitoring_vendor == $MONITORING_VENDOR_NAGIOS ]]; then
+        local file=/etc/nagios3/nagios.cfg
+    else
+        local file=/etc/icinga/icinga.cfg
+    fi
+    
     dont_quote_conf_values=1
     set_conf_file_value check_external_commands 1 $file
     dont_quote_conf_values=0
 
     for el in $fai_monitoring_host_list; do
-        set_up_icinga_host $el
+        set_up_monitoring_host_def $monitoring_vendor $el
     done
 
-    set_up_icinga_host_groups \
+    if [[ $monitoring_vendor == $MONITORING_VENDOR_NAGIOS ]]; then
+        file=/etc/nagios3/conf.d/hostgroups_nagios2.cfg
+    else
+        file=/etc/icinga/objects/hostgroups_icinga.cfg
+    fi
+    
+    set_up_monitoring_host_group \
+        $file \
         "ece-hosts" \
         'Hosts running one or more ECE' \
         ${fai_monitoring_ece_host_list}
 
-    run /etc/init.d/icinga restart
+    set_up_monitoring_host_group \
+        $file \
+        "search-hosts" \
+        'Hosts running search instance(s) (Solr + indexer)' \
+        ${fai_monitoring_search_host_list}
+
+    if [[ $monitoring_vendor == $MONITORING_VENDOR_NAGIOS ]]; then
+        run /etc/init.d/nagios3 restart
+        add_next_step "Icinga monitoring interface: http://${HOSTNAME}/nagios3"
+    else
+        run /etc/init.d/icinga restart
+        add_next_step "Icinga monitoring interface: http://${HOSTNAME}/icinga"
+    fi
+    
     run /etc/init.d/apache2 reload
+
 }
 
-## $1 <host name>:<ip>, e.g.: fire:192.168.1.100
-function set_up_icinga_host()
+## Sets up the definition file for a given monitoring host.
+##
+## $1 nagios flavour/vendor
+## $2 <host name>:<ip>, e.g.: fire:192.168.1.100
+function set_up_monitoring_host_def()
 {
-    local old_ifs=$IFS
-    IFS=':'
-    read host_name ip <<< "$1"
     local file=/etc/icinga/objects/${host_name}_icinga.cfg
+    if [[ $1 == $MONITORING_VENDOR_NAGIOS ]]; then
+        file=/etc/nagios3/conf.d/${host_name}_nagios2.cfg
+    fi
+    
+    local old_ifs=$IFS
+    IFS='#'
+    read host_name ip <<< "$2"
     IFS=$old_ifs
-
-
-    if [ $(grep "host_name $host_name" $file | wc -l) -gt 0 ]; then
-        print "Icinga host" $host_name "already defined, skipping it."
+    
+    if [ $(grep "host_name $host_name" $file 2>/dev/null | wc -l) -gt 0 ]; then
+        print "$1 host" $host_name "already defined, skipping it."
         return
     fi
     
@@ -2976,7 +3025,7 @@ EOF
 
 }
 
-function install_icinga_client()
+function install_nagios_node()
 {
     print "Installing an icinga client on $HOSTNAME ..."
     if [ $on_debian_or_derivative -eq 1 ]; then
@@ -2992,6 +3041,7 @@ function install_icinga_client()
     dont_quote_conf_values=0
 
     run /etc/init.d/nagios-nrpe-server restart
+    add_next_step "A Nagios NRPE node has been installed on ${HOSTNAME}"
 }
 
 # munin nodes need the IP of the munin gatherer to be escaped. Hence this function.
@@ -3057,7 +3107,7 @@ EOF
     run chmod 755 $file
 
     local instance_list=$(get_instance_list)
-    if [ -z ${instance_list} ]; then
+    if [ -z "${instance_list}" ]; then
         print_and_log "No ECE instances found on $HOSTNAME, so I'm not adding"
         print_and_log "additional Munin configuration"  
         add_next_step "A Munin node has been installed on $HOSTNAME"
@@ -3308,12 +3358,18 @@ function restore_from_backup()
     fi
 }
 
-function set_up_icinga_host_groups()
+## $1 configuration file name
+## $2 host group name
+## $3 host group alias
+## $4..n host group members
+function set_up_monitoring_host_group()
 {
-    local file=/etc/icinga/objects/hostgroups_icinga.cfg
-    local host_group_name=$1
-    local host_group_alias=$2
-    local host_group_member_list=${@:3:$(( $# - 2 ))}
+    local file=$1
+    local host_group_name=$2
+    local host_group_alias=$3
+    # the remainding arguments passed to the methods is the member
+    # list members
+    local host_group_member_list=${@:4:$(( $# - 3 ))}
 
     if [ $(grep "hostgroup_name $host_group_name" $file | wc -l) -gt 0 ]; then
         print "Icinga group member" \
@@ -3337,6 +3393,41 @@ EOF
 EOF
 }
 
+## $1 nagios vendor
+function create_monitoring_server_overview()
+{
+    local file=/var/www/index.html
+    cat > $file <<EOF
+<html>
+  <body>
+    <h1>Welcome to the might monitoring server @ ${HOSTNAME}</h1>
+    <ul>
+EOF
+    if [[ $1 == $MONITORING_VENDOR_NAGIOS ]]; then
+        echo '<li><a href="/nagios3">Nagios</a></li>' \
+    else
+        echo '<li><a href="/icinga">Icinga</a> (an enhanced Nagios)</li>' \
+            >> $file
+    fi
+    cat > $file <<EOF
+      <li><a href="/munin">Munin</a></li>
+    </ul>
+  </body>
+</html>
+EOF
+    add_next_step "Start page for all monitoring interfaces: http://${HOSTNAME}/"
+}
+
+MONITORING_VENDOR_NAGIOS=nagios
+MONITORING_VENDOR_ICINGA=icinga
+function install_monitoring_server()
+{
+    local nagios_flavour=${fai_monitoring_nagios_flavour-$MONITORING_VENDOR_ICINGA}
+    install_nagios_monitoring_server $nagios_flavour
+    install_munin_gatherer
+    create_monitoring_server_overview $nagios_flavour
+}
+
 function common_post_install()
 {
     if [ $install_profile_number -eq $PROFILE_ALL_IN_ONE -o \
@@ -3352,7 +3443,7 @@ function common_post_install()
         install_munin_node
 
         if [ $install_profile_number -ne $PROFILE_MONITORING_SERVER ]; then
-            install_icinga_client
+            install_nagios_node
         fi
     fi
 
@@ -3444,9 +3535,7 @@ if [ $fai_enabled -eq 1 ]; then
     
     if [ $(get_boolean_conf_value fai_monitoring_install) -eq 1 ]; then
         install_profile_number=$PROFILE_MONITORING_SERVER
-        monitoring_install_icinga_server
-        install_munin_gatherer
-        # install_web_server 1
+        install_monitoring_server
         no_fai_profile=0
     fi
     

From db5e9b41e3d0aac441d4fb987040dc7430be6352 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 15 Feb 2012 18:57:39 +0800
Subject: [PATCH 0291/2585] - when ece cannot find one of its required fields,
 it will now tell   which ece.conf files it has parsed/read instead of just
 saying   "ece.conf"

  [ece#engine-editor1] You need to specifiy 'tmp_dir' in one of
  /etc/escenic/ece-editor1.conf /etc/escenic/ece.conf
---
 usr/bin/ece | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index a361bcf3..a7aa3f0c 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -152,7 +152,7 @@ function ensure_that_required_fields_are_set()
             continue
         fi
         
-        print "You need to specifiy '$el' in your `basename $0`.conf"
+        print "You need to specifiy '$el' in one of ${ece_conf_files_read}"
         requirements_failed=1
     done
 

From 72d7986c4f74d25e6a7be082420c4ab14e2c3fa8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 15 Feb 2012 18:59:19 +0800
Subject: [PATCH 0292/2585] - small fix: now lists _all_ the parsed files (not
 just the first one):

  [ece#engine-dev1] You need to specifiy 'tmp_dir' in one of /etc/escenic/ece-dev1.conf /etc/escenic/ece.conf
---
 usr/bin/ece | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index a7aa3f0c..0febad76 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -152,7 +152,7 @@ function ensure_that_required_fields_are_set()
             continue
         fi
         
-        print "You need to specifiy '$el' in one of ${ece_conf_files_read}"
+        print "You need to specifiy '$el' in one of ${ece_conf_files_read[@]}"
         requirements_failed=1
     done
 

From 3fbd45dfdabefd37e9598944e372172deb122e37 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 16 Feb 2012 17:08:57 +0800
Subject: [PATCH 0293/2585] - added dedicated method for getting privileged
 hosts:   Returns the privileged hosts. This will include both the IP(s) the  
 logged in user conduction the ece-install is coming from, as well   as any
 IPs defined in fai_privileged_hosts.

- made use of this method in both Munin's Apache configuration and in
  Varnish' ACL.
---
 usr/sbin/ece-install | 38 ++++++++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 988df325..0061b64f 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -271,7 +271,7 @@ function download_escenic_components()
 #
 # parameters:
 # $1 : space separated string of package names 
-install_packages_if_missing()
+function install_packages_if_missing()
 {
     if [ $on_debian_or_derivative -eq 1 ]; then
         some_are_missing=0
@@ -1724,6 +1724,27 @@ function un_install_ece()
     apt-get clean
 }
 
+## Returns the privileged hosts. This will include both the IP(s) the
+## logged in user conduction the ece-install is coming from, as well
+## as any IPs defined in fai_privileged_hosts.
+function get_privileged_hosts()
+{
+    local privileged_hosts=${fai_privileged_hosts}
+    
+    for ip in $(
+        w -h  | \
+            grep pts | \
+            sed "s#.*pts/[0-9]*[ ]*\(.*\)#\1#" | \
+            cut -d' ' -f1 | \
+            sort | \
+            uniq
+    ); do
+        privileged_hosts=${privileged_hosts}" "${ip}
+    done
+
+    echo ${privileged_hosts}
+}
+
 function set_up_varnish()
 {
     print_and_log "Setting up Varnish to match your environment ..."
@@ -1744,13 +1765,11 @@ function set_up_varnish()
 acl staff {
   "localhost";
 EOF
-    w | cut -d' ' -f7 | sort | uniq | while read l; do
-        if [ $(echo $l | wc -c) -gt 8 ]; then
-    cat >> /etc/varnish/default.vcl <<EOF
-  # The host which conducted the ece-install
+    for l in $(get_privileged_hosts); do
+        cat >> /etc/varnish/default.vcl <<EOF
+  # Privileged host (either doing the ece-install or listed as such)
   "${l}";
 EOF
-        fi
     done
     
     cat >> /etc/varnish/default.vcl <<EOF
@@ -2885,14 +2904,13 @@ EOF
     # TODO add the priveleged network to the Allowed stanza (i.e. the
     # network wich will do the monitoring of the servers.
     local file=/etc/apache2/conf.d/munin
-    if [ -n "${fai_monitoring_privileged_hosts}" ]; then
+    if [ -n "$(get_privileged_hosts)" ]; then
         local privileged_hosts=$(
-            echo ${fai_monitoring_privileged_hosts} | \
-                sed "s#\ #\\\ #g"
+            echo $(get_privileged_hosts) | sed "s#\ #\\\ #g"
         )
         sed -i "s#Allow\ from\ localhost#Allow\ from\ ${privileged_hosts}\ localhost#g" \
             $file
-        exit_on_error "Failed adding ${fai_monitoring_privileged_hosts} to" \
+        exit_on_error "Failed adding ${fai_privileged_hosts} to" \
             "Munin's allowed addresses."
         run /etc/init.d/apache2 reload
     fi

From 7c69c27c6dadc64693a91ae1aa2545ce6e1f02cf Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 17 Feb 2012 12:32:19 +0800
Subject: [PATCH 0294/2585] - when using fai_<profile>_conf_archive, the plugin
 configuration must   now reside with the other configuration files:

  "If you wish to provide Nursery configuration for the plugins, you
   simply put them in engine/siteconfig/config-skeleton inside your
   tarball, together with the other Nursery configuration files."
---
 usr/share/doc/escenic/ece-install-guide.org | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 5a9dc8d8..a30d35c0 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -419,8 +419,7 @@ $ tar czf /tmp/nursery-skeleton-solr-and-security.tar.gz \
   engine/security \
   engine/siteconfig/config-skeleton/ \
   engine/solr/conf \
-  engine/siteconfig/bootstrap-skeleton/ \
-  `find -L assemblytool/plugins/ -name siteconfig`
+  engine/siteconfig/bootstrap-skeleton/`
 #+END_SRC
 
 /tmp/nursery-skeleton-solr-and-security.tar.gz should now have everything
@@ -439,6 +438,10 @@ The inclusion of the engine/solr directory makes it easy for users to
 provide their own, optimised Solr configuration. In this context, also
 note that a post install hook, set_up_solr.postinst, is available.
 
+If you wish to provide Nursery configuration for the plugins, you
+simply put them in engine/siteconfig/config-skeleton inside your
+tarball, together with the other Nursery configuration files.
+
 ** Setting up virtual hosts
 Setting up virtual host definitions in the application server makes a
 some things easier, such as ECE plugins which set cookies based on

From 74f0a947dbefc9806210cd24906a4e13b79b6c23 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 17 Feb 2012 12:48:05 +0800
Subject: [PATCH 0295/2585] - when using conf archives
 (fai_<profile>_conf_archive), the plugin   information must now be together
 with the other Nursery   configuration you wish to provide/override. See the
 documentation   for exact examples of this.

- providing the JAAS (engine/security) configuration in the conf
  archive is now optional. If it's not provided, ece-install will use
  the JAAS configuration shipped with ECE.

- new method: get_user_home_directory, which will:

  Method which will try its best to find the home diretory of
  existing users and probable home directories of new users.

  (1) On Darwin/Mac OS X, it will return /Users/<user>
  (2) On systems using /etc/passwd, it will search there to find the
      home dir of existing users.
  (3) For new users, it will check the configuration of adduser (if
      present).
  (4) If all of thes above fails, it will return /home/<user>

- it's now possible to have the UNIX users with home directories
  outside of /home (or /Users on Mac).

- the Maven dependency is first required, installed & checked for when
  it's needed (i.e. when installing WF)
---
 usr/sbin/ece-install | 82 +++++++++++++++++++++++++++++---------------
 1 file changed, 55 insertions(+), 27 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 0061b64f..20808ac0 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -296,7 +296,6 @@ function install_packages_if_missing()
     fi
 }
 
-
 function install_common_os_packages()
 {
     print_and_log "Installing 3rd party packages needed by $(basename $0) ..."
@@ -413,10 +412,8 @@ name: ${short_name}
 source-war: ${short_name}.war
 context-root: ${short_name}
 EOF
-            
         done
     fi
-    
 }
 
 function set_up_engine_and_plugins()
@@ -609,31 +606,37 @@ function set_up_basic_nursery_configuration()
 {
     print_and_log "Setting up the basic Nursery configuration ..."
 
-    local escenic_root_dir=$escenic_root_dir
-    
+    # we always copy the default plugin configuration (even if there
+    # is an archive)
+    for el in $escenic_root_dir/assemblytool/plugins/*; do
+        if [ ! -d $el/misc/siteconfig/ ]; then
+            continue
+        fi
+        run cp -r $el/misc/siteconfig/* $common_nursery_dir/
+    done
+
+    # Then we see if we're using configuration archives, if yes, use
+    # the JAAS and Nursery configuraiton from here.
     if [ $(is_using_conf_archive) -eq 1 ]; then
         print_and_log "Using the supplied Nursery & JAAS configuration from" 
         print_and_log "bundle: $ece_instance_conf_archive"
         local a_tmp_dir=$(mktemp -d)
-        escenic_root_dir=$a_tmp_dir
+        
+        if [ ! -d ${a_tmp_dir}/engine/security ]; then
+            print "Archive $ece_instance_conf_archive doesn't have JAAS config,"
+            print "I'll use standard JAAS (engine/security) instead."
+            run cp -r $escenic_root_dir/engine/security/ $common_nursery_dir/
+        fi
+        
         run cd $a_tmp_dir
         run tar xzf $ece_instance_conf_archive
+        run cp -r engine/siteconfig/config-skeleton/* $common_nursery_dir/
+    else
+        run cp -r $escenic_root_dir/engine/siteconfig/config-skeleton/* \
+            $common_nursery_dir/
+        run cp -r $escenic_root_dir/engine/security/ $common_nursery_dir/
     fi
-    
-    run cp -r $escenic_root_dir/engine/siteconfig/config-skeleton/* \
-        $common_nursery_dir/
-    run cp -r $escenic_root_dir/engine/security/ \
-        $common_nursery_dir/
 
-    make_dir $escenic_conf_dir/engine/instance
-
-    for el in $escenic_root_dir/assemblytool/plugins/*; do
-        if [ ! -d $el/misc/siteconfig/ ]; then
-            continue
-        fi
-
-        run cp -r $el/misc/siteconfig/* $common_nursery_dir/
-    done
 
     if [ -n "${a_tmp_dir}" ]; then
         run rm -rf ${a_tmp_dir}
@@ -920,14 +923,13 @@ function install_ece_third_party_packages
           libtcnative-1
           libmysql-java
           memcached
-          maven2
           wget"
 
         print_and_log "Installing 3rd party packages needed by ECE ..."
         install_packages_if_missing $packages
     fi
     
-    for el in ant mvn java; do
+    for el in ant java; do
         assert_pre_prequesite $el
     done
 }
@@ -1622,16 +1624,40 @@ EOF
     echo "TBD"
 }
 
+## Method which will try its best to find the home diretory of
+## existing users and probable home directories of new users.
+##
+## (1) On Darwin/Mac OS X, it will return /Users/<user>
+## (2) On systems using /etc/passwd, it will search there to find the
+##     home dir of existing users.
+## (3) For new users, it will check the configuration of adduser (if
+##     present).
+## (4) If all of thes above fails, it will return /home/<user>
+##
+## Arguments:
+## $1 : the user name, can either be an existing user or a non-yet
+## created user.
+function get_user_home_directory()
+{
+    if [ $(uname -s) = "Darwin" ]; then
+        echo /Users/$1
+    elif [ $(grep $1 /etc/passwd | wc -l) -gt 0 ]; then
+        grep $1 /etc/passwd | cut -d':' -f6
+    elif [ -r /etc/adduser.conf ]; then
+        local dir=$(grep DHOME /etc/adduser.conf | grep -v ^# | cut -d'=' -f2)
+        echo $dir/$1
+    else
+        echo "/home/$1"
+    fi
+}
+
 function set_up_user_enviornment()
 {
     print_and_log "Setting up the ${ece_user} user's UNIX environment ..."
 
-    local bashrc=/home/${ece_user}/.bashrc
-    if [ $(uname -s) = "Darwin" ]; then
-        bashrc=/Users/${ece_user}/.bashrc
-    fi
+    local bashrc=$(get_user_home_directory $ece_user)/.bashrc
     
-    if [ $(grep bash_completion.d/ece ${bashrc}  2>/dev/null | \
+    if [ $(grep bash_completion.d/ece ${bashrc} 2>/dev/null | \
         wc -l) -lt 1 ]; then
         echo ". /etc/bash_completion.d/ece" >> ${bashrc}
     fi
@@ -2705,7 +2731,9 @@ EOF
         run unzip -q -u $download_dir/$(basename $el)
     done
 
+    install_packages_if_missing "maven2"
     assert_pre_prequesite mvn
+    
     export JAVA_HOME=$java_home
     wf_maven_dir=$(echo $escenic_root_dir/widget-framework-core-*/maven)
     run cd $wf_maven_dir

From 9f1b51f2a48f5ffb4b9f6f364d264de1577cfe68 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 17 Feb 2012 12:59:23 +0800
Subject: [PATCH 0296/2585] - renamed appserver_root_dir ->
 appserver_parent_dir as that's what it   is.

---
 usr/sbin/ece-install | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 20808ac0..a83e6444 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -35,7 +35,7 @@ escenic_backups_dir=/var/backups/${dir_suffix}
 escenic_spool_dir=/var/spool/${dir_suffix}
 escenic_cache_dir=/var/cache/${dir_suffix}
 escenic_crash_dir=/var/crash/${dir_suffix}
-appserver_root_dir=/opt
+appserver_parent_dir=/opt
 
 # country code for selecting the correct (APT) mirror.
 mirror_country_suffix=jp
@@ -1114,7 +1114,7 @@ function set_up_app_server()
     run wget $wget_opts $tomcat_download
     tomcat_dir=$(get_base_dir_from_bundle $tomcat_download)
     
-    run cd $appserver_root_dir
+    run cd $appserver_parent_dir
     run tar xzf $download_dir/${tomcat_dir}.tar.gz
 
     if [ -e tomcat ]; then
@@ -1122,11 +1122,11 @@ function set_up_app_server()
     fi
     run ln -sf ${tomcat_dir} tomcat
     
-    tomcat_home=${appserver_root_dir}/tomcat   
-    tomcat_base=${appserver_root_dir}/tomcat-${instance_name}
+    tomcat_home=${appserver_parent_dir}/tomcat   
+    tomcat_base=${appserver_parent_dir}/tomcat-${instance_name}
     make_dir $tomcat_base
 
-    run cp -r ${appserver_root_dir}/${tomcat_dir}/conf $tomcat_base
+    run cp -r ${appserver_parent_dir}/${tomcat_dir}/conf $tomcat_base
     for el in bin escenic/lib lib work logs temp webapps; do
         make_dir $tomcat_base/$el
     done
@@ -1715,7 +1715,7 @@ function un_install_ece()
     print_and_log "Uninstalling ECE ..."
      # TODO safety, warnings++
     rm -rf $escenic_conf_dir/ \
-        ${appserver_root_dir}/*tomcat* \
+        ${appserver_parent_dir}/*tomcat* \
         $escenic_root_dir \
         $escenic_data_dir \
         $escenic_run_dir/ \
@@ -3369,7 +3369,7 @@ function restore_from_backup()
         run tar -C / -xf $backup_file opt
         add_next_step "Successfully restored Escenic & Tomcat binaries"
         add_next_step "Backup file used: $(basename $backup_file)"
-        add_next_step "Check ${appserver_root_dir} to verify that they're all there".
+        add_next_step "Check ${appserver_parent_dir} to verify that they're all there".
         install_ece_third_party_packages
         set_up_engine_directories
 

From af988d14bb5583aa23af4beb41267c759b7cf6e2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 17 Feb 2012 12:59:36 +0800
Subject: [PATCH 0297/2585] - renamed appserver_root_dir ->
 appserver_parent_dir as that's what it   is.

---
 usr/share/doc/escenic/ece-install-guide.org | 22 ++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index a30d35c0..177290b2 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -674,17 +674,17 @@ ece-install.conf. Here's an example of changing all the paths possible
 with the same suffix.
 
 #+BEGIN_SRC conf
-suffix=escenic-parallel
-
-escenic_root_dir=/opt/$suffix
-escenic_conf_dir=/etc/$suffix
-escenic_log_dir=/var/log/$suffix
-escenic_data_dir=/var/lib/$suffix
-escenic_run_dir=/var/run/$suffix
-escenic_backups_dir=/var/backups/$suffix
-escenic_spool_dir=/var/spool/$suffix
-escenic_cache_dir=/var/cache/$suffix
-escenic_crash_dir=/var/crash/$suffix
+dir_suffix=escenic-parallel
+escenic_root_dir=/opt/${dir_suffix}
+escenic_conf_dir=/etc/${dir_suffix}
+escenic_log_dir=/var/log/${dir_suffix}
+escenic_data_dir=/var/lib/${dir_suffix}
+escenic_run_dir=/var/run/${dir_suffix}
+escenic_backups_dir=/var/backups/${dir_suffix}
+escenic_spool_dir=/var/spool/${dir_suffix}
+escenic_cache_dir=/var/cache/${dir_suffix}
+escenic_crash_dir=/var/crash/${dir_suffix}
+appserver_parent_dir=/opt
 #+END_SRC
 
 Note, this is only needed if you are running two completely separate

From 5ea12c4165ab15c63351cf6c410fe6f0ac41a2da Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 17 Feb 2012 12:59:55 +0800
Subject: [PATCH 0298/2585] - update HTML

---
 usr/share/doc/escenic/ece-install-guide.html | 56 +++++++++++++-------
 1 file changed, 38 insertions(+), 18 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.html b/usr/share/doc/escenic/ece-install-guide.html
index e49f7282..98051c42 100644
--- a/usr/share/doc/escenic/ece-install-guide.html
+++ b/usr/share/doc/escenic/ece-install-guide.html
@@ -7,7 +7,7 @@
 <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
 <meta name="title" content="Welcome to the /usr/sbin/ece-install Guide"/>
 <meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2012-02-07 19:40:37 CST"/>
+<meta name="generated" content="2012-02-17 12:59:41 CST"/>
 <meta name="author" content="Torstein Krause Johansen"/>
 <meta name="description" content=""/>
 <meta name="keywords" content=""/>
@@ -1128,8 +1128,7 @@ <h3 id="sec-6-1"><span class="section-number-3">6.1</span> Installing from EARs
   <span style="color: #f0dfaf;">engine/security</span> \
   <span style="color: #f0dfaf;">engine/siteconfig/config-skeleton/</span> \
   <span style="color: #f0dfaf;">engine/solr/conf</span> \
-  <span style="color: #f0dfaf;">engine/siteconfig/bootstrap-skeleton/</span> \
-  <span style="color: #f0dfaf;">`find</span> -L assemblytool/plugins/ -name siteconfig`
+  <span style="color: #f0dfaf;">engine/siteconfig/bootstrap-skeleton/`</span>
 </pre>
 
 
@@ -1155,6 +1154,11 @@ <h3 id="sec-6-1"><span class="section-number-3">6.1</span> Installing from EARs
 provide their own, optimised Solr configuration. In this context, also
 note that a post install hook, set<sub>up</sub><sub>solr</sub>.postinst, is available.
 </p>
+<p>
+If you wish to provide Nursery configuration for the plugins, you
+simply put them in engine/siteconfig/config-skeleton inside your
+tarball, together with the other Nursery configuration files.
+</p>
 </div>
 
 </div>
@@ -1206,8 +1210,23 @@ <h3 id="sec-6-2"><span class="section-number-3">6.2</span> Setting up virtual ho
 
 
 <p>
-You must of course make sure that these host names are resolvable to
-the intended IPs on your system using /etc/hosts or a local DNS.
+Furthermore, if these host names are  not resolvable to your local
+host (neither localhost or the IP of your $HOSTNAME), ece-install will
+add entries for these domains in the machine's /etc/hosts:
+</p>
+
+
+<pre class="src src-sh"><span style="color: #7f9f7f; font-style: italic;"># </span><span style="color: #7f9f7f; font-style: italic;">added by ece-install @ Wed Feb  8 19:21:49 CST 2012</span>
+127.0.1.1 fire.escenic.com
+
+<span style="color: #7f9f7f; font-style: italic;"># </span><span style="color: #7f9f7f; font-style: italic;">added by ece-install @ Wed Feb  8 19:21:51 CST 2012</span>
+127.0.1.1 ild.escenic.com
+</pre>
+
+
+<p>
+If you do not want ece-install to touch your /etc/hosts, you can set
+fai_keep_off_etc_hosts=1 in your ece-install.conf
 </p>
 </div>
 
@@ -1259,7 +1278,7 @@ <h3 id="sec-6-3"><span class="section-number-3">6.3</span> Overview of All FAI P
 <tr><td class="left">fai_publication_use_instance</td><td class="left">dev1</td><td class="left">Name of local instance to use for creation</td></tr>
 <tr><td class="left">fai_publication_war</td><td class="left">"WF or ECE demo WAR"</td><td class="left">WAR to base the new publication on</td></tr>
 <tr><td class="left">fai_publication_war_uri_list</td><td class="left">""</td><td class="left">Publication WARs used for setting up Assembly tool. Supported: http[s]://tmp.com/mypub.war, <a href="file:////tmp/mypub.war">///tmp/mypub.war</a> and /tmp/mypub.war.</td></tr>
-<tr><td class="left">fai_publication_domain_mapping_list</td><td class="left">""</td><td class="left">Mapping between publication names and their corresponding domains on the form: one#one.com other#other.com</td></tr>
+<tr><td class="left">fai_publication_domain_mapping_list</td><td class="left">""</td><td class="left">Mapping between publication names and their corresponding domains on the form: "one#one.com other#other.com"</td></tr>
 <tr><td class="left">fai_rmi_install</td><td class="left">0</td><td class="left">Install RMI hub profile</td></tr>
 <tr><td class="left">fai_search_conf_archive</td><td class="left">""</td><td class="left">conf.tar.gz to use for Nursery &amp; JAAS configuration</td></tr>
 <tr><td class="left">fai_search_ear</td><td class="left">""</td><td class="left">EAR to use instead of the Escenic binaries</td></tr>
@@ -1269,6 +1288,7 @@ <h3 id="sec-6-3"><span class="section-number-3">6.3</span> Overview of All FAI P
 <tr><td class="left">fai_search_name</td><td class="left">search1</td><td class="left">Name of the search instance</td></tr>
 <tr><td class="left">fai_search_port</td><td class="left">8080</td><td class="left">HTTP port of the search instance</td></tr>
 <tr><td class="left">fai_search_shutdown</td><td class="left">8005</td><td class="left">Shutdown port of the search instance</td></tr>
+<tr><td class="left">fai_keep_off_etc_hosts</td><td class="left">0</td><td class="left">Set this to 1 if you don't want ece-install adding entries to /etc/hosts</td></tr>
 <tr><td class="left">fai_wf_install</td><td class="left">0</td><td class="left">Install Widget Framework profile</td></tr>
 </tbody>
 </table>
@@ -1510,17 +1530,17 @@ <h2 id="sec-11"><span class="section-number-2">11</span> Overriding the Escenic
 
 
 
-<pre class="src src-conf"><span style="color: #f0dfaf;">suffix</span>=escenic-parallel
-
-<span style="color: #f0dfaf;">escenic_root_dir</span>=/opt/$suffix
-<span style="color: #f0dfaf;">escenic_conf_dir</span>=/etc/$suffix
-<span style="color: #f0dfaf;">escenic_log_dir</span>=/var/log/$suffix
-<span style="color: #f0dfaf;">escenic_data_dir</span>=/var/lib/$suffix
-<span style="color: #f0dfaf;">escenic_run_dir</span>=/var/run/$suffix
-<span style="color: #f0dfaf;">escenic_backups_dir</span>=/var/backups/$suffix
-<span style="color: #f0dfaf;">escenic_spool_dir</span>=/var/spool/$suffix
-<span style="color: #f0dfaf;">escenic_cache_dir</span>=/var/cache/$suffix
-<span style="color: #f0dfaf;">escenic_crash_dir</span>=/var/crash/$suffix
+<pre class="src src-conf"><span style="color: #f0dfaf;">dir_suffix</span>=escenic-parallel
+<span style="color: #f0dfaf;">escenic_root_dir</span>=/opt/${dir_suffix}
+<span style="color: #f0dfaf;">escenic_conf_dir</span>=/etc/${dir_suffix}
+<span style="color: #f0dfaf;">escenic_log_dir</span>=/var/log/${dir_suffix}
+<span style="color: #f0dfaf;">escenic_data_dir</span>=/var/lib/${dir_suffix}
+<span style="color: #f0dfaf;">escenic_run_dir</span>=/var/run/${dir_suffix}
+<span style="color: #f0dfaf;">escenic_backups_dir</span>=/var/backups/${dir_suffix}
+<span style="color: #f0dfaf;">escenic_spool_dir</span>=/var/spool/${dir_suffix}
+<span style="color: #f0dfaf;">escenic_cache_dir</span>=/var/cache/${dir_suffix}
+<span style="color: #f0dfaf;">escenic_crash_dir</span>=/var/crash/${dir_suffix}
+<span style="color: #f0dfaf;">appserver_parent_dir</span>=/opt
 </pre>
 
 
@@ -1734,7 +1754,7 @@ <h2 id="sec-15"><span class="section-number-2">15</span> Example Output FAI</h2>
 <hr/>
 <p class="author">
   Author: Torstein Krause Johansen (<a href="mailto:tkj@vizrt.com">tkj@vizrt.com</a>)
-  Date: 2012-02-07 19:40:37 CST
+  Date: 2012-02-17 12:59:41 CST
 </p>
 </div>
 </body>

From 62b8318e01c1f9f5b186c68a364346d96d59aa1b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 17 Feb 2012 18:25:54 +0800
Subject: [PATCH 0299/2585] - added method to get pulse on ongoing tasks, as
 well as outputting a   green "ok" on success or a red "failed" on failure.

- made use of the new show_pulse method a few places.
---
 usr/sbin/ece-install | 429 ++++++++++++++++++++++++-------------------
 1 file changed, 235 insertions(+), 194 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index a83e6444..17f7572d 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -110,6 +110,11 @@ function print()
     echo $(get_id) $@
 }
 
+function printne()
+{
+    echo -ne $(get_id) $@
+}
+
 function log()
 {
     echo $(get_id) $@ >> $log
@@ -244,14 +249,46 @@ function set_up_engine_directories()
     done
 }
 
+pulse_bits="-\|/"
+
+function pulse()
+{
+    echo -ne "\b${pulse_bits:i++%${#pulse_bits}:1}"
+}
+
+function show_pulse()
+{
+    printne "$1 ...."
+    local pulse_pid=$2
+    while true; do
+        kill -0 $pulse_pid 2>/dev/null
+        if [ $? -eq 0 ]; then
+            pulse
+            sleep 0.25
+        else
+            wait $pulse_pid
+            local exit_code=$?
+            if [ $exit_code -eq 0 ]; then
+                echo -e '\b\E[37;32m'" \033[1mok\033[0m"
+                tput sgr0
+            else
+                echo -e '\b\E[37;31m'" \033[1mfailed\033[0m"
+                tput sgr0
+            fi
+            
+            break
+        fi
+    done
+}
+
 function download_escenic_components()
 {
     if [ $ece_software_setup_completed -eq 1 ]; then
         return
     fi
-    
+
     print_and_log "Downloading Escenic software from technet.escenic.com ..."
-    
+
     cd $download_dir
     for el in $technet_download_list; do
         if [ -e $(basename $el) ]; then
@@ -263,7 +300,6 @@ function download_escenic_components()
             --http-password $technet_password \
             $el 
     done
-
 }
 
 # will install the passed packages if these are not installed from
@@ -298,23 +334,24 @@ function install_packages_if_missing()
 
 function install_common_os_packages()
 {
-    print_and_log "Installing 3rd party packages needed by $(basename $0) ..."
-
-    if [ $on_debian_or_derivative -eq 1 ]; then
+    $(
+        if [ $on_debian_or_derivative -eq 1 ]; then
         # Ubuntu doesn't have git (!) but only git-core.
-        if [ $on_ubuntu -eq 1 ]; then
-            git_package=git-core
-        else
-            git_package=git
-        fi
+            if [ $on_ubuntu -eq 1 ]; then
+                git_package=git-core
+            else
+                git_package=git
+            fi
 
-        packages="curl $git_package wget unzip"
-        install_packages_if_missing $packages
-    fi
+            packages="curl $git_package wget unzip"
+            install_packages_if_missing $packages
+        fi
 
-    for el in lsb_release curl wget git unzip; do
-        assert_pre_prequesite $el
-    done
+        for el in lsb_release curl wget git unzip; do
+            assert_pre_prequesite $el
+        done
+    ) &
+    show_pulse  "Installing 3rd party packages needed by $(basename $0)" $!
 }
 
 function set_up_assembly_tool()
@@ -436,12 +473,12 @@ function set_up_engine_and_plugins()
         fi
     done
     
-    if [ ! -d ${engine_dir} ]; then
+    if [ ! -d "${engine_dir}" ]; then
         run unzip -q -u $download_dir/${engine_file}
         if [ -h engine ]; then
             run rm engine
         fi
-    
+        
         run ln -s ${engine_dir} engine
     else
         debug "${engine_dir} is already there, skipping to next step."
@@ -465,41 +502,43 @@ function set_up_engine_and_plugins()
 
 function set_up_ece_scripts()
 {
-    print_and_log "Setting up the ece UNIX scripts ..." 
-
-    run cd $download_dir
-    if [ -d ece-scripts ]; then
-        (
-            run cd ece-scripts
-            run git pull
-        )
-    else
-        run git clone $ece_scripts_git_source
-    fi
-    
-    run cp -r ece-scripts/usr/* /usr/
-    run cp -r ece-scripts/etc/escenic/* ${escenic_conf_dir}/
-    run cp -r ece-scripts/etc/bash_completion.d/ece /etc/bash_completion.d/
-    run cp -r ece-scripts/etc/init.d/* /etc/init.d/
-    run cp -r ece-scripts/etc/default/* /etc/default/
-    
-    local file=${escenic_conf_dir}/ece.conf
-    set_conf_file_value assemblytool_home ${escenic_root_dir}/assemblytool $file
-    set_conf_file_value backup_dir ${escenic_backups_dir} $file
-    set_conf_file_value cache_dir ${escenic_cache_dir} ${file}
-    set_conf_file_value ece_home ${escenic_root_dir}/engine ${file}
-    set_conf_file_value escenic_conf_dir ${escenic_conf_dir} ${file}
-    set_conf_file_value heap_dump_dir ${escenic_crash_dir} ${file}
-    set_conf_file_value log_dir ${escenic_log_dir} ${file}
-    set_conf_file_value pid_dir ${escenic_run_dir} ${file}
-    set_conf_file_value rmi_hub_conf ${escenic_conf_dir}/rmi-hub ${file}
-    set_conf_file_value solr_home ${escenic_data_dir}/solr ${file}
-    set_conf_file_value ece_security_configuration_dir \
-        ${escenic_conf_dir}/engine/common/security \
-        ${file}
-
-    run sed -i "s#/etc/escenic#${escenic_conf_dir}#g" /etc/bash_completion.d/ece
-    run sed -i "s#/opt/escenic#${escenic_root_dir}#g" /etc/bash_completion.d/ece
+    $(
+        run cd $download_dir
+        if [ -d ece-scripts ]; then
+            (
+                run cd ece-scripts
+                run git pull
+            )
+        else
+            run git clone $ece_scripts_git_source
+        fi
+        
+        run cp -r ece-scripts/usr/* /usr/
+        run cp -r ece-scripts/etc/escenic/* ${escenic_conf_dir}/
+        run cp -r ece-scripts/etc/bash_completion.d/ece /etc/bash_completion.d/
+        run cp -r ece-scripts/etc/init.d/* /etc/init.d/
+        run cp -r ece-scripts/etc/default/* /etc/default/
+        
+        local file=${escenic_conf_dir}/ece.conf
+        set_conf_file_value assemblytool_home ${escenic_root_dir}/assemblytool $file
+        set_conf_file_value backup_dir ${escenic_backups_dir} $file
+        set_conf_file_value cache_dir ${escenic_cache_dir} ${file}
+        set_conf_file_value ece_home ${escenic_root_dir}/engine ${file}
+        set_conf_file_value escenic_conf_dir ${escenic_conf_dir} ${file}
+        set_conf_file_value heap_dump_dir ${escenic_crash_dir} ${file}
+        set_conf_file_value log_dir ${escenic_log_dir} ${file}
+        set_conf_file_value pid_dir ${escenic_run_dir} ${file}
+        set_conf_file_value rmi_hub_conf ${escenic_conf_dir}/rmi-hub ${file}
+        set_conf_file_value solr_home ${escenic_data_dir}/solr ${file}
+        set_conf_file_value ece_security_configuration_dir \
+            ${escenic_conf_dir}/engine/common/security \
+            ${file}
+
+        run sed -i "s#/etc/escenic#${escenic_conf_dir}#g" /etc/bash_completion.d/ece
+        run sed -i "s#/opt/escenic#${escenic_root_dir}#g" /etc/bash_completion.d/ece
+    ) &
+    
+    show_pulse "Setting up the ece UNIX scripts ..." $!
 }
 
 default_db_port=3306
@@ -672,21 +711,21 @@ readConnector=/connector/ReadConnector
 updateConnector=/connector/UpdateConnector
 EOF
 
-    file=$common_nursery_dir/com/escenic/community/CommunityEngine.properties
-    if [ -w ${file} ]; then
-        sed -i 's/jdbc\/ecome/jdbc\/ECE_UPDATE_DS/g' $file
-        exit_on_error "sed on $file"
-    elif [ ! -e ${file} ]; then
-        print_and_log "I Could not find an ECOME configuration file,"
-        print_and_log "I assume you have not installed Community Engine."
-    else
-        print_and_log "Could not write to ${file},"
-        print_and_log "Community Engine might not work because of this. "
-        remove_pid_and_exit_in_error
-    fi
+file=$common_nursery_dir/com/escenic/community/CommunityEngine.properties
+if [ -w ${file} ]; then
+    sed -i 's/jdbc\/ecome/jdbc\/ECE_UPDATE_DS/g' $file
+    exit_on_error "sed on $file"
+elif [ ! -e ${file} ]; then
+    print_and_log "I Could not find an ECOME configuration file,"
+    print_and_log "I assume you have not installed Community Engine."
+else
+    print_and_log "Could not write to ${file},"
+    print_and_log "Community Engine might not work because of this. "
+    remove_pid_and_exit_in_error
+fi
 
-    file=$common_nursery_dir/com/escenic/webstart/StudioConfig.properties
-    cat >> $file <<EOF
+file=$common_nursery_dir/com/escenic/webstart/StudioConfig.properties
+cat >> $file <<EOF
 
 # We set this to get around a missing feature in Varnish, see:
 # https://www.varnish-cache.org/trac/wiki/Future_Feature#Chunkedencodingclientrequests
@@ -698,11 +737,11 @@ EOF
 function set_up_instance_specific_nursery_configuration()
 {
     for el in $escenic_conf_dir/engine/instance/*; do
-       i=$(( i + 1 ))
-       if [ $(basename $el) = $instance_name ]; then
-           rmi_port="8${i}23"
-           run echo "port=$rmi_port" > $el/RMI.properties
-       fi
+        i=$(( i + 1 ))
+        if [ $(basename $el) = $instance_name ]; then
+            rmi_port="8${i}23"
+            run echo "port=$rmi_port" > $el/RMI.properties
+        fi
     done
 
     nursery_context=neo/io/managers/HubConnectionManager.properties
@@ -925,8 +964,8 @@ function install_ece_third_party_packages
           memcached
           wget"
 
-        print_and_log "Installing 3rd party packages needed by ECE ..."
-        install_packages_if_missing $packages
+        $(install_packages_if_missing $packages) & \
+            show_pulse "Installing 3rd party packages needed by ECE" $!
     fi
     
     for el in ant java; do
@@ -943,12 +982,12 @@ function get_base_dir_from_bundle()
         # we'll look inside the archive to determine the base_dir
         file_name=$(
             unzip -t ${download_dir}/$file_name | \
-            awk '{print $2}' | \
-            cut -d'/' -f1 | \
-            sort | \
-            uniq | \
-            grep -v errors | \
-            grep [a-z]
+                awk '{print $2}' | \
+                cut -d'/' -f1 | \
+                sort | \
+                uniq | \
+                grep -v errors | \
+                grep [a-z]
         )
     else
         for el in .tar.gz .tar.bz2 .zip; do
@@ -1134,7 +1173,7 @@ function set_up_app_server()
     set_ece_instance_conf tomcat_base $tomcat_base   
     set_ece_instance_conf tomcat_home $tomcat_home
     set_ece_instance_conf appserver_port $appserver_port
-   
+    
     run cd $tomcat_base/lib
     make_ln $jdbc_driver
 
@@ -1338,9 +1377,9 @@ EOF
   <WatchedResource>WEB-INF/web.xml</WatchedResource>
 EOF
 
-    if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER -a \
-        $install_profile_number -ne $PROFILE_SEARCH_SERVER ]; then
-        cat >> $tomcat_base/conf/context.xml <<EOF
+if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER -a \
+    $install_profile_number -ne $PROFILE_SEARCH_SERVER ]; then
+    cat >> $tomcat_base/conf/context.xml <<EOF
   <ResourceLink
       global="jdbc/ECE_READ_DS"
       name="jdbc/ECE_READ_DS"
@@ -1352,10 +1391,10 @@ EOF
       type="javax.sql.DataSource"
   />
 EOF
-    fi
+fi
 
-    if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER ]; then
-        cat >> $tomcat_base/conf/context.xml <<EOF
+if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER ]; then
+    cat >> $tomcat_base/conf/context.xml <<EOF
   <Environment
       name="escenic/solr-base-uri"
       value="http://${search_host}:${search_port}/solr/"
@@ -1363,10 +1402,10 @@ EOF
       override="false"
   />
 EOF
-    fi
+fi
 
-    if [ $install_profile_number -eq $PROFILE_SEARCH_SERVER ]; then
-        cat >> $tomcat_base/conf/context.xml <<EOF
+if [ $install_profile_number -eq $PROFILE_SEARCH_SERVER ]; then
+    cat >> $tomcat_base/conf/context.xml <<EOF
   <Environment
       name="escenic/indexer-webservice"
       value="http://${indexer_ws_uri}"
@@ -1393,8 +1432,8 @@ EOF
   />
 </Context>
 EOF
-    elif [ $install_profile_number -eq $PROFILE_ANALYSIS_SERVER ]; then
-        cat >> $tomcat_base/conf/context.xml <<EOF
+elif [ $install_profile_number -eq $PROFILE_ANALYSIS_SERVER ]; then
+    cat >> $tomcat_base/conf/context.xml <<EOF
   <ResourceLink
       global="jdbc/eae-logger/logger"
       name="jdbc/eae-logger/logger"
@@ -1407,30 +1446,30 @@ EOF
   />
 </Context>
 EOF
-    else 
-        cat >> $tomcat_base/conf/context.xml <<EOF
+else 
+    cat >> $tomcat_base/conf/context.xml <<EOF
 </Context>
 EOF
-    fi
+fi
 }
 
 function create_user_and_group_if_not_present()
 {
-   if [ $(grep $ece_user /etc/passwd | wc -l) -lt 1 ]; then
-       print_and_log "Creating UNIX user $ece_user ..."
+    if [ $(grep $ece_user /etc/passwd | wc -l) -lt 1 ]; then
+        print_and_log "Creating UNIX user $ece_user ..."
         # TODO add support for useradd
-       run adduser $ece_user \
-           --disabled-password \
-           --gecos "Escenic-user,Room,Work,Home,Other"
-       add_next_step "I created a new UNIX user called $ece_user"
-       add_next_step "and you must set a password using: passwd $ece_user"
-   fi
-   
-   if [ $(grep $ece_group /etc/group | wc -l) -lt 1 ]; then
-       print_and_log "Creating UNIX group $ece_group ..."
-       run addgroup $ece_group
-   fi
- }
+        run adduser $ece_user \
+            --disabled-password \
+            --gecos "Escenic-user,Room,Work,Home,Other"
+        add_next_step "I created a new UNIX user called $ece_user"
+        add_next_step "and you must set a password using: passwd $ece_user"
+    fi
+    
+    if [ $(grep $ece_group /etc/group | wc -l) -lt 1 ]; then
+        print_and_log "Creating UNIX group $ece_group ..."
+        run addgroup $ece_group
+    fi
+}
 
 # last, give the control back to the ECE user & group 
 function set_correct_permissions()
@@ -1558,19 +1597,19 @@ source-war: ${publication_name}.war
 context-root: ${publication_name}
 EOF
 
-    publication_war=$escenic_root_dir/assemblytool/publications/${publication_name}.war
-    if [[ $fai_enabled -eq 1 && -n "${fai_publication_war}" ]]; then
-        print_and_log "Basing ${publication_name}.war on the one specified in $conf_file"
-        run cp ${fai_publication_war} ${publication_war}
-    elif [ -d $escenic_root_dir/widget-framework-core-* ]; then
-        print_and_log "Basing ${publication_name}.war on Widget Framework Demo ..."
-        run cd $escenic_root_dir/widget-framework-core-*/publications/demo-core
-        run mvn $maven_opts package
-        run cp target/demo-core-*.war ${publication_war}
-    else
-        print_and_log "Basing your ${publication_name}.war on ECE/demo-clean ..."
-        run cp $escenic_root_dir/engine/contrib/wars/demo-clean.war ${publication_war}
-    fi
+publication_war=$escenic_root_dir/assemblytool/publications/${publication_name}.war
+if [[ $fai_enabled -eq 1 && -n "${fai_publication_war}" ]]; then
+    print_and_log "Basing ${publication_name}.war on the one specified in $conf_file"
+    run cp ${fai_publication_war} ${publication_war}
+elif [ -d $escenic_root_dir/widget-framework-core-* ]; then
+    print_and_log "Basing ${publication_name}.war on Widget Framework Demo ..."
+    run cd $escenic_root_dir/widget-framework-core-*/publications/demo-core
+    run mvn $maven_opts package
+    run cp target/demo-core-*.war ${publication_war}
+else
+    print_and_log "Basing your ${publication_name}.war on ECE/demo-clean ..."
+    run cp $escenic_root_dir/engine/contrib/wars/demo-clean.war ${publication_war}
+fi
 
     # TODO add support for the community widgets
     #
@@ -1621,7 +1660,7 @@ function install_memcached()
 service.0.0-memcached-socket-pool=/com/danga/SockIOPool
 EOF
 
-    echo "TBD"
+echo "TBD"
 }
 
 ## Method which will try its best to find the home diretory of
@@ -1653,19 +1692,20 @@ function get_user_home_directory()
 
 function set_up_user_enviornment()
 {
-    print_and_log "Setting up the ${ece_user} user's UNIX environment ..."
-
-    local bashrc=$(get_user_home_directory $ece_user)/.bashrc
-    
-    if [ $(grep bash_completion.d/ece ${bashrc} 2>/dev/null | \
-        wc -l) -lt 1 ]; then
-        echo ". /etc/bash_completion.d/ece" >> ${bashrc}
-    fi
+    $(
+        local bashrc=$(get_user_home_directory $ece_user)/.bashrc
+        
+        if [ $(grep bash_completion.d/ece ${bashrc} 2>/dev/null | \
+            wc -l) -lt 1 ]; then
+            echo ". /etc/bash_completion.d/ece" >> ${bashrc}
+        fi
 
-    if [ $(grep ECE_CONF_LOCATIONS ${bashrc} | wc -l) -eq 0 ]; then
-        echo "export ECE_CONF_LOCATIONS=\"$escenic_conf_dir\"" >> ${bashrc}
-        run chown ${ece_user}:${ece_group} ${bashrc}
-    fi
+        if [ $(grep ECE_CONF_LOCATIONS ${bashrc} | wc -l) -eq 0 ]; then
+            echo "export ECE_CONF_LOCATIONS=\"$escenic_conf_dir\"" >> ${bashrc}
+            run chown ${ece_user}:${ece_group} ${bashrc}
+        fi
+    ) &
+    show_pulse "Setting up the ${ece_user} user's UNIX environment" $!
 }
 
 function set_up_solr()
@@ -1845,7 +1885,7 @@ EOF
 }
 EOF
 
-    cat >> /etc/varnish/default.vcl <<EOF
+cat >> /etc/varnish/default.vcl <<EOF
 sub vcl_recv {
   if (!client.ip ~ staff &&
       (req.url ~ "^/escenic" ||
@@ -1916,20 +1956,20 @@ EOF
 function read_user_input()
 {
     installation_profiles=(
-      "$PROFILE_ALL_IN_ONE - All in one, full stack on one host,"\
+        "$PROFILE_ALL_IN_ONE - All in one, full stack on one host,"\
 " suitable for dev & test environments"
-      "$PROFILE_EDITORIAL_SERVER - Editorial (publication) server"
-      "$PROFILE_PRESENTATION_SERVER - Presentation server (ECE + memcached)."
-      "$PROFILE_DB_SERVER - Database server"
-      "$PROFILE_CACHE_SERVER - Cache server (cache and web server)"
-      "$PROFILE_RMI_HUB - RMI hub"
-      "$PROFILE_SEARCH_SERVER - Search server (Solr + indexer-webapp)"
-      "$PROFILE_WIDGET_FRAMEWORK - Install Widget Framework."
-      "$PROFILE_CREATE_PUBLICATION - Create a new publication"\
+"$PROFILE_EDITORIAL_SERVER - Editorial (publication) server"
+"$PROFILE_PRESENTATION_SERVER - Presentation server (ECE + memcached)."
+"$PROFILE_DB_SERVER - Database server"
+"$PROFILE_CACHE_SERVER - Cache server (cache and web server)"
+"$PROFILE_RMI_HUB - RMI hub"
+"$PROFILE_SEARCH_SERVER - Search server (Solr + indexer-webapp)"
+"$PROFILE_WIDGET_FRAMEWORK - Install Widget Framework."
+"$PROFILE_CREATE_PUBLICATION - Create a new publication"\
 " based on WF if available, ECE/clean-demo if not"
-      "$PROFILE_MONITORING_SERVER - A monitoring server (web server +"\
+"$PROFILE_MONITORING_SERVER - A monitoring server (web server +"\
 " Munin gatherer)"
-      "$PROFILE_RESTORE_FROM_BACKUP - Restore from backup"\
+"$PROFILE_RESTORE_FROM_BACKUP - Restore from backup"\
 " (DB, data files, binaries, conf & publications)"
     )
     
@@ -2069,7 +2109,7 @@ function install_cache_server()
     fi
 
     code_name=$(lsb_release -s -c)
-        
+    
     supported_code_name=0
     # list taken from http://repo.varnish-cache.org/debian/dists/
     supported_list="lenny squeeze hardy lucid"
@@ -2120,7 +2160,7 @@ function add_next_step()
     if [ -n "$next_steps" ]; then
         next_steps=${next_steps}${NEW_LINE}"[$(basename $0)] "${1}
     else
-         next_steps="[$(basename $0)] "${1}
+        next_steps="[$(basename $0)] "${1}
     fi
 }
 
@@ -2332,7 +2372,7 @@ function verify_that_files_exist_and_are_readable()
         fi
     done
 }   
-        
+
 # $1=<default instance name>
 # $2=<editorial server=0 | presentation server=1>
 function install_ece_instance()
@@ -2388,9 +2428,9 @@ function install_ece_instance()
     add_next_step "Admin interface: $admin_uri"
     add_next_step "View installed versions with:"\
 " ece -i $instance_name versions"
-    add_next_step "Type 'ece help' to see all the options of this script"
-    add_next_step "Read its guide: /usr/share/doc/escenic/ece-guide.txt"
-    add_next_step "/etc/default/ece lists all instances started at boot time"
+add_next_step "Type 'ece help' to see all the options of this script"
+add_next_step "Read its guide: /usr/share/doc/escenic/ece-guide.txt"
+add_next_step "/etc/default/ece lists all instances started at boot time"
 }
 
 function get_publication_short_name_list()
@@ -2409,7 +2449,7 @@ function get_publication_short_name_list()
     done
 
     echo ${short_name_list}
- }
+}
 
 function get_deploy_white_list()
 {
@@ -2432,7 +2472,7 @@ function get_deploy_white_list()
 
 function install_presentation_server()
 {
-    print_and_log "Installing a presentation server on $HOSTNAME ..."
+    print_and_log "Installing a presentation server on $HOSTNAME."
     type=engine
     install_ece_instance "web1" $PROFILE_PRESENTATION_SERVER
 }
@@ -2629,11 +2669,11 @@ clientConfiguration=/neo/io/services/HubConnection
 pingTime=10000
 EOF
 
-    add_next_step "Restart all your instances to make the hub see them."
+add_next_step "Restart all your instances to make the hub see them."
 
-    print_and_log "Starting the RMI-hub on $HOSTNAME ..."
-    ece_command="ece -t rmi-hub restart"
-    su - $ece_user -c "$ece_command" 1>>$log 2>>$log
+print_and_log "Starting the RMI-hub on $HOSTNAME ..."
+ece_command="ece -t rmi-hub restart"
+su - $ece_user -c "$ece_command" 1>>$log 2>>$log
 }
 
 # reads the value of the desired setting from $conf_file
@@ -2720,39 +2760,39 @@ function install_widget_framework()
 </settings>
 EOF
 
-    print_and_log "Downloading Widget Framework from technet.escenic.com ..."
-    for el in $wf_download_list; do
-        cd $download_dir
-        run wget $wget_opts \
-            --http-user $technet_user \
-            --http-password $technet_password \
-            $el
-        run cd $escenic_root_dir/
-        run unzip -q -u $download_dir/$(basename $el)
-    done
+print_and_log "Downloading Widget Framework from technet.escenic.com ..."
+for el in $wf_download_list; do
+    cd $download_dir
+    run wget $wget_opts \
+        --http-user $technet_user \
+        --http-password $technet_password \
+        $el
+    run cd $escenic_root_dir/
+    run unzip -q -u $download_dir/$(basename $el)
+done
 
-    install_packages_if_missing "maven2"
-    assert_pre_prequesite mvn
-    
-    export JAVA_HOME=$java_home
-    wf_maven_dir=$(echo $escenic_root_dir/widget-framework-core-*/maven)
-    run cd $wf_maven_dir
-    
-    print_and_log "Installing Widget Framework into your Maven repository ..."
-    log "JAVA_HOME=$JAVA_HOME"
-    
-    run mvn $maven_opts install
+install_packages_if_missing "maven2"
+assert_pre_prequesite mvn
+
+export JAVA_HOME=$java_home
+wf_maven_dir=$(echo $escenic_root_dir/widget-framework-core-*/maven)
+run cd $wf_maven_dir
+
+print_and_log "Installing Widget Framework into your Maven repository ..."
+log "JAVA_HOME=$JAVA_HOME"
+
+run mvn $maven_opts install
 
     # installing the widget-framework-common as a ECE plugin
-    wf_dist_dir=$(echo $wf_maven_dir/widget-framework-common/target/widget-framework-common-*-dist/widget-framework-common-*)
-    cd $escenic_root_dir/assemblytool/plugins
-    if [ ! -h $(basename $wf_dist_dir) ]; then
-        ln -s $wf_dist_dir
-    fi
-    
-    cp -r $wf_dist_dir/misc/siteconfig/* $common_nursery_dir/
+wf_dist_dir=$(echo $wf_maven_dir/widget-framework-common/target/widget-framework-common-*-dist/widget-framework-common-*)
+cd $escenic_root_dir/assemblytool/plugins
+if [ ! -h $(basename $wf_dist_dir) ]; then
+    ln -s $wf_dist_dir
+fi
 
-    add_next_step "Widget Framework has been installed into your "\
+cp -r $wf_dist_dir/misc/siteconfig/* $common_nursery_dir/
+
+add_next_step "Widget Framework has been installed into your "\
 " Maven repo"
 }
 
@@ -2763,7 +2803,7 @@ function install_search_server()
     install_ece_instance "search1" 0
     
     # TODO update instead of append
-    dir=$common_nursery_dir/com/escenic/framework/search/solr
+    local dir=$common_nursery_dir/com/escenic/framework/search/solr
     make_dir $dir
     echo "solrServerURI=http://${search_host}:${search_port}/solr" \
         >>  $dir/SolrSearchEngine.properties
@@ -3052,7 +3092,8 @@ function set_up_monitoring_host_def()
         print "$1 host" $host_name "already defined, skipping it."
         return
     fi
-    
+
+    # TODO add more services based on what kind of host it is.
     cat >> $file <<EOF
 define host {
   use generic-host
@@ -3205,8 +3246,8 @@ function add_server_to_runlevels()
     # no need to add init.d scripts to the runlevel(s) for these
     # profiles
     if [ $install_profile_number -eq $PROFILE_WIDGET_FRAMEWORK -o \
-         $install_profile_number -eq $PROFILE_DB_SERVER -o \
-         $install_profile_number -eq $PROFILE_CACHE_SERVER ]; then
+        $install_profile_number -eq $PROFILE_DB_SERVER -o \
+        $install_profile_number -eq $PROFILE_CACHE_SERVER ]; then
         return
     fi
 
@@ -3451,7 +3492,7 @@ function create_monitoring_server_overview()
 EOF
     if [[ $1 == $MONITORING_VENDOR_NAGIOS ]]; then
         echo '<li><a href="/nagios3">Nagios</a></li>' \
-    else
+            else
         echo '<li><a href="/icinga">Icinga</a> (an enhanced Nagios)</li>' \
             >> $file
     fi

From 836caf0eab8c893456104fc59d934353f1f8b76a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 20 Feb 2012 12:36:27 +0800
Subject: [PATCH 0300/2585] - sun java packages have now been removed from
 Ubuntu LTS as well (so   much for a stable, dependable release right?), hence
 we now also   build local packages for Ubuntu LTS, see  
 https://github.com/skybert/ece-scripts/issues/30 for more background   on
 this issue.

- re-factored the pulse handling, introduced pulse methods, suffixed
  _p so that it's easy to remove their usage if desired.

- a few methods have pulse right now, trying it out before adding it
  all of the place.

- NOTE a lot of changed lines due to new indent (basic offset strictly
  (emacs) speaking) of 2 and braces on first line to bring it into
  line with Escenic's internal (Java) coding standards.
---
 usr/sbin/ece-install | 237 +++++++++++++++++++++++--------------------
 1 file changed, 127 insertions(+), 110 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 17f7572d..05a93aa4 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -253,13 +253,13 @@ pulse_bits="-\|/"
 
 function pulse()
 {
-    echo -ne "\b${pulse_bits:i++%${#pulse_bits}:1}"
+    echo -ne "\b${pulse_bits: i++ % ${#pulse_bits}: 1}"
 }
 
 function show_pulse()
 {
-    printne "$1 ...."
-    local pulse_pid=$2
+    printne "${@: 2: $(( $# - 1 ))} ...."
+    local pulse_pid=$1
     while true; do
         kill -0 $pulse_pid 2>/dev/null
         if [ $? -eq 0 ]; then
@@ -287,18 +287,16 @@ function download_escenic_components()
         return
     fi
 
-    print_and_log "Downloading Escenic software from technet.escenic.com ..."
-
     cd $download_dir
     for el in $technet_download_list; do
-        if [ -e $(basename $el) ]; then
-            continue
-        fi
-        
-        run wget $wget_opts \
-            --http-user $technet_user \
-            --http-password $technet_password \
-            $el 
+      if [ -e $(basename $el) ]; then
+        continue
+      fi
+      
+      run wget $wget_opts \
+        --http-user $technet_user \
+        --http-password $technet_password \
+        $el 
     done
 }
 
@@ -309,6 +307,8 @@ function download_escenic_components()
 # $1 : space separated string of package names 
 function install_packages_if_missing()
 {
+  log "Installing packages [$1] if they're missing ..."
+  
     if [ $on_debian_or_derivative -eq 1 ]; then
         some_are_missing=0
         for el in $@; do
@@ -334,25 +334,48 @@ function install_packages_if_missing()
 
 function install_common_os_packages()
 {
-    $(
-        if [ $on_debian_or_derivative -eq 1 ]; then
+  log "Installing common OS packages ..."
+  
+  if [ $on_debian_or_derivative -eq 1 ]; then
         # Ubuntu doesn't have git (!) but only git-core.
-            if [ $on_ubuntu -eq 1 ]; then
-                git_package=git-core
-            else
-                git_package=git
-            fi
+    if [ $on_ubuntu -eq 1 ]; then
+      git_package=git-core
+    else
+      git_package=git
+    fi
+    
+    packages="curl $git_package wget unzip"
+    install_packages_if_missing $packages
+  fi
+  
+  for el in lsb_release curl wget git unzip; do
+    assert_pre_prequesite $el
+  done
+}
 
-            packages="curl $git_package wget unzip"
-            install_packages_if_missing $packages
-        fi
+######################################################################
+# <pulse-methods>
+function set_up_user_environment_p() {
+  $(set_up_user_environment) &
+  show_pulse $! "Setting up the ${ece_user}'s UNIX environment"
+}
 
-        for el in lsb_release curl wget git unzip; do
-            assert_pre_prequesite $el
-        done
-    ) &
-    show_pulse  "Installing 3rd party packages needed by $(basename $0)" $!
+function set_up_ece_scripts_p() {
+  $(set_up_ece_scripts) &
+  show_pulse $! 'Setting up the ece UNIX scripts'
+}
+
+function install_common_os_packages_p() {
+  $(install_common_os_packages) &
+  show_pulse $! "Installing 3rd party packages needed by $(basename $0)"
+}
+
+function install_ece_third_party_packages_p() {
+  $(install_ece_third_party_packages) &
+  show_pulse $! "Installing 3rd party packages needed by ECE"
 }
+######################################################################
+# </pulse-methods>
 
 function set_up_assembly_tool()
 {
@@ -502,43 +525,39 @@ function set_up_engine_and_plugins()
 
 function set_up_ece_scripts()
 {
-    $(
-        run cd $download_dir
-        if [ -d ece-scripts ]; then
-            (
-                run cd ece-scripts
-                run git pull
-            )
-        else
-            run git clone $ece_scripts_git_source
-        fi
-        
-        run cp -r ece-scripts/usr/* /usr/
-        run cp -r ece-scripts/etc/escenic/* ${escenic_conf_dir}/
-        run cp -r ece-scripts/etc/bash_completion.d/ece /etc/bash_completion.d/
-        run cp -r ece-scripts/etc/init.d/* /etc/init.d/
-        run cp -r ece-scripts/etc/default/* /etc/default/
-        
-        local file=${escenic_conf_dir}/ece.conf
-        set_conf_file_value assemblytool_home ${escenic_root_dir}/assemblytool $file
-        set_conf_file_value backup_dir ${escenic_backups_dir} $file
-        set_conf_file_value cache_dir ${escenic_cache_dir} ${file}
-        set_conf_file_value ece_home ${escenic_root_dir}/engine ${file}
-        set_conf_file_value escenic_conf_dir ${escenic_conf_dir} ${file}
-        set_conf_file_value heap_dump_dir ${escenic_crash_dir} ${file}
-        set_conf_file_value log_dir ${escenic_log_dir} ${file}
-        set_conf_file_value pid_dir ${escenic_run_dir} ${file}
-        set_conf_file_value rmi_hub_conf ${escenic_conf_dir}/rmi-hub ${file}
-        set_conf_file_value solr_home ${escenic_data_dir}/solr ${file}
-        set_conf_file_value ece_security_configuration_dir \
-            ${escenic_conf_dir}/engine/common/security \
-            ${file}
-
-        run sed -i "s#/etc/escenic#${escenic_conf_dir}#g" /etc/bash_completion.d/ece
-        run sed -i "s#/opt/escenic#${escenic_root_dir}#g" /etc/bash_completion.d/ece
-    ) &
-    
-    show_pulse "Setting up the ece UNIX scripts ..." $!
+  run cd $download_dir
+  if [ -d ece-scripts ]; then
+    (
+      run cd ece-scripts
+      run git pull
+    )
+  else
+    run git clone $ece_scripts_git_source
+  fi
+  
+  run cp -r ece-scripts/usr/* /usr/
+  run cp -r ece-scripts/etc/escenic/* ${escenic_conf_dir}/
+  run cp -r ece-scripts/etc/bash_completion.d/ece /etc/bash_completion.d/
+  run cp -r ece-scripts/etc/init.d/* /etc/init.d/
+  run cp -r ece-scripts/etc/default/* /etc/default/
+  
+  local file=${escenic_conf_dir}/ece.conf
+  set_conf_file_value assemblytool_home ${escenic_root_dir}/assemblytool $file
+  set_conf_file_value backup_dir ${escenic_backups_dir} $file
+  set_conf_file_value cache_dir ${escenic_cache_dir} ${file}
+  set_conf_file_value ece_home ${escenic_root_dir}/engine ${file}
+  set_conf_file_value escenic_conf_dir ${escenic_conf_dir} ${file}
+  set_conf_file_value heap_dump_dir ${escenic_crash_dir} ${file}
+  set_conf_file_value log_dir ${escenic_log_dir} ${file}
+  set_conf_file_value pid_dir ${escenic_run_dir} ${file}
+  set_conf_file_value rmi_hub_conf ${escenic_conf_dir}/rmi-hub ${file}
+  set_conf_file_value solr_home ${escenic_data_dir}/solr ${file}
+  set_conf_file_value ece_security_configuration_dir \
+    ${escenic_conf_dir}/engine/common/security \
+    ${file}
+
+  run sed -i "s#/etc/escenic#${escenic_conf_dir}#g" /etc/bash_completion.d/ece
+  run sed -i "s#/opt/escenic#${escenic_root_dir}#g" /etc/bash_completion.d/ece
 }
 
 default_db_port=3306
@@ -917,8 +936,10 @@ function install_ece_third_party_packages
     
     if [ $on_debian_or_derivative -eq 1 ]; then
         if [ $on_ubuntu -eq 1 ]; then
-            # Sun Java was removed in Ubuntu in 11.10 
-            local version_needs_local_java_deb=1110
+            # Sun Java was removed in Ubuntu in 11.10 and later also
+            # from LTS 10.04, hence Hardy is the last one with these
+            # packges now (2012-02-20 11:22)
+            local version_needs_local_java_deb=1004
             local version=$(lsb_release -s -r | sed "s#\.##g")
             
             add_apt_source \
@@ -964,8 +985,7 @@ function install_ece_third_party_packages
           memcached
           wget"
 
-        $(install_packages_if_missing $packages) & \
-            show_pulse "Installing 3rd party packages needed by ECE" $!
+        install_packages_if_missing $packages
     fi
     
     for el in ant java; do
@@ -1690,22 +1710,19 @@ function get_user_home_directory()
     fi
 }
 
-function set_up_user_enviornment()
+function set_up_user_environment()
 {
-    $(
-        local bashrc=$(get_user_home_directory $ece_user)/.bashrc
-        
-        if [ $(grep bash_completion.d/ece ${bashrc} 2>/dev/null | \
-            wc -l) -lt 1 ]; then
-            echo ". /etc/bash_completion.d/ece" >> ${bashrc}
-        fi
-
-        if [ $(grep ECE_CONF_LOCATIONS ${bashrc} | wc -l) -eq 0 ]; then
-            echo "export ECE_CONF_LOCATIONS=\"$escenic_conf_dir\"" >> ${bashrc}
-            run chown ${ece_user}:${ece_group} ${bashrc}
-        fi
-    ) &
-    show_pulse "Setting up the ${ece_user} user's UNIX environment" $!
+  local bashrc=$(get_user_home_directory $ece_user)/.bashrc
+  
+  if [ $(grep bash_completion.d/ece ${bashrc} 2>/dev/null | \
+    wc -l) -lt 1 ]; then
+    echo ". /etc/bash_completion.d/ece" >> ${bashrc}
+  fi
+  
+  if [ $(grep ECE_CONF_LOCATIONS ${bashrc} | wc -l) -eq 0 ]; then
+    echo "export ECE_CONF_LOCATIONS=\"$escenic_conf_dir\"" >> ${bashrc}
+    run chown ${ece_user}:${ece_group} ${bashrc}
+  fi
 }
 
 function set_up_solr()
@@ -2070,9 +2087,9 @@ function common_pre_install()
     fi
 
     make_dir $download_dir
-    install_common_os_packages
+    install_common_os_packages_p
     create_user_and_group_if_not_present
-    set_up_user_enviornment
+    set_up_user_environment_p
 }
 
 function assert_pre_prequesite()
@@ -2381,7 +2398,7 @@ function install_ece_instance()
     
     ask_for_instance_name $1
     set_up_engine_directories
-    set_up_ece_scripts
+    set_up_ece_scripts_p
 
     set_archive_files_depending_on_profile
     
@@ -2760,40 +2777,40 @@ function install_widget_framework()
 </settings>
 EOF
 
-print_and_log "Downloading Widget Framework from technet.escenic.com ..."
-for el in $wf_download_list; do
-    cd $download_dir
-    run wget $wget_opts \
+    print_and_log "Downloading Widget Framework from technet.escenic.com ..."
+    for el in $wf_download_list; do
+      cd $download_dir
+      run wget $wget_opts \
         --http-user $technet_user \
         --http-password $technet_password \
         $el
-    run cd $escenic_root_dir/
-    run unzip -q -u $download_dir/$(basename $el)
-done
+      run cd $escenic_root_dir/
+      run unzip -q -u $download_dir/$(basename $el)
+    done
 
-install_packages_if_missing "maven2"
-assert_pre_prequesite mvn
+    install_packages_if_missing "maven2"
+    assert_pre_prequesite mvn
 
-export JAVA_HOME=$java_home
-wf_maven_dir=$(echo $escenic_root_dir/widget-framework-core-*/maven)
-run cd $wf_maven_dir
+    export JAVA_HOME=$java_home
+    wf_maven_dir=$(echo $escenic_root_dir/widget-framework-core-*/maven)
+    run cd $wf_maven_dir
 
-print_and_log "Installing Widget Framework into your Maven repository ..."
-log "JAVA_HOME=$JAVA_HOME"
+    print_and_log "Installing Widget Framework into your Maven repository ..."
+    log "JAVA_HOME=$JAVA_HOME"
 
-run mvn $maven_opts install
+    run mvn $maven_opts install
 
     # installing the widget-framework-common as a ECE plugin
-wf_dist_dir=$(echo $wf_maven_dir/widget-framework-common/target/widget-framework-common-*-dist/widget-framework-common-*)
-cd $escenic_root_dir/assemblytool/plugins
-if [ ! -h $(basename $wf_dist_dir) ]; then
-    ln -s $wf_dist_dir
-fi
+    wf_dist_dir=$(echo $wf_maven_dir/widget-framework-common/target/widget-framework-common-*-dist/widget-framework-common-*)
+    cd $escenic_root_dir/assemblytool/plugins
+    if [ ! -h $(basename $wf_dist_dir) ]; then
+      ln -s $wf_dist_dir
+    fi
 
-cp -r $wf_dist_dir/misc/siteconfig/* $common_nursery_dir/
+    cp -r $wf_dist_dir/misc/siteconfig/* $common_nursery_dir/
 
-add_next_step "Widget Framework has been installed into your "\
-" Maven repo"
+    add_next_step "Widget Framework has been installed into your " \
+      " Maven repo"
 }
 
 function install_search_server()

From 83524615342d24d2d2c91e26c477fc3e6a537ac0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 20 Feb 2012 12:50:16 +0800
Subject: [PATCH 0301/2585] - fix in ensure_domain_is_known_to_local_host:
 /etc/hosts should no   longer get duplicate entries.

---
 usr/sbin/ece-install | 62 +++++++++++++++++++++-----------------------
 1 file changed, 29 insertions(+), 33 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 05a93aa4..5e96b79d 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -1035,43 +1035,39 @@ function get_escaped_bash_string()
 #
 # The method will ensure that the passed domain is resolvable by the
 # host on which ece-install is run.
-function ensure_domain_is_known_to_local_host()
-{
-    if [ -z "$1" ]; then
-        return 1
-    fi
-    
-    local localhost_ip=$(ping -c 1 localhost 2>/dev/null | \
-        head -1 | \
-        cut -d'(' -f2 | \
-        cut -d')' -f1)
-    local hostname_ip=$(ping -c 1 $HOSTNAME 2>/dev/null | \
-        head -1 | \
-        cut -d'(' -f2 | \
-        cut -d')' -f1)
-    local domain_ip=$(ping -c 1 $1 2>/dev/null | \
-        head -1 | \
-        cut -d'(' -f2 | \
-        cut -d')' -f1)
-
-    local keep_off_etc_hosts=${fai_keep_off_etc_hosts-0}
-    if [[ $domain_ip != $localhost_ip && \
-        $domain_ip != hostname_ip && \
-        $keep_off_etc_hosts -ne 1 ]]; then
-        print_and_log "The domain name ${1} is not resolvable to this host"
-        print_and_log "I will remedy this by adding it to /etc/hosts"
-        cat >> /etc/hosts <<EOF
+function ensure_domain_is_known_to_local_host() {
+  if [ -z "$1" ]; then
+    return 1
+  fi
+  
+  local hostname_ip=$(ping -c 1 $HOSTNAME 2>/dev/null | \
+    head -1 | \
+    cut -d'(' -f2 | \
+    cut -d')' -f1)
+  local domain_ip=$(ping -c 1 $1 2>/dev/null | \
+    head -1 | \
+    cut -d'(' -f2 | \
+    cut -d')' -f1)
+
+  local keep_off_etc_hosts=${fai_keep_off_etc_hosts-0}
+  if [[ $domain_ip != "127.0.0.1" && \
+    $domain_ip != "127.0.1.1" && \
+    $domain_ip != $hostname_ip && \
+    $keep_off_etc_hosts -ne 1 ]]; then
+    print_and_log "The domain name ${1} is not resolvable to this host"
+    print_and_log "I will remedy this by adding it to /etc/hosts"
+    cat >> /etc/hosts <<EOF
 
 # added by $(basename $0) @ $(date)
 127.0.1.1 ${1}
 EOF
-    fi
-    if [[ $domain_ip != $localhost_ip && \
-        $domain_ip != hostname_ip && \
-        $keep_off_etc_hosts -eq 1 ]]; then
-        print_and_log "The domain name ${1} is not resolvable to this host"
-        print_and_log "but I will keep off /etc/hosts as you've requested."
-    fi
+  fi
+  if [[ $domain_ip != $localhost_ip && \
+    $domain_ip != hostname_ip && \
+    $keep_off_etc_hosts -eq 1 ]]; then
+    print_and_log "The domain name ${1} is not resolvable to this host"
+    print_and_log "but I will keep off /etc/hosts as you've requested."
+  fi
 }
 
 function set_up_app_server()

From 08148690f4ba03e045cbb7ff4470a355887ef510 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 20 Feb 2012 13:00:29 +0800
Subject: [PATCH 0302/2585] - set_up_app_server() : re-wrote the set up of
 virtual hosts in Tomcat   to not use BASH 4.x features (not hash map). This
 should fix the   error when running on BASH < 4.x:

  ece-install: line 1302: declare: -A: invalid option
  declare: usage: declare [-afFirtx] [-p] [name[=value] ...]
---
 usr/sbin/ece-install | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 5e96b79d..8b863032 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -1354,25 +1354,20 @@ EOF
         $install_profile_number == $PROFILE_ALL_IN_ONE) && \
         -n "$fai_publication_domain_mapping_list" ]]; then
 
-        declare -A publication_domain_map
-        
         for el in ${fai_publication_domain_mapping_list}; do
             local old_ifs=$IFS
             # the entries in the fai_publication_domain_mapping_list
             # are on the form: <publication>#<domain>
             IFS='#'
             read publication domain <<< "$el"
-            publication_domain_map[${publication}]="${domain}"
             IFS=$old_ifs
 
             ensure_domain_is_known_to_local_host ${domain}
-        done
         
-        for el in ${!publication_domain_map[@]}; do
             cat >> $tomcat_base/conf/server.xml <<EOF
-      <Host name="${publication_domain_map[$el]}" appBase="webapps" autoDeploy="false">
-        <Context displayName="${publication_domain_map[$el]}"
-                 docBase="${el}"
+      <Host name="${domain}" appBase="webapps" autoDeploy="false">
+        <Context displayName="${domain}"
+                 docBase="${publication}"
                  path="/"
         />
       </Host>

From d2463bd578f7a310b050520abfcee09c22e31f6d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 20 Feb 2012 15:24:02 +0800
Subject: [PATCH 0303/2585] - long overdue modularisation of ece-install. I've
 resisted the   temptation of doing this to keep ece-install as self contained
 as   possible and by that as easy to get started with as   possible. However,
 as the code base is growing, a modularisation   became apparent.

  Furthermore, the code which has been split out in separate
  common-*.sh files, is the code which is re-usable by other
  scripts. To include e.g. common-io.sh in your script, you'd do:

  common_io_is_loaded > /dev/null 2>&1 || source common-io.sh

  The other libraries have similar functions to avoid re-loading the
  same library several times.

  The following common libraries are now available in
  /usr/share/escenic/ece-scripts:

  - common-bashing.sh
  - common-io.sh
  - common-pulse.sh
  - common-os.sh

  See their headers for an explanation of what you can expect to find
  were.

  This re-factoring means that you must have ece-install in your
  path. If you're using standard locations, this is of no problem, but
  if you're for some reason just running it from somewhere in your
  home directory, you'd have to do:

  # export PATH=~/src/ece-scripts/usr/sbin:$PATH
  # ece-install

- checked some spelling mistakes in method names while moving them out
  to the common library files.
---
 usr/sbin/ece-install                          | 397 ++----------------
 .../escenic/ece-scripts/common-bashing.sh     | 152 +++++++
 usr/share/escenic/ece-scripts/common-io.sh    |  87 ++++
 usr/share/escenic/ece-scripts/common-os.sh    | 101 +++++
 usr/share/escenic/ece-scripts/common-pulse.sh |  37 ++
 5 files changed, 420 insertions(+), 354 deletions(-)
 create mode 100644 usr/share/escenic/ece-scripts/common-bashing.sh
 create mode 100644 usr/share/escenic/ece-scripts/common-io.sh
 create mode 100644 usr/share/escenic/ece-scripts/common-os.sh
 create mode 100644 usr/share/escenic/ece-scripts/common-pulse.sh

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 8b863032..b1e1785f 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -73,118 +73,10 @@ force_packages=0
 # ECE software components.
 ece_software_setup_completed=0
 
-NEW_LINE="
-"
 # the next steps printed when the user has installed his/her
 # components.
 next_steps=()
 
-function get_seconds_since_start()
-{
-    local seconds="n/a"
-    
-    if [ -r $pid_file ]; then
-        now=`date +%s`
-        started=`stat -c %Y $pid_file`
-        seconds=$(( now - started ))
-    fi
-    
-    echo "$seconds"
-}
-
-function get_id()
-{
-    timestamp=$(get_seconds_since_start)
-    echo "[$(basename $0)-${timestamp}]"
-}
-
-function debug()
-{
-    if [ $debug -eq 1 ]; then
-        echo "[$(basename $0)-debug]" "$@"
-    fi
-}
-
-function print()
-{
-    echo $(get_id) $@
-}
-
-function printne()
-{
-    echo -ne $(get_id) $@
-}
-
-function log()
-{
-    echo $(get_id) $@ >> $log
-}
-
-function print_and_log()
-{
-    print "$@"
-    log "$@"
-}
-
-function log_call_stack()
-{
-    log "Call stack (top most is the last one, main is the first):"
-
-    # skipping i=0 as this is log_call_stack itself
-    for ((i = 1; i < ${#FUNCNAME[@]}; i++)); do
-        echo -n  ${BASH_SOURCE[$i]}:${BASH_LINENO[$i-1]}:${FUNCNAME[$i]}"()" >> $log
-        if [ -e ${BASH_SOURCE[$i]} ]; then
-            echo -n " => " >> $log
-            sed -n "${BASH_LINENO[$i-1]}p" ${BASH_SOURCE[$i]} | \
-                sed "s#^[ \t]*##g" >> $log
-        else
-            echo "" >> $log
-        fi
-    done
-}
-
-function remove_pid_and_exit_in_error()
-{
-    if [ -e $pid_file ]; then
-        rm $pid_file
-    fi
-
-    log_call_stack
-    
-    exit 1
-}
-
-function exit_on_error()
-{
-    if [ $? -gt 0 ]; then
-        print "The command ["$@"] FAILED, exiting :-("
-        print "See $log for further details."
-        remove_pid_and_exit_in_error
-    fi
-}
-
-function run()
-{
-    $@ 1>>$log 2>>$log
-    exit_on_error $@
-}
-
-# Returns 1 if the passed value is a number, 0 if not
-#
-# $1 : what you want to test
-function is_number()
-{
-    if [ -z $1 ]; then
-        echo 0
-    elif [ $(echo $1 | grep [a-z] | wc -l) -gt 0 ]; then
-        echo 0
-    elif [ $(echo $1 | grep [A-Z] | wc -l) -gt 0 ]; then
-        echo 0
-    else
-        echo 1
-    fi
-}
-
 technet_download_list="
 http://technet.escenic.com/downloads/assemblytool-2.0.2.zip
 http://technet.escenic.com/downloads/release/53/analysis-engine-2.3.7.0.zip
@@ -216,31 +108,14 @@ PROFILE_MONITORING_SERVER=10
 PROFILE_RESTORE_FROM_BACKUP=11
 PROFILE_ANALYSIS_SERVER=12
 
-function make_dir()
-{
-    if [ ! -d $1 ]; then
-        run mkdir -p $1
-    fi
-}
-
-function make_ln()
-{
-    if [ $2 ]; then
-        if [ -e $1 -a ! -h $2 ]; then
-            run ln -s $1 $2
-        elif [ ! -e $1 ]; then
-            print_and_log "Tried to make a symlink to $1, but it doesn't exist"
-            remove_pid_and_exit_in_error
-        fi
-    else
-        if [ -e $1 -a ! -h $(basename $1) ]; then
-            run ln -s $1
-        elif [ ! -e $1 ]; then
-            print_and_log "Tried to make a symlink to $1, but it doesn't exist"
-            remove_pid_and_exit_in_error
-        fi
-    fi
-}
+######################################################################
+# Load common BASH libraries
+#####################################################################
+common_libraries="common-bashing.sh common-pulse.sh common-io.sh common-os.sh"
+for el in $common_libraries; do
+  source $(dirname $0)/../share/escenic/ece-scripts/${el} || \
+    (echo "Could not find $el"; exit 1)
+done
 
 function set_up_engine_directories()
 {
@@ -249,38 +124,6 @@ function set_up_engine_directories()
     done
 }
 
-pulse_bits="-\|/"
-
-function pulse()
-{
-    echo -ne "\b${pulse_bits: i++ % ${#pulse_bits}: 1}"
-}
-
-function show_pulse()
-{
-    printne "${@: 2: $(( $# - 1 ))} ...."
-    local pulse_pid=$1
-    while true; do
-        kill -0 $pulse_pid 2>/dev/null
-        if [ $? -eq 0 ]; then
-            pulse
-            sleep 0.25
-        else
-            wait $pulse_pid
-            local exit_code=$?
-            if [ $exit_code -eq 0 ]; then
-                echo -e '\b\E[37;32m'" \033[1mok\033[0m"
-                tput sgr0
-            else
-                echo -e '\b\E[37;31m'" \033[1mfailed\033[0m"
-                tput sgr0
-            fi
-            
-            break
-        fi
-    done
-}
-
 function download_escenic_components()
 {
     if [ $ece_software_setup_completed -eq 1 ]; then
@@ -349,12 +192,13 @@ function install_common_os_packages()
   fi
   
   for el in lsb_release curl wget git unzip; do
-    assert_pre_prequesite $el
+    assert_pre_requisite $el
   done
 }
 
 ######################################################################
 # <pulse-methods>
+######################################################################
 function set_up_user_environment_p() {
   $(set_up_user_environment) &
   show_pulse $! "Setting up the ${ece_user}'s UNIX environment"
@@ -376,6 +220,7 @@ function install_ece_third_party_packages_p() {
 }
 ######################################################################
 # </pulse-methods>
+######################################################################
 
 function set_up_assembly_tool()
 {
@@ -593,30 +438,30 @@ function set_db_defaults_if_not_set()
 
 function set_db_settings_from_fai_conf()
 {
-    # Note: the port isn't fully supported. The user must himself
-    # update the mysql configuration to run it on a non standard port.
-    
-    if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER ]; then
-        db_port=${fai_db_port-${default_db_port}}
-        db_host=${fai_db_host-${default_db_host}}
-        db_user=${fai_db_user-${default_db_user}}
-        db_password=${fai_db_password-${default_db_password}}
-        db_schema=${fai_db_schema-${default_db_schema}}
-    else
-        db_port=${fai_analysis_db_port-${default_db_port}}
-        db_host=${fai_analysis_db_host-${default_db_host}}
-        db_user=${fai_analysis_db_user-${default_db_user}}
-        db_password=${fai_analysis_db_password-${default_db_password}}
-        db_schema=${fai_analysis_db_schema-${default_db_schema}}
-    fi
-    
-    if [ -n "${fai_db_drop_old_db_first}" ]; then
-        drop_db_first=${fai_db_drop_old_db_first}
-        if [ $fai_db_drop_old_db_first -eq 1 ]; then
-            print_and_log "WARNING: I hope you know what you're doing!"
-            print_and_log "WARNING: fai_db_drop_old_db_first is 1 (true)"
-        fi
+  # Note: the port isn't fully supported. The user must himself
+  # update the mysql configuration to run it on a non standard port.
+  
+  if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER ]; then
+    db_port=${fai_db_port-${default_db_port}}
+    db_host=${fai_db_host-${default_db_host}}
+    db_user=${fai_db_user-${default_db_user}}
+    db_password=${fai_db_password-${default_db_password}}
+    db_schema=${fai_db_schema-${default_db_schema}}
+  else
+    db_port=${fai_analysis_db_port-${default_db_port}}
+    db_host=${fai_analysis_db_host-${default_db_host}}
+    db_user=${fai_analysis_db_user-${default_db_user}}
+    db_password=${fai_analysis_db_password-${default_db_password}}
+    db_schema=${fai_analysis_db_schema-${default_db_schema}}
+  fi
+  
+  if [ -n "${fai_db_drop_old_db_first}" ]; then
+    drop_db_first=${fai_db_drop_old_db_first}
+    if [ $fai_db_drop_old_db_first -eq 1 ]; then
+      print_and_log "$(yellow WARNING): I hope you know what you're doing!"
+      print_and_log "$(yellow WARNING): fai_db_drop_old_db_first is 1 (true)"
     fi
+  fi
 }
 
 function set_up_ecedb()
@@ -823,7 +668,6 @@ EOF
     else
         run cp $tomcat_home/conf/logging.properties $tomcat_base/conf
     fi
-    
 }
 
 # don't quote values when setting conf file values with
@@ -831,57 +675,6 @@ EOF
 # handling of .cfg files.
 dont_quote_conf_values=0
 
-# Parameters:
-# $1 is the property
-# $2 ... to the (last - 1) is the value
-# The last argument is the file
-#
-# e.g.:
-# set_conf_file_value \
-#   mykey \
-#   myvalue1 myvalue2 myvalue3 \
-#   /etc/myfile.conf
-function set_conf_file_value()
-{
-    if [ $# -lt 3 ]; then
-        return
-    fi
-    
-    local file=${@:${#@}}
-    local key=${@:1:1}
-    local value_end_index=$(( $# - 2 ))
-    local value=${@:2:${value_end_index}}
-
-    local parent_dir=$(dirname $file)
-    if [ ! -d ${parent_dir} ]; then
-        print ${parent_dir} "doesn't exist, something is wrong :-("
-        remove_pid_and_exit_in_error
-    fi
-    
-    if [ -r $file ]; then
-        if [ $(grep ^$1 $file | wc -l) -gt 0 ]; then
-            if [ $dont_quote_conf_values -eq 0 ]; then
-                sed -i "s~$key=.*~$key=\"$value\"~g" $file
-            else
-                sed -i "s~$key=.*~$key=$value~g" $file
-            fi    
-        else
-            if [ $dont_quote_conf_values -eq 0 ]; then
-                echo "$key=\"$value\"" >> $file
-            else
-                echo "$key=$value" >> $file
-            fi
-            
-        fi
-    else
-        if [ $dont_quote_conf_values -eq 0 ]; then
-            echo "$key=\"$value\"" >> $file
-        else
-            echo "$key=$value" >> $file
-        fi
-    fi
-}
-
 # The function accepts the following parameters:
 # $1 is the property
 # $2 is the value
@@ -917,16 +710,6 @@ function create_java_deb_packages_and_repo()
     add_next_step "to your APT system with /etc/apt/sources.list.d/oab.list"
 }
 
-function has_sun_java_installed()
-{
-    if [[ -x /usr/lib/jvm/java-6-sun/bin/java || \
-        $(java -version 2>&1 > /dev/null | grep HotSpot | wc -l) -gt 0 ]]; then
-        echo 1
-    else
-        echo 0
-    fi
-}
-
 # Installs third party packages needed by the ECE (i.e. Java related).
 # Also see install_common_os_packages for packages common to all
 # servers in the architecture.
@@ -989,7 +772,7 @@ function install_ece_third_party_packages
     fi
     
     for el in ant java; do
-        assert_pre_prequesite $el
+        assert_pre_requisite $el
     done
 }
 
@@ -1018,19 +801,6 @@ function get_base_dir_from_bundle()
     echo $file_name
 }
 
-# Returns an escaped string useful for sed and other BASH commands.
-#
-# $1 :  the string
-function get_escaped_bash_string()
-{
-    local result=$(echo $1 | \
-        sed -e 's/\$/\\$/g' \
-        -e 's/\*/\\*/g' \
-        -e 's#/#\\/#g' \
-        -e 's/\./\\./g')
-    echo $result
-}
-
 # $1 the domain
 #
 # The method will ensure that the passed domain is resolvable by the
@@ -1464,24 +1234,6 @@ EOF
 fi
 }
 
-function create_user_and_group_if_not_present()
-{
-    if [ $(grep $ece_user /etc/passwd | wc -l) -lt 1 ]; then
-        print_and_log "Creating UNIX user $ece_user ..."
-        # TODO add support for useradd
-        run adduser $ece_user \
-            --disabled-password \
-            --gecos "Escenic-user,Room,Work,Home,Other"
-        add_next_step "I created a new UNIX user called $ece_user"
-        add_next_step "and you must set a password using: passwd $ece_user"
-    fi
-    
-    if [ $(grep $ece_group /etc/group | wc -l) -lt 1 ]; then
-        print_and_log "Creating UNIX group $ece_group ..."
-        run addgroup $ece_group
-    fi
-}
-
 # last, give the control back to the ECE user & group 
 function set_correct_permissions()
 {
@@ -1547,7 +1299,7 @@ function print_status_and_next_steps()
     done
 
     print $'\n'"Enjoy your time with Escenic Content Engine!"$'\n'
-    print "-Vizrt Online"
+    print "-$(red Vizrt) Online"
 }
 
 # Based on Erik Mogensen's work:
@@ -1671,34 +1423,7 @@ function install_memcached()
 service.0.0-memcached-socket-pool=/com/danga/SockIOPool
 EOF
 
-echo "TBD"
-}
-
-## Method which will try its best to find the home diretory of
-## existing users and probable home directories of new users.
-##
-## (1) On Darwin/Mac OS X, it will return /Users/<user>
-## (2) On systems using /etc/passwd, it will search there to find the
-##     home dir of existing users.
-## (3) For new users, it will check the configuration of adduser (if
-##     present).
-## (4) If all of thes above fails, it will return /home/<user>
-##
-## Arguments:
-## $1 : the user name, can either be an existing user or a non-yet
-## created user.
-function get_user_home_directory()
-{
-    if [ $(uname -s) = "Darwin" ]; then
-        echo /Users/$1
-    elif [ $(grep $1 /etc/passwd | wc -l) -gt 0 ]; then
-        grep $1 /etc/passwd | cut -d':' -f6
-    elif [ -r /etc/adduser.conf ]; then
-        local dir=$(grep DHOME /etc/adduser.conf | grep -v ^# | cut -d'=' -f2)
-        echo $dir/$1
-    else
-        echo "/home/$1"
-    fi
+    echo "TBD"
 }
 
 function set_up_user_environment()
@@ -2079,18 +1804,10 @@ function common_pre_install()
 
     make_dir $download_dir
     install_common_os_packages_p
-    create_user_and_group_if_not_present
+    create_user_and_group_if_not_present $ece_user $ece_group
     set_up_user_environment_p
 }
 
-function assert_pre_prequesite()
-{
-    if [ $(which $1 | wc -l) -lt 1 ]; then
-        print_and_log "Please install $1 and then run $(basename $0) again."
-        remove_pid_and_exit_in_error
-    fi
-}
-
 function add_apt_source()
 {
     escenic_sources=/etc/apt/sources.list.d/escenic.list
@@ -2137,7 +1854,7 @@ function install_cache_server()
         apt-get -y install varnish 1>>$log 2>>$log
     fi
 
-    assert_pre_prequesite varnishd
+    assert_pre_requisite varnishd
 
     if [ $fai_enabled -eq 0 ]; then
         print "You must now list your backend servers."
@@ -2166,7 +1883,7 @@ function add_next_step()
     return
     
     if [ -n "$next_steps" ]; then
-        next_steps=${next_steps}${NEW_LINE}"[$(basename $0)] "${1}
+        next_steps=${next_steps}$'\n'"[$(basename $0)] "${1}
     else
         next_steps="[$(basename $0)] "${1}
     fi
@@ -2240,7 +1957,7 @@ function install_database_server()
         fi
     fi
 
-    assert_pre_prequesite mysql
+    assert_pre_requisite mysql
 
     if [ -z "$1" ]; then
         download_escenic_components
@@ -2780,7 +2497,7 @@ EOF
     done
 
     install_packages_if_missing "maven2"
-    assert_pre_prequesite mvn
+    assert_pre_requisite mvn
 
     export JAVA_HOME=$java_home
     wf_maven_dir=$(echo $escenic_root_dir/widget-framework-core-*/maven)
@@ -2995,23 +2712,6 @@ EOF
     add_next_step "Make sure all nodes allows its IP to connect to them."
 }
 
-# will return the IP of the host name. If not found, the host name
-# passed to the function will be returned.
-# parameters: $1 the host name
-function get_ip()
-{
-    ip=$(ping -c 1 $1 2>/dev/null | \
-        grep "bytes from" | \
-        cut -d'(' -f2 | \
-        cut -d ')' -f1)
-    
-    if [ -z "$ip" ]; then
-        echo $1
-    fi
-
-    echo $ip
-}
-
 ## Installs the Nagios monitoring server.
 ## $1 the nagios vendor/falvour, "nagios" and "icinga" are supported.
 function install_nagios_monitoring_server()
@@ -3139,17 +2839,6 @@ function install_nagios_node()
     add_next_step "A Nagios NRPE node has been installed on ${HOSTNAME}"
 }
 
-# munin nodes need the IP of the munin gatherer to be escaped. Hence this function.
-# $parameters:
-# $1 : the IP
-function get_perl_escaped()
-{
-    local escaped_input=$(
-        echo $1 | sed 's/\./\\./g'
-    )
-    echo "^${escaped_input}$"
-}
-
 function install_munin_node()
 {
     print_and_log "Installing a Munin node on $HOSTNAME ..."
@@ -3434,7 +3123,7 @@ function restore_from_backup()
                 cut -d'=' -f2 | \
                 sed -e "s/'//g" -e 's/"//g'
             )
-            create_user_and_group_if_not_present
+            create_user_and_group_if_not_present $ece_user $ece_group
             
             if [ -d $escenic_conf_dir -a \
                 $(ls $escenic_conf_dir/ | grep ^ece- | wc -l) -gt 0 -a \
diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
new file mode 100644
index 00000000..d9052b38
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -0,0 +1,152 @@
+#! /usr/bin/env bash
+
+# Common, useful methods for BASH scripts. The callee is responsible
+# for setting the following variables:
+#
+# * pid_file
+# * log
+#
+# by tkj@vizrt.com
+
+function common_bashing_is_loaded() {
+  echo 1
+}
+
+function get_seconds_since_start() {
+  local seconds="n/a"
+  
+  if [ -r $pid_file ]; then
+    now=`date +%s`
+    started=`stat -c %Y $pid_file`
+    seconds=$(( now - started ))
+  fi
+  
+  echo "$seconds"
+}
+
+function get_id() {
+  local timestamp=$(get_seconds_since_start)
+  echo "[$(basename $0)-${timestamp}]"
+}
+
+function debug() {
+  if [ $debug -eq 1 ]; then
+    echo "[$(basename $0)-debug]" "$@"
+  fi
+}
+
+function print() {
+  echo $(get_id) $@
+}
+
+function printne() {
+  echo -ne $(get_id) $@
+}
+
+function log() {
+  echo $(get_id) $@ >> $log
+}
+
+function print_and_log() {
+  print "$@"
+  log "$@"
+}
+
+function log_call_stack() {
+  log "Call stack (top most is the last one, main is the first):"
+
+    # skipping i=0 as this is log_call_stack itself
+  for ((i = 1; i < ${#FUNCNAME[@]}; i++)); do
+    echo -n  ${BASH_SOURCE[$i]}:${BASH_LINENO[$i-1]}:${FUNCNAME[$i]}"()" >> $log
+    if [ -e ${BASH_SOURCE[$i]} ]; then
+      echo -n " => " >> $log
+      sed -n "${BASH_LINENO[$i-1]}p" ${BASH_SOURCE[$i]} | \
+        sed "s#^[ \t]*##g" >> $log
+    else
+      echo "" >> $log
+    fi
+  done
+}
+
+function remove_pid_and_exit_in_error() {
+  if [ -e $pid_file ]; then
+    rm $pid_file
+  fi
+
+  log_call_stack
+  
+  exit 1
+}
+
+function exit_on_error() {
+  if [ $? -gt 0 ]; then
+    print "The command ["$@"] FAILED, exiting :-("
+    print "See $log for further details."
+    remove_pid_and_exit_in_error
+  fi
+}
+
+function run() {
+  $@ 1>>$log 2>>$log
+  exit_on_error $@
+}
+
+## Returns 1 if the passed argument is a number, 0 if not.
+## $1: the value you wish to test.
+function is_number() {
+  for (( i = 0; i < ${#1}; i++ )); do
+    if [ $(echo ${1:$i:1} | grep [0-9] | wc -l) -lt 1 ]; then
+      echo 0
+      return
+    fi
+  done
+  
+  echo 1
+}
+
+## Returns an escaped string useful for sed and other BASH commands.
+##
+## $1 : the string
+function get_escaped_bash_string() {
+  local result=$(echo $1 | \
+    sed -e 's/\$/\\$/g' \
+    -e 's/\*/\\*/g' \
+    -e 's#/#\\/#g' \
+    -e 's/\./\\./g')
+  echo $result
+}
+
+# Munin nodes need the IP of the munin gatherer to be escaped. Hence
+# this function.
+# 
+# Parameters:
+#
+# $1 : the IP
+function get_perl_escaped() {
+  local escaped_input=$(
+    echo $1 | sed 's/\./\\./g'
+  )
+  echo "^${escaped_input}$"
+}
+
+## Returns the inputted string(s) as red
+##
+## $1: input string
+function red() {
+  echo -e "\E[37;31m\033[1m${@}\033[0m"
+}
+
+## Returns the inputted string(s) as green
+##
+## $1: input string
+function green() {
+  echo -e "\E[37;32m\033[1m${@}\033[0m"
+}
+
+## Returns the inputted string(s) as yellow
+##
+## $1: input string
+function yellow() {
+  echo -e "\E[37;33m\033[1m${@}\033[0m"
+}
+
diff --git a/usr/share/escenic/ece-scripts/common-io.sh b/usr/share/escenic/ece-scripts/common-io.sh
new file mode 100644
index 00000000..0c681e05
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/common-io.sh
@@ -0,0 +1,87 @@
+#! /usr/bin/env bash
+
+# by tkj@vizrt.com
+
+# depends on common-bashing
+common_bashing_is_loaded > /dev/null 2>&1 || source common-bashing.sh
+
+# Can be used like this:
+# common_io_is_loaded 2>/dev/null || source common-io.sh
+function common_io_is_loaded() {
+  echo 1
+}
+
+## Parameters:
+## $1 is the property
+## $2 ... to the (last - 1) is the value
+## $n -1: The last argument is the file
+##
+## e.g.:
+## set_conf_file_value \
+##   mykey \
+##   myvalue1 myvalue2 myvalue3 \
+##   /etc/myfile.conf
+function set_conf_file_value() {
+  if [ $# -lt 3 ]; then
+    return
+  fi
+  
+  local file=${@:${#@}}
+  local key=${@:1:1}
+  local value_end_index=$(( $# - 2 ))
+  local value=${@:2:${value_end_index}}
+
+  local parent_dir=$(dirname $file)
+  if [ ! -d ${parent_dir} ]; then
+    print ${parent_dir} "doesn't exist, something is wrong :-("
+    remove_pid_and_exit_in_error
+  fi
+  
+  if [ -r $file ]; then
+    if [ $(grep ^$1 $file | wc -l) -gt 0 ]; then
+      if [ $dont_quote_conf_values -eq 0 ]; then
+        sed -i "s~$key=.*~$key=\"$value\"~g" $file
+      else
+        sed -i "s~$key=.*~$key=$value~g" $file
+      fi    
+    else
+      if [ $dont_quote_conf_values -eq 0 ]; then
+        echo "$key=\"$value\"" >> $file
+      else
+        echo "$key=$value" >> $file
+      fi
+      
+    fi
+  else
+    if [ $dont_quote_conf_values -eq 0 ]; then
+      echo "$key=\"$value\"" >> $file
+    else
+      echo "$key=$value" >> $file
+    fi
+  fi
+}
+
+function make_dir() {
+  if [ ! -d $1 ]; then
+    run mkdir -p $1
+  fi
+}
+
+function make_ln() {
+  if [ $2 ]; then
+    if [ -e $1 -a ! -h $2 ]; then
+      run ln -s $1 $2
+    elif [ ! -e $1 ]; then
+      print_and_log "Tried to make a symlink to $1, but it doesn't exist"
+      remove_pid_and_exit_in_error
+    fi
+  else
+    if [ -e $1 -a ! -h $(basename $1) ]; then
+      run ln -s $1
+    elif [ ! -e $1 ]; then
+      print_and_log "Tried to make a symlink to $1, but it doesn't exist"
+      remove_pid_and_exit_in_error
+    fi
+  fi
+}
+
diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
new file mode 100644
index 00000000..736e488a
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -0,0 +1,101 @@
+#! /usr/bin/env bash
+
+# Platform/OS specific methods.
+# 
+# by tkj@vizrt.com
+
+# depends on common-bashing
+common_bashing_is_loaded > /dev/null 2>&1 || source common-bashing.sh
+
+# Can be used like this:
+# common_io_os_loaded 2>/dev/null || source common-os.sh
+function common_os_is_loaded() {
+  echo 1
+}
+
+## Method which will try its best to find the home diretory of
+## existing users and probable home directories of new users.
+##
+## (1) On Darwin/Mac OS X, it will return /Users/<user>
+## (2) On systems using /etc/passwd, it will search there to find the
+##     home dir of existing users.
+## (3) For new users, it will check the configuration of adduser (if
+##     present).
+## (4) If all of thes above fails, it will return /home/<user>
+##
+## Arguments:
+## $1 : the user name, can either be an existing user or a non-yet
+## created user.
+function get_user_home_directory() {
+  if [ $(uname -s) = "Darwin" ]; then
+    echo /Users/$1
+  elif [ $(grep $1 /etc/passwd | wc -l) -gt 0 ]; then
+    grep $1 /etc/passwd | cut -d':' -f6
+  elif [ -r /etc/adduser.conf ]; then
+    local dir=$(grep DHOME /etc/adduser.conf | grep -v ^# | cut -d'=' -f2)
+    echo $dir/$1
+  else
+    echo "/home/$1"
+  fi
+}
+
+function has_sun_java_installed() {
+  if [[ -x /usr/lib/jvm/java-6-sun/bin/java || \
+    $(java -version 2>&1 > /dev/null | grep HotSpot | wc -l) -gt 0 ]]; then
+    echo 1
+  else
+    echo 0
+  fi
+}
+
+## $1 user name
+## $2 group name
+function create_user_and_group_if_not_present() {
+  local user=$1
+  local group=$1
+  
+  if [ $(grep $user /etc/passwd | wc -l) -lt 1 ]; then
+    print_and_log "Creating UNIX user $user ..."
+        # TODO add support for useradd
+    run adduser $user \
+      --disabled-password \
+      --gecos "Escenic-user,Room,Work,Home,Other"
+    add_next_step "I created a new UNIX user called $user"
+    add_next_step "and you must set a password using: passwd $user"
+  fi
+  
+  if [ $(grep $group /etc/group | wc -l) -lt 1 ]; then
+    print_and_log "Creating UNIX group $group ..."
+    run addgroup $group
+  fi
+}
+
+## Will return the IP of the host name. If not found, the host name
+## passed to the function will be returned.
+## 
+## Parameters: $1 the host name
+function get_ip() {
+  local ip=$(ping -c 1 $1 2>/dev/null | \
+    grep "bytes from" | \
+    cut -d'(' -f2 | \
+    cut -d ')' -f1)
+  
+  if [ -z "$ip" ]; then
+    echo $1
+  fi
+
+  echo $ip
+}
+
+## Asserts that the passed command/program is indeed accessible in the
+## current context. If it is not, the program aborts and removes the
+## PID.
+##
+## $1: the binary/executable/program
+function assert_pre_requisite() {
+  if [ $(which $1 | wc -l) -lt 1 ]; then
+    print_and_log "Please install $1 and then run $(basename $0) again."
+    remove_pid_and_exit_in_error
+  fi
+}
+
diff --git a/usr/share/escenic/ece-scripts/common-pulse.sh b/usr/share/escenic/ece-scripts/common-pulse.sh
new file mode 100644
index 00000000..a0f7704c
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/common-pulse.sh
@@ -0,0 +1,37 @@
+#! /usr/bin/env bash
+
+# by tkj@vizrt.com
+
+# depends on common-bashing
+common_bashing_is_loaded > /dev/null 2>&1 || source common-bashing.sh
+
+pulse_bits="-\|/"
+
+function pulse() {
+  echo -ne "\b${pulse_bits: i++ % ${#pulse_bits}: 1}"
+}
+
+function show_pulse() {
+  printne "${@: 2: $(( $# - 1 ))} ...."
+  local pulse_pid=$1
+  while true; do
+    kill -0 $pulse_pid 2>/dev/null
+    if [ $? -eq 0 ]; then
+      pulse
+      sleep 0.25
+    else
+      wait $pulse_pid
+      local exit_code=$?
+      if [ $exit_code -eq 0 ]; then
+        echo -e '\b\E[37;32m'" \033[1mok\033[0m"
+        tput sgr0
+      else
+        echo -e '\b\E[37;31m'" \033[1mfailed\033[0m"
+        tput sgr0
+      fi
+      
+      break
+    fi
+  done
+}
+

From 7478b9eeef28a1bca27af7ec146a7069a772ed13 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 20 Feb 2012 18:20:00 +0800
Subject: [PATCH 0304/2585] - made explicit mention of BASH version in
 documentation.

---
 usr/share/doc/escenic/ece-install-guide.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 177290b2..03823356 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -4,7 +4,7 @@ Welcome to the /usr/sbin/ece-install Guide
 For the best experience, run this script on Debian Squeeze (or newer),
 the latest Ubuntu LTS or most other Debian based operating systems,
 but it should work without any problems on any Unix like system that
-has a recent version of BASH.
+has BASH version 4.2 or newer.
 
 *** Debian based operating systems
 If running on a Debian based operating system, ece-install will take

From 044e2f46b5ff7e7ba4448d5dd1477f40a7cab8c3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 21 Feb 2012 11:59:31 +0800
Subject: [PATCH 0305/2585] - new feature: ece-install will now dynamically
 figure out the Tomcat   downlad URL based on what tomcat.apache.org, which
 again will be   correct for the user's regions.

  This should hopefully resolve a number of issues users around the
  world have been having with the default tomcat_download value being
  wrong for them.

  This also means that the tomcat_download variable now is obsolete
  and can be removed from your local ece-install.conf files.

- hardening: pulse methods that fail will now terminate the main
  ece-install BASH process.

- hardening: check_for_required_downloads now checks that ZIP archives
  are not faulty, not only that the required downloads exist in the
  download folder.

- added pulse to more methods

- improvement: get_base_dir_from_bundle is now moved to common-bashing
  and has been generalised so that it's useful for other calees as
  well as ece-install.
---
 usr/sbin/ece-install                          | 145 ++++++++++--------
 .../escenic/ece-scripts/common-bashing.sh     |  27 ++++
 usr/share/escenic/ece-scripts/common-os.sh    |  29 ++++
 usr/share/escenic/ece-scripts/common-pulse.sh |  14 ++
 4 files changed, 149 insertions(+), 66 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index b1e1785f..e307d601 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -21,7 +21,6 @@ ece_user=escenic
 ece_group=escenic
 jdbc_driver=/usr/share/java/mysql.jar
 debug=0
-tomcat_download=http://ftp.mirror.tw/pub/apache/tomcat/tomcat-6/v6.0.35/bin/apache-tomcat-6.0.35.tar.gz
 
 # These variables govern where software is installed and data and run
 # time files are written.
@@ -135,7 +134,8 @@ function download_escenic_components()
       if [ -e $(basename $el) ]; then
         continue
       fi
-      
+
+      log "Downloading $el ..."
       run wget $wget_opts \
         --http-user $technet_user \
         --http-password $technet_password \
@@ -143,7 +143,12 @@ function download_escenic_components()
     done
 }
 
-# will install the passed packages if these are not installed from
+function download_escenic_components_p() {
+  $(download_escenic_components) &
+  show_pulse $! "Downloading Escenic components from Technet"
+}
+
+# WILL install the passed packages if these are not installed from
 # before.
 #
 # parameters:
@@ -199,6 +204,31 @@ function install_common_os_packages()
 ######################################################################
 # <pulse-methods>
 ######################################################################
+function set_up_instance_specific_nursery_configuration_p() {
+  $(set_up_instance_specific_nursery_configuration) &
+  show_pulse $! "Setting up instance specific Nursery configuration"
+}
+
+function set_up_basic_nursery_configuration_p() {
+  $(set_up_basic_nursery_configuration) &
+  show_pulse $! "Setting up basic Nursery configuration"
+}
+
+function assemble_deploy_and_restart_type_p() {
+  echo $(assemble_deploy_and_restart_type) &
+  show_pulse $! "Assembling, deploying & starting $instance_name"
+}
+
+function set_up_engine_and_plugins_p() {
+  $(set_up_engine_and_plugins) &
+  show_pulse $! "Setting up the Escenic Content Engine & its plugins"
+}
+  
+function check_for_required_downloads_p() {
+  $(check_for_required_downloads) &
+  show_pulse $! "Asserting that required downloads succeeded"
+}
+
 function set_up_user_environment_p() {
   $(set_up_user_environment) &
   show_pulse $! "Setting up the ${ece_user}'s UNIX environment"
@@ -218,13 +248,19 @@ function install_ece_third_party_packages_p() {
   $(install_ece_third_party_packages) &
   show_pulse $! "Installing 3rd party packages needed by ECE"
 }
+
+function set_up_assembly_tool() {
+  $(set_up_assembly_tool) &
+  show_pulse $! "Setting up the Assembly Tool"
+}
+  
 ######################################################################
 # </pulse-methods>
 ######################################################################
 
 function set_up_assembly_tool()
 {
-    print_and_log "Setting up the Assembly Tool ..."
+    log "Setting up the Assembly Tool ..."
     
     make_dir $escenic_root_dir/assemblytool/
     cd $escenic_root_dir/assemblytool/
@@ -327,7 +363,7 @@ function set_up_engine_and_plugins()
         return
     fi
     
-    print_and_log "Setting up the Escenic Content Engine & its plugins ..."
+    log "Setting up the Escenic Content Engine & its plugins ..."
 
     make_dir $escenic_root_dir
     cd $escenic_root_dir/
@@ -336,7 +372,7 @@ function set_up_engine_and_plugins()
         if [ $(basename $el | \
             grep -E "^engine-[0-9]|^engine-trunk-SNAPSHOT|^engine-dist" | \
             wc -l) -gt 0 ]; then
-            engine_dir=$(get_base_dir_from_bundle $el)
+            engine_dir=$(get_base_dir_from_bundle $download_dir/$el)
             engine_file=$(basename $el)
         fi
     done
@@ -507,7 +543,7 @@ function set_up_ecedb()
 
 function set_up_basic_nursery_configuration()
 {
-    print_and_log "Setting up the basic Nursery configuration ..."
+    log "Setting up basic Nursery configuration ..."
 
     # we always copy the default plugin configuration (even if there
     # is an archive)
@@ -776,31 +812,6 @@ function install_ece_third_party_packages
     done
 }
 
-function get_base_dir_from_bundle()
-{
-    local file_name=$(basename $1)
-    suffix=${file_name##*.}
-
-    if [ ${suffix} = "zip" ]; then
-        # we'll look inside the archive to determine the base_dir
-        file_name=$(
-            unzip -t ${download_dir}/$file_name | \
-                awk '{print $2}' | \
-                cut -d'/' -f1 | \
-                sort | \
-                uniq | \
-                grep -v errors | \
-                grep [a-z]
-        )
-    else
-        for el in .tar.gz .tar.bz2 .zip; do
-            file_name=${file_name%$el}
-        done
-    fi
-    
-    echo $file_name
-}
-
 # $1 the domain
 #
 # The method will ensure that the passed domain is resolvable by the
@@ -934,10 +945,9 @@ function set_up_app_server()
         search_host=$(echo $user_search | cut -d':' -f1)
         search_port=$(echo $user_search | cut -d':' -f2)
     fi
-    
-    run cd $download_dir
-    run wget $wget_opts $tomcat_download
-    tomcat_dir=$(get_base_dir_from_bundle $tomcat_download)
+
+    download_tomcat_p
+    tomcat_dir=$(get_base_dir_from_bundle $(get_tomcat_download_url))
     
     run cd $appserver_parent_dir
     run tar xzf $download_dir/${tomcat_dir}.tar.gz
@@ -1237,7 +1247,7 @@ fi
 # last, give the control back to the ECE user & group 
 function set_correct_permissions()
 {
-    print_and_log "Setting correct permissions on ECE related directories ..."
+    log "Setting correct permissions on ECE related directories ..."
 
     for el in $engine_dir_list; do
         if [ ! -d $el ]; then
@@ -1250,8 +1260,8 @@ function set_correct_permissions()
                 -user ${ece_user} | \
                 wc -l)
             if [ $correct_permission -gt 0 ]; then
-                print_and_log "Data directory root, $el,"
-                print_and_log "has correct permissions, skiping sub directories."
+                log "Data directory root, $el,"
+                log "has correct permissions, skiping sub directories."
                 continue
             fi
         fi
@@ -1386,25 +1396,28 @@ fi
 
 function check_for_required_downloads()
 {
-    if [ $ece_software_setup_completed -eq 1 ]; then
-        return
-    fi
+  if [ $ece_software_setup_completed -eq 1 ]; then
+    return
+  fi
+  
+  log "Asserting that required downloads succeeded ..."
+  local required_escenic_packages="engine assemblytool"
     
-    print_and_log "Asserting that required downloads succeeded ..."
-    required_escenic_packages="engine assemblytool"
-
-    for el in $required_escenic_packages; do
-        if [ $(ls $download_dir | \
-            grep ${el} | \
-            grep -v community | \
-            grep -v analysis | \
-            grep .zip$ | \
-            wc -l) \
-            -lt 1 ]; then
-            print_and_log "Couldn't find $el* in $download_dir"
-            remove_pid_and_exit_in_error
-        fi
-    done
+  for el in $required_escenic_packages; do
+    if [ $(ls $download_dir/$el*.zip 2>/dev/null | wc -l) -lt 1 ]; then
+      log "$el is missing"
+    else
+      # want the newest one if there are several
+      local file=$(ls $download_dir/$el*.zip | tail -1)
+      unzip -t $file > /dev/null 2>&1
+
+      if [ $? -ne 0 ]; then
+        log "$file has been downloaded, but is faulty,"
+        log "remove it and re-run $0"
+        return 9
+      fi
+    fi
+  done
 }
 
 function install_memcached()
@@ -1960,7 +1973,7 @@ function install_database_server()
     assert_pre_requisite mysql
 
     if [ -z "$1" ]; then
-        download_escenic_components
+        download_escenic_components_p
         set_up_engine_and_plugins
         set_up_ecedb
     fi
@@ -2113,9 +2126,9 @@ function install_ece_instance()
     # most likely, the user is _not_ installing from archives (EAR +
     # configuration bundle), hence the false test goes first.
     if [ $(is_installing_from_ear) -eq 0 ]; then
-        download_escenic_components
-        check_for_required_downloads
-        set_up_engine_and_plugins
+        download_escenic_components_p
+        check_for_required_downloads_p
+        set_up_engine_and_plugins_p
         set_up_assembly_tool
     else
         verify_that_files_exist_and_are_readable \
@@ -2123,8 +2136,8 @@ function install_ece_instance()
             $ece_instance_conf_archive
     fi
     
-    set_up_basic_nursery_configuration
-    set_up_instance_specific_nursery_configuration
+    set_up_basic_nursery_configuration_p
+    set_up_instance_specific_nursery_configuration_p
     
     set_up_app_server
     set_up_proper_logging_configuration
@@ -2141,7 +2154,7 @@ function install_ece_instance()
 
     if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER -a \
         $install_profile_number -ne $PROFILE_SEARCH_SERVER ]; then
-        assemble_deploy_and_restart_type
+        assemble_deploy_and_restart_type_p
     fi
     
     update_type_instances_to_start_up
@@ -2204,7 +2217,7 @@ function install_presentation_server()
 
 function assemble_deploy_and_restart_type()
 {
-    print_and_log "Assembling, deploying & starting $instance_name ..."
+    log "Assembling, deploying & starting $instance_name ..."
     
     set_correct_permissions
 
@@ -2214,7 +2227,7 @@ function assemble_deploy_and_restart_type()
     if [ $(is_installing_from_ear) -eq 1 ]; then
         run cp $ece_instance_ear_file $escenic_cache_dir/engine.ear
         ece_command="ece -i $instance_name -t $type deploy restart"
-        print_and_log "Using the supplied EAR instead of running an assembly."
+        log "Using the supplied EAR instead of running an assembly."
     fi
     
     su - $ece_user -c "$ece_command" 1>>$log 2>>$log
diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index d9052b38..6f2e183a 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -150,3 +150,30 @@ function yellow() {
   echo -e "\E[37;33m\033[1m${@}\033[0m"
 }
 
+
+## $1: full path to the file.
+function get_base_dir_from_bundle()
+{
+    local file_name=$(basename $1)
+    suffix=${file_name##*.}
+    
+    if [ ${suffix} = "zip" ]; then
+        # we'll look inside the archive to determine the base_dir
+        file_name=$(
+            unzip -t $1 2>>$log | \
+                awk '{print $2}' | \
+                cut -d'/' -f1 | \
+                sort | \
+                uniq | \
+                grep -v errors | \
+                grep [a-z]
+        )
+    else
+        for el in .tar.gz .tar.bz2 .zip; do
+            file_name=${file_name%$el}
+        done
+    fi
+    
+    echo $file_name
+}
+
diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index 736e488a..fb9f6d12 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -6,6 +6,9 @@
 
 # depends on common-bashing
 common_bashing_is_loaded > /dev/null 2>&1 || source common-bashing.sh
+common_pulse_is_loaded > /dev/null 2>&1 || source common-bashing.sh
+
+wget_opts="--continue --inet4-only --quiet"
 
 # Can be used like this:
 # common_io_os_loaded 2>/dev/null || source common-os.sh
@@ -99,3 +102,29 @@ function assert_pre_requisite() {
   fi
 }
 
+function get_tomcat_download_url() {
+  local url=$(
+    curl -s http://tomcat.apache.org/download-60.cgi | \
+      grep tar.gz | \
+      head -1 | \
+      cut -d'"' -f2
+  )
+  
+  echo $url
+}
+
+## Downloads Tomcat from the regional mirror
+##
+## $1: target directory
+function download_tomcat() {
+  (
+    log "Downloading Tomcat from $url ..."
+    run cd $1
+    run wget $wget_opts $(get_tomcat_url)
+  )
+}
+
+function download_tomcat_p() {
+  $(download_tomcat) &
+  show_pulse $! "Downloading Tomcat from local mirror"
+}
diff --git a/usr/share/escenic/ece-scripts/common-pulse.sh b/usr/share/escenic/ece-scripts/common-pulse.sh
index a0f7704c..bc198d06 100644
--- a/usr/share/escenic/ece-scripts/common-pulse.sh
+++ b/usr/share/escenic/ece-scripts/common-pulse.sh
@@ -7,12 +7,21 @@ common_bashing_is_loaded > /dev/null 2>&1 || source common-bashing.sh
 
 pulse_bits="-\|/"
 
+# Can be used like this:
+# common_io_pulse_loaded 2>/dev/null || source common-pulse.sh
+function common_pulse_is_loaded() {
+  echo 1
+}
+
 function pulse() {
   echo -ne "\b${pulse_bits: i++ % ${#pulse_bits}: 1}"
 }
 
+## $1:     the PID of the process on which you want to view the pulse.
+## $2...n: Strings to display while the pulse is running.
 function show_pulse() {
   printne "${@: 2: $(( $# - 1 ))} ...."
+  
   local pulse_pid=$1
   while true; do
     kill -0 $pulse_pid 2>/dev/null
@@ -28,6 +37,11 @@ function show_pulse() {
       else
         echo -e '\b\E[37;31m'" \033[1mfailed\033[0m"
         tput sgr0
+        print "See $log for further details"
+        log_call_stack
+
+        # terminate the main ece script process.
+        kill $$ 2>/dev/null
       fi
       
       break

From 38b982e3f740c549641253b1acfa7287ae3b453f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 21 Feb 2012 12:01:19 +0800
Subject: [PATCH 0306/2585] - various small regression bug fixes (magit took my
 change set as it   was when I first started composing the commit message, and
 not the   updates files. Clever! But also different to all other SCMs I've  
 worked with).

---
 usr/sbin/ece-install                            | 6 +++++-
 usr/share/escenic/ece-scripts/common-bashing.sh | 8 +++++---
 usr/share/escenic/ece-scripts/common-os.sh      | 4 ++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index e307d601..0282e1fa 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -237,6 +237,9 @@ function set_up_user_environment_p() {
 function set_up_ece_scripts_p() {
   $(set_up_ece_scripts) &
   show_pulse $! 'Setting up the ece UNIX scripts'
+  if [ -n "${messages}" ]; then
+    echo $message
+  fi
 }
 
 function install_common_os_packages_p() {
@@ -372,7 +375,7 @@ function set_up_engine_and_plugins()
         if [ $(basename $el | \
             grep -E "^engine-[0-9]|^engine-trunk-SNAPSHOT|^engine-dist" | \
             wc -l) -gt 0 ]; then
-            engine_dir=$(get_base_dir_from_bundle $download_dir/$el)
+            engine_dir=$(get_base_dir_from_bundle $download_dir/$(basename $el))
             engine_file=$(basename $el)
         fi
     done
@@ -412,6 +415,7 @@ function set_up_ece_scripts()
       run cd ece-scripts
       run git pull
     )
+    if [ $! -eq 1 ]; then echo $!; return 1; fi
   else
     run git clone $ece_scripts_git_source
   fi
diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index 6f2e183a..1e3111cb 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -80,8 +80,8 @@ function remove_pid_and_exit_in_error() {
 
 function exit_on_error() {
   if [ $? -gt 0 ]; then
-    print "The command ["$@"] FAILED, exiting :-("
-    print "See $log for further details."
+    log "The command ["$@"] FAILED, exiting :-("
+    log "See $log for further details."
     remove_pid_and_exit_in_error
   fi
 }
@@ -173,7 +173,9 @@ function get_base_dir_from_bundle()
             file_name=${file_name%$el}
         done
     fi
-    
+
+    log "get_base_dir_from_bundle file_name="$file_name $1
+
     echo $file_name
 }
 
diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index fb9f6d12..5dabeef8 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -120,11 +120,11 @@ function download_tomcat() {
   (
     log "Downloading Tomcat from $url ..."
     run cd $1
-    run wget $wget_opts $(get_tomcat_url)
+    run wget $wget_opts $(get_tomcat_download_url)
   )
 }
 
 function download_tomcat_p() {
   $(download_tomcat) &
-  show_pulse $! "Downloading Tomcat from local mirror"
+  show_pulse $! "Downloading Tomcat from nearest mirror"
 }

From 5d15ccac557621a11ac932c184ceae48b6817c82 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 21 Feb 2012 14:01:58 +0800
Subject: [PATCH 0307/2585] - fixed regression in tomcat download (download
 went into the wrong   directory.

---
 usr/share/escenic/ece-scripts/common-os.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index 5dabeef8..64e50770 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -125,6 +125,6 @@ function download_tomcat() {
 }
 
 function download_tomcat_p() {
-  $(download_tomcat) &
+  $(download_tomcat $1) &
   show_pulse $! "Downloading Tomcat from nearest mirror"
 }

From 692eaada923e946b60eeaf6be9c7fda6ac8bc76e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 21 Feb 2012 14:03:10 +0800
Subject: [PATCH 0308/2585] - fixed regression in tomcat downloading - added
 pulse to java deb package generation - fixed status label (ece_user <user>'s
 ...)

---
 usr/sbin/ece-install | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 0282e1fa..476d6085 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -231,7 +231,7 @@ function check_for_required_downloads_p() {
 
 function set_up_user_environment_p() {
   $(set_up_user_environment) &
-  show_pulse $! "Setting up the ${ece_user}'s UNIX environment"
+  show_pulse $! "Setting up the ${ece_user} user's UNIX environment"
 }
 
 function set_up_ece_scripts_p() {
@@ -734,16 +734,16 @@ function create_java_deb_packages_and_repo()
     print $(lsb_release -i | cut -d':' -f2) \
         $(lsb_release -r | cut -d':' -f2) \
         "doesn't have official Sun/Oracle Java packages,"
-    print "I'm creating packages & local repo for you ..."
     
     local tmp_dir=$(mktemp -d)
-    (
+    $(
         run cd $tmp_dir
         run git clone https://github.com/flexiondotorg/oab-java6.git
         run cd oab-java6
         run bash oab-java6.sh
         run rm -rf $tmp_dir
-    )
+    ) &
+    show_pulse $! "I'm creating packages & local repo for you"
 
     add_next_step "Local APT repository with Sun/Oracle Java packages"
     add_next_step "has been installed at /var/local/oab/deb and added"
@@ -950,7 +950,7 @@ function set_up_app_server()
         search_port=$(echo $user_search | cut -d':' -f2)
     fi
 
-    download_tomcat_p
+    download_tomcat_p $download_dir
     tomcat_dir=$(get_base_dir_from_bundle $(get_tomcat_download_url))
     
     run cd $appserver_parent_dir

From 57482012e006403060228256592ee88ee2471da3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 21 Feb 2012 17:26:59 +0800
Subject: [PATCH 0309/2585] - moved install_memcached to its own BASH module -
 first implementation all steps involved in setting up memcached.

  TODO: test and give user hint on feeding back the changes into the
  publication source tree
---
 usr/sbin/ece-install                          | 19 ----
 .../ece-scripts/ece-install.d/memcached.sh    | 92 +++++++++++++++++++
 2 files changed, 92 insertions(+), 19 deletions(-)
 create mode 100644 usr/share/escenic/ece-scripts/ece-install.d/memcached.sh

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 476d6085..821e72aa 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -1424,25 +1424,6 @@ function check_for_required_downloads()
   done
 }
 
-function install_memcached()
-{
-    if [ $on_debian_or_derivative ]; then
-        install_packages_if_missing "memcached"
-    fi
-    
-     # 1) download java library
-     # 2) configure PresenationArticle cache for the publication
-     # 3) build and re-deploy
-    
-    cat >> $escenic_conf_dir/engine/common/Initial.properties <<EOF
-
-# using memcached
-service.0.0-memcached-socket-pool=/com/danga/SockIOPool
-EOF
-
-    echo "TBD"
-}
-
 function set_up_user_environment()
 {
   local bashrc=$(get_user_home_directory $ece_user)/.bashrc
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/memcached.sh b/usr/share/escenic/ece-scripts/ece-install.d/memcached.sh
new file mode 100644
index 00000000..9f4baa51
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece-install.d/memcached.sh
@@ -0,0 +1,92 @@
+#! /usr/bin/env bash
+
+# by tkj@vizrt.com
+
+memcached_java_lib_url=http://img.whalin.com/memcached/jdk5/log4j/java_memcached-release_2.0.1.tar.gz
+
+## $1: root directory of the publication
+function memcached_create_publication_nursery_component() {
+  if [ ! -d "$1" ]; then
+    log $1 "doesn't exist"
+    return
+  fi
+
+  log "Adding memcached wrapper to PresenationArticle in $1 ..."
+  local dir=$1/webapp/WEB-INF/localconfig/neo/xredsys/presentation/cache
+  make_dir $dir
+  local file=$dir/PresentationArticleCache.properties
+  sed -i "s#\$class=.*#\$class=neo.util.cache.Memcached#g" $file
+}
+
+function install_memcached()
+{
+  if [ $on_debian_or_derivative ]; then
+    install_packages_if_missing "memcached"
+  fi
+  
+  run $download_dir
+  run wget $wget_opts $memcached_java_lib_url
+  local name=$(get_base_dir_from_bundle $memcached_java_lib_url)
+  run cp $name/$name.jar $assemblytool_home/lib
+  
+  memcached_set_up_common_nursery
+  
+  log "Configuring all publications for using memcached ..."
+  for el in $assemblytool_home/publications/*.properties 2>/dev/null; do
+    local publication=$(basename $el .properties)
+    
+    if [[ $appserver == "tomcat" ]]; then
+      dir=$tomcat_base/webapps/$publication
+      make_dir $dir
+      memcached_create_publication_nursery_component $dir
+    fi
+  done
+  
+  # fixing the deployed publications on host
+  if [[ $appserver == "tomcat" ]]; then
+    for el in $(
+      find $tomcat_base/webapps/ \
+        -mindepth 1 \
+        -maxdepth 1 \
+        -type d | \
+        egrep -v "solr|webservice|escenic|escenic-admin|indexer-webservice" | \
+        egrep -v "indexer-webapp|studio"
+    ); do
+      memcached_create_publication_nursery_component $el
+    done
+    
+  fi
+  
+  # TODO inform the user that he/she might want to do tihs in the
+  # publication tree as well.
+  assemble_deploy_and_restart_type_p
+}
+
+function memcached_set_up_common_nursery() {
+  local dir=$common_nursery_dir/com/danga
+  make_dir $dir
+  cat > $dir/SockIOPool <<EOF
+$class=com.danga.MemCached.SockIOPool
+# fill in memcached servers here.
+servers=${fai_memcached_node_list}
+
+# how many connections to use
+initConn = 10
+minConn = 5
+maxConn = 100
+# idle time
+maxIdle = 180000
+maintSleep = 5000
+# socket timeout
+socketTO = 3000
+failover = true
+# a network lookup algorithm
+nagle = false
+EOF
+
+  cat >> $common_nursery_dir/Initial.properties <<EOF
+
+# using memcached
+service.0.0-memcached-socket-pool=/com/danga/SockIOPool
+EOF
+}

From efcd41240d38d1382d8e61f35946d31a5d55cd08 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 21 Feb 2012 17:34:16 +0800
Subject: [PATCH 0310/2585] - first version of memcached installation (sub)
 profile. - added README for /usr/share/escenic/ece-scripts structure.

---
 usr/share/escenic/ece-scripts/README | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 usr/share/escenic/ece-scripts/README

diff --git a/usr/share/escenic/ece-scripts/README b/usr/share/escenic/ece-scripts/README
new file mode 100644
index 00000000..297b649f
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/README
@@ -0,0 +1,14 @@
+#############################################################################
+# common-*.sh :: Common libraries
+#############################################################################
+
+The common-*.sh files are considered re-usable BASH libraries, which
+can be used by any script, in and outside of the ece-scripts.
+
+#############################################################################
+# ece-install.d :: ece-install modules.
+#############################################################################
+
+The scripts found in ece-install.d are meant for use by ece-install
+itself and may not work when used separately as they rely on
+ece-install internals.

From 53af0201f5a81522b3fba7f6e7f82e2d588f3fa9 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 22 Feb 2012 22:01:54 +0800
Subject: [PATCH 0311/2585] - now uses https instead of git protocol when
 downloading the   ece-scripts.

- corrected log message in install_packages_if_missing, it only listed
  the first package being installed, leading to confusion.

- localised some variables to not litter the global naming space

- fixed indentation a few places

- removed redundant call to git package installation.

- removed redundant >> <<EOF in set_up_varnish
---
 usr/sbin/ece-install | 131 +++++++++++++++++++------------------------
 1 file changed, 59 insertions(+), 72 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 821e72aa..79e2193f 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -50,7 +50,7 @@ pid_file=/var/run/$(basename $0).pid
 download_dir=/tmp/ece-downloads
 log=/var/log/$(basename $0).log
 conf_file=$HOME/ece-install.conf
-ece_scripts_git_source=git://github.com/skybert/ece-scripts.git
+ece_scripts_git_source=https://github.com/skybert/ece-scripts.git
 maven_opts="--batch-mode"
 wget_opts="--continue --inet4-only --quiet"
 apt_opts="--no-install-recommends"
@@ -109,7 +109,7 @@ PROFILE_ANALYSIS_SERVER=12
 
 ######################################################################
 # Load common BASH libraries
-#####################################################################
+######################################################################
 common_libraries="common-bashing.sh common-pulse.sh common-io.sh common-os.sh"
 for el in $common_libraries; do
   source $(dirname $0)/../share/escenic/ece-scripts/${el} || \
@@ -148,14 +148,14 @@ function download_escenic_components_p() {
   show_pulse $! "Downloading Escenic components from Technet"
 }
 
-# WILL install the passed packages if these are not installed from
+# Will install the passed packages if these are not installed from
 # before.
 #
 # parameters:
 # $1 : space separated string of package names 
 function install_packages_if_missing()
 {
-  log "Installing packages [$1] if they're missing ..."
+  log "Installing package(s) [$@] if missing ..."
   
     if [ $on_debian_or_derivative -eq 1 ]; then
         some_are_missing=0
@@ -192,7 +192,7 @@ function install_common_os_packages()
       git_package=git
     fi
     
-    packages="curl $git_package wget unzip"
+    local packages="curl $git_package wget unzip"
     install_packages_if_missing $packages
   fi
   
@@ -580,7 +580,6 @@ function set_up_basic_nursery_configuration()
         run cp -r $escenic_root_dir/engine/security/ $common_nursery_dir/
     fi
 
-
     if [ -n "${a_tmp_dir}" ]; then
         run rm -rf ${a_tmp_dir}
     fi
@@ -615,21 +614,21 @@ readConnector=/connector/ReadConnector
 updateConnector=/connector/UpdateConnector
 EOF
 
-file=$common_nursery_dir/com/escenic/community/CommunityEngine.properties
-if [ -w ${file} ]; then
-    sed -i 's/jdbc\/ecome/jdbc\/ECE_UPDATE_DS/g' $file
-    exit_on_error "sed on $file"
-elif [ ! -e ${file} ]; then
-    print_and_log "I Could not find an ECOME configuration file,"
-    print_and_log "I assume you have not installed Community Engine."
-else
-    print_and_log "Could not write to ${file},"
-    print_and_log "Community Engine might not work because of this. "
-    remove_pid_and_exit_in_error
-fi
+    file=$common_nursery_dir/com/escenic/community/CommunityEngine.properties
+    if [ -w ${file} ]; then
+        sed -i 's/jdbc\/ecome/jdbc\/ECE_UPDATE_DS/g' $file
+        exit_on_error "sed on $file"
+    elif [ ! -e ${file} ]; then
+        print_and_log "I Could not find an ECOME configuration file,"
+        print_and_log "I assume you have not installed Community Engine."
+    else
+        print_and_log "Could not write to ${file},"
+        print_and_log "Community Engine might not work because of this. "
+        remove_pid_and_exit_in_error
+    fi
 
-file=$common_nursery_dir/com/escenic/webstart/StudioConfig.properties
-cat >> $file <<EOF
+    file=$common_nursery_dir/com/escenic/webstart/StudioConfig.properties
+    cat >> $file <<EOF
 
 # We set this to get around a missing feature in Varnish, see:
 # https://www.varnish-cache.org/trac/wiki/Future_Feature#Chunkedencodingclientrequests
@@ -656,7 +655,6 @@ function set_up_instance_specific_nursery_configuration()
     if [ ! -e $file ]; then
         run echo "hostname=$HOSTNAME" >> $file
     fi
-    
 }
 
 function set_up_proper_logging_configuration()
@@ -674,7 +672,6 @@ EOF
     make_ln $common_nursery_dir/trace.properties
     run ln -sf trace.properties log4j.properies
 
-
     # since the solr webapp otherwise will pollute our logs, we ask
     # Tomcat specifically to make it log to dedicated logger.
     if [ $install_profile_number -eq $PROFILE_SEARCH_SERVER -o \
@@ -729,8 +726,6 @@ function set_ece_instance_conf()
 
 function create_java_deb_packages_and_repo()
 {
-    install_packages_if_missing $git_package
-
     print $(lsb_release -i | cut -d':' -f2) \
         $(lsb_release -r | cut -d':' -f2) \
         "doesn't have official Sun/Oracle Java packages,"
@@ -1168,13 +1163,12 @@ EOF
     cat > $tomcat_base/conf/context.xml <<EOF
 <?xml version='1.0' encoding='utf-8'?>
 <Context>
-
   <WatchedResource>WEB-INF/web.xml</WatchedResource>
 EOF
 
-if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER -a \
-    $install_profile_number -ne $PROFILE_SEARCH_SERVER ]; then
-    cat >> $tomcat_base/conf/context.xml <<EOF
+    if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER -a \
+      $install_profile_number -ne $PROFILE_SEARCH_SERVER ]; then
+      cat >> $tomcat_base/conf/context.xml <<EOF
   <ResourceLink
       global="jdbc/ECE_READ_DS"
       name="jdbc/ECE_READ_DS"
@@ -1186,10 +1180,10 @@ if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER -a \
       type="javax.sql.DataSource"
   />
 EOF
-fi
+    fi
 
-if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER ]; then
-    cat >> $tomcat_base/conf/context.xml <<EOF
+    if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER ]; then
+      cat >> $tomcat_base/conf/context.xml <<EOF
   <Environment
       name="escenic/solr-base-uri"
       value="http://${search_host}:${search_port}/solr/"
@@ -1197,10 +1191,10 @@ if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER ]; then
       override="false"
   />
 EOF
-fi
+    fi
 
-if [ $install_profile_number -eq $PROFILE_SEARCH_SERVER ]; then
-    cat >> $tomcat_base/conf/context.xml <<EOF
+    if [ $install_profile_number -eq $PROFILE_SEARCH_SERVER ]; then
+      cat >> $tomcat_base/conf/context.xml <<EOF
   <Environment
       name="escenic/indexer-webservice"
       value="http://${indexer_ws_uri}"
@@ -1227,8 +1221,8 @@ if [ $install_profile_number -eq $PROFILE_SEARCH_SERVER ]; then
   />
 </Context>
 EOF
-elif [ $install_profile_number -eq $PROFILE_ANALYSIS_SERVER ]; then
-    cat >> $tomcat_base/conf/context.xml <<EOF
+    elif [ $install_profile_number -eq $PROFILE_ANALYSIS_SERVER ]; then
+      cat >> $tomcat_base/conf/context.xml <<EOF
   <ResourceLink
       global="jdbc/eae-logger/logger"
       name="jdbc/eae-logger/logger"
@@ -1241,11 +1235,11 @@ elif [ $install_profile_number -eq $PROFILE_ANALYSIS_SERVER ]; then
   />
 </Context>
 EOF
-else 
-    cat >> $tomcat_base/conf/context.xml <<EOF
+    else 
+      cat >> $tomcat_base/conf/context.xml <<EOF
 </Context>
 EOF
-fi
+    fi
 }
 
 # last, give the control back to the ECE user & group 
@@ -1276,10 +1270,6 @@ function set_correct_permissions()
     if [ -d "$tomcat_base" ]; then
         run chown -R ${ece_user}:${ece_group} $tomcat_base
     fi
-
-    if [ $(ls /tmp | grep ^ece | wc -l) -gt 0 ]; then
-        run chown -R ${ece_user}:${ece_group} /tmp/ece-*
-    fi
 }
 
 function print_status_and_next_steps()
@@ -1374,19 +1364,19 @@ source-war: ${publication_name}.war
 context-root: ${publication_name}
 EOF
 
-publication_war=$escenic_root_dir/assemblytool/publications/${publication_name}.war
-if [[ $fai_enabled -eq 1 && -n "${fai_publication_war}" ]]; then
-    print_and_log "Basing ${publication_name}.war on the one specified in $conf_file"
-    run cp ${fai_publication_war} ${publication_war}
-elif [ -d $escenic_root_dir/widget-framework-core-* ]; then
-    print_and_log "Basing ${publication_name}.war on Widget Framework Demo ..."
-    run cd $escenic_root_dir/widget-framework-core-*/publications/demo-core
-    run mvn $maven_opts package
-    run cp target/demo-core-*.war ${publication_war}
-else
-    print_and_log "Basing your ${publication_name}.war on ECE/demo-clean ..."
-    run cp $escenic_root_dir/engine/contrib/wars/demo-clean.war ${publication_war}
-fi
+    publication_war=$escenic_root_dir/assemblytool/publications/${publication_name}.war
+    if [[ $fai_enabled -eq 1 && -n "${fai_publication_war}" ]]; then
+      print_and_log "Basing ${publication_name}.war on the one specified in $conf_file"
+      run cp ${fai_publication_war} ${publication_war}
+    elif [ -d $escenic_root_dir/widget-framework-core-* ]; then
+      print_and_log "Basing ${publication_name}.war on Widget Framework Demo ..."
+      run cd $escenic_root_dir/widget-framework-core-*/publications/demo-core
+      run mvn $maven_opts package
+      run cp target/demo-core-*.war ${publication_war}
+    else
+      print_and_log "Basing your ${publication_name}.war on ECE/demo-clean ..."
+      run cp $escenic_root_dir/engine/contrib/wars/demo-clean.war ${publication_war}
+    fi
 
     # TODO add support for the community widgets
     #
@@ -1551,7 +1541,7 @@ function set_up_varnish()
     # -V for some reason writes to standard error.
     using_varnish_3=$(varnishd -V 3>&1 1>&2 2>&3 | grep varnish-3 | wc -l)
     
-    file=/etc/default/varnish
+    local file=/etc/default/varnish
     sed -i -e 's/6081/80/g' -e 's/^START=no$/START=yes/' $file
     exit_on_error "sed on $file"
 
@@ -1614,9 +1604,7 @@ EOF
 
     cat >> /etc/varnish/default.vcl <<EOF
 }
-EOF
 
-cat >> /etc/varnish/default.vcl <<EOF
 sub vcl_recv {
   if (!client.ip ~ staff &&
       (req.url ~ "^/escenic" ||
@@ -1887,8 +1875,8 @@ function add_next_step()
     fi
 }
 
-# $1 : optional parameter, binaries_only. If passed, $1=binaries_only,
-#      the ECE DB schema is not set up. 
+## $1: optional parameter, binaries_only. If passed, $1=binaries_only,
+##     the ECE DB schema is not set up. 
 function install_database_server()
 {
     print_and_log "Installing the database server on $HOSTNAME ..."
@@ -2096,8 +2084,7 @@ function verify_that_files_exist_and_are_readable()
     done
 }   
 
-# $1=<default instance name>
-# $2=<editorial server=0 | presentation server=1>
+## $1=<default instance name>
 function install_ece_instance()
 {
     install_ece_third_party_packages
@@ -2149,11 +2136,11 @@ function install_ece_instance()
     admin_uri=http://$HOSTNAME:${appserver_port}/escenic-admin/
     add_next_step "New ECE instance $instance_name installed."
     add_next_step "Admin interface: $admin_uri"
-    add_next_step "View installed versions with:"\
-" ece -i $instance_name versions"
-add_next_step "Type 'ece help' to see all the options of this script"
-add_next_step "Read its guide: /usr/share/doc/escenic/ece-guide.txt"
-add_next_step "/etc/default/ece lists all instances started at boot time"
+    add_next_step "View installed versions with:" \
+      " ece -i $instance_name versions"
+    add_next_step "Type 'ece help' to see all the options of this script"
+    add_next_step "Read its guide: /usr/share/doc/escenic/ece-guide.txt"
+    add_next_step "/etc/default/ece lists all instances started at boot time"
 }
 
 function get_publication_short_name_list()
@@ -2392,11 +2379,11 @@ clientConfiguration=/neo/io/services/HubConnection
 pingTime=10000
 EOF
 
-add_next_step "Restart all your instances to make the hub see them."
+    add_next_step "Restart all your instances to make the hub see them."
 
-print_and_log "Starting the RMI-hub on $HOSTNAME ..."
-ece_command="ece -t rmi-hub restart"
-su - $ece_user -c "$ece_command" 1>>$log 2>>$log
+    print_and_log "Starting the RMI-hub on $HOSTNAME ..."
+    ece_command="ece -t rmi-hub restart"
+    su - $ece_user -c "$ece_command" 1>>$log 2>>$log
 }
 
 # reads the value of the desired setting from $conf_file

From 4fa45061c5bf56dd110df616be1803f9ac3b13c5 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 22 Feb 2012 22:02:23 +0800
Subject: [PATCH 0312/2585] - changed debug statement from log to debug.

---
 usr/share/escenic/ece-scripts/common-bashing.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index 1e3111cb..4af9492a 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -174,7 +174,7 @@ function get_base_dir_from_bundle()
         done
     fi
 
-    log "get_base_dir_from_bundle file_name="$file_name $1
+    debug "get_base_dir_from_bundle file_name="$file_name $1
 
     echo $file_name
 }

From 6f3593804f45225bfdbca9b437ee0db0a3ed074f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 23 Feb 2012 14:51:02 +0800
Subject: [PATCH 0313/2585] - removed set_up_basic_nursery_configuration_p as  
 set_up_basic_nursery_configuration cannot be run in a subshell as it  
 prompts the user for input when run in interactive mode. This   resulted in
 the installer hanging on forever waiting for user input   but the user
 neither knew about the requested input, nor was able to   input this because
 of the i/o redirection when running in a pulse-ed   subshell.

---
 usr/sbin/ece-install | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 79e2193f..98e4d6b1 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -209,11 +209,6 @@ function set_up_instance_specific_nursery_configuration_p() {
   show_pulse $! "Setting up instance specific Nursery configuration"
 }
 
-function set_up_basic_nursery_configuration_p() {
-  $(set_up_basic_nursery_configuration) &
-  show_pulse $! "Setting up basic Nursery configuration"
-}
-
 function assemble_deploy_and_restart_type_p() {
   echo $(assemble_deploy_and_restart_type) &
   show_pulse $! "Assembling, deploying & starting $instance_name"
@@ -926,8 +921,8 @@ function set_up_app_server()
     if [ $fai_enabled -eq 0 ]; then
         print "Last question, I promise!: Where does the search instance run?"
         print "Press ENTER to accept the default ($HOSTNAME:8080)"
+        print "or enter: <host>:<port>, e.g.: 'search1:8080'"
         print "If you're in doubt, just press ENTER :-)"
-        print "Or enter: <host>:<port>, e.g.: 'search1:8080'"
         echo -n "Your choice [$HOSTNAME:8080]> "
         read user_search
     else
@@ -2108,7 +2103,7 @@ function install_ece_instance()
             $ece_instance_conf_archive
     fi
     
-    set_up_basic_nursery_configuration_p
+    set_up_basic_nursery_configuration
     set_up_instance_specific_nursery_configuration_p
     
     set_up_app_server

From ab1a5ff1983fac1be0aeee7fbc2fe38308bf4dcb Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 23 Feb 2012 14:58:39 +0800
Subject: [PATCH 0314/2585] - fix in get_privileged_hosts: it would add :0.0 to
 the privileged   host list when installing e.g. a cache server on a local  
 system. Now, the local :0.0 display address is omitted from the   result of
 the method.

---
 usr/sbin/ece-install | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 98e4d6b1..36b09848 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -1509,22 +1509,22 @@ function un_install_ece()
 ## Returns the privileged hosts. This will include both the IP(s) the
 ## logged in user conduction the ece-install is coming from, as well
 ## as any IPs defined in fai_privileged_hosts.
-function get_privileged_hosts()
-{
-    local privileged_hosts=${fai_privileged_hosts}
-    
-    for ip in $(
-        w -h  | \
-            grep pts | \
-            sed "s#.*pts/[0-9]*[ ]*\(.*\)#\1#" | \
-            cut -d' ' -f1 | \
-            sort | \
-            uniq
-    ); do
-        privileged_hosts=${privileged_hosts}" "${ip}
-    done
+function get_privileged_hosts() {
+  local privileged_hosts=${fai_privileged_hosts}
+  
+  for ip in $(
+    w -h  | \
+      grep pts | \
+      grep -v ":0.0" | \
+    sed "s#.*pts/[0-9]*[ ]*\(.*\)#\1#" | \
+      cut -d' ' -f1 | \
+      sort | \
+      uniq
+  ); do
+    privileged_hosts=${privileged_hosts}" "${ip}
+  done
 
-    echo ${privileged_hosts}
+  echo ${privileged_hosts}
 }
 
 function set_up_varnish()
@@ -1567,6 +1567,7 @@ backend static {
   .host = "localhost";
   .port = "81";
 }
+
 EOF
     for el in $backend_servers; do
         appserver_id=$(echo $el | cut -d':' -f1 | sed 's/-/_/g')

From f2ec01579f5254eba0c877cf22b60bf151da95e5 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 23 Feb 2012 17:40:45 +0800
Subject: [PATCH 0315/2585] - started adding support for RedHat/CentOS (testing
 with version   6.2).

  TODO: still a lot. Right now, only the database is done without any
  errors..

- improved messages in download_tomcat

- added fail fast to get_tomcat_download_url
---
 usr/share/escenic/ece-scripts/common-os.sh | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index 64e50770..7d602711 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -96,7 +96,7 @@ function get_ip() {
 ##
 ## $1: the binary/executable/program
 function assert_pre_requisite() {
-  if [ $(which $1 | wc -l) -lt 1 ]; then
+  if [ $(which $1 2>/dev/null | wc -l) -lt 1 ]; then
     print_and_log "Please install $1 and then run $(basename $0) again."
     remove_pid_and_exit_in_error
   fi
@@ -109,6 +109,11 @@ function get_tomcat_download_url() {
       head -1 | \
       cut -d'"' -f2
   )
+
+  if [ -z $url ]; then
+    print_and_log "Failed to get Tomcat download URL"
+    kill $$
+  fi
   
   echo $url
 }
@@ -118,13 +123,10 @@ function get_tomcat_download_url() {
 ## $1: target directory
 function download_tomcat() {
   (
+    local url=$(get_tomcat_download_url)
     log "Downloading Tomcat from $url ..."
     run cd $1
-    run wget $wget_opts $(get_tomcat_download_url)
+    run wget $wget_opts $url
   )
 }
 
-function download_tomcat_p() {
-  $(download_tomcat $1) &
-  show_pulse $! "Downloading Tomcat from nearest mirror"
-}

From c1870b6a6167cc12e9db2ca3a49c4c8cca569cde Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 23 Feb 2012 17:41:44 +0800
Subject: [PATCH 0316/2585] - started adding support for RedHat/CentOS.

  TODO still a lot. Right now, the biggest obstacle is that "ece
  clean" fails on CentOS, whereas running "ant clean" works, funnily
  enough.
---
 usr/sbin/ece-install | 124 ++++++++++++++++++++++++++-----------------
 1 file changed, 74 insertions(+), 50 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 36b09848..799a2790 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -19,7 +19,7 @@
 #####################################################################
 ece_user=escenic
 ece_group=escenic
-jdbc_driver=/usr/share/java/mysql.jar
+jdbc_driver=/usr/share/java/mysql-connector-java.jar
 debug=0
 
 # These variables govern where software is installed and data and run
@@ -63,6 +63,7 @@ ece_install_scripts_dir=$HOME/ece-install.d
 appserver_host=localhost
 appserver_port=8080
 on_debian_or_derivative=0
+on_redhat_or_derivative=0
 on_debian=0
 on_ubuntu=0
 force_packages=0
@@ -143,59 +144,54 @@ function download_escenic_components()
     done
 }
 
-function download_escenic_components_p() {
-  $(download_escenic_components) &
-  show_pulse $! "Downloading Escenic components from Technet"
-}
 
 # Will install the passed packages if these are not installed from
 # before.
 #
 # parameters:
 # $1 : space separated string of package names 
-function install_packages_if_missing()
-{
+function install_packages_if_missing() {
   log "Installing package(s) [$@] if missing ..."
   
-    if [ $on_debian_or_derivative -eq 1 ]; then
-        some_are_missing=0
-        for el in $@; do
+  if [ $on_debian_or_derivative -eq 1 ]; then
+    some_are_missing=0
+    for el in $@; do
             # we don't need to grep away "No packages found matching
             # ..." since this message from dpkg is written to standard
             # error.
-            if [ $(dpkg -l $el 2>/dev/null | grep ^ii | wc -l) -lt 1 ]; then
-                some_are_missing=1
-            fi
-        done
-        
-        if [ $some_are_missing -eq 0 ]; then
-            return
-        fi
+      if [ $(dpkg -l $el 2>/dev/null | grep ^ii | wc -l) -lt 1 ]; then
+        some_are_missing=1
+      fi
+    done
+    
+    if [ $some_are_missing -eq 0 ]; then
+      return
+    fi
 
-        if [ $force_packages -eq 1 ]; then
-            run apt-get install $apt_opts --assume-yes --force-yes $@
-        else
-            run apt-get install $apt_opts --assume-yes $@
-        fi
+    if [ $force_packages -eq 1 ]; then
+      run apt-get install $apt_opts --assume-yes --force-yes $@
+    else
+      run apt-get install $apt_opts --assume-yes $@
     fi
+  elif [ $on_redhat_or_derivative -eq 1 ]; then
+    run yum install --assumeyes $@
+  fi
 }
 
 function install_common_os_packages()
 {
-  log "Installing common OS packages ..."
-  
+  print_and_log "Installing common OS packages ..."
+  git_package=git
   if [ $on_debian_or_derivative -eq 1 ]; then
         # Ubuntu doesn't have git (!) but only git-core.
     if [ $on_ubuntu -eq 1 ]; then
       git_package=git-core
-    else
-      git_package=git
     fi
-    
-    local packages="curl $git_package wget unzip"
-    install_packages_if_missing $packages
   fi
   
+  local packages="curl $git_package wget unzip"
+  install_packages_if_missing $packages
+  
   for el in lsb_release curl wget git unzip; do
     assert_pre_requisite $el
   done
@@ -204,6 +200,11 @@ function install_common_os_packages()
 ######################################################################
 # <pulse-methods>
 ######################################################################
+function download_escenic_components_p() {
+  $(download_escenic_components) &
+  show_pulse $! "Downloading Escenic components from Technet"
+}
+
 function set_up_instance_specific_nursery_configuration_p() {
   $(set_up_instance_specific_nursery_configuration) &
   show_pulse $! "Setting up instance specific Nursery configuration"
@@ -797,10 +798,21 @@ function install_ece_third_party_packages
           libmysql-java
           memcached
           wget"
-
-        install_packages_if_missing $packages
+    elif [ $on_redhat_or_derivative -eq 1 ]; then
+      packages="
+        ant
+        ant-contrib
+        ant-nodeps
+        apr
+        memcached
+        mysql-connector-java
+        wget
+      "
+      # TODO no tomcat APR wrappers in official repositories
     fi
     
+    install_packages_if_missing $packages
+    
     for el in ant java; do
         assert_pre_requisite $el
     done
@@ -940,7 +952,7 @@ function set_up_app_server()
         search_port=$(echo $user_search | cut -d':' -f2)
     fi
 
-    download_tomcat_p $download_dir
+    download_tomcat $download_dir
     tomcat_dir=$(get_base_dir_from_bundle $(get_tomcat_download_url))
     
     run cd $appserver_parent_dir
@@ -1769,14 +1781,21 @@ function common_pre_install()
     if [ -e /etc/debian_version -a -x /usr/bin/dpkg ]; then
         on_debian_or_derivative=1
         export DEBIAN_FRONTEND=noninteractive
+        
+      # chicken and the egg problem, we need lsb_release to install the
+      # packages later on, hence as soon as we know we've got a Debian
+      # based platform, we install lsb-release. Also note, the
+      # executable, lsb_release, is in the list of required binaries in
+      # install_common_os_packages.
+      install_packages_if_missing "lsb-release"
+    fi
+
+    if [ -e /etc/redhat-release ]; then
+      on_redhat_or_derivative=1
+      install_packages_if_missing "redhat-lsb"
     fi
 
-    # chicken and the egg problem, we need lsb_release to install the
-    # packages later on, hence as soon as we know we've got a Debian
-    # based platform, we install lsb-release. Also note, the
-    # executable, lsb_release, is in the list of required binaries in
-    # install_common_os_packages.
-    install_packages_if_missing "lsb-release"
+    assert_pre_requisite lsb_release
     
     if [ $(lsb_release -i | grep Ubuntu | wc -l) -gt 0 ]; then
         on_ubuntu=1
@@ -1785,9 +1804,9 @@ function common_pre_install()
     fi
 
     make_dir $download_dir
-    install_common_os_packages_p
+    install_common_os_packages
     create_user_and_group_if_not_present $ece_user $ece_group
-    set_up_user_environment_p
+    set_up_user_environment
 }
 
 function add_apt_source()
@@ -1832,10 +1851,7 @@ function install_cache_server()
         add_apt_source "deb http://repo.varnish-cache.org/ubuntu/ $(lsb_release -s -c) varnish-3.0"
     fi
 
-    if [ $on_debian_or_derivative -eq 1 ]; then
-        apt-get -y install varnish 1>>$log 2>>$log
-    fi
-
+    install_packages_if_missing varnish
     assert_pre_requisite varnishd
 
     if [ $fai_enabled -eq 0 ]; then
@@ -1877,7 +1893,7 @@ function install_database_server()
 {
     print_and_log "Installing the database server on $HOSTNAME ..."
 
-    source /usr/sbin/drop-and-create-ecedb
+    source $(dirname $0)/drop-and-create-ecedb
 
     if [ $on_debian_or_derivative -eq 1 ]; then
 
@@ -1935,8 +1951,16 @@ function install_database_server()
             print_and_log "I will use vanilla MySQL instead."
 
             packages="mysql-server mysql-client"
-            install_packages_if_missing $packages
         fi
+    elif [ $on_redhat_or_derivative -eq 1 ]; then
+      packages="mysql mysql-server"
+    fi
+    
+    install_packages_if_missing $packages
+
+    if [ $on_redhat_or_derivative -eq 1 ]; then
+      run chkconfig --level 35 mysqld on
+      run /etc/init.d/mysqld start
     fi
 
     assert_pre_requisite mysql
@@ -2122,7 +2146,7 @@ function install_ece_instance()
 
     if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER -a \
         $install_profile_number -ne $PROFILE_SEARCH_SERVER ]; then
-        assemble_deploy_and_restart_type_p
+        assemble_deploy_and_restart_type
     fi
     
     update_type_instances_to_start_up
@@ -2185,7 +2209,7 @@ function install_presentation_server()
 
 function assemble_deploy_and_restart_type()
 {
-    log "Assembling, deploying & starting $instance_name ..."
+    print_and_log "Assembling, deploying & starting $instance_name ..."
     
     set_correct_permissions
 
@@ -2937,7 +2961,7 @@ function add_server_to_runlevels()
 "run levels." 
         # TODO add init.d to the default runlevels, for other
         # distributions too:
-        # - RedHat/chekcconfig
+        # - RedHat/chekcconfig  chkconfig --level 35 ece on
         # - Gentoo: rc-update add ece default
     fi
 }

From c4f9494e23c4dfa9ce924bf34c50840c80c5e513 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 23 Feb 2012 17:48:30 +0800
Subject: [PATCH 0317/2585] - removed one pulse and a return code check which
 for some reason   didn't return a number .

---
 usr/sbin/ece-install | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 799a2790..07e40592 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -411,7 +411,6 @@ function set_up_ece_scripts()
       run cd ece-scripts
       run git pull
     )
-    if [ $! -eq 1 ]; then echo $!; return 1; fi
   else
     run git clone $ece_scripts_git_source
   fi
@@ -2111,7 +2110,7 @@ function install_ece_instance()
     
     ask_for_instance_name $1
     set_up_engine_directories
-    set_up_ece_scripts_p
+    set_up_ece_scripts
 
     set_archive_files_depending_on_profile
     

From 9696a74c34e37431007075df888d029a77569c49 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 23 Feb 2012 18:10:15 +0800
Subject: [PATCH 0318/2585] - user friendliness: if java_home isn't set, "ece
 clean" and other   commands indirectly using java will fail. For "ece  
 start/stop/restart" this is more visible, but for "ece clean" it is   not,
 here ece will just complain that ant failed.

  Now ece will complain if the java_home is set to an invalid value:

  [ece#engine-dev1] java_home /usr/lib/jvm/java-1.6.0. doesn't exist
  [ece#engine-dev1] check your setting in /etc/escenic/ece-dev1.conf
  /etc/escenic/ece.conf

  This should help debugging and installation a *lot* easier :-)
---
 usr/bin/ece | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/usr/bin/ece b/usr/bin/ece
index 0febad76..66a48c9b 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -464,6 +464,16 @@ function sanity_check()
             exit 1
         fi
     fi
+
+    # verifies that java_home exists and has the java executable
+    if [ ! -d $java_home ]; then
+        print "java_home $java_home doesn't exist"
+        print "check your setting in ${ece_conf_files_read[@]}"
+        exit 1
+    elif [ ! -x $java_home/bin/java ]; then
+        print "$java_home/bin/java isn't executable for $ece_user"
+        exit 1
+    fi
 }
 
 function deploy()

From 3ced2363365e90013f7cfcfc2cbaf6e6efa0fe73 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 23 Feb 2012 18:16:15 +0800
Subject: [PATCH 0319/2585] - a tad more logical feedback string

---
 usr/bin/ece | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 66a48c9b..49368ff2 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -468,7 +468,7 @@ function sanity_check()
     # verifies that java_home exists and has the java executable
     if [ ! -d $java_home ]; then
         print "java_home $java_home doesn't exist"
-        print "check your setting in ${ece_conf_files_read[@]}"
+        print "check your setting in one of: ${ece_conf_files_read[@]}"
         exit 1
     elif [ ! -x $java_home/bin/java ]; then
         print "$java_home/bin/java isn't executable for $ece_user"

From 6f34a72d9755a1e9619100448e1268de4ad16669 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 24 Feb 2012 12:01:48 +0800
Subject: [PATCH 0320/2585] - fix: ece-install now updates the java_home
 variable in the global   ece.conf, this means that the user can override the
 java_home   variable in his/her ece-install.conf.

---
 usr/sbin/ece-install | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 07e40592..8c71f57a 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -428,6 +428,7 @@ function set_up_ece_scripts()
   set_conf_file_value ece_home ${escenic_root_dir}/engine ${file}
   set_conf_file_value escenic_conf_dir ${escenic_conf_dir} ${file}
   set_conf_file_value heap_dump_dir ${escenic_crash_dir} ${file}
+  set_conf_file_value java_home ${java_home} ${file}
   set_conf_file_value log_dir ${escenic_log_dir} ${file}
   set_conf_file_value pid_dir ${escenic_run_dir} ${file}
   set_conf_file_value rmi_hub_conf ${escenic_conf_dir}/rmi-hub ${file}

From 41bae8f7ea6cba22fe3449988cf435b2e0e862d6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 24 Feb 2012 14:23:19 +0800
Subject: [PATCH 0321/2585] - new feature: it's possible to say that munin and
 nagios node/client   setup should be skipped with two new FAI parameters:

  fai_monitoring_node_munin_skip=1
  fai_monitoring_node_nagios_skip=1

  As the settings suggest, this will apply to all nodes, regardless of
  installation profile.

- non-Debian systems: nagios node will not be installed (or for the
  time being) nor attempted to configure. The user is simply told that
  he/she has to do this manually.
---
 usr/sbin/ece-install | 47 +++++++++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 8c71f57a..a4aa2362 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -2827,9 +2827,13 @@ EOF
 
 function install_nagios_node()
 {
-    print "Installing an icinga client on $HOSTNAME ..."
+    print "Installing a Nagios client on $HOSTNAME ..."
     if [ $on_debian_or_derivative -eq 1 ]; then
         install_packages_if_missing nagios-nrpe-server nagios-plugins
+    else
+      print_and_log "Nagios node installation not supported on your system"
+      print_and_log "You will have to install it manually."
+      return
     fi
     
     local file=/etc/nagios/nrpe.cfg
@@ -3217,29 +3221,32 @@ function install_monitoring_server()
     create_monitoring_server_overview $nagios_flavour
 }
 
-function common_post_install()
-{
-    if [ $install_profile_number -eq $PROFILE_ALL_IN_ONE -o \
-        $install_profile_number -eq $PROFILE_PRESENTATION_SERVER -o \
-        $install_profile_number -eq $PROFILE_RMI_HUB -o \
-        $install_profile_number -eq $PROFILE_EDITORIAL_SERVER ]; then
-        add_server_to_runlevels
-    fi
+function common_post_install() {
+  if [ $install_profile_number -eq $PROFILE_ALL_IN_ONE -o \
+    $install_profile_number -eq $PROFILE_PRESENTATION_SERVER -o \
+    $install_profile_number -eq $PROFILE_RMI_HUB -o \
+    $install_profile_number -eq $PROFILE_EDITORIAL_SERVER ]; then
+    add_server_to_runlevels
+  fi
 
-    if [ $install_profile_number -ne $PROFILE_WIDGET_FRAMEWORK -a \
-        $install_profile_number -ne $PROFILE_CREATE_PUBLICATION -a \
-        $install_profile_number -ne $PROFILE_RESTORE_FROM_BACKUP ]; then
-        install_munin_node
+  if [ $install_profile_number -ne $PROFILE_WIDGET_FRAMEWORK -a \
+    $install_profile_number -ne $PROFILE_CREATE_PUBLICATION -a \
+    $install_profile_number -ne $PROFILE_RESTORE_FROM_BACKUP ]; then
 
-        if [ $install_profile_number -ne $PROFILE_MONITORING_SERVER ]; then
-            install_nagios_node
-        fi
+    if [[ "${fai_monitoring_node_munin_skip}" != "1" ]]; then
+      install_munin_node
     fi
 
-    set_correct_permissions
-    
-    print_status_and_next_steps
-    rm $pid_file
+    if [[ $install_profile_number != $PROFILE_MONITORING_SERVER &&
+          "${fai_monitoring_node_nagios_skip}" != "1" ]]; then
+      install_nagios_node
+    fi
+  fi
+
+  set_correct_permissions
+  
+  print_status_and_next_steps
+  run rm $pid_file
 }
 
 for el in $@; do

From e8a9fcfa4178641613c76d89c896602859defc83 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 24 Feb 2012 14:43:31 +0800
Subject: [PATCH 0322/2585] - removed shebang

---
 usr/share/escenic/ece-scripts/ece-install.d/memcached.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/memcached.sh b/usr/share/escenic/ece-scripts/ece-install.d/memcached.sh
index 9f4baa51..03da73db 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/memcached.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/memcached.sh
@@ -1,7 +1,3 @@
-#! /usr/bin/env bash
-
-# by tkj@vizrt.com
-
 memcached_java_lib_url=http://img.whalin.com/memcached/jdk5/log4j/java_memcached-release_2.0.1.tar.gz
 
 ## $1: root directory of the publication

From 3c4b2283fab98d9e865683e603c165d049fa2882 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 24 Feb 2012 15:15:34 +0800
Subject: [PATCH 0323/2585] - moved install_cache_server and set_up_varnish to 
  ece-install.d/cache-server.sh

---
 .../ece-scripts/ece-install.d/cache-server.sh | 193 ++++++++++++++++++
 1 file changed, 193 insertions(+)
 create mode 100644 usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
new file mode 100644
index 00000000..642e2d6e
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
@@ -0,0 +1,193 @@
+function install_cache_server()
+{
+    print_and_log "Installing a caching server on $HOSTNAME ..."
+
+    if [[ $on_debian_or_derivative -eq 1 &&
+          $(apt-key list | grep varnish-software.com | wc -l) -eq 0 ]]; then
+        curl ${curl_opts} \
+            http://repo.varnish-cache.org/debian/GPG-key.txt \
+            2>> $log | \
+            apt-key add - \
+            1>>$log 2>>$log
+        run apt-get update
+    fi
+
+    code_name=$(lsb_release -s -c)
+    
+    supported_code_name=0
+    # list taken from http://repo.varnish-cache.org/debian/dists/
+    supported_list="lenny squeeze hardy lucid"
+    for el in $supported_list; do
+        if [ $code_name = $el ]; then
+            supported_code_name=1
+        fi
+    done
+    
+    if [ $supported_code_name -eq 1 -a $on_debian -eq 1 ]; then
+        add_apt_source "deb http://repo.varnish-cache.org/debian/ $(lsb_release -s -c) varnish-3.0"
+    elif [ $supported_code_name -eq 1 -a $on_ubuntu -eq 1 ]; then
+        add_apt_source "deb http://repo.varnish-cache.org/ubuntu/ $(lsb_release -s -c) varnish-3.0"
+    fi
+
+    install_packages_if_missing varnish
+    assert_pre_requisite varnishd
+
+    if [ $fai_enabled -eq 0 ]; then
+        print "You must now list your backend servers."
+        print "Seperate the entries with a space. e.g.: app1:8080 app2:8080."
+        print "Press ENTER to accept the default: ${HOSTNAME}:${appserver_port}"
+        echo -n "Your choice [${HOSTNAME}:${appserver_port}]> "
+        read backend_servers
+    else
+        backend_servers=${fai_cache_backends}
+    fi
+
+    if [ -z "$backend_servers" ]; then
+        backend_servers="${HOSTNAME}:${appserver_port}"
+    fi
+
+    set_up_varnish $backend_servers
+
+    add_next_step "Cache server is up and running at http://${HOSTNAME}:80/"
+}
+
+function set_up_varnish()
+{
+    print_and_log "Setting up Varnish to match your environment ..."
+    run /etc/init.d/varnish stop
+
+    # we need to swap standard err and standard out here as varnishd
+    # -V for some reason writes to standard error.
+    using_varnish_3=$(varnishd -V 3>&1 1>&2 2>&3 | grep varnish-3 | wc -l)
+    
+    local file=/etc/default/varnish
+    sed -i -e 's/6081/80/g' -e 's/^START=no$/START=yes/' $file
+    exit_on_error "sed on $file"
+
+    cat > /etc/varnish/default.vcl <<EOF
+/* Varnish configuration for Escenic Content Engine              -*- java -*- */
+
+/* IPs that are allowed to access the administrative pages/webapps. */
+acl staff {
+  "localhost";
+EOF
+    for l in $(get_privileged_hosts); do
+        cat >> /etc/varnish/default.vcl <<EOF
+  # Privileged host (either doing the ece-install or listed as such)
+  "${l}";
+EOF
+    done
+    
+    cat >> /etc/varnish/default.vcl <<EOF
+}
+
+/* The IP of the Adactus/Mobilize server */
+acl adactus {
+  "203.33.232.216";
+}
+
+/* Our web server for serving static content */
+backend static {
+  .host = "localhost";
+  .port = "81";
+}
+
+EOF
+    for el in $backend_servers; do
+        appserver_id=$(echo $el | cut -d':' -f1 | sed 's/-/_/g')
+        appserver_host=$(echo $el | cut -d':' -f1)
+        appserver_port=$(echo $el | cut -d':' -f2)
+
+        cat >> /etc/varnish/default.vcl <<EOF
+backend $appserver_id {
+  .host = "$appserver_host";
+  .port = "$appserver_port";
+}
+
+EOF
+    done
+
+    cat >> /etc/varnish/default.vcl <<EOF
+/* The client director gives us session stickiness based on client
+ * IP. */
+director webdirector client {
+EOF
+    for el in $backend_servers; do
+	      appserver_id=$(echo $el | cut -d':' -f1 | sed 's/-/_/g' )        
+        cat >> /etc/varnish/default.vcl <<EOF
+  {
+     .backend = $appserver_id;
+     .weight = 1;
+  }
+EOF
+    done
+
+    cat >> /etc/varnish/default.vcl <<EOF
+}
+
+sub vcl_recv {
+  if (!client.ip ~ staff &&
+      (req.url ~ "^/escenic" ||
+       req.url ~ "^/studio" ||
+       req.url ~ "^/munin" ||
+       req.url ~ "^/webservice" ||
+       req.url ~ "^/escenic-admin")) {
+     error 405 "Not allowed.";
+  }
+
+  /* Only Adactus/Mobilize is allowed to access the /binary context
+   * which contains all the full quality video files. */
+  if (!client.ip ~ adactus && req.url ~ "^/binary") {
+    error 405 "Not allowed.";
+  }
+
+  if (req.url ~ "^/munin") {
+    set req.url = regsub(req.url, "^/munin", "/");
+    set req.backend = static;
+  }
+  else {
+    set req.backend = webdirector;
+  }
+
+  if (req.url ~ "\.(png|gif|jpg|css|js)$" || req.url == "/favicon.ico") { 
+    remove req.http.Cookie;
+  }
+}
+
+ /* Called when content is fetched from the backend. */
+sub vcl_fetch {
+  /* Remove cookies from these resource types and cache them for a
+   * long time */
+  if (req.url ~ "\.(png|gif|jpg|css|js)$" || req.url == "/favicon.ico") { 
+    set beresp.ttl = 5h;
+    remove beresp.http.Set-Cookie;
+  }
+}
+
+sub vcl_deliver {
+  /* Adds debug header to the result so that we can easily see if a
+   * URL has been fetched from cache or not.
+   */
+  if (obj.hits > 0) {
+EOF
+    if [ $using_varnish_3 -gt 0 ]; then
+        cat >> /etc/varnish/default.vcl <<EOF
+    set resp.http.X-Cache = "HIT #" + obj.hits;
+EOF
+    else
+        cat >> /etc/varnish/default.vcl <<EOF
+    set resp.http.X-Cache = "HIT #" obj.hits;
+EOF
+    fi
+    
+    cat >> /etc/varnish/default.vcl <<EOF
+  }
+  else {
+    set resp.http.X-Cache = "MISS";
+  }
+
+  set resp.http.X-Cache-Backend = req.backend;
+}
+EOF
+    run /etc/init.d/varnish start
+}

From cc449d4c5e8a9b4fa679029c9ed5c0f60f896d6d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 24 Feb 2012 15:18:48 +0800
Subject: [PATCH 0324/2585] - moved all cache server related code to
 ece-install.d/cache-server.sh - added loading of ece-install.d modules and
 common libraries to new   method, init() - clean-up/faster install on Debian
 based systems:   * will not fetch and add the varnish APT key if already
 exists     in the local key ring.   * will not add the varnish APT source to
 escenic.list if already     exists in sources.list

---
 usr/sbin/ece-install | 242 +++++++------------------------------------
 1 file changed, 35 insertions(+), 207 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index a4aa2362..ee689c14 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -108,14 +108,33 @@ PROFILE_MONITORING_SERVER=10
 PROFILE_RESTORE_FROM_BACKUP=11
 PROFILE_ANALYSIS_SERVER=12
 
-######################################################################
-# Load common BASH libraries
-######################################################################
-common_libraries="common-bashing.sh common-pulse.sh common-io.sh common-os.sh"
-for el in $common_libraries; do
-  source $(dirname $0)/../share/escenic/ece-scripts/${el} || \
-    (echo "Could not find $el"; exit 1)
-done
+## Bootstrapping, load files from /usr/share/escenic/ece-scripts The
+## method will first try to be smart, in case the user has copied the
+## ece-scripts somewhere else., e.g.: moved everything to ~/ece-scrpts
+## or /opt/escenic/ece-scripts, this should also work.
+function init() {
+  # first, try to be nice
+  local dir=$(dirname $0)/../share/escenic/ece-scripts
+
+  # then check the standard location
+  if [ ! -d $dir  ]; then
+    dir=/usr/share/escenic/ece-scripts
+  fi
+
+  if [ -d $dir ]; then
+    # load common librariees
+    common_libraries="common-bashing.sh common-pulse.sh common-io.sh common-os.sh"
+    for el in $common_libraries; do
+      source $dir/${el}
+    done
+
+    # load ece-install modules
+    source $dir/ece-install.d/*.sh
+  else
+    echo "I cannot find $(basename $0)'s dependencies, exiting :-("
+    exit 1
+  fi
+}
 
 function set_up_engine_directories()
 {
@@ -1292,7 +1311,7 @@ function print_status_and_next_steps()
     seconds_left=$(( seconds_left - $minutes * 60 ))
 
     if [ $install_profile_number -ne $PROFILE_RESTORE_FROM_BACKUP ]; then
-        s="The installation is now complete!"
+        s="The installation is now $(green complete)!"
     else
         s="The restore is now complete!"
     fi
@@ -1539,147 +1558,6 @@ function get_privileged_hosts() {
   echo ${privileged_hosts}
 }
 
-function set_up_varnish()
-{
-    print_and_log "Setting up Varnish to match your environment ..."
-    run /etc/init.d/varnish stop
-
-    # we need to swap standard err and standard out here as varnishd
-    # -V for some reason writes to standard error.
-    using_varnish_3=$(varnishd -V 3>&1 1>&2 2>&3 | grep varnish-3 | wc -l)
-    
-    local file=/etc/default/varnish
-    sed -i -e 's/6081/80/g' -e 's/^START=no$/START=yes/' $file
-    exit_on_error "sed on $file"
-
-    cat > /etc/varnish/default.vcl <<EOF
-/* Varnish configuration for Escenic Content Engine              -*- java -*- */
-
-/* IPs that are allowed to access the administrative pages/webapps. */
-acl staff {
-  "localhost";
-EOF
-    for l in $(get_privileged_hosts); do
-        cat >> /etc/varnish/default.vcl <<EOF
-  # Privileged host (either doing the ece-install or listed as such)
-  "${l}";
-EOF
-    done
-    
-    cat >> /etc/varnish/default.vcl <<EOF
-}
-
-/* The IP of the Adactus/Mobilize server */
-acl adactus {
-  "203.33.232.216";
-}
-
-/* Our web server for serving static content */
-backend static {
-  .host = "localhost";
-  .port = "81";
-}
-
-EOF
-    for el in $backend_servers; do
-        appserver_id=$(echo $el | cut -d':' -f1 | sed 's/-/_/g')
-        appserver_host=$(echo $el | cut -d':' -f1)
-        appserver_port=$(echo $el | cut -d':' -f2)
-
-        cat >> /etc/varnish/default.vcl <<EOF
-backend $appserver_id {
-  .host = "$appserver_host";
-  .port = "$appserver_port";
-}
-
-EOF
-    done
-
-    cat >> /etc/varnish/default.vcl <<EOF
-/* The client director gives us session stickiness based on client
- * IP. */
-director webdirector client {
-EOF
-    for el in $backend_servers; do
-	      appserver_id=$(echo $el | cut -d':' -f1 | sed 's/-/_/g' )        
-        cat >> /etc/varnish/default.vcl <<EOF
-  {
-     .backend = $appserver_id;
-     .weight = 1;
-  }
-EOF
-    done
-
-    cat >> /etc/varnish/default.vcl <<EOF
-}
-
-sub vcl_recv {
-  if (!client.ip ~ staff &&
-      (req.url ~ "^/escenic" ||
-       req.url ~ "^/studio" ||
-       req.url ~ "^/munin" ||
-       req.url ~ "^/webservice" ||
-       req.url ~ "^/escenic-admin")) {
-     error 405 "Not allowed.";
-  }
-
-  /* Only Adactus/Mobilize is allowed to access the /binary context
-   * which contains all the full quality video files. */
-  if (!client.ip ~ adactus && req.url ~ "^/binary") {
-    error 405 "Not allowed.";
-  }
-
-  if (req.url ~ "^/munin") {
-    set req.url = regsub(req.url, "^/munin", "/");
-    set req.backend = static;
-  }
-  else {
-    set req.backend = webdirector;
-  }
-
-  if (req.url ~ "\.(png|gif|jpg|css|js)$" || req.url == "/favicon.ico") { 
-    remove req.http.Cookie;
-  }
-}
-
- /* Called when content is fetched from the backend. */
-sub vcl_fetch {
-  /* Remove cookies from these resource types and cache them for a
-   * long time */
-  if (req.url ~ "\.(png|gif|jpg|css|js)$" || req.url == "/favicon.ico") { 
-    set beresp.ttl = 5h;
-    remove beresp.http.Set-Cookie;
-  }
-}
-
-sub vcl_deliver {
-  /* Adds debug header to the result so that we can easily see if a
-   * URL has been fetched from cache or not.
-   */
-  if (obj.hits > 0) {
-EOF
-    if [ $using_varnish_3 -gt 0 ]; then
-        cat >> /etc/varnish/default.vcl <<EOF
-    set resp.http.X-Cache = "HIT #" + obj.hits;
-EOF
-    else
-        cat >> /etc/varnish/default.vcl <<EOF
-    set resp.http.X-Cache = "HIT #" obj.hits;
-EOF
-    fi
-    
-    cat >> /etc/varnish/default.vcl <<EOF
-  }
-  else {
-    set resp.http.X-Cache = "MISS";
-  }
-
-  set resp.http.X-Cache-Backend = req.backend;
-}
-EOF
-    run /etc/init.d/varnish start
-}
-
 function read_user_input()
 {
     installation_profiles=(
@@ -1812,7 +1690,8 @@ function common_pre_install()
 function add_apt_source()
 {
     escenic_sources=/etc/apt/sources.list.d/escenic.list
-    if [ ! -e $escenic_sources ]; then
+    if [[ ! -e $escenic_sources &&
+          $(grep "$@" /etc/apt/sources.list | wc -l) -lt 1 ]]; then
         echo "$@" >> $escenic_sources
         run apt-get update
     elif [ $(grep "$@" $escenic_sources | wc -l) -lt 1 ]; then
@@ -1821,58 +1700,6 @@ function add_apt_source()
     fi
 }
 
-function install_cache_server()
-{
-    print_and_log "Installing a caching server on $HOSTNAME ..."
-
-    if [ $on_debian_or_derivative -eq 1 ]; then
-        curl ${curl_opts} \
-            http://repo.varnish-cache.org/debian/GPG-key.txt \
-            2>> $log | \
-            apt-key add - \
-            1>>$log 2>>$log
-        run apt-get update
-    fi
-
-    code_name=$(lsb_release -s -c)
-    
-    supported_code_name=0
-    # list taken from http://repo.varnish-cache.org/debian/dists/
-    supported_list="lenny squeeze hardy lucid"
-    for el in $supported_list; do
-        if [ $code_name = $el ]; then
-            supported_code_name=1
-        fi
-    done
-    
-    if [ $supported_code_name -eq 1 -a $on_debian -eq 1 ]; then
-        add_apt_source "deb http://repo.varnish-cache.org/debian/ $(lsb_release -s -c) varnish-3.0"
-    elif [ $supported_code_name -eq 1 -a $on_ubuntu -eq 1 ]; then
-        add_apt_source "deb http://repo.varnish-cache.org/ubuntu/ $(lsb_release -s -c) varnish-3.0"
-    fi
-
-    install_packages_if_missing varnish
-    assert_pre_requisite varnishd
-
-    if [ $fai_enabled -eq 0 ]; then
-        print "You must now list your backend servers."
-        print "Seperate the entries with a space. e.g.: app1:8080 app2:8080."
-        print "Press ENTER to accept the default: ${HOSTNAME}:${appserver_port}"
-        echo -n "Your choice [${HOSTNAME}:${appserver_port}]> "
-        read backend_servers
-    else
-        backend_servers=$(get_conf_value fai_cache_backends)
-    fi
-
-    if [ -z "$backend_servers" ]; then
-        backend_servers="${HOSTNAME}:${appserver_port}"
-    fi
-
-    set_up_varnish $backend_servers
-
-    add_next_step "Cache server is up and running at http://${HOSTNAME}:80/"
-}
-
 # Parameters:
 # $1 : your added line
 function add_next_step()
@@ -3089,14 +2916,14 @@ function restore_from_backup()
         gunzip < $sql_file | mysql $db_schema
         exit_on_error "restoring from $sql_file"
         
-        add_next_step "Successfully restored DB from $(basename $sql_file)"
+        add_next_step "$(green Successfully) restored DB from $sql_file"
     fi
     
     if [ $restore_data_files -eq 1 -o $restore_all -eq 1 ]; then
         print_and_log "Restoring the Solr & ECE data files on $HOSTNAME ..."
         run cd $dir
         run tar -C / -xf $backup_file var/lib/escenic
-        add_next_step "Successfully restored Solr & ECE data files"
+        add_next_step "$(green Successfully) restored Solr & ECE data files"
         add_next_step "Backup file used:  $(basename $backup_file)"
         add_next_step "Check $escenic_data_dir to verify they're all there."
     fi
@@ -3105,7 +2932,7 @@ function restore_from_backup()
         print_and_log "Restoring the ECE configuration files on $HOSTNAME ..."
         run cd $dir
         run tar -C / -xf $backup_file etc
-        add_next_step "Successfully restored ECE configuration files"
+        add_next_step "$(green Successfully) restored ECE configuration files"
         add_next_step "Backup file used: $(basename $backup_file)"
         add_next_step "Check /etc to verify that they're all there."
     fi
@@ -3114,7 +2941,7 @@ function restore_from_backup()
         print_and_log "Restoring the Escenic & Tomcat binaries on $HOSTNAME ..."
         run cd $dir
         run tar -C / -xf $backup_file opt
-        add_next_step "Successfully restored Escenic & Tomcat binaries"
+        add_next_step "$(green Successfully) restored Escenic & Tomcat binaries"
         add_next_step "Backup file used: $(basename $backup_file)"
         add_next_step "Check ${appserver_parent_dir} to verify that they're all there".
         install_ece_third_party_packages
@@ -3268,6 +3095,7 @@ for el in $@; do
     fi
 done
 
+init
 assert_correct_runtime_environment
 
 fai_enabled=$(get_boolean_conf_value fai_enabled)

From 5f1780c40d3aab04e9085af33e809823cdda285d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 24 Feb 2012 15:24:03 +0800
Subject: [PATCH 0325/2585] - usability: added more help on giving input to
 ece-install when   installing the cache profile interactively:

  [ece-install-3] You must now list your backend servers.
  [ece-install-3] These must be host names (not IPs) and must all be resolvable
  [ece-install-3] by your cache host (quanah), preferably from /etc/hosts
  [ece-install-3] Seperate the entries with a space. e.g.: app1:8080 app2:8080.
  [ece-install-3] Press ENTER to accept the default: quanah:8080

  The reason why ece-install wants these as host names and not IPs, is
  that it'll use these both as the backend host definitions in
  Varnish, as well as the actual address of the backend. Since Varnish
  does not support backend names which start which looks like a
  number, or IP for that matter, we use the host name instead.

  To make it simple, we encourage having entries for all the other
  nodes, cache, app servers, db and so on, in the different hosts'
  /etc/hosts, hence the message above.
---
 usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
index 642e2d6e..d54319e3 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
@@ -34,6 +34,8 @@ function install_cache_server()
 
     if [ $fai_enabled -eq 0 ]; then
         print "You must now list your backend servers."
+        print "These must be host names (not IPs) and must all be resolvable"
+        print "by your cache host ($HOSTNAME), preferably from /etc/hosts"
         print "Seperate the entries with a space. e.g.: app1:8080 app2:8080."
         print "Press ENTER to accept the default: ${HOSTNAME}:${appserver_port}"
         echo -n "Your choice [${HOSTNAME}:${appserver_port}]> "

From 2fda9deaed340053bf861cf48e6d04bd5952acf1 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 24 Feb 2012 15:27:52 +0800
Subject: [PATCH 0326/2585] - regression: exists in error where hidden (because
 of the   introduction of pulse)

---
 usr/share/escenic/ece-scripts/common-bashing.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index 4af9492a..d963aec0 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -80,8 +80,8 @@ function remove_pid_and_exit_in_error() {
 
 function exit_on_error() {
   if [ $? -gt 0 ]; then
-    log "The command ["$@"] FAILED, exiting :-("
-    log "See $log for further details."
+    print_and_log "The command ["$@"] $(red FAILED), exiting :-("
+    print "See $log for further details."
     remove_pid_and_exit_in_error
   fi
 }

From 38be3fc41265190a5d7eeb268f5276f8732ab4c5 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 24 Feb 2012 15:28:48 +0800
Subject: [PATCH 0327/2585] - renamed memcached.sh -> memory-cache.sh to make
 it inline with the   rest of the modules; using general names for what the
 components   actually are, refraining from getting locked down to  
 vendor/product.

---
 .../ece-scripts/ece-install.d/memory-cache.sh | 88 +++++++++++++++++++
 1 file changed, 88 insertions(+)
 create mode 100644 usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh b/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
new file mode 100644
index 00000000..03da73db
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
@@ -0,0 +1,88 @@
+memcached_java_lib_url=http://img.whalin.com/memcached/jdk5/log4j/java_memcached-release_2.0.1.tar.gz
+
+## $1: root directory of the publication
+function memcached_create_publication_nursery_component() {
+  if [ ! -d "$1" ]; then
+    log $1 "doesn't exist"
+    return
+  fi
+
+  log "Adding memcached wrapper to PresenationArticle in $1 ..."
+  local dir=$1/webapp/WEB-INF/localconfig/neo/xredsys/presentation/cache
+  make_dir $dir
+  local file=$dir/PresentationArticleCache.properties
+  sed -i "s#\$class=.*#\$class=neo.util.cache.Memcached#g" $file
+}
+
+function install_memcached()
+{
+  if [ $on_debian_or_derivative ]; then
+    install_packages_if_missing "memcached"
+  fi
+  
+  run $download_dir
+  run wget $wget_opts $memcached_java_lib_url
+  local name=$(get_base_dir_from_bundle $memcached_java_lib_url)
+  run cp $name/$name.jar $assemblytool_home/lib
+  
+  memcached_set_up_common_nursery
+  
+  log "Configuring all publications for using memcached ..."
+  for el in $assemblytool_home/publications/*.properties 2>/dev/null; do
+    local publication=$(basename $el .properties)
+    
+    if [[ $appserver == "tomcat" ]]; then
+      dir=$tomcat_base/webapps/$publication
+      make_dir $dir
+      memcached_create_publication_nursery_component $dir
+    fi
+  done
+  
+  # fixing the deployed publications on host
+  if [[ $appserver == "tomcat" ]]; then
+    for el in $(
+      find $tomcat_base/webapps/ \
+        -mindepth 1 \
+        -maxdepth 1 \
+        -type d | \
+        egrep -v "solr|webservice|escenic|escenic-admin|indexer-webservice" | \
+        egrep -v "indexer-webapp|studio"
+    ); do
+      memcached_create_publication_nursery_component $el
+    done
+    
+  fi
+  
+  # TODO inform the user that he/she might want to do tihs in the
+  # publication tree as well.
+  assemble_deploy_and_restart_type_p
+}
+
+function memcached_set_up_common_nursery() {
+  local dir=$common_nursery_dir/com/danga
+  make_dir $dir
+  cat > $dir/SockIOPool <<EOF
+$class=com.danga.MemCached.SockIOPool
+# fill in memcached servers here.
+servers=${fai_memcached_node_list}
+
+# how many connections to use
+initConn = 10
+minConn = 5
+maxConn = 100
+# idle time
+maxIdle = 180000
+maintSleep = 5000
+# socket timeout
+socketTO = 3000
+failover = true
+# a network lookup algorithm
+nagle = false
+EOF
+
+  cat >> $common_nursery_dir/Initial.properties <<EOF
+
+# using memcached
+service.0.0-memcached-socket-pool=/com/danga/SockIOPool
+EOF
+}

From a58c5f35697d5293970440bbe9a6a69e37c26c10 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 24 Feb 2012 15:43:14 +0800
Subject: [PATCH 0328/2585] - since some versions of yum use --assume-yes and
 some use --assumeyes   (!) (yes, I know, don't get me started), we just use
 the short form   -y here.

---
 usr/sbin/ece-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index ee689c14..91bf4791 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -193,7 +193,7 @@ function install_packages_if_missing() {
       run apt-get install $apt_opts --assume-yes $@
     fi
   elif [ $on_redhat_or_derivative -eq 1 ]; then
-    run yum install --assumeyes $@
+    run yum install -y $@
   fi
 }
 

From 7a3deb692abd688f682c634122d4f1d68a65b79a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 24 Feb 2012 15:51:58 +0800
Subject: [PATCH 0329/2585] - git sometimes, for some reason fails to verify
 the SSL   certifacte of github, we thus turn off this checking.

---
 usr/sbin/ece-install | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 91bf4791..e0c8dae6 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -193,6 +193,8 @@ function install_packages_if_missing() {
       run apt-get install $apt_opts --assume-yes $@
     fi
   elif [ $on_redhat_or_derivative -eq 1 ]; then
+    # since some versions of yum use --assume-yes and some use
+    # --assumeyes (!), we use the short form, -y, here
     run yum install -y $@
   fi
 }
@@ -1681,6 +1683,10 @@ function common_pre_install()
         on_debian=1
     fi
 
+    # git sometimes, for some reason fails to verify the SSL
+    # certifacte of github.
+    export GIT_SSL_NO_VERIFY=true
+    
     make_dir $download_dir
     install_common_os_packages
     create_user_and_group_if_not_present $ece_user $ece_group

From ee2ec5d42d606049e16cbc41a51e98775a6a9475 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 24 Feb 2012 16:10:31 +0800
Subject: [PATCH 0330/2585] - removed use of pulses in install_ece_instance -
 clarified explanation for turning off git SSL checking

---
 usr/sbin/ece-install | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index e0c8dae6..1740aace 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -1683,8 +1683,9 @@ function common_pre_install()
         on_debian=1
     fi
 
-    # git sometimes, for some reason fails to verify the SSL
-    # certifacte of github.
+    # git will fail if curl doesn't have the right CA certificates
+    # installed. As this happens on RedHat/CentOS 5.7, we turn it off
+    # here.
     export GIT_SSL_NO_VERIFY=true
     
     make_dir $download_dir
@@ -1693,17 +1694,16 @@ function common_pre_install()
     set_up_user_environment
 }
 
-function add_apt_source()
-{
-    escenic_sources=/etc/apt/sources.list.d/escenic.list
-    if [[ ! -e $escenic_sources &&
-          $(grep "$@" /etc/apt/sources.list | wc -l) -lt 1 ]]; then
-        echo "$@" >> $escenic_sources
-        run apt-get update
-    elif [ $(grep "$@" $escenic_sources | wc -l) -lt 1 ]; then
-        echo "$@" >> $escenic_sources
-        run apt-get update
-    fi
+function add_apt_source() {
+  local escenic_sources=/etc/apt/sources.list.d/escenic.list
+  if [[ ! -e $escenic_sources &&
+        $(grep "$@" /etc/apt/sources.list | wc -l) -lt 1 ]]; then
+    echo "$@" >> $escenic_sources
+    run apt-get update
+  elif [ $(grep "$@" $escenic_sources | wc -l) -lt 1 ]; then
+    echo "$@" >> $escenic_sources
+    run apt-get update
+  fi
 }
 
 # Parameters:
@@ -1951,9 +1951,9 @@ function install_ece_instance()
     # most likely, the user is _not_ installing from archives (EAR +
     # configuration bundle), hence the false test goes first.
     if [ $(is_installing_from_ear) -eq 0 ]; then
-        download_escenic_components_p
-        check_for_required_downloads_p
-        set_up_engine_and_plugins_p
+        download_escenic_components
+        check_for_required_downloads
+        set_up_engine_and_plugins
         set_up_assembly_tool
     else
         verify_that_files_exist_and_are_readable \
@@ -1962,7 +1962,7 @@ function install_ece_instance()
     fi
     
     set_up_basic_nursery_configuration
-    set_up_instance_specific_nursery_configuration_p
+    set_up_instance_specific_nursery_configuration
     
     set_up_app_server
     set_up_proper_logging_configuration

From 4b4652e874251ab62e052eaec826f7e4d603d77c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 24 Feb 2012 16:31:08 +0800
Subject: [PATCH 0331/2585] - added constants file

---
 .../escenic/ece-scripts/ece-install.d/constants.sh  | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 usr/share/escenic/ece-scripts/ece-install.d/constants.sh

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/constants.sh b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
new file mode 100644
index 00000000..ec10854b
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
@@ -0,0 +1,13 @@
+PROFILE_ALL_IN_ONE=1
+PROFILE_CACHE_SERVER=5
+PROFILE_DB_SERVER=4
+PROFILE_EDITORIAL_SERVER=2
+PROFILE_PRESENTATION_SERVER=3
+PROFILE_RMI_HUB=6
+PROFILE_SEARCH_SERVER=7
+PROFILE_WIDGET_FRAMEWORK=8
+PROFILE_CREATE_PUBLICATION=9
+PROFILE_MONITORING_SERVER=10
+PROFILE_RESTORE_FROM_BACKUP=11
+PROFILE_ANALYSIS_SERVER=12
+

From 872ab81e65b6347be293afae2fb3c8a5d1f3dcf8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 24 Feb 2012 16:49:32 +0800
Subject: [PATCH 0332/2585] - started moving content-engine specific things to
 its own module

---
 .../ece-install.d/content-engine.sh           | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
new file mode 100644
index 00000000..b99be89f
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -0,0 +1,39 @@
+function get_deploy_white_list()
+{
+    local white_list="escenic-admin"
+    
+    if [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER \
+        -a -n "${publication_name}" ]; then
+        white_list="${white_list} ${publication_name} "
+    elif [ $install_profile_number -eq $PROFILE_SEARCH_SERVER ]; then 
+        white_list="${white_list} solr indexer-webapp"
+    elif [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ]; then
+        white_list="${white_list} "$(get_publication_short_name_list)
+    elif [ $install_profile_number -eq $PROFILE_EDITORIAL_SERVER ]; then
+        white_list="${white_list} escenic studio indexer-webservice"
+        white_list="${white_list} "$(get_publication_short_name_list)
+    fi
+
+    echo ${white_list}
+}
+
+function get_publication_short_name_list()
+{
+    local short_name_list=""
+    
+    local publication_def_dir=${escenic_root_dir}/assemblytool/publications
+    if [ $(ls ${publication_def_dir} | grep .properties$ | wc -l) -eq 0 ]; then
+        echo ${short_name_list}
+        return
+    fi
+
+    for el in $(find ${publication_def_dir} -name "*.properties"); do
+        local short_name=$(basename $el .properties)
+        short_name_list="${short_name_list} ${short_name}"
+    done
+
+    echo ${short_name_list}
+}
+
+
+

From f9621da4b241f1377b9e838c9867a165bf768bc0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 24 Feb 2012 16:50:19 +0800
Subject: [PATCH 0333/2585] - started moving content-engine specific things to
 its own module - moved constants to its own module

---
 usr/sbin/ece-install | 51 --------------------------------------------
 1 file changed, 51 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 1740aace..bb256dc7 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -90,24 +90,10 @@ http://technet.escenic.com/downloads/release/53/menu-editor-dist-2.0.6.0.zip
 http://technet.escenic.com/downloads/release/53/poll-2.1.3.0.zip
 http://technet.escenic.com/downloads/release/53/xml-editor-dist-2.1.0.0.zip
 "
-
 wf_download_list="
 http://technet.escenic.com/downloads/widget-framework/widget-framework-core-1.10.0.0.zip
 "
 
-PROFILE_ALL_IN_ONE=1
-PROFILE_CACHE_SERVER=5
-PROFILE_DB_SERVER=4
-PROFILE_EDITORIAL_SERVER=2
-PROFILE_PRESENTATION_SERVER=3
-PROFILE_RMI_HUB=6
-PROFILE_SEARCH_SERVER=7
-PROFILE_WIDGET_FRAMEWORK=8
-PROFILE_CREATE_PUBLICATION=9
-PROFILE_MONITORING_SERVER=10
-PROFILE_RESTORE_FROM_BACKUP=11
-PROFILE_ANALYSIS_SERVER=12
-
 ## Bootstrapping, load files from /usr/share/escenic/ece-scripts The
 ## method will first try to be smart, in case the user has copied the
 ## ece-scripts somewhere else., e.g.: moved everything to ~/ece-scrpts
@@ -1996,43 +1982,6 @@ function install_ece_instance()
     add_next_step "/etc/default/ece lists all instances started at boot time"
 }
 
-function get_publication_short_name_list()
-{
-    local short_name_list=""
-    
-    local publication_def_dir=${escenic_root_dir}/assemblytool/publications
-    if [ $(ls ${publication_def_dir} | grep .properties$ | wc -l) -eq 0 ]; then
-        echo ${short_name_list}
-        return
-    fi
-
-    for el in $(find ${publication_def_dir} -name "*.properties"); do
-        local short_name=$(basename $el .properties)
-        short_name_list="${short_name_list} ${short_name}"
-    done
-
-    echo ${short_name_list}
-}
-
-function get_deploy_white_list()
-{
-    local white_list="escenic-admin"
-    
-    if [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER \
-        -a -n "${publication_name}" ]; then
-        white_list="${white_list} ${publication_name} "
-    elif [ $install_profile_number -eq $PROFILE_SEARCH_SERVER ]; then 
-        white_list="${white_list} solr indexer-webapp"
-    elif [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ]; then
-        white_list="${white_list} "$(get_publication_short_name_list)
-    elif [ $install_profile_number -eq $PROFILE_EDITORIAL_SERVER ]; then
-        white_list="${white_list} escenic studio indexer-webservice"
-        white_list="${white_list} "$(get_publication_short_name_list)
-    fi
-
-    echo ${white_list}
-}
-
 function install_presentation_server()
 {
     print_and_log "Installing a presentation server on $HOSTNAME."

From 38b29a529762ca60e15fd28b6ab3fec4f696a22a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 24 Feb 2012 17:09:24 +0800
Subject: [PATCH 0334/2585] - TDD feels good! Wrote test before fixing  
 get_publication_short_name_list.

- fixed bug in get_publication_short_name_list, if you had .properties
  in sub directories of assemblytool/publications.
---
 .../test-ece-install-content-engine           | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 usr/local/src/unit-tests/test-ece-install-content-engine

diff --git a/usr/local/src/unit-tests/test-ece-install-content-engine b/usr/local/src/unit-tests/test-ece-install-content-engine
new file mode 100644
index 00000000..6537a253
--- /dev/null
+++ b/usr/local/src/unit-tests/test-ece-install-content-engine
@@ -0,0 +1,32 @@
+#! /usr/bin/env bash
+
+# by tkj@vizrt.com
+
+common_test_is_loaded > /dev/null 2>&1 || source common-test.sh
+
+# source ../../../share/escenic/ece-scripts/ece-install.d/constants.sh
+source ../../../share/escenic/ece-scripts/ece-install.d/content-engine.sh
+
+function test_get_publication_short_name_list() {
+  escenic_root_dir=$(mktemp -d)
+  local pub_dir=$escenic_root_dir/assemblytool/publications
+  mkdir -p $pub_dir
+  touch $pub_dir/{pub1,pub2}.properties
+
+  # a sub dir
+  mkdir -p $pub_dir/sub
+  touch $pub_dir/sub/{SomeNurseryComponent,SomeOtherNurseryComponent}.properties
+  
+  local short_name_list=$(get_publication_short_name_list | sed 's/\ //g')
+  assert_equals "should not include other .properties" "pub2pub1" $short_name_list
+
+  rm -rf $escenic_root_dir
+}
+
+test_suite="
+test_get_publication_short_name_list
+"
+
+run_test_suite $test_suite
+
+

From 43040d5cf1a6d8824fa164ca3a2f137bd9a2b3d3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 24 Feb 2012 17:09:41 +0800
Subject: [PATCH 0335/2585] - added

---
 usr/local/src/unit-tests/common-test.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 usr/local/src/unit-tests/common-test.sh

diff --git a/usr/local/src/unit-tests/common-test.sh b/usr/local/src/unit-tests/common-test.sh
new file mode 100644
index 00000000..3676d432
--- /dev/null
+++ b/usr/local/src/unit-tests/common-test.sh
@@ -0,0 +1,14 @@
+#! /usr/bin/env bash
+
+# by tkj@vizrt.com
+
+if [ ! -e bash_unit ]; then
+  wget --quiet https://raw.github.com/skybert/my-little-friends/master/bash/bash_unit
+fi
+
+source bash_unit
+
+function common_test_is_loaded() {
+  echo 1
+}
+

From a0c093f22461e105cf4797ed8fb7bda517670794 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 24 Feb 2012 17:11:02 +0800
Subject: [PATCH 0336/2585] - dynamically fetches test & common libraries from
 my-little-friends

---
 usr/local/src/unit-tests/common-test.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/usr/local/src/unit-tests/common-test.sh b/usr/local/src/unit-tests/common-test.sh
index 3676d432..76de94c9 100644
--- a/usr/local/src/unit-tests/common-test.sh
+++ b/usr/local/src/unit-tests/common-test.sh
@@ -5,6 +5,9 @@
 if [ ! -e bash_unit ]; then
   wget --quiet https://raw.github.com/skybert/my-little-friends/master/bash/bash_unit
 fi
+if [ ! -e alexandria ]; then
+  wget --quiet https://raw.github.com/skybert/my-little-friends/master/bash/alexandria
+fi
 
 source bash_unit
 

From 373b1becb315a7d611a4daea6ce0248916a719e1 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 24 Feb 2012 17:13:09 +0800
Subject: [PATCH 0337/2585] - bug fix: fix in get_publication_short_name_list,
 which again would   manifest itself when calling get_deploy_white_list for
 building up   the deploy white list property in ece-<instance>.conf

  The bug was that get_publication_short_name_list would think
  .properties files in sub folders of assemblytool/publications would
  be taken for publication definitions.
---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index b99be89f..28f2c0b2 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -27,7 +27,7 @@ function get_publication_short_name_list()
         return
     fi
 
-    for el in $(find ${publication_def_dir} -name "*.properties"); do
+    for el in $(find ${publication_def_dir} -maxdepth 1 -name "*.properties"); do
         local short_name=$(basename $el .properties)
         short_name_list="${short_name_list} ${short_name}"
     done

From e8f9e9125ceda28b09a322f3702b64f077b498e5 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 24 Feb 2012 17:25:18 +0800
Subject: [PATCH 0338/2585] - fixed bug in memory-cache.sh (2>/dev/null which
 didn't make any   sense, made a source fail.)

---
 usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh b/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
index 03da73db..44bc6a57 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
@@ -28,7 +28,7 @@ function install_memcached()
   memcached_set_up_common_nursery
   
   log "Configuring all publications for using memcached ..."
-  for el in $assemblytool_home/publications/*.properties 2>/dev/null; do
+  for el in $assemblytool_home/publications/*.properties; do
     local publication=$(basename $el .properties)
     
     if [[ $appserver == "tomcat" ]]; then

From b54b5fde7d084026614ed005ab5a0c4e847efe2b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 24 Feb 2012 17:26:26 +0800
Subject: [PATCH 0339/2585] - renamed

---
 .../ece-scripts/ece-install.d/memcached.sh    | 88 -------------------
 1 file changed, 88 deletions(-)
 delete mode 100644 usr/share/escenic/ece-scripts/ece-install.d/memcached.sh

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/memcached.sh b/usr/share/escenic/ece-scripts/ece-install.d/memcached.sh
deleted file mode 100644
index 03da73db..00000000
--- a/usr/share/escenic/ece-scripts/ece-install.d/memcached.sh
+++ /dev/null
@@ -1,88 +0,0 @@
-memcached_java_lib_url=http://img.whalin.com/memcached/jdk5/log4j/java_memcached-release_2.0.1.tar.gz
-
-## $1: root directory of the publication
-function memcached_create_publication_nursery_component() {
-  if [ ! -d "$1" ]; then
-    log $1 "doesn't exist"
-    return
-  fi
-
-  log "Adding memcached wrapper to PresenationArticle in $1 ..."
-  local dir=$1/webapp/WEB-INF/localconfig/neo/xredsys/presentation/cache
-  make_dir $dir
-  local file=$dir/PresentationArticleCache.properties
-  sed -i "s#\$class=.*#\$class=neo.util.cache.Memcached#g" $file
-}
-
-function install_memcached()
-{
-  if [ $on_debian_or_derivative ]; then
-    install_packages_if_missing "memcached"
-  fi
-  
-  run $download_dir
-  run wget $wget_opts $memcached_java_lib_url
-  local name=$(get_base_dir_from_bundle $memcached_java_lib_url)
-  run cp $name/$name.jar $assemblytool_home/lib
-  
-  memcached_set_up_common_nursery
-  
-  log "Configuring all publications for using memcached ..."
-  for el in $assemblytool_home/publications/*.properties 2>/dev/null; do
-    local publication=$(basename $el .properties)
-    
-    if [[ $appserver == "tomcat" ]]; then
-      dir=$tomcat_base/webapps/$publication
-      make_dir $dir
-      memcached_create_publication_nursery_component $dir
-    fi
-  done
-  
-  # fixing the deployed publications on host
-  if [[ $appserver == "tomcat" ]]; then
-    for el in $(
-      find $tomcat_base/webapps/ \
-        -mindepth 1 \
-        -maxdepth 1 \
-        -type d | \
-        egrep -v "solr|webservice|escenic|escenic-admin|indexer-webservice" | \
-        egrep -v "indexer-webapp|studio"
-    ); do
-      memcached_create_publication_nursery_component $el
-    done
-    
-  fi
-  
-  # TODO inform the user that he/she might want to do tihs in the
-  # publication tree as well.
-  assemble_deploy_and_restart_type_p
-}
-
-function memcached_set_up_common_nursery() {
-  local dir=$common_nursery_dir/com/danga
-  make_dir $dir
-  cat > $dir/SockIOPool <<EOF
-$class=com.danga.MemCached.SockIOPool
-# fill in memcached servers here.
-servers=${fai_memcached_node_list}
-
-# how many connections to use
-initConn = 10
-minConn = 5
-maxConn = 100
-# idle time
-maxIdle = 180000
-maintSleep = 5000
-# socket timeout
-socketTO = 3000
-failover = true
-# a network lookup algorithm
-nagle = false
-EOF
-
-  cat >> $common_nursery_dir/Initial.properties <<EOF
-
-# using memcached
-service.0.0-memcached-socket-pool=/com/danga/SockIOPool
-EOF
-}

From 3e9f3a40e60b166b18ba05782a5bb08c9b9485f6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 24 Feb 2012 17:27:19 +0800
Subject: [PATCH 0340/2585] - changed the sourcing of modules in a loop to make
 debugging   easier. If one source fails, the others might fail too, obscure
 the   error hunting when just doing source *.sh

---
 usr/sbin/ece-install | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index bb256dc7..57efe798 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -115,7 +115,10 @@ function init() {
     done
 
     # load ece-install modules
-    source $dir/ece-install.d/*.sh
+    for el in $dir/ece-install.d/*.sh; do
+      print "Loading $(basename $0) module:" $el
+      source $el
+    done
   else
     echo "I cannot find $(basename $0)'s dependencies, exiting :-("
     exit 1

From 35349fcf455407f8667792144c128d4b48e9a0ea Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 24 Feb 2012 17:27:47 +0800
Subject: [PATCH 0341/2585] - changed print to log

---
 usr/sbin/ece-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 57efe798..f42f9042 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -116,7 +116,7 @@ function init() {
 
     # load ece-install modules
     for el in $dir/ece-install.d/*.sh; do
-      print "Loading $(basename $0) module:" $el
+      log "Loading $(basename $0) module:" $el
       source $el
     done
   else

From 2decf48826d5e24360714484abe1747159b25218 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 27 Feb 2012 13:16:23 +0800
Subject: [PATCH 0342/2585] - new feature: installing the Percona database now
 works on CentOS - moved database specific out into its own ece-install
 module.

---
 usr/sbin/ece-install                          |  86 +--------------
 .../ece-scripts/ece-install.d/database.sh     | 102 ++++++++++++++++++
 2 files changed, 103 insertions(+), 85 deletions(-)
 create mode 100644 usr/share/escenic/ece-scripts/ece-install.d/database.sh

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index f42f9042..b326c09d 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -1388,6 +1388,7 @@ EOF
     elif [ -d $escenic_root_dir/widget-framework-core-* ]; then
       print_and_log "Basing ${publication_name}.war on Widget Framework Demo ..."
       run cd $escenic_root_dir/widget-framework-core-*/publications/demo-core
+      assert_pre_requisite mvn
       run mvn $maven_opts package
       run cp target/demo-core-*.war ${publication_war}
     else
@@ -1709,91 +1710,6 @@ function add_next_step()
     fi
 }
 
-## $1: optional parameter, binaries_only. If passed, $1=binaries_only,
-##     the ECE DB schema is not set up. 
-function install_database_server()
-{
-    print_and_log "Installing the database server on $HOSTNAME ..."
-
-    source $(dirname $0)/drop-and-create-ecedb
-
-    if [ $on_debian_or_derivative -eq 1 ]; then
-
-        code_name=$(lsb_release -s -c)
-        
-        supported_code_name=0
-        supported_list="lenny squeeze hardy lucid maverick"
-        for el in $supported_list; do
-            if [ $code_name = $el ]; then
-                supported_code_name=1
-            fi
-        done
-        
-         # some how, this is to install Percona 5.5
-        if [ -e /var/lib/mysql/debian-*.flag ]; then
-            run rm /var/lib/mysql/debian-*.flag
-        fi
-        
-        if [ $supported_code_name -eq 1 ]; then
-            print_and_log "Installing the Percona database ..."
-
-            if [ $(apt-key list| grep CD2EFD2A | wc -l) -lt 1 ]; then
-                run gpg --keyserver hkp://keys.gnupg.net \
-                    --recv-keys 1C4CBDCDCD2EFD2A
-                
-                # There has been twice now, during six months, that
-                # the key cannot be retrieved from
-                # keys.gnupg.net. Therefore, we're checking if it
-                # failed and if yes, force the package installation.
-                if [ $? -gt 0 ]; then
-                    s="Failed retrieving the Percona key from keys.gnupg.net"
-                    print_and_log $s
-                    s="Will install the Percona packages without the GPG key"
-                    print_and_log $s
-                    force_packages=1
-                else
-                    gpg --armor \
-                        -a \
-                        --export 1C4CBDCDCD2EFD2A | \
-                        apt-key add - \
-                        1>>$log 2>>$log
-                fi
-
-                run apt-get update
-            fi
-            
-            add_apt_source "deb http://repo.percona.com/apt ${code_name} main"
-            packages="percona-server-server percona-server-client"
-            install_packages_if_missing $packages
-            force_packages=0
-        else
-            print_and_log "The Percona APT repsository doesn't have packages" 
-            print_and_log "for your Debian (or derivative) version with code"
-            print_and_log "name $code_name. "
-            print_and_log "I will use vanilla MySQL instead."
-
-            packages="mysql-server mysql-client"
-        fi
-    elif [ $on_redhat_or_derivative -eq 1 ]; then
-      packages="mysql mysql-server"
-    fi
-    
-    install_packages_if_missing $packages
-
-    if [ $on_redhat_or_derivative -eq 1 ]; then
-      run chkconfig --level 35 mysqld on
-      run /etc/init.d/mysqld start
-    fi
-
-    assert_pre_requisite mysql
-
-    if [ -z "$1" ]; then
-        download_escenic_components_p
-        set_up_engine_and_plugins
-        set_up_ecedb
-    fi
-}
-
 # $1 is the default instance name, the calee is responsible for
 # setting this.
 function ask_for_instance_name()
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
new file mode 100644
index 00000000..a660d074
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -0,0 +1,102 @@
+percona_rpm_release_version=0.0-1
+percona_rpm_release_package_name=percona-release-${percona_rpm_release_version}
+percona_rpm_release_url=http://www.percona.com/downloads/percona-release/$percona_rpm_release_package_name.x86_64.rpm
+if [[ $(uname -m) != "x86_64" ]]; then
+  percona_rpm_release_url=http://www.percona.com/downloads/percona-release/$percona_rpm_release_package_name.i386.rpm
+fi
+
+## $1: optional parameter, binaries_only. If passed, $1=binaries_only,
+##     the ECE DB schema is not set up. 
+function install_database_server()
+{
+  print_and_log "Installing the database server on $HOSTNAME ..."
+
+  source $(dirname $0)/drop-and-create-ecedb
+
+  if [ $on_debian_or_derivative -eq 1 ]; then
+
+    code_name=$(lsb_release -s -c)
+    
+    supported_code_name=0
+    supported_list="lenny squeeze hardy lucid maverick"
+    for el in $supported_list; do
+      if [ $code_name = $el ]; then
+        supported_code_name=1
+      fi
+    done
+    
+    # some how, this is to install Percona 5.5
+    if [ -e /var/lib/mysql/debian-*.flag ]; then
+      run rm /var/lib/mysql/debian-*.flag
+    fi
+    
+    if [ $supported_code_name -eq 1 ]; then
+      print_and_log "Installing the Percona database ..."
+
+      if [ $(apt-key list| grep CD2EFD2A | wc -l) -lt 1 ]; then
+        run gpg --keyserver hkp://keys.gnupg.net \
+          --recv-keys 1C4CBDCDCD2EFD2A
+        
+        # There has been twice now, during six months, that
+        # the key cannot be retrieved from
+        # keys.gnupg.net. Therefore, we're checking if it
+        # failed and if yes, force the package installation.
+        if [ $? -gt 0 ]; then
+          s="Failed retrieving the Percona key from keys.gnupg.net"
+          print_and_log $s
+          s="Will install the Percona packages without the GPG key"
+          print_and_log $s
+          force_packages=1
+        else
+          gpg --armor \
+            -a \
+            --export 1C4CBDCDCD2EFD2A | \
+            apt-key add - \
+            1>>$log 2>>$log
+        fi
+
+        run apt-get update
+      fi
+      
+      add_apt_source "deb http://repo.percona.com/apt ${code_name} main"
+      packages="percona-server-server percona-server-client"
+      install_packages_if_missing $packages
+      force_packages=0
+    else
+      print_and_log "The Percona APT repsository doesn't have packages" 
+      print_and_log "for your Debian (or derivative) version with code"
+      print_and_log "name $code_name. "
+      print_and_log "I will use vanilla MySQL instead."
+
+      packages="mysql-server mysql-client"
+    fi
+  elif [ $on_redhat_or_derivative -eq 1 ]; then
+    print_and_log "Installing the Percona database ..."
+    
+    if [ $(rpm -qa | grep $percona_rpm_release_package_name | wc -l) -lt 1 ]; then
+      run rpm -Uhv $percona_rpm_release_url
+    fi
+    
+    packages="
+      Percona-Server-shared-compat
+      Percona-Server-server-55
+      Percona-Server-client-55"
+  fi
+  
+  install_packages_if_missing $packages
+
+  if [ $on_redhat_or_derivative -eq 1 ]; then
+    run chkconfig --level 35 mysql on
+    run /etc/init.d/mysql start
+  fi
+
+  assert_pre_requisite mysql
+  assert_pre_requisite mysqld
+
+  if [ -z "$1" ]; then
+    download_escenic_components
+    set_up_engine_and_plugins
+    set_up_ecedb
+  fi
+}
+

From a74ba8646021cce088aef46fcd4e6d8076484e3a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 27 Feb 2012 13:23:11 +0800
Subject: [PATCH 0343/2585] - added "tested operating systems" section

---
 usr/share/doc/escenic/ece-install-guide.org | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 03823356..67a40e95 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -6,12 +6,12 @@ the latest Ubuntu LTS or most other Debian based operating systems,
 but it should work without any problems on any Unix like system that
 has BASH version 4.2 or newer.
 
-*** Debian based operating systems
+** Debian based operating systems
 If running on a Debian based operating system, ece-install will take
 care of installing all required third party software, such as database
 & caching server.
 
-*** Other GNU/Linux and Unix systems 
+** Other GNU/Linux and Unix systems 
 If you're installing on another Linux or Unix system, you must first
 make sure that these 3rd party components are installed. ece-install
 will tell you which ones it cannot find and tell you to install these,
@@ -21,6 +21,14 @@ You may also look inside the ece-install script for all calls to the
 'assert\_pre\_prequesite' method and you'll get a list of the binaries
 ece-install assumes are present.
 
+** Tested Operating Systems
+| Operating system     | Status                                                     | Date updated     |
+|----------------------+------------------------------------------------------------+------------------|
+| Debian 6.0 (squeeze) | Everything is 100% automatic                               | 2012-02-27 13:18 |
+| Ubuntu LTS 10.04     | Everything except Tomcat/APR wrappers are automatic        | 2012-02-27 13:19 |
+| Ubuntu 11.10         | Everything except Tomcat/APR wrappers are automatic        | 2012-02-27 13:19 |
+| CentOS 6.2           | Sun Java, Cache server, APR & monitoring are not automatic | 2012-02-27 13:21 |
+
 * A Note on Running ece-install On Non-GNU/Linux Systems
 Please note, it's assumed that the OS uses GNU's tools, i.e. find, cp
 & tar. If you're running a system which has a different set of core

From cfe932343a311224d5dcc9966f0731d657389d5b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 27 Feb 2012 18:57:52 +0800
Subject: [PATCH 0344/2585] - new feature: automatic installation of Sun/Oracle
 Java on CentOS - moved installation of java to separate ece-install module

---
 usr/sbin/ece-install                          | 28 ++-----
 .../escenic/ece-scripts/ece-install.d/java.sh | 79 +++++++++++++++++++
 2 files changed, 86 insertions(+), 21 deletions(-)
 create mode 100644 usr/share/escenic/ece-scripts/ece-install.d/java.sh

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index b326c09d..165ae5e4 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -84,10 +84,14 @@ http://technet.escenic.com/downloads/release/53/community-engine-3.6.1.0.zip
 http://technet.escenic.com/downloads/release/53/dashboard-1.0.0.0.zip
 http://technet.escenic.com/downloads/release/53/engine-5.3.4.7.zip
 http://technet.escenic.com/downloads/release/53/forum-3.0.0.0.zip
+http://technet.escenic.com/downloads/release/53/geocode-dist-2.3.1.0.zip
 http://technet.escenic.com/downloads/release/53/inpage-1.3.0.0.zip
 http://technet.escenic.com/downloads/release/53/lucy-dist-4.1.6.0.zip
 http://technet.escenic.com/downloads/release/53/menu-editor-dist-2.0.6.0.zip
+http://technet.escenic.com/downloads/release/53/mobile-expansion-3.0.0.0.zip
 http://technet.escenic.com/downloads/release/53/poll-2.1.3.0.zip
+http://technet.escenic.com/downloads/release/53/revision-history-dist-1.0.0.1.zip
+http://technet.escenic.com/downloads/release/53/section-feed-dist-2.0.4.0.zip
 http://technet.escenic.com/downloads/release/53/xml-editor-dist-2.1.0.0.zip
 "
 wf_download_list="
@@ -730,27 +734,6 @@ function set_ece_instance_conf()
     set_conf_file_value $1 $2 $instance_conf_file
 }
 
-function create_java_deb_packages_and_repo()
-{
-    print $(lsb_release -i | cut -d':' -f2) \
-        $(lsb_release -r | cut -d':' -f2) \
-        "doesn't have official Sun/Oracle Java packages,"
-    
-    local tmp_dir=$(mktemp -d)
-    $(
-        run cd $tmp_dir
-        run git clone https://github.com/flexiondotorg/oab-java6.git
-        run cd oab-java6
-        run bash oab-java6.sh
-        run rm -rf $tmp_dir
-    ) &
-    show_pulse $! "I'm creating packages & local repo for you"
-
-    add_next_step "Local APT repository with Sun/Oracle Java packages"
-    add_next_step "has been installed at /var/local/oab/deb and added"
-    add_next_step "to your APT system with /etc/apt/sources.list.d/oab.list"
-}
-
 # Installs third party packages needed by the ECE (i.e. Java related).
 # Also see install_common_os_packages for packages common to all
 # servers in the architecture.
@@ -818,7 +801,10 @@ function install_ece_third_party_packages
         mysql-connector-java
         wget
       "
+
       # TODO no tomcat APR wrappers in official repositories
+      
+      install_sun_java_on_redhat
     fi
     
     install_packages_if_missing $packages
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/java.sh b/usr/share/escenic/ece-scripts/ece-install.d/java.sh
new file mode 100644
index 00000000..95d15052
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece-install.d/java.sh
@@ -0,0 +1,79 @@
+sun_java_bin_url=http://download.oracle.com/otn-pub/java/jdk/6u31-b04/jdk-6u31-linux-i586.bin
+if [[ $(uname -m) == "x86_64" ]]; then
+  sun_java_bin_url=http://download.oracle.com/otn-pub/java/jdk/6u31-b04/jdk-6u31-linux-x64.bin
+fi
+  
+function create_java_deb_packages_and_repo() {
+  print $(lsb_release -i | cut -d':' -f2) \
+    $(lsb_release -r | cut -d':' -f2) \
+    "doesn't have official Sun/Oracle Java packages,"
+  
+  local tmp_dir=$(mktemp -d)
+  $(
+    run cd $tmp_dir
+    run git clone https://github.com/flexiondotorg/oab-java6.git
+    run cd oab-java6
+    run bash oab-java6.sh
+    run rm -rf $tmp_dir
+  ) &
+  show_pulse $! "I'm creating packages & local repo for you"
+
+  add_next_step "Local APT repository with Sun/Oracle Java packages"
+  add_next_step "has been installed at /var/local/oab/deb and added"
+  add_next_step "to your APT system with /etc/apt/sources.list.d/oab.list"
+}
+
+
+function install_sun_java_on_redhat() {
+  if [[ $(java -version 2>&1 | grep HotSpot | wc -l) -gt 0 ]]; then
+    print_and_log "Sun Java is already installed on $HOSTNAME"
+    return
+  fi
+
+  print_and_log "Downloading Sun Java from download.oracle.com ..."
+  run cd $download_dir
+  run wget $wget_opts $sun_java_bin_url
+
+  # calculating start and stop offset from where to extract the zip
+  # from the java data blob. calculation taken from
+  # git://github.com/rraptorr/sun-java6.git
+  local file_name=$(basename $sun_java_bin_url)
+  local binsize=$(wc -c $file_name | awk '{print $1}');
+	local zipstart=$(unzip -ql $file_name 2>&1 >/dev/null | \
+    sed -n -e 's/.* \([0-9][0-9]*\) extra bytes.*/\1/p');
+	tail -c $(expr $binsize - $zipstart) $file_name > tmp-jdk.zip
+
+  run cd /opt
+  run unzip -q -o $download_dir/tmp-jdk.zip
+  local latest_jdk=$(find . -maxdepth 1 -type d -name "jdk*" | sort -r | head -1)
+  run rm -f /opt/jdk
+  run ln -s $latest_jdk jdk
+
+  # generate jar files from the .pack files
+  for el in $(find /opt/jdk/ -name "*.pack"); do
+    file_name=$(basename $el .pack)
+    local dir=$(dirname $el)
+    run /opt/jdk/bin/unpack200 $el $dir/$file_name.jar
+  done
+
+  # update RedHat's alternatives system to use Sun Java as its
+  # default.
+  for el in java javac jar; do
+    if [ ! -e /usr/bin/$el ]; then
+      ln -s /usr/bin/$el /etc/alternatives/$el
+    fi
+    alternatives --set $el /opt/jdk/bin/$el
+  done
+
+  # setting java_home to the newly installed location
+  java_home=/opt/jdk
+  
+  local version=$(java -version 2>&1 | grep version | cut -d'"' -f2)
+  print_and_log "Sun Java $version is now installed in /opt/jdk"
+
+  add_next_step "By using Sun Java, you must accept this license: "
+  add_next_step "http://www.oracle.com/technetwork/java/javase/terms/license/"
+}
+
+
+

From 5841be9935325d17f8f8403f07f68f9b2089ea36 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 28 Feb 2012 11:39:36 +0800
Subject: [PATCH 0345/2585] - updated the download list with the latest from
 technet.escenic.com.

  For the curious, this is how I got the list to update:

url=http://technet.escenic.com/engine/53/technotes/article5535.ece

list=$(
  curl  -s -u user:pass $url | \
    grep .zip | \
    sed "s#.*<a\ href=\"\(.*.zip\)\".*#\1#"
)

result=""

for el in $list; do
  if [[ ${el:0:4} == "http" ]]; then
    result=${result}$'\n'$el
  else
    result=${result}$'\n'"http://technet.escenic.com"$el
  fi
done

echo "$result" | sort
---
 usr/sbin/ece-install | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 165ae5e4..c5097fcb 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -77,15 +77,16 @@ ece_software_setup_completed=0
 # components.
 next_steps=()
 
+
 technet_download_list="
 http://technet.escenic.com/downloads/assemblytool-2.0.2.zip
 http://technet.escenic.com/downloads/release/53/analysis-engine-2.3.7.0.zip
 http://technet.escenic.com/downloads/release/53/community-engine-3.6.1.0.zip
-http://technet.escenic.com/downloads/release/53/dashboard-1.0.0.0.zip
-http://technet.escenic.com/downloads/release/53/engine-5.3.4.7.zip
+http://technet.escenic.com/downloads/release/53/dashboard-1.1.0.2.zip
+http://technet.escenic.com/downloads/release/53/engine-5.3.5.121857.zip
 http://technet.escenic.com/downloads/release/53/forum-3.0.0.0.zip
 http://technet.escenic.com/downloads/release/53/geocode-dist-2.3.1.0.zip
-http://technet.escenic.com/downloads/release/53/inpage-1.3.0.0.zip
+http://technet.escenic.com/downloads/release/53/inpage-2.0.0.0.zip
 http://technet.escenic.com/downloads/release/53/lucy-dist-4.1.6.0.zip
 http://technet.escenic.com/downloads/release/53/menu-editor-dist-2.0.6.0.zip
 http://technet.escenic.com/downloads/release/53/mobile-expansion-3.0.0.0.zip

From ec9e485c7df1c2450a3702f3886ac34ff09853d8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 28 Feb 2012 11:42:17 +0800
Subject: [PATCH 0346/2585] - new feature: installing the cache profile now
 works on CentOS! This   means that automatic installation of Varnish 3 with
 full backend   load balancing, cookie stripping, ACLs and so on is now
 working on   CentOS.

- changed default backend configuration in varnish to "localhost"
  instead of <hostname>. The reason for this, is that CentOS/REHL
  doesn't add an entry for the host name in /etc/hosts (even when
  using the admin tools to change the hostname).
---
 .../ece-scripts/ece-install.d/cache-server.sh | 163 ++++++++++--------
 1 file changed, 88 insertions(+), 75 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
index d54319e3..3fff7e19 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
@@ -1,86 +1,99 @@
+# ece-install module for installing the cache server
+
+varnish_redhat_rpm_url=http://repo.varnish-cache.org/redhat/varnish-3.0/el5/noarch/varnish-release-3.0-1.noarch.rpm
+
 function install_cache_server()
 {
-    print_and_log "Installing a caching server on $HOSTNAME ..."
-
-    if [[ $on_debian_or_derivative -eq 1 &&
-          $(apt-key list | grep varnish-software.com | wc -l) -eq 0 ]]; then
-        curl ${curl_opts} \
-            http://repo.varnish-cache.org/debian/GPG-key.txt \
-            2>> $log | \
-            apt-key add - \
-            1>>$log 2>>$log
-        run apt-get update
-    fi
-
-    code_name=$(lsb_release -s -c)
+  print_and_log "Installing a caching server on $HOSTNAME ..."
+
+  if [[ $on_debian_or_derivative -eq 1 &&
+        $(apt-key list | grep varnish-software.com | wc -l) -eq 0 ]]; then
+    curl ${curl_opts} \
+      http://repo.varnish-cache.org/debian/GPG-key.txt \
+      2>> $log | \
+      apt-key add - \
+      1>>$log 2>>$log
+    run apt-get update
     
+    code_name=$(lsb_release -s -c)
     supported_code_name=0
+    
     # list taken from http://repo.varnish-cache.org/debian/dists/
     supported_list="lenny squeeze hardy lucid"
     for el in $supported_list; do
-        if [ $code_name = $el ]; then
-            supported_code_name=1
-        fi
+      if [ $code_name = $el ]; then
+        supported_code_name=1
+      fi
     done
     
     if [ $supported_code_name -eq 1 -a $on_debian -eq 1 ]; then
-        add_apt_source "deb http://repo.varnish-cache.org/debian/ $(lsb_release -s -c) varnish-3.0"
+      add_apt_source "deb http://repo.varnish-cache.org/debian/ $(lsb_release -s -c) varnish-3.0"
     elif [ $supported_code_name -eq 1 -a $on_ubuntu -eq 1 ]; then
-        add_apt_source "deb http://repo.varnish-cache.org/ubuntu/ $(lsb_release -s -c) varnish-3.0"
-    fi
-
-    install_packages_if_missing varnish
-    assert_pre_requisite varnishd
-
-    if [ $fai_enabled -eq 0 ]; then
-        print "You must now list your backend servers."
-        print "These must be host names (not IPs) and must all be resolvable"
-        print "by your cache host ($HOSTNAME), preferably from /etc/hosts"
-        print "Seperate the entries with a space. e.g.: app1:8080 app2:8080."
-        print "Press ENTER to accept the default: ${HOSTNAME}:${appserver_port}"
-        echo -n "Your choice [${HOSTNAME}:${appserver_port}]> "
-        read backend_servers
-    else
-        backend_servers=${fai_cache_backends}
-    fi
-
-    if [ -z "$backend_servers" ]; then
-        backend_servers="${HOSTNAME}:${appserver_port}"
+      add_apt_source "deb http://repo.varnish-cache.org/ubuntu/ $(lsb_release -s -c) varnish-3.0"
     fi
-
-    set_up_varnish $backend_servers
-
-    add_next_step "Cache server is up and running at http://${HOSTNAME}:80/"
+    
+  elif [[ $on_redhat_or_derivative -eq 1 &&
+        $(rpm -qa | grep varnish-release | wc -l) -lt 1 ]]; then
+    print "Installing the Varnish repository RPM"
+    run rpm --nosignature -i $varnish_redhat_rpm_url
+  fi
+
+  install_packages_if_missing varnish
+  assert_pre_requisite varnishd
+
+  if [ $fai_enabled -eq 0 ]; then
+    print "You must now list your backend servers."
+    print "These must be host names (not IPs) and must all be resolvable"
+    print "by your cache host ($HOSTNAME), preferably from /etc/hosts"
+    print "Seperate the entries with a space. e.g.: app1:8080 app2:8080."
+    print "Press ENTER to accept the default: ${HOSTNAME}:${appserver_port}"
+    echo -n "Your choice [${HOSTNAME}:${appserver_port}]> "
+    read backend_servers
+  else
+    backend_servers=${fai_cache_backends}
+  fi
+
+  if [ -z "$backend_servers" ]; then
+    backend_servers="localhost:${appserver_port}"
+  fi
+
+  set_up_varnish $backend_servers
+
+  add_next_step "Cache server is up and running at http://${HOSTNAME}:80/"
 }
 
 function set_up_varnish()
 {
-    print_and_log "Setting up Varnish to match your environment ..."
-    run /etc/init.d/varnish stop
+  print_and_log "Setting up Varnish to match your environment ..."
+  run /etc/init.d/varnish stop
 
     # we need to swap standard err and standard out here as varnishd
     # -V for some reason writes to standard error.
-    using_varnish_3=$(varnishd -V 3>&1 1>&2 2>&3 | grep varnish-3 | wc -l)
-    
-    local file=/etc/default/varnish
-    sed -i -e 's/6081/80/g' -e 's/^START=no$/START=yes/' $file
-    exit_on_error "sed on $file"
-
-    cat > /etc/varnish/default.vcl <<EOF
+  using_varnish_3=$(varnishd -V 3>&1 1>&2 2>&3 | grep varnish-3 | wc -l)
+  
+  local file=/etc/default/varnish
+  if [ $on_redhat_or_derivative -eq 1 ]; then
+    file=/etc/sysconfig/varnish
+  fi
+  
+  sed -i -e 's/6081/80/g' -e 's/^START=no$/START=yes/' $file
+  exit_on_error "sed on $file"
+
+  cat > /etc/varnish/default.vcl <<EOF
 /* Varnish configuration for Escenic Content Engine              -*- java -*- */
 
 /* IPs that are allowed to access the administrative pages/webapps. */
 acl staff {
   "localhost";
 EOF
-    for l in $(get_privileged_hosts); do
-        cat >> /etc/varnish/default.vcl <<EOF
+  for l in $(get_privileged_hosts); do
+    cat >> /etc/varnish/default.vcl <<EOF
   # Privileged host (either doing the ece-install or listed as such)
   "${l}";
 EOF
-    done
-    
-    cat >> /etc/varnish/default.vcl <<EOF
+  done
+  
+  cat >> /etc/varnish/default.vcl <<EOF
 }
 
 /* The IP of the Adactus/Mobilize server */
@@ -95,36 +108,36 @@ backend static {
 }
 
 EOF
-    for el in $backend_servers; do
-        appserver_id=$(echo $el | cut -d':' -f1 | sed 's/-/_/g')
-        appserver_host=$(echo $el | cut -d':' -f1)
-        appserver_port=$(echo $el | cut -d':' -f2)
+  for el in $backend_servers; do
+    appserver_id=$(echo $el | cut -d':' -f1 | sed 's/-/_/g')
+    appserver_host=$(echo $el | cut -d':' -f1)
+    appserver_port=$(echo $el | cut -d':' -f2)
 
-        cat >> /etc/varnish/default.vcl <<EOF
+    cat >> /etc/varnish/default.vcl <<EOF
 backend $appserver_id {
   .host = "$appserver_host";
   .port = "$appserver_port";
 }
 
 EOF
-    done
+  done
 
-    cat >> /etc/varnish/default.vcl <<EOF
+  cat >> /etc/varnish/default.vcl <<EOF
 /* The client director gives us session stickiness based on client
  * IP. */
 director webdirector client {
 EOF
-    for el in $backend_servers; do
-	      appserver_id=$(echo $el | cut -d':' -f1 | sed 's/-/_/g' )        
-        cat >> /etc/varnish/default.vcl <<EOF
+  for el in $backend_servers; do
+	  appserver_id=$(echo $el | cut -d':' -f1 | sed 's/-/_/g' )        
+    cat >> /etc/varnish/default.vcl <<EOF
   {
      .backend = $appserver_id;
      .weight = 1;
   }
 EOF
-    done
+  done
 
-    cat >> /etc/varnish/default.vcl <<EOF
+  cat >> /etc/varnish/default.vcl <<EOF
 }
 
 sub vcl_recv {
@@ -172,17 +185,17 @@ sub vcl_deliver {
    */
   if (obj.hits > 0) {
 EOF
-    if [ $using_varnish_3 -gt 0 ]; then
-        cat >> /etc/varnish/default.vcl <<EOF
+  if [ $using_varnish_3 -gt 0 ]; then
+    cat >> /etc/varnish/default.vcl <<EOF
     set resp.http.X-Cache = "HIT #" + obj.hits;
 EOF
-    else
-        cat >> /etc/varnish/default.vcl <<EOF
+  else
+    cat >> /etc/varnish/default.vcl <<EOF
     set resp.http.X-Cache = "HIT #" obj.hits;
 EOF
-    fi
-    
-    cat >> /etc/varnish/default.vcl <<EOF
+  fi
+  
+  cat >> /etc/varnish/default.vcl <<EOF
   }
   else {
     set resp.http.X-Cache = "MISS";
@@ -191,5 +204,5 @@ EOF
   set resp.http.X-Cache-Backend = req.backend;
 }
 EOF
-    run /etc/init.d/varnish start
+  run /etc/init.d/varnish start
 }

From 3a26feb55e701b395ad0ab230f134e1b1ac4ba5a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 28 Feb 2012 12:26:30 +0800
Subject: [PATCH 0347/2585] - persnickety: indentation of comment

---
 usr/share/escenic/ece-scripts/common-bashing.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index d963aec0..3e6e4fdf 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -55,7 +55,7 @@ function print_and_log() {
 function log_call_stack() {
   log "Call stack (top most is the last one, main is the first):"
 
-    # skipping i=0 as this is log_call_stack itself
+  # skipping i=0 as this is log_call_stack itself
   for ((i = 1; i < ${#FUNCNAME[@]}; i++)); do
     echo -n  ${BASH_SOURCE[$i]}:${BASH_LINENO[$i-1]}:${FUNCNAME[$i]}"()" >> $log
     if [ -e ${BASH_SOURCE[$i]} ]; then

From f35df599cf89d27c3174312e09eaac9502c91351 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 28 Feb 2012 12:27:11 +0800
Subject: [PATCH 0348/2585] - fix: having the JDK download in the $dowload_tmp
 confused   ece-install (issue only on CentOS/REHL)

---
 usr/sbin/ece-install | 42 +++++++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index c5097fcb..835ff593 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -143,7 +143,9 @@ function download_escenic_components()
         return
     fi
 
-    cd $download_dir
+    print "Downloading software from technet.escenic.com ..."
+    
+    run cd $download_dir
     for el in $technet_download_list; do
       if [ -e $(basename $el) ]; then
         continue
@@ -410,6 +412,8 @@ function set_up_engine_and_plugins()
             continue
         elif [ $(basename $el | grep ^assemblytool-.*.zip | wc -l) -gt 0 ]; then
             continue
+        elif [ $(basename $el | grep ^jdk-.*.zip | wc -l) -gt 0 ]; then
+            continue
         fi
         
         run unzip -q -u $el
@@ -2637,25 +2641,25 @@ EOF
 
 function add_server_to_runlevels()
 {
-    # no need to add init.d scripts to the runlevel(s) for these
-    # profiles
-    if [ $install_profile_number -eq $PROFILE_WIDGET_FRAMEWORK -o \
-        $install_profile_number -eq $PROFILE_DB_SERVER -o \
-        $install_profile_number -eq $PROFILE_CACHE_SERVER ]; then
-        return
-    fi
+  # no need to add init.d scripts to the runlevel(s) for these
+  # profiles
+  if [ $install_profile_number -eq $PROFILE_WIDGET_FRAMEWORK -o \
+    $install_profile_number -eq $PROFILE_DB_SERVER -o \
+    $install_profile_number -eq $PROFILE_CACHE_SERVER ]; then
+    return
+  fi
 
-    if [ $on_debian_or_derivative -eq 1 ]; then
-        print_and_log "Adding the ece init.d script to the default run levels ..."
-        run update-rc.d ece defaults
-    else
-        add_next_step "Remember to add /etc/init.d/ece to the desired "\
-"run levels." 
-        # TODO add init.d to the default runlevels, for other
-        # distributions too:
-        # - RedHat/chekcconfig  chkconfig --level 35 ece on
-        # - Gentoo: rc-update add ece default
-    fi
+  if [ $on_debian_or_derivative -eq 1 ]; then
+    print_and_log "Adding the ece init.d script to the default run levels ..."
+    run update-rc.d ece defaults
+  elif [ $on_redhat_or_derivative -eq 1 ]; then
+    run chkconfig --level 35 ece on      
+  else
+    add_next_step "Remember to add /etc/init.d/ece to the desired run levels." 
+    # TODO add init.d to the default runlevels, for other
+    # distributions too:
+    # - Gentoo: rc-update add ece default
+  fi
 }
 
 function restore_from_backup()

From 9a8e8168138f77a5430f190fef0aaf582fce957f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 28 Feb 2012 12:27:41 +0800
Subject: [PATCH 0349/2585] - minor: used variable instead of hard coded string
 for temporary JDK   bundle.

---
 usr/share/escenic/ece-scripts/ece-install.d/java.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/java.sh b/usr/share/escenic/ece-scripts/ece-install.d/java.sh
index 95d15052..0048c349 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/java.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/java.sh
@@ -37,14 +37,15 @@ function install_sun_java_on_redhat() {
   # calculating start and stop offset from where to extract the zip
   # from the java data blob. calculation taken from
   # git://github.com/rraptorr/sun-java6.git
+  local tmp_jdk=jdk-tmp.zip
   local file_name=$(basename $sun_java_bin_url)
   local binsize=$(wc -c $file_name | awk '{print $1}');
 	local zipstart=$(unzip -ql $file_name 2>&1 >/dev/null | \
     sed -n -e 's/.* \([0-9][0-9]*\) extra bytes.*/\1/p');
-	tail -c $(expr $binsize - $zipstart) $file_name > tmp-jdk.zip
+	tail -c $(expr $binsize - $zipstart) $file_name > $tmp_jdk
 
   run cd /opt
-  run unzip -q -o $download_dir/tmp-jdk.zip
+  run unzip -q -o $download_dir/$tmp_jdk
   local latest_jdk=$(find . -maxdepth 1 -type d -name "jdk*" | sort -r | head -1)
   run rm -f /opt/jdk
   run ln -s $latest_jdk jdk

From e9bb4e56f48c804499d7e10900cfdc876d7bc195 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 28 Feb 2012 12:38:09 +0800
Subject: [PATCH 0350/2585] - updated tested operating systems - generated new
 markup

---
 usr/share/doc/escenic/ece-install-guide.html | 46 +++++++++++++++-----
 usr/share/doc/escenic/ece-install-guide.org  | 12 ++---
 2 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.html b/usr/share/doc/escenic/ece-install-guide.html
index 98051c42..e7ab8faf 100644
--- a/usr/share/doc/escenic/ece-install-guide.html
+++ b/usr/share/doc/escenic/ece-install-guide.html
@@ -7,7 +7,7 @@
 <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
 <meta name="title" content="Welcome to the /usr/sbin/ece-install Guide"/>
 <meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2012-02-17 12:59:41 CST"/>
+<meta name="generated" content="2012-02-28 12:37:37 CST"/>
 <meta name="author" content="Torstein Krause Johansen"/>
 <meta name="description" content=""/>
 <meta name="keywords" content=""/>
@@ -230,11 +230,9 @@ <h2>Table of Contents</h2>
 <ul>
 <li><a href="#sec-1">1 Supported Operating Systems</a>
 <ul>
-<li>
-<ul>
 <li><a href="#sec-1-1">1.1 Debian based operating systems</a></li>
 <li><a href="#sec-1-2">1.2 Other GNU/Linux and Unix systems</a></li>
-</ul></li>
+<li><a href="#sec-1-3">1.3 Tested Operating Systems</a></li>
 </ul>
 </li>
 <li><a href="#sec-2">2 A Note on Running ece-install On Non-GNU/Linux Systems</a></li>
@@ -319,14 +317,14 @@ <h2 id="sec-1"><span class="section-number-2">1</span> Supported Operating Syste
 <p>For the best experience, run this script on Debian Squeeze (or newer),
 the latest Ubuntu LTS or most other Debian based operating systems,
 but it should work without any problems on any Unix like system that
-has a recent version of BASH.
+has BASH version 4.2 or newer.
 </p>
 
 </div>
 
-<div id="outline-container-1-1" class="outline-4">
-<h4 id="sec-1-1"><span class="section-number-4">1.1</span> Debian based operating systems</h4>
-<div class="outline-text-4" id="text-1-1">
+<div id="outline-container-1-1" class="outline-3">
+<h3 id="sec-1-1"><span class="section-number-3">1.1</span> Debian based operating systems</h3>
+<div class="outline-text-3" id="text-1-1">
 
 <p>If running on a Debian based operating system, ece-install will take
 care of installing all required third party software, such as database
@@ -336,9 +334,9 @@ <h4 id="sec-1-1"><span class="section-number-4">1.1</span> Debian based operatin
 
 </div>
 
-<div id="outline-container-1-2" class="outline-4">
-<h4 id="sec-1-2"><span class="section-number-4">1.2</span> Other GNU/Linux and Unix systems</h4>
-<div class="outline-text-4" id="text-1-2">
+<div id="outline-container-1-2" class="outline-3">
+<h3 id="sec-1-2"><span class="section-number-3">1.2</span> Other GNU/Linux and Unix systems</h3>
+<div class="outline-text-3" id="text-1-2">
 
 <p>If you're installing on another Linux or Unix system, you must first
 make sure that these 3rd party components are installed. ece-install
@@ -350,6 +348,30 @@ <h4 id="sec-1-2"><span class="section-number-4">1.2</span> Other GNU/Linux and U
 'assert_pre_prequesite' method and you'll get a list of the binaries
 ece-install assumes are present.
 </p>
+</div>
+
+</div>
+
+<div id="outline-container-1-3" class="outline-3">
+<h3 id="sec-1-3"><span class="section-number-3">1.3</span> Tested Operating Systems</h3>
+<div class="outline-text-3" id="text-1-3">
+
+<table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
+<caption></caption>
+<colgroup><col class="left" /><col class="left" /><col class="left" />
+</colgroup>
+<thead>
+<tr><th scope="col" class="left">Operating system</th><th scope="col" class="left">Status</th><th scope="col" class="left">Date updated</th></tr>
+</thead>
+<tbody>
+<tr><td class="left">Debian 6.0 (squeeze)</td><td class="left">Everything is 100% automatic</td><td class="left">2012-02-27 13:18</td></tr>
+<tr><td class="left">Ubuntu LTS 10.04</td><td class="left">Everything except Tomcat/APR wrappers are automatic</td><td class="left">2012-02-27 13:19</td></tr>
+<tr><td class="left">Ubuntu 11.10</td><td class="left">Everything except Tomcat/APR wrappers are automatic</td><td class="left">2012-02-27 13:19</td></tr>
+<tr><td class="left">CentOS 6.2</td><td class="left">APR &amp; monitoring are not automatic</td><td class="left">2012-02-28 12:37</td></tr>
+</tbody>
+</table>
+
+
 </div>
 </div>
 
@@ -1754,7 +1776,7 @@ <h2 id="sec-15"><span class="section-number-2">15</span> Example Output FAI</h2>
 <hr/>
 <p class="author">
   Author: Torstein Krause Johansen (<a href="mailto:tkj@vizrt.com">tkj@vizrt.com</a>)
-  Date: 2012-02-17 12:59:41 CST
+  Date: 2012-02-28 12:37:37 CST
 </p>
 </div>
 </body>
diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 67a40e95..07f0d010 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -22,12 +22,12 @@ You may also look inside the ece-install script for all calls to the
 ece-install assumes are present.
 
 ** Tested Operating Systems
-| Operating system     | Status                                                     | Date updated     |
-|----------------------+------------------------------------------------------------+------------------|
-| Debian 6.0 (squeeze) | Everything is 100% automatic                               | 2012-02-27 13:18 |
-| Ubuntu LTS 10.04     | Everything except Tomcat/APR wrappers are automatic        | 2012-02-27 13:19 |
-| Ubuntu 11.10         | Everything except Tomcat/APR wrappers are automatic        | 2012-02-27 13:19 |
-| CentOS 6.2           | Sun Java, Cache server, APR & monitoring are not automatic | 2012-02-27 13:21 |
+| Operating system     | Status                                              | Date updated     |
+|----------------------+-----------------------------------------------------+------------------|
+| Debian 6.0 (squeeze) | Everything is 100% automatic                        | 2012-02-27 13:18 |
+| Ubuntu LTS 10.04     | Everything except Tomcat/APR wrappers are automatic | 2012-02-27 13:19 |
+| Ubuntu 11.10         | Everything except Tomcat/APR wrappers are automatic | 2012-02-27 13:19 |
+| CentOS 6.2           | APR & monitoring are not automatic                  | 2012-02-28 12:37 |
 
 * A Note on Running ece-install On Non-GNU/Linux Systems
 Please note, it's assumed that the OS uses GNU's tools, i.e. find, cp

From 8d6d1b0ecc74b3338d446e48d41142aa184f4aa4 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 28 Feb 2012 12:41:30 +0800
Subject: [PATCH 0351/2585] - added section: Supported Operating Systems/RedHat
 based operating systems.

---
 usr/share/doc/escenic/ece-install-guide.org | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 07f0d010..e5df4b18 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -11,6 +11,15 @@ If running on a Debian based operating system, ece-install will take
 care of installing all required third party software, such as database
 & caching server.
 
+** RedHat based operating systems
+ece-install constantly gets better support for automatic installation
+on RedHat based operating systems. However, since the public RedHat
+repositories are significantly smaller than the Debian ones, there
+will often be the case that you'll have to do some manually
+installation of 3rd party dependencies prior to running
+ece-install. Don't despair though, ece-install will tell you what you
+need to do. 
+
 ** Other GNU/Linux and Unix systems 
 If you're installing on another Linux or Unix system, you must first
 make sure that these 3rd party components are installed. ece-install

From 710045a92fc1cef30815fd5088a3ed07e6234a7f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 28 Feb 2012 15:45:49 +0800
Subject: [PATCH 0352/2585] - moved RMI hub code to its own module

---
 .../ece-scripts/ece-install.d/rmi-hub.sh      | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 usr/share/escenic/ece-scripts/ece-install.d/rmi-hub.sh

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/rmi-hub.sh b/usr/share/escenic/ece-scripts/ece-install.d/rmi-hub.sh
new file mode 100644
index 00000000..ffaa4cc6
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece-install.d/rmi-hub.sh
@@ -0,0 +1,31 @@
+# ece-install module for installing the RMI hub
+
+function install_rmi_hub()
+{
+  make_dir $escenic_conf_dir/rmi-hub
+  
+  run cp -r $escenic_root_dir/engine/contrib/rmi-hub/config/* \
+    $escenic_conf_dir/rmi-hub/
+
+  hub_host=$HOSTNAME
+  file=$common_nursery_dir
+  file=$file/neo/io/managers/HubConnectionManager.properties
+
+  make_dir $(basename $file)
+  set_conf_file_value hub \
+    "rmi://${hub_host}:1099/hub/Hub" \
+    $file
+
+  cat > $common_nursery_dir/io/api/EventManager.properties <<EOF
+clientConfiguration=/neo/io/services/HubConnection
+pingTime=10000
+EOF
+
+  add_next_step "Restart all your instances to make the hub see them."
+
+  print_and_log "Starting the RMI-hub on $HOSTNAME ..."
+  ece_command="ece -t rmi-hub restart"
+  su - $ece_user -c "$ece_command" 1>>$log 2>>$log
+}
+
+

From 4910132fb486ec3b510be37c6dbff7fdfb659f4b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 28 Feb 2012 15:51:29 +0800
Subject: [PATCH 0353/2585] - added /etc/sysconfig to the list of directories
 potentially holding   the init.d script's configuration.

---
 etc/init.d/ece | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/etc/init.d/ece b/etc/init.d/ece
index f4cce807..979bd279 100755
--- a/etc/init.d/ece
+++ b/etc/init.d/ece
@@ -46,11 +46,12 @@ ece_script=/usr/bin/ece
 # The values above may be overidden a file named the same as this
 # init.d script. This init.d configuration must also hold the
 # variables controlling which ECE instances to start. The list of
-# locations per default caters (at least) for Debian & Gentoo based
-# systems:
+# locations per default caters (at least) for Debian, RedHat & Gentoo
+# based systems:
 conf_file_location_list="
 /etc/default
 /etc/conf.d
+/etc/sysconfig
 "
 
 function read_conf_file()

From 77bf552a00ed0757d42ac6da78082368319ff732 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 28 Feb 2012 15:55:23 +0800
Subject: [PATCH 0354/2585] - moved EAE specific code to analysis-engine.sh -
 moved more ECE specific code to content-engine.sh - moved Icinga, Nagios &
 Munin specific code to monitoring.sh - moved solr & indexer specific code to
 search-server.sh

---
 usr/sbin/ece-install                          | 544 +-----------------
 .../ece-install.d/analysis-engine.sh          |  67 +++
 .../ece-install.d/content-engine.sh           | 116 +++-
 .../ece-scripts/ece-install.d/memory-cache.sh |  12 +-
 .../ece-scripts/ece-install.d/monitoring.sh   | 290 ++++++++++
 .../ece-install.d/search-server.sh            |  71 +++
 6 files changed, 540 insertions(+), 560 deletions(-)
 create mode 100644 usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh
 create mode 100644 usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
 create mode 100644 usr/share/escenic/ece-scripts/ece-install.d/search-server.sh

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 835ff593..8b1e1ee9 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -562,7 +562,7 @@ function set_up_ecedb()
 
 function set_up_basic_nursery_configuration()
 {
-    log "Setting up basic Nursery configuration ..."
+    print_and_log "Setting up basic Nursery configuration ..."
 
     # we always copy the default plugin configuration (even if there
     # is an archive)
@@ -654,22 +654,24 @@ EOF
 
 function set_up_instance_specific_nursery_configuration()
 {
-    for el in $escenic_conf_dir/engine/instance/*; do
-        i=$(( i + 1 ))
-        if [ $(basename $el) = $instance_name ]; then
-            rmi_port="8${i}23"
-            run echo "port=$rmi_port" > $el/RMI.properties
-        fi
-    done
+  print_and_log "Setting up instance specific Nursery configuration ..."
+  
+  for el in $escenic_conf_dir/engine/instance/*; do
+    i=$(( i + 1 ))
+    if [ $(basename $el) = $instance_name ]; then
+      rmi_port="8${i}23"
+      run echo "port=$rmi_port" > $el/RMI.properties
+    fi
+  done
 
-    nursery_context=neo/io/managers/HubConnectionManager.properties
-    file=$escenic_conf_dir/engine/instance/$instance_name/$nursery_context
-    make_dir $(dirname $file)
-    
+  nursery_context=neo/io/managers/HubConnectionManager.properties
+  file=$escenic_conf_dir/engine/instance/$instance_name/$nursery_context
+  make_dir $(dirname $file)
+  
     # we don't touch it if the file already exists.
-    if [ ! -e $file ]; then
-        run echo "hostname=$HOSTNAME" >> $file
-    fi
+  if [ ! -e $file ]; then
+    run echo "hostname=$HOSTNAME" >> $file
+  fi
 }
 
 function set_up_proper_logging_configuration()
@@ -1438,45 +1440,6 @@ function set_up_user_environment()
   fi
 }
 
-function set_up_solr()
-{
-    run_hook set_up_solr.preinst
-    
-    print_and_log "Setting up solr ..."
-    if [ ! -d $escenic_conf_dir/solr ]; then
-        if [ $(is_using_conf_archive) -eq 1 ]; then
-            print_and_log "Using the supplied Solr configuration from" 
-            print_and_log "bundle: $ece_instance_conf_archive"
-            local a_tmp_dir=$(mktemp -d)
-            run cd $a_tmp_dir
-            run tar xzf $ece_instance_conf_archive engine/solr/conf
-            run cp -r engine/solr/conf $escenic_conf_dir/solr
-            run rm -r $a_tmp_dir
-        else
-            print_and_log "Installing default Solr conf shipped with ECE ..."
-            run cp -r $escenic_root_dir/engine/solr/conf $escenic_conf_dir/solr
-        fi
-    else
-        print_and_log "$escenic_conf_dir/solr already exists, not touching it."
-    fi
-
-    make_dir $escenic_data_dir/solr/
-    run cd $escenic_data_dir/solr/
-    if  [ ! -h conf ]; then
-        run ln -s $escenic_conf_dir/solr conf
-    fi
-
-    local editorial_search_instance=${fai_search_for_editor-0}
-    local file=$escenic_conf_dir/solr/solrconfig.xml
-    if [ $editorial_search_instance -eq 1 ]; then
-        run sed -i "s#<maxTime>[0-9]*</maxTime>#<maxTime>5000</maxTime>#g" $file
-    else
-        run sed -i "s#<maxTime>[0-9]*</maxTime>#<maxTime>60000</maxTime>#g" $file
-    fi
-
-    run_hook set_up_solr.postinst
-}
-
 # So far, I've used this method for copy/past-ing it into the shell
 # before running ece-insatll anew. It might be useful for its own
 # command later, though.
@@ -1785,7 +1748,6 @@ function set_archive_files_depending_on_profile()
     fi
 }
 
-
 # Returns 1 if we're installing the ECE instances from a provided EAR
 # file
 function is_installing_from_ear()
@@ -1833,65 +1795,6 @@ function verify_that_files_exist_and_are_readable()
     done
 }   
 
-## $1=<default instance name>
-function install_ece_instance()
-{
-    install_ece_third_party_packages
-    
-    ask_for_instance_name $1
-    set_up_engine_directories
-    set_up_ece_scripts
-
-    set_archive_files_depending_on_profile
-    
-    # most likely, the user is _not_ installing from archives (EAR +
-    # configuration bundle), hence the false test goes first.
-    if [ $(is_installing_from_ear) -eq 0 ]; then
-        download_escenic_components
-        check_for_required_downloads
-        set_up_engine_and_plugins
-        set_up_assembly_tool
-    else
-        verify_that_files_exist_and_are_readable \
-            $ece_instance_ear_file \
-            $ece_instance_conf_archive
-    fi
-    
-    set_up_basic_nursery_configuration
-    set_up_instance_specific_nursery_configuration
-    
-    set_up_app_server
-    set_up_proper_logging_configuration
-
-    # We set a WAR white list for all profiles except all in one
-    if [ $install_profile_number -ne $PROFILE_ALL_IN_ONE ]; then
-        file=$escenic_conf_dir/ece-${instance_name}.conf
-        print_and_log "Creating deployment white list in $file ..."
-        set_conf_file_value \
-            deploy_webapp_white_list \
-            $(get_deploy_white_list) \
-            $file
-    fi
-
-    if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER -a \
-        $install_profile_number -ne $PROFILE_SEARCH_SERVER ]; then
-        assemble_deploy_and_restart_type
-    fi
-    
-    update_type_instances_to_start_up
-    set_conf_file_value ece_unix_user $ece_user /etc/default/ece
-    set_conf_file_value ece_unix_group $ece_group /etc/default/ece
-
-    admin_uri=http://$HOSTNAME:${appserver_port}/escenic-admin/
-    add_next_step "New ECE instance $instance_name installed."
-    add_next_step "Admin interface: $admin_uri"
-    add_next_step "View installed versions with:" \
-      " ece -i $instance_name versions"
-    add_next_step "Type 'ece help' to see all the options of this script"
-    add_next_step "Read its guide: /usr/share/doc/escenic/ece-guide.txt"
-    add_next_step "/etc/default/ece lists all instances started at boot time"
-}
-
 function install_presentation_server()
 {
     print_and_log "Installing a presentation server on $HOSTNAME."
@@ -2004,100 +1907,6 @@ function run_hook()
     fi
 }
 
-function install_analysis_server()
-{
-    run_hook install_analysis_server.preinst
-    
-    print_and_log "Installing an analysis server on $HOSTNAME ..."
-    type=analysis
-    
-    install_ece_instance "analysis1"
-
-    run cp ${escenic_root_dir}/analysis-engine-*/wars/*.war \
-        ${tomcat_base}/webapps
-
-    if [ -n "${fai_analysis_host}" ]; then
-        appserver_host=${fai_analysis_host}
-    fi
-    if [ -n "${fai_analysis_port}" ]; then
-        appserver_port=${fai_analysis_port}
-    fi
-    
-    # deploy the EAE WARs
-    run cp ${escenic_root_dir}/analysis-engine-*/wars/*.war \
-        ${tomcat_base}/webapps
-
-    set_correct_permissions
-    
-    local ece_command="ece -i ${instance_name} -t ${type} start"
-    su - $ece_user -c "$ece_command" 1>>$log 2>>$log
-    exit_on_error "su - $ece_user -c \"$ece_command\""
-
-    local seconds=3
-    print_and_log "Waiting ${seconds} seconds for EAE to come up ..."
-    sleep 10
-    
-    # EAE cannot handle .cfg files with quotes values (!)
-    dont_quote_conf_values=1
-    
-    print_and_log "Configuring EAE Reports ..."
-    local file=${tomcat_base}/webapps/analysis-reports/WEB-INF/config/reports.cfg
-    set_conf_file_value queryServiceUrl \
-        http://${appserver_host}:${appserver_port}/analysis-qs/QueryService \
-        ${file}
-
-    print_and_log "Configuring EAE Logger ..."
-    local file=${tomcat_base}/webapps/analysis-logger/WEB-INF/config/logger.cfg
-    set_conf_file_value databaseQueueManager.reinsertcount \
-        6 \
-        ${file}
-    set_conf_file_value pageview.maintenance.cron.expr '0 0 4 * * ? *' $file
-    set_conf_file_value pageview.aggr.hour.cron.expr '0 10 * * * ?' $file
-    set_conf_file_value imageResponse false $file
-    set_conf_file_value pageview.maintenance.older.than.months 6 $file
-    set_conf_file_value pageview.aggr.day.older.than.days 7 $file
-    set_conf_file_value pageview.aggr.day.cron.expr '0 0 5 * * ? *' $file
-    set_conf_file_value pageview.aggr.hour.older.than.hours 2 $file
-    set_conf_file_value pageview.maintenance.older.than.days 0 $file
-
-    # important to turn this off here, it's only for the EAE .cfg
-    # files, see above.
-    dont_quote_conf_values=0
-
-    # touching web.xml to trigger a re-deploy of the EAE Reports
-    # application.
-    run touch ${tomcat_base}/webapps/analysis-reports/WEB-INF/web.xml
-    run_hook install_analysis_server.postinst
-}
-
-function install_rmi_hub()
-{
-    make_dir $escenic_conf_dir/rmi-hub
-    
-    run cp -r $escenic_root_dir/engine/contrib/rmi-hub/config/* \
-        $escenic_conf_dir/rmi-hub/
-
-    hub_host=$HOSTNAME
-    file=$common_nursery_dir
-    file=$file/neo/io/managers/HubConnectionManager.properties
-
-    make_dir $(basename $file)
-    set_conf_file_value hub \
-        "rmi://${hub_host}:1099/hub/Hub" \
-        $file
-
-    cat > $common_nursery_dir/io/api/EventManager.properties <<EOF
-clientConfiguration=/neo/io/services/HubConnection
-pingTime=10000
-EOF
-
-    add_next_step "Restart all your instances to make the hub see them."
-
-    print_and_log "Starting the RMI-hub on $HOSTNAME ..."
-    ece_command="ece -t rmi-hub restart"
-    su - $ece_user -c "$ece_command" 1>>$log 2>>$log
-}
-
 # reads the value of the desired setting from $conf_file
 #
 # parameters: $1 : the conf key, see ece-install-guide.txt for an
@@ -2218,37 +2027,6 @@ EOF
       " Maven repo"
 }
 
-function install_search_server()
-{
-    print_and_log "Installing a search server on $HOSTNAME ..."
-    type=search
-    install_ece_instance "search1" 0
-    
-    # TODO update instead of append
-    local dir=$common_nursery_dir/com/escenic/framework/search/solr
-    make_dir $dir
-    echo "solrServerURI=http://${search_host}:${search_port}/solr" \
-        >>  $dir/SolrSearchEngine.properties
-    
-    dir=$common_nursery_dir/com/escenic/webservice/search
-    make_dir $dir
-    echo "solrURI=http://${search_host}:${search_port}/solr/select" \
-        >> $dir/DelegatingSearchEngine.properties
-
-    dir=$common_nursery_dir/com/escenic/lucy
-    make_dir $dir
-    echo "solrURI=http://${search_host}:${search_port}/solr" \
-        >> $dir/LucySearchEngine.properties
-
-    dir=$common_nursery_dir/com/escenic/forum/search/lucy
-    make_dir $dir
-    echo "solrURI=http://${search_host}:${search_port}/solr" \
-        >> $dir/SearchEngine.properties
-
-    set_up_solr
-    assemble_deploy_and_restart_type
-}
-
 # useful for development and test environments.
 function install_all_in_one_environment()
 {
@@ -2351,294 +2129,6 @@ EOF
     fi
 }
 
-function install_munin_gatherer()
-{
-    print_and_log "Installing a Munin gatherer on $HOSTNAME ..."
-
-    if [ $on_debian_or_derivative -eq 1 ]; then
-        packages="munin"
-        install_packages_if_missing $packages
-    else
-        print_and_log "Munin gatherer installation not supported on your"
-        print_and_log "system :-( You will have to install it manually."
-        return
-    fi
-
-    if [ $fai_enabled -eq 0 ]; then
-        print "Which nodes shall this Munin monitor gather from?"
-        print "Separate your hosts with a space, e.g.: 'editor01 db01 web01'"
-        echo -n "Your choice> "
-        read user_munin_nodes
-        
-        if [ -n "$user_munin_nodes" ]; then
-            node_list=$user_munin_nodes
-        fi
-    else
-        node_list=${fai_monitoring_munin_node_list}
-    fi
-    
-    if [ -z "$node_list" ]; then
-        return
-    fi
-
-    for el in $node_list; do
-        print_and_log "Adding ${el} to the Munin gatherer on ${HOSTNAME} ..."
-        local file=/etc/munin/munin-conf.d/escenic.conf
-        cat >> $file <<EOF
-[${el}]
-    address $(get_ip $el)
-    use_node_name yes
-EOF
-    done
-
-    # TODO add the priveleged network to the Allowed stanza (i.e. the
-    # network wich will do the monitoring of the servers.
-    local file=/etc/apache2/conf.d/munin
-    if [ -n "$(get_privileged_hosts)" ]; then
-        local privileged_hosts=$(
-            echo $(get_privileged_hosts) | sed "s#\ #\\\ #g"
-        )
-        sed -i "s#Allow\ from\ localhost#Allow\ from\ ${privileged_hosts}\ localhost#g" \
-            $file
-        exit_on_error "Failed adding ${fai_privileged_hosts} to" \
-            "Munin's allowed addresses."
-        run /etc/init.d/apache2 reload
-    fi
-
-    add_next_step "Munin gatherer admin interface: http://${HOSTNAME}/munin"
-    add_next_step "Make sure all nodes allows its IP to connect to them."
-}
-
-## Installs the Nagios monitoring server.
-## $1 the nagios vendor/falvour, "nagios" and "icinga" are supported.
-function install_nagios_monitoring_server()
-{
-    print "Installing an $1 server on $HOSTNAME ..."
-    local monitoring_vendor=$1
-    
-    if [ $on_debian_or_derivative -eq 1 ]; then
-        if [[ $monitoring_vendor == $MONITORING_VENDOR_NAGIOS ]]; then
-            install_packages_if_missing apache2 nagios3 nagios-nrpe-plugin
-        else
-            install_packages_if_missing \
-                apache2 icinga nagios-nrpe-plugin icinga-doc
-        fi
-    fi
-
-    if [[ $monitoring_vendor == $MONITORING_VENDOR_ICINGA ]]; then
-        print "Setting user/pass for icinga admin ..."
-        local file=/etc/icinga/htpasswd.users
-        run htpasswd -b -c $file icingaadmin \
-            ${fai_monitoring_admin_password-admin}
-    fi
-    
-    # enable remote commands
-    if [[ $monitoring_vendor == $MONITORING_VENDOR_NAGIOS ]]; then
-        local file=/etc/nagios3/nagios.cfg
-    else
-        local file=/etc/icinga/icinga.cfg
-    fi
-    
-    dont_quote_conf_values=1
-    set_conf_file_value check_external_commands 1 $file
-    dont_quote_conf_values=0
-
-    for el in $fai_monitoring_host_list; do
-        set_up_monitoring_host_def $monitoring_vendor $el
-    done
-
-    if [[ $monitoring_vendor == $MONITORING_VENDOR_NAGIOS ]]; then
-        file=/etc/nagios3/conf.d/hostgroups_nagios2.cfg
-    else
-        file=/etc/icinga/objects/hostgroups_icinga.cfg
-    fi
-    
-    set_up_monitoring_host_group \
-        $file \
-        "ece-hosts" \
-        'Hosts running one or more ECE' \
-        ${fai_monitoring_ece_host_list}
-
-    set_up_monitoring_host_group \
-        $file \
-        "search-hosts" \
-        'Hosts running search instance(s) (Solr + indexer)' \
-        ${fai_monitoring_search_host_list}
-
-    if [[ $monitoring_vendor == $MONITORING_VENDOR_NAGIOS ]]; then
-        run /etc/init.d/nagios3 restart
-        add_next_step "Icinga monitoring interface: http://${HOSTNAME}/nagios3"
-    else
-        run /etc/init.d/icinga restart
-        add_next_step "Icinga monitoring interface: http://${HOSTNAME}/icinga"
-    fi
-    
-    run /etc/init.d/apache2 reload
-
-}
-
-## Sets up the definition file for a given monitoring host.
-##
-## $1 nagios flavour/vendor
-## $2 <host name>:<ip>, e.g.: fire:192.168.1.100
-function set_up_monitoring_host_def()
-{
-    local file=/etc/icinga/objects/${host_name}_icinga.cfg
-    if [[ $1 == $MONITORING_VENDOR_NAGIOS ]]; then
-        file=/etc/nagios3/conf.d/${host_name}_nagios2.cfg
-    fi
-    
-    local old_ifs=$IFS
-    IFS='#'
-    read host_name ip <<< "$2"
-    IFS=$old_ifs
-    
-    if [ $(grep "host_name $host_name" $file 2>/dev/null | wc -l) -gt 0 ]; then
-        print "$1 host" $host_name "already defined, skipping it."
-        return
-    fi
-
-    # TODO add more services based on what kind of host it is.
-    cat >> $file <<EOF
-define host {
-  use generic-host
-  host_name $host_name
-  alias $host_name
-  address $ip
-}
-
-define service {
-  use generic-service
-  host_name $host_name
-  service_description CPU load
-  check_command check_nrpe_1arg!check_load
-}
-EOF
-
-}
-
-function install_nagios_node()
-{
-    print "Installing a Nagios client on $HOSTNAME ..."
-    if [ $on_debian_or_derivative -eq 1 ]; then
-        install_packages_if_missing nagios-nrpe-server nagios-plugins
-    else
-      print_and_log "Nagios node installation not supported on your system"
-      print_and_log "You will have to install it manually."
-      return
-    fi
-    
-    local file=/etc/nagios/nrpe.cfg
-    dont_quote_conf_values=1
-    set_conf_file_value \
-        allowed_hosts \
-        127.0.0.1,${fai_monitoring_server_ip} \
-        $file
-    dont_quote_conf_values=0
-
-    run /etc/init.d/nagios-nrpe-server restart
-    add_next_step "A Nagios NRPE node has been installed on ${HOSTNAME}"
-}
-
-function install_munin_node()
-{
-    print_and_log "Installing a Munin node on $HOSTNAME ..."
-
-    # the IP of the monitoring server
-    local default_ip=127.0.0.1
-    if [ $fai_enabled -eq 1 ]; then
-        if [ -n "fai_monitoring_server_ip" ]; then
-            monitoring_server_ip=${fai_monitoring_server_ip}
-        fi
-    elif [ $install_profile_number -ne $PROFILE_MONITORING_SERVER ]; then
-        print "What is the IP of your monitoring server? If you don't know"
-        print "this, don't worry and just press ENTER"
-        echo -n "Your choice [${default_ip}]> "
-        read user_monitoring_server
-
-        if [ -n "$user_monitoring_server" ]; then
-            monitoring_server_ip=$user_monitoring_server
-        fi
-    fi
-
-    if [ -z "$monitoring_server_ip" ]; then
-        monitoring_server_ip=$default_ip
-    fi
-    
-    if [ $on_debian_or_derivative -eq 1 ]; then
-        packages="munin-node munin-plugins-extra munin-java-plugins"
-        install_packages_if_missing $packages
-    else
-        print_and_log "Munin node installation not supported on your system"
-        print_and_log "You will have to install it manually."
-        return
-    fi
-
-    if [ -n "$monitoring_server_ip" ]; then
-        escaped_munin_gather_ip=$(get_perl_escaped ${monitoring_server_ip})
-        file=/etc/munin/munin-node.conf
-        cat >> $file <<EOF
-
-# added by ece-install $(date)
-allow ${escaped_munin_gather_ip}
-EOF
-    fi
-    
-    # install the escenic_jstat munin plugin
-    local file=/usr/share/munin/plugins/escenic_jstat_
-    run wget $wget_opts \
-        https://github.com/mogsie/escenic-munin/raw/master/escenic_jstat_ \
-        -O $file
-    run chmod 755 $file
-
-    local instance_list=$(get_instance_list)
-    if [ -z "${instance_list}" ]; then
-        print_and_log "No ECE instances found on $HOSTNAME, so I'm not adding"
-        print_and_log "additional Munin configuration"  
-        add_next_step "A Munin node has been installed on $HOSTNAME"
-        return
-    fi
-    
-    local escenic_jstat_modules="_gc _gcoverhead _heap _uptime"
-    for current_instance in $instance_list; do
-        for module in $escenic_jstat_modules; do
-	          cd /usr/share/munin/plugins/
-	          make_ln escenic_jstat_ escenic_jstat_${current_instance}${module}
-        done
-
-        # we need to hack a bit since escenic_jstat_ looks for
-        # instance PIDs in $escenic_run_dir ece-<instance>.pid. It's
-        # now <type>-<instance>.pid
-        file=$escenic_run_dir/$type-${instance_name}.pid
-        if [ ! -e $file ]; then
-            run touch $file
-        fi
-
-        # enabling the instance specific munin entries:
-        for el in /usr/share/munin/plugins/escenic_jstat_[a-z]*; do
-            run cd /etc/munin/plugins
-            make_ln $el
-        done
-    done
-
-    # TODO in which version(s) of munin is this directory called
-    # client-conf.d?
-    file=/etc/munin/plugin-conf.d/munin-node
-    if [ -e $file ]; then
-        cat >> $file <<EOF
-[escenic*]
-user $ece_user
-
-EOF
-    fi
-    
-    if [ $on_debian_or_derivative -eq 1 ]; then
-        run service munin-node restart
-    fi
-
-    add_next_step "A Munin node has been installed on $HOSTNAME"
-}
-
 function add_server_to_runlevels()
 {
   # no need to add init.d scripts to the runlevel(s) for these
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh
new file mode 100644
index 00000000..a4c99b0c
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh
@@ -0,0 +1,67 @@
+# ece-install module for installing EAE
+
+function install_analysis_server()
+{
+  run_hook install_analysis_server.preinst
+  
+  print_and_log "Installing an analysis server on $HOSTNAME ..."
+  type=analysis
+  
+  install_ece_instance "analysis1"
+
+  run cp ${escenic_root_dir}/analysis-engine-*/wars/*.war \
+    ${tomcat_base}/webapps
+
+  if [ -n "${fai_analysis_host}" ]; then
+    appserver_host=${fai_analysis_host}
+  fi
+  if [ -n "${fai_analysis_port}" ]; then
+    appserver_port=${fai_analysis_port}
+  fi
+  
+    # deploy the EAE WARs
+  run cp ${escenic_root_dir}/analysis-engine-*/wars/*.war \
+    ${tomcat_base}/webapps
+
+  set_correct_permissions
+  
+  local ece_command="ece -i ${instance_name} -t ${type} start"
+  su - $ece_user -c "$ece_command" 1>>$log 2>>$log
+  exit_on_error "su - $ece_user -c \"$ece_command\""
+
+  local seconds=3
+  print_and_log "Waiting ${seconds} seconds for EAE to come up ..."
+  sleep 10
+  
+    # EAE cannot handle .cfg files with quotes values (!)
+  dont_quote_conf_values=1
+  
+  print_and_log "Configuring EAE Reports ..."
+  local file=${tomcat_base}/webapps/analysis-reports/WEB-INF/config/reports.cfg
+  set_conf_file_value queryServiceUrl \
+    http://${appserver_host}:${appserver_port}/analysis-qs/QueryService \
+    ${file}
+
+  print_and_log "Configuring EAE Logger ..."
+  local file=${tomcat_base}/webapps/analysis-logger/WEB-INF/config/logger.cfg
+  set_conf_file_value databaseQueueManager.reinsertcount \
+    6 \
+    ${file}
+  set_conf_file_value pageview.maintenance.cron.expr '0 0 4 * * ? *' $file
+  set_conf_file_value pageview.aggr.hour.cron.expr '0 10 * * * ?' $file
+  set_conf_file_value imageResponse false $file
+  set_conf_file_value pageview.maintenance.older.than.months 6 $file
+  set_conf_file_value pageview.aggr.day.older.than.days 7 $file
+  set_conf_file_value pageview.aggr.day.cron.expr '0 0 5 * * ? *' $file
+  set_conf_file_value pageview.aggr.hour.older.than.hours 2 $file
+  set_conf_file_value pageview.maintenance.older.than.days 0 $file
+
+    # important to turn this off here, it's only for the EAE .cfg
+    # files, see above.
+  dont_quote_conf_values=0
+
+    # touching web.xml to trigger a re-deploy of the EAE Reports
+    # application.
+  run touch ${tomcat_base}/webapps/analysis-reports/WEB-INF/web.xml
+  run_hook install_analysis_server.postinst
+}
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 28f2c0b2..16062922 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -1,39 +1,99 @@
+# ece-install module Content Engine specific code.
+
 function get_deploy_white_list()
 {
-    local white_list="escenic-admin"
-    
-    if [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER \
-        -a -n "${publication_name}" ]; then
-        white_list="${white_list} ${publication_name} "
-    elif [ $install_profile_number -eq $PROFILE_SEARCH_SERVER ]; then 
-        white_list="${white_list} solr indexer-webapp"
-    elif [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ]; then
-        white_list="${white_list} "$(get_publication_short_name_list)
-    elif [ $install_profile_number -eq $PROFILE_EDITORIAL_SERVER ]; then
-        white_list="${white_list} escenic studio indexer-webservice"
-        white_list="${white_list} "$(get_publication_short_name_list)
-    fi
-
-    echo ${white_list}
+  local white_list="escenic-admin"
+  
+  if [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER \
+    -a -n "${publication_name}" ]; then
+    white_list="${white_list} ${publication_name} "
+  elif [ $install_profile_number -eq $PROFILE_SEARCH_SERVER ]; then 
+    white_list="${white_list} solr indexer-webapp"
+  elif [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ]; then
+    white_list="${white_list} "$(get_publication_short_name_list)
+  elif [ $install_profile_number -eq $PROFILE_EDITORIAL_SERVER ]; then
+    white_list="${white_list} escenic studio indexer-webservice"
+    white_list="${white_list} "$(get_publication_short_name_list)
+  fi
+
+  echo ${white_list}
 }
 
 function get_publication_short_name_list()
 {
-    local short_name_list=""
-    
-    local publication_def_dir=${escenic_root_dir}/assemblytool/publications
-    if [ $(ls ${publication_def_dir} | grep .properties$ | wc -l) -eq 0 ]; then
-        echo ${short_name_list}
-        return
-    fi
-
-    for el in $(find ${publication_def_dir} -maxdepth 1 -name "*.properties"); do
-        local short_name=$(basename $el .properties)
-        short_name_list="${short_name_list} ${short_name}"
-    done
-
+  local short_name_list=""
+  
+  local publication_def_dir=${escenic_root_dir}/assemblytool/publications
+  if [ $(ls ${publication_def_dir} | grep .properties$ | wc -l) -eq 0 ]; then
     echo ${short_name_list}
+    return
+  fi
+
+  for el in $(find ${publication_def_dir} -maxdepth 1 -name "*.properties"); do
+    local short_name=$(basename $el .properties)
+    short_name_list="${short_name_list} ${short_name}"
+  done
+
+  echo ${short_name_list}
 }
 
+## $1=<default instance name>
+function install_ece_instance()
+{
+  install_ece_third_party_packages
+  
+  ask_for_instance_name $1
+  set_up_engine_directories
+  set_up_ece_scripts
+
+  set_archive_files_depending_on_profile
+  
+    # most likely, the user is _not_ installing from archives (EAR +
+    # configuration bundle), hence the false test goes first.
+  if [ $(is_installing_from_ear) -eq 0 ]; then
+    download_escenic_components
+    check_for_required_downloads
+    set_up_engine_and_plugins
+    set_up_assembly_tool
+  else
+    verify_that_files_exist_and_are_readable \
+      $ece_instance_ear_file \
+      $ece_instance_conf_archive
+  fi
+  
+  set_up_basic_nursery_configuration
+  set_up_instance_specific_nursery_configuration
+  
+  set_up_app_server
+  set_up_proper_logging_configuration
+
+    # We set a WAR white list for all profiles except all in one
+  if [ $install_profile_number -ne $PROFILE_ALL_IN_ONE ]; then
+    file=$escenic_conf_dir/ece-${instance_name}.conf
+    print_and_log "Creating deployment white list in $file ..."
+    set_conf_file_value \
+      deploy_webapp_white_list \
+      $(get_deploy_white_list) \
+      $file
+  fi
 
+  if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER -a \
+    $install_profile_number -ne $PROFILE_SEARCH_SERVER ]; then
+    assemble_deploy_and_restart_type
+    install_memory_cache
+  fi
+  
+  update_type_instances_to_start_up
+  set_conf_file_value ece_unix_user $ece_user /etc/default/ece
+  set_conf_file_value ece_unix_group $ece_group /etc/default/ece
+
+  admin_uri=http://$HOSTNAME:${appserver_port}/escenic-admin/
+  add_next_step "New ECE instance $instance_name installed."
+  add_next_step "Admin interface: $admin_uri"
+  add_next_step "View installed versions with:" \
+    " ece -i $instance_name versions"
+  add_next_step "Type 'ece help' to see all the options of this script"
+  add_next_step "Read its guide: /usr/share/doc/escenic/ece-guide.txt"
+  add_next_step "/etc/default/ece lists all instances started at boot time"
+}
 
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh b/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
index 44bc6a57..2ff196cf 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
@@ -1,3 +1,5 @@
+# ece-install module for installing the memory cache
+
 memcached_java_lib_url=http://img.whalin.com/memcached/jdk5/log4j/java_memcached-release_2.0.1.tar.gz
 
 ## $1: root directory of the publication
@@ -12,15 +14,15 @@ function memcached_create_publication_nursery_component() {
   make_dir $dir
   local file=$dir/PresentationArticleCache.properties
   sed -i "s#\$class=.*#\$class=neo.util.cache.Memcached#g" $file
+  exit_on_error "sed on $file"
 }
 
-function install_memcached()
+function install_memory_cache()
 {
-  if [ $on_debian_or_derivative ]; then
-    install_packages_if_missing "memcached"
-  fi
+  install_packages_if_missing "memcached"
+  assert_pre_requisite memcached
   
-  run $download_dir
+  run cd $download_dir
   run wget $wget_opts $memcached_java_lib_url
   local name=$(get_base_dir_from_bundle $memcached_java_lib_url)
   run cp $name/$name.jar $assemblytool_home/lib
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
new file mode 100644
index 00000000..9fc01959
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -0,0 +1,290 @@
+# module for installing monitoring software, both server and client side.
+
+## Installs the Nagios monitoring server.
+## $1 the nagios vendor/falvour, "nagios" and "icinga" are supported.
+function install_nagios_monitoring_server()
+{
+  print "Installing an $1 server on $HOSTNAME ..."
+  local monitoring_vendor=$1
+  
+  if [ $on_debian_or_derivative -eq 1 ]; then
+    if [[ $monitoring_vendor == $MONITORING_VENDOR_NAGIOS ]]; then
+      install_packages_if_missing apache2 nagios3 nagios-nrpe-plugin
+    else
+      install_packages_if_missing \
+        apache2 icinga nagios-nrpe-plugin icinga-doc
+    fi
+  fi
+
+  if [[ $monitoring_vendor == $MONITORING_VENDOR_ICINGA ]]; then
+    print "Setting user/pass for icinga admin ..."
+    local file=/etc/icinga/htpasswd.users
+    run htpasswd -b -c $file icingaadmin \
+      ${fai_monitoring_admin_password-admin}
+  fi
+  
+    # enable remote commands
+  if [[ $monitoring_vendor == $MONITORING_VENDOR_NAGIOS ]]; then
+    local file=/etc/nagios3/nagios.cfg
+  else
+    local file=/etc/icinga/icinga.cfg
+  fi
+  
+  dont_quote_conf_values=1
+  set_conf_file_value check_external_commands 1 $file
+  dont_quote_conf_values=0
+
+  for el in $fai_monitoring_host_list; do
+    set_up_monitoring_host_def $monitoring_vendor $el
+  done
+
+  if [[ $monitoring_vendor == $MONITORING_VENDOR_NAGIOS ]]; then
+    file=/etc/nagios3/conf.d/hostgroups_nagios2.cfg
+  else
+    file=/etc/icinga/objects/hostgroups_icinga.cfg
+  fi
+  
+  set_up_monitoring_host_group \
+    $file \
+    "ece-hosts" \
+    'Hosts running one or more ECE' \
+    ${fai_monitoring_ece_host_list}
+
+  set_up_monitoring_host_group \
+    $file \
+    "search-hosts" \
+    'Hosts running search instance(s) (Solr + indexer)' \
+    ${fai_monitoring_search_host_list}
+
+  if [[ $monitoring_vendor == $MONITORING_VENDOR_NAGIOS ]]; then
+    run /etc/init.d/nagios3 restart
+    add_next_step "Icinga monitoring interface: http://${HOSTNAME}/nagios3"
+  else
+    run /etc/init.d/icinga restart
+    add_next_step "Icinga monitoring interface: http://${HOSTNAME}/icinga"
+  fi
+  
+  run /etc/init.d/apache2 reload
+
+}
+
+## Sets up the definition file for a given monitoring host.
+##
+## $1 nagios flavour/vendor
+## $2 <host name>:<ip>, e.g.: fire:192.168.1.100
+function set_up_monitoring_host_def()
+{
+  local file=/etc/icinga/objects/${host_name}_icinga.cfg
+  if [[ $1 == $MONITORING_VENDOR_NAGIOS ]]; then
+    file=/etc/nagios3/conf.d/${host_name}_nagios2.cfg
+  fi
+  
+  local old_ifs=$IFS
+  IFS='#'
+  read host_name ip <<< "$2"
+  IFS=$old_ifs
+  
+  if [ $(grep "host_name $host_name" $file 2>/dev/null | wc -l) -gt 0 ]; then
+    print "$1 host" $host_name "already defined, skipping it."
+    return
+  fi
+
+    # TODO add more services based on what kind of host it is.
+  cat >> $file <<EOF
+define host {
+  use generic-host
+  host_name $host_name
+  alias $host_name
+  address $ip
+}
+
+define service {
+  use generic-service
+  host_name $host_name
+  service_description CPU load
+  check_command check_nrpe_1arg!check_load
+}
+EOF
+
+}
+
+function install_nagios_node()
+{
+  print "Installing a Nagios client on $HOSTNAME ..."
+  if [ $on_debian_or_derivative -eq 1 ]; then
+    install_packages_if_missing nagios-nrpe-server nagios-plugins
+  else
+    print_and_log "Nagios node installation not supported on your system"
+    print_and_log "You will have to install it manually."
+    return
+  fi
+  
+  local file=/etc/nagios/nrpe.cfg
+  dont_quote_conf_values=1
+  set_conf_file_value \
+    allowed_hosts \
+    127.0.0.1,${fai_monitoring_server_ip} \
+    $file
+  dont_quote_conf_values=0
+
+  run /etc/init.d/nagios-nrpe-server restart
+  add_next_step "A Nagios NRPE node has been installed on ${HOSTNAME}"
+}
+
+function install_munin_node()
+{
+  print_and_log "Installing a Munin node on $HOSTNAME ..."
+
+    # the IP of the monitoring server
+  local default_ip=127.0.0.1
+  if [ $fai_enabled -eq 1 ]; then
+    if [ -n "fai_monitoring_server_ip" ]; then
+      monitoring_server_ip=${fai_monitoring_server_ip}
+    fi
+  elif [ $install_profile_number -ne $PROFILE_MONITORING_SERVER ]; then
+    print "What is the IP of your monitoring server? If you don't know"
+    print "this, don't worry and just press ENTER"
+    echo -n "Your choice [${default_ip}]> "
+    read user_monitoring_server
+
+    if [ -n "$user_monitoring_server" ]; then
+      monitoring_server_ip=$user_monitoring_server
+    fi
+  fi
+
+  if [ -z "$monitoring_server_ip" ]; then
+    monitoring_server_ip=$default_ip
+  fi
+  
+  if [ $on_debian_or_derivative -eq 1 ]; then
+    packages="munin-node munin-plugins-extra munin-java-plugins"
+    install_packages_if_missing $packages
+  else
+    print_and_log "Munin node installation not supported on your system"
+    print_and_log "You will have to install it manually."
+    return
+  fi
+
+  if [ -n "$monitoring_server_ip" ]; then
+    escaped_munin_gather_ip=$(get_perl_escaped ${monitoring_server_ip})
+    file=/etc/munin/munin-node.conf
+    cat >> $file <<EOF
+
+# added by ece-install $(date)
+allow ${escaped_munin_gather_ip}
+EOF
+  fi
+  
+    # install the escenic_jstat munin plugin
+  local file=/usr/share/munin/plugins/escenic_jstat_
+  run wget $wget_opts \
+    https://github.com/mogsie/escenic-munin/raw/master/escenic_jstat_ \
+    -O $file
+  run chmod 755 $file
+
+  local instance_list=$(get_instance_list)
+  if [ -z "${instance_list}" ]; then
+    print_and_log "No ECE instances found on $HOSTNAME, so I'm not adding"
+    print_and_log "additional Munin configuration"  
+    add_next_step "A Munin node has been installed on $HOSTNAME"
+    return
+  fi
+  
+  local escenic_jstat_modules="_gc _gcoverhead _heap _uptime"
+  for current_instance in $instance_list; do
+    for module in $escenic_jstat_modules; do
+	    cd /usr/share/munin/plugins/
+	    make_ln escenic_jstat_ escenic_jstat_${current_instance}${module}
+    done
+
+        # we need to hack a bit since escenic_jstat_ looks for
+        # instance PIDs in $escenic_run_dir ece-<instance>.pid. It's
+        # now <type>-<instance>.pid
+    file=$escenic_run_dir/$type-${instance_name}.pid
+    if [ ! -e $file ]; then
+      run touch $file
+    fi
+
+        # enabling the instance specific munin entries:
+    for el in /usr/share/munin/plugins/escenic_jstat_[a-z]*; do
+      run cd /etc/munin/plugins
+      make_ln $el
+    done
+  done
+
+    # TODO in which version(s) of munin is this directory called
+    # client-conf.d?
+  file=/etc/munin/plugin-conf.d/munin-node
+  if [ -e $file ]; then
+    cat >> $file <<EOF
+[escenic*]
+user $ece_user
+
+EOF
+  fi
+  
+  if [ $on_debian_or_derivative -eq 1 ]; then
+    run service munin-node restart
+  fi
+
+  add_next_step "A Munin node has been installed on $HOSTNAME"
+}
+
+
+function install_munin_gatherer()
+{
+  print_and_log "Installing a Munin gatherer on $HOSTNAME ..."
+
+  if [ $on_debian_or_derivative -eq 1 ]; then
+    packages="munin"
+    install_packages_if_missing $packages
+  else
+    print_and_log "Munin gatherer installation not supported on your"
+    print_and_log "system :-( You will have to install it manually."
+    return
+  fi
+
+  if [ $fai_enabled -eq 0 ]; then
+    print "Which nodes shall this Munin monitor gather from?"
+    print "Separate your hosts with a space, e.g.: 'editor01 db01 web01'"
+    echo -n "Your choice> "
+    read user_munin_nodes
+    
+    if [ -n "$user_munin_nodes" ]; then
+      node_list=$user_munin_nodes
+    fi
+  else
+    node_list=${fai_monitoring_munin_node_list}
+  fi
+  
+  if [ -z "$node_list" ]; then
+    return
+  fi
+
+  for el in $node_list; do
+    print_and_log "Adding ${el} to the Munin gatherer on ${HOSTNAME} ..."
+    local file=/etc/munin/munin-conf.d/escenic.conf
+    cat >> $file <<EOF
+[${el}]
+    address $(get_ip $el)
+    use_node_name yes
+EOF
+  done
+
+    # TODO add the priveleged network to the Allowed stanza (i.e. the
+    # network wich will do the monitoring of the servers.
+  local file=/etc/apache2/conf.d/munin
+  if [ -n "$(get_privileged_hosts)" ]; then
+    local privileged_hosts=$(
+      echo $(get_privileged_hosts) | sed "s#\ #\\\ #g"
+    )
+    sed -i "s#Allow\ from\ localhost#Allow\ from\ ${privileged_hosts}\ localhost#g" \
+      $file
+    exit_on_error "Failed adding ${fai_privileged_hosts} to" \
+      "Munin's allowed addresses."
+    run /etc/init.d/apache2 reload
+  fi
+
+  add_next_step "Munin gatherer admin interface: http://${HOSTNAME}/munin"
+  add_next_step "Make sure all nodes allows its IP to connect to them."
+}
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
new file mode 100644
index 00000000..fd293f8b
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
@@ -0,0 +1,71 @@
+# ece-install module for installing the search server
+
+function install_search_server()
+{
+  print_and_log "Installing a search server on $HOSTNAME ..."
+  type=search
+  install_ece_instance "search1" 0
+  
+  # TODO update instead of append
+  local dir=$common_nursery_dir/com/escenic/framework/search/solr
+  make_dir $dir
+  echo "solrServerURI=http://${search_host}:${search_port}/solr" \
+    >>  $dir/SolrSearchEngine.properties
+  
+  dir=$common_nursery_dir/com/escenic/webservice/search
+  make_dir $dir
+  echo "solrURI=http://${search_host}:${search_port}/solr/select" \
+    >> $dir/DelegatingSearchEngine.properties
+
+  dir=$common_nursery_dir/com/escenic/lucy
+  make_dir $dir
+  echo "solrURI=http://${search_host}:${search_port}/solr" \
+    >> $dir/LucySearchEngine.properties
+
+  dir=$common_nursery_dir/com/escenic/forum/search/lucy
+  make_dir $dir
+  echo "solrURI=http://${search_host}:${search_port}/solr" \
+    >> $dir/SearchEngine.properties
+
+  set_up_solr
+  assemble_deploy_and_restart_type
+}
+
+function set_up_solr()
+{
+  run_hook set_up_solr.preinst
+  
+  print_and_log "Setting up solr ..."
+  if [ ! -d $escenic_conf_dir/solr ]; then
+    if [ $(is_using_conf_archive) -eq 1 ]; then
+      print_and_log "Using the supplied Solr configuration from" 
+      print_and_log "bundle: $ece_instance_conf_archive"
+      local a_tmp_dir=$(mktemp -d)
+      run cd $a_tmp_dir
+      run tar xzf $ece_instance_conf_archive engine/solr/conf
+      run cp -r engine/solr/conf $escenic_conf_dir/solr
+      run rm -r $a_tmp_dir
+    else
+      print_and_log "Installing default Solr conf shipped with ECE ..."
+      run cp -r $escenic_root_dir/engine/solr/conf $escenic_conf_dir/solr
+    fi
+  else
+    print_and_log "$escenic_conf_dir/solr already exists, not touching it."
+  fi
+
+  make_dir $escenic_data_dir/solr/
+  run cd $escenic_data_dir/solr/
+  if  [ ! -h conf ]; then
+    run ln -s $escenic_conf_dir/solr conf
+  fi
+
+  local editorial_search_instance=${fai_search_for_editor-0}
+  local file=$escenic_conf_dir/solr/solrconfig.xml
+  if [ $editorial_search_instance -eq 1 ]; then
+    run sed -i "s#<maxTime>[0-9]*</maxTime>#<maxTime>5000</maxTime>#g" $file
+  else
+    run sed -i "s#<maxTime>[0-9]*</maxTime>#<maxTime>60000</maxTime>#g" $file
+  fi
+
+  run_hook set_up_solr.postinst
+}

From 3da4a9fdc02a83d25aeaac455275de0eda4dc2c3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 28 Feb 2012 18:55:43 +0800
Subject: [PATCH 0355/2585] - added documentation on the profile=analysis

---
 usr/share/doc/escenic/ece-install-guide.org | 99 ++++++++++++---------
 1 file changed, 56 insertions(+), 43 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index e5df4b18..46a7b633 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -293,6 +293,11 @@ what's available on the host where it's run):
 - ECE, cache and web server configuration
 - Escenic software
 
+** Profile - Analysis Server
+This profile will install the Escenic Analysis Engine and configure it
+for production use with sane defaults. Be sure to use a different DB
+than you use for ECE.
+
 ** Running interactively
 *** Start ece-install and choose the Option, "Restore from backup"
 #+BEGIN_SRC text
@@ -512,51 +517,59 @@ The ece-install script understands for the following settings in the
 $HOME/ece-install.conf file of the root user:
 
 |-----------------------------------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------|
-| Parameter                               |                                           Default | Description                                                                                                                           |
+| Parameter                               | Default                                           | Description                                                                                                                           |
 |-----------------------------------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------|
-| fai\_all\_install                       |                                                 0 | Install all components on your server.                                                                                                |
-| fai\_cache\_backends                    |                                  ${HOSTNAME}:8080 | Space separated, e.g. "app1:8080 app2:8080"                                                                                           |
-| fai\_cache\_install                     |                                                 0 | Install cache server profile                                                                                                          |
-| fai\_db\_host                           |                                         $HOSTNAME | Useful for editor & presentation profiles                                                                                             |
-| fai\_db\_drop\_old\_db\_first           |                                                 0 | Warning: this will drop the old database before installing a new one                                                                  |
-| fai\_db\_install                        |                                                 0 | Install db profile                                                                                                                    |
-| fai\_db\_password                       |                              read-the-source-luke | Useful for DB installation profile                                                                                                    |
-| fai\_db\_port                           |                                              3306 | Useful for editor & presentation profiles                                                                                             |
-| fai\_db\_schema                         |                                            ece5db | Useful for DB installation profile                                                                                                    |
-| fai\_db\_user                           |                                          ece5user | Useful for DB installation profile                                                                                                    |
-| fai\_editor\_conf\_archive              |                                                "" | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
-| fai\_editor\_ear                        |                                                "" | EAR to use instead of the Escenic binaries                                                                                            |
-| fai\_editor\_install                    |                                                 0 | Install the editorial profile                                                                                                         |
-| fai\_editor\_name                       |                                           editor1 | Name of the editor instance                                                                                                           |
-| fai\_editor\_port                       |                                              8080 | HTTP port of the editor instance                                                                                                      |
-| fai\_editor\_shutdown                   |                                              8005 | Shutdown port of the editor instance                                                                                                  |
-| fai\_enabled                            |                                                 0 | Whether or not to run ece-install in FAI mode                                                                                         |
-| fai\_monitoring\_server\_install        |                                                 0 | Install the monitoring server profile.                                                                                                |
-| fai\_monitoring\_server\_ip             |                                         127.0.0.1 | The IP of the monitoring server.                                                                                                      |
-| fai\_presentation\_conf\_archive        |                                                "" | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
-| fai\_presentation\_ear                  |                                                "" | EAR to use instead of the Escenic binaries                                                                                            |
-| fai\_presentation\_install              |                                                 0 | Install the presentation server profile                                                                                               |
-| fai\_presentation\_name                 |                                              web1 | Name of the presentation server instance                                                                                              |
-| fai\_presentation\_port                 |                                              8080 | HTTP port of the presentation server instance                                                                                         |
-| fai\_presentation\_shutdown             |                                              8005 | Shutdown port of the presentation instance                                                                                            |
-| fai\_public\_host\_name                 |                                  ${HOSTNAME}:8080 | The public address for your website                                                                                                   |
-| fai\_publication\_create                |                                                 0 | Create a new publication                                                                                                              |
-| fai\_publication\_name                  |                                             mypub | Name of the publication                                                                                                               |
-| fai\_publication\_use\_instance         |                                              dev1 | Name of local instance to use for creation                                                                                            |
-| fai\_publication\_war                   |                              "WF or ECE demo WAR" | WAR to base the new publication on                                                                                                    |
-| fai\_publication\_war\_uri\_list        |                                                "" | Publication WARs used for setting up Assembly tool. Supported: http[s]://tmp.com/mypub.war, file:///tmp/mypub.war and /tmp/mypub.war. |
-| fai\_publication\_domain\_mapping\_list |                                                "" | Mapping between publication names and their corresponding domains on the form: "one#one.com other#other.com"                          |
-| fai\_rmi\_install                       |                                                 0 | Install RMI hub profile                                                                                                               |
-| fai\_search\_conf\_archive              |                                                "" | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
-| fai\_search\_ear                        |                                                "" | EAR to use instead of the Escenic binaries                                                                                            |
-| fai\_search\_for\_editor                |                                                 0 | If 1 (true), will configure Solr for use with an editorial server, if not conf for presentation servers will be chosen.               |
+| fai\_all\_install                       | 0                                                 | Install all components on your server.                                                                                                |
+| fai\_analysis\_db\_port                 | 3306                                              | For the EAE DB (different from ECE's)                                                                                                 |
+| fai\_analysis\_db\_host                 | localhost                                         | For the EAE DB (different from ECE's)                                                                                                 |
+| fai\_analysis\_db\_user                 | ece5user                                          | For the EAE DB (different from ECE's)                                                                                                 |
+| fai\_analysis\_db\_password             | read-the-source-luke                              | For the EAE DB (different from ECE's)                                                                                                 |
+| fai\_analysis\_db\_schema               | ece5db                                            | For the EAE DB (different from ECE's)                                                                                                                                      |
+| fai\_analysis\_port                     | 8080                                              | Port of the EAE                                                                                                                       |
+| fai\_analysis\_shutdown                 | 8005                                              | Shutdown port for the EAE app server                                                                                                  |
+| fai\_analysis\_name                     | analysis1                                         | EAE instance name                                                                                                                     |
+| fai\_cache\_backends                    | ${HOSTNAME}:8080                                  | Space separated, e.g. "app1:8080 app2:8080"                                                                                           |
+| fai\_cache\_install                     | 0                                                 | Install cache server profile                                                                                                          |
+| fai\_db\_host                           | $HOSTNAME                                         | Useful for editor & presentation profiles                                                                                             |
+| fai\_db\_drop\_old\_db\_first           | 0                                                 | Warning: this will drop the old database before installing a new one                                                                  |
+| fai\_db\_install                        | 0                                                 | Install db profile                                                                                                                    |
+| fai\_db\_password                       | read-the-source-luke                              | Useful for DB installation profile                                                                                                    |
+| fai\_db\_port                           | 3306                                              | Useful for editor & presentation profiles                                                                                             |
+| fai\_db\_schema                         | ece5db                                            | Useful for DB installation profile                                                                                                    |
+| fai\_db\_user                           | ece5user                                          | Useful for DB installation profile                                                                                                    |
+| fai\_editor\_conf\_archive              | ""                                                | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
+| fai\_editor\_ear                        | ""                                                | EAR to use instead of the Escenic binaries                                                                                            |
+| fai\_editor\_install                    | 0                                                 | Install the editorial profile                                                                                                         |
+| fai\_editor\_name                       | editor1                                           | Name of the editor instance                                                                                                           |
+| fai\_editor\_port                       | 8080                                              | HTTP port of the editor instance                                                                                                      |
+| fai\_editor\_shutdown                   | 8005                                              | Shutdown port of the editor instance                                                                                                  |
+| fai\_enabled                            | 0                                                 | Whether or not to run ece-install in FAI mode                                                                                         |
+| fai\_monitoring\_server\_install        | 0                                                 | Install the monitoring server profile.                                                                                                |
+| fai\_monitoring\_server\_ip             | 127.0.0.1                                         | The IP of the monitoring server.                                                                                                      |
+| fai\_presentation\_conf\_archive        | ""                                                | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
+| fai\_presentation\_ear                  | ""                                                | EAR to use instead of the Escenic binaries                                                                                            |
+| fai\_presentation\_install              | 0                                                 | Install the presentation server profile                                                                                               |
+| fai\_presentation\_name                 | web1                                              | Name of the presentation server instance                                                                                              |
+| fai\_presentation\_port                 | 8080                                              | HTTP port of the presentation server instance                                                                                         |
+| fai\_presentation\_shutdown             | 8005                                              | Shutdown port of the presentation instance                                                                                            |
+| fai\_public\_host\_name                 | ${HOSTNAME}:8080                                  | The public address for your website                                                                                                   |
+| fai\_publication\_create                | 0                                                 | Create a new publication                                                                                                              |
+| fai\_publication\_name                  | mypub                                             | Name of the publication                                                                                                               |
+| fai\_publication\_use\_instance         | dev1                                              | Name of local instance to use for creation                                                                                            |
+| fai\_publication\_war                   | "WF or ECE demo WAR"                              | WAR to base the new publication on                                                                                                    |
+| fai\_publication\_war\_uri\_list        | ""                                                | Publication WARs used for setting up Assembly tool. Supported: http[s]://tmp.com/mypub.war, file:///tmp/mypub.war and /tmp/mypub.war. |
+| fai\_publication\_domain\_mapping\_list | ""                                                | Mapping between publication names and their corresponding domains on the form: "one#one.com other#other.com"                          |
+| fai\_rmi\_install                       | 0                                                 | Install RMI hub profile                                                                                                               |
+| fai\_search\_conf\_archive              | ""                                                | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
+| fai\_search\_ear                        | ""                                                | EAR to use instead of the Escenic binaries                                                                                            |
+| fai\_search\_for\_editor                | 0                                                 | If 1 (true), will configure Solr for use with an editorial server, if not conf for presentation servers will be chosen.               |
 | fai\_search\_indexer\_ws\_uri           | http://${HOSTNAME}:8080/indexer-webservice/index/ | URI of the indexer-webservice that the search instance shall use for knowing what to index.                                           |
-| fai\_search\_install                    |                                                 0 | Install the search server profile (Solr + indexer)                                                                                    |
-| fai\_search\_name                       |                                           search1 | Name of the search instance                                                                                                           |
-| fai\_search\_port                       |                                              8080 | HTTP port of the search instance                                                                                                      |
-| fai\_search\_shutdown                   |                                              8005 | Shutdown port of the search instance                                                                                                  |
-| fai\_keep\_off\_etc\_hosts              |                                                 0 | Set this to 1 if you don't want ece-install adding entries to /etc/hosts                                                              |
-| fai\_wf\_install                        |                                                 0 | Install Widget Framework profile                                                                                                      |
+| fai\_search\_install                    | 0                                                 | Install the search server profile (Solr + indexer)                                                                                    |
+| fai\_search\_name                       | search1                                           | Name of the search instance                                                                                                           |
+| fai\_search\_port                       | 8080                                              | HTTP port of the search instance                                                                                                      |
+| fai\_search\_shutdown                   | 8005                                              | Shutdown port of the search instance                                                                                                  |
+| fai\_keep\_off\_etc\_hosts              | 0                                                 | Set this to 1 if you don't want ece-install adding entries to /etc/hosts                                                              |
+| fai\_wf\_install                        | 0                                                 | Install Widget Framework profile                                                                                                      |
 |-----------------------------------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------|
 #+TBLFM: $2=http://$fai_editor_name:$fai_editor_port/indexer-webservice/index/                   0
 

From 5fc11d0f07c69a47ae233a7158686b10d0bba14a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 28 Feb 2012 18:56:01 +0800
Subject: [PATCH 0356/2585] - update markup

---
 usr/share/doc/escenic/ece-install-guide.html | 106 +++++++++++++------
 1 file changed, 72 insertions(+), 34 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.html b/usr/share/doc/escenic/ece-install-guide.html
index e7ab8faf..b03ed535 100644
--- a/usr/share/doc/escenic/ece-install-guide.html
+++ b/usr/share/doc/escenic/ece-install-guide.html
@@ -7,7 +7,7 @@
 <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
 <meta name="title" content="Welcome to the /usr/sbin/ece-install Guide"/>
 <meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2012-02-28 12:37:37 CST"/>
+<meta name="generated" content="2012-02-28 18:55:47 CST"/>
 <meta name="author" content="Torstein Krause Johansen"/>
 <meta name="description" content=""/>
 <meta name="keywords" content=""/>
@@ -231,8 +231,9 @@ <h2>Table of Contents</h2>
 <li><a href="#sec-1">1 Supported Operating Systems</a>
 <ul>
 <li><a href="#sec-1-1">1.1 Debian based operating systems</a></li>
-<li><a href="#sec-1-2">1.2 Other GNU/Linux and Unix systems</a></li>
-<li><a href="#sec-1-3">1.3 Tested Operating Systems</a></li>
+<li><a href="#sec-1-2">1.2 RedHat based operating systems</a></li>
+<li><a href="#sec-1-3">1.3 Other GNU/Linux and Unix systems</a></li>
+<li><a href="#sec-1-4">1.4 Tested Operating Systems</a></li>
 </ul>
 </li>
 <li><a href="#sec-2">2 A Note on Running ece-install On Non-GNU/Linux Systems</a></li>
@@ -261,16 +262,17 @@ <h2>Table of Contents</h2>
 <li><a href="#sec-5-9">5.9 Profile - Create Publication</a></li>
 <li><a href="#sec-5-10">5.10 Profile - Monitoring Server</a></li>
 <li><a href="#sec-5-11">5.11 Profile - Restoring from backup</a></li>
-<li><a href="#sec-5-12">5.12 Running interactively</a>
+<li><a href="#sec-5-12">5.12 Profile - Analysis Server</a></li>
+<li><a href="#sec-5-13">5.13 Running interactively</a>
 <ul>
-<li><a href="#sec-5-12-1">5.12.1 Start ece-install and choose the Option, "Restore from backup"</a></li>
-<li><a href="#sec-5-12-2">5.12.2 Select Which Backup to Restore</a></li>
-<li><a href="#sec-5-12-3">5.12.3 Choose What to Restore</a></li>
-<li><a href="#sec-5-12-4">5.12.4 Sit Back and Watch ece-install Restore the Data for You</a></li>
+<li><a href="#sec-5-13-1">5.13.1 Start ece-install and choose the Option, "Restore from backup"</a></li>
+<li><a href="#sec-5-13-2">5.13.2 Select Which Backup to Restore</a></li>
+<li><a href="#sec-5-13-3">5.13.3 Choose What to Restore</a></li>
+<li><a href="#sec-5-13-4">5.13.4 Sit Back and Watch ece-install Restore the Data for You</a></li>
 </ul>
 </li>
-<li><a href="#sec-5-13">5.13 Running in FAI mode</a></li>
-<li><a href="#sec-5-14">5.14 Data security</a></li>
+<li><a href="#sec-5-14">5.14 Running in FAI mode</a></li>
+<li><a href="#sec-5-15">5.15 Data security</a></li>
 </ul>
 </li>
 <li><a href="#sec-6">6 Full Automatic Install (FAI)</a>
@@ -335,9 +337,25 @@ <h3 id="sec-1-1"><span class="section-number-3">1.1</span> Debian based operatin
 </div>
 
 <div id="outline-container-1-2" class="outline-3">
-<h3 id="sec-1-2"><span class="section-number-3">1.2</span> Other GNU/Linux and Unix systems</h3>
+<h3 id="sec-1-2"><span class="section-number-3">1.2</span> RedHat based operating systems</h3>
 <div class="outline-text-3" id="text-1-2">
 
+<p>ece-install constantly gets better support for automatic installation
+on RedHat based operating systems. However, since the public RedHat
+repositories are significantly smaller than the Debian ones, there
+will often be the case that you'll have to do some manually
+installation of 3rd party dependencies prior to running
+ece-install. Don't despair though, ece-install will tell you what you
+need to do. 
+</p>
+</div>
+
+</div>
+
+<div id="outline-container-1-3" class="outline-3">
+<h3 id="sec-1-3"><span class="section-number-3">1.3</span> Other GNU/Linux and Unix systems</h3>
+<div class="outline-text-3" id="text-1-3">
+
 <p>If you're installing on another Linux or Unix system, you must first
 make sure that these 3rd party components are installed. ece-install
 will tell you which ones it cannot find and tell you to install these,
@@ -352,9 +370,9 @@ <h3 id="sec-1-2"><span class="section-number-3">1.2</span> Other GNU/Linux and U
 
 </div>
 
-<div id="outline-container-1-3" class="outline-3">
-<h3 id="sec-1-3"><span class="section-number-3">1.3</span> Tested Operating Systems</h3>
-<div class="outline-text-3" id="text-1-3">
+<div id="outline-container-1-4" class="outline-3">
+<h3 id="sec-1-4"><span class="section-number-3">1.4</span> Tested Operating Systems</h3>
+<div class="outline-text-3" id="text-1-4">
 
 <table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
 <caption></caption>
@@ -885,15 +903,27 @@ <h3 id="sec-5-11"><span class="section-number-3">5.11</span> Profile - Restoring
 </div>
 
 <div id="outline-container-5-12" class="outline-3">
-<h3 id="sec-5-12"><span class="section-number-3">5.12</span> Running interactively</h3>
+<h3 id="sec-5-12"><span class="section-number-3">5.12</span> Profile - Analysis Server</h3>
 <div class="outline-text-3" id="text-5-12">
 
+<p>This profile will install the Escenic Analysis Engine and configure it
+for production use with sane defaults. Be sure to use a different DB
+than you use for ECE.
+</p>
+</div>
+
+</div>
+
+<div id="outline-container-5-13" class="outline-3">
+<h3 id="sec-5-13"><span class="section-number-3">5.13</span> Running interactively</h3>
+<div class="outline-text-3" id="text-5-13">
+
 
 </div>
 
-<div id="outline-container-5-12-1" class="outline-4">
-<h4 id="sec-5-12-1"><span class="section-number-4">5.12.1</span> Start ece-install and choose the Option, "Restore from backup"</h4>
-<div class="outline-text-4" id="text-5-12-1">
+<div id="outline-container-5-13-1" class="outline-4">
+<h4 id="sec-5-13-1"><span class="section-number-4">5.13.1</span> Start ece-install and choose the Option, "Restore from backup"</h4>
+<div class="outline-text-4" id="text-5-13-1">
 
 
 
@@ -906,9 +936,9 @@ <h4 id="sec-5-12-1"><span class="section-number-4">5.12.1</span> Start ece-insta
 
 </div>
 
-<div id="outline-container-5-12-2" class="outline-4">
-<h4 id="sec-5-12-2"><span class="section-number-4">5.12.2</span> Select Which Backup to Restore</h4>
-<div class="outline-text-4" id="text-5-12-2">
+<div id="outline-container-5-13-2" class="outline-4">
+<h4 id="sec-5-13-2"><span class="section-number-4">5.13.2</span> Select Which Backup to Restore</h4>
+<div class="outline-text-4" id="text-5-13-2">
 
 
 
@@ -937,9 +967,9 @@ <h4 id="sec-5-12-2"><span class="section-number-4">5.12.2</span> Select Which Ba
 
 </div>
 
-<div id="outline-container-5-12-3" class="outline-4">
-<h4 id="sec-5-12-3"><span class="section-number-4">5.12.3</span> Choose What to Restore</h4>
-<div class="outline-text-4" id="text-5-12-3">
+<div id="outline-container-5-13-3" class="outline-4">
+<h4 id="sec-5-13-3"><span class="section-number-4">5.13.3</span> Choose What to Restore</h4>
+<div class="outline-text-4" id="text-5-13-3">
 
 
 
@@ -957,9 +987,9 @@ <h4 id="sec-5-12-3"><span class="section-number-4">5.12.3</span> Choose What to
 
 </div>
 
-<div id="outline-container-5-12-4" class="outline-4">
-<h4 id="sec-5-12-4"><span class="section-number-4">5.12.4</span> Sit Back and Watch ece-install Restore the Data for You</h4>
-<div class="outline-text-4" id="text-5-12-4">
+<div id="outline-container-5-13-4" class="outline-4">
+<h4 id="sec-5-13-4"><span class="section-number-4">5.13.4</span> Sit Back and Watch ece-install Restore the Data for You</h4>
+<div class="outline-text-4" id="text-5-13-4">
 
 
 
@@ -977,9 +1007,9 @@ <h4 id="sec-5-12-4"><span class="section-number-4">5.12.4</span> Sit Back and Wa
 
 </div>
 
-<div id="outline-container-5-13" class="outline-3">
-<h3 id="sec-5-13"><span class="section-number-3">5.13</span> Running in FAI mode</h3>
-<div class="outline-text-3" id="text-5-13">
+<div id="outline-container-5-14" class="outline-3">
+<h3 id="sec-5-14"><span class="section-number-3">5.14</span> Running in FAI mode</h3>
+<div class="outline-text-3" id="text-5-14">
 
 <p>If you're running in FAI mode, you can choose between these settings
 to decide what to restore and where to find the backup file to
@@ -1021,9 +1051,9 @@ <h3 id="sec-5-13"><span class="section-number-3">5.13</span> Running in FAI mode
 
 </div>
 
-<div id="outline-container-5-14" class="outline-3">
-<h3 id="sec-5-14"><span class="section-number-3">5.14</span> Data security</h3>
-<div class="outline-text-3" id="text-5-14">
+<div id="outline-container-5-15" class="outline-3">
+<h3 id="sec-5-15"><span class="section-number-3">5.15</span> Data security</h3>
+<div class="outline-text-3" id="text-5-15">
 
 <p>You should take heed when running restore, so that you're not
 restoring a system which you didn't want to change (yes, this mishap
@@ -1270,6 +1300,14 @@ <h3 id="sec-6-3"><span class="section-number-3">6.3</span> Overview of All FAI P
 </thead>
 <tbody>
 <tr><td class="left">fai_all_install</td><td class="left">0</td><td class="left">Install all components on your server.</td></tr>
+<tr><td class="left">fai_analysis_db_port</td><td class="left">3306</td><td class="left">For the EAE DB (different from ECE's)</td></tr>
+<tr><td class="left">fai_analysis_db_host</td><td class="left">localhost</td><td class="left">For the EAE DB (different from ECE's)</td></tr>
+<tr><td class="left">fai_analysis_db_user</td><td class="left">ece5user</td><td class="left">For the EAE DB (different from ECE's)</td></tr>
+<tr><td class="left">fai_analysis_db_password</td><td class="left">read-the-source-luke</td><td class="left">For the EAE DB (different from ECE's)</td></tr>
+<tr><td class="left">fai_analysis_db_schema</td><td class="left">ece5db</td><td class="left">For the EAE DB (different from ECE's)</td></tr>
+<tr><td class="left">fai_analysis_port</td><td class="left">8080</td><td class="left">Port of the EAE</td></tr>
+<tr><td class="left">fai_analysis_shutdown</td><td class="left">8005</td><td class="left">Shutdown port for the EAE app server</td></tr>
+<tr><td class="left">fai_analysis_name</td><td class="left">analysis1</td><td class="left">EAE instance name</td></tr>
 <tr><td class="left">fai_cache_backends</td><td class="left">${HOSTNAME}:8080</td><td class="left">Space separated, e.g. "app1:8080 app2:8080"</td></tr>
 <tr><td class="left">fai_cache_install</td><td class="left">0</td><td class="left">Install cache server profile</td></tr>
 <tr><td class="left">fai_db_host</td><td class="left">$HOSTNAME</td><td class="left">Useful for editor &amp; presentation profiles</td></tr>
@@ -1776,7 +1814,7 @@ <h2 id="sec-15"><span class="section-number-2">15</span> Example Output FAI</h2>
 <hr/>
 <p class="author">
   Author: Torstein Krause Johansen (<a href="mailto:tkj@vizrt.com">tkj@vizrt.com</a>)
-  Date: 2012-02-28 12:37:37 CST
+  Date: 2012-02-28 18:55:47 CST
 </p>
 </div>
 </body>

From 04611781870e85c4f86fbc8726a58e8f35dee750 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 28 Feb 2012 18:56:24 +0800
Subject: [PATCH 0357/2585] - moved the assemble_deploy_and_restart_type to
 after setting up the   memory cache.

---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 16062922..a20a5653 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -79,8 +79,8 @@ function install_ece_instance()
 
   if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER -a \
     $install_profile_number -ne $PROFILE_SEARCH_SERVER ]; then
-    assemble_deploy_and_restart_type
     install_memory_cache
+    assemble_deploy_and_restart_type
   fi
   
   update_type_instances_to_start_up

From 7e5f4c63a687f0f3bdc20b3663033e606e75b146 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 28 Feb 2012 18:57:02 +0800
Subject: [PATCH 0358/2585] - first working version of the automatic
 installation of memcached   with per publication Nursery configuration.

---
 .../ece-scripts/ece-install.d/memory-cache.sh | 61 +++++++++++--------
 1 file changed, 34 insertions(+), 27 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh b/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
index 2ff196cf..89a23a27 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
@@ -9,55 +9,62 @@ function memcached_create_publication_nursery_component() {
     return
   fi
 
-  log "Adding memcached wrapper to PresenationArticle in $1 ..."
-  local dir=$1/webapp/WEB-INF/localconfig/neo/xredsys/presentation/cache
+  print_and_log "Adding memcached wrapper to PresenationArticle in $1 ..."
+  local dir=$1/WEB-INF/localconfig/neo/xredsys/presentation/cache
   make_dir $dir
   local file=$dir/PresentationArticleCache.properties
-  sed -i "s#\$class=.*#\$class=neo.util.cache.Memcached#g" $file
+  
+  if [[ -e $file && $(grep "\$class" $file | wc -l) -gt 0 ]]; then
+    sed -i "s#\$class=.*#\$class=neo.util.cache.Memcached#g" $file
+  else
+    echo "\$class=neo.util.cache.Memcached" >> $file
+  fi
+  
   exit_on_error "sed on $file"
 }
 
 function install_memory_cache()
 {
+  print "Installing a distributed memory cache on $HOSTNAME ..."
+  
   install_packages_if_missing "memcached"
   assert_pre_requisite memcached
   
   run cd $download_dir
   run wget $wget_opts $memcached_java_lib_url
+
+  local tmp_dir=$(mktemp -d)
+  run cd $tmp_dir
+  run tar xzf $download_dir/$(basename $memcached_java_lib_url)
   local name=$(get_base_dir_from_bundle $memcached_java_lib_url)
-  run cp $name/$name.jar $assemblytool_home/lib
+  run cp $name/$name.jar ${escenic_root_dir}/assemblytool/lib
+  run rm -rf $tmp_dir
   
   memcached_set_up_common_nursery
   
-  log "Configuring all publications for using memcached ..."
-  for el in $assemblytool_home/publications/*.properties; do
+  print_and_log "Configuring all publications for using memcached ..."
+  for el in $(ls $escenic_root_dir/assemblytool/publications/*.properties \
+    2>/dev/null); do
     local publication=$(basename $el .properties)
-    
-    if [[ $appserver == "tomcat" ]]; then
-      dir=$tomcat_base/webapps/$publication
-      make_dir $dir
-      memcached_create_publication_nursery_component $dir
-    fi
+    dir=$tomcat_base/webapps/$publication
+    make_dir $dir
+    memcached_create_publication_nursery_component $dir
   done
   
   # fixing the deployed publications on host
-  if [[ $appserver == "tomcat" ]]; then
-    for el in $(
-      find $tomcat_base/webapps/ \
-        -mindepth 1 \
-        -maxdepth 1 \
-        -type d | \
-        egrep -v "solr|webservice|escenic|escenic-admin|indexer-webservice" | \
-        egrep -v "indexer-webapp|studio"
-    ); do
-      memcached_create_publication_nursery_component $el
-    done
-    
-  fi
+  for el in $(
+    find $tomcat_base/webapps/ \
+      -mindepth 1 \
+      -maxdepth 1 \
+      -type d | \
+      egrep -v "solr|webservice|escenic|escenic-admin|indexer-webservice" | \
+      egrep -v "indexer-webapp|studio"
+  ); do
+    memcached_create_publication_nursery_component $el
+  done
   
   # TODO inform the user that he/she might want to do tihs in the
   # publication tree as well.
-  assemble_deploy_and_restart_type_p
 }
 
 function memcached_set_up_common_nursery() {
@@ -84,7 +91,7 @@ EOF
 
   cat >> $common_nursery_dir/Initial.properties <<EOF
 
-# using memcached
+# using memcached, added by $(basename $0) @ $(date --iso)
 service.0.0-memcached-socket-pool=/com/danga/SockIOPool
 EOF
 }

From 3853ed58e5e865d6d20b49cfed51c8e4752afd00 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 29 Feb 2012 11:42:02 +0800
Subject: [PATCH 0359/2585] - hardening: now fails fast if one of the required
 technet downloads   are missing, before it would first actually fail and exit
 when one   of these artifacts were missing. Now, ece-install will fail as  
 follows:

  [ece-install-7] Asserting that required downloads succeeded ...
  [ece-install-7] -> engine is missing
  [ece-install-7] -> assemblytool is missing
  [ece-install-8] Add these download archives to the technet_download_list
  [ece-install-8] and re-run ece-install
---
 usr/sbin/ece-install | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 8b1e1ee9..c71919ec 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -1405,12 +1405,14 @@ function check_for_required_downloads()
     return
   fi
   
-  log "Asserting that required downloads succeeded ..."
+  print_and_log "Asserting that required downloads succeeded ..."
   local required_escenic_packages="engine assemblytool"
-    
+  local some_is_missing=0
+  
   for el in $required_escenic_packages; do
     if [ $(ls $download_dir/$el*.zip 2>/dev/null | wc -l) -lt 1 ]; then
-      log "$el is missing"
+      print_and_log "-> $el is missing"
+      some_is_missing=1
     else
       # want the newest one if there are several
       local file=$(ls $download_dir/$el*.zip | tail -1)
@@ -1423,6 +1425,12 @@ function check_for_required_downloads()
       fi
     fi
   done
+
+  if [ $some_is_missing -eq 1 ]; then
+    print_and_log "Add these download archives to the technet_download_list"
+    print_and_log "and re-run $(basename $0)"
+    exit 1
+  fi
 }
 
 function set_up_user_environment()

From 820032904c2e292f23dbc55f3a1cdb73810263cc Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 29 Feb 2012 14:03:51 +0800
Subject: [PATCH 0360/2585] - new feature: new setting
 fai_analysis_db_install=1 for installing   the EAE DB. This is just to add
 consistency with the optional   fai_analysis_db_* keys. You can still use the
 regular fai_db_*   parameters for installing the EAE DB, this is, as  
 a7f864a09bf1cf3263d5b19081fafd56b04902d3 explains, only necessary to   use
 when you're installing multiple profiles from the same   ece-install.conf -
 or if you really like the idea that all EAE   parameters have the same
 fai_analysis_* prefix, including the db   options.

- moved all database related code to database.sh
---
 usr/sbin/ece-install                          | 103 +---------------
 .../ece-scripts/ece-install.d/database.sh     | 114 +++++++++++++++++-
 2 files changed, 115 insertions(+), 102 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index c71919ec..a51070c7 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -460,106 +460,6 @@ function set_up_ece_scripts()
   run sed -i "s#/opt/escenic#${escenic_root_dir}#g" /etc/bash_completion.d/ece
 }
 
-default_db_port=3306
-default_db_host=localhost
-default_db_user=ece5user
-default_db_password=ece5password
-default_db_schema=ece5db
-
-# Method used both from interactive mode to set any missing values
-# (defaults)
-function set_db_defaults_if_not_set()
-{
-    if [ -z "$db_host" ]; then
-        db_host=${default_db_host}
-    fi
-    
-    if [ -z "$db_port" ]; then
-        db_port=${default_db_port}
-    fi
-    
-    if [ -z "$db_user" ]; then
-        db_user=${default_db_user}
-    fi
-    
-    if [ -z "$db_password" ]; then
-        db_password=${default_db_password}
-    fi
-    
-    if [ -z "$db_schema" ]; then
-        db_schema=${default_db_schema}
-    fi
-}
-
-function set_db_settings_from_fai_conf()
-{
-  # Note: the port isn't fully supported. The user must himself
-  # update the mysql configuration to run it on a non standard port.
-  
-  if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER ]; then
-    db_port=${fai_db_port-${default_db_port}}
-    db_host=${fai_db_host-${default_db_host}}
-    db_user=${fai_db_user-${default_db_user}}
-    db_password=${fai_db_password-${default_db_password}}
-    db_schema=${fai_db_schema-${default_db_schema}}
-  else
-    db_port=${fai_analysis_db_port-${default_db_port}}
-    db_host=${fai_analysis_db_host-${default_db_host}}
-    db_user=${fai_analysis_db_user-${default_db_user}}
-    db_password=${fai_analysis_db_password-${default_db_password}}
-    db_schema=${fai_analysis_db_schema-${default_db_schema}}
-  fi
-  
-  if [ -n "${fai_db_drop_old_db_first}" ]; then
-    drop_db_first=${fai_db_drop_old_db_first}
-    if [ $fai_db_drop_old_db_first -eq 1 ]; then
-      print_and_log "$(yellow WARNING): I hope you know what you're doing!"
-      print_and_log "$(yellow WARNING): fai_db_drop_old_db_first is 1 (true)"
-    fi
-  fi
-}
-
-function set_up_ecedb()
-{
-    print_and_log "Setting up the ECE database schema ..."
-
-    make_dir $escenic_root_dir/engine/plugins
-    run cd $escenic_root_dir/engine/plugins
-    
-    find ../../ -maxdepth 1 -type d | \
-        grep -v assemblytool | \
-        while read directory; do
-        if [ $directory = "../../" ]; then
-            continue
-        fi
-        
-          # nuisance to get the community engine, but not the engine
-        if [ $(echo $directory | grep engine | wc -l) -gt 0 ]; then
-            if [ $(echo $directory | grep community | wc -l) -lt 1 ]; then
-                continue
-            fi
-        fi
-
-        if [ ! -h $(basename $directory) ]; then
-            run ln -s $directory
-        fi
-    done
-
-    # the user may override standard DB settings in ece-install.conf
-    set_db_settings_from_fai_conf
-    set_db_defaults_if_not_set
-
-    # the methods in drop-and-create-ecedb needs ece_home to be set
-    ece_home=${escenic_root_dir}/engine
-    pre_install_new_ecedb
-    create_ecedb
-    
-    cd ~/
-    run rm -rf $escenic_root_dir/engine/plugins
-
-    add_next_step "DB is now set up on ${db_host}:${db_port}"
-}
-
 function set_up_basic_nursery_configuration()
 {
     print_and_log "Setting up basic Nursery configuration ..."
@@ -2477,7 +2377,8 @@ if [ $fai_enabled -eq 1 ]; then
         no_fai_profile=0
     fi
     
-    if [ $(get_boolean_conf_value fai_db_install) -eq 1 ]; then
+    if [[ $(get_boolean_conf_value fai_db_install) -eq 1 ||
+          $(get_boolean_conf_value fai_analysis_db_install) -eq 1 ]]; then
         install_profile_number=$PROFILE_DB_SERVER
         install_database_server
         no_fai_profile=0
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index a660d074..c699f0f2 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -1,3 +1,5 @@
+# ece-install module for installing the database.
+
 percona_rpm_release_version=0.0-1
 percona_rpm_release_package_name=percona-release-${percona_rpm_release_version}
 percona_rpm_release_url=http://www.percona.com/downloads/percona-release/$percona_rpm_release_package_name.x86_64.rpm
@@ -5,6 +7,12 @@ if [[ $(uname -m) != "x86_64" ]]; then
   percona_rpm_release_url=http://www.percona.com/downloads/percona-release/$percona_rpm_release_package_name.i386.rpm
 fi
 
+default_db_port=3306
+default_db_host=localhost
+default_db_user=ece5user
+default_db_password=ece5password
+default_db_schema=ece5db
+
 ## $1: optional parameter, binaries_only. If passed, $1=binaries_only,
 ##     the ECE DB schema is not set up. 
 function install_database_server()
@@ -87,7 +95,7 @@ function install_database_server()
 
   if [ $on_redhat_or_derivative -eq 1 ]; then
     run chkconfig --level 35 mysql on
-    run /etc/init.d/mysql start
+    run /etc/init.d/mysql restart
   fi
 
   assert_pre_requisite mysql
@@ -100,3 +108,107 @@ function install_database_server()
   fi
 }
 
+function set_up_ecedb()
+{
+  print_and_log "Setting up the ECE database schema ..."
+
+  make_dir $escenic_root_dir/engine/plugins
+  run cd $escenic_root_dir/engine/plugins
+  
+  find ../../ -maxdepth 1 -type d | \
+    grep -v assemblytool | \
+    while read directory; do
+    if [ $directory = "../../" ]; then
+      continue
+    fi
+    
+          # nuisance to get the community engine, but not the engine
+    if [ $(echo $directory | grep engine | wc -l) -gt 0 ]; then
+      if [ $(echo $directory | grep community | wc -l) -lt 1 ]; then
+        continue
+      fi
+    fi
+
+    if [ ! -h $(basename $directory) ]; then
+      run ln -s $directory
+    fi
+  done
+
+  # the user may override standard DB settings in ece-install.conf
+  set_db_settings_from_fai_conf
+  set_db_defaults_if_not_set
+
+  # the methods in drop-and-create-ecedb needs ece_home to be set
+  ece_home=${escenic_root_dir}/engine
+  pre_install_new_ecedb
+  create_ecedb
+  
+  cd ~/
+  run rm -rf $escenic_root_dir/engine/plugins
+
+  add_next_step "DB is now set up on ${db_host}:${db_port}"
+}
+
+function set_db_settings_from_fai_conf()
+{
+  # Note: the port isn't fully supported. The user must himself
+  # update the mysql configuration to run it on a non standard port.
+
+  # if either the profile=analysis or the profile=db &&
+  # fai_analysis_db_install is set, we try first to use the
+  # fai_analysis_db_* variables.
+  if [[ ( $install_profile_number -eq $PROFILE_DB_SERVER &&
+          $(get_boolean_conf_value fai_analysis_db_install) -eq 1 ) ||
+        $install_profile_number -eq $PROFILE_ANALYSIS_SERVER ]]; then
+
+    # order of precedence:
+    # 1) fai_analysis_db_*
+    # 2) fai_db_*
+    # 3) default_db_*
+    db_port=${fai_analysis_db_port-${fai_db_port-${default_db_port}}}
+    db_host=${fai_analysis_db_host-${fai_db_host-${default_db_host}}}
+    db_user=${fai_analysis_db_user-${fai_db_user-${default_db_user}}}
+    db_password=${fai_analysis_db_password-${fai_db_password-${default_db_password}}}
+    db_schema=${fai_analysis_db_schema-${fai_db_schema-${default_db_schema}}}
+  else
+    db_port=${fai_db_port-${default_db_port}}
+    db_host=${fai_db_host-${default_db_host}}
+    db_user=${fai_db_user-${default_db_user}}
+    db_password=${fai_db_password-${default_db_password}}
+    db_schema=${fai_db_schema-${default_db_schema}}
+  fi
+  
+  if [ -n "${fai_db_drop_old_db_first}" ]; then
+    drop_db_first=${fai_db_drop_old_db_first}
+    if [ $fai_db_drop_old_db_first -eq 1 ]; then
+      print_and_log "$(yellow WARNING): I hope you know what you're doing!"
+      print_and_log "$(yellow WARNING): fai_db_drop_old_db_first is 1 (true)"
+    fi
+  fi
+}
+
+# Method used both from interactive mode to set any missing values
+# (defaults)
+function set_db_defaults_if_not_set()
+{
+  if [ -z "$db_host" ]; then
+    db_host=${default_db_host}
+  fi
+  
+  if [ -z "$db_port" ]; then
+    db_port=${default_db_port}
+  fi
+  
+  if [ -z "$db_user" ]; then
+    db_user=${default_db_user}
+  fi
+  
+  if [ -z "$db_password" ]; then
+    db_password=${default_db_password}
+  fi
+  
+  if [ -z "$db_schema" ]; then
+    db_schema=${default_db_schema}
+  fi
+}
+

From dd9a9d98e1f04ab8b70797271db18324df2aa4e9 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 29 Feb 2012 14:12:36 +0800
Subject: [PATCH 0361/2585] - updated doc; use https instead of git protocol
 for getting the scripts.

---
 usr/share/doc/escenic/ece-install-guide.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 46a7b633..7d4558bd 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -50,7 +50,7 @@ The ece-install script can be downloaded from:
 https://raw.github.com/skybert/ece-scripts/master/usr/sbin/ece-install
 or be downloaded together with the other ece-scripts using git:
 #+BEGIN_SRC conf
-$ git clone git@github.com:skybert/ece-scripts.git
+$ git clone https://github.com/skybert/ece-scripts.git
 #+END_SRC
 
 * Running the ece-install Script

From 539c0126a08d0305297f4b513a0c08f8794f9f7c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 29 Feb 2012 14:19:56 +0800
Subject: [PATCH 0362/2585] - elaborated about the ece-install log file. -
 included -f/--file in the documentation - added fai_analysis_db_install to
 FAI config overview - sorted fai config overview list

---
 usr/share/doc/escenic/ece-install-guide.org | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 7d4558bd..cfa461c3 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -99,9 +99,12 @@ below.
 
 With the configuration file in place, you're now ready to run it:
 #+BEGIN_SRC conf
-# bash ece-install [-v|--verbose]
+# bash ece-install [-v|--verbose|<-f|--file> <conf-file>]
 #+END_SRC
 
+It will output everything from internal and external commands to its
+log file located at /var/log/ece-install.log.
+
 ece-install will try to "fail fast", exiting as soon as it detects an
 error during its execution:
 #+BEGIN_SRC conf
@@ -520,18 +523,19 @@ $HOME/ece-install.conf file of the root user:
 | Parameter                               | Default                                           | Description                                                                                                                           |
 |-----------------------------------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------|
 | fai\_all\_install                       | 0                                                 | Install all components on your server.                                                                                                |
-| fai\_analysis\_db\_port                 | 3306                                              | For the EAE DB (different from ECE's)                                                                                                 |
 | fai\_analysis\_db\_host                 | localhost                                         | For the EAE DB (different from ECE's)                                                                                                 |
-| fai\_analysis\_db\_user                 | ece5user                                          | For the EAE DB (different from ECE's)                                                                                                 |
+| fai\_analysis\_db\_install                    | 0                                                 | Install db profile                                                                                                                    |
 | fai\_analysis\_db\_password             | read-the-source-luke                              | For the EAE DB (different from ECE's)                                                                                                 |
+| fai\_analysis\_db\_port                 | 3306                                              | For the EAE DB (different from ECE's)                                                                                                 |
 | fai\_analysis\_db\_schema               | ece5db                                            | For the EAE DB (different from ECE's)                                                                                                                                      |
+| fai\_analysis\_db\_user                 | ece5user                                          | For the EAE DB (different from ECE's)                                                                                                 |
+| fai\_analysis\_name                     | analysis1                                         | EAE instance name                                                                                                                     |
 | fai\_analysis\_port                     | 8080                                              | Port of the EAE                                                                                                                       |
 | fai\_analysis\_shutdown                 | 8005                                              | Shutdown port for the EAE app server                                                                                                  |
-| fai\_analysis\_name                     | analysis1                                         | EAE instance name                                                                                                                     |
 | fai\_cache\_backends                    | ${HOSTNAME}:8080                                  | Space separated, e.g. "app1:8080 app2:8080"                                                                                           |
 | fai\_cache\_install                     | 0                                                 | Install cache server profile                                                                                                          |
-| fai\_db\_host                           | $HOSTNAME                                         | Useful for editor & presentation profiles                                                                                             |
 | fai\_db\_drop\_old\_db\_first           | 0                                                 | Warning: this will drop the old database before installing a new one                                                                  |
+| fai\_db\_host                           | $HOSTNAME                                         | Useful for editor & presentation profiles                                                                                             |
 | fai\_db\_install                        | 0                                                 | Install db profile                                                                                                                    |
 | fai\_db\_password                       | read-the-source-luke                              | Useful for DB installation profile                                                                                                    |
 | fai\_db\_port                           | 3306                                              | Useful for editor & presentation profiles                                                                                             |
@@ -544,6 +548,7 @@ $HOME/ece-install.conf file of the root user:
 | fai\_editor\_port                       | 8080                                              | HTTP port of the editor instance                                                                                                      |
 | fai\_editor\_shutdown                   | 8005                                              | Shutdown port of the editor instance                                                                                                  |
 | fai\_enabled                            | 0                                                 | Whether or not to run ece-install in FAI mode                                                                                         |
+| fai\_keep\_off\_etc\_hosts              | 0                                                 | Set this to 1 if you don't want ece-install adding entries to /etc/hosts                                                              |
 | fai\_monitoring\_server\_install        | 0                                                 | Install the monitoring server profile.                                                                                                |
 | fai\_monitoring\_server\_ip             | 127.0.0.1                                         | The IP of the monitoring server.                                                                                                      |
 | fai\_presentation\_conf\_archive        | ""                                                | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
@@ -554,11 +559,11 @@ $HOME/ece-install.conf file of the root user:
 | fai\_presentation\_shutdown             | 8005                                              | Shutdown port of the presentation instance                                                                                            |
 | fai\_public\_host\_name                 | ${HOSTNAME}:8080                                  | The public address for your website                                                                                                   |
 | fai\_publication\_create                | 0                                                 | Create a new publication                                                                                                              |
+| fai\_publication\_domain\_mapping\_list | ""                                                | Mapping between publication names and their corresponding domains on the form: "one#one.com other#other.com"                          |
 | fai\_publication\_name                  | mypub                                             | Name of the publication                                                                                                               |
 | fai\_publication\_use\_instance         | dev1                                              | Name of local instance to use for creation                                                                                            |
 | fai\_publication\_war                   | "WF or ECE demo WAR"                              | WAR to base the new publication on                                                                                                    |
 | fai\_publication\_war\_uri\_list        | ""                                                | Publication WARs used for setting up Assembly tool. Supported: http[s]://tmp.com/mypub.war, file:///tmp/mypub.war and /tmp/mypub.war. |
-| fai\_publication\_domain\_mapping\_list | ""                                                | Mapping between publication names and their corresponding domains on the form: "one#one.com other#other.com"                          |
 | fai\_rmi\_install                       | 0                                                 | Install RMI hub profile                                                                                                               |
 | fai\_search\_conf\_archive              | ""                                                | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
 | fai\_search\_ear                        | ""                                                | EAR to use instead of the Escenic binaries                                                                                            |
@@ -568,7 +573,6 @@ $HOME/ece-install.conf file of the root user:
 | fai\_search\_name                       | search1                                           | Name of the search instance                                                                                                           |
 | fai\_search\_port                       | 8080                                              | HTTP port of the search instance                                                                                                      |
 | fai\_search\_shutdown                   | 8005                                              | Shutdown port of the search instance                                                                                                  |
-| fai\_keep\_off\_etc\_hosts              | 0                                                 | Set this to 1 if you don't want ece-install adding entries to /etc/hosts                                                              |
 | fai\_wf\_install                        | 0                                                 | Install Widget Framework profile                                                                                                      |
 |-----------------------------------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------|
 #+TBLFM: $2=http://$fai_editor_name:$fai_editor_port/indexer-webservice/index/                   0

From b9801fdbdd3a9e22407c087f485d293b59aacfd7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 29 Feb 2012 18:16:37 +0800
Subject: [PATCH 0363/2585] - hardening: re-implemented
 update_type_instances_to_start_up, it now   should work with non-standard
 instance names. The benefit of this,   is that newly installed instances
 always are added to the instances   started by the init.d script.

- improved user feedback: don't call sub shells in sub shells as it
  makes reporting had, as with get_tomcat_download_url instide
  get_base_idr.

- hardening: set_up_ece_scripts now checks if /etc/ files already
  exists, and if they do, it will not overwrite those. It reports
  everything it skips in both log and standard out.
---
 usr/sbin/ece-install | 80 +++++++++++++++++++++++++-------------------
 1 file changed, 45 insertions(+), 35 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index a51070c7..c4bed8db 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -424,6 +424,8 @@ function set_up_engine_and_plugins()
 
 function set_up_ece_scripts()
 {
+  print_and_log 'Setting up the ece UNIX scripts ...'
+
   run cd $download_dir
   if [ -d ece-scripts ]; then
     (
@@ -435,10 +437,26 @@ function set_up_ece_scripts()
   fi
   
   run cp -r ece-scripts/usr/* /usr/
-  run cp -r ece-scripts/etc/escenic/* ${escenic_conf_dir}/
   run cp -r ece-scripts/etc/bash_completion.d/ece /etc/bash_completion.d/
   run cp -r ece-scripts/etc/init.d/* /etc/init.d/
-  run cp -r ece-scripts/etc/default/* /etc/default/
+
+  for el in ece-scripts/etc/default/*; do
+    local file=/etc/default/$(basename $el)
+    if [ -e $file ]; then
+      print_and_log "$file already exists, not overwriting it"
+      continue
+    fi
+    run cp $el /etc/default/
+  done
+  
+  for el in ece-scripts/etc/escenic/*; do
+    local file=/etc/escenic/$(basename $el)
+    if [ -e $file ]; then
+      print_and_log "$file already exists, not overwriting it"
+      continue
+    fi
+    run cp $el /etc/escenic/
+  done
   
   local file=${escenic_conf_dir}/ece.conf
   set_conf_file_value assemblytool_home ${escenic_root_dir}/assemblytool $file
@@ -856,7 +874,8 @@ function set_up_app_server()
     fi
 
     download_tomcat $download_dir
-    tomcat_dir=$(get_base_dir_from_bundle $(get_tomcat_download_url))
+    local tomcat_download_url=$(get_tomcat_download_url)
+    tomcat_dir=$(get_base_dir_from_bundle $tomcat_download_url)
     
     run cd $appserver_parent_dir
     run tar xzf $download_dir/${tomcat_dir}.tar.gz
@@ -1604,39 +1623,30 @@ function ask_for_instance_name()
 # search and analysis instances.
 function update_type_instances_to_start_up()
 {
-    if [ $type = "engine" ]; then
-        for el in $escenic_conf_dir/ece-*.conf; do
-            if [ $(echo el | grep analysis | wc -l) -gt 0 ]; then
-                continue
-            elif [ $(echo el | grep search | wc -l) -gt 0 ]; then
-                continue
-            fi
-
-            current_instance=$(basename ${el} | \
-                sed -e 's/ece-//g' -e 's/engine-//g' | \
-                cut -d'.' -f1)
-            all_instances="$all_instances $current_instance"
-
-            set_conf_file_value engine_instance_list \
-                "$all_instances" \
-                /etc/default/ece
-        done
-    elif [ $type = "search" ]; then
-        for el in $escenic_conf_dir/ece-*.conf; do
-            if [ $(echo el | grep search | wc -l) -lt 1 ]; then
-                continue
-            fi
-
-            current_instance=$(basename ${el} | \
-                sed -e 's/ece-//g' -e 's/search-//g' | \
-                cut -d'.' -f1)
-            all_instances="$all_instances $current_instance"
-
-            set_conf_file_value search_instance_list \
-                "$all_instances" \
-                /etc/default/ece
-        done
+  run source /etc/default/ece
+
+  if [ $type = "engine" ]; then
+    if [[ "$engine_instance_list" != *"${instance_name}"* ]]; then
+      print_and_log "Adding $instance_name instance to the init.d configuration"
+      set_conf_file_value engine_instance_list \
+        "$engine_instance_list $instance_name" \
+        /etc/default/ece
+    fi
+  elif [ $type = "search" ]; then
+    if [[ "$search_instance_list" != *"${instance_name}"* ]]; then
+      print_and_log "Adding $instance_name instance to the init.d configuration"
+      set_conf_file_value search_instance_list \
+        "$search_instance_list $instance_name" \
+        /etc/default/ece
+    fi
+  elif [ $type = "analysis" ]; then
+    if [[ "$analysis_instance_list" != *"${instance_name}"* ]]; then
+      print_and_log "Adding $instance_name instance to the init.d configuration"
+      set_conf_file_value analysis_instance_list \
+        "$analysis_instance_list $instance_name" \
+        /etc/default/ece
     fi
+  fi
 }
 
 ece_instance_ear_file=""

From 44678cd51ba6cd91f13c828b0bb2ac187878fb9e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 29 Feb 2012 18:17:14 +0800
Subject: [PATCH 0364/2585] - fix: create the assemblytool/lib if it doesn't
 exist. Needed to put   the memcached java library in there.

---
 usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh b/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
index 89a23a27..a1b88a5a 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
@@ -37,6 +37,7 @@ function install_memory_cache()
   run cd $tmp_dir
   run tar xzf $download_dir/$(basename $memcached_java_lib_url)
   local name=$(get_base_dir_from_bundle $memcached_java_lib_url)
+  make_dir ${escenic_root_dir}/assemblytool/lib
   run cp $name/$name.jar ${escenic_root_dir}/assemblytool/lib
   run rm -rf $tmp_dir
   

From 340dd2b1c6cac618569b2586f09824abe1dcadaa Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 29 Feb 2012 18:31:29 +0800
Subject: [PATCH 0365/2585] - hardening: we need to do one apt-get update to be
 sure the package list is   fresh. However, we don't want to do this in a
 common method, since   it *might* be that all pre-requisite packages already
 are present.

  Hence, ece-install will only do a (one time) apt-get update when
  installing the first non installed, required package.
---
 usr/sbin/ece-install | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index c4bed8db..25c1ecd3 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -159,6 +159,10 @@ function download_escenic_components()
     done
 }
 
+# we need to do one apt-get update to be sure the package list is
+# fresh. However, we don't want to do this in a common method, since
+# it *might* be that all pre-requisite packages already are present. 
+one_time_apt_update_done=0
 
 # Will install the passed packages if these are not installed from
 # before.
@@ -181,6 +185,10 @@ function install_packages_if_missing() {
     
     if [ $some_are_missing -eq 0 ]; then
       return
+    elif [ $one_time_apt_update_done -eq 0 ]; then
+      log "Running one time APT update to ensure package list is up to date"
+      run apt-get update
+      one_time_apt_update_done=1
     fi
 
     if [ $force_packages -eq 1 ]; then

From a00c7417f2a6300a6cf1d9bff658d0ddb97b2974 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 1 Mar 2012 12:21:42 +0800
Subject: [PATCH 0366/2585] - now running the alternatives command inside the
 run wrapper

---
 usr/share/escenic/ece-scripts/ece-install.d/java.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/java.sh b/usr/share/escenic/ece-scripts/ece-install.d/java.sh
index 0048c349..a05c7d32 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/java.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/java.sh
@@ -63,7 +63,7 @@ function install_sun_java_on_redhat() {
     if [ ! -e /usr/bin/$el ]; then
       ln -s /usr/bin/$el /etc/alternatives/$el
     fi
-    alternatives --set $el /opt/jdk/bin/$el
+    run alternatives --set $el /opt/jdk/bin/$el
   done
 
   # setting java_home to the newly installed location

From 5a587acf88322fa4fcbd23f5e2e098e50b7abc4b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 1 Mar 2012 12:22:15 +0800
Subject: [PATCH 0367/2585] - re-added user feedback when installing 3rd party
 software.

---
 usr/sbin/ece-install | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 25c1ecd3..cfb553c4 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -673,6 +673,7 @@ function set_ece_instance_conf()
 function install_ece_third_party_packages
 {
     run_hook install_ece_third_party_packages.preinst
+    print_and_log "Installing 3rd party packages needed by $type instances"
     
     if [ $on_debian_or_derivative -eq 1 ]; then
         if [ $on_ubuntu -eq 1 ]; then

From 32da47e9a3ca48d5ebec33d2705a0dcf15296e59 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 1 Mar 2012 13:53:00 +0800
Subject: [PATCH 0368/2585] - new feature: the HTTPS/SSL/redirect port can now
 be overridden:

  fai_analysis_redirect
  fai_editor_redirect
  fai_presentation_redirect
  fai_search_redirect

  and in interactive mode (of course).

- speed: if Java in already installed and this is in a non default
  location, ece-install still picks it up if the java_home is passed
  and will hence not attempt to (re) install Java, either from APT
  repo, build deb packages or install via oracle.com bundles.

  If you're installing on a non-Debian based system, chances are that
  the default java_home path of /usr/lib/jvm/java-6-sun will not apply
  to you. Here, set java_home in your ece-install.conf to speed up the
  installation (if you've already installed java, that is, if not just
  let ece-install do the work for you).

- hardening: if determining the tomcat mirror URL fails, this is
  handled in the right place, rather than propagating the error.

- moved application server specific code to its own mnodule,
  app-server.sh
---
 usr/sbin/ece-install                          | 393 -----------------
 usr/share/escenic/ece-scripts/common-os.sh    |  22 +-
 .../ece-scripts/ece-install.d/app-server.sh   | 401 ++++++++++++++++++
 .../escenic/ece-scripts/ece-install.d/java.sh |   8 +-
 4 files changed, 417 insertions(+), 407 deletions(-)
 create mode 100644 usr/share/escenic/ece-scripts/ece-install.d/app-server.sh

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index cfb553c4..3d124516 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -787,399 +787,6 @@ EOF
   fi
 }
 
-function set_up_app_server()
-{
-    print_and_log "Setting up the application server ..."
-
-    if [ $fai_enabled -eq 0 ]; then
-        print "On which ports do you wish to run the app server on?"
-        print "Press ENTER to accept port 8080 and shutdown port 8005"
-        print "Or enter: <port> <shutdown port>, e.g.: '8180 8105'"
-        echo -n "Your choice [8080 8005]> "
-        read user_ports
-        
-        if [ -n "$user_ports" ]; then
-            appserver_port=$(echo $user_ports | cut -d' ' -f1)
-            shutdown_port=$(echo $user_ports | cut -d' ' -f2)
-        fi
-    else
-        if [ $install_profile_number -eq $PROFILE_EDITORIAL_SERVER ]; then
-            appserver_port=${fai_editor_port-8080}
-            shutdown_port=${fai_editor_shutdown-8005}
-        elif [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ]; then
-            appserver_port=${fai_presentation_port-8080}
-            shutdown_port=${fai_presentation_shutdown-8005}
-        elif [ $install_profile_number -eq $PROFILE_SEARCH_SERVER ]; then
-            appserver_port=${fai_search_port-8080}
-            shutdown_port=${fai_search_shutdown-8005}
-        elif [ $install_profile_number -eq $PROFILE_ANALYSIS_SERVER ]; then
-            appserver_port=${fai_analysis_port-8080}
-            shutdown_port=${fai_analysis_shutdown-8005}
-        fi
-    fi
-
-    if [ -z "$appserver_port" ]; then
-        appserver_port=8080
-    elif [ -z "$appserver_shutdown" ]; then
-        appserver_shutdown=8005
-    fi
-    
-    debug "appserver_port=$appserver_port shutdown_port=$shutdown_port"
-    
-    if [ $fai_enabled -eq 0 ]; then
-        print "Another question: Where does the database run?"
-        print "Press ENTER to accept the default " \
-            "($HOSTNAME:${default_db_port}:${default_db_schema})"
-        print "Or enter: <host>:<port>:<schema>, e.g.: 'db1:${default_db_port}:mydb'"
-        echo -n "Your choice [$HOSTNAME:${default_db_port}:schema]> "
-        read user_database
-        
-        db_host=$(echo $user_database | cut -d':' -f1)
-        db_port=$(echo $user_database | cut -d':' -f2)
-        db_schema=$(echo $user_database | cut -d':' -f3)
-    else
-        set_db_settings_from_fai_conf
-    fi
-
-    set_db_defaults_if_not_set
-
-    if [ $fai_enabled -eq 0 ]; then
-        print "Awfully sorry to bug you with so many questions, but:"
-        print "What's the URI to the indexer-webservice? (this is typically"
-        print "something like http://editor1/indexer-webservice/index/)"
-        echo -n "Your choice [http://${HOSTNAME}:8080/indexer-webservice/index/]> "
-        read user_indexer_ws_uri
-    else
-        user_indexer_ws_uri=${fai_search_indexer_ws_uri}
-    fi
-
-    if [ -n "$user_indexer_ws_uri" ]; then
-        indexer_ws_uri=$user_indexer_ws_uri
-    else
-        indexer_ws_uri=http://${HOSTNAME}:${appserver_port}/indexer-webservice/index/
-    fi
-    
-    
-    if [ $fai_enabled -eq 0 ]; then
-        print "Last question, I promise!: Where does the search instance run?"
-        print "Press ENTER to accept the default ($HOSTNAME:8080)"
-        print "or enter: <host>:<port>, e.g.: 'search1:8080'"
-        print "If you're in doubt, just press ENTER :-)"
-        echo -n "Your choice [$HOSTNAME:8080]> "
-        read user_search
-    else
-        user_search=$(get_conf_value fai_search_host)
-        if [ -n "${user_search}" ]; then
-            user_search=${user_search}":"$(get_conf_value fai_search_port)
-        fi
-    fi
-
-    if [ -z "$user_search" ]; then
-        search_host=$HOSTNAME
-        search_port=8080
-    else
-        search_host=$(echo $user_search | cut -d':' -f1)
-        search_port=$(echo $user_search | cut -d':' -f2)
-    fi
-
-    download_tomcat $download_dir
-    local tomcat_download_url=$(get_tomcat_download_url)
-    tomcat_dir=$(get_base_dir_from_bundle $tomcat_download_url)
-    
-    run cd $appserver_parent_dir
-    run tar xzf $download_dir/${tomcat_dir}.tar.gz
-
-    if [ -e tomcat ]; then
-        run rm tomcat
-    fi
-    run ln -sf ${tomcat_dir} tomcat
-    
-    tomcat_home=${appserver_parent_dir}/tomcat   
-    tomcat_base=${appserver_parent_dir}/tomcat-${instance_name}
-    make_dir $tomcat_base
-
-    run cp -r ${appserver_parent_dir}/${tomcat_dir}/conf $tomcat_base
-    for el in bin escenic/lib lib work logs temp webapps; do
-        make_dir $tomcat_base/$el
-    done
-
-    set_ece_instance_conf tomcat_base $tomcat_base   
-    set_ece_instance_conf tomcat_home $tomcat_home
-    set_ece_instance_conf appserver_port $appserver_port
-    
-    run cd $tomcat_base/lib
-    make_ln $jdbc_driver
-
-    # it's important to append (and not pre-pend) the ECE libraries so
-    # that things put it in the standard loader behaves as expected,
-    # such as log4j configuration put in ${tomcat.base}/lib.
-    file=$tomcat_base/conf/catalina.properties
-    common_loader=$(grep ^common.loader $file)
-    escaped_common_loader=$(get_escaped_bash_string ${common_loader})
-    escenic_loader=",$\{catalina.base\}/escenic/lib/*.jar"
-    old=$(get_escaped_bash_string ${common_loader})
-    new=${escaped_common_loader}$(get_escaped_bash_string ${escenic_loader})
-    run sed -i "s#${old}#${new}#g" $file 
-    
-    cat > $tomcat_base/conf/server.xml <<EOF
-<?xml version='1.0' encoding='utf-8'?>
-<Server port="$shutdown_port" shutdown="SHUTDOWN">
-  <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
-  <Listener className="org.apache.catalina.core.JasperListener" />
-  <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
-  <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
-  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
-
-  <GlobalNamingResources>
-    <Resource name="UserDatabase"
-              auth="Container"
-              type="org.apache.catalina.UserDatabase"
-              description="User database that can be updated and saved"
-              factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
-              pathname="conf/tomcat-users.xml"
-    />
-EOF
-    if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER \
-        -a $install_profile_number -ne $PROFILE_SEARCH_SERVER ]; then
-        cat >> $tomcat_base/conf/server.xml <<EOF
-    <Resource
-        name="jdbc/ECE_READ_DS"
-        auth="Container"
-        type="javax.sql.DataSource"
-        maxActive="400"
-        maxIdle="8"
-        maxWait="2000"
-        initialSize="20"
-        username="${db_user}"
-        password="${db_password}"
-        driverClassName="com.mysql.jdbc.Driver"
-        url="jdbc:mysql://${db_host}:${db_port}/${db_schema}?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;characterSetResults=UTF-8"
-        removeAbandoned="true"
-        removeAbandonedTimeout="120"
-        logAbandoned="true"
-        testOnBorrow="false"
-        testOnReturn="false"
-        timeBetweenEvictionRunsMillis="60000"
-        numTestsPerEvictionRun="5"
-        minEvictableIdleTimeMillis="30000"
-        testWhileIdle="true"
-        validationQuery="select now()"
-    />
-    <Resource
-        name="jdbc/ECE_UPDATE_DS"
-        auth="Container"
-        type="javax.sql.DataSource"
-        maxActive="100"
-        maxIdle="8"
-        maxWait="2000"
-        initialSize="20"
-        username="${db_user}"
-        password="${db_password}"
-        driverClassName="com.mysql.jdbc.Driver"
-        url="jdbc:mysql://${db_host}:${db_port}/${db_schema}?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;characterSetResults=UTF-8"
-        removeAbandoned="true"
-        removeAbandonedTimeout="120"
-        logAbandoned="true"
-        testOnBorrow="false"
-        testOnReturn="false"
-        timeBetweenEvictionRunsMillis="60000"
-        numTestsPerEvictionRun="5"
-        minEvictableIdleTimeMillis="30000"
-        testWhileIdle="true"
-        validationQuery="select now()"
-    />
-EOF
-    elif [ $install_profile_number -eq $PROFILE_ANALYSIS_SERVER ]; then
-        cat >> $tomcat_base/conf/server.xml <<EOF
-    <Resource
-        name="jdbc/eae-qs/qs"
-        auth="Container"
-        type="javax.sql.DataSource"
-        maxActive="400"
-        maxIdle="8"
-        maxWait="2000"
-        initialSize="20"
-        username="${db_user}"
-        password="${db_password}"
-        driverClassName="com.mysql.jdbc.Driver"
-        url="jdbc:mysql://${db_host}:${db_port}/${db_schema}?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;characterSetResults=UTF-8"
-        removeAbandoned="true"
-        removeAbandonedTimeout="120"
-        logAbandoned="true"
-        testOnBorrow="false"
-        testOnReturn="false"
-        timeBetweenEvictionRunsMillis="60000"
-        numTestsPerEvictionRun="5"
-        minEvictableIdleTimeMillis="30000"
-        testWhileIdle="true"
-        validationQuery="select now()"
-    />
-    <Resource
-        name="jdbc/eae-logger/logger"
-        auth="Container"
-        type="javax.sql.DataSource"
-        maxActive="100"
-        maxIdle="8"
-        maxWait="2000"
-        initialSize="20"
-        username="${db_user}"
-        password="${db_password}"
-        driverClassName="com.mysql.jdbc.Driver"
-        url="jdbc:mysql://${db_host}:${db_port}/${db_schema}?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;characterSetResults=UTF-8"
-        removeAbandoned="true"
-        removeAbandonedTimeout="120"
-        logAbandoned="true"
-        testOnBorrow="false"
-        testOnReturn="false"
-        timeBetweenEvictionRunsMillis="60000"
-        numTestsPerEvictionRun="5"
-        minEvictableIdleTimeMillis="30000"
-        testWhileIdle="true"
-        validationQuery="select now()"
-    />
-EOF
-    fi
-    
-    cat >> $tomcat_base/conf/server.xml <<EOF
-  </GlobalNamingResources>
-
-  <Service name="Catalina">
-    <Connector port="${appserver_port}"
-               protocol="HTTP/1.1" 
-               connectionTimeout="20000" 
-               URIEncoding="UTF-8"
-               compression="on"
-               redirectPort="8543"
-    />
-    <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
-      <Valve className="org.apache.catalina.valves.AccessLogValve"
-             prefix="access."
-             suffix=".log"
-             pattern="common"/>
-      <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
-             resourceName="UserDatabase"/>
-      <Host name="localhost"
-            appBase="webapps"
-            unpackWARs="true"
-            autoDeploy="true"
-            xmlValidation="false"
-            xmlNamespaceAware="false">
-      </Host>
-EOF
-    if [[ ($install_profile_number == $PROFILE_EDITORIAL_SERVER || \
-        $install_profile_number == $PROFILE_PRESENTATION_SERVER || \
-        $install_profile_number == $PROFILE_ALL_IN_ONE) && \
-        -n "$fai_publication_domain_mapping_list" ]]; then
-
-        for el in ${fai_publication_domain_mapping_list}; do
-            local old_ifs=$IFS
-            # the entries in the fai_publication_domain_mapping_list
-            # are on the form: <publication>#<domain>
-            IFS='#'
-            read publication domain <<< "$el"
-            IFS=$old_ifs
-
-            ensure_domain_is_known_to_local_host ${domain}
-        
-            cat >> $tomcat_base/conf/server.xml <<EOF
-      <Host name="${domain}" appBase="webapps" autoDeploy="false">
-        <Context displayName="${domain}"
-                 docBase="${publication}"
-                 path="/"
-        />
-      </Host>
-EOF
-        done
-    fi
-    
-    cat >> $tomcat_base/conf/server.xml <<EOF
-    </Engine>
-  </Service>
-</Server>
-
-EOF
-    cat > $tomcat_base/conf/context.xml <<EOF
-<?xml version='1.0' encoding='utf-8'?>
-<Context>
-  <WatchedResource>WEB-INF/web.xml</WatchedResource>
-EOF
-
-    if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER -a \
-      $install_profile_number -ne $PROFILE_SEARCH_SERVER ]; then
-      cat >> $tomcat_base/conf/context.xml <<EOF
-  <ResourceLink
-      global="jdbc/ECE_READ_DS"
-      name="jdbc/ECE_READ_DS"
-      type="javax.sql.DataSource"
-  />
-  <ResourceLink
-      global="jdbc/ECE_UPDATE_DS"
-      name="jdbc/ECE_UPDATE_DS"
-      type="javax.sql.DataSource"
-  />
-EOF
-    fi
-
-    if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER ]; then
-      cat >> $tomcat_base/conf/context.xml <<EOF
-  <Environment
-      name="escenic/solr-base-uri"
-      value="http://${search_host}:${search_port}/solr/"
-      type="java.lang.String"
-      override="false"
-  />
-EOF
-    fi
-
-    if [ $install_profile_number -eq $PROFILE_SEARCH_SERVER ]; then
-      cat >> $tomcat_base/conf/context.xml <<EOF
-  <Environment
-      name="escenic/indexer-webservice"
-      value="http://${indexer_ws_uri}"
-      type="java.lang.String"
-      override="false"
-  />
-  <Environment
-      name="escenic/index-update-uri"
-      value="http://${search_host}:${search_port}/solr/update/"
-      type="java.lang.String"
-      override="false"
-  />
-  <Environment
-      name="escenic/head-tail-storage-file"
-      value="$escenic_data_dir/engine/head-tail.index"
-      type="java.lang.String"
-      override="false"
-  />
-  <Environment
-      name="escenic/failing-documents-storage-file"
-      value="$escenic_data_dir/engine/failures.index"
-      type="java.lang.String"
-      override="false"
-  />
-</Context>
-EOF
-    elif [ $install_profile_number -eq $PROFILE_ANALYSIS_SERVER ]; then
-      cat >> $tomcat_base/conf/context.xml <<EOF
-  <ResourceLink
-      global="jdbc/eae-logger/logger"
-      name="jdbc/eae-logger/logger"
-      type="javax.sql.DataSource"
-  />
-  <ResourceLink
-      global="jdbc/eae-qs/qs"
-      name="jdbc/eae-qs/qs"
-      type="javax.sql.DataSource"
-  />
-</Context>
-EOF
-    else 
-      cat >> $tomcat_base/conf/context.xml <<EOF
-</Context>
-EOF
-    fi
-}
-
 # last, give the control back to the ECE user & group 
 function set_correct_permissions()
 {
diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index 7d602711..5af8b48f 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -110,11 +110,6 @@ function get_tomcat_download_url() {
       cut -d'"' -f2
   )
 
-  if [ -z $url ]; then
-    print_and_log "Failed to get Tomcat download URL"
-    kill $$
-  fi
-  
   echo $url
 }
 
@@ -122,11 +117,16 @@ function get_tomcat_download_url() {
 ##
 ## $1: target directory
 function download_tomcat() {
-  (
-    local url=$(get_tomcat_download_url)
-    log "Downloading Tomcat from $url ..."
-    run cd $1
-    run wget $wget_opts $url
-  )
+  local url=$(get_tomcat_download_url)
+  
+  if [ -z $url ]; then
+    print_and_log "Failed to get Tomcat download URL"
+    kill $$
+  fi
+
+  print "Downloading Tomcat ..."
+  log "Downloading Tomcat from $url ..."
+  run cd $1
+  run wget $wget_opts $url
 }
 
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
new file mode 100644
index 00000000..9eceddb2
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -0,0 +1,401 @@
+function set_up_app_server()
+{
+  print_and_log "Setting up the application server ..."
+
+  if [ $fai_enabled -eq 0 ]; then
+    print "On which ports do you wish to run the app server on?"
+    print "Press ENTER to accept the default ports"
+    print "or enter: <port> <shutdown port> <redirect port>:"
+    echo -n "Your choice [8080 8005 8443]> "
+    read user_ports
+    
+    if [ -n "$user_ports" ]; then
+      read appserver_port shutdown_port redirect_port <<< $user_ports
+    fi
+  else
+    if [ $install_profile_number -eq $PROFILE_EDITORIAL_SERVER ]; then
+      appserver_port=${fai_editor_port-8080}
+      shutdown_port=${fai_editor_shutdown-8005}
+      redirect_port=${fai_editor_redirect-8443}
+    elif [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ]; then
+      appserver_port=${fai_presentation_port-8080}
+      shutdown_port=${fai_presentation_shutdown-8005}
+      redirect_port=${fai_presentation_redirect-8443}
+    elif [ $install_profile_number -eq $PROFILE_SEARCH_SERVER ]; then
+      appserver_port=${fai_search_port-8080}
+      shutdown_port=${fai_search_shutdown-8005}
+      redirect_port=${fai_search_redirect-8443}
+    elif [ $install_profile_number -eq $PROFILE_ANALYSIS_SERVER ]; then
+      appserver_port=${fai_analysis_port-8080}
+      shutdown_port=${fai_analysis_shutdown-8005}
+      redirect_port=${fai_analysis_redirect-8443}
+    fi
+  fi
+
+  if [ -z "$appserver_port" ]; then
+    appserver_port=8080
+  fi
+  if [ -z "$shutdown_port" ]; then
+    shutdown_port=8005
+  fi
+  if [ -z "$redirect_port" ]; then
+    redirect_port=8443
+  fi
+  
+  if [ $fai_enabled -eq 0 ]; then
+    print "Another question: Where does the database run?"
+    print "Press ENTER to accept the default " \
+      "($HOSTNAME:${default_db_port}:${default_db_schema})"
+    print "Or enter: <host>:<port>:<schema>, e.g.: 'db1:${default_db_port}:mydb'"
+    echo -n "Your choice [$HOSTNAME:${default_db_port}:schema]> "
+    read user_database
+
+    db_host=$(echo $user_database | cut -d':' -f1)
+    db_port=$(echo $user_database | cut -d':' -f2)
+    db_schema=$(echo $user_database | cut -d':' -f3)
+  else
+    set_db_settings_from_fai_conf
+  fi
+
+  set_db_defaults_if_not_set
+
+  if [ $fai_enabled -eq 0 ]; then
+    print "Awfully sorry to bug you with so many questions, but:"
+    print "What's the URI to the indexer-webservice? (this is typically"
+    print "something like http://editor1/indexer-webservice/index/)"
+    echo -n "Your choice [http://${HOSTNAME}:8080/indexer-webservice/index/]> "
+    read user_indexer_ws_uri
+  else
+    user_indexer_ws_uri=${fai_search_indexer_ws_uri}
+  fi
+
+  if [ -n "$user_indexer_ws_uri" ]; then
+    indexer_ws_uri=$user_indexer_ws_uri
+  else
+    indexer_ws_uri=http://${HOSTNAME}:${appserver_port}/indexer-webservice/index/
+  fi
+  
+  
+  if [ $fai_enabled -eq 0 ]; then
+    print "Last question, I promise!: Where does the search instance run?"
+    print "Press ENTER to accept the default ($HOSTNAME:8080)"
+    print "or enter: <host>:<port>, e.g.: 'search1:8080'"
+    print "If you're in doubt, just press ENTER :-)"
+    echo -n "Your choice [$HOSTNAME:8080]> "
+    read user_search
+  else
+    user_search=$(get_conf_value fai_search_host)
+    if [ -n "${user_search}" ]; then
+      user_search=${user_search}":"$(get_conf_value fai_search_port)
+    fi
+  fi
+
+  if [ -z "$user_search" ]; then
+    search_host=$HOSTNAME
+    search_port=8080
+  else
+    search_host=$(echo $user_search | cut -d':' -f1)
+    search_port=$(echo $user_search | cut -d':' -f2)
+  fi
+
+  download_tomcat $download_dir
+  local tomcat_archive=$(
+    find $download_dir \
+      -name "apache-tomcat*.tar.gz" | \
+      tail -1
+  )
+  tomcat_dir=$(get_base_dir_from_bundle $tomcat_archive)
+  
+  run cd $appserver_parent_dir
+  run tar xzf $download_dir/${tomcat_dir}.tar.gz
+
+  if [ -e tomcat ]; then
+    run rm tomcat
+  fi
+  run ln -sf ${tomcat_dir} tomcat
+  
+  tomcat_home=${appserver_parent_dir}/tomcat   
+  tomcat_base=${appserver_parent_dir}/tomcat-${instance_name}
+  make_dir $tomcat_base
+
+  run cp -r ${appserver_parent_dir}/${tomcat_dir}/conf $tomcat_base
+  for el in bin escenic/lib lib work logs temp webapps; do
+    make_dir $tomcat_base/$el
+  done
+
+  set_ece_instance_conf tomcat_base $tomcat_base   
+  set_ece_instance_conf tomcat_home $tomcat_home
+  set_ece_instance_conf appserver_port $appserver_port
+  
+  run cd $tomcat_base/lib
+  make_ln $jdbc_driver
+
+    # it's important to append (and not pre-pend) the ECE libraries so
+    # that things put it in the standard loader behaves as expected,
+    # such as log4j configuration put in ${tomcat.base}/lib.
+  file=$tomcat_base/conf/catalina.properties
+  common_loader=$(grep ^common.loader $file)
+  escaped_common_loader=$(get_escaped_bash_string ${common_loader})
+  escenic_loader=",$\{catalina.base\}/escenic/lib/*.jar"
+  old=$(get_escaped_bash_string ${common_loader})
+  new=${escaped_common_loader}$(get_escaped_bash_string ${escenic_loader})
+  run sed -i "s#${old}#${new}#g" $file 
+  
+  cat > $tomcat_base/conf/server.xml <<EOF
+<?xml version='1.0' encoding='utf-8'?>
+<Server port="$shutdown_port" shutdown="SHUTDOWN">
+  <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+  <Listener className="org.apache.catalina.core.JasperListener" />
+  <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
+  <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
+  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+
+  <GlobalNamingResources>
+    <Resource name="UserDatabase"
+              auth="Container"
+              type="org.apache.catalina.UserDatabase"
+              description="User database that can be updated and saved"
+              factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+              pathname="conf/tomcat-users.xml"
+    />
+EOF
+  if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER \
+    -a $install_profile_number -ne $PROFILE_SEARCH_SERVER ]; then
+    cat >> $tomcat_base/conf/server.xml <<EOF
+    <Resource
+        name="jdbc/ECE_READ_DS"
+        auth="Container"
+        type="javax.sql.DataSource"
+        maxActive="400"
+        maxIdle="8"
+        maxWait="2000"
+        initialSize="20"
+        username="${db_user}"
+        password="${db_password}"
+        driverClassName="com.mysql.jdbc.Driver"
+        url="jdbc:mysql://${db_host}:${db_port}/${db_schema}?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;characterSetResults=UTF-8"
+        removeAbandoned="true"
+        removeAbandonedTimeout="120"
+        logAbandoned="true"
+        testOnBorrow="false"
+        testOnReturn="false"
+        timeBetweenEvictionRunsMillis="60000"
+        numTestsPerEvictionRun="5"
+        minEvictableIdleTimeMillis="30000"
+        testWhileIdle="true"
+        validationQuery="select now()"
+    />
+    <Resource
+        name="jdbc/ECE_UPDATE_DS"
+        auth="Container"
+        type="javax.sql.DataSource"
+        maxActive="100"
+        maxIdle="8"
+        maxWait="2000"
+        initialSize="20"
+        username="${db_user}"
+        password="${db_password}"
+        driverClassName="com.mysql.jdbc.Driver"
+        url="jdbc:mysql://${db_host}:${db_port}/${db_schema}?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;characterSetResults=UTF-8"
+        removeAbandoned="true"
+        removeAbandonedTimeout="120"
+        logAbandoned="true"
+        testOnBorrow="false"
+        testOnReturn="false"
+        timeBetweenEvictionRunsMillis="60000"
+        numTestsPerEvictionRun="5"
+        minEvictableIdleTimeMillis="30000"
+        testWhileIdle="true"
+        validationQuery="select now()"
+    />
+EOF
+  elif [ $install_profile_number -eq $PROFILE_ANALYSIS_SERVER ]; then
+    cat >> $tomcat_base/conf/server.xml <<EOF
+    <Resource
+        name="jdbc/eae-qs/qs"
+        auth="Container"
+        type="javax.sql.DataSource"
+        maxActive="400"
+        maxIdle="8"
+        maxWait="2000"
+        initialSize="20"
+        username="${db_user}"
+        password="${db_password}"
+        driverClassName="com.mysql.jdbc.Driver"
+        url="jdbc:mysql://${db_host}:${db_port}/${db_schema}?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;characterSetResults=UTF-8"
+        removeAbandoned="true"
+        removeAbandonedTimeout="120"
+        logAbandoned="true"
+        testOnBorrow="false"
+        testOnReturn="false"
+        timeBetweenEvictionRunsMillis="60000"
+        numTestsPerEvictionRun="5"
+        minEvictableIdleTimeMillis="30000"
+        testWhileIdle="true"
+        validationQuery="select now()"
+    />
+    <Resource
+        name="jdbc/eae-logger/logger"
+        auth="Container"
+        type="javax.sql.DataSource"
+        maxActive="100"
+        maxIdle="8"
+        maxWait="2000"
+        initialSize="20"
+        username="${db_user}"
+        password="${db_password}"
+        driverClassName="com.mysql.jdbc.Driver"
+        url="jdbc:mysql://${db_host}:${db_port}/${db_schema}?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;characterSetResults=UTF-8"
+        removeAbandoned="true"
+        removeAbandonedTimeout="120"
+        logAbandoned="true"
+        testOnBorrow="false"
+        testOnReturn="false"
+        timeBetweenEvictionRunsMillis="60000"
+        numTestsPerEvictionRun="5"
+        minEvictableIdleTimeMillis="30000"
+        testWhileIdle="true"
+        validationQuery="select now()"
+    />
+EOF
+  fi
+  
+  cat >> $tomcat_base/conf/server.xml <<EOF
+  </GlobalNamingResources>
+
+  <Service name="Catalina">
+    <Connector port="${appserver_port}"
+               protocol="HTTP/1.1" 
+               connectionTimeout="20000" 
+               URIEncoding="UTF-8"
+               compression="on"
+               redirectPort="${redirect_port}"
+    />
+    <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
+      <Valve className="org.apache.catalina.valves.AccessLogValve"
+             prefix="access."
+             suffix=".log"
+             pattern="common"/>
+      <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+             resourceName="UserDatabase"/>
+      <Host name="localhost"
+            appBase="webapps"
+            unpackWARs="true"
+            autoDeploy="true"
+            xmlValidation="false"
+            xmlNamespaceAware="false">
+      </Host>
+EOF
+  if [[ ($install_profile_number == $PROFILE_EDITORIAL_SERVER || \
+    $install_profile_number == $PROFILE_PRESENTATION_SERVER || \
+    $install_profile_number == $PROFILE_ALL_IN_ONE) && \
+    -n "$fai_publication_domain_mapping_list" ]]; then
+
+    for el in ${fai_publication_domain_mapping_list}; do
+      local old_ifs=$IFS
+            # the entries in the fai_publication_domain_mapping_list
+            # are on the form: <publication>#<domain>
+      IFS='#'
+      read publication domain <<< "$el"
+      IFS=$old_ifs
+
+      ensure_domain_is_known_to_local_host ${domain}
+      
+      cat >> $tomcat_base/conf/server.xml <<EOF
+      <Host name="${domain}" appBase="webapps" autoDeploy="false">
+        <Context displayName="${domain}"
+                 docBase="${publication}"
+                 path="/"
+        />
+      </Host>
+EOF
+    done
+  fi
+  
+  cat >> $tomcat_base/conf/server.xml <<EOF
+    </Engine>
+  </Service>
+</Server>
+
+EOF
+  cat > $tomcat_base/conf/context.xml <<EOF
+<?xml version='1.0' encoding='utf-8'?>
+<Context>
+  <WatchedResource>WEB-INF/web.xml</WatchedResource>
+EOF
+
+  if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER -a \
+    $install_profile_number -ne $PROFILE_SEARCH_SERVER ]; then
+    cat >> $tomcat_base/conf/context.xml <<EOF
+  <ResourceLink
+      global="jdbc/ECE_READ_DS"
+      name="jdbc/ECE_READ_DS"
+      type="javax.sql.DataSource"
+  />
+  <ResourceLink
+      global="jdbc/ECE_UPDATE_DS"
+      name="jdbc/ECE_UPDATE_DS"
+      type="javax.sql.DataSource"
+  />
+EOF
+  fi
+
+  if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER ]; then
+    cat >> $tomcat_base/conf/context.xml <<EOF
+  <Environment
+      name="escenic/solr-base-uri"
+      value="http://${search_host}:${search_port}/solr/"
+      type="java.lang.String"
+      override="false"
+  />
+EOF
+  fi
+
+  if [ $install_profile_number -eq $PROFILE_SEARCH_SERVER ]; then
+    cat >> $tomcat_base/conf/context.xml <<EOF
+  <Environment
+      name="escenic/indexer-webservice"
+      value="http://${indexer_ws_uri}"
+      type="java.lang.String"
+      override="false"
+  />
+  <Environment
+      name="escenic/index-update-uri"
+      value="http://${search_host}:${search_port}/solr/update/"
+      type="java.lang.String"
+      override="false"
+  />
+  <Environment
+      name="escenic/head-tail-storage-file"
+      value="$escenic_data_dir/engine/head-tail.index"
+      type="java.lang.String"
+      override="false"
+  />
+  <Environment
+      name="escenic/failing-documents-storage-file"
+      value="$escenic_data_dir/engine/failures.index"
+      type="java.lang.String"
+      override="false"
+  />
+</Context>
+EOF
+  elif [ $install_profile_number -eq $PROFILE_ANALYSIS_SERVER ]; then
+    cat >> $tomcat_base/conf/context.xml <<EOF
+  <ResourceLink
+      global="jdbc/eae-logger/logger"
+      name="jdbc/eae-logger/logger"
+      type="javax.sql.DataSource"
+  />
+  <ResourceLink
+      global="jdbc/eae-qs/qs"
+      name="jdbc/eae-qs/qs"
+      type="javax.sql.DataSource"
+  />
+</Context>
+EOF
+  else 
+    cat >> $tomcat_base/conf/context.xml <<EOF
+</Context>
+EOF
+  fi
+}
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/java.sh b/usr/share/escenic/ece-scripts/ece-install.d/java.sh
index a05c7d32..b8603aee 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/java.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/java.sh
@@ -25,11 +25,12 @@ function create_java_deb_packages_and_repo() {
 
 
 function install_sun_java_on_redhat() {
-  if [[ $(java -version 2>&1 | grep HotSpot | wc -l) -gt 0 ]]; then
+  if [[ $(${java_home}/bin/java -version 2>&1 | \
+    grep HotSpot | wc -l) -gt 0 ]]; then
     print_and_log "Sun Java is already installed on $HOSTNAME"
     return
   fi
-
+  
   print_and_log "Downloading Sun Java from download.oracle.com ..."
   run cd $download_dir
   run wget $wget_opts $sun_java_bin_url
@@ -63,7 +64,8 @@ function install_sun_java_on_redhat() {
     if [ ! -e /usr/bin/$el ]; then
       ln -s /usr/bin/$el /etc/alternatives/$el
     fi
-    run alternatives --set $el /opt/jdk/bin/$el
+    # doesn't seem to like running inside the run wrapper
+    alternatives --set $el /opt/jdk/bin/$el 1>>$log 2>>$log
   done
 
   # setting java_home to the newly installed location

From 482f388d137219e078a7ba69566fa3c8f7f405d8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 1 Mar 2012 14:19:58 +0800
Subject: [PATCH 0369/2585] - fix: memcached component, SockIOPool was falsely
 names.

- resilience: if fai_memcached_node_list is not set, ece-install will
  use the default of localhost:11211. This means that at the very
  least, all ECE instances will get their own memcached instance
  configured.

- when running on REHL, a newly instqalled memcached is not installed
  automatically. Hence, we have to (re) start it ourselves.
---
 .../escenic/ece-scripts/ece-install.d/memory-cache.sh     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh b/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
index a1b88a5a..cb597bb8 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
@@ -28,6 +28,10 @@ function install_memory_cache()
   print "Installing a distributed memory cache on $HOSTNAME ..."
   
   install_packages_if_missing "memcached"
+  if [ $on_redhat_or_derivative -eq 1 ]; then
+    run /etc/init.d/memcached restart
+  fi
+  
   assert_pre_requisite memcached
   
   run cd $download_dir
@@ -71,10 +75,10 @@ function install_memory_cache()
 function memcached_set_up_common_nursery() {
   local dir=$common_nursery_dir/com/danga
   make_dir $dir
-  cat > $dir/SockIOPool <<EOF
+  cat > $dir/SockIOPool.properties <<EOF
 $class=com.danga.MemCached.SockIOPool
 # fill in memcached servers here.
-servers=${fai_memcached_node_list}
+servers=${fai_memcached_node_list-localhost:11211}
 
 # how many connections to use
 initConn = 10

From f67b6499ccb08eb53165acef68b1e94ca90ddeab Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 1 Mar 2012 14:20:17 +0800
Subject: [PATCH 0370/2585] - pretty: re-positioned comments

---
 usr/share/escenic/ece-scripts/ece-install.d/app-server.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 9eceddb2..a34ff16e 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -130,9 +130,9 @@ function set_up_app_server()
   run cd $tomcat_base/lib
   make_ln $jdbc_driver
 
-    # it's important to append (and not pre-pend) the ECE libraries so
-    # that things put it in the standard loader behaves as expected,
-    # such as log4j configuration put in ${tomcat.base}/lib.
+  # it's important to append (and not pre-pend) the ECE libraries so
+  # that things put it in the standard loader behaves as expected,
+  # such as log4j configuration put in ${tomcat.base}/lib.
   file=$tomcat_base/conf/catalina.properties
   common_loader=$(grep ^common.loader $file)
   escaped_common_loader=$(get_escaped_bash_string ${common_loader})

From 9571db476cbdeccfa4267ecd8c3c8a7dbd135b60 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 1 Mar 2012 15:17:01 +0800
Subject: [PATCH 0371/2585] - resilience: now using default_schema instead of
 "schema" string when   addressing the app server database in interactive
 mode.

---
 usr/share/escenic/ece-scripts/ece-install.d/app-server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index a34ff16e..70d902c4 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -47,7 +47,7 @@ function set_up_app_server()
     print "Press ENTER to accept the default " \
       "($HOSTNAME:${default_db_port}:${default_db_schema})"
     print "Or enter: <host>:<port>:<schema>, e.g.: 'db1:${default_db_port}:mydb'"
-    echo -n "Your choice [$HOSTNAME:${default_db_port}:schema]> "
+    echo -n "Your choice [$HOSTNAME:${default_db_port}:${default_db_schema}]> "
     read user_database
 
     db_host=$(echo $user_database | cut -d':' -f1)

From 265b960c701ad64f25e51a95bb63a6ae9447d09d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 1 Mar 2012 15:18:42 +0800
Subject: [PATCH 0372/2585] - hardening: introduced default tomcat archive
 download URL,   fallback_tomcat_url. Only used if the Tomcat download mirror 
  couldn't be resolved.

---
 usr/share/escenic/ece-scripts/common-os.sh | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index 5af8b48f..2f34d0e3 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -8,6 +8,9 @@
 common_bashing_is_loaded > /dev/null 2>&1 || source common-bashing.sh
 common_pulse_is_loaded > /dev/null 2>&1 || source common-bashing.sh
 
+## Only used if the Tomcat download mirror couldn't be determined
+fallback_tomcat_url="http://mirrorservice.nomedia.no/apache.org/tomcat/tomcat-6/v6.0.35/bin/apache-tomcat-6.0.35.tar.gz"
+
 wget_opts="--continue --inet4-only --quiet"
 
 # Can be used like this:
@@ -110,20 +113,21 @@ function get_tomcat_download_url() {
       cut -d'"' -f2
   )
 
+  if [ -z $url ]; then
+    url=$fallback_tomcat_url
+    log "Failed to get Tomcat mirror URL, will use fallback URL $url"
+  fi
+
   echo $url
 }
 
+
 ## Downloads Tomcat from the regional mirror
 ##
 ## $1: target directory
 function download_tomcat() {
   local url=$(get_tomcat_download_url)
   
-  if [ -z $url ]; then
-    print_and_log "Failed to get Tomcat download URL"
-    kill $$
-  fi
-
   print "Downloading Tomcat ..."
   log "Downloading Tomcat from $url ..."
   run cd $1

From 71fb798687bfbff9f6bb1c775e22555803456287 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 1 Mar 2012 15:22:20 +0800
Subject: [PATCH 0373/2585] - mode the setting of publication specific Nursery
 configuration to   "ece deploy". This can be turned off with  
 do_not_add_memcached_support=1 in ece[-<instance>].conf.

  It's pretty harmless as the regular LRU cache works if the memcached
  libraries or daemons are not present.

- fixed the class declaration of the memcached Nursery component.

- this means that fully automatic installation and set up of memcached
  is working.

  TODO: test this thoroughly :-)
---
 usr/bin/ece                                   | 39 ++++++++++++++-
 .../ece-scripts/ece-install.d/memory-cache.sh | 49 ++-----------------
 2 files changed, 43 insertions(+), 45 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 49368ff2..5dbd0549 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -107,7 +107,7 @@ function print()
 
 function log()
 {
-    echo "$id" `date` $@ 2>/dev/null >> $log_file 
+    echo $(date) "$id" $@ 2>/dev/null >> $log_file 
 }
 
 function print_and_log()
@@ -576,6 +576,7 @@ function deploy()
                     jar xf $war \
                         1>>$log_file \
                         2>>$log_file)
+                add_memcached_support $tomcat_base/webapps/$name
                 exit_on_error "extracting $war to $tomcat_base/webapps/"
             done
             ;;
@@ -598,6 +599,42 @@ function deploy()
     run rm -rf ${dir}
 }
 
+## $1 : dir of the webapp 
+function add_memcached_support() {
+    if [[ "$do_not_add_memcached_support" == "1" ]]; then
+        return
+    fi
+
+    if [ ! -d "$1" ]; then
+        log $1 "doesn't exist"
+        return
+    fi
+
+    local exempt_from_memcached_list="
+      escenic escenic-admin indexer-webservice indexer-webapp studio
+      inpage-ws dashboard
+    "
+
+    for el in $exempt_from_memcached_list; do
+        if [[ $(basename $1) == "$el" ]]; then
+          return
+        fi
+    done
+
+    log "Adding memcached support in $1 ..."
+    local dir=$1/WEB-INF/localconfig/neo/xredsys/presentation/cache
+    run mkdir -p $dir
+    local file=$dir/PresentationArticleCache.properties
+
+    if [[ -e $file && $(grep "\$class" $file | wc -l) -gt 0 ]]; then
+        sed -i "s#\$class=.*#\$class=neo.util.cache.Memcached#g" $file
+    else
+        echo "\$class=neo.util.cache.Memcached" >> $file
+    fi
+
+    exit_on_error "sed on $file"
+}
+
 # Returns the file (can be a directory) passed to the function only
 # if it's the actual file/directory and not a link to it. If the
 # passed file is a link, the link target is returned instead.
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh b/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
index cb597bb8..f3a71e89 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
@@ -2,27 +2,6 @@
 
 memcached_java_lib_url=http://img.whalin.com/memcached/jdk5/log4j/java_memcached-release_2.0.1.tar.gz
 
-## $1: root directory of the publication
-function memcached_create_publication_nursery_component() {
-  if [ ! -d "$1" ]; then
-    log $1 "doesn't exist"
-    return
-  fi
-
-  print_and_log "Adding memcached wrapper to PresenationArticle in $1 ..."
-  local dir=$1/WEB-INF/localconfig/neo/xredsys/presentation/cache
-  make_dir $dir
-  local file=$dir/PresentationArticleCache.properties
-  
-  if [[ -e $file && $(grep "\$class" $file | wc -l) -gt 0 ]]; then
-    sed -i "s#\$class=.*#\$class=neo.util.cache.Memcached#g" $file
-  else
-    echo "\$class=neo.util.cache.Memcached" >> $file
-  fi
-  
-  exit_on_error "sed on $file"
-}
-
 function install_memory_cache()
 {
   print "Installing a distributed memory cache on $HOSTNAME ..."
@@ -46,29 +25,11 @@ function install_memory_cache()
   run rm -rf $tmp_dir
   
   memcached_set_up_common_nursery
+
+  # ece deploy will set up the necessary in-publication Nursery
+  # configuration, if needed.
   
-  print_and_log "Configuring all publications for using memcached ..."
-  for el in $(ls $escenic_root_dir/assemblytool/publications/*.properties \
-    2>/dev/null); do
-    local publication=$(basename $el .properties)
-    dir=$tomcat_base/webapps/$publication
-    make_dir $dir
-    memcached_create_publication_nursery_component $dir
-  done
-  
-  # fixing the deployed publications on host
-  for el in $(
-    find $tomcat_base/webapps/ \
-      -mindepth 1 \
-      -maxdepth 1 \
-      -type d | \
-      egrep -v "solr|webservice|escenic|escenic-admin|indexer-webservice" | \
-      egrep -v "indexer-webapp|studio"
-  ); do
-    memcached_create_publication_nursery_component $el
-  done
-  
-  # TODO inform the user that he/she might want to do tihs in the
+  # TODO inform the user that he/she might want to do this in the
   # publication tree as well.
 }
 
@@ -76,7 +37,7 @@ function memcached_set_up_common_nursery() {
   local dir=$common_nursery_dir/com/danga
   make_dir $dir
   cat > $dir/SockIOPool.properties <<EOF
-$class=com.danga.MemCached.SockIOPool
+\$class=com.danga.MemCached.SockIOPool
 # fill in memcached servers here.
 servers=${fai_memcached_node_list-localhost:11211}
 

From 94aa4d9eebb40ee0eca3c8a7d41b2d1ebc28f294 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Sun, 5 Feb 2012 16:40:11 +0100
Subject: [PATCH 0374/2585]      Added basic initial example.

---
 usr/lib/vosa/install-engine.sh | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 usr/lib/vosa/install-engine.sh

diff --git a/usr/lib/vosa/install-engine.sh b/usr/lib/vosa/install-engine.sh
new file mode 100644
index 00000000..e864c4dc
--- /dev/null
+++ b/usr/lib/vosa/install-engine.sh
@@ -0,0 +1,19 @@
+# Only argument is the "vm name" as provided on the command line,
+# which is a directory path of a VOSA vm definition:
+#
+# e.g. /etc/vosa/available.d/vm03
+
+# The VM is assumed to be booted and ready for SSH using the passwordless
+# key in the vm03 directory, as the XXX user (ubuntu?)
+
+cat > /dev/null <<EOF
+ece-install is copied in to /root
+so is a conf file (probably located in /etc/vosa/available.d/vm03
+ece-install is called
+return code is ! 0 if ece-install is ! 0...
+EOF
+
+# What's needed: A tool to extract interesting information about a VM
+# at run-time, programmatically.
+# e.g. give me the IP address of a running VM by name "vm04"
+# e.g. give me the 

From 3d130835ba3824150e7fd10af4015c92a8c7e56e Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Mon, 6 Feb 2012 08:28:26 +0100
Subject: [PATCH 0375/2585]      Added a developer-keys

---
 .../vosa/post-install-hooks/install-engine.sh | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 usr/share/vizrt/vosa/post-install-hooks/install-engine.sh

diff --git a/usr/share/vizrt/vosa/post-install-hooks/install-engine.sh b/usr/share/vizrt/vosa/post-install-hooks/install-engine.sh
new file mode 100644
index 00000000..e864c4dc
--- /dev/null
+++ b/usr/share/vizrt/vosa/post-install-hooks/install-engine.sh
@@ -0,0 +1,19 @@
+# Only argument is the "vm name" as provided on the command line,
+# which is a directory path of a VOSA vm definition:
+#
+# e.g. /etc/vosa/available.d/vm03
+
+# The VM is assumed to be booted and ready for SSH using the passwordless
+# key in the vm03 directory, as the XXX user (ubuntu?)
+
+cat > /dev/null <<EOF
+ece-install is copied in to /root
+so is a conf file (probably located in /etc/vosa/available.d/vm03
+ece-install is called
+return code is ! 0 if ece-install is ! 0...
+EOF
+
+# What's needed: A tool to extract interesting information about a VM
+# at run-time, programmatically.
+# e.g. give me the IP address of a running VM by name "vm04"
+# e.g. give me the 

From dfd034ccec3128a262e5294e3ebbdff708411887 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Mon, 6 Feb 2012 17:39:26 +0100
Subject: [PATCH 0376/2585]      skeleton of vosa command

---
 usr/bin/vosa | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 usr/bin/vosa

diff --git a/usr/bin/vosa b/usr/bin/vosa
new file mode 100644
index 00000000..b9f7a1f6
--- /dev/null
+++ b/usr/bin/vosa
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# /usr/bin/vosa --- command to manage vizrt on-line system-administration
+# managed instances of virtual machines.
+
+# vosa list --- list all available virtual machines
+# vosa -i /etc/vizrt/vosa/available.d/vm03 enable --- enable a specific vm
+# vosa -i /etc/vizrt/vosa/available.d/vm03 disable --- disable a specific vm
+# vosa -i /etc/vizrt/vosa/enabled.d/vm03 disable --- disable a vm
+# vosa -i ... restart
+# vosa -i ... reinstall
+

From fb5b57ca1e1412e56abb36b73bcc52a7a667fbfb Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Wed, 8 Feb 2012 00:19:03 +0100
Subject: [PATCH 0377/2585]      Much more fleshed out vosa command

---
 usr/bin/vosa | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 100 insertions(+)
 mode change 100644 => 100755 usr/bin/vosa

diff --git a/usr/bin/vosa b/usr/bin/vosa
old mode 100644
new mode 100755
index b9f7a1f6..b2685958
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -10,3 +10,103 @@
 # vosa -i ... restart
 # vosa -i ... reinstall
 
+instance_dir=
+usage=0
+
+### To add an option, add it to the optstring, as defined in getopts, in alphabetical order.
+### Also add a function "option-x" where x is the option. $1 will be the option value, if any.
+### set any variables needed to default values as globals first.
+OPTSTRING=":i:h"
+
+function option-h() {
+  usage=1
+}
+
+function option-i() {
+  instance_dir="${1}"
+}
+
+
+function unknown-option() {
+  echo "Unknown option $@"
+  usage=1
+}
+
+### To add a command, simply define a function with a do_ prefix.
+function do_list() {
+  if [ ! -z $instance_dir ] ; then
+    echo "Instance cannot be specified"
+    usage=1
+    return
+  fi
+  availabledir=$(dirname $0)/../../etc/vizrt/vosa/available.d
+  availabledir=$(readlink -f ${availabledir})
+  ls -d ${availabledir}/* | grep "/[0-9a-z][-0-9a-z]*$"
+}
+
+### To add a command, simply define a function with a do_ prefix.
+function do_install() {
+  if [ -z $instance_dir ] ; then
+    echo "Instance is required"
+    usage=1
+    return
+  fi
+  echo "Starting $instance_dir"
+}
+
+function unknown-argument() {
+  echo "Unknown argument $@"
+  usage=1
+}
+
+LASTOPTIND=0
+
+function parseopts() {
+local OPTARG
+local OPTIND
+local opt
+local currentconfigdirectory="${@:1:1}"
+shift;
+while getopts "${OPTSTRING}" opt; do
+  case $opt in
+    \?)
+      unknown-option "-$OPTARG"
+      ;;
+    *)
+      option-$opt "${OPTARG}"
+      ;;
+  esac
+done
+
+LASTOPTIND=$OPTIND
+
+}
+
+parseopts "$PWD" "${@}"
+
+# get rid of all parsed parameters from command line, leaving real arguments
+shift $((LASTOPTIND-1))
+
+if [ $usage -eq 0 -a "${#@}" -gt 1 ] ; then
+  echo "Only one argument is allowed"
+  usage=1
+fi
+
+if [ $usage -eq 0 -a "${#@}" -lt 1 ] ; then
+  echo "A command must be specified."
+  usage=1
+fi
+
+
+# Check if the command
+fn="do_$1"
+declare > /dev/null -f "$fn" || unknown-argument "$1"
+declare > /dev/null -f "$fn" && "$fn"
+
+if [ $usage -eq 1 ] ; then
+  echo "Usage: $0 -i instance-dir <command>"
+  exit 1;
+fi
+
+
+

From 11e18a0aa2f2b28a2eed6544ce4a9cb44a393369 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Wed, 8 Feb 2012 00:28:28 +0100
Subject: [PATCH 0378/2585]      Added vosa enabled which shows all enabled VMs
 on this host

---
 usr/bin/vosa | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index b2685958..339bd766 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -33,6 +33,7 @@ function unknown-option() {
 }
 
 ### To add a command, simply define a function with a do_ prefix.
+
 function do_list() {
   if [ ! -z $instance_dir ] ; then
     echo "Instance cannot be specified"
@@ -44,7 +45,17 @@ function do_list() {
   ls -d ${availabledir}/* | grep "/[0-9a-z][-0-9a-z]*$"
 }
 
-### To add a command, simply define a function with a do_ prefix.
+function do_enabled() {
+  if [ ! -z $instance_dir ] ; then
+    echo "Instance cannot be specified"
+    usage=1
+    return
+  fi
+  availabledir=$(dirname $0)/../../etc/vizrt/vosa/enabled.d
+  availabledir=$(readlink -f ${availabledir})
+  ls -d ${availabledir}/* | grep "/[0-9a-z][-0-9a-z]*$"
+}
+
 function do_install() {
   if [ -z $instance_dir ] ; then
     echo "Instance is required"

From daa2ff3e4b3d17784f984dcc1d9b7e401097f472 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Wed, 8 Feb 2012 00:42:00 +0100
Subject: [PATCH 0379/2585]      Added "enable" command to enable a VM by
 making a symlink. With error checks

---
 usr/bin/vosa | 40 +++++++++++++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 339bd766..1301827f 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -33,16 +33,18 @@ function unknown-option() {
 }
 
 ### To add a command, simply define a function with a do_ prefix.
+available_dir=$(dirname $0)/../../etc/vizrt/vosa/available.d
+available_dir=$(readlink -f ${available_dir})
+enabled_dir=$(dirname $0)/../../etc/vizrt/vosa/enabled.d
+enabled_dir=$(readlink -f ${enabled_dir})
 
-function do_list() {
+function do_available() {
   if [ ! -z $instance_dir ] ; then
     echo "Instance cannot be specified"
     usage=1
     return
   fi
-  availabledir=$(dirname $0)/../../etc/vizrt/vosa/available.d
-  availabledir=$(readlink -f ${availabledir})
-  ls -d ${availabledir}/* | grep "/[0-9a-z][-0-9a-z]*$"
+  ls -d ${available_dir}/* | grep "/[0-9a-z][-0-9a-z]*$"
 }
 
 function do_enabled() {
@@ -51,11 +53,35 @@ function do_enabled() {
     usage=1
     return
   fi
-  availabledir=$(dirname $0)/../../etc/vizrt/vosa/enabled.d
-  availabledir=$(readlink -f ${availabledir})
-  ls -d ${availabledir}/* | grep "/[0-9a-z][-0-9a-z]*$"
+  ls -d ${enabled_dir}/* | grep "/[0-9a-z][-0-9a-z]*$"
 }
 
+function do_enable() {
+  if [ -z $instance_dir ] ; then
+    echo "Instance must be specified"
+    usage=1
+    return
+  fi
+  # check if the instance isn't enabled already
+  # check if the instance isn't forcibly disabled
+  # check if the instance is available
+  # make a symbolic link
+  if [ -L ${enabled_dir}/$(basename $instance_dir) ] ; then
+    echo "$instance_dir is already enabled"
+    exit 1
+  fi
+  if [ -r ${enabled_dir}/$(basename $instance_dir) ] ; then
+    echo "$instance_dir has been forcibly disabled by the presence of the file ${enabled_dir}/$(basename $instance_dir)"
+    exit 1
+  fi
+  if [ ! -d ${available_dir}/$(basename $instance_dir) ] ; then
+    echo "$instance_dir is not an available instance"
+    exit 1
+  fi
+  ln -v -s "../available.d/$(basename $instance_dir)" "$enabled_dir" || exit 1
+}
+
+
 function do_install() {
   if [ -z $instance_dir ] ; then
     echo "Instance is required"

From fa9a79ffe6a29c7fb8e78cc06ed1e33658ff8ec5 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Wed, 8 Feb 2012 00:47:57 +0100
Subject: [PATCH 0380/2585]      Doodling around the "install" command. Here is
 where most of my full-image.sh comes in

---
 usr/bin/vosa | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 1301827f..1f1a2df0 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -88,7 +88,11 @@ function do_install() {
     usage=1
     return
   fi
-  echo "Starting $instance_dir"
+  echo "Installing $instance_dir from scratch...  This takes a few minutes"
+  echo "Archiving old image ..."
+  echo "Extracting a new fresh image"
+  # TODO should this just be in
+  # $(dirname $0)/../../usr/share/vizrt/vosa/commands/install.sh "$instance_dir"
 }
 
 function unknown-argument() {

From 6f397820951fc217277b8212e6da8a52847e8241 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Wed, 8 Feb 2012 14:51:07 +0100
Subject: [PATCH 0381/2585]      Skeleton of config file parser, common to many
 functions in vosa, perhaps

---
 usr/bin/vosa                                  | 10 +--
 usr/share/vizrt/vosa/commands/functions       | 17 +++++
 usr/share/vizrt/vosa/commands/install.sh      | 52 ++++++++++++++++
 .../vizrt/vosa/commands/install_config_parser | 62 +++++++++++++++++++
 4 files changed, 136 insertions(+), 5 deletions(-)
 create mode 100644 usr/share/vizrt/vosa/commands/functions
 create mode 100755 usr/share/vizrt/vosa/commands/install.sh
 create mode 100644 usr/share/vizrt/vosa/commands/install_config_parser

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 1f1a2df0..6903321a 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -88,11 +88,11 @@ function do_install() {
     usage=1
     return
   fi
-  echo "Installing $instance_dir from scratch...  This takes a few minutes"
-  echo "Archiving old image ..."
-  echo "Extracting a new fresh image"
-  # TODO should this just be in
-  # $(dirname $0)/../../usr/share/vizrt/vosa/commands/install.sh "$instance_dir"
+  # todo:
+  # Error checking: if the instance is not enabled, abort
+  # If the instance exists and is running, stop it (gracefully?)
+  # If the instance exists, take a tar.gz backup of the entire image directory
+  $(dirname $0)/../share/vizrt/vosa/commands/install.sh "$instance_dir"
 }
 
 function unknown-argument() {
diff --git a/usr/share/vizrt/vosa/commands/functions b/usr/share/vizrt/vosa/commands/functions
new file mode 100644
index 00000000..70a387e5
--- /dev/null
+++ b/usr/share/vizrt/vosa/commands/functions
@@ -0,0 +1,17 @@
+# bash functions common to the vosa commands
+# e.g. parsing a config file
+
+
+# $1 == config file name
+# $2 == prefix of functions to call
+function parse_config_file() {
+  local line
+  local prefix=$2
+  while read line; do
+    if [ "${line:0:1}" == "#" ] ; then continue; fi
+    if [ -z "${line}" ] ; then continue; fi
+    local line2=(${line})
+    local name="${line2[0]}"
+    declare > /dev/null -f ${prefix}${name} && ${prefix}${name} "${line2[@]:1}"
+  done < "${1}"
+}
diff --git a/usr/share/vizrt/vosa/commands/install.sh b/usr/share/vizrt/vosa/commands/install.sh
new file mode 100755
index 00000000..bbcc1e36
--- /dev/null
+++ b/usr/share/vizrt/vosa/commands/install.sh
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+# Performs a full installation of a vm
+
+# Expects a single argument, namely a directory or symlink to a directory which
+# contains a "vosa" configuration, and a second directory, which should not exist
+# which is where the installation will be held.
+
+# This command will create the second directory and build a virtual machine image from
+# scratch and configure it as described by relevant files in the first directory.
+
+# Usually this command is executed from "/usr/bin/vosa -i somevm install"
+# or similar.
+
+source $(dirname $0)/functions
+source $(dirname $0)/install_config_parser
+
+config=$1
+image=$2
+
+if [ -z "$image" -o -z "$config" ] ; then
+  echo "You need to specify a config directory (e.g. /etc/vizrt/vosa/enabled.d/foo) "
+  echo "and a place to hold the installation (e.g. /usr/lib/vizrt/vosa/images/foo)"
+  echo "the former MUST exist and contain vosa configuration files"
+  echo "the latter MUST NOT exist, and will be created as a result of this command"
+  exit 1
+fi
+
+# basic error checking
+if [ ! -d "$config" ] ; then
+  echo "Config directory $config isn't a directory."
+  exit 1
+fi
+
+if [ -d "$image" -o -r "$image" ] ; then
+  echo "image directory $image already exist.  Can't continue."
+  exit 1
+fi
+
+# make the holding area.
+mkdir $image
+
+# Parse all install config items
+parse_config_file $config/install.conf install_config_
+
+
+echo $ip_address
+
+
+
+
+
diff --git a/usr/share/vizrt/vosa/commands/install_config_parser b/usr/share/vizrt/vosa/commands/install_config_parser
new file mode 100644
index 00000000..b0be6f32
--- /dev/null
+++ b/usr/share/vizrt/vosa/commands/install_config_parser
@@ -0,0 +1,62 @@
+# bash functions common to the vosa commands
+# e.g. parsing a config file
+
+ip_address=
+original_image=
+kernel=
+initial_disk_size=
+macaddr=
+netmask=
+gateway=
+timezone=
+
+
+function install_config_ip_address() {
+  ip_address=$1
+}
+
+function install_config_original_image() {
+  original_image=$1
+}
+
+function install_config_kernel() {
+  kernel=$1
+}
+
+function install_config_initial_disk_size() {
+  initial_disk_size=$1
+}
+
+function install_config_macaddr() {
+  macaddr=$1
+}
+
+function install_config_netmask() {
+  netmask=$1
+}
+
+function install_config_gateway() {
+  gateway=$1
+}
+
+function install_config_timezone() {
+  timezone=$1
+}
+
+# Handle arrays
+
+declare -a ssh_keys
+declare -a overlay
+declare -a postinstall
+
+function install_config_ssh_keys() {
+  ssh_keys=( "${ssh_keys[@]}" "$1" )
+}
+
+function install_config_overlay() {
+  overlay=( "${overlay[@]}" "$1" )
+}
+
+function install_config_postinstall() {
+  postinstall=( "${postinstall[@]}" "$1" )
+}

From 317801e9941f006213ea291fdd95ab5427b0ba3a Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Wed, 8 Feb 2012 16:05:41 +0100
Subject: [PATCH 0382/2585]      boot file parsed, and the install script is
 getting underway...

---
 .../vizrt/vosa/commands/boot_config_parser    |  28 +++
 usr/share/vizrt/vosa/commands/install.sh      | 171 +++++++++++++++++-
 .../vizrt/vosa/commands/install_config_parser |  44 ++---
 3 files changed, 214 insertions(+), 29 deletions(-)
 create mode 100644 usr/share/vizrt/vosa/commands/boot_config_parser

diff --git a/usr/share/vizrt/vosa/commands/boot_config_parser b/usr/share/vizrt/vosa/commands/boot_config_parser
new file mode 100644
index 00000000..e4c46b49
--- /dev/null
+++ b/usr/share/vizrt/vosa/commands/boot_config_parser
@@ -0,0 +1,28 @@
+# bash functions common to the vosa commands
+# specifically functions to aid parsing boot.conf files
+
+boot_config_memory=
+boot_config_processor_affinity=
+boot_config_vnc_port=
+
+
+function boot_config_memory() {
+  boot_config_memory=$1
+}
+
+function boot_config_processor_affinity() {
+  boot_config_processor_affinity=$1
+}
+
+function boot_config_vnc_port() {
+  boot_config_vnc_port=$1
+}
+
+# Handle arrays
+
+# declare -a ssh_keys
+
+#function install_config_ssh_keys() {
+#  ssh_keys=( "${ssh_keys[@]}" "$1" )
+#}
+
diff --git a/usr/share/vizrt/vosa/commands/install.sh b/usr/share/vizrt/vosa/commands/install.sh
index bbcc1e36..1b38984f 100755
--- a/usr/share/vizrt/vosa/commands/install.sh
+++ b/usr/share/vizrt/vosa/commands/install.sh
@@ -12,8 +12,25 @@
 # Usually this command is executed from "/usr/bin/vosa -i somevm install"
 # or similar.
 
+debug=3
+
+function decho() {
+  if [ $debug -ge $1 ] ; then
+    echo "${@:2}"
+  fi
+}
+
+function exitonerror() {
+  rc=$1
+  if [ "$rc" != "0" ] ; then
+    echo "$2 (rc=$rc)"
+    exit 2
+  fi
+}
+
 source $(dirname $0)/functions
 source $(dirname $0)/install_config_parser
+source $(dirname $0)/boot_config_parser
 
 config=$1
 image=$2
@@ -37,16 +54,156 @@ if [ -d "$image" -o -r "$image" ] ; then
   exit 1
 fi
 
+if [ "$(basename "$image")" != "$(basename "$config")" ] ; then
+  echo "$image and $config appear to try to name different VMs. Try using $(basename $config) instead."
+  exit 2
+fi
+
 # make the holding area.
 mkdir $image
 
 # Parse all install config items
 parse_config_file $config/install.conf install_config_
-
-
-echo $ip_address
-
-
-
-
+parse_config_file $config/boot.conf boot_config_
+
+function make_temp_dir() {
+  tempdir=/tmp/some-rundir
+  mkdir "${tempdir}"
+}
+
+function cleanup_temp_dir() {
+  if [ ! -z "${tempdir}" -a -d "${tempdir}" ] ; then
+    rm -rf "${tempdir}"
+  fi
+}
+
+make_run_dir() {
+  rundir=/var/run/vizrt/vosa/ 
+  if [ "$(id -u)" != "0" ] ; then
+    rundir=$HOME/.vizrt/vosa/
+  fi
+  decho 1 "Making var-run directory $rundir"
+  mkdir -p $rundir || exitonerror $? "Unable to make the place where pidfiles are stored ($rundir)"
+}
+
+function copy_original_image() {
+  decho 1 "Copying original image file to image file"
+  if [ -z "$install_config_original_image" -o ! -r "$install_config_original_image" ] ; then
+    echo "Original image file $install_config_original_image does not exist. exiting."
+    exit 2;
+  fi
+  img="$image/disk.img"
+  kernel="$image/vmlinuz"
+  cp "$install_config_original_image" "$img"
+  cp "$install_config_kernel" "$kernel"
+}
+
+function resize_original_image() {
+  decho 1 "Resizing 'disk.img' to ${install_config_initial_disk_size}Gb"
+  fsck.ext4 > /dev/null -p -f ${img}; exitonerror $? "fsck.ext4 failed before resize"
+  resize2fs > /dev/null ${img} ${install_config_initial_disk_size}G; exitonerror $? "resize2fs failed"
+  fsck.ext4 > /dev/null -n -f ${img}; exitonerror $? "fsck.ext4 failed after resize"
+}
+
+function generate_ssh_key() {
+  decho 1 "generating SSH key"
+  ssh-keygen -t dsa -N "" -f ${image}/id_dsa -b 1024 -C "kvm-one-time-key:$name" > /dev/null; exitonerror $? "Unable to generate ssh key"
+}
+
+function create_user_data_file() {
+  cat >> ${tempdir}/user_data.txt <<EOF
+#cloud-config
+manage_etc_hosts: true
+timezone: ${timezone}
+apt_update: false
+apt_upgrade: false
+apt_mirror: ${mirror}
+EOF
+}
+
+function check_sudo() {
+  sudo=''
+  runas=''
+  if [ "$(id -u)" != "0" ] ; then
+    decho 1 "Checking if we have sudo access to kvm"
+    sudo -n kvm --help > /dev/null 2>/dev/null
+    if [ $? -ne 0 ] ; then
+      cat <<EOF
+$0: It seems I am not able to run kvm as root.  I will not be able to run kvm
+with bridged networking.
+To fix this, add the file /etc/sudoers.d/kvm with the line
+
+  $(id -un) ALL=(ALL) NOPASSWD: /usr/bin/kvm
+
+Exiting.
+EOF
+      exit 2
+    fi
+
+    sudo=sudo
+    # drop priviledges after kvm starts if necessary.
+    runas="-runas $(id -un)"
+  fi
+}
+
+function touch_pid_file() {
+  pidfile=$rundir/$(basename $config).pid
+  touch "${pidfile}"
+}
+
+function configure_vnc_option() {
+  if [ -z "$boot_config_vnc_port" -o "$boot_config_vnc_port" == "none" ] ; then 
+    vncoption="-vnc none"
+  else
+    vncoption="-vnc :${vncdisplay}"
+  fi
+}
+
+
+function boot_kvm() {
+  # should _maybe_ be put in some other script?  Needed by e.g. vosa start too.
+  decho 1 "Starting the machine"
+  startupcmd=($sudo kvm \
+  -daemonize \
+  ${vncoption} \
+  -name "${hostname}"
+  -cpu "host" \
+  -pidfile "${pidfile}" \
+  -m "${boot_config_memory}" \
+  $runas \
+  -enable-kvm \
+  -balloon "virtio" \
+  -drive "file=${img},if=virtio,cache=none" \
+  -drive "file=updates.iso,if=virtio"
+  -kernel ${kernel} \
+  -net "nic,model=virtio,macaddr=${install_config_macaddr}" \
+  -net "tap,script=../bin/qemu-ifup")
+  
+
+  firstboot=("${startupcmd[@]}" -append "root=/dev/vda ro init=/usr/lib/cloud-init/uncloud-init ds=${cloud_param} ubuntu-pass=random xupdate=vdb:mnt" )
+
+  # actually execute kvm
+  "${firstboot[@]}"; exitonerror $? "Unable to start kvm :-/" 
+}
+
+check_sudo
+copy_original_image
+resize_original_image
+generate_ssh_key
+make_run_dir
+configure_vnc_option
+touch_pid_file  # should maybe be part of boot process?  dunno.
+
+### functions below require tempdir
+
+make_temp_dir
+create_user_data_file
+
+
+
+
+
+boot_kvm
+
+cleanup_temp_dir
 
diff --git a/usr/share/vizrt/vosa/commands/install_config_parser b/usr/share/vizrt/vosa/commands/install_config_parser
index b0be6f32..1748d1b4 100644
--- a/usr/share/vizrt/vosa/commands/install_config_parser
+++ b/usr/share/vizrt/vosa/commands/install_config_parser
@@ -1,62 +1,62 @@
 # bash functions common to the vosa commands
 # e.g. parsing a config file
 
-ip_address=
-original_image=
-kernel=
-initial_disk_size=
-macaddr=
-netmask=
-gateway=
-timezone=
+install_config_ip_address=
+install_config_original_image=
+install_config_kernel=
+install_config_initial_disk_size=
+install_config_macaddr=
+install_config_netmask=
+install_config_gateway=
+install_config_timezone=
 
 
 function install_config_ip_address() {
-  ip_address=$1
+  install_config_ip_address=$1
 }
 
 function install_config_original_image() {
-  original_image=$1
+  install_config_original_image=$1
 }
 
 function install_config_kernel() {
-  kernel=$1
+  install_config_kernel=$1
 }
 
 function install_config_initial_disk_size() {
-  initial_disk_size=$1
+  install_config_initial_disk_size=$1
 }
 
 function install_config_macaddr() {
-  macaddr=$1
+  install_config_macaddr=$1
 }
 
 function install_config_netmask() {
-  netmask=$1
+  install_config_netmask=$1
 }
 
 function install_config_gateway() {
-  gateway=$1
+  install_config_gateway=$1
 }
 
 function install_config_timezone() {
-  timezone=$1
+  install_config_timezone=$1
 }
 
 # Handle arrays
 
-declare -a ssh_keys
-declare -a overlay
-declare -a postinstall
+declare -a install_config_ssh_keys
+declare -a install_config_overlay
+declare -a install_config_postinstall
 
 function install_config_ssh_keys() {
-  ssh_keys=( "${ssh_keys[@]}" "$1" )
+  install_config_ssh_keys=( "${ssh_keys[@]}" "$1" )
 }
 
 function install_config_overlay() {
-  overlay=( "${overlay[@]}" "$1" )
+  install_config_overlay=( "${overlay[@]}" "$1" )
 }
 
 function install_config_postinstall() {
-  postinstall=( "${postinstall[@]}" "$1" )
+  install_config_postinstall=( "${postinstall[@]}" "$1" )
 }

From a3e84c8e21b3b7fd6216be03e8531d9f9186b376 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Wed, 8 Feb 2012 16:09:54 +0100
Subject: [PATCH 0383/2585]      Don't resize disk if we don't need to

---
 usr/share/vizrt/vosa/commands/install.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/usr/share/vizrt/vosa/commands/install.sh b/usr/share/vizrt/vosa/commands/install.sh
index 1b38984f..49055edb 100755
--- a/usr/share/vizrt/vosa/commands/install.sh
+++ b/usr/share/vizrt/vosa/commands/install.sh
@@ -54,6 +54,8 @@ if [ -d "$image" -o -r "$image" ] ; then
   exit 1
 fi
 
+# todo: verify that basename and image don't end with slashes...
+
 if [ "$(basename "$image")" != "$(basename "$config")" ] ; then
   echo "$image and $config appear to try to name different VMs. Try using $(basename $config) instead."
   exit 2
@@ -61,6 +63,7 @@ fi
 
 # make the holding area.
 mkdir $image
+hostname=$(basename "$image")
 
 # Parse all install config items
 parse_config_file $config/install.conf install_config_
@@ -99,6 +102,7 @@ function copy_original_image() {
 }
 
 function resize_original_image() {
+  if [ -z "${install_config_initial_disk_size}" ] ; then return; fi
   decho 1 "Resizing 'disk.img' to ${install_config_initial_disk_size}Gb"
   fsck.ext4 > /dev/null -p -f ${img}; exitonerror $? "fsck.ext4 failed before resize"
   resize2fs > /dev/null ${img} ${install_config_initial_disk_size}G; exitonerror $? "resize2fs failed"
@@ -147,7 +151,7 @@ EOF
 }
 
 function touch_pid_file() {
-  pidfile=$rundir/$(basename $config).pid
+  pidfile=$rundir/$hostname.pid
   touch "${pidfile}"
 }
 
@@ -192,7 +196,6 @@ resize_original_image
 generate_ssh_key
 make_run_dir
 configure_vnc_option
-touch_pid_file  # should maybe be part of boot process?  dunno.
 
 ### functions below require tempdir
 
@@ -203,6 +206,7 @@ create_user_data_file
 
 
 
+touch_pid_file  # should maybe be part of boot process?  dunno.
 boot_kvm
 
 cleanup_temp_dir

From 0b4b7dd5639ac7ce002a3f8fff70959c2826facf Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Wed, 8 Feb 2012 16:36:43 +0100
Subject: [PATCH 0384/2585]      Forked boot portion into its own script

---
 usr/share/vizrt/vosa/commands/boot.sh    | 153 +++++++++++++++++++++++
 usr/share/vizrt/vosa/commands/install.sh |  85 ++-----------
 usr/share/vizrt/vosa/commands/qemu-ifup  |   5 +
 3 files changed, 168 insertions(+), 75 deletions(-)
 create mode 100755 usr/share/vizrt/vosa/commands/boot.sh
 create mode 100755 usr/share/vizrt/vosa/commands/qemu-ifup

diff --git a/usr/share/vizrt/vosa/commands/boot.sh b/usr/share/vizrt/vosa/commands/boot.sh
new file mode 100755
index 00000000..94478286
--- /dev/null
+++ b/usr/share/vizrt/vosa/commands/boot.sh
@@ -0,0 +1,153 @@
+#!/bin/bash
+
+# Boots a kvm instance.
+
+# Expects two arguments, namely a directory or symlink to a directory which
+# contains a "vosa" configuration, and a second directory,
+# which is where the installation disks are held.
+
+# Usually this command is executed from "/usr/bin/vosa -i somevm install"
+# or similar.
+
+debug=3
+
+function decho() {
+  if [ $debug -ge $1 ] ; then
+    echo "${@:2}"
+  fi
+}
+
+function exitonerror() {
+  rc=$1
+  if [ "$rc" != "0" ] ; then
+    echo "$2 (rc=$rc)"
+    exit 2
+  fi
+}
+
+source $(dirname $0)/functions
+source $(dirname $0)/install_config_parser
+source $(dirname $0)/boot_config_parser
+
+config=$1
+image=$2
+
+if [ -z "$image" -o -z "$config" ] ; then
+  echo "You need to specify a config directory (e.g. /etc/vizrt/vosa/enabled.d/foo) "
+  echo "and a place to hold the installation (e.g. /usr/lib/vizrt/vosa/images/foo)"
+  echo "the former MUST exist and contain vosa configuration files"
+  echo "the latter MUST also exist, and contain disk images and kernels etc"
+  exit 1
+fi
+
+# basic error checking
+if [ ! -d "$config" ] ; then
+  echo "Config directory $config isn't a directory."
+  exit 1
+fi
+
+if [ ! -d "$image" ] ; then
+  echo "image directory $image does not exist.  Can't continue."
+  exit 1
+fi
+
+# todo: verify that basename and image don't end with slashes...
+
+if [ "$(basename "$image")" != "$(basename "$config")" ] ; then
+  echo "$image and $config appear to try to name different VMs. Try using $(basename $config) instead."
+  exit 2
+fi
+
+# make the holding area.
+hostname=$(basename "$image")
+
+# Parse all install config items
+parse_config_file $config/install.conf install_config_
+parse_config_file $config/boot.conf boot_config_
+
+make_run_dir() {
+  rundir=/var/run/vizrt/vosa/ 
+  if [ "$(id -u)" != "0" ] ; then
+    rundir=$HOME/.vizrt/vosa/
+  fi
+  decho 1 "Making var-run directory $rundir"
+  mkdir -p $rundir || exitonerror $? "Unable to make the place where pidfiles are stored ($rundir)"
+}
+
+function check_sudo() {
+  sudo=''
+  runas=''
+  if [ "$(id -u)" != "0" ] ; then
+    decho 1 "Checking if we have sudo access to kvm"
+    sudo -n kvm --help > /dev/null 2>/dev/null
+    if [ $? -ne 0 ] ; then
+      cat <<EOF
+$0: It seems I am not able to run kvm as root.  I will not be able to run kvm
+with bridged networking.
+To fix this, add the file /etc/sudoers.d/kvm with the line
+
+  $(id -un) ALL=(ALL) NOPASSWD: /usr/bin/kvm
+
+Exiting.
+EOF
+      exit 2
+    fi
+
+    sudo=sudo
+    # drop priviledges after kvm starts if necessary.
+    runas="-runas $(id -un)"
+  fi
+}
+
+function touch_pid_file() {
+  pidfile=$rundir/$hostname.pid
+  touch "${pidfile}"
+}
+
+function configure_vnc_option() {
+  if [ -z "$boot_config_vnc_port" -o "$boot_config_vnc_port" == "none" ] ; then 
+    vncoption="-vnc none"
+  else
+    vncoption="-vnc :${boot_config_vnc_port}"
+  fi
+}
+
+
+function boot_kvm() {
+  kernel=${image}/vmlinuz
+  img=${image}/disk.img
+
+  # should _maybe_ be put in some other script?  Needed by e.g. vosa start too.
+  decho 1 "Starting the machine"
+  startupcmd=($sudo kvm
+  -daemonize
+  ${vncoption}
+  -name "${hostname}"
+  -cpu "host"
+  -pidfile "${pidfile}"
+  -m "${boot_config_memory}"
+  $runas
+  -enable-kvm
+  -balloon "virtio"
+  -drive "file=${img},if=virtio,cache=none"
+  -kernel ${kernel}
+  -net "nic,model=virtio,macaddr=${install_config_macaddr}"
+  -net "tap,script=$(dirname $0)/qemu-ifup")
+  
+
+  #-drive "file=updates.iso,if=virtio" \
+
+  firstboot=("${startupcmd[@]}" -append "root=/dev/vda ro init=/usr/lib/cloud-init/uncloud-init ds=${cloud_param} ubuntu-pass=random xupdate=vdb:mnt" )
+
+  # actually execute kvm
+  echo "${firstboot[@]}"
+  "${firstboot[@]}"; exitonerror $? "Unable to start kvm :-/" 
+}
+
+check_sudo
+make_run_dir
+configure_vnc_option
+
+touch_pid_file  # should maybe be part of boot process?  dunno.
+boot_kvm
+
diff --git a/usr/share/vizrt/vosa/commands/install.sh b/usr/share/vizrt/vosa/commands/install.sh
index 49055edb..253bc2a7 100755
--- a/usr/share/vizrt/vosa/commands/install.sh
+++ b/usr/share/vizrt/vosa/commands/install.sh
@@ -71,7 +71,9 @@ parse_config_file $config/boot.conf boot_config_
 
 function make_temp_dir() {
   tempdir=/tmp/some-rundir
-  mkdir "${tempdir}"
+  if [ ! -z "${tempdir}" -a ! -d "${tempdir}" ] ; then
+    mkdir "${tempdir}"
+  fi
 }
 
 function cleanup_temp_dir() {
@@ -125,89 +127,22 @@ apt_mirror: ${mirror}
 EOF
 }
 
-function check_sudo() {
-  sudo=''
-  runas=''
-  if [ "$(id -u)" != "0" ] ; then
-    decho 1 "Checking if we have sudo access to kvm"
-    sudo -n kvm --help > /dev/null 2>/dev/null
-    if [ $? -ne 0 ] ; then
-      cat <<EOF
-$0: It seems I am not able to run kvm as root.  I will not be able to run kvm
-with bridged networking.
-To fix this, add the file /etc/sudoers.d/kvm with the line
-
-  $(id -un) ALL=(ALL) NOPASSWD: /usr/bin/kvm
-
-Exiting.
-EOF
-      exit 2
-    fi
-
-    sudo=sudo
-    # drop priviledges after kvm starts if necessary.
-    runas="-runas $(id -un)"
-  fi
-}
-
-function touch_pid_file() {
-  pidfile=$rundir/$hostname.pid
-  touch "${pidfile}"
-}
-
-function configure_vnc_option() {
-  if [ -z "$boot_config_vnc_port" -o "$boot_config_vnc_port" == "none" ] ; then 
-    vncoption="-vnc none"
-  else
-    vncoption="-vnc :${vncdisplay}"
-  fi
-}
-
-
-function boot_kvm() {
-  # should _maybe_ be put in some other script?  Needed by e.g. vosa start too.
-  decho 1 "Starting the machine"
-  startupcmd=($sudo kvm \
-  -daemonize \
-  ${vncoption} \
-  -name "${hostname}"
-  -cpu "host" \
-  -pidfile "${pidfile}" \
-  -m "${boot_config_memory}" \
-  $runas \
-  -enable-kvm \
-  -balloon "virtio" \
-  -drive "file=${img},if=virtio,cache=none" \
-  -drive "file=updates.iso,if=virtio"
-  -kernel ${kernel} \
-  -net "nic,model=virtio,macaddr=${install_config_macaddr}" \
-  -net "tap,script=../bin/qemu-ifup")
-  
-
-  firstboot=("${startupcmd[@]}" -append "root=/dev/vda ro init=/usr/lib/cloud-init/uncloud-init ds=${cloud_param} ubuntu-pass=random xupdate=vdb:mnt" )
-
-  # actually execute kvm
-  "${firstboot[@]}"; exitonerror $? "Unable to start kvm :-/" 
+function postinstall() {
+  echo "running all the postinstall scripts..."
+  sleep 4;
 }
 
-check_sudo
 copy_original_image
 resize_original_image
 generate_ssh_key
-make_run_dir
-configure_vnc_option
 
 ### functions below require tempdir
 
 make_temp_dir
 create_user_data_file
-
-
-
-
-
-touch_pid_file  # should maybe be part of boot process?  dunno.
-boot_kvm
-
 cleanup_temp_dir
 
+# chain to boot.sh to actually start the image.
+$(dirname $0)/boot.sh $1 $2
+
+postinstall
diff --git a/usr/share/vizrt/vosa/commands/qemu-ifup b/usr/share/vizrt/vosa/commands/qemu-ifup
new file mode 100755
index 00000000..47d13cae
--- /dev/null
+++ b/usr/share/vizrt/vosa/commands/qemu-ifup
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+switch=$(ip route list | awk '/^default / { print $5 }')
+ifconfig $1 0.0.0.0 up
+brctl addif ${switch} $1

From 865f08a63b78c3c1fa50f9d4d1fe036c21409df2 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Wed, 8 Feb 2012 17:05:20 +0100
Subject: [PATCH 0385/2585]      Now boot.sh can boot vms the first time and
 subsequent times

---
 usr/bin/vosa                          |  2 +-
 usr/share/vizrt/vosa/commands/boot.sh | 24 +++++++++++++++++-------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 6903321a..c9fa1e8f 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -92,7 +92,7 @@ function do_install() {
   # Error checking: if the instance is not enabled, abort
   # If the instance exists and is running, stop it (gracefully?)
   # If the instance exists, take a tar.gz backup of the entire image directory
-  $(dirname $0)/../share/vizrt/vosa/commands/install.sh "$instance_dir"
+  $(dirname $0)/../share/vizrt/vosa/commands/install.sh "$instance_dir" "$(dirname $0)/../../var/lib/vizrt/vosa/images/$(basename $instance_dir)"
 }
 
 function unknown-argument() {
diff --git a/usr/share/vizrt/vosa/commands/boot.sh b/usr/share/vizrt/vosa/commands/boot.sh
index 94478286..9d54785e 100755
--- a/usr/share/vizrt/vosa/commands/boot.sh
+++ b/usr/share/vizrt/vosa/commands/boot.sh
@@ -6,7 +6,7 @@
 # contains a "vosa" configuration, and a second directory,
 # which is where the installation disks are held.
 
-# Usually this command is executed from "/usr/bin/vosa -i somevm install"
+# Usually this command is executed from "/usr/bin/vosa -i somevm start"
 # or similar.
 
 debug=3
@@ -104,6 +104,11 @@ function touch_pid_file() {
   touch "${pidfile}"
 }
 
+function touch_state_file() {
+  statefile=$rundir/$hostname.state
+  echo 'running' > $statefile
+}
+
 function configure_vnc_option() {
   if [ -z "$boot_config_vnc_port" -o "$boot_config_vnc_port" == "none" ] ; then 
     vncoption="-vnc none"
@@ -116,6 +121,7 @@ function configure_vnc_option() {
 function boot_kvm() {
   kernel=${image}/vmlinuz
   img=${image}/disk.img
+  cloud_param="nocloud;h=${hostname}"
 
   # should _maybe_ be put in some other script?  Needed by e.g. vosa start too.
   decho 1 "Starting the machine"
@@ -134,20 +140,24 @@ function boot_kvm() {
   -net "nic,model=virtio,macaddr=${install_config_macaddr}"
   -net "tap,script=$(dirname $0)/qemu-ifup")
   
+  updates=${image}/updates.iso
+  if [ -r "${updates}" ] ; then
+    startupcmd=("${startupcmd[@]}" -drive "file=${updates},if=virtio")
+    xupdate="xupdate=vdb:mnt"
+  fi
 
-  #-drive "file=updates.iso,if=virtio" \
-
-  firstboot=("${startupcmd[@]}" -append "root=/dev/vda ro init=/usr/lib/cloud-init/uncloud-init ds=${cloud_param} ubuntu-pass=random xupdate=vdb:mnt" )
+  startupcmd=("${startupcmd[@]}" -append "root=/dev/vda ro init=/usr/lib/cloud-init/uncloud-init ds=${cloud_param} ubuntu-pass=random $xupdate" )
 
   # actually execute kvm
-  echo "${firstboot[@]}"
-  "${firstboot[@]}"; exitonerror $? "Unable to start kvm :-/" 
+  echo "${startupcmd[@]}"
+  "${startupcmd[@]}"; exitonerror $? "Unable to start kvm :-/" 
 }
 
+
 check_sudo
 make_run_dir
 configure_vnc_option
 
 touch_pid_file  # should maybe be part of boot process?  dunno.
 boot_kvm
-
+touch_state_file

From 1b08f82d7ed76fe2d358dd6198888c1440539144 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Wed, 8 Feb 2012 17:08:54 +0100
Subject: [PATCH 0386/2585]      Make "start" an official command. no "stop"
 just yet, though

---
 usr/bin/vosa | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index c9fa1e8f..008bf631 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -82,6 +82,9 @@ function do_enable() {
 }
 
 
+commands="$(dirname $0)/../share/vizrt/vosa/commands"
+
+
 function do_install() {
   if [ -z $instance_dir ] ; then
     echo "Instance is required"
@@ -90,11 +93,26 @@ function do_install() {
   fi
   # todo:
   # Error checking: if the instance is not enabled, abort
-  # If the instance exists and is running, stop it (gracefully?)
+  # If the instance exists and is running, abort. its 'statefile' must be set to 'stopped' for a reinstall to happen.
+  # If the instance exists, take a tar.gz backup of the entire image directory
+  ${commands}/install.sh "$instance_dir" "$(dirname $0)/../../var/lib/vizrt/vosa/images/$(basename $instance_dir)"
+}
+
+function do_start() {
+  if [ -z $instance_dir ] ; then
+    echo "Instance is required"
+    usage=1
+    return
+  fi
+  # todo:
+  # Error checking: if the instance is not enabled, abort
+  # If the instance exists and is running, abort. its 'statefile' must be set to 'stopped' for a reinstall to happen.
   # If the instance exists, take a tar.gz backup of the entire image directory
-  $(dirname $0)/../share/vizrt/vosa/commands/install.sh "$instance_dir" "$(dirname $0)/../../var/lib/vizrt/vosa/images/$(basename $instance_dir)"
+  ${commands}/boot.sh "$instance_dir" "$(dirname $0)/../../var/lib/vizrt/vosa/images/$(basename $instance_dir)"
 }
 
+
+
 function unknown-argument() {
   echo "Unknown argument $@"
   usage=1

From 41a1bbd2f0867c55ac9abf11ef90fbfcf535b699 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Wed, 8 Feb 2012 17:26:40 +0100
Subject: [PATCH 0387/2585]      Added most of the overlay.  It's created with
 the wrong file name, so it won't work just yet, but it's mostly done.  Nearly
 there.

---
 usr/share/vizrt/vosa/commands/install.sh | 64 +++++++++++++++++++++---
 1 file changed, 57 insertions(+), 7 deletions(-)

diff --git a/usr/share/vizrt/vosa/commands/install.sh b/usr/share/vizrt/vosa/commands/install.sh
index 253bc2a7..12243eb7 100755
--- a/usr/share/vizrt/vosa/commands/install.sh
+++ b/usr/share/vizrt/vosa/commands/install.sh
@@ -30,7 +30,6 @@ function exitonerror() {
 
 source $(dirname $0)/functions
 source $(dirname $0)/install_config_parser
-source $(dirname $0)/boot_config_parser
 
 config=$1
 image=$2
@@ -67,7 +66,6 @@ hostname=$(basename "$image")
 
 # Parse all install config items
 parse_config_file $config/install.conf install_config_
-parse_config_file $config/boot.conf boot_config_
 
 function make_temp_dir() {
   tempdir=/tmp/some-rundir
@@ -116,8 +114,19 @@ function generate_ssh_key() {
   ssh-keygen -t dsa -N "" -f ${image}/id_dsa -b 1024 -C "kvm-one-time-key:$name" > /dev/null; exitonerror $? "Unable to generate ssh key"
 }
 
-function create_user_data_file() {
-  cat >> ${tempdir}/user_data.txt <<EOF
+function create_overlay() {
+  make_temp_dir
+
+  # local copy of overlay
+  mkdir -p ${tempdir}/overlay/updates; exitonerror $? "Unable to make overlay directory" 
+
+  for o in "${install_config_overlay[@]}" ; do  ****
+    if [ "${o}" == "" ] ; then continue; fi
+    cp -rp --dereference $o/* ${tempdir}/overlay/updates/; exitonerror $? "Unable to copy overlay $o" 
+  done
+
+  mkdir -p ${tempdir}/overlay/updates/var/lib/cloud/data/cache/nocloud/
+  cat >> ${tempdir}/overlay/updates/var/lib/cloud/data/cache/nocloud/user-data <<EOF
 #cloud-config
 manage_etc_hosts: true
 timezone: ${timezone}
@@ -125,6 +134,47 @@ apt_update: false
 apt_upgrade: false
 apt_mirror: ${mirror}
 EOF
+
+  cat >> ${tempdir}/overlay/updates/var/lib/cloud/data/cache/nocloud/meta-data <<EOF
+EOF
+
+  mkdir -p ${tempdir}/overlay/updates/home/ubuntu/.ssh
+  chmod 700 ${tempdir}/overlay/updates/home/ubuntu/.ssh
+  for o in "${install_config_ssh_keys[@]}" ; do
+    cat $o >> ${tempdir}/overlay/updates/home/ubuntu/.ssh/authorized_keys; exitonerror $? "Unable to add authorized key $o" 
+  done
+
+  chmod 600 ${tempdir}/overlay/updates/home/ubuntu/.ssh/authorized_keys; exitonerror $? "Unable to chmod 600 authorized_keys" 
+  # todo: inject another key to go from one server to another???
+
+  cat > ${tempdir}/overlay/updates.script <<EOF
+# Reset permissions on files created above (might not belong to root etc):
+chown --recursive ubuntu: /home/ubuntu/
+
+# Remove DHCP defaults
+perl -pi -e 's/iface eth0.*//' /etc/network/interfaces
+
+# Add static IP configuration
+cat >> /etc/network/interfaces <<END
+iface eth0 inet static
+    address ${guestip}
+    netmask ${guestmask}
+    gateway ${guestgw}
+END
+EOF
+
+  chmod 755 ${tempdir}/overlay/updates.script
+  # Make an ISO image of the overlay, to pass to kvm during its first boot.
+  genisoimage -quiet -rock -uid 0 -gid 0 --output ${tempdir}/updates.iso ${tempdir}/overlay; exitonerror $? "Unable to create overlay file" 
+
+
+
+  cleanup_temp_dir
+}
+
+function delete_overlay() {
+  # ...
+  decho 1 'Deleting initial overlay file'
 }
 
 function postinstall() {
@@ -138,11 +188,11 @@ generate_ssh_key
 
 ### functions below require tempdir
 
-make_temp_dir
-create_user_data_file
-cleanup_temp_dir
+create_overlay
 
 # chain to boot.sh to actually start the image.
 $(dirname $0)/boot.sh $1 $2
 
 postinstall
+delete_overlay
+

From 8b67ba58778b36fbc616c1c0d556dcd7fa6a0c97 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Wed, 8 Feb 2012 21:50:09 +0100
Subject: [PATCH 0388/2585]      Added "status" to show the state of one or all
 vms

---
 usr/bin/vosa | 176 ++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 124 insertions(+), 52 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 008bf631..2c29d47c 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -38,47 +38,124 @@ available_dir=$(readlink -f ${available_dir})
 enabled_dir=$(dirname $0)/../../etc/vizrt/vosa/enabled.d
 enabled_dir=$(readlink -f ${enabled_dir})
 
-function do_available() {
-  if [ ! -z $instance_dir ] ; then
-    echo "Instance cannot be specified"
+
+function requires_instance_dir() {
+  if [ -z "$instance_dir" ] ; then
+    echo "Instance is required"
     usage=1
-    return
+    return 1
   fi
-  ls -d ${available_dir}/* | grep "/[0-9a-z][-0-9a-z]*$"
 }
-
-function do_enabled() {
-  if [ ! -z $instance_dir ] ; then
+function prohibits_instance_dir() {
+  if [ ! -z "$instance_dir" ] ; then
     echo "Instance cannot be specified"
     usage=1
-    return
+    return 1
   fi
-  ls -d ${enabled_dir}/* | grep "/[0-9a-z][-0-9a-z]*$"
 }
 
-function do_enable() {
-  if [ -z $instance_dir ] ; then
-    echo "Instance must be specified"
-    usage=1
-    return
-  fi
-  # check if the instance isn't enabled already
-  # check if the instance isn't forcibly disabled
-  # check if the instance is available
-  # make a symbolic link
-  if [ -L ${enabled_dir}/$(basename $instance_dir) ] ; then
-    echo "$instance_dir is already enabled"
-    exit 1
-  fi
-  if [ -r ${enabled_dir}/$(basename $instance_dir) ] ; then
-    echo "$instance_dir has been forcibly disabled by the presence of the file ${enabled_dir}/$(basename $instance_dir)"
-    exit 1
+function do_available() {
+  prohibits_instance_dir && {
+    ls -d ${available_dir}/* | grep "/[0-9a-z][-0-9a-z]*$"
+  }
+}
+
+function do_enabled() {
+  prohibits_instance_dir && {
+    ls -d ${enabled_dir}/* | grep "/[0-9a-z][-0-9a-z]*$"
+  }
+}
+
+function do_help() {
+  if [ -z "$instance_dir" ] ; then
+    cat <<EOF
+$0 is a command to manage virtual machines running under
+the regime of Vizrt Online System Administration.
+
+"$0 status" gives you a quick overview of the VMs running
+on this host.
+EOF
+    exit 0;
+  else
+    echo "\"$0 -i $instance_dir status\" to see the status of this instance"
+    echo "\"$0 -i $instance_dir install\" to (re)install this image from scratch"
+    exit 0;
   fi
-  if [ ! -d ${available_dir}/$(basename $instance_dir) ] ; then
-    echo "$instance_dir is not an available instance"
-    exit 1
+}
+
+function do_status() {
+  if [ -z "$instance_dir" ] ; then
+    for a in $(
+      ls -d ${available_dir}/* | grep "/[0-9a-z][-0-9a-z]*$"
+    ) ; do 
+      really_do_status $a
+    done
+  else
+    really_do_status $instance_dir
   fi
-  ln -v -s "../available.d/$(basename $instance_dir)" "$enabled_dir" || exit 1
+}
+
+function really_do_status () {
+    local output
+    local avdir="${available_dir}/$(basename $1)"
+    local endir="${enabled_dir}/$(basename $1)"
+    output=( $avdir )
+    if [ ! -d "$avdir" ] ; then
+      output=( ${output[@]} unavailable );
+    else
+      output=( ${output[@]} available );
+      if [ ! -L "$endir" ] ; then
+        output=( ${output[@]} disabled );
+      else
+        output=( ${output[@]} enabled );
+        local vmdir=$(readlink -f ${avdir}/../../../../../var/lib/vizrt/vosa/images/vm02/)
+        if [ ! -d "$vmdir" ] ; then
+          output=( ${output[@]} uninstalled );
+        else
+          output=( ${output[@]} installed );
+          local statefile=$(readlink -f ${avdir}/../../../../../var/run/vizrt/vosa/$(basename $1).state)
+          if [ ! -r "$statefile" ] ; then
+            output=( ${output[@]} probably_stopped );
+          else
+            output=( ${output[@]} $(<$statefile) );
+            if [ ! -z "$(<$statefile)" -a $(<$statefile) == "running" ] ; then
+              local pidfile="$(dirname $statefile)/$(basename $1).pid"
+              if [ -r "$pidfile" ] ; then
+                output=( ${output[@]} $(<$pidfile) );
+                if ! ps > /dev/null $(<$pidfile) ; then
+                  output=( ${output[@]} dead );
+                else
+                  output=( ${output[@]} alive "$( ps -p "$(<$pidfile)" -o "etime=" )" );
+                fi
+              fi
+            fi
+          fi
+        fi
+      fi
+    fi
+    echo ${output[@]}
+}
+
+function do_enable() {
+  requires_instance_dir && {
+    # check if the instance is available
+    # check if the instance isn't enabled already
+    # check if the instance isn't forcibly disabled
+    # make a symbolic link
+    if [ ! -d ${available_dir}/$(basename $instance_dir) ] ; then
+      echo "$instance_dir is not an available instance"
+      exit 1
+    fi
+    if [ -L ${enabled_dir}/$(basename $instance_dir) ] ; then
+      echo "$instance_dir is already enabled"
+      exit 1
+    fi
+    if [ -r ${enabled_dir}/$(basename $instance_dir) ] ; then
+      echo "$instance_dir has been forcibly disabled by the presence of the file ${enabled_dir}/$(basename $instance_dir)"
+      exit 1
+    fi
+    ln -v -s "../available.d/$(basename $instance_dir)" "$enabled_dir" || exit 1
+  }
 }
 
 
@@ -86,29 +163,23 @@ commands="$(dirname $0)/../share/vizrt/vosa/commands"
 
 
 function do_install() {
-  if [ -z $instance_dir ] ; then
-    echo "Instance is required"
-    usage=1
-    return
-  fi
-  # todo:
-  # Error checking: if the instance is not enabled, abort
-  # If the instance exists and is running, abort. its 'statefile' must be set to 'stopped' for a reinstall to happen.
-  # If the instance exists, take a tar.gz backup of the entire image directory
-  ${commands}/install.sh "$instance_dir" "$(dirname $0)/../../var/lib/vizrt/vosa/images/$(basename $instance_dir)"
+  requires_instance_dir && {
+    # todo:
+    # Error checking: if the instance is not enabled, abort
+    # If the instance exists and is running, abort. its 'statefile' must be set to 'stopped' for a reinstall to happen.
+    # If the instance exists, take a tar.gz backup of the entire image directory
+    ${commands}/install.sh "$instance_dir" "$(dirname $0)/../../var/lib/vizrt/vosa/images/$(basename $instance_dir)"
+  }
 }
 
 function do_start() {
-  if [ -z $instance_dir ] ; then
-    echo "Instance is required"
-    usage=1
-    return
-  fi
-  # todo:
-  # Error checking: if the instance is not enabled, abort
-  # If the instance exists and is running, abort. its 'statefile' must be set to 'stopped' for a reinstall to happen.
-  # If the instance exists, take a tar.gz backup of the entire image directory
-  ${commands}/boot.sh "$instance_dir" "$(dirname $0)/../../var/lib/vizrt/vosa/images/$(basename $instance_dir)"
+  requires_instance_dir && {
+    # todo:
+    # Error checking: if the instance is not enabled, abort
+    # If the instance exists and is running, abort. its 'statefile' must be set to 'stopped' for a reinstall to happen.
+    # If the instance exists, take a tar.gz backup of the entire image directory
+    ${commands}/boot.sh "$instance_dir" "$(dirname $0)/../../var/lib/vizrt/vosa/images/$(basename $instance_dir)"
+  }
 }
 
 
@@ -163,7 +234,8 @@ declare > /dev/null -f "$fn" || unknown-argument "$1"
 declare > /dev/null -f "$fn" && "$fn"
 
 if [ $usage -eq 1 ] ; then
-  echo "Usage: $0 -i instance-dir <command>"
+  echo "Usage: $0 [-i <instance-dir>] <command>"
+  echo "$0 available to get a list of instances"
   exit 1;
 fi
 

From 77406e707ef599e8bfec2bad603d34fccbf97002 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Wed, 8 Feb 2012 22:07:15 +0100
Subject: [PATCH 0389/2585]      removed typos

---
 usr/share/vizrt/vosa/commands/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/vizrt/vosa/commands/install.sh b/usr/share/vizrt/vosa/commands/install.sh
index 12243eb7..4755fc12 100755
--- a/usr/share/vizrt/vosa/commands/install.sh
+++ b/usr/share/vizrt/vosa/commands/install.sh
@@ -120,7 +120,7 @@ function create_overlay() {
   # local copy of overlay
   mkdir -p ${tempdir}/overlay/updates; exitonerror $? "Unable to make overlay directory" 
 
-  for o in "${install_config_overlay[@]}" ; do  ****
+  for o in "${install_config_overlay[@]}" ; do
     if [ "${o}" == "" ] ; then continue; fi
     cp -rp --dereference $o/* ${tempdir}/overlay/updates/; exitonerror $? "Unable to copy overlay $o" 
   done

From bb720ef059c9e88427fbcf83d250fa26132e0c4d Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Wed, 8 Feb 2012 22:25:02 +0100
Subject: [PATCH 0390/2585]      added uninstall command. fixed status to not
 depend on vm02...

---
 usr/bin/vosa | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 2c29d47c..516d177d 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -108,7 +108,7 @@ function really_do_status () {
         output=( ${output[@]} disabled );
       else
         output=( ${output[@]} enabled );
-        local vmdir=$(readlink -f ${avdir}/../../../../../var/lib/vizrt/vosa/images/vm02/)
+        local vmdir=$(readlink -f ${avdir}/../../../../../var/lib/vizrt/vosa/images/$(basename $1))
         if [ ! -d "$vmdir" ] ; then
           output=( ${output[@]} uninstalled );
         else
@@ -158,6 +158,31 @@ function do_enable() {
   }
 }
 
+function do_uninstall() {
+  requires_instance_dir && {
+    # check if the instance is available
+    # check if the instance isn't enabled already
+    # check if the instance isn't forcibly disabled
+    # make a symbolic link
+    if [ ! -d ${available_dir}/$(basename $instance_dir) ] ; then
+      echo "$instance_dir is not an available instance"
+      exit 1
+    fi
+    if [ ! -L ${enabled_dir}/$(basename $instance_dir) ] ; then
+      echo "$instance_dir is not enabled"
+      exit 1
+    fi
+    local imgdir=$(readlink -f ${instance_dir}/../../../../../var/lib/vizrt/vosa/images/$(basename $instance_dir)/)
+    local backupdir="/var/backup/vizrt/vosa/$(basename $instance_dir)"
+    local backupparent="/var/backup/vizrt/vosa"
+    if [ ! -z "$imgdir" -a -d "$imgdir" -a -w "$backupparent" ] ; then
+      # todo: rotate a few times?
+      rm -rf "$backupdir"
+      mv "$imgdir" "$backupparent"
+    fi
+  }
+}
+
 
 commands="$(dirname $0)/../share/vizrt/vosa/commands"
 

From e8d53a7fa970020025e76e22221f66a9d5b31d7e Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Wed, 8 Feb 2012 22:33:28 +0100
Subject: [PATCH 0391/2585]      Fixed backup to only backup if backups
 directory exist. one generation only. Add system generated ssh key to image

---
 usr/bin/vosa                             | 19 +++++++++++++------
 usr/share/vizrt/vosa/commands/install.sh |  1 +
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 516d177d..c1e0c1f4 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -7,8 +7,10 @@
 # vosa -i /etc/vizrt/vosa/available.d/vm03 enable --- enable a specific vm
 # vosa -i /etc/vizrt/vosa/available.d/vm03 disable --- disable a specific vm
 # vosa -i /etc/vizrt/vosa/enabled.d/vm03 disable --- disable a vm
-# vosa -i ... restart
-# vosa -i ... reinstall
+# vosa -i /etc/vizrt/vosa/enabled.d/vm03 install --- creates a new disk image etc.
+# vosa -i /etc/vizrt/vosa/enabled.d/vm03 uninstall --- removes the disk image etc.
+# vosa -i ... start
+# vosa -i ... status --- tells you about the VM, if it's enabled, running, alive, its uptime.
 
 instance_dir=
 usage=0
@@ -24,6 +26,7 @@ function option-h() {
 
 function option-i() {
   instance_dir="${1}"
+  # TODO remove trailing "/" since it's supposed to be a directory.  This script depends on it!
 }
 
 
@@ -175,10 +178,14 @@ function do_uninstall() {
     local imgdir=$(readlink -f ${instance_dir}/../../../../../var/lib/vizrt/vosa/images/$(basename $instance_dir)/)
     local backupdir="/var/backup/vizrt/vosa/$(basename $instance_dir)"
     local backupparent="/var/backup/vizrt/vosa"
-    if [ ! -z "$imgdir" -a -d "$imgdir" -a -w "$backupparent" ] ; then
-      # todo: rotate a few times?
-      rm -rf "$backupdir"
-      mv "$imgdir" "$backupparent"
+    if [ ! -z "$imgdir" -a -d "$imgdir" ] ; then
+      if [ -w "$backupparent" ] ; then
+        # todo: rotate a few times?
+        rm -rf "$backupdir"
+        mv "$imgdir" "$backupparent"
+      else
+        rm -rf "$imgdir"
+      fi
     fi
   }
 }
diff --git a/usr/share/vizrt/vosa/commands/install.sh b/usr/share/vizrt/vosa/commands/install.sh
index 4755fc12..4f697df3 100755
--- a/usr/share/vizrt/vosa/commands/install.sh
+++ b/usr/share/vizrt/vosa/commands/install.sh
@@ -140,6 +140,7 @@ EOF
 
   mkdir -p ${tempdir}/overlay/updates/home/ubuntu/.ssh
   chmod 700 ${tempdir}/overlay/updates/home/ubuntu/.ssh
+  cp "${image}/id_dsa.pub" "${tempdir}/overlay/updates/home/ubuntu/.ssh/authorized_keys"; exitonerror $? "Unable to install id_dsa.pub" 
   for o in "${install_config_ssh_keys[@]}" ; do
     cat $o >> ${tempdir}/overlay/updates/home/ubuntu/.ssh/authorized_keys; exitonerror $? "Unable to add authorized key $o" 
   done

From 566c658c26c5c7ee5308d075b0243ced85c45a21 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Wed, 8 Feb 2012 22:45:12 +0100
Subject: [PATCH 0392/2585]      uninstall now checks if the vm is alive or in
 the "running" state, and aborts

---
 usr/bin/vosa | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index c1e0c1f4..d41bc1f8 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -175,6 +175,15 @@ function do_uninstall() {
       echo "$instance_dir is not enabled"
       exit 1
     fi
+    local status=( $(really_do_status $instance_dir) )
+    if [ "${status[6]}" == "alive" ] ; then
+      echo "$instance_dir is alive. Stop it first. exiting"
+      exit 1
+    fi
+    if [ "${status[4]}" == "running" ] ; then
+      echo "$instance_dir is supposed to be running. Stop it first. Exiting!"
+      exit 1
+    fi
     local imgdir=$(readlink -f ${instance_dir}/../../../../../var/lib/vizrt/vosa/images/$(basename $instance_dir)/)
     local backupdir="/var/backup/vizrt/vosa/$(basename $instance_dir)"
     local backupparent="/var/backup/vizrt/vosa"

From 6f05b0e85a5bb8291b849f3009b87a69b421c137 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Wed, 8 Feb 2012 23:04:15 +0100
Subject: [PATCH 0393/2585]      Added "stop" command. Added checks for start
 and install to not destroy a running system

---
 usr/bin/vosa | 59 +++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 51 insertions(+), 8 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index d41bc1f8..f8f9027f 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -161,6 +161,21 @@ function do_enable() {
   }
 }
 
+function help_uninstall() {
+  cat <<EOF
+uninstall: removes the entire image directory from disk.
+
+This deletes the contents of the directory
+/var/lib/vizrt/vosa/images/<vm-id>/ if it exists.
+
+If the VM is in the running state (i.e. it _should_ be
+running, this command does nothing.
+
+If the VM is alive, i.e. actually is running, this
+command does nothing.
+EOF
+}
+
 function do_uninstall() {
   requires_instance_dir && {
     # check if the instance is available
@@ -205,24 +220,51 @@ commands="$(dirname $0)/../share/vizrt/vosa/commands"
 
 function do_install() {
   requires_instance_dir && {
-    # todo:
-    # Error checking: if the instance is not enabled, abort
-    # If the instance exists and is running, abort. its 'statefile' must be set to 'stopped' for a reinstall to happen.
-    # If the instance exists, take a tar.gz backup of the entire image directory
+    local status=( $(really_do_status $instance_dir) )
+    if [ "${status[3]}" == "installed" ] ; then
+      echo "$instance_dir is already installed. Uninstall before installing."
+      exit 1
+    fi
+    if [ "${status[2]}" != "enabled" ] ; then
+      echo "$instance_dir is not enabled, enable it on this host first"
+      exit 1
+    fi
     ${commands}/install.sh "$instance_dir" "$(dirname $0)/../../var/lib/vizrt/vosa/images/$(basename $instance_dir)"
   }
 }
 
 function do_start() {
   requires_instance_dir && {
-    # todo:
-    # Error checking: if the instance is not enabled, abort
-    # If the instance exists and is running, abort. its 'statefile' must be set to 'stopped' for a reinstall to happen.
-    # If the instance exists, take a tar.gz backup of the entire image directory
+    local status=( $(really_do_status $instance_dir) )
+    if [ "${status[6]}" == "alive" ] ; then
+      echo "$instance_dir is alive. No need to start it."
+      exit 1
+    fi
+    if [ "${status[3]}" != "installed" ] ; then
+      echo "$instance_dir is not installed. I can't start it."
+      exit 1
+    fi
     ${commands}/boot.sh "$instance_dir" "$(dirname $0)/../../var/lib/vizrt/vosa/images/$(basename $instance_dir)"
   }
 }
 
+function do_stop() {
+  requires_instance_dir && {
+    local status=( $(really_do_status $instance_dir) )
+    if [ "${status[3]}" != "installed" ] ; then
+      echo "$instance_dir is not installed. I can't stop it."
+      exit 1
+    fi
+    if [ "${status[6]}" == "alive" ] ; then
+      echo "Killing kvm process ${status[5]}"
+      kill "${status[5]}"
+      # should now be "dead" if we asked it.
+    fi
+    # set state to "stopped"
+    echo "stopped" > "$(dirname $0)/../../var/run/vizrt/vosa/$(basename $instance_dir).state"
+  }
+}
+
 
 
 function unknown-argument() {
@@ -260,6 +302,7 @@ shift $((LASTOPTIND-1))
 
 if [ $usage -eq 0 -a "${#@}" -gt 1 ] ; then
   echo "Only one argument is allowed"
+  # TODO parse each command one at a time...
   usage=1
 fi
 

From 36d2b0b670393cb0c13d145c6749626f064e5cb2 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Wed, 8 Feb 2012 23:09:30 +0100
Subject: [PATCH 0394/2585]      Made it possible to do many commands after one
 another (but it doesn't quite work)

---
 usr/bin/vosa | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index f8f9027f..286c9037 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -295,33 +295,33 @@ LASTOPTIND=$OPTIND
 
 }
 
+function verify_usage() {
+  if [ $usage -eq 1 ] ; then
+    echo "Usage: $0 [-i <instance-dir>] <command>"
+    echo "$0 available to get a list of instances"
+    exit 1;
+  fi
+}
+
 parseopts "$PWD" "${@}"
 
 # get rid of all parsed parameters from command line, leaving real arguments
 shift $((LASTOPTIND-1))
 
-if [ $usage -eq 0 -a "${#@}" -gt 1 ] ; then
-  echo "Only one argument is allowed"
-  # TODO parse each command one at a time...
-  usage=1
-fi
-
 if [ $usage -eq 0 -a "${#@}" -lt 1 ] ; then
   echo "A command must be specified."
   usage=1
 fi
 
+verify_usage
 
-# Check if the command
-fn="do_$1"
-declare > /dev/null -f "$fn" || unknown-argument "$1"
-declare > /dev/null -f "$fn" && "$fn"
-
-if [ $usage -eq 1 ] ; then
-  echo "Usage: $0 [-i <instance-dir>] <command>"
-  echo "$0 available to get a list of instances"
-  exit 1;
-fi
+for cmd in "${@}" ; do
+  # Check if the command
+  fn="do_${cmd}"
+  declare > /dev/null -f "$fn" || unknown-argument "$1"
+  declare > /dev/null -f "$fn" && "$fn"
+  verify_usage
+done
 
 
 

From 38b1d488a6ed4328306e08a3ff46c9917a6b640d Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Wed, 8 Feb 2012 23:12:53 +0100
Subject: [PATCH 0395/2585]      local variable

---
 usr/bin/vosa | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 286c9037..95c3ba3b 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -88,6 +88,7 @@ EOF
 
 function do_status() {
   if [ -z "$instance_dir" ] ; then
+    local a
     for a in $(
       ls -d ${available_dir}/* | grep "/[0-9a-z][-0-9a-z]*$"
     ) ; do 

From a48cf9d075caa953a4ba0b0fbddbcd190f8600a8 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Wed, 8 Feb 2012 23:25:51 +0100
Subject: [PATCH 0396/2585]      Fixed install so that it can actually boot a
 working machine, with IP and timezone, etc

---
 usr/share/vizrt/vosa/commands/install.sh | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/usr/share/vizrt/vosa/commands/install.sh b/usr/share/vizrt/vosa/commands/install.sh
index 4f697df3..aade1f3c 100755
--- a/usr/share/vizrt/vosa/commands/install.sh
+++ b/usr/share/vizrt/vosa/commands/install.sh
@@ -129,10 +129,10 @@ function create_overlay() {
   cat >> ${tempdir}/overlay/updates/var/lib/cloud/data/cache/nocloud/user-data <<EOF
 #cloud-config
 manage_etc_hosts: true
-timezone: ${timezone}
+timezone: ${install_config_timezone}
 apt_update: false
 apt_upgrade: false
-apt_mirror: ${mirror}
+apt_mirror: ${install_config_mirror}
 EOF
 
   cat >> ${tempdir}/overlay/updates/var/lib/cloud/data/cache/nocloud/meta-data <<EOF
@@ -146,7 +146,6 @@ EOF
   done
 
   chmod 600 ${tempdir}/overlay/updates/home/ubuntu/.ssh/authorized_keys; exitonerror $? "Unable to chmod 600 authorized_keys" 
-  # todo: inject another key to go from one server to another???
 
   cat > ${tempdir}/overlay/updates.script <<EOF
 # Reset permissions on files created above (might not belong to root etc):
@@ -158,17 +157,16 @@ perl -pi -e 's/iface eth0.*//' /etc/network/interfaces
 # Add static IP configuration
 cat >> /etc/network/interfaces <<END
 iface eth0 inet static
-    address ${guestip}
-    netmask ${guestmask}
-    gateway ${guestgw}
+    address ${install_config_ip_address}
+    netmask ${install_config_netmask}
+    gateway ${install_config_gateway}
 END
 EOF
 
   chmod 755 ${tempdir}/overlay/updates.script
-  # Make an ISO image of the overlay, to pass to kvm during its first boot.
-  genisoimage -quiet -rock -uid 0 -gid 0 --output ${tempdir}/updates.iso ${tempdir}/overlay; exitonerror $? "Unable to create overlay file" 
-
 
+  # Make an ISO image of the overlay, to pass to kvm during its first boot.
+  genisoimage -quiet -rock -uid 0 -gid 0 --output ${image}/updates.iso ${tempdir}/overlay; exitonerror $? "Unable to create overlay file" 
 
   cleanup_temp_dir
 }

From 9e98889ef86658568d790b53a39f93ac44fda8e5 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Wed, 8 Feb 2012 23:34:48 +0100
Subject: [PATCH 0397/2585]      Actually try to run the postinstall scripts...

---
 usr/share/vizrt/vosa/commands/install.sh             | 12 ++++++++++--
 .../vizrt/vosa/post-install-hooks/install-engine.sh  |  0
 2 files changed, 10 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 usr/share/vizrt/vosa/post-install-hooks/install-engine.sh

diff --git a/usr/share/vizrt/vosa/commands/install.sh b/usr/share/vizrt/vosa/commands/install.sh
index aade1f3c..2a856bfb 100755
--- a/usr/share/vizrt/vosa/commands/install.sh
+++ b/usr/share/vizrt/vosa/commands/install.sh
@@ -177,8 +177,16 @@ function delete_overlay() {
 }
 
 function postinstall() {
-  echo "running all the postinstall scripts..."
-  sleep 4;
+  for o in "${install_config_postinstall[@]}" ; do
+    echo "Executing postinstall $o"
+    local cmd="$(dirname $0)/../post-install-hooks/$o"
+    if [ ! -x "$cmd" ] ; then
+      echo "Unable to execute non-executable post-install hook: $cmd"
+      exit 1
+    fi
+    cmd=$(readlink -f "$cmd")
+    $cmd "$config" "$image"
+  done
 }
 
 copy_original_image
diff --git a/usr/share/vizrt/vosa/post-install-hooks/install-engine.sh b/usr/share/vizrt/vosa/post-install-hooks/install-engine.sh
old mode 100644
new mode 100755

From d8849a2b816ea42d3c5ba78616b4cdec56856ae3 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Wed, 8 Feb 2012 23:36:24 +0100
Subject: [PATCH 0398/2585]      Handle all values of arrays

---
 usr/share/vizrt/vosa/commands/install_config_parser | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/share/vizrt/vosa/commands/install_config_parser b/usr/share/vizrt/vosa/commands/install_config_parser
index 1748d1b4..6eedd346 100644
--- a/usr/share/vizrt/vosa/commands/install_config_parser
+++ b/usr/share/vizrt/vosa/commands/install_config_parser
@@ -50,13 +50,13 @@ declare -a install_config_overlay
 declare -a install_config_postinstall
 
 function install_config_ssh_keys() {
-  install_config_ssh_keys=( "${ssh_keys[@]}" "$1" )
+  install_config_ssh_keys=( "${install_config_ssh_keys[@]}" "$1" )
 }
 
 function install_config_overlay() {
-  install_config_overlay=( "${overlay[@]}" "$1" )
+  install_config_overlay=( "${install_config_overlay[@]}" "$1" )
 }
 
 function install_config_postinstall() {
-  install_config_postinstall=( "${postinstall[@]}" "$1" )
+  install_config_postinstall=( "${install_config_postinstall[@]}" "$1" )
 }

From fe68d84ac8340bedddbc2e2a1939b0fe09f650ae Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Wed, 8 Feb 2012 23:54:27 +0100
Subject: [PATCH 0399/2585]      Working wait-for-ssh, working ssh.conf, can
 now ssh from host to guest as root too.

---
 usr/share/vizrt/vosa/commands/install.sh         | 16 ++++++++++++++++
 .../vizrt/vosa/post-install-hooks/make-a-motd.sh |  3 +++
 .../vosa/post-install-hooks/wait-for-ssh.sh      | 12 ++++++++++++
 3 files changed, 31 insertions(+)
 create mode 100755 usr/share/vizrt/vosa/post-install-hooks/make-a-motd.sh
 create mode 100755 usr/share/vizrt/vosa/post-install-hooks/wait-for-ssh.sh

diff --git a/usr/share/vizrt/vosa/commands/install.sh b/usr/share/vizrt/vosa/commands/install.sh
index 2a856bfb..9b7fda8f 100755
--- a/usr/share/vizrt/vosa/commands/install.sh
+++ b/usr/share/vizrt/vosa/commands/install.sh
@@ -114,6 +114,17 @@ function generate_ssh_key() {
   ssh-keygen -t dsa -N "" -f ${image}/id_dsa -b 1024 -C "kvm-one-time-key:$name" > /dev/null; exitonerror $? "Unable to generate ssh key"
 }
 
+function make_ssh_conf() {
+  cat > ${image}/ssh.conf <<EOF
+IdentityFile ${image}/id_dsa
+HostName ${install_config_ip_address}
+User ubuntu
+BatchMode yes
+UserKnownHostsFile ${image}/ssh_known_hosts
+StrictHostKeyChecking no
+EOF
+}
+
 function create_overlay() {
   make_temp_dir
 
@@ -138,13 +149,17 @@ EOF
   cat >> ${tempdir}/overlay/updates/var/lib/cloud/data/cache/nocloud/meta-data <<EOF
 EOF
 
+  mkdir -p ${tempdir}/overlay/updates/root/.ssh
+  chmod 700 ${tempdir}/overlay/updates/root/.ssh
   mkdir -p ${tempdir}/overlay/updates/home/ubuntu/.ssh
   chmod 700 ${tempdir}/overlay/updates/home/ubuntu/.ssh
   cp "${image}/id_dsa.pub" "${tempdir}/overlay/updates/home/ubuntu/.ssh/authorized_keys"; exitonerror $? "Unable to install id_dsa.pub" 
+  cp "${image}/id_dsa.pub" "${tempdir}/overlay/updates/root/.ssh/authorized_keys"; exitonerror $? "Unable to install id_dsa.pub for root" 
   for o in "${install_config_ssh_keys[@]}" ; do
     cat $o >> ${tempdir}/overlay/updates/home/ubuntu/.ssh/authorized_keys; exitonerror $? "Unable to add authorized key $o" 
   done
 
+  chmod 600 ${tempdir}/overlay/updates/root/.ssh/authorized_keys; exitonerror $? "Unable to chmod 600 authorized_keys" 
   chmod 600 ${tempdir}/overlay/updates/home/ubuntu/.ssh/authorized_keys; exitonerror $? "Unable to chmod 600 authorized_keys" 
 
   cat > ${tempdir}/overlay/updates.script <<EOF
@@ -192,6 +207,7 @@ function postinstall() {
 copy_original_image
 resize_original_image
 generate_ssh_key
+make_ssh_conf
 
 ### functions below require tempdir
 
diff --git a/usr/share/vizrt/vosa/post-install-hooks/make-a-motd.sh b/usr/share/vizrt/vosa/post-install-hooks/make-a-motd.sh
new file mode 100755
index 00000000..5f77a8b2
--- /dev/null
+++ b/usr/share/vizrt/vosa/post-install-hooks/make-a-motd.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+echo 'This is a VOSA system!' | ssh -F $2/ssh.conf root@remote tee /etc/motd
diff --git a/usr/share/vizrt/vosa/post-install-hooks/wait-for-ssh.sh b/usr/share/vizrt/vosa/post-install-hooks/wait-for-ssh.sh
new file mode 100755
index 00000000..8611f3d2
--- /dev/null
+++ b/usr/share/vizrt/vosa/post-install-hooks/wait-for-ssh.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+for a in $(seq 1 20) ; do
+  ssh -q -F $2/ssh.conf root@remote id > /dev/null
+  if [ $? == 0 ] ; then
+    exit 0
+  fi
+  sleep 1;
+done
+
+exit 1
+

From a5b99508559a8eb54717b067addc3e1972117ca3 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Thu, 9 Feb 2012 00:02:43 +0100
Subject: [PATCH 0400/2585]      Made ssh.conf specifically call the guest for
 "guest" to make things more homogenous

---
 usr/share/vizrt/vosa/commands/install.sh            | 13 +++++++------
 .../vizrt/vosa/post-install-hooks/make-a-motd.sh    |  3 ++-
 .../vizrt/vosa/post-install-hooks/wait-for-ssh.sh   |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/usr/share/vizrt/vosa/commands/install.sh b/usr/share/vizrt/vosa/commands/install.sh
index 9b7fda8f..c5a877b8 100755
--- a/usr/share/vizrt/vosa/commands/install.sh
+++ b/usr/share/vizrt/vosa/commands/install.sh
@@ -116,12 +116,13 @@ function generate_ssh_key() {
 
 function make_ssh_conf() {
   cat > ${image}/ssh.conf <<EOF
-IdentityFile ${image}/id_dsa
-HostName ${install_config_ip_address}
-User ubuntu
-BatchMode yes
-UserKnownHostsFile ${image}/ssh_known_hosts
-StrictHostKeyChecking no
+Host guest
+  IdentityFile ${image}/id_dsa
+  HostName ${install_config_ip_address}
+  User ubuntu
+  BatchMode yes
+  UserKnownHostsFile ${image}/ssh_known_hosts
+  StrictHostKeyChecking no
 EOF
 }
 
diff --git a/usr/share/vizrt/vosa/post-install-hooks/make-a-motd.sh b/usr/share/vizrt/vosa/post-install-hooks/make-a-motd.sh
index 5f77a8b2..0af8c61a 100755
--- a/usr/share/vizrt/vosa/post-install-hooks/make-a-motd.sh
+++ b/usr/share/vizrt/vosa/post-install-hooks/make-a-motd.sh
@@ -1,3 +1,4 @@
 #!/bin/bash
 
-echo 'This is a VOSA system!' | ssh -F $2/ssh.conf root@remote tee /etc/motd
+ssh -F $2/ssh.conf root@guest rm /etc/motd
+echo 'This is a VOSA system!' | ssh -F $2/ssh.conf root@guest tee /etc/motd
diff --git a/usr/share/vizrt/vosa/post-install-hooks/wait-for-ssh.sh b/usr/share/vizrt/vosa/post-install-hooks/wait-for-ssh.sh
index 8611f3d2..5b52ab44 100755
--- a/usr/share/vizrt/vosa/post-install-hooks/wait-for-ssh.sh
+++ b/usr/share/vizrt/vosa/post-install-hooks/wait-for-ssh.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 for a in $(seq 1 20) ; do
-  ssh -q -F $2/ssh.conf root@remote id > /dev/null
+  ssh -q -F $2/ssh.conf root@guest id > /dev/null
   if [ $? == 0 ] ; then
     exit 0
   fi

From 611ddb3f162f989469c9086485f9533316eb1f29 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Thu, 9 Feb 2012 00:14:57 +0100
Subject: [PATCH 0401/2585]      now actually calls ece-install as postinst job

---
 .../vosa/post-install-hooks/install-engine.sh | 39 +++++++++++++------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/usr/share/vizrt/vosa/post-install-hooks/install-engine.sh b/usr/share/vizrt/vosa/post-install-hooks/install-engine.sh
index e864c4dc..171c0143 100755
--- a/usr/share/vizrt/vosa/post-install-hooks/install-engine.sh
+++ b/usr/share/vizrt/vosa/post-install-hooks/install-engine.sh
@@ -1,19 +1,34 @@
-# Only argument is the "vm name" as provided on the command line,
+#!/bin/bash
+
+# Two arguments are passed:
+# the "vm name" as provided on the command line,
 # which is a directory path of a VOSA vm definition:
 #
 # e.g. /etc/vosa/available.d/vm03
+#
+# and the image directory, which holds generated files
+# which stick across reboots, but not reinstalls.
+#
+# e.g. /var/lib/vosa/image/vm03
 
 # The VM is assumed to be booted and ready for SSH using the passwordless
-# key in the vm03 directory, as the XXX user (ubuntu?)
+# key referenced by the $2/ssh.conf file, as the ubuntu or root users.
+
+# ensure we have an ece-install image.
+if [ ! -r $2/ece-install ] ; then
+  if [ -r $1/ece-install ] ; then
+    cp $1/ece-install $2
+  else
+    wget "https://raw.github.com/skybert/ece-scripts/master/usr/sbin/ece-install" -O $2/ece-install
+  fi
+fi
+chmod +x $2/ece-install
+if [ ! -r $1/ece-install.conf ] ; then
+  echo "No ece-install.conf file present in $1"
+  exit 1;
+fi
+
+scp -F $2/ssh.conf $2/ece-install $1/ece-install.conf root@guest:
 
-cat > /dev/null <<EOF
-ece-install is copied in to /root
-so is a conf file (probably located in /etc/vosa/available.d/vm03
-ece-install is called
-return code is ! 0 if ece-install is ! 0...
-EOF
+ssh -F $2/ssh.conf root@guest ./ece-install
 
-# What's needed: A tool to extract interesting information about a VM
-# at run-time, programmatically.
-# e.g. give me the IP address of a running VM by name "vm04"
-# e.g. give me the 

From 4d3bcdd99778c554ff78a50bbf51de775b18dd84 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 9 Feb 2012 12:22:51 +0800
Subject: [PATCH 0402/2585]      - added listing of available commands to "vosa
 help"

---
 usr/bin/vosa | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 95c3ba3b..81abb3ef 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -78,6 +78,12 @@ the regime of Vizrt Online System Administration.
 "$0 status" gives you a quick overview of the VMs running
 on this host.
 EOF
+    echo "$0 supports these commands:"
+    declare | grep ^"do_" | cut -d' ' -f1 | cut -d'_' -f2 | sort | \
+        while read f; do
+      echo "  *" $f
+    done
+    
     exit 0;
   else
     echo "\"$0 -i $instance_dir status\" to see the status of this instance"

From 27b4f8eebf7c1de0934ce0e7cc450aa21c24c442 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Thu, 9 Feb 2012 22:59:57 +0100
Subject: [PATCH 0403/2585]      Added "long help" by using awk to parse the
 shell script itself, looking for preceding ## comments

---
 usr/bin/vosa                           | 115 +++++++++++++++++++++----
 usr/share/vizrt/vosa/commands/help.awk |  37 ++++++++
 2 files changed, 137 insertions(+), 15 deletions(-)
 create mode 100644 usr/share/vizrt/vosa/commands/help.awk

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 81abb3ef..dd18c353 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -57,18 +57,31 @@ function prohibits_instance_dir() {
   fi
 }
 
+## Lists the names of all the instance definitions known to vosa.
+##
+## An instance known to vosa is an instance which has a directory
+## /etc/vizrt/vosa/available.d/<instance>/
+##
+## An available instance
 function do_available() {
   prohibits_instance_dir && {
     ls -d ${available_dir}/* | grep "/[0-9a-z][-0-9a-z]*$"
   }
 }
 
+## Lists the names of all enabled instances
+##
+## An enabled instance is an instance with a symlink from
+## /etc/vizrt/vosa/enabled.d/<instance> -> ../available.d/<instance>
+##
+## An enabled instance may be installed
 function do_enabled() {
   prohibits_instance_dir && {
     ls -d ${enabled_dir}/* | grep "/[0-9a-z][-0-9a-z]*$"
   }
 }
 
+## Provides help... :-)
 function do_help() {
   if [ -z "$instance_dir" ] ; then
     cat <<EOF
@@ -79,9 +92,11 @@ the regime of Vizrt Online System Administration.
 on this host.
 EOF
     echo "$0 supports these commands:"
-    declare | grep ^"do_" | cut -d' ' -f1 | cut -d'_' -f2 | sort | \
+    declare -F | grep ^"declare -f do_" | cut -d ' ' -f3 | cut -d'_' -f2 | sort | \
         while read f; do
-      echo "  *" $f
+      echo -n ' * '$f:  # first line on the same as the command.
+      awk -f $commands/help.awk fn=do_$f < $0
+      echo
     done
     
     exit 0;
@@ -92,6 +107,32 @@ EOF
   fi
 }
 
+## Provides status information about defines VMs
+##
+## vosa status
+##      Provides status information on all known VMs.
+##
+## vosa -i <instance> status
+##      Provides status information on a single VM
+##
+## Status information consists of up to 8 columns
+##  - instance name
+##      The first column is the instance name itself.
+##      An instance may be unavailable or available.
+##  - unavailable or available
+##      An unavailable VM isn't known to the system.
+##      An available VM is known to the system, in that it contains
+##      a directory in /etc/vizrt/vosa/available.d/<instance>/
+##      An available VM can be enabled or disabled.
+##  - enabled or disabled
+##      A disabled VM is not "supposed" to run on this physical machine
+##      An enabled VM *is* supposed to run on this machine.
+##      An enabled VM may be installed or uninstalled.
+##  - installed or uninstalled
+##      An uninstalled VM does not have an image directory
+##      An installed VM *does* have an image directory
+##      An installed VM may be running or stopped
+## rest of help excluded because of pending changes to vosa command)
 function do_status() {
   if [ -z "$instance_dir" ] ; then
     local a
@@ -146,6 +187,16 @@ function really_do_status () {
     echo ${output[@]}
 }
 
+## Tells vosa that it is allowed to install and run an instance.
+##
+## vosa -i <instance> enable
+##     Enables <instance> on this host.
+##
+## vosa will create a symlink in /etc/vizrt/vosa/enabled.d/
+## pointing to "../available.d/<instance>".  This is all that is
+## required to enable an instance.
+##
+## An enabled instance can be installed.
 function do_enable() {
   requires_instance_dir && {
     # check if the instance is available
@@ -168,21 +219,23 @@ function do_enable() {
   }
 }
 
-function help_uninstall() {
-  cat <<EOF
-uninstall: removes the entire image directory from disk.
 
-This deletes the contents of the directory
-/var/lib/vizrt/vosa/images/<vm-id>/ if it exists.
-
-If the VM is in the running state (i.e. it _should_ be
-running, this command does nothing.
-
-If the VM is alive, i.e. actually is running, this
-command does nothing.
-EOF
-}
 
+## Removes the installed image of an instance
+##
+## This deletes the contents of the directory
+## /var/lib/vizrt/vosa/images/<instance>/ if it exists.
+##
+## Removing the installed image of an instance makes it impossible to
+## start the instance unless it is (re)installed later.  Uninstalling
+## an instance is destructive, but if the directory
+##   /var/backup/vizrt/vosa/
+## exists then ONE generation of backups will be kept in that directory,
+## and it will be possible to restore an old backup by manually moving
+## the backup directory back into /var/lib/vizrt/vosa/images/
+##
+## It is not possible to uninstall an instance that is running, or
+## that _should_ be running (i.e. if a .pid file exists).
 function do_uninstall() {
   requires_instance_dir && {
     # check if the instance is available
@@ -225,6 +278,18 @@ function do_uninstall() {
 commands="$(dirname $0)/../share/vizrt/vosa/commands"
 
 
+## Installs an image of an instance
+##
+## This creates a disk image and supporting files in the directory
+## /var/lib/vizrt/vosa/images/<instance>/, starts a virtual machine
+## and configures it as described in the instance configuration
+## directory /etc/vizrt/vosa/available.d/<instance>/.
+##
+## Installing an instance usually ends up in a functional virtual
+## machine.
+##
+## It is not possible to install an instance that has already been
+## installed.
 function do_install() {
   requires_instance_dir && {
     local status=( $(really_do_status $instance_dir) )
@@ -240,7 +305,17 @@ function do_install() {
   }
 }
 
+## Starts a stopped instance.
+##
+## Starts an installed instance that has been stopped or has died
+## (or has been shut down from within the guest). A pidfile will be
+## created, with the pid of the kvm process, which also serves as a
+## flag that the "desired state" of the VM is to be started.
+##
+## It is not possible to start an instance that has not been installed,
+## or that is running.
 function do_start() {
+  # TODO: let's make this command wait for SSH access before returning?
   requires_instance_dir && {
     local status=( $(really_do_status $instance_dir) )
     if [ "${status[6]}" == "alive" ] ; then
@@ -255,7 +330,17 @@ function do_start() {
   }
 }
 
+
+## Stops a running instance.
+##
+## Stops an instance that has previously been been started. If the instance
+## has died, the pidfile will be removed to indicate that the desired state
+## is to be stopped.
+##
+## It is not possible to start an instance that has not been installed,
+## or that is running.
 function do_stop() {
+  # TODO: let's make this command try to do a graceful shutdown (by ssh'ing to the guest and performing a shutdown, and eventually killing, and wait for the kvm process to die, eventually killing it.
   requires_instance_dir && {
     local status=( $(really_do_status $instance_dir) )
     if [ "${status[3]}" != "installed" ] ; then
diff --git a/usr/share/vizrt/vosa/commands/help.awk b/usr/share/vizrt/vosa/commands/help.awk
new file mode 100644
index 00000000..77a0c184
--- /dev/null
+++ b/usr/share/vizrt/vosa/commands/help.awk
@@ -0,0 +1,37 @@
+#!/usr/bin/awk -f
+
+BEGIN {
+  linecount++;
+}
+
+# main
+match($0, /^##(.*)$/, a) {
+  # Store the line for safe keeping.
+  lines[linecount++] = a[1]
+  next;
+}
+
+
+match($0, /^function +([a-zA-Z0-9_]*)[^a-zA-Z0-9_]/, a) {
+  if (("fn="a[1]) == ARGV[ARGC-1]) {
+    for (i = 0; i < linecount; i++) {
+      if (i == 0) {
+        print lines[i]
+      }
+      else {
+        print "      " lines[i]
+      }
+    }
+  }
+  next;
+}
+
+{
+  # ignore all non-matching lines...
+  for (i in lines)
+     delete lines[i]
+  linecount=0
+  next;
+}
+
+

From f00c9125d899b944ccac15b7606b5a591743b1e4 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Thu, 9 Feb 2012 23:15:52 +0100
Subject: [PATCH 0404/2585]      Made vosa completion use the new and concise
 vosa commands instead of vosa help.

---
 usr/bin/vosa | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index dd18c353..15038179 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -83,28 +83,29 @@ function do_enabled() {
 
 ## Provides help... :-)
 function do_help() {
-  if [ -z "$instance_dir" ] ; then
-    cat <<EOF
+  cat <<EOF
 $0 is a command to manage virtual machines running under
 the regime of Vizrt Online System Administration.
 
 "$0 status" gives you a quick overview of the VMs running
 on this host.
 EOF
-    echo "$0 supports these commands:"
-    declare -F | grep ^"declare -f do_" | cut -d ' ' -f3 | cut -d'_' -f2 | sort | \
-        while read f; do
-      echo -n ' * '$f:  # first line on the same as the command.
-      awk -f $commands/help.awk fn=do_$f < $0
-      echo
-    done
-    
-    exit 0;
-  else
-    echo "\"$0 -i $instance_dir status\" to see the status of this instance"
-    echo "\"$0 -i $instance_dir install\" to (re)install this image from scratch"
-    exit 0;
-  fi
+  echo "$0 supports these commands:"
+  declare -F | grep ^"declare -f do_" | cut -d ' ' -f3 | cut -d'_' -f2 | sort | \
+      while read f; do
+    echo -n ' * '$f:  # first line on the same as the command.
+    awk -f $commands/help.awk fn=do_$f < $0
+    echo
+  done
+}
+
+## List detailed information on how to use all the commands.
+function do_commands() {
+  declare -F | grep ^"declare -f do_" | cut -d ' ' -f3 | cut -d'_' -f2 | sort | \
+      while read f; do
+    echo -n ' * '$f:  # first line on the same as the command.
+    awk -f $commands/help.awk fn=do_$f < $0 | head -n 1
+  done
 }
 
 ## Provides status information about defines VMs
@@ -275,7 +276,7 @@ function do_uninstall() {
 }
 
 
-commands="$(dirname $0)/../share/vizrt/vosa/commands"
+commands="$(readlink -f "$(dirname $(readlink -f $0))")/../share/vizrt/vosa/commands"
 
 
 ## Installs an image of an instance

From b37a71bb31758cb81dc1553e100428c3d16fe58a Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Thu, 9 Feb 2012 23:48:50 +0100
Subject: [PATCH 0405/2585]      Made most commands not use the instance name,
 and print names, instead of full paths...

---
 usr/bin/vosa | 72 ++++++++++++++++++++++++++++++----------------------
 1 file changed, 42 insertions(+), 30 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 15038179..0d961de5 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -13,6 +13,7 @@
 # vosa -i ... status --- tells you about the VM, if it's enabled, running, alive, its uptime.
 
 instance_dir=
+instance_name=
 usage=0
 
 ### To add an option, add it to the optstring, as defined in getopts, in alphabetical order.
@@ -25,8 +26,18 @@ function option-h() {
 }
 
 function option-i() {
-  instance_dir="${1}"
-  # TODO remove trailing "/" since it's supposed to be a directory.  This script depends on it!
+  if [[ "${1}" =~ ^[-a-z0-9]*$ ]] ; then
+    instance_dir=${available_dir}/$1
+  else
+    instance_dir="${1}"
+  fi
+  if [ ! -r $instance_dir ] ; then
+    echo "Instance $1 does not exist.  Exiting"
+    exit 1
+  else
+    instance_dir=$(readlink -f "$instance_dir")
+    instance_name=$(basename $instance_dir)
+  fi
 }
 
 
@@ -36,21 +47,21 @@ function unknown-option() {
 }
 
 ### To add a command, simply define a function with a do_ prefix.
-available_dir=$(dirname $0)/../../etc/vizrt/vosa/available.d
+available_dir=$(dirname $(readlink -f $0))/../../etc/vizrt/vosa/available.d
 available_dir=$(readlink -f ${available_dir})
-enabled_dir=$(dirname $0)/../../etc/vizrt/vosa/enabled.d
+enabled_dir=$(dirname $(readlink -f $0))/../../etc/vizrt/vosa/enabled.d
 enabled_dir=$(readlink -f ${enabled_dir})
 
 
 function requires_instance_dir() {
-  if [ -z "$instance_dir" ] ; then
+  if [ -z "$instance_dir" -o -z "${instance_name}" ] ; then
     echo "Instance is required"
     usage=1
     return 1
   fi
 }
 function prohibits_instance_dir() {
-  if [ ! -z "$instance_dir" ] ; then
+  if [ ! -z "$instance_dir" -o -z "${instance_name}" ] ; then
     echo "Instance cannot be specified"
     usage=1
     return 1
@@ -151,7 +162,7 @@ function really_do_status () {
     local output
     local avdir="${available_dir}/$(basename $1)"
     local endir="${enabled_dir}/$(basename $1)"
-    output=( $avdir )
+    output=( $(basename $1) )
     if [ ! -d "$avdir" ] ; then
       output=( ${output[@]} unavailable );
     else
@@ -204,19 +215,19 @@ function do_enable() {
     # check if the instance isn't enabled already
     # check if the instance isn't forcibly disabled
     # make a symbolic link
-    if [ ! -d ${available_dir}/$(basename $instance_dir) ] ; then
-      echo "$instance_dir is not an available instance"
+    if [ ! -d ${available_dir}/$instance_name ] ; then
+      echo "$instance_name is not an available instance"
       exit 1
     fi
-    if [ -L ${enabled_dir}/$(basename $instance_dir) ] ; then
-      echo "$instance_dir is already enabled"
+    if [ -L ${enabled_dir}/$instance_name ] ; then
+      echo "$instance_name is already enabled"
       exit 1
     fi
-    if [ -r ${enabled_dir}/$(basename $instance_dir) ] ; then
-      echo "$instance_dir has been forcibly disabled by the presence of the file ${enabled_dir}/$(basename $instance_dir)"
+    if [ -r ${enabled_dir}/$instance_name ] ; then
+      echo "$instance_name has been forcibly disabled by the presence of the file ${enabled_dir}/$instance_name"
       exit 1
     fi
-    ln -v -s "../available.d/$(basename $instance_dir)" "$enabled_dir" || exit 1
+    ln -v -s "../available.d/$instance_name" "$enabled_dir" || exit 1
   }
 }
 
@@ -243,25 +254,25 @@ function do_uninstall() {
     # check if the instance isn't enabled already
     # check if the instance isn't forcibly disabled
     # make a symbolic link
-    if [ ! -d ${available_dir}/$(basename $instance_dir) ] ; then
-      echo "$instance_dir is not an available instance"
+    if [ ! -d ${available_dir}/$instance_name ] ; then
+      echo "$instance_name is not an available instance"
       exit 1
     fi
-    if [ ! -L ${enabled_dir}/$(basename $instance_dir) ] ; then
-      echo "$instance_dir is not enabled"
+    if [ ! -L ${enabled_dir}/$instance_name ] ; then
+      echo "$instance_name is not enabled"
       exit 1
     fi
     local status=( $(really_do_status $instance_dir) )
     if [ "${status[6]}" == "alive" ] ; then
-      echo "$instance_dir is alive. Stop it first. exiting"
+      echo "$instance_name is alive. Stop it first. exiting"
       exit 1
     fi
     if [ "${status[4]}" == "running" ] ; then
-      echo "$instance_dir is supposed to be running. Stop it first. Exiting!"
+      echo "$instance_name is supposed to be running. Stop it first. Exiting!"
       exit 1
     fi
-    local imgdir=$(readlink -f ${instance_dir}/../../../../../var/lib/vizrt/vosa/images/$(basename $instance_dir)/)
-    local backupdir="/var/backup/vizrt/vosa/$(basename $instance_dir)"
+    local imgdir=$(readlink -f ${instance_dir}/../../../../../var/lib/vizrt/vosa/images/$instance_name/)
+    local backupdir="/var/backup/vizrt/vosa/$instance_name"
     local backupparent="/var/backup/vizrt/vosa"
     if [ ! -z "$imgdir" -a -d "$imgdir" ] ; then
       if [ -w "$backupparent" ] ; then
@@ -295,14 +306,14 @@ function do_install() {
   requires_instance_dir && {
     local status=( $(really_do_status $instance_dir) )
     if [ "${status[3]}" == "installed" ] ; then
-      echo "$instance_dir is already installed. Uninstall before installing."
+      echo "$instance_name is already installed. Uninstall before installing."
       exit 1
     fi
     if [ "${status[2]}" != "enabled" ] ; then
-      echo "$instance_dir is not enabled, enable it on this host first"
+      echo "$instance_name is not enabled, enable it on this host first"
       exit 1
     fi
-    ${commands}/install.sh "$instance_dir" "$(dirname $0)/../../var/lib/vizrt/vosa/images/$(basename $instance_dir)"
+    ${commands}/install.sh "$instance_dir" "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name"
   }
 }
 
@@ -320,14 +331,14 @@ function do_start() {
   requires_instance_dir && {
     local status=( $(really_do_status $instance_dir) )
     if [ "${status[6]}" == "alive" ] ; then
-      echo "$instance_dir is alive. No need to start it."
+      echo "$instance_name is alive. No need to start it."
       exit 1
     fi
     if [ "${status[3]}" != "installed" ] ; then
-      echo "$instance_dir is not installed. I can't start it."
+      echo "$instance_name is not installed. I can't start it."
       exit 1
     fi
-    ${commands}/boot.sh "$instance_dir" "$(dirname $0)/../../var/lib/vizrt/vosa/images/$(basename $instance_dir)"
+    ${commands}/boot.sh "$instance_dir" "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name"
   }
 }
 
@@ -345,16 +356,17 @@ function do_stop() {
   requires_instance_dir && {
     local status=( $(really_do_status $instance_dir) )
     if [ "${status[3]}" != "installed" ] ; then
-      echo "$instance_dir is not installed. I can't stop it."
+      echo "$instance_name is not installed. I can't stop it."
       exit 1
     fi
     if [ "${status[6]}" == "alive" ] ; then
       echo "Killing kvm process ${status[5]}"
       kill "${status[5]}"
       # should now be "dead" if we asked it.
+      # TODO: remove PIDfile instead of keeping the state file
     fi
     # set state to "stopped"
-    echo "stopped" > "$(dirname $0)/../../var/run/vizrt/vosa/$(basename $instance_dir).state"
+    echo "stopped" > "$(dirname $0)/../../var/run/vizrt/vosa/$instance_name.state"
   }
 }
 

From b742b50423c9f8893770553965159b8e419638e0 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Fri, 10 Feb 2012 00:17:34 +0100
Subject: [PATCH 0406/2585]      Simplified status. No longer "probably_dead"
 and "running" and "stopped" states. Now only running, and dead, both
 indicating that it _should_ be running

---
 usr/bin/vosa | 52 ++++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 0d961de5..167412e5 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -173,24 +173,17 @@ function really_do_status () {
         output=( ${output[@]} enabled );
         local vmdir=$(readlink -f ${avdir}/../../../../../var/lib/vizrt/vosa/images/$(basename $1))
         if [ ! -d "$vmdir" ] ; then
-          output=( ${output[@]} uninstalled );
+          output=( ${output[@]} uninstalled );
         else
           output=( ${output[@]} installed );
-          local statefile=$(readlink -f ${avdir}/../../../../../var/run/vizrt/vosa/$(basename $1).state)
-          if [ ! -r "$statefile" ] ; then
-            output=( ${output[@]} probably_stopped );
-          else
-            output=( ${output[@]} $(<$statefile) );
-            if [ ! -z "$(<$statefile)" -a $(<$statefile) == "running" ] ; then
-              local pidfile="$(dirname $statefile)/$(basename $1).pid"
-              if [ -r "$pidfile" ] ; then
-                output=( ${output[@]} $(<$pidfile) );
-                if ! ps > /dev/null $(<$pidfile) ; then
-                  output=( ${output[@]} dead );
-                else
-                  output=( ${output[@]} alive "$( ps -p "$(<$pidfile)" -o "etime=" )" );
-                fi
-              fi
+          local pidfile=$(echo_pidfile_of $(basename $1))
+          if [ -r "$pidfile" ] ; then
+            if ! ps > /dev/null $(<$pidfile) ; then
+              output=( ${output[@]} dead );
+            else
+              output=( ${output[@]} alive )
+              output=( ${output[@]} $(<$pidfile) );
+              output=( ${output[@]} "$( ps -p "$(<$pidfile)" -o "etime=" )" );
             fi
           fi
         fi
@@ -199,6 +192,11 @@ function really_do_status () {
     echo ${output[@]}
 }
 
+function echo_pidfile_of() {
+  local avdir="${available_dir}/$(basename $1)"
+  echo "$(readlink -f ${avdir}/../../../../../var/run/vizrt/vosa/$1.pid)"
+}
+
 ## Tells vosa that it is allowed to install and run an instance.
 ##
 ## vosa -i <instance> enable
@@ -263,12 +261,12 @@ function do_uninstall() {
       exit 1
     fi
     local status=( $(really_do_status $instance_dir) )
-    if [ "${status[6]}" == "alive" ] ; then
+    if [ "${status[4]}" == "alive" ] ; then
       echo "$instance_name is alive. Stop it first. exiting"
       exit 1
     fi
-    if [ "${status[4]}" == "running" ] ; then
-      echo "$instance_name is supposed to be running. Stop it first. Exiting!"
+    if [ "${status[4]}" == "dead" ] ; then
+      echo "$instance_name is dead, but supposed to be running. Stop it first. Exiting!"
       exit 1
     fi
     local imgdir=$(readlink -f ${instance_dir}/../../../../../var/lib/vizrt/vosa/images/$instance_name/)
@@ -313,7 +311,7 @@ function do_install() {
       echo "$instance_name is not enabled, enable it on this host first"
       exit 1
     fi
-    ${commands}/install.sh "$instance_dir" "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name"
+    ${commands}/install.sh "$instance_dir" "$(dirname $(readlink -f $0))/../../var/lib/vizrt/vosa/images/$instance_name"
   }
 }
 
@@ -330,7 +328,7 @@ function do_start() {
   # TODO: let's make this command wait for SSH access before returning?
   requires_instance_dir && {
     local status=( $(really_do_status $instance_dir) )
-    if [ "${status[6]}" == "alive" ] ; then
+    if [ "${status[4]}" == "alive" ] ; then
       echo "$instance_name is alive. No need to start it."
       exit 1
     fi
@@ -338,7 +336,7 @@ function do_start() {
       echo "$instance_name is not installed. I can't start it."
       exit 1
     fi
-    ${commands}/boot.sh "$instance_dir" "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name"
+    ${commands}/boot.sh "$instance_dir" "$(dirname $(readlink -f $0))/../../var/lib/vizrt/vosa/images/$instance_name"
   }
 }
 
@@ -359,14 +357,16 @@ function do_stop() {
       echo "$instance_name is not installed. I can't stop it."
       exit 1
     fi
-    if [ "${status[6]}" == "alive" ] ; then
+    if [ "${status[4]}" == "alive" ] ; then
       echo "Killing kvm process ${status[5]}"
       kill "${status[5]}"
       # should now be "dead" if we asked it.
-      # TODO: remove PIDfile instead of keeping the state file
     fi
-    # set state to "stopped"
-    echo "stopped" > "$(dirname $0)/../../var/run/vizrt/vosa/$instance_name.state"
+    # regardless of this, we _want_ it to die. remove pidfile.
+    # TODO: continue trying to kill it more forcibly, and
+    # remove the pidfile when it's done.
+    local pidfile=$(echo_pidfile_of ${status[0]})
+    rm $pidfile
   }
 }
 

From cbcd16ab120435e03f1d223e36d74250cf113544 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Fri, 10 Feb 2012 00:42:32 +0100
Subject: [PATCH 0407/2585]      Removed dirname resolution, to allow symlinks
 in production environment

---
 usr/bin/vosa | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 167412e5..8b83d171 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -47,9 +47,9 @@ function unknown-option() {
 }
 
 ### To add a command, simply define a function with a do_ prefix.
-available_dir=$(dirname $(readlink -f $0))/../../etc/vizrt/vosa/available.d
+available_dir=$(dirname $0)/../../etc/vizrt/vosa/available.d
 available_dir=$(readlink -f ${available_dir})
-enabled_dir=$(dirname $(readlink -f $0))/../../etc/vizrt/vosa/enabled.d
+enabled_dir=$(dirname $0)/../../etc/vizrt/vosa/enabled.d
 enabled_dir=$(readlink -f ${enabled_dir})
 
 
@@ -61,7 +61,7 @@ function requires_instance_dir() {
   fi
 }
 function prohibits_instance_dir() {
-  if [ ! -z "$instance_dir" -o -z "${instance_name}" ] ; then
+  if [ ! -z "$instance_dir" -o ! -z "${instance_name}" ] ; then
     echo "Instance cannot be specified"
     usage=1
     return 1
@@ -76,7 +76,7 @@ function prohibits_instance_dir() {
 ## An available instance
 function do_available() {
   prohibits_instance_dir && {
-    ls -d ${available_dir}/* | grep "/[0-9a-z][-0-9a-z]*$"
+    ls -d ${available_dir}/* | grep "/[0-9a-z][-0-9a-z]*$" | sed s,.*/,,
   }
 }
 
@@ -88,7 +88,7 @@ function do_available() {
 ## An enabled instance may be installed
 function do_enabled() {
   prohibits_instance_dir && {
-    ls -d ${enabled_dir}/* | grep "/[0-9a-z][-0-9a-z]*$"
+    ls -d ${enabled_dir}/* | grep "/[0-9a-z][-0-9a-z]*$" | sed s,.*/,,
   }
 }
 
@@ -285,7 +285,7 @@ function do_uninstall() {
 }
 
 
-commands="$(readlink -f "$(dirname $(readlink -f $0))")/../share/vizrt/vosa/commands"
+commands="$(readlink -f "$(dirname $0)")/../share/vizrt/vosa/commands"
 
 
 ## Installs an image of an instance
@@ -311,7 +311,7 @@ function do_install() {
       echo "$instance_name is not enabled, enable it on this host first"
       exit 1
     fi
-    ${commands}/install.sh "$instance_dir" "$(dirname $(readlink -f $0))/../../var/lib/vizrt/vosa/images/$instance_name"
+    ${commands}/install.sh "$instance_dir" "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name"
   }
 }
 
@@ -336,7 +336,7 @@ function do_start() {
       echo "$instance_name is not installed. I can't start it."
       exit 1
     fi
-    ${commands}/boot.sh "$instance_dir" "$(dirname $(readlink -f $0))/../../var/lib/vizrt/vosa/images/$instance_name"
+    ${commands}/boot.sh "$instance_dir" "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name"
   }
 }
 

From 235aa370339ecb4744b5012205ed7ffd4f42fb63 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Fri, 10 Feb 2012 01:27:46 +0100
Subject: [PATCH 0408/2585]      Changed status output to be even more terse. 
 Less to describe, less to be confused about. Added lots more documentation.
 Removed "enabled" and "available" command, they are no longer needed.

---
 usr/bin/vosa | 151 ++++++++++++++++++++++++++++++---------------------
 1 file changed, 89 insertions(+), 62 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 8b83d171..5fb5d287 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -68,38 +68,45 @@ function prohibits_instance_dir() {
   fi
 }
 
-## Lists the names of all the instance definitions known to vosa.
-##
-## An instance known to vosa is an instance which has a directory
-## /etc/vizrt/vosa/available.d/<instance>/
-##
-## An available instance
-function do_available() {
-  prohibits_instance_dir && {
-    ls -d ${available_dir}/* | grep "/[0-9a-z][-0-9a-z]*$" | sed s,.*/,,
-  }
-}
+## Provides instant gratification.
+function do_help() {
+  cat <<EOF
+$(basename $0) is a command to manage virtual machines running under
+the regime of Vizrt Online System Administration.
 
-## Lists the names of all enabled instances
-##
-## An enabled instance is an instance with a symlink from
-## /etc/vizrt/vosa/enabled.d/<instance> -> ../available.d/<instance>
-##
-## An enabled instance may be installed
-function do_enabled() {
-  prohibits_instance_dir && {
-    ls -d ${enabled_dir}/* | grep "/[0-9a-z][-0-9a-z]*$" | sed s,.*/,,
-  }
+Useful starting points:
+ - $(basename $0) commands     Shows what commands vosa supports
+ - $(basename $0) status       Shows the current status
+ - $(basename $0) longhelp     Shows a long help text
+EOF
 }
 
-## Provides help... :-)
-function do_help() {
+## Provides even more help.
+function do_longhelp() {
   cat <<EOF
 $0 is a command to manage virtual machines running under
 the regime of Vizrt Online System Administration.
 
-"$0 status" gives you a quick overview of the VMs running
-on this host.
+"$0 status" gives you a quick overview of the VMs known
+to this host.
+
+An instance known to vosa is an instance which has a directory
+/etc/vizrt/vosa/available.d/<instance>/
+
+Each instance needs an 'install.conf' and 'boot.conf' which
+describes installation and boot parameters, like ip address,
+memory and disk space, and so on.
+
+An instance may be "enabled" if it is desirable that an instance
+definition actually be used on this installation of vosa.
+
+The idea behind available and enabled instances is that a vosa
+cluster will consist of many vosa hosts.  For example, 15 different
+guests might be running on four different hosts. All 15 definitions
+should be present as "available" on all four hosts, but only
+the three or four that _should be working_ should be "enabled" for
+a host.
+
 EOF
   echo "$0 supports these commands:"
   declare -F | grep ^"declare -f do_" | cut -d ' ' -f3 | cut -d'_' -f2 | sort | \
@@ -127,24 +134,46 @@ function do_commands() {
 ## vosa -i <instance> status
 ##      Provides status information on a single VM
 ##
-## Status information consists of up to 8 columns
+## Example output:
+##   vm01
+##   vm02 enabled
+##   vm03 enabled installed
+##   vm04 enabled installed alive 31374 4-12:45:06
+##   vm05 enabled installed dead
+##
+## The example output shows all possible status.
+##
+## An instance is defined to be the existsence of a
+## directory /etc/vizrt/vosa/available.d/<instance>/ with
+## configuration information about the instance.
+##
+## Status information consists of up to 6 columns
 ##  - instance name
 ##      The first column is the instance name itself.
-##      An instance may be unavailable or available.
-##  - unavailable or available
-##      An unavailable VM isn't known to the system.
-##      An available VM is known to the system, in that it contains
-##      a directory in /etc/vizrt/vosa/available.d/<instance>/
-##      An available VM can be enabled or disabled.
-##  - enabled or disabled
-##      A disabled VM is not "supposed" to run on this physical machine
-##      An enabled VM *is* supposed to run on this machine.
-##      An enabled VM may be installed or uninstalled.
-##  - installed or uninstalled
-##      An uninstalled VM does not have an image directory
-##      An installed VM *does* have an image directory
-##      An installed VM may be running or stopped
-## rest of help excluded because of pending changes to vosa command)
+##      An instance may be enabled (see "vosa enable")
+##  - enabled
+##      Only enabled instances are "supposed" to run on this
+##      physical machine.
+##      An enabled instance *is* supposed to run on this machine.
+##      An enabled instance may later be be installed. (see
+##      "vosa install")
+##  - installed
+##      An installed instance has an image directory, created by
+##      "vosa install"
+##      An installed instance may be started (see "vosa start").
+##      An installed instance may be uninstalled (see "vosa
+##      uninstall").
+##  - alive or dead (actual run state)
+##      If any of the words alive or dead are present in the fourth
+##      column then that means that the instance _should_ be running.
+##      An instance that has been started will probably be alive, but
+##      if the instance is killed or dies for whatever reason other
+##      than the "vosa stop" command, it will be labeled as "dead".
+##  - pid (of an alive instance)
+##  - uptime (of an alive instance)
+##      Only shown for instances that are "alive".
+##      For informational purposes, the pid and the uptime of the pid
+##      are shown in dd-hh:mm:ss format.
 function do_status() {
   if [ -z "$instance_dir" ] ; then
     local a
@@ -163,18 +192,13 @@ function really_do_status () {
     local avdir="${available_dir}/$(basename $1)"
     local endir="${enabled_dir}/$(basename $1)"
     output=( $(basename $1) )
-    if [ ! -d "$avdir" ] ; then
-      output=( ${output[@]} unavailable );
-    else
-      output=( ${output[@]} available );
+    if [ -d "$avdir" ] ; then
       if [ ! -L "$endir" ] ; then
         output=( ${output[@]} disabled );
       else
         output=( ${output[@]} enabled );
         local vmdir=$(readlink -f ${avdir}/../../../../../var/lib/vizrt/vosa/images/$(basename $1))
-        if [ ! -d "$vmdir" ] ; then
-          output=( ${output[@]} uninstalled );
-        else
+        if [ -d "$vmdir" ] ; then
           output=( ${output[@]} installed );
           local pidfile=$(echo_pidfile_of $(basename $1))
           if [ -r "$pidfile" ] ; then
@@ -246,6 +270,8 @@ function do_enable() {
 ##
 ## It is not possible to uninstall an instance that is running, or
 ## that _should_ be running (i.e. if a .pid file exists).
+##
+## Please be careful with uninstall.
 function do_uninstall() {
   requires_instance_dir && {
     # check if the instance is available
@@ -261,11 +287,11 @@ function do_uninstall() {
       exit 1
     fi
     local status=( $(really_do_status $instance_dir) )
-    if [ "${status[4]}" == "alive" ] ; then
+    if [ "${status[3]}" == "alive" ] ; then
       echo "$instance_name is alive. Stop it first. exiting"
       exit 1
     fi
-    if [ "${status[4]}" == "dead" ] ; then
+    if [ "${status[3]}" == "dead" ] ; then
       echo "$instance_name is dead, but supposed to be running. Stop it first. Exiting!"
       exit 1
     fi
@@ -303,11 +329,11 @@ commands="$(readlink -f "$(dirname $0)")/../share/vizrt/vosa/commands"
 function do_install() {
   requires_instance_dir && {
     local status=( $(really_do_status $instance_dir) )
-    if [ "${status[3]}" == "installed" ] ; then
+    if [ "${status[2]}" == "installed" ] ; then
       echo "$instance_name is already installed. Uninstall before installing."
       exit 1
     fi
-    if [ "${status[2]}" != "enabled" ] ; then
+    if [ "${status[1]}" != "enabled" ] ; then
       echo "$instance_name is not enabled, enable it on this host first"
       exit 1
     fi
@@ -323,16 +349,17 @@ function do_install() {
 ## flag that the "desired state" of the VM is to be started.
 ##
 ## It is not possible to start an instance that has not been installed,
-## or that is running.
+## or that is already running and alive.  It _is_ possible to (re)start
+## a dead instance.
 function do_start() {
   # TODO: let's make this command wait for SSH access before returning?
   requires_instance_dir && {
     local status=( $(really_do_status $instance_dir) )
-    if [ "${status[4]}" == "alive" ] ; then
+    if [ "${status[3]}" == "alive" ] ; then
       echo "$instance_name is alive. No need to start it."
       exit 1
     fi
-    if [ "${status[3]}" != "installed" ] ; then
+    if [ "${status[2]}" != "installed" ] ; then
       echo "$instance_name is not installed. I can't start it."
       exit 1
     fi
@@ -347,26 +374,26 @@ function do_start() {
 ## has died, the pidfile will be removed to indicate that the desired state
 ## is to be stopped.
 ##
-## It is not possible to start an instance that has not been installed,
-## or that is running.
+## It is not possible to stop an instance that has not been installed. Stopping
+## an already stopped instance has no effect.
 function do_stop() {
   # TODO: let's make this command try to do a graceful shutdown (by ssh'ing to the guest and performing a shutdown, and eventually killing, and wait for the kvm process to die, eventually killing it.
   requires_instance_dir && {
     local status=( $(really_do_status $instance_dir) )
-    if [ "${status[3]}" != "installed" ] ; then
+    if [ "${status[2]}" != "installed" ] ; then
       echo "$instance_name is not installed. I can't stop it."
       exit 1
     fi
-    if [ "${status[4]}" == "alive" ] ; then
-      echo "Killing kvm process ${status[5]}"
-      kill "${status[5]}"
+    if [ "${status[3]}" == "alive" ] ; then
+      echo "Killing kvm process ${status[4]}"
+      kill "${status[4]}"
       # should now be "dead" if we asked it.
     fi
     # regardless of this, we _want_ it to die. remove pidfile.
     # TODO: continue trying to kill it more forcibly, and
     # remove the pidfile when it's done.
     local pidfile=$(echo_pidfile_of ${status[0]})
-    rm $pidfile
+    rm -f $pidfile
   }
 }
 

From 8b1cd0f857d3d3ac52939bd6c7807146b866c240 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Fri, 10 Feb 2012 02:20:21 +0100
Subject: [PATCH 0409/2585]      Delete overlay, added comments on monitor...

---
 usr/share/vizrt/vosa/commands/boot.sh    | 4 ++++
 usr/share/vizrt/vosa/commands/install.sh | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/usr/share/vizrt/vosa/commands/boot.sh b/usr/share/vizrt/vosa/commands/boot.sh
index 9d54785e..a94b193a 100755
--- a/usr/share/vizrt/vosa/commands/boot.sh
+++ b/usr/share/vizrt/vosa/commands/boot.sh
@@ -140,6 +140,10 @@ function boot_kvm() {
   -net "nic,model=virtio,macaddr=${install_config_macaddr}"
   -net "tap,script=$(dirname $0)/qemu-ifup")
   
+# http://dwdwwebcache.googleusercontent.com/search?q=cache:mEAjcA2zHosJ:kerneltrap.org/mailarchive/linux-kvm/2010/1/26/6257297/thread+qemu-kvm+acpi+shutdown&cd=1&hl=no&ct=clnk&gl=no
+# http://kerneltrap.org/mailarchive/linux-kvm/2010/1/26/6257297/thread
+# provide a monitor socket to talk to kvm.   /var/run?
+
   updates=${image}/updates.iso
   if [ -r "${updates}" ] ; then
     startupcmd=("${startupcmd[@]}" -drive "file=${updates},if=virtio")
diff --git a/usr/share/vizrt/vosa/commands/install.sh b/usr/share/vizrt/vosa/commands/install.sh
index c5a877b8..96950908 100755
--- a/usr/share/vizrt/vosa/commands/install.sh
+++ b/usr/share/vizrt/vosa/commands/install.sh
@@ -190,6 +190,7 @@ EOF
 function delete_overlay() {
   # ...
   decho 1 'Deleting initial overlay file'
+  rm -f ${image}/updates.iso 
 }
 
 function postinstall() {
@@ -198,10 +199,11 @@ function postinstall() {
     local cmd="$(dirname $0)/../post-install-hooks/$o"
     if [ ! -x "$cmd" ] ; then
       echo "Unable to execute non-executable post-install hook: $cmd"
+      delete_overlay
       exit 1
     fi
     cmd=$(readlink -f "$cmd")
-    $cmd "$config" "$image"
+    $cmd "$config" "$image" || exitonerror $? "Postinstall script $cmd exited nonzero return code."
   done
 }
 

From fab1766e03e2f8c8612e205799baee0884d86db9 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Fri, 10 Feb 2012 14:09:04 +0100
Subject: [PATCH 0410/2585]      Added monitor socket, to be able to
 communicate with the guest hardware

---
 usr/share/vizrt/vosa/commands/boot.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/vizrt/vosa/commands/boot.sh b/usr/share/vizrt/vosa/commands/boot.sh
index a94b193a..fa6987fb 100755
--- a/usr/share/vizrt/vosa/commands/boot.sh
+++ b/usr/share/vizrt/vosa/commands/boot.sh
@@ -134,6 +134,7 @@ function boot_kvm() {
   -m "${boot_config_memory}"
   $runas
   -enable-kvm
+  -monitor unix:${image}/monitor.sock,server,nowait
   -balloon "virtio"
   -drive "file=${img},if=virtio,cache=none"
   -kernel ${kernel}

From a59e032bf8bd89f5f6ef555da6ce242428ea2e6f Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Fri, 10 Feb 2012 15:45:34 +0100
Subject: [PATCH 0411/2585]      Moved socket to rundir per FHS. Added graceful
 and escalated shutdown. Requires acpi in guest, though.

---
 usr/bin/vosa                          | 36 ++++++++++++++++++++++-----
 usr/share/vizrt/vosa/commands/boot.sh |  2 +-
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 5fb5d287..624ba8dd 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -200,7 +200,7 @@ function really_do_status () {
         local vmdir=$(readlink -f ${avdir}/../../../../../var/lib/vizrt/vosa/images/$(basename $1))
         if [ -d "$vmdir" ] ; then
           output=( ${output[@]} installed );
-          local pidfile=$(echo_pidfile_of $(basename $1))
+          local pidfile=$(echo_rundir_of $(basename $1))/$(basename $1).pid
           if [ -r "$pidfile" ] ; then
             if ! ps > /dev/null $(<$pidfile) ; then
               output=( ${output[@]} dead );
@@ -216,9 +216,9 @@ function really_do_status () {
     echo ${output[@]}
 }
 
-function echo_pidfile_of() {
+function echo_rundir_of() {
   local avdir="${available_dir}/$(basename $1)"
-  echo "$(readlink -f ${avdir}/../../../../../var/run/vizrt/vosa/$1.pid)"
+  echo "$(readlink -f ${avdir}/../../../../../var/run/vizrt/vosa/)"
 }
 
 ## Tells vosa that it is allowed to install and run an instance.
@@ -385,20 +385,44 @@ function do_stop() {
       exit 1
     fi
     if [ "${status[3]}" == "alive" ] ; then
-      echo "Killing kvm process ${status[4]}"
-      kill "${status[4]}"
+      shutdown "${status[0]}"
       # should now be "dead" if we asked it.
     fi
     # regardless of this, we _want_ it to die. remove pidfile.
     # TODO: continue trying to kill it more forcibly, and
     # remove the pidfile when it's done.
-    local pidfile=$(echo_pidfile_of ${status[0]})
+    local pidfile=$(echo_rundir_of ${status[0]})/${status[0]}.pid
     rm -f $pidfile
   }
 }
 
 
 
+# Performs a graceful shutdown of the guest
+function shutdown() {
+  local pid=$(<$(echo_rundir_of $1)/$1.pid)
+  echo "Sending ACPI shutdown signal to guest ($pid) ($(echo_rundir_of $1)/$1.monitor)"
+  echo 'system_powerdown' | nc -U $(echo_rundir_of $1)/$1.monitor
+  local a;
+  for a in $(seq 1 10) ; do
+    sleep 1
+    ps > /dev/null $pid || return 0
+  done
+  ps > /dev/null $pid && {
+    echo "guest did not shut down.  Killing its power."
+    kill "${status[4]}"
+  }
+  for a in $(seq 1 10) ; do
+    sleep 1
+    ps > /dev/null $pid || return 0
+  done
+  ps > /dev/null $pid && {
+    echo "guest did not respond to kill.  Killing with -9."
+    kill -9 "${status[4]}"
+  }
+}
+
+
 function unknown-argument() {
   echo "Unknown argument $@"
   usage=1
diff --git a/usr/share/vizrt/vosa/commands/boot.sh b/usr/share/vizrt/vosa/commands/boot.sh
index fa6987fb..effc8672 100755
--- a/usr/share/vizrt/vosa/commands/boot.sh
+++ b/usr/share/vizrt/vosa/commands/boot.sh
@@ -134,7 +134,7 @@ function boot_kvm() {
   -m "${boot_config_memory}"
   $runas
   -enable-kvm
-  -monitor unix:${image}/monitor.sock,server,nowait
+  -monitor unix:${rundir}/${hostname}.monitor,server,nowait
   -balloon "virtio"
   -drive "file=${img},if=virtio,cache=none"
   -kernel ${kernel}

From d400caeb8f674a351485b5882204cedd8ed094d5 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Tue, 14 Feb 2012 17:29:29 +0100
Subject: [PATCH 0412/2585]      Added sanity check for existence of
 enabled/available directories

---
 usr/bin/vosa                          | 51 +++++++++++----------------
 usr/share/vizrt/vosa/commands/boot.sh |  1 -
 2 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 624ba8dd..0b038802 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -81,6 +81,11 @@ Useful starting points:
 EOF
 }
 
+## Initializes the etc directory with a skeleton of a virtual machine
+function do_init() {
+  echo "not implemented."
+}
+
 ## Provides even more help.
 function do_longhelp() {
   cat <<EOF
@@ -200,7 +205,7 @@ function really_do_status () {
         local vmdir=$(readlink -f ${avdir}/../../../../../var/lib/vizrt/vosa/images/$(basename $1))
         if [ -d "$vmdir" ] ; then
           output=( ${output[@]} installed );
-          local pidfile=$(echo_rundir_of $(basename $1))/$(basename $1).pid
+          local pidfile=$(echo_pidfile_of $(basename $1))
           if [ -r "$pidfile" ] ; then
             if ! ps > /dev/null $(<$pidfile) ; then
               output=( ${output[@]} dead );
@@ -216,9 +221,9 @@ function really_do_status () {
     echo ${output[@]}
 }
 
-function echo_rundir_of() {
+function echo_pidfile_of() {
   local avdir="${available_dir}/$(basename $1)"
-  echo "$(readlink -f ${avdir}/../../../../../var/run/vizrt/vosa/)"
+  echo "$(readlink -f ${avdir}/../../../../../var/run/vizrt/vosa/$1.pid)"
 }
 
 ## Tells vosa that it is allowed to install and run an instance.
@@ -385,44 +390,20 @@ function do_stop() {
       exit 1
     fi
     if [ "${status[3]}" == "alive" ] ; then
-      shutdown "${status[0]}"
+      echo "Killing kvm process ${status[4]}"
+      kill "${status[4]}"
       # should now be "dead" if we asked it.
     fi
     # regardless of this, we _want_ it to die. remove pidfile.
     # TODO: continue trying to kill it more forcibly, and
     # remove the pidfile when it's done.
-    local pidfile=$(echo_rundir_of ${status[0]})/${status[0]}.pid
+    local pidfile=$(echo_pidfile_of ${status[0]})
     rm -f $pidfile
   }
 }
 
 
 
-# Performs a graceful shutdown of the guest
-function shutdown() {
-  local pid=$(<$(echo_rundir_of $1)/$1.pid)
-  echo "Sending ACPI shutdown signal to guest ($pid) ($(echo_rundir_of $1)/$1.monitor)"
-  echo 'system_powerdown' | nc -U $(echo_rundir_of $1)/$1.monitor
-  local a;
-  for a in $(seq 1 10) ; do
-    sleep 1
-    ps > /dev/null $pid || return 0
-  done
-  ps > /dev/null $pid && {
-    echo "guest did not shut down.  Killing its power."
-    kill "${status[4]}"
-  }
-  for a in $(seq 1 10) ; do
-    sleep 1
-    ps > /dev/null $pid || return 0
-  done
-  ps > /dev/null $pid && {
-    echo "guest did not respond to kill.  Killing with -9."
-    kill -9 "${status[4]}"
-  }
-}
-
-
 function unknown-argument() {
   echo "Unknown argument $@"
   usage=1
@@ -471,6 +452,16 @@ fi
 
 verify_usage
 
+if [ -z "$available_dir" -o ! -r "$available_dir" ] ; then
+  echo "Not initialized! RTFM! Exiting. ($available_dir)"
+  exit 2
+fi
+
+if [ -z "$enabled_dir" -o ! -r "$enabled_dir" ] ; then
+  echo "Not initialized! RTFM! Exiting. ($enabled_dir)"
+  exit 2
+fi
+
 for cmd in "${@}" ; do
   # Check if the command
   fn="do_${cmd}"
diff --git a/usr/share/vizrt/vosa/commands/boot.sh b/usr/share/vizrt/vosa/commands/boot.sh
index effc8672..a94b193a 100755
--- a/usr/share/vizrt/vosa/commands/boot.sh
+++ b/usr/share/vizrt/vosa/commands/boot.sh
@@ -134,7 +134,6 @@ function boot_kvm() {
   -m "${boot_config_memory}"
   $runas
   -enable-kvm
-  -monitor unix:${rundir}/${hostname}.monitor,server,nowait
   -balloon "virtio"
   -drive "file=${img},if=virtio,cache=none"
   -kernel ${kernel}

From 8938394582172008206d094a5a1acad67b73df90 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Tue, 14 Feb 2012 17:30:14 +0100
Subject: [PATCH 0413/2585]      Merge

---
 usr/bin/vosa                          | 36 ++++++++++++++++++++++-----
 usr/share/vizrt/vosa/commands/boot.sh |  1 +
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 0b038802..dcd9020c 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -205,7 +205,7 @@ function really_do_status () {
         local vmdir=$(readlink -f ${avdir}/../../../../../var/lib/vizrt/vosa/images/$(basename $1))
         if [ -d "$vmdir" ] ; then
           output=( ${output[@]} installed );
-          local pidfile=$(echo_pidfile_of $(basename $1))
+          local pidfile=$(echo_rundir_of $(basename $1))/$(basename $1).pid
           if [ -r "$pidfile" ] ; then
             if ! ps > /dev/null $(<$pidfile) ; then
               output=( ${output[@]} dead );
@@ -221,9 +221,9 @@ function really_do_status () {
     echo ${output[@]}
 }
 
-function echo_pidfile_of() {
+function echo_rundir_of() {
   local avdir="${available_dir}/$(basename $1)"
-  echo "$(readlink -f ${avdir}/../../../../../var/run/vizrt/vosa/$1.pid)"
+  echo "$(readlink -f ${avdir}/../../../../../var/run/vizrt/vosa/)"
 }
 
 ## Tells vosa that it is allowed to install and run an instance.
@@ -390,20 +390,44 @@ function do_stop() {
       exit 1
     fi
     if [ "${status[3]}" == "alive" ] ; then
-      echo "Killing kvm process ${status[4]}"
-      kill "${status[4]}"
+      shutdown "${status[0]}"
       # should now be "dead" if we asked it.
     fi
     # regardless of this, we _want_ it to die. remove pidfile.
     # TODO: continue trying to kill it more forcibly, and
     # remove the pidfile when it's done.
-    local pidfile=$(echo_pidfile_of ${status[0]})
+    local pidfile=$(echo_rundir_of ${status[0]})/${status[0]}.pid
     rm -f $pidfile
   }
 }
 
 
 
+# Performs a graceful shutdown of the guest
+function shutdown() {
+  local pid=$(<$(echo_rundir_of $1)/$1.pid)
+  echo "Sending ACPI shutdown signal to guest ($pid) ($(echo_rundir_of $1)/$1.monitor)"
+  echo 'system_powerdown' | nc -U $(echo_rundir_of $1)/$1.monitor
+  local a;
+  for a in $(seq 1 10) ; do
+    sleep 1
+    ps > /dev/null $pid || return 0
+  done
+  ps > /dev/null $pid && {
+    echo "guest did not shut down.  Killing its power."
+    kill "${status[4]}"
+  }
+  for a in $(seq 1 10) ; do
+    sleep 1
+    ps > /dev/null $pid || return 0
+  done
+  ps > /dev/null $pid && {
+    echo "guest did not respond to kill.  Killing with -9."
+    kill -9 "${status[4]}"
+  }
+}
+
+
 function unknown-argument() {
   echo "Unknown argument $@"
   usage=1
diff --git a/usr/share/vizrt/vosa/commands/boot.sh b/usr/share/vizrt/vosa/commands/boot.sh
index a94b193a..effc8672 100755
--- a/usr/share/vizrt/vosa/commands/boot.sh
+++ b/usr/share/vizrt/vosa/commands/boot.sh
@@ -134,6 +134,7 @@ function boot_kvm() {
   -m "${boot_config_memory}"
   $runas
   -enable-kvm
+  -monitor unix:${rundir}/${hostname}.monitor,server,nowait
   -balloon "virtio"
   -drive "file=${img},if=virtio,cache=none"
   -kernel ${kernel}

From bb047cb1fca0d45b726c7a7688972e29af53166c Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Fri, 17 Feb 2012 13:15:23 +0100
Subject: [PATCH 0414/2585]      Added support for selecting kvm interface at
 boot time.

---
 usr/share/vizrt/vosa/commands/boot.sh | 62 +++++++++++++++++++++++----
 1 file changed, 53 insertions(+), 9 deletions(-)

diff --git a/usr/share/vizrt/vosa/commands/boot.sh b/usr/share/vizrt/vosa/commands/boot.sh
index effc8672..9f93039b 100755
--- a/usr/share/vizrt/vosa/commands/boot.sh
+++ b/usr/share/vizrt/vosa/commands/boot.sh
@@ -65,7 +65,7 @@ hostname=$(basename "$image")
 parse_config_file $config/install.conf install_config_
 parse_config_file $config/boot.conf boot_config_
 
-make_run_dir() {
+function make_run_dir() {
   rundir=/var/run/vizrt/vosa/ 
   if [ "$(id -u)" != "0" ] ; then
     rundir=$HOME/.vizrt/vosa/
@@ -74,6 +74,52 @@ make_run_dir() {
   mkdir -p $rundir || exitonerror $? "Unable to make the place where pidfiles are stored ($rundir)"
 }
 
+## Select a tap interface
+## For now it selects a single tap interface at random, of the ones not
+## listed in use by any other machines.
+function select_tap_interface() {
+  if [ -r $rundir/$hostname.network ] ; then
+    rm -f $rundir/$hostname.network
+  fi
+  for try in 1 2 3 4 ; do 
+    # Read the list of available networks we have
+    declare -A availablenetworks
+    local network
+    for network in $rundir/*.availablenetwork ; do
+      [[ -f $network ]] || continue
+      # $network == tap4.availablenetwork.  Contains the name(s) of vm04's networks
+      local tap
+      tap=$(basename $network .availablenetwork)
+      availablenetworks["$tap"]=1
+    done
+
+    echo "Available tap interfaces: ${!availablenetworks[@]}"
+
+    # Read the list of used networks we have
+    declare -A usednetworks
+    for network in $rundir/*.network ; do
+      [[ -f $network ]] || continue
+      # $network == /.../vm04.network.  File contains a list of taps used by vm04
+      local vm  # "vm04"
+      vm=$(basename $network .network)
+      local i
+      for i in $(<$network) ; do
+        usednetworks["$i"]=$vm  # e.g. usednetworks[tap3]=vm04
+      done
+    done
+
+    echo "tap interfaces already in use : ${!usednetworks[@]}"
+
+    for tap in ${!availablenetworks[@]} ; do
+      if [ -z "${usednetworks["$tap"]}" ] ; then
+        tapinterface=$tap
+        # TODO: only exit when the desired number of network interfaces has been reached...
+        echo $tap >> "${rundir}/${hostname}.network" && return
+      fi
+    done
+  done
+}
+
 function check_sudo() {
   sudo=''
   runas=''
@@ -104,11 +150,6 @@ function touch_pid_file() {
   touch "${pidfile}"
 }
 
-function touch_state_file() {
-  statefile=$rundir/$hostname.state
-  echo 'running' > $statefile
-}
-
 function configure_vnc_option() {
   if [ -z "$boot_config_vnc_port" -o "$boot_config_vnc_port" == "none" ] ; then 
     vncoption="-vnc none"
@@ -119,6 +160,9 @@ function configure_vnc_option() {
 
 
 function boot_kvm() {
+  if [ -z "$tapinterface" ] ; then
+    echo "No tap interface available..."
+  fi
   kernel=${image}/vmlinuz
   img=${image}/disk.img
   cloud_param="nocloud;h=${hostname}"
@@ -139,7 +183,7 @@ function boot_kvm() {
   -drive "file=${img},if=virtio,cache=none"
   -kernel ${kernel}
   -net "nic,model=virtio,macaddr=${install_config_macaddr}"
-  -net "tap,script=$(dirname $0)/qemu-ifup")
+  -net "tap,ifname=$tapinterface,script=no,downscript=no")
   
 # http://dwdwwebcache.googleusercontent.com/search?q=cache:mEAjcA2zHosJ:kerneltrap.org/mailarchive/linux-kvm/2010/1/26/6257297/thread+qemu-kvm+acpi+shutdown&cd=1&hl=no&ct=clnk&gl=no
 # http://kerneltrap.org/mailarchive/linux-kvm/2010/1/26/6257297/thread
@@ -162,7 +206,7 @@ function boot_kvm() {
 check_sudo
 make_run_dir
 configure_vnc_option
+select_tap_interface
 
-touch_pid_file  # should maybe be part of boot process?  dunno.
+touch_pid_file
 boot_kvm
-touch_state_file

From be119369543de15676f21898369e5f66cb88a3f6 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Fri, 17 Feb 2012 13:30:28 +0100
Subject: [PATCH 0415/2585]      Added optional ability to pass user-data to
 vosa install

---
 usr/share/vizrt/vosa/commands/install.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/usr/share/vizrt/vosa/commands/install.sh b/usr/share/vizrt/vosa/commands/install.sh
index 96950908..db19e43c 100755
--- a/usr/share/vizrt/vosa/commands/install.sh
+++ b/usr/share/vizrt/vosa/commands/install.sh
@@ -138,7 +138,10 @@ function create_overlay() {
   done
 
   mkdir -p ${tempdir}/overlay/updates/var/lib/cloud/data/cache/nocloud/
-  cat >> ${tempdir}/overlay/updates/var/lib/cloud/data/cache/nocloud/user-data <<EOF
+  if [ ! -z "${install_config_user_data}" ] ; then
+    cp "${install_config_user_data}" ${tempdir}/overlay/updates/var/lib/cloud/data/cache/nocloud/user-data
+  else 
+    cat >> ${tempdir}/overlay/updates/var/lib/cloud/data/cache/nocloud/user-data <<EOF
 #cloud-config
 manage_etc_hosts: true
 timezone: ${install_config_timezone}
@@ -146,6 +149,7 @@ apt_update: false
 apt_upgrade: false
 apt_mirror: ${install_config_mirror}
 EOF
+  fi
 
   cat >> ${tempdir}/overlay/updates/var/lib/cloud/data/cache/nocloud/meta-data <<EOF
 EOF

From 86515c4d99d25daa2cb487a18ed6331ecb7e9859 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Fri, 17 Feb 2012 13:33:29 +0100
Subject: [PATCH 0416/2585]      Made it possible to _configure_ the user data
 too

---
 usr/share/vizrt/vosa/commands/install_config_parser | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/usr/share/vizrt/vosa/commands/install_config_parser b/usr/share/vizrt/vosa/commands/install_config_parser
index 6eedd346..e44795f3 100644
--- a/usr/share/vizrt/vosa/commands/install_config_parser
+++ b/usr/share/vizrt/vosa/commands/install_config_parser
@@ -9,6 +9,7 @@ install_config_macaddr=
 install_config_netmask=
 install_config_gateway=
 install_config_timezone=
+install_config_user_data=
 
 
 function install_config_ip_address() {
@@ -43,6 +44,10 @@ function install_config_timezone() {
   install_config_timezone=$1
 }
 
+function install_config_user_data() {
+  install_config_user_data=$1
+}
+
 # Handle arrays
 
 declare -a install_config_ssh_keys

From 823a9ebf4b552abfb7e6ce812c6675f971799236 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Fri, 17 Feb 2012 14:52:17 +0100
Subject: [PATCH 0417/2585]      Added seed information to actually use the
 user-data file on boot!

---
 usr/share/vizrt/vosa/commands/boot.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/vizrt/vosa/commands/boot.sh b/usr/share/vizrt/vosa/commands/boot.sh
index 9f93039b..e6a21e07 100755
--- a/usr/share/vizrt/vosa/commands/boot.sh
+++ b/usr/share/vizrt/vosa/commands/boot.sh
@@ -165,7 +165,7 @@ function boot_kvm() {
   fi
   kernel=${image}/vmlinuz
   img=${image}/disk.img
-  cloud_param="nocloud;h=${hostname}"
+  cloud_param="nocloud;h=${hostname};s=file:///var/lib/cloud/data/cache/nocloud/"
 
   # should _maybe_ be put in some other script?  Needed by e.g. vosa start too.
   decho 1 "Starting the machine"

From b8941875501cc599a353ea76dbf7132141c60456 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Sun, 19 Feb 2012 12:53:48 +0100
Subject: [PATCH 0418/2585]      Made KVM binary not always be "kvm" in path,
 but look for other obvious locations

---
 usr/share/vizrt/vosa/commands/boot.sh | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/usr/share/vizrt/vosa/commands/boot.sh b/usr/share/vizrt/vosa/commands/boot.sh
index e6a21e07..5a306c4b 100755
--- a/usr/share/vizrt/vosa/commands/boot.sh
+++ b/usr/share/vizrt/vosa/commands/boot.sh
@@ -9,6 +9,17 @@
 # Usually this command is executed from "/usr/bin/vosa -i somevm start"
 # or similar.
 
+if [ -z "$KVM_BINARY" ] ; then
+  KVM_BINARY=$(which 2>/dev/null kvm) ||
+  KVM_BINARY=$(which 2>/dev/null qemu-kvm) ||
+  KVM_BINARY=/usr/libexec/qemu-kvm
+fi
+
+if [ -z "$KVM_BINARY" -o ! -x $KVM_BINARY ] ; then
+  echo Unable to figure out where kvm is installed... export KVM_BINARY to make it work.
+fi
+
+
 debug=3
 
 function decho() {
@@ -132,7 +143,7 @@ $0: It seems I am not able to run kvm as root.  I will not be able to run kvm
 with bridged networking.
 To fix this, add the file /etc/sudoers.d/kvm with the line
 
-  $(id -un) ALL=(ALL) NOPASSWD: /usr/bin/kvm
+  $(id -un) ALL=(ALL) NOPASSWD: $KVM_BINARY
 
 Exiting.
 EOF
@@ -165,11 +176,11 @@ function boot_kvm() {
   fi
   kernel=${image}/vmlinuz
   img=${image}/disk.img
-  cloud_param="nocloud;h=${hostname};s=file:///var/lib/cloud/data/cache/nocloud/"
+  cloud_param="nocloud;h=${hostname}"
 
   # should _maybe_ be put in some other script?  Needed by e.g. vosa start too.
   decho 1 "Starting the machine"
-  startupcmd=($sudo kvm
+  startupcmd=($sudo $KVM_BINARY
   -daemonize
   ${vncoption}
   -name "${hostname}"

From 10d1bda310e82010536328ea28f51f2618959484 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Sun, 19 Feb 2012 12:54:07 +0100
Subject: [PATCH 0419/2585]      Merged heads

---
 usr/share/vizrt/vosa/commands/boot.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/vizrt/vosa/commands/boot.sh b/usr/share/vizrt/vosa/commands/boot.sh
index 5a306c4b..1e6676b6 100755
--- a/usr/share/vizrt/vosa/commands/boot.sh
+++ b/usr/share/vizrt/vosa/commands/boot.sh
@@ -176,7 +176,7 @@ function boot_kvm() {
   fi
   kernel=${image}/vmlinuz
   img=${image}/disk.img
-  cloud_param="nocloud;h=${hostname}"
+  cloud_param="nocloud;h=${hostname};s=file:///var/lib/cloud/data/cache/nocloud/"
 
   # should _maybe_ be put in some other script?  Needed by e.g. vosa start too.
   decho 1 "Starting the machine"

From 47c3e2a5c3743e09800f2d743b4f75b70b191e54 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Sun, 19 Feb 2012 22:09:46 +0100
Subject: [PATCH 0420/2585]      Removed pidfile if unable to start kvm

---
 usr/share/vizrt/vosa/commands/boot.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/usr/share/vizrt/vosa/commands/boot.sh b/usr/share/vizrt/vosa/commands/boot.sh
index 1e6676b6..46da8fc3 100755
--- a/usr/share/vizrt/vosa/commands/boot.sh
+++ b/usr/share/vizrt/vosa/commands/boot.sh
@@ -210,7 +210,13 @@ function boot_kvm() {
 
   # actually execute kvm
   echo "${startupcmd[@]}"
-  "${startupcmd[@]}"; exitonerror $? "Unable to start kvm :-/" 
+  "${startupcmd[@]}"; 
+  local rc
+  rc=$?
+  if [ $rc != 0 ] ;
+    rm $pidfile
+    exitonerror $rc "Unable to start kvm :-/"
+  fi
 }
 
 

From 5a81332aa3f9a4c7a8675aeabc17b5255ff7b917 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Mon, 20 Feb 2012 12:52:26 +0100
Subject: [PATCH 0421/2585]      Typo in boot.  Now vosa start respects the
 processor affinity in boot.conf.

---
 usr/share/vizrt/vosa/commands/boot.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/usr/share/vizrt/vosa/commands/boot.sh b/usr/share/vizrt/vosa/commands/boot.sh
index 46da8fc3..25c6778f 100755
--- a/usr/share/vizrt/vosa/commands/boot.sh
+++ b/usr/share/vizrt/vosa/commands/boot.sh
@@ -174,17 +174,24 @@ function boot_kvm() {
   if [ -z "$tapinterface" ] ; then
     echo "No tap interface available..."
   fi
+
+  if [ ! -z "$boot_config_processor_affinity" ] ; then
+    echo "Applying processor restriction to $boot_config_processor_affinity"
+    taskset="taskset -c $boot_config_processor_affinity"
+    smpoption="-smp cores=2"
+  fi
   kernel=${image}/vmlinuz
   img=${image}/disk.img
   cloud_param="nocloud;h=${hostname};s=file:///var/lib/cloud/data/cache/nocloud/"
 
   # should _maybe_ be put in some other script?  Needed by e.g. vosa start too.
   decho 1 "Starting the machine"
-  startupcmd=($sudo $KVM_BINARY
+  startupcmd=($sudo $taskset $KVM_BINARY
   -daemonize
   ${vncoption}
   -name "${hostname}"
   -cpu "host"
+  $smpoption
   -pidfile "${pidfile}"
   -m "${boot_config_memory}"
   $runas
@@ -213,7 +220,7 @@ function boot_kvm() {
   "${startupcmd[@]}"; 
   local rc
   rc=$?
-  if [ $rc != 0 ] ;
+  if [ $rc != 0 ] ; then
     rm $pidfile
     exitonerror $rc "Unable to start kvm :-/"
   fi

From 52d1fcae1d2463e668fd39e2980ec83b02d87b6c Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Mon, 20 Feb 2012 14:28:20 +0100
Subject: [PATCH 0422/2585]      Made number of CPU cores that the guest
 emulates identical to the number of pinned processors

---
 usr/share/vizrt/vosa/commands/boot.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/vizrt/vosa/commands/boot.sh b/usr/share/vizrt/vosa/commands/boot.sh
index 25c6778f..4ab03268 100755
--- a/usr/share/vizrt/vosa/commands/boot.sh
+++ b/usr/share/vizrt/vosa/commands/boot.sh
@@ -178,7 +178,8 @@ function boot_kvm() {
   if [ ! -z "$boot_config_processor_affinity" ] ; then
     echo "Applying processor restriction to $boot_config_processor_affinity"
     taskset="taskset -c $boot_config_processor_affinity"
-    smpoption="-smp cores=2"
+    cpulist=( "${boot_config_processor_affinity//,/ }" )
+    smpoption="-smp cores=${#cpulist[@]}"
   fi
   kernel=${image}/vmlinuz
   img=${image}/disk.img

From b2f89ad66dce2a0739172107b7793e98096952e7 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Mon, 20 Feb 2012 14:42:54 +0100
Subject: [PATCH 0423/2585]      Now top on host shows the name of the guest:
 "kvm/vm03"

---
 usr/share/vizrt/vosa/commands/boot.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/vizrt/vosa/commands/boot.sh b/usr/share/vizrt/vosa/commands/boot.sh
index 4ab03268..465594d7 100755
--- a/usr/share/vizrt/vosa/commands/boot.sh
+++ b/usr/share/vizrt/vosa/commands/boot.sh
@@ -190,7 +190,7 @@ function boot_kvm() {
   startupcmd=($sudo $taskset $KVM_BINARY
   -daemonize
   ${vncoption}
-  -name "${hostname}"
+  -name "${hostname}",process=kvm/${hostname}
   -cpu "host"
   $smpoption
   -pidfile "${pidfile}"

From 4d591a1c63331ca72a1ef774ceb1e3cd44d58261 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Mon, 20 Feb 2012 16:58:17 +0100
Subject: [PATCH 0424/2585]      typo

---
 usr/share/vizrt/vosa/commands/boot.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/vizrt/vosa/commands/boot.sh b/usr/share/vizrt/vosa/commands/boot.sh
index 465594d7..727c3f27 100755
--- a/usr/share/vizrt/vosa/commands/boot.sh
+++ b/usr/share/vizrt/vosa/commands/boot.sh
@@ -178,7 +178,7 @@ function boot_kvm() {
   if [ ! -z "$boot_config_processor_affinity" ] ; then
     echo "Applying processor restriction to $boot_config_processor_affinity"
     taskset="taskset -c $boot_config_processor_affinity"
-    cpulist=( "${boot_config_processor_affinity//,/ }" )
+    cpulist=( ${boot_config_processor_affinity//,/ } )
     smpoption="-smp cores=${#cpulist[@]}"
   fi
   kernel=${image}/vmlinuz

From 3c4f53dac22516eeb57debe91ce9b4b435f67102 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 23 Feb 2012 14:55:23 +0100
Subject: [PATCH 0425/2585]      Update to make it possible to run the latest
 ece-install scripts

---
 .../vizrt/vosa/post-install-hooks/install-engine.sh      | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/usr/share/vizrt/vosa/post-install-hooks/install-engine.sh b/usr/share/vizrt/vosa/post-install-hooks/install-engine.sh
index 171c0143..1f6d2851 100755
--- a/usr/share/vizrt/vosa/post-install-hooks/install-engine.sh
+++ b/usr/share/vizrt/vosa/post-install-hooks/install-engine.sh
@@ -19,16 +19,15 @@ if [ ! -r $2/ece-install ] ; then
   if [ -r $1/ece-install ] ; then
     cp $1/ece-install $2
   else
-    wget "https://raw.github.com/skybert/ece-scripts/master/usr/sbin/ece-install" -O $2/ece-install
+    wget "https://github.com/skybert/ece-scripts/tarball/master" -O $2/ece-install.tar.gz
   fi
 fi
-chmod +x $2/ece-install
 if [ ! -r $1/ece-install.conf ] ; then
   echo "No ece-install.conf file present in $1"
   exit 1;
 fi
 
-scp -F $2/ssh.conf $2/ece-install $1/ece-install.conf root@guest:
-
-ssh -F $2/ssh.conf root@guest ./ece-install
+scp -F $2/ssh.conf $2/ece-install.tar.gz $1/ece-install.conf root@guest:
 
+ssh -F $2/ssh.conf root@guest tar xfz ece-install.tar.gz
+ssh -F $2/ssh.conf root@guest bash *-ece-scripts-*/usr/sbin/ece-install

From 7ebf804fb18dd6db90f22d13ceae0b3a62545789 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 23 Feb 2012 14:55:41 +0100
Subject: [PATCH 0426/2585]      Forced rtl8139 to avoid networking issues

---
 usr/share/vizrt/vosa/commands/boot.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/vizrt/vosa/commands/boot.sh b/usr/share/vizrt/vosa/commands/boot.sh
index 727c3f27..19e564bb 100755
--- a/usr/share/vizrt/vosa/commands/boot.sh
+++ b/usr/share/vizrt/vosa/commands/boot.sh
@@ -201,7 +201,7 @@ function boot_kvm() {
   -balloon "virtio"
   -drive "file=${img},if=virtio,cache=none"
   -kernel ${kernel}
-  -net "nic,model=virtio,macaddr=${install_config_macaddr}"
+  -net "nic,model=rtl8139,macaddr=${install_config_macaddr}"
   -net "tap,ifname=$tapinterface,script=no,downscript=no")
   
 # http://dwdwwebcache.googleusercontent.com/search?q=cache:mEAjcA2zHosJ:kerneltrap.org/mailarchive/linux-kvm/2010/1/26/6257297/thread+qemu-kvm+acpi+shutdown&cd=1&hl=no&ct=clnk&gl=no

From bb73b1e723e0f24f3a0ba9c0076fd70748121d4f Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Thu, 23 Feb 2012 15:30:24 +0100
Subject: [PATCH 0427/2585]      Made "vosa init" which sets up the /etc
 directory if anything is missing. Various small typos

---
 usr/bin/vosa | 241 ++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 227 insertions(+), 14 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index dcd9020c..b8f22c2d 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -54,6 +54,7 @@ enabled_dir=$(readlink -f ${enabled_dir})
 
 
 function requires_instance_dir() {
+  
   if [ -z "$instance_dir" -o -z "${instance_name}" ] ; then
     echo "Instance is required"
     usage=1
@@ -81,9 +82,218 @@ Useful starting points:
 EOF
 }
 
-## Initializes the etc directory with a skeleton of a virtual machine
+## Initializes the etc directory with the required directory structure
+##
+## Creates /etc/vizrt/vosa/available.d, enabled.d and a skeleton directory
+## with a documented set of files.  The files and directories are not
+## overwritten if they already exist.
 function do_init() {
-  echo "not implemented."
+  mkdir -p /etc/vizrt/vosa/available.d || exit 2
+  mkdir -p /etc/vizrt/vosa/enabled.d || exit 2
+  mkdir -p /etc/vizrt/vosa/skeleton || exit 2
+  if [ ! -r /etc/vizrt/vosa/skeleton/install.conf ] ; then
+    cat > /etc/vizrt/vosa/skeleton/install.conf <<EOF
+# Installation time configuration
+
+# The lines in this files are parsed in-order.  The bottom most
+# values override top ones of the same name, unless the stanza has
+# been defined as having multiple values, in which case the values
+# will be appended in the order they appear in the file.
+
+# Which image to use to install the sucker
+
+original_image /var/lib/vizrt/vosa/original-images/current/disk.img
+kernel /var/lib/vizrt/vosa/original-images/current/vmlinuz
+
+# Initial disk size for its own storage, in Gigabytes: Disk will be
+# reized to this size on installation.
+# If this isn't used, the original image file is used without resizing, in which
+# case it ought to be resized manually first.
+initial_disk_size 10
+
+# Any SSH keys to use here?  If specified many times, all of the files will
+# be appended to the user's known_host.
+ssh_keys /etc/vizrt/vosa/global-ssh-keys
+#ssh_keys ssh-keys
+
+# MAC address to use (e.g. DE:AD:BE:EF:88:EC)
+# This allows a host to keep a stable mac address across restarts
+# and across reinstalls.
+macaddr 00:0c:29:38:b4:02
+
+# ip-address given to the eth0 in the guest.
+ip_address 172.24.201.202
+netmask 255.255.0.0
+gateway 172.24.1.1
+
+# address of mirror to use (defaults to mirror://mirrors.ubuntu.com/mirrors.txt)
+# mirror http://no.archive.ubuntu.com/
+user_data /etc/vizrt/vosa/user-data/puppet-client.txt
+
+# Host name give to the machine. defaults to the name of the vm instance
+# hostname some-vm03
+
+# Add files to the image early in initial boot
+# This option can be provided several times.
+# Any symliks in the overlay will be dereferenced on the host
+# before being overlaid on the guest.
+overlay /etc/vizrt/vosa/overlay/common
+
+# Time zone that the server should have if
+# different than the host (e.g. Europe/Oslo)
+timezone Europe/Oslo
+
+# scripts to run as root on the host after installing a
+# guest, passing the name of the vm on the command line.
+# If the command fails, the VM is killed, and the operation
+# is deemed a failure.
+
+
+# First, wait for SSH access....
+postinstall wait-for-ssh.sh
+
+#Provide sane and correct information in motd
+postinstall make-a-motd.sh
+
+# Mount prerequisite shared file systems by adding them to
+# /etc/fstab, mounting them and verifying that they're there
+#postinstall mount-shared-disks.sh
+
+# run ece-install in the guest, with the EAR file in question
+# The scripts are assumed to be in /usr/lib/vosa/
+# OR simply install tomcat, and the ece scripts and deploy it...
+# postinstall install-engine.sh
+
+# Install and configure the heartbeat
+#postinstall install-heartbeat.sh
+
+# Install and configure fail2ban.sh
+#postinstall install-fail2ban.sh
+
+
+# Configure the standard firewall rules
+#postinstall install-firewall-rules.sh
+
+# Configure syslog to use the host's syslog and not the guest.
+#postinstall reconfigure-syslog.sh
+
+# finally let's have a clean boot for goot measure.
+# this command waits until it's back up again.
+#postinstall final-reboot.sh 
+
+
+#postinstall enable-time-synchronization.sh
+
+EOF
+  fi
+
+  if [ ! -r /etc/vizrt/vosa/skeleton/boot.conf ] ; then
+    cat > /etc/vizrt/vosa/skeleton/boot.conf <<EOF
+#-----------------------------------------------------------------------#
+# Run-time configuration options
+#-----------------------------------------------------------------------#
+#
+# Changes to this file take effect the next time the image is
+# stopped and started (i.e. "power off")
+#
+# These options are also used during installation, affect install-time
+# by coming into play when the image is booted the first time.
+
+#-----------------------------------------------------------------------#
+# Amount of memory, in megabytes, allocated to this guest
+# 3584 is 3.5Gb.
+memory 3584
+
+#-----------------------------------------------------------------------#
+# Which processors should this guest have access to?
+# The number of processors specified here are also used to calculate
+# how many CPUs that should be emulated inside the guest.
+# For example: 0,1,2,3 will make the guest have a four-way CPU.
+processor_affinity 0,1,2,3
+
+#-----------------------------------------------------------------------#
+# Dispay number for vnc or "none" to turn off
+# Example: "vnc_port 4" will listen on port 5904.
+# Note that guests will fail to start if the vnc port is busy!
+# This should only be used to debug boot problems; in production it
+# should not be necessary to vnc to the guests...
+vnc_port none
+EOF
+  fi
+  # TODO:
+  # Include common configuration items.
+  #include /etc/vizrt/vosa/common.conf
+
+
+  mkdir -p /etc/vizrt/vosa/user-data || exit 2
+  if [ ! -r /etc/vizrt/vosa/user-data/puppetmaster.pp ] ; then
+    cat > /etc/vizrt/vosa/user-data/puppetmaster.pp <<EOF
+#cloud-config
+
+#------------------------------------------------------------------------#
+# This file is a User Data file to set up a puppet master.
+#
+# It installs a base set of packages and configures the puppet master to
+# create a self signed certificate.
+
+manage_etc_hosts: false
+timezone: Europe/Oslo
+
+apt_update: true
+apt_upgrade: true
+apt_mirror: http://no.archive.ubuntu.com/
+
+# ACPID installed before puppet, because it ensures clean shutdowns, even if something goes wrong.
+packages:
+ - acpid
+ - mercurial
+ - ruby-activerecord
+
+puppet:
+  conf:
+    master:
+      certname: "puppetmaster"
+      node_name: "facter"
+      storeconfigs: "true"
+
+# Patch the oneiric auth.conf to allow the cert called "generic-puppetmaster-client"
+# to access the guest.
+# Other versions of guests might need a different patch file...
+# Note that dollar-signs need to be escaped.
+runcmd:
+ - |
+   apt-get -y install puppetmaster
+   cat > /tmp/auth.patch <<EOF
+   --- /etc/puppet/auth.conf    2011-06-27 16:50:51.000000000 +0200
+   +++ /etc/puppet/auth.conf.orig       2012-02-21 07:26:54.361610001 +0100
+   @@ -51,7 +51,9 @@
+    # allow nodes to retrieve their own catalog (ie their configuration)
+    path ~ ^/catalog/([^/]+)\\$
+    method find
+   -allow \\\$1
+   +#allow \\\$1
+   +# allow the generic cert to retrieve any node's catalog
+   +allow generic-puppetmaster-client
+
+    # allow nodes to retrieve their own node definition
+    path ~ ^/node/([^/]+)\\$
+   EOF
+   patch /etc/puppet/auth.conf < /tmp/auth.patch
+   puppet cert --generate generic-puppetmaster-client
+EOF
+  fi
+
+  mkdir -p /etc/vizrt/vosa/overlay/common/etc || exit 2
+  mkdir -p /etc/vizrt/vosa/overlay/common/etc || exit 2
+  if [ ! -r /etc/vizrt/vosa/overlay/common/etc/resolv.conf ] ; then
+    ln -s /etc/resolv.conf /etc/vizrt/vosa/overlay/common/etc/resolv.conf || exit 2
+  fi
+  if [ ! -r /etc/vizrt/vosa/overlay/common/etc/hosts ] ; then
+    ln -s /etc/resolv.conf /etc/vizrt/vosa/overlay/common/etc/hosts || exit 2
+  fi
+  if [ ! -r /etc/vizrt/vosa/global-ssh-keys ] ; then
+    touch /etc/vizrt/vosa/global-ssh-keys || exit 2
+  fi
 }
 
 ## Provides even more help.
@@ -131,6 +341,18 @@ function do_commands() {
   done
 }
 
+function verify_installation() {
+  if [ -z "$available_dir" -o ! -r "$available_dir" ] ; then
+    echo "Not initialized! RTFM! Exiting. ($available_dir)"
+    exit 2
+  fi
+
+  if [ -z "$enabled_dir" -o ! -r "$enabled_dir" ] ; then
+    echo "Not initialized! RTFM! Exiting. ($enabled_dir)"
+    exit 2
+  fi
+}
+
 ## Provides status information about defines VMs
 ##
 ## vosa status
@@ -180,10 +402,11 @@ function do_commands() {
 ##      For informational purposes, the pid and the uptime of the pid
 ##      are shown in dd-hh:mm:ss format.
 function do_status() {
+  verify_installation
   if [ -z "$instance_dir" ] ; then
     local a
     for a in $(
-      ls -d ${available_dir}/* | grep "/[0-9a-z][-0-9a-z]*$"
+      ls 2>/dev/null -d ${available_dir}/* | grep "/[0-9a-z][-0-9a-z]*$"
     ) ; do 
       really_do_status $a
     done
@@ -459,7 +682,7 @@ LASTOPTIND=$OPTIND
 function verify_usage() {
   if [ $usage -eq 1 ] ; then
     echo "Usage: $0 [-i <instance-dir>] <command>"
-    echo "$0 available to get a list of instances"
+    echo "$0 help for more help"
     exit 1;
   fi
 }
@@ -476,16 +699,6 @@ fi
 
 verify_usage
 
-if [ -z "$available_dir" -o ! -r "$available_dir" ] ; then
-  echo "Not initialized! RTFM! Exiting. ($available_dir)"
-  exit 2
-fi
-
-if [ -z "$enabled_dir" -o ! -r "$enabled_dir" ] ; then
-  echo "Not initialized! RTFM! Exiting. ($enabled_dir)"
-  exit 2
-fi
-
 for cmd in "${@}" ; do
   # Check if the command
   fn="do_${cmd}"

From 2f71b437fdbbebf4355e85e1f2964c442a424e80 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Thu, 23 Feb 2012 15:31:37 +0100
Subject: [PATCH 0428/2585]      Full support of specifying a mirror

---
 usr/share/vizrt/vosa/commands/install_config_parser | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/usr/share/vizrt/vosa/commands/install_config_parser b/usr/share/vizrt/vosa/commands/install_config_parser
index e44795f3..8c7eea47 100644
--- a/usr/share/vizrt/vosa/commands/install_config_parser
+++ b/usr/share/vizrt/vosa/commands/install_config_parser
@@ -10,6 +10,7 @@ install_config_netmask=
 install_config_gateway=
 install_config_timezone=
 install_config_user_data=
+install_config_mirror=
 
 
 function install_config_ip_address() {
@@ -48,6 +49,10 @@ function install_config_user_data() {
   install_config_user_data=$1
 }
 
+function install_config_mirror() {
+  install_config_mirror=$1
+}
+
 # Handle arrays
 
 declare -a install_config_ssh_keys

From d9f749f50b8912163f1873458485ce17b3384a4f Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Thu, 23 Feb 2012 18:42:40 +0100
Subject: [PATCH 0429/2585]      Added "vosa -v oneiric download" which
 downloads the latest UEC image to /var/lib

---
 usr/bin/vosa | 40 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index b8f22c2d..a42f7c60 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -19,7 +19,7 @@ usage=0
 ### To add an option, add it to the optstring, as defined in getopts, in alphabetical order.
 ### Also add a function "option-x" where x is the option. $1 will be the option value, if any.
 ### set any variables needed to default values as globals first.
-OPTSTRING=":i:h"
+OPTSTRING=":i:v:h"
 
 function option-h() {
   usage=1
@@ -40,6 +40,10 @@ function option-i() {
   fi
 }
 
+function option-v() {
+  uec_version="${1}"
+}
+
 
 function unknown-option() {
   echo "Unknown option $@"
@@ -296,6 +300,40 @@ EOF
   fi
 }
 
+## Download an Ubuntu Enterprise Cloud server image
+##
+## Downloads a tar.gz from Ubuntu Enterprise Cloud and makes it
+## available under /var/lib/vizrt/vosa/images/<today's date>/
+## unless it already exists.
+##
+## Required option -v naming the distribution, e.g. oneiric or lucid.
+##
+## Also changes the symlink of "current" to point to this image.
+function do_download() {
+  if [ -z "$uec_version" ] ; then
+    echo "-v option is required when downloading."
+    exit 2
+  fi
+  date=$(date --iso)
+  local dir
+  dir=/var/lib/vizrt/vosa/images/$uec_version-$date/
+  if [ -d $dir ] ; then
+    echo "$uec_version-$date already exists, skipping download."
+    echo "Remove $dir if you want to re-download this image."
+  else
+    mkdir /var/lib/vizrt/vosa/images/$uec_version-$date/ || exit 2
+    wget http://uec-images.ubuntu.com/server/$uec_version/current/$uec_version-server-cloudimg-amd64.tar.gz -O $dir/$uec_version-server-cloudimg-amd64.tar.gz || exit 2
+    tar -x -C $dir -v -f $dir/$uec_version-server-cloudimg-amd64.tar.gz | tee $dir/contents > /dev/null || exit 2
+    local kernel
+    kernel=$(cd $dir && echo ${base}-vmlinuz-*)
+  fi
+  if [ -L /var/lib/vizrt/vosa/images/current ] ; then
+    rm /var/lib/vizrt/vosa/images/current
+  fi
+  echo "Marking $uec_version-$date as"' "current"'
+  ln -s $uec_version-$date /var/lib/vizrt/vosa/images/current
+}
+
 ## Provides even more help.
 function do_longhelp() {
   cat <<EOF

From d9f22785d3a44200380545e9bbc8d31d25ec06fa Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Thu, 23 Feb 2012 19:43:52 +0100
Subject: [PATCH 0430/2585]      Made some additional checks to see if the
 image file or the process name are running / in use.  Moved the default
 location of UEC images to /var/lib/vizrt/vosa/uec-images, and fixed the names
 to be correct (disk.img and vmlinuz)

---
 usr/bin/vosa                          | 21 ++++++++++++---------
 usr/share/vizrt/vosa/commands/boot.sh | 13 +++++++++++++
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index a42f7c60..cf1b635a 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -106,8 +106,8 @@ function do_init() {
 
 # Which image to use to install the sucker
 
-original_image /var/lib/vizrt/vosa/original-images/current/disk.img
-kernel /var/lib/vizrt/vosa/original-images/current/vmlinuz
+original_image /var/lib/vizrt/vosa/uec-images/current/disk.img
+kernel /var/lib/vizrt/vosa/uec-images/current/vmlinuz
 
 # Initial disk size for its own storage, in Gigabytes: Disk will be
 # reized to this size on installation.
@@ -316,22 +316,25 @@ function do_download() {
   fi
   date=$(date --iso)
   local dir
-  dir=/var/lib/vizrt/vosa/images/$uec_version-$date/
+  dir=/var/lib/vizrt/vosa/uec-images/$uec_version-$date/
   if [ -d $dir ] ; then
     echo "$uec_version-$date already exists, skipping download."
     echo "Remove $dir if you want to re-download this image."
   else
-    mkdir /var/lib/vizrt/vosa/images/$uec_version-$date/ || exit 2
+    mkdir -p $dir || exit 2
     wget http://uec-images.ubuntu.com/server/$uec_version/current/$uec_version-server-cloudimg-amd64.tar.gz -O $dir/$uec_version-server-cloudimg-amd64.tar.gz || exit 2
-    tar -x -C $dir -v -f $dir/$uec_version-server-cloudimg-amd64.tar.gz | tee $dir/contents > /dev/null || exit 2
+    tar -x --no-same-owner --no-same-permissions -C $dir -v -f $dir/$uec_version-server-cloudimg-amd64.tar.gz | tee $dir/contents > /dev/null || exit 2
     local kernel
-    kernel=$(cd $dir && echo ${base}-vmlinuz-*)
+    kernel=$(cd $dir && echo *-vmlinuz-*)
+    image=$(cd $dir && echo *.img)
+    mv $dir/$kernel $dir/vmlinuz
+    mv $dir/$image $dir/disk.img
   fi
-  if [ -L /var/lib/vizrt/vosa/images/current ] ; then
-    rm /var/lib/vizrt/vosa/images/current
+  if [ -L /var/lib/vizrt/vosa/uec-images/current ] ; then
+    rm /var/lib/vizrt/vosa/uec-images/current
   fi
   echo "Marking $uec_version-$date as"' "current"'
-  ln -s $uec_version-$date /var/lib/vizrt/vosa/images/current
+  ln -s $uec_version-$date /var/lib/vizrt/vosa/uec-images/current
 }
 
 ## Provides even more help.
diff --git a/usr/share/vizrt/vosa/commands/boot.sh b/usr/share/vizrt/vosa/commands/boot.sh
index 19e564bb..689c724a 100755
--- a/usr/share/vizrt/vosa/commands/boot.sh
+++ b/usr/share/vizrt/vosa/commands/boot.sh
@@ -216,7 +216,20 @@ function boot_kvm() {
 
   startupcmd=("${startupcmd[@]}" -append "root=/dev/vda ro init=/usr/lib/cloud-init/uncloud-init ds=${cloud_param} ubuntu-pass=random $xupdate" )
 
+  ps > /dev/null -fC "kvm/${hostname}" && {
+    echo "This instance of KVM is already running.  Just see here:"
+    ps -fC "kvm/${hostname}"
+    exit 2
+  }
+
+  lsof > /dev/null ${img} && {
+    echo "This instance of KVM seems to be in use by another process. Just see here:"
+    lsof "${img}"
+    exit 2
+  }
+
   # actually execute kvm
+  echo "Command to star this KVM:"
   echo "${startupcmd[@]}"
   "${startupcmd[@]}"; 
   local rc

From 7440b766d76cac4a14824221c96db2c2280c090b Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Fri, 24 Feb 2012 02:48:34 +0100
Subject: [PATCH 0431/2585]      Cleaned up the "shutdown" procedure. Now uses
 "quit" kvm command, which is possibly more guest friendly.

---
 usr/bin/vosa | 43 ++++++++++++++++++++++++++++++++++++-------
 1 file changed, 36 insertions(+), 7 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index cf1b635a..7214f8f3 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -646,7 +646,6 @@ function do_start() {
 ## It is not possible to stop an instance that has not been installed. Stopping
 ## an already stopped instance has no effect.
 function do_stop() {
-  # TODO: let's make this command try to do a graceful shutdown (by ssh'ing to the guest and performing a shutdown, and eventually killing, and wait for the kvm process to die, eventually killing it.
   requires_instance_dir && {
     local status=( $(really_do_status $instance_dir) )
     if [ "${status[2]}" != "installed" ] ; then
@@ -670,20 +669,50 @@ function do_stop() {
 # Performs a graceful shutdown of the guest
 function shutdown() {
   local pid=$(<$(echo_rundir_of $1)/$1.pid)
-  echo "Sending ACPI shutdown signal to guest ($pid) ($(echo_rundir_of $1)/$1.monitor)"
-  echo 'system_powerdown' | nc -U $(echo_rundir_of $1)/$1.monitor
+  if [ -z "$pid" ] ; then
+    return 0
+  fi
+  ps > /dev/null $pid && {
+    echo "Sending ACPI shutdown signal to guest ($pid) ($(echo_rundir_of $1)/$1.monitor)"
+    echo 'system_powerdown' | nc -U $(echo_rundir_of $1)/$1.monitor
+    echo
+    echo -n "Waiting 15 seconds for it to shut down"
+  }
   local a;
-  for a in $(seq 1 10) ; do
+  for a in $(seq 1 15) ; do
+    echo -n '.'
+    sleep 1
+    ps > /dev/null $pid || {
+      echo;
+      return 0;
+    }
+  done
+  ps > /dev/null $pid && {
+    echo;
+    echo "Sending quit signal to kvm ($(echo_rundir_of $1)/$1.monitor)"
+    echo 'quit' | nc -U $(echo_rundir_of $1)/$1.monitor
+    echo -n "Waiting 30 seconds for it to stop"
+  }
+  local a;
+  for a in $(seq 1 30) ; do
+    echo -n '.'
     sleep 1
-    ps > /dev/null $pid || return 0
+    ps > /dev/null $pid || {
+      echo;
+      return 0;
+    }
   done
   ps > /dev/null $pid && {
-    echo "guest did not shut down.  Killing its power."
+    echo "guest did not shut down.  Killing (like pulling power cord)."
     kill "${status[4]}"
+    echo -n "Waiting 10 seconds for it to die"
   }
   for a in $(seq 1 10) ; do
     sleep 1
-    ps > /dev/null $pid || return 0
+    ps > /dev/null $pid || {
+      echo;
+      return 0;
+    }
   done
   ps > /dev/null $pid && {
     echo "guest did not respond to kill.  Killing with -9."

From b87b6fd565fc6eddd3b9bed1c5f8b027f3d74dc0 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Wed, 29 Feb 2012 15:16:37 +0100
Subject: [PATCH 0432/2585]      Initial stab at installation of puppet master
 script. not tested yet.

---
 .../install-puppet-master.sh                  | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 usr/share/vizrt/vosa/post-install-hooks/install-puppet-master.sh

diff --git a/usr/share/vizrt/vosa/post-install-hooks/install-puppet-master.sh b/usr/share/vizrt/vosa/post-install-hooks/install-puppet-master.sh
new file mode 100644
index 00000000..0b1b378b
--- /dev/null
+++ b/usr/share/vizrt/vosa/post-install-hooks/install-puppet-master.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+# A post installation script to set up a fully functional puppet master with
+# the ability to prime puppet hosts.  
+
+# First get newly installed packages to not auto-start on installation:
+ssh -F $2/ssh.conf root@guest tee > /dev/null /usr/sbin/policy-rc.d  <<EOF
+#!/bin/sh
+exit 101
+EOF
+ssh -F $2/ssh.conf root@guest chmod +x /usr/sbin/policy-rc.d
+
+
+ssh -F $2/ssh.conf root@guest ssh -F apt-get -y install puppetmaster
+ssh -F $2/ssh.conf root@guest patch /etc/puppet/auth.conf <<EOF
+--- /etc/puppet/auth.conf    2011-06-27 16:50:51.000000000 +0200
++++ /etc/puppet/auth.conf.orig       2012-02-21 07:26:54.361610001 +0100
+@@ -51,7 +51,9 @@
+ # allow nodes to retrieve their own catalog (ie their configuration)
+ path ~ ^/catalog/([^/]+)\$
+ method find
+-allow \$1
++#allow \$1
++# allow the generic cert to retrieve any node's catalog
++allow generic-puppetmaster-client
+
+ # allow nodes to retrieve their own node definition
+ path ~ ^/node/([^/]+)\$
+EOF
+ssh -F $2/ssh.conf root@guest puppet cert --generate generic-puppetmaster-client
+
+# Allow future installations to auto-start their se
+ssh -F $2/ssh.conf root@guest rm -f /usr/sbin/policy-rc.d

From f204fdbffae9d7a08961641e35e2f804ff6d84c1 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Wed, 29 Feb 2012 19:35:29 +0100
Subject: [PATCH 0433/2585]      Setting up the puppet master and generating a
 key, extract it and provide it to vosa to create clients

---
 .../install-puppet-master.sh                  | 77 ++++++++++++++++++-
 .../vosa/puppet/client-postinst-script.tmpl   | 10 +++
 2 files changed, 83 insertions(+), 4 deletions(-)
 create mode 100644 usr/share/vizrt/vosa/puppet/client-postinst-script.tmpl

diff --git a/usr/share/vizrt/vosa/post-install-hooks/install-puppet-master.sh b/usr/share/vizrt/vosa/post-install-hooks/install-puppet-master.sh
index 0b1b378b..38b1fca0 100644
--- a/usr/share/vizrt/vosa/post-install-hooks/install-puppet-master.sh
+++ b/usr/share/vizrt/vosa/post-install-hooks/install-puppet-master.sh
@@ -3,6 +3,8 @@
 # A post installation script to set up a fully functional puppet master with
 # the ability to prime puppet hosts.  
 
+hostname=$(basename $2)
+
 # First get newly installed packages to not auto-start on installation:
 ssh -F $2/ssh.conf root@guest tee > /dev/null /usr/sbin/policy-rc.d  <<EOF
 #!/bin/sh
@@ -11,7 +13,8 @@ EOF
 ssh -F $2/ssh.conf root@guest chmod +x /usr/sbin/policy-rc.d
 
 
-ssh -F $2/ssh.conf root@guest ssh -F apt-get -y install puppetmaster
+# Install the puppet master package on the guest, and patch the configuration file
+ssh -F $2/ssh.conf root@guest apt-get -y install puppetmaster || exit 2
 ssh -F $2/ssh.conf root@guest patch /etc/puppet/auth.conf <<EOF
 --- /etc/puppet/auth.conf    2011-06-27 16:50:51.000000000 +0200
 +++ /etc/puppet/auth.conf.orig       2012-02-21 07:26:54.361610001 +0100
@@ -27,7 +30,73 @@ ssh -F $2/ssh.conf root@guest patch /etc/puppet/auth.conf <<EOF
  # allow nodes to retrieve their own node definition
  path ~ ^/node/([^/]+)\$
 EOF
-ssh -F $2/ssh.conf root@guest puppet cert --generate generic-puppetmaster-client
 
-# Allow future installations to auto-start their se
-ssh -F $2/ssh.conf root@guest rm -f /usr/sbin/policy-rc.d
+# Name the certificate based on the hostname, to avoid conflicts.
+# Usually this would be called "puppetmaster" or "puppet" but it could be "puppet-3"
+# or whatever.
+ssh -F $2/ssh.conf root@guest puppet cert --generate generic-$hostname-client || exit $2
+
+# Allow future installations to auto-start their services...
+ssh -F $2/ssh.conf root@guest rm -f /usr/sbin/policy-rc.d || exit $2
+
+
+
+
+
+### Set up the host to be able to spawn puppet master clients:
+
+# 1. Get the private key of the puppetmaster's certificate.  Store it to $2/puppet-$hostname.pem.
+
+# 1. store a user-data-file in the /etc directory as "$hstname-client.sh"
+# Note:
+#    This needs to be propagated to other vosa servers that want to spawn clients from
+#    this puppet master.  This might not be possible to handle using puppet, since puppet
+#    requires this file (certificates) in order to work...
+# This is designed to run as a postinst hook.
+
+
+awk ' BEGIN { RS="" }
+      FILENAME==ARGV[1] { r=$0 }
+      FILENAME==ARGV[2] { sub("@@PRIVATE_KEY@@",r) ; print }
+    ' $2/puppet-$hostname.pem /usr/share/vizrt/vosa/puppet/client-postinst-script.tmpl > /etc/vizrt/vosa/puppet/$hostname-client.sh  
+
+/etc/vizrt/vosa/puppet/$hostname-client.sh  <<EOF
+puppet:
+  conf:
+    agent:
+      server: "puppetmaster"
+      certname: "generic-$hostname-client"
+      node_name_fact: "fqdn"
+      runinterval: 15
+      environment: production
+
+
+ssh -F \$2/ssh.conf tee /var/lib/puppet/ssl/private_keys/generic-$hostname-client.pem <<EOF2
+EOF
+
+
+
+cat > /etc/vizrt/vosa/puppet/$hostname-client.sh  <<EOF
+EOF2
+EOF
+
+   EOF
+   cat > /var/lib/puppet/ssl/certs/generic-puppetmaster-client.pem <<EOF
+   -----BEGIN CERTIFICATE-----
+   MIICWjCCAcOgAwIBAgIBAzANBgkqhkiG9w0BAQUFADAiMSAwHgYDVQQDDBdQdXBw
+   ZXQgQ0E6IHB1cHBldG1hc3RlcjAeFw0xMjAyMjAwOTU0MzVaFw0xNzAyMTkwOTU0
+   MzVaMCYxJDAiBgNVBAMMG2dlbmVyaWMtcHVwcGV0bWFzdGVyLWNsaWVudDCBnzAN
+   BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyROaA2bu67istk9t30mR/3R+OAjVGfUN
+   e2e/ocKmWi+xcBs0RXI1DnQd0M8YKDVaI/Oj13Wzp1vHGN1iu9HxlafjXd69Tozl
+   xinyTWL+XzlTil54JuLB94X/e318E0rPnOmtCUsGgsZUtICUeKF7O3kwQPZVsaec
+   4VrDUDQN/NkCAwEAAaOBmzCBmDAMBgNVHRMBAf8EAjAAMDcGCWCGSAGG+EIBDQQq
+   FihQdXBwZXQgUnVieS9PcGVuU1NMIEludGVybmFsIENlcnRpZmljYXRlMA4GA1Ud
+   DwEB/wQEAwIFoDAdBgNVHQ4EFgQURTSO+mSf60ueGo9SZQeuoiXOz4wwIAYDVR0l
+   AQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA0GCSqGSIb3DQEBBQUAA4GBAAtQ
+   AVZNhoUc6nhrUPGNAGUE83S3jMwjRRh8DP/fZFGtF9zBYkVCEtcEbjT/kX56b5MJ
+   NtJlYASzJejggnqDCIy3HUP8Hdb/PPPelJzp/mYYpPPwh7+ZEV3OjB+Ff5CAz+RS
+   n8evskKlDNakx3cY/t+ox0HjhvH8EK648oD2KfJg
+   -----END CERTIFICATE-----
+   EOF
+   /etc/init.d/puppet restart
+
diff --git a/usr/share/vizrt/vosa/puppet/client-postinst-script.tmpl b/usr/share/vizrt/vosa/puppet/client-postinst-script.tmpl
new file mode 100644
index 00000000..2b51e5f5
--- /dev/null
+++ b/usr/share/vizrt/vosa/puppet/client-postinst-script.tmpl
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+## This file is generated from /var/lib/vizrt/vosa/puppet/client-postinst-script.tmpl!!!
+
+## THE @@ stuff below is replaced on the fly.
+cat <<EOF
+@@PRIVATE_KEY@@
+EOF
+
+

From 348c60ac75c349f4464e0144023959f256f18d42 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Wed, 29 Feb 2012 20:53:25 +0100
Subject: [PATCH 0434/2585]      Seemingly working puppet-master-from-scratch

---
 usr/share/vizrt/vosa/commands/install.sh      |  2 +-
 .../vizrt/vosa/commands/install_config_parser |  6 +-
 .../install-puppet-master.sh                  | 70 +++++++------------
 .../vosa/puppet/client-postinst-script.tmpl   | 35 +++++++++-
 4 files changed, 61 insertions(+), 52 deletions(-)
 mode change 100644 => 100755 usr/share/vizrt/vosa/post-install-hooks/install-puppet-master.sh

diff --git a/usr/share/vizrt/vosa/commands/install.sh b/usr/share/vizrt/vosa/commands/install.sh
index db19e43c..df179051 100755
--- a/usr/share/vizrt/vosa/commands/install.sh
+++ b/usr/share/vizrt/vosa/commands/install.sh
@@ -145,7 +145,7 @@ function create_overlay() {
 #cloud-config
 manage_etc_hosts: true
 timezone: ${install_config_timezone}
-apt_update: false
+apt_update: true
 apt_upgrade: false
 apt_mirror: ${install_config_mirror}
 EOF
diff --git a/usr/share/vizrt/vosa/commands/install_config_parser b/usr/share/vizrt/vosa/commands/install_config_parser
index 8c7eea47..d2794de3 100644
--- a/usr/share/vizrt/vosa/commands/install_config_parser
+++ b/usr/share/vizrt/vosa/commands/install_config_parser
@@ -2,15 +2,15 @@
 # e.g. parsing a config file
 
 install_config_ip_address=
-install_config_original_image=
-install_config_kernel=
+install_config_original_image=/var/lib/vizrt/vosa/uec-images/current/disk.img
+install_config_kernel=/var/lib/vizrt/vosa/uec-images/current/vmlinuz
 install_config_initial_disk_size=
 install_config_macaddr=
 install_config_netmask=
 install_config_gateway=
 install_config_timezone=
 install_config_user_data=
-install_config_mirror=
+install_config_mirror=mirror://mirrors.ubuntu.com/mirrors.txt
 
 
 function install_config_ip_address() {
diff --git a/usr/share/vizrt/vosa/post-install-hooks/install-puppet-master.sh b/usr/share/vizrt/vosa/post-install-hooks/install-puppet-master.sh
old mode 100644
new mode 100755
index 38b1fca0..f879d23e
--- a/usr/share/vizrt/vosa/post-install-hooks/install-puppet-master.sh
+++ b/usr/share/vizrt/vosa/post-install-hooks/install-puppet-master.sh
@@ -45,58 +45,36 @@ ssh -F $2/ssh.conf root@guest rm -f /usr/sbin/policy-rc.d || exit $2
 
 ### Set up the host to be able to spawn puppet master clients:
 
-# 1. Get the private key of the puppetmaster's certificate.  Store it to $2/puppet-$hostname.pem.
+# 1. Get the private key and signed certficate of the
+# newly created puppetmaster's generic client.
+# Store it inside $2
 
-# 1. store a user-data-file in the /etc directory as "$hstname-client.sh"
+scp -F $2/ssh.conf \
+   root@guest:/var/lib/puppet/ssl/ca/signed/generic-$hostname-client.pem \
+   $2/generic-$hostname-client-certificate.pem || exit 2
+
+scp -F $2/ssh.conf \
+   root@guest:/var/lib/puppet/ssl/private_keys/generic-$hostname-client.pem \
+   $2/generic-$hostname-client-private.pem || exit 2
+
+# 2. store a user-data-file in the /etc directory as "$hostname-client.sh"
 # Note:
 #    This needs to be propagated to other vosa servers that want to spawn clients from
 #    this puppet master.  This might not be possible to handle using puppet, since puppet
 #    requires this file (certificates) in order to work...
 # This is designed to run as a postinst hook.
 
+mkdir -p /etc/vizrt/vosa/puppet/
 
 awk ' BEGIN { RS="" }
-      FILENAME==ARGV[1] { r=$0 }
-      FILENAME==ARGV[2] { sub("@@PRIVATE_KEY@@",r) ; print }
-    ' $2/puppet-$hostname.pem /usr/share/vizrt/vosa/puppet/client-postinst-script.tmpl > /etc/vizrt/vosa/puppet/$hostname-client.sh  
-
-/etc/vizrt/vosa/puppet/$hostname-client.sh  <<EOF
-puppet:
-  conf:
-    agent:
-      server: "puppetmaster"
-      certname: "generic-$hostname-client"
-      node_name_fact: "fqdn"
-      runinterval: 15
-      environment: production
-
-
-ssh -F \$2/ssh.conf tee /var/lib/puppet/ssl/private_keys/generic-$hostname-client.pem <<EOF2
-EOF
-
-
-
-cat > /etc/vizrt/vosa/puppet/$hostname-client.sh  <<EOF
-EOF2
-EOF
-
-   EOF
-   cat > /var/lib/puppet/ssl/certs/generic-puppetmaster-client.pem <<EOF
-   -----BEGIN CERTIFICATE-----
-   MIICWjCCAcOgAwIBAgIBAzANBgkqhkiG9w0BAQUFADAiMSAwHgYDVQQDDBdQdXBw
-   ZXQgQ0E6IHB1cHBldG1hc3RlcjAeFw0xMjAyMjAwOTU0MzVaFw0xNzAyMTkwOTU0
-   MzVaMCYxJDAiBgNVBAMMG2dlbmVyaWMtcHVwcGV0bWFzdGVyLWNsaWVudDCBnzAN
-   BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyROaA2bu67istk9t30mR/3R+OAjVGfUN
-   e2e/ocKmWi+xcBs0RXI1DnQd0M8YKDVaI/Oj13Wzp1vHGN1iu9HxlafjXd69Tozl
-   xinyTWL+XzlTil54JuLB94X/e318E0rPnOmtCUsGgsZUtICUeKF7O3kwQPZVsaec
-   4VrDUDQN/NkCAwEAAaOBmzCBmDAMBgNVHRMBAf8EAjAAMDcGCWCGSAGG+EIBDQQq
-   FihQdXBwZXQgUnVieS9PcGVuU1NMIEludGVybmFsIENlcnRpZmljYXRlMA4GA1Ud
-   DwEB/wQEAwIFoDAdBgNVHQ4EFgQURTSO+mSf60ueGo9SZQeuoiXOz4wwIAYDVR0l
-   AQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA0GCSqGSIb3DQEBBQUAA4GBAAtQ
-   AVZNhoUc6nhrUPGNAGUE83S3jMwjRRh8DP/fZFGtF9zBYkVCEtcEbjT/kX56b5MJ
-   NtJlYASzJejggnqDCIy3HUP8Hdb/PPPelJzp/mYYpPPwh7+ZEV3OjB+Ff5CAz+RS
-   n8evskKlDNakx3cY/t+ox0HjhvH8EK648oD2KfJg
-   -----END CERTIFICATE-----
-   EOF
-   /etc/init.d/puppet restart
-
+      FILENAME==ARGV[1] { p=$0 }
+      FILENAME==ARGV[2] { c=$0 }
+      FILENAME==ARGV[3] { sub("@@PRIVATE_KEY@@",p); sub("@@CERTIFICATE@@",c); print }
+    ' \
+   $2/generic-$hostname-client-private.pem \
+   $2/generic-$hostname-client-certificate.pem \
+   /usr/share/vizrt/vosa/puppet/client-postinst-script.tmpl \
+   | sed s/'@@HOSTNAME@@'/"$hostname"/g \
+   > /etc/vizrt/vosa/puppet/$hostname-client.sh || exit 2
+
+ssh -F $2/ssh.conf root@guest /etc/init.d/puppetmaster restart || exit 2
diff --git a/usr/share/vizrt/vosa/puppet/client-postinst-script.tmpl b/usr/share/vizrt/vosa/puppet/client-postinst-script.tmpl
index 2b51e5f5..306635d2 100644
--- a/usr/share/vizrt/vosa/puppet/client-postinst-script.tmpl
+++ b/usr/share/vizrt/vosa/puppet/client-postinst-script.tmpl
@@ -2,9 +2,40 @@
 
 ## This file is generated from /var/lib/vizrt/vosa/puppet/client-postinst-script.tmpl!!!
 
-## THE @@ stuff below is replaced on the fly.
-cat <<EOF
+
+# First get newly installed packages to not auto-start on installation:
+ssh -F $2/ssh.conf root@guest tee > /dev/null /usr/sbin/policy-rc.d  <<EOF
+#!/bin/sh
+exit 101
+EOF
+ssh -F $2/ssh.conf root@guest chmod +x /usr/sbin/policy-rc.d
+
+
+# Install the puppet master package on the guest, and patch the configuration file
+ssh -F $2/ssh.conf root@guest apt-get -y install puppet || exit 2
+ssh -F $2/ssh.conf root@guest tee > /dev/null /etc/puppet/puppet.conf <<EOF
+[agent]
+server = @@HOSTNAME@@
+certname = "generic-@@HOSTNAME@@-client"
+node_name_fact = "fqdn"
+runinterval = 15
+environment = production
+EOF
+
+
+ssh -F $2/ssh.conf root@guest tee > /dev/null /var/lib/puppet/ssl/private_keys/generic-@@HOSTNAME@@-client.pem <<EOF
 @@PRIVATE_KEY@@
 EOF
 
+ssh -F $2/ssh.conf root@guest tee > /dev/null /var/lib/puppet/ssl/certs/generic-@@HOSTNAME@@-client.pem <<EOF
+@@CERTIFICATE@@
+EOF
+
+# Allow future installations to auto-start their services...
+ssh -F $2/ssh.conf root@guest rm -f /usr/sbin/policy-rc.d || exit $2
+
+
+# Finally start puppet!!!
+ssh -F $2/ssh.conf root@guest /etc/init.d/puppet start || exit $2
+
 

From 702ba015cc1063fabbaf24ec8d38f03a3cff635c Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Wed, 29 Feb 2012 21:05:39 +0100
Subject: [PATCH 0435/2585]      Allow postinstall scripts to be absolute
 paths.

---
 usr/share/vizrt/vosa/commands/install.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/usr/share/vizrt/vosa/commands/install.sh b/usr/share/vizrt/vosa/commands/install.sh
index df179051..6e96e475 100755
--- a/usr/share/vizrt/vosa/commands/install.sh
+++ b/usr/share/vizrt/vosa/commands/install.sh
@@ -200,7 +200,11 @@ function delete_overlay() {
 function postinstall() {
   for o in "${install_config_postinstall[@]}" ; do
     echo "Executing postinstall $o"
-    local cmd="$(dirname $0)/../post-install-hooks/$o"
+    if [ "${o:0:1}" == "/" ] ; then
+      local cmd=$o
+    else
+      local cmd="$(dirname $0)/../post-install-hooks/$o"
+    fi
     if [ ! -x "$cmd" ] ; then
       echo "Unable to execute non-executable post-install hook: $cmd"
       delete_overlay

From 66c2a5a7b52a145bb2f308427d473a025d03b45e Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Wed, 29 Feb 2012 21:08:16 +0100
Subject: [PATCH 0436/2585]      Made the "hostname-client.sh" postinstall
 script executable and non-world-readable.

---
 .../vizrt/vosa/post-install-hooks/install-puppet-master.sh   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/usr/share/vizrt/vosa/post-install-hooks/install-puppet-master.sh b/usr/share/vizrt/vosa/post-install-hooks/install-puppet-master.sh
index f879d23e..869a5ae0 100755
--- a/usr/share/vizrt/vosa/post-install-hooks/install-puppet-master.sh
+++ b/usr/share/vizrt/vosa/post-install-hooks/install-puppet-master.sh
@@ -77,4 +77,9 @@ awk ' BEGIN { RS="" }
    | sed s/'@@HOSTNAME@@'/"$hostname"/g \
    > /etc/vizrt/vosa/puppet/$hostname-client.sh || exit 2
 
+# Make private and executable to root only (since it contains the private keys of
+# the SSL certificate.
+chmod 0500 /etc/vizrt/vosa/puppet/$hostname-client.sh || exit 2
+
 ssh -F $2/ssh.conf root@guest /etc/init.d/puppetmaster restart || exit 2
+

From fe958b3338e6eb7b0cb006d4c7594cd2a03f1232 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Wed, 29 Feb 2012 21:30:05 +0100
Subject: [PATCH 0437/2585]      Full puppet config on the client. Make
 directories before copying them in. Change permisions to match puppet
 expectations

---
 .../vosa/puppet/client-postinst-script.tmpl   | 34 ++++++++++++++++---
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/usr/share/vizrt/vosa/puppet/client-postinst-script.tmpl b/usr/share/vizrt/vosa/puppet/client-postinst-script.tmpl
index 306635d2..074b28ae 100644
--- a/usr/share/vizrt/vosa/puppet/client-postinst-script.tmpl
+++ b/usr/share/vizrt/vosa/puppet/client-postinst-script.tmpl
@@ -11,9 +11,23 @@ EOF
 ssh -F $2/ssh.conf root@guest chmod +x /usr/sbin/policy-rc.d
 
 
-# Install the puppet master package on the guest, and patch the configuration file
+# Install the puppet master package on the guest, and overwrite the configuration file
 ssh -F $2/ssh.conf root@guest apt-get -y install puppet || exit 2
 ssh -F $2/ssh.conf root@guest tee > /dev/null /etc/puppet/puppet.conf <<EOF
+[main]
+logdir = /var/log/puppet
+vardir = /var/lib/puppet
+ssldir = /var/lib/puppet/ssl
+rundir = /var/run/puppet
+factpath = $vardir/lib/facter
+templatedir = $confdir/templates
+prerun_command = /etc/puppet/etckeeper-commit-pre
+postrun_command = /etc/puppet/etckeeper-commit-post
+
+[master]
+ssl_client_header = SSL_CLIENT_S_DN
+ssl_client_verify_header = SSL_CLIENT_VERIFY
+
 [agent]
 server = @@HOSTNAME@@
 certname = "generic-@@HOSTNAME@@-client"
@@ -22,20 +36,32 @@ runinterval = 15
 environment = production
 EOF
 
-
+ssh -F $2/ssh.conf root@guest mkdir -p /var/lib/puppet/ssl/private_keys
+ssh -F $2/ssh.conf root@guest mkdir -p /var/lib/puppet/ssl/certs
+ssh -F $2/ssh.conf root@guest chmod 0751 /var/lib/puppet/ssl
+ssh -F $2/ssh.conf root@guest chmod 0750 /var/lib/puppet/ssl/private_keys
 ssh -F $2/ssh.conf root@guest tee > /dev/null /var/lib/puppet/ssl/private_keys/generic-@@HOSTNAME@@-client.pem <<EOF
 @@PRIVATE_KEY@@
 EOF
+# Change permissions to match what is expected of private eys...
+ssh -F $2/ssh.conf root@guest chmod 0600 /var/lib/puppet/ssl/private_keys/generic-@@HOSTNAME@@-client.pem 
 
 ssh -F $2/ssh.conf root@guest tee > /dev/null /var/lib/puppet/ssl/certs/generic-@@HOSTNAME@@-client.pem <<EOF
 @@CERTIFICATE@@
 EOF
 
+# Change ownership as per a default install of puppet
+ssh -F $2/ssh.conf root@guest chown --recursive puppet:root /var/lib/puppet/ssl/
+
 # Allow future installations to auto-start their services...
-ssh -F $2/ssh.conf root@guest rm -f /usr/sbin/policy-rc.d || exit $2
+ssh -F $2/ssh.conf root@guest rm -f /usr/sbin/policy-rc.d || exit 2
+
+
 
+# Make it possible to start puppet
+ssh -F $2/ssh.conf root@guest perl -pi -e 's/^START=.*/START=yes/' /etc/default/puppet || exit 2
 
 # Finally start puppet!!!
-ssh -F $2/ssh.conf root@guest /etc/init.d/puppet start || exit $2
+ssh -F $2/ssh.conf root@guest /etc/init.d/puppet start || exit 2
 
 

From cb7bd636b324bef0c7d05decaa39caa33e21a4c1 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Wed, 29 Feb 2012 21:43:51 +0100
Subject: [PATCH 0438/2585]      Fixed omission in generifying the scripts

---
 .../vizrt/vosa/post-install-hooks/install-puppet-master.sh      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/vizrt/vosa/post-install-hooks/install-puppet-master.sh b/usr/share/vizrt/vosa/post-install-hooks/install-puppet-master.sh
index 869a5ae0..f0ec3662 100755
--- a/usr/share/vizrt/vosa/post-install-hooks/install-puppet-master.sh
+++ b/usr/share/vizrt/vosa/post-install-hooks/install-puppet-master.sh
@@ -25,7 +25,7 @@ ssh -F $2/ssh.conf root@guest patch /etc/puppet/auth.conf <<EOF
 -allow \$1
 +#allow \$1
 +# allow the generic cert to retrieve any node's catalog
-+allow generic-puppetmaster-client
++allow generic-$hostname-client
 
  # allow nodes to retrieve their own node definition
  path ~ ^/node/([^/]+)\$

From 287a4d36b1c29f4281270d0cda1ab45d176ede4a Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Wed, 29 Feb 2012 21:48:47 +0100
Subject: [PATCH 0439/2585]      Overwrite the puppet master configuration with
 one that has a fixed certname for the server.

---
 .../install-puppet-master.sh                  | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/usr/share/vizrt/vosa/post-install-hooks/install-puppet-master.sh b/usr/share/vizrt/vosa/post-install-hooks/install-puppet-master.sh
index f0ec3662..53a84912 100755
--- a/usr/share/vizrt/vosa/post-install-hooks/install-puppet-master.sh
+++ b/usr/share/vizrt/vosa/post-install-hooks/install-puppet-master.sh
@@ -31,6 +31,32 @@ ssh -F $2/ssh.conf root@guest patch /etc/puppet/auth.conf <<EOF
  path ~ ^/node/([^/]+)\$
 EOF
 
+
+ssh -F $2/ssh.conf root@guest tee > /dev/null /etc/puppet/puppet.conf <<EOF
+[main]
+logdir=/var/log/puppet
+vardir=/var/lib/puppet
+ssldir=/var/lib/puppet/ssl
+rundir=/var/run/puppet
+factpath=$vardir/lib/facter
+templatedir=$confdir/templates
+prerun_command=/etc/puppet/etckeeper-commit-pre
+postrun_command=/etc/puppet/etckeeper-commit-post
+
+[master]
+# These are needed when the puppetmaster is run by passenger
+# and can safely be removed if webrick is used.
+ssl_client_header = SSL_CLIENT_S_DN 
+ssl_client_verify_header = SSL_CLIENT_VERIFY
+
+# Force the server to use an unqualified name as its certificate,
+# as FQDNs make everything depend on a DNS Server providing a domain
+# name that might cause problems in the future, if the domain name
+# changes or DNS is unavailable.
+certname=$hostname
+
+EOF
+
 # Name the certificate based on the hostname, to avoid conflicts.
 # Usually this would be called "puppetmaster" or "puppet" but it could be "puppet-3"
 # or whatever.

From b0a419f6a60ef9b96298cecc4879c7612b3bd351 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Wed, 29 Feb 2012 21:54:14 +0100
Subject: [PATCH 0440/2585]      Feed the IP address of the puppet master to
 the slaves before installing the puppet client

---
 .../vizrt/vosa/post-install-hooks/install-puppet-master.sh     | 2 ++
 usr/share/vizrt/vosa/puppet/client-postinst-script.tmpl        | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/usr/share/vizrt/vosa/post-install-hooks/install-puppet-master.sh b/usr/share/vizrt/vosa/post-install-hooks/install-puppet-master.sh
index 53a84912..27bc6e4b 100755
--- a/usr/share/vizrt/vosa/post-install-hooks/install-puppet-master.sh
+++ b/usr/share/vizrt/vosa/post-install-hooks/install-puppet-master.sh
@@ -4,6 +4,7 @@
 # the ability to prime puppet hosts.  
 
 hostname=$(basename $2)
+ipaddress=$(ssh -F $2/ssh.conf root@guest hostname -I | cut -f 1 -d ' ')
 
 # First get newly installed packages to not auto-start on installation:
 ssh -F $2/ssh.conf root@guest tee > /dev/null /usr/sbin/policy-rc.d  <<EOF
@@ -101,6 +102,7 @@ awk ' BEGIN { RS="" }
    $2/generic-$hostname-client-certificate.pem \
    /usr/share/vizrt/vosa/puppet/client-postinst-script.tmpl \
    | sed s/'@@HOSTNAME@@'/"$hostname"/g \
+   | sed s/'@@IPADDRESS@@'/"$ipaddress"/g \
    > /etc/vizrt/vosa/puppet/$hostname-client.sh || exit 2
 
 # Make private and executable to root only (since it contains the private keys of
diff --git a/usr/share/vizrt/vosa/puppet/client-postinst-script.tmpl b/usr/share/vizrt/vosa/puppet/client-postinst-script.tmpl
index 074b28ae..0033b5d6 100644
--- a/usr/share/vizrt/vosa/puppet/client-postinst-script.tmpl
+++ b/usr/share/vizrt/vosa/puppet/client-postinst-script.tmpl
@@ -2,6 +2,9 @@
 
 ## This file is generated from /var/lib/vizrt/vosa/puppet/client-postinst-script.tmpl!!!
 
+ssh -F $2/ssh.conf root@guest tee > /dev/null -a /etc/hosts <<EOF
+@@IPADDRESS@@	@@HOSTNAME@@
+EOF
 
 # First get newly installed packages to not auto-start on installation:
 ssh -F $2/ssh.conf root@guest tee > /dev/null /usr/sbin/policy-rc.d  <<EOF

From a23d7b115efa7ac49b1abeed9b875c65342fff65 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Wed, 29 Feb 2012 23:30:27 +0100
Subject: [PATCH 0441/2585]      Increased wait-for-ssh timeout to 90 seconds. 
 Also made wait-for-ssh wait for any cloud-init apt-get calls to complete, to
 avoid race conditions when installing on fast hardware, or when apt-get
 update is comparatively slow, or apt-get is busy installing lots of packages.
 Maybe a better way to handle this, by checking some cloud-init status.

---
 usr/share/vizrt/vosa/post-install-hooks/wait-for-ssh.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/usr/share/vizrt/vosa/post-install-hooks/wait-for-ssh.sh b/usr/share/vizrt/vosa/post-install-hooks/wait-for-ssh.sh
index 5b52ab44..7f293685 100755
--- a/usr/share/vizrt/vosa/post-install-hooks/wait-for-ssh.sh
+++ b/usr/share/vizrt/vosa/post-install-hooks/wait-for-ssh.sh
@@ -1,8 +1,15 @@
 #!/bin/bash
 
-for a in $(seq 1 20) ; do
+for a in $(seq 1 90) ; do
   ssh -q -F $2/ssh.conf root@guest id > /dev/null
   if [ $? == 0 ] ; then
+    pid=1
+    # Wait for existing apt-gets to complete.
+    while [ ! -z "$pid" ] ;
+    do
+      pid=$(ssh -F $2/ssh.conf root@guest pidof apt-get)
+      sleep 1;
+    done
     exit 0
   fi
   sleep 1;

From cf0708ea13467f76a38779891f87f925cc45ff10 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 1 Mar 2012 14:46:03 +0100
Subject: [PATCH 0442/2585] Removed unused file

---
 usr/lib/vosa/install-engine.sh | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 usr/lib/vosa/install-engine.sh

diff --git a/usr/lib/vosa/install-engine.sh b/usr/lib/vosa/install-engine.sh
deleted file mode 100644
index e864c4dc..00000000
--- a/usr/lib/vosa/install-engine.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-# Only argument is the "vm name" as provided on the command line,
-# which is a directory path of a VOSA vm definition:
-#
-# e.g. /etc/vosa/available.d/vm03
-
-# The VM is assumed to be booted and ready for SSH using the passwordless
-# key in the vm03 directory, as the XXX user (ubuntu?)
-
-cat > /dev/null <<EOF
-ece-install is copied in to /root
-so is a conf file (probably located in /etc/vosa/available.d/vm03
-ece-install is called
-return code is ! 0 if ece-install is ! 0...
-EOF
-
-# What's needed: A tool to extract interesting information about a VM
-# at run-time, programmatically.
-# e.g. give me the IP address of a running VM by name "vm04"
-# e.g. give me the 

From 7f6514c16747d23b54bd6bfe967343512d5de255 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 1 Mar 2012 14:51:46 +0100
Subject: [PATCH 0443/2585] Updated initial README file, and initial
 documentation of /usr/bin/vosa

---
 usr/share/doc/vizrt/vosa-guide.org | 63 ++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 usr/share/doc/vizrt/vosa-guide.org

diff --git a/usr/share/doc/vizrt/vosa-guide.org b/usr/share/doc/vizrt/vosa-guide.org
new file mode 100644
index 00000000..ff31004b
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-guide.org
@@ -0,0 +1,63 @@
+Installation of VOSA package
+============================
+
+
+Requirements:
+---------------
+- kvm or qemu-kvm
+- genisoimage
+- nc
+- tunctl
+- sudo access to kvm (or run vosa as root...)
+- a bridged network
+
+This installation will:
+
+- download an UEC image and kernel
+- create 10 tap interfaces (or less) (see below)
+- create ten "tap*.availablenetwork" fileis (where * is a number between 0 and 10)
+  in /var/run/vizrt/vosa/ signifying the names of the tap interfaces that can be used.
+- write (exclusively?) access to /var/run/vizrt/vosa/
+
+
+Setup
+-----
+
+    mkdir -p /etc/vizrt/vosa/available.d/vm-1
+    mkdir -p /etc/vizrt/vosa/enabled.d
+    mkdir -p /var/run/vizrt/vosa/
+    mkdir -p /var/lib/vizrt/vosa/images/
+    mkdir -p /var/lib/vizrt/vosa/original-images/
+
+Install the vosa command itself and its required libraries
+
+    ln -s $PWD/usr/bin/vosa /usr/bin/vosa
+    ln -s $PWD/usr/share/vizrt/ /usr/share/vizrt
+
+Set up an image
+
+    cd /var/lib/vizrt/vosa/original-images/
+    mkdir oneiric-2012-01-29
+    ln -s oneiric-2012-01-29 latest
+    cd latest
+    tar xfz ~/mogsie-autovm/downloads/oneiric-server-cloudimg-amd64.tar.gz 
+    mv oneiric-server-cloudimg-amd64.img disk.img
+    mv oneiric-server-cloudimg-amd64-vmlinuz-virtual vmlinuz
+    rm oneiric-server-cloudimg-amd64-*
+    rm README.files 
+
+Make a bridge, br0 or something (outside the scope of this document)
+
+make 10 tap interfaces and make them known to vosa (this probably needs to happen every boot...
+
+    for i in $(seq 1 10) ; do
+      tap=$(tunctl -b)
+      touch /var/run/vizrt/vosa/$tap.availablenetwork
+      brctl addif br0 $tap
+      ifconfig $tap up 0.0.0.0
+    done
+
+
+
+
+

From 726bb0531ca97ceb1f46d141a95daed70df04d83 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 1 Mar 2012 14:52:42 +0100
Subject: [PATCH 0444/2585] Updated initial README file, and initial
 documentation of /usr/bin/vosa

---
 README | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README b/README
index 7a85bc50..33f7381d 100644
--- a/README
+++ b/README
@@ -28,6 +28,11 @@ Features of the /usr/bin/system-info script
 ===========================================
 https://github.com/skybert/ece-scripts/blob/master/usr/share/doc/escenic/system-info-guide.org
 
+====================================
+Features of the /usr/bin/vosa script
+====================================
+https://github.com/skybert/ece-scripts/blob/master/usr/share/doc/vizrt/vosa-guide.org
+
 ========
 Feedback
 ========

From c20082ae1ea99ad9ccbecc443bcdec6b137b154c Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 1 Mar 2012 15:01:25 +0100
Subject: [PATCH 0445/2585] updated documentation, now closer to reality.
 migrated to orgmode.

---
 usr/share/doc/vizrt/vosa-guide.org | 52 ++++++++++++++++--------------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-guide.org b/usr/share/doc/vizrt/vosa-guide.org
index ff31004b..63f9bf67 100644
--- a/usr/share/doc/vizrt/vosa-guide.org
+++ b/usr/share/doc/vizrt/vosa-guide.org
@@ -1,14 +1,12 @@
-Installation of VOSA package
-============================
+* Installation of VOSA package
 
 
-Requirements:
----------------
+** Requirements:
 - kvm or qemu-kvm
 - genisoimage
 - nc
 - tunctl
-- sudo access to kvm (or run vosa as root...)
+- sudo access to kvm (or the more usual, which is to run vosa as root...)
 - a bridged network
 
 This installation will:
@@ -20,31 +18,19 @@ This installation will:
 - write (exclusively?) access to /var/run/vizrt/vosa/
 
 
-Setup
------
+** Setup
+Install the vosa command itself and its required libraries
 
-    mkdir -p /etc/vizrt/vosa/available.d/vm-1
-    mkdir -p /etc/vizrt/vosa/enabled.d
-    mkdir -p /var/run/vizrt/vosa/
-    mkdir -p /var/lib/vizrt/vosa/images/
-    mkdir -p /var/lib/vizrt/vosa/original-images/
+   : ln -s $PWD/usr/bin/vosa /usr/bin/vosa
+   : ln -s $PWD/usr/share/vizrt/ /usr/share/vizrt
 
-Install the vosa command itself and its required libraries
+Initialize it:
 
-    ln -s $PWD/usr/bin/vosa /usr/bin/vosa
-    ln -s $PWD/usr/share/vizrt/ /usr/share/vizrt
+   : vosa init
 
-Set up an image
+Download an Ubuntu Enterprise Cloud image to use as the base OS
 
-    cd /var/lib/vizrt/vosa/original-images/
-    mkdir oneiric-2012-01-29
-    ln -s oneiric-2012-01-29 latest
-    cd latest
-    tar xfz ~/mogsie-autovm/downloads/oneiric-server-cloudimg-amd64.tar.gz 
-    mv oneiric-server-cloudimg-amd64.img disk.img
-    mv oneiric-server-cloudimg-amd64-vmlinuz-virtual vmlinuz
-    rm oneiric-server-cloudimg-amd64-*
-    rm README.files 
+    vosa -v oneiric download
 
 Make a bridge, br0 or something (outside the scope of this document)
 
@@ -57,7 +43,23 @@ make 10 tap interfaces and make them known to vosa (this probably needs to happe
       ifconfig $tap up 0.0.0.0
     done
 
+Define a virtual machine:
+
+    mkdir /etc/vizrt/vosa/available.d/my-first-vm &&
+    cp /etc/vizrt/vosa/skeleton/* /etc/vizrt/vosa/available.d/my-first-vm/
+
+Configure these files (they're well documented)
+
+    vi /etc/vizrt/vosa/available.d/my-first-vm/*
+
+Make sure your IP and MAC addresses are unique
+
+Finally, enable and install your virtual machine:
+
+    vosa -i my-first-vm enable install
 
+When it's done you can SSH into the system:
 
+    ssh -F /var/lib/vizrt/vosa/my-first-vm/ssh.conf root@guest
 
 

From d084f8d424b4e858999e3707ba47bf5ce5e5308c Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 1 Mar 2012 15:02:29 +0100
Subject: [PATCH 0446/2585] more orgmode

---
 usr/share/doc/vizrt/vosa-guide.org | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-guide.org b/usr/share/doc/vizrt/vosa-guide.org
index 63f9bf67..49acb0b3 100644
--- a/usr/share/doc/vizrt/vosa-guide.org
+++ b/usr/share/doc/vizrt/vosa-guide.org
@@ -30,36 +30,36 @@ Initialize it:
 
 Download an Ubuntu Enterprise Cloud image to use as the base OS
 
-    vosa -v oneiric download
+   : vosa -v oneiric download
 
 Make a bridge, br0 or something (outside the scope of this document)
 
 make 10 tap interfaces and make them known to vosa (this probably needs to happen every boot...
 
-    for i in $(seq 1 10) ; do
-      tap=$(tunctl -b)
-      touch /var/run/vizrt/vosa/$tap.availablenetwork
-      brctl addif br0 $tap
-      ifconfig $tap up 0.0.0.0
-    done
+   : for i in $(seq 1 10) ; do
+   :   tap=$(tunctl -b)
+   :   touch /var/run/vizrt/vosa/$tap.availablenetwork
+   :   brctl addif br0 $tap
+   :   ifconfig $tap up 0.0.0.0
+   : done
 
 Define a virtual machine:
 
-    mkdir /etc/vizrt/vosa/available.d/my-first-vm &&
-    cp /etc/vizrt/vosa/skeleton/* /etc/vizrt/vosa/available.d/my-first-vm/
+   : mkdir /etc/vizrt/vosa/available.d/my-first-vm &&
+   : cp /etc/vizrt/vosa/skeleton/* /etc/vizrt/vosa/available.d/my-first-vm/
 
 Configure these files (they're well documented)
 
-    vi /etc/vizrt/vosa/available.d/my-first-vm/*
+   : vi /etc/vizrt/vosa/available.d/my-first-vm/*
 
 Make sure your IP and MAC addresses are unique
 
 Finally, enable and install your virtual machine:
 
-    vosa -i my-first-vm enable install
+   : vosa -i my-first-vm enable install
 
 When it's done you can SSH into the system:
 
-    ssh -F /var/lib/vizrt/vosa/my-first-vm/ssh.conf root@guest
+   : ssh -F /var/lib/vizrt/vosa/my-first-vm/ssh.conf root@guest
 
 

From cbfd24c1fbc9b095187667c270a5878ec9570d23 Mon Sep 17 00:00:00 2001
From: "Erik Mogensen (@mogsie)" <erik@mogensoft.net>
Date: Thu, 1 Mar 2012 22:32:36 +0100
Subject: [PATCH 0447/2585] Updated vosa documentation

---
 usr/share/doc/vizrt/vosa-guide.org | 210 ++++++++++++++++++++++++++---
 1 file changed, 192 insertions(+), 18 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-guide.org b/usr/share/doc/vizrt/vosa-guide.org
index 49acb0b3..0c271d2d 100644
--- a/usr/share/doc/vizrt/vosa-guide.org
+++ b/usr/share/doc/vizrt/vosa-guide.org
@@ -1,7 +1,88 @@
+* What is VOSA?
+
+Vosa is short for Vizrt Online System Administration, a set of tools
+created by Vizrt to ease various system administration chores.
+
+It facilitates the set up and installation of virtual machines,
+booting them up and installing software on them.  It also includes
+steps to set up a puppet master with a generic client certificate,
+and tools to install puppets that do what that puppet master says.
+
+All of this is possible manually by apt-get'ing and configuring
+manualy; the value of these scripts is that all of this is
+made possible without intervention.
+
+There are various post-installation hooks available which perform
+various tasks, for simple things like creating an /etc/motd file,
+to more advanced things like setting up a puppet master or
+installing a production ready Escenic Content Engine using
+ece-install.
+
+** Who is it for?
+
+It is aimed at anyone who needs to install lots of virtual machines,
+and particularly at those who agree that it is valuable to be able
+to completely reinstall a virtual machine from scratch without
+intervention, and then put that virtual machine in production.
+
+** Why should I use it?
+
+The normal way of virtualizing is to sit someone in front of a
+fresh VM and start to install software on it.  The software is
+configured, and more software piles on until it's production ready.
+Some final tweaks are made and then it might go into production.
+All of this installation, configuration and tweaking is /valuable/
+in the sense that doing it all over again actually costs money since
+someone needs to sit down and do it.  Most of the time, the people
+who did the original installation are no longer around, so doing it
+all from scratch would also revert some tweaks.
+
+A different way of looking at virtualization is to ascribe /no
+value/ to the virtual machine itself, or at least to the the disk
+image that constitutes the virtual machine. In order to do so, you
+need to make sure that it is possible to create a fully functional
+virtual machine at any time.  One that is production ready, with all
+the last-minute-tweaks in place.
+
+The Vosa scripts do just that.
+
+A short definition file tells vosa what base image to start with;
+this is an Ubuntu Enterprise Cloud image, but in theory other image
+types could be supported.  The file also provides it an IP address
+and the machine's time zone, and so on.  Most importantly, these
+files also tell vosa what to do with the virtual machine once it
+has booted, so-called "post install hooks".  Each of these are
+executed when the "first boot" has completed.  These hooks run
+only the first time the virtual machine has booted, and should be
+written in such a way that they end up with a production ready
+system that can go straight into production.
+
+The machines can be stopped, started, and so on, and since vosa
+relies on simple kvm, you can access the kvm monitor or vnc if you
+want to.  Vosa also sets up throw-away ssh keys that the host uses
+to interact with the guest during the first boot.
+
+** What can I do with this?
+
+Probably the most advanced thing you could do with this is to
+automate the setup of a complete data center, with database, nfs,
+a virtualized server park, and various virtual machines, tomcats,
+varnishes and so on, all from a single set of configuration files,
+without intervention.
+
+But you could also use it to just easily re-install a VM using the
+latest and greatest Ubuntu release, instead of (as is usual) not even
+daring to run apt-get upgrade.
+
 * Installation of VOSA package
 
+This is a terse description of what it takes to get a system to run
+vosa.
 
 ** Requirements:
+
+In order to benefit from vosa, you need the following:
+
 - kvm or qemu-kvm
 - genisoimage
 - nc
@@ -9,32 +90,58 @@
 - sudo access to kvm (or the more usual, which is to run vosa as root...)
 - a bridged network
 
-This installation will:
+In theory, it should be possible to script this too, or to get e.g.
+puppet to do this for us.  Watch this space!
 
-- download an UEC image and kernel
-- create 10 tap interfaces (or less) (see below)
-- create ten "tap*.availablenetwork" fileis (where * is a number between 0 and 10)
-  in /var/run/vizrt/vosa/ signifying the names of the tap interfaces that can be used.
-- write (exclusively?) access to /var/run/vizrt/vosa/
+** Setup
 
+Setting up vosa entails a few manual installation steps.  Among other
+things it will
+- provide the "vosa" command and its required libraries
+- download an image of an Ubuntu Enterprise Cloud
+- create 10 tap interfaces (an arbitrary number, really, see below
+  for an explanation).
+- create the same number of "tap*.availablenetwork" files in
+  /var/run/vizrt/vosa/ each one signifying the names of the tap
+  interfaces that can be used.
 
-** Setup
-Install the vosa command itself and its required libraries
+So without further ado, let's get started.  First of all, we need to
+onstall the vosa command itself and its required libraries:
 
    : ln -s $PWD/usr/bin/vosa /usr/bin/vosa
    : ln -s $PWD/usr/share/vizrt/ /usr/share/vizrt
 
-Initialize it:
+The vosa command should now work (to a certain extent)
+
+   : vosa help
+   : vosa commands
+   : vosa longhelp | less
+
+To make vosa usable, you need to initialize it:
 
    : vosa init
 
-Download an Ubuntu Enterprise Cloud image to use as the base OS
+This will create the /etc/vizrt/vosa directory structure, and a
+skeleton of a virtual machine definition.
+
+Let's download an Ubuntu Enterprise Cloud (UEC) image to use as the
+base OS.  vosa does this for you:
 
    : vosa -v oneiric download
 
-Make a bridge, br0 or something (outside the scope of this document)
+** Networking
+
+For this to be useful, your machines need to be accessible directly
+on the local network.  The scripts have only been tested on a bridged
+network.  So make a bridge, call it br0 or something.  How this is
+done is, however outside the scope of this document.
 
-make 10 tap interfaces and make them known to vosa (this probably needs to happen every boot...
+Once you have a bridged network, you need to create tap interfaces
+for each of your virtual machines.  Let's make 10 to start with.
+The reason these need to be pre-allocated is that we've seen that
+doing this temporarily (ca 10 seconds) makes the network go
+completely dark, and so shouldn't happen whenever any virtual
+machines are running.
 
    : for i in $(seq 1 10) ; do
    :   tap=$(tunctl -b)
@@ -43,23 +150,90 @@ make 10 tap interfaces and make them known to vosa (this probably needs to happe
    :   ifconfig $tap up 0.0.0.0
    : done
 
-Define a virtual machine:
+tunctl creates the tap interface, and we create a file with the name
+of the created tap interface in a directory.  This little snippet
+needs to run every time the host machine boots.
+
+** Defining a virtual machine
+
+Defining a virtual machine is a bit different than when using virsh
+or VMware of VirtualBox.  Vosa exploits the fact that the UEC images
+are pre-seeded with cloud-init, and so have a hook to execute code
+during the first boot.  This means we don't need to make any changes
+to the image file itself, but can boot the unmodified UEC image.
+
+A big benefit of this is that the exact same UEC images are available
+in Amazon EC2, and also in a Eucalyptus private cloud.  This means
+that vosa will be able to control Amazon EC2 images in the same way.
+
+Defining a virtual machine means creating two files (boot.conf and
+install.conf) in a directory.  "vosa init" has already created a
+documented skeleton which you can customize as you see fit.
 
    : mkdir /etc/vizrt/vosa/available.d/my-first-vm &&
    : cp /etc/vizrt/vosa/skeleton/* /etc/vizrt/vosa/available.d/my-first-vm/
+   : vi /etc/vizrt/vosa/available.d/my-first-vm/*
 
-Configure these files (they're well documented)
+Note that the name you choose ("my-first-vm") must be a valid
+internet host name with no domain part.  I.e. only lowercase
+alphanumerics and hyphens.  The name you choose will become the
+virtual machine's host name.
 
-   : vi /etc/vizrt/vosa/available.d/my-first-vm/*
+When you're happy with them you should of course track these in a
+version control system, so you don't lose them.  Over time, these
+will become more valuable than the virtual machine images themselves.
+
+Make sure your IP and MAC addresses are unique, or make a script to
+randomize them.
+
+Now, enable your virtual machine:
+
+   : vosa -i my-first-vm enable
 
-Make sure your IP and MAC addresses are unique
+This creates a symlink from available.d/my-first-vm to enabled.d, it
+serves no other purpose than to differentiate between a possibly long
+list of virtual machine definitions (in available.d), and the ones
+you have decided to actually run on this machine.
 
-Finally, enable and install your virtual machine:
+To install the machine, just issue the "install" command:
 
-   : vosa -i my-first-vm enable install
+   : vosa -i my-first-vm install
+
+This will copy the disk image to /var/lib/vizrt/vosa/images/my-first-vm/
+and put some more files in there (like the SSH private key), and
+finally it will boot up the image and use the UEC's cloud-init
+support to prime the image and execute any post-installation hooks
+you defined.
+
+The host name (as the machine sees it, at least) will be the same as
+the name of the virtual machine; in this case "my-first-vm"
 
 When it's done you can SSH into the system:
 
    : ssh -F /var/lib/vizrt/vosa/my-first-vm/ssh.conf root@guest
 
+Not that you should need to do that, of course.
+
+* Puppet Master
+
+Setting up a puppet master is also an important piece of vosa.
+
+To make this possible, vosa supplies a post-install hook. This hook:
+
+- installs the puppet master from the apt repositories,
+- configures the puppet master to use hostnames instead of its DNS
+  name for certificates
+- configures a self signed certificate for all guests (mainly to avoid
+  having to sign or auto-sign the puppets, since that would be
+  problematic when a puppet happens to be re-installed)
+- creates vosa post-installation hook to set up a pre-authenticated
+  puppet in /etc/vizrt/vosa/puppet/<puppetmaster-name>-client.sh
+
+This makes it possible to define more virtual machines that
+automatically dance to the puppet master's tune.
+
+Making this useful of course means pushing your puppet configuration
+into the puppet master, but that's outside the scope of this
+document.
+
 

From 0906f4ef84af300f2e7ac4ce17653950b09e5070 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 2 Mar 2012 11:48:51 +0800
Subject: [PATCH 0448/2585] - moved WF code to its own module

---
 usr/sbin/ece-install                          | 86 -------------------
 .../ece-install.d/widget-framework.sh         | 86 +++++++++++++++++++
 2 files changed, 86 insertions(+), 86 deletions(-)
 create mode 100644 usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 3d124516..6065a250 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -1474,92 +1474,6 @@ function get_boolean_conf_value()
     fi
 }
 
-function install_widget_framework()
-{
-    print_and_log "Installing Widget Framework on $HOSTNAME ..."
-    # TODO java.lang.NoClassDefFoundError:
-    # Lcom/escenic/framework/captcha/ReCaptchaConfig;
-    
-    wf_user=$(get_conf_value wf_user)
-    wf_password=$(get_conf_value wf_password)
-
-    if [ -z "$wf_user" -o -z "$wf_password" ]; then
-        print_and_log "Missing wf_user and wf_password in ${conf_file}. If you"
-        print_and_log "don't have these, please contact support@escenic.com"
-        remove_pid_and_exit_in_error
-    fi
-
-    print_and_log "Creating a Maven settings file: $HOME/.m2/settings.xml ..."
-    make_dir $HOME/.m2
-    cat > $HOME/.m2/settings.xml <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<settings xmlns="http://maven.apache.org/settings/1.0.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
-                              http://maven.apache.org/xsd/settings-1.0.0.xsd">
-  <servers>
-    <server>
-      <id>escenic-repo</id>
-      <username>${wf_user}</username>
-      <password>${wf_password}</password>
-    </server>
-  </servers>
-
-  <profiles>
-    <profile>
-      <id>escenic-profile</id>
-      <repositories>
-        <repository>
-          <id>escenic-repo</id>
-          <name>Repository for EWF libraries</name>
-          <url>http://repo.escenic.com/</url>
-          <layout>default</layout>
-        </repository>
-      </repositories>
-    </profile>
-  </profiles>
-
-  <activeProfiles>
-    <activeProfile>escenic-profile</activeProfile>
-  </activeProfiles>
-</settings>
-EOF
-
-    print_and_log "Downloading Widget Framework from technet.escenic.com ..."
-    for el in $wf_download_list; do
-      cd $download_dir
-      run wget $wget_opts \
-        --http-user $technet_user \
-        --http-password $technet_password \
-        $el
-      run cd $escenic_root_dir/
-      run unzip -q -u $download_dir/$(basename $el)
-    done
-
-    install_packages_if_missing "maven2"
-    assert_pre_requisite mvn
-
-    export JAVA_HOME=$java_home
-    wf_maven_dir=$(echo $escenic_root_dir/widget-framework-core-*/maven)
-    run cd $wf_maven_dir
-
-    print_and_log "Installing Widget Framework into your Maven repository ..."
-    log "JAVA_HOME=$JAVA_HOME"
-
-    run mvn $maven_opts install
-
-    # installing the widget-framework-common as a ECE plugin
-    wf_dist_dir=$(echo $wf_maven_dir/widget-framework-common/target/widget-framework-common-*-dist/widget-framework-common-*)
-    cd $escenic_root_dir/assemblytool/plugins
-    if [ ! -h $(basename $wf_dist_dir) ]; then
-      ln -s $wf_dist_dir
-    fi
-
-    cp -r $wf_dist_dir/misc/siteconfig/* $common_nursery_dir/
-
-    add_next_step "Widget Framework has been installed into your " \
-      " Maven repo"
-}
 
 # useful for development and test environments.
 function install_all_in_one_environment()
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh b/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
new file mode 100644
index 00000000..00ed8075
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
@@ -0,0 +1,86 @@
+function install_widget_framework()
+{
+  print_and_log "Installing Widget Framework on $HOSTNAME ..."
+  # TODO java.lang.NoClassDefFoundError:
+  # Lcom/escenic/framework/captcha/ReCaptchaConfig;
+  
+  local wf_user=$(get_conf_value wf_user)
+  local wf_password=$(get_conf_value wf_password)
+
+  if [ -z "$wf_user" -o -z "$wf_password" ]; then
+    print_and_log "Missing wf_user and wf_password in ${conf_file}. If you"
+    print_and_log "don't have these, please contact support@escenic.com"
+    remove_pid_and_exit_in_error
+  fi
+
+  print_and_log "Creating a Maven settings file: $HOME/.m2/settings.xml ..."
+  make_dir $HOME/.m2
+  cat > $HOME/.m2/settings.xml <<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<settings xmlns="http://maven.apache.org/settings/1.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                              http://maven.apache.org/xsd/settings-1.0.0.xsd">
+  <servers>
+    <server>
+      <id>escenic-repo</id>
+      <username>${wf_user}</username>
+      <password>${wf_password}</password>
+    </server>
+  </servers>
+
+  <profiles>
+    <profile>
+      <id>escenic-profile</id>
+      <repositories>
+        <repository>
+          <id>escenic-repo</id>
+          <name>Repository for EWF libraries</name>
+          <url>http://repo.escenic.com/</url>
+          <layout>default</layout>
+        </repository>
+      </repositories>
+    </profile>
+  </profiles>
+
+  <activeProfiles>
+    <activeProfile>escenic-profile</activeProfile>
+  </activeProfiles>
+</settings>
+EOF
+
+  print_and_log "Downloading Widget Framework from technet.escenic.com ..."
+  for el in $wf_download_list; do
+    cd $download_dir
+    run wget $wget_opts \
+      --http-user $technet_user \
+      --http-password $technet_password \
+      $el
+    run cd $escenic_root_dir/
+    run unzip -q -u $download_dir/$(basename $el)
+  done
+
+  install_packages_if_missing "maven2"
+  assert_pre_requisite mvn
+
+  export JAVA_HOME=$java_home
+  wf_maven_dir=$(echo $escenic_root_dir/widget-framework-core-*/maven)
+  run cd $wf_maven_dir
+
+  print_and_log "Installing Widget Framework into your Maven repository ..."
+  log "JAVA_HOME=$JAVA_HOME"
+
+  run mvn $maven_opts install
+
+    # installing the widget-framework-common as a ECE plugin
+  wf_dist_dir=$(echo $wf_maven_dir/widget-framework-common/target/widget-framework-common-*-dist/widget-framework-common-*)
+  cd $escenic_root_dir/assemblytool/plugins
+  if [ ! -h $(basename $wf_dist_dir) ]; then
+    ln -s $wf_dist_dir
+  fi
+
+  cp -r $wf_dist_dir/misc/siteconfig/* $common_nursery_dir/
+
+  add_next_step "Widget Framework has been installed into your " \
+    " Maven repo"
+}

From 1d823a7d9cef88bbc11f56d37852b31077df879b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 2 Mar 2012 11:53:03 +0800
Subject: [PATCH 0449/2585] - moved restore from backup into its own module

---
 usr/sbin/ece-install                          | 181 ------------------
 .../ece-install.d/restore-from-backup.sh      | 179 +++++++++++++++++
 2 files changed, 179 insertions(+), 181 deletions(-)
 create mode 100644 usr/share/escenic/ece-scripts/ece-install.d/restore-from-backup.sh

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 6065a250..a8ed7edf 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -1600,187 +1600,6 @@ function add_server_to_runlevels()
   fi
 }
 
-function restore_from_backup()
-{
-    # locals
-    restore_all=0
-    restore_db=0
-    restore_binaries=0
-    restore_data_files=0
-    restore_conf=0
-    backup_file=""
-    backup_dir=$escenic_backups_dir
-    
-    if [ $(get_boolean_conf_value fai_enabled) -eq 1 -a \
-        $(get_boolean_conf_value fai_restore_from_backup) -eq 1 ]; then
-        backup_file=${fai_restore_from_file}
-
-        if [ -z "$backup_file" ]; then
-            print_and_log "You must specifify fai_restore_from_file"
-            remove_pid_and_exit_in_error
-        fi
-
-        if [ $(get_boolean_conf_value fai_restore_all) -eq 1 ]; then
-            restore_all=1
-        elif [ $(get_boolean_conf_value fai_restore_db) -eq 1 ]; then
-            restore_db=1
-        elif [ $(get_boolean_conf_value fai_restore_data_files) -eq 1 ]; then
-            restore_data_files=1
-        elif [ $(get_boolean_conf_value fai_restore_software_binaries) -eq 1 ]
-        then
-            restore_binaries=1
-        elif [ $(get_boolean_conf_value fai_restore_configuration) -eq 1 ]; then
-            restore_conf=1
-        fi
-    elif [ $(get_boolean_conf_value fai_enabled) -eq 0 ]; then
-        print "From which dataset do you wish to restore?"
-        if [ ! -d $backup_dir ]; then
-            print_and_log "Directory $backup_dir doesn't exist or isn't readable"
-            remove_pid_and_exit_in_error
-        fi
-
-        if [ $(ls $backup_dir | grep ".tar$" | wc -l) -lt 1 ]; then
-            print_and_log "No backup files (.tar) found in $backup_dir, exiting."
-            exit 0
-        fi
-        
-        tarball_array=($(ls -t $backup_dir/*.tar))
-        
-        for (( i = 0; i <${#tarball_array[@]}; i++ )); do
-            echo "   " $(( ${i} + 1 )) "-" $(basename  ${tarball_array[$i]})
-        done
-        
-        print "Enter the number next to the tarball, from 1 to $i"
-        echo -n "Your choice [1]> "
-        read user_tarball
-
-        if [ -z "$user_tarball" ]; then
-            user_tarball=1
-        fi
-
-        backup_file=${tarball_array[$(( ${user_tarball} - 1 ))]}
-
-        print "Which part of the system do you wish to restore?"
-        restore_profiles=(
-            "The database"
-            "The Solr and ECE data files (multimedia archive)"
-            "The ECE configuration files"
-            "The Escenic and Tomcat software binaries + publication templates"
-            "Restore everything of the above"
-        )
-        for (( i = 0; i <${#restore_profiles[@]}; i++ )); do
-            echo "   " $(( ${i} + 1 )) "-" ${restore_profiles[$i]}
-        done
-        
-        print "Enter the number next to the tarball, from 1 to $i"
-        echo -n "Your choice [1]> "
-        read user_restore_profile
-
-        if [ -z "$user_restore_profile" ]; then
-            user_restore_profile=1
-        fi
-
-        if [ $user_restore_profile -eq 1 ]; then
-            restore_db=1
-        elif [ $user_restore_profile -eq 2 ]; then
-            restore_data_files=1
-        elif [ $user_restore_profile -eq 3 ]; then
-            restore_conf=1
-        elif [ $user_restore_profile -eq 4 ]; then
-            restore_binaries=1
-        elif [ $user_restore_profile -eq 5 ]; then
-            restore_all=1
-        fi
-    fi
-
-    if [ ! -r "$backup_file" ]; then
-        print_and_log "$backup_file either doesn't exist or cannot be read."
-        print_and_log "I cannot restore from it :-("
-        remove_pid_and_exit_in_error
-    fi
-    
-    dir=$(mktemp -d)
-    
-    if [ $restore_db -eq 1 -o $restore_all -eq 1 ]; then
-        install_database_server "binaries_only"
-        print_and_log "Restoring the database contents on $HOSTNAME ..."
-        run cd $dir
-        run tar xf $backup_file --wildcards var/backups/escenic/*.sql.gz
-        # picking the DB backup file to restore
-        sql_file=$(ls -tra var/backups/escenic/*.sql.gz | tail -1)
-        print_and_log "Selecting database dump: $(basename $sql_file)"
-
-        # methods in drop-and-create-ecedb to set up the database
-        # schema & user
-        pre_install_new_ecedb
-        create_schema
-
-        # db_schema is defined in drop-and-create-ecedb
-        gunzip < $sql_file | mysql $db_schema
-        exit_on_error "restoring from $sql_file"
-        
-        add_next_step "$(green Successfully) restored DB from $sql_file"
-    fi
-    
-    if [ $restore_data_files -eq 1 -o $restore_all -eq 1 ]; then
-        print_and_log "Restoring the Solr & ECE data files on $HOSTNAME ..."
-        run cd $dir
-        run tar -C / -xf $backup_file var/lib/escenic
-        add_next_step "$(green Successfully) restored Solr & ECE data files"
-        add_next_step "Backup file used:  $(basename $backup_file)"
-        add_next_step "Check $escenic_data_dir to verify they're all there."
-    fi
-    
-    if [ $restore_conf -eq 1 -o $restore_all -eq 1 ]; then
-        print_and_log "Restoring the ECE configuration files on $HOSTNAME ..."
-        run cd $dir
-        run tar -C / -xf $backup_file etc
-        add_next_step "$(green Successfully) restored ECE configuration files"
-        add_next_step "Backup file used: $(basename $backup_file)"
-        add_next_step "Check /etc to verify that they're all there."
-    fi
-    
-    if [ $restore_binaries -eq 1 -o $restore_all -eq 1 ]; then
-        print_and_log "Restoring the Escenic & Tomcat binaries on $HOSTNAME ..."
-        run cd $dir
-        run tar -C / -xf $backup_file opt
-        add_next_step "$(green Successfully) restored Escenic & Tomcat binaries"
-        add_next_step "Backup file used: $(basename $backup_file)"
-        add_next_step "Check ${appserver_parent_dir} to verify that they're all there".
-        install_ece_third_party_packages
-        set_up_engine_directories
-
-        # doing some educated guessing on which tomcat_base/home as
-        # well as UNIX user/group to use for this.
-        file=/etc/default/ece
-        if [ -r $file ]; then
-            ece_user=$(grep ^ece_unix_user $file | \
-                cut -d'=' -f2 | \
-                sed -e "s/'//g" -e 's/"//g'
-            )
-            ece_group=$(grep ^ece_unix_group $file | \
-                cut -d'=' -f2 | \
-                sed -e "s/'//g" -e 's/"//g'
-            )
-            create_user_and_group_if_not_present $ece_user $ece_group
-            
-            if [ -d $escenic_conf_dir -a \
-                $(ls $escenic_conf_dir/ | grep ^ece- | wc -l) -gt 0 -a \
-                $(grep ^tomcat_base $escenic_conf_dir/ece*.conf | wc -l) -gt 0 ]; then
-                directories=$(grep ^tomcat_base $escenic_conf_dir/ece*.conf | \
-                    cut -d'=' -f2 | \
-                    sed -e "s/'//g" -e 's/"//g'
-                )
-                s="Setting file permissions according to /etc/default/ece"
-                print_and_log $s
-                s="and $escenic_conf_dir/ece*.conf"
-                print_and_log $s
-                run chown -R ${ece_user}:${ece_group} ${directories}
-            fi
-        fi
-    fi
-}
-
 ## $1 configuration file name
 ## $2 host group name
 ## $3 host group alias
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/restore-from-backup.sh b/usr/share/escenic/ece-scripts/ece-install.d/restore-from-backup.sh
new file mode 100644
index 00000000..3313da65
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece-install.d/restore-from-backup.sh
@@ -0,0 +1,179 @@
+function restore_from_backup()
+{
+  local restore_all=0
+  local restore_db=0
+  local restore_binaries=0
+  local restore_data_files=0
+  local restore_conf=0
+  local backup_file=""
+  local backup_dir=$escenic_backups_dir
+  
+  if [ $(get_boolean_conf_value fai_enabled) -eq 1 -a \
+    $(get_boolean_conf_value fai_restore_from_backup) -eq 1 ]; then
+    backup_file=${fai_restore_from_file}
+
+    if [ -z "$backup_file" ]; then
+      print_and_log "You must specifify fai_restore_from_file"
+      remove_pid_and_exit_in_error
+    fi
+
+    if [ $(get_boolean_conf_value fai_restore_all) -eq 1 ]; then
+      restore_all=1
+    elif [ $(get_boolean_conf_value fai_restore_db) -eq 1 ]; then
+      restore_db=1
+    elif [ $(get_boolean_conf_value fai_restore_data_files) -eq 1 ]; then
+      restore_data_files=1
+    elif [ $(get_boolean_conf_value fai_restore_software_binaries) -eq 1 ]
+    then
+      restore_binaries=1
+    elif [ $(get_boolean_conf_value fai_restore_configuration) -eq 1 ]; then
+      restore_conf=1
+    fi
+  elif [ $(get_boolean_conf_value fai_enabled) -eq 0 ]; then
+    print "From which dataset do you wish to restore?"
+    if [ ! -d $backup_dir ]; then
+      print_and_log "Directory $backup_dir doesn't exist or isn't readable"
+      remove_pid_and_exit_in_error
+    fi
+
+    if [ $(ls $backup_dir | grep ".tar$" | wc -l) -lt 1 ]; then
+      print_and_log "No backup files (.tar) found in $backup_dir, exiting."
+      exit 0
+    fi
+    
+    local tarball_array=($(ls -t $backup_dir/*.tar))
+    
+    for (( i = 0; i <${#tarball_array[@]}; i++ )); do
+      echo "   " $(( ${i} + 1 )) "-" $(basename  ${tarball_array[$i]})
+    done
+    
+    print "Enter the number next to the tarball, from 1 to $i"
+    echo -n "Your choice [1]> "
+    read user_tarball
+
+    if [ -z "$user_tarball" ]; then
+      user_tarball=1
+    fi
+
+    backup_file=${tarball_array[$(( ${user_tarball} - 1 ))]}
+
+    print "Which part of the system do you wish to restore?"
+    restore_profiles=(
+      "The database"
+      "The Solr and ECE data files (multimedia archive)"
+      "The ECE configuration files"
+      "The Escenic and Tomcat software binaries + publication templates"
+      "Restore everything of the above"
+    )
+    for (( i = 0; i <${#restore_profiles[@]}; i++ )); do
+      echo "   " $(( ${i} + 1 )) "-" ${restore_profiles[$i]}
+    done
+    
+    print "Enter the number next to the tarball, from 1 to $i"
+    echo -n "Your choice [1]> "
+    read user_restore_profile
+
+    if [ -z "$user_restore_profile" ]; then
+      user_restore_profile=1
+    fi
+
+    if [ $user_restore_profile -eq 1 ]; then
+      restore_db=1
+    elif [ $user_restore_profile -eq 2 ]; then
+      restore_data_files=1
+    elif [ $user_restore_profile -eq 3 ]; then
+      restore_conf=1
+    elif [ $user_restore_profile -eq 4 ]; then
+      restore_binaries=1
+    elif [ $user_restore_profile -eq 5 ]; then
+      restore_all=1
+    fi
+  fi
+
+  if [ ! -r "$backup_file" ]; then
+    print_and_log "$backup_file either doesn't exist or cannot be read."
+    print_and_log "I cannot restore from it :-("
+    remove_pid_and_exit_in_error
+  fi
+  
+  local dir=$(mktemp -d)
+  
+  if [ $restore_db -eq 1 -o $restore_all -eq 1 ]; then
+    install_database_server "binaries_only"
+    print_and_log "Restoring the database contents on $HOSTNAME ..."
+    run cd $dir
+    run tar xf $backup_file --wildcards var/backups/escenic/*.sql.gz
+        # picking the DB backup file to restore
+    sql_file=$(ls -tra var/backups/escenic/*.sql.gz | tail -1)
+    print_and_log "Selecting database dump: $(basename $sql_file)"
+
+    # methods in drop-and-create-ecedb to set up the database
+    # schema & user
+    pre_install_new_ecedb
+    create_schema
+
+    # db_schema is defined in drop-and-create-ecedb
+    gunzip < $sql_file | mysql $db_schema
+    exit_on_error "restoring from $sql_file"
+    
+    add_next_step "$(green Successfully) restored DB from $sql_file"
+  fi
+  
+  if [ $restore_data_files -eq 1 -o $restore_all -eq 1 ]; then
+    print_and_log "Restoring the Solr & ECE data files on $HOSTNAME ..."
+    run cd $dir
+    run tar -C / -xf $backup_file var/lib/escenic
+    add_next_step "$(green Successfully) restored Solr & ECE data files"
+    add_next_step "Backup file used:  $(basename $backup_file)"
+    add_next_step "Check $escenic_data_dir to verify they're all there."
+  fi
+  
+  if [ $restore_conf -eq 1 -o $restore_all -eq 1 ]; then
+    print_and_log "Restoring the ECE configuration files on $HOSTNAME ..."
+    run cd $dir
+    run tar -C / -xf $backup_file etc
+    add_next_step "$(green Successfully) restored ECE configuration files"
+    add_next_step "Backup file used: $(basename $backup_file)"
+    add_next_step "Check /etc to verify that they're all there."
+  fi
+  
+  if [ $restore_binaries -eq 1 -o $restore_all -eq 1 ]; then
+    print_and_log "Restoring the Escenic & Tomcat binaries on $HOSTNAME ..."
+    run cd $dir
+    run tar -C / -xf $backup_file opt
+    add_next_step "$(green Successfully) restored Escenic & Tomcat binaries"
+    add_next_step "Backup file used: $(basename $backup_file)"
+    add_next_step "Check ${appserver_parent_dir} to verify that they're all there".
+    install_ece_third_party_packages
+    set_up_engine_directories
+
+    # doing some educated guessing on which tomcat_base/home as well
+    # as UNIX user/group to use for this.
+    file=/etc/default/ece
+    if [ -r $file ]; then
+      ece_user=$(grep ^ece_unix_user $file | \
+        cut -d'=' -f2 | \
+        sed -e "s/'//g" -e 's/"//g'
+      )
+      ece_group=$(grep ^ece_unix_group $file | \
+        cut -d'=' -f2 | \
+        sed -e "s/'//g" -e 's/"//g'
+      )
+      create_user_and_group_if_not_present $ece_user $ece_group
+      
+      if [ -d $escenic_conf_dir -a \
+        $(ls $escenic_conf_dir/ | grep ^ece- | wc -l) -gt 0 -a \
+        $(grep ^tomcat_base $escenic_conf_dir/ece*.conf | wc -l) -gt 0 ]; then
+        directories=$(grep ^tomcat_base $escenic_conf_dir/ece*.conf | \
+          cut -d'=' -f2 | \
+          sed -e "s/'//g" -e 's/"//g'
+        )
+        s="Setting file permissions according to /etc/default/ece"
+        print_and_log $s
+        s="and $escenic_conf_dir/ece*.conf"
+        print_and_log $s
+        run chown -R ${ece_user}:${ece_group} ${directories}
+      fi
+    fi
+  fi
+}

From bb647f14e337fd02a09410409bcec46f214e0241 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 2 Mar 2012 13:23:17 +0800
Subject: [PATCH 0450/2585] - hardening: better error reporting if the creation
 of java packages &   repo fails (was wrapped in a pulse).

---
 .../escenic/ece-scripts/ece-install.d/java.sh    | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/java.sh b/usr/share/escenic/ece-scripts/ece-install.d/java.sh
index b8603aee..48544acb 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/java.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/java.sh
@@ -7,17 +7,15 @@ function create_java_deb_packages_and_repo() {
   print $(lsb_release -i | cut -d':' -f2) \
     $(lsb_release -r | cut -d':' -f2) \
     "doesn't have official Sun/Oracle Java packages,"
+  print "creating packages & local repo for you ..."
   
   local tmp_dir=$(mktemp -d)
-  $(
-    run cd $tmp_dir
-    run git clone https://github.com/flexiondotorg/oab-java6.git
-    run cd oab-java6
-    run bash oab-java6.sh
-    run rm -rf $tmp_dir
-  ) &
-  show_pulse $! "I'm creating packages & local repo for you"
-
+  run cd $tmp_dir
+  run git clone https://github.com/flexiondotorg/oab-java6.git
+  run cd oab-java6
+  run bash oab-java6.sh
+  run rm -rf $tmp_dir
+    
   add_next_step "Local APT repository with Sun/Oracle Java packages"
   add_next_step "has been installed at /var/local/oab/deb and added"
   add_next_step "to your APT system with /etc/apt/sources.list.d/oab.list"

From 29106588644def77d330dd68322dd60d7fe6155c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 2 Mar 2012 13:27:18 +0800
Subject: [PATCH 0451/2585] - removed redundant call to
 install_packages_if_missing inside   install_database_server

---
 usr/share/escenic/ece-scripts/ece-install.d/database.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index c699f0f2..95a6d6f3 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -68,7 +68,6 @@ function install_database_server()
       
       add_apt_source "deb http://repo.percona.com/apt ${code_name} main"
       packages="percona-server-server percona-server-client"
-      install_packages_if_missing $packages
       force_packages=0
     else
       print_and_log "The Percona APT repsository doesn't have packages" 

From 0acb4e07147ed2c36c6d227e88fbe5e3deab3036 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 2 Mar 2012 13:31:11 +0800
Subject: [PATCH 0452/2585] - constants are just that, constant, this implies
 they're also   read-only. -> declare -r

---
 .../ece-scripts/ece-install.d/constants.sh    | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/constants.sh b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
index ec10854b..c743494d 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
@@ -1,13 +1,17 @@
-PROFILE_ALL_IN_ONE=1
-PROFILE_CACHE_SERVER=5
-PROFILE_DB_SERVER=4
-PROFILE_EDITORIAL_SERVER=2
-PROFILE_PRESENTATION_SERVER=3
-PROFILE_RMI_HUB=6
-PROFILE_SEARCH_SERVER=7
-PROFILE_WIDGET_FRAMEWORK=8
-PROFILE_CREATE_PUBLICATION=9
-PROFILE_MONITORING_SERVER=10
-PROFILE_RESTORE_FROM_BACKUP=11
-PROFILE_ANALYSIS_SERVER=12
+# constants used in several/all the ece-install modules.
+
+# constants are just that, constant, this implies they're also
+# read-only.
+declare -r PROFILE_ALL_IN_ONE=1
+declare -r PROFILE_CACHE_SERVER=5
+declare -r PROFILE_DB_SERVER=4
+declare -r PROFILE_EDITORIAL_SERVER=2
+declare -r PROFILE_PRESENTATION_SERVER=3
+declare -r PROFILE_RMI_HUB=6
+declare -r PROFILE_SEARCH_SERVER=7
+declare -r PROFILE_WIDGET_FRAMEWORK=8
+declare -r PROFILE_CREATE_PUBLICATION=9
+declare -r PROFILE_MONITORING_SERVER=10
+declare -r PROFILE_RESTORE_FROM_BACKUP=11
+declare -r PROFILE_ANALYSIS_SERVER=12
 

From 30d9a0b0ac7f1d329c65a9b2217494af94feddf6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 2 Mar 2012 14:02:40 +0800
Subject: [PATCH 0453/2585] - moved more monitoring code to the monitoring.sh
 module

---
 usr/sbin/ece-install                          | 36 -------------------
 .../ece-scripts/ece-install.d/monitoring.sh   | 36 +++++++++++++++++++
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index a8ed7edf..c8833d89 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -1635,41 +1635,6 @@ EOF
 EOF
 }
 
-## $1 nagios vendor
-function create_monitoring_server_overview()
-{
-    local file=/var/www/index.html
-    cat > $file <<EOF
-<html>
-  <body>
-    <h1>Welcome to the might monitoring server @ ${HOSTNAME}</h1>
-    <ul>
-EOF
-    if [[ $1 == $MONITORING_VENDOR_NAGIOS ]]; then
-        echo '<li><a href="/nagios3">Nagios</a></li>' \
-            else
-        echo '<li><a href="/icinga">Icinga</a> (an enhanced Nagios)</li>' \
-            >> $file
-    fi
-    cat > $file <<EOF
-      <li><a href="/munin">Munin</a></li>
-    </ul>
-  </body>
-</html>
-EOF
-    add_next_step "Start page for all monitoring interfaces: http://${HOSTNAME}/"
-}
-
-MONITORING_VENDOR_NAGIOS=nagios
-MONITORING_VENDOR_ICINGA=icinga
-function install_monitoring_server()
-{
-    local nagios_flavour=${fai_monitoring_nagios_flavour-$MONITORING_VENDOR_ICINGA}
-    install_nagios_monitoring_server $nagios_flavour
-    install_munin_gatherer
-    create_monitoring_server_overview $nagios_flavour
-}
-
 function common_post_install() {
   if [ $install_profile_number -eq $PROFILE_ALL_IN_ONE -o \
     $install_profile_number -eq $PROFILE_PRESENTATION_SERVER -o \
@@ -1719,7 +1684,6 @@ done
 
 init
 assert_correct_runtime_environment
-
 fai_enabled=$(get_boolean_conf_value fai_enabled)
 
 if [ $fai_enabled -eq 1 ]; then
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index 9fc01959..6b545ddd 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -1,5 +1,8 @@
 # module for installing monitoring software, both server and client side.
 
+MONITORING_VENDOR_NAGIOS=nagios
+MONITORING_VENDOR_ICINGA=icinga
+
 ## Installs the Nagios monitoring server.
 ## $1 the nagios vendor/falvour, "nagios" and "icinga" are supported.
 function install_nagios_monitoring_server()
@@ -288,3 +291,36 @@ EOF
   add_next_step "Munin gatherer admin interface: http://${HOSTNAME}/munin"
   add_next_step "Make sure all nodes allows its IP to connect to them."
 }
+
+## $1 nagios vendor
+function create_monitoring_server_overview()
+{
+    local file=/var/www/index.html
+    cat > $file <<EOF
+<html>
+  <body>
+    <h1>Welcome to the might monitoring server @ ${HOSTNAME}</h1>
+    <ul>
+EOF
+    if [[ $1 == $MONITORING_VENDOR_NAGIOS ]]; then
+        echo '<li><a href="/nagios3">Nagios</a></li>' \
+            else
+        echo '<li><a href="/icinga">Icinga</a> (an enhanced Nagios)</li>' \
+            >> $file
+    fi
+    cat > $file <<EOF
+      <li><a href="/munin">Munin</a></li>
+    </ul>
+  </body>
+</html>
+EOF
+    add_next_step "Start page for all monitoring interfaces: http://${HOSTNAME}/"
+}
+
+function install_monitoring_server()
+{
+    local nagios_flavour=${fai_monitoring_nagios_flavour-$MONITORING_VENDOR_ICINGA}
+    install_nagios_monitoring_server $nagios_flavour
+    install_munin_gatherer
+    create_monitoring_server_overview $nagios_flavour
+}

From f5dc509453d7f18cb6f59699e43a3e49b040b2d8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 2 Mar 2012 14:03:06 +0800
Subject: [PATCH 0454/2585] - the scope gets too local when using declare -r
 (even with -x outside   a method).

---
 .../ece-scripts/ece-install.d/constants.sh    | 34 +++++++++++--------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/constants.sh b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
index c743494d..d757dad1 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
@@ -1,17 +1,23 @@
 # constants used in several/all the ece-install modules.
 
-# constants are just that, constant, this implies they're also
-# read-only.
-declare -r PROFILE_ALL_IN_ONE=1
-declare -r PROFILE_CACHE_SERVER=5
-declare -r PROFILE_DB_SERVER=4
-declare -r PROFILE_EDITORIAL_SERVER=2
-declare -r PROFILE_PRESENTATION_SERVER=3
-declare -r PROFILE_RMI_HUB=6
-declare -r PROFILE_SEARCH_SERVER=7
-declare -r PROFILE_WIDGET_FRAMEWORK=8
-declare -r PROFILE_CREATE_PUBLICATION=9
-declare -r PROFILE_MONITORING_SERVER=10
-declare -r PROFILE_RESTORE_FROM_BACKUP=11
-declare -r PROFILE_ANALYSIS_SERVER=12
+# installation profiles
+PROFILE_ALL_IN_ONE=1
+PROFILE_CACHE_SERVER=5
+PROFILE_DB_SERVER=4
+PROFILE_EDITORIAL_SERVER=2
+PROFILE_PRESENTATION_SERVER=3
+PROFILE_RMI_HUB=6
+PROFILE_SEARCH_SERVER=7
+PROFILE_WIDGET_FRAMEWORK=8
+PROFILE_CREATE_PUBLICATION=9
+PROFILE_MONITORING_SERVER=10
+PROFILE_RESTORE_FROM_BACKUP=11
+PROFILE_ANALYSIS_SERVER=12
+
+# database constants
+default_db_port=3306
+default_db_host=localhost
+default_db_user=ece5user
+default_db_password=ece5password
+default_db_schema=ece5db
 

From 61732d960e997f2245ee193a18baa1725c401615 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 2 Mar 2012 14:03:41 +0800
Subject: [PATCH 0455/2585] - moved constants to constants.sh

---
 usr/share/escenic/ece-scripts/ece-install.d/database.sh | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 95a6d6f3..dfee59bf 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -1,5 +1,6 @@
 # ece-install module for installing the database.
 
+# Setting the correct URLs for the percona releas (bootstrap) RPM package.
 percona_rpm_release_version=0.0-1
 percona_rpm_release_package_name=percona-release-${percona_rpm_release_version}
 percona_rpm_release_url=http://www.percona.com/downloads/percona-release/$percona_rpm_release_package_name.x86_64.rpm
@@ -7,12 +8,6 @@ if [[ $(uname -m) != "x86_64" ]]; then
   percona_rpm_release_url=http://www.percona.com/downloads/percona-release/$percona_rpm_release_package_name.i386.rpm
 fi
 
-default_db_port=3306
-default_db_host=localhost
-default_db_user=ece5user
-default_db_password=ece5password
-default_db_schema=ece5db
-
 ## $1: optional parameter, binaries_only. If passed, $1=binaries_only,
 ##     the ECE DB schema is not set up. 
 function install_database_server()

From 4db69df78b77e5ca32a50f9ca953a74d71ec8597 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 2 Mar 2012 14:36:24 +0800
Subject: [PATCH 0456/2585] - added webservice to the default deployment list
 for editorial servers.

---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index a20a5653..600528db 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -12,7 +12,7 @@ function get_deploy_white_list()
   elif [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ]; then
     white_list="${white_list} "$(get_publication_short_name_list)
   elif [ $install_profile_number -eq $PROFILE_EDITORIAL_SERVER ]; then
-    white_list="${white_list} escenic studio indexer-webservice"
+    white_list="${white_list} escenic studio indexer-webservice webservice"
     white_list="${white_list} "$(get_publication_short_name_list)
   fi
 

From be0be180759f406b9b8209273bddc93e4431b565 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 2 Mar 2012 14:41:58 +0800
Subject: [PATCH 0457/2585] - moved profile=publication to its own module -
 moved profile=web server to its own module

---
 usr/sbin/ece-install                          | 133 ------------------
 .../ece-install.d/create-publication.sh       |  79 +++++++++++
 .../ece-scripts/ece-install.d/web-server.sh   |  85 +++++++++++
 3 files changed, 164 insertions(+), 133 deletions(-)
 create mode 100644 usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
 create mode 100644 usr/share/escenic/ece-scripts/ece-install.d/web-server.sh

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index c8833d89..8c6ed3f3 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -1355,17 +1355,6 @@ function assemble_deploy_and_restart_type()
     exit_on_error "su - $ece_user -c \"$ece_command\""
 }
 
-function ensure_that_instance_is_running()
-{
-    ece_command="ece -i $1 -t $type status"
-    if [ $(su - $ece_user -c "$ece_command" | grep UP | wc -l) -lt 1 ]; then
-        ece_command="ece -i $1 -t $type start"
-        su - $ece_user -c "$ece_command" 1>>$log 2>>$log
-        # TODO improve this by adding a timed while loop
-        sleep 60
-    fi
-}
-
 # If the system is installed using the recommended paths, the method
 # will return a list of the instances configured in
 # ${escenic_conf_dir}/engine/instance
@@ -1380,42 +1369,6 @@ function get_instance_list()
     echo $instance_list
 }
 
-function create_publication()
-{
-    if [ ! -e $escenic_root_dir/engine -o \
-        ! -e $escenic_root_dir/assemblytool ]; then
-        print_and_log "Please install ECE and an assembly environment before"
-        print_and_log "running this installation profile again."
-        remove_pid_and_exit_in_error
-    fi
-
-    print_and_log "Getting ready to create a new publication ..."
-    create_publication_definition_and_war
-
-    local instance_list=$(get_instance_list)
-    local default_instance=$(echo ${instance_list} | cut -d' ' -f1)
-
-    if [ $fai_enabled -eq 0 ]; then
-        print "Which ECE instance do you wish to use to create it?"
-        print "These instances are available: $instance_list"
-        echo -n "Your choice [$default_instance]> "
-        read instance_name
-    else
-        instance_name=$(get_conf_value fai_publication_use_instance)
-    fi
-
-    if [ -z "$instance_name" ]; then
-        instance_name=$default_instance
-    fi
-
-    type=engine
-    ensure_that_instance_is_running $instance_name
-    create_publication_in_db $publication_war
-    assemble_deploy_and_restart_type
-
-    add_next_step "A new publication $publication_name has been created."
-}
-
 function install_editorial_server()
 {
     print_and_log "Installing an editorial server on $HOSTNAME ..."
@@ -1491,92 +1444,6 @@ function install_all_in_one_environment()
     create_publication
 }
 
-# parameters:
-# $1 - what kind of webserver. Available options are:
-#      * 0 - cache server
-#      * 1 - monitoring server
-#      * 2 - both cache & monitoring server
-function install_web_server()
-{
-    print_and_log "Installing a web server on $HOSTNAME ..."
-
-    if [ $on_debian_or_derivative -eq 1 ]; then
-        packages="nginx"
-        install_packages_if_missing $packages
-    else
-        debug "Web server installation not supported on your system."
-        return
-    fi
-    
-    file=/etc/nginx/sites-available/default
-    # in some very unusual cases, this file will not exist (can occur
-    # when re-running ece-install several times).
-    if [ -e $file ]; then
-        run mv $file $file.orig
-    fi
-
-    if [ $1 -eq 0 ]; then
-        port=81
-        cat > $file <<EOF
-server {
-  listen ${port} default;
-  access_log  /var/log/nginx/localhost.access.log;
-
-  # Typical endpoint for Adactus/Mobilize to get the videos to
-  # transcode.
-  location /binary {
-    root $escenic_data_dir;
-    index index.html;
-  }
-}
-EOF
-    elif [ $1 -eq 1 ]; then
-        port=80
-        cat > $file <<EOF
-server {
-  listen ${port} default;
-  access_log  /var/log/nginx/localhost.access.log;
-
-  location / {
-    root /var/cache/munin/www;
-    index index.html;
-  }
-}
-EOF
-    elif [ $1 -eq 3 ]; then
-        port=81
-        cat > $file <<EOF
-server {
-  listen ${port} default;
-  access_log  /var/log/nginx/localhost.access.log;
-
-  location / {
-    root /var/cache/munin/www;
-    index index.html;
-  }
-
-  # Typical endpoint for Adactus/Mobilize to get the videos to
-  # transcode.
-  location /binary {
-    root $escenic_data_dir;
-    index index.html;
-  }
-}
-EOF
-    fi
-    
-    run /etc/init.d/nginx restart
-
-    if [ $1 -eq 0 ]; then
-        add_next_step "http://${HOSTNAME}:${port}/binary gives the Adactus endpoint"
-    elif [ $1 -eq 1 ]; then
-        add_next_step "http://${HOSTNAME}:${port}/ gives the Munin interface"
-    elif [ $1 -eq 2 ]; then
-        add_next_step "http://${HOSTNAME}:${port}/       gives the Munin interface"
-        add_next_step "http://${HOSTNAME}:${port}/binary gives the Adactus endpoint"
-    fi
-}
-
 function add_server_to_runlevels()
 {
   # no need to add init.d scripts to the runlevel(s) for these
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
new file mode 100644
index 00000000..07798835
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
@@ -0,0 +1,79 @@
+function create_publication()
+{
+  if [ ! -e $escenic_root_dir/engine -o \
+    ! -e $escenic_root_dir/assemblytool ]; then
+    print_and_log "Please install ECE and an assembly environment before"
+    print_and_log "running this installation profile again."
+    remove_pid_and_exit_in_error
+  fi
+
+  print_and_log "Getting ready to create a new publication ..."
+  create_publication_definition_and_war
+
+  instance_list=$(get_instance_list)
+  default_instance=$(echo ${instance_list} | cut -d' ' -f1)
+
+  if [ $fai_enabled -eq 0 ]; then
+    print "Which ECE instance do you wish to use to create it?"
+    print "These instances are available: $instance_list"
+    echo -n "Your choice [$default_instance]> "
+    read instance_name
+  else
+    instance_name=$(get_conf_value fai_publication_use_instance)
+  fi
+
+  if [ -z "$instance_name" ]; then
+    instance_name=$default_instance
+  fi
+
+  type=engine
+  ensure_that_instance_is_running $instance_name
+  create_publication_in_db $publication_war
+  add_publication_to_deployment_lists
+  assemble_deploy_and_restart_type
+
+  add_next_step "A new publication $publication_name has been created."
+}
+
+## $1 : publication name
+function add_publication_to_deployment_lists() {
+  if [ $fai_enabled -eq 0 ]; then
+    print "On which ECE instances do you wish to deploy $publication_name"
+    print "These instances are available: $instance_list"
+    echo -n "Your choice [$default_instance]> "
+    read update_instance_list
+  else
+    update_instance_list=${fai_publication_instance_list-${default_instance}}
+  fi
+
+  if [ -z $update_instance_list ]; then
+    update_instance_list=$default_instance
+  fi
+
+  for el in $update_instance_list; do
+    print "Adding $publication_name to instance ${el}'s deployment list ..."
+    local file=$escenic_conf_dir/ece-${el}.conf
+    if [ -e $file ]; then
+      # don't want to source it as it'll pollute the variable name
+      # space.
+      local existing_value=$(
+        grep deploy_webapp_white_list $file | cut -d'=' -f2 | sed 's#"##g'
+      )
+      set_conf_file_value \
+        deploy_webapp_white_list \
+        $publication_name $existing_value \
+        $file
+    fi
+  done
+}
+
+function ensure_that_instance_is_running()
+{
+  local ece_command="ece -i $1 -t $type status"
+  if [ $(su - $ece_user -c "$ece_command" | grep UP | wc -l) -lt 1 ]; then
+    ece_command="ece -i $1 -t $type start"
+    su - $ece_user -c "$ece_command" 1>>$log 2>>$log
+    # TODO improve this by adding a timed while loop
+    sleep 60
+  fi
+}
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/web-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/web-server.sh
new file mode 100644
index 00000000..c42de569
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece-install.d/web-server.sh
@@ -0,0 +1,85 @@
+# parameters:
+# $1 - what kind of webserver. Available options are:
+#      * 0 - cache server
+#      * 1 - monitoring server
+#      * 2 - both cache & monitoring server
+function install_web_server()
+{
+  print_and_log "Installing a web server on $HOSTNAME ..."
+
+  if [ $on_debian_or_derivative -eq 1 ]; then
+    packages="nginx"
+    install_packages_if_missing $packages
+  else
+    debug "Web server installation not supported on your system."
+    return
+  fi
+  
+  file=/etc/nginx/sites-available/default
+    # in some very unusual cases, this file will not exist (can occur
+    # when re-running ece-install several times).
+  if [ -e $file ]; then
+    run mv $file $file.orig
+  fi
+
+  if [ $1 -eq 0 ]; then
+    port=81
+    cat > $file <<EOF
+server {
+  listen ${port} default;
+  access_log  /var/log/nginx/localhost.access.log;
+
+  # Typical endpoint for Adactus/Mobilize to get the videos to
+  # transcode.
+  location /binary {
+    root $escenic_data_dir;
+    index index.html;
+  }
+}
+EOF
+  elif [ $1 -eq 1 ]; then
+    port=80
+    cat > $file <<EOF
+server {
+  listen ${port} default;
+  access_log  /var/log/nginx/localhost.access.log;
+
+  location / {
+    root /var/cache/munin/www;
+    index index.html;
+  }
+}
+EOF
+  elif [ $1 -eq 3 ]; then
+    port=81
+    cat > $file <<EOF
+server {
+  listen ${port} default;
+  access_log  /var/log/nginx/localhost.access.log;
+
+  location / {
+    root /var/cache/munin/www;
+    index index.html;
+  }
+
+  # Typical endpoint for Adactus/Mobilize to get the videos to
+  # transcode.
+  location /binary {
+    root $escenic_data_dir;
+    index index.html;
+  }
+}
+EOF
+  fi
+  
+  run /etc/init.d/nginx restart
+
+  if [ $1 -eq 0 ]; then
+    add_next_step "http://${HOSTNAME}:${port}/binary gives the Adactus endpoint"
+  elif [ $1 -eq 1 ]; then
+    add_next_step "http://${HOSTNAME}:${port}/ gives the Munin interface"
+  elif [ $1 -eq 2 ]; then
+    add_next_step "http://${HOSTNAME}:${port}/       gives the Munin interface"
+    add_next_step "http://${HOSTNAME}:${port}/binary gives the Adactus endpoint"
+  fi
+}

From 8dfb2567c6131eebda3ddb8dd4ce2e772d99917f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 2 Mar 2012 15:04:18 +0800
Subject: [PATCH 0458/2585] - moved content engine / Nursery specific set up
 code into its own   module - moved more publication and monitoring methods
 into the designated modules   for these tasks.

---
 usr/sbin/ece-install                          | 511 ------------------
 .../ece-install.d/content-engine.sh           | 399 +++++++++++++-
 .../ece-install.d/create-publication.sh       |  88 ++-
 .../ece-scripts/ece-install.d/monitoring.sh   |  67 ++-
 4 files changed, 526 insertions(+), 539 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 8c6ed3f3..a62dfb23 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -282,154 +282,6 @@ function set_up_assembly_tool() {
 # </pulse-methods>
 ######################################################################
 
-function set_up_assembly_tool()
-{
-    log "Setting up the Assembly Tool ..."
-    
-    make_dir $escenic_root_dir/assemblytool/
-    cd $escenic_root_dir/assemblytool/
-    
-    if [ -e $download_dir/assemblytool*zip ]; then
-        run unzip -q -u $download_dir/assemblytool*zip
-    fi
-
-    # adding an instance layer to the Nursery configuration
-    cp -r $escenic_root_dir/engine/siteconfig/bootstrap-skeleton \
-        $escenic_root_dir/assemblytool/conf
-    cd $escenic_root_dir/assemblytool/conf/
-    cp -r layers/host layers/instance
-    cat > layers/instance/Files.properties <<EOF
-\$class=neo.nursery.FileSystemDepot
-fileSystemRoot = $escenic_conf_dir/engine/instance/\${com.escenic.instance}/
-EOF
-    echo "" >> Nursery.properties
-    echo "layer.06 = /layers/instance/Layer" >> Nursery.properties
-
-    # fixing the path to the Nursery configuration according to
-    # escenic_conf_dir which may have been overridden by the user.
-    for el in $(find $escenic_root_dir/assemblytool/conf -name Files.properties)
-    do
-        sed -i "s#/etc/escenic#${escenic_conf_dir}#g" $el
-    done
-    
-    # set up which plugins to use
-    cd $escenic_root_dir/assemblytool/
-    make_dir plugins
-    cd plugins
-    find ../../ -maxdepth 1 -type d | \
-        grep -v assemblytool | \
-        while read directory; do
-        if [ $directory = "../../" -o \
-            $(echo $directory | grep widget-framework | wc -l) -gt 0 ]; then
-            continue
-        fi
-        
-        # nuisance to get the community engine and analysis engine,
-        # but not the engine
-        if [ $(echo $directory | \
-            grep engine | \
-            grep -v community | \
-            grep -v analysis | \
-            wc -l) -gt 0 ]; then
-            continue
-        fi
-
-        make_ln $directory
-    done
-
-    run cd $escenic_root_dir/assemblytool/
-    run ant -q initialize
-    sed -i "s~#\ engine.root\ =\ \.~engine.root=${escenic_root_dir}/engine~g" \
-        assemble.properties \
-        1>>$log 2>>$log
-    exit_on_error "sed on assemble.properties"
-    
-    sed -i "s~\#\# plugins\ =\ /path/to/plugins~plugins=${escenic_root_dir}/assemblytool/plugins~g" \
-        assemble.properties \
-        1>>$log 2>>$log
-    exit_on_error "sed on assemble.properties"
-
-    make_dir $escenic_root_dir/assemblytool/publications
-
-    # set up user publication definitions
-    if [ -n "${fai_publication_war_uri_list}" ]; then
-        run cd $escenic_root_dir/assemblytool/publications
-        
-        for el in ${fai_publication_war_uri_list}; do
-            if [[ $el == http* ]]; then
-                run wget $wget_opts $el
-            elif [[ $el == file://* ]]; then
-                local file_with_path=$(echo $el | sed "s#file://##g")
-                run cp $file_with_path .
-            else
-                run cp ${el} .
-            fi
-            
-            if [ ! -e $(basename $el) ]; then
-                print_and_log "Failed to get user publication $el."
-                print_and_log "I will skip it and continue to the next one."
-                continue
-            fi
-
-            local short_name=$(basename $el .war)
-            cat > ${short_name}.properties <<EOF
-name: ${short_name}
-source-war: ${short_name}.war
-context-root: ${short_name}
-EOF
-        done
-    fi
-}
-
-function set_up_engine_and_plugins()
-{
-    if [ $ece_software_setup_completed -eq 1 ]; then
-        return
-    fi
-    
-    log "Setting up the Escenic Content Engine & its plugins ..."
-
-    make_dir $escenic_root_dir
-    cd $escenic_root_dir/
-
-    for el in $technet_download_list; do
-        if [ $(basename $el | \
-            grep -E "^engine-[0-9]|^engine-trunk-SNAPSHOT|^engine-dist" | \
-            wc -l) -gt 0 ]; then
-            engine_dir=$(get_base_dir_from_bundle $download_dir/$(basename $el))
-            engine_file=$(basename $el)
-        fi
-    done
-    
-    if [ ! -d "${engine_dir}" ]; then
-        run unzip -q -u $download_dir/${engine_file}
-        if [ -h engine ]; then
-            run rm engine
-        fi
-        
-        run ln -s ${engine_dir} engine
-    else
-        debug "${engine_dir} is already there, skipping to next step."
-    fi
-
-    # we now extract all the plugins. We extract them in $escenic_root_dir
-    # as we want to re-use them between minor updates of ECE.
-    cd $escenic_root_dir/
-    for el in $download_dir/*.zip; do
-        if [ $(basename $el | grep ^engine-.*.zip | wc -l) -gt 0 ]; then
-            continue
-        elif [ $(basename $el | grep ^assemblytool-.*.zip | wc -l) -gt 0 ]; then
-            continue
-        elif [ $(basename $el | grep ^jdk-.*.zip | wc -l) -gt 0 ]; then
-            continue
-        fi
-        
-        run unzip -q -u $el
-    done
-
-    ece_software_setup_completed=1
-}
-
 function set_up_ece_scripts()
 {
   print_and_log 'Setting up the ece UNIX scripts ...'
@@ -486,170 +338,6 @@ function set_up_ece_scripts()
   run sed -i "s#/opt/escenic#${escenic_root_dir}#g" /etc/bash_completion.d/ece
 }
 
-function set_up_basic_nursery_configuration()
-{
-    print_and_log "Setting up basic Nursery configuration ..."
-
-    # we always copy the default plugin configuration (even if there
-    # is an archive)
-    for el in $escenic_root_dir/assemblytool/plugins/*; do
-        if [ ! -d $el/misc/siteconfig/ ]; then
-            continue
-        fi
-        run cp -r $el/misc/siteconfig/* $common_nursery_dir/
-    done
-
-    # Then we see if we're using configuration archives, if yes, use
-    # the JAAS and Nursery configuraiton from here.
-    if [ $(is_using_conf_archive) -eq 1 ]; then
-        print_and_log "Using the supplied Nursery & JAAS configuration from" 
-        print_and_log "bundle: $ece_instance_conf_archive"
-        local a_tmp_dir=$(mktemp -d)
-        
-        if [ ! -d ${a_tmp_dir}/engine/security ]; then
-            print "Archive $ece_instance_conf_archive doesn't have JAAS config,"
-            print "I'll use standard JAAS (engine/security) instead."
-            run cp -r $escenic_root_dir/engine/security/ $common_nursery_dir/
-        fi
-        
-        run cd $a_tmp_dir
-        run tar xzf $ece_instance_conf_archive
-        run cp -r engine/siteconfig/config-skeleton/* $common_nursery_dir/
-    else
-        run cp -r $escenic_root_dir/engine/siteconfig/config-skeleton/* \
-            $common_nursery_dir/
-        run cp -r $escenic_root_dir/engine/security/ $common_nursery_dir/
-    fi
-
-    if [ -n "${a_tmp_dir}" ]; then
-        run rm -rf ${a_tmp_dir}
-    fi
-    
-    public_host_name=$HOSTNAME:${appserver_port}
-    if [ $fai_enabled -eq 1 ]; then
-        if [ -n "$fai_public_host_name" ]; then
-            public_host_name=$fai_public_host_name
-        fi
-    else
-        print "What is the public address of your website?"
-        print "Press ENTER to use the default ($public_host_name)"
-        echo -n "Your choice [$public_host_name]> "
-        read user_host_name
-    fi
-
-    if [ -n "$user_host_name" ]; then
-        public_host_name=$user_host_name
-    fi
-    
-    cat > $common_nursery_dir/ServerConfig.properties <<EOF
-databaseProductName=MySQL
-filePublicationRoot=$escenic_data_dir/engine/
-webPublicationRoot=http://${public_host_name}/
-
-# These two LDAP settings can be ignored on systems with ECE >= 5.3
-ldapProductName=OpenLdap
-ldapProductVersion=2.2.26
-EOF
-    cat > $common_nursery_dir/neo/io/managers/ContentManager.properties <<EOF
-readConnector=/connector/ReadConnector
-updateConnector=/connector/UpdateConnector
-EOF
-
-    file=$common_nursery_dir/com/escenic/community/CommunityEngine.properties
-    if [ -w ${file} ]; then
-        sed -i 's/jdbc\/ecome/jdbc\/ECE_UPDATE_DS/g' $file
-        exit_on_error "sed on $file"
-    elif [ ! -e ${file} ]; then
-        print_and_log "I Could not find an ECOME configuration file,"
-        print_and_log "I assume you have not installed Community Engine."
-    else
-        print_and_log "Could not write to ${file},"
-        print_and_log "Community Engine might not work because of this. "
-        remove_pid_and_exit_in_error
-    fi
-
-    file=$common_nursery_dir/com/escenic/webstart/StudioConfig.properties
-    cat >> $file <<EOF
-
-# We set this to get around a missing feature in Varnish, see:
-# https://www.varnish-cache.org/trac/wiki/Future_Feature#Chunkedencodingclientrequests
-# For Escenic-ites, see: VF-3480
-property.com.escenic.client.chunked=false
-EOF
-}
-
-function set_up_instance_specific_nursery_configuration()
-{
-  print_and_log "Setting up instance specific Nursery configuration ..."
-  
-  for el in $escenic_conf_dir/engine/instance/*; do
-    i=$(( i + 1 ))
-    if [ $(basename $el) = $instance_name ]; then
-      rmi_port="8${i}23"
-      run echo "port=$rmi_port" > $el/RMI.properties
-    fi
-  done
-
-  nursery_context=neo/io/managers/HubConnectionManager.properties
-  file=$escenic_conf_dir/engine/instance/$instance_name/$nursery_context
-  make_dir $(dirname $file)
-  
-    # we don't touch it if the file already exists.
-  if [ ! -e $file ]; then
-    run echo "hostname=$HOSTNAME" >> $file
-  fi
-}
-
-function set_up_proper_logging_configuration()
-{
-    print_and_log "Setting up proper log4j & Java logging configuration ..."
-    
-    cat > $common_nursery_dir/trace.properties <<EOF
-log4j.rootLogger=ERROR, ECELOG
-log4j.appender.ECELOG=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.ECELOG.File=$escenic_log_dir/\${escenic.server}-messages
-log4j.appender.ECELOG.layout=org.apache.log4j.PatternLayout
-log4j.appender.ECELOG.layout.ConversionPattern=%d %5p [%t] %x (%c) %m%n
-EOF
-    cd $tomcat_base/lib/
-    make_ln $common_nursery_dir/trace.properties
-    run ln -sf trace.properties log4j.properies
-
-    # since the solr webapp otherwise will pollute our logs, we ask
-    # Tomcat specifically to make it log to dedicated logger.
-    if [ $install_profile_number -eq $PROFILE_SEARCH_SERVER -o \
-        $install_profile_number -eq $PROFILE_ALL_IN_ONE ]; then
-        cat > $tomcat_base/conf/logging.properties <<EOF
-handlers = 1catalina.org.apache.juli.FileHandler, 2localhost.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler, 6localhost.org.apache.juli.FileHandler
-
-.handlers = 1catalina.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
-
-1catalina.org.apache.juli.FileHandler.level = FINE
-1catalina.org.apache.juli.FileHandler.directory = \$\{catalina.base\}/logs
-1catalina.org.apache.juli.FileHandler.prefix = catalina.
-
-2localhost.org.apache.juli.FileHandler.level = FINE
-2localhost.org.apache.juli.FileHandler.directory = \$\{catalina.base\}/logs
-2localhost.org.apache.juli.FileHandler.prefix = localhost.
-
-java.util.logging.ConsoleHandler.level = FINE
-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
-
-6localhost.org.apache.juli.FileHandler.level = FINE
-6localhost.org.apache.juli.FileHandler.directory = $escenic_log_dir
-6localhost.org.apache.juli.FileHandler.prefix = solr.
-
-org.apache.solr.level=INFO
-org.apache.solr.handlers=6localhost.org.apache.juli.FileHandler
-
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.FileHandler
-EOF
-    else
-        run cp $tomcat_home/conf/logging.properties $tomcat_base/conf
-    fi
-}
-
 # don't quote values when setting conf file values with
 # set_conf_file_value. This is a hack-ish variable due to EAE's
 # handling of .cfg files.
@@ -667,87 +355,6 @@ function set_ece_instance_conf()
     set_conf_file_value $1 $2 $instance_conf_file
 }
 
-# Installs third party packages needed by the ECE (i.e. Java related).
-# Also see install_common_os_packages for packages common to all
-# servers in the architecture.
-function install_ece_third_party_packages
-{
-    run_hook install_ece_third_party_packages.preinst
-    print_and_log "Installing 3rd party packages needed by $type instances"
-    
-    if [ $on_debian_or_derivative -eq 1 ]; then
-        if [ $on_ubuntu -eq 1 ]; then
-            # Sun Java was removed in Ubuntu in 11.10 and later also
-            # from LTS 10.04, hence Hardy is the last one with these
-            # packges now (2012-02-20 11:22)
-            local version_needs_local_java_deb=1004
-            local version=$(lsb_release -s -r | sed "s#\.##g")
-            
-            add_apt_source \
-                "deb http://archive.canonical.com/ $(lsb_release -s -c) partner"
-        elif [ $on_debian -eq 1 ]; then
-            code_name=$(lsb_release -s -c)
-            has_non_free=$(grep $(lsb_release -s -c) \
-                /etc/apt/sources.list | \
-                egrep -v "^#|deb-src" | \
-                grep -v security | \
-                grep non-free | \
-                wc -l)
-            if [ $has_non_free -eq 0 ]; then
-                add_apt_source "deb http://ftp.${mirror_country_suffix}.debian.org/debian/ $(lsb_release -s -c) contrib non-free"
-            fi
-
-            # Sun Java will be removed in the next Debian stable,
-            # wheezy (either 6.1 or 7.0 not announced yet, current in
-            # squeeze/6.0, hence setting 6.1 here).
-            local version_needs_local_java_deb=610
-            local version=$(lsb_release -s -r | sed "s#\.##g")
-        fi
-        
-        if [ $version -ge $version_needs_local_java_deb -a \
-            $(has_sun_java_installed) -eq 0 ]; then
-            create_java_deb_packages_and_repo
-        fi
-        
-        echo "sun-java6-jdk shared/accepted-sun-dlj-v1-1 boolean true" | \
-            debconf-set-selections
-
-        # install sun-java6-jdk first so that ant doesn't pull down OpenJDK
-        local packages="sun-java6-jdk"
-        install_packages_if_missing $packages
-
-        packages="
-          ant
-          ant-contrib
-          ant-optional
-          libapr1
-          libtcnative-1
-          libmysql-java
-          memcached
-          wget"
-    elif [ $on_redhat_or_derivative -eq 1 ]; then
-      packages="
-        ant
-        ant-contrib
-        ant-nodeps
-        apr
-        memcached
-        mysql-connector-java
-        wget
-      "
-
-      # TODO no tomcat APR wrappers in official repositories
-      
-      install_sun_java_on_redhat
-    fi
-    
-    install_packages_if_missing $packages
-    
-    for el in ant java; do
-        assert_pre_requisite $el
-    done
-}
-
 # $1 the domain
 #
 # The method will ensure that the passed domain is resolvable by the
@@ -851,89 +458,6 @@ function print_status_and_next_steps()
     print "-$(red Vizrt) Online"
 }
 
-# Based on Erik Mogensen's work:
-# //depot/branches/personal/mogsie/fromscratch/create-publication.sh
-function create_publication_in_db()
-{
-    print_and_log "Creating ${publication_name} using $instance_name ..."
-
-    ece_admin_uri=http://$HOSTNAME:${appserver_port}/escenic-admin
-    
-    cookie=$(curl ${curl_opts} -I ${ece_admin_uri}/ | \
-        grep -i "^Set-Cookie" | \
-        sed s/.*'JSESSIONID=\([^;]*\).*'/'\1'/)
-
-    if [ "$cookie" == "" ] ; then
-        print_and_log "Unable to get a session cookie."
-        remove_pid_and_exit_in_error;
-    fi
-
-    run curl ${curl_opts} \
-        -F "type=webapp" \
-        -F "resourceFile=@${1}" \
-        --cookie JSESSIONID="$cookie" \
-        "${ece_admin_uri}/do/publication/resource"
-    
-    run curl ${curl_opts}  \
-        -F "name=${publication_name}" \
-        -F "publisherName=Escenic" \
-        -F "adminPassword=${publication_name}" \
-        -F "adminPasswordConfirm=${publication_name}" \
-        --cookie JSESSIONID="$cookie" \
-        "${ece_admin_uri}/do/publication/insert"
-}
-
-function create_publication_definition_and_war()
-{
-    publication_name=mypub
-
-    if [ $fai_enabled -eq 0 ]; then
-        print "What name do you wish to give your publication?"
-        print "Press ENTER to accept ${publication_name}"
-        echo -n "Your choice [${publication_name}]> "
-        read publication_name
-    else
-        publication_name=$(get_conf_value fai_publication_name)
-    fi
-
-    if [ -z "$publication_name" ]; then
-        publication_name=mypub
-    fi
-
-    print_and_log "Setting up the ${publication_name} publication ..."
-    make_dir $escenic_root_dir/assemblytool/publications/
-    run cd $escenic_root_dir/assemblytool/publications/
-    cat > $escenic_root_dir/assemblytool/publications/${publication_name}.properties <<EOF
-name: ${publication_name}
-source-war: ${publication_name}.war
-context-root: ${publication_name}
-EOF
-
-    publication_war=$escenic_root_dir/assemblytool/publications/${publication_name}.war
-    if [[ $fai_enabled -eq 1 && -n "${fai_publication_war}" ]]; then
-      print_and_log "Basing ${publication_name}.war on the one specified in $conf_file"
-      run cp ${fai_publication_war} ${publication_war}
-    elif [ -d $escenic_root_dir/widget-framework-core-* ]; then
-      print_and_log "Basing ${publication_name}.war on Widget Framework Demo ..."
-      run cd $escenic_root_dir/widget-framework-core-*/publications/demo-core
-      assert_pre_requisite mvn
-      run mvn $maven_opts package
-      run cp target/demo-core-*.war ${publication_war}
-    else
-      print_and_log "Basing your ${publication_name}.war on ECE/demo-clean ..."
-      run cp $escenic_root_dir/engine/contrib/wars/demo-clean.war ${publication_war}
-    fi
-
-    # TODO add support for the community widgets
-    #
-    # 1 - add the core widgets to the
-    # publications/demo-community/pom.xml
-    # 
-    # 2 - add the <ui:group name="core-widgets"/> definition for core
-    # widgets in:
-    # publications/demo-community/src/main/webapp/META-INF/escenic/publication-resources/escenic/content-type
-}
-
 function check_for_required_downloads()
 {
   if [ $ece_software_setup_completed -eq 1 ]; then
@@ -1467,41 +991,6 @@ function add_server_to_runlevels()
   fi
 }
 
-## $1 configuration file name
-## $2 host group name
-## $3 host group alias
-## $4..n host group members
-function set_up_monitoring_host_group()
-{
-    local file=$1
-    local host_group_name=$2
-    local host_group_alias=$3
-    # the remainding arguments passed to the methods is the member
-    # list members
-    local host_group_member_list=${@:4:$(( $# - 3 ))}
-
-    if [ $(grep "hostgroup_name $host_group_name" $file | wc -l) -gt 0 ]; then
-        print "Icinga group member" \
-            $host_group_name \
-            "already defined, skipping it."
-        return
-    fi
-    
-    cat >> $file <<EOF
-define hostgroup {
-  hostgroup_name $host_group_name
-  alias $host_group_alias
-EOF
-    echo -n "  members" >> $file
-    for el in $host_group_member_list; do
-        echo -n " ${el}," >> $file
-    done
-    cat >> $file <<EOF
-
-}
-EOF
-}
-
 function common_post_install() {
   if [ $install_profile_number -eq $PROFILE_ALL_IN_ONE -o \
     $install_profile_number -eq $PROFILE_PRESENTATION_SERVER -o \
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 600528db..55192434 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -1,7 +1,6 @@
 # ece-install module Content Engine specific code.
 
-function get_deploy_white_list()
-{
+function get_deploy_white_list() {
   local white_list="escenic-admin"
   
   if [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER \
@@ -19,8 +18,7 @@ function get_deploy_white_list()
   echo ${white_list}
 }
 
-function get_publication_short_name_list()
-{
+function get_publication_short_name_list() {
   local short_name_list=""
   
   local publication_def_dir=${escenic_root_dir}/assemblytool/publications
@@ -38,8 +36,7 @@ function get_publication_short_name_list()
 }
 
 ## $1=<default instance name>
-function install_ece_instance()
-{
+function install_ece_instance() {
   install_ece_third_party_packages
   
   ask_for_instance_name $1
@@ -48,8 +45,8 @@ function install_ece_instance()
 
   set_archive_files_depending_on_profile
   
-    # most likely, the user is _not_ installing from archives (EAR +
-    # configuration bundle), hence the false test goes first.
+  # most likely, the user is _not_ installing from archives (EAR +
+  # configuration bundle), hence the false test goes first.
   if [ $(is_installing_from_ear) -eq 0 ]; then
     download_escenic_components
     check_for_required_downloads
@@ -97,3 +94,389 @@ function install_ece_instance()
   add_next_step "/etc/default/ece lists all instances started at boot time"
 }
 
+function set_up_engine_and_plugins() {
+  if [ $ece_software_setup_completed -eq 1 ]; then
+    return
+  fi
+  
+  log "Setting up the Escenic Content Engine & its plugins ..."
+
+  make_dir $escenic_root_dir
+  cd $escenic_root_dir/
+
+  for el in $technet_download_list; do
+    if [ $(basename $el | \
+      grep -E "^engine-[0-9]|^engine-trunk-SNAPSHOT|^engine-dist" | \
+      wc -l) -gt 0 ]; then
+      engine_dir=$(get_base_dir_from_bundle $download_dir/$(basename $el))
+      engine_file=$(basename $el)
+    fi
+  done
+  
+  if [ ! -d "${engine_dir}" ]; then
+    run unzip -q -u $download_dir/${engine_file}
+    if [ -h engine ]; then
+      run rm engine
+    fi
+    
+    run ln -s ${engine_dir} engine
+  else
+    debug "${engine_dir} is already there, skipping to next step."
+  fi
+
+    # we now extract all the plugins. We extract them in $escenic_root_dir
+    # as we want to re-use them between minor updates of ECE.
+  cd $escenic_root_dir/
+  for el in $download_dir/*.zip; do
+    if [ $(basename $el | grep ^engine-.*.zip | wc -l) -gt 0 ]; then
+      continue
+    elif [ $(basename $el | grep ^assemblytool-.*.zip | wc -l) -gt 0 ]; then
+      continue
+    elif [ $(basename $el | grep ^jdk-.*.zip | wc -l) -gt 0 ]; then
+      continue
+    fi
+    
+    run unzip -q -u $el
+  done
+
+  ece_software_setup_completed=1
+}
+
+function set_up_assembly_tool() {
+  log "Setting up the Assembly Tool ..."
+  
+  make_dir $escenic_root_dir/assemblytool/
+  cd $escenic_root_dir/assemblytool/
+  
+  if [ -e $download_dir/assemblytool*zip ]; then
+    run unzip -q -u $download_dir/assemblytool*zip
+  fi
+
+    # adding an instance layer to the Nursery configuration
+  cp -r $escenic_root_dir/engine/siteconfig/bootstrap-skeleton \
+    $escenic_root_dir/assemblytool/conf
+  cd $escenic_root_dir/assemblytool/conf/
+  cp -r layers/host layers/instance
+  cat > layers/instance/Files.properties <<EOF
+\$class=neo.nursery.FileSystemDepot
+fileSystemRoot = $escenic_conf_dir/engine/instance/\${com.escenic.instance}/
+EOF
+  echo "" >> Nursery.properties
+  echo "layer.06 = /layers/instance/Layer" >> Nursery.properties
+
+    # fixing the path to the Nursery configuration according to
+    # escenic_conf_dir which may have been overridden by the user.
+  for el in $(find $escenic_root_dir/assemblytool/conf -name Files.properties)
+  do
+    sed -i "s#/etc/escenic#${escenic_conf_dir}#g" $el
+  done
+  
+    # set up which plugins to use
+  cd $escenic_root_dir/assemblytool/
+  make_dir plugins
+  cd plugins
+  find ../../ -maxdepth 1 -type d | \
+    grep -v assemblytool | \
+    while read directory; do
+    if [ $directory = "../../" -o \
+      $(echo $directory | grep widget-framework | wc -l) -gt 0 ]; then
+      continue
+    fi
+    
+        # nuisance to get the community engine and analysis engine,
+        # but not the engine
+    if [ $(echo $directory | \
+      grep engine | \
+      grep -v community | \
+      grep -v analysis | \
+      wc -l) -gt 0 ]; then
+      continue
+    fi
+
+    make_ln $directory
+  done
+
+  run cd $escenic_root_dir/assemblytool/
+  run ant -q initialize
+  sed -i "s~#\ engine.root\ =\ \.~engine.root=${escenic_root_dir}/engine~g" \
+    assemble.properties \
+    1>>$log 2>>$log
+  exit_on_error "sed on assemble.properties"
+  
+  sed -i "s~\#\# plugins\ =\ /path/to/plugins~plugins=${escenic_root_dir}/assemblytool/plugins~g" \
+    assemble.properties \
+    1>>$log 2>>$log
+  exit_on_error "sed on assemble.properties"
+
+  make_dir $escenic_root_dir/assemblytool/publications
+
+    # set up user publication definitions
+  if [ -n "${fai_publication_war_uri_list}" ]; then
+    run cd $escenic_root_dir/assemblytool/publications
+    
+    for el in ${fai_publication_war_uri_list}; do
+      if [[ $el == http* ]]; then
+        run wget $wget_opts $el
+      elif [[ $el == file://* ]]; then
+        local file_with_path=$(echo $el | sed "s#file://##g")
+        run cp $file_with_path .
+      else
+        run cp ${el} .
+      fi
+      
+      if [ ! -e $(basename $el) ]; then
+        print_and_log "Failed to get user publication $el."
+        print_and_log "I will skip it and continue to the next one."
+        continue
+      fi
+
+      local short_name=$(basename $el .war)
+      cat > ${short_name}.properties <<EOF
+name: ${short_name}
+source-war: ${short_name}.war
+context-root: ${short_name}
+EOF
+    done
+  fi
+}
+
+function set_up_basic_nursery_configuration() {
+  print_and_log "Setting up basic Nursery configuration ..."
+
+    # we always copy the default plugin configuration (even if there
+    # is an archive)
+  for el in $escenic_root_dir/assemblytool/plugins/*; do
+    if [ ! -d $el/misc/siteconfig/ ]; then
+      continue
+    fi
+    run cp -r $el/misc/siteconfig/* $common_nursery_dir/
+  done
+
+    # Then we see if we're using configuration archives, if yes, use
+    # the JAAS and Nursery configuraiton from here.
+  if [ $(is_using_conf_archive) -eq 1 ]; then
+    print_and_log "Using the supplied Nursery & JAAS configuration from" 
+    print_and_log "bundle: $ece_instance_conf_archive"
+    local a_tmp_dir=$(mktemp -d)
+    
+    if [ ! -d ${a_tmp_dir}/engine/security ]; then
+      print "Archive $ece_instance_conf_archive doesn't have JAAS config,"
+      print "I'll use standard JAAS (engine/security) instead."
+      run cp -r $escenic_root_dir/engine/security/ $common_nursery_dir/
+    fi
+    
+    run cd $a_tmp_dir
+    run tar xzf $ece_instance_conf_archive
+    run cp -r engine/siteconfig/config-skeleton/* $common_nursery_dir/
+  else
+    run cp -r $escenic_root_dir/engine/siteconfig/config-skeleton/* \
+      $common_nursery_dir/
+    run cp -r $escenic_root_dir/engine/security/ $common_nursery_dir/
+  fi
+
+  if [ -n "${a_tmp_dir}" ]; then
+    run rm -rf ${a_tmp_dir}
+  fi
+  
+  public_host_name=$HOSTNAME:${appserver_port}
+  if [ $fai_enabled -eq 1 ]; then
+    if [ -n "$fai_public_host_name" ]; then
+      public_host_name=$fai_public_host_name
+    fi
+  else
+    print "What is the public address of your website?"
+    print "Press ENTER to use the default ($public_host_name)"
+    echo -n "Your choice [$public_host_name]> "
+    read user_host_name
+  fi
+
+  if [ -n "$user_host_name" ]; then
+    public_host_name=$user_host_name
+  fi
+  
+  cat > $common_nursery_dir/ServerConfig.properties <<EOF
+databaseProductName=MySQL
+filePublicationRoot=$escenic_data_dir/engine/
+webPublicationRoot=http://${public_host_name}/
+
+# These two LDAP settings can be ignored on systems with ECE >= 5.3
+ldapProductName=OpenLdap
+ldapProductVersion=2.2.26
+EOF
+  cat > $common_nursery_dir/neo/io/managers/ContentManager.properties <<EOF
+readConnector=/connector/ReadConnector
+updateConnector=/connector/UpdateConnector
+EOF
+
+  file=$common_nursery_dir/com/escenic/community/CommunityEngine.properties
+  if [ -w ${file} ]; then
+    sed -i 's/jdbc\/ecome/jdbc\/ECE_UPDATE_DS/g' $file
+    exit_on_error "sed on $file"
+  elif [ ! -e ${file} ]; then
+    print_and_log "I Could not find an ECOME configuration file,"
+    print_and_log "I assume you have not installed Community Engine."
+  else
+    print_and_log "Could not write to ${file},"
+    print_and_log "Community Engine might not work because of this. "
+    remove_pid_and_exit_in_error
+  fi
+
+  file=$common_nursery_dir/com/escenic/webstart/StudioConfig.properties
+  cat >> $file <<EOF
+
+# We set this to get around a missing feature in Varnish, see:
+# https://www.varnish-cache.org/trac/wiki/Future_Feature#Chunkedencodingclientrequests
+# For Escenic-ites, see: VF-3480
+property.com.escenic.client.chunked=false
+EOF
+}
+
+function set_up_instance_specific_nursery_configuration() {
+  print_and_log "Setting up instance specific Nursery configuration ..."
+  
+  for el in $escenic_conf_dir/engine/instance/*; do
+    i=$(( i + 1 ))
+    if [ $(basename $el) = $instance_name ]; then
+      rmi_port="8${i}23"
+      run echo "port=$rmi_port" > $el/RMI.properties
+    fi
+  done
+
+  nursery_context=neo/io/managers/HubConnectionManager.properties
+  file=$escenic_conf_dir/engine/instance/$instance_name/$nursery_context
+  make_dir $(dirname $file)
+  
+    # we don't touch it if the file already exists.
+  if [ ! -e $file ]; then
+    run echo "hostname=$HOSTNAME" >> $file
+  fi
+}
+
+function set_up_proper_logging_configuration() {
+  print_and_log "Setting up proper log4j & Java logging configuration ..."
+  
+  cat > $common_nursery_dir/trace.properties <<EOF
+log4j.rootLogger=ERROR, ECELOG
+log4j.appender.ECELOG=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.ECELOG.File=$escenic_log_dir/\${escenic.server}-messages
+log4j.appender.ECELOG.layout=org.apache.log4j.PatternLayout
+log4j.appender.ECELOG.layout.ConversionPattern=%d %5p [%t] %x (%c) %m%n
+EOF
+  cd $tomcat_base/lib/
+  make_ln $common_nursery_dir/trace.properties
+  run ln -sf trace.properties log4j.properies
+
+    # since the solr webapp otherwise will pollute our logs, we ask
+    # Tomcat specifically to make it log to dedicated logger.
+  if [ $install_profile_number -eq $PROFILE_SEARCH_SERVER -o \
+    $install_profile_number -eq $PROFILE_ALL_IN_ONE ]; then
+    cat > $tomcat_base/conf/logging.properties <<EOF
+handlers = 1catalina.org.apache.juli.FileHandler, 2localhost.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler, 6localhost.org.apache.juli.FileHandler
+
+.handlers = 1catalina.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
+
+1catalina.org.apache.juli.FileHandler.level = FINE
+1catalina.org.apache.juli.FileHandler.directory = \$\{catalina.base\}/logs
+1catalina.org.apache.juli.FileHandler.prefix = catalina.
+
+2localhost.org.apache.juli.FileHandler.level = FINE
+2localhost.org.apache.juli.FileHandler.directory = \$\{catalina.base\}/logs
+2localhost.org.apache.juli.FileHandler.prefix = localhost.
+
+java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
+
+6localhost.org.apache.juli.FileHandler.level = FINE
+6localhost.org.apache.juli.FileHandler.directory = $escenic_log_dir
+6localhost.org.apache.juli.FileHandler.prefix = solr.
+
+org.apache.solr.level=INFO
+org.apache.solr.handlers=6localhost.org.apache.juli.FileHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.FileHandler
+EOF
+  else
+    run cp $tomcat_home/conf/logging.properties $tomcat_base/conf
+  fi
+}
+
+# Installs third party packages needed by the ECE (i.e. Java related).
+# Also see install_common_os_packages for packages common to all
+# servers in the architecture.
+function install_ece_third_party_packages
+{
+  run_hook install_ece_third_party_packages.preinst
+  print_and_log "Installing 3rd party packages needed by $type instances"
+  
+  if [ $on_debian_or_derivative -eq 1 ]; then
+    if [ $on_ubuntu -eq 1 ]; then
+            # Sun Java was removed in Ubuntu in 11.10 and later also
+            # from LTS 10.04, hence Hardy is the last one with these
+            # packges now (2012-02-20 11:22)
+      local version_needs_local_java_deb=1004
+      local version=$(lsb_release -s -r | sed "s#\.##g")
+      
+      add_apt_source \
+        "deb http://archive.canonical.com/ $(lsb_release -s -c) partner"
+    elif [ $on_debian -eq 1 ]; then
+      code_name=$(lsb_release -s -c)
+      has_non_free=$(grep $(lsb_release -s -c) \
+        /etc/apt/sources.list | \
+        egrep -v "^#|deb-src" | \
+        grep -v security | \
+        grep non-free | \
+        wc -l)
+      if [ $has_non_free -eq 0 ]; then
+        add_apt_source "deb http://ftp.${mirror_country_suffix}.debian.org/debian/ $(lsb_release -s -c) contrib non-free"
+      fi
+
+      # Sun Java will be removed in the next Debian stable,
+      # wheezy (either 6.1 or 7.0 not announced yet, current in
+      # squeeze/6.0, hence setting 6.1 here).
+      local version_needs_local_java_deb=610
+      local version=$(lsb_release -s -r | sed "s#\.##g")
+    fi
+    
+    if [ $version -ge $version_needs_local_java_deb -a \
+      $(has_sun_java_installed) -eq 0 ]; then
+      create_java_deb_packages_and_repo
+    fi
+    
+    echo "sun-java6-jdk shared/accepted-sun-dlj-v1-1 boolean true" | \
+      debconf-set-selections
+
+        # install sun-java6-jdk first so that ant doesn't pull down OpenJDK
+    local packages="sun-java6-jdk"
+    install_packages_if_missing $packages
+
+    packages="
+          ant
+          ant-contrib
+          ant-optional
+          libapr1
+          libtcnative-1
+          libmysql-java
+          memcached
+          wget"
+  elif [ $on_redhat_or_derivative -eq 1 ]; then
+    packages="
+        ant
+        ant-contrib
+        ant-nodeps
+        apr
+        memcached
+        mysql-connector-java
+        wget
+    "
+
+    # TODO no tomcat APR wrappers in official repositories
+    install_sun_java_on_redhat
+  fi
+  
+  install_packages_if_missing $packages
+  
+  for el in ant java; do
+    assert_pre_requisite $el
+  done
+}
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
index 07798835..3a7a5729 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
@@ -1,5 +1,4 @@
-function create_publication()
-{
+function create_publication() {
   if [ ! -e $escenic_root_dir/engine -o \
     ! -e $escenic_root_dir/assemblytool ]; then
     print_and_log "Please install ECE and an assembly environment before"
@@ -67,8 +66,7 @@ function add_publication_to_deployment_lists() {
   done
 }
 
-function ensure_that_instance_is_running()
-{
+function ensure_that_instance_is_running() {
   local ece_command="ece -i $1 -t $type status"
   if [ $(su - $ece_user -c "$ece_command" | grep UP | wc -l) -lt 1 ]; then
     ece_command="ece -i $1 -t $type start"
@@ -77,3 +75,85 @@ function ensure_that_instance_is_running()
     sleep 60
   fi
 }
+
+# Based on Erik Mogensen's work:
+# //depot/branches/personal/mogsie/fromscratch/create-publication.sh
+function create_publication_in_db() {
+  print_and_log "Creating ${publication_name} using $instance_name ..."
+
+  ece_admin_uri=http://$HOSTNAME:${appserver_port}/escenic-admin
+  
+  cookie=$(curl ${curl_opts} -I ${ece_admin_uri}/ | \
+    grep -i "^Set-Cookie" | \
+    sed s/.*'JSESSIONID=\([^;]*\).*'/'\1'/)
+
+  if [ "$cookie" == "" ] ; then
+    print_and_log "Unable to get a session cookie."
+    remove_pid_and_exit_in_error;
+  fi
+
+  run curl ${curl_opts} \
+    -F "type=webapp" \
+    -F "resourceFile=@${1}" \
+    --cookie JSESSIONID="$cookie" \
+    "${ece_admin_uri}/do/publication/resource"
+  
+  run curl ${curl_opts}  \
+    -F "name=${publication_name}" \
+    -F "publisherName=Escenic" \
+    -F "adminPassword=${publication_name}" \
+    -F "adminPasswordConfirm=${publication_name}" \
+    --cookie JSESSIONID="$cookie" \
+    "${ece_admin_uri}/do/publication/insert"
+}
+
+function create_publication_definition_and_war()
+{
+  publication_name=mypub
+
+  if [ $fai_enabled -eq 0 ]; then
+    print "What name do you wish to give your publication?"
+    print "Press ENTER to accept ${publication_name}"
+    echo -n "Your choice [${publication_name}]> "
+    read publication_name
+  else
+    publication_name=$(get_conf_value fai_publication_name)
+  fi
+
+  if [ -z "$publication_name" ]; then
+    publication_name=mypub
+  fi
+
+  print_and_log "Setting up the ${publication_name} publication ..."
+  make_dir $escenic_root_dir/assemblytool/publications/
+  run cd $escenic_root_dir/assemblytool/publications/
+  cat > $escenic_root_dir/assemblytool/publications/${publication_name}.properties <<EOF
+name: ${publication_name}
+source-war: ${publication_name}.war
+context-root: ${publication_name}
+EOF
+
+  publication_war=$escenic_root_dir/assemblytool/publications/${publication_name}.war
+  if [[ $fai_enabled -eq 1 && -n "${fai_publication_war}" ]]; then
+    print_and_log "Basing ${publication_name}.war on the one specified in $conf_file"
+    run cp ${fai_publication_war} ${publication_war}
+  elif [ -d $escenic_root_dir/widget-framework-core-* ]; then
+    print_and_log "Basing ${publication_name}.war on Widget Framework Demo ..."
+    run cd $escenic_root_dir/widget-framework-core-*/publications/demo-core
+    assert_pre_requisite mvn
+    run mvn $maven_opts package
+    run cp target/demo-core-*.war ${publication_war}
+  else
+    print_and_log "Basing your ${publication_name}.war on ECE/demo-clean ..."
+    run cp $escenic_root_dir/engine/contrib/wars/demo-clean.war ${publication_war}
+  fi
+
+    # TODO add support for the community widgets
+    #
+    # 1 - add the core widgets to the
+    # publications/demo-community/pom.xml
+    # 
+    # 2 - add the <ui:group name="core-widgets"/> definition for core
+    # widgets in:
+    # publications/demo-community/src/main/webapp/META-INF/escenic/publication-resources/escenic/content-type
+}
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index 6b545ddd..69919fa0 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -268,10 +268,10 @@ function install_munin_gatherer()
     print_and_log "Adding ${el} to the Munin gatherer on ${HOSTNAME} ..."
     local file=/etc/munin/munin-conf.d/escenic.conf
     cat >> $file <<EOF
-[${el}]
+    [${el}]
     address $(get_ip $el)
     use_node_name yes
-EOF
+    EOF
   done
 
     # TODO add the priveleged network to the Allowed stanza (i.e. the
@@ -295,32 +295,67 @@ EOF
 ## $1 nagios vendor
 function create_monitoring_server_overview()
 {
-    local file=/var/www/index.html
-    cat > $file <<EOF
+  local file=/var/www/index.html
+  cat > $file <<EOF
 <html>
   <body>
     <h1>Welcome to the might monitoring server @ ${HOSTNAME}</h1>
     <ul>
 EOF
-    if [[ $1 == $MONITORING_VENDOR_NAGIOS ]]; then
-        echo '<li><a href="/nagios3">Nagios</a></li>' \
-            else
-        echo '<li><a href="/icinga">Icinga</a> (an enhanced Nagios)</li>' \
-            >> $file
-    fi
-    cat > $file <<EOF
+  if [[ $1 == $MONITORING_VENDOR_NAGIOS ]]; then
+    echo '<li><a href="/nagios3">Nagios</a></li>' \
+      else
+    echo '<li><a href="/icinga">Icinga</a> (an enhanced Nagios)</li>' \
+      >> $file
+  fi
+  cat > $file <<EOF
       <li><a href="/munin">Munin</a></li>
     </ul>
   </body>
 </html>
 EOF
-    add_next_step "Start page for all monitoring interfaces: http://${HOSTNAME}/"
+  add_next_step "Start page for all monitoring interfaces: http://${HOSTNAME}/"
 }
 
 function install_monitoring_server()
 {
-    local nagios_flavour=${fai_monitoring_nagios_flavour-$MONITORING_VENDOR_ICINGA}
-    install_nagios_monitoring_server $nagios_flavour
-    install_munin_gatherer
-    create_monitoring_server_overview $nagios_flavour
+  local nagios_flavour=${fai_monitoring_nagios_flavour-$MONITORING_VENDOR_ICINGA}
+  install_nagios_monitoring_server $nagios_flavour
+  install_munin_gatherer
+  create_monitoring_server_overview $nagios_flavour
+}
+
+## $1 configuration file name
+## $2 host group name
+## $3 host group alias
+## $4..n host group members
+function set_up_monitoring_host_group()
+{
+  local file=$1
+  local host_group_name=$2
+  local host_group_alias=$3
+    # the remainding arguments passed to the methods is the member
+    # list members
+  local host_group_member_list=${@:4:$(( $# - 3 ))}
+
+  if [ $(grep "hostgroup_name $host_group_name" $file | wc -l) -gt 0 ]; then
+    print "Icinga group member" \
+      $host_group_name \
+      "already defined, skipping it."
+    return
+  fi
+  
+  cat >> $file <<EOF
+define hostgroup {
+  hostgroup_name $host_group_name
+  alias $host_group_alias
+EOF
+  echo -n "  members" >> $file
+  for el in $host_group_member_list; do
+    echo -n " ${el}," >> $file
+  done
+  cat >> $file <<EOF
+
+}
+EOF
 }

From 60fcc65db377f9412e83bb72bee80a234a2ecd9f Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Fri, 2 Mar 2012 14:33:15 +0100
Subject: [PATCH 0459/2585] Fixed syntax error

---
 usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index 69919fa0..00a4a6d3 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -271,7 +271,7 @@ function install_munin_gatherer()
     [${el}]
     address $(get_ip $el)
     use_node_name yes
-    EOF
+EOF
   done
 
     # TODO add the priveleged network to the Allowed stanza (i.e. the

From 622d2880fe995b7d54a3f89fe34a16fdc31891a7 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Fri, 2 Mar 2012 14:55:47 +0100
Subject: [PATCH 0460/2585] Made wait-for-ssh postinstall hook emit more
 information and wait for cloud-init to complete, rather than just an apt-get
 install to complete.

---
 .../vizrt/vosa/post-install-hooks/wait-for-ssh.sh    | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/usr/share/vizrt/vosa/post-install-hooks/wait-for-ssh.sh b/usr/share/vizrt/vosa/post-install-hooks/wait-for-ssh.sh
index 7f293685..2d530097 100755
--- a/usr/share/vizrt/vosa/post-install-hooks/wait-for-ssh.sh
+++ b/usr/share/vizrt/vosa/post-install-hooks/wait-for-ssh.sh
@@ -1,15 +1,23 @@
 #!/bin/bash
 
+echo -n "Waiting for ssh access..."
 for a in $(seq 1 90) ; do
+  echo -n .
   ssh -q -F $2/ssh.conf root@guest id > /dev/null
   if [ $? == 0 ] ; then
     pid=1
+    echo
+    echo -n "Waiting for cloud-init to complete"
     # Wait for existing apt-gets to complete.
-    while [ ! -z "$pid" ] ;
+    # TODO: drop the boot confi
+    while [ "$pid" != 0 ] ;
     do
-      pid=$(ssh -F $2/ssh.conf root@guest pidof apt-get)
+      echo -n .
+      ssh -q -F $2/ssh.conf root@guest ls /var/lib/cloud/instances/nocloud/boot-finished > /dev/null 2>&1
+      pid=$?
       sleep 1;
     done
+    echo
     exit 0
   fi
   sleep 1;

From d0bc7ebe5d9c42147506b4f134441c10165608dd Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 5 Mar 2012 13:45:57 +0800
Subject: [PATCH 0461/2585] - added new features to "ece info". The command now
 lists all the   Escenic JNDI resources, the DB handles as well as the log
 files used   by the given ECE instance.

  $ ece -i  dev1 info
[ece#engine-dev1] Current instance: dev1
[ece#engine-dev1] Instances available on quanah: dev1 memento web1
[ece#engine-dev1] Conf files parsed: /etc/escenic/ece-dev1.conf /etc/escenic/ece.conf
[ece#engine-dev1] ECE location: /opt/escenic/engine
[ece#engine-dev1] Assembly Tool location: /opt/escenic/assemblytool
[ece#engine-dev1] Java location: /usr/lib/jvm/java-6-sun
[ece#engine-dev1] Application server:
[ece#engine-dev1] |-> Status: UP 0d 1h 9m 31s
[ece#engine-dev1] |-> Port: 8080
[ece#engine-dev1] |-> PID: 16883
[ece#engine-dev1] |-> Type: tomcat
[ece#engine-dev1] |-> Tomcat home: /opt/tomcat
[ece#engine-dev1] |-> Tomcat base: /opt/tomcat-dev1
[ece#engine-dev1] Application server resources:
[ece#engine-dev1] |-> escenic/indexer-webservice: http://localhost:9980/indexer-webservice/index/
[ece#engine-dev1] |-> escenic/index-update-uri: http://quanah:8080/solr/update/
[ece#engine-dev1] |-> escenic/solr-base-uri: http://quanah:8080/solr/
[ece#engine-dev1] |-> escenic/head-tail-storage-file: /var/lib/escenic/engine/head-tail.index
[ece#engine-dev1] |-> escenic/failing-documents-storage-file: /var/lib/escenic/engine/failures.index
[ece#engine-dev1] Database:
[ece#engine-dev1] |-> name: jdbc/ECE_READ_DS
[ece#engine-dev1] |-> url: jdbc:mysql://localhost:3306/ece5db?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;characterSetResults=UTF-8
[ece#engine-dev1] |-> username: mementouser
[ece#engine-dev1] |-> name: jdbc/ECE_UPDATE_DS
[ece#engine-dev1] |-> url: jdbc:mysql://localhost:3306/ece5db?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;characterSetResults=UTF-8
[ece#engine-dev1] |-> username: mementouser
[ece#engine-dev1] Log files:
[ece#engine-dev1] |-> System out log: /var/log/escenic/engine-dev1.out
[ece#engine-dev1] |-> App server log: /opt/tomcat-dev1/logs/localhost.2012-03-05.log
[ece#engine-dev1] |-> Log4j log: /var/log/escenic/quanah-dev1-messages

   Pre-requisite is that the user has xml_grep installed. On Debian,
   this is available in the xml-twig-tools package.
---
 usr/bin/ece | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/usr/bin/ece b/usr/bin/ece
index 5dbd0549..4f8c759c 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -990,6 +990,7 @@ function get_info_for_type()
                 if [ -n "${tomcat_home}" ]; then
                     print "|-> Tomcat home:" $tomcat_home
                     print "|-> Tomcat base:" $tomcat_base
+                    print_tomcat_resources
                 fi
             ;;
             resin)
@@ -999,6 +1000,51 @@ function get_info_for_type()
                 ;;
         esac
     fi
+
+    print "Log files:"
+    print "|-> System out log:" $log_file
+    print "|-> App server log:" $(get_app_log)
+    print "|-> Log4j log:     " $(get_log4j_log)
+}
+
+function print_tomcat_resources() {
+  if [ "$(which xml_grep)x" == "x" ]; then
+    log "Install xml_grep to get more 'ece info' details"
+    return
+  fi
+
+  print "Application server resources:"
+
+  xml_grep  --nowrap --cond Context/Environment \
+    $tomcat_base/conf/context.xml | \
+    sed 's/^[ \t]//g' | \
+    sed "s#><#>\n<#g" | \
+    cut -d' ' -f2,5 |  \
+    cut -d'"' -f2,4 | \
+    while read line ; do
+    local key=$(echo $line | cut -d'"' -f1)
+    local value=$(echo $line | cut -d'"' -f2)
+    print "|->" ${key}: ${value}
+  done
+   
+  print "Database:"
+  xml_grep \
+    --nowrap \
+    --cond 'Server/GlobalNamingResources/Resource[@type="javax.sql.DataSource"]' \
+    $tomcat_base/conf/server.xml | \
+    sed 's/^[ \t]//g' | \
+    sed "s#><#>\n<#g" | \
+    while read line ; do
+    for el in $(echo $line | cut -d' ' -f1- ); do
+      if [[ $el == "name"* || $el == "url"* || $el == "username"* ]]; then
+        local key=$(echo $el | cut -d'"' -f1 | cut -d'=' -f1)
+        local value=$(echo $el | cut -d'"' -f2)
+        print "|->" ${key}: ${value}
+      fi
+
+    done
+  done
+  
 }
 
 function restart_type()

From 5c8806c04c5fceb13baee231b1abe6a7fac0137f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 5 Mar 2012 14:06:05 +0800
Subject: [PATCH 0462/2585] - moved the log files up in the "ece info" output

---
 usr/bin/ece | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 4f8c759c..6f637cd2 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -976,6 +976,12 @@ function get_info_for_type()
     if [ -n "${java_home}" ]; then
         print "Java location: $java_home"
     fi
+    
+    print "Log files:"
+    print "|-> System out log:" $log_file
+    print "|-> App server log:" $(get_app_log)
+    print "|-> Log4j log:     " $(get_log4j_log)
+    
     if [ -n "${appserver}" ]; then
         print "Application server:"
         set_type_port
@@ -1000,11 +1006,6 @@ function get_info_for_type()
                 ;;
         esac
     fi
-
-    print "Log files:"
-    print "|-> System out log:" $log_file
-    print "|-> App server log:" $(get_app_log)
-    print "|-> Log4j log:     " $(get_log4j_log)
 }
 
 function print_tomcat_resources() {

From e5b36e28a71a0c00ca6f6fe079c33a0d919ce629 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 6 Mar 2012 13:37:22 +0800
Subject: [PATCH 0463/2585] - fixed bug in pulse method for function
 set_up_assembly_tool, it was   using the actual method name instead of the _p
 access point.

---
 usr/sbin/ece-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index a62dfb23..0dc0256b 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -273,7 +273,7 @@ function install_ece_third_party_packages_p() {
   show_pulse $! "Installing 3rd party packages needed by ECE"
 }
 
-function set_up_assembly_tool() {
+function set_up_assembly_tool_p() {
   $(set_up_assembly_tool) &
   show_pulse $! "Setting up the Assembly Tool"
 }

From 7ff91c35179926fddd3dd514ad460fa2c537eed7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 6 Mar 2012 13:40:40 +0800
Subject: [PATCH 0464/2585] - speed & size improvement: the analysis profile
 now doesn't require   the technet download list to include ECE and  
 AssemblyTool and will now happily install EAE without access to ECE   & AT.

  This closes issue #42

- ece-install will also no longer set up a deployment white list for
  the analysis profile

- added more run wrappers to set_up_assembly_tool to ensure fail fast
  (as possible) and consistent error reporting.
---
 .../ece-install.d/content-engine.sh           | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 55192434..bc71ea22 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -51,22 +51,28 @@ function install_ece_instance() {
     download_escenic_components
     check_for_required_downloads
     set_up_engine_and_plugins
-    set_up_assembly_tool
+
+    if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER ]; then
+      set_up_assembly_tool
+    fi
   else
     verify_that_files_exist_and_are_readable \
       $ece_instance_ear_file \
       $ece_instance_conf_archive
   fi
-  
-  set_up_basic_nursery_configuration
-  set_up_instance_specific_nursery_configuration
+
+  if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER ]; then
+    set_up_basic_nursery_configuration
+    set_up_instance_specific_nursery_configuration
+  fi
   
   set_up_app_server
   set_up_proper_logging_configuration
 
     # We set a WAR white list for all profiles except all in one
-  if [ $install_profile_number -ne $PROFILE_ALL_IN_ONE ]; then
-    file=$escenic_conf_dir/ece-${instance_name}.conf
+  if [ $install_profile_number -ne $PROFILE_ALL_IN_ONE -a \
+    $install_profile_number -ne $PROFILE_ANALYSIS_SERVER ]; then
+    local file=$escenic_conf_dir/ece-${instance_name}.conf
     print_and_log "Creating deployment white list in $file ..."
     set_conf_file_value \
       deploy_webapp_white_list \
@@ -113,7 +119,7 @@ function set_up_engine_and_plugins() {
     fi
   done
   
-  if [ ! -d "${engine_dir}" ]; then
+  if [ -n "$engine_dir" -a ! -d "${engine_dir}" ]; then
     run unzip -q -u $download_dir/${engine_file}
     if [ -h engine ]; then
       run rm engine
@@ -124,8 +130,8 @@ function set_up_engine_and_plugins() {
     debug "${engine_dir} is already there, skipping to next step."
   fi
 
-    # we now extract all the plugins. We extract them in $escenic_root_dir
-    # as we want to re-use them between minor updates of ECE.
+  # we now extract all the plugins. We extract them in $escenic_root_dir
+  # as we want to re-use them between minor updates of ECE.
   cd $escenic_root_dir/
   for el in $download_dir/*.zip; do
     if [ $(basename $el | grep ^engine-.*.zip | wc -l) -gt 0 ]; then
@@ -153,10 +159,10 @@ function set_up_assembly_tool() {
   fi
 
     # adding an instance layer to the Nursery configuration
-  cp -r $escenic_root_dir/engine/siteconfig/bootstrap-skeleton \
+  run cp -r $escenic_root_dir/engine/siteconfig/bootstrap-skeleton \
     $escenic_root_dir/assemblytool/conf
-  cd $escenic_root_dir/assemblytool/conf/
-  cp -r layers/host layers/instance
+  run cd $escenic_root_dir/assemblytool/conf/
+  run cp -r layers/host layers/instance
   cat > layers/instance/Files.properties <<EOF
 \$class=neo.nursery.FileSystemDepot
 fileSystemRoot = $escenic_conf_dir/engine/instance/\${com.escenic.instance}/

From 657d902b968a42da51269926c345cb1c4d01df7a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 6 Mar 2012 14:23:44 +0800
Subject: [PATCH 0465/2585] - in create_publication: don't set/introduce the
 deployment white list   for profile=all.

---
 .../ece-scripts/ece-install.d/create-publication.sh        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
index 3a7a5729..368e1799 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
@@ -28,7 +28,12 @@ function create_publication() {
   type=engine
   ensure_that_instance_is_running $instance_name
   create_publication_in_db $publication_war
-  add_publication_to_deployment_lists
+
+  # don't set/introduce the deployment white list for profile=all
+  if [ $install_profile_number -ne $PROFILE_ALL_IN_ONE ]; then
+    add_publication_to_deployment_lists
+  fi
+  
   assemble_deploy_and_restart_type
 
   add_next_step "A new publication $publication_name has been created."

From ac9e2f0910968fd062b070c1f3986968f1b539a8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 6 Mar 2012 16:11:29 +0800
Subject: [PATCH 0466/2585] - added local scope to
 print_status_and_next_steps's local variables.

---
 usr/sbin/ece-install | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 0dc0256b..0321724c 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -426,15 +426,15 @@ function set_correct_permissions()
 
 function print_status_and_next_steps()
 {
-    now=`date +%s`
-    started=`stat -c %Y $pid_file`
-    seconds=$(( now - started ))
-    days=$(( seconds / ( 60 * 60 * 24 ) ))
-    seconds_left=$(( seconds - ( $days * 60 * 60 * 24 ) ))
-    hours=$(( seconds_left / ( 60 * 60 ) ))
-    seconds_left=$(( seconds_left - ( $hours * 60 * 60 ) ))
-    minutes=$(( seconds_left / 60 ))
-    seconds_left=$(( seconds_left - $minutes * 60 ))
+    local now=`date +%s`
+    local started=`stat -c %Y $pid_file`
+    local seconds=$(( now - started ))
+    local days=$(( seconds / ( 60 * 60 * 24 ) ))
+    local seconds_left=$(( seconds - ( $days * 60 * 60 * 24 ) ))
+    local hours=$(( seconds_left / ( 60 * 60 ) ))
+    local seconds_left=$(( seconds_left - ( $hours * 60 * 60 ) ))
+    local minutes=$(( seconds_left / 60 ))
+    local seconds_left=$(( seconds_left - $minutes * 60 ))
 
     if [ $install_profile_number -ne $PROFILE_RESTORE_FROM_BACKUP ]; then
         s="The installation is now $(green complete)!"

From d2559624fcb98cac8a3089d58ddd97e5466cf5d8 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Tue, 6 Mar 2012 10:51:09 +0100
Subject: [PATCH 0467/2585] Reverted 7ebf804fb18dd6db90f22d13ceae0b3a62545789
 since the problem was with CPU sharing

---
 usr/share/vizrt/vosa/commands/boot.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/vizrt/vosa/commands/boot.sh b/usr/share/vizrt/vosa/commands/boot.sh
index 689c724a..5d799057 100755
--- a/usr/share/vizrt/vosa/commands/boot.sh
+++ b/usr/share/vizrt/vosa/commands/boot.sh
@@ -201,7 +201,7 @@ function boot_kvm() {
   -balloon "virtio"
   -drive "file=${img},if=virtio,cache=none"
   -kernel ${kernel}
-  -net "nic,model=rtl8139,macaddr=${install_config_macaddr}"
+  -net "nic,model=virtio,macaddr=${install_config_macaddr}"
   -net "tap,ifname=$tapinterface,script=no,downscript=no")
   
 # http://dwdwwebcache.googleusercontent.com/search?q=cache:mEAjcA2zHosJ:kerneltrap.org/mailarchive/linux-kvm/2010/1/26/6257297/thread+qemu-kvm+acpi+shutdown&cd=1&hl=no&ct=clnk&gl=no

From e44bfc3c16763601bca179f216bfdd2e0a0a575d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 6 Mar 2012 19:21:11 +0800
Subject: [PATCH 0468/2585] - new feature: first version of the VIP provider
 profile

  For instance, 192.168.1.108 and 192.168.1.109 are to provide the VIP
  192.168.1.200 for NFS and .108 is the master.

  .108 is then installed with:

  fai_vip_address=192.168.1.200
  fai_vip_interface=eth0
  fai_vip_sibling_ip=192.168.1.109
  fai_vip_service_list="nfs-kernel-server"
  fai_vip_primary_node_name="nfs1"
  fai_vip_primary_node_ip="192.168.1.108"
  fai_vip_secondary_node_name="nfs2"
  fai_vip_secondary_node_ip="192.168.1.109"

  # optional
  fai_vip_log=/var/log/ha.log

  and .109 is then installed with:

  fai_vip_address=192.168.1.200
  fai_vip_interface=eth0
  fai_vip_sibling_ip=192.168.1.108
  fai_vip_service_list="nfs-kernel-server"
  fai_vip_primary_node_name="nfs1"
  fai_vip_primary_node_ip="192.168.1.108"
  fai_vip_secondary_node_name="nfs2"
  fai_vip_secondary_node_ip="192.168.1.109"

  TODO: test & bug hunt. Find out how to best configure custom
  services, probably scripts in ha.d for "our" VIP services, such as
  search-website-vip, search-editor-vip, content-studio-vip
---
 .../ece-scripts/ece-install.d/vip-provier.sh  | 125 ++++++++++++++++++
 1 file changed, 125 insertions(+)
 create mode 100644 usr/share/escenic/ece-scripts/ece-install.d/vip-provier.sh

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/vip-provier.sh b/usr/share/escenic/ece-scripts/ece-install.d/vip-provier.sh
new file mode 100644
index 00000000..a1663109
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece-install.d/vip-provier.sh
@@ -0,0 +1,125 @@
+function get_vip_configuration() {
+  # TODO add interactive mode if it's needed/requested
+
+  # dependant on the running ece-install process/host
+  vip_address=${fai_vip_address}
+  vip_interface=${fai_vip_interface}
+  vip_log_file=${fai_vip_log-/var/log/ha-debug}
+  vip_sibling_ip=${fai_vip_sibling_ip}
+  vip_service_list=${fai_vip_service_list}
+
+  # common to both VIP nodes, node names must be what $(uname -n)
+  # returns.
+  vip_primary_node_name=${fai_vip_primary_node_name}
+  vip_primary_node_ip=${fai_vip_primary_node_ip}
+  vip_secondary_node_name=${fai_vip_secondary_node_name}
+  vip_secondary_node_ip=${fai_vip_secondary_node_ip}
+}
+
+function install_vip_provider() {
+  install_packages_if_missing heartbeat
+  set_kernel_vip_parameters
+  create_ha_auth_keys
+  set_up_ha_conf
+  set_up_ha_resources
+  propagate_ha_settings
+
+  run /etc/init.d/heartbeat restart
+  
+  add_next_step "Heartbeat installed on $HOSTNAME to provide VIP $vip"
+  add_next_step "be sure that $node2_name gets similar setup as $HOSTNAME."
+}
+
+function set_kernel_vip_parameters() {
+  local file=/etc/sysctl.conf
+
+  if [ $(grep "net.ipv4.ip_nonlocal_bind=1" $file | wc -l) -gt 0 ]; then
+    return
+  fi
+  
+  cat >> $file <<EOF
+# needed to bind to VIP, added by $(basename $0) @ $(date)
+net.ipv4.ip_nonlocal_bind=1
+EOF
+
+  print "Re-loading $(uname -s) kernel configuration ..."
+  run sysctl -p
+
+  # TODO
+  # print "Making sure the kernel parameters are loaded at boot time"
+}
+
+function propagate_ha_settings() {
+  run /usr/share/heartbeat/ha_propagate
+}
+
+function set_up_ha_resources() {
+  local file=/etc/ha.d/haresources
+  
+  cat > $file <<EOF
+# <primary node> <virtual IP (VIP)>
+$vip_primary_node_name $vip_address $vip_service_list
+EOF
+}
+
+function assure_vip_hosts_are_resolvable() {
+  local keep_off_etc_hosts=${fai_keep_off_etc_hosts-0}
+  if [ $keep_off_etc_hosts -eq 1 ]; then
+    return
+  fi
+  
+  if [ $(grep $vip_primary_node_name /etc/hosts | wc -l) -lt 1 ]; then
+    cat >> /etc/hosts <<EOF
+
+# added by $(basename $0) @ $(date)
+$vip_primary_node_name $vip_primary_node_ip
+EOF
+  fi
+  
+  if [ $(grep $vip_secondary_node_name /etc/hosts | wc -l) -lt 1 ]; then
+    cat >> /etc/hosts <<EOF
+
+# added by $(basename $0) @ $(date)
+$vip_secondary_node_name $vip_secondary_node_ip
+EOF
+  fi
+}
+
+function set_up_ha_conf() {
+  local file=/etc/ha.d/ha.cf
+  
+  cat > $file <<EOF
+###############################
+# logging
+debugfile ${vip_log_file}
+
+###############################
+# communication
+autojoin none
+udpport 694
+# the other node                                                               
+ucast $vip_interface $vip_sibling_ip
+udp $vip_interface
+
+###############################
+# thresholds
+warntime 5
+deadtime 15
+initdead 60
+keepalive 2
+
+###############################
+# nodes
+node $vip_primary_node_name
+node $vip_secondary_node_name
+EOF
+}
+
+function create_ha_auth_keys() {
+  local file=/etc/ha.d/authkeys
+
+  (echo -ne "auth 1\n1 sha1 "; \
+    dd if=/dev/urandom bs=512 count=1 | openssl md5) \
+    > $file
+  run chmod 0600 $file
+}

From 25cecfe792cb2caaa0a735ab20728bd54a17646a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 7 Mar 2012 11:22:59 +0800
Subject: [PATCH 0469/2585] - implemented installing an NFS server, issue #43

  TODO add profile hook.

- implemented  installing an NFS client, issue #44

  TODO add profile hook
---
 .../ece-install.d/network-file-system.sh      | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh b/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
new file mode 100644
index 00000000..02648d9d
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
@@ -0,0 +1,47 @@
+# module to install & configure network file systems
+
+default_nfs_export_list="/exports/multimedia"
+
+function get_nfs_configuration() {
+  nfs_export_list=${fai_nfs_export_list-$default_nfs_export_list}
+  nfs_server=${fai_nfs_server}
+}
+
+
+function install_nfs_server() {
+  print "Installing an NFS server on $HOSTNAME ..."
+  install_packages_if_missing "portmap nfs-kernel-server nfs-common"
+  get_nfs_configuration
+  
+  for el in $nfs_export_list; do
+    cat >> /etc/exports <<EOF
+$el ${nfs_allowed_network}(rw,sync)
+EOF
+
+    make_dir $el
+    run chown ${ece_user}:${ece_group} $el
+  done
+
+  run /etc/init.d/portmap restart
+  run /etc/init.d/nfs-kernel-server restart
+  run /etc/init.d/nfs-common restart
+}
+
+function install_nfs_client() {
+  print "Installing an NFS client on $HOSTNAME ..."
+  
+  install_packages_if_missing "nfs-common"
+  get_nfs_configuration
+
+  for el in $nfs_export_list; do
+    make_dir /mnt/${basename $el}
+
+    cat >> /etc/fstab <<EOF
+# added by $(basename $el) @ $(date)
+${nfs_server}:$el /mnt/$(basename $el) nfs defaults 0 0
+EOF
+
+    run mount /mnt/$(basename $el)
+  done
+  
+}

From b171282cd1b5454da9e375dba9df2f031f688773 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 7 Mar 2012 11:35:04 +0800
Subject: [PATCH 0470/2585] - added profile hooks for NFS server and client
 profiles, it should   now be possible to install these in FAI mode:

  ece-install-nfs-server.conf:
  fai_nfs_server_address=nfs1
  fai_nfs_export_list="/exports/multimedia"
  fai_nfs_allowed_client_network="172.16.230.0/255.255.255.0"

  ece-install-nfs-client.conf:
  fai_nfs_server_address=nfs1
  fai_nfs_export_list="/exports/multimedia"

  Related issues #43 & #44
---
 usr/sbin/ece-install                          | 21 +++++++++++++++++++
 .../ece-scripts/ece-install.d/constants.sh    |  3 +++
 .../ece-install.d/network-file-system.sh      |  4 ++--
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 0321724c..88be34fc 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -1124,6 +1124,24 @@ if [ $fai_enabled -eq 1 ]; then
         no_fai_profile=0
     fi
     
+    if [ $(get_boolean_conf_value fai_vip_install) -eq 1 ]; then
+      install_profile_number=$PROFILE_VIP_PROVIDER
+      install_vip_provider
+      no_fai_profile=0
+    fi
+    
+    if [ $(get_boolean_conf_value fai_nfs_server_install) -eq 1 ]; then
+      install_profile_number=$PROFILE_NFS_SERVER
+      install_nfs_server
+      no_fai_profile=0
+    fi
+    
+    if [ $(get_boolean_conf_value fai_nfs_client_install) -eq 1 ]; then
+      install_profile_number=$PROFILE_NFS_CLIENT
+      install_nfs_client
+      no_fai_profile=0
+    fi
+    
     if [ $no_fai_profile -eq 1 ]; then
         print_and_log "No install profile selected, be sure to have one of the "
         print_and_log "fai_<profile>_install=1 in your $conf_file"
@@ -1171,6 +1189,9 @@ else
         $PROFILE_RESTORE_FROM_BACKUP)
             restore_from_backup
             ;;
+        $PROFILE_VIP_PROVIDER)
+            install_vip_provider
+            ;;
         *)
             print "Invalid profile number $install_profile_number, must be 1-11"
             remove_pid_and_exit_in_error
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/constants.sh b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
index d757dad1..0000d70a 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
@@ -13,6 +13,9 @@ PROFILE_CREATE_PUBLICATION=9
 PROFILE_MONITORING_SERVER=10
 PROFILE_RESTORE_FROM_BACKUP=11
 PROFILE_ANALYSIS_SERVER=12
+PROFILE_VIP_PROVIDER=13
+PROFILE_NFS_SERVER=14
+PROFILE_NFS_CLIENT=15
 
 # database constants
 default_db_port=3306
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh b/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
index 02648d9d..5700ed47 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
@@ -4,7 +4,7 @@ default_nfs_export_list="/exports/multimedia"
 
 function get_nfs_configuration() {
   nfs_export_list=${fai_nfs_export_list-$default_nfs_export_list}
-  nfs_server=${fai_nfs_server}
+  nfs_server_address=${fai_nfs_server_address}
 }
 
 
@@ -38,7 +38,7 @@ function install_nfs_client() {
 
     cat >> /etc/fstab <<EOF
 # added by $(basename $el) @ $(date)
-${nfs_server}:$el /mnt/$(basename $el) nfs defaults 0 0
+${nfs_server_address}:$el /mnt/$(basename $el) nfs defaults 0 0
 EOF
 
     run mount /mnt/$(basename $el)

From 46dc03c9ca9cf781861e2b649898896e6c1834e2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 7 Mar 2012 11:35:32 +0800
Subject: [PATCH 0471/2585] - added
 nfs_allowed_network=${fai_nfs_allowed_client_network}.

  Issue #43
---
 .../escenic/ece-scripts/ece-install.d/network-file-system.sh   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh b/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
index 5700ed47..7094d9b5 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
@@ -5,6 +5,7 @@ default_nfs_export_list="/exports/multimedia"
 function get_nfs_configuration() {
   nfs_export_list=${fai_nfs_export_list-$default_nfs_export_list}
   nfs_server_address=${fai_nfs_server_address}
+  nfs_allowed_network=${fai_nfs_allowed_client_network}
 }
 
 
@@ -15,7 +16,7 @@ function install_nfs_server() {
   
   for el in $nfs_export_list; do
     cat >> /etc/exports <<EOF
-$el ${nfs_allowed_network}(rw,sync)
+$el ${nfs_allowed_client_network}(rw,sync)
 EOF
 
     make_dir $el

From d014e4c0acf84db6c65ba956eb9ed5b1e23e1096 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 7 Mar 2012 12:16:58 +0800
Subject: [PATCH 0472/2585] - hardening: not adding NFS configuration if it's
 already there.

  Tested the NFS server profile, it now works in FAI mode with
  e.g. this configuration:

  fai_nfs_server_install=1
  fai_nfs_export_list="/exports/multimedia"
  fai_nfs_allowed_client_network="192.168.1.0/255.255.255.0"

  Issue closes #43
---
 .../ece-install.d/network-file-system.sh      | 34 +++++++++++++------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh b/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
index 7094d9b5..368f121f 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
@@ -5,7 +5,7 @@ default_nfs_export_list="/exports/multimedia"
 function get_nfs_configuration() {
   nfs_export_list=${fai_nfs_export_list-$default_nfs_export_list}
   nfs_server_address=${fai_nfs_server_address}
-  nfs_allowed_network=${fai_nfs_allowed_client_network}
+  nfs_allowed_client_network=${fai_nfs_allowed_client_network}
 }
 
 
@@ -15,17 +15,23 @@ function install_nfs_server() {
   get_nfs_configuration
   
   for el in $nfs_export_list; do
-    cat >> /etc/exports <<EOF
+    local entry="$el ${nfs_allowed_client_network}(rw,sync)"
+    if [ $(grep "$entry" /etc/exports | wc -l) -lt 1 ]; then
+      cat >> /etc/exports <<EOF
+# added by $(basename $0) @ $(date)
 $el ${nfs_allowed_client_network}(rw,sync)
 EOF
-
+    fi
+    
     make_dir $el
     run chown ${ece_user}:${ece_group} $el
   done
 
   run /etc/init.d/portmap restart
   run /etc/init.d/nfs-kernel-server restart
-  run /etc/init.d/nfs-common restart
+
+  add_next_step "An NFS server has been installed on ${HOSTNAME},"
+  add_next_step "NFS exports: $nfs_export_list"
 }
 
 function install_nfs_client() {
@@ -34,15 +40,23 @@ function install_nfs_client() {
   install_packages_if_missing "nfs-common"
   get_nfs_configuration
 
+  local mount_point_list=""
+  
   for el in $nfs_export_list; do
-    make_dir /mnt/${basename $el}
-
-    cat >> /etc/fstab <<EOF
+    local entry="${nfs_server_address}:$el /mnt/$(basename $0) nfs defaults 0 0"
+    if [ $(grep "$entry" /etc/exports | wc -l) -lt 1 ]; then
+      cat >> /etc/fstab <<EOF
 # added by $(basename $el) @ $(date)
-${nfs_server_address}:$el /mnt/$(basename $el) nfs defaults 0 0
+${nfs_server_address}:$el /mnt/$(basename $0) nfs defaults 0 0
 EOF
+    fi
 
-    run mount /mnt/$(basename $el)
+    local mount_point=/mnt/${basename $el}
+    make_dir $mount_point
+    run mount $mount_point
+    mount_point_list="$mount_point $mount_point_list"
   done
-  
+
+  add_next_step "An NFS client has been added to $HOSTNAME"
+  add_next_step "NFS mount points: $mount_point_list"
 }

From ef37f92b0985a5fb2fca507afbcb503d0318136a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 7 Mar 2012 13:10:17 +0800
Subject: [PATCH 0473/2585] - first success full install of a VIP provider
 (tested with NFS):

  fai_vip_install=1
  fai_vip_service_list="nfs-kernel-server"
  fai_vip_primary_node_name=ubiquitous
  fai_vip_primary_node_ip=192.168.1.112
  fai_vip_secondary_node_name=ubiquitous-lts
  fai_vip_secondary_node_ip=192.168.1.111
  fai_vip_address=192.168.1.200
  fai_vip_sibling_ip=$fai_vip_secondary_node_ip

  Issue #34

  TODO: hardening & testing. Lots of it.
---
 .../ece-scripts/ece-install.d/vip-provier.sh  | 52 ++++++++++++-------
 1 file changed, 33 insertions(+), 19 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/vip-provier.sh b/usr/share/escenic/ece-scripts/ece-install.d/vip-provier.sh
index a1663109..c078a970 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/vip-provier.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/vip-provier.sh
@@ -3,7 +3,7 @@ function get_vip_configuration() {
 
   # dependant on the running ece-install process/host
   vip_address=${fai_vip_address}
-  vip_interface=${fai_vip_interface}
+  vip_interface=${fai_vip_interface-eth0}
   vip_log_file=${fai_vip_log-/var/log/ha-debug}
   vip_sibling_ip=${fai_vip_sibling_ip}
   vip_service_list=${fai_vip_service_list}
@@ -17,32 +17,36 @@ function get_vip_configuration() {
 }
 
 function install_vip_provider() {
+  print_and_log "Installing a VIP provider on $HOSTNAME"
   install_packages_if_missing heartbeat
+  get_vip_configuration
+  assure_vip_hosts_are_resolvable
   set_kernel_vip_parameters
   create_ha_auth_keys
   set_up_ha_conf
   set_up_ha_resources
   propagate_ha_settings
 
+  print_and_log "Restarting hearbeat to activate new configuration ..."
   run /etc/init.d/heartbeat restart
   
-  add_next_step "Heartbeat installed on $HOSTNAME to provide VIP $vip"
-  add_next_step "be sure that $node2_name gets similar setup as $HOSTNAME."
+  add_next_step "Heartbeat installed on $HOSTNAME to provide VIP ${vip_address},"
+  add_next_step "be sure that $vip_sibling_ip gets similar setup as $HOSTNAME."
 }
 
 function set_kernel_vip_parameters() {
   local file=/etc/sysctl.conf
-
-  if [ $(grep "net.ipv4.ip_nonlocal_bind=1" $file | wc -l) -gt 0 ]; then
+  local entry="net.ipv4.ip_nonlocal_bind=1"
+  if [ $(grep "$entry" $file | wc -l) -gt 0 ]; then
     return
   fi
   
   cat >> $file <<EOF
 # needed to bind to VIP, added by $(basename $0) @ $(date)
-net.ipv4.ip_nonlocal_bind=1
+$entry
 EOF
 
-  print "Re-loading $(uname -s) kernel configuration ..."
+  print_and_log "Re-loading ${HOSTNAME}'s kernel configuration ..."
   run sysctl -p
 
   # TODO
@@ -55,11 +59,14 @@ function propagate_ha_settings() {
 
 function set_up_ha_resources() {
   local file=/etc/ha.d/haresources
-  
-  cat > $file <<EOF
+  local entry="$vip_primary_node_name $vip_address $vip_service_list"
+
+  if [ $(grep "$entry" $file | wc -l) -lt 1 ]; then
+    cat > $file <<EOF
 # <primary node> <virtual IP (VIP)>
-$vip_primary_node_name $vip_address $vip_service_list
+$entry
 EOF
+  fi
 }
 
 function assure_vip_hosts_are_resolvable() {
@@ -67,26 +74,31 @@ function assure_vip_hosts_are_resolvable() {
   if [ $keep_off_etc_hosts -eq 1 ]; then
     return
   fi
-  
-  if [ $(grep $vip_primary_node_name /etc/hosts | wc -l) -lt 1 ]; then
-    cat >> /etc/hosts <<EOF
+
+  local file=/etc/hosts
+  local entry="$vip_primary_node_name $vip_primary_node_ip"
+  if [ $(grep "$entry" $file | wc -l) -lt 1 ]; then
+    cat >> $file <<EOF
 
 # added by $(basename $0) @ $(date)
-$vip_primary_node_name $vip_primary_node_ip
+$entry
 EOF
   fi
-  
-  if [ $(grep $vip_secondary_node_name /etc/hosts | wc -l) -lt 1 ]; then
-    cat >> /etc/hosts <<EOF
+
+  entry="$vip_secondary_node_name $vip_secondary_node_ip"
+  if [ $(grep "$entry" $file | wc -l) -lt 1 ]; then
+    cat >> $file <<EOF
 
 # added by $(basename $0) @ $(date)
-$vip_secondary_node_name $vip_secondary_node_ip
+$entry
 EOF
   fi
 }
 
 function set_up_ha_conf() {
   local file=/etc/ha.d/ha.cf
+
+  print_and_log "Setting up HA/heartbeat configuration in $file ..."
   
   cat > $file <<EOF
 ###############################
@@ -97,9 +109,10 @@ debugfile ${vip_log_file}
 # communication
 autojoin none
 udpport 694
+auto_failback on
 # the other node                                                               
 ucast $vip_interface $vip_sibling_ip
-udp $vip_interface
+bcast $vip_interface
 
 ###############################
 # thresholds
@@ -117,6 +130,7 @@ EOF
 
 function create_ha_auth_keys() {
   local file=/etc/ha.d/authkeys
+  print_and_log "Creating HA/heartbeat keys in $file ..."
 
   (echo -ne "auth 1\n1 sha1 "; \
     dd if=/dev/urandom bs=512 count=1 | openssl md5) \

From 53279c6a1de035715978d13b3c34cc099a32b4fc Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 7 Mar 2012 13:39:31 +0800
Subject: [PATCH 0474/2585] - added assumption (RAM)

---
 usr/share/doc/escenic/ece-install-guide.org | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index cfa461c3..4fa6e1b2 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -773,11 +773,14 @@ set_up_solr.postinst
 #+END_SRC
 
 * Assumptions
-** /etc/esecenic is shared
-It's assumed that the /etc/escenic directory is either on a shared
-file system or rsync-ed among the hosts that are running the ECE
-instances (the exception being database and cache servers).
- 
+** The machine on which ece-install has enough RAM
+It is assumed that the machine on which ece-install has enough RAM to
+install the profiles the user asks for.
+
+A common error by users, is to run ece-install in a (virtual) machine
+that has e.g. only 1GB RAM. For happy running, we recommend having a
+machine with at least 3GB when installing a full ECE stack on it.
+
 * Uninstalling Everything That the ece-install Set Up
 WARNING: this is potentially dangerous as some of these components may
 be used by other pieces of software you have running on your

From 57a12ce33ae7c15d614d87b6dd334b0b909e58f2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 7 Mar 2012 13:40:39 +0800
Subject: [PATCH 0475/2585] - replaced \_ with _, this means the HTML export
 will produce funny   looking subscripts, but at least the .org source is
 clean and folks   using   e.g.
 https://github.com/skybert/ece-scripts/blob/master/usr/share/doc/escenic/ece-install-guide.org
   can copy and paste code without problems.

---
 usr/share/doc/escenic/ece-install-guide.org | 136 ++++++++++----------
 1 file changed, 68 insertions(+), 68 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 4fa6e1b2..f372e9fd 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -27,7 +27,7 @@ will tell you which ones it cannot find and tell you to install these,
 so you can simply run it to find out which ones you need.
 
 You may also look inside the ece-install script for all calls to the
-'assert\_pre\_prequesite' method and you'll get a list of the binaries
+'assert_pre_prequesite' method and you'll get a list of the binaries
 ece-install assumes are present.
 
 ** Tested Operating Systems
@@ -153,7 +153,7 @@ any Escenic server components.
 *** Sun Java 6
 *** Apache Tomcat application server
 - Compression of textual content (previously, this was typically set
-  up with Apache and its mod\_deflate module).
+  up with Apache and its mod_deflate module).
 - pooling set up tweaked for high read/write performance.
 - proper logging configuration directing solr messages to its own log.
 - routing information in the cookies
@@ -172,7 +172,7 @@ may be removed after the installation if you want to.
 *** Compression of content 
 This was was previously accomplished by having a web server in fron t
 of the application server (or cache server if you used ESI). A typical
-system architecture would contain Apache with mod\_deflate. However,
+system architecture would contain Apache with mod_deflate. However,
 this is no longer necessary as Varnish can handles ESI parsing of
 compressed content (and many other things that we before needed Apache
 for). Thus, we'll let the application server do the compression for us
@@ -350,12 +350,12 @@ restore from:
 |----------------------------------+---------+------------------------------------------------|
 | Parameter                        | Default | Description                                    |
 |----------------------------------+---------+------------------------------------------------|
-| fai\_restore\_all                |       0 | Restore everything found in the backup file    |
-| fai\_restore\_db                 |       0 | Install the DB server & restore its contents   |
-| fai\_restore\_data\_files        |       0 | Restore the Solr & ECE data files              |
-| fai\_restore\_configuration      |       0 | Restore the Solr & ECE configuration files     |
-| fai\_restore\_software\_binaries |       0 | Restore the Escenic and Apache Tomcat software |
-| fai\_restore\_from\_file         |      "" | The .tar.gz produced by "ece -i <instance> backup" |
+| fai_restore_all                |       0 | Restore everything found in the backup file    |
+| fai_restore_db                 |       0 | Install the DB server & restore its contents   |
+| fai_restore_data_files        |       0 | Restore the Solr & ECE data files              |
+| fai_restore_configuration      |       0 | Restore the Solr & ECE configuration files     |
+| fai_restore_software_binaries |       0 | Restore the Escenic and Apache Tomcat software |
+| fai_restore_from_file         |      "" | The .tar.gz produced by "ece -i <instance> backup" |
 |----------------------------------+---------+------------------------------------------------|
 
 For example, to restore everything possible from a given tarball, you
@@ -513,7 +513,7 @@ add entries for these domains in the machine's /etc/hosts:
 #+END_SRC
 
 If you do not want ece-install to touch your /etc/hosts, you can set
-fai\_keep\_off\_etc\_hosts=1 in your ece-install.conf
+fai_keep_off_etc_hosts=1 in your ece-install.conf
 
 ** Overview of All FAI Parameters
 The ece-install script understands for the following settings in the
@@ -522,58 +522,58 @@ $HOME/ece-install.conf file of the root user:
 |-----------------------------------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------|
 | Parameter                               | Default                                           | Description                                                                                                                           |
 |-----------------------------------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------|
-| fai\_all\_install                       | 0                                                 | Install all components on your server.                                                                                                |
-| fai\_analysis\_db\_host                 | localhost                                         | For the EAE DB (different from ECE's)                                                                                                 |
-| fai\_analysis\_db\_install                    | 0                                                 | Install db profile                                                                                                                    |
-| fai\_analysis\_db\_password             | read-the-source-luke                              | For the EAE DB (different from ECE's)                                                                                                 |
-| fai\_analysis\_db\_port                 | 3306                                              | For the EAE DB (different from ECE's)                                                                                                 |
-| fai\_analysis\_db\_schema               | ece5db                                            | For the EAE DB (different from ECE's)                                                                                                                                      |
-| fai\_analysis\_db\_user                 | ece5user                                          | For the EAE DB (different from ECE's)                                                                                                 |
-| fai\_analysis\_name                     | analysis1                                         | EAE instance name                                                                                                                     |
-| fai\_analysis\_port                     | 8080                                              | Port of the EAE                                                                                                                       |
-| fai\_analysis\_shutdown                 | 8005                                              | Shutdown port for the EAE app server                                                                                                  |
-| fai\_cache\_backends                    | ${HOSTNAME}:8080                                  | Space separated, e.g. "app1:8080 app2:8080"                                                                                           |
-| fai\_cache\_install                     | 0                                                 | Install cache server profile                                                                                                          |
-| fai\_db\_drop\_old\_db\_first           | 0                                                 | Warning: this will drop the old database before installing a new one                                                                  |
-| fai\_db\_host                           | $HOSTNAME                                         | Useful for editor & presentation profiles                                                                                             |
-| fai\_db\_install                        | 0                                                 | Install db profile                                                                                                                    |
-| fai\_db\_password                       | read-the-source-luke                              | Useful for DB installation profile                                                                                                    |
-| fai\_db\_port                           | 3306                                              | Useful for editor & presentation profiles                                                                                             |
-| fai\_db\_schema                         | ece5db                                            | Useful for DB installation profile                                                                                                    |
-| fai\_db\_user                           | ece5user                                          | Useful for DB installation profile                                                                                                    |
-| fai\_editor\_conf\_archive              | ""                                                | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
-| fai\_editor\_ear                        | ""                                                | EAR to use instead of the Escenic binaries                                                                                            |
-| fai\_editor\_install                    | 0                                                 | Install the editorial profile                                                                                                         |
-| fai\_editor\_name                       | editor1                                           | Name of the editor instance                                                                                                           |
-| fai\_editor\_port                       | 8080                                              | HTTP port of the editor instance                                                                                                      |
-| fai\_editor\_shutdown                   | 8005                                              | Shutdown port of the editor instance                                                                                                  |
-| fai\_enabled                            | 0                                                 | Whether or not to run ece-install in FAI mode                                                                                         |
-| fai\_keep\_off\_etc\_hosts              | 0                                                 | Set this to 1 if you don't want ece-install adding entries to /etc/hosts                                                              |
-| fai\_monitoring\_server\_install        | 0                                                 | Install the monitoring server profile.                                                                                                |
-| fai\_monitoring\_server\_ip             | 127.0.0.1                                         | The IP of the monitoring server.                                                                                                      |
-| fai\_presentation\_conf\_archive        | ""                                                | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
-| fai\_presentation\_ear                  | ""                                                | EAR to use instead of the Escenic binaries                                                                                            |
-| fai\_presentation\_install              | 0                                                 | Install the presentation server profile                                                                                               |
-| fai\_presentation\_name                 | web1                                              | Name of the presentation server instance                                                                                              |
-| fai\_presentation\_port                 | 8080                                              | HTTP port of the presentation server instance                                                                                         |
-| fai\_presentation\_shutdown             | 8005                                              | Shutdown port of the presentation instance                                                                                            |
-| fai\_public\_host\_name                 | ${HOSTNAME}:8080                                  | The public address for your website                                                                                                   |
-| fai\_publication\_create                | 0                                                 | Create a new publication                                                                                                              |
-| fai\_publication\_domain\_mapping\_list | ""                                                | Mapping between publication names and their corresponding domains on the form: "one#one.com other#other.com"                          |
-| fai\_publication\_name                  | mypub                                             | Name of the publication                                                                                                               |
-| fai\_publication\_use\_instance         | dev1                                              | Name of local instance to use for creation                                                                                            |
-| fai\_publication\_war                   | "WF or ECE demo WAR"                              | WAR to base the new publication on                                                                                                    |
-| fai\_publication\_war\_uri\_list        | ""                                                | Publication WARs used for setting up Assembly tool. Supported: http[s]://tmp.com/mypub.war, file:///tmp/mypub.war and /tmp/mypub.war. |
-| fai\_rmi\_install                       | 0                                                 | Install RMI hub profile                                                                                                               |
-| fai\_search\_conf\_archive              | ""                                                | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
-| fai\_search\_ear                        | ""                                                | EAR to use instead of the Escenic binaries                                                                                            |
-| fai\_search\_for\_editor                | 0                                                 | If 1 (true), will configure Solr for use with an editorial server, if not conf for presentation servers will be chosen.               |
-| fai\_search\_indexer\_ws\_uri           | http://${HOSTNAME}:8080/indexer-webservice/index/ | URI of the indexer-webservice that the search instance shall use for knowing what to index.                                           |
-| fai\_search\_install                    | 0                                                 | Install the search server profile (Solr + indexer)                                                                                    |
-| fai\_search\_name                       | search1                                           | Name of the search instance                                                                                                           |
-| fai\_search\_port                       | 8080                                              | HTTP port of the search instance                                                                                                      |
-| fai\_search\_shutdown                   | 8005                                              | Shutdown port of the search instance                                                                                                  |
-| fai\_wf\_install                        | 0                                                 | Install Widget Framework profile                                                                                                      |
+| fai_all_install                       | 0                                                 | Install all components on your server.                                                                                                |
+| fai_analysis_db_host                 | localhost                                         | For the EAE DB (different from ECE's)                                                                                                 |
+| fai_analysis_db_install                    | 0                                                 | Install db profile                                                                                                                    |
+| fai_analysis_db_password             | read-the-source-luke                              | For the EAE DB (different from ECE's)                                                                                                 |
+| fai_analysis_db_port                 | 3306                                              | For the EAE DB (different from ECE's)                                                                                                 |
+| fai_analysis_db_schema               | ece5db                                            | For the EAE DB (different from ECE's)                                                                                                                                      |
+| fai_analysis_db_user                 | ece5user                                          | For the EAE DB (different from ECE's)                                                                                                 |
+| fai_analysis_name                     | analysis1                                         | EAE instance name                                                                                                                     |
+| fai_analysis_port                     | 8080                                              | Port of the EAE                                                                                                                       |
+| fai_analysis_shutdown                 | 8005                                              | Shutdown port for the EAE app server                                                                                                  |
+| fai_cache_backends                    | ${HOSTNAME}:8080                                  | Space separated, e.g. "app1:8080 app2:8080"                                                                                           |
+| fai_cache_install                     | 0                                                 | Install cache server profile                                                                                                          |
+| fai_db_drop_old_db_first           | 0                                                 | Warning: this will drop the old database before installing a new one                                                                  |
+| fai_db_host                           | $HOSTNAME                                         | Useful for editor & presentation profiles                                                                                             |
+| fai_db_install                        | 0                                                 | Install db profile                                                                                                                    |
+| fai_db_password                       | read-the-source-luke                              | Useful for DB installation profile                                                                                                    |
+| fai_db_port                           | 3306                                              | Useful for editor & presentation profiles                                                                                             |
+| fai_db_schema                         | ece5db                                            | Useful for DB installation profile                                                                                                    |
+| fai_db_user                           | ece5user                                          | Useful for DB installation profile                                                                                                    |
+| fai_editor_conf_archive              | ""                                                | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
+| fai_editor_ear                        | ""                                                | EAR to use instead of the Escenic binaries                                                                                            |
+| fai_editor_install                    | 0                                                 | Install the editorial profile                                                                                                         |
+| fai_editor_name                       | editor1                                           | Name of the editor instance                                                                                                           |
+| fai_editor_port                       | 8080                                              | HTTP port of the editor instance                                                                                                      |
+| fai_editor_shutdown                   | 8005                                              | Shutdown port of the editor instance                                                                                                  |
+| fai_enabled                            | 0                                                 | Whether or not to run ece-install in FAI mode                                                                                         |
+| fai_keep_off_etc_hosts              | 0                                                 | Set this to 1 if you don't want ece-install adding entries to /etc/hosts                                                              |
+| fai_monitoring_server_install        | 0                                                 | Install the monitoring server profile.                                                                                                |
+| fai_monitoring_server_ip             | 127.0.0.1                                         | The IP of the monitoring server.                                                                                                      |
+| fai_presentation_conf_archive        | ""                                                | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
+| fai_presentation_ear                  | ""                                                | EAR to use instead of the Escenic binaries                                                                                            |
+| fai_presentation_install              | 0                                                 | Install the presentation server profile                                                                                               |
+| fai_presentation_name                 | web1                                              | Name of the presentation server instance                                                                                              |
+| fai_presentation_port                 | 8080                                              | HTTP port of the presentation server instance                                                                                         |
+| fai_presentation_shutdown             | 8005                                              | Shutdown port of the presentation instance                                                                                            |
+| fai_public_host_name                 | ${HOSTNAME}:8080                                  | The public address for your website                                                                                                   |
+| fai_publication_create                | 0                                                 | Create a new publication                                                                                                              |
+| fai_publication_domain_mapping_list | ""                                                | Mapping between publication names and their corresponding domains on the form: "one#one.com other#other.com"                          |
+| fai_publication_name                  | mypub                                             | Name of the publication                                                                                                               |
+| fai_publication_use_instance         | dev1                                              | Name of local instance to use for creation                                                                                            |
+| fai_publication_war                   | "WF or ECE demo WAR"                              | WAR to base the new publication on                                                                                                    |
+| fai_publication_war_uri_list        | ""                                                | Publication WARs used for setting up Assembly tool. Supported: http[s]://tmp.com/mypub.war, file:///tmp/mypub.war and /tmp/mypub.war. |
+| fai_rmi_install                       | 0                                                 | Install RMI hub profile                                                                                                               |
+| fai_search_conf_archive              | ""                                                | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
+| fai_search_ear                        | ""                                                | EAR to use instead of the Escenic binaries                                                                                            |
+| fai_search_for_editor                | 0                                                 | If 1 (true), will configure Solr for use with an editorial server, if not conf for presentation servers will be chosen.               |
+| fai_search_indexer_ws_uri           | http://${HOSTNAME}:8080/indexer-webservice/index/ | URI of the indexer-webservice that the search instance shall use for knowing what to index.                                           |
+| fai_search_install                    | 0                                                 | Install the search server profile (Solr + indexer)                                                                                    |
+| fai_search_name                       | search1                                           | Name of the search instance                                                                                                           |
+| fai_search_port                       | 8080                                              | HTTP port of the search instance                                                                                                      |
+| fai_search_shutdown                   | 8005                                              | Shutdown port of the search instance                                                                                                  |
+| fai_wf_install                        | 0                                                 | Install Widget Framework profile                                                                                                      |
 |-----------------------------------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------|
 #+TBLFM: $2=http://$fai_editor_name:$fai_editor_port/indexer-webservice/index/                   0
 
@@ -651,9 +651,9 @@ folder, and only download the missing ones (if any).
 To get a list of the artifacts it'll pull from
 http://technet.escenic.com and http://tomcat.apache.org search for the
 following variables:
-- technet\_download\_list
-- wf\_download\_list
-- tomcat\_download
+- technet_download_list
+- wf_download_list
+- tomcat_download
 
 Two other ways of speeding up the installation is (of course) to use
 the backup/restore feature or install from a EAR and configuration
@@ -689,8 +689,8 @@ but these should be the most interesting ones.
 | /opt/escenic/assemblytool                   | The assembly tool                                                |
 | /opt/escenic/assemblytool/plugins           | Contains symlinks to all plugins in /opt/escenic                 |
 | /opt/escenic/engine                         | Symlink pointing to the current ECE                              |
-| /opt/tomcat                                 | Symlink pointing to the install Apache Tomcat (catalina\_home)   |
-| /opt/tomcat-<instance>                      | Instance specific Tomcat files (catalina\_base)                  |
+| /opt/tomcat                                 | Symlink pointing to the install Apache Tomcat (catalina_home)   |
+| /opt/tomcat-<instance>                      | Instance specific Tomcat files (catalina_base)                  |
 | /usr/bin/ece                                | Script for operating all ECE instances + RMI hub and EAE         |
 | /usr/sbin/drop-and-create-ecedb             | DB script used by the ece-install script                         |
 | /usr/sbin/ece-install                       | The installation script described in this guide                  |
@@ -788,7 +788,7 @@ host. However, this may be useful if you're installing a clean
 environment and want to e.g. undo your previous install to install a
 different profile.
 
-Open the ece-install script and look for the "un\_install\_ece"
+Open the ece-install script and look for the "un_install_ece"
 function, it has copy and pastable commands for undoing most/all
 things set up by the script.
 

From 5e8e2b4100f6752fcc3e3f8a86b65b6b65c4892a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 7 Mar 2012 13:42:39 +0800
Subject: [PATCH 0476/2585] - updated test status for CentOS

---
 usr/share/doc/escenic/ece-install-guide.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index f372e9fd..d494987b 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -36,7 +36,7 @@ ece-install assumes are present.
 | Debian 6.0 (squeeze) | Everything is 100% automatic                        | 2012-02-27 13:18 |
 | Ubuntu LTS 10.04     | Everything except Tomcat/APR wrappers are automatic | 2012-02-27 13:19 |
 | Ubuntu 11.10         | Everything except Tomcat/APR wrappers are automatic | 2012-02-27 13:19 |
-| CentOS 6.2           | APR & monitoring are not automatic                  | 2012-02-28 12:37 |
+| CentOS 6.2           | HA, APR & monitoring are not automatic              | 2012-03-07 13:42 |
 
 * A Note on Running ece-install On Non-GNU/Linux Systems
 Please note, it's assumed that the OS uses GNU's tools, i.e. find, cp

From c3dbbabcd4e014149e3ea4494000d54b0cf8b6dd Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 7 Mar 2012 13:45:45 +0800
Subject: [PATCH 0477/2585] - removed munin-java-plugins from munin plugins as
 it pulls down   OpenJDK. Unless we really need these plugins, we'd probably
 be   better without them.

---
 usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index 00a4a6d3..9ea2675f 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -160,7 +160,7 @@ function install_munin_node()
   fi
   
   if [ $on_debian_or_derivative -eq 1 ]; then
-    packages="munin-node munin-plugins-extra munin-java-plugins"
+    packages="munin-node munin-plugins-extra"
     install_packages_if_missing $packages
   else
     print_and_log "Munin node installation not supported on your system"

From caccd1399d42ba552f07ac5662d9e6ba0cee4a1a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 7 Mar 2012 14:32:10 +0800
Subject: [PATCH 0478/2585] - added ensure_variable_is_set

---
 .../escenic/ece-scripts/common-bashing.sh     | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index 3e6e4fdf..b1afdb20 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -179,3 +179,25 @@ function get_base_dir_from_bundle()
     echo $file_name
 }
 
+## Will assert that all the passed variable names are set, if not, it
+## will exit in error.
+## 
+## $@ : a list of variable names
+##
+## Requires $conf_file to be set.
+function ensure_variable_is_set() {
+  local requirements_failed=0
+  
+  for el in $@; do
+    if [ -n "$(eval echo $`echo $el`)" ]; then
+      continue
+    fi
+    
+    print "You need to specifiy '$el' in your $conf_file"
+    requirements_failed=1
+  done
+  
+  if [ $requirements_failed -eq 1 ]; then
+    remove_pid_and_exit_in_error
+  fi
+}

From 77f631d5d57b6c6639d500656716d21b0705ec57 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 7 Mar 2012 14:37:29 +0800
Subject: [PATCH 0479/2585] - NFS client profile install now works!

  Example configuration:

  fai_enabled=1
  fai_nfs_server_address=192.168.1.200
  fai_nfs_client_install=1
  fai_nfs_export_list="/exports/multimedia"

  This closes issue #44.
---
 .../ece-install.d/network-file-system.sh      | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh b/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
index 368f121f..e76086a0 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
@@ -6,11 +6,17 @@ function get_nfs_configuration() {
   nfs_export_list=${fai_nfs_export_list-$default_nfs_export_list}
   nfs_server_address=${fai_nfs_server_address}
   nfs_allowed_client_network=${fai_nfs_allowed_client_network}
+
+  ensure_variable_is_set fai_nfs_server_address
+
+  if [ $install_profile_number -eq $PROFILE_NFS_SERVER ]; then
+    fai_nfs_allowed_client_network
+  fi
 }
 
 
 function install_nfs_server() {
-  print "Installing an NFS server on $HOSTNAME ..."
+  print_and_log "Installing an NFS server on $HOSTNAME ..."
   install_packages_if_missing "portmap nfs-kernel-server nfs-common"
   get_nfs_configuration
   
@@ -35,23 +41,24 @@ EOF
 }
 
 function install_nfs_client() {
-  print "Installing an NFS client on $HOSTNAME ..."
+  print_and_log "Installing an NFS client on $HOSTNAME ..."
   
   install_packages_if_missing "nfs-common"
   get_nfs_configuration
 
   local mount_point_list=""
+  local file=/etc/fstab
   
   for el in $nfs_export_list; do
     local entry="${nfs_server_address}:$el /mnt/$(basename $0) nfs defaults 0 0"
-    if [ $(grep "$entry" /etc/exports | wc -l) -lt 1 ]; then
-      cat >> /etc/fstab <<EOF
+    if [ $(grep "$entry" $file | wc -l) -lt 1 ]; then
+      cat >> $file <<EOF
 # added by $(basename $el) @ $(date)
-${nfs_server_address}:$el /mnt/$(basename $0) nfs defaults 0 0
+${nfs_server_address}:$el /mnt/$(basename $el) nfs defaults 0 0
 EOF
     fi
 
-    local mount_point=/mnt/${basename $el}
+    local mount_point=/mnt/$(basename $el)
     make_dir $mount_point
     run mount $mount_point
     mount_point_list="$mount_point $mount_point_list"

From 94f07c97e55ac83cafa1147db0cc2cd1a766e903 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 7 Mar 2012 14:39:11 +0800
Subject: [PATCH 0480/2585] - minor change to documentation. This closes #44

---
 .../escenic/ece-scripts/ece-install.d/network-file-system.sh  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh b/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
index e76086a0..598aa570 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
@@ -1,4 +1,5 @@
-# module to install & configure network file systems
+# module to install & configure network file systems, both server and
+# client side.
 
 default_nfs_export_list="/exports/multimedia"
 
@@ -14,7 +15,6 @@ function get_nfs_configuration() {
   fi
 }
 
-
 function install_nfs_server() {
   print_and_log "Installing an NFS server on $HOSTNAME ..."
   install_packages_if_missing "portmap nfs-kernel-server nfs-common"

From 2def3ea67f09efee694306b90ca45220fb9d7fd9 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 7 Mar 2012 17:35:09 +0800
Subject: [PATCH 0481/2585] - improved NFS server profile, added more export
 options to make it   perform better.

- NFS server: now creates exports.d to get rid of warning/error each
  time nfs-kernel-server starts

- for NFS client profile, added possibility to decide mount point parent:

     fai_nfs_client_mount_point_parent=/data

  Default is /mnt
---
 .../ece-install.d/network-file-system.sh      | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh b/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
index 598aa570..3fde3e09 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
@@ -1,17 +1,19 @@
 # module to install & configure network file systems, both server and
 # client side.
 
-default_nfs_export_list="/exports/multimedia"
+default_nfs_export_list="/var/exports/multimedia"
+default_nfs_mount_point_parent="/mnt"
 
 function get_nfs_configuration() {
   nfs_export_list=${fai_nfs_export_list-$default_nfs_export_list}
   nfs_server_address=${fai_nfs_server_address}
   nfs_allowed_client_network=${fai_nfs_allowed_client_network}
-
-  ensure_variable_is_set fai_nfs_server_address
+  nfs_client_mount_point_parent=${fai_nfs_client_mount_point_parent-${default_nfs_mount_point_parent}}
 
   if [ $install_profile_number -eq $PROFILE_NFS_SERVER ]; then
-    fai_nfs_allowed_client_network
+    ensure_variable_is_set fai_nfs_allowed_client_network
+  elif [ $install_profile_number -eq $PROFILE_NFS_CLIENT ]; then
+    ensure_variable_is_set fai_nfs_server_address
   fi
 }
 
@@ -21,11 +23,12 @@ function install_nfs_server() {
   get_nfs_configuration
   
   for el in $nfs_export_list; do
-    local entry="$el ${nfs_allowed_client_network}(rw,sync)"
-    if [ $(grep "$entry" /etc/exports | wc -l) -lt 1 ]; then
+    # using no_subtree_check and async to speed up transfers.
+    local entry="$el ${nfs_allowed_client_network}(rw,no_subtree_check,async)"
+    if [ $(grep "$entry" /etc/exports 2>/dev/null | wc -l) -lt 1 ]; then
       cat >> /etc/exports <<EOF
 # added by $(basename $0) @ $(date)
-$el ${nfs_allowed_client_network}(rw,sync)
+$entry
 EOF
     fi
     
@@ -33,6 +36,10 @@ EOF
     run chown ${ece_user}:${ece_group} $el
   done
 
+
+  # nfs-kernel-server complains on Ubuntu if this directory doesn't exist
+  make_dir /etc/exports.d
+  
   run /etc/init.d/portmap restart
   run /etc/init.d/nfs-kernel-server restart
 
@@ -50,15 +57,15 @@ function install_nfs_client() {
   local file=/etc/fstab
   
   for el in $nfs_export_list; do
-    local entry="${nfs_server_address}:$el /mnt/$(basename $0) nfs defaults 0 0"
+    local entry="${nfs_server_address}:$el ${nfs_client_mount_point_parent}/$(basename $0) nfs defaults 0 0"
     if [ $(grep "$entry" $file | wc -l) -lt 1 ]; then
       cat >> $file <<EOF
 # added by $(basename $el) @ $(date)
-${nfs_server_address}:$el /mnt/$(basename $el) nfs defaults 0 0
+${nfs_server_address}:$el ${nfs_client_mount_point_parent}/$(basename $el) nfs defaults 0 0
 EOF
     fi
 
-    local mount_point=/mnt/$(basename $el)
+    local mount_point=${nfs_client_mount_point_parent}/$(basename $el)
     make_dir $mount_point
     run mount $mount_point
     mount_point_list="$mount_point $mount_point_list"

From 391766a59b4ba6910cd0ec99b63de599fcd5bc9a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 7 Mar 2012 17:40:17 +0800
Subject: [PATCH 0482/2585] - added option to pass the primary node auth key.
 This is needed when   installing the secondary node (or indeed for setting up
 both primary   and secondary).

      fai_vip_primary_node_auth_key

  This value is the MD5 sum in /etc/ha.d/authkeys

  Normally, we could use ha_propagate, however, this doesn't work on
  Ubuntu as we're running as root and ha_propagate uses ssh, so since
  the target system doesn't allow/know about the root user when
  logging in as root, the ha_propagate command is useless.

  Passing this parameter here makes the secondary node installation
  possible on all distributions, Ubuntu included.

  Issue #34

- hardening.
---
 .../ece-scripts/ece-install.d/vip-provier.sh  | 50 ++++++++++++-------
 1 file changed, 31 insertions(+), 19 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/vip-provier.sh b/usr/share/escenic/ece-scripts/ece-install.d/vip-provier.sh
index c078a970..03196109 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/vip-provier.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/vip-provier.sh
@@ -14,6 +14,11 @@ function get_vip_configuration() {
   vip_primary_node_ip=${fai_vip_primary_node_ip}
   vip_secondary_node_name=${fai_vip_secondary_node_name}
   vip_secondary_node_ip=${fai_vip_secondary_node_ip}
+
+  # only useful when installing the secondary node (from its
+  # /etc/ha.d/authkeys), looks something like:
+  # e19f39c09e9affafc23fc5bcd0404186
+  vip_primary_node_auth_key=${fai_vip_primary_node_auth_key}
 }
 
 function install_vip_provider() {
@@ -25,7 +30,6 @@ function install_vip_provider() {
   create_ha_auth_keys
   set_up_ha_conf
   set_up_ha_resources
-  propagate_ha_settings
 
   print_and_log "Restarting hearbeat to activate new configuration ..."
   run /etc/init.d/heartbeat restart
@@ -37,7 +41,7 @@ function install_vip_provider() {
 function set_kernel_vip_parameters() {
   local file=/etc/sysctl.conf
   local entry="net.ipv4.ip_nonlocal_bind=1"
-  if [ $(grep "$entry" $file | wc -l) -gt 0 ]; then
+  if [ $(grep "$entry" $file 2>/dev/null | wc -l) -gt 0 ]; then
     return
   fi
   
@@ -53,15 +57,11 @@ EOF
   # print "Making sure the kernel parameters are loaded at boot time"
 }
 
-function propagate_ha_settings() {
-  run /usr/share/heartbeat/ha_propagate
-}
-
 function set_up_ha_resources() {
   local file=/etc/ha.d/haresources
   local entry="$vip_primary_node_name $vip_address $vip_service_list"
 
-  if [ $(grep "$entry" $file | wc -l) -lt 1 ]; then
+  if [ $(grep "$entry" $file 2>/dev/null | wc -l) -lt 1 ]; then
     cat > $file <<EOF
 # <primary node> <virtual IP (VIP)>
 $entry
@@ -76,17 +76,14 @@ function assure_vip_hosts_are_resolvable() {
   fi
 
   local file=/etc/hosts
-  local entry="$vip_primary_node_name $vip_primary_node_ip"
-  if [ $(grep "$entry" $file | wc -l) -lt 1 ]; then
-    cat >> $file <<EOF
 
-# added by $(basename $0) @ $(date)
-$entry
-EOF
+  if [[ $(uname -n) == "$vip_primary_node_name" ]]; then
+    local entry="$vip_secondary_node_ip $vip_secondary_node_name"
+  else
+    local entry="$vip_primary_node_ip $vip_primary_node_name"
   fi
-
-  entry="$vip_secondary_node_name $vip_secondary_node_ip"
-  if [ $(grep "$entry" $file | wc -l) -lt 1 ]; then
+    
+  if [ $(grep "$entry" $file 2>/dev/null | wc -l) -lt 1 ]; then
     cat >> $file <<EOF
 
 # added by $(basename $0) @ $(date)
@@ -107,9 +104,14 @@ debugfile ${vip_log_file}
 
 ###############################
 # communication
+
+# do not use discovery, instead insist on explicit listing of nodes
+# (see below)
 autojoin none
+
 udpport 694
 auto_failback on
+
 # the other node                                                               
 ucast $vip_interface $vip_sibling_ip
 bcast $vip_interface
@@ -132,8 +134,18 @@ function create_ha_auth_keys() {
   local file=/etc/ha.d/authkeys
   print_and_log "Creating HA/heartbeat keys in $file ..."
 
-  (echo -ne "auth 1\n1 sha1 "; \
-    dd if=/dev/urandom bs=512 count=1 | openssl md5) \
-    > $file
+  echo -ne "auth 1\n1 sha1 " > $file
+  
+  if [ -n "${vip_primary_node_auth_key}" ]; then
+    echo "${vip_primary_node_auth_key}" >> $file
+  else
+    # the cut -d' ' -f2 is because 1.0.0e produces "(stdin)=" in front
+    # of the output, something which the old, 0.9.8o didn't do.
+    dd if=/dev/urandom bs=512 count=1 2>> $log | \
+      openssl md5 | \
+      cut -d' ' -f2 \
+      >> $file
+  fi
+  
   run chmod 0600 $file
 }

From 938ff29e1041c592cab5e543904f16d7f2e8440c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 7 Mar 2012 18:11:24 +0800
Subject: [PATCH 0483/2585] - added fsid to the NFS exports options. This
 should remedy stale NFS   handles after recovery.

  Issue #43
---
 .../ece-scripts/ece-install.d/network-file-system.sh       | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh b/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
index 3fde3e09..aa621ff4 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
@@ -21,10 +21,12 @@ function install_nfs_server() {
   print_and_log "Installing an NFS server on $HOSTNAME ..."
   install_packages_if_missing "portmap nfs-kernel-server nfs-common"
   get_nfs_configuration
-  
+
+  local i=1
   for el in $nfs_export_list; do
     # using no_subtree_check and async to speed up transfers.
-    local entry="$el ${nfs_allowed_client_network}(rw,no_subtree_check,async)"
+    local nfs_opts="(rw,no_subtree_check,sync,fsid=$i)"
+    local entry="$el ${nfs_allowed_client_network}${nfs_opts}"
     if [ $(grep "$entry" /etc/exports 2>/dev/null | wc -l) -lt 1 ]; then
       cat >> /etc/exports <<EOF
 # added by $(basename $0) @ $(date)
@@ -34,6 +36,7 @@ EOF
     
     make_dir $el
     run chown ${ece_user}:${ece_group} $el
+    i=$(( $i + 1 ))
   done
 
 

From ea02569354b88c71813cdb6d4a777158212c82a9 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 8 Mar 2012 13:40:00 +0800
Subject: [PATCH 0484/2585] - hardening: run assert_correct_runtime_environment
 before init. This   ensure that ece-install doesn't try to load all the
 different   modules if the run-time environment isn't right (e.g. if the user
 is   trying to run ece-install as a non-root user).

- moved the checking/running of the VIP provider profile so that the
  user can install any other profile before (possible) the VIP
  profile, which therefore can depend on a previous installation
  profile in the same run of ece-install.

  This means that a user can install both an NFS server as well as an
  NFS server VIP provider from the same ece-install process.
---
 usr/sbin/ece-install | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 88be34fc..9b127f68 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -186,7 +186,8 @@ function install_packages_if_missing() {
     if [ $some_are_missing -eq 0 ]; then
       return
     elif [ $one_time_apt_update_done -eq 0 ]; then
-      log "Running one time APT update to ensure package list is up to date"
+      print_and_log \
+        "Running one time APT update to ensure package list is fresh"
       run apt-get update
       one_time_apt_update_done=1
     fi
@@ -614,15 +615,15 @@ function read_user_input()
 function assert_correct_runtime_environment()
 {
     if [ $(whoami) != "root" ]; then
-        print "You must be root when running $(basename $0)"
+        echo "You must be root when running $(basename $0)"
         exit 1
     fi
     
     if [ -e $pid_file ]; then
-        print "There's already one $(basename $0) process running."
-        print "If you blelieve this is wrong, e.g. if a previous run of" 
-        print "$(basename $0) was aborted before it completed, you"
-        print "may remove ${pid_file} and run $(basename $0) again."
+        echo "There's already one $(basename $0) process running."
+        echo "If you blelieve this is wrong, e.g. if a previous run of" 
+        echo "$(basename $0) was aborted before it completed, you"
+        echo "may remove ${pid_file} and run $(basename $0) again."
         exit 1
     else
         echo $BASHPID > $pid_file
@@ -630,8 +631,8 @@ function assert_correct_runtime_environment()
     fi
 
     if [ ! -e "$conf_file" ]; then
-        print $conf_file "doesn't exist."
-        print "I cannot live without it, so I'm exiting :-("
+        echo $conf_file "doesn't exist."
+        echo "I cannot live without it, so I'm exiting :-("
         remove_pid_and_exit_in_error
     fi
 }
@@ -1038,8 +1039,8 @@ for el in $@; do
     fi
 done
 
-init
 assert_correct_runtime_environment
+init
 fai_enabled=$(get_boolean_conf_value fai_enabled)
 
 if [ $fai_enabled -eq 1 ]; then
@@ -1124,12 +1125,6 @@ if [ $fai_enabled -eq 1 ]; then
         no_fai_profile=0
     fi
     
-    if [ $(get_boolean_conf_value fai_vip_install) -eq 1 ]; then
-      install_profile_number=$PROFILE_VIP_PROVIDER
-      install_vip_provider
-      no_fai_profile=0
-    fi
-    
     if [ $(get_boolean_conf_value fai_nfs_server_install) -eq 1 ]; then
       install_profile_number=$PROFILE_NFS_SERVER
       install_nfs_server
@@ -1141,6 +1136,15 @@ if [ $fai_enabled -eq 1 ]; then
       install_nfs_client
       no_fai_profile=0
     fi
+
+    # checking for VIP profile last so that ece-install can (if so
+    # configured in the ece-install.con) install all dependent
+    # services first.
+    if [ $(get_boolean_conf_value fai_vip_install) -eq 1 ]; then
+      install_profile_number=$PROFILE_VIP_PROVIDER
+      install_vip_provider
+      no_fai_profile=0
+    fi
     
     if [ $no_fai_profile -eq 1 ]; then
         print_and_log "No install profile selected, be sure to have one of the "

From 1810e375d801667d3c0ab08b5c4aa669dd106485 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 8 Mar 2012 15:21:55 +0800
Subject: [PATCH 0485/2585] - added NFS client documentation, #44 - added NFS
 server documentation, #43 - added VIP provider documentation, #34

---
 usr/share/doc/escenic/ece-install-guide.org | 209 ++++++++++++++------
 1 file changed, 146 insertions(+), 63 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index d494987b..35c0ce2f 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -178,7 +178,7 @@ compressed content (and many other things that we before needed Apache
 for). Thus, we'll let the application server do the compression for us
 now.
 
-** Profile - Full Stack on One Host
+** Profile :: Full Stack on One Host
 This profile is suitable for developers and admins wanting to set up a
 test environment. It will install the full stack including caching
 server, application server, ECE, assembly host, database, Widget
@@ -188,17 +188,17 @@ For further details on each of the different server components, see
 the different profile descriptions bellow.
 
 
-** Profile - Editorial Server (Publication Server)
+** Profile :: Editorial Server (Publication Server)
 Will set up a typical editorial server (often referred to as the
 publication server in Escenic literature).
 
-** Profile - Presentation Server
+** Profile :: Presentation Server
 This will set up a typical presentation server:
 - Memcached, distributed memory cache
 - Deployment setup to only deploy escenic-admin and the
   publication(s).
 
-** Profile - Database Server
+** Profile :: Database Server
 If ece-install is run on a support version of Debian or Ubuntu, this
 will install the excellent Percona distribution of MySQL with their
 set of high performance patches.
@@ -219,7 +219,7 @@ ERROR 1050 (42S01) at line 2: Table 'DBChangeLog' already exists
 [ece-install] running tables FAILED, exiting :-(
 #+END_SRC
 
-** Profile - Cache Server
+** Profile :: Cache Server
 If ece-install is run on a support version of Debian or Ubuntu, it
 will install the latest Varnish 3.0 caching server from the Varnish
 APT repository.
@@ -255,7 +255,7 @@ TBD:
   to be in the staff network ACL, defined in the Varnish
   configuration. 
 
-** Profile - Install Widget Framework
+** Profile :: Install Widget Framework
 You'll need a user name and password for accessing the
 repo.escenic.com Maven repository. You should get these credentials
 when you bought Widget Framework. If you for some reason do not have
@@ -267,7 +267,7 @@ complain:
 [ece-install] Be sure to set wf_user and wf_password in /root/ece-install.conf
 [ece-install] If you don't have these, please contact support@escenic.com
 #+END_SRC
-** Profile - Create Publication
+** Profile :: Create Publication
 This profile will create a publication for you, only asking you the
 name of the publication and which ECE instance to use for its
 creation.
@@ -275,14 +275,14 @@ creation.
 This installation profile will base the publication on the Widget
 Framework if its present on the system, if not, ECE's clean demo WAR
 is used as a basis.  
-** Profile - Monitoring Server
+** Profile :: Monitoring Server
 This will install a Munin gatherer and web server. The latter for
 accessing the reports generated by the former.
 
 TBD: This profile will also install the Nagios interface for
 monitoring the different nodes. 
 
-** Profile - Restoring from backup
+** Profile :: Restoring from backup
 ece-install can restore from a backup made by the ece script:
 #+BEGIN_SRC conf
 $ ece -i <instance> backup
@@ -296,11 +296,80 @@ what's available on the host where it's run):
 - ECE, cache and web server configuration
 - Escenic software
 
-** Profile - Analysis Server
+** Profile :: Analysis Server
 This profile will install the Escenic Analysis Engine and configure it
 for production use with sane defaults. Be sure to use a different DB
 than you use for ECE.
 
+** Profile :: NFS server
+Will install an NFS server.
+
+** Profile :: NFS client
+Will install an NFS client, create all the mountpoints and mount these
+on the host.
+
+Configuration example for setting up an NFS client mounting the
+multimedia archive on the NFS server:
+#+BEGIN_SRC sh
+fai_enabled=1
+fai_nfs_client_install=1
+fai_nfs_server_address=192.168.1.200
+fai_nfs_export_list="/var/exports/multimedia"  
+#+END_SRC
+
+** Profile :: VIP provider
+
+This profile will make the host capable of serving a certain virtual
+IP (VIP) for one or more services. This is a useful thing for all
+[[http://en.wikipedia.org/wiki/Single_point_of_failure][SPOFs]] in your architecture, such as the file server or database.
+
+You will typically install another profile at the same time as the VIP
+provider. For instance, you will install both an NFS server and a VIP
+provider for that NFS server (and perhaps other services too running
+on the same host).
+
+The following ece-install.conf configuration will install an NFS
+server and make it a VIP provider exposing its NFS service. The two
+VIP providers have have the IP addresses 192.168.1.111 and
+192.168.1.112 and both provide the VIP 192.168.1.200
+
+#+BEGIN_SRC sh
+# install the NFS server
+fai_enabled=1
+fai_nfs_server_install=1
+fai_nfs_export_list="/var/exports/multimedia"
+fai_nfs_allowed_client_network="192.168.1.0/255.255.255.0"
+
+# install the VIP provider, primary node
+fai_vip_install=1
+fai_vip_service_list="nfs-kernel-server"
+fai_vip_primary_node_name=ubiquitous
+fai_vip_primary_node_ip=192.168.1.112
+fai_vip_primary_node_auth_key=d41d8cd98f00b204e9800998ecf8427e
+fai_vip_secondary_node_name=ubiquitous-lts
+fai_vip_secondary_node_ip=192.168.1.111
+fai_vip_address=192.168.1.200
+fai_vip_sibling_ip=$fai_vip_secondary_node_ip
+#+END_SRC
+
+The secondary node, also an NFS VIP provider can have the exact same
+configuration except for having a different sibling:
+
+#+BEGIN_SRC sh
+fai_vip_sibling_ip=$fai_vip_primary_node_ip
+#+END_SRC
+
+Note that the fai_vip_primary_node_auth_key is optional. If not set,
+ece-install will generate it for you. However, you will then have to
+add this to ece-install.conf when installing the secondary
+node. Generate this key, do:
+
+#+BEGIN_SRC sh
+$ dd if=/dev/urandom bs=512 count=1 2>> $log | \
+    openssl md5 | \
+    cut -d' ' -f2   
+#+END_SRC
+
 ** Running interactively
 *** Start ece-install and choose the Option, "Restore from backup"
 #+BEGIN_SRC text
@@ -519,63 +588,77 @@ fai_keep_off_etc_hosts=1 in your ece-install.conf
 The ece-install script understands for the following settings in the
 $HOME/ece-install.conf file of the root user:
 
-|-----------------------------------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------|
-| Parameter                               | Default                                           | Description                                                                                                                           |
-|-----------------------------------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------|
-| fai_all_install                       | 0                                                 | Install all components on your server.                                                                                                |
-| fai_analysis_db_host                 | localhost                                         | For the EAE DB (different from ECE's)                                                                                                 |
-| fai_analysis_db_install                    | 0                                                 | Install db profile                                                                                                                    |
-| fai_analysis_db_password             | read-the-source-luke                              | For the EAE DB (different from ECE's)                                                                                                 |
-| fai_analysis_db_port                 | 3306                                              | For the EAE DB (different from ECE's)                                                                                                 |
-| fai_analysis_db_schema               | ece5db                                            | For the EAE DB (different from ECE's)                                                                                                                                      |
-| fai_analysis_db_user                 | ece5user                                          | For the EAE DB (different from ECE's)                                                                                                 |
-| fai_analysis_name                     | analysis1                                         | EAE instance name                                                                                                                     |
-| fai_analysis_port                     | 8080                                              | Port of the EAE                                                                                                                       |
-| fai_analysis_shutdown                 | 8005                                              | Shutdown port for the EAE app server                                                                                                  |
-| fai_cache_backends                    | ${HOSTNAME}:8080                                  | Space separated, e.g. "app1:8080 app2:8080"                                                                                           |
-| fai_cache_install                     | 0                                                 | Install cache server profile                                                                                                          |
-| fai_db_drop_old_db_first           | 0                                                 | Warning: this will drop the old database before installing a new one                                                                  |
-| fai_db_host                           | $HOSTNAME                                         | Useful for editor & presentation profiles                                                                                             |
-| fai_db_install                        | 0                                                 | Install db profile                                                                                                                    |
-| fai_db_password                       | read-the-source-luke                              | Useful for DB installation profile                                                                                                    |
-| fai_db_port                           | 3306                                              | Useful for editor & presentation profiles                                                                                             |
-| fai_db_schema                         | ece5db                                            | Useful for DB installation profile                                                                                                    |
-| fai_db_user                           | ece5user                                          | Useful for DB installation profile                                                                                                    |
-| fai_editor_conf_archive              | ""                                                | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
-| fai_editor_ear                        | ""                                                | EAR to use instead of the Escenic binaries                                                                                            |
-| fai_editor_install                    | 0                                                 | Install the editorial profile                                                                                                         |
-| fai_editor_name                       | editor1                                           | Name of the editor instance                                                                                                           |
-| fai_editor_port                       | 8080                                              | HTTP port of the editor instance                                                                                                      |
-| fai_editor_shutdown                   | 8005                                              | Shutdown port of the editor instance                                                                                                  |
-| fai_enabled                            | 0                                                 | Whether or not to run ece-install in FAI mode                                                                                         |
+|-------------------------------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------|
+| Parameter                           | Default                                           | Description                                                                                                                           |
+|-------------------------------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------|
+| fai_all_install                     | 0                                                 | Install all components on your server.                                                                                                |
+| fai_analysis_db_host                | localhost                                         | For the EAE DB (different from ECE's)                                                                                                 |
+| fai_analysis_db_install             | 0                                                 | Install db profile                                                                                                                    |
+| fai_analysis_db_password            | read-the-source-luke                              | For the EAE DB (different from ECE's)                                                                                                 |
+| fai_analysis_db_port                | 3306                                              | For the EAE DB (different from ECE's)                                                                                                 |
+| fai_analysis_db_schema              | ece5db                                            | For the EAE DB (different from ECE's)                                                                                                 |
+| fai_analysis_db_user                | ece5user                                          | For the EAE DB (different from ECE's)                                                                                                 |
+| fai_analysis_name                   | analysis1                                         | EAE instance name                                                                                                                     |
+| fai_analysis_port                   | 8080                                              | Port of the EAE                                                                                                                       |
+| fai_analysis_shutdown               | 8005                                              | Shutdown port for the EAE app server                                                                                                  |
+| fai_cache_backends                  | ${HOSTNAME}:8080                                  | Space separated, e.g. "app1:8080 app2:8080"                                                                                           |
+| fai_cache_install                   | 0                                                 | Install cache server profile                                                                                                          |
+| fai_db_drop_old_db_first            | 0                                                 | Warning: this will drop the old database before installing a new one                                                                  |
+| fai_db_host                         | $HOSTNAME                                         | Useful for editor & presentation profiles                                                                                             |
+| fai_db_install                      | 0                                                 | Install db profile                                                                                                                    |
+| fai_db_password                     | read-the-source-luke                              | Useful for DB installation profile                                                                                                    |
+| fai_db_port                         | 3306                                              | Useful for editor & presentation profiles                                                                                             |
+| fai_db_schema                       | ece5db                                            | Useful for DB installation profile                                                                                                    |
+| fai_db_user                         | ece5user                                          | Useful for DB installation profile                                                                                                    |
+| fai_editor_conf_archive             | ""                                                | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
+| fai_editor_ear                      | ""                                                | EAR to use instead of the Escenic binaries                                                                                            |
+| fai_editor_install                  | 0                                                 | Install the editorial profile                                                                                                         |
+| fai_editor_name                     | editor1                                           | Name of the editor instance                                                                                                           |
+| fai_editor_port                     | 8080                                              | HTTP port of the editor instance                                                                                                      |
+| fai_editor_shutdown                 | 8005                                              | Shutdown port of the editor instance                                                                                                  |
+| fai_enabled                         | 0                                                 | Whether or not to run ece-install in FAI mode                                                                                         |
 | fai_keep_off_etc_hosts              | 0                                                 | Set this to 1 if you don't want ece-install adding entries to /etc/hosts                                                              |
-| fai_monitoring_server_install        | 0                                                 | Install the monitoring server profile.                                                                                                |
-| fai_monitoring_server_ip             | 127.0.0.1                                         | The IP of the monitoring server.                                                                                                      |
-| fai_presentation_conf_archive        | ""                                                | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
-| fai_presentation_ear                  | ""                                                | EAR to use instead of the Escenic binaries                                                                                            |
-| fai_presentation_install              | 0                                                 | Install the presentation server profile                                                                                               |
-| fai_presentation_name                 | web1                                              | Name of the presentation server instance                                                                                              |
-| fai_presentation_port                 | 8080                                              | HTTP port of the presentation server instance                                                                                         |
-| fai_presentation_shutdown             | 8005                                              | Shutdown port of the presentation instance                                                                                            |
-| fai_public_host_name                 | ${HOSTNAME}:8080                                  | The public address for your website                                                                                                   |
-| fai_publication_create                | 0                                                 | Create a new publication                                                                                                              |
+| fai_monitoring_server_install       | 0                                                 | Install the monitoring server profile.                                                                                                |
+| fai_monitoring_server_ip            | 127.0.0.1                                         | The IP of the monitoring server.                                                                                                      |
+| fai_nfs_allowed_client_network      | ""                                                | IP/netmwask of allowed NFS clients, example: 192.168.1.0/255.255.255.0                                                                |
+| fai_nfs_client_install              | 0                                                 | Installs an NFS client                                                                                                                |
+| fai_nfs_client_mount_point_parent   | /mnt                                              | Mount point parent directory                                                                                                          |
+| fai_nfs_export_list                 | ""                                                | Space separated list of NFS export directories, full paths as seen on the NFS server. E.g.: /var/exports/multimedia                   |
+| fai_nfs_server_address              | ""                                                | Address of the NFS server, useful for the NFS client profile                                                                          |
+| fai_nfs_server_install              | 0                                                 | Install an NFS server                                                                                                                 |
+| fai_presentation_conf_archive       | ""                                                | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
+| fai_presentation_ear                | ""                                                | EAR to use instead of the Escenic binaries                                                                                            |
+| fai_presentation_install            | 0                                                 | Install the presentation server profile                                                                                               |
+| fai_presentation_name               | web1                                              | Name of the presentation server instance                                                                                              |
+| fai_presentation_port               | 8080                                              | HTTP port of the presentation server instance                                                                                         |
+| fai_presentation_shutdown           | 8005                                              | Shutdown port of the presentation instance                                                                                            |
+| fai_public_host_name                | ${HOSTNAME}:8080                                  | The public address for your website                                                                                                   |
+| fai_publication_create              | 0                                                 | Create a new publication                                                                                                              |
 | fai_publication_domain_mapping_list | ""                                                | Mapping between publication names and their corresponding domains on the form: "one#one.com other#other.com"                          |
-| fai_publication_name                  | mypub                                             | Name of the publication                                                                                                               |
-| fai_publication_use_instance         | dev1                                              | Name of local instance to use for creation                                                                                            |
-| fai_publication_war                   | "WF or ECE demo WAR"                              | WAR to base the new publication on                                                                                                    |
+| fai_publication_name                | mypub                                             | Name of the publication                                                                                                               |
+| fai_publication_use_instance        | dev1                                              | Name of local instance to use for creation                                                                                            |
+| fai_publication_war                 | "WF or ECE demo WAR"                              | WAR to base the new publication on                                                                                                    |
 | fai_publication_war_uri_list        | ""                                                | Publication WARs used for setting up Assembly tool. Supported: http[s]://tmp.com/mypub.war, file:///tmp/mypub.war and /tmp/mypub.war. |
-| fai_rmi_install                       | 0                                                 | Install RMI hub profile                                                                                                               |
-| fai_search_conf_archive              | ""                                                | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
-| fai_search_ear                        | ""                                                | EAR to use instead of the Escenic binaries                                                                                            |
-| fai_search_for_editor                | 0                                                 | If 1 (true), will configure Solr for use with an editorial server, if not conf for presentation servers will be chosen.               |
+| fai_rmi_install                     | 0                                                 | Install RMI hub profile                                                                                                               |
+| fai_search_conf_archive             | ""                                                | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
+| fai_search_ear                      | ""                                                | EAR to use instead of the Escenic binaries                                                                                            |
+| fai_search_for_editor               | 0                                                 | If 1 (true), will configure Solr for use with an editorial server, if not conf for presentation servers will be chosen.               |
 | fai_search_indexer_ws_uri           | http://${HOSTNAME}:8080/indexer-webservice/index/ | URI of the indexer-webservice that the search instance shall use for knowing what to index.                                           |
-| fai_search_install                    | 0                                                 | Install the search server profile (Solr + indexer)                                                                                    |
-| fai_search_name                       | search1                                           | Name of the search instance                                                                                                           |
-| fai_search_port                       | 8080                                              | HTTP port of the search instance                                                                                                      |
-| fai_search_shutdown                   | 8005                                              | Shutdown port of the search instance                                                                                                  |
-| fai_wf_install                        | 0                                                 | Install Widget Framework profile                                                                                                      |
-|-----------------------------------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------|
-#+TBLFM: $2=http://$fai_editor_name:$fai_editor_port/indexer-webservice/index/                   0
+| fai_search_install                  | 0                                                 | Install the search server profile (Solr + indexer)                                                                                    |
+| fai_search_name                     | search1                                           | Name of the search instance                                                                                                           |
+| fai_search_port                     | 8080                                              | HTTP port of the search instance                                                                                                      |
+| fai_search_shutdown                 | 8005                                              | Shutdown port of the search instance                                                                                                  |
+| fai_vip_address                     | ""                                                | The virtual IP the provider will claim                                                                                                |
+| fai_vip_install                     | 0                                                 | Install a VIP provider                                                                                                                |
+| fai_vip_primary_node_auth_key       | ""                                                | Optional, but useful to set to make conf files consistent. Will be generated if not set                                               |
+| fai_vip_primary_node_ip             | ""                                                | Primary node IP                                                                                                                       |
+| fai_vip_primary_node_name           | ""                                                | Primary node name, must be what $(uname -n) returns                                                                                   |
+| fai_vip_secondary_node_ip           | ""                                                | Secondary node IP                                                                                                                     |
+| fai_vip_secondary_node_name         | ""                                                | Secondary node name, must be what $(uname -n) returns                                                                                 |
+| fai_vip_service_list                | ""                                                | List of init.d scripts to invoke when the VIP is acclaimed/revoked, script must support start & stop                                  |
+| fai_vip_sibling_ip                  | ""                                                | The IP of the other node offering the VIP                                                                                             |
+| fai_wf_install                      | 0                                                 | Install Widget Framework profile                                                                                                      |
+|-------------------------------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------|
 
 As you've probably have guessed, 0 means "false" and 1 means "true" :-)
 

From 0555c7b7affb8ad92896d72d1e46557887263fed Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 8 Mar 2012 15:22:10 +0800
Subject: [PATCH 0486/2585] - updated HTML

---
 usr/share/doc/escenic/ece-install-guide.html | 353 ++++++++++++-------
 1 file changed, 230 insertions(+), 123 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.html b/usr/share/doc/escenic/ece-install-guide.html
index b03ed535..95b62b46 100644
--- a/usr/share/doc/escenic/ece-install-guide.html
+++ b/usr/share/doc/escenic/ece-install-guide.html
@@ -7,7 +7,7 @@
 <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
 <meta name="title" content="Welcome to the /usr/sbin/ece-install Guide"/>
 <meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2012-02-28 18:55:47 CST"/>
+<meta name="generated" content="2012-03-08 15:10:00 CST"/>
 <meta name="author" content="Torstein Krause Johansen"/>
 <meta name="description" content=""/>
 <meta name="keywords" content=""/>
@@ -253,26 +253,29 @@ <h2>Table of Contents</h2>
 <li><a href="#sec-5-2-7">5.2.7 Compression of content</a></li>
 </ul>
 </li>
-<li><a href="#sec-5-3">5.3 Profile - Full Stack on One Host</a></li>
-<li><a href="#sec-5-4">5.4 Profile - Editorial Server (Publication Server)</a></li>
-<li><a href="#sec-5-5">5.5 Profile - Presentation Server</a></li>
-<li><a href="#sec-5-6">5.6 Profile - Database Server</a></li>
-<li><a href="#sec-5-7">5.7 Profile - Cache Server</a></li>
-<li><a href="#sec-5-8">5.8 Profile - Install Widget Framework</a></li>
-<li><a href="#sec-5-9">5.9 Profile - Create Publication</a></li>
-<li><a href="#sec-5-10">5.10 Profile - Monitoring Server</a></li>
-<li><a href="#sec-5-11">5.11 Profile - Restoring from backup</a></li>
-<li><a href="#sec-5-12">5.12 Profile - Analysis Server</a></li>
-<li><a href="#sec-5-13">5.13 Running interactively</a>
+<li><a href="#sec-5-3">5.3 Profile :: Full Stack on One Host</a></li>
+<li><a href="#sec-5-4">5.4 Profile :: Editorial Server (Publication Server)</a></li>
+<li><a href="#sec-5-5">5.5 Profile :: Presentation Server</a></li>
+<li><a href="#sec-5-6">5.6 Profile :: Database Server</a></li>
+<li><a href="#sec-5-7">5.7 Profile :: Cache Server</a></li>
+<li><a href="#sec-5-8">5.8 Profile :: Install Widget Framework</a></li>
+<li><a href="#sec-5-9">5.9 Profile :: Create Publication</a></li>
+<li><a href="#sec-5-10">5.10 Profile :: Monitoring Server</a></li>
+<li><a href="#sec-5-11">5.11 Profile :: Restoring from backup</a></li>
+<li><a href="#sec-5-12">5.12 Profile :: Analysis Server</a></li>
+<li><a href="#sec-5-13">5.13 Profile :: NFS server</a></li>
+<li><a href="#sec-5-14">5.14 Profile :: NFS client</a></li>
+<li><a href="#sec-5-15">5.15 Profile :: VIP provider</a></li>
+<li><a href="#sec-5-16">5.16 Running interactively</a>
 <ul>
-<li><a href="#sec-5-13-1">5.13.1 Start ece-install and choose the Option, "Restore from backup"</a></li>
-<li><a href="#sec-5-13-2">5.13.2 Select Which Backup to Restore</a></li>
-<li><a href="#sec-5-13-3">5.13.3 Choose What to Restore</a></li>
-<li><a href="#sec-5-13-4">5.13.4 Sit Back and Watch ece-install Restore the Data for You</a></li>
+<li><a href="#sec-5-16-1">5.16.1 Start ece-install and choose the Option, "Restore from backup"</a></li>
+<li><a href="#sec-5-16-2">5.16.2 Select Which Backup to Restore</a></li>
+<li><a href="#sec-5-16-3">5.16.3 Choose What to Restore</a></li>
+<li><a href="#sec-5-16-4">5.16.4 Sit Back and Watch ece-install Restore the Data for You</a></li>
 </ul>
 </li>
-<li><a href="#sec-5-14">5.14 Running in FAI mode</a></li>
-<li><a href="#sec-5-15">5.15 Data security</a></li>
+<li><a href="#sec-5-17">5.17 Running in FAI mode</a></li>
+<li><a href="#sec-5-18">5.18 Data security</a></li>
 </ul>
 </li>
 <li><a href="#sec-6">6 Full Automatic Install (FAI)</a>
@@ -303,7 +306,7 @@ <h2>Table of Contents</h2>
 </li>
 <li><a href="#sec-13">13 Assumptions</a>
 <ul>
-<li><a href="#sec-13-1">13.1 /etc/esecenic is shared</a></li>
+<li><a href="#sec-13-1">13.1 The machine on which ece-install has enough RAM</a></li>
 </ul>
 </li>
 <li><a href="#sec-14">14 Uninstalling Everything That the ece-install Set Up</a></li>
@@ -363,7 +366,7 @@ <h3 id="sec-1-3"><span class="section-number-3">1.3</span> Other GNU/Linux and U
 </p>
 <p>
 You may also look inside the ece-install script for all calls to the
-'assert_pre_prequesite' method and you'll get a list of the binaries
+'assert<sub>pre</sub><sub>prequesite'</sub> method and you'll get a list of the binaries
 ece-install assumes are present.
 </p>
 </div>
@@ -385,7 +388,7 @@ <h3 id="sec-1-4"><span class="section-number-3">1.4</span> Tested Operating Syst
 <tr><td class="left">Debian 6.0 (squeeze)</td><td class="left">Everything is 100% automatic</td><td class="left">2012-02-27 13:18</td></tr>
 <tr><td class="left">Ubuntu LTS 10.04</td><td class="left">Everything except Tomcat/APR wrappers are automatic</td><td class="left">2012-02-27 13:19</td></tr>
 <tr><td class="left">Ubuntu 11.10</td><td class="left">Everything except Tomcat/APR wrappers are automatic</td><td class="left">2012-02-27 13:19</td></tr>
-<tr><td class="left">CentOS 6.2</td><td class="left">APR &amp; monitoring are not automatic</td><td class="left">2012-02-28 12:37</td></tr>
+<tr><td class="left">CentOS 6.2</td><td class="left">HA, APR &amp; monitoring are not automatic</td><td class="left">2012-03-07 13:42</td></tr>
 </tbody>
 </table>
 
@@ -419,7 +422,7 @@ <h2 id="sec-3"><span class="section-number-2">3</span> Downloading the ece-insta
 </p>
 
 
-<pre class="src src-conf"><span style="color: #f0dfaf;">$ git clone git@github.com</span>:skybert/ece-scripts.git
+<pre class="src src-conf"><span style="color: #f0dfaf;">$ git clone https</span>://github.com/skybert/ece-scripts.git
 </pre>
 
 
@@ -504,10 +507,14 @@ <h2 id="sec-4"><span class="section-number-2">4</span> Running the ece-install S
 </p>
 
 
-<pre class="src src-conf"><span style="color: #7f9f7f; font-style: italic;"># </span><span style="color: #7f9f7f; font-style: italic;">bash ece-install [-v|--verbose]</span>
+<pre class="src src-conf"><span style="color: #7f9f7f; font-style: italic;"># </span><span style="color: #7f9f7f; font-style: italic;">bash ece-install [-v|--verbose|&lt;-f|--file&gt; &lt;conf-file&gt;]</span>
 </pre>
 
 
+<p>
+It will output everything from internal and external commands to its
+log file located at /var/log/ece-install.log.
+</p>
 <p>
 ece-install will try to "fail fast", exiting as soon as it detects an
 error during its execution:
@@ -602,7 +609,7 @@ <h4 id="sec-5-2-2"><span class="section-number-4">5.2.2</span> Apache Tomcat app
 
 <ul>
 <li>Compression of textual content (previously, this was typically set
-  up with Apache and its mod_deflate module).
+  up with Apache and its mod<sub>deflate</sub> module).
 </li>
 <li>pooling set up tweaked for high read/write performance.
 </li>
@@ -663,7 +670,7 @@ <h4 id="sec-5-2-7"><span class="section-number-4">5.2.7</span> Compression of co
 
 <p>This was was previously accomplished by having a web server in fron t
 of the application server (or cache server if you used ESI). A typical
-system architecture would contain Apache with mod_deflate. However,
+system architecture would contain Apache with mod<sub>deflate</sub>. However,
 this is no longer necessary as Varnish can handles ESI parsing of
 compressed content (and many other things that we before needed Apache
 for). Thus, we'll let the application server do the compression for us
@@ -675,7 +682,7 @@ <h4 id="sec-5-2-7"><span class="section-number-4">5.2.7</span> Compression of co
 </div>
 
 <div id="outline-container-5-3" class="outline-3">
-<h3 id="sec-5-3"><span class="section-number-3">5.3</span> Profile - Full Stack on One Host</h3>
+<h3 id="sec-5-3"><span class="section-number-3">5.3</span> Profile :: Full Stack on One Host</h3>
 <div class="outline-text-3" id="text-5-3">
 
 <p>This profile is suitable for developers and admins wanting to set up a
@@ -693,7 +700,7 @@ <h3 id="sec-5-3"><span class="section-number-3">5.3</span> Profile - Full Stack
 </div>
 
 <div id="outline-container-5-4" class="outline-3">
-<h3 id="sec-5-4"><span class="section-number-3">5.4</span> Profile - Editorial Server (Publication Server)</h3>
+<h3 id="sec-5-4"><span class="section-number-3">5.4</span> Profile :: Editorial Server (Publication Server)</h3>
 <div class="outline-text-3" id="text-5-4">
 
 <p>Will set up a typical editorial server (often referred to as the
@@ -704,7 +711,7 @@ <h3 id="sec-5-4"><span class="section-number-3">5.4</span> Profile - Editorial S
 </div>
 
 <div id="outline-container-5-5" class="outline-3">
-<h3 id="sec-5-5"><span class="section-number-3">5.5</span> Profile - Presentation Server</h3>
+<h3 id="sec-5-5"><span class="section-number-3">5.5</span> Profile :: Presentation Server</h3>
 <div class="outline-text-3" id="text-5-5">
 
 <p>This will set up a typical presentation server:
@@ -722,7 +729,7 @@ <h3 id="sec-5-5"><span class="section-number-3">5.5</span> Profile - Presentatio
 </div>
 
 <div id="outline-container-5-6" class="outline-3">
-<h3 id="sec-5-6"><span class="section-number-3">5.6</span> Profile - Database Server</h3>
+<h3 id="sec-5-6"><span class="section-number-3">5.6</span> Profile :: Database Server</h3>
 <div class="outline-text-3" id="text-5-6">
 
 <p>If ece-install is run on a support version of Debian or Ubuntu, this
@@ -756,7 +763,7 @@ <h3 id="sec-5-6"><span class="section-number-3">5.6</span> Profile - Database Se
 </div>
 
 <div id="outline-container-5-7" class="outline-3">
-<h3 id="sec-5-7"><span class="section-number-3">5.7</span> Profile - Cache Server</h3>
+<h3 id="sec-5-7"><span class="section-number-3">5.7</span> Profile :: Cache Server</h3>
 <div class="outline-text-3" id="text-5-7">
 
 <p>If ece-install is run on a support version of Debian or Ubuntu, it
@@ -817,7 +824,7 @@ <h3 id="sec-5-7"><span class="section-number-3">5.7</span> Profile - Cache Serve
 </div>
 
 <div id="outline-container-5-8" class="outline-3">
-<h3 id="sec-5-8"><span class="section-number-3">5.8</span> Profile - Install Widget Framework</h3>
+<h3 id="sec-5-8"><span class="section-number-3">5.8</span> Profile :: Install Widget Framework</h3>
 <div class="outline-text-3" id="text-5-8">
 
 <p>You'll need a user name and password for accessing the
@@ -840,7 +847,7 @@ <h3 id="sec-5-8"><span class="section-number-3">5.8</span> Profile - Install Wid
 </div>
 
 <div id="outline-container-5-9" class="outline-3">
-<h3 id="sec-5-9"><span class="section-number-3">5.9</span> Profile - Create Publication</h3>
+<h3 id="sec-5-9"><span class="section-number-3">5.9</span> Profile :: Create Publication</h3>
 <div class="outline-text-3" id="text-5-9">
 
 <p>This profile will create a publication for you, only asking you the
@@ -856,7 +863,7 @@ <h3 id="sec-5-9"><span class="section-number-3">5.9</span> Profile - Create Publ
 </div>
 
 <div id="outline-container-5-10" class="outline-3">
-<h3 id="sec-5-10"><span class="section-number-3">5.10</span> Profile - Monitoring Server</h3>
+<h3 id="sec-5-10"><span class="section-number-3">5.10</span> Profile :: Monitoring Server</h3>
 <div class="outline-text-3" id="text-5-10">
 
 <p>This will install a Munin gatherer and web server. The latter for
@@ -871,7 +878,7 @@ <h3 id="sec-5-10"><span class="section-number-3">5.10</span> Profile - Monitorin
 </div>
 
 <div id="outline-container-5-11" class="outline-3">
-<h3 id="sec-5-11"><span class="section-number-3">5.11</span> Profile - Restoring from backup</h3>
+<h3 id="sec-5-11"><span class="section-number-3">5.11</span> Profile :: Restoring from backup</h3>
 <div class="outline-text-3" id="text-5-11">
 
 <p>ece-install can restore from a backup made by the ece script:
@@ -903,7 +910,7 @@ <h3 id="sec-5-11"><span class="section-number-3">5.11</span> Profile - Restoring
 </div>
 
 <div id="outline-container-5-12" class="outline-3">
-<h3 id="sec-5-12"><span class="section-number-3">5.12</span> Profile - Analysis Server</h3>
+<h3 id="sec-5-12"><span class="section-number-3">5.12</span> Profile :: Analysis Server</h3>
 <div class="outline-text-3" id="text-5-12">
 
 <p>This profile will install the Escenic Analysis Engine and configure it
@@ -915,15 +922,110 @@ <h3 id="sec-5-12"><span class="section-number-3">5.12</span> Profile - Analysis
 </div>
 
 <div id="outline-container-5-13" class="outline-3">
-<h3 id="sec-5-13"><span class="section-number-3">5.13</span> Running interactively</h3>
+<h3 id="sec-5-13"><span class="section-number-3">5.13</span> Profile :: NFS server</h3>
 <div class="outline-text-3" id="text-5-13">
 
+<p>Will install an NFS server.
+</p>
+</div>
 
 </div>
 
-<div id="outline-container-5-13-1" class="outline-4">
-<h4 id="sec-5-13-1"><span class="section-number-4">5.13.1</span> Start ece-install and choose the Option, "Restore from backup"</h4>
-<div class="outline-text-4" id="text-5-13-1">
+<div id="outline-container-5-14" class="outline-3">
+<h3 id="sec-5-14"><span class="section-number-3">5.14</span> Profile :: NFS client</h3>
+<div class="outline-text-3" id="text-5-14">
+
+<p>Will install an NFS client, create all the mountpoints and mount these
+on the host.
+</p>
+</div>
+
+</div>
+
+<div id="outline-container-5-15" class="outline-3">
+<h3 id="sec-5-15"><span class="section-number-3">5.15</span> Profile :: VIP provider</h3>
+<div class="outline-text-3" id="text-5-15">
+
+
+<p>
+This profile will make the host capable of serving a certain virtual
+IP (VIP) for one or more services. This is a useful thing for all
+<a href="http://en.wikipedia.org/wiki/Single_point_of_failure">SPOFs</a> in your architecture, such as the file server or database.
+</p>
+<p>
+You will typically install another profile at the same time as the VIP
+provider. For instance, you will install both an NFS server and a VIP
+provider for that NFS server (and perhaps other services too running
+on the same host).
+</p>
+<p>
+The following ece-install.conf configuration will install an NFS
+server and make it a VIP provider exposing its NFS service. The two
+VIP providers have have the IP addresses 192.168.1.111 and
+192.168.1.112 and both provide the VIP 192.168.1.200
+</p>
+
+
+
+<pre class="src src-sh"><span style="color: #7f9f7f; font-style: italic;"># </span><span style="color: #7f9f7f; font-style: italic;">install the NFS server</span>
+<span style="color: #f0dfaf;">fai_enabled</span>=1
+<span style="color: #f0dfaf;">fai_nfs_server_install</span>=1
+<span style="color: #f0dfaf;">fai_nfs_export_list</span>=<span style="color: #ffa07a;">"/var/exports/multimedia"</span>
+<span style="color: #f0dfaf;">fai_nfs_allowed_client_network</span>=<span style="color: #ffa07a;">"192.168.1.0/255.255.255.0"</span>
+
+<span style="color: #7f9f7f; font-style: italic;"># </span><span style="color: #7f9f7f; font-style: italic;">install the VIP provider, primary node</span>
+<span style="color: #f0dfaf;">fai_vip_install</span>=1
+<span style="color: #f0dfaf;">fai_vip_service_list</span>=<span style="color: #ffa07a;">"nfs-kernel-server"</span>
+<span style="color: #f0dfaf;">fai_vip_primary_node_name</span>=ubiquitous
+<span style="color: #f0dfaf;">fai_vip_primary_node_ip</span>=192.168.1.112
+<span style="color: #f0dfaf;">fai_vip_primary_node_auth_key</span>=d41d8cd98f00b204e9800998ecf8427e
+<span style="color: #f0dfaf;">fai_vip_secondary_node_name</span>=ubiquitous-lts
+<span style="color: #f0dfaf;">fai_vip_secondary_node_ip</span>=192.168.1.111
+<span style="color: #f0dfaf;">fai_vip_address</span>=192.168.1.200
+<span style="color: #f0dfaf;">fai_vip_sibling_ip</span>=$<span style="color: #f0dfaf;">fai_vip_secondary_node_ip</span>
+</pre>
+
+
+<p>
+The secondary node, also an NFS VIP provider can have the exact same
+configuration except for having a different sibling:
+</p>
+
+
+
+<pre class="src src-sh"><span style="color: #f0dfaf;">fai_vip_sibling_ip</span>=$<span style="color: #f0dfaf;">fai_vip_primary_node_ip</span>
+</pre>
+
+
+<p>
+Note that the fai<sub>vip</sub><sub>primary</sub><sub>node</sub><sub>auth</sub><sub>key</sub> is optional. If not set,
+ece-install will generate it for you. However, you will then have to
+add this to ece-install.conf when installing the secondary
+node. Generate this key, do:
+</p>
+
+
+
+<pre class="src src-sh">$ dd <span style="color: #f0dfaf;">if</span>=/dev/urandom <span style="color: #f0dfaf;">bs</span>=512 <span style="color: #f0dfaf;">count</span>=1 2&gt;&gt; $<span style="color: #f0dfaf;">log</span> | <span style="color: #ffa07a;">\</span>
+    openssl md5 | <span style="color: #ffa07a;">\</span>
+    cut -d<span style="color: #ffa07a;">' '</span> -f2   
+</pre>
+
+
+</div>
+
+</div>
+
+<div id="outline-container-5-16" class="outline-3">
+<h3 id="sec-5-16"><span class="section-number-3">5.16</span> Running interactively</h3>
+<div class="outline-text-3" id="text-5-16">
+
+
+</div>
+
+<div id="outline-container-5-16-1" class="outline-4">
+<h4 id="sec-5-16-1"><span class="section-number-4">5.16.1</span> Start ece-install and choose the Option, "Restore from backup"</h4>
+<div class="outline-text-4" id="text-5-16-1">
 
 
 
@@ -936,9 +1038,9 @@ <h4 id="sec-5-13-1"><span class="section-number-4">5.13.1</span> Start ece-insta
 
 </div>
 
-<div id="outline-container-5-13-2" class="outline-4">
-<h4 id="sec-5-13-2"><span class="section-number-4">5.13.2</span> Select Which Backup to Restore</h4>
-<div class="outline-text-4" id="text-5-13-2">
+<div id="outline-container-5-16-2" class="outline-4">
+<h4 id="sec-5-16-2"><span class="section-number-4">5.16.2</span> Select Which Backup to Restore</h4>
+<div class="outline-text-4" id="text-5-16-2">
 
 
 
@@ -967,9 +1069,9 @@ <h4 id="sec-5-13-2"><span class="section-number-4">5.13.2</span> Select Which Ba
 
 </div>
 
-<div id="outline-container-5-13-3" class="outline-4">
-<h4 id="sec-5-13-3"><span class="section-number-4">5.13.3</span> Choose What to Restore</h4>
-<div class="outline-text-4" id="text-5-13-3">
+<div id="outline-container-5-16-3" class="outline-4">
+<h4 id="sec-5-16-3"><span class="section-number-4">5.16.3</span> Choose What to Restore</h4>
+<div class="outline-text-4" id="text-5-16-3">
 
 
 
@@ -987,9 +1089,9 @@ <h4 id="sec-5-13-3"><span class="section-number-4">5.13.3</span> Choose What to
 
 </div>
 
-<div id="outline-container-5-13-4" class="outline-4">
-<h4 id="sec-5-13-4"><span class="section-number-4">5.13.4</span> Sit Back and Watch ece-install Restore the Data for You</h4>
-<div class="outline-text-4" id="text-5-13-4">
+<div id="outline-container-5-16-4" class="outline-4">
+<h4 id="sec-5-16-4"><span class="section-number-4">5.16.4</span> Sit Back and Watch ece-install Restore the Data for You</h4>
+<div class="outline-text-4" id="text-5-16-4">
 
 
 
@@ -1007,9 +1109,9 @@ <h4 id="sec-5-13-4"><span class="section-number-4">5.13.4</span> Sit Back and Wa
 
 </div>
 
-<div id="outline-container-5-14" class="outline-3">
-<h3 id="sec-5-14"><span class="section-number-3">5.14</span> Running in FAI mode</h3>
-<div class="outline-text-3" id="text-5-14">
+<div id="outline-container-5-17" class="outline-3">
+<h3 id="sec-5-17"><span class="section-number-3">5.17</span> Running in FAI mode</h3>
+<div class="outline-text-3" id="text-5-17">
 
 <p>If you're running in FAI mode, you can choose between these settings
 to decide what to restore and where to find the backup file to
@@ -1023,12 +1125,12 @@ <h3 id="sec-5-14"><span class="section-number-3">5.14</span> Running in FAI mode
 <tr><th scope="col" class="left">Parameter</th><th scope="col" class="right">Default</th><th scope="col" class="left">Description</th></tr>
 </thead>
 <tbody>
-<tr><td class="left">fai_restore_all</td><td class="right">0</td><td class="left">Restore everything found in the backup file</td></tr>
-<tr><td class="left">fai_restore_db</td><td class="right">0</td><td class="left">Install the DB server &amp; restore its contents</td></tr>
-<tr><td class="left">fai_restore_data_files</td><td class="right">0</td><td class="left">Restore the Solr &amp; ECE data files</td></tr>
-<tr><td class="left">fai_restore_configuration</td><td class="right">0</td><td class="left">Restore the Solr &amp; ECE configuration files</td></tr>
-<tr><td class="left">fai_restore_software_binaries</td><td class="right">0</td><td class="left">Restore the Escenic and Apache Tomcat software</td></tr>
-<tr><td class="left">fai_restore_from_file</td><td class="right">""</td><td class="left">The .tar.gz produced by "ece -i &lt;instance&gt; backup"</td></tr>
+<tr><td class="left">fai<sub>restore</sub><sub>all</sub></td><td class="right">0</td><td class="left">Restore everything found in the backup file</td></tr>
+<tr><td class="left">fai<sub>restore</sub><sub>db</sub></td><td class="right">0</td><td class="left">Install the DB server &amp; restore its contents</td></tr>
+<tr><td class="left">fai<sub>restore</sub><sub>data</sub><sub>files</sub></td><td class="right">0</td><td class="left">Restore the Solr &amp; ECE data files</td></tr>
+<tr><td class="left">fai<sub>restore</sub><sub>configuration</sub></td><td class="right">0</td><td class="left">Restore the Solr &amp; ECE configuration files</td></tr>
+<tr><td class="left">fai<sub>restore</sub><sub>software</sub><sub>binaries</sub></td><td class="right">0</td><td class="left">Restore the Escenic and Apache Tomcat software</td></tr>
+<tr><td class="left">fai<sub>restore</sub><sub>from</sub><sub>file</sub></td><td class="right">""</td><td class="left">The .tar.gz produced by "ece -i &lt;instance&gt; backup"</td></tr>
 </tbody>
 </table>
 
@@ -1051,9 +1153,9 @@ <h3 id="sec-5-14"><span class="section-number-3">5.14</span> Running in FAI mode
 
 </div>
 
-<div id="outline-container-5-15" class="outline-3">
-<h3 id="sec-5-15"><span class="section-number-3">5.15</span> Data security</h3>
-<div class="outline-text-3" id="text-5-15">
+<div id="outline-container-5-18" class="outline-3">
+<h3 id="sec-5-18"><span class="section-number-3">5.18</span> Data security</h3>
+<div class="outline-text-3" id="text-5-18">
 
 <p>You should take heed when running restore, so that you're not
 restoring a system which you didn't want to change (yes, this mishap
@@ -1278,7 +1380,7 @@ <h3 id="sec-6-2"><span class="section-number-3">6.2</span> Setting up virtual ho
 
 <p>
 If you do not want ece-install to touch your /etc/hosts, you can set
-fai_keep_off_etc_hosts=1 in your ece-install.conf
+fai<sub>keep</sub><sub>off</sub><sub>etc</sub><sub>hosts</sub>=1 in your ece-install.conf
 </p>
 </div>
 
@@ -1299,57 +1401,58 @@ <h3 id="sec-6-3"><span class="section-number-3">6.3</span> Overview of All FAI P
 <tr><th scope="col" class="left">Parameter</th><th scope="col" class="left">Default</th><th scope="col" class="left">Description</th></tr>
 </thead>
 <tbody>
-<tr><td class="left">fai_all_install</td><td class="left">0</td><td class="left">Install all components on your server.</td></tr>
-<tr><td class="left">fai_analysis_db_port</td><td class="left">3306</td><td class="left">For the EAE DB (different from ECE's)</td></tr>
-<tr><td class="left">fai_analysis_db_host</td><td class="left">localhost</td><td class="left">For the EAE DB (different from ECE's)</td></tr>
-<tr><td class="left">fai_analysis_db_user</td><td class="left">ece5user</td><td class="left">For the EAE DB (different from ECE's)</td></tr>
-<tr><td class="left">fai_analysis_db_password</td><td class="left">read-the-source-luke</td><td class="left">For the EAE DB (different from ECE's)</td></tr>
-<tr><td class="left">fai_analysis_db_schema</td><td class="left">ece5db</td><td class="left">For the EAE DB (different from ECE's)</td></tr>
-<tr><td class="left">fai_analysis_port</td><td class="left">8080</td><td class="left">Port of the EAE</td></tr>
-<tr><td class="left">fai_analysis_shutdown</td><td class="left">8005</td><td class="left">Shutdown port for the EAE app server</td></tr>
-<tr><td class="left">fai_analysis_name</td><td class="left">analysis1</td><td class="left">EAE instance name</td></tr>
-<tr><td class="left">fai_cache_backends</td><td class="left">${HOSTNAME}:8080</td><td class="left">Space separated, e.g. "app1:8080 app2:8080"</td></tr>
-<tr><td class="left">fai_cache_install</td><td class="left">0</td><td class="left">Install cache server profile</td></tr>
-<tr><td class="left">fai_db_host</td><td class="left">$HOSTNAME</td><td class="left">Useful for editor &amp; presentation profiles</td></tr>
-<tr><td class="left">fai_db_drop_old_db_first</td><td class="left">0</td><td class="left">Warning: this will drop the old database before installing a new one</td></tr>
-<tr><td class="left">fai_db_install</td><td class="left">0</td><td class="left">Install db profile</td></tr>
-<tr><td class="left">fai_db_password</td><td class="left">read-the-source-luke</td><td class="left">Useful for DB installation profile</td></tr>
-<tr><td class="left">fai_db_port</td><td class="left">3306</td><td class="left">Useful for editor &amp; presentation profiles</td></tr>
-<tr><td class="left">fai_db_schema</td><td class="left">ece5db</td><td class="left">Useful for DB installation profile</td></tr>
-<tr><td class="left">fai_db_user</td><td class="left">ece5user</td><td class="left">Useful for DB installation profile</td></tr>
-<tr><td class="left">fai_editor_conf_archive</td><td class="left">""</td><td class="left">conf.tar.gz to use for Nursery &amp; JAAS configuration</td></tr>
-<tr><td class="left">fai_editor_ear</td><td class="left">""</td><td class="left">EAR to use instead of the Escenic binaries</td></tr>
-<tr><td class="left">fai_editor_install</td><td class="left">0</td><td class="left">Install the editorial profile</td></tr>
-<tr><td class="left">fai_editor_name</td><td class="left">editor1</td><td class="left">Name of the editor instance</td></tr>
-<tr><td class="left">fai_editor_port</td><td class="left">8080</td><td class="left">HTTP port of the editor instance</td></tr>
-<tr><td class="left">fai_editor_shutdown</td><td class="left">8005</td><td class="left">Shutdown port of the editor instance</td></tr>
-<tr><td class="left">fai_enabled</td><td class="left">0</td><td class="left">Whether or not to run ece-install in FAI mode</td></tr>
-<tr><td class="left">fai_monitoring_server_install</td><td class="left">0</td><td class="left">Install the monitoring server profile.</td></tr>
-<tr><td class="left">fai_monitoring_server_ip</td><td class="left">127.0.0.1</td><td class="left">The IP of the monitoring server.</td></tr>
-<tr><td class="left">fai_presentation_conf_archive</td><td class="left">""</td><td class="left">conf.tar.gz to use for Nursery &amp; JAAS configuration</td></tr>
-<tr><td class="left">fai_presentation_ear</td><td class="left">""</td><td class="left">EAR to use instead of the Escenic binaries</td></tr>
-<tr><td class="left">fai_presentation_install</td><td class="left">0</td><td class="left">Install the presentation server profile</td></tr>
-<tr><td class="left">fai_presentation_name</td><td class="left">web1</td><td class="left">Name of the presentation server instance</td></tr>
-<tr><td class="left">fai_presentation_port</td><td class="left">8080</td><td class="left">HTTP port of the presentation server instance</td></tr>
-<tr><td class="left">fai_presentation_shutdown</td><td class="left">8005</td><td class="left">Shutdown port of the presentation instance</td></tr>
-<tr><td class="left">fai_public_host_name</td><td class="left">${HOSTNAME}:8080</td><td class="left">The public address for your website</td></tr>
-<tr><td class="left">fai_publication_create</td><td class="left">0</td><td class="left">Create a new publication</td></tr>
-<tr><td class="left">fai_publication_name</td><td class="left">mypub</td><td class="left">Name of the publication</td></tr>
-<tr><td class="left">fai_publication_use_instance</td><td class="left">dev1</td><td class="left">Name of local instance to use for creation</td></tr>
-<tr><td class="left">fai_publication_war</td><td class="left">"WF or ECE demo WAR"</td><td class="left">WAR to base the new publication on</td></tr>
-<tr><td class="left">fai_publication_war_uri_list</td><td class="left">""</td><td class="left">Publication WARs used for setting up Assembly tool. Supported: http[s]://tmp.com/mypub.war, <a href="file:////tmp/mypub.war">///tmp/mypub.war</a> and /tmp/mypub.war.</td></tr>
-<tr><td class="left">fai_publication_domain_mapping_list</td><td class="left">""</td><td class="left">Mapping between publication names and their corresponding domains on the form: "one#one.com other#other.com"</td></tr>
-<tr><td class="left">fai_rmi_install</td><td class="left">0</td><td class="left">Install RMI hub profile</td></tr>
-<tr><td class="left">fai_search_conf_archive</td><td class="left">""</td><td class="left">conf.tar.gz to use for Nursery &amp; JAAS configuration</td></tr>
-<tr><td class="left">fai_search_ear</td><td class="left">""</td><td class="left">EAR to use instead of the Escenic binaries</td></tr>
-<tr><td class="left">fai_search_for_editor</td><td class="left">0</td><td class="left">If 1 (true), will configure Solr for use with an editorial server, if not conf for presentation servers will be chosen.</td></tr>
-<tr><td class="left">fai_search_indexer_ws_uri</td><td class="left"><a href="http://${HOSTNAME}:8080/indexer-webservice/index/">http://${HOSTNAME}:8080/indexer-webservice/index/</a></td><td class="left">URI of the indexer-webservice that the search instance shall use for knowing what to index.</td></tr>
-<tr><td class="left">fai_search_install</td><td class="left">0</td><td class="left">Install the search server profile (Solr + indexer)</td></tr>
-<tr><td class="left">fai_search_name</td><td class="left">search1</td><td class="left">Name of the search instance</td></tr>
-<tr><td class="left">fai_search_port</td><td class="left">8080</td><td class="left">HTTP port of the search instance</td></tr>
-<tr><td class="left">fai_search_shutdown</td><td class="left">8005</td><td class="left">Shutdown port of the search instance</td></tr>
-<tr><td class="left">fai_keep_off_etc_hosts</td><td class="left">0</td><td class="left">Set this to 1 if you don't want ece-install adding entries to /etc/hosts</td></tr>
-<tr><td class="left">fai_wf_install</td><td class="left">0</td><td class="left">Install Widget Framework profile</td></tr>
+<tr><td class="left">fai<sub>all</sub><sub>install</sub></td><td class="left">0</td><td class="left">Install all components on your server.</td></tr>
+<tr><td class="left">fai<sub>analysis</sub><sub>db</sub><sub>host</sub></td><td class="left">localhost</td><td class="left">For the EAE DB (different from ECE's)</td></tr>
+<tr><td class="left">fai<sub>analysis</sub><sub>db</sub><sub>install</sub></td><td class="left">0</td><td class="left">Install db profile</td></tr>
+<tr><td class="left">fai<sub>analysis</sub><sub>db</sub><sub>password</sub></td><td class="left">read-the-source-luke</td><td class="left">For the EAE DB (different from ECE's)</td></tr>
+<tr><td class="left">fai<sub>analysis</sub><sub>db</sub><sub>port</sub></td><td class="left">3306</td><td class="left">For the EAE DB (different from ECE's)</td></tr>
+<tr><td class="left">fai<sub>analysis</sub><sub>db</sub><sub>schema</sub></td><td class="left">ece5db</td><td class="left">For the EAE DB (different from ECE's)</td></tr>
+<tr><td class="left">fai<sub>analysis</sub><sub>db</sub><sub>user</sub></td><td class="left">ece5user</td><td class="left">For the EAE DB (different from ECE's)</td></tr>
+<tr><td class="left">fai<sub>analysis</sub><sub>name</sub></td><td class="left">analysis1</td><td class="left">EAE instance name</td></tr>
+<tr><td class="left">fai<sub>analysis</sub><sub>port</sub></td><td class="left">8080</td><td class="left">Port of the EAE</td></tr>
+<tr><td class="left">fai<sub>analysis</sub><sub>shutdown</sub></td><td class="left">8005</td><td class="left">Shutdown port for the EAE app server</td></tr>
+<tr><td class="left">fai<sub>cache</sub><sub>backends</sub></td><td class="left">${HOSTNAME}:8080</td><td class="left">Space separated, e.g. "app1:8080 app2:8080"</td></tr>
+<tr><td class="left">fai<sub>cache</sub><sub>install</sub></td><td class="left">0</td><td class="left">Install cache server profile</td></tr>
+<tr><td class="left">fai<sub>db</sub><sub>drop</sub><sub>old</sub><sub>db</sub><sub>first</sub></td><td class="left">0</td><td class="left">Warning: this will drop the old database before installing a new one</td></tr>
+<tr><td class="left">fai<sub>db</sub><sub>host</sub></td><td class="left">$HOSTNAME</td><td class="left">Useful for editor &amp; presentation profiles</td></tr>
+<tr><td class="left">fai<sub>db</sub><sub>install</sub></td><td class="left">0</td><td class="left">Install db profile</td></tr>
+<tr><td class="left">fai<sub>db</sub><sub>password</sub></td><td class="left">read-the-source-luke</td><td class="left">Useful for DB installation profile</td></tr>
+<tr><td class="left">fai<sub>db</sub><sub>port</sub></td><td class="left">3306</td><td class="left">Useful for editor &amp; presentation profiles</td></tr>
+<tr><td class="left">fai<sub>db</sub><sub>schema</sub></td><td class="left">ece5db</td><td class="left">Useful for DB installation profile</td></tr>
+<tr><td class="left">fai<sub>db</sub><sub>user</sub></td><td class="left">ece5user</td><td class="left">Useful for DB installation profile</td></tr>
+<tr><td class="left">fai<sub>editor</sub><sub>conf</sub><sub>archive</sub></td><td class="left">""</td><td class="left">conf.tar.gz to use for Nursery &amp; JAAS configuration</td></tr>
+<tr><td class="left">fai<sub>editor</sub><sub>ear</sub></td><td class="left">""</td><td class="left">EAR to use instead of the Escenic binaries</td></tr>
+<tr><td class="left">fai<sub>editor</sub><sub>install</sub></td><td class="left">0</td><td class="left">Install the editorial profile</td></tr>
+<tr><td class="left">fai<sub>editor</sub><sub>name</sub></td><td class="left">editor1</td><td class="left">Name of the editor instance</td></tr>
+<tr><td class="left">fai<sub>editor</sub><sub>port</sub></td><td class="left">8080</td><td class="left">HTTP port of the editor instance</td></tr>
+<tr><td class="left">fai<sub>editor</sub><sub>shutdown</sub></td><td class="left">8005</td><td class="left">Shutdown port of the editor instance</td></tr>
+<tr><td class="left">fai<sub>enabled</sub></td><td class="left">0</td><td class="left">Whether or not to run ece-install in FAI mode</td></tr>
+<tr><td class="left">fai<sub>keep</sub><sub>off</sub><sub>etc</sub><sub>hosts</sub></td><td class="left">0</td><td class="left">Set this to 1 if you don't want ece-install adding entries to /etc/hosts</td></tr>
+<tr><td class="left">fai<sub>monitoring</sub><sub>server</sub><sub>install</sub></td><td class="left">0</td><td class="left">Install the monitoring server profile.</td></tr>
+<tr><td class="left">fai<sub>monitoring</sub><sub>server</sub><sub>ip</sub></td><td class="left">127.0.0.1</td><td class="left">The IP of the monitoring server.</td></tr>
+<tr><td class="left">fai<sub>presentation</sub><sub>conf</sub><sub>archive</sub></td><td class="left">""</td><td class="left">conf.tar.gz to use for Nursery &amp; JAAS configuration</td></tr>
+<tr><td class="left">fai<sub>presentation</sub><sub>ear</sub></td><td class="left">""</td><td class="left">EAR to use instead of the Escenic binaries</td></tr>
+<tr><td class="left">fai<sub>presentation</sub><sub>install</sub></td><td class="left">0</td><td class="left">Install the presentation server profile</td></tr>
+<tr><td class="left">fai<sub>presentation</sub><sub>name</sub></td><td class="left">web1</td><td class="left">Name of the presentation server instance</td></tr>
+<tr><td class="left">fai<sub>presentation</sub><sub>port</sub></td><td class="left">8080</td><td class="left">HTTP port of the presentation server instance</td></tr>
+<tr><td class="left">fai<sub>presentation</sub><sub>shutdown</sub></td><td class="left">8005</td><td class="left">Shutdown port of the presentation instance</td></tr>
+<tr><td class="left">fai<sub>public</sub><sub>host</sub><sub>name</sub></td><td class="left">${HOSTNAME}:8080</td><td class="left">The public address for your website</td></tr>
+<tr><td class="left">fai<sub>publication</sub><sub>create</sub></td><td class="left">0</td><td class="left">Create a new publication</td></tr>
+<tr><td class="left">fai<sub>publication</sub><sub>domain</sub><sub>mapping</sub><sub>list</sub></td><td class="left">""</td><td class="left">Mapping between publication names and their corresponding domains on the form: "one#one.com other#other.com"</td></tr>
+<tr><td class="left">fai<sub>publication</sub><sub>name</sub></td><td class="left">mypub</td><td class="left">Name of the publication</td></tr>
+<tr><td class="left">fai<sub>publication</sub><sub>use</sub><sub>instance</sub></td><td class="left">dev1</td><td class="left">Name of local instance to use for creation</td></tr>
+<tr><td class="left">fai<sub>publication</sub><sub>war</sub></td><td class="left">"WF or ECE demo WAR"</td><td class="left">WAR to base the new publication on</td></tr>
+<tr><td class="left">fai<sub>publication</sub><sub>war</sub><sub>uri</sub><sub>list</sub></td><td class="left">""</td><td class="left">Publication WARs used for setting up Assembly tool. Supported: http[s]://tmp.com/mypub.war, <a href="file:////tmp/mypub.war">///tmp/mypub.war</a> and /tmp/mypub.war.</td></tr>
+<tr><td class="left">fai<sub>rmi</sub><sub>install</sub></td><td class="left">0</td><td class="left">Install RMI hub profile</td></tr>
+<tr><td class="left">fai<sub>search</sub><sub>conf</sub><sub>archive</sub></td><td class="left">""</td><td class="left">conf.tar.gz to use for Nursery &amp; JAAS configuration</td></tr>
+<tr><td class="left">fai<sub>search</sub><sub>ear</sub></td><td class="left">""</td><td class="left">EAR to use instead of the Escenic binaries</td></tr>
+<tr><td class="left">fai<sub>search</sub><sub>for</sub><sub>editor</sub></td><td class="left">0</td><td class="left">If 1 (true), will configure Solr for use with an editorial server, if not conf for presentation servers will be chosen.</td></tr>
+<tr><td class="left">fai<sub>search</sub><sub>indexer</sub><sub>ws</sub><sub>uri</sub></td><td class="left"><a href="http://${HOSTNAME}:8080/indexer-webservice/index/">http://${HOSTNAME}:8080/indexer-webservice/index/</a></td><td class="left">URI of the indexer-webservice that the search instance shall use for knowing what to index.</td></tr>
+<tr><td class="left">fai<sub>search</sub><sub>install</sub></td><td class="left">0</td><td class="left">Install the search server profile (Solr + indexer)</td></tr>
+<tr><td class="left">fai<sub>search</sub><sub>name</sub></td><td class="left">search1</td><td class="left">Name of the search instance</td></tr>
+<tr><td class="left">fai<sub>search</sub><sub>port</sub></td><td class="left">8080</td><td class="left">HTTP port of the search instance</td></tr>
+<tr><td class="left">fai<sub>search</sub><sub>shutdown</sub></td><td class="left">8005</td><td class="left">Shutdown port of the search instance</td></tr>
+<tr><td class="left">fai<sub>wf</sub><sub>install</sub></td><td class="left">0</td><td class="left">Install Widget Framework profile</td></tr>
 </tbody>
 </table>
 
@@ -1493,11 +1596,11 @@ <h2 id="sec-8"><span class="section-number-2">8</span> Re-running ece-install (a
 <a href="http://technet.escenic.com">http://technet.escenic.com</a> and <a href="http://tomcat.apache.org">http://tomcat.apache.org</a> search for the
 following variables:
 </p><ul>
-<li>technet_download_list
+<li>technet<sub>download</sub><sub>list</sub>
 </li>
-<li>wf_download_list
+<li>wf<sub>download</sub><sub>list</sub>
 </li>
-<li>tomcat_download
+<li>tomcat<sub>download</sub>
 </li>
 </ul>
 
@@ -1559,8 +1662,8 @@ <h2 id="sec-10"><span class="section-number-2">10</span> Overview of File Paths
 <tr><td class="left">/opt/escenic/assemblytool</td><td class="left">The assembly tool</td></tr>
 <tr><td class="left">/opt/escenic/assemblytool/plugins</td><td class="left">Contains symlinks to all plugins in /opt/escenic</td></tr>
 <tr><td class="left">/opt/escenic/engine</td><td class="left">Symlink pointing to the current ECE</td></tr>
-<tr><td class="left">/opt/tomcat</td><td class="left">Symlink pointing to the install Apache Tomcat (catalina_home)</td></tr>
-<tr><td class="left">/opt/tomcat-&lt;instance&gt;</td><td class="left">Instance specific Tomcat files (catalina_base)</td></tr>
+<tr><td class="left">/opt/tomcat</td><td class="left">Symlink pointing to the install Apache Tomcat (catalina<sub>home</sub>)</td></tr>
+<tr><td class="left">/opt/tomcat-&lt;instance&gt;</td><td class="left">Instance specific Tomcat files (catalina<sub>base</sub>)</td></tr>
 <tr><td class="left">/usr/bin/ece</td><td class="left">Script for operating all ECE instances + RMI hub and EAE</td></tr>
 <tr><td class="left">/usr/sbin/drop-and-create-ecedb</td><td class="left">DB script used by the ece-install script</td></tr>
 <tr><td class="left">/usr/sbin/ece-install</td><td class="left">The installation script described in this guide</td></tr>
@@ -1710,12 +1813,16 @@ <h2 id="sec-13"><span class="section-number-2">13</span> Assumptions</h2>
 </div>
 
 <div id="outline-container-13-1" class="outline-3">
-<h3 id="sec-13-1"><span class="section-number-3">13.1</span> /etc/esecenic is shared</h3>
+<h3 id="sec-13-1"><span class="section-number-3">13.1</span> The machine on which ece-install has enough RAM</h3>
 <div class="outline-text-3" id="text-13-1">
 
-<p>It's assumed that the /etc/escenic directory is either on a shared
-file system or rsync-ed among the hosts that are running the ECE
-instances (the exception being database and cache servers).
+<p>It is assumed that the machine on which ece-install has enough RAM to
+install the profiles the user asks for.
+</p>
+<p>
+A common error by users, is to run ece-install in a (virtual) machine
+that has e.g. only 1GB RAM. For happy running, we recommend having a
+machine with at least 3GB when installing a full ECE stack on it.
 </p>
 </div>
 </div>
@@ -1733,7 +1840,7 @@ <h2 id="sec-14"><span class="section-number-2">14</span> Uninstalling Everything
 different profile.
 </p>
 <p>
-Open the ece-install script and look for the "un_install_ece"
+Open the ece-install script and look for the "un<sub>install</sub><sub>ece</sub>"
 function, it has copy and pastable commands for undoing most/all
 things set up by the script.
 </p>
@@ -1814,7 +1921,7 @@ <h2 id="sec-15"><span class="section-number-2">15</span> Example Output FAI</h2>
 <hr/>
 <p class="author">
   Author: Torstein Krause Johansen (<a href="mailto:tkj@vizrt.com">tkj@vizrt.com</a>)
-  Date: 2012-02-28 18:55:47 CST
+  Date: 2012-03-08 15:10:00 CST
 </p>
 </div>
 </body>

From d42ed571b297a8623c24e5fedc7d41b039ba2036 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 8 Mar 2012 15:26:51 +0800
Subject: [PATCH 0487/2585] - removed >>log in auth key generation example

---
 usr/share/doc/escenic/ece-install-guide.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 35c0ce2f..7cf18563 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -365,7 +365,7 @@ add this to ece-install.conf when installing the secondary
 node. Generate this key, do:
 
 #+BEGIN_SRC sh
-$ dd if=/dev/urandom bs=512 count=1 2>> $log | \
+$ dd if=/dev/urandom bs=512 count=1 | \
     openssl md5 | \
     cut -d' ' -f2   
 #+END_SRC

From d69ac823a7b609c549c784760b80bf3714d7362e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 8 Mar 2012 18:02:07 +0800
Subject: [PATCH 0488/2585] - first implementation of client/server replication
 master/slave. #45

---
 .../ece-scripts/ece-install.d/database.sh     | 109 ++++++++++++++++++
 1 file changed, 109 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index dfee59bf..419bf886 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -100,6 +100,17 @@ function install_database_server()
     set_up_engine_and_plugins
     set_up_ecedb
   fi
+
+  if [ $db_replication -eq 1 ]; then
+    if [ $db_master -eq 1 ]; then
+      create_replication_user
+    fi
+    configure_mysql_for_replication
+
+    if [ $db_master -eq 0 ]; then
+      set_slave_to_replicate_master
+    fi
+  fi
 }
 
 function set_up_ecedb()
@@ -179,6 +190,18 @@ function set_db_settings_from_fai_conf()
       print_and_log "$(yellow WARNING): fai_db_drop_old_db_first is 1 (true)"
     fi
   fi
+  
+  # replication is only available in FAI mode
+  db_replication=${fai_db_replication-0}
+  db_replication_user=${fai_db_replication_user-replicationuser}
+  db_replication_password=${fai_db_replication_password-replicationpassword}
+  
+  db_master=${fai_db_master-0}
+  db_master_host=${fai_db_master_host}
+  db_master_log_file=${fai_db_master_log_file}
+  db_master_log_position=${fai_db_master_log_position}
+  
+  # TODO assert set
 }
 
 # Method used both from interactive mode to set any missing values
@@ -204,5 +227,91 @@ function set_db_defaults_if_not_set()
   if [ -z "$db_schema" ]; then
     db_schema=${default_db_schema}
   fi
+
+}
+
+function create_replication_user() {
+  print_and_log "Creating replication user $db_replication_user ..."
+  mysql -u $db_user -p${db_password} <<EOF
+grant replication slave on *.* to '${db_replication_user}'@'%' identified by '${db_replication_password}';
+flush privileges;
+quit;
+EOF
+}
+
+function configure_mysql_for_replication() {
+  print_and_log "Configuring DB for replication ..."
+  
+  local file=/etc/mysql/my.cnf
+
+  # On old versions of MySQL/Percona, this file isn't there by
+  # default, although it's read from /etc/init.d/mysql
+  if [ ! -e $file ]; then
+    cat > $file <<EOF
+[mysqld]
+EOF
+  fi
+
+  # server ID
+  local old="#server-id.*= 1"
+
+  if [ $db_master -eq 1 ]; then
+    local new="server-id = 1"
+  else
+    local new="server-id = 2"
+  fi
+
+  if [ $(grep "$old" $file | wc -l) -gt 0 ]; then
+    sed -i "s#$old#$new#g" $file
+  else
+    echo "$new" >> $file
+  fi
+
+  run /etc/init.d/mysql restart
+
+  # replication log configuration of the master
+  if [ $db_master -eq 1 ]; then
+    old="bind-address.*= 127.0.0.1"
+    new="# bind-address = 127.0.0.1"
+    if [ $(grep "$old" $file | wc -l) -gt 0 ]; then
+      sed -i "s#$old#$new#g" $file
+    else
+      echo "$new" >> $file
+    fi
+    
+    
+    old="#log_bin.*= /var/log/mysql/mysql-bin.log"
+    new="log_bin = /var/log/mysql/mysql-bin.log"
+    if [ $(grep "$old" $file | wc -l) -gt 0 ]; then
+      sed -i "s#$old#$new#g" $file
+    else
+      echo "$new" >> $file
+    fi
+      
+    old="#binlog_do_db.* =.*"
+    new="binlog_do_db = ${db_schema}"
+
+    if [ $(grep "$old" $file | wc -l) -gt 0 ]; then
+      sed -i "s#$old#$new#g" $file
+    else
+      echo "$new" >> $file
+    fi
+  fi
 }
 
+function set_slave_to_replicate_master() {
+  print_and_log "Setting slave to replicate master DB @ $db_master_host ..."
+  mysql ${db_schema} <<EOF 
+change master to
+  master_host='${db_master_host}',
+  master_user='${db_replication_user}',
+  master_password='${db_replication_password}',
+  master_log_file='${db_master_log_file}',
+  master_log_pos=${db_master_log_position}
+;
+
+start slave;
+EOF
+}
+
+  

From 34cdfcece43f0cdb33274314d00c319c4c9e74a6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 8 Mar 2012 18:22:00 +0800
Subject: [PATCH 0489/2585] - minor bug fixes to
 configure_mysql_for_replication

---
 .../escenic/ece-scripts/ece-install.d/database.sh      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 419bf886..8d8bf6b6 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -232,7 +232,7 @@ function set_db_defaults_if_not_set()
 
 function create_replication_user() {
   print_and_log "Creating replication user $db_replication_user ..."
-  mysql -u $db_user -p${db_password} <<EOF
+  mysql <<EOF
 grant replication slave on *.* to '${db_replication_user}'@'%' identified by '${db_replication_password}';
 flush privileges;
 quit;
@@ -262,7 +262,7 @@ EOF
   fi
 
   if [ $(grep "$old" $file | wc -l) -gt 0 ]; then
-    sed -i "s#$old#$new#g" $file
+    sed -i "s~$old~$new~g" $file
   else
     echo "$new" >> $file
   fi
@@ -274,7 +274,7 @@ EOF
     old="bind-address.*= 127.0.0.1"
     new="# bind-address = 127.0.0.1"
     if [ $(grep "$old" $file | wc -l) -gt 0 ]; then
-      sed -i "s#$old#$new#g" $file
+      sed -i "s~$old~$new~g" $file
     else
       echo "$new" >> $file
     fi
@@ -283,7 +283,7 @@ EOF
     old="#log_bin.*= /var/log/mysql/mysql-bin.log"
     new="log_bin = /var/log/mysql/mysql-bin.log"
     if [ $(grep "$old" $file | wc -l) -gt 0 ]; then
-      sed -i "s#$old#$new#g" $file
+      sed -i "s~$old~$new~g" $file
     else
       echo "$new" >> $file
     fi
@@ -292,7 +292,7 @@ EOF
     new="binlog_do_db = ${db_schema}"
 
     if [ $(grep "$old" $file | wc -l) -gt 0 ]; then
-      sed -i "s#$old#$new#g" $file
+      sed -i "s~$old~$new~g" $file
     else
       echo "$new" >> $file
     fi

From 44a8967d7ad9adbe85eb9da794bc9ef1892cf2cb Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 13 Mar 2012 19:00:17 +0800
Subject: [PATCH 0490/2585] - improved add_next_step to accept multiple
 arguments

---
 usr/sbin/ece-install | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 9b127f68..75d4edad 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -722,13 +722,13 @@ function add_apt_source() {
 # $1 : your added line
 function add_next_step()
 {
-    next_steps[${#next_steps[@]}]="${1}"
+    next_steps[${#next_steps[@]}]="$@"
     return
     
     if [ -n "$next_steps" ]; then
         next_steps=${next_steps}$'\n'"[$(basename $0)] "${1}
     else
-        next_steps="[$(basename $0)] "${1}
+        next_steps="[$(basename $0)] $@"
     fi
 }
 

From e3679849ef5d451bc92528ff7cba9ceccc0c050e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 13 Mar 2012 19:32:40 +0800
Subject: [PATCH 0491/2585] - fix to create_replication_user - hardening when
 re-running the DB profile several times with   replication settings.

  Issue #45
---
 .../ece-scripts/ece-install.d/database.sh     | 40 +++++++++++--------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 8d8bf6b6..cb2206f5 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -12,7 +12,7 @@ fi
 ##     the ECE DB schema is not set up. 
 function install_database_server()
 {
-  print_and_log "Installing the database server on $HOSTNAME ..."
+  print_and_log "Installing database server on $HOSTNAME ..."
 
   source $(dirname $0)/drop-and-create-ecedb
 
@@ -232,10 +232,9 @@ function set_db_defaults_if_not_set()
 
 function create_replication_user() {
   print_and_log "Creating replication user $db_replication_user ..."
-  mysql <<EOF
+  mysql ${db_schema} <<EOF
 grant replication slave on *.* to '${db_replication_user}'@'%' identified by '${db_replication_password}';
 flush privileges;
-quit;
 EOF
 }
 
@@ -261,8 +260,8 @@ EOF
     local new="server-id = 2"
   fi
 
-  if [ $(grep "$old" $file | wc -l) -gt 0 ]; then
-    sed -i "s~$old~$new~g" $file
+  if [ $(grep ^"$old" $file | wc -l) -gt 0 ]; then
+    sed -i "s~^$old~$new~g" $file
   else
     echo "$new" >> $file
   fi
@@ -273,32 +272,39 @@ EOF
   if [ $db_master -eq 1 ]; then
     old="bind-address.*= 127.0.0.1"
     new="# bind-address = 127.0.0.1"
-    if [ $(grep "$old" $file | wc -l) -gt 0 ]; then
-      sed -i "s~$old~$new~g" $file
-    else
-      echo "$new" >> $file
+    if [ $(grep ^"${old}" $file | wc -l) -gt 0 ]; then
+      sed -i "s~^${old}~$new~g" $file
     fi
     
-    
     old="#log_bin.*= /var/log/mysql/mysql-bin.log"
     new="log_bin = /var/log/mysql/mysql-bin.log"
-    if [ $(grep "$old" $file | wc -l) -gt 0 ]; then
-      sed -i "s~$old~$new~g" $file
-    else
+    if [ $(grep ^"$old" $file | wc -l) -gt 0 ]; then
+      sed -i "s~^${old}~${new}~g" $file
+    elif [ $(grep ^$new $file | wc -l) -lt 1 ]; then
       echo "$new" >> $file
     fi
       
-    old="#binlog_do_db.* =.*"
+    old="#binlog_do_db.*=.*"
     new="binlog_do_db = ${db_schema}"
 
-    if [ $(grep "$old" $file | wc -l) -gt 0 ]; then
-      sed -i "s~$old~$new~g" $file
-    else
+    if [ $(grep ^"$old" $file | wc -l) -gt 0 ]; then
+      sed -i "s~^${old}~${new}~g" $file
+    elif [ $(grep ^$new $file | wc -l) -lt 1 ]; then
       echo "$new" >> $file
     fi
+    
+    # report the needed settings for a slave
+    local master_status=$(mysql $db_schema -e "show master status" | tail -1)
+    local file=$(echo $master_status | cut -d' ' -f1)
+    local position=$(echo $master_status | cut -d' ' -f2)
+    add_next_step "ece-install.conf for slave: fai_db_master_log_file=$file"
+    add_next_step "ece-install.conf for slave:" \
+      fai_db_master_log_position=$position
   fi
 }
 
+
+
 function set_slave_to_replicate_master() {
   print_and_log "Setting slave to replicate master DB @ $db_master_host ..."
   mysql ${db_schema} <<EOF 

From 5eb07335ce64c383866f72bd2c2987abbec7e379 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 13 Mar 2012 19:33:00 +0800
Subject: [PATCH 0492/2585] - added section on adding DB replication support,
 issue #45

---
 usr/share/doc/escenic/ece-install-guide.org | 41 +++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 7cf18563..ade45951 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -218,6 +218,47 @@ ERROR 1007 (HY000) at line 1: Can't create database 'ece5db'; database exists
 ERROR 1050 (42S01) at line 2: Table 'DBChangeLog' already exists
 [ece-install] running tables FAILED, exiting :-(
 #+END_SRC
+If you for some reason wish to make ece-install drop the DB fro you
+before creating a new one, you can set
+#+BEGIN_SRC sh
+  fai_db_drop_old_db_first=1
+#+END_SRC
+
+*** Master & slave setup
+It's easy to set up master and slave DBs, here's how you'd configure
+ece-install to install these:
+
+On the master, create an ece-install.conf with:
+#+BEGIN_SRC sh
+fai_enabled=1
+fai_db_install=1
+fai_db_master=1
+fai_db_replication=1
+#+END_SRC
+
+The script will itself output some replication log settings you need
+for the slave:
+#+BEGIN_SRC sh
+[ece-install-35] - DB is now set up on localhost:3306
+[ece-install-35] - ece-install.conf for slave: fai_db_master_log_file=mysql-bin.000013
+[ece-install-35] - ece-install.conf for slave: fai_db_master_log_position=106
+#+END_SRC
+
+Once this is done, create and use an ece-install.conf on the slave
+with this:
+#+BEGIN_SRC sh
+fai_enabled=1
+fai_db_install=1
+fai_db_replication=1
+fai_db_master=0
+fai_db_master_host=my-db-master
+fai_db_master_log_file=mysql-bin.000013
+fai_db_master_log_position=106
+#+END_SRC
+
+The script will set up and use the replication user & credentials with
+default values, if you wish to override these, have a look in the FAI
+parameter overview.
 
 ** Profile :: Cache Server
 If ece-install is run on a support version of Debian or Ubuntu, it

From 3c571ba29fe2f0264bdf0c19beb7a9d18d4e83c5 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 14 Mar 2012 15:05:14 +0800
Subject: [PATCH 0493/2585] - moved control files to package specific location

---
 .../debian/{DEBIAN => escenic-content-engine-installer}/control   | 0
 .../debian/{DEBIAN => escenic-content-engine-installer}/postinst  | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename usr/local/src/debian/{DEBIAN => escenic-content-engine-installer}/control (100%)
 rename usr/local/src/debian/{DEBIAN => escenic-content-engine-installer}/postinst (100%)

diff --git a/usr/local/src/debian/DEBIAN/control b/usr/local/src/debian/escenic-content-engine-installer/control
similarity index 100%
rename from usr/local/src/debian/DEBIAN/control
rename to usr/local/src/debian/escenic-content-engine-installer/control
diff --git a/usr/local/src/debian/DEBIAN/postinst b/usr/local/src/debian/escenic-content-engine-installer/postinst
similarity index 100%
rename from usr/local/src/debian/DEBIAN/postinst
rename to usr/local/src/debian/escenic-content-engine-installer/postinst

From 8d3bc769a15e8108677207b5c6f242915f0d48e3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 14 Mar 2012 15:05:25 +0800
Subject: [PATCH 0494/2585] - can now build different packages

---
 usr/local/src/create-packages | 110 +++++++++++++++++++++-------------
 1 file changed, 69 insertions(+), 41 deletions(-)

diff --git a/usr/local/src/create-packages b/usr/local/src/create-packages
index 89f2056f..412f5704 100644
--- a/usr/local/src/create-packages
+++ b/usr/local/src/create-packages
@@ -5,60 +5,88 @@
 
 # by tkj@vizrt.com
 
-rm -rf debian/{etc,usr}
-
-target_dir=debian
+target_dir=target
 package_name=escenic-content-engine-installer
+package_version=$(date +%s)
 
-function get_version()
-{
-    engine_file=$(grep http ../../sbin/ece-install | grep "/engine")
-    version=$(basename $engine_file .zip | cut -d'-' -f2)
-    echo $version
+function clean_up() {
+  rm -rf $target_dir
 }
 
-function get_name()
-{
-    name=$(grep $USER /etc/passwd | cut -d':' -f5 | cut -d',' -f1)
-    echo "${name}"
+function get_user_options() {
+  while getopts ":p:r:" opt; do
+    case $opt in
+      r)
+        package_version=${OPTARG}
+        ;;
+      p)
+        echo "-p was triggered, Parameter: $OPTARG" >&2
+        package_name=${OPTARG}
+        ;;
+      \?)
+        echo "Invalid option: -$OPTARG" >&2
+        exit 1
+        ;;
+      :)
+        echo "Option -$OPTARG requires an argument." >&2
+        exit 1
+        ;;
+    esac
+  done
+  
 }
 
-function get_email()
-{
-    echo ${USER}@${HOSTNAME}
+function set_up_target_directory() {
+  mkdir -p $target_dir/{etc,usr}
+  mkdir -p $target_dir/usr/{bin,share/doc}
+  
+  if [[ $package_name == "escenic-content-engine-installer" ]]; then
+    cp -r ../../bin/{ece,system-info} $target_dir/usr/bin/
+    cp -r ../../share/escenic/ $target_dir/usr/share/
+    cp -r ../../share/doc/escenic/*.{org,html} $target_dir/usr/share/doc/
+    cp -r ../../../etc/escenic/ $target_dir/etc/
+  fi
+
+  debian_dir=$target_dir/DEBIAN
+  mkdir -p $debian_dir
+  cp debian/${package_name}/* $debian_dir
 }
 
-version=$(get_version)
-
-cp -r ../../../etc $target_dir
-
-mkdir -p $target_dir/usr
-cp -r ../../../usr/bin $target_dir/usr
-cp -r ../../../usr/sbin $target_dir/usr
-cp -r ../../../usr/share $target_dir/usr
+function get_name() {
+  name=$(grep $USER /etc/passwd | cut -d':' -f5 | cut -d',' -f1)
+  echo "${name}"
+}
 
-cp $target_dir/DEBIAN/control $target_dir/DEBIAN/control.orig
+function get_email() {
+  echo ${USER}@${HOSTNAME}
+}
 
-sed -i "s#VERSION#${version}#g" $target_dir/DEBIAN/control
-sed -i "s#MAINTAINER_NAME#$(get_name)#g" $target_dir/DEBIAN/control
-sed -i "s#MAINTAINER_EMAIL#$(get_email)#g" $target_dir/DEBIAN/control
+function create_packages() {
+  sed -i "s#VERSION#${package_version}#g" $debian_dir/control
+  sed -i "s#MAINTAINER_NAME#$(get_name)#g" $debian_dir/control
+  sed -i "s#MAINTAINER_EMAIL#$(get_email)#g" $debian_dir/control
 
-# fix permissions
-chmod 755 $target_dir/DEBIAN/postinst
+  # fix permissions
+  chmod 755 $debian_dir/postinst
 
-if [ ! -x /usr/bin/dpkg-deb ]; then
+  if [ ! -x /usr/bin/dpkg-deb ]; then
     echo "You must have dpkg-deb installed :-("
     exit 1
-fi
-
-dpkg-deb --build debian
-mv debian.deb ${package_name}-${version}.deb
-
-if [[ -x /usr/bin/alien && -x /usr/bin/fakeroot ]]; then
-    fakeroot alien --to-rpm --scripts ${package_name}-${version}.deb
-else
+  fi
+
+  dpkg-deb --build $target_dir
+  mv ${target_dir}.deb $target_dir/${package_name}-${package_version}.deb
+  
+  if [[ -x /usr/bin/alien && -x /usr/bin/fakeroot ]]; then
+    cd $target_dir
+    fakeroot alien --to-rpm --scripts \
+      ${package_name}-${package_version}.deb
+  else
     echo "You must have 'alien' and 'fakeroot' installed to create RPMs"
-fi
+  fi
+}  
 
-# cleanup
-cp $target_dir/DEBIAN/control.orig $target_dir/DEBIAN/control
+clean_up
+get_user_options $@
+set_up_target_directory
+create_packages

From fcf5572d194c82081b920194d235ac93488d10bb Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 14 Mar 2012 15:05:41 +0800
Subject: [PATCH 0495/2585] - too complicated, deleting it.

---
 .../usr/share/doc/escenic/create_hook_overview     | 14 --------------
 1 file changed, 14 deletions(-)
 delete mode 100644 usr/local/src/debian/usr/share/doc/escenic/create_hook_overview

diff --git a/usr/local/src/debian/usr/share/doc/escenic/create_hook_overview b/usr/local/src/debian/usr/share/doc/escenic/create_hook_overview
deleted file mode 100644
index b68ce6f3..00000000
--- a/usr/local/src/debian/usr/share/doc/escenic/create_hook_overview
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /usr/bin/env bash
-
-dir=~/src/ece-scripts
-
-echo "" > $dir/usr/share/doc/escenic/ece-install-hooks.org
-
-grep run_hook $dir/usr/sbin/ece-install | \
-    grep -v function | \
-    awk '{print $2}' | \
-    while read l; do
-    echo "- $l" >> $dir/usr/share/doc/escenic/ece-install-hooks.org
-done
-
-

From 346c9256896c37dff0c3f7c43f211005d0a8c660 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 14 Mar 2012 15:16:50 +0800
Subject: [PATCH 0496/2585] - can now generate both
 escenic-content-engine-installer and vosa   packages:

  $ create-packages -p vosa
  Sir, the packages are now ready:
  target/vosa-1331709369-2.noarch.rpm  target/vosa-1331709369.deb
---
 usr/local/src/create-packages | 37 ++++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/usr/local/src/create-packages b/usr/local/src/create-packages
index 412f5704..87ea9eea 100644
--- a/usr/local/src/create-packages
+++ b/usr/local/src/create-packages
@@ -20,7 +20,6 @@ function get_user_options() {
         package_version=${OPTARG}
         ;;
       p)
-        echo "-p was triggered, Parameter: $OPTARG" >&2
         package_name=${OPTARG}
         ;;
       \?)
@@ -37,14 +36,22 @@ function get_user_options() {
 }
 
 function set_up_target_directory() {
-  mkdir -p $target_dir/{etc,usr}
+  mkdir -p $target_dir/{etc,usr,/etc/default}
   mkdir -p $target_dir/usr/{bin,share/doc}
   
   if [[ $package_name == "escenic-content-engine-installer" ]]; then
+    mkdir -p $target_dir/usr/share/doc/escenic
+    
     cp -r ../../bin/{ece,system-info} $target_dir/usr/bin/
     cp -r ../../share/escenic/ $target_dir/usr/share/
-    cp -r ../../share/doc/escenic/*.{org,html} $target_dir/usr/share/doc/
+    cp -r ../../share/doc/escenic/*.{org,html} $target_dir/usr/share/doc/escenic
     cp -r ../../../etc/escenic/ $target_dir/etc/
+    cp -r ../../../etc/default/ece $target_dir/etc/default
+  elif [[ $package_name == "vosa" ]]; then
+    mkdir -p $target_dir/usr/share/doc/vosa
+    cp -r ../../bin/vosa $target_dir/usr/bin/
+    cp -r ../../share/vizrt/ $target_dir/usr/share/
+    cp -r ../../share/doc/vizrt/*.org $target_dir/usr/share/doc/vosa/
   fi
 
   debian_dir=$target_dir/DEBIAN
@@ -67,26 +74,38 @@ function create_packages() {
   sed -i "s#MAINTAINER_EMAIL#$(get_email)#g" $debian_dir/control
 
   # fix permissions
-  chmod 755 $debian_dir/postinst
-
+  if [ -e $debian_dir/postinst ]; then
+    chmod 755 $debian_dir/postinst
+  fi
+  
   if [ ! -x /usr/bin/dpkg-deb ]; then
     echo "You must have dpkg-deb installed :-("
     exit 1
   fi
 
-  dpkg-deb --build $target_dir
+  dpkg-deb --build $target_dir \
+    2>&1 > /dev/null
   mv ${target_dir}.deb $target_dir/${package_name}-${package_version}.deb
   
   if [[ -x /usr/bin/alien && -x /usr/bin/fakeroot ]]; then
-    cd $target_dir
-    fakeroot alien --to-rpm --scripts \
-      ${package_name}-${package_version}.deb
+    (
+      cd $target_dir
+      fakeroot alien --to-rpm --scripts \
+        ${package_name}-${package_version}.deb \
+        2>&1 > /dev/null
+    )
   else
     echo "You must have 'alien' and 'fakeroot' installed to create RPMs"
   fi
 }  
 
+function list_packages() {
+  echo "Sir, the packages are now ready:"
+  ls $target_dir/*.{deb,rpm}
+}
+
 clean_up
 get_user_options $@
 set_up_target_directory
 create_packages
+list_packages

From a00c8b2c1727acc7c4b1592f559e1a772d9e1828 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 14 Mar 2012 15:38:46 +0800
Subject: [PATCH 0497/2585] - forgot the echo

---
 .../debian/escenic-content-engine-installer/postinst | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/usr/local/src/debian/escenic-content-engine-installer/postinst b/usr/local/src/debian/escenic-content-engine-installer/postinst
index d8b24474..4147fc4a 100755
--- a/usr/local/src/debian/escenic-content-engine-installer/postinst
+++ b/usr/local/src/debian/escenic-content-engine-installer/postinst
@@ -3,17 +3,7 @@
 
 chmod +x /usr/sbin/ece-install /usr/bin/{ece,system-info}
 
-echo "Do you wish to run the Escenic Content Engine installer now?"
-
-answer=no
-echo -n "Your choice: yes/[no] "
-read answer
-
-if [ "$answer" = "yes" ]; then
-    ece-install
-else
-    echo "Run the Escenic Content Engine installer by typing 'ece-install'"
-fi
+echo "Run the Escenic Content Engine installer by typing 'ece-install'"
 
 exit 0
 

From 6a6a11dd99c227e34861f3477548e25923a3adea Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 14 Mar 2012 15:39:34 +0800
Subject: [PATCH 0498/2585] - "as root", mind you

---
 usr/local/src/debian/escenic-content-engine-installer/postinst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/local/src/debian/escenic-content-engine-installer/postinst b/usr/local/src/debian/escenic-content-engine-installer/postinst
index 4147fc4a..946b0b50 100755
--- a/usr/local/src/debian/escenic-content-engine-installer/postinst
+++ b/usr/local/src/debian/escenic-content-engine-installer/postinst
@@ -3,7 +3,7 @@
 
 chmod +x /usr/sbin/ece-install /usr/bin/{ece,system-info}
 
-echo "Run the Escenic Content Engine installer by typing 'ece-install'"
+echo "Run the Escenic Content Engine installer by typing 'ece-install' as root"
 
 exit 0
 

From 21d5019c574f39bf85364bc43d6ea3a5f4d0685c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 14 Mar 2012 15:40:18 +0800
Subject: [PATCH 0499/2585] - some more user feedback

---
 usr/local/src/debian/escenic-content-engine-installer/postinst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/local/src/debian/escenic-content-engine-installer/postinst b/usr/local/src/debian/escenic-content-engine-installer/postinst
index 946b0b50..ca61ce55 100755
--- a/usr/local/src/debian/escenic-content-engine-installer/postinst
+++ b/usr/local/src/debian/escenic-content-engine-installer/postinst
@@ -3,7 +3,8 @@
 
 chmod +x /usr/sbin/ece-install /usr/bin/{ece,system-info}
 
-echo "Run the Escenic Content Engine installer by typing 'ece-install' as root"
+echo "You can now run the Escenic Content Engine installer "
+echo "by typing 'ece-install' as root"
 
 exit 0
 

From 6bef64b2654d28c116549c5ecacabab26edbe241 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 14 Mar 2012 15:42:56 +0800
Subject: [PATCH 0500/2585] - some small bug fixes - better version string,
 e.g.: 2012-03-14.154031

---
 usr/local/src/create-packages | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/usr/local/src/create-packages b/usr/local/src/create-packages
index 87ea9eea..8c431f61 100644
--- a/usr/local/src/create-packages
+++ b/usr/local/src/create-packages
@@ -7,7 +7,7 @@
 
 target_dir=target
 package_name=escenic-content-engine-installer
-package_version=$(date +%s)
+package_version=$(date +%Y-%m-%d.%H%M%S)
 
 function clean_up() {
   rm -rf $target_dir
@@ -37,16 +37,19 @@ function get_user_options() {
 
 function set_up_target_directory() {
   mkdir -p $target_dir/{etc,usr,/etc/default}
-  mkdir -p $target_dir/usr/{bin,share/doc}
+  mkdir -p $target_dir/usr/{bin,sbin,share/doc}
   
   if [[ $package_name == "escenic-content-engine-installer" ]]; then
     mkdir -p $target_dir/usr/share/doc/escenic
     
+    cp -r ../../bin/{ece,system-info} $target_dir/usr/bin/
+    cp -r ../../sbin/{ece-install,drop-and-create-ecedb} $target_dir/usr/sbin/
     cp -r ../../bin/{ece,system-info} $target_dir/usr/bin/
     cp -r ../../share/escenic/ $target_dir/usr/share/
     cp -r ../../share/doc/escenic/*.{org,html} $target_dir/usr/share/doc/escenic
     cp -r ../../../etc/escenic/ $target_dir/etc/
     cp -r ../../../etc/default/ece $target_dir/etc/default
+    
   elif [[ $package_name == "vosa" ]]; then
     mkdir -p $target_dir/usr/share/doc/vosa
     cp -r ../../bin/vosa $target_dir/usr/bin/

From 73092133f89ae26a8cd408b4c941d53bd3f87db9 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 14 Mar 2012 16:49:10 +0800
Subject: [PATCH 0501/2585] - added, thanks Mogsie ;-)

---
 usr/local/src/debian/vosa/control | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 usr/local/src/debian/vosa/control

diff --git a/usr/local/src/debian/vosa/control b/usr/local/src/debian/vosa/control
new file mode 100644
index 00000000..5287045b
--- /dev/null
+++ b/usr/local/src/debian/vosa/control
@@ -0,0 +1,10 @@
+Package: vosa
+Version: VERSION
+Section: base
+Priority: optional
+Architecture: all
+Maintainer: MAINTAINER_NAME <MAINTAINER_EMAIL>
+Description: The Vizrt Online System Administration command line tools.
+  See the documentation in /usr/share/doc/vizrt/ for further
+  details.
+ 
\ No newline at end of file

From a8c084fd3be71782eec6bf5c304c9d3006cc3ac1 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 14 Mar 2012 17:06:20 +0800
Subject: [PATCH 0502/2585] - now exists on failed fakeroot/alien

---
 usr/local/src/create-packages | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/local/src/create-packages b/usr/local/src/create-packages
index 8c431f61..26db3bc2 100644
--- a/usr/local/src/create-packages
+++ b/usr/local/src/create-packages
@@ -99,6 +99,7 @@ function create_packages() {
     )
   else
     echo "You must have 'alien' and 'fakeroot' installed to create RPMs"
+    exit 1
   fi
 }  
 

From 39140c478c223d9bbebb51782337eaac6fb05006 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 14 Mar 2012 18:10:40 +0800
Subject: [PATCH 0503/2585] - added

---
 usr/share/doc/escenic/images/nfs-vip.nwdiag | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 usr/share/doc/escenic/images/nfs-vip.nwdiag

diff --git a/usr/share/doc/escenic/images/nfs-vip.nwdiag b/usr/share/doc/escenic/images/nfs-vip.nwdiag
new file mode 100644
index 00000000..68a4cd88
--- /dev/null
+++ b/usr/share/doc/escenic/images/nfs-vip.nwdiag
@@ -0,0 +1,13 @@
+nwdiag {
+  group {
+    color = "orange";
+    nfs1;
+    nfs2;
+  }
+  
+  network nfs-vip {
+    address = "192.168.1.200";
+    nfs1 [ address = "192.168.1.122", description = "NFS master" ];
+    nfs2 [ address = "192.168.1.123", description = "NFS slave" ];
+  }
+}

From 71d9e31e759d584121d249a89b9b58013f33dae5 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 14 Mar 2012 18:10:58 +0800
Subject: [PATCH 0504/2585] - added

---
 usr/share/doc/escenic/images/nfs-vip.png | Bin 0 -> 9721 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 usr/share/doc/escenic/images/nfs-vip.png

diff --git a/usr/share/doc/escenic/images/nfs-vip.png b/usr/share/doc/escenic/images/nfs-vip.png
new file mode 100644
index 0000000000000000000000000000000000000000..283e0f2c0e7134091115b772452cd294eb5ab580
GIT binary patch
literal 9721
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

literal 0
HcmV?d00001


From 052764d141f0e3178427f99df4956833f55c3de7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 14 Mar 2012 18:11:12 +0800
Subject: [PATCH 0505/2585] - added diagram for NFS + VIP

---
 usr/share/doc/escenic/ece-install-guide.org | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index ade45951..dfe0e641 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -245,7 +245,7 @@ for the slave:
 #+END_SRC
 
 Once this is done, create and use an ece-install.conf on the slave
-with this:
+with this configuration:
 #+BEGIN_SRC sh
 fai_enabled=1
 fai_db_install=1
@@ -359,6 +359,7 @@ fai_nfs_export_list="/var/exports/multimedia"
 #+END_SRC
 
 ** Profile :: VIP provider
+[[file:images/nfs-vip.png]]
 
 This profile will make the host capable of serving a certain virtual
 IP (VIP) for one or more services. This is a useful thing for all

From 303be1c0fc6fa3a095ea6a4a86bb2c6cb4bdb9c2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 14 Mar 2012 18:22:51 +0800
Subject: [PATCH 0506/2585] - minor change to log message

---
 usr/sbin/ece-install | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 75d4edad..52b2dab4 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -186,8 +186,8 @@ function install_packages_if_missing() {
     if [ $some_are_missing -eq 0 ]; then
       return
     elif [ $one_time_apt_update_done -eq 0 ]; then
-      print_and_log \
-        "Running one time APT update to ensure package list is fresh"
+      log "First running APT update to ensure fresh package list, " \
+        "then continuing the above"
       run apt-get update
       one_time_apt_update_done=1
     fi

From ac63c70dff06266660c2bf5df551babad133d420 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 14 Mar 2012 18:26:06 +0800
Subject: [PATCH 0507/2585] - added get_percona_supported_list. This means that
 ece-install will   dynamically determine if the OS you're installing it on
 supports   package based installation of the Percona database.

- (another) fix to installing the Percona DB if the(ir) GPG key server
  doesn't respond at the time of installation. Since this key server
  is so unstable, ece-install turns on force package installation of
  the DB related packages if the key server couldn't be reached.

- simplification + some hardening of the DB replication configuration

  All of this relates to issue #45
---
 .../ece-scripts/ece-install.d/database.sh     | 77 ++++++++++++-------
 1 file changed, 48 insertions(+), 29 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index cb2206f5..4a83a7c7 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -8,6 +8,15 @@ if [[ $(uname -m) != "x86_64" ]]; then
   percona_rpm_release_url=http://www.percona.com/downloads/percona-release/$percona_rpm_release_package_name.i386.rpm
 fi
 
+function get_percona_supported_list() {
+  echo $(
+    curl -s http://repo.percona.com/apt/dists/ | \
+      grep ^"<li><a href" | \
+      cut -d'"' -f2 | \
+      cut -d'/' -f1
+  )
+}
+
 ## $1: optional parameter, binaries_only. If passed, $1=binaries_only,
 ##     the ECE DB schema is not set up. 
 function install_database_server()
@@ -21,7 +30,7 @@ function install_database_server()
     code_name=$(lsb_release -s -c)
     
     supported_code_name=0
-    supported_list="lenny squeeze hardy lucid maverick"
+    supported_list=$(get_percona_supported_list)
     for el in $supported_list; do
       if [ $code_name = $el ]; then
         supported_code_name=1
@@ -37,13 +46,14 @@ function install_database_server()
       print_and_log "Installing the Percona database ..."
 
       if [ $(apt-key list| grep CD2EFD2A | wc -l) -lt 1 ]; then
-        run gpg --keyserver hkp://keys.gnupg.net \
-          --recv-keys 1C4CBDCDCD2EFD2A
+        gpg --keyserver hkp://keys.gnupg.net \
+          --recv-keys 1C4CBDCDCD2EFD2A \
+          1>>$log 2>>$log
         
-        # There has been twice now, during six months, that
-        # the key cannot be retrieved from
-        # keys.gnupg.net. Therefore, we're checking if it
-        # failed and if yes, force the package installation.
+        # There has been three times now, during six months, that the
+        # key cannot be retrieved from keys.gnupg.net. Therefore,
+        # we're checking if it failed and if yes, force the package
+        # installation.
         if [ $? -gt 0 ]; then
           s="Failed retrieving the Percona key from keys.gnupg.net"
           print_and_log $s
@@ -62,8 +72,7 @@ function install_database_server()
       fi
       
       add_apt_source "deb http://repo.percona.com/apt ${code_name} main"
-      packages="percona-server-server percona-server-client"
-      force_packages=0
+      packages="percona-server-server percona-server-client libmysqlclient16"
     else
       print_and_log "The Percona APT repsository doesn't have packages" 
       print_and_log "for your Debian (or derivative) version with code"
@@ -86,6 +95,7 @@ function install_database_server()
   fi
   
   install_packages_if_missing $packages
+  force_packages=0
 
   if [ $on_redhat_or_derivative -eq 1 ]; then
     run chkconfig --level 35 mysql on
@@ -251,25 +261,17 @@ function configure_mysql_for_replication() {
 EOF
   fi
 
-  # server ID
-  local old="#server-id.*= 1"
-
-  if [ $db_master -eq 1 ]; then
-    local new="server-id = 1"
-  else
-    local new="server-id = 2"
-  fi
-
-  if [ $(grep ^"$old" $file | wc -l) -gt 0 ]; then
-    sed -i "s~^$old~$new~g" $file
-  else
-    echo "$new" >> $file
-  fi
-
-  run /etc/init.d/mysql restart
-
   # replication log configuration of the master
   if [ $db_master -eq 1 ]; then
+    local old="#server-id.*= 1"
+    local new="server-id = 1"
+    
+    if [ $(grep ^"$old" $file | wc -l) -gt 0 ]; then
+      sed -i "s~^$old~$new~g" $file
+    elif [ $(grep ^"$new" $file | wc -l) -lt 1 ]; then
+      echo "$new" >> $file
+    fi
+  
     old="bind-address.*= 127.0.0.1"
     new="# bind-address = 127.0.0.1"
     if [ $(grep ^"${old}" $file | wc -l) -gt 0 ]; then
@@ -280,7 +282,7 @@ EOF
     new="log_bin = /var/log/mysql/mysql-bin.log"
     if [ $(grep ^"$old" $file | wc -l) -gt 0 ]; then
       sed -i "s~^${old}~${new}~g" $file
-    elif [ $(grep ^$new $file | wc -l) -lt 1 ]; then
+    elif [ $(grep ^"$new" $file | wc -l) -lt 1 ]; then
       echo "$new" >> $file
     fi
       
@@ -289,10 +291,12 @@ EOF
 
     if [ $(grep ^"$old" $file | wc -l) -gt 0 ]; then
       sed -i "s~^${old}~${new}~g" $file
-    elif [ $(grep ^$new $file | wc -l) -lt 1 ]; then
+    elif [ $(grep ^"$new" $file | wc -l) -lt 1 ]; then
       echo "$new" >> $file
     fi
     
+    run /etc/init.d/mysql restart
+
     # report the needed settings for a slave
     local master_status=$(mysql $db_schema -e "show master status" | tail -1)
     local file=$(echo $master_status | cut -d' ' -f1)
@@ -300,6 +304,17 @@ EOF
     add_next_step "ece-install.conf for slave: fai_db_master_log_file=$file"
     add_next_step "ece-install.conf for slave:" \
       fai_db_master_log_position=$position
+  else
+    local old="#server-id.*= 1"
+    local new="server-id = 2"
+    
+    if [ $(grep ^"$old" $file | wc -l) -gt 0 ]; then
+      sed -i "s~^$old~$new~g" $file
+    elif [ $(grep ^"$new" $file | wc -l) -lt 1 ]; then
+      echo "$new" >> $file
+    fi
+    
+    run /etc/init.d/mysql restart
   fi
 }
 
@@ -307,7 +322,9 @@ EOF
 
 function set_slave_to_replicate_master() {
   print_and_log "Setting slave to replicate master DB @ $db_master_host ..."
-  mysql ${db_schema} <<EOF 
+  mysql ${db_schema} <<EOF
+stop slave;
+
 change master to
   master_host='${db_master_host}',
   master_user='${db_replication_user}',
@@ -318,6 +335,8 @@ change master to
 
 start slave;
 EOF
+
+  add_next_step "DB on $HOSTNAME replicates master DB @ ${db_master_host}"
 }
 
   

From 320f3fad1e9f34edfd64eaf8ffe894530c04892d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 15 Mar 2012 13:05:13 +0800
Subject: [PATCH 0508/2585] - added new ece.conf parameter, jvm_gc_settings
 with sane defaults for   production use.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  The default GC settings are based on the concurrent mark sweep GC
  profile for the Hotspot VM. Credits go to Ola Schön, Axel Springer &
  UnitB for providing these settings.

  The default settings should be fine for most users, but they're
  override-able on a per ECE/EAE/Search instance basis if that's
  desirable.

  The GC logging related settings are still maintained by the default
  ece_args variable inside ece as this should be applicable to all ECE
  users regardless of GC profile. Also, the existing JVM settings
  related ece.conf variables are still kept in place.

  This closes issue #46

- simplified the declaration of the default JVM parameters in
  ece_args. Sorted them so that they're easier to read.
---
 etc/escenic/ece.conf | 22 ++++++++++++++++++++++
 usr/bin/ece          | 23 +++++++++++++++--------
 2 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/etc/escenic/ece.conf b/etc/escenic/ece.conf
index 166b5e01..08d9edef 100644
--- a/etc/escenic/ece.conf
+++ b/etc/escenic/ece.conf
@@ -122,6 +122,28 @@ remote_debugging_port=5005
 enable_remote_monitoring=0
 remote_monitoring_port=5792
 
+########################################################################
+# Settings related to the JVM garbage collection, don't touch these if
+# you're not sure of what you're doing and have tested your changes
+# properly. Note that ece takes care of the GC logging, so you don't
+# have to cater for that here.
+########################################################################
+jvm_gc_settings="
+-XX:+CMSClassUnloadingEnabled
+-XX:+CMSIncrementalPacing
+-XX:+CMSPermGenSweepingEnabled
+-XX:+ExplicitGCInvokesConcurrent
+-XX:+UseCMSInitiatingOccupancyOnly
+-XX:+UseConcMarkSweepGC
+-XX:CMSInitiatingOccupancyFraction=65
+-XX:InitialCodeCacheSize=50m
+-XX:MaxNewSize=250m
+-XX:NewSize=250m
+-XX:ParallelGCThreads=1
+-XX:ReservedCodeCacheSize=50m
+-XX:SurvivorRatio=1
+"
+
 #####################################################################
 # Java will use IPv6 if it's available on the OS. This however, can
 # cause problems with applications that insists on using IPv4
diff --git a/usr/bin/ece b/usr/bin/ece
index 6f637cd2..97a38e6c 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -340,14 +340,21 @@ function set_instance_settings()
     # * java.security for configuring the Java security framework with ECE.
     # * garbage collection log: this is paramount to keep an eye on
     #   when running in production.
-    ece_args="-Descenic.server=$ece_server\
-              -Dsolr.solr.home=$solr_home\
-              -Djava.awt.headless=true\
-              -Djava.security.auth.login.config=$ece_security_configuration_dir/jaas.config\
-              -Djava.security.policy=$ece_security_configuration_dir/java.policy\
-              -XX:+PrintGCTimeStamps\
-              -XX:+PrintGCDetails\
-              -Xloggc:${log_dir}/${type}-${instance}-gc.log"
+    ece_args="
+      -Descenic.server=$ece_server
+      -Djava.awt.headless=true
+      -Djava.security.auth.login.config=$ece_security_configuration_dir/jaas.config
+      -Djava.security.policy=$ece_security_configuration_dir/java.policy
+      -Dsolr.solr.home=$solr_home
+      -XX:+PrintGCDetails
+      -XX:+PrintGCTimeStamps
+      -Xloggc:${log_dir}/${type}-${instance}-gc.log
+    "
+
+    if [ "$jvm_gc_settings" ]; then
+      ece_args=$ece_args" "$jvm_gc_settings
+    fi
+    
 
     if [ "$instance" != "default" ]; then
         ece_args=$ece_args" -Dcom.escenic.instance=$instance"

From d03e4aa436b166dbbbf8494e7c687f45c1d6e1a6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 15 Mar 2012 14:00:53 +0800
Subject: [PATCH 0509/2585] - ece-install will now output the required slave DB
 FAI settings in a   designated .conf.add file. The file location is listed in
 the   installation report summary as well as in the log:

  [ece-install-37] - See /root/ece-install-db-slave.conf.add for
  settings needed for the slave DB(s)

  Typical contents of this file looks like this:

  fai_db_master_log_file=mysql-bin.000006
  fai_db_master_log_position=107

  This is related to issue #45
---
 .../escenic/ece-scripts/ece-install.d/database.sh     | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 4a83a7c7..85a5a492 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -301,9 +301,14 @@ EOF
     local master_status=$(mysql $db_schema -e "show master status" | tail -1)
     local file=$(echo $master_status | cut -d' ' -f1)
     local position=$(echo $master_status | cut -d' ' -f2)
-    add_next_step "ece-install.conf for slave: fai_db_master_log_file=$file"
-    add_next_step "ece-install.conf for slave:" \
-      fai_db_master_log_position=$position
+    local slave_conf_file=$HOME/ece-install-db-slave.conf.add
+    cat > $slave_conf_file <<EOF
+fai_db_master_log_file=$file
+fai_db_master_log_position=$position
+EOF
+    local message="See $slave_conf_file for settings needed for the slave DB(s)"
+    log $message
+    add_next_step $message
   else
     local old="#server-id.*= 1"
     local new="server-id = 2"

From f88d40a9f354d87f23dbc1ffe2b5a04e021f2a14 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 15 Mar 2012 16:38:19 +0800
Subject: [PATCH 0510/2585] - added support for escenic-content-engine-scripts
 - removed /usr/bin/ece, init.d & BASH completion from  
 escenic-content-engine-installer

---
 usr/local/src/create-packages | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/usr/local/src/create-packages b/usr/local/src/create-packages
index 26db3bc2..f546d5c8 100644
--- a/usr/local/src/create-packages
+++ b/usr/local/src/create-packages
@@ -42,16 +42,26 @@ function set_up_target_directory() {
   if [[ $package_name == "escenic-content-engine-installer" ]]; then
     mkdir -p $target_dir/usr/share/doc/escenic
     
-    cp -r ../../bin/{ece,system-info} $target_dir/usr/bin/
     cp -r ../../sbin/{ece-install,drop-and-create-ecedb} $target_dir/usr/sbin/
-    cp -r ../../bin/{ece,system-info} $target_dir/usr/bin/
     cp -r ../../share/escenic/ $target_dir/usr/share/
-    cp -r ../../share/doc/escenic/*.{org,html} $target_dir/usr/share/doc/escenic
+    cp -r ../../share/doc/escenic/ece-install-guide.{org,html} \
+      $target_dir/usr/share/doc/escenic
+    
+  elif [[ $package_name == "escenic-content-engine-scripts" ]]; then
+    mkdir -p $target_dir/usr/share/doc/escenic
+    mkdir -p $target_dir/usr/share/escenic/ece-scripts
+    
+    cp -r ../../bin/{ece,system-info} $target_dir/usr/bin/
+    cp -r ../../share/escenic/ece-scripts/common* \
+      $target_dir/usr/share/escenic/ece-scripts/
+    cp -r ../../share/doc/escenic/{ece,system-info}-guide.{org,html} \
+      $target_dir/usr/share/doc/escenic
     cp -r ../../../etc/escenic/ $target_dir/etc/
     cp -r ../../../etc/default/ece $target_dir/etc/default
     
   elif [[ $package_name == "vosa" ]]; then
     mkdir -p $target_dir/usr/share/doc/vosa
+    
     cp -r ../../bin/vosa $target_dir/usr/bin/
     cp -r ../../share/vizrt/ $target_dir/usr/share/
     cp -r ../../share/doc/vizrt/*.org $target_dir/usr/share/doc/vosa/

From fb31538a21a0789bd9433c80495bab8f19584fbe Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 15 Mar 2012 16:38:36 +0800
Subject: [PATCH 0511/2585] - added escenic-content-engine-scripts package

---
 .../debian/escenic-content-engine-scripts/control | 15 +++++++++++++++
 .../escenic-content-engine-scripts/postinst       |  7 +++++++
 2 files changed, 22 insertions(+)
 create mode 100644 usr/local/src/debian/escenic-content-engine-scripts/control
 create mode 100755 usr/local/src/debian/escenic-content-engine-scripts/postinst

diff --git a/usr/local/src/debian/escenic-content-engine-scripts/control b/usr/local/src/debian/escenic-content-engine-scripts/control
new file mode 100644
index 00000000..b15f692c
--- /dev/null
+++ b/usr/local/src/debian/escenic-content-engine-scripts/control
@@ -0,0 +1,15 @@
+Package: escenic-content-engine-scripts
+Version: VERSION
+Section: base
+Priority: optional
+Architecture: all
+Maintainer: MAINTAINER_NAME <MAINTAINER_EMAIL>
+Description: Scripts for operating the Escenic Content Engine.
+  Included in this packages are scripts for operating the Escenic
+  Content Engine, Escenic Analysis Engine, Search servers (solr +
+  indexer-webapp), BASH completion of all commands as well as init.d
+  scripts.
+  .
+  See the documentation in /usr/share/doc/escenic/ for further
+  details.
+ 
\ No newline at end of file
diff --git a/usr/local/src/debian/escenic-content-engine-scripts/postinst b/usr/local/src/debian/escenic-content-engine-scripts/postinst
new file mode 100755
index 00000000..cc6f2bb3
--- /dev/null
+++ b/usr/local/src/debian/escenic-content-engine-scripts/postinst
@@ -0,0 +1,7 @@
+#! /usr/bin/env bash
+# set -e
+
+chmod +x /usr/bin/{ece,system-info}
+
+exit 0
+

From 7f0e7da0a18a9b4312a65caab5027147f84cc95a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 15 Mar 2012 16:46:03 +0800
Subject: [PATCH 0512/2585] - added --keep-version to alien option list

---
 usr/local/src/create-packages | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/local/src/create-packages b/usr/local/src/create-packages
index f546d5c8..5c38862d 100644
--- a/usr/local/src/create-packages
+++ b/usr/local/src/create-packages
@@ -103,7 +103,7 @@ function create_packages() {
   if [[ -x /usr/bin/alien && -x /usr/bin/fakeroot ]]; then
     (
       cd $target_dir
-      fakeroot alien --to-rpm --scripts \
+      fakeroot alien --keep-version --to-rpm --scripts \
         ${package_name}-${package_version}.deb \
         2>&1 > /dev/null
     )

From 47df743d13cf47358e464604b7e9ae879b43132c Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 15 Mar 2012 10:36:30 +0100
Subject: [PATCH 0513/2585] Made it possible to run several ece-installs in
 succession

---
 .../vosa/post-install-hooks/install-engine.sh | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/usr/share/vizrt/vosa/post-install-hooks/install-engine.sh b/usr/share/vizrt/vosa/post-install-hooks/install-engine.sh
index 1f6d2851..a49cf881 100755
--- a/usr/share/vizrt/vosa/post-install-hooks/install-engine.sh
+++ b/usr/share/vizrt/vosa/post-install-hooks/install-engine.sh
@@ -14,7 +14,14 @@
 # The VM is assumed to be booted and ready for SSH using the passwordless
 # key referenced by the $2/ssh.conf file, as the ubuntu or root users.
 
-# ensure we have an ece-install image.
+# ensure we have some ece-install*.conf file(s)
+ece_install_conf_files=$(ls $1 | grep "^ece-install.*\\.conf$")
+if [ -z "$ece_install_conf_files" ] ; then
+  echo "No ece-install.conf files present in $1"
+  exit 1;
+fi
+
+# ensure we have an ece-install image, download one.
 if [ ! -r $2/ece-install ] ; then
   if [ -r $1/ece-install ] ; then
     cp $1/ece-install $2
@@ -22,12 +29,13 @@ if [ ! -r $2/ece-install ] ; then
     wget "https://github.com/skybert/ece-scripts/tarball/master" -O $2/ece-install.tar.gz
   fi
 fi
-if [ ! -r $1/ece-install.conf ] ; then
-  echo "No ece-install.conf file present in $1"
-  exit 1;
-fi
 
-scp -F $2/ssh.conf $2/ece-install.tar.gz $1/ece-install.conf root@guest:
+scp -F $2/ssh.conf $2/ece-install.tar.gz $1/ece-install*.conf root@guest:
 
 ssh -F $2/ssh.conf root@guest tar xfz ece-install.tar.gz
-ssh -F $2/ssh.conf root@guest bash *-ece-scripts-*/usr/sbin/ece-install
+for conf in $ece_install_conf_files ; do
+  echo "Performing ece-install with -f $conf"
+  ssh -F $2/ssh.conf root@guest bash *-ece-scripts-*/usr/sbin/ece-install -f "$conf" || exit $? 
+  echo "---------8<-------------------------"
+done
+

From 2d62105759a966b61543dd2706b9c6a235f36fc8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 15 Mar 2012 18:06:00 +0800
Subject: [PATCH 0514/2585] - re-implemented get_instance_list to read the  
 /etc/escenic/ece[type]-<instance.conf files instead. For this to   work, the
 following types have been hard coded:

  * engine,
  * search,
  * analysis,
  * rmi-hub
  * changelogd

  so that global configuration files for types can still be given with e.g.:

     ece-search.conf

  for common settings for all search instances.

  Another implication is that you cannot have instances called the
  same as the type name, i.e. your search instance must be called
  e.g. "search1" and not "search". Apart from this limitation, the
  global type configuration & instance configuration should work as
  before.

  This closes #47

- -q/--quiet now applies to all commands, providing ece output without
   the ID prefix. e.g.:

   ece -i dev1 status
   [ece#engine-dev1] DOWN

   ece --quiet -i dev1 status
   DOWN

   This closes #49
---
 usr/bin/ece | 36 +++++++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 97a38e6c..5d5a0ea9 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -102,6 +102,8 @@ function print()
 {
     if [ "$quiet" -eq 0 ]; then
         echo "$id" $@
+    else
+      echo $@
     fi
 }
 
@@ -175,16 +177,29 @@ function read_conf_file()
     done
 }
 
-# If the system is installed using the recommended paths, the method
-# will return a list of the instances configured in
-# ${escenic_conf_dir}/engine/instance
+## If the system is installed using the recommended paths, the method
+## will return a list of the instances configured in
+## ${escenic_conf_dir}/ece-*.conf
 function get_instance_list()
 {
+    local allowed_types="engine analysis changelogd search rmi-hub"
     instance_list=""
-
-    if [ -r ${escenic_conf_dir}/engine/instance ]; then
-        instance_list=$(ls ${escenic_conf_dir}/engine/instance)
-    fi
+    for el in $(\ls /etc/escenic/ece-*.conf 2>/dev/null); do
+      
+      local instance=$(basename $el .conf)
+      instance=${instance##ece-}
+      
+      for ele in $allowed_types; do
+        if [[ $instance == $ele ]]; then
+          instance=""
+          continue
+        fi
+        
+        local away="${ele}-"
+        instance=${instance##${away}}
+      done
+      instance_list="$instance_list $instance"
+    done
 
     echo $instance_list
 }
@@ -456,6 +471,10 @@ function sanity_check()
         exit 1
     fi
 
+    if [[ "$command"=="list-instances" ]]; then
+      return
+    fi
+
     # checks if the user is using the default instance when he/she
     # really wants to start one of the instances installed on the
     # system.
@@ -1804,6 +1823,9 @@ for el in $command; do
         versions)
             list_versions
             ;;
+        list-instances)
+            print $(get_instance_list)
+            ;;
         update)
             update_publication_resources
             ;;

From e67e786068e602adf55264ebf10fabcd40716ea2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 15 Mar 2012 18:07:18 +0800
Subject: [PATCH 0515/2585] - made use of ece's get_instance_list instead of
 re-implementing the   method ourselves

- simpler declaration of commands, options and resources
---
 etc/bash_completion.d/ece | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/etc/bash_completion.d/ece b/etc/bash_completion.d/ece
index ad53165e..b781f4d5 100644
--- a/etc/bash_completion.d/ece
+++ b/etc/bash_completion.d/ece
@@ -5,25 +5,19 @@ _ece_commands()
     local cur=${COMP_WORDS[COMP_CWORD]}
     local prev=${COMP_WORDS[COMP_CWORD-1]}
 
-    commands="applog assemble backup clean deploy edit help info kill log loglist \
-              flush outlog package restart start status stop threaddump update versions"
-    options="-i --instance -p --publication -r --publication-resource \
+    commands="applog assemble backup clean deploy edit help info kill log loglist
+              flush outlog package restart start status stop threaddump update versions
+              list-instances
+    "
+    options="-i --instance -p --publication -r --publication-resource
              -t --type -u --user -w --password"
-    resources="content-type feature layout layout-group image-version menu \
+    resources="content-type feature layout layout-group image-version menu
                security root-section-parameters"
     types="engine search analysis rmi-hub"
 
     # default completions is the list of commands
     completions=$commands" "$options
 
-    instances=""
-    dir=/etc/escenic/engine/instance
-    if [ -r $dir ] ; then
-        for el in ${dir}/*; do
-            instances=$(basename ${el})" "$instances
-        done
-    fi
-    
     publications=""
     dir=/opt/escenic/assemblytool/publications
     if [ -r $dir ] ; then
@@ -40,7 +34,7 @@ _ece_commands()
             completions=$types
             ;;
         -i|--instance)
-            completions=$instances
+            completions=$(ece -q list-instances)
             ;;
         -p|--publication)
             completions=$publications

From d9b598a1791d9a2971bf36a5496ffcd3d3f56439 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 15 Mar 2012 11:32:55 +0100
Subject: [PATCH 0516/2585] Added documentation for
 fai_monitoring_munin_node_list

---
 usr/share/doc/escenic/ece-install-guide.org | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index dfe0e641..8ca35305 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -660,6 +660,7 @@ $HOME/ece-install.conf file of the root user:
 | fai_editor_shutdown                 | 8005                                              | Shutdown port of the editor instance                                                                                                  |
 | fai_enabled                         | 0                                                 | Whether or not to run ece-install in FAI mode                                                                                         |
 | fai_keep_off_etc_hosts              | 0                                                 | Set this to 1 if you don't want ece-install adding entries to /etc/hosts                                                              |
+| fai_monitoring_munin_node_list      | ""                                                | Set this to a whitespace separated list of nodes that munin should monitor                                                            |
 | fai_monitoring_server_install       | 0                                                 | Install the monitoring server profile.                                                                                                |
 | fai_monitoring_server_ip            | 127.0.0.1                                         | The IP of the monitoring server.                                                                                                      |
 | fai_nfs_allowed_client_network      | ""                                                | IP/netmwask of allowed NFS clients, example: 192.168.1.0/255.255.255.0                                                                |

From ae6b147e0316685466235c5525b759f1e62c1004 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 15 Mar 2012 18:34:09 +0800
Subject: [PATCH 0517/2585] - sanity_check now considers the get_instance_list
 for all commands,   except when the commands are help or list-instances
 (undocumented   command for now, only used by the BASH completion).

  This means that any command which passes a non-existent instance
  (non existent being defined as an instance which doesn't have a
  corresponding ece-<instance>.conf in /etc/escenic), will fail to
  execute with a message like:

  $ ece -i peace-on-earth start
  [ece#engine-peace-on-earth] Instance 'peace-on-earth' doesn't exist on quanah

  Another benefit of this feature, is that the TAB completion will
  return all instances on the system, also the ones that are not ECE
  (like EAE and search).

  This closes #48
---
 usr/bin/ece | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 5d5a0ea9..f5f27f17 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -471,17 +471,17 @@ function sanity_check()
         exit 1
     fi
 
-    if [[ "$command"=="list-instances" ]]; then
+    if [ $command == "list-instances" ]; then
       return
     fi
 
+    local instance_list=$(get_instance_list)
     # checks if the user is using the default instance when he/she
     # really wants to start one of the instances installed on the
     # system.
     if [ "$instance" == "default" -a \
         "$type" == "engine" -a \
         $(echo $command | egrep 'help' | wc -l) -eq 0 ]; then
-        instance_list=$(get_instance_list)
         if [[ -n "$instance_list" && \
             $(echo $instance_list | grep ' ' | wc -l) -gt 0 ]]; then
             print "You must specify the instance with -i <instance>"
@@ -491,6 +491,19 @@ function sanity_check()
         fi
     fi
 
+    local instance_exists=0
+    for el in $instance_list; do
+      if [ $el == $instance ]; then
+        instance_exists=1
+        break
+      fi
+    done
+
+    if [ $instance_exists -eq 0 ]; then
+      print "Instance '$instance' doesn't exist on $HOSTNAME"
+      exit 1
+    fi
+    
     # verifies that java_home exists and has the java executable
     if [ ! -d $java_home ]; then
         print "java_home $java_home doesn't exist"

From 6bfc3d18fcf318967304d16166ebdb188490795f Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 15 Mar 2012 11:46:24 +0100
Subject: [PATCH 0518/2585] Fixed documentation to match code. the monitoring
 server profile is fai_monitoring_install=1

---
 usr/share/doc/escenic/ece-install-guide.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 8ca35305..82e6af81 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -660,8 +660,8 @@ $HOME/ece-install.conf file of the root user:
 | fai_editor_shutdown                 | 8005                                              | Shutdown port of the editor instance                                                                                                  |
 | fai_enabled                         | 0                                                 | Whether or not to run ece-install in FAI mode                                                                                         |
 | fai_keep_off_etc_hosts              | 0                                                 | Set this to 1 if you don't want ece-install adding entries to /etc/hosts                                                              |
+| fai_monitoring_install              | 0                                                 | Install the monitoring server profile.                                                                                                |
 | fai_monitoring_munin_node_list      | ""                                                | Set this to a whitespace separated list of nodes that munin should monitor                                                            |
-| fai_monitoring_server_install       | 0                                                 | Install the monitoring server profile.                                                                                                |
 | fai_monitoring_server_ip            | 127.0.0.1                                         | The IP of the monitoring server.                                                                                                      |
 | fai_nfs_allowed_client_network      | ""                                                | IP/netmwask of allowed NFS clients, example: 192.168.1.0/255.255.255.0                                                                |
 | fai_nfs_client_install              | 0                                                 | Installs an NFS client                                                                                                                |

From 76861506e6f3fc933b217aee79d764c9e9da925f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 15 Mar 2012 19:22:53 +0800
Subject: [PATCH 0519/2585] - what a wonderful chicken and egg problem :-)  
 assert_correct_runtime_environment cannot use any methods pulled in   from
 the modules through the (later processed) init method.

---
 usr/sbin/ece-install | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 52b2dab4..cf6a4f7b 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -633,7 +633,12 @@ function assert_correct_runtime_environment()
     if [ ! -e "$conf_file" ]; then
         echo $conf_file "doesn't exist."
         echo "I cannot live without it, so I'm exiting :-("
-        remove_pid_and_exit_in_error
+        
+        if [ -e $pid_file ]; then
+          rm $pid_file
+        fi
+        
+        exit 1
     fi
 }
 

From fd2e3c1ffb6ec04b98f3ed25348a637c61672787 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 15 Mar 2012 20:04:15 +0800
Subject: [PATCH 0520/2585] - fix for Ubuntu LTS which doesn't have Icinga -
 fix for conf which doesn't have all the node list variables defined   (no
 host group will be created)

---
 .../ece-scripts/ece-install.d/monitoring.sh    | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index 9ea2675f..a027bbc9 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -320,6 +320,14 @@ EOF
 function install_monitoring_server()
 {
   local nagios_flavour=${fai_monitoring_nagios_flavour-$MONITORING_VENDOR_ICINGA}
+  
+  if [ "$(lsb_release -s -c 2>/dev/null)" = "lucid" ]; then
+    log "Version $(lsb_release -s -c 2>/dev/null) of" \
+      $(lsb_release -s -c 2>/dev/null) \
+      "doesn't support Icinga, will use vanilla Nagios instead."
+    nagios_flavour=$MONITORING_VENDOR_NAGIOS
+  fi
+  
   install_nagios_monitoring_server $nagios_flavour
   install_munin_gatherer
   create_monitoring_server_overview $nagios_flavour
@@ -334,10 +342,16 @@ function set_up_monitoring_host_group()
   local file=$1
   local host_group_name=$2
   local host_group_alias=$3
-    # the remainding arguments passed to the methods is the member
-    # list members
+  # the remainding arguments passed to the methods is the member
+  # list members
   local host_group_member_list=${@:4:$(( $# - 3 ))}
 
+  # don't set up host groups for empty node lists, so we exit here if
+  # the member list is empty.
+  if [ -z "${host_group_member_list}" ]; then
+    return
+  fi
+
   if [ $(grep "hostgroup_name $host_group_name" $file | wc -l) -gt 0 ]; then
     print "Icinga group member" \
       $host_group_name \

From 13d4514724960b22f038509d48efbf5d85102540 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 15 Mar 2012 13:54:02 +0100
Subject: [PATCH 0521/2585] Restart munin-node even when engine is not
 installed.

---
 usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index 9ea2675f..18e86fa4 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -189,6 +189,11 @@ EOF
   if [ -z "${instance_list}" ]; then
     print_and_log "No ECE instances found on $HOSTNAME, so I'm not adding"
     print_and_log "additional Munin configuration"  
+
+    if [ $on_debian_or_derivative -eq 1 ]; then
+      run service munin-node restart
+    fi
+
     add_next_step "A Munin node has been installed on $HOSTNAME"
     return
   fi

From 42d202d5507250e49727d8885d0054ca25dc74b7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 16 Mar 2012 10:24:51 +0800
Subject: [PATCH 0522/2585] - ece & system-info are no longer a part of the  
 escenic-content-engine-installer package

---
 usr/local/src/debian/escenic-content-engine-installer/postinst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/local/src/debian/escenic-content-engine-installer/postinst b/usr/local/src/debian/escenic-content-engine-installer/postinst
index ca61ce55..d1b78243 100755
--- a/usr/local/src/debian/escenic-content-engine-installer/postinst
+++ b/usr/local/src/debian/escenic-content-engine-installer/postinst
@@ -1,7 +1,7 @@
 #! /usr/bin/env bash
 # set -e
 
-chmod +x /usr/sbin/ece-install /usr/bin/{ece,system-info}
+chmod +x /usr/sbin/ece-install
 
 echo "You can now run the Escenic Content Engine installer "
 echo "by typing 'ece-install' as root"

From a0e8ade5d793fd15c9d4872e92af84f5604aaaec Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 16 Mar 2012 10:49:23 +0800
Subject: [PATCH 0523/2585] - removed user output:

  "You can now run the Escenic Content Engine installer "
  "by typing 'ece-install' as root"

  As this is rather unusual for a DEB package.
---
 usr/local/src/debian/escenic-content-engine-installer/postinst | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/usr/local/src/debian/escenic-content-engine-installer/postinst b/usr/local/src/debian/escenic-content-engine-installer/postinst
index d1b78243..9f4c9f1c 100755
--- a/usr/local/src/debian/escenic-content-engine-installer/postinst
+++ b/usr/local/src/debian/escenic-content-engine-installer/postinst
@@ -3,8 +3,5 @@
 
 chmod +x /usr/sbin/ece-install
 
-echo "You can now run the Escenic Content Engine installer "
-echo "by typing 'ece-install' as root"
-
 exit 0
 

From 9086a5fe5bff96c8bffedc5d25ffa586c1503962 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 16 Mar 2012 10:52:22 +0800
Subject: [PATCH 0524/2585] - removed the pulse methods

---
 usr/sbin/ece-install | 60 --------------------------------------------
 1 file changed, 60 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index cf6a4f7b..7886f246 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -223,66 +223,6 @@ function install_common_os_packages()
   done
 }
 
-######################################################################
-# <pulse-methods>
-######################################################################
-function download_escenic_components_p() {
-  $(download_escenic_components) &
-  show_pulse $! "Downloading Escenic components from Technet"
-}
-
-function set_up_instance_specific_nursery_configuration_p() {
-  $(set_up_instance_specific_nursery_configuration) &
-  show_pulse $! "Setting up instance specific Nursery configuration"
-}
-
-function assemble_deploy_and_restart_type_p() {
-  echo $(assemble_deploy_and_restart_type) &
-  show_pulse $! "Assembling, deploying & starting $instance_name"
-}
-
-function set_up_engine_and_plugins_p() {
-  $(set_up_engine_and_plugins) &
-  show_pulse $! "Setting up the Escenic Content Engine & its plugins"
-}
-  
-function check_for_required_downloads_p() {
-  $(check_for_required_downloads) &
-  show_pulse $! "Asserting that required downloads succeeded"
-}
-
-function set_up_user_environment_p() {
-  $(set_up_user_environment) &
-  show_pulse $! "Setting up the ${ece_user} user's UNIX environment"
-}
-
-function set_up_ece_scripts_p() {
-  $(set_up_ece_scripts) &
-  show_pulse $! 'Setting up the ece UNIX scripts'
-  if [ -n "${messages}" ]; then
-    echo $message
-  fi
-}
-
-function install_common_os_packages_p() {
-  $(install_common_os_packages) &
-  show_pulse $! "Installing 3rd party packages needed by $(basename $0)"
-}
-
-function install_ece_third_party_packages_p() {
-  $(install_ece_third_party_packages) &
-  show_pulse $! "Installing 3rd party packages needed by ECE"
-}
-
-function set_up_assembly_tool_p() {
-  $(set_up_assembly_tool) &
-  show_pulse $! "Setting up the Assembly Tool"
-}
-  
-######################################################################
-# </pulse-methods>
-######################################################################
-
 function set_up_ece_scripts()
 {
   print_and_log 'Setting up the ece UNIX scripts ...'

From 45bcd40034a1c865c435f251d319298dec525981 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 16 Mar 2012 10:53:21 +0800
Subject: [PATCH 0525/2585] - fix for $command being more than one command (bug
 introduced with   yesterday's "list-instances" command test in sanity_check

---
 usr/bin/ece | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index f5f27f17..d066ae82 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -471,7 +471,7 @@ function sanity_check()
         exit 1
     fi
 
-    if [ $command == "list-instances" ]; then
+    if [ "$command" == "list-instances" ]; then
       return
     fi
 

From 40439fa03fbd651c403e27fe7dc4efa10e6f0888 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 16 Mar 2012 10:54:04 +0800
Subject: [PATCH 0526/2585] - more user feedback in set_up_engine_and_plugins,
 before the message   was only logged, not displayed to standard out.

---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index bc71ea22..422b2d8b 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -105,7 +105,7 @@ function set_up_engine_and_plugins() {
     return
   fi
   
-  log "Setting up the Escenic Content Engine & its plugins ..."
+  print_and_log "Setting up the Escenic Content Engine & its plugins ..."
 
   make_dir $escenic_root_dir
   cd $escenic_root_dir/

From dfa632e6329336edc2064dde07d6d8a58c8e0dee Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 16 Mar 2012 11:21:28 +0800
Subject: [PATCH 0527/2585] - bug fix in set_up_basic_nursery_configuration:
 provided JAAS   configuration in the conf archive bundle wasn't heeded.

---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 422b2d8b..ed0de9da 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -264,6 +264,8 @@ function set_up_basic_nursery_configuration() {
     print_and_log "Using the supplied Nursery & JAAS configuration from" 
     print_and_log "bundle: $ece_instance_conf_archive"
     local a_tmp_dir=$(mktemp -d)
+    run cd $a_tmp_dir
+    run tar xzf $ece_instance_conf_archive
     
     if [ ! -d ${a_tmp_dir}/engine/security ]; then
       print "Archive $ece_instance_conf_archive doesn't have JAAS config,"
@@ -271,8 +273,6 @@ function set_up_basic_nursery_configuration() {
       run cp -r $escenic_root_dir/engine/security/ $common_nursery_dir/
     fi
     
-    run cd $a_tmp_dir
-    run tar xzf $ece_instance_conf_archive
     run cp -r engine/siteconfig/config-skeleton/* $common_nursery_dir/
   else
     run cp -r $escenic_root_dir/engine/siteconfig/config-skeleton/* \

From 6ed77b19d67611e4241c2e795ed990c80f7821dd Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 16 Mar 2012 11:44:35 +0800
Subject: [PATCH 0528/2585] - moved content engine specific code to the
 content-engine.sh module - improved user feedback when using EAR based
 deployment.

---
 usr/sbin/ece-install                          | 66 ------------------
 .../ece-install.d/content-engine.sh           | 68 +++++++++++++++++++
 2 files changed, 68 insertions(+), 66 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 7886f246..92cef523 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -735,53 +735,6 @@ function update_type_instances_to_start_up()
   fi
 }
 
-ece_instance_ear_file=""
-ece_instance_conf_archive=""
-
-function set_archive_files_depending_on_profile()
-{
-    if [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ]; then
-        ece_instance_ear_file=$fai_presentation_ear
-        ece_instance_conf_archive=$fai_presentation_conf_archive
-    elif [ $install_profile_number -eq $PROFILE_EDITORIAL_SERVER ]; then
-        ece_instance_ear_file=$fai_editor_ear
-        ece_instance_conf_archive=$fai_editor_conf_archive
-    elif [ $install_profile_number -eq $PROFILE_SEARCH_SERVER ]; then
-        ece_instance_ear_file=$fai_search_ear
-        ece_instance_conf_archive=$fai_search_conf_archive
-    fi
-}
-
-# Returns 1 if we're installing the ECE instances from a provided EAR
-# file
-function is_installing_from_ear()
-{
-    log install_profile_number=$install_profile_number
-    log ece_instance_ear_file=$ece_instance_ear_file
-
-    if [[ -z "$ece_instance_ear_file" || \
-        $fai_enabled -eq 0 ]]; then
-        echo 0
-        return
-    fi
-
-    echo 1
-}
-
-# Returns 1 if we're using a tarball with the Nursery & JAAS configuration.
-function is_using_conf_archive(){
-    log install_profile_number=$install_profile_number
-    log ece_instance_conf_archive=$ece_instance_conf_archive
-
-    if [[ -z "$ece_instance_conf_archive" || \
-        $fai_enabled -eq 0 ]]; then
-        echo 0
-        return
-    fi
-
-    echo 1
-}
-
 # verifies that the passed file(s) exist and are readable, depends on
 # set_archive_files_depending_on_profile
 function verify_that_files_exist_and_are_readable()
@@ -806,25 +759,6 @@ function install_presentation_server()
     install_ece_instance "web1" $PROFILE_PRESENTATION_SERVER
 }
 
-function assemble_deploy_and_restart_type()
-{
-    print_and_log "Assembling, deploying & starting $instance_name ..."
-    
-    set_correct_permissions
-
-    # need to run clean here since we might be running multiple
-    # profiles in the same ece-install process.
-    ece_command="ece -i $instance_name -t $type clean assemble deploy restart"
-    if [ $(is_installing_from_ear) -eq 1 ]; then
-        run cp $ece_instance_ear_file $escenic_cache_dir/engine.ear
-        ece_command="ece -i $instance_name -t $type deploy restart"
-        log "Using the supplied EAR instead of running an assembly."
-    fi
-    
-    su - $ece_user -c "$ece_command" 1>>$log 2>>$log
-    exit_on_error "su - $ece_user -c \"$ece_command\""
-}
-
 # If the system is installed using the recommended paths, the method
 # will return a list of the instances configured in
 # ${escenic_conf_dir}/engine/instance
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index ed0de9da..51dd34e9 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -486,3 +486,71 @@ function install_ece_third_party_packages
     assert_pre_requisite $el
   done
 }
+
+ece_instance_ear_file=""
+ece_instance_conf_archive=""
+
+function set_archive_files_depending_on_profile()
+{
+  if [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ]; then
+    ece_instance_ear_file=$fai_presentation_ear
+    ece_instance_conf_archive=$fai_presentation_conf_archive
+  elif [ $install_profile_number -eq $PROFILE_EDITORIAL_SERVER ]; then
+    ece_instance_ear_file=$fai_editor_ear
+    ece_instance_conf_archive=$fai_editor_conf_archive
+  elif [ $install_profile_number -eq $PROFILE_SEARCH_SERVER ]; then
+    ece_instance_ear_file=$fai_search_ear
+    ece_instance_conf_archive=$fai_search_conf_archive
+  fi
+}
+
+# Returns 1 if we're installing the ECE instances from a provided EAR
+# file
+function is_installing_from_ear()
+{
+  log install_profile_number=$install_profile_number
+  log ece_instance_ear_file=$ece_instance_ear_file
+
+  if [[ -z "$ece_instance_ear_file" || \
+    $fai_enabled -eq 0 ]]; then
+    echo 0
+    return
+  fi
+
+  echo 1
+}
+
+# Returns 1 if we're using a tarball with the Nursery & JAAS configuration.
+function is_using_conf_archive(){
+  log install_profile_number=$install_profile_number
+  log ece_instance_conf_archive=$ece_instance_conf_archive
+
+  if [[ -z "$ece_instance_conf_archive" || \
+    $fai_enabled -eq 0 ]]; then
+    echo 0
+    return
+  fi
+
+  echo 1
+}
+
+function assemble_deploy_and_restart_type()
+{
+  set_correct_permissions
+
+    # need to run clean here since we might be running multiple
+    # profiles in the same ece-install process.
+  ece_command="ece -i $instance_name -t $type clean assemble deploy restart"
+  if [ $(is_installing_from_ear) -eq 1 ]; then
+    run cp $ece_instance_ear_file $escenic_cache_dir/engine.ear
+    ece_command="ece -i $instance_name -t $type deploy restart"
+    print_and_log "Deploying the supplied EAR on instance $instance_name"
+    print_and_log "and restarting it ..."
+  else
+    print_and_log "Assembling, deploying & starting $instance_name ..."
+  fi
+  
+  su - $ece_user -c "$ece_command" 1>>$log 2>>$log
+  exit_on_error "su - $ece_user -c \"$ece_command\""
+}
+

From 001053176a01bdbe3e694ce0f0d1bc985020af2d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 16 Mar 2012 12:07:00 +0800
Subject: [PATCH 0529/2585] - fix to "ece list-instances" in sanity_check. This
 should also fix   the issue with TAB completion where the error message (you
 have to   specify instance with -i ...) would be included in the completion  
 list.

---
 usr/bin/ece | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index d066ae82..bf3f1419 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -471,7 +471,7 @@ function sanity_check()
         exit 1
     fi
 
-    if [ "$command" == "list-instances" ]; then
+    if [ "$(echo $command)" == "list-instances" ]; then
       return
     fi
 

From 5a47f0aaba7683f754f9d8c17c55ceb3b52beb4c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 16 Mar 2012 12:14:53 +0800
Subject: [PATCH 0530/2585] - new method: get_gc_log - the GC log is now
 included in the output both from "ece log" and   "ece loglist"

---
 usr/bin/ece | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index bf3f1419..8f51bf89 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -233,6 +233,8 @@ function set_common_settings()
         log_file=$log_dir/$type-$instance.out
         pid_file=$pid_dir/$type-$instance.pid
     fi
+    
+    gc_log=${log_dir}/${type}-${instance}-gc.log
 
     log_file_list="
       $log_dir/${HOSTNAME}-${instance}-messages
@@ -363,7 +365,7 @@ function set_instance_settings()
       -Dsolr.solr.home=$solr_home
       -XX:+PrintGCDetails
       -XX:+PrintGCTimeStamps
-      -Xloggc:${log_dir}/${type}-${instance}-gc.log
+      -Xloggc:${gc_log}
     "
 
     if [ "$jvm_gc_settings" ]; then
@@ -1020,6 +1022,7 @@ function get_info_for_type()
     print "|-> System out log:" $log_file
     print "|-> App server log:" $(get_app_log)
     print "|-> Log4j log:     " $(get_log4j_log)
+    print "|-> GC log:        " $(get_gc_log)
     
     if [ -n "${appserver}" ]; then
         print "Application server:"
@@ -1290,6 +1293,10 @@ EOF
     run rm -rf ${dir}
 }
 
+function get_gc_log() {
+  echo ${gc_log}
+}
+
 function get_log4j_log()
 {
     for el in $log_file_list; do
@@ -1684,10 +1691,12 @@ function show_all_log_paths()
         print "System out log: "$log_file
         print "App server log: "$(get_app_log)
         print "log4j log:  "$(get_log4j_log)
+        print "GC log:  "$(get_gc_log)
     else
         echo $log_file
         echo $(get_app_log)
         echo $(get_log4j_log)
+        echo $(get_gc_log)
     fi
 }
 

From 11d1d76abc675223b3fb245fcee5cac8b995e1da Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 16 Mar 2012 12:24:51 +0800
Subject: [PATCH 0531/2585]  -  The common files are also provided in the
 installer. Later, when     we've got a repo up and running, we'll let the
 -installer depend     on the scripts package, and then remove the common
 scripts from     the installer.

    For now though, the -scripts package doesn't include the common
    files.

- included the init.d script itself in the -scripts package
---
 usr/local/src/create-packages | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/usr/local/src/create-packages b/usr/local/src/create-packages
index 5c38862d..f14d99d7 100644
--- a/usr/local/src/create-packages
+++ b/usr/local/src/create-packages
@@ -49,15 +49,23 @@ function set_up_target_directory() {
     
   elif [[ $package_name == "escenic-content-engine-scripts" ]]; then
     mkdir -p $target_dir/usr/share/doc/escenic
+    mkdir -p $target_dir/etc/init.d
     mkdir -p $target_dir/usr/share/escenic/ece-scripts
-    
+
     cp -r ../../bin/{ece,system-info} $target_dir/usr/bin/
-    cp -r ../../share/escenic/ece-scripts/common* \
-      $target_dir/usr/share/escenic/ece-scripts/
+
+    # The common files are also provided in the installer. Later, when
+    # we've got a repo up and running, we'll let the -installer depend
+    # on the scripts package, and then remove the common scripts from
+    # the installer.
+    # cp -r ../../share/escenic/ece-scripts/common* \
+    # $target_dir/usr/share/escenic/ece-scripts/
+    
     cp -r ../../share/doc/escenic/{ece,system-info}-guide.{org,html} \
       $target_dir/usr/share/doc/escenic
     cp -r ../../../etc/escenic/ $target_dir/etc/
-    cp -r ../../../etc/default/ece $target_dir/etc/default
+    cp -r ../../../etc/default/ece $target_dir/etc/default/
+    cp -r ../../../etc/init.d/ece $target_dir/etc/init.d/
     
   elif [[ $package_name == "vosa" ]]; then
     mkdir -p $target_dir/usr/share/doc/vosa

From 7ab99202357e751ab2edccb4f4f930873b0beee7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 16 Mar 2012 12:25:49 +0800
Subject: [PATCH 0532/2585] - updated comment header to include the vosa
 scripts :)

---
 usr/local/src/create-packages | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/local/src/create-packages b/usr/local/src/create-packages
index f14d99d7..f8a70f11 100644
--- a/usr/local/src/create-packages
+++ b/usr/local/src/create-packages
@@ -1,7 +1,7 @@
 #! /usr/bin/env bash
 
-# script fro creating DEB and RPM packages of the ece-install and ece
-# scripts.
+# script fro creating DEB and RPM packages of the vosa, ece-install
+# and ece scripts.
 
 # by tkj@vizrt.com
 

From e3dd4789a09a18fc6e2bfbdb2e640b2a18df1d6c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 16 Mar 2012 12:59:48 +0800
Subject: [PATCH 0533/2585] - fixed bug in nagios-nrpe-server, restart fails
 (sometimes) if the PID   isn't there (!)

---
 usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index 89956481..4e0b1c1a 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -130,7 +130,11 @@ function install_nagios_node()
     $file
   dont_quote_conf_values=0
 
+  # bug in nagios-nrpe-server, restart fails (sometimes) if the PID
+  # isn't there (!)
+  run touch /var/run/nagios/nrpe.pid
   run /etc/init.d/nagios-nrpe-server restart
+  
   add_next_step "A Nagios NRPE node has been installed on ${HOSTNAME}"
 }
 

From c93d5c3331867ed77ca105e157547370667e981d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 16 Mar 2012 13:45:24 +0800
Subject: [PATCH 0534/2585] - improved "taking care of the user": provider=1
 will now test to see   if all the needed variables are set in the .conf file.

---
 .../escenic/ece-scripts/ece-install.d/vip-provier.sh      | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/vip-provier.sh b/usr/share/escenic/ece-scripts/ece-install.d/vip-provier.sh
index 03196109..1f890e5c 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/vip-provier.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/vip-provier.sh
@@ -19,6 +19,14 @@ function get_vip_configuration() {
   # /etc/ha.d/authkeys), looks something like:
   # e19f39c09e9affafc23fc5bcd0404186
   vip_primary_node_auth_key=${fai_vip_primary_node_auth_key}
+
+  ensure_variable_is_set \
+    fai_vip_address \
+    fai_vip_sibling_ip \
+    fai_vip_primary_node_name \
+    fai_vip_primary_node_ip \
+    fai_vip_secondary_node_name \
+    fai_vip_secondary_node_ip
 }
 
 function install_vip_provider() {

From db175593c99f874fa431d42b0c1935e4eb61e25b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 16 Mar 2012 14:05:45 +0800
Subject: [PATCH 0535/2585] - taking care of the user, making sure that
 required variables:

    fai_db_master_host
    fai_db_master_log_file
    fai_db_master_log_position

  are provided in the ece-install.conf before attempting setting up a
  DB slave.
---
 usr/share/escenic/ece-scripts/ece-install.d/database.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 85a5a492..dcd81f06 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -210,8 +210,13 @@ function set_db_settings_from_fai_conf()
   db_master_host=${fai_db_master_host}
   db_master_log_file=${fai_db_master_log_file}
   db_master_log_position=${fai_db_master_log_position}
-  
-  # TODO assert set
+
+  if [ $fai_db_master -eq 0 ]; then
+    ensure_variable_is_set \
+      fai_db_master_host \
+      fai_db_master_log_file \
+      fai_db_master_log_position
+  fi
 }
 
 # Method used both from interactive mode to set any missing values

From f8b68528cfde11b51a30f2ba6b78962e4fd8a44a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 16 Mar 2012 15:03:25 +0800
Subject: [PATCH 0536/2585] - improved cache server profile: you can now have
 two or more backends   on the same host. This is useful for cases were you
 want to run the   cache server on the same host as the ECE presentation
 servers and   you have more than one ECE you want to serve the site with.

---
 .../escenic/ece-scripts/ece-install.d/cache-server.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
index 3fff7e19..b98d0e45 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
@@ -108,18 +108,20 @@ backend static {
 }
 
 EOF
+  local i=0
   for el in $backend_servers; do
     appserver_id=$(echo $el | cut -d':' -f1 | sed 's/-/_/g')
     appserver_host=$(echo $el | cut -d':' -f1)
     appserver_port=$(echo $el | cut -d':' -f2)
 
     cat >> /etc/varnish/default.vcl <<EOF
-backend $appserver_id {
+backend ${appserver_id}${i} {
   .host = "$appserver_host";
   .port = "$appserver_port";
 }
 
 EOF
+    i=$(( $i+1 ))
   done
 
   cat >> /etc/varnish/default.vcl <<EOF
@@ -127,14 +129,17 @@ EOF
  * IP. */
 director webdirector client {
 EOF
+
+  i=0
   for el in $backend_servers; do
-	  appserver_id=$(echo $el | cut -d':' -f1 | sed 's/-/_/g' )        
+	  appserver_id=$(echo $el | cut -d':' -f1 | sed 's/-/_/g')        
     cat >> /etc/varnish/default.vcl <<EOF
   {
-     .backend = $appserver_id;
+     .backend = ${appserver_id}${i};
      .weight = 1;
   }
 EOF
+    i=$(( $i+1 ))
   done
 
   cat >> /etc/varnish/default.vcl <<EOF

From cd3f5d633f4a3a23ece130e753680a326702f33c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 16 Mar 2012 15:18:50 +0800
Subject: [PATCH 0537/2585] - small bug fix in DB master test

---
 usr/share/escenic/ece-scripts/ece-install.d/database.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index dcd81f06..1060667a 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -211,7 +211,7 @@ function set_db_settings_from_fai_conf()
   db_master_log_file=${fai_db_master_log_file}
   db_master_log_position=${fai_db_master_log_position}
 
-  if [ $fai_db_master -eq 0 ]; then
+  if [ $db_master -eq 0 ]; then
     ensure_variable_is_set \
       fai_db_master_host \
       fai_db_master_log_file \

From 21e3f80d2c234220e427e46871b8f1709d5237b8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 16 Mar 2012 15:21:59 +0800
Subject: [PATCH 0538/2585] - another wee fix for DB installation which are not
 a part of a   master/slave setup but plain old DB setup.

---
 usr/share/escenic/ece-scripts/ece-install.d/database.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 1060667a..c30c1286 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -211,7 +211,7 @@ function set_db_settings_from_fai_conf()
   db_master_log_file=${fai_db_master_log_file}
   db_master_log_position=${fai_db_master_log_position}
 
-  if [ $db_master -eq 0 ]; then
+  if [ $db_master -eq 0 -a $db_replication -eq 1 ]; then
     ensure_variable_is_set \
       fai_db_master_host \
       fai_db_master_log_file \

From c2552e7ef578899df0fc98280c245887c5a8c1f7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 19 Mar 2012 12:14:10 +0800
Subject: [PATCH 0539/2585] - moved the installation of cache server after the
 presentation server   profile so that one ece-install process can install a
 presentation   server first and then a cache server from the same
 ece-install.conf   file.

---
 usr/sbin/ece-install | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 92cef523..5294e5b0 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -955,13 +955,6 @@ if [ $fai_enabled -eq 1 ]; then
         no_fai_profile=0
     fi
     
-    if [ $(get_boolean_conf_value fai_cache_install) -eq 1 ]; then
-        install_profile_number=$PROFILE_CACHE_SERVER
-        install_cache_server
-        install_web_server 0
-        no_fai_profile=0
-    fi
-    
     if [ $(get_boolean_conf_value fai_wf_install) -eq 1 ]; then
         install_profile_number=$PROFILE_WIDGET_FRAMEWORK
         install_widget_framework
@@ -974,6 +967,13 @@ if [ $fai_enabled -eq 1 ]; then
         no_fai_profile=0
     fi
     
+    if [ $(get_boolean_conf_value fai_cache_install) -eq 1 ]; then
+        install_profile_number=$PROFILE_CACHE_SERVER
+        install_cache_server
+        install_web_server 0
+        no_fai_profile=0
+    fi
+    
     if [ $(get_boolean_conf_value fai_publication_create) -eq 1 ]; then
         install_profile_number=$PROFILE_CREATE_PUBLICATION
         create_publication

From 9248e09f5d31e0e257ba9ff1ded77511a81c8a6e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 19 Mar 2012 12:43:05 +0800
Subject: [PATCH 0540/2585] - any method coming after install_memory_cache that
 used a shell   command (not a BASH built-in), would get a PWD error because  
 install_memory_cache removed the tmp directory in which it was CD-ed   into,
 e.g.:

  [ece-install-850] Installing a caching server on staging ...
  sh: getcwd() failed: No such file or directory

  This had no practical implications, but was confusing
  nevertheless. This has now been fixed.
---
 usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh b/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
index f3a71e89..5c73fe3c 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
@@ -23,6 +23,7 @@ function install_memory_cache()
   make_dir ${escenic_root_dir}/assemblytool/lib
   run cp $name/$name.jar ${escenic_root_dir}/assemblytool/lib
   run rm -rf $tmp_dir
+  run cd ~/
   
   memcached_set_up_common_nursery
 

From c1096b533bfae100c2fd1da21eaf3f399361d917 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 20 Mar 2012 11:36:32 +0800
Subject: [PATCH 0541/2585] - fix in get_privileged_hosts: if the host you
 connect from is on the   server identified with a :<something, e.g.:

    114-40-28-73:S.1

  The :S.1 would remain in the privileged host name, which would cause
  the Varnish VCL configuration to fail. This has now been fixed.
---
 usr/sbin/ece-install | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 5294e5b0..7f3fb1b7 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -487,7 +487,7 @@ function un_install_ece()
         ; do
         apt-get --yes --purge remove $el
     done
-    
+
     apt-get clean
 }
 
@@ -496,13 +496,14 @@ function un_install_ece()
 ## as any IPs defined in fai_privileged_hosts.
 function get_privileged_hosts() {
   local privileged_hosts=${fai_privileged_hosts}
-  
+
   for ip in $(
     w -h  | \
       grep pts | \
       grep -v ":0.0" | \
-    sed "s#.*pts/[0-9]*[ ]*\(.*\)#\1#" | \
+      sed "s#.*pts/[0-9]*[ ]*\(.*\)#\1#" | \
       cut -d' ' -f1 | \
+      cut -d':' -f1 | \
       sort | \
       uniq
   ); do

From 3a35f5bf4b4ee94d10021a789cbe3682bd6ca52a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 20 Mar 2012 13:36:55 +0800
Subject: [PATCH 0542/2585] - fix in "ece info" in case the user doesn't have
 read access to the   app server configuration files, "ece info" would produce
 a number of   big errors due to xml_grep's verbosity.

---
 usr/bin/ece | 64 +++++++++++++++++++++++++++++++----------------------
 1 file changed, 37 insertions(+), 27 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 8f51bf89..9c19cb7a 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -1058,36 +1058,46 @@ function print_tomcat_resources() {
 
   print "Application server resources:"
 
-  xml_grep  --nowrap --cond Context/Environment \
-    $tomcat_base/conf/context.xml | \
-    sed 's/^[ \t]//g' | \
-    sed "s#><#>\n<#g" | \
-    cut -d' ' -f2,5 |  \
-    cut -d'"' -f2,4 | \
-    while read line ; do
-    local key=$(echo $line | cut -d'"' -f1)
-    local value=$(echo $line | cut -d'"' -f2)
-    print "|->" ${key}: ${value}
-  done
-   
+  local file=$tomcat_base/conf/context.xml
+  if [ -r $file ]; then
+    xml_grep  --nowrap --cond Context/Environment \
+      $file | \
+      sed 's/^[ \t]//g' | \
+      sed "s#><#>\n<#g" | \
+      cut -d' ' -f2,5 |  \
+      cut -d'"' -f2,4 | \
+      while read line ; do
+      local key=$(echo $line | cut -d'"' -f1)
+      local value=$(echo $line | cut -d'"' -f2)
+      print "|->" ${key}: ${value}
+    done
+  else
+    print "|-> $USER cannot read $file"
+  fi
+  
   print "Database:"
-  xml_grep \
-    --nowrap \
-    --cond 'Server/GlobalNamingResources/Resource[@type="javax.sql.DataSource"]' \
-    $tomcat_base/conf/server.xml | \
-    sed 's/^[ \t]//g' | \
-    sed "s#><#>\n<#g" | \
-    while read line ; do
-    for el in $(echo $line | cut -d' ' -f1- ); do
-      if [[ $el == "name"* || $el == "url"* || $el == "username"* ]]; then
-        local key=$(echo $el | cut -d'"' -f1 | cut -d'=' -f1)
-        local value=$(echo $el | cut -d'"' -f2)
-        print "|->" ${key}: ${value}
-      fi
+  file=$tomcat_base/conf/server.xml
+  if [ -r $file ]; then
+    xml_grep \
+      --nowrap \
+      --cond 'Server/GlobalNamingResources/Resource[@type="javax.sql.DataSource"]' \
+      $file | \
+      sed 's/^[ \t]//g' | \
+      sed "s#><#>\n<#g" | \
+      while read line ; do
+      for el in $(echo $line | cut -d' ' -f1- ); do
+        if [[ $el == "name"* || $el == "url"* || $el == "username"* ]]; then
+          local key=$(echo $el | cut -d'"' -f1 | cut -d'=' -f1)
+          local value=$(echo $el | cut -d'"' -f2)
+          print "|->" ${key}: ${value}
+        fi
 
+      done
     done
-  done
-  
+  else
+    print "|-> $USER cannot read $file"
+  fi
+
 }
 
 function restart_type()

From 608288e1205d32064156262aab92840795171db0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 20 Mar 2012 13:38:09 +0800
Subject: [PATCH 0543/2585] - improved error string if user cannot read the
 configuration file

---
 usr/bin/ece | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 9c19cb7a..cd51df77 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -1072,7 +1072,7 @@ function print_tomcat_resources() {
       print "|->" ${key}: ${value}
     done
   else
-    print "|-> $USER cannot read $file"
+    print "|-> user $USER cannot read $file"
   fi
   
   print "Database:"
@@ -1095,7 +1095,7 @@ function print_tomcat_resources() {
       done
     done
   else
-    print "|-> $USER cannot read $file"
+    print "|-> user $USER cannot read $file"
   fi
 
 }

From 49314f84ceecadd8802570b0147f445b3ca82a71 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 20 Mar 2012 15:14:23 +0800
Subject: [PATCH 0544/2585] - changed the header of the "ece versions" command
 (partly to make it   better parseable by ece-overview.

---
 usr/bin/ece | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index cd51df77..fb847796 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -1588,7 +1588,7 @@ function list_versions()
     version_manager=browser/Global/neo/io/managers/VersionManager
     url=$(get_escenic_admin_url)/$version_manager
         
-    print "Installed on the ${type} running on ${host}:${port} is:"
+    print "Installed on the ${instance} instance running on port ${port}:"
     wget $wget_auth -O - $url  2>/dev/null | \
         grep "\[\[" | \
         sed 's/\[//g' | \

From be3e79e0b326a05679c1d16afa9d4df201bcf223 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 20 Mar 2012 15:21:40 +0800
Subject: [PATCH 0545/2585] - improved output from "ece info", creating better
 URIs for MySQL   DBs.

---
 usr/bin/ece | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/usr/bin/ece b/usr/bin/ece
index fb847796..d819811e 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -1089,6 +1089,10 @@ function print_tomcat_resources() {
         if [[ $el == "name"* || $el == "url"* || $el == "username"* ]]; then
           local key=$(echo $el | cut -d'"' -f1 | cut -d'=' -f1)
           local value=$(echo $el | cut -d'"' -f2)
+          if [[ $value == "jdbc:mysql"* ]]; then
+            value=${value:5}
+          fi
+          
           print "|->" ${key}: ${value}
         fi
 

From bbca038fe43742be59723cc1acdb702bd250003a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 20 Mar 2012 18:42:19 +0800
Subject: [PATCH 0546/2585] - new feature: ece  info also lists deployed web
 applications, e.g.:

  [ece#engine-web1] Deployed web applications:
  [ece#engine-web1] |-> http://quanah:8080/solr
  [ece#engine-web1] |-> http://quanah:8080/webservice
  [ece#engine-web1] |-> http://quanah:8080/escenic
  [ece#engine-web1] |-> http://quanah:8080/inpage-ws
  [ece#engine-web1] |-> http://quanah:8080/ip
  [ece#engine-web1] |-> http://quanah:8080/escenic-admin
---
 usr/bin/ece | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index d819811e..e619adfc 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -1039,17 +1039,31 @@ function get_info_for_type()
                     print "|-> Tomcat home:" $tomcat_home
                     print "|-> Tomcat base:" $tomcat_base
                     print_tomcat_resources
+                    print_deployed_webapps $tomcat_base
                 fi
             ;;
             resin)
                 if [ -n "${resin_home}" ]; then
                     print "  |-> Resin home:" $resin_home
+                    print_deployed_webapps $resin_home
                 fi
                 ;;
         esac
     fi
 }
 
+## $1: dir
+function print_deployed_webapps() {
+  local webapps=""
+  
+  print "Deployed web applications:"
+  for el in $(find $1/webapps -maxdepth 1 -type d | \
+    grep -v webapps$); do
+    print "|-> http://${HOSTNAME}:${port}/"$(basename $el)
+  done
+
+}
+
 function print_tomcat_resources() {
   if [ "$(which xml_grep)x" == "x" ]; then
     log "Install xml_grep to get more 'ece info' details"
@@ -1101,7 +1115,6 @@ function print_tomcat_resources() {
   else
     print "|-> user $USER cannot read $file"
   fi
-
 }
 
 function restart_type()

From b6da6b9d9f4caf703f8028c54002cee81400cc60 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 20 Mar 2012 19:34:14 +0800
Subject: [PATCH 0547/2585] - added support for org, html and potentially other
 output formats,   definable by the -f <format> parameter.

---
 usr/bin/ece-overview | 218 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 218 insertions(+)
 create mode 100644 usr/bin/ece-overview

diff --git a/usr/bin/ece-overview b/usr/bin/ece-overview
new file mode 100644
index 00000000..859967c4
--- /dev/null
+++ b/usr/bin/ece-overview
@@ -0,0 +1,218 @@
+#! /usr/bin/env bash
+
+## Script which creates an overview of system information related to
+## the specified ECE/EAE/Search instance, example invocation:
+##
+## $ ece-overview -i web1 | xmllint --format - > /var/www/web1.html
+
+instance=dev1
+
+## 1 : html
+## 2 : org
+format=html
+
+function create_header() {
+  local title="Overview of the $instance instance on $HOSTNAME"
+  
+  if [ $format == "org" ]; then
+    echo "* $title"
+    echo "Generated @ $(date)"
+    return
+  fi
+
+  local header="
+<html xmlns=\"http://www.w3.org/1999/xhtml\">
+  <head>
+    <title>$title @ $(date)</title>
+    <style type=\"text/css\">
+$(cat ../share/escenic/ece-scripts/vizrt.css)
+    </style>
+  </head>
+  <body>
+$(cat ../share/escenic/ece-scripts/html-vizrt-logo-svg.html)
+    <h1>$title</h1>
+    <p>Generated @ $(date)</p>
+    <ul>
+"
+  echo "$header"
+}
+
+function create_footer() {
+  if [ $format != "html" ]; then
+    return
+  fi
+  
+  local footer="
+  </body>
+</html>
+"
+  echo "$footer"
+}
+
+function wrap_in_anchor_if_applicable() {
+  if [ $format == "org" ]; then
+    echo "$@"
+    return
+  fi
+
+  local result=""
+  for el in "$@"; do
+    if [[ $el == "/"* || $el == "http://"* || $el == "mysql://"* ]]; then
+      result="$result <a href=\"${el}\">$el</a>"
+    else
+      result="$result $el"
+    fi
+    
+  done
+  echo "$result"
+}
+
+function print_un_ordered_list_start() {
+  if [ $format == "org" ]; then
+    echo ""
+  elif [ $format == "html" ]; then
+    echo "<ul>"
+  fi
+}
+
+function print_un_ordered_list_end() {
+  if [ $format == "org" ]; then
+    echo ""
+  elif [ $format == "html" ]; then
+    echo "</ul>"
+  fi
+}
+
+function print_list_item() {
+  if [ $format == "org" ]; then
+    echo "- $@"
+  elif [ $format == "html" ]; then
+    echo "<li>" \
+      "$@" \
+      "</li>"
+  fi
+}
+
+ 
+function do_create-overview() {
+  local data="$(ece -q -i $instance info)"$'\n'
+  data="$data $(ece -q -i $instance versions | cut -d'*' -f2-)"
+  
+  echo "$data" | while read line; do
+    if [[ $line == "|->"* ]]; then
+      print_list_item $(wrap_in_anchor_if_applicable ${line:3})
+    elif [ $(echo $line | cut -d':' -f2- | wc -c) -gt 1 ]; then
+      print_list_item $(wrap_in_anchor_if_applicable $line)
+    else
+      print_un_ordered_list_end
+      print_h2_header $(echo $line | cut -d: -f1)
+      print_un_ordered_list_start
+    fi
+    
+  done
+
+  list_services_running
+  list_hw
+}
+
+function print_pre_text() {
+  if [ $format == "org" ]; then
+    cat <<EOF
+#+BEGIN_SRC sh
+$@  
+#+END_SRC
+EOF
+  elif [ $format == "html" ]; then
+    cat <<EOF
+<pre>
+$@
+</pre>
+EOF
+  fi
+}
+
+function print_h2_header() {
+  if [ $format == "org" ]; then
+    echo ""
+    echo "** $@"
+  elif [ $format == "html" ]; then
+    echo "<h2>$@</h2>"
+  fi
+}
+
+function print_h1_header() {
+  if [ $format == "org" ]; then
+    echo "* $@"
+  elif [ $format == "html" ]; then
+    echo "<h1>$@</h1>"
+  fi
+}
+
+function print_p_text() {
+  if [ $format == "org" ]; then
+    echo "$@"
+  elif [ $format == "html" ]; then
+    cat <<EOF
+<p>
+  $@
+</p>
+EOF
+  fi
+}
+
+function list_hw() {
+  print_h2_header "Disks used on $HOSTNAME"
+  print_pre_text "$(df -hT)"
+  
+  print_h2_header "Memory on $HOSTNAME</h2>"
+  print_pre_text "$(free -m)"
+
+  print_h2_header "CPU(s) on $HOSTNAME"
+  print_p_text "Number of CPUs:" $(grep "model name" /proc/cpuinfo | wc -l)
+  print_pre_text "$(grep "model name" /proc/cpuinfo | sort | uniq)"
+}
+
+
+
+function list_services_running() {
+  cat <<EOF
+    </ul>
+    <h2>Overview of all server services on $HOSTNAME</h2>
+    <pre>
+$(netstat -nlp | egrep -v "tcp6|ACC" | grep LISTEN)
+    </pre>
+EOF
+
+  if [ $(whoami) != "root" ]; then
+    echo "<p>Run $(basename $0) as  root to get more details in this listing</p>"
+  fi
+}
+
+function get_user_options() {
+  while getopts ":i:f:" opt; do
+    case $opt in
+      i)
+        instance=${OPTARG}
+        ;;
+      f)
+        format=${OPTARG}
+        ;;
+      \?)
+        echo "Invalid option: -$OPTARG" >&2
+        exit 1
+        ;;
+      :)
+        echo "Option -$OPTARG requires an argument." >&2
+        exit 1
+        ;;
+    esac
+  done
+  
+}
+
+get_user_options $@
+create_header
+do_create-overview
+create_footer
+
+

From 95b707abd1888a36a556eba19c5a6f2c4b57cd5a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 20 Mar 2012 19:34:36 +0800
Subject: [PATCH 0548/2585] - added Vizrt SVG and CSS static files

---
 .../ece-scripts/html-vizrt-logo-svg.html      | 44 ++++++++++
 usr/share/escenic/ece-scripts/vizrt.css       | 85 +++++++++++++++++++
 2 files changed, 129 insertions(+)
 create mode 100644 usr/share/escenic/ece-scripts/html-vizrt-logo-svg.html
 create mode 100644 usr/share/escenic/ece-scripts/vizrt.css

diff --git a/usr/share/escenic/ece-scripts/html-vizrt-logo-svg.html b/usr/share/escenic/ece-scripts/html-vizrt-logo-svg.html
new file mode 100644
index 00000000..c51f5b9a
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/html-vizrt-logo-svg.html
@@ -0,0 +1,44 @@
+<svg
+    id="vizrt-logo"
+    version="1.1"
+    width="138"
+    height="84"
+    > 
+  <g
+      id="g12"
+      transform="matrix(1.25,0,0,-1.25,-451.34003,425.24315)"> 
+    <g
+        id="g14"
+        transform="matrix(0.0246257,0,0,0.02458666,313.76213,231.21317)"> 
+      <path
+          d="m 3060.56,3437.2 -209.9,-593.4 -207.05,593.4 -215.82,0 326.08,-866.38 184.92,0 332.24,866.38 -210.47,0"
+          style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
+          id="path16"/> 
+      <path
+          d="m 3473.3,2569.82 193.547,0 0,866.531 -193.547,0 0,-866.531 z"
+          style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
+          id="path18"/> 
+      <path
+          d="m 3916.16,3436.36 -0.14,-177.24 364.23,0 -372.91,-554.74 0,-133.56 616.08,0 0,175.25 -374.66,0 366.68,550.78 0,139.51 -599.28,0"
+          style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
+          id="path20"/> 
+      <path
+          d="m 4961.8,3436.66 c -56.15,0 -99.9,-9.02 -144.01,-53.04 -42.13,-42.13 -63.55,-93.63 -63.55,-153.7 l 0,-658.85 193.26,0 0,629.18 c 0,16.39 5.76,30.04 17.53,41.82 9.79,9.87 32.16,17.44 52.18,17.44 l 161.49,0 0,177.15 -216.9,0"
+          style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
+          id="path22"/> 
+      <path
+          d="m 5367.91,3699.54 0,-915.91 c 0,-58.68 20.75,-109.43 62.13,-150.8 43.31,-43.47 85.57,-62.01 141.03,-62.01 l 212.69,0 0,174.7 -158.78,0 c -15.96,0 -28.96,5.5 -40.72,16.87 -11.19,11.53 -16.76,24.5 -16.76,40.65 l 0,456.42 216.26,0 0,176.39 -216.26,0 0,263.69 -199.59,0"
+          style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
+          id="path24"/> 
+      <path
+          d="m 1921.16,3066.86 c -0.39,-514.15 173.24,-988.49 465.56,-1367.51 l 69.26,204.63 c -205.49,300.61 -333.44,658.06 -355.3,1043.68 l -179.52,119.2"
+          style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
+          id="path26"/> 
+      <path
+          d="m 6404.28,3065.28 c 0.49,513.97 -173.17,988.55 -465.37,1367.26 l -69.46,-204.34 c 205.52,-300.7 333.61,-658.34 355.24,-1043.68 l 179.59,-119.24"
+          style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
+          id="path28"/> 
+      
+    </g> 
+  </g> 
+</svg>
diff --git a/usr/share/escenic/ece-scripts/vizrt.css b/usr/share/escenic/ece-scripts/vizrt.css
new file mode 100644
index 00000000..ce7826bc
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/vizrt.css
@@ -0,0 +1,85 @@
+body {
+  font-family: Arial, Helvetica, sans-serif;
+  font-size: small;
+  #width : 600;
+  margin: 70px 70px 0px 50px;
+}
+
+pre {
+  background-color: grey;
+}
+
+h1, h2 {
+  color: #e88424;
+}
+
+h1 {
+  font-size: 150%;
+}
+
+h2 {
+  font-size: 120%;
+  margin-top: 3em;
+  margin-bottom: 0em;
+}
+
+h3, h4, h5, h6 {
+  font-weight: bold;
+  margin-top: 2em;
+  margin-bottom: 0.2em;
+}
+
+h3, h4, h5 {
+  font-size: 110%;
+}
+
+h6 {
+  font-size: 80%;
+}
+
+a {
+  color: #333;
+  font-weight: bold;
+  text-decoration: none;
+}
+
+a:hover {
+  text-decoration: underline;
+}
+
+p, dl {
+  font-size: 95%;
+}
+
+p {
+  margin-top: 0em;
+  margin-bottom: 0.6em;
+}
+
+pre.programlisting {
+  margin-top: 0em;
+  background-color: #ffddaa;
+  padding-top: 0.5em;
+  padding-bottom: 0.5em;
+  padding-left: 0.5em;
+  padding-right: 0.5em;
+}
+
+em {
+  font-weight: bold;
+  font-style: normal;
+}
+
+em.replaceable {
+  font-weight: normal;
+  font-style: italic;
+}
+
+div.note {
+  background-color: #ffddaa;
+  padding-top: 0.5em;
+  padding-bottom: 0.5em;
+  padding-left: 0.5em;
+  padding-right: 0.5em;
+}
+

From cbf7874b8d7d4f1ea0e267062971ca3f60d00511 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 21 Mar 2012 11:27:59 +0800
Subject: [PATCH 0549/2585] - moved (and will later merge) the new ece-overview
 to the system-info   command as I realise the goals of the two are SO similar
 they ought   to be the same.

  TODO make system-info pluggable/extendable.
---
 usr/bin/ece-overview | 218 ---------------------------
 usr/bin/system-info  | 343 +++++++++++++++++++++++--------------------
 2 files changed, 184 insertions(+), 377 deletions(-)
 delete mode 100644 usr/bin/ece-overview

diff --git a/usr/bin/ece-overview b/usr/bin/ece-overview
deleted file mode 100644
index 859967c4..00000000
--- a/usr/bin/ece-overview
+++ /dev/null
@@ -1,218 +0,0 @@
-#! /usr/bin/env bash
-
-## Script which creates an overview of system information related to
-## the specified ECE/EAE/Search instance, example invocation:
-##
-## $ ece-overview -i web1 | xmllint --format - > /var/www/web1.html
-
-instance=dev1
-
-## 1 : html
-## 2 : org
-format=html
-
-function create_header() {
-  local title="Overview of the $instance instance on $HOSTNAME"
-  
-  if [ $format == "org" ]; then
-    echo "* $title"
-    echo "Generated @ $(date)"
-    return
-  fi
-
-  local header="
-<html xmlns=\"http://www.w3.org/1999/xhtml\">
-  <head>
-    <title>$title @ $(date)</title>
-    <style type=\"text/css\">
-$(cat ../share/escenic/ece-scripts/vizrt.css)
-    </style>
-  </head>
-  <body>
-$(cat ../share/escenic/ece-scripts/html-vizrt-logo-svg.html)
-    <h1>$title</h1>
-    <p>Generated @ $(date)</p>
-    <ul>
-"
-  echo "$header"
-}
-
-function create_footer() {
-  if [ $format != "html" ]; then
-    return
-  fi
-  
-  local footer="
-  </body>
-</html>
-"
-  echo "$footer"
-}
-
-function wrap_in_anchor_if_applicable() {
-  if [ $format == "org" ]; then
-    echo "$@"
-    return
-  fi
-
-  local result=""
-  for el in "$@"; do
-    if [[ $el == "/"* || $el == "http://"* || $el == "mysql://"* ]]; then
-      result="$result <a href=\"${el}\">$el</a>"
-    else
-      result="$result $el"
-    fi
-    
-  done
-  echo "$result"
-}
-
-function print_un_ordered_list_start() {
-  if [ $format == "org" ]; then
-    echo ""
-  elif [ $format == "html" ]; then
-    echo "<ul>"
-  fi
-}
-
-function print_un_ordered_list_end() {
-  if [ $format == "org" ]; then
-    echo ""
-  elif [ $format == "html" ]; then
-    echo "</ul>"
-  fi
-}
-
-function print_list_item() {
-  if [ $format == "org" ]; then
-    echo "- $@"
-  elif [ $format == "html" ]; then
-    echo "<li>" \
-      "$@" \
-      "</li>"
-  fi
-}
-
- 
-function do_create-overview() {
-  local data="$(ece -q -i $instance info)"$'\n'
-  data="$data $(ece -q -i $instance versions | cut -d'*' -f2-)"
-  
-  echo "$data" | while read line; do
-    if [[ $line == "|->"* ]]; then
-      print_list_item $(wrap_in_anchor_if_applicable ${line:3})
-    elif [ $(echo $line | cut -d':' -f2- | wc -c) -gt 1 ]; then
-      print_list_item $(wrap_in_anchor_if_applicable $line)
-    else
-      print_un_ordered_list_end
-      print_h2_header $(echo $line | cut -d: -f1)
-      print_un_ordered_list_start
-    fi
-    
-  done
-
-  list_services_running
-  list_hw
-}
-
-function print_pre_text() {
-  if [ $format == "org" ]; then
-    cat <<EOF
-#+BEGIN_SRC sh
-$@  
-#+END_SRC
-EOF
-  elif [ $format == "html" ]; then
-    cat <<EOF
-<pre>
-$@
-</pre>
-EOF
-  fi
-}
-
-function print_h2_header() {
-  if [ $format == "org" ]; then
-    echo ""
-    echo "** $@"
-  elif [ $format == "html" ]; then
-    echo "<h2>$@</h2>"
-  fi
-}
-
-function print_h1_header() {
-  if [ $format == "org" ]; then
-    echo "* $@"
-  elif [ $format == "html" ]; then
-    echo "<h1>$@</h1>"
-  fi
-}
-
-function print_p_text() {
-  if [ $format == "org" ]; then
-    echo "$@"
-  elif [ $format == "html" ]; then
-    cat <<EOF
-<p>
-  $@
-</p>
-EOF
-  fi
-}
-
-function list_hw() {
-  print_h2_header "Disks used on $HOSTNAME"
-  print_pre_text "$(df -hT)"
-  
-  print_h2_header "Memory on $HOSTNAME</h2>"
-  print_pre_text "$(free -m)"
-
-  print_h2_header "CPU(s) on $HOSTNAME"
-  print_p_text "Number of CPUs:" $(grep "model name" /proc/cpuinfo | wc -l)
-  print_pre_text "$(grep "model name" /proc/cpuinfo | sort | uniq)"
-}
-
-
-
-function list_services_running() {
-  cat <<EOF
-    </ul>
-    <h2>Overview of all server services on $HOSTNAME</h2>
-    <pre>
-$(netstat -nlp | egrep -v "tcp6|ACC" | grep LISTEN)
-    </pre>
-EOF
-
-  if [ $(whoami) != "root" ]; then
-    echo "<p>Run $(basename $0) as  root to get more details in this listing</p>"
-  fi
-}
-
-function get_user_options() {
-  while getopts ":i:f:" opt; do
-    case $opt in
-      i)
-        instance=${OPTARG}
-        ;;
-      f)
-        format=${OPTARG}
-        ;;
-      \?)
-        echo "Invalid option: -$OPTARG" >&2
-        exit 1
-        ;;
-      :)
-        echo "Option -$OPTARG requires an argument." >&2
-        exit 1
-        ;;
-    esac
-  done
-  
-}
-
-get_user_options $@
-create_header
-do_create-overview
-create_footer
-
-
diff --git a/usr/bin/system-info b/usr/bin/system-info
index 3df03f28..859967c4 100755
--- a/usr/bin/system-info
+++ b/usr/bin/system-info
@@ -1,193 +1,218 @@
 #! /usr/bin/env bash
 
-# Getting system info, especially useful before reporting to Escenic
-# select Support.
-
-# can be: ascii, confluence
-output_format=ascii
-on_debian_or_derivate=0
-on_gentoo_or_derivate=0
-on_redhat_or_derivate=0
-on_linux=0
-
-important_packages_on_debian="
-ant
-apache2
-libapr1
-libmysql-java
-libtcnative-1
-maven2
-mysql-server
-nginx
-percona-server-server
-slapd
-sun-java6-jdk
-sun-java6-jre
-tomcat6
-tomcat6-user
-varnish
+## Script which creates an overview of system information related to
+## the specified ECE/EAE/Search instance, example invocation:
+##
+## $ ece-overview -i web1 | xmllint --format - > /var/www/web1.html
+
+instance=dev1
+
+## 1 : html
+## 2 : org
+format=html
+
+function create_header() {
+  local title="Overview of the $instance instance on $HOSTNAME"
+  
+  if [ $format == "org" ]; then
+    echo "* $title"
+    echo "Generated @ $(date)"
+    return
+  fi
+
+  local header="
+<html xmlns=\"http://www.w3.org/1999/xhtml\">
+  <head>
+    <title>$title @ $(date)</title>
+    <style type=\"text/css\">
+$(cat ../share/escenic/ece-scripts/vizrt.css)
+    </style>
+  </head>
+  <body>
+$(cat ../share/escenic/ece-scripts/html-vizrt-logo-svg.html)
+    <h1>$title</h1>
+    <p>Generated @ $(date)</p>
+    <ul>
 "
-important_packages_on_gentoo="
-dev-db/percona-server
-dev-java/ant-contrib
-dev-java/ant-nodeps
-dev-java/maven-bin
-dev-libs/apr
-net-misc/memcached
-net-nds/openldap
-virtual/jre-1.6.0
-www-servers/apache
-www-servers/nginx
-www-servers/varnish
-"
-
-if [ `uname -s` = "Linux" ]; then
-    on_linux=1
-fi
+  echo "$header"
+}
 
-if [ -x /usr/bin/dpkg -a -e /etc/debian_version ]; then
-    on_debian_or_derivate=1
-elif [ -x /usr/bin/emerge -a -e /etc/gentoo-release ]; then
-    on_gentoo_or_derivate=1
-fi
+function create_footer() {
+  if [ $format != "html" ]; then
+    return
+  fi
+  
+  local footer="
+  </body>
+</html>
+"
+  echo "$footer"
+}
 
+function wrap_in_anchor_if_applicable() {
+  if [ $format == "org" ]; then
+    echo "$@"
+    return
+  fi
 
-function print_ruler()
-{
-    if [ $output_format = "ascii" ]; then
-        for i in {0..72}; do
-            echo -n $1
-        done
+  local result=""
+  for el in "$@"; do
+    if [[ $el == "/"* || $el == "http://"* || $el == "mysql://"* ]]; then
+      result="$result <a href=\"${el}\">$el</a>"
+    else
+      result="$result $el"
     fi
+    
+  done
+  echo "$result"
 }
 
-function print_pre_start()
-{
-    if [ $output_format = "confluence" ]; then
-        echo "{code}"
-    fi
+function print_un_ordered_list_start() {
+  if [ $format == "org" ]; then
+    echo ""
+  elif [ $format == "html" ]; then
+    echo "<ul>"
+  fi
 }
 
-function print_pre_end()
-{
-    if [ $output_format = "confluence" ]; then
-        echo "{code}"
-    fi
+function print_un_ordered_list_end() {
+  if [ $format == "org" ]; then
+    echo ""
+  elif [ $format == "html" ]; then
+    echo "</ul>"
+  fi
 }
 
-function print_header()
-{
-    if [ $output_format = "confluence" ]; then
-        echo "h2. $1"
-    elif [ $output_format = "ascii" ]; then
-        echo ""
-        print_ruler "#"
-        echo ""
-        echo $1
-        print_ruler "#"
-        echo ""
-    fi
+function print_list_item() {
+  if [ $format == "org" ]; then
+    echo "- $@"
+  elif [ $format == "html" ]; then
+    echo "<li>" \
+      "$@" \
+      "</li>"
+  fi
 }
 
-function list_useful_package_info()
-{
-    print_header "Important packages"
-    print_pre_start
-
-    if [ $on_debian_or_derivate -eq 1 ]; then
-        for el in $important_packages_on_debian; do
-            dpkg -l $el 2>/dev/null | grep ^ii | sed 's/ii\ \ //g'
-        done
-    elif [ $on_gentoo_or_derivate -eq 1 ]; then
-        for el in $important_packages_on_gentoo; do
-	    equery  --no-color --no-pipe list $el 2>/dev/null | \
-		grep -v "Searching for" | \
-		cut -d']' -f3- 2>/dev/null
-        done
+ 
+function do_create-overview() {
+  local data="$(ece -q -i $instance info)"$'\n'
+  data="$data $(ece -q -i $instance versions | cut -d'*' -f2-)"
+  
+  echo "$data" | while read line; do
+    if [[ $line == "|->"* ]]; then
+      print_list_item $(wrap_in_anchor_if_applicable ${line:3})
+    elif [ $(echo $line | cut -d':' -f2- | wc -c) -gt 1 ]; then
+      print_list_item $(wrap_in_anchor_if_applicable $line)
+    else
+      print_un_ordered_list_end
+      print_h2_header $(echo $line | cut -d: -f1)
+      print_un_ordered_list_start
     fi
+    
+  done
 
-    print_pre_end
+  list_services_running
+  list_hw
 }
 
-function list_os_info()
-{
-    print_header "Kernel version"
-    uname -a
-
-    print_header "Distribution information"
-    if [ $on_debian_or_derivate -eq 1 ]; then
-        echo "Debian or derivate, version "`cat /etc/debian_version`
-    elif [ -r /etc/gentoo-release ]; then
-        cat /etc/gentoo-release
-    fi
+function print_pre_text() {
+  if [ $format == "org" ]; then
+    cat <<EOF
+#+BEGIN_SRC sh
+$@  
+#+END_SRC
+EOF
+  elif [ $format == "html" ]; then
+    cat <<EOF
+<pre>
+$@
+</pre>
+EOF
+  fi
 }
 
-function list_db_information()
-{
-    print_header "Database details"
-    if [ -x /usr/sbin/mysqld ]; then
-        /usr/sbin/mysqld -V
-    else
-        mysql -V 2>/dev/null
-        mysql5 -V 2>/dev/null
-    fi
+function print_h2_header() {
+  if [ $format == "org" ]; then
+    echo ""
+    echo "** $@"
+  elif [ $format == "html" ]; then
+    echo "<h2>$@</h2>"
+  fi
 }
 
-function list_java_information()
-{
-    print_header "Java version"
-    java -version
+function print_h1_header() {
+  if [ $format == "org" ]; then
+    echo "* $@"
+  elif [ $format == "html" ]; then
+    echo "<h1>$@</h1>"
+  fi
 }
 
-function list_hardware_information()
-{
-    if [ $on_linux -eq 1 ]; then
-        print_header "Processors"
-        echo "Processor type: " `grep "model name" /proc/cpuinfo | head -1 | cut -d':' -f2`
-        echo "Number of processors/cores:" `grep processor /proc/cpuinfo | wc -l`
+function print_p_text() {
+  if [ $format == "org" ]; then
+    echo "$@"
+  elif [ $format == "html" ]; then
+    cat <<EOF
+<p>
+  $@
+</p>
+EOF
+  fi
+}
 
-        print_header "Memory"
-        echo "Total memory: " `grep MemTotal /proc/meminfo | cut -d':' -f2`
-        echo "Free memory: " `grep MemFree /proc/meminfo | cut -d':' -f2`
-    fi
+function list_hw() {
+  print_h2_header "Disks used on $HOSTNAME"
+  print_pre_text "$(df -hT)"
+  
+  print_h2_header "Memory on $HOSTNAME</h2>"
+  print_pre_text "$(free -m)"
 
-    print_header "Disk Storage"
-    print_pre_start
-    if [ $(df --version | grep GNU | wc -l) -gt 0 ]; then
-	df -hT
-    else
-	df
-    fi
-    print_pre_end
+  print_h2_header "CPU(s) on $HOSTNAME"
+  print_p_text "Number of CPUs:" $(grep "model name" /proc/cpuinfo | wc -l)
+  print_pre_text "$(grep "model name" /proc/cpuinfo | sort | uniq)"
 }
 
-function print_report_header()
-{
-    if [ $output_format = "confluence" ]; then
-	echo "h1. System details for $HOSTNAME"
-    elif [ $output_format = "ascii" ]; then
-        echo ""
-        print_ruler "#"
-        echo ""
-        echo "System details for $HOSTNAME"
-        print_ruler "#"
-        echo ""
-    fi
 
+
+function list_services_running() {
+  cat <<EOF
+    </ul>
+    <h2>Overview of all server services on $HOSTNAME</h2>
+    <pre>
+$(netstat -nlp | egrep -v "tcp6|ACC" | grep LISTEN)
+    </pre>
+EOF
+
+  if [ $(whoami) != "root" ]; then
+    echo "<p>Run $(basename $0) as  root to get more details in this listing</p>"
+  fi
 }
 
-for el in $@; do
-    if [ $el = "-c" -o $el = "--confluence" ]; then
-        output_format=confluence
-    fi
-done
+function get_user_options() {
+  while getopts ":i:f:" opt; do
+    case $opt in
+      i)
+        instance=${OPTARG}
+        ;;
+      f)
+        format=${OPTARG}
+        ;;
+      \?)
+        echo "Invalid option: -$OPTARG" >&2
+        exit 1
+        ;;
+      :)
+        echo "Option -$OPTARG requires an argument." >&2
+        exit 1
+        ;;
+    esac
+  done
+  
+}
+
+get_user_options $@
+create_header
+do_create-overview
+create_footer
 
-print_report_header
-list_os_info
-list_db_information
-list_java_information
-list_useful_package_info
-list_hardware_information
 
-   
-    
\ No newline at end of file

From a11bf39651a7aaaf72288209ef7879c790e60994 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 21 Mar 2012 12:51:46 +0800
Subject: [PATCH 0550/2585] - updated create-packages for
 package=escenic-content-engine-installer   to include the HTML, CSS and
 modules of system-info

---
 usr/local/src/create-packages | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/usr/local/src/create-packages b/usr/local/src/create-packages
index f8a70f11..87f44a2e 100644
--- a/usr/local/src/create-packages
+++ b/usr/local/src/create-packages
@@ -60,6 +60,13 @@ function set_up_target_directory() {
     # the installer.
     # cp -r ../../share/escenic/ece-scripts/common* \
     # $target_dir/usr/share/escenic/ece-scripts/
+
+    cp -r ../../share/escenic/ece-scripts/*.css \
+      $target_dir/usr/share/escenic/ece-scripts/
+    cp -r ../../share/escenic/ece-scripts/*.html \
+      $target_dir/usr/share/escenic/ece-scripts/
+    cp -r ../../share/escenic/ece-scripts/system-info.d \
+      $target_dir/usr/share/escenic/ece-scripts/
     
     cp -r ../../share/doc/escenic/{ece,system-info}-guide.{org,html} \
       $target_dir/usr/share/doc/escenic

From 2646dedbb941a47106b39f0c5ff0b8d46a5fb8cd Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 21 Mar 2012 13:19:07 +0800
Subject: [PATCH 0551/2585] - added support for h3 and h4 - added line to add
 to the user's crontab - moved list services to its own module

---
 usr/bin/system-info | 111 ++++++++++++++++++++++----------------------
 1 file changed, 55 insertions(+), 56 deletions(-)

diff --git a/usr/bin/system-info b/usr/bin/system-info
index 859967c4..4501a679 100755
--- a/usr/bin/system-info
+++ b/usr/bin/system-info
@@ -3,7 +3,12 @@
 ## Script which creates an overview of system information related to
 ## the specified ECE/EAE/Search instance, example invocation:
 ##
-## $ ece-overview -i web1 | xmllint --format - > /var/www/web1.html
+## $ system-info -i web1 | xmllint --format - > /var/www/web1.html
+##
+## TODO:
+## Add this to /etc/cronttab
+# echo '* *     * * *   root    system-info -f html > /var/www/index.html' >> /etc/crontab
+
 
 instance=dev1
 
@@ -11,8 +16,34 @@ instance=dev1
 ## 2 : org
 format=html
 
+function init() {
+  # first, try to be nice
+  ece_scripts_dir=$(dirname $0)/../share/escenic/ece-scripts
+  
+  # then check the standard location
+  if [ ! -d $ece_scripts_dir  ]; then
+    ece_scripts_dir=/usr/share/escenic/ece-scripts
+  fi
+
+  source $ece_scripts_dir/common-ece.sh
+}
+
+## Runs extra system-info modules
+function run_system_info_modules() {
+  if [ -d $ece_scripts_dir ]; then
+    # load system-info modules
+    if [ ! -d $ece_scripts_dir/system-info.d ]; then
+      return
+    fi
+    
+    for el in $(\ls $ece_scripts_dir/system-info.d/*.sh 2>/dev/null); do
+      source $el
+    done
+  fi
+}
+
 function create_header() {
-  local title="Overview of the $instance instance on $HOSTNAME"
+  local title="Overview of $HOSTNAME"
   
   if [ $format == "org" ]; then
     echo "* $title"
@@ -25,14 +56,13 @@ function create_header() {
   <head>
     <title>$title @ $(date)</title>
     <style type=\"text/css\">
-$(cat ../share/escenic/ece-scripts/vizrt.css)
+$(cat $ece_scripts_dir/vizrt.css)
     </style>
   </head>
   <body>
-$(cat ../share/escenic/ece-scripts/html-vizrt-logo-svg.html)
+$(cat $ece_scripts_dir/html-vizrt-logo-svg.html)
     <h1>$title</h1>
     <p>Generated @ $(date)</p>
-    <ul>
 "
   echo "$header"
 }
@@ -92,29 +122,7 @@ function print_list_item() {
       "</li>"
   fi
 }
-
  
-function do_create-overview() {
-  local data="$(ece -q -i $instance info)"$'\n'
-  data="$data $(ece -q -i $instance versions | cut -d'*' -f2-)"
-  
-  echo "$data" | while read line; do
-    if [[ $line == "|->"* ]]; then
-      print_list_item $(wrap_in_anchor_if_applicable ${line:3})
-    elif [ $(echo $line | cut -d':' -f2- | wc -c) -gt 1 ]; then
-      print_list_item $(wrap_in_anchor_if_applicable $line)
-    else
-      print_un_ordered_list_end
-      print_h2_header $(echo $line | cut -d: -f1)
-      print_un_ordered_list_start
-    fi
-    
-  done
-
-  list_services_running
-  list_hw
-}
-
 function print_pre_text() {
   if [ $format == "org" ]; then
     cat <<EOF
@@ -131,6 +139,24 @@ EOF
   fi
 }
 
+function print_h3_header() {
+  if [ $format == "org" ]; then
+    echo ""
+    echo "*** $@"
+  elif [ $format == "html" ]; then
+    echo "<h3>$@</h3>"
+  fi
+}
+
+function print_h4_header() {
+  if [ $format == "org" ]; then
+    echo ""
+    echo "**** $@"
+  elif [ $format == "html" ]; then
+    echo "<h4>$@</h4>"
+  fi
+}
+
 function print_h2_header() {
   if [ $format == "org" ]; then
     echo ""
@@ -160,34 +186,6 @@ EOF
   fi
 }
 
-function list_hw() {
-  print_h2_header "Disks used on $HOSTNAME"
-  print_pre_text "$(df -hT)"
-  
-  print_h2_header "Memory on $HOSTNAME</h2>"
-  print_pre_text "$(free -m)"
-
-  print_h2_header "CPU(s) on $HOSTNAME"
-  print_p_text "Number of CPUs:" $(grep "model name" /proc/cpuinfo | wc -l)
-  print_pre_text "$(grep "model name" /proc/cpuinfo | sort | uniq)"
-}
-
-
-
-function list_services_running() {
-  cat <<EOF
-    </ul>
-    <h2>Overview of all server services on $HOSTNAME</h2>
-    <pre>
-$(netstat -nlp | egrep -v "tcp6|ACC" | grep LISTEN)
-    </pre>
-EOF
-
-  if [ $(whoami) != "root" ]; then
-    echo "<p>Run $(basename $0) as  root to get more details in this listing</p>"
-  fi
-}
-
 function get_user_options() {
   while getopts ":i:f:" opt; do
     case $opt in
@@ -210,9 +208,10 @@ function get_user_options() {
   
 }
 
+init
 get_user_options $@
 create_header
-do_create-overview
+run_system_info_modules
 create_footer
 
 

From 2ccdf93ab3741941eb72903bbffbbdaba10fa620 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 21 Mar 2012 13:19:57 +0800
Subject: [PATCH 0552/2585] - get_instance_list is used by several commands and
 modules, about   time it gets its own place.

---
 usr/share/escenic/ece-scripts/common-ece.sh | 29 +++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 usr/share/escenic/ece-scripts/common-ece.sh

diff --git a/usr/share/escenic/ece-scripts/common-ece.sh b/usr/share/escenic/ece-scripts/common-ece.sh
new file mode 100644
index 00000000..d087dfb2
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/common-ece.sh
@@ -0,0 +1,29 @@
+#! /usr/bin/env bash
+
+# by tkj@vizrt.com
+
+## If the system is installed using the recommended paths, the method
+## will return a list of the instances configured in
+## ${escenic_conf_dir}/ece-*.conf
+function get_instance_list() {
+  local allowed_types="engine analysis changelogd search rmi-hub"
+  instance_list=""
+  for el in $(\ls /etc/escenic/ece-*.conf 2>/dev/null); do
+    
+    local instance=$(basename $el .conf)
+    instance=${instance##ece-}
+    
+    for ele in $allowed_types; do
+      if [[ $instance == $ele ]]; then
+        instance=""
+        continue
+      fi
+      
+      local away="${ele}-"
+      instance=${instance##${away}}
+    done
+    instance_list="$instance_list $instance"
+  done
+
+  echo $instance_list
+}

From 4ed04cd439b7ad608c6c8e641de6b4930577e23f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 21 Mar 2012 13:20:32 +0800
Subject: [PATCH 0553/2585] - added (moved code from ece-overview/system-info)

---
 .../system-info.d/11-list-ece-overview.sh     | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh

diff --git a/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh b/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
new file mode 100644
index 00000000..d0cc5f65
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
@@ -0,0 +1,40 @@
+#! /usr/bin/env bash
+
+# by tkj@vizrt.com
+
+function create_ece_overview() {
+  local data="$(ece -q -i $instance info)"$'\n'
+  data="$data $(ece -q -i $instance versions | cut -d'*' -f2-)"
+  
+  echo "$data" | while read line; do
+    if [[ $line == "|->"* ]]; then
+      print_list_item $(wrap_in_anchor_if_applicable ${line:3})
+    elif [ $(echo $line | cut -d':' -f2- | wc -c) -gt 1 ]; then
+      print_list_item $(wrap_in_anchor_if_applicable $line)
+    else
+      print_un_ordered_list_end
+      print_h4_header $(echo $line | cut -d: -f1)
+      print_un_ordered_list_start
+    fi
+  done
+  
+  print_un_ordered_list_end
+}
+
+function get_overview_of_all_instances() {
+  local instance_list=$(get_instance_list)
+
+  if [ -z "$instance_list" ]; then
+    return
+  fi
+
+  print_h2_header "Overview of all the ECE instances on $HOSTNAME"
+  for el in $(get_instance_list); do
+    print_h3_header "Overview of instance $el"
+    print_un_ordered_list_start
+    create_ece_overview
+  done
+}
+
+get_overview_of_all_instances
+

From 69f6c9cf0a1fed07df2271e7d433293929482bc2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 21 Mar 2012 13:22:10 +0800
Subject: [PATCH 0554/2585] - now create_ece_overview accepts instances as a
 parameter

---
 .../ece-scripts/system-info.d/11-list-ece-overview.sh      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh b/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
index d0cc5f65..d0a6b3ce 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
@@ -2,9 +2,10 @@
 
 # by tkj@vizrt.com
 
+## $1 is instance
 function create_ece_overview() {
-  local data="$(ece -q -i $instance info)"$'\n'
-  data="$data $(ece -q -i $instance versions | cut -d'*' -f2-)"
+  local data="$(ece -q -i $1 info)"$'\n'
+  data="$data $(ece -q -i $1 versions | cut -d'*' -f2-)"
   
   echo "$data" | while read line; do
     if [[ $line == "|->"* ]]; then
@@ -32,7 +33,7 @@ function get_overview_of_all_instances() {
   for el in $(get_instance_list); do
     print_h3_header "Overview of instance $el"
     print_un_ordered_list_start
-    create_ece_overview
+    create_ece_overview $el
   done
 }
 

From ac838bc0cac3e26f2426349da059479222026b45 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 21 Mar 2012 13:28:21 +0800
Subject: [PATCH 0555/2585] - include common scripts in the
 escenic-content-engine-scripts package

---
 usr/local/src/create-packages | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/local/src/create-packages b/usr/local/src/create-packages
index 87f44a2e..e824489d 100644
--- a/usr/local/src/create-packages
+++ b/usr/local/src/create-packages
@@ -58,9 +58,9 @@ function set_up_target_directory() {
     # we've got a repo up and running, we'll let the -installer depend
     # on the scripts package, and then remove the common scripts from
     # the installer.
-    # cp -r ../../share/escenic/ece-scripts/common* \
-    # $target_dir/usr/share/escenic/ece-scripts/
-
+    cp -r ../../share/escenic/ece-scripts/common* \
+      $target_dir/usr/share/escenic/ece-scripts/
+    
     cp -r ../../share/escenic/ece-scripts/*.css \
       $target_dir/usr/share/escenic/ece-scripts/
     cp -r ../../share/escenic/ece-scripts/*.html \

From bf56ac77fc552d376d04949683f0e4b1418897e0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 21 Mar 2012 13:39:43 +0800
Subject: [PATCH 0556/2585] - root handling is still buggy

---
 .../system-info.d/11-list-ece-overview.sh          | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh b/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
index d0a6b3ce..c9aca179 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
@@ -4,8 +4,18 @@
 
 ## $1 is instance
 function create_ece_overview() {
-  local data="$(ece -q -i $1 info)"$'\n'
-  data="$data $(ece -q -i $1 versions | cut -d'*' -f2-)"
+  if [ $(whoami) == "root" ]; then
+    local command="ece -q -i $1 info"
+    local data="$(su - $ece_user -c $command)"$'\n'
+    echo $data
+
+    kill $$
+    data="$data $(su - $ece_user -c ece -q -i $1 versions | cut -d'*' -f2-)"
+  else
+    local data="$(ece -q -i $1 info)"$'\n'
+    data="$data $(ece -q -i $1 versions | cut -d'*' -f2-)"
+  fi
+  
   
   echo "$data" | while read line; do
     if [[ $line == "|->"* ]]; then

From cea43ef512e2910d288ee3bf9082c29a3549ee6a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 21 Mar 2012 13:40:19 +0800
Subject: [PATCH 0557/2585] - added -u parameter, used when calling the script
 as root -> under   which user the ece script calls should be run

---
 usr/bin/system-info | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/usr/bin/system-info b/usr/bin/system-info
index 4501a679..cea4e01c 100755
--- a/usr/bin/system-info
+++ b/usr/bin/system-info
@@ -9,8 +9,7 @@
 ## Add this to /etc/cronttab
 # echo '* *     * * *   root    system-info -f html > /var/www/index.html' >> /etc/crontab
 
-
-instance=dev1
+ece_user=""
 
 ## 1 : html
 ## 2 : org
@@ -187,11 +186,14 @@ EOF
 }
 
 function get_user_options() {
-  while getopts ":i:f:" opt; do
+  while getopts ":i:f:u:" opt; do
     case $opt in
       i)
         instance=${OPTARG}
         ;;
+      u)
+        ece_user=${OPTARG}
+        ;;
       f)
         format=${OPTARG}
         ;;

From 0b2891e7de027788499a54a7838fd9bfea64a4c7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 21 Mar 2012 13:40:38 +0800
Subject: [PATCH 0558/2585] - sanitised the font sizes - colours for all
 headers h1-4

---
 usr/share/escenic/ece-scripts/vizrt.css | 28 +------------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/vizrt.css b/usr/share/escenic/ece-scripts/vizrt.css
index ce7826bc..1d1a95c6 100644
--- a/usr/share/escenic/ece-scripts/vizrt.css
+++ b/usr/share/escenic/ece-scripts/vizrt.css
@@ -1,7 +1,5 @@
 body {
   font-family: Arial, Helvetica, sans-serif;
-  font-size: small;
-  #width : 600;
   margin: 70px 70px 0px 50px;
 }
 
@@ -9,34 +7,10 @@ pre {
   background-color: grey;
 }
 
-h1, h2 {
+h1, h2, h3, h4 {
   color: #e88424;
 }
 
-h1 {
-  font-size: 150%;
-}
-
-h2 {
-  font-size: 120%;
-  margin-top: 3em;
-  margin-bottom: 0em;
-}
-
-h3, h4, h5, h6 {
-  font-weight: bold;
-  margin-top: 2em;
-  margin-bottom: 0.2em;
-}
-
-h3, h4, h5 {
-  font-size: 110%;
-}
-
-h6 {
-  font-size: 80%;
-}
-
 a {
   color: #333;
   font-weight: bold;

From c8f7bd63a865769dbcf02fecef57e7eea58b8a06 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 21 Mar 2012 13:43:06 +0800
Subject: [PATCH 0559/2585] added system-info modules for: - db - java -
 listening server - hardware - OS

---
 .../ece-scripts/system-info.d/44-db-info.sh   | 11 ++++++++++
 .../ece-scripts/system-info.d/44-java-info.sh |  8 ++++++++
 .../system-info.d/55-list-services.sh         |  9 +++++++++
 .../system-info.d/66-list-hw-info.sh          | 20 +++++++++++++++++++
 .../system-info.d/66-list-os-info.sh          |  7 +++++++
 5 files changed, 55 insertions(+)
 create mode 100644 usr/share/escenic/ece-scripts/system-info.d/44-db-info.sh
 create mode 100644 usr/share/escenic/ece-scripts/system-info.d/44-java-info.sh
 create mode 100644 usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh
 create mode 100644 usr/share/escenic/ece-scripts/system-info.d/66-list-hw-info.sh
 create mode 100644 usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh

diff --git a/usr/share/escenic/ece-scripts/system-info.d/44-db-info.sh b/usr/share/escenic/ece-scripts/system-info.d/44-db-info.sh
new file mode 100644
index 00000000..b1f93ce7
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/system-info.d/44-db-info.sh
@@ -0,0 +1,11 @@
+#! /usr/bin/env bash
+
+# by tkj@vizrt.com
+
+if [ -x /usr/sbin/mysqld ]; then
+  print_h2_header "DB information"
+  print_pre_text "$(/usr/sbin/mysqld -V)"
+else
+  print_pre_text "$(mysql -V 2>/dev/null)"
+  print_pre_text "$(mysql5 -V 2>/dev/null)"
+fi
diff --git a/usr/share/escenic/ece-scripts/system-info.d/44-java-info.sh b/usr/share/escenic/ece-scripts/system-info.d/44-java-info.sh
new file mode 100644
index 00000000..cf7e4a0a
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/system-info.d/44-java-info.sh
@@ -0,0 +1,8 @@
+#! /usr/bin/env bash
+
+# by tkj@vizrt.com
+
+print_h2_header "Java information"
+print_pre_text $(java -version 2>&1)
+
+
diff --git a/usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh b/usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh
new file mode 100644
index 00000000..3c2148c3
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh
@@ -0,0 +1,9 @@
+
+print_h2_header "Overview of all server services on $HOSTNAME"
+print_pre_text "$(netstat -nlp 2>/dev/null | egrep -v "tcp6|ACC" | grep LISTEN)"
+
+if [ $(whoami) != "root" ]; then
+  print_p_text "Run $(basename $0) as  root to get more details in this listing"
+fi
+
+
diff --git a/usr/share/escenic/ece-scripts/system-info.d/66-list-hw-info.sh b/usr/share/escenic/ece-scripts/system-info.d/66-list-hw-info.sh
new file mode 100644
index 00000000..10d66986
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/system-info.d/66-list-hw-info.sh
@@ -0,0 +1,20 @@
+
+print_h2_header "Disks used on $HOSTNAME"
+print_pre_text "$(df -hT)"
+
+print_h2_header "Memory on $HOSTNAME"
+print_pre_text "Total memory: " `grep MemTotal /proc/meminfo | cut -d':' -f2`
+print_pre_text "Free memory: " `grep MemFree /proc/meminfo | cut -d':' -f2`
+
+
+print_h2_header "CPU(s) on $HOSTNAME"
+print_un_ordered_list_start
+print_list_item "Number of CPUs:" $(grep "model name" /proc/cpuinfo | wc -l)
+print_list_item "Model: \
+  $(grep model\ name /proc/cpuinfo | \
+    cut -d: -f2- | \
+    sed 's/^[ ]//g' | \
+    sort | \
+    uniq)"
+print_un_ordered_list_end
+
diff --git a/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
new file mode 100644
index 00000000..9b92ac71
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
@@ -0,0 +1,7 @@
+#! /usr/bin/env bash
+
+# by tkj@vizrt.com
+
+print_h2_header "Operating system"
+
+print_pre_text "$(lsb_release  -a 2>/dev/null)"

From e28b4d271ab9b5b789e277d3e34680c93be7d890 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 21 Mar 2012 15:32:20 +0800
Subject: [PATCH 0560/2585] - fix in print_deployed_webapps, used by "ece
 info", to return if the   passed app server home/base directory doesn't
 exist.

---
 usr/bin/ece | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index e619adfc..6f27eaf1 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -1055,7 +1055,11 @@ function get_info_for_type()
 ## $1: dir
 function print_deployed_webapps() {
   local webapps=""
-  
+
+  if [ ! -d $1/webapps ]; then
+    return
+  fi
+
   print "Deployed web applications:"
   for el in $(find $1/webapps -maxdepth 1 -type d | \
     grep -v webapps$); do

From 0aa46b86579b608bc20f134a5dfc48c76bc002ed Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 21 Mar 2012 15:33:06 +0800
Subject: [PATCH 0561/2585] - fixed the problem with running su -c commands
 where the command   itself contained a variable. Great!

---
 .../ece-scripts/system-info.d/11-list-ece-overview.sh      | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh b/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
index c9aca179..d24c1493 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
@@ -6,11 +6,10 @@
 function create_ece_overview() {
   if [ $(whoami) == "root" ]; then
     local command="ece -q -i $1 info"
-    local data="$(su - $ece_user -c $command)"$'\n'
-    echo $data
+    local data="$(su - $ece_user -c " $command ")"$'\n'
 
-    kill $$
-    data="$data $(su - $ece_user -c ece -q -i $1 versions | cut -d'*' -f2-)"
+    comman="ece -q -i $1 versions"
+    data="$data $(su - $ece_user -c" $command " | cut -d'*' -f2-)"
   else
     local data="$(ece -q -i $1 info)"$'\n'
     data="$data $(ece -q -i $1 versions | cut -d'*' -f2-)"

From 3806b935ba3283253937b2ee7eaf45aa6bfd0df3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 21 Mar 2012 15:38:07 +0800
Subject: [PATCH 0562/2585] - added kernel info

---
 .../escenic/ece-scripts/system-info.d/66-list-os-info.sh    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
index 9b92ac71..f88ad908 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
@@ -4,4 +4,10 @@
 
 print_h2_header "Operating system"
 
+print_h3_header "Kernel"
+print_pre_text $(uname -a)
+
+print_h3_header "Distribution"
 print_pre_text "$(lsb_release  -a 2>/dev/null)"
+
+

From 4297006c4afe097dc0690f87cc2d8516b0f63e7b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 21 Mar 2012 16:19:42 +0800
Subject: [PATCH 0563/2585] - added support for confluence markup - re-wrote &
 improved create_header, made re-use of the generic   print_* methods.

---
 usr/bin/system-info | 67 +++++++++++++++++++++++++++++----------------
 1 file changed, 43 insertions(+), 24 deletions(-)

diff --git a/usr/bin/system-info b/usr/bin/system-info
index cea4e01c..a0752ba3 100755
--- a/usr/bin/system-info
+++ b/usr/bin/system-info
@@ -11,9 +11,8 @@
 
 ece_user=""
 
-## 1 : html
-## 2 : org
-format=html
+## possible values: html, org, confluence
+format=org
 
 function init() {
   # first, try to be nice
@@ -44,13 +43,9 @@ function run_system_info_modules() {
 function create_header() {
   local title="Overview of $HOSTNAME"
   
-  if [ $format == "org" ]; then
-    echo "* $title"
-    echo "Generated @ $(date)"
-    return
-  fi
+  if [ $format == "html" ]; then
+cat <<EOF
 
-  local header="
 <html xmlns=\"http://www.w3.org/1999/xhtml\">
   <head>
     <title>$title @ $(date)</title>
@@ -60,10 +55,12 @@ $(cat $ece_scripts_dir/vizrt.css)
   </head>
   <body>
 $(cat $ece_scripts_dir/html-vizrt-logo-svg.html)
-    <h1>$title</h1>
-    <p>Generated @ $(date)</p>
 "
-  echo "$header"
+EOF
+fi
+
+  print_h1_header $title
+  print_p_text "Generated @ $(date)"
 }
 
 function create_footer() {
@@ -79,20 +76,20 @@ function create_footer() {
 }
 
 function wrap_in_anchor_if_applicable() {
-  if [ $format == "org" ]; then
-    echo "$@"
-    return
+  local result=""
+  
+  if [ $format == "html" ]; then
+    for el in "$@"; do
+      if [[ $el == "/"* || $el == "http://"* || $el == "mysql://"* ]]; then
+        result="$result <a href=\"${el}\">$el</a>"
+      else
+        result="$result $el"
+      fi
+    done
+  else
+    result="$@"
   fi
 
-  local result=""
-  for el in "$@"; do
-    if [[ $el == "/"* || $el == "http://"* || $el == "mysql://"* ]]; then
-      result="$result <a href=\"${el}\">$el</a>"
-    else
-      result="$result $el"
-    fi
-    
-  done
   echo "$result"
 }
 
@@ -101,6 +98,8 @@ function print_un_ordered_list_start() {
     echo ""
   elif [ $format == "html" ]; then
     echo "<ul>"
+  elif [ $format == "confluence" ]; then
+    echo ""
   fi
 }
 
@@ -109,6 +108,8 @@ function print_un_ordered_list_end() {
     echo ""
   elif [ $format == "html" ]; then
     echo "</ul>"
+  elif [ $format == "confluence" ]; then
+    echo ""
   fi
 }
 
@@ -119,6 +120,8 @@ function print_list_item() {
     echo "<li>" \
       "$@" \
       "</li>"
+  elif [ $format == "confluence" ]; then
+    echo "* $@"
   fi
 }
  
@@ -134,6 +137,12 @@ EOF
 <pre>
 $@
 </pre>
+EOF
+  elif [ $format == "confluence" ]; then
+    cat <<EOF
+{code}
+$@
+{code}
 EOF
   fi
 }
@@ -144,6 +153,8 @@ function print_h3_header() {
     echo "*** $@"
   elif [ $format == "html" ]; then
     echo "<h3>$@</h3>"
+  elif [ $format == "confluence" ]; then
+    echo "h3. $@"
   fi
 }
 
@@ -153,6 +164,8 @@ function print_h4_header() {
     echo "**** $@"
   elif [ $format == "html" ]; then
     echo "<h4>$@</h4>"
+  elif [ $format == "confluence" ]; then
+    echo "h4. $@"
   fi
 }
 
@@ -162,6 +175,8 @@ function print_h2_header() {
     echo "** $@"
   elif [ $format == "html" ]; then
     echo "<h2>$@</h2>"
+  elif [ $format == "confluence" ]; then
+    echo "h2. $@"
   fi
 }
 
@@ -170,6 +185,8 @@ function print_h1_header() {
     echo "* $@"
   elif [ $format == "html" ]; then
     echo "<h1>$@</h1>"
+  elif [ $format == "confluence" ]; then
+    echo "h1. $@"
   fi
 }
 
@@ -182,6 +199,8 @@ function print_p_text() {
   $@
 </p>
 EOF
+  elif [ $format == "confluence" ]; then
+    echo "$@"
   fi
 }
 

From 3b69bed9d77dcc3f8a70483353f6db0cc5872a2a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 21 Mar 2012 16:22:17 +0800
Subject: [PATCH 0564/2585] - fix in "ece info": only show PID field if the
 service is running - duh!

---
 usr/bin/ece | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 6f27eaf1..5333a37a 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -1030,7 +1030,11 @@ function get_info_for_type()
         set_type_pid
         print "|-> Status:" $(get_status)
         print "|-> Port:" $port
-        print "|-> PID:" $type_pid
+
+        if [ $(get_status | cut -d' ' -f1) == "UP" ]; then
+          print "|-> PID:" $type_pid
+        fi
+        
         print "|-> Type: " $appserver
         
         case "$appserver" in

From da91302dd4193e9ad445fc9b193d674f58e422e8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 21 Mar 2012 17:39:53 +0800
Subject: [PATCH 0565/2585] - fixed quote escapes in HTML header - renamed
 vizrt SVG include file

---
 usr/bin/system-info | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/usr/bin/system-info b/usr/bin/system-info
index a0752ba3..2d6fbb1a 100755
--- a/usr/bin/system-info
+++ b/usr/bin/system-info
@@ -46,16 +46,15 @@ function create_header() {
   if [ $format == "html" ]; then
 cat <<EOF
 
-<html xmlns=\"http://www.w3.org/1999/xhtml\">
+<html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>$title @ $(date)</title>
-    <style type=\"text/css\">
+    <style type="text/css">
 $(cat $ece_scripts_dir/vizrt.css)
     </style>
   </head>
   <body>
-$(cat $ece_scripts_dir/html-vizrt-logo-svg.html)
-"
+$(cat $ece_scripts_dir/vizrt-logo-svg.html)
 EOF
 fi
 

From 4a73c543530ff7d56d764446fd610bd0f4a64de5 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 21 Mar 2012 17:40:25 +0800
Subject: [PATCH 0566/2585] - only run "ece versions" if ece is running.

---
 .../system-info.d/11-list-ece-overview.sh            | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh b/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
index d24c1493..a356d125 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
@@ -8,11 +8,17 @@ function create_ece_overview() {
     local command="ece -q -i $1 info"
     local data="$(su - $ece_user -c " $command ")"$'\n'
 
-    comman="ece -q -i $1 versions"
-    data="$data $(su - $ece_user -c" $command " | cut -d'*' -f2-)"
+    command="ece -q -i $1 status"
+    if [ "UP" == $(su - $ece_user -c "$command" | cut -d' ' -f1) ]; then
+        command="ece -q -i $1 versions"
+        data="$data $(su - $ece_user -c" $command " | cut -d'*' -f2-)"
+    fi
   else
     local data="$(ece -q -i $1 info)"$'\n'
-    data="$data $(ece -q -i $1 versions | cut -d'*' -f2-)"
+    
+    if [ "UP" == $(ece -q -i $1 status | cut -d' ' -f1) ]; then
+      data="$data $(ece -q -i $1 versions | cut -d'*' -f2-)"
+    fi
   fi
   
   

From de30798ea50edb52c1d5b20168c61ba01425b6cc Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 21 Mar 2012 17:40:43 +0800
Subject: [PATCH 0567/2585] - renamed html-vizrt-logo-svg.html ->
 vizrt-logo-svg.html

---
 .../ece-scripts/{html-vizrt-logo-svg.html => vizrt-logo-svg.html} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename usr/share/escenic/ece-scripts/{html-vizrt-logo-svg.html => vizrt-logo-svg.html} (100%)

diff --git a/usr/share/escenic/ece-scripts/html-vizrt-logo-svg.html b/usr/share/escenic/ece-scripts/vizrt-logo-svg.html
similarity index 100%
rename from usr/share/escenic/ece-scripts/html-vizrt-logo-svg.html
rename to usr/share/escenic/ece-scripts/vizrt-logo-svg.html

From 8974abc44cd0f5a617eb005727c88ebe48de0728 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 21 Mar 2012 18:38:47 +0800
Subject: [PATCH 0568/2585] - system-info -f json now produces JSON with the
 following exceptions:

  * only the first line of pre output is displayed (quick hack to see
    how hard it was to add JSON support.

  * objects and lists have trailing commas, the former violates
    ECMA-262 the latter is parsed differently in different browsers.
---
 usr/bin/system-info | 67 +++++++++++++++++++++++++++++++++++++--------
 1 file changed, 56 insertions(+), 11 deletions(-)

diff --git a/usr/bin/system-info b/usr/bin/system-info
index 2d6fbb1a..4c60ec86 100755
--- a/usr/bin/system-info
+++ b/usr/bin/system-info
@@ -11,7 +11,7 @@
 
 ece_user=""
 
-## possible values: html, org, confluence
+## possible values: html, org, confluence, json
 format=org
 
 function init() {
@@ -56,22 +56,32 @@ $(cat $ece_scripts_dir/vizrt.css)
   <body>
 $(cat $ece_scripts_dir/vizrt-logo-svg.html)
 EOF
-fi
+  elif [ $format == "json" ]; then
+    cat <<EOF
+{
+  "title": "$title",
+  "generated-date": "$(date)",
+EOF
+  else
+    print_h1_header $title
+    print_p_text "Generated @ $(date)"
+  fi
 
-  print_h1_header $title
-  print_p_text "Generated @ $(date)"
 }
 
 function create_footer() {
-  if [ $format != "html" ]; then
-    return
-  fi
-  
-  local footer="
+    if [ $format == "html" ]; then
+      cat <<EOF
+
   </body>
 </html>
-"
-  echo "$footer"
+EOF
+
+    elif [ $format == "json" ]; then
+      cat <<EOF
+}
+EOF
+    fi
 }
 
 function wrap_in_anchor_if_applicable() {
@@ -99,6 +109,8 @@ function print_un_ordered_list_start() {
     echo "<ul>"
   elif [ $format == "confluence" ]; then
     echo ""
+  elif [ $format == "json" ]; then
+    echo "    \"list\": ["
   fi
 }
 
@@ -109,6 +121,8 @@ function print_un_ordered_list_end() {
     echo "</ul>"
   elif [ $format == "confluence" ]; then
     echo ""
+  elif [ $format == "json" ]; then
+    echo "    ],"
   fi
 }
 
@@ -121,8 +135,14 @@ function print_list_item() {
       "</li>"
   elif [ $format == "confluence" ]; then
     echo "* $@"
+  elif [ $format == "json" ]; then
+    echo "      \"$@\", "
   fi
 }
+
+function json_escape_string() {
+  echo "$@" | sed 's/\"/\\"/g'
+}
  
 function print_pre_text() {
   if [ $format == "org" ]; then
@@ -142,10 +162,19 @@ EOF
 {code}
 $@
 {code}
+EOF
+  elif [ $format == "json" ]; then
+    # hack to make JSON work, TODO: replace linebreaks with \n
+    cat <<EOF
+    "data": "$(json_escape_string $(echo $@ | head -1))",
 EOF
   fi
 }
 
+function make_string_into_json_label() {
+  echo "$@" | tr [A-Z] [a-z] | sed 's/ /-/g'
+}
+
 function print_h3_header() {
   if [ $format == "org" ]; then
     echo ""
@@ -154,6 +183,10 @@ function print_h3_header() {
     echo "<h3>$@</h3>"
   elif [ $format == "confluence" ]; then
     echo "h3. $@"
+  elif [ $format == "json" ]; then
+    cat <<EOF
+    "$(make_string_into_json_label $@)": {
+EOF
   fi
 }
 
@@ -176,6 +209,16 @@ function print_h2_header() {
     echo "<h2>$@</h2>"
   elif [ $format == "confluence" ]; then
     echo "h2. $@"
+  elif [ $format == "json" ]; then
+    cat <<EOF
+  "$(echo $@ | tr [A-Z] [a-z] | sed 's/ /-/g')" : {
+EOF
+  fi
+}
+
+function print_section_end {
+  if [ $format == "json" ]; then
+    echo "},"
   fi
 }
 
@@ -200,6 +243,8 @@ function print_p_text() {
 EOF
   elif [ $format == "confluence" ]; then
     echo "$@"
+  elif [ $format == "json" ]; then
+    echo "    \"message\": \"$@\","
   fi
 }
 

From 9f7d168bdf0373e5d5a0517f7aaed9fb3c5241cf Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 21 Mar 2012 18:50:52 +0800
Subject: [PATCH 0569/2585] - updated markup

---
 usr/share/doc/escenic/ece-install-guide.html | 108 ++++++++++++++++++-
 1 file changed, 103 insertions(+), 5 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.html b/usr/share/doc/escenic/ece-install-guide.html
index 95b62b46..35f99d71 100644
--- a/usr/share/doc/escenic/ece-install-guide.html
+++ b/usr/share/doc/escenic/ece-install-guide.html
@@ -7,7 +7,7 @@
 <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
 <meta name="title" content="Welcome to the /usr/sbin/ece-install Guide"/>
 <meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2012-03-08 15:10:00 CST"/>
+<meta name="generated" content="2012-03-14 18:08:27 CST"/>
 <meta name="author" content="Torstein Krause Johansen"/>
 <meta name="description" content=""/>
 <meta name="keywords" content=""/>
@@ -256,7 +256,11 @@ <h2>Table of Contents</h2>
 <li><a href="#sec-5-3">5.3 Profile :: Full Stack on One Host</a></li>
 <li><a href="#sec-5-4">5.4 Profile :: Editorial Server (Publication Server)</a></li>
 <li><a href="#sec-5-5">5.5 Profile :: Presentation Server</a></li>
-<li><a href="#sec-5-6">5.6 Profile :: Database Server</a></li>
+<li><a href="#sec-5-6">5.6 Profile :: Database Server</a>
+<ul>
+<li><a href="#sec-5-6-1">5.6.1 Master &amp; slave setup</a></li>
+</ul>
+</li>
 <li><a href="#sec-5-7">5.7 Profile :: Cache Server</a></li>
 <li><a href="#sec-5-8">5.8 Profile :: Install Widget Framework</a></li>
 <li><a href="#sec-5-9">5.9 Profile :: Create Publication</a></li>
@@ -757,7 +761,72 @@ <h3 id="sec-5-6"><span class="section-number-3">5.6</span> Profile :: Database S
 <span style="color: #ffa07a;">[ece-install] running tables FAILED, exiting :-(</span>
 </pre>
 
+<p>
+If you for some reason wish to make ece-install drop the DB fro you
+before creating a new one, you can set
+</p>
+
+
+<pre class="src src-sh"><span style="color: #f0dfaf;">fai_db_drop_old_db_first</span>=1
+</pre>
+
+
 
+</div>
+
+<div id="outline-container-5-6-1" class="outline-4">
+<h4 id="sec-5-6-1"><span class="section-number-4">5.6.1</span> Master &amp; slave setup</h4>
+<div class="outline-text-4" id="text-5-6-1">
+
+<p>It's easy to set up master and slave DBs, here's how you'd configure
+ece-install to install these:
+</p>
+<p>
+On the master, create an ece-install.conf with:
+</p>
+
+
+<pre class="src src-sh"><span style="color: #f0dfaf;">fai_enabled</span>=1
+<span style="color: #f0dfaf;">fai_db_install</span>=1
+<span style="color: #f0dfaf;">fai_db_master</span>=1
+<span style="color: #f0dfaf;">fai_db_replication</span>=1
+</pre>
+
+
+<p>
+The script will itself output some replication log settings you need
+for the slave:
+</p>
+
+
+<pre class="src src-sh">[ece-install-35] - DB is now set up on localhost:3306
+[ece-install-35] - ece-install.conf for slave: <span style="color: #f0dfaf;">fai_db_master_log_file</span>=mysql-bin.000013
+[ece-install-35] - ece-install.conf for slave: <span style="color: #f0dfaf;">fai_db_master_log_position</span>=106
+</pre>
+
+
+<p>
+Once this is done, create and use an ece-install.conf on the slave
+with this configuration:
+</p>
+
+
+<pre class="src src-sh"><span style="color: #f0dfaf;">fai_enabled</span>=1
+<span style="color: #f0dfaf;">fai_db_install</span>=1
+<span style="color: #f0dfaf;">fai_db_replication</span>=1
+<span style="color: #f0dfaf;">fai_db_master</span>=0
+<span style="color: #f0dfaf;">fai_db_master_host</span>=my-db-master
+<span style="color: #f0dfaf;">fai_db_master_log_file</span>=mysql-bin.000013
+<span style="color: #f0dfaf;">fai_db_master_log_position</span>=106
+</pre>
+
+
+<p>
+The script will set up and use the replication user &amp; credentials with
+default values, if you wish to override these, have a look in the FAI
+parameter overview.
+</p>
+</div>
 </div>
 
 </div>
@@ -938,6 +1007,19 @@ <h3 id="sec-5-14"><span class="section-number-3">5.14</span> Profile :: NFS clie
 <p>Will install an NFS client, create all the mountpoints and mount these
 on the host.
 </p>
+<p>
+Configuration example for setting up an NFS client mounting the
+multimedia archive on the NFS server:
+</p>
+
+
+<pre class="src src-sh"><span style="color: #f0dfaf;">fai_enabled</span>=1
+<span style="color: #f0dfaf;">fai_nfs_client_install</span>=1
+<span style="color: #f0dfaf;">fai_nfs_server_address</span>=192.168.1.200
+<span style="color: #f0dfaf;">fai_nfs_export_list</span>=<span style="color: #ffa07a;">"/var/exports/multimedia"</span>  
+</pre>
+
+
 </div>
 
 </div>
@@ -946,7 +1028,8 @@ <h3 id="sec-5-14"><span class="section-number-3">5.14</span> Profile :: NFS clie
 <h3 id="sec-5-15"><span class="section-number-3">5.15</span> Profile :: VIP provider</h3>
 <div class="outline-text-3" id="text-5-15">
 
-
+<p><img src="images/db-vip.png"  alt="images/db-vip.png" />
+</p>
 <p>
 This profile will make the host capable of serving a certain virtual
 IP (VIP) for one or more services. This is a useful thing for all
@@ -1006,7 +1089,7 @@ <h3 id="sec-5-15"><span class="section-number-3">5.15</span> Profile :: VIP prov
 
 
 
-<pre class="src src-sh">$ dd <span style="color: #f0dfaf;">if</span>=/dev/urandom <span style="color: #f0dfaf;">bs</span>=512 <span style="color: #f0dfaf;">count</span>=1 2&gt;&gt; $<span style="color: #f0dfaf;">log</span> | <span style="color: #ffa07a;">\</span>
+<pre class="src src-sh">$ dd <span style="color: #f0dfaf;">if</span>=/dev/urandom <span style="color: #f0dfaf;">bs</span>=512 <span style="color: #f0dfaf;">count</span>=1 | <span style="color: #ffa07a;">\</span>
     openssl md5 | <span style="color: #ffa07a;">\</span>
     cut -d<span style="color: #ffa07a;">' '</span> -f2   
 </pre>
@@ -1430,6 +1513,12 @@ <h3 id="sec-6-3"><span class="section-number-3">6.3</span> Overview of All FAI P
 <tr><td class="left">fai<sub>keep</sub><sub>off</sub><sub>etc</sub><sub>hosts</sub></td><td class="left">0</td><td class="left">Set this to 1 if you don't want ece-install adding entries to /etc/hosts</td></tr>
 <tr><td class="left">fai<sub>monitoring</sub><sub>server</sub><sub>install</sub></td><td class="left">0</td><td class="left">Install the monitoring server profile.</td></tr>
 <tr><td class="left">fai<sub>monitoring</sub><sub>server</sub><sub>ip</sub></td><td class="left">127.0.0.1</td><td class="left">The IP of the monitoring server.</td></tr>
+<tr><td class="left">fai<sub>nfs</sub><sub>allowed</sub><sub>client</sub><sub>network</sub></td><td class="left">""</td><td class="left">IP/netmwask of allowed NFS clients, example: 192.168.1.0/255.255.255.0</td></tr>
+<tr><td class="left">fai<sub>nfs</sub><sub>client</sub><sub>install</sub></td><td class="left">0</td><td class="left">Installs an NFS client</td></tr>
+<tr><td class="left">fai<sub>nfs</sub><sub>client</sub><sub>mount</sub><sub>point</sub><sub>parent</sub></td><td class="left">/mnt</td><td class="left">Mount point parent directory</td></tr>
+<tr><td class="left">fai<sub>nfs</sub><sub>export</sub><sub>list</sub></td><td class="left">""</td><td class="left">Space separated list of NFS export directories, full paths as seen on the NFS server. E.g.: /var/exports/multimedia</td></tr>
+<tr><td class="left">fai<sub>nfs</sub><sub>server</sub><sub>address</sub></td><td class="left">""</td><td class="left">Address of the NFS server, useful for the NFS client profile</td></tr>
+<tr><td class="left">fai<sub>nfs</sub><sub>server</sub><sub>install</sub></td><td class="left">0</td><td class="left">Install an NFS server</td></tr>
 <tr><td class="left">fai<sub>presentation</sub><sub>conf</sub><sub>archive</sub></td><td class="left">""</td><td class="left">conf.tar.gz to use for Nursery &amp; JAAS configuration</td></tr>
 <tr><td class="left">fai<sub>presentation</sub><sub>ear</sub></td><td class="left">""</td><td class="left">EAR to use instead of the Escenic binaries</td></tr>
 <tr><td class="left">fai<sub>presentation</sub><sub>install</sub></td><td class="left">0</td><td class="left">Install the presentation server profile</td></tr>
@@ -1452,6 +1541,15 @@ <h3 id="sec-6-3"><span class="section-number-3">6.3</span> Overview of All FAI P
 <tr><td class="left">fai<sub>search</sub><sub>name</sub></td><td class="left">search1</td><td class="left">Name of the search instance</td></tr>
 <tr><td class="left">fai<sub>search</sub><sub>port</sub></td><td class="left">8080</td><td class="left">HTTP port of the search instance</td></tr>
 <tr><td class="left">fai<sub>search</sub><sub>shutdown</sub></td><td class="left">8005</td><td class="left">Shutdown port of the search instance</td></tr>
+<tr><td class="left">fai<sub>vip</sub><sub>address</sub></td><td class="left">""</td><td class="left">The virtual IP the provider will claim</td></tr>
+<tr><td class="left">fai<sub>vip</sub><sub>install</sub></td><td class="left">0</td><td class="left">Install a VIP provider</td></tr>
+<tr><td class="left">fai<sub>vip</sub><sub>primary</sub><sub>node</sub><sub>auth</sub><sub>key</sub></td><td class="left">""</td><td class="left">Optional, but useful to set to make conf files consistent. Will be generated if not set</td></tr>
+<tr><td class="left">fai<sub>vip</sub><sub>primary</sub><sub>node</sub><sub>ip</sub></td><td class="left">""</td><td class="left">Primary node IP</td></tr>
+<tr><td class="left">fai<sub>vip</sub><sub>primary</sub><sub>node</sub><sub>name</sub></td><td class="left">""</td><td class="left">Primary node name, must be what $(uname -n) returns</td></tr>
+<tr><td class="left">fai<sub>vip</sub><sub>secondary</sub><sub>node</sub><sub>ip</sub></td><td class="left">""</td><td class="left">Secondary node IP</td></tr>
+<tr><td class="left">fai<sub>vip</sub><sub>secondary</sub><sub>node</sub><sub>name</sub></td><td class="left">""</td><td class="left">Secondary node name, must be what $(uname -n) returns</td></tr>
+<tr><td class="left">fai<sub>vip</sub><sub>service</sub><sub>list</sub></td><td class="left">""</td><td class="left">List of init.d scripts to invoke when the VIP is acclaimed/revoked, script must support start &amp; stop</td></tr>
+<tr><td class="left">fai<sub>vip</sub><sub>sibling</sub><sub>ip</sub></td><td class="left">""</td><td class="left">The IP of the other node offering the VIP</td></tr>
 <tr><td class="left">fai<sub>wf</sub><sub>install</sub></td><td class="left">0</td><td class="left">Install Widget Framework profile</td></tr>
 </tbody>
 </table>
@@ -1921,7 +2019,7 @@ <h2 id="sec-15"><span class="section-number-2">15</span> Example Output FAI</h2>
 <hr/>
 <p class="author">
   Author: Torstein Krause Johansen (<a href="mailto:tkj@vizrt.com">tkj@vizrt.com</a>)
-  Date: 2012-03-08 15:10:00 CST
+  Date: 2012-03-14 18:08:27 CST
 </p>
 </div>
 </body>

From f7958c2e77f66abd9887d861e8823c0b09c86245 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 21 Mar 2012 18:51:37 +0800
Subject: [PATCH 0570/2585] - added print_section_end to all modules to
 facilitate (partly) JSON   output.

---
 .../ece-scripts/system-info.d/11-list-ece-overview.sh        | 3 +++
 usr/share/escenic/ece-scripts/system-info.d/44-db-info.sh    | 1 +
 usr/share/escenic/ece-scripts/system-info.d/44-java-info.sh  | 2 +-
 .../escenic/ece-scripts/system-info.d/55-list-services.sh    | 2 +-
 .../escenic/ece-scripts/system-info.d/66-list-hw-info.sh     | 5 +++--
 .../escenic/ece-scripts/system-info.d/66-list-os-info.sh     | 5 ++++-
 6 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh b/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
index a356d125..2e273f74 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
@@ -49,7 +49,10 @@ function get_overview_of_all_instances() {
     print_h3_header "Overview of instance $el"
     print_un_ordered_list_start
     create_ece_overview $el
+    print_section_end
   done
+
+  print_section_end
 }
 
 get_overview_of_all_instances
diff --git a/usr/share/escenic/ece-scripts/system-info.d/44-db-info.sh b/usr/share/escenic/ece-scripts/system-info.d/44-db-info.sh
index b1f93ce7..e9e4e099 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/44-db-info.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/44-db-info.sh
@@ -5,6 +5,7 @@
 if [ -x /usr/sbin/mysqld ]; then
   print_h2_header "DB information"
   print_pre_text "$(/usr/sbin/mysqld -V)"
+  print_section_end
 else
   print_pre_text "$(mysql -V 2>/dev/null)"
   print_pre_text "$(mysql5 -V 2>/dev/null)"
diff --git a/usr/share/escenic/ece-scripts/system-info.d/44-java-info.sh b/usr/share/escenic/ece-scripts/system-info.d/44-java-info.sh
index cf7e4a0a..fd51fd91 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/44-java-info.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/44-java-info.sh
@@ -4,5 +4,5 @@
 
 print_h2_header "Java information"
 print_pre_text $(java -version 2>&1)
-
+print_section_end
 
diff --git a/usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh b/usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh
index 3c2148c3..9c3e777d 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh
@@ -6,4 +6,4 @@ if [ $(whoami) != "root" ]; then
   print_p_text "Run $(basename $0) as  root to get more details in this listing"
 fi
 
-
+print_section_end
diff --git a/usr/share/escenic/ece-scripts/system-info.d/66-list-hw-info.sh b/usr/share/escenic/ece-scripts/system-info.d/66-list-hw-info.sh
index 10d66986..0254ef2d 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/66-list-hw-info.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/66-list-hw-info.sh
@@ -1,11 +1,12 @@
 
 print_h2_header "Disks used on $HOSTNAME"
 print_pre_text "$(df -hT)"
+print_section_end
 
 print_h2_header "Memory on $HOSTNAME"
 print_pre_text "Total memory: " `grep MemTotal /proc/meminfo | cut -d':' -f2`
 print_pre_text "Free memory: " `grep MemFree /proc/meminfo | cut -d':' -f2`
-
+print_section_end
 
 print_h2_header "CPU(s) on $HOSTNAME"
 print_un_ordered_list_start
@@ -17,4 +18,4 @@ print_list_item "Model: \
     sort | \
     uniq)"
 print_un_ordered_list_end
-
+print_section_end
diff --git a/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
index f88ad908..14298e45 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
@@ -6,8 +6,11 @@ print_h2_header "Operating system"
 
 print_h3_header "Kernel"
 print_pre_text $(uname -a)
+print_section_end
 
 print_h3_header "Distribution"
 print_pre_text "$(lsb_release  -a 2>/dev/null)"
+print_section_end
 
-
+# of the h2
+print_section_end

From d2e77d7d0e0353ea8c10db7df60cccd194e90d63 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 21 Mar 2012 18:56:33 +0800
Subject: [PATCH 0571/2585] - fixed the JSON new line hack (avoidance). Now
 gets the full multi   line value by converting all newlines to \n-s.

---
 usr/bin/system-info | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/bin/system-info b/usr/bin/system-info
index 4c60ec86..e846856b 100755
--- a/usr/bin/system-info
+++ b/usr/bin/system-info
@@ -164,9 +164,9 @@ $@
 {code}
 EOF
   elif [ $format == "json" ]; then
-    # hack to make JSON work, TODO: replace linebreaks with \n
+    # JSON doesn't accept newline characters
     cat <<EOF
-    "data": "$(json_escape_string $(echo $@ | head -1))",
+    "data": "$(json_escape_string $(echo $@ | sed 's/$/\\n/'))",
 EOF
   fi
 }

From ac4f40b8e7cd4b3a9ee4ae62c4d228ba32cb64ec Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 21 Mar 2012 18:58:30 +0800
Subject: [PATCH 0572/2585] - added note on JSON support not being complete

---
 usr/bin/system-info | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/bin/system-info b/usr/bin/system-info
index e846856b..aa84d82c 100755
--- a/usr/bin/system-info
+++ b/usr/bin/system-info
@@ -11,7 +11,7 @@
 
 ece_user=""
 
-## possible values: html, org, confluence, json
+## possible values: html, org, confluence, json (not coplete)
 format=org
 
 function init() {

From dd85db28b4681cb75c6f4b65ad6a37c7736cb062 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 22 Mar 2012 11:55:28 +0800
Subject: [PATCH 0573/2585] - improved JSON structure, less objects, direct
 lists where it makes sense.

---
 usr/bin/system-info                                       | 8 ++++----
 .../ece-scripts/system-info.d/11-list-ece-overview.sh     | 1 -
 .../escenic/ece-scripts/system-info.d/66-list-os-info.sh  | 2 --
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/usr/bin/system-info b/usr/bin/system-info
index aa84d82c..704bdcfd 100755
--- a/usr/bin/system-info
+++ b/usr/bin/system-info
@@ -110,7 +110,7 @@ function print_un_ordered_list_start() {
   elif [ $format == "confluence" ]; then
     echo ""
   elif [ $format == "json" ]; then
-    echo "    \"list\": ["
+    echo "    ["
   fi
 }
 
@@ -166,13 +166,13 @@ EOF
   elif [ $format == "json" ]; then
     # JSON doesn't accept newline characters
     cat <<EOF
-    "data": "$(json_escape_string $(echo $@ | sed 's/$/\\n/'))",
+"$(json_escape_string $(echo $@ | sed 's/$/\\n/'))",
 EOF
   fi
 }
 
 function make_string_into_json_label() {
-  echo "$@" | tr [A-Z] [a-z] | sed 's/ /-/g'
+  echo "$@" | tr [A-Z] [a-z] | sed -e 's/ /-/g'
 }
 
 function print_h3_header() {
@@ -185,7 +185,7 @@ function print_h3_header() {
     echo "h3. $@"
   elif [ $format == "json" ]; then
     cat <<EOF
-    "$(make_string_into_json_label $@)": {
+    "$(make_string_into_json_label $@)" :
 EOF
   fi
 }
diff --git a/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh b/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
index 2e273f74..4fba6fa0 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
@@ -49,7 +49,6 @@ function get_overview_of_all_instances() {
     print_h3_header "Overview of instance $el"
     print_un_ordered_list_start
     create_ece_overview $el
-    print_section_end
   done
 
   print_section_end
diff --git a/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
index 14298e45..2cd3feaa 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
@@ -6,11 +6,9 @@ print_h2_header "Operating system"
 
 print_h3_header "Kernel"
 print_pre_text $(uname -a)
-print_section_end
 
 print_h3_header "Distribution"
 print_pre_text "$(lsb_release  -a 2>/dev/null)"
-print_section_end
 
 # of the h2
 print_section_end

From eb83b89a378fc9f5cf9fc50ae1f789631073ee59 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 22 Mar 2012 12:20:46 +0800
Subject: [PATCH 0574/2585] - minor, minor change ;)

---
 usr/bin/system-info | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/bin/system-info b/usr/bin/system-info
index 704bdcfd..9bd81c21 100755
--- a/usr/bin/system-info
+++ b/usr/bin/system-info
@@ -7,7 +7,7 @@
 ##
 ## TODO:
 ## Add this to /etc/cronttab
-# echo '* *     * * *   root    system-info -f html > /var/www/index.html' >> /etc/crontab
+## echo '* *     * * *   root    system-info -f html > /var/www/index.html' >> /etc/crontab
 
 ece_user=""
 

From 18c4ec697fe118349d4aa5263f172424e22cdce2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 22 Mar 2012 12:22:13 +0800
Subject: [PATCH 0575/2585] - added method for setting up self reporting via
 systeminfo. TODO:   configure thttpd. - called this install_system_info
 method from the common_post_install   in ece-install.

---
 usr/sbin/ece-install                          |  1 +
 .../ece-scripts/ece-install.d/monitoring.sh   | 35 +++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 7f3fb1b7..d2a02150 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -894,6 +894,7 @@ function common_post_install() {
     fi
   fi
 
+  install_system_info
   set_correct_permissions
   
   print_status_and_next_steps
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index 4e0b1c1a..cac600b7 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -382,3 +382,38 @@ EOF
 }
 EOF
 }
+
+## Installs and sets up self-reporting of the current host
+function install_system_info() {
+  print_and_log "Setting up self-reporting on $HOSTNAME ..."
+  
+  install_packages_if_missing dhttpd
+  assert_pre_requisite dhttpd
+
+  local dir=/var/www/system-info
+  local port=5678
+  
+  # configure dhttpd
+
+  # set system-info to be run every minute on the host
+  echo '* *     * * *   root    system-info -f html -u $ece_user > $dir/index.html' \
+    >> /etc/crontab
+
+  # creating symlinks like:
+  # /var/www/system-info/var/log/escenic -> /var/log/escenic
+  # /var/www/system-info/etc/escenic -> /etc/escenic
+  make_dir ${dir}/$(dirname $log_dir)
+  make_dir ${dir}/$(dirname $escenic_conf_dir)
+  run ln -s ${log_dir} \
+    ./$(dirname ${log_dir})/$(basename ${log_dir})
+  run ln -s ${escenic_conf_dir} \
+    ./$(dirname $escenic_conf_dir)/$(basename $escenic_conf_dir)
+
+  # thttpd doesn't serve files if they've got the execution bit set
+  # (it then think it's a misnamed CGI script)
+  find $log_dir -type f | egrep ".log$|.out$" | xargs chmod 644
+  find $escenic_conf_dir -type f | egrep ".conf$|.properties$" | xargs chmod 644
+
+  add_next_step "Max 1 min old system info available: http://$HOSTNAME:$port/"
+  add_next_step "you can also see system-info in the shell, type: system-info"
+}

From 8b1678aca34c4ab9491091966e7a23b52805256a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 22 Mar 2012 12:53:42 +0800
Subject: [PATCH 0576/2585] - added get_free_memory_in_mega_bytes

---
 usr/share/escenic/ece-scripts/common-os.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index 2f34d0e3..24a51a20 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -134,3 +134,8 @@ function download_tomcat() {
   run wget $wget_opts $url
 }
 
+function get_free_memory_in_mega_bytes() {
+  if [ $(uname -s) == "Linux" ]; then
+    grep  MemFree /proc/meminfo | cut -d: -f2- | sed 's/^[ ]*//g' | cut -d' ' -f1
+  fi
+}

From e03329f2d927c7b4374e3feb6d82abf69d089a57 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 22 Mar 2012 13:05:31 +0800
Subject: [PATCH 0577/2585] - added set_appropriate_jvm_heap_sizes, this should
 make sure that   when installing an ECE, search or EAE instance, the min/max
 heap   sizes (and future perhaps more parameters) do not exceed the amount  
 of free memory (at install time).

  A warning is given about this, so the user may choose to adjust
  these values afterwards.

    [ece-install-43] You only have $free_size MBs free, I will use this for the
    [ece-install-43] use heap sizes, but you should really consider adding some
    [ece-install-43] more RAM so that you at least have 2GBs for web1

  This change is relate to issue #26
---
 .../ece-scripts/ece-install.d/app-server.sh    | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 70d902c4..2b9f4e24 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -126,6 +126,7 @@ function set_up_app_server()
   set_ece_instance_conf tomcat_base $tomcat_base   
   set_ece_instance_conf tomcat_home $tomcat_home
   set_ece_instance_conf appserver_port $appserver_port
+  set_appropriate_jvm_heap_sizes
   
   run cd $tomcat_base/lib
   make_ln $jdbc_driver
@@ -399,3 +400,20 @@ EOF
 EOF
   fi
 }
+
+function set_appropriate_jvm_heap_sizes() {
+  # in MB
+  local heap_size=2024
+
+  local free_size=$(get_free_memory_in_mega_bytes)
+  if [ $free_size -lt $heap_size ]; then
+    print_and_log "You only have $free_size MBs free, I will use this for the"
+    print_and_log "use heap sizes, but you should really consider adding some"
+    print_and_log "more RAM so that you at least have 2GBs for $instance_name"
+
+    heap_size=$free_size
+  fi
+  
+  set_ece_instance_conf min_heap_size "${heap_size}m"
+  set_ece_instance_conf max_heap_size "${heap_size}m"
+}

From 0a3529baecdb160588a68eea5be198a8bd8fb1ca Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 22 Mar 2012 15:34:57 +0800
Subject: [PATCH 0578/2585] - ece-install will now warn the user that there's
 less than 2GBs   available to the new instance:

  [ece-install-25] WARNING You only have 103 MBs of memory free, I will
  [ece-install-25] WARNING use this for the use heap sizes, but you
  [ece-install-26] WARNING should really consider adding some
  [ece-install-26] WARNING more RAM so that you at least have 2GBs
  [ece-install-26] WARNING for the web1 instance

  It then goes ahead and sets the currently available memory to the
  instance specific .conf:

  $ grep heap /etc/escenic/ece-web1.conf
  min_heap_size="103m"
  max_heap_size="103m"

  This should hopefully resolve issue #50 and perhaps also be
  satisfactory for issue #26.
---
 usr/share/escenic/ece-scripts/common-os.sh             |  8 +++++++-
 .../escenic/ece-scripts/ece-install.d/app-server.sh    | 10 ++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index 24a51a20..21750f2d 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -136,6 +136,12 @@ function download_tomcat() {
 
 function get_free_memory_in_mega_bytes() {
   if [ $(uname -s) == "Linux" ]; then
-    grep  MemFree /proc/meminfo | cut -d: -f2- | sed 's/^[ ]*//g' | cut -d' ' -f1
+    local free_in_kb=$(
+      grep  MemFree /proc/meminfo | \
+        cut -d: -f2- | \
+        sed 's/^[ ]*//g' | \
+        cut -d' ' -f1
+    )
+    echo $(( $free_in_kb / 1024 ))
   fi
 }
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 2b9f4e24..7a68fadf 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -403,13 +403,15 @@ EOF
 
 function set_appropriate_jvm_heap_sizes() {
   # in MB
-  local heap_size=2024
+  local heap_size=2048
 
   local free_size=$(get_free_memory_in_mega_bytes)
   if [ $free_size -lt $heap_size ]; then
-    print_and_log "You only have $free_size MBs free, I will use this for the"
-    print_and_log "use heap sizes, but you should really consider adding some"
-    print_and_log "more RAM so that you at least have 2GBs for $instance_name"
+    print_and_log "$(yellow WARNING) You only have $free_size MBs of memory free,"
+    print_and_log "$(yellow WARNING) I will use this for the use heap sizes, but"
+    print_and_log "$(yellow WARNING) you should really consider adding some"
+    print_and_log "$(yellow WARNING) more RAM so that you have at least 2GBs"
+    print_and_log "$(yellow WARNING) for the $instance_name instance"
 
     heap_size=$free_size
   fi

From 764ddfa8f6282ff4d92119ec7fa5f22443d3a468 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 22 Mar 2012 16:05:41 +0800
Subject: [PATCH 0579/2585] - for some reason, a lot of services are only
 listed under tcp6   instead of tcp. Mhmm. Adding them nevertheless.

---
 usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh b/usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh
index 9c3e777d..67e7895c 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh
@@ -1,6 +1,6 @@
 
 print_h2_header "Overview of all server services on $HOSTNAME"
-print_pre_text "$(netstat -nlp 2>/dev/null | egrep -v "tcp6|ACC" | grep LISTEN)"
+print_pre_text "$(netstat -nlp 2>/dev/null | egrep -v "ACC" | grep LISTEN)"
 
 if [ $(whoami) != "root" ]; then
   print_p_text "Run $(basename $0) as  root to get more details in this listing"

From d366ec0a92d288ceb3e5fb1fdfa503519a4ed3da Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 22 Mar 2012 16:07:14 +0800
Subject: [PATCH 0580/2585] - instead of grepping "away", I "grep include".

---
 usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh b/usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh
index 67e7895c..8d2f9ee1 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh
@@ -1,6 +1,6 @@
 
 print_h2_header "Overview of all server services on $HOSTNAME"
-print_pre_text "$(netstat -nlp 2>/dev/null | egrep -v "ACC" | grep LISTEN)"
+print_pre_text "$(netstat -nlp 2>/dev/null | grep ^tcp | grep LISTEN)"
 
 if [ $(whoami) != "root" ]; then
   print_p_text "Run $(basename $0) as  root to get more details in this listing"

From 7183b7d4aad9cb30ec4a06733228d16882136d2d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 22 Mar 2012 16:38:08 +0800
Subject: [PATCH 0581/2585] - added get_total_memory_in_mega_bytes

---
 usr/share/escenic/ece-scripts/common-os.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index 21750f2d..ff628b72 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -145,3 +145,15 @@ function get_free_memory_in_mega_bytes() {
     echo $(( $free_in_kb / 1024 ))
   fi
 }
+
+function get_total_memory_in_mega_bytes() {
+  if [ $(uname -s) == "Linux" ]; then
+    local total_in_kb=$(
+      grep  MemTotal /proc/meminfo | \
+        cut -d: -f2- | \
+        sed 's/^[ ]*//g' | \
+        cut -d' ' -f1
+    )
+    echo $(( $total_in_kb / 1024 ))
+  fi
+}

From 4011ffe7555235a62964bb4f1a151b34beaf263f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 22 Mar 2012 16:45:27 +0800
Subject: [PATCH 0582/2585] - ece-install now automatically sets up host self
 reporting in the   common_post_install, via
 monitoring.sh::install_system_info.

  All hosts now get a lightweight HTTP server running on port 5678
  where they can browse up to date system information.

  Issue #51
---
 .../ece-scripts/ece-install.d/monitoring.sh   | 56 ++++++++++++++-----
 1 file changed, 43 insertions(+), 13 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index cac600b7..b87272cc 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -385,33 +385,63 @@ EOF
 
 ## Installs and sets up self-reporting of the current host
 function install_system_info() {
-  print_and_log "Setting up self-reporting on $HOSTNAME ..."
+  print_and_log "Setting up self-reporting module on $HOSTNAME ..."
   
-  install_packages_if_missing dhttpd
-  assert_pre_requisite dhttpd
+  install_packages_if_missing thttpd
+  assert_pre_requisite thttpd
 
-  local dir=/var/www/system-info
-  local port=5678
+  local port=${fai_reporting_port-5678}
+  local dir=${fai_reporting_dir-/var/www/system-info}
+  make_dir $dir
   
   # configure dhttpd
+  local file=/etc/thttpd/thttpd.conf
 
+  # set the port
+  sed -i "s~^port=80~port=$port~g" $file
+  
+  # set the document root
+  sed -i "s~^dir=/var/www$~dir=$dir~g" $file
+  
+  # set a non-chroot environment to make the symlinking outside the
+  # document root work
+  sed -i "s~^#nochroot~nochroot~g" $file
+  sed -i "s~^chroot~#chroot~g" $file
+
+  # prevent symlink checking
+  sed -i "s~^symlinks~#symlinks~g" $file
+  sed -i "s~^#nosymlinks~nosymlinks~g" $file
+  
+  # make thttpd start
+  file=/etc/default/thttpd
+  sed -i "s~^ENABLED=no~ENABLED=yes~g" $file
+  run /etc/init.d/thttpd restart
+  
   # set system-info to be run every minute on the host
-  echo '* *     * * *   root    system-info -f html -u $ece_user > $dir/index.html' \
-    >> /etc/crontab
+  local command="system-info -f html -u $ece_user > $dir/index.html"
+  if [ $(grep -v ^# /etc/crontab | grep "$command" | wc -l) -lt 1 ]; then
+    echo '* *     * * *   root    '$command >> /etc/crontab
+  fi
 
   # creating symlinks like:
   # /var/www/system-info/var/log/escenic -> /var/log/escenic
   # /var/www/system-info/etc/escenic -> /etc/escenic
-  make_dir ${dir}/$(dirname $log_dir)
+  make_dir ${dir}/$(dirname $escenic_log_dir)
   make_dir ${dir}/$(dirname $escenic_conf_dir)
-  run ln -s ${log_dir} \
-    ./$(dirname ${log_dir})/$(basename ${log_dir})
-  run ln -s ${escenic_conf_dir} \
-    ./$(dirname $escenic_conf_dir)/$(basename $escenic_conf_dir)
+  
+  local target=${dir}/$(dirname ${escenic_log_dir})/$(basename ${escenic_log_dir})
+  if [ ! -h $target ]; then
+    run ln -s ${escenic_log_dir} $target
+  fi
 
+  target=${dir}/$(dirname $escenic_conf_dir)/$(basename $escenic_conf_dir)
+  if [ ! -h $target ]; then
+    run ln -s ${escenic_conf_dir} $target
+  fi
+  
   # thttpd doesn't serve files if they've got the execution bit set
   # (it then think it's a misnamed CGI script)
-  find $log_dir -type f | egrep ".log$|.out$" | xargs chmod 644
+  find $escenic_log_dir -type f | egrep ".log$|.out$" | xargs chmod 644
   find $escenic_conf_dir -type f | egrep ".conf$|.properties$" | xargs chmod 644
 
   add_next_step "Max 1 min old system info available: http://$HOSTNAME:$port/"

From 594e57116f4daa6c32ae242e43c7057adff6cf73 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 22 Mar 2012 17:09:08 +0800
Subject: [PATCH 0583/2585] - now using total memory instead of free memory as
 the basis of the   70% heap size calculation.

  The reason for this is that OSs, especially Linux, holds on to
  memory until it really needs letting it go. Hence, testing the free
  memory and allocating JVM heaps after that will lead to
  unnecessarily small heaps.

  Issue #26 and #50
---
 .../ece-scripts/ece-install.d/app-server.sh   | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 7a68fadf..36f600d0 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -404,16 +404,17 @@ EOF
 function set_appropriate_jvm_heap_sizes() {
   # in MB
   local heap_size=2048
+  local percent=70
+  local total_size=$(get_total_memory_in_mega_bytes)
+  
+  if [ $total_size -lt $heap_size ]; then
+    local warning="$(yellow WARNING)"
+    print_and_log "$warning $HOSTNAME only has $total_size MBs of memory, I will"
+    print_and_log "$warning use ${percent}% of this for the JVM heap sizes, but you"
+    print_and_log "$warning should really consider adding more RAM so that"
+    print_and_log "$warning the $instance_name instance gets 2GBs"
 
-  local free_size=$(get_free_memory_in_mega_bytes)
-  if [ $free_size -lt $heap_size ]; then
-    print_and_log "$(yellow WARNING) You only have $free_size MBs of memory free,"
-    print_and_log "$(yellow WARNING) I will use this for the use heap sizes, but"
-    print_and_log "$(yellow WARNING) you should really consider adding some"
-    print_and_log "$(yellow WARNING) more RAM so that you have at least 2GBs"
-    print_and_log "$(yellow WARNING) for the $instance_name instance"
-
-    heap_size=$free_size
+    heap_size=$(echo "$total_size * 0.${percent}" | bc | cut -d'.' -f1)
   fi
   
   set_ece_instance_conf min_heap_size "${heap_size}m"

From 95e1f57d14198b3bacf9b662cd53f991c350fdc9 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 22 Mar 2012 17:21:06 +0800
Subject: [PATCH 0584/2585] - some extra hardening when running system-info as
 root

---
 .../system-info.d/11-list-ece-overview.sh         | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh b/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
index 4fba6fa0..c3dcede4 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
@@ -4,19 +4,22 @@
 
 ## $1 is instance
 function create_ece_overview() {
+  
   if [ $(whoami) == "root" ]; then
-    local command="ece -q -i $1 info"
-    local data="$(su - $ece_user -c " $command ")"$'\n'
-
-    command="ece -q -i $1 status"
-    if [ "UP" == $(su - $ece_user -c "$command" | cut -d' ' -f1) ]; then
+    if [ -n "$ece_user" ]; then
+      local command="ece -q -i $1 info"
+      local data="$(su - $ece_user -c " $command ")"$'\n'
+      
+      command="ece -q -i $1 status"
+      if [ "UP" == "$(su - $ece_user -c "$command" | cut -d' ' -f1)" ]; then
         command="ece -q -i $1 versions"
         data="$data $(su - $ece_user -c" $command " | cut -d'*' -f2-)"
+      fi
     fi
   else
     local data="$(ece -q -i $1 info)"$'\n'
     
-    if [ "UP" == $(ece -q -i $1 status | cut -d' ' -f1) ]; then
+    if [ "UP" == "$(ece -q -i $1 status | cut -d' ' -f1)" ]; then
       data="$data $(ece -q -i $1 versions | cut -d'*' -f2-)"
     fi
   fi

From 6d37ba03f5c7a7dea598f9043c93e3814be73cf2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 22 Mar 2012 17:39:40 +0800
Subject: [PATCH 0585/2585] - fix in system-info::db-info, will now no longer
 generate any output   if no MySQL DB is present

---
 usr/share/escenic/ece-scripts/system-info.d/44-db-info.sh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/44-db-info.sh b/usr/share/escenic/ece-scripts/system-info.d/44-db-info.sh
index e9e4e099..a5b7543f 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/44-db-info.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/44-db-info.sh
@@ -2,11 +2,8 @@
 
 # by tkj@vizrt.com
 
-if [ -x /usr/sbin/mysqld ]; then
+if [ "$(which mysqld)x" != "x" ]; then
   print_h2_header "DB information"
-  print_pre_text "$(/usr/sbin/mysqld -V)"
+  print_pre_text "$(mysqld -V)"
   print_section_end
-else
-  print_pre_text "$(mysql -V 2>/dev/null)"
-  print_pre_text "$(mysql5 -V 2>/dev/null)"
 fi

From f43d07f9eade795e23f878df0c32c81268593b65 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 22 Mar 2012 17:49:00 +0800
Subject: [PATCH 0586/2585] - fixed empty elements in the output, very visible
 in HTML output for   empty lines.

---
 .../escenic/ece-scripts/system-info.d/11-list-ece-overview.sh   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh b/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
index c3dcede4..404a29d4 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
@@ -30,7 +30,7 @@ function create_ece_overview() {
       print_list_item $(wrap_in_anchor_if_applicable ${line:3})
     elif [ $(echo $line | cut -d':' -f2- | wc -c) -gt 1 ]; then
       print_list_item $(wrap_in_anchor_if_applicable $line)
-    else
+    elif [ -n "$line" ]; then
       print_un_ordered_list_end
       print_h4_header $(echo $line | cut -d: -f1)
       print_un_ordered_list_start

From 1d4036db8be0391d30f43e589c300e1c0bccff6b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 23 Mar 2012 13:06:20 +0800
Subject: [PATCH 0587/2585] - added BASH completion from the hg repository.

---
 etc/bash_completion.d/vosa | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 etc/bash_completion.d/vosa

diff --git a/etc/bash_completion.d/vosa b/etc/bash_completion.d/vosa
new file mode 100644
index 00000000..5e84442c
--- /dev/null
+++ b/etc/bash_completion.d/vosa
@@ -0,0 +1,19 @@
+# auto completion for the vosa command.                    -*- sh -*-
+
+_vosa_commands()
+{
+    local cur=${COMP_WORDS[COMP_CWORD]}
+    local prev=${COMP_WORDS[COMP_CWORD-1]}
+
+    commands=$(
+        vosa commands | cut -f3 -d' ' | cut -f1 -d':'
+    )
+    
+    # default completions is the list of commands
+    completions="$commands"
+
+    COMPREPLY=( $(compgen -W "$completions" -- $cur) )
+}
+
+complete -o default -F _vosa_commands vosa
+

From d7fd7cf3ae6e2f05b5c9fab7a4096d40bb3df0a9 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 23 Mar 2012 15:44:37 +0800
Subject: [PATCH 0588/2585] - added automatic set up of Emacs & VIM support for
 editing Puppet   files on the Puppet master.

---
 .../vizrt/vosa/post-install-hooks/install-puppet-master.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/usr/share/vizrt/vosa/post-install-hooks/install-puppet-master.sh b/usr/share/vizrt/vosa/post-install-hooks/install-puppet-master.sh
index 27bc6e4b..1d708e80 100755
--- a/usr/share/vizrt/vosa/post-install-hooks/install-puppet-master.sh
+++ b/usr/share/vizrt/vosa/post-install-hooks/install-puppet-master.sh
@@ -14,8 +14,11 @@ EOF
 ssh -F $2/ssh.conf root@guest chmod +x /usr/sbin/policy-rc.d
 
 
-# Install the puppet master package on the guest, and patch the configuration file
-ssh -F $2/ssh.conf root@guest apt-get -y install puppetmaster || exit 2
+# Install the puppet master package + VIM & Emacs support for editing
+# Puppet onfiguration files on the guest, and patch the configuration
+# file
+packages="puppetmaster emacs23-nox puppet-el vim-puppet"
+ssh -F $2/ssh.conf root@guest apt-get -y install $packages || exit 2
 ssh -F $2/ssh.conf root@guest patch /etc/puppet/auth.conf <<EOF
 --- /etc/puppet/auth.conf    2011-06-27 16:50:51.000000000 +0200
 +++ /etc/puppet/auth.conf.orig       2012-02-21 07:26:54.361610001 +0100

From b1545828704bf19ce24ffa96413df1215bd4ba50 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 23 Mar 2012 18:03:58 +0800
Subject: [PATCH 0589/2585] - improved report string: "Always up to date system
 info:" instead of   "Max 1 min old system info available", it's easier to
 understand the   first one :)

---
 usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index b87272cc..b8436fba 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -444,6 +444,6 @@ function install_system_info() {
   find $escenic_log_dir -type f | egrep ".log$|.out$" | xargs chmod 644
   find $escenic_conf_dir -type f | egrep ".conf$|.properties$" | xargs chmod 644
 
-  add_next_step "Max 1 min old system info available: http://$HOSTNAME:$port/"
+  add_next_step "Always up to date system info: http://$HOSTNAME:$port/"
   add_next_step "you can also see system-info in the shell, type: system-info"
 }

From de85800d94dcf1817b042f1b6014c67593a69465 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 23 Mar 2012 18:25:42 +0800
Subject: [PATCH 0590/2585] - small bug fix in get_publication_short_name_list
 when installing   from EAR files. Before, the user would get an error printed
 in the   installation console when generating the deployment white list  
 because $assembly_tool_home/publications couldn't be found.

  This has now been fixed.
---
 .../ece-scripts/ece-install.d/content-engine.sh        | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 51dd34e9..33fe0cfe 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -22,6 +22,12 @@ function get_publication_short_name_list() {
   local short_name_list=""
   
   local publication_def_dir=${escenic_root_dir}/assemblytool/publications
+
+  if [ ! -d $publication_def_dir ]; then
+    echo ${short_name_list}
+    return
+  fi
+
   if [ $(ls ${publication_def_dir} | grep .properties$ | wc -l) -eq 0 ]; then
     echo ${short_name_list}
     return
@@ -267,7 +273,9 @@ function set_up_basic_nursery_configuration() {
     run cd $a_tmp_dir
     run tar xzf $ece_instance_conf_archive
     
-    if [ ! -d ${a_tmp_dir}/engine/security ]; then
+    if [ -d ${a_tmp_dir}/engine/security ]; then
+      run cp -r $a_tmp_dir/engine/security/ $common_nursery_dir/
+    else
       print "Archive $ece_instance_conf_archive doesn't have JAAS config,"
       print "I'll use standard JAAS (engine/security) instead."
       run cp -r $escenic_root_dir/engine/security/ $common_nursery_dir/

From d9bfeb1eb1eababc5b4f40ac21f8a6866061f536 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 23 Mar 2012 18:49:20 +0800
Subject: [PATCH 0591/2585] - new feature: when installing using FAI mode, the
 user can specify a   new parameter in ece-install.conf:

  fai_publication_deploy_white_list="mypub escenic-admin"

  which ece-install will heed.

  This parameter is especially useful when using EAR based
  installation as ece-install then doesn't have any good way of
  determining which web applications it should deploy.

  When using non-EAR deployment (the default if you will), ece-install
  will select the webapps to deploy out from the kind of profile
  you're installing. Most of the times, this will work fine, but you
  can then still use this new parameter to to specify the webapps you
  want to be deployed.
---
 .../escenic/ece-scripts/ece-install.d/content-engine.sh    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 33fe0cfe..e3090982 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -1,6 +1,13 @@
 # ece-install module Content Engine specific code.
 
 function get_deploy_white_list() {
+  
+  # user's deploy white list, if present, takes precedence.
+  if [ $fai_enabled -eq 1 -a -n "${fai_publication_deploy_white_list}" ]; then
+    echo $fai_publication_deploy_white_list
+    return
+  fi
+  
   local white_list="escenic-admin"
   
   if [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER \

From be3cd6edf80b4e5e8dfaf12c6287997915089695 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Fri, 23 Mar 2012 13:23:18 +0100
Subject: [PATCH 0592/2585] Made it compatible with puppet 2.6.14. Use hostname
 instead of fqdn.

---
 usr/share/vizrt/vosa/puppet/client-postinst-script.tmpl | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/usr/share/vizrt/vosa/puppet/client-postinst-script.tmpl b/usr/share/vizrt/vosa/puppet/client-postinst-script.tmpl
index 0033b5d6..21edc359 100644
--- a/usr/share/vizrt/vosa/puppet/client-postinst-script.tmpl
+++ b/usr/share/vizrt/vosa/puppet/client-postinst-script.tmpl
@@ -22,8 +22,8 @@ logdir = /var/log/puppet
 vardir = /var/lib/puppet
 ssldir = /var/lib/puppet/ssl
 rundir = /var/run/puppet
-factpath = $vardir/lib/facter
-templatedir = $confdir/templates
+factpath = \$vardir/lib/facter
+templatedir = \$confdir/templates
 prerun_command = /etc/puppet/etckeeper-commit-pre
 postrun_command = /etc/puppet/etckeeper-commit-post
 
@@ -34,7 +34,8 @@ ssl_client_verify_header = SSL_CLIENT_VERIFY
 [agent]
 server = @@HOSTNAME@@
 certname = "generic-@@HOSTNAME@@-client"
-node_name_fact = "fqdn"
+node_name = "facter"
+node_name_fact = "hostname"
 runinterval = 15
 environment = production
 EOF

From b20723e524a55ef0c439583674b7c1cbf882b4c9 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 26 Mar 2012 18:13:56 +0800
Subject: [PATCH 0593/2585] - added "installed packages" to OS module, supp
 ported OSs:   * RPM based ones   * DEB based ones

---
 .../escenic/ece-scripts/system-info.d/66-list-os-info.sh   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
index 2cd3feaa..bd30e419 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
@@ -10,5 +10,12 @@ print_pre_text $(uname -a)
 print_h3_header "Distribution"
 print_pre_text "$(lsb_release  -a 2>/dev/null)"
 
+print_h3_header "Installed packages"
+if [ $(which dpkg)x != "x" ]; then
+  print_pre_text "$(dpkg -l 2>/dev/null)"
+elif [ $(which rpm)x != "x" ]; then
+  print_pre_text "$(rpm -qla 2>/dev/null)"
+fi
+
 # of the h2
 print_section_end

From e43b55e78cda32173796e63032707720bc6ced06 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 26 Mar 2012 18:31:49 +0800
Subject: [PATCH 0594/2585] - added an option to create per module based output
 files, e.g:

  $ system-info -m

  will create the following files in the current directory:

  11-list-ece-overview.sh.org
  44-db-info.sh.org
  44-java-info.sh.org
  55-list-services.sh.org
  66-list-hw-info.sh.org
  66-list-os-info.sh.org

  The output directory can be controlled by the -d parameter:

  $ system-info -m -d /var/www/system-info

  The aggregated summary will still be printed to standard out.
---
 usr/bin/system-info | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/usr/bin/system-info b/usr/bin/system-info
index 9bd81c21..75147eaf 100755
--- a/usr/bin/system-info
+++ b/usr/bin/system-info
@@ -13,6 +13,8 @@ ece_user=""
 
 ## possible values: html, org, confluence, json (not coplete)
 format=org
+generate_output_file_per_module=0
+output_dir=$(pwd)
 
 function init() {
   # first, try to be nice
@@ -35,7 +37,11 @@ function run_system_info_modules() {
     fi
     
     for el in $(\ls $ece_scripts_dir/system-info.d/*.sh 2>/dev/null); do
-      source $el
+      if [ $generate_output_file_per_module -eq 1 ]; then
+        source $el | tee ${output_dir}/$(basename $el).${format}
+      else
+        source $el
+      fi
     done
   fi
 }
@@ -249,17 +255,24 @@ EOF
 }
 
 function get_user_options() {
-  while getopts ":i:f:u:" opt; do
+  while getopts ":d:i:f:u:m" opt; do
     case $opt in
       i)
         instance=${OPTARG}
         ;;
+      d)
+        output_dir=${OPTARG}
+        mkdir -p $output_dir
+        ;;
       u)
         ece_user=${OPTARG}
         ;;
       f)
         format=${OPTARG}
         ;;
+      m)
+        generate_output_file_per_module=1
+        ;;
       \?)
         echo "Invalid option: -$OPTARG" >&2
         exit 1

From 2e27fd8e7e80c7b01cf1f355f77f5b2aeb5c488c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 27 Mar 2012 15:17:13 +0800
Subject: [PATCH 0595/2585] - added diagram showing how everything is thought
 to work together:

  1) The build server creates a new build (which it has been told by
     something to do.

  2) It creates a deployment descriptor for that matches the current
     build and copies this over to each of the ECE instances. In this
     example, this is "pres1".

  3) The deployment descriptor lands in the spool directory (used for
      e.g. imports), default wise this will be:
      /var/spool/escenic/deploy.<instance>

  4a) The puppet agent on the pres1 server checks for the presence of
      such a file, and if there, triggers a new-deploy of ECE.

  4b) The "ece start" checks if there is such a deployment descriptor
      and, if yes, triggers a new-deployment of ECE before it starts
      itself.

  5) "ece deploy" will then fetch the EAR from the build server,
     deploy the downloaded EAR and update deploy-pres1.state file,
     default wise in:
     /var/lib/escenic/deploy-dev1.state

  6) Whenever "ece info" is called, it will look for the presence of
     this file and present the deployment information contained therein.

     This information will also be available on overview pages like
     /escenic-admin
---
 ...ece-deploy-and-ece-info-workflow.blockdiag | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 usr/share/doc/escenic/images/puppet-build-server-ece-deploy-and-ece-info-workflow.blockdiag

diff --git a/usr/share/doc/escenic/images/puppet-build-server-ece-deploy-and-ece-info-workflow.blockdiag b/usr/share/doc/escenic/images/puppet-build-server-ece-deploy-and-ece-info-workflow.blockdiag
new file mode 100644
index 00000000..32e8e1c4
--- /dev/null
+++ b/usr/share/doc/escenic/images/puppet-build-server-ece-deploy-and-ece-info-workflow.blockdiag
@@ -0,0 +1,19 @@
+blockdiag {
+   A [label = "build-server"];
+   B [label = "pres1: /var/spool/escenic/deploy.pres1"];
+   C [label = "pres1: puppet-agent" ];
+   D [label = "pres1: ece deploy", color = "orange" ];
+   E [label = "pres1: app server" ];
+   F [label = "pres1: /var/lib/escenic/deploy-pres1.state"];
+   G [label = "pres1: ece info" ];
+   
+   A -> B [label = "scp"];
+   C -> B [label = "reads"];
+   C -> D [folded, label = "calls"];
+
+   D -> A [label = "gets EAR"];
+   D -> E [label = "deploys"];
+   D -> F [label = "writes"];
+
+   G -> F [label = "reads"];
+}
\ No newline at end of file

From 9ab62a0f3ad9bdd6055f5bae3e2e65d5c0ec21ea Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 27 Mar 2012 15:19:01 +0800
Subject: [PATCH 0596/2585] - added

---
 ...-server-ece-deploy-and-ece-info-workflow.png | Bin 0 -> 14981 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 usr/share/doc/escenic/images/puppet-build-server-ece-deploy-and-ece-info-workflow.png

diff --git a/usr/share/doc/escenic/images/puppet-build-server-ece-deploy-and-ece-info-workflow.png b/usr/share/doc/escenic/images/puppet-build-server-ece-deploy-and-ece-info-workflow.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4c82a159dd536ff8561d87bcb038075b251adec
GIT binary patch
literal 14981
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
AbpQYW

literal 0
HcmV?d00001


From 605afbcbfd438e5fa8c6868a0f844375f2268c51 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 28 Mar 2012 14:00:51 +0800
Subject: [PATCH 0597/2585] - added data dir

---
 etc/escenic/ece.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/etc/escenic/ece.conf b/etc/escenic/ece.conf
index 08d9edef..39c8b1c2 100644
--- a/etc/escenic/ece.conf
+++ b/etc/escenic/ece.conf
@@ -53,6 +53,7 @@ cache_dir=/var/cache/escenic
 # The root of all Escenic configuration files (not only ECE)
 escenic_conf_dir=/etc/escenic
 ece_security_configuration_dir=${escenic_conf_dir}/engine/common/security
+data_dir=/var/lib/escenic
 log_dir=/var/log/escenic
 pid_dir=/var/run/escenic
 rmi_hub_conf=${escenic_conf_dir}/rmi-hub

From 56a174eb0eb22e82c6320fefaac65b9b8b29b7e3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 28 Mar 2012 17:36:38 +0800
Subject: [PATCH 0598/2585] - new feature to "ece deploy": it now accepts a URI
 with the EAR to be   deployed, e.g.:

  $ ece deploy -f http://localhost:5678/builds/engine-ap.no-1.2.3.ear
  [ece#engine-cohen] Deploying http://localhost:5678/builds/engine-ap.no-1.2.3.ear on cohen ...
  [ece#engine-cohen] Downloading EAR http://localhost:5678/builds/engine-ap.no-1.2.3.ear ...
  [ece#engine-cohen] Deploying /var/cache/escenic/engine-ap.no-1.2.3.ear on tomcat ...
  [ece#engine-cohen] Deployment white list active, only deploying: escenic-admin
  [ece#engine-cohen] Deployment state file updated: /var/lib/escenic/cohen.state

  "ece deploy" accepts the following URIs in the -f/--file parameter:
  * http://my.buildserver.com/engine-mysite.com-1.2.3.ear
  * https://my.buildserver.com/engine-mysite.com-1.2.3.ear
  * file:///tmp/engine-mysite.com-1.2.3.ear
  * /tmp/engine-mysite.com-1.2.3.ear

  This change closes issue #52

- "ece deploy" also updates a new deployment state file for the
  instance, this is written to <data_dir>/<instance>.state, default
  wise in /var/lib/escenic/<instance>.state

  The contents of this file looks like this:

  ear_used=http://localhost:5678/builds/engine-ap.no-1.2.3.ear
  version=ap.no-1.2.3
  md5_sum=5881d1895c09c7b35a032806c6249433
  deployed_date=Wed Mar 28 17:16:19 CST 2012

  "ece deploy" will remove the "engine-" in the EAR file name and make
  the rest before the .ear suffix into the version of the deployment:

     engine-mysite.com-1.2.3.ear -> version: mysite.com-1.2.3

- ece is now made modular, it can now use its own modules from
  /usr/share/escenic/ece-scripts/ece.d/.

- deployment code has been moved from ece to its own ece.d module.

- removed code from ece which is present in the common-bashing &
  common-os modules.

- added hardening to common-bashing, testing if the pid file is set,
  if it's readable and so on.

- made common-bashing's use of ID (used for user messages) more
  flexible.

- added feature to print() (taken from the ece script), that it checks
  if the user has asked for quiet operation (with the -q/--quiet
  parameter) and based on that only outputs the messages without an ID
  preceding them, e.g.:

  $ ece status
  DOWN

  instead of the normal one with ID:
  $ ece status
  [ece#engine-myinstance] DOWN

- made data_dir a necessary pre-requisite in ece.conf

- more flexible loading of common libraries in common-os (which needs
  common-bashing), also removed the loading of the common-pulse
  library from common-os as it's not used right now.

- added data_dir / /var/lib/escenic to the directories inti.d/ece
  takes care of.
---
 etc/escenic/ece.conf                          |   4 +-
 etc/init.d/ece                                |   1 +
 usr/bin/ece                                   | 297 ++++++------------
 .../escenic/ece-scripts/common-bashing.sh     |  14 +-
 usr/share/escenic/ece-scripts/common-os.sh    |   3 +-
 usr/share/escenic/ece-scripts/ece.d/deploy.sh | 188 +++++++++++
 6 files changed, 306 insertions(+), 201 deletions(-)
 create mode 100644 usr/share/escenic/ece-scripts/ece.d/deploy.sh

diff --git a/etc/escenic/ece.conf b/etc/escenic/ece.conf
index 39c8b1c2..041cd81a 100644
--- a/etc/escenic/ece.conf
+++ b/etc/escenic/ece.conf
@@ -105,8 +105,8 @@ apr_lib_dir=/usr/lib
 ########################################################################
 # The minimum and maximum heap sizes for the Java process
 ########################################################################
-min_heap_size=2048m
-max_heap_size=2048m
+min_heap_size=256m
+max_heap_size=256m
 
 ########################################################################
 # The permgen size is the amount of memory the JVM sets aside to class
diff --git a/etc/init.d/ece b/etc/init.d/ece
index 979bd279..9ed84d73 100755
--- a/etc/init.d/ece
+++ b/etc/init.d/ece
@@ -38,6 +38,7 @@ dir_list="
 /var/backups/escenic
 /var/crash/escenic
 /var/log/escenic
+/var/lib/escenic
 /var/run/escenic
 "
 
diff --git a/usr/bin/ece b/usr/bin/ece
index 5333a37a..469da782 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -10,7 +10,6 @@
 ######################################################################
 # Script defaults, my be overriden in any of the configration files
 ######################################################################
-verbose=0
 force_ipv4=0
 quiet=0
 everything_but_the_kitchen_sink=0
@@ -28,6 +27,7 @@ http_user=""
 http_password=""
 wget_auth=""
 curl_auth=""
+log="/tmp/arne"
 
 type_list="
 engine
@@ -45,6 +45,7 @@ engine_required_fields="
 appserver
 assemblytool_home
 cache_dir
+data_dir
 escenic_conf_dir
 ece_home
 ece_security_configuration_dir
@@ -70,6 +71,38 @@ appserver
 java_home
 tmp_dir
 "
+
+## Bootstrapping, load files from /usr/share/escenic/ece-scripts The
+## method will first try to be smart, in case the user has copied the
+## ece-scripts somewhere else., e.g.: moved everything to ~/ece-scrpts
+## or /opt/escenic/ece-scripts, this should also work.
+function init() {
+  # first, try to be nice
+  local dir=$(dirname $0)/../share/escenic/ece-scripts
+
+  # then check the standard location
+  if [ ! -d $dir  ]; then
+    dir=/usr/share/escenic/ece-scripts
+  fi
+
+  if [ -d $dir ]; then
+    # load common libraries
+    common_libraries="common-bashing.sh common-io.sh common-os.sh"
+    for el in $common_libraries; do
+      source $dir/${el}
+    done
+    
+    # load ece-install modules
+    for el in $dir/ece.d/*.sh; do
+      log "Loading $(basename $0) module:" $el
+      source $el
+    done
+  else
+    echo "I cannot find $(basename $0)'s dependencies, exiting :-("
+    exit 1
+  fi
+}
+
 ####################################################################
 # Will exit the ece execution if the last operation failed. While
 # failing, it will print the message passed to the function.
@@ -84,40 +117,10 @@ function exit_on_error()
 
 function run()
 {
-    $@ 1>>$log_file 2>>$log_file
+    $@ 1>>$log 2>>$log
     exit_on_error $@
 }
 
-####################################################################
-# debug/verbose method
-####################################################################
-function debug()
-{
-    if [ "$verbose" -eq 1 ]; then
-        print $@
-    fi
-}
-
-function print()
-{
-    if [ "$quiet" -eq 0 ]; then
-        echo "$id" $@
-    else
-      echo $@
-    fi
-}
-
-function log()
-{
-    echo $(date) "$id" $@ 2>/dev/null >> $log_file 
-}
-
-function print_and_log()
-{
-    print "$@"
-    log "$@"
-}
-
 function verify_that_directory_and_file_are_writeable()
 {
     dir=`dirname $1`
@@ -227,16 +230,16 @@ function set_common_settings()
     read_conf_file `basename $0`.conf
 
     if [ "$instance" == "default" ]; then
-        log_file=$log_dir/$type.out
+        log=$log_dir/$type.out
         pid_file=$pid_dir/$type.pid
     else
-        log_file=$log_dir/$type-$instance.out
+        log=$log_dir/$type-$instance.out
         pid_file=$pid_dir/$type-$instance.pid
     fi
     
     gc_log=${log_dir}/${type}-${instance}-gc.log
 
-    log_file_list="
+    log_list="
       $log_dir/${HOSTNAME}-${instance}-messages
       $log_dir/messages
       $log_dir/Escenic-error.log
@@ -296,7 +299,7 @@ function set_type_port()
             # for tomcat6-user packaged tomcats (and perhaps others)
             out_log=$tomcat_base/logs/catalina.out
         else
-            out_log=$log_file
+            out_log=$log
         fi
 
         if [ -r $out_log ]; then
@@ -465,7 +468,7 @@ function sanity_check()
         exit 1
     fi
     
-    verify_that_directory_and_file_are_writeable $log_file
+    verify_that_directory_and_file_are_writeable $log
     verify_that_directory_and_file_are_writeable $pid_file
 
     if [ -z "$command" ]; then
@@ -517,127 +520,9 @@ function sanity_check()
     fi
 }
 
-function deploy()
-{
-    ear=$cache_dir/engine.ear
-    if [ ! -e "$ear" ]; then
-        print_and_log "$ear does not exist. "
-        print_and_log "Did you run '"`basename $0`" -i" $instance "assemble'?"
-        exit 1
-    fi
-    
-    # extract EAR to a temporary area
-    local dir=$(mktemp -d)
-    (mkdir -p $dir && cd $dir && jar xf $ear)
-    exit_on_error "extracting $ear to $dir"
-
-    print "Deploying $ear on $appserver ..."
-    
-    case $appserver in
-        tomcat)
-            # We do not want the Escenic jars to share the same
-            # classloader folder as tomcat does We thereby want
-            # clients to use a separate escenic classloader to avoid
-            # strange upgrade problems i.e wrong versions of certain
-            # libraries.
-            if [ -d $tomcat_base/escenic/lib ]; then
-                if [ `ls $tomcat_base/escenic/lib | grep .jar | wc -l` -gt 0 ]; then
-                    rm $tomcat_base/escenic/lib/*.jar
-                    exit_on_error "removing previous deployed libraries"
-                fi
-                cp $dir/lib/*.jar \
-                    $tomcat_base/escenic/lib  \
-                    1>>$log_file \
-                    2>>$log_file
-                exit_on_error "deploying jar files to $tomcat_base/escenic/lib"
-            else
-                print "Could not find $tomcat_base/escenic/lib. Exiting."
-                print "Also make sure that you have defined this directory in"
-                print "  $tomcat_base/conf/catalina.properties"
-                print "see sample configuration in the engine distribution"
-                print "  contrib/appserver/tomcat/catalina-sample.properties"
-                exit 1
-            fi
-            
-            exit_on_error "copying lib files to app server classpath"
-
-            rm -rf $tomcat_base/work/* \
-                1>>$log_file \
-                2>>$log_file
-            
-            exit_on_error "removing work files from tomcat"
-
-            for war in $dir/*.war ; do
-                if [ -d $tomcat_base/webapps/`basename $war .war` ] ; then
-                    rm -rf $tomcat_base/webapps/`basename $war .war` \
-                        1>>$log_file \
-                        2>>$log_file
-                    exit_on_error "removing already deployed escenic wars in $tomcat_base/webapps/"
-                fi
-            done
-
-            # this scenario is likely when running many minimal
-            # instances of tomcat and some of these are not properly
-            # initialised.
-            if [ ! -d $tomcat_base/webapps ]; then
-                print $tomcat_base/webapps "doesn't exist, exiting."
-                exit 1
-            fi
-            
-            if [ -n "$deploy_webapp_white_list" ]; then
-                deploy_this_war=0
-                message="Deployment white list active, only deploying: "
-                message=$message"$deploy_webapp_white_list"
-                print $message
-                log $message
-            fi
-                        
-            for war in $dir/*.war ; do
-                name=`basename $war .war`
-
-                deploy_this_war=1
-                if [ -n "$deploy_webapp_white_list" ]; then
-                    deploy_this_war=0
-
-                    for el in $deploy_webapp_white_list; do
-                        if [ "$el" == $name ]; then
-                            debug "found $war in white list, will deploy it"
-                            deploy_this_war=1
-                        fi
-                    done
-                fi
-
-                if [ "$deploy_this_war" -eq 0 ]; then
-                    continue
-                fi
-                
-                (cd $tomcat_base/webapps &&
-                    mkdir $name &&
-                    cd $name &&
-                    jar xf $war \
-                        1>>$log_file \
-                        2>>$log_file)
-                add_memcached_support $tomcat_base/webapps/$name
-                exit_on_error "extracting $war to $tomcat_base/webapps/"
-            done
-            ;;
-        
-        resin)
-            if [ ! -d $resin_home/deploy ]; then
-                mkdir -p $resin_home/deploy \
-                    1>>$log_file \
-                    2>>$log_file
-            fi
-            cp $ear $resin_home/deploy \
-                1>>$log_file \
-                2>>$log_file
-            ;;
-        *)
-            print "Deployment is only implemented for Resin and Tomcat so far."
-            ;;
-    esac
-
-    run rm -rf ${dir}
+function run() {
+  $@ >> $log 2>> $log
+  exit_on_error "$@"
 }
 
 ## $1 : dir of the webapp 
@@ -844,8 +729,8 @@ function start_type()
         $java_home/bin/java \
             -Djava.rmi.server.hostname=${ece_server_hostname} \
             neo.nursery.GlobalBus /Initial \
-            1>>$log_file \
-            2>>$log_file & pid=$!
+            1>>$log \
+            2>>$log & pid=$!
         
         echo $pid > $pid_file
         exit 0
@@ -880,14 +765,14 @@ function start_type()
 
             # We call run here to get the log output to the stdout log
             $tomcat_home/bin/catalina.sh run \
-                1>>$log_file \
-                2>>$log_file & pid=$!
+                1>>$log \
+                2>>$log & pid=$!
             ;;
         oc4j)
             export OC4J_JVM_ARGS=$ece_args
             $oc4j_home/bin/oc4j -start\
-                1>>$log_file\
-                2>>$log_file & pid=$!
+                1>>$log\
+                2>>$log & pid=$!
             ;;
         resin)
             # Resin has stared insisting on a -J prefix of the -D
@@ -901,23 +786,23 @@ function start_type()
                     -name httpd \
                     -class com.caucho.server.resin.Resin \
                     $resin_ece_args ${1+"$@"} \
-                    1>>$log_file \
-                    2>>$log_file & pid=$!
+                    1>>$log \
+                    2>>$log & pid=$!
             else
                 # works for Resin 3.1
                 $java_home/bin/java $ece_args \
                     -jar $resin_home/lib/resin.jar \
                     start \
-                    1>>$log_file \
-                    2>>$log_file & pid=$!
+                    1>>$log \
+                    2>>$log & pid=$!
             fi
             ;;
         jboss)
             $jboss_home/bin/run.sh \
                 -b 0.0.0.0 \
                 -c $jboss_conf \
-                1>>$log_file \
-                2>>$log_file & pid=$!
+                1>>$log \
+                2>>$log & pid=$!
             ;;
         *)
             echo "" # extra line feed, because of the echo -n above
@@ -1019,7 +904,7 @@ function get_info_for_type()
     fi
     
     print "Log files:"
-    print "|-> System out log:" $log_file
+    print "|-> System out log:" $log
     print "|-> App server log:" $(get_app_log)
     print "|-> Log4j log:     " $(get_log4j_log)
     print "|-> GC log:        " $(get_gc_log)
@@ -1161,12 +1046,12 @@ function assemble()
 
     message="Assembling your EAR file"
     print $message "..."
-    log $message "..." >> $log_file
+    log $message "..." >> $log
 
     cd $assemblytool_home && \
         ant -q ear -DskipRedundancyCheck=true \
-        1>>$log_file \
-        2>>$log_file
+        1>>$log \
+        2>>$log
     exit_on_error "$message"
 
     # test to see if the new versions of ECE & plugins are upgrades of
@@ -1353,7 +1238,7 @@ function tail_messages_log()
 
 function tail_out_log()
 {
-    tail_list=$log_file
+    tail_list=$log
 
     # if needs be, we can add more system out logs here. For now,
     # we're sticking with the default one.
@@ -1364,10 +1249,11 @@ function tail_out_log()
 
 function get_app_log()
 {
+    local app_log=""
     if [ "$appserver" == "tomcat" ]; then
-        log_file=$tomcat_base/logs/localhost.`date +%F`.log
+        app_log=$tomcat_base/logs/localhost.`date +%F`.log
     elif [ "$appserver" == "resin" -a -e $resin_home/log/jvm-default.log ]; then
-        log_file=$resin_home/log/jvm-default.log
+        app_log=$resin_home/log/jvm-default.log
     else
         print "I don't know where the logs for $appserver are."
         print "Ask support@escenic.com to add support for $appserver in "
@@ -1375,7 +1261,7 @@ function get_app_log()
         exit 1
     fi
 
-    echo $log_file
+    echo $app_log
 }
 
 
@@ -1396,12 +1282,12 @@ function make_thread_dump()
     if [ -n "$type_pid" ]; then
         print "Thread dump (PID" $type_pid") written to system out log."
         print "Type 'ece -t $type -i $instance outlog' to see it or view"
-        print $log_file "directly."
+        print $log "directly."
 
         if [ -x $java_home/bin/jstack ]; then
-            jstack -l $type_pid >> $log_file
+            jstack -l $type_pid >> $log
         else
-            kill -QUIT $type_pid >> $log_file
+            kill -QUIT $type_pid >> $log
         fi
     else
         print "$(get_status)"
@@ -1410,16 +1296,17 @@ function make_thread_dump()
 
 function set_type_command_and_instance()
 {
-    next_is_type=0
-    next_is_instance=0
-    next_is_publication=0
-    next_is_resource=0
-    next_is_http_user=0
-    next_is_http_password=0
+    local next_is_type=0
+    local next_is_instance=0
+    local next_is_publication=0
+    local next_is_resource=0
+    local next_is_http_user=0
+    local next_is_http_password=0
+    local next_is_file=0
     
     for el in $@; do
         if [ "$el" == "-v" -o "$el" == "--verbose" ]; then
-            verbose=1
+            debug=1
             continue
         fi
         
@@ -1427,7 +1314,13 @@ function set_type_command_and_instance()
             everything_but_the_kitchen_sink=1
             continue
         fi
-        
+
+        if [ "$el" == "-f" -o $el == "--file" ]; then
+          next_is_file=1
+          continue
+        fi
+
+         
         if [ "$el" == "-q" -o $el == "--quiet" ]; then
             quiet=1
             continue
@@ -1438,6 +1331,12 @@ function set_type_command_and_instance()
             continue
         fi
 
+        if [ "$next_is_file" -eq 1 ]; then
+          file=$el
+          next_is_file=0
+          continue
+        fi
+        
         if [ "$next_is_type" -eq 1 ]; then
             type=$el
             next_is_type=0
@@ -1690,8 +1589,8 @@ function update_publication_resources()
 
         $EDITOR ${resource}
         md5sum -c ${resource}.md5sum \
-            1>>$log_file \
-            2>>$log_file
+            1>>$log \
+            2>>$log
         if [ $? -eq 0 ]; then
             print "You didn't make any changes to ${resource}, I will exit."
             exit 1
@@ -1706,13 +1605,13 @@ function update_publication_resources()
         curl -T ${resource} \
           ${curl_auth} \
             ${url} \
-            1>>$log_file 2>>$log_file
+            1>>$log 2>>$log
     else
         wget $wget_auth \
             -O - \
             --post-file ${resource} \
             $url \
-            1>>$log_file 2>>$log_file
+            1>>$log 2>>$log
     fi
 
     if [ -d $tmp_dir ]; then
@@ -1723,12 +1622,12 @@ function update_publication_resources()
 function show_all_log_paths()
 {
     if [ "$quiet" -eq 0 ]; then
-        print "System out log: "$log_file
+        print "System out log: "$log
         print "App server log: "$(get_app_log)
         print "log4j log:  "$(get_log4j_log)
         print "GC log:  "$(get_gc_log)
     else
-        echo $log_file
+        echo $log
         echo $(get_app_log)
         echo $(get_log4j_log)
         echo $(get_gc_log)
@@ -1763,9 +1662,10 @@ function flush_caches()
         -O - \
         --post-data='confirm=Confirm' \
         $url \
-        1>>$log_file 2>>$log_file
+        1>>$log 2>>$log
 }
 
+init
 read_rc_file_if_present
 set_type_command_and_instance $@
 set_id
@@ -1774,6 +1674,7 @@ set_type_settings
 set_instance_settings
 sanity_check
 
+
 function print_help()
 {
     echo "Usage: $0 [-t <type>] [-i <instance>] <command>"
@@ -1791,6 +1692,10 @@ function print_help()
     echo " -i --instance <instance>" 
     echo "      The type instance, such as editor1, web1 or search1"
     echo ""
+    echo " -f --file <file>"
+    echo "      Specificies the file that the given comand shall act upon."
+    echo "      Right now, this only entails the 'deploy' command"
+    echo ""
     echo " -p --publication <publication>" 
     echo "      Needed only for updating publication resources"
     echo ""
diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index b1afdb20..6b220eee 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -8,6 +8,8 @@
 #
 # by tkj@vizrt.com
 
+debug=0
+
 function common_bashing_is_loaded() {
   echo 1
 }
@@ -15,7 +17,7 @@ function common_bashing_is_loaded() {
 function get_seconds_since_start() {
   local seconds="n/a"
   
-  if [ -r $pid_file ]; then
+  if [ -n "$pid_file" -a -r "$pid"_file ]; then
     now=`date +%s`
     started=`stat -c %Y $pid_file`
     seconds=$(( now - started ))
@@ -25,6 +27,11 @@ function get_seconds_since_start() {
 }
 
 function get_id() {
+  if [ -n "$id" ]; then
+    echo $id
+    return
+  fi
+  
   local timestamp=$(get_seconds_since_start)
   echo "[$(basename $0)-${timestamp}]"
 }
@@ -36,6 +43,11 @@ function debug() {
 }
 
 function print() {
+  if [[ "$quiet" == 1 ]]; then
+    echo $@
+    return
+  fi
+  
   echo $(get_id) $@
 }
 
diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index ff628b72..b8e6fe32 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -5,8 +5,7 @@
 # by tkj@vizrt.com
 
 # depends on common-bashing
-common_bashing_is_loaded > /dev/null 2>&1 || source common-bashing.sh
-common_pulse_is_loaded > /dev/null 2>&1 || source common-bashing.sh
+common_bashing_is_loaded > /dev/null 2>&1 || source $(pwd)/common-bashing.sh
 
 ## Only used if the Tomcat download mirror couldn't be determined
 fallback_tomcat_url="http://mirrorservice.nomedia.no/apache.org/tomcat/tomcat-6/v6.0.35/bin/apache-tomcat-6.0.35.tar.gz"
diff --git a/usr/share/escenic/ece-scripts/ece.d/deploy.sh b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
new file mode 100644
index 00000000..be554121
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
@@ -0,0 +1,188 @@
+wget_opts="--continue --inet4-only --quiet"
+
+function get_state_file() {
+   echo $data_dir/${instance}.state
+}
+
+## $1 : local EAR file
+function get_version_from_ear_file() {
+  local version=$(basename $1 .ear | sed 's/^engine-//g')
+
+  # if this is emtpy, it means it was called just engine.ear, in which
+  # case we generate a nice version string.
+  if [ -z "$version" ]; then
+    version=$(date +%Y%m%d.%H%M)
+  fi
+  
+  echo $version
+}
+
+## $1 : local EAR file
+function update_deployment_state_file() {
+  local state_file=$(get_state_file)
+
+  if [ ! -w $(dirname $state_file) ]; then
+    print_and_log "I cannot write to $state_file, I will exit :-("
+    exit 1
+  fi
+
+  if [ -n "${file}" ]; then
+    echo "ear_used=$file" > $state_file
+  else
+    echo "ear_used=$1" > $state_file
+  fi
+  
+  cat >> $state_file <<EOF
+version=$(get_version_from_ear_file $1)
+md5_sum=$(md5sum $1 | cut -d' ' -f1)
+deployed_date=$(date)
+EOF
+
+  print_and_log "Deployment state file updated: $state_file"
+}
+
+function deploy() {
+  local ear=$cache_dir/engine.ear
+
+  if [ -n "$file" ]; then
+    print_and_log "Deploying $file on $instance ..."
+    local downloaded_ear=$(basename $file)
+    if [[ $file == "http://"* || $file == "https://"* ]]; then
+      print_and_log "Downloading EAR $file ..."
+      run cd $cache_dir
+      run wget $wget_opts $file -O $(basename $file)
+      ear=$cache_dir/$(basename $file)
+    elif [[ $file == "file://"* ]]; then
+      # length of file:// is 7
+      ear=${file:7}
+    else
+      ear=$file
+    fi
+    
+    if [ ! -e $ear ]; then
+        print_and_log "The EAR $ear_uri specified in $file could"
+        print_and_log "not be retrieved. I will exit now. :-("
+        exit 1
+    fi
+  fi
+  
+  if [ ! -e "$ear" ]; then
+    print_and_log "$ear does not exist. "
+    print_and_log "Did you run '"`basename $0`" -i" $instance "assemble'?"
+    exit 1
+  fi
+  
+  # extract EAR to a temporary area
+  local dir=$(mktemp -d)
+  (mkdir -p $dir && cd $dir && jar xf $ear)
+  exit_on_error "extracting $ear to $dir"
+
+  print "Deploying $ear on $appserver ..."
+  
+  case $appserver in
+    tomcat)
+            # We do not want the Escenic jars to share the same
+            # classloader folder as tomcat does We thereby want
+            # clients to use a separate escenic classloader to avoid
+            # strange upgrade problems i.e wrong versions of certain
+            # libraries.
+      if [ -d $tomcat_base/escenic/lib ]; then
+        if [ `ls $tomcat_base/escenic/lib | grep .jar | wc -l` -gt 0 ]; then
+          rm $tomcat_base/escenic/lib/*.jar
+          exit_on_error "removing previous deployed libraries"
+        fi
+        cp $dir/lib/*.jar \
+          $tomcat_base/escenic/lib  \
+          1>>$log \
+          2>>$log
+        exit_on_error "deploying jar files to $tomcat_base/escenic/lib"
+      else
+        print "Could not find $tomcat_base/escenic/lib. Exiting."
+        print "Also make sure that you have defined this directory in"
+        print "  $tomcat_base/conf/catalina.properties"
+        print "see sample configuration in the engine distribution"
+        print "  contrib/appserver/tomcat/catalina-sample.properties"
+        exit 1
+      fi
+      
+      exit_on_error "copying lib files to app server classpath"
+
+      rm -rf $tomcat_base/work/* \
+        1>>$log \
+        2>>$log
+      
+      exit_on_error "removing work files from tomcat"
+
+      for war in $dir/*.war ; do
+        if [ -d $tomcat_base/webapps/`basename $war .war` ] ; then
+          rm -rf $tomcat_base/webapps/`basename $war .war` \
+            1>>$log \
+            2>>$log
+          exit_on_error "removing already deployed escenic wars in $tomcat_base/webapps/"
+        fi
+      done
+
+            # this scenario is likely when running many minimal
+            # instances of tomcat and some of these are not properly
+            # initialised.
+      if [ ! -d $tomcat_base/webapps ]; then
+        print $tomcat_base/webapps "doesn't exist, exiting."
+        exit 1
+      fi
+      
+      if [ -n "$deploy_webapp_white_list" ]; then
+        deploy_this_war=0
+        message="Deployment white list active, only deploying: "
+        message=$message"$deploy_webapp_white_list"
+        print $message
+        log $message
+      fi
+      
+      for war in $dir/*.war ; do
+        name=`basename $war .war`
+
+        deploy_this_war=1
+        if [ -n "$deploy_webapp_white_list" ]; then
+          deploy_this_war=0
+
+          for el in $deploy_webapp_white_list; do
+            if [ "$el" == $name ]; then
+              debug "found $war in white list, will deploy it"
+              deploy_this_war=1
+            fi
+          done
+        fi
+
+        if [ "$deploy_this_war" -eq 0 ]; then
+          continue
+        fi
+        
+        (cd $tomcat_base/webapps &&
+          mkdir $name &&
+          cd $name &&
+          jar xf $war \
+            1>>$log \
+            2>>$log)
+        add_memcached_support $tomcat_base/webapps/$name
+        exit_on_error "extracting $war to $tomcat_base/webapps/"
+      done
+      ;;
+    
+    resin)
+      if [ ! -d $resin_home/deploy ]; then
+        mkdir -p $resin_home/deploy \
+          1>>$log \
+          2>>$log
+      fi
+      cp $ear $resin_home/deploy \
+        1>>$log \
+        2>>$log
+      ;;
+    *)
+      print "Deployment is only implemented for Resin and Tomcat so far."
+      ;;
+  esac
+
+  run rm -rf ${dir}
+  update_deployment_state_file $ear
+}

From e20b5ab6294e3555a7839d661ae797e65b4217ae Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 28 Mar 2012 17:53:54 +0800
Subject: [PATCH 0599/2585] - moved info related code to its own module

---
 usr/bin/ece                                 | 123 --------------------
 usr/share/escenic/ece-scripts/ece.d/info.sh | 121 +++++++++++++++++++
 2 files changed, 121 insertions(+), 123 deletions(-)
 create mode 100644 usr/share/escenic/ece-scripts/ece.d/info.sh

diff --git a/usr/bin/ece b/usr/bin/ece
index 469da782..5b617a38 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -887,129 +887,6 @@ function kill_type()
     exit_on_error "kill_type"
 }
 
-function get_info_for_type()
-{
-    print "Current instance:    ${instance}"
-    print "Instances available on $HOSTNAME: $(get_instance_list)"
-    print "Conf files parsed: ${ece_conf_files_read[@]}"
-    
-    if [ -n "${ece_home}" ]; then
-        print "ECE location: $ece_home"
-    fi
-    if [[ -n "${assemblytool_home}" && -e "${assemblytool_home}" ]]; then
-        print "Assembly Tool location: $assemblytool_home"
-    fi
-    if [ -n "${java_home}" ]; then
-        print "Java location: $java_home"
-    fi
-    
-    print "Log files:"
-    print "|-> System out log:" $log
-    print "|-> App server log:" $(get_app_log)
-    print "|-> Log4j log:     " $(get_log4j_log)
-    print "|-> GC log:        " $(get_gc_log)
-    
-    if [ -n "${appserver}" ]; then
-        print "Application server:"
-        set_type_port
-        set_type_pid
-        print "|-> Status:" $(get_status)
-        print "|-> Port:" $port
-
-        if [ $(get_status | cut -d' ' -f1) == "UP" ]; then
-          print "|-> PID:" $type_pid
-        fi
-        
-        print "|-> Type: " $appserver
-        
-        case "$appserver" in
-            tomcat)
-                if [ -n "${tomcat_home}" ]; then
-                    print "|-> Tomcat home:" $tomcat_home
-                    print "|-> Tomcat base:" $tomcat_base
-                    print_tomcat_resources
-                    print_deployed_webapps $tomcat_base
-                fi
-            ;;
-            resin)
-                if [ -n "${resin_home}" ]; then
-                    print "  |-> Resin home:" $resin_home
-                    print_deployed_webapps $resin_home
-                fi
-                ;;
-        esac
-    fi
-}
-
-## $1: dir
-function print_deployed_webapps() {
-  local webapps=""
-
-  if [ ! -d $1/webapps ]; then
-    return
-  fi
-
-  print "Deployed web applications:"
-  for el in $(find $1/webapps -maxdepth 1 -type d | \
-    grep -v webapps$); do
-    print "|-> http://${HOSTNAME}:${port}/"$(basename $el)
-  done
-
-}
-
-function print_tomcat_resources() {
-  if [ "$(which xml_grep)x" == "x" ]; then
-    log "Install xml_grep to get more 'ece info' details"
-    return
-  fi
-
-  print "Application server resources:"
-
-  local file=$tomcat_base/conf/context.xml
-  if [ -r $file ]; then
-    xml_grep  --nowrap --cond Context/Environment \
-      $file | \
-      sed 's/^[ \t]//g' | \
-      sed "s#><#>\n<#g" | \
-      cut -d' ' -f2,5 |  \
-      cut -d'"' -f2,4 | \
-      while read line ; do
-      local key=$(echo $line | cut -d'"' -f1)
-      local value=$(echo $line | cut -d'"' -f2)
-      print "|->" ${key}: ${value}
-    done
-  else
-    print "|-> user $USER cannot read $file"
-  fi
-  
-  print "Database:"
-  file=$tomcat_base/conf/server.xml
-  if [ -r $file ]; then
-    xml_grep \
-      --nowrap \
-      --cond 'Server/GlobalNamingResources/Resource[@type="javax.sql.DataSource"]' \
-      $file | \
-      sed 's/^[ \t]//g' | \
-      sed "s#><#>\n<#g" | \
-      while read line ; do
-      for el in $(echo $line | cut -d' ' -f1- ); do
-        if [[ $el == "name"* || $el == "url"* || $el == "username"* ]]; then
-          local key=$(echo $el | cut -d'"' -f1 | cut -d'=' -f1)
-          local value=$(echo $el | cut -d'"' -f2)
-          if [[ $value == "jdbc:mysql"* ]]; then
-            value=${value:5}
-          fi
-          
-          print "|->" ${key}: ${value}
-        fi
-
-      done
-    done
-  else
-    print "|-> user $USER cannot read $file"
-  fi
-}
-
 function restart_type()
 {
     stop_type
diff --git a/usr/share/escenic/ece-scripts/ece.d/info.sh b/usr/share/escenic/ece-scripts/ece.d/info.sh
new file mode 100644
index 00000000..0e65d2d4
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece.d/info.sh
@@ -0,0 +1,121 @@
+function get_info_for_type() {
+  print "Current instance:    ${instance}"
+  print "Instances available on $HOSTNAME: $(get_instance_list)"
+  print "Conf files parsed: ${ece_conf_files_read[@]}"
+  
+  if [ -n "${ece_home}" ]; then
+    print "ECE location: $ece_home"
+  fi
+  if [[ -n "${assemblytool_home}" && -e "${assemblytool_home}" ]]; then
+    print "Assembly Tool location: $assemblytool_home"
+  fi
+  if [ -n "${java_home}" ]; then
+    print "Java location: $java_home"
+  fi
+  
+  print "Log files:"
+  print "|-> System out log:" $log
+  print "|-> App server log:" $(get_app_log)
+  print "|-> Log4j log:     " $(get_log4j_log)
+  print "|-> GC log:        " $(get_gc_log)
+  
+  if [ -n "${appserver}" ]; then
+    print "Application server:"
+    set_type_port
+    set_type_pid
+    print "|-> Status:" $(get_status)
+    print "|-> Port:" $port
+
+    if [ $(get_status | cut -d' ' -f1) == "UP" ]; then
+      print "|-> PID:" $type_pid
+    fi
+    
+    print "|-> Type: " $appserver
+    
+    case "$appserver" in
+      tomcat)
+        if [ -n "${tomcat_home}" ]; then
+          print "|-> Tomcat home:" $tomcat_home
+          print "|-> Tomcat base:" $tomcat_base
+          print_tomcat_resources
+          print_deployed_webapps $tomcat_base
+        fi
+        ;;
+      resin)
+        if [ -n "${resin_home}" ]; then
+          print "  |-> Resin home:" $resin_home
+          print_deployed_webapps $resin_home
+        fi
+        ;;
+    esac
+  fi
+}
+
+## $1: dir
+function print_deployed_webapps() {
+  local webapps=""
+
+  if [ ! -d $1/webapps ]; then
+    return
+  fi
+
+  print "Deployed web applications:"
+  for el in $(find $1/webapps -maxdepth 1 -type d | \
+    grep -v webapps$); do
+    print "|-> http://${HOSTNAME}:${port}/"$(basename $el)
+  done
+
+}
+
+function print_tomcat_resources() {
+  if [ "$(which xml_grep)x" == "x" ]; then
+    log "Install xml_grep to get more 'ece info' details"
+    return
+  fi
+
+  print "Application server resources:"
+
+  local file=$tomcat_base/conf/context.xml
+  if [ -r $file ]; then
+    xml_grep  --nowrap --cond Context/Environment \
+      $file | \
+      sed 's/^[ \t]//g' | \
+      sed "s#><#>\n<#g" | \
+      cut -d' ' -f2,5 |  \
+      cut -d'"' -f2,4 | \
+      while read line ; do
+      local key=$(echo $line | cut -d'"' -f1)
+      local value=$(echo $line | cut -d'"' -f2)
+      print "|->" ${key}: ${value}
+    done
+  else
+    print "|-> user $USER cannot read $file"
+  fi
+  
+  print "Database:"
+  file=$tomcat_base/conf/server.xml
+  if [ -r $file ]; then
+    xml_grep \
+      --nowrap \
+      --cond 'Server/GlobalNamingResources/Resource[@type="javax.sql.DataSource"]' \
+      $file | \
+      sed 's/^[ \t]//g' | \
+      sed "s#><#>\n<#g" | \
+      while read line ; do
+      for el in $(echo $line | cut -d' ' -f1- ); do
+        if [[ $el == "name"* || $el == "url"* || $el == "username"* ]]; then
+          local key=$(echo $el | cut -d'"' -f1 | cut -d'=' -f1)
+          local value=$(echo $el | cut -d'"' -f2)
+          if [[ $value == "jdbc:mysql"* ]]; then
+            value=${value:5}
+          fi
+          
+          print "|->" ${key}: ${value}
+        fi
+
+      done
+    done
+  else
+    print "|-> user $USER cannot read $file"
+  fi
+}

From 1b5919d12bc5c9e20d3546038ff8d5c7cfa70a45 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 28 Mar 2012 18:06:46 +0800
Subject: [PATCH 0600/2585] - new feature to "ece info": it now lists the
 deployment state of the   instance:

  $ ece info
  [ece#engine-cohen] Current instance: cohen
  [..]
  [ece#engine-cohen] Deployment state:
  [ece#engine-cohen] |-> Version: ap.no-1.2.3
  [ece#engine-cohen] |-> EAR used: http://localhost:5678/builds/engine-ap.no-1.2.3.ear
  [ece#engine-cohen] |-> MD5 sum: 5881d1895c09c7b35a032806c6249433
  [ece#engine-cohen] |-> Deployment date: Wed Mar 28 18:03:56 CST 2012

  This closes #53
---
 usr/share/escenic/ece-scripts/ece.d/info.sh | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/info.sh b/usr/share/escenic/ece-scripts/ece.d/info.sh
index 0e65d2d4..eac4225f 100644
--- a/usr/share/escenic/ece-scripts/ece.d/info.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/info.sh
@@ -43,12 +43,27 @@ function get_info_for_type() {
         ;;
       resin)
         if [ -n "${resin_home}" ]; then
-          print "  |-> Resin home:" $resin_home
+          print "|-> Resin home:" $resin_home
           print_deployed_webapps $resin_home
         fi
         ;;
     esac
   fi
+
+  print_deployment_state
+}
+
+print_deployment_state() {
+  local file=$data_dir/$instance.state
+  if [ ! -r $file ]; then
+    return
+  fi
+
+  print "Deployment state:"
+  print "|-> Version:" $(grep ^version $file | cut -d'=' -f2-)
+  print "|-> EAR used:" $(grep ^ear_used $file | cut -d'=' -f2-)
+  print "|-> MD5 sum:" $(grep ^md5_sum $file | cut -d'=' -f2-)
+  print "|-> Deployment date:" $(grep ^deployed_date $file | cut -d'=' -f2-)
 }
 
 ## $1: dir

From 109d4450f57a0a731de310dfc0cc6b661d5f1724 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 28 Mar 2012 18:31:31 +0800
Subject: [PATCH 0601/2585] - "ece deploy": added --uri as a synonym for
 -f/--file, it feels   better to write:

  $ ece deploy --uri http://server/engine.ear

- added BASH auto completion of -f, --file and --uri
---
 etc/bash_completion.d/ece | 5 ++++-
 usr/bin/ece               | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/etc/bash_completion.d/ece b/etc/bash_completion.d/ece
index b781f4d5..3db3a725 100644
--- a/etc/bash_completion.d/ece
+++ b/etc/bash_completion.d/ece
@@ -28,7 +28,10 @@ _ece_commands()
 
     case "$prev" in
         backup)
-            completions="--exclude-binaries"
+            completions="--exclude-binaries $commands"
+            ;;
+        deploy)
+            completions="--file --uri $commands"
             ;;
         -t|--type)
             completions=$types
diff --git a/usr/bin/ece b/usr/bin/ece
index 5b617a38..ffa81905 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -1192,7 +1192,7 @@ function set_type_command_and_instance()
             continue
         fi
 
-        if [ "$el" == "-f" -o $el == "--file" ]; then
+        if [ "$el" == "-f" -o $el == "--file" -o $el == "--uri" ]; then
           next_is_file=1
           continue
         fi
@@ -1569,9 +1569,9 @@ function print_help()
     echo " -i --instance <instance>" 
     echo "      The type instance, such as editor1, web1 or search1"
     echo ""
-    echo " -f --file <file>"
+    echo " -f --file <file> } --uri <uri>"
     echo "      Specificies the file that the given comand shall act upon."
-    echo "      Right now, this only entails the 'deploy' command"
+    echo "      Right now, this only entails the 'deploy' command".
     echo ""
     echo " -p --publication <publication>" 
     echo "      Needed only for updating publication resources"

From bf728e8b5fc16d4a49212b8db75fdaa17d6e437f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 28 Mar 2012 19:30:01 +0800
Subject: [PATCH 0602/2585] - added useful fallback version string for cases
 were simply   "engine.ear" is used in the file name (or indeed on the
 assembly   host).

---
 usr/share/escenic/ece-scripts/ece.d/deploy.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/deploy.sh b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
index be554121..a182505c 100644
--- a/usr/share/escenic/ece-scripts/ece.d/deploy.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
@@ -10,7 +10,7 @@ function get_version_from_ear_file() {
 
   # if this is emtpy, it means it was called just engine.ear, in which
   # case we generate a nice version string.
-  if [ -z "$version" ]; then
+  if [[ -z "$version" || "$version" == "engine" ]]; then
     version=$(date +%Y%m%d.%H%M)
   fi
   

From f10b8a45fbdf8c8d3d3b86b6c329703bcf5cafc5 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 29 Mar 2012 12:28:36 +0800
Subject: [PATCH 0603/2585] - ece-install now sets the data_dir inside the
 ece.conf, this is   needed now that "ece deploy" updates a file in the data
 directory   (the deployment state file).

  This is related to issue #52.
---
 usr/sbin/ece-install | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index d2a02150..592e07aa 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -263,6 +263,7 @@ function set_up_ece_scripts()
   set_conf_file_value assemblytool_home ${escenic_root_dir}/assemblytool $file
   set_conf_file_value backup_dir ${escenic_backups_dir} $file
   set_conf_file_value cache_dir ${escenic_cache_dir} ${file}
+  set_conf_file_value data_dir ${escenic_data_dir} ${file}
   set_conf_file_value ece_home ${escenic_root_dir}/engine ${file}
   set_conf_file_value escenic_conf_dir ${escenic_conf_dir} ${file}
   set_conf_file_value heap_dump_dir ${escenic_crash_dir} ${file}

From 397f63841453fba00976228f21663c3d2fa0d352 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 29 Mar 2012 12:44:57 +0800
Subject: [PATCH 0604/2585] - added diagram definition to reflect:

  0) Puppet master has it in its .pp that the puppet agent should
    deploy the EAR from the build server if it's different from the
    one mentioned in the <instance>state file

  1) Build server builds a new EAR

  2) Puppet agent discovers that this is an updated EAR

  3) Calls "ece deploy -i <instance> --uri
  http://build/engien-1.2.3.ear

  4) "ece deploy " deploys the EAR and update the state file

  5) "ece info" uses this state file for reporting the new deployment
     state, which may also wander to other places like:

     * http://localhost:5678/
     * http://localhost:8080/escenic-admin/
---
 ...uild-server-ece-deploy-and-ece-info-workflow.blockdiag | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/usr/share/doc/escenic/images/puppet-build-server-ece-deploy-and-ece-info-workflow.blockdiag b/usr/share/doc/escenic/images/puppet-build-server-ece-deploy-and-ece-info-workflow.blockdiag
index 32e8e1c4..f88bcc11 100644
--- a/usr/share/doc/escenic/images/puppet-build-server-ece-deploy-and-ece-info-workflow.blockdiag
+++ b/usr/share/doc/escenic/images/puppet-build-server-ece-deploy-and-ece-info-workflow.blockdiag
@@ -1,17 +1,17 @@
 blockdiag {
    A [label = "build-server"];
-   B [label = "pres1: /var/spool/escenic/deploy.pres1"];
+   B [label = "build-server: http://build/engine-1.2.3.ear"];
    C [label = "pres1: puppet-agent" ];
    D [label = "pres1: ece deploy", color = "orange" ];
    E [label = "pres1: app server" ];
-   F [label = "pres1: /var/lib/escenic/deploy-pres1.state"];
+   F [label = "pres1: /var/lib/escenic/pres1.state"];
    G [label = "pres1: ece info" ];
    
-   A -> B [label = "scp"];
+   A -> B [label = "builds"];
    C -> B [label = "reads"];
    C -> D [folded, label = "calls"];
 
-   D -> A [label = "gets EAR"];
+   D -> B [label = "gets"];
    D -> E [label = "deploys"];
    D -> F [label = "writes"];
 

From 5361cee6a1bcf2c9967bb9f702737a92c1697952 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 29 Mar 2012 12:50:35 +0800
Subject: [PATCH 0605/2585] - change from escenic to vizrt email address

---
 README | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README b/README
index 33f7381d..b451695c 100644
--- a/README
+++ b/README
@@ -39,6 +39,7 @@ Feedback
 Hope you enjoy the ece /usr/bin and intit.d scripts. All feedback,
 come hither!
 
-torstein@escenic.com
+tkj@vizrt.com
+
 
 

From 04c9c16da89ccfefb84edc1ead48219c46522da2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 29 Mar 2012 15:26:15 +0800
Subject: [PATCH 0606/2585] - bug fix in get_seconds_since_start, it would
 always print n/a

---
 usr/share/escenic/ece-scripts/common-bashing.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index 6b220eee..8f36a5aa 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -17,7 +17,7 @@ function common_bashing_is_loaded() {
 function get_seconds_since_start() {
   local seconds="n/a"
   
-  if [ -n "$pid_file" -a -r "$pid"_file ]; then
+  if [ -n "$pid_file" -a -r "$pid_file" ]; then
     now=`date +%s`
     started=`stat -c %Y $pid_file`
     seconds=$(( now - started ))

From cb97a340df27adbdd00a73e5c912880027c914be Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 29 Mar 2012 17:15:59 +0800
Subject: [PATCH 0607/2585] - added new package escenic-common-scripts, moved
 common scripts and   web resources to this package. - the
 escenic-content-engine-installer and   escenic-content-engine-scripts both
 now depend on this common package

---
 usr/local/src/create-packages                 | 26 +++++++++----------
 .../src/debian/escenic-common-scripts/control | 12 +++++++++
 .../debian/escenic-common-scripts/postinst    |  4 +++
 .../escenic-content-engine-installer/control  |  1 +
 .../escenic-content-engine-scripts/control    |  1 +
 5 files changed, 31 insertions(+), 13 deletions(-)
 create mode 100644 usr/local/src/debian/escenic-common-scripts/control
 create mode 100755 usr/local/src/debian/escenic-common-scripts/postinst

diff --git a/usr/local/src/create-packages b/usr/local/src/create-packages
index e824489d..6e92194a 100644
--- a/usr/local/src/create-packages
+++ b/usr/local/src/create-packages
@@ -41,30 +41,21 @@ function set_up_target_directory() {
   
   if [[ $package_name == "escenic-content-engine-installer" ]]; then
     mkdir -p $target_dir/usr/share/doc/escenic
+    mkdir -p $target_dir/usr/share/escenic/ece-scripts
     
     cp -r ../../sbin/{ece-install,drop-and-create-ecedb} $target_dir/usr/sbin/
-    cp -r ../../share/escenic/ $target_dir/usr/share/
+    cp -r ../../share/escenic/ece-scripts/ece-install.d/ \
+      $target_dir/usr/share/escenic/ece-scripts/
     cp -r ../../share/doc/escenic/ece-install-guide.{org,html} \
       $target_dir/usr/share/doc/escenic
     
   elif [[ $package_name == "escenic-content-engine-scripts" ]]; then
-    mkdir -p $target_dir/usr/share/doc/escenic
     mkdir -p $target_dir/etc/init.d
+    mkdir -p $target_dir/usr/share/doc/escenic
     mkdir -p $target_dir/usr/share/escenic/ece-scripts
 
     cp -r ../../bin/{ece,system-info} $target_dir/usr/bin/
 
-    # The common files are also provided in the installer. Later, when
-    # we've got a repo up and running, we'll let the -installer depend
-    # on the scripts package, and then remove the common scripts from
-    # the installer.
-    cp -r ../../share/escenic/ece-scripts/common* \
-      $target_dir/usr/share/escenic/ece-scripts/
-    
-    cp -r ../../share/escenic/ece-scripts/*.css \
-      $target_dir/usr/share/escenic/ece-scripts/
-    cp -r ../../share/escenic/ece-scripts/*.html \
-      $target_dir/usr/share/escenic/ece-scripts/
     cp -r ../../share/escenic/ece-scripts/system-info.d \
       $target_dir/usr/share/escenic/ece-scripts/
     
@@ -80,6 +71,15 @@ function set_up_target_directory() {
     cp -r ../../bin/vosa $target_dir/usr/bin/
     cp -r ../../share/vizrt/ $target_dir/usr/share/
     cp -r ../../share/doc/vizrt/*.org $target_dir/usr/share/doc/vosa/
+  elif [[ $package_name == "escenic-common-scripts" ]]; then
+    # both the installer and ece-scripts use the common scripts and
+    # web resources.
+    cp -r ../../share/escenic/ece-scripts/common* \
+      $target_dir/usr/share/escenic/ece-scripts/
+    cp -r ../../share/escenic/ece-scripts/*.css \
+      $target_dir/usr/share/escenic/ece-scripts/
+    cp -r ../../share/escenic/ece-scripts/*.html \
+      $target_dir/usr/share/escenic/ece-scripts/
   fi
 
   debian_dir=$target_dir/DEBIAN
diff --git a/usr/local/src/debian/escenic-common-scripts/control b/usr/local/src/debian/escenic-common-scripts/control
new file mode 100644
index 00000000..677b60a9
--- /dev/null
+++ b/usr/local/src/debian/escenic-common-scripts/control
@@ -0,0 +1,12 @@
+Package: escenic-common-scripts
+Version: VERSION
+Section: base
+Priority: optional
+Architecture: all
+Maintainer: MAINTAINER_NAME <MAINTAINER_EMAIL>
+Description: Common scripts used by the various Escenic and Vizrt
+  script packages.
+  .
+  See the documentation in /usr/share/doc/escenic/ for further
+  details.
+ 
\ No newline at end of file
diff --git a/usr/local/src/debian/escenic-common-scripts/postinst b/usr/local/src/debian/escenic-common-scripts/postinst
new file mode 100755
index 00000000..e15ca1c2
--- /dev/null
+++ b/usr/local/src/debian/escenic-common-scripts/postinst
@@ -0,0 +1,4 @@
+#! /usr/bin/env bash
+
+exit 0
+
diff --git a/usr/local/src/debian/escenic-content-engine-installer/control b/usr/local/src/debian/escenic-content-engine-installer/control
index 78ba42f0..6c7a9f26 100644
--- a/usr/local/src/debian/escenic-content-engine-installer/control
+++ b/usr/local/src/debian/escenic-content-engine-installer/control
@@ -1,5 +1,6 @@
 Package: escenic-content-engine-installer
 Version: VERSION
+Depends: escenic-common-scripts (>= VERSION)
 Section: base
 Priority: optional
 Architecture: all
diff --git a/usr/local/src/debian/escenic-content-engine-scripts/control b/usr/local/src/debian/escenic-content-engine-scripts/control
index b15f692c..f1fa4a1d 100644
--- a/usr/local/src/debian/escenic-content-engine-scripts/control
+++ b/usr/local/src/debian/escenic-content-engine-scripts/control
@@ -1,5 +1,6 @@
 Package: escenic-content-engine-scripts
 Version: VERSION
+Depends: escenic-common-scripts (>= VERSION)
 Section: base
 Priority: optional
 Architecture: all

From 0f46b310d73275d7cc1c5255a068e6dac3c6f134 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 29 Mar 2012 17:16:37 +0800
Subject: [PATCH 0608/2585] - removed print and exit_on_error as these are to
 be found in the   common-bashing module.

---
 usr/bin/ece | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index ffa81905..9a15a32f 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -103,24 +103,6 @@ function init() {
   fi
 }
 
-####################################################################
-# Will exit the ece execution if the last operation failed. While
-# failing, it will print the message passed to the function.
-####################################################################
-function exit_on_error()
-{
-    if [ $? -eq 1 ]; then
-        print $@ "FAILED, exiting :-("
-        exit 1
-    fi
-}
-
-function run()
-{
-    $@ 1>>$log 2>>$log
-    exit_on_error $@
-}
-
 function verify_that_directory_and_file_are_writeable()
 {
     dir=`dirname $1`

From 7a1e733bef745435421ce07d75ac16d83953ac6a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 29 Mar 2012 17:18:41 +0800
Subject: [PATCH 0609/2585] - added method to common-bashing:
 is_archive_healthy - made use of this method in deploy::deploy() to check if
 the EAR to   be deploy is healthy.

---
 .../escenic/ece-scripts/common-bashing.sh     | 19 +++++++++++++++++++
 usr/share/escenic/ece-scripts/ece.d/deploy.sh | 11 ++++++-----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index 8f36a5aa..4b7ec125 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -213,3 +213,22 @@ function ensure_variable_is_set() {
     remove_pid_and_exit_in_error
   fi
 }
+
+## $1 : the archive to check, must be a local file
+function is_archive_healthy() {
+  if [[ "$1" == *".ear" || "$1" == *".zip" ]]; then
+    unzip -t $1 2>/dev/null 1>/dev/null
+  elif [[ "$1" == *".tar.gz" ]]; then
+    tar tzf $1 2>&1 > /dev/null
+  else
+    echo 0
+    return
+  fi
+  
+  if [ $? -eq 0 ]; then
+    echo 1
+  else
+    echo 0
+  fi
+}
+
diff --git a/usr/share/escenic/ece-scripts/ece.d/deploy.sh b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
index a182505c..842f476f 100644
--- a/usr/share/escenic/ece-scripts/ece.d/deploy.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
@@ -71,6 +71,11 @@ function deploy() {
     print_and_log "Did you run '"`basename $0`" -i" $instance "assemble'?"
     exit 1
   fi
+
+  if [ $(is_archive_healthy $ear) -eq 0 ]; then
+    print_and_log "$ear is faulty, I cannot deploy it :-("
+    exit 1
+  fi
   
   # extract EAR to a temporary area
   local dir=$(mktemp -d)
@@ -91,11 +96,7 @@ function deploy() {
           rm $tomcat_base/escenic/lib/*.jar
           exit_on_error "removing previous deployed libraries"
         fi
-        cp $dir/lib/*.jar \
-          $tomcat_base/escenic/lib  \
-          1>>$log \
-          2>>$log
-        exit_on_error "deploying jar files to $tomcat_base/escenic/lib"
+        run cp $dir/lib/*.jar $tomcat_base/escenic/lib
       else
         print "Could not find $tomcat_base/escenic/lib. Exiting."
         print "Also make sure that you have defined this directory in"

From 915b43b399b1282ea018dfa4ec0217e8df7bb23e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 29 Mar 2012 17:48:34 +0800
Subject: [PATCH 0610/2585] - added ece-install introduction presentation, I
 use   org-html5presentation.el to export it to Google/HTML5 slides, but   any
 org exporter can of course be used.

---
 .../ece-install-introduction/presentation.org | 76 +++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 usr/share/doc/escenic/presentations/ece-install-introduction/presentation.org

diff --git a/usr/share/doc/escenic/presentations/ece-install-introduction/presentation.org b/usr/share/doc/escenic/presentations/ece-install-introduction/presentation.org
new file mode 100644
index 00000000..a3e48c7a
--- /dev/null
+++ b/usr/share/doc/escenic/presentations/ece-install-introduction/presentation.org
@@ -0,0 +1,76 @@
+#+TITLE: Welcome to the world of ece-install 
+#+AUTHOR: Torstein Krause Johansen 
+
+* What?
+
+Full automatic installation of:
+- Escenic Content Engine & all plugins
+- Escenic Analysis Engine
+- Standalone search instances (Solr + indexer)
+- Database
+- NFS
+
+and ...
+
+* What? - II
+
+Full automatic installation of:
+- Cache server
+- High availability (HA) services
+- Monitoring clients
+- Monitoring server
+- Host self reporting 
+- and yes, even the RMI Hub  
+
+* What? - III
+
+Does all the hard bits for you, like:
+- Cache server with cookie stripping, load balancing,
+  session binding, locked down security.
+- Master/slave database setup with HA services and virtual IPs.
+- Analysis Engine (stats) with production ready settings.
+
+and there's more ...
+
+* What? - IV
+
+- Separate search instances, 
+- Tweaked JVM parameters, GC strategies that's known to work
+- DB pool settings that's been tested for high load
+- Proper logging (yes, there are endless systems were this is not set
+  up correctly). 
+
+* What does it need?
+- The latest stable Ubuntu, Debian, CentOS or RedHat Linux
+  distribution installed.
+- A network connection
+
+Yes, that's it.
+
+* For whom?
+
+- Professional Services
+- QA
+- R & D
+- Escenic/Vizrt Online partners
+- Experienced customers
+
+* Let's take it for a spin
+
+- Install two presentation servers
+- Install a cache server with load balancing
+- Check out its new self reporting module
+
+
+* How to get it?
+
+- git clone https://github.com/escenic/ece-scripts/ (or zip download)
+- daily builds of DEB and RPM packages from http://hudson.dev.escenic.com
+
+* 問題?
+
+- Questions to tkj@vizrt.com
+- Or ask on the SaaS mailing list: saas@lists.escenic.com
+- Or pop by the SaaS chat room: saas@conference.ardendo.se
+
+* Xièxiè!

From 021bdc213e10110ed4a7697bb3ff2cfa13956f09 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 30 Mar 2012 04:42:28 +0200
Subject: [PATCH 0611/2585] - added the blockdiag of a typical ECE architecture

---
 .../escenic/images/ece-architecture.blockdiag | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 usr/share/doc/escenic/images/ece-architecture.blockdiag

diff --git a/usr/share/doc/escenic/images/ece-architecture.blockdiag b/usr/share/doc/escenic/images/ece-architecture.blockdiag
new file mode 100644
index 00000000..bd7eebd6
--- /dev/null
+++ b/usr/share/doc/escenic/images/ece-architecture.blockdiag
@@ -0,0 +1,46 @@
+# a typical ECE production environment
+blockdiag {
+    orientation = porttrait;
+
+    A [label = "lb"];
+    B [label = "cache1"];
+    C [label = "cache2"];
+
+    D [label = "pres1"];
+    E [label = "pres2"];
+    F [label = "pres3"];
+
+    G [label = "editor1"];
+    H [label = "editor2"];
+
+    I [label = "db-vip"];
+    J [label = "db1", shape = flowchart.database];
+    K [label = "db2", shape = flowchart.database];
+
+    
+    L [label = "nfs-vip"];
+    M [label = "nfs1"];
+    N [label = "nfs2"];
+
+    O [label = "search1"];
+    P [label = "search2"];
+
+    # lb -> cache & 2
+    A -> B, C;
+
+    # caches to the pres servers
+    B -> D, E, F;
+    C -> D, E, F;
+
+    # presentation servers to DB, NFS & search
+    D -> I, L, O;
+    E -> I, L, O;
+    F -> I, L, O;
+    G -> I, L, P;
+    H -> I, L, P;
+
+    # db-vip -> db1 & 2
+    I -> J, K;
+    # db1 & 2 master/slave
+    I <-> J;
+}

From c2f4bf6c435af312feec32844ac33c1d6a72a561 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 30 Mar 2012 11:13:05 +0800
Subject: [PATCH 0612/2585] - first version of a typical ECE production ready
 architecture

---
 .../escenic/images/ece-architecture.blockdiag |  42 ++++++++++++++++++
 .../doc/escenic/images/ece-architecture.png   | Bin 0 -> 37944 bytes
 2 files changed, 42 insertions(+)
 create mode 100644 usr/share/doc/escenic/images/ece-architecture.blockdiag
 create mode 100644 usr/share/doc/escenic/images/ece-architecture.png

diff --git a/usr/share/doc/escenic/images/ece-architecture.blockdiag b/usr/share/doc/escenic/images/ece-architecture.blockdiag
new file mode 100644
index 00000000..bc7cceb4
--- /dev/null
+++ b/usr/share/doc/escenic/images/ece-architecture.blockdiag
@@ -0,0 +1,42 @@
+# a typical ECE production environment
+blockdiag {
+    orientation = portrait;
+
+    internet [ shape = "cloud" ];
+    cache1 [ color = "green" ];
+    cache2 [ color = "green" ];
+    pres1 [ color = "orange" ];
+    pres2 [ color = "orange" ];
+    pres3 [ color = "orange" ];
+    db1 [ shape = "flowchart.database" ];
+    db2 [ shape = "flowchart.database" ];
+    editor1 [ color = "orange" ];
+    editor2 [ color = "orange" ];
+    journalist [ shape = "actor" ];
+    
+    group {
+        pres1;
+        pres2;
+        pres3;
+        color = "white";
+    };
+    # group {
+    #     cache1;
+    #     cache2;
+    #     color = "green";
+    # }
+    
+    internet -> lb -> cache1, cache2;
+    cache1 -> pres1, pres2, pres3;
+    cache2 -> pres1, pres2, pres3;
+    pres1 -> db-vip, nfs-vip, search1;
+    pres2 -> db-vip, nfs-vip, search1;
+    pres3 -> db-vip, nfs-vip, search1;
+
+    journalist -> editor1 -> db-vip, nfs-vip, search2;
+    import -> editor2 -> db-vip, nfs-vip, search2;
+    
+    db-vip -> db1, db2;
+    db1 <-> db2;
+    nfs-vip -> nfs1, nfs2;
+}
diff --git a/usr/share/doc/escenic/images/ece-architecture.png b/usr/share/doc/escenic/images/ece-architecture.png
new file mode 100644
index 0000000000000000000000000000000000000000..eeac468a13807b6d66103fbbfda615a1913fefd3
GIT binary patch
literal 37944
zcmb@u2{_d4`!_tI=+0V-vX%D8mh4L<DOr+4Y7B|UmSi_G+7O|VY$1fQja`;8N}=q@
zHiIEC7-MLdF~-dIy+-%*e}2#M9>;UM&+C}`HfFxdb)DbyI?vDNbDmdEFIkuf{j=vE
z7z`$K;r!XlFc@DG47SNmU<>%<F(&mP43+?0ID7g^&>ITd>zU$p)L<ybR?ozBU@V`d
zcb}2VQgc&p+NNH<^vp3xwbHWYVEuK0pa=cgv0op>7M(ux?AdRH<RxjxbDOey!}+B?
z4x%2pZG#_p^!WLUurSQ&M@rkB<(e0_5O-f|@w#rnx=(>u6&^b=>E0P*ufX{JzOAUJ
zpySyyJ7WB+f{voFsE+m9U!oBuRcG9b6TtwvKl^tsWB<N`HSH4%=h=Ag_*0<i?}sXP
z_#FSflRUXe<?p*^dw3-OzB?BS6a4!w=NybXWf&~nYCnv3<6YDH|BK7*TEW5$e%Ldx
z0*`WE&4r3_uZ(rXh10PD{xE2H1$!8#yZ7oXR?V!wOY>InWtOAigb>T2Cxid48=qrn
zOG}a50;{WK$Hq`T3N+Efd&rfd5nz7fSIVe8<{st*nWocX;rgE%H5@$oG(+dkJy+@n
zM@#-AN8jd_MC^{#2}f8=g<8Vs=i{#(Et3!Zi0ov3RW=33XxSK04lnYa3~v+-*Z*v!
zamm1|BW_l;S$gZIjr%R`;2Gi(4Uv)XLxCGQz7HD>9B*}pwVs1b2hFuaYJbXD=<!2Q
z*2c<Jfz?hCTS^h9>epslF7Yq6e?U>O!cFvAc_)ifwpOAx4&UxufN%uYeb${!-;qq)
z*7RXf4Mt#Wd7}ME7(>;@4c*-^xXO*O&5lUEOOG8`{iHXD4jXVvxX~VRBQM1bhNK;W
zk)5OD{T`0`MERk5rMS-xDft=2<Mq2)>Woa2vJrDEbVoSlq4uY^cx@c_TuMY`W>frE
zm_?!l&k#~daGFn7-zb?D<2?etg~0?LfsZvhwg#+$F@eAHe<xFzSqr*)c{1!*gQjUR
zO~`XQ!u9XFe0$@_mL$AE5HjLpxh^C;D-JA7qf^D_V5r@54AgU;p|ZyDj;+;bgHC4u
zihX2VHaM(lRx6jyH@&_|Mf}m$rnuebR1Xg=G1W-6na$c8Zo1h2jo-0V_;HK+;UQH-
zyFs%wVtW18pc)vuujKbPj`bsqGB4}t^*y@~x(?$?nT;0@%Y@5>OmTja<~%G)or#!>
ztc&-eYHLPXWoT~@W|bn~%>0n=oOr@6{afcFCLPygJZZ^DW?2}?QUj*@)#(wkb89tb
z=TH_gAKoY)pC0Nl?}rk52u3qr7T`syuL=D=(ohMH#ITt=!kO*))IS%tIM#<TTMP~l
zS@V_~VR`~aXGR0lA_W7bS#J>P2f#EJFA?y}v`v^2<Yt1fSIvc**e`D>I*RoJye(dY
zz`%LpY=U4@_3pJdj+R0M**yW;q{Pt16;VP#1N*W4Z+c8tC$Bf&&ifwmZi`Xm<;buG
zR>s9!>k2!;rHL!Mk9guWd+agkny<7dp$v>ZuA3R0LMxPmvm%Q_N_|RLhiDP;k=~iM
zro~7qg;_?e5IzQzqP=kx5o**Z{_@+rC%1CoUO>QA{g5ns2W&`UOq2#<SMjUujIdVX
zN$*S34&H>;21EyQGxvU;+jR2!-1{2Yg|?XO`Rs)ZozMrpaWWYJGbtoyI#^FiN=lb$
z`aUDn2A4;rs;EK!9pSOT7NzF#6~#442}24MrwcQ6tkyM5j|P*AYo_7x?79BJ3*`13
zO+M$s);r3Bd5g10_gRNB8L=BadN+E$@r>^3of;f5gj{^)?C-BJ5`B9G_K<D`#_5Je
zIN6PalqO9a&V40r{DSZF+edrfQv%0^GZCZS&$ft#$NF28!XIJi%G%TKTq~|2qo(jK
zDT=hOAIp*qnZFZKMji3Wmqq#PJ&=d51uWpoBnBGm9Mwn?V5(u`5i;g|M?&F)l(XK1
zqL{DpA`jmRH<!j`zyGJXRJi%ltIIk94>czby4MSvwxSNm?Y&iIXVw|m0KSdRey`?a
zcie)MsJeg=mWL5s&-*>p4@k~o1*)Z}i|Csz?W^L=3>*t4eRqJq9nO67#L3O5wCmO|
z7Q+f+$fWuUG>fzvp!R@a)N7wh!^#Axo9A?Ob<G_QyvF=2(YW{xv;G|uwl8i{EpGDj
z`tfF!BI7S~f$REoqjUOtyS!%DcXcnRoA01w^=63u{r!HV`o^F35?11g^75xee^P22
zTW|I741MU@O8-e1lL%Xp3Gw>T%bKkkus7hWPS$)@DSEiq4g7y}ZxLHkWVh_F%V4vH
z;j(Waa^AdKvn7!qjBKrcg||*B=>BLPS@qTBKWi)GnwJNz-MUuomg<^Sb@jqaanqw-
zQEee<$pH&0$sqy)O?&0<`T8zdq~`hgMW^O%J?nkAMU%*g?NbmMb>uCzPTS!*NE+G|
zRHa-KsgrSMu|K!!LD)*C4~m985^YMz#m8xmi9fzZ+25@dU%L`atsiw(*?3eIR;`z6
z-j<O0pU5a98p95E)5rw{C3xL0dFEq!c@mOwh5ENE`&bI^3+|M%prOnpa8weB>7PNe
z4bY#MPt!F0a86etQPn)!uuZw?Xy;aXvWvUVTOCgReDrtOufFFelG;&L1`x9wy<Ui0
zD}?-|TicIBM}twFSojzaX`EX7d0~WjhyP~%V<&>JaMK$Eu#aRki+*vW7ALzWJUufL
zr<vBNG$M0TS2=lD+rX5yhc&gu(H|~y50Yc~qfngM+4~_@Ha3d#zdG2qDKD-UU=aqp
za#)+@b&rI2uKE+h9J+#Cpj5Kw>dqmAL&P4`HSd}`g#I5}KNk$FJN{Z0sNWG?E7cEg
zF7=Z7h4g-xvJtWChfG+gzP6VEKA9zAJCz6l`i6$+?h%s|nP256ALh*Bk9ybS%dzlo
zMsjg7ob#|PF9@=Z8tcG+&0gMmao`(pFPA>`tbw{+FQzjhcfYej@>qbZ6&i6OdSr{k
z9gQ@bNV^hi7ma6-ZxW#~WaU^AVbOzf;2uG!9y@{c*@Pr9HI=SQfDjL&eUBCv`5D1X
zL@+;7Iion%Aho_5!7fCvP#eRTe`JcQ9y{56^=&ZgyZ<6@R{p}vQuoxRj-wiJ={qck
zPW}A(<x%M7n{PmT8564&!u?Rkek-5XX)h<&l{DwMzbZ~qrEiilhXr(Kf09*=PcqBz
z)7?5}_qiBO`4f_O`Om<0pUzQoS9f>*^!b<g-AN6p@l9a0=`q+kE6GzXUCQ8zEr0O9
z<#;sa*OeF%+9w-%&EXCXD0`3MUs_5PifNXI5(=}A{3s~6Sz#@$wclnzZ_ECD78hB5
zYMG;tNKcxz;BYv0XRGfE;8|AU!Pj12fDih@2eSt75u@^Ijnsf1#-{n^658D=TfX?<
z4Ay7Nz))z4*`Zh=9A4`1NdJl~a;-13k@GX(;G}Z2{LywbRjFU^-BU~5_w=iqlUQ}R
z*H;~0`y>&7En${bAB6C|V>edDO8pGjX=s`cr)Ms+rZ2XL(t%==5zylF^t7izX7@CW
zdB66?w8iR9?TMuAC%oG8NVgHB1GUzaXEz}^%L+TiyqK>yFN+&reeF`WZ+(x+uYR>u
zS;sW#>>Ara2(RC`d@6n{=+4L&=4c=hyB<qijSU3h#@-~MNOMJiFd)@|9kosp0z(Qa
zLYlY!T1TV=XI{mkG-ADvM9Xh$E<F}4f4p4{%%+5_b1wu{ydp4MsYt*R;K1kNPrL*8
z^5#R#JH_^o1qHgq6)z$qOUfTsO%?i<N2qGXe7p7IzW<4q$>DuZaFc=SaT4|(Ozs%E
zwM-HOJ9-b0_X^D4aPnvtrKZUhQL>B<4u=D%H2%DLg>y&bf#;~dhf)7yc))$*y*1dj
zhjeyb#Ho^uaUPR9Cd#jp#~vV+1=eokX!KB@hssj-iL<lXhjN6PWTjm7e+R&^jg<p)
zjr)toeMdyeh7bu_SG@4DR@>e<t4gU^<%)cHnPxIea>1XFL2e|}*4#GYq6;Km9ori5
z;z&XNqh<|@nuX+#UY;a3a;%?W;N|&K9-|{;UhLLsb1x@+8@9q|FUvvrjlhn8$hw@?
zB<sUD>%Zav@XNZmm?P`l_uPbLd(wP|UMRgNtgZZ)FRGi$)Q4#3HA`rg(eICh53cB4
zc-gcpVC`!68y``NwOaV+XrQ*~Z)DbPsUYw~^!lqmT<u_11&4T2i}Ktz1s+MbY&tLS
z)VxEa)m)U%UowJzOXO6Q#+!2Y)PA>Ze)j{!cD&Ly@d}hnb2qYReIH794Aj^g7~)@-
z#eDB^>lFZl^<A_5jU&De+UUg5p%I33kdBl({Kk#2I>q)NwUo2=9=hJOQQ7C+i_<`k
zu5hZB^1;s97QpMhcHHA)sONaYN>VV2<o1WPe8P}+0;<n9X!-ip_}8<~Lt2{3lo?c6
z=07iV`6I}4?34Bmn;p{(dc6EXw9&Q?20b+jW!I#Klq-1HnrR$v+U$6^*Y1hq!iBR7
zd^ZP5{36Ph0M>5G`sf!j+#VT{k$>6r!nM~Qyh79HjCA)4Zic-1Ut8xtr@`hM_r)%_
z1X^Hb@7q&#eAlw{Z{1`!9-1(mrg?`5=e}y7b?Mqt2p}rm%YOBPa>>k_x2)JN!e6F8
zB3297mHt70?yShIAAi2yR8=)Ptl(##_WD**?dNd#a#?0O&q7Oc3~YWMEqHdoN?LOi
zCz4+-onJyms%4U5*-%a6%JG`W<n+n6!@C~;MV37ya+4Hsh5UuJwY6*F#xByW#?q}%
z^zG}TuACNC4=7i`cLg1zKV1@c;B)kX8%YyB4IV|7Rc}_N&?p2S7J^mBI+J1UcZ>3;
z0ZF!_D->6StuM9uq#!=*VJY<I?S0n7MenWSe2z}U_VSoP3<7=Z!b_Kz2WTL!xToU3
ztyJkAR$jEL4>&gzfE;wDlv|E85<kpO{+ejm)`ZVWiaOt?u9nuhhXLi^vJP?)u^BNy
zBiyQH>2RlOgOfyt7KNmLvY0{Z*TgY98QDjU<s2yh=wW29qQKbt%sDPs4mYZpNFwlh
z%2B$H=N!nG|MTZhpL^=q?_k+cgLz8j{yex>yoQNDgbAVAa=y+db7ddv3!L$(G*}|M
zDm`S?Ux1*YClV|Y(a2MwP|=O%(Bz;w3};T_mzF~+$ZHD^3*1wyM7f-2D8EE*rgQ48
zd+K5uaeX?J#taKUBH8o6xXjMZ&fzeF%;URafM>YF2d%jASx4oxwPV~Rxz{c!07SAE
zMW97=#Viy0lDWDA+IQh)Fu)0Yv&;8%(j6=gB@6~<AP!$BkDB~ABYCuUNE-)6-~b}O
z&7l7Q`C|ePbp)G#2tE?58mNjYqWCN|tI<Cw6ot%9)}mEq9kw_IO#ZsK+TRbqFSii-
zX5WFSfP>6>)F5?jWg{^n^4xVSU*6i?TDD!xJ<`$h9auDX&r@U_&HEnv!%b{#4jNnC
z0`dALZ)x_C@`8e2dG4RV!q(&~B<mCv98+pn8>NR$FHIH{yewDj%Rcf)MbJYGz>2Q`
z`Z-Asc(1yI1{zykIdoyWM=@{il^w=bDS5LECFHhiheE=g)FVpcV>%oDY0`-+*j|Y-
zG)}AY_x2-}w$LdVe})z&eL}{pU6YtA<iSiep(qcEwC`cTW>XKWhM}~S53s!SqrO6g
zN~h$lUv7rZ{nIo;7^8`so*iKoElBX4_M(eCjDsnPifw)Pwz{UK-7RTykt!Uvl#IN|
zKrtv7Z^B{OUj|Bb!8^mB3ew&mOKWtbC{HOd2rG3gSu`OD^<Lp|dwY8gxh~FA<ycLm
zr-O{lWsf)q5bnb#@14oV3n~`@p99WEIl$~J4uB0LLtg3Ui7A-Etz6XJhKxHFo&AH)
zDP6zGOhh$MX|&%feu>j0!k|=m@2Ot>iTnkJ;++<iU^{~QSRO}AY(Dum09=9vXh2M?
z-YGCn_(Rpe$q6nu5dOBT-n(%2&!K0>{z6`j-**Ypj^Ob)NxmjzbVu0wN=saLsrX+Y
zB~9HNpzl##e!JH$n%7>B9smxM{oYN+?mOpwSW%5=M(B*d;nn6sSkWk}J%E4u;)G`X
z!-kI^gKUrHb}A!mq+1ISmGfIN9UM0t+}tF!0^4X-U)fgf>5Xa{bdm&cTk(7Ov$VWx
zoizvL3*7fibxG0LM2HP_dtq<Cx=f_shUPQbgYKza6^iu$bzt)QX20H2t2OOg&fDqc
zF6JA*2*B43{J0`O&x-BS^rp+zAiddB$nW%Hjhu+GY0nH`<hg%l&5rHn;4y4Gbu}GF
z3*>Csmz+5t!N9PqaCD*rz)QgY)h@iu9ggazyzuetjEdSd481r9h7EgBuiw;hmbQ(s
zD>nPRY2SUT*DjZBY<{Yn|6b-?wxD8G6%fqt-Sb*FsvKtmywIs6<_Z|%n@(3uUf--s
z25Hb&T6tcj?P`3<A%TbAx7^PY(y#Gy^OFk+=h51oBhrNT<d<c%9l@=)<JKuex)+fy
zwl5hme{MArH4}+in46mm2FP9A+~-ijH}bbzFH_DLd)B{d_Zk%q;%29}o&v5Bh6P%2
ziI+`*D@|%C{ZNnfT6Kx9oRRibEh6iz^P<N^)-CH72+0}?nX4PH%dlLrJ_FeEcExbv
zw_AU7K)e9KTYLL0uSeRqqo(halxoFo0}j>i@obSR>?px1Msjkl*zANxy4fRgfQ4G3
zA}`O$B|{8sl$K~c562ljAJ0bjsbjAxB?YJEG4IuO#ALU9FYhQQFr63k*NWz%t+=nd
z<=;Qr>vs0tohRnT@WF|Q{e}e~8W35bXezYc!`{8)AzKbTmyeo@?7Z7X*6YTAfyPY+
z%`R`cE_2{}x+t-0>n>xfepP-+LwVkrbPP|jn$%Wz|DD2|1tPm1s<AX+{`NEdVCdmv
zCaDp&u!T|INUk@~FzMWiKV0lT^9E74qgMZ{IvC4c(S<1SK2+7dWSQ;PG|jE?<Av^f
zbj@1}^jS}o!zOBKC^%24m78ZuA=U<rveel@Rqj(y*TvTDsW7XSNS1nh^3Zbm>0x`S
z@);Ev^3O?FUzf6&N90c7hi?I$Ub~2%Rc6z;c?$&bwUo<qgatiV*3h>(d}$-ZVJUm%
zWKD|xNc5YT){XS3_Lq0%aN+#;b9>4)uekFikM@=t_SE^Iil;S!^u|!4Zo{E|o1lK@
zCtgPX$q=2-M{`JMPN+9E+fzh2H2etR>VQRC)!fcQWR|_h4kGWV%rK#*k?}%6i_~%6
z9qG*+2MOaB1O757iU)!<m3`!%?%|)^ocV4Ps?YR|<9txH*LfluV%v6Y`MCArsWhRL
zJE(^TE=*s04bOKE@iGKy*XQMd6cei}$=+j$6{=h|9hW`oXDT(l*0RO%wCMY~l1E&1
zV6AbH?6V$=TiSsE$_%v|Vj4nOm*?6Uj~xwJJ`e@RCg!`R{`AMH)1JGNT5knDWc9~?
zrR>+=j^feU3B<x`g|f>9Tbu9t+f9H}4>Ff|eqZ}W=D1mL+TBb!>xTnm0?o*=p?-gv
z6lT_$8rD)EaxieS9BOrfAm6&Rd49`O3}XFPr}Fw|Wi!2yF|smhDP}?0+{5IZZ@qJx
z(ol7)t$X}CXW{;^lj#=9t`)-<Np709?x`ihM9)L(mGEv6&K~aK!o)c}heH()5`Nh8
zXRiIs-^I|MCUOX9mJcpuWp1=wF(J=A+i)eH^Al%n%Kqf#wQ9H=$?3r{84!mEeNqvO
zQ4wrc5hUli&+QesqsqFnpweoNu6Ni5lP1jYs?@)5^Ey8=hA@74AO`sQ_i{7J7m|Fr
z&UaJr0l;ZTqvbXCCF|=r-a3?dBkl2@&_+@yigp_f;$opQwuL*ZLHTUl>Q`k4_Gd8J
zjz=VHIZbfrZhP&>#{}QHW|{O16j;Y(SGAOe42yh;+qZ9%x-$)-f#KodTA@!J6KOFe
z4vug@UVt7fhu>!xif+NqR^0CX?nMhZn){o&4&o&m+t3hJe<Zr7ggm6@KtmE4NGT%~
zk~TD|%=x9v@iAxN)2Zzdck9?;3q*P_Y^EJd&6XT>48IIh04pX<MWK#jQ*=PE`50j4
zAeVqg+DW3#-m871m~@eG<iS(@^-}%qF>H@a>T_)N8=<HA4R<G-X{o_=$3oxjzP(WL
zUG_l>(?g{F##yT?Uwj+R_x+@E>bUXiaKg8*U@C<b6%|R`xm66$%XiZ}P7LR#lN`O2
zxB~QBW%^$8is7O<<@GfXWvFa~lCm<<L2*|?LBaOoD!$W~T77TaDeli?`JopO3b~v`
z{e43?C>ODoOT8PZi+^#_NwO}9XZ#k(@z)N0DK*-A@x)_Q6@?(LW(-&o-rn9N;J>an
zFhxz;gWLd%(z+6WWU}i@C`UPKgE&qMakWLWaq?2u^U<c{+7eI8{ONies~%0;P!SNZ
zE5W$sT;=q7Y^~XQo8+7yucm)ncq8x|5G^%$Y`PdWzX9U%`(kGAujzEt+7;VN5)NF$
z!#b8>1QwY~tUY!8k^(Asp!yk45Qa-T442T24Grr*Z<Zwkc&K5X1M<SW$j|^{bsKsD
zaV)nn#8QABBZpk>4g9!cG!6Gl@aYJ%YEx4gz^%2|rdOBE#f=k3;?isMn^S=cAGq*3
zAZi34P^DclRj{HX(LV)KZmjSX797*a2OM~rA2rU8$~qE#<LC<iS^5c+*KiJXy^Gp#
zH{Ra;QRZHOR6|ZHw2Dd2@PrD>^r$Q<4(*gdvq(-n@C{Hwz#1;<24l5r^>ME+ye!)6
z2m%f%*xS+;{C2q(kl->L8{8lto!!4^5`yNgNjv<+>#dCe!Z;3CVk{`18)5GN(I7he
zd|KYtd693fn^^V$f!tb~0H9a|VwirQj_%`Qv8T1K?mzIGem*f)BhYnq|J}8)b?=a!
z;Z?0a_)qslMV+-e@MqfXK~>5Dq<hHLDUDUN30qf7jhTB7F&`D%!9**MM27*jltg20
zOqsJ{$@y)`nTT93@2i?00MmlLZ@FY4@;-NVv(4tyJwVC~<A&Oq%=HBHABqurOc^<Q
z5%VU;Uy0HyMbpD|mCt`)$6CC+CEL36LorF{ld06Rlv>;_*G=m-qORQpD5doX;3S?R
zni{{rL)NNfowIf;c1c<!%dI~`FWNfbQ0xzBX=&H2#8Y;lZ0N1ORRk{*P#CfffYfXS
z^b}@&f9_8P5#-b#%FrKWblM4%5~0t>iv6+0#b&y7hz3Zs*6;p+F6~BqiY-ra|34>E
z_X-?{miLM<)Cg#Pe&CyYdwE*+krK1_iK$uflrco%VqrnSyCcz_zzjg6nFn&s215~H
z_lU4ZxID#h4Mb*<x^6TvD;j<%yuj<cM8w1oKL0|8OIG4Lfn@0+bHyfceb$hj4|!RM
zGcBQIONf(YfJq@2mNs7oFt0jc&=UAMKqdI)@w&41AOC#1ifx)ddf{aiE^ptZ<iXpd
zofQdlege0FO_o2;G7t96R@Q>W9SJSUaWrjhZ8KB5NfqUa*2Vtg(jy+;({<RVlR@sh
zrGQ*a-P2C#CiTg&d*#?ibAM*mALe6CL924mB!oAMz@<tPmydXiOnv(H(XVOK>W7^-
zFd=@?{3n08z+6)t9J8ycjYcZ<L*B~Vv9;-!Z&%YCj~?x5?}Db5H(g9>&lPIQ0CJjs
zMV6Ul#8f8p1bP~(vQu<zpHhQTGMOnvKjOKGi-@%!7ggcWo!^9cE1Q|#o+9tfrOH99
zXLG0!2Xe2yVG*6(1`QjsZsS57yRQ#59d9oO810^RTBk#LdO8*WOJxAta#L!^hs^t)
z%qCXv+2T&(@%vo*V{84@8r9R+Da&g&hxP;O(7gxcqTm`~cZkFlYeVn~3l3(^a`Ot1
z=_YJ}?B|3&%ZWiRDRX8t8<%3`Okds-<2ya7Zf+-TtdZG$8z5H@;JOS}#~(pgkFJnv
zjzc(BAmr_e)(a3m)&H@b`JBPS-&}g7s4V^Zn-8eEkO#490yKaYamgRiLS9B9Cq(SP
z<-ncn2L0U*)re4f<<qxPZ3hW=K^(ac+z4F11TYTOgbxy~cIiS+u0$4=$b!oBzs=Rf
zRSp26+hebAJD7qwS|wBAV|3(%;Nl&%lpE8*91sf0T5%E<qKVvO5@uj{@#Sy8lMx_F
z{R+h~LZJkiI;Jw`D{d7L*3Ag(_K{%)%Pod@bt_Auum-xip(oQiyE64d1H8|a+9rJa
zU3J12OGxnWe|J8#vTb0cu&I4^$)6Mz&p4?8Y#DA;=7+`tvG}B+21!#>v!bxDum)rj
zLw{h?uCHIe>Lw*6Wonod#T%cUKOd#n?E}#NS5J-5gYthqSR&^p0hDr*)bNM%8(aN$
zRsTA-_Y#_ofmSkAOk%G9q6=~&*X?h2XQUgVIqL~rl_uwCv{qbuU5P@yb+OOkEek6k
z9^1rc#v8275W2g&4Ozdw#sGDHsTC2l^y@2$`%xem4IM1Rim7`kwl+IGigWVZANKP~
zkDt1YTwQDyAu|6Y;npt@+kMY31a{9)UIn)X^a|ur7Y}G?i&NpgPPHG47r!*a%+A(*
zRt_DF-s<;ipia11rN=(WypL~MJhgAGVe6+eeb$O_rKEuK8R>7acMtg>Mn*;yJHM>e
z3Oz~9d)m=^g!gvsRsF2GGu#LE<FS=39QPX>awBc;LNJhU!0f6_%EiTi8a_AF&3ZoQ
z@fqXMM<d_VNW+HF=ZBd9f;3Jo!$Q;ZW=A?0{R^Egyd}C$Nwk_#q5C!x-m&0`z*-%7
z`AL{^6AY%{*gcZ0Qnb86`w!0h5>KBZfVvdhy}=Wh0#5)uXNTyhhLwTq%4RIAd+H&e
z@m}n^?@gjt@z>h}AW&E0ta}Xwgq3TrpQh~4R&M{(^6cf)Us}R%<Z4zTEcj<0(0I|#
zx}nMLXj9!4%a;eXNxcC@yp!h6x(dtK)zGB8S#x6hT|rmeKssq8oq-SNDN8>ypz~-M
zJ0JPW7&dUyVhrnTExIcr%dI#~MKEz|^QQWVUVBVQ#XbvAsgMzNpKi5JLwt`w(9b^x
z(oeOW;vv_`7eD=F2#)4wUp4Ih=i{E2?q}Xh5qR6X9&sUSdWM}pIFs_!ABjXJx(xdR
zSOtE%M@T!xQb2@=XE($LW9haV$f!F*UsrQt@ChJvPLcZf0|cRuZ^m5eWI~3!QP!52
zl2{F?d%&L3mlgP|UFB|3OoIHbJslDDQnOCrYI%UA|Ix#h8_I(+3jkTl1ncB4zBh*U
zHxOWoag(_xo}y&<P9K*Cv{NmCM2O?b8a{m4ReLMWB64)F*YrcneeqHm>0LlTxOFW6
z{@O)ee!H=iyN<$RSEB9j0ECx1;I%Hme0+sW>>HRTs6=?w$9s#wZs+sf3wiMLS*1j>
z1W$6?w5ZwH>dj6!Q53r;PB*X4Ok?ynYY4_<A9+vK35Y-AMtXBE<izOjV3fa~pPws<
zS0Vc5N%3+Sf#Iz11wA`&Wkte{LJy^qZ@1LG(bn;AN=h&ojG5@k>q<$rQEk_Kuq#Vt
znT#yVpjn6yx;BLCGbtp*6GYcJf)I8@Jk&qgRdac6jZpHUB!mmO0+y1sadksk&*_--
z#;*$_8s<9yIE{)b*Eg8|lmi&W*ZVqHaj_JO{G{SXcE<_UQA0WJ0Rc<PIE^>36gSRI
zH)w%p<kNR$$71DVShbYJ_5k&d0MjOcO4j5@;G!p3ZW9Iueb&qCOqv8zxmooikDX*h
z;#NIOr}&v9SHqBnd6OEW(q0+Ct~8k0Et=C4&CN~}#PMZ{P^BM1*9jba8a`NcV(?Y^
zW2~DHDb#CI>Fmw2w)XN4PsT)^`<dV!0>cX*0RD<mY@b*8GMMn~mj8EvNz7ol0QD9S
zK!&dnm&Zc%GrMiO73BYP=~CBQ{@O^7c<eq|=Z|wC%hh(qpLD_}lNd0n1aaZE@VAtT
zkL3@pyml$OYzkCHV3%XL_klPJ3aEh#V<3?omwyTT70g7abY!vJ0&t%TFI<L4%!XgO
z72AmNRWV=St3Oc=ta|8nY6)q;R8Qt~_MW<EEink>%+JE1&n7>X@>`bjBsUBbWfE(M
zC|1pyLxgiF>yrlT1b_2KAQN$^fHIJZo@gJN*NdC{5e8A(K3H{4l5Ajy?rF}?tz}j@
zWvDP3yxBGZo3u$sBC4e3fVg$OZ@Go<jJ2*vvaUC-(BzdLu~tfPcp;`*;&uH#pjDds
z9PhA_!T@*m*m1_(Q=~MIh-3_cl_nB~9i&GkfDjIP7?}MdPVvQy9;Dia0Oq}TUv39N
z_@~moprQ0(u6hlW&l4lQ?j)GC>B(w+FT&#V48>1OOczS>!V$iec77;lDFKanD4>2o
z=aQ*AA>qqoN56Vy$Nar7UI?e}DZe^e^w5grxRt9cO;=R&D_)l=^7Py{R8MVWk%60J
zX|q06GY~sl%Y-^Gl;tzrQNfDbkntw&pcays;Xoloc|vN`JyBJW7x9lrg+Aj=)Nd#y
zffRV4CgJKX;}`QP2YM_nX<7E&_b+dT%xr(#du!@^@3=56e6Rtmo$q{?f&t=;YP)Sf
zOM&jqlaSxZRSBa6k_PT-Z34X*iLy+`c?=S^KL=>tF>{1oL}5;KkSfH*c1Ad*ANcko
zz2@6k%i~)YY0XQZRGS+W#atSSu=)Pj4L=%K#*^#^E9^<PY)c^qxik3R$mN)5-oNvH
z1Yh>aJvEOjeYXK|>!C$xX*qqdwHFzc$)3NBE~dI@y`<|o7LJct*xbrfzxQaq3OQG{
z+XZ&0{JMav&uz+{)Y_U+(UKX!#8m{VMxPJu_Zli&20;m^=c!KNA1>f0foAG=<?O*}
zTUp(!1aG$vjP}LDeD*TMUoGa9YNXVr1aS?t2Ktfbz|adm(yZXZf;z@ZYR=`#%s}@N
zgnwT^$Y?S0P<<E4pLiP?MF6Y8v4O5ivJG8+O8F*cY~>%?pQch!LawE-56a(c7S1>K
z%HQ_k>{(AKe6SLWw^8QU?a&xdtz!4udn&7t_&J~B+T5VMqbOxrn(Vj}zHc>|Jb%MC
zaiFd=Gk2?{M8Nj2K&ZoFsgJNt`z>QE)Mr`0N%6MUBwqTijEvboQqKaP3^_BE;xu48
zhKrMI2PuRFDWzfm`w4pm&U%b$>3<%{k$P=oa~uS2pidVTL<7V%AMus%3_W<yZC+PR
z^?-ZG&~!@4NYr^}+Yl$oEdalm_Z3Ar;z=iYt{nJ_YifZ1*Ec%QZY<DVPsb1pu8_N$
zWdfNUfhS+@1kWF4k#^a%BfiTY0LtG5<T@qucp2SW=DJ>YbTyX>*oyb0o>$4%d*E`T
zC$-8=QY#JZ3F+>kX#<Pjdg;=;)haNRbNWZ_UFWqDw*hI0OAjWJ>d_hlu#P0{rnBC>
zDzv~Vi_(<G`j;|w3)<%q4D1m9i8)wDh?{8jEGJDihfOvkqwPK5x}z2zI|Mg(WyOpd
z@neML6sO&ubX_v7ce>`)<O!QvZu-&n$Ib6n3uupN;xqM#RM;gJ%mpGK;O)Z<Zt-%G
zEXf!gE9pNTHc6^(UlCEAPUNNmi%7zPx)(LC%EwCEB;VFGlF{`_ksdioch>24W?WAl
zaOMa7II8@ddm*pfZbuF)?P!*>d{%*b*I9Xz5}ftgA0BDZjcMB2cuspOheqng^)u9@
zA2H`aKhT09L9{49H+=|64IsTN+ieUBh?<CF=$~V8C}iEw$t}y`6;k_LG!8u&eLu9f
z%^XkJ(lPwDNW-y9Y)>lP4}Wveo~$BxP+(JWl{Z*9hr+HOWPxA+P;lmA2sNEVzVvC(
zh-x^H2nt=WxWfH>edl&WIE~7dxbhwgrt#9cnzvs+Jyd{25hn?t6RnHZbN~L&9*eeK
z(D9HGx3%Epyl*89{WJ<REwnc#O+?KH65$f+t_68@GS8`X8IlE7e2((<k&X)#xQNgf
z4SizunB%lg{b?)tA0Kf8$x|Qw4&Q#1t*fCSmDvuLJsf^L)Iscpx_MG7Y7B`Ti+k%k
z`A6@kb>pJ*jcZ_lZwUq{H{$X~3UXV1dU2Hus`rj{O$chlU6<MufjH<%N65&)bmHq!
zZ8C27q4>Un^r~=c4|w2wX6#yQSGngHLv6W9sKEAgvea{84NCG+FBqMr)Z9mk(b#fO
zS_TG*Y;7^^X!$an=V?CdAG&|QVHzHNznK=DB1i)eb!M=BpWVpn2;(@xAU4<qxOVuY
zALDo(U7-WIKZp##ddlJ0hNLjo(dvaAJ%<crDE7W36+E{mg@f-?LprAP@&J?vW@@|7
z3acN?)Axy8(bX#ej%q4OPj2P5B;a>Nq(GP_287o+NKWI_tlhAGK#svQZDDf7;NXb-
zDsZ=^=ks`Bv{`*{62UW682>rHSmCS}+=ub4MRUTIUsocvTZ7^e&#u>NgLzty|Mb`O
z$b`SB(H}%&zsmYS$Vfx4>8L~#<QNh+);dN%D!ZoV43Y!TRDxu6H~sn$kLxBi`HpHX
z_e(SmV!C<gdwEq}M4~Sc<mQ|sFN_7^B9{%w_IXA=Z5sMl<+|&sgRGuK%B6T5l?4X(
zEZtI<$QZ5~{pfZ67jjT;QajGe?c`5J=m3Mp_(mF3`o$p2dBP6;smzLFAZJ9<8RV>Z
z;)-6R@ZB)f7+jVls<0{3RtXG8>y2~e3HNs4KBY`T$;7lIbJ;#{qK~CI1M9#u-XQ3z
zHTq+Xbx-Lwp2%35{*ysgGDKxD!HGcZGXN!-bv#lt3N|lJTECa+<2LGry!U-VR>6UL
z04&Z~lxN5wLQD2e7l!U97O_ILJ1y?V?Uj^{u=JWUz&|naiV?0=idf6wbykaldCCdv
zlLkw={h}j2cCdO{-#BuwQffJ0qbEpB!aZ!17{4MKvHGN2iu*YX9n=TP#mO{}RSWGQ
zohcVCB!W4%ZP^{ZB6CWWG+3&4$PUjSnZ}<04%8}ToyHQ!BlAlI>m~n?3|=uL7r*TV
zO=W5kI|-89A|VX68qTiCpJ3A@{Qfsh&^eNuw11aP<cBkSpqZ<nUVc}r5|J4J{)!vs
zkZ7TM#&B$@?;K_QChnzRu>Wn_H2%mm%){A?>U!a&I)w}%TYbrqe;)So@A;k#B$ja1
zY&LE;1!~sHr5mo`cCVl%^RGZ6pZF;$tj3WrCU+q$y=9AJT0wW0oHm9GbNqQuo9~Zm
z*qlb)4W&ow=G6O}0aturNo_u4MCszTMUOInF66Rt>G2eFra|BwS~qi!2-*)+jVY57
zpIQeM?=iOF+F9d$rogWp-P|B*3;0lt!ySQ?9HOFam5i2B-c$;&G+Zu2@1CXwKPLrG
zI>@p-#`^6VxqZMx&*+8}bbBi}!;*d7pdUBLlYD(Kt&8=!b<oqjSQ9miwBHSmdnQAH
zG{eF=Ut=ifIY<axd&+|y6Lq9`<s0@h>&Fbzp_)`Run^43_(<*ihP7m=q;-A=)c+%O
zN=t3j0Q0IGZHowDv=be~q}RADzLsu~oCpQ#^MI_ORwH(%16wX3kSCe-L_*BB{`6-{
z2?>c0mrWIN_t0zuiv{9p&wxQJZl$25`#w}bAGp8zA=O}Qz8`s`ltiBOoL4WikG$L~
za36HOi1LB{m)Ht5yHR0qQuF<MHWZs7A%L|)NKo<6PeVmHGI7cVHem7DvWy`W=L6Ig
z(DVde8x`h)j_+@Gz34Y}B-puw)8EMAp_yM7S($4l5{Nlm4AB4D?AMAxha<~DcA5IO
z>iD;*<6^NtKrct-xAUDY?tJa+i9mt#<$5?KX_mlfa$W}g=rl0JwmSz!OE-l_wQ<D|
zpeb}7y_0%Kv^HJx($U<iffY&IIykKnxJr@__cSHq9P#8DtO)sP+hMkFLBSq2xs~kz
z+E*L^umyPv)OMnyv?kw5<z8{NzWai3Ane)bY2a-w;dH}=6Vu?q#<QN)a;TG|5>0TP
zpZ=6lax0ufB4wt5ItOSTke3I&0{}Jzm;u|FdK9-VJ^>}GMIj2hlKGR9&*`1EX4eEW
zH<ykYUgJ6STZ5+t!8sEB{lJA?0BB5Z5SKf}9%2)BKY?NM8neKFxkkRx*pF*3R1P=C
znQtob3^ZJ&{QC7v<^@3+otg)V<nY^o;|}@{smGR|JTV|H4cxcL4a$j8=1v(N_5o4?
z?JxoJ6@J&;i+QiYM8#_B>OvIaCPCGL3_2e`K?#%(01yS*rL5A>K=061K5%>IGb}m6
zGc4PZ?VMIN2x*)qZtLMa_{a5N599M&G^iBS0l@$?S-4!wlWJU_Tx|jCa5a){I1n@d
zW?I%#v4)tOl4zR!L7F1B>d?Mgf~q^fduD^(O(n1qJ}^pHv(f)B!$IZn?Jum*r9*J|
z;0yhf3(%&+?CQhdI6(;tx+rLfd)Z%3Y|N@;_^{Gjq%yz7Ss+Kyz9I-JTK;PIL~vwN
zTQ8?|PdC?S13_0Ik1)ZeBCEq`L+R#qok@r{iLjGkajVEyQufM^RYR@o_(fR804{1(
zCj7-iqq7Ur2XhtJ0Gc!j^fW$-!cm|yoWXp{;F`pe9*p;fLD&TF1=vV7h&)U?$cnfv
zeDcyA?BSe&5Q>gmj2!q*Qf*~LleD6_;D9FjTY{vgw`<W3`4h?`eNpM*?buQ59al&O
z$H4^q@?`F^W1HvS6k;&^uv3|9@6n84rjnqDKIs1S35gPm=H4rRve7{)&6_+nhD8x9
z!dN=&SPH~1Oc5u`H5-elM75=j7wTWx4vsu!s6i?6+0#|^ffN&(9-3wzkDFDyYnE>h
zg(*kG{N0;kVV9|2GH+p^%bICF+HW{9SgOj$Jr`y%)EHR3`*YMj?Zh?eo;?>tH58X&
zw8xk4cm+8Rx`<7~xG~n^34#12Jsj0Ha*lFgu4eRhQkG*{hI5~bW2Qwhrv@JB^p-#Q
zus}69G<;$>;9WgZZ=hsQpRWBN|1GD?a(Uw-z_$N4dtv^+Y^`a!WV(VC;7&8{G2Jk1
z+L;|H6V6<HFsYRL>iRZ3Ru+6Sd733G&jB96Su2%7kP%;~FtZq%Q!~Q!=y7>&VdwiP
z0{JnwJS({kA0R5`Lx7x7UO_NRGUDvn>_&;V{Pwr>N0;}_esKkD<KP7(DCVD-sQZT|
z!PO;S)l(o0qgqjmCxaVsi<XKwgTRZQCf~9?nrpZ=ljCD(Xb8>6NGKaXORaL~3DCQr
z$^B?#YHEtW)!1IQyExd`6jjBg=3QG!?hBD#S)7QJYotvnqnQbfNt4e<5|JQKUoPNw
zB=_AnNHGJQmqqj6u8FBPz8eQ)kbTSc>ESTS!FrbZiA!3+aqA1#7NE6>?=*nmGR9Uw
zFy9TDazO<K6v%9B%A(FoM%aJ_HlQQfE<sHES8vP<y$#L)ho>C)Hi8-e?K{5GNg(8b
zz~^f0dsqy_yQak+4#I>*#Bft*+!~{h12@>>SiSB2RZ~#c8~~j^K;sA1L?F$9N}E3r
zK%>rsW<GGsYdl9PHc9p;e*==uFd!wL?u1oTY_j_egm=)t4Aj+*Xvf_VPT)m(H!i>5
z;uClv=i=z-Z4@*Hta<dd6{-yzvm_6zfWy2(Mwh0PLH7WNj{3kHlqAEr$?T1a^82by
zl8K-ujhhMG9rp>&!zC9xIV)V*790o&-$s4Rx6J8akHJkYQ?U@GKomD9z8+Z5$AleU
z&#B?wWMscI*hvBG3>siS%^CD->I0e7v!+`sZljXku2!Z16WcxY&p4%q$SDR$T(UzV
zuxb-%iEAsL2leqA8QkIu$Q>Z}<h$#{PkvN~pY{rL($7;i0INvE4GPR*Q%yj^q@H85
ztROgOIaAaX9@zEZ8qbYkWi+rFNL(91xCL~*xvtZ^HphA%TwJK9azcQ-=|*oSudi8g
z+m*z_Kv!OeYlSViRm#p&6Bhpr(SCttJ-*cq!hoCDf}0>r*en}JiMmN8U+V4ghc5qW
zAHZ_veV`@>GDTlO0e;lbMB)*OUXjVJ0y8>~pM0xuf{x7iyG;PpG=3DpUb}AYd3KT;
zNf&u2P`w+(>I1=>n$2N<fU0}>9Zin{Av*SYl|uNDXiyq-5~1#iaPrz=)wgn@gp8ME
zpBd&0^BfDMVtWsdzYgUS4-^aoQXWIR)mO~87ynO_45T-(6GZZ+o?Z@4jsh)JLmwbu
zpUGl~#qGYzwvXi9DORTN7?hDgeguiKPyNAwj;Ppf@;^;Usy*^G3NTurzkp-K_9LBH
zj!Dz)2>e2(GqW5RWHp)&>EIz0Sg4TyPaI-}`bP=o*ZO(O=}QD!*T*3jAO|Ic@pnm}
zUnRf{K-uIvS0^310P76)Y8(kTcq!5eh{bj(zw0#=V3b2d?)u+_hXQ*!jC|leL}NC~
z8u9`iyVbhy^_8ci1Qz}Q9hltS^*OpWeyLkt9%zo`KwFa6%^23NGv2}XKm)PXa-Y?3
zf*xF?06adtESpV?rGts1=WtRhR1<dK(lOwTzC~+Sy`oRK7kdOYRKR(bYa1e8y9_r_
zU1lBx)IBP>%Gbs0jSb{Jl${jFzY=2K0eF%89*vtLPQgJiSPUq4zshHSc27-ve(0dH
z5=j*}4jn6Kl1Ct=C!QurpgT5hubRU~gN%#@D-MGH#2Ky-r{RENO*hZmizSo29z64D
z^5fUtHF7(xao(BDb+XmR|BFr4U=<q3j|+D0a?h}B)IJou5ywrS&c-b0HI)KK5WvNc
zBMhkKVZ~^%ZeEonOSzD=ZVdeQvIEXiO77I}<;F)anBi&zdx=>Uv$$rwjuHt&QRGoL
z6c?l$j0en&TU)IH7Wat-Y^LH_3DwYMs}^p0Qu$YK>6RFO2?MMg07mtTvqnBNW)&D_
zlchn;10;&_amr7KOXwv2V?SswuOJYO`xpRk1F|TLhhSmq-(k;`VnwW9AJpez%s1}$
z7-|QV3sA6HfC!UIDdN!G&nljCb$Oil4$}T^*z3y$z4jFxo@Xr3+Z|6o95)$3hd2~G
zhgxUGma~*@74ot~mvPMne*QB{0%EgW@<g2;Rf0;I=<Vbpr&GjpV&P?eE9wns@R#Iv
zJjSw_rRf=l0>4Pg5vRb~06+h^cNNgKZ_)<f>l$?H{MB|61Dwh-sksN*z{}VuE@{hQ
z^S)^W`pL$r&%`G1s3p`|%)aLvf5ZM`&nx~&<SDg0WW|9CsdRr|X$;&}eDkLn-t^0w
z_H*bHbC8O~2M!MmmCdf$P04J2%jOmAKEkWwc~#uFr%LQTgzlK)iF>*R5=CPc`-I+O
zkI1hqvhvk{|8}2{@ZARfX%0$Br&IF+QJd}mWpM@^`SCuI1>1+@%;try|LzOOq<05Y
zqG5(XVC$-D?!sh56PLvWKB{SFsl1Cl@L#k|4mN%mZ&<&ybTX!g!xJ`T46BZzoBGU4
zJz|E*{th1dnAFNi4V;>6iCxR*9G4^iJ-!lM)JQNy8sdC{aO^36*mTLFW;)|ZJZAWZ
zz0ZxUalupP*|>>Gk80qcu<%SbsDb;38w5jLwkIdBB8Uu+4g+NZ&EA92fV3Q8O#dFs
zM<#c=PWAWOj4<v=r*L-~4&w@AGwPQ-d;}Q&+5!*rz(yXn;R;&sCmOc`@Y^_OJ<h3`
zc03z?nnen7gL*hiy9o$f@E~u;==js9kE7v8P&E49n3VOO9Ir+bML-?gvwaRynj>Zc
zL$5xicf%{uU~C2;mhA|pd34Vuy%h<8OE1szzWATHo~rl@U-lUzw(}G(GzV;vAHZrQ
zO`sdCO?x>!dR(%%uof2GZ0H*Xk{pQJG7(NdWZ!9Q<)RS*TDdhI8bLdwHW=PtL(ZIG
z@h>KDxgH*42%67JsZ*z+l9G}P&;!-tdjs@V{l|_weC3;#(xsdYrUahySr)$+_Ys38
zp{L-=JW{8kqHf%{(U1U2v~RLOS>pxascPb7ptZ)kPnxisr>=8-1DvIVHw@1_Cl_87
z|L52G+KwwWC)Wn!Sy*nHGH7}OjW7jd9r0RyotzZ@x2h)pTwBSM`|&RMCzs{@HJHeP
z5qH>uQm{Z?yTPhJj9ehtoQC!WSroLS#zX<k0NN6VwRs-yy=3p9A0Z^W60ecTwHNR;
zH?WpgzqJd6Q#c)4MCEI6u;Ew)NY<dk4rC;Nen8U@x9|Pg^xfeNdS?h?PbGRhn|oTJ
zP&j*~b$!!2&p_M%#`Izl|0~m5Mm%_rzQ2_Fcdb2A+OU&Y_;4B2<&s+^JOl%KKmnyL
z24DnC88pVWmzx2#om?keHSi$xqvv%KBfRKkXvlSbMFh6EgCgh2ov}68e6@V)X~VDp
z9jh`!1npd)x8Z`7__b@VXCq>XcGW?DsTGL5y_`>bxMpq`foZ|*v0-ex+ZthDyMV8a
z&5K#E0Y&I7Yg>=xCFm~mDztI<gBZHV_+f-5%=D~X+3B-qx!V6Xvyk0dIL=UC@+HV_
zsr28;?Bre-kT*|>nZ_jE!`besJ;RH|C!f91+1-Bb`5K^j|61B^<0-}SBpa8Dh}BZI
zD^E+DW}H8*wy<Y6&7+w&$ew%WGOtHb8!O)r)`B@D`a;)a>)hJP?N=>-(LVQ?Rr`o$
z0pous!vyb^eR|aW9>mpgDKH8IK=&~HHOFRV<Om~+!E5oAU#d%Pjw?s-zWtdd77pj>
zMMC`H)_{&>A{X0Odef+;56tnc40i~W;Uu4WWxW={&3lcg2*NC6^qV5)AL*wDDiZ@)
zB?KPis-q=ow4E{9h%^Lwo!2AM3_g({W$zECZn336KIGnh;f9%|&5ms|JQ`Qz=4Yu!
zaw1xr|Gx3*qkzOF{8q-of3y9<l=-0Hayjb_e6WVf4>LL?QmVT8)}O;W-00j$L0i@y
z?}-$#CmB9(9)S3-b3pJdHSrcHF6sH8P<q+aOD1)OJ{{5#=I|H+i-?AK3L4zy1f&xK
zSa3NhEgLy4bbXgkJ-Z|xN%RBvly1v&a9Dtf%#CCM%PyAoudMPp!6F{+dv3JyDFU!&
z0*x_>B23m$akFI)oSBZzL^?!avb=GWrBPO(K7h7O4~E8W5F*Y5tgPNsu7S`*X{UN6
z37DYJhJj=-gcUjkGF)DI;JoJ8N)EsxS&#@a446otu<N`(o2rT}1G_@ZNj#2jGdx^`
z4!-*T=U-d+KWCWXS=@h(A$;r-aIq#$u=;R8GT~*PAGLYOXjQ!h%8=(gMx=hJitExh
zSzE+_GhxDnn<}*wbXPAP%{4x&kXtz{c_%deS<ShYze)r*40sau%7cp`jFHNxL@LiK
zj6!eo4}Q8J0QOWrd<z&<SBvG@ceJFe2RR!e3yAKs7Ocn&1Jp*$X@!}6IlwYK%I-Ch
zL$a7m=50hn&=ND=kh8i?*`Z-|9ehOMHlsGy)&^JKP@;idn#KM<)jJDX-waIJal4r#
zsbS1^1m_)48xPbx0Aw%cRRP#60tgP+*a;eo6+-W6JnoD_Z_efj%@N!GhRb*pkX>dr
zI3?=;j8jfVC<9i(<wRzTX|PK{CpsH!hp1(9$rRW}`gdbgXT+Z_<ulHw*q9s+yWnr0
z1=&mlmIRhOWm9qDWpl|0P}c{dVLMRK{>OfgYc@8X8sXnPVJ7{zLjc+0LfO(iM5-qY
z@GWj9Bp{Vi75i?0wi@u##cg`}jAXla4)<h@QSdhoO@des8vyuXSgDjgm=+g{0Q6W7
zP*K27-8E5w`~vO;h*z=D_<KD-1&p~JISX4<1e?FB2bKKY=x{Fua9mJ>2Vq!9>Jwee
zdCP+}V%(Zs;J=xQ`>=~>8*DP{f6FFG|D8=rodRrf%i@1$lMx<OJfJz@|D8={c?AaR
zFAK@75M$REIseW|6U^!cU?8t$_`Pi(y7C6OXrlhMgMns|M3>!zpv8R&s`2P~;l&5q
z4Mq{v(A~nF-VJXM5ZLo^k)_ZB`b+?n!GIPWHL0f0>EacnuSA78w9E?C_V2V>4Z*Z3
zLE6?Hb)=ZyP04e=GU$KgUj5QVu#M(ObOY#YEhq?Jkb2pIi=ZQjJ_!0L_PclUUP`Hz
zn+6mWaA__V@7!|NT_e0R8O6@}OCSHbKu|1QBs}rIh$Nv}s_9=M=_3t@Bw9=bo(U99
zN-yFSd$ZeLCdmjd8`%%5^*i;>T_?~IJUT1!VlUX}5@a;I_c8=*(|VnoD|$KHECuse
z=CPCL*O4xXiW=Q}=t6l%`8?ix9Vpe60}rCw>@>q0J02XkSI?u4wvBAkkoxpP`k!ET
z4OA|LqgNd(^RMi&0fHx$fwdI@rw&vM0-YxM)MwieU`K=wZk?|y!sk_j<9~2S6~G}i
zyaV>z{mUT{s5=!rKNpk@jZFR}jvFIflAy@JlrWoA2r~E#3BR+VfxJWN=0N|w;~y%!
zvI>D6@?7=gg-kb9b~Kl}u_D&NxlW(Bn`O8hyZ1j`ffppbro|2NI0DGy)rY1Y@cKzM
zWlL%Ilzt`H-Go#&5~=Ky38~t5zbihV;lBww8#Cjc9MoM8>)`zJ(}La^aVh5fWI%Ah
z|5SNws8F3BS&VhrfBrwG@BrlFy|P;z<$bQY!llmmVd1AkRL6;3PsS_ErRr6^SKt37
z-+z%wB|x6*lR&WYvahZ6+q~MuNDO1Gu>PPfK{a8_2F<@g7NDn%Alo3^bi)9%%w>b@
z1`g;2rw50Aq!_GT<-PX0cns3(mJ)mM^=2=DMa;KmfpUAeC0^eOCM`iUL@y2VqW*w?
zhQej@;MnXR_uQF2kI}DL#CR1!a1Q8d1bcN^wnzJ=<@s_rgSqbbs3^sx_PyqPEu7Bs
zBCrd|A;Pgl6-@^<xgO3ZqeXDFMR2tz-3t1d2v%9`L{cag?4mTua>qluTM&2lUU+%#
zEa+|S4=v)>T)@_sRCRMH2EZPU4PoxU9lgtP_@%GG2h)l529c-MZdo@OFLIlEV3PoD
z6oq^pSN}+R<OJbYP(&BU4vo!!w4_7cfUlRGU-3xBwnrXqe<|};KXm?uOXa}nP=n}5
zhn9t3THfy=c0C42wt0>5t-{~7gsXxI3GAbYE*I5+AIT~!I*f3tic{UqQk)Ov(Q9Q9
zmB-Ml&(<V*Wk|CjKulFpa~5fOrM<Z;*gZY+{0L)HP#gmXn!9;FKW}6Iu(yV4DvKf!
z_GeQER^mUGDuVRfrxFb-%JFqKQV#uR%3E}xe}BhC(+@zMSR6?hLkE;(M65-U!Z1+4
z%+wY{l{QgpkVi`l1QD3XNpPa^H?Q%X-znsZ!=dRyUj>@Rf(HKUo{K5e73vm8jhTYZ
z5BDtSI$&oMEd0Tq>oC`5%z5v~lLzHrrsB%9YxgB%<Edi{|9w6kjJ28vucc6l(^sO}
zeyktwqzHTh)8BGOoG1Cj;b$@nk}>BG)fnlHBnW->6ll5OD4$)$xj}4K(GZz`4ZUMz
zYQF%ZCgPlhFJ^HvBi0a7bhl>AnX}W=;@{HbI_AB|ULtLOC$An2>nQaLGrlKve@b30
zfiNL+LM$bfd^z~UftOCtYZ?LS{?~$wDcvhnVRWUDY|=fcFnCN`VuQA+>;4Y@Ez8k&
zcf%I1I14rXKc&41JXHPLKYlEQJ8LS+uI@^UB@(8gqO_5eNMR&N_GDxosnAA?qHIZ`
z?1bziWhz3p!B{I~85A>^F*CpGjPCn;KhO93d;YKg^P88~D~&m4&iS0rIiKr#U+?$(
zGA|J+OT6(R&FK492|v|hC9CztKv&Nxbv4-=?9{icU$>VN{F7bdR7tL)vMfHjP3Bzh
z4zrW`H6)lvohL?%qh(#;hFD&8%tBrd-#F~V*!^m*lkzqVj>jzT^y5Y>V#+f~sJhG<
z(Ci!QgMCDNxD#>uQ`}Tt*qKA#e++*9q6E88S9A~}MtlEJ*q+zD6nCtII!{vpg-`GO
z9TmiKVdDLD^9?9Kz&S8`@#qT9x1W#B%O-YgCFFQdsc&dL*UGVvZ_ZtTLIzb2WI{T7
z?QYE5sT5!7DAeuLzKV6e*8&SZ=uEU9A&0+z7T=E%s-!N_en?5Q^Z4i{j$iK)w%dP)
zm=)|9c=~<CRF3km2?;5o@;+ljR*h3D=Lvnmt|%==r0S0nkqT|OT>``_5}?kZyKUi#
zl{r(QWVNZ-o@@l?t?B*Au|nh4jzloplK+Y|kPBQj^*D+)DbM;M8nESiQP16vZkT7A
z7tY9YC)Vmi0Ct_*zejOw`buXn?y>IRul2|&x!&$Hd(FDRUk|iQ`bJ7^U9ck#k4+DV
zRq4>#iN`ptRfFHuCR(e=G>;9$C?lh2^VII5m99Bz7@JVHQyoQU47>E)ZJv$<@xv~1
zALG>P6PI^xi?2?TQ$FO9&`rqr={z|#`KxnMcb(1;COg*p1)Jr?OCy-Ia@==j5wfB$
zd^b5V^{HNIjcyudAZAT7s=h@w!}Td$lj1JDs>t--^bT=}w%&o&Owp!5{i=`CfnRO4
zcPG#KcNCAXg3{P8p>iD*Fxp39kU^3Xc`xGHL6zdH+$>TI!EQxAF|eBr1r!%o5!*IB
z9~&paN0Ha<^o1_bDBa1n6CLGJwt$MbUXpvM(OwtOcXZmfff>q}EMy1l29V?c%Qq<Z
zQ!D3{jiPBl^~gwD8(JhH5^rxsT*h3}^>|{a^Wd%YHF35YJa{f@$EAXzqV9!rxqB;x
zCF>h*r&8FpTHjOLvvs!8#i{Ql!GjkWg*x;YCq12WO1`}+=+1;d=6j)1?N)=e@-Q*?
zof+q`in}oR{kvb{Y{{-P9PAQSvLx_C`6D&@^^r$C5_<inO<(BQdZT?LKSH}1r-ID+
zV#e`3%8}ZU)n(}bm=2gY&94f%@gdHRX^AoH`{8$`NrvVFaLI9T{;!E$yNMnCAxAml
zx{nzKn?@BLy(IiZVJ{?b2oMr^#@9MCDc54FEucVaQvoGW<lPT(2}#MbyieI*t~0_L
z17D)wa2dWJlf&rK`pohr{s1Az0T3`hXt#d$gPtM5U!6X*`x*PoKA6t>Z3ggAn*^5u
zqib@CnI&)Dm^nYWiR~=SHN-_u)e+PT6<-n};*D4eD`{fn_wTRI9p}LQ^<{#PcKuH=
zWz)wjEE*4mADj9$c<AHw>0dizO0)MGP1N&!6NSlQDglLUGtN|JEP!7KGKK;tC74}B
zdCRH*^r*X}XG0aI_~FLm)$!8x()i2igx5zoQ;&}TaDen<AhwaP7Z7xTLV8Kp{EcV(
z@2|VJ?!dZ82j?f}E<JEO#_>cy?7{u8W)5#IU0fO;qIeM_aQ_3f;mDI0_Z=UfJ-Ob;
zCI=rfKC-I<iEJ(mVHn3qrgKtYum-<=-D6a1hn~&UI>bfcSFi0k0YPPtNZv=oB`fwS
zIi5UdLpCS-I8h^n$0Bg821Uv2fr30Tj2F@?$gmBmd@WNnMLv^v_x%~K$%e+*+w+A3
z_UVMVdJ>93PCbm_iN!qU$;Ifyo-8a94DD*qX67u5LLVZP+)-~Vm*y=I5;+wS(dv^m
zp2Nmc=VrE{%hiVitpqhLh;WLz_|d5Hah~;W8^n6S+UZ+lqtzI?D=`43ob=n_fI@Q0
zMTkh<#P>ItUE^~^saAu)eGo4rb2Veg?R~07+D9U=bcQr@ti~NZKr;6L?~#Fq6SjQB
zCp-=Khe*mKL%`n{-Riaik2L;8WiZo{kkU7ZM1F3s6r_o9%+R5d=F17+b!Nxt*cfIP
z#5dJyeM{!9p}QkmHSxLfcVX61<yNxplvVY6F!olB<#qh5R>7QL@ufweA42ekV!09{
zT|fOk4AM>S8DsQcky=!CayH7AvW<80ziDKQF}2o&XA+8~rUbcDCQ%XU#XZg?ljPu8
z0>q%r*hJHTdE?2KG=pCW9R0DJ$p=!2)|?rBc+e50)%lwpY%tR{6}<aOTf`cv)|?5>
zKKX0aYooY#1@40&ao<_W+4t^u9euwSe_mEV_1}ZUKQkm7VC_6ViCS>z?95qo0lLJG
zTie{L(OHy|PbG6~as*6;Xktlnuh^4J1vm}$74<yY$}?tuuPcWYN15}+R~Q8Nb>JC$
zHiUbgMJWOuf>UEV;WEIIVE~)t%78{5{{64$x$qT!M$)qM$>H$6bo5h5im@0h2I%WQ
zT0qvy;&ySo6=|%6DH$3%ptza;8K;Ql6IS<DR7v#@3VymFh-}b=0e}m^EtF62?7J$Z
zT<p_ivCJVS3gsif#A`$`XW+y5$%XJJd*CmPM>f5XQ^wtfNpqV!XTpmO6?>LuGyJ2L
zh4wB%-QIq5&+9fvHhl@-WzNYpeaeoCWQ4EezcPnHb4cZ{t;nfmYrvcgV1v(~>1l&f
z^!IO329KoFY}2Qwy-Ui=qvPUaAi_1bcz8Z5)%nQ|vF9WWx0Y~);Mib*3vB5Xvf<w+
z-gU?&Y`nS7<QOpGmxm3EzIHbLLG)Kye~eQHd+{2zOXqm4-o=^?Wy}__3y*P1Q`m)K
z+y_HSo&YW(K;?y3#zU}+<6Rk+9QkbjSDi;Xk&ry!Uv~o}{YFM_)uUfH8@XVg$SGJp
zdGRgasNA?I@ROGBy%*bf^8UKKqza>>t;Xm&(HCU1TO115Ut2k&*km?o@EUiq@R4t;
z0>DNu(xD=iU2z#5#6a~T<Z!X64SBnA^TyOQ!2AiGx4@G&)NT8ifA~{=tFrRZ6$dOV
zQhIrw9A5vKRlKG$8&PbWZgX<Kicn<wBQP9e0*C5SkW-k#-g}Lq@IW$~laj*jn<{66
zK*j`q?yobEB>_&MCv50OSf}YbdEpc~BXG6LLwvUHx4aT#{%X}dfUs}v&x(E(ZGNS5
zUg)dN3H-3rw#S+HU>JjE8=q&79i2q51a|o-l&q6`#%h9x3OWyiEWlKWcxBI(tCbwQ
zpBvSkGM~mKjlsD-P3KT|<`A%PpPzg@YwmRN#GePu0dI%A5`N+oKAlLm%wUr&Q5%@G
zJ0QS%o)Qxi(Rxuv^|-RRO6o!Hn}^rx06ltt%W+sLMlO}Ep)V)pZCSNUrS4)O-@0vy
zC3dGhs#y3hD08^SD-W{^>Ogq^#)gKodI<*;hwr}_*~G8YY?hl+&ap8B=a*HZP{S@^
zM?p}qk9Fh;Xs0jeB|P#=jB$Pfc(^6_a_kmAeozJc4fd#^QPyr52c%uJ>R^e8^s1p1
zadJ;L3D-1<5XT!p#&REh?&o#!TqLj*D5gyyLI{Amoa~dHd9MJ%8?3>LmX}cIzQaSj
zB1dEOtw78;-+aE(2*+DFdZPv|;K~T2@@Z!y82SLvWD7t(=&?7YZYps*(owVo^>Zce
zy7MREJv@>-V5y>f2%<-Kqwm&6%UclDtBMgO$ctvJho#vMBQhf+&-n(|>T_;^F2R7=
ziBfH?x~7R82~T%6{@Lga_kc_QQMTzzFUJIn8!cTWF-jOWea(&vV^r0BV~}64eG-S^
zXYlN{lh2(QdXe9NJM95hO&e1m9eiotdkyCvfK~(fwxJQQ`y2$}r&WBi3M-Ev{BsC@
z-F(xsP{o_iHnv)C#+1KLkRq{vO|lsV?Q$qDe-eeFwoIsR^c8)oWkNQkN8qSRIQJu=
zSiKHrPW19DT7qA^EAp)H_k|IIV^W|gjA@y`PX?H<I6tu^c`bkuOr4@&_Cs^;)Z_Lq
zj-(IbZNGS}f`cM{;11DXE>Fj4_kbXqi2bhamJuI}R366q5#MgS86A-+w|Y}uep^En
zi)ME=(9kaPZ`q8OZ@-(GxD4-`G<pLEy+)98EKg=LK~bao1r4SEM^YHoi3Fu(24G)0
zksgQVXyz(D$<d{cDD-R8CAB+o=&)>uVL2Pro3qDVCe!lQ`h`t<zgw$3{7Bu2J1Wk9
zB_f?(u1E=<SNLYy1SEGt1(ejovQs)susq`*Cl(aEc&Ab-I8?b^0f`KSD)gr1LQIBG
z&H_FRRJ2y_{h}-w3chKo(dIeP=9ULvmUI_w?w%*YcdM&A{6QQS|8UTKn0?b|ofc>F
z-tYTV9=c>5leiIWo*c2U;6d8Bs9B4ai+AO17MUP%4|Mb{C{dtrgHaKtX5ys_i4&qk
zJladZ$kr!H-76#?WHAT$$2c3)Iqr$%Ds5U0ICR1fOou1-QRIU!H<u)&cx6Xhe{y5K
zO%OnDT)u7XNT&Eb;%U1&s?i)-`Thq;^vsNSQ=^+<N*Es&=eMQKS)F|3_l56i)@H#U
z&Xp-Cm7IyO{6bR}bNJdQ8a)HUp?RovW9kJT4B67&Kj<^n&aZ{<Hp&;nJ*`~<(dm&;
z4>gLsJ^9RAwJe{f(fK@&FZy0HTId+@dha#<Synynbqz9GN}uP`>0)}gRIs{$P(VA)
zfg}v54!5*vO&uVjJLnVeowUaYruClQdY;-T<G(WW4b{cNJ;)ZV4Kl%<iFO%SrGWNg
zxu=SPm7qzOacgN{-@`9NG1z53y)^5W1kMcXcrOYDLpgDkWGI@Koj7Q5krI~cP3Sx@
zg@y#X93VzU?;T{-&4~LH`+J`f52wsF$R}bfZ;M5n$DnyY7iJziJ~R7^?ctvQ6c1Pq
zAy4Uh#(v1kE$j}nFQVco%kOyqN<)|UedljO>C(T(;_<Zh-2L`>%I2M&BV%WVbbhuA
z1=1_3I2)$qWi3DoNe@gM?prQ#62zVCN9hKYL3EqI0I_t=j`&8~y10<KL=S5++&MU6
z?V6C2bSWE|Yd10l>^!V1v+Ndvx|FtgClG%O6d3$qR@IF`D$$~~b*~Z7zT#gvJ9EyR
z#21`a{Z<*1<Ke&@M~NwfGz*^B{@37)aYnWBAtgoH7f9tb-U^x{YK#^pbMg>t!-3|A
zh!uP7#X^-1zAW8%6Tl`AZ#T0P7Iv|Yp{u^M!J1N}Jl|O$NschbjfX;VqT3nYgBk8(
z#(txYuIB<!A}EY0-r6O2Zn_of{)}z$j&`5&&o0Sznw2~0L2=~m`*!2on`HKE6hmPt
z)czCA(Ov7vuBqg1`cK}#zr3>DR(OYK5Ncbd*dj7XegFCg&W0%UpNN9{H2BS3dS;b{
z*G%@Y<-DyVxLZ*bXa=%CV<6?4!+dHn`X56w?VGy9uGp5d|3+JAj#q2tplE~{r)C#R
zp%$2taOm18$zzY1c=wL^>R3o$R--`*lJup6i@pIp<IY9F?+$ZXuIEZlF9qq`>ObK6
z@Fn$zn*_=>eC6^KfF~vcOp_>Xc(V*hDI~4Ypl*pNpdobk40H|#NjIA=UnD6A(yDTp
z!U<71C(kaR9}n44E=a_Gai56{a>D5+3HT-Mm>A5f8nT&x<825RZxs;CnZNUw>tvo-
zN`K#_UMc;`bBA0iywaTNF@~)i8TjulAT$J_M04&jtW7P{FIfdbjM~ZRd~8l3zL7Hf
zF37`lBB(38)AfX{jm`TYHPXEix?gHEtE_9p%Qv_SvnRY9*ePQ0g_Nq+svV}KXpZZt
z1C}`xqEQhM7-9b4(l>ARLk(V~Ew-xE#rTI6#;DZ*2p-{$Knvx5*jDt)>neJ&Z&<&=
zKkSFWlL@?Y;}eqGsI{St@V#(e`qO!Tr_d8Zo;NG{JpYYkfDgMMagxgK7PtAFAk@Dh
z+0(Q`V`U_92~OFiik$)8PL(kNtTG@u%X2A>5~QEzE;gW)y%_;3y-UIH&aeap;E+T1
z1$=C{CFdH-U?nM(T#?JiFLCeIty{j$;2?7h47VUl)yOvoCij>Ibpa~b|4L*Fp!z^f
z3Dm7(3s_j(Vbi_^qmH_2K&gge`)H}?UZZ$F92!jq@I-Xe`K3R3N{=ecqN%9{H#Ked
zE9UE;K-&KA9CFiGMZxHH>nQv1aE7rAq&4&0l)iHMq5x5p013BpF&5zlME}Ms&;nu^
zgt`AXT+JLjGM>YEArO*ZBiCPyo}-bwZ}8u~Yk!-={u@HEJfyS4F23%diyU`!PzwSm
z&q3t}wC`$l+g^_8fnRB>wSe_ln{8B9iV{`uD5nF>QEF|`C&A^lKLU9CpBnX!^V9yF
zP>_(6H~td}|7fzE$W6A%<=s4<VOp2x8F>xkbL$*W)>>HXJ@?}f&Nrl69)U_=&E9_{
z=7BvtX3BeNRw*k30C4umx#n-gd0Jm$?KKAJ4;U~%EA$9@e`z2EhByWoh(>?{*@@)j
zM(TL^Aa9)i=zsZQpc`xn?z|q+EqY^l%i4EX^Z46ki-lQqqBx@y<?_d2<hCt>G6-&r
zF=&KE2EnL;{xn+UMFPM3AWPqL3|s;Fz+xgMU6nq$gxIpN4ZFv|?v5XGZd{gVJTdFi
z;u|t4Xj-jWSQ<r2Yk*DFkMraB(h6-U8l5X5u!BE&?A(~9RA$-Io$VTLRf^E3j<g<c
zE)S)Mud+_`Xc>uEr08}`oM<W$`7%S5LN43h>BD-VH(A<E>!vfZhnI@(Rq=7cy5;zK
z6pRoiXf|M_66OY9gw#gp5|@rvhGbOmJ&!K+?kcKjej+{B;GH)e<=`^;-1on53HV4~
zvy01$cx?J^Wsh~Pg3XD>zzly^^t670->popX-Dz!0m};a(U<vdq;BeGpC7u>Ar4(L
zLH1~hgV+IUj);5h+h68i;yR{OkiiVq#0eG!*`a^z10dpQseiF++_G~qq^_cr*CU*n
z<-|PKINx-ZO~>&%$|x9);!5RRVwgP4*UlB3SijN^^cZmUg2bh+Nf=qm&}H2jZ@#iO
z9*NJwyV-eB1tU8>&x>W%klHtJ-G6VdG*rwhaKnQ7Bp8PtQi#$s0cm`#8Vf-d2UYn$
zrThFi_$a*oL3;bw;`P62^zbjPz~V}x9&9Us)4Hs5@sxn+*7LIr4VnLj`7}a&la{xP
zppyDJ;(ThfHpZ~acEh)<dm2^RI}vnhqr?`(_9oz4^5^f-?0n}_$sT`G&pYQOBu2(p
zt9t@h#|*IN#+?}i_;}7d$~m{gKQw2gfT0I{dV0FC5^OxC6~NF#$`&OGpl^Yhb7hdX
z_p~e6A%m#JdJMdkEuwU@NMGdH|IN-r)crq^&O0S8?CV|@!k87L5d>%+xj;KdZ;$dp
zsNfL>Ee>u6n&hHT2Dsyk29V$m`4_DUoO~~2UCkSxdjn6W5tN}V>;aXx^puU89;|yz
zX@opU8T{ODK7*97YkXtRh=lsm)~X~xf+4|c=L9cec5pY3i%SD84nm|FbyQpfRa~f(
zuZQY={uW7zd!V~P9jf`B*NZl#*VaQWjplEHC#K7EFuQ;;We2?R1Tcc?l(7Cy5U4<m
zYFp6LlB5xCF+A*9KsHAo3ZHKw^`cjDt9pIM7gij&Uk?Ow)KdXJ3>4452<LoSo4^B&
zz|EJ-_*R73JK`_@c0&9oK>)Lxx;9LNmnJ5G=F7DVLigX{z?NCTBfG_afUz5hIu||a
zz`SJ{X8g~{Z)ZSu1x9Y;qIV;1UljQ9FMdE|-35V-FkaxP1e66oJf4pFdVygDc$}av
z1;W?!YEoyKd;=k9KMDkTDHuO447PI_5Y5FR-1s5&-dr|~`k!*$x`74;R^9g=a|Vl+
zVDl56a_tBpb2BW!sF_Yif!SI!oi`R3?cj=L0d}zG1kyb>?49uYIeU{aD@Nlih0-_;
zNYyBCtO>xelk_z=ey}*agD#ni3lbR6!Mc+5>J@gu@sa@_f&Mqse42Rt+(Z(%%%WN?
zll2b{74W^*!t6rn0cq@teGowS!dy$^K8klRki#l}T8|a_VIUC$Z!u7?hZl?0<Q7#4
z#wDx4Nzi}TeWD}Maf>Q;1jg5MLUtF3$a;=}b;OFjE|^^t3u=a)O3&B;7{26aw*$W%
zy^S(aP<?NqXt=8K8Q%z)xe%SZ`3C<@4)6^Le9X7+J6_<!g4<y=@iNKdi!?_qj6td#
zds|V0+-RR&E6}EE8GSiixbCqpV9-+gx%7bgW%*#Bc`0~aEM6|@sA=c|SaEpJDuhY6
z4ZF363p-2lFuQ^AVgY6r^Mh5|m|b10LBfx80^#@dW24s(Dg}_AdP)b_)=MOJ%RS|~
z-yR2o^7&zc1lJ%0a#4xS`P1Dg0dO~-FKB6rwO8{U3SP}H6{m?Mvn_|OGo&QiIhB9U
z248uxpbYIhxYWYzo_Sjs)1<n9^CusDhKnzM-bttag7F7kgRXhobb=rRi!zxUl&=FJ
zGjKpUZ4s&+{&VErRrhM;etqqw#n$;9hFc$w0gX1DoYK8XPFpa$TMe#3z$youa$(>;
z*z`uZb3L9a_;}2X&o5B2@=~t%z?^GKLxVIrWuXYcZZ{YM0=oh%Oio}L-2S3A3(fNa
zJ-!#)RjC2h8}6j4F@KPH#xw><+M!rA(HNe+s!1{x`c-%d+bY4yD~)sGtVQ;C+AJgJ
z4?CWFElg2fq!w;$*O)slWnV^GmUgC*OK;^>D6|^LpK(pX{-%(Z!~T$OD5H4U;tso?
zE$!D#8tWS-qk73I{vb8@2Yq?&pFys!JJ38+A*}E6BusJ5E;TDojgyZ}0Smj$KY<rv
zpmg#(V>Qu^2lzZ2CouW36|(%*y}tS{(O7~Y-Ogbak1?voE(Yl9t$%M2uP!VE)^t<C
zB6f>k@DCi?E!t2Kp0~AOO81!WnSPgr4+$Xg_kr5&dKwk#cFZmG15MlcG6%NoU-o}t
zi|g{I?QDFfqIOCuY#hlAD`M+yhg8eA-fhM2+{;Z1A*#rnMTXo@M|ECKPQJ7z@t3Y_
zfjvHb_?Z_7ZegTrgtvhY1VMW5o564!{o$Y`hv_APncU<3K?c!r+BFM)n>URw*7&*J
zO)Xr{4^LCjQyX6uCgOc=+FSP3MFZu&QZ@2h;n>Y*Iv=mDosm=a3Bm`dNrw0Y<v1Ma
zyi4Y!jYk*pEhcdB=I}iBO!~3}N4l^eQh4tqFwWZqxr}qa2vX&6xNCe#-8<+xVTx`@
zJa!ZY0H?(x?Hy|WfT@3o+k64u=>~579Y^Sjv$gJGi7+fe)0=<5FN|OVhF}yl_?bG@
zH&)@GH%Q~COnLQC|3OOM2GmJQl54l@*Amf+1=3~0gv)8{xz(a=IEMx`+?;%Y=}#}?
z4lYYQA-I0+5(U10kkms^WlY)%BdpI!`n>hu`r<u&xfugK^-E=-fzr1Y+i+ofo4FN+
zHXMbkQDb(nN)!iX0x8OFpG*i%LYsOqsq$?>r9xj&B1t<p+B_<;(S^cF+}8S2WmcdG
zD9pJd<!T^3ZZC3cjwMqUv&1^I&NO$(IqQh~GT*+Odtwy}O~V17f{L*1hKXt4iawQ8
zj%fz84(lw+kmodJd!CJ5zmTR;NauuW<rnqflkU6;2X;HtMh#pI!Go}=iQk<Xz^bDD
zPBYa~n5nXZQZu{8ILFc`!w=2rlNWl%vmYpw1rzEWM>&_%IW1^}BKnzvxRTXJm3EUw
z$<!5R3Kg8R;~pBiDxS}RGN3Z_%&2oaKeAQiX+ljw_Uu{mSdk4UmIA%Cm|mH3!4eX_
z(km7&d3oL2l=|BIl?K7bQrt6hR|tcokzkF^jPogSyq$x2)g7uL2Mu*&9?D$8ZhyDt
zj8xFH|8P{vWaPkOY!!oMUZxOIVq+=A$sUL<6Ha=byi_=jN^KV9`%l@cI?kso?<w1U
z9!)haLyxDk=f8@2J7m7ynpN1fz57>I@_aP8?9k;Gg^w(AYzOI<hcvEOS>n!J%`-{1
z!iZB=g?*9c4@;|1HF)3Ks8b0ZWg=+LoZP>9<LuhnAf{?)H+u{fPQy9i{3JrCdbjgf
zx6&mq-iSyCV}9(p`#w9nRVRmE+^y$#klY~c;;P;*`d-`TeQ{$S&96nAKkVZO>)HQ@
z%DRXB^XvzBq;iwYh|9}E3f-1fx_<N2j%zFHmST0zoQw_YGGQ_xK)hjoFiw?Sx-wz}
zAEiF4dwzlE8?OB)4-aBwgf<;H05)f)M?r8Ekr}N1#hUD34Kkxe4)|rM5H}2O^Cdku
z?VeRNUuY#@_u7)gp4qg53GUA4CIY2)i@$k5%<gH_Uw>y8&Pp%1JGa6v^wq0!3VR^?
zAKhrc!bG`PV1owb>OPgW*TauwKhfbb2i2a2t8nRO5zlvR!JhtGO)l|W(*YG|lLBSs
zDgZE8-Sq_f4Ix=QYn3`FeA4<mko2)G3RR(32h~~vsWJW4rd1ML7xeUeZ)GT)m4?-c
zL2;bR>_;Sy@a1Mt-RiGXn8>Yd3>?yw0^9r@ePGh9bw?i%W4D0ooy?{=zS?S0jxrMR
z!A(rMY+8XUl>|*C%29><Gs|bI@@K4=ru1*(KVrK*q^m|D?!{5+*nk-24hIY_p_T=(
zHyRpSj{yV^qKPiyJEzOAAp?08c8A5J9mAPK4^Z__Ms!asfKxImqkQB@hEW0Ims6UC
zlS>R)p#O#_D+Kf!>+|)$RJ3=Q(hmp@DN$krSPWVkDsluSrt_1Mh%M3P%fph}t#gK|
zp8gaNj<OlX#5`=*Q$#>k4|I%Ea1;=30W&nl@iDl=0Xg(S7GD<a!h3^vSD%^v)(`CB
zs`0yaN@py^G1CdsIrwkXwhYTjFlu?7J+|LPPRE<DeQ4wUg<nFquTp7c3?BaAQ(IQG
zpvI7>hu*fH-02*nv%+`yMipGR*~-En#IA~}aark!9BcQc-O}3fRHTko4<O6@>gfz8
z#ft&_&lLqvNPcrk8S_GfZ)rXcN02l4g$MatzzbJdb7pfcPY8wYoNzkfO(6Pk0a8Or
zIFE1kF=!D$tqCcPTG6o*FMczj(nP84MdQR^T}%>y8Co^+E}BZg_K~5-!7xFiD!9v!
z7%L_$z2#5k@s7VW3yg}cd8uQYgVeqy0*JtsEhM5*;W^B&*qRWJcs_??R==7&mxLGO
zG=4?LVPooREU!6;7%?irEn2&!!)_9nNiPu%4BZY#(-6tAR{!4m(dq;QZ>Vk^AgPrh
zol|u)$TE3v>8bFg4sZ|p%1yHZ(QC)GTd#oXlI7l`<=NnfTNRNVEaa%Fj??<liGT`1
zLiL4Bzr4!PTAQ`MRmvc7&;SIoeaaZaf6;CELXbXb{Sl!fVbX~rgS6i6?)X8!V6Y8c
z54NFjEwa#k-p*bVHgRRS;M)*;nXh^)nPk0#XDlaUj;=v7RkZ#bQUxHTQG3}%iV!aD
zh3@FO+#}9r!Wy2d5AwYN*IGy(=^OXIm?d`^<(`QQHJV$3eAA4kuJjaykdi3X%a6-e
zl3#M8_Txab<73GEDE3k77e?bH`H-;DWMf@?Kn1Vi>|MriL_gHn9{@>XcP@`aNdkYn
zJkQ7Y?*3bAc+@Y82^IVpyqV{Bm_?EAqkm|G#d{7M$fFa)t0tH1=8T(>fV26+x%;Et
zOG)Iay>BZ8!*qXINF~r2CLBJ~&Pp^MyxoWkLnb7)`e!=N(!12h@0Id+{_5`CWK&_Q
zz2x-xoP#j^Bu5xj2DrdLD$n|_U&KF{RDJch(CXLw!#gVUo%ntvWsv^pXJCbxm|F&+
z5>lJn52CQd@)kDDTM|RQo^$>O@03Z|@U2D)GMARYF5~Lyzx8{IsjIoVyeT9Mob8oD
zq?1g%6@9YC%CggT2#1a5(T<!F1e+5jL?+Kh#$R?o5DD`*=Fw*|HXCj$7QYP*dAq~^
zgF0^wPe+8$=aE8ZRpEdV7Ga18Ar-s~NwT=Lvv*6j#Lg~?18+-UiQK>ZH-{D?t`dA=
z;8hD?*Wt~nu`_?TWjs-*?dJMlBI=%?<@V(j@n_F{44ycsLJhNNaFp5&Ra1EJ4LX3^
z9ff(w$cWRd#%i9FDiJXhe7n#e+-}G0BC`#-XaV%K5DFzOwYQGf8}V>PF)4(243#@X
zy{3*#PaANi`=+@rqo|YdWH%7vE=J{@50C3(_4Kjgfa4D(+a;jJtr}{59dMnyeaOHs
z5R?vtjnIxQmbh7SQJlFbF1UgEb1?H1n0W@xZEJ6vjnBA^ew<AOU*uHO@jdtUvvl}@
zCKI5_R*wOFLk6VSV4R+Myue-u?MetRkhll0dTO*tPWRMei;VQ!-!6mxUD>1sH5OG^
zs8(1|0B^@6wN<wuL3XyVH~_kN^HEKks3Yq5z_`%tS#Y^G@0I<&i=tRZpW2p8Mx_qe
z$BjXNO+%-Rq77CpPZY*4tBE6?D>5kqns9adp=6-GVIhCoU_?>ywUFT_SP-CM4ZR7#
z4-f2U%fWE@i?zT(6)0F*SXi7S`^>cE1k<X{XMvH&)4~(<9P`m0=A)~3U46^6YJ0(D
zf0@_N$i)EH&bux1Wuqe?T>vpdcVK%AXttpW4c^y1&z(#Es6LE4r!cm=ZfXDPpV+Vu
z3G)U$DadTWF5_)<a(K@iiaQY?2syc4uw^~sa#-4Y5m!M47OF9IH$<uc)Cal9&1bQ(
zwm3+$kJ^y!TeRQ@1lX=m*3XSvRx!q?X7!0iMvw1~Q%R~!@tT4(t*3|I{AoJ5dB>0Z
zm>t(`?u=Ae#ND9wOx4lp-1F6rvxx^M;>L3Y;L`jXF<FL@ZEg@4+G!9n;1Fy8UKnn-
zS;;BeIp3^Y&erFMi1nkG?M|TMt<V3%(G@un*K6l38Fm(hv|Lt#hXLv5Ho!%|o*7mk
zc;tEQ$pxURNvP%obZx-B&9hKkuRMx&+VIdxj%6jq)+s9&FPmLIZr*UwKyT;RA>)Wb
zeD8U&t*3h$v}=vdW;w-V&eAW$r|7g#d~6tW9HPA%FSi3<7wAucUNOCdN`EkSs{`tT
z$7eVVC=)=Hf#g;Gx<>K()H3N?7{kZ&?#$2bYNbPg<D;uJQSgqt7Th*K3ThNi)hJS@
zNC2?FteZc(%?})3HY%UFng_1GL(}v1{5Y6-z*ET+s{RVgpG=tU6|1uW;hpOB{AY@s
zteC&7)ilaFCJr@OXXFG9Zm#OAq+$m;P4yS1YJ4jfz((TNwc@$Yq3&WptZ09snAua7
zp;04F4Lt1<Lp>_fvsSl@Sa;3#q2@>sm_*nQ`4`mKpq9{FuUEi&fWzPiUZ3EZ{z*%C
zQcJMY8CmL57&-qVC90COu&_|T6(51M#ln&R@o2O?4VW+|ZjGtyUf8%C5Wh@$TnP4J
z&|r4P=cqp|z^b%!!mgCEY=fZZaIh>T+=LZ?ve$4u;PM|MX?xx$K#OQ$NYtLFe?FIC
zhFXJL^K@+D_YPI3Y<Asll)qU}bJ((GeL~$8N!J_YLc|j>J-ugVuQ_3uF`Qp^Y_f8(
zQU}b#HqNgZ-;OOabn!!*Q@d>~io6Q7-+iHv=WlS*ad4V)4A%kZudA_5q|$X#Z3p5#
z6j%ms4H+dwxN;PwyA9hU{dv|lS*vyOB_9U@4DT<{ApN!hI?)idI!H}l{$pm13}!Y>
z7y0y7cHucZW3&unGv$!?ES|FvnHZocX!kD=V7TV2)2z>1AwfBm2@fT3W6d>Gh^cct
z_co_B{*2Sc=fFVUI24A1xY}j<dP&W?Q)B^r>~oorLjQm)_hN_3bVaz0FN%3kgOpB4
zzK+cNp_SdfzQA{)c+ICD@!eyaho$NPGHo*>oe(?`yOiCm`*nDeU>#_nOj=}y&)-d@
zvOrmIJB)%U)To{x-AKgSnEkfRMP*dHAsezBzHFwt&r-Vqfcr~46|e#~z4jp0H4Ozu
z!%$!pBF+IDq`hrfz1C=#@pbeeRp3p~tx=HNFn1FiANBmNWr^H!4YzGDg7%Qb8$L_<
zNrrUF+hM|-F!LXi7Cug1QscA`7)J<wVhcpEg{T03LUEW?k#TId2=T;*4dd3diP1l5
zv_*VgW8cJ2XPDIsdu#y+t`<5p+&}9qL%{!7TTvC_mD^|ID;Vf9Tm|pCi(Nb8%Z8{4
zOwPysyM=%w;Esp`1S=M-36{IM0=pgqHOf_xr^~orhJRE+89*fjK`k1x{D|uWdBIFv
zZts^(xn4s{yaVuA{yrtc6td5PnyUcLy-_`&S17-0AV#O6s+-iYDzRtGgOyc9+fbIx
z;hxUIJ%#yuNx@$O%D29=URLc|^GXi-3O}ZHS`;_rm|W_6GF>Ofd(wy1C{pXXvAvYF
z>AAN|fYw6DKt3kqoLtK1(^09qf}d!Ro8;D1Lg8)It@qFt;N4Q>7g1rgr}cQ0rZ$p`
ztpGFaL1;=*2htxfGcJ70m#;-xGaLT6((dg8GY&Kc1yD2>Fu~0B=TEI&dfwdGL(xee
z^B<V`YQ5}rS4By8Q%28pohaebWQ)emX8PBQ!yIcF_W7$ha&HTat9GFFqd5jYu@!3X
zMxWT7apPTxOmxT)vQ9uUg(m3y-Zi-mwhr{4-Ao<wj)q*4MWfo9VB+NtKhJUhUil>*
z6APe~9`Xxz3#%l7T&}^)dp)A?G&`{mK)@oY`rm4@_!LBH;(0$-jcp6SUNRi<<(fJu
z%(Bi0cd1vKz!js4s<}3n3@%h?R>cUt9Cw_>?<P_A4C8$x`A6vE7x%n&8+iNyJMA3^
z?LzvFxH36*>^j1{G5e<ho5Tq>uFUG1f9T~9;mE6Ap@MkxzAlx+l|+pR7i3b;R#N@m
zc2nG*Jg7gJh%uBGstWn(8OGC@Km-?*dsyCF-Ho42xXmhIb*B#4Wr~MoV8zTGhbo_d
zRLxB+;tX#{YNu^hkr0$913ok1VYLek%`>sW`92lx)@1IA^KGeF(S}DtDcyAwM^{rG
zwDip<dCT~UsyPn*Ts{&jShe!4+p@+JvjI0z0@u+B;`8l7>@e{RtOUD@W#mpscBd(4
z^bkKS^kMVQw)l4!ayom1vhKQU4JlKbd&VOOsas!hJFQF9muxLHArayhB?ws%*HC5R
zsBzbOXRmgqi#IM6)xY6Y_wPWYzlyE>D+{$T%|F^Qai(e#)X3R1OP>XsxZK{7Ev7#l
zISN0@l%B}k?yOQS9<T_At$roY!S}WxA&BG~Na8T12tTDbJH$#`mWm1Ibtl@<m0YC@
zO9_^-gZ!2mbq#JtJt9Tjb<IC#tE<UD#T42_u#{`j;t@I64@Uc(bF3}aF3wN(b;=jQ
zgVXWk`k{?gH&)YEQhLkrEdQI7gFA1tzPxu2j~9OmI!8~@Yvy{`N0TB5-S07jlq`%+
z5*;lye`q06*+ssUDJS=GEI1?gUC?d1+1>yf%sOum%EZz3(gYdXl4WPE7TUbkbjCKA
zCW764mOxMPRhi(A?n;jWm~DQ=0w*ma2DSRTYf8$hJG(p&&K5O%^T77`_>nn0IyMcW
z@gTn~8g7g8^Lj+zwH6;lu_n(J{<!?CT}&&3dJntnR)CSc)7(OOB=2Ds^A=qH{zp<k
z92yd@XE%;Yt9ouw)GYquF_BMy<FfmNi%v>KgGjCR5<8bV=7%ZQ4dD6mD|xoFf49;j
zZ%S5_y=ocu%{$#HJkunq>=3c=(AualMfJmSV;8C8-@!!b#0%dnCSQ$hcub0KX+==J
zLDMCXFMag2ADhfL;!$W;Q-}I<Gu5wVgKMYkEITXltc#Kf$vf-1y^UC3VW5~uqdZiF
z<{c)>s<V|I=@g&p$zfU9aQbF+scT%Z&ozu|#H7W1rK2hx#iEm6!}Fvfk?QT|CGJA`
zGtIcZVtTiz98K)!8yJ6(4|*5w7^RfbC%cf2*1F7<<vw()(dM64nCnhr;3_pA%XG{2
zj`%abPjOT!x#L)(08t$*fsNJd+}c0i!F;c)7}JQ66lmK%6I^IB(e+cIPWuWY{4$E=
zMBLUwDB9g#l%UhIJyjXIo7}DReLD3XIS)^bD~+F4Bu#aMwHogEV2GtBPl)wjwl?f6
z%eE8oFreorE5zaHq&M!1u6ull`X?Y!HsroD?jt;4`un?;^&Q*u)bQ}0fXscScDq}W
zZ58eq;@%X|q#g4;2(GK|8(e5LFk0Z|xqz*nEURbIT1h?M^OQRCME*oD?GA~}(>yvm
zE6MDy1;f~>)k#=TfkSJx({b7};f%s*4Ut<U;flal$DEObPZuNN+w+mj<)j6x>e)U!
zl*2{X$q$?0#sO@`7S^#}%$GBojK9^)E^Vx|tD2nLpsp3@#7zW{xig?g`_MAH&^2?J
zqJE@y1aqz?F@fu7hM2aT=T#pw^A7HrJuT*Sp&F1QXbZs2S`g2TDa(kbNr}@gmTB$B
z(znz-1q!4OQ$KX@WgDWtDzF%;05DT<1-qBx!egfoJ?G$rSu)eR7xna0ZKx9~t8so%
ze@Oe<*&3g5#hd+L_X)+N7WEFKUT-MgjyfE$@ohmGhGsU>8UuMRyc9(A5$^;>Q|&Pk
zV^g0J)76u!J=e^szU8v(i4#jDLgdag<Qx-v@5!K7T&))6?hzqv2k%rB`<1(;5-%JR
z!D@eKww6TwQK4>PbQP#jKA-HR>WU1~mdpE8c%<dKqJKg9?^Hw6dtr~TRV(haRfgA0
zJScO$W=~}QtO(`$H-OivD>TSezv)>gRu<U6?5fUfeE<6kS!>QBwedKeb$@~Wr@=0j
zI=Z4JyD|pkWG{kjWJxaMm3t**J#OI1z7c5E0DTF!{NT-XSaLW>;A9kpsZA?GOE?BY
zzjnTJ=$keSI}Xj?WmolWUL=2XBz@t>)eD80Ofa`Bc9}*(ykzzw+K+UrBMY|x)&lPD
zrfRu^7gx`)f@dV;HMmW>p`fJAts@BgivBzuZp(HkH<(>w7<Dqt@Vd!jcX@=UgSv%M
zzZ72$54Y{55u#`vq`=Yqac1Fnzsk`i&_^X|+bsDQ-*ZwgN4&bNh~&zdOpaMhwb{3e
z1gsS7TU2L9Ht!r`{_Gj{I~YOhm@hBtnN%^9OS(wlo~fs7$~X_bN!=;Qo?Pjl;?sRX
zm+TvKE{Y-RRB+PI$7iL%Q01vh6=qcay)GQW{*alwww6(T3#8uRm)J_dFWi0T$a?VQ
z+SH_n^V?uf7axmg3yue(nW%>17wbA`W~*8}K&IZRWMvfd@4|#T*-U=SCcBlfHHz0F
z+)7aYr8{`RvoWNl4iw%ZJaO>!3HK&it9Zs_il%;;U&S=3+m|#|pIFS1q6Q;Fc$*s4
zvan+l+XC-D{R92_kb$4;k$?|P?@V|sE#IUTo+t}DWhk7N_*EsxH)iUv%U0+W_vxW|
zmk6npS5xM;+aK?{u5=Ws-{v+)MMCVs;*H`Xol?=wDEp%fXydfl1MNRO%gU4D_H2{9
zZ4!^m%&WG-te|ME@S^ZTr#bE^3*VCBv7!|9*TuI&A70-QHAcZmf%-t}-_SW!NIKN(
zh2C8%Gmd4-^4l(M6(jYazi-F$FH7y9vrs2pM>-oHLR;+Id;YL=I~W5zG}o3s)l<27
z#hCxj_0<CCX8o7^WI}W+D%wNU_T>EZu6fbNruGHPb1iw?c=NhO<kmx<_3$?+Sr|I=
zYyc(}qiJPuXPvacYyrF8N#8rqYRfNZy70(xH8gI4G)&7RrCX0XO^}+wHd!1s5gMwd
z(`i%T3H9v%0hs1~f%K{zUiEvl8x!C!^MN|0xksJTp+1H-K}Ee5!0h3L^N@1B*}((S
zVGx3z50Ex{tH#}M=|_}*w=(o4z~ccni}3MX+GtybFO0f1+2?toXuNLKnp9xJx%}QF
ztd83PGy^)a+NvqLNG6t%9p<`t9x)$Rfya*~1QO8oMp+rZEfAwosa-119WNxl5=v|n
zM->vrjsqlNVR4k~ws#`T-ln+Pxod^F8)F>xf_)5DsG8$>kz8CzkXwoY+YRMsREG|w
zf@}8NBNndt!I!H|xd%-JpJtCuB~p5R{#Ug3(xTfB@HFt|3jji@3$MJwm1M%WT7WQF
z4J@0t^Z$~F@*=4Y2r6|>M9v3S2D2C~fVKmj6xb-xLfsZF3c&4fUCw7c>~0tFzQVmU
z>bq?DaajXVc){;o>*kn&ktT`D6NNQ)%6uBDC@Imc1F!)SVxSH~r*dlxi*Bwpz&7vN
zEV+$W6uEODWB_F8k|&oPcYP`W<+_>I!eZL*h>jbRZJ<3Cw~MCLbvvjg0DAjMAU5Ls
zUxQAHL+T-T1|I1JgucR1=s_5)D$ifN>JSak8n8TH19e&M5rX>qFmegumk~!*^LsS=
zEYF*|Pwo8+L9ASg`(zr?HyiqtfKPV-IJ`wmdnRA9@0Qty#nF8d#UpLMwEcBJfSWXZ
ze-HOfbu-%ro^zKq`7gFSr`k;4EGed4>dkADAp-u2zG|yU^0;2FtC_zIcLFh8$!S+$
zeS=rZFc)iGme+MfibtILmh@WxkULhG{tJ}Wma$6IA`V`{LOjy#;=zmOkf(&y+>{Ac
zNiC1#TfBpAOQP7Sh}XDY-vsry5Fe?%c3{eQLdkITYWm`mTpJ;e<L>Rh(Z_J=v#9$s
zJl?;1BQGABANIdqWMLA^c)E}KuC$H<UoPg#QY>NNtbuQ8G`>c4IRDn~>vaV<jFQ|Q
z4$lZ9F~K9Vx4OfW`0ax|4aRbUs4g5O!B8lK@$YWp-;KMfzST5grua2?ul+AkcT(dn
z`po=%5@&wW4{h31MK8=@`ML|f*j_@idR_B*l07lW{tWh-z?A}`71hrBLRZCG?)F4a
zzttg~o;5R!my5p6!3!k9f-%=r2IY#eI-*z|3L~Qu`!?bk+O+S?=9tPEbCouLX!jjG
z4nIJ<g~mOxb&g!h3iwGEn!oB)m*v{dBEk_ncw)^zg;~1Kp<6(b2zmVB`)BU~JL$mv
zc`<gs7+Z`?CO1mmdY{R)40-PS#7u?uIGeOV8dGVqn~XO0Q}GbJ_|)yLW5DIdO)jV{
zX=43wWdyWe12jl7)A_R)zFcbY($L=mRZFO9eBlU4%-r7Ig;pSt-a#uGci^*vyekJR
zvcTZO{2+kHfT@B_M-VN;j-_TjX67OX_aG}H+JClkP;nilM|F1#`rS$mJ8j&fw#r=8
zBUoZtfO~@BXj~)XBH*(P(+ePgfriGGO0h!q;||#Kor^;{0ykg5VeuCx(0N(?IeNN|
zooM@Bz)vM*f}x8ajM<948X6VEucg^3rP(!$y{ogp;n`#g#dyh-<XG&Dh;2~BjIyCC
zg*hD&y7~VApDs>6Y4qW3vC)Aqw`+#|Bu;%D^jd7U&QKHtB~A=r!(em)Heitb-jEF4
z3q>na=^{Pwla`Fk;?<Bi3NWc<aE;LWan8Hbt0YQn-t4fCx%i0rW#FWp-k!|D>3sp`
z2S)Kl#fcG_wDJ42UfVm~D@a|~&XV%_a@&Uqvzwtl3KnN5uPd#^5}HQ^pk%eIPFFm@
z85U1ofPGF3Ui$g(dsF>91lr?Mq;~cF;9vk?*?z9&tt~t(Z$@<Bpfhvae4xH2j}<%t
zp>wk9p4>ODUVR9&H&tBK*=w&Yta&Aty1Koxy!}wUY7uk!>-I&Qx5y*l$YuPc*=tr*
z#O0WH`$SJ$tbGJtKfADwo_=TIo~&EH<DQ&Pk7p_&7ghJJ=!BXyV4rO$@Y3l@M=!cI
zj}`cqJFc%GQ_1@kxsf!{6D&!+bqB6%8}p%Ex4}qhhlyka7&3qZ&7M4{fI2V1Wr)`c
zy>-pWZ4>{Ptymv#ClYr_Rlqd&Pt;n#1|RUCM>3H%k@y>?)IM!3^YwfHzVm@*e4gf9
zzM(8I9I3;jOYMqgV;~~%uCy^tYiT=;12P*`e81CUp^C+8yb-Q(-DAP3$Zv1{_ef)V
zICD>CTi=Nzx%8kOW>(lXy$!RBPa{7q_8on_X0+pv>YG4Ngv-?+VPLr%+IW*;J<~D1
zy2Wi$Ep&0c5Bpq(WM)Xk3Pt|^ga|9T{(P5@ef!-VDbmxmC%^Kww3IG#PEVm$560VF
zKXdM~1C%u2rrvvh-62W;t<<K)_MJelmjB<Od9=|)ahI+91p}5C0GBl>1sU!Mc5y!{
zw-3i)`17Hu6Tl*7nLbR5{liP`{)zxmufxHmtASRR<>L@4<;M3ARBWZ$Ql@Izg}X9(
z;_5^yy0BH_Q^vFUay4t+)Kq=hIfVmJ+H+k>JIAI`jO|qqv;a1a82_Pr!e<6?(en>2
zvA1%{(O_Pl2#Oz*aq9T?YFMiJcRVqKHXI7pGH{FSUk~95K3uA3xcefz_i<m{wd3^s
zfU>9G@X6j~7~{}O0eD@duA-^K-;IV4%BnMuk;5K;5aW?7cLA%3Z+bObpzie~l2T%*
zDpP20y3NUNLfCKJ0=Ha<n*-~Ct{TNtWS1<EAc9&`%N=nHIP+NjQ^mOa!#u1mD}ke1
z>@_@PeokKPUgV9bQ%c=MQ?5Q$iJ2y$RZ8zJ9JyA7H;|BE8bC9wSfl?0VJQo8qkh~Q
z)a9V}+G<K@E``uHq#;Kjug~;Vy(Q`2$q`_<M+_}>pyzyWyWA#U`(~7f9x|0F^)Kk@
zPg66W4fPj8Guj-7wVNeeOJY*Lsr??RwL^Q6Av)uNom#WpHQm`$*Z-Vwcpbi}YphG@
zaR3D$mETV7p88}XE|W=Jo_J$sMJO2djITOVQf!yt8*ta>x)t@tG-cq#7>9a*K6x#{
zX1Gjsl3~ETwLJaNVz_oVj!t;gUYcRt(M7Fyn~5vS#7<b>ZClfDKF1p<Kh@-}U;5j2
zVu}Q=TQ#^9>xY$$)BBf0Vo%+HolxZ=t5&ZX_<dEsnV@~cew0pXQ{+h%gp3WH*85w2
zo_4XfBG>qC?K7+?NTjYgbHlr=jnx&^M&p<ywPaVf8-{M#^VdC=fz-E&ZZ8s%>E4c%
zc%-NLB{s+(veA=wNt?=a!h~BXGew@sFTaT$^jln(a&K?@2iCHAowHaHq?A5eS{epA
zU;4YgnYk<e%PcA=oyomQAvJ4Y-d%)7+N9op04n-XzvhkyEinoIBVBM&0VW;x1$ddN
z)4^Dp*A73|{n{tOFH=du20`qF#fQ=>h{>}}2Hq$8TVU63@vCpD%hO3E;}6y?)~OTE
zt>Ec67QWQ|Nn?f>zZ$7{ayGt^8^eXP0N?KL_Yv=4H~(_Cu$>AqYLTn=Nd$7kH_s>g
zBtuSyKban@9QGFsEeOZ7d5#>9S%e$PHA<0spK-v~_MYFiGw>YuK!j07qGA2~pUnjI
zF!r5+{b)l0fJb`%pKy?UZ}0u=FW~Cva5{i~K#tFN8;|4eTDVUUtTTod-m*0|EEdp%
zr4J+L;3KEg<ToWSesRyF|7!ITT=p@AuKjZZV)`!JElp#Zt&_edGL`mZ9uulnKV2`h
zxYSI6ruUp2=C$%VXx_32ps1T}0OE@&HeQc5I9>fR{9sxo7%9T*_Lrx;xh8^%o)-j5
zxo_ymT}|Zg)1!Ty(y-;X;l9N+1dbbDZYqA?Uh?f$?t8WNtvns7iOVmFCno6c*}{FV
yKM3-HYn!>hBWY@oXfFO5VyL{B%7bE##o>AK>@3kk>{1E(#{+v!jk5RPLjMma%9wEg

literal 0
HcmV?d00001


From 95bbe6c4a5de9743e77fc99b0b4fe38a1e36ebbe Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 30 Mar 2012 05:21:32 +0200
Subject: [PATCH 0613/2585] - updated

---
 .../ece-install-introduction/presentation.org | 49 ++++++++++++++++---
 1 file changed, 43 insertions(+), 6 deletions(-)

diff --git a/usr/share/doc/escenic/presentations/ece-install-introduction/presentation.org b/usr/share/doc/escenic/presentations/ece-install-introduction/presentation.org
index a3e48c7a..0ffa3f8c 100644
--- a/usr/share/doc/escenic/presentations/ece-install-introduction/presentation.org
+++ b/usr/share/doc/escenic/presentations/ece-install-introduction/presentation.org
@@ -1,5 +1,15 @@
 #+TITLE: Welcome to the world of ece-install 
 #+AUTHOR: Torstein Krause Johansen 
+#+EMAIL: tkj@vizrt.com
+#+DATE: 2012-03-30
+
+* Agenda
+- What? (is it)
+- Why? (should anyone want to use it)
+- What Does It Need? (to run)
+- For Whom? (is it intended for)
+- Show Me! (how)
+- How? (can I get started using this)
 
 * What?
 
@@ -16,7 +26,7 @@ and ...
 
 Full automatic installation of:
 - Cache server
-- High availability (HA) services
+- High availability services (HA)
 - Monitoring clients
 - Monitoring server
 - Host self reporting 
@@ -40,32 +50,59 @@ and there's more ...
 - Proper logging (yes, there are endless systems were this is not set
   up correctly). 
 
-* What does it need?
+* Why?
+- Instead of one week, you'll spend one day, perhaps even less.
+- You will get production quality settings from day one.
+- Benefit from best practices from experienced Escenic engineers,
+  customers & partners.
+
+* Why? - II
+- Web site will function better from day one
+- Web site will perform better from day one
+- Reduces installation costs
+- Reduces maintenance costs
+
+* Why? - III
+Not only for produciton environments, using ece-install, you'll also
+find it's:
+
+- Easy to set up proper staging environments
+- Easy to set up proper testing environments
+- Easy to set up development environments
+
+* What Does It Need?
 - The latest stable Ubuntu, Debian, CentOS or RedHat Linux
   distribution installed.
 - A network connection
 
 Yes, that's it.
 
-* For whom?
+* For Whom?
 
 - Professional Services
 - QA
 - R & D
+- SaaS / VOSA
 - Escenic/Vizrt Online partners
 - Experienced customers
 
-* Let's take it for a spin
+* Show Me!
 
 - Install two presentation servers
 - Install a cache server with load balancing
 - Check out its new self reporting module
 
 
-* How to get it?
+* How?
 
 - git clone https://github.com/escenic/ece-scripts/ (or zip download)
-- daily builds of DEB and RPM packages from http://hudson.dev.escenic.com
+- Daily builds of DEB and RPM packages from
+  http://hudson.dev.escenic.com
+
+* How - II
+- Documentation:
+  /usr/share/doc/escenic/ece-install-guide.org
+- Screencasts (instruction videos): http://www.screenr.com/user/skybert
 
 * 問題?
 

From f35707fb096605378b596156c65f946176ddaad0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 30 Mar 2012 06:19:12 +0200
Subject: [PATCH 0614/2585] - presentation ready for the masses ;-)

---
 .../ece-install-introduction/presentation.org | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/usr/share/doc/escenic/presentations/ece-install-introduction/presentation.org b/usr/share/doc/escenic/presentations/ece-install-introduction/presentation.org
index 0ffa3f8c..ec66d2c8 100644
--- a/usr/share/doc/escenic/presentations/ece-install-introduction/presentation.org
+++ b/usr/share/doc/escenic/presentations/ece-install-introduction/presentation.org
@@ -4,15 +4,18 @@
 #+DATE: 2012-03-30
 
 * Agenda
-- What? (is it)
-- Why? (should anyone want to use it)
+- The Challenge
+- What? (is ece-install)
+- Why? (should anyone want to use ece-install)
 - What Does It Need? (to run)
-- For Whom? (is it intended for)
-- Show Me! (how)
-- How? (can I get started using this)
+- For Whom? (is ece-install intended for)
+- Show Me! (how to use ece-install)
+- How? (can I get started using ece-install)
 
-* What?
+* The Challenge
+[[file:../../images/ece-architecture.png][../../images/ece-architecture.png]]
 
+* What? - I
 Full automatic installation of:
 - Escenic Content Engine & all plugins
 - Escenic Analysis Engine
@@ -104,6 +107,14 @@ Yes, that's it.
   /usr/share/doc/escenic/ece-install-guide.org
 - Screencasts (instruction videos): http://www.screenr.com/user/skybert
 
+* To Sum It All Up
+- Full automatic install of all components of an ECE production
+  environment
+- Production ready settings out of the box
+- Up to date, generated documentation & monitoring included 
+- You only needs a Linux machine with a network connection
+- Daily DEB & RPM packages available
+
 * 問題?
 
 - Questions to tkj@vizrt.com

From adb589d4ccc56cf7e5e47f76d44f32e7e559bb42 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 30 Mar 2012 14:04:45 +0800
Subject: [PATCH 0615/2585] - removed some trailing newlines

---
 README | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README b/README
index b451695c..5fa16361 100644
--- a/README
+++ b/README
@@ -41,5 +41,3 @@ come hither!
 
 tkj@vizrt.com
 
-
-

From b15cac9d4c3692c733031e31b59e1e7e1f3a0368 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 30 Mar 2012 17:03:50 +0800
Subject: [PATCH 0616/2585] - added times PNG

---
 .../2012-03-30-times-online.png                | Bin 0 -> 437846 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 usr/share/doc/escenic/presentations/ece-install-introduction/2012-03-30-times-online.png

diff --git a/usr/share/doc/escenic/presentations/ece-install-introduction/2012-03-30-times-online.png b/usr/share/doc/escenic/presentations/ece-install-introduction/2012-03-30-times-online.png
new file mode 100644
index 0000000000000000000000000000000000000000..a84b65908c197dc91a80b342db3096fe05ee7ce7
GIT binary patch
literal 437846
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%0DL77{iFS<<H!4lR?@MHkE^7;`Ml>Cdtaqt
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%0DjwT)S5M~V2c+mx7UV!4WnJjD%FU!<o&y-LC&W2
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
Z{~NNR=O$m}sD%Ik002ovPDHLkV1i395EcLc

literal 0
HcmV?d00001


From 5c8c2a55cd60370a7970ff1f99ac1ead3f215344 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 30 Mar 2012 17:08:01 +0800
Subject: [PATCH 0617/2585] - some last corrections

---
 .../ece-install-introduction/presentation.org        | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/usr/share/doc/escenic/presentations/ece-install-introduction/presentation.org b/usr/share/doc/escenic/presentations/ece-install-introduction/presentation.org
index ec66d2c8..09adba24 100644
--- a/usr/share/doc/escenic/presentations/ece-install-introduction/presentation.org
+++ b/usr/share/doc/escenic/presentations/ece-install-introduction/presentation.org
@@ -1,4 +1,4 @@
-#+TITLE: Welcome to the world of ece-install 
+#+TITLE: BASH all you want: ece-install 
 #+AUTHOR: Torstein Krause Johansen 
 #+EMAIL: tkj@vizrt.com
 #+DATE: 2012-03-30
@@ -13,10 +13,14 @@
 - How? (can I get started using ece-install)
 
 * The Challenge
+[[file:2012-03-30-times-online.png]]
+* The Challenge - II
 [[file:../../images/ece-architecture.png][../../images/ece-architecture.png]]
 
-* What? - I
-Full automatic installation of:
+* What?
+ece-install is a a shell command which gives you full automatic
+installation of:
+
 - Escenic Content Engine & all plugins
 - Escenic Analysis Engine
 - Standalone search instances (Solr + indexer)
@@ -66,7 +70,7 @@ and there's more ...
 - Reduces maintenance costs
 
 * Why? - III
-Not only for produciton environments, using ece-install, you'll also
+Not only for production environments, using ece-install, you'll also
 find it's:
 
 - Easy to set up proper staging environments

From e59be3c0b5e04d323d8fef455122a2c1550fb1c2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 30 Mar 2012 17:08:45 +0800
Subject: [PATCH 0618/2585] - changed file reference of the diagram to be pwd.

---
 .../presentations/ece-install-introduction/presentation.org     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/escenic/presentations/ece-install-introduction/presentation.org b/usr/share/doc/escenic/presentations/ece-install-introduction/presentation.org
index ec66d2c8..c66776f6 100644
--- a/usr/share/doc/escenic/presentations/ece-install-introduction/presentation.org
+++ b/usr/share/doc/escenic/presentations/ece-install-introduction/presentation.org
@@ -13,7 +13,7 @@
 - How? (can I get started using ece-install)
 
 * The Challenge
-[[file:../../images/ece-architecture.png][../../images/ece-architecture.png]]
+[[file:ece-architecture.png][ece-architecture.png]]
 
 * What? - I
 Full automatic installation of:

From 55aad360b12594085ca35fd93b4d76eb7d265739 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 30 Mar 2012 17:12:36 +0800
Subject: [PATCH 0619/2585] - resolved merge

---
 .../presentations/ece-install-introduction/presentation.org     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/escenic/presentations/ece-install-introduction/presentation.org b/usr/share/doc/escenic/presentations/ece-install-introduction/presentation.org
index 425157ea..9e97a5b0 100644
--- a/usr/share/doc/escenic/presentations/ece-install-introduction/presentation.org
+++ b/usr/share/doc/escenic/presentations/ece-install-introduction/presentation.org
@@ -16,7 +16,7 @@
 [[file:2012-03-30-times-online.png]]
 
 * The Challenge - II
-[[file:../../images/ece-architecture.png][../../images/ece-architecture.png]]
+[[file:ece-architecture.png][ece-architecture.png]]
 
 * What?
 ece-install is a a shell command which gives you full automatic

From 65b34dbba195fe2109b8bd872135cb96dad1356a Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Fri, 30 Mar 2012 15:40:26 +0200
Subject: [PATCH 0620/2585] Fixed .deb creation to actually install files

---
 usr/local/src/create-packages | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/local/src/create-packages b/usr/local/src/create-packages
index 6e92194a..17f5d09e 100644
--- a/usr/local/src/create-packages
+++ b/usr/local/src/create-packages
@@ -74,6 +74,7 @@ function set_up_target_directory() {
   elif [[ $package_name == "escenic-common-scripts" ]]; then
     # both the installer and ece-scripts use the common scripts and
     # web resources.
+    mkdir -p $target_dir/usr/share/escenic/ece-scripts
     cp -r ../../share/escenic/ece-scripts/common* \
       $target_dir/usr/share/escenic/ece-scripts/
     cp -r ../../share/escenic/ece-scripts/*.css \

From 0d2eeee040dc56c9e2038d39608378c1940754cf Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 2 Apr 2012 13:22:05 +0800
Subject: [PATCH 0621/2585] - added lock file support to ece-install. This is
 useful for systems   were you want to ensure that no one incidentally
 triggers   ece-install without wanting to.

  If this lock file is in place, ece-install will fail fast:

     The lock file is present: /var/lock/ece-install.lock and
     ece-install will therefore refuse to run.
---
 usr/sbin/ece-install | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 592e07aa..571ad3ba 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -47,6 +47,7 @@ java_home=/usr/lib/jvm/java-6-sun
 #####################################################################
 
 pid_file=/var/run/$(basename $0).pid
+lock_file=/var/lock/$(basename $0).lock
 download_dir=/tmp/ece-downloads
 log=/var/log/$(basename $0).log
 conf_file=$HOME/ece-install.conf
@@ -560,10 +561,18 @@ function assert_correct_runtime_environment()
         echo "You must be root when running $(basename $0)"
         exit 1
     fi
+
+    if [ -e $lock_file ]; then
+      cat <<EOF
+The lock file is present: ${lock_file} and $(basename $0) will
+therefore refuse to run.
+EOF
+      exit 1
+    fi
     
     if [ -e $pid_file ]; then
         echo "There's already one $(basename $0) process running."
-        echo "If you blelieve this is wrong, e.g. if a previous run of" 
+        echo "If you believe this is wrong, e.g. if a previous run of" 
         echo "$(basename $0) was aborted before it completed, you"
         echo "may remove ${pid_file} and run $(basename $0) again."
         exit 1

From ebb86259a48b19eae74a63d7bdf9b5e470d127ce Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 2 Apr 2012 13:28:18 +0800
Subject: [PATCH 0622/2585] - added documentation for the lock file and how to
 prevent accidental   execution of ece-install

---
 usr/share/doc/escenic/ece-install-guide.org | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 82e6af81..79948744 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -54,6 +54,7 @@ $ git clone https://github.com/skybert/ece-scripts.git
 #+END_SRC
 
 * Running the ece-install Script
+** Requires super user privileges
 You must run the script as the root user.  If you start the script as
 a regular user, it will complain:
 #+BEGIN_SRC conf
@@ -70,6 +71,7 @@ On all other Unix like system, do:
    $ su -
 #+END_SRC
 
+** Technet & WF credentials
 You will need access to http://technet.escenic.com and put these
 credentials in the root user's $HOME/ece-install.conf, normally this
 means /root/ece-install.conf, the script will also tell you this if
@@ -97,6 +99,7 @@ runn a fully automatic install without any user interaction, you'll
 need to specify some FAI specific parameters, see the FAI section
 below. 
 
+** Basic invocation & how to debug errors
 With the configuration file in place, you're now ready to run it:
 #+BEGIN_SRC conf
 # bash ece-install [-v|--verbose|<-f|--file> <conf-file>]
@@ -123,6 +126,23 @@ Here you can see everything that BASH does when running the script,
 how the wildcard variables expand and so on. Normally, having a tail
 on /var/log/ece-install.log should be sufficient, though.
 
+** Preventing accidental execution of ece-install 
+
+ece-install has support for a lock file. This is useful for systems
+were you want to ensure that no one incidentally triggers ece-install
+without wanting to. The location of this lock file is:
+
+#+BEGIN_SRC sh
+/var/lock/ece-install.lock
+#+END_SRC
+    
+If this lock file is in place, ece-install will fail fast:
+
+#+BEGIN_SRC sh
+The lock file is present: /var/lock/ece-install.lock and ece-install
+will therefore refuse to run.
+#+END_SRC
+
 * Available Server Profiles
 When starting the script, it will ask you which server profile you
 want to install:

From 028acff16876ba9f2d51c4af931ef93eedf1dd81 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 2 Apr 2012 13:43:02 +0800
Subject: [PATCH 0623/2585] - added documentation on URI based deployment -
 added documentation of the 'ece info' command

---
 usr/share/doc/escenic/ece-guide.org | 84 +++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)

diff --git a/usr/share/doc/escenic/ece-guide.org b/usr/share/doc/escenic/ece-guide.org
index ebfb7676..53dd8d46 100644
--- a/usr/share/doc/escenic/ece-guide.org
+++ b/usr/share/doc/escenic/ece-guide.org
@@ -154,6 +154,90 @@ The EAR produced is now ready to be deployed with
 #+BEGIN_SRC sh
 $ ece [-i <instance>] deploy
 #+END_SRC
+
+* Deployment
+ece will default wise attempt to deploy the EAR which "ece assemble"
+produces and resides in:
+
+#+BEGIN_SRC sh
+/var/cache/escenic/engine.ear
+#+END_SRC
+
+It is also possible to deploy an EAR directly from a local or remote
+URI. This is especially useful where you have a build server and you
+want the ECEs deploy this EAR directly, you can then do:
+#+BEGIN_SRC sh
+$ ece -i myinstance deploy --uri http://my.build.server.com/engine-mysite.com-2.314.ear
+#+END_SRC
+
+The following URIs are supported:
+- http://my.build.server.com/engine-mysite.com-2.314.ear
+- https://my.build.server.com/engine-mysite.com-2.314.ear
+- file:///var/cache/escenic/engine-mysite.com-2.314.ear
+
+It is also possible to deploy a local file without the URI protocol
+prefix using the -f (file) parameter:
+#+BEGIN_SRC sh
+$ ece -i myinstance deploy -f /tmp/engine-mysite.com-2.314.ear
+#+END_SRC
+
+The URI of the EAR file is completely up to you, but if use the
+pattern
+#+BEGIN_SRC sh
+  engine-<a string>-<a number>.ear
+#+END_SRC
+ece will understand this as version: mysite.com-2.314 and write this
+to its deployment state file: /var/lib/escenic/<instance>.state, which
+again will be reported by the "ece info" command.
+
+* Getting information about the ECE instance
+The "ece info" command will give you a lot of useful information about
+the current instance:
+#+BEGIN_SRC sh
+$ ece -i myinstance info
+[ece#engine-myinstance] Current instance: myinstance
+[ece#engine-myinstance] Instances available on myhost: myinstance
+[ece#engine-myinstance] Conf files parsed: /etc/escenic/ece-myinstance.conf
+/etc/escenic/ece.conf
+[ece#engine-myinstance] ECE location: /opt/escenic/engine
+[ece#engine-myinstance] Assembly Tool location: /opt/escenic/assemblytool
+[ece#engine-myinstance] Java location: /usr/lib/jvm/java-6-sun
+[ece#engine-myinstance] Log files:
+[ece#engine-myinstance] |-> System out log:
+/var/log/escenic/engine-myinstance.out
+[ece#engine-myinstance] |-> App server log:
+/opt/tomcat-myinstance/logs/localhost.2012-04-02.log
+[ece#engine-myinstance] |-> Log4j log: /var/log/escenic/ece-myinstance-messages
+[ece#engine-myinstance] |-> GC log: /var/log/escenic/engine-myinstance-gc.log
+[ece#engine-myinstance] Application server:
+[ece#engine-myinstance] |-> Status: DOWN
+[ece#engine-myinstance] |-> Port: 8080
+[ece#engine-myinstance] |-> Type: tomcat
+[ece#engine-myinstance] |-> Tomcat home: /opt/tomcat
+[ece#engine-myinstance] |-> Tomcat base: /opt/tomcat-myinstance
+[ece#engine-myinstance] Application server resources:
+[ece#engine-myinstance] |-> escenic/solr-base-uri:
+http://mysearch:8080/solr/
+[ece#engine-myinstance] Database:
+[ece#engine-myinstance] |-> name: jdbc/ECE_READ_DS
+[ece#engine-myinstance] |-> url:
+mysql://mydb:3306/ece5db?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;characterSetResults=UTF-8
+[ece#engine-myinstance] |-> username: ece5user
+[ece#engine-myinstance] |-> name: jdbc/ECE_UPDATE_DS
+[ece#engine-myinstance] |-> url:
+mysql://mydb:3306/ece5db?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;characterSetResults=UTF-8
+[ece#engine-myinstance] |-> username: ece5user
+[ece#engine-myinstance] Deployed web applications:
+[ece#engine-myinstance] |-> http://myhost:8080/escenic-admin
+[ece#engine-myinstance] Deployment state:
+[ece#engine-myinstance] |-> Version: mysite.com-1.2.3
+[ece#engine-myinstance] |-> EAR used:
+http://my.build.server.com/engine-mysite.com-1.2.3.ear
+[ece#engine-myinstance] |-> MD5 sum: 5881d1895c09c7b35a032806c6249433
+[ece#engine-myinstance] |-> Deployment date: Wed Mar 28 18:29:58 CST 2012  
+#+END_SRC
+
+
 * Installation
 The ece script and ece.conf may be used on any Unix like system that
 has a fairly recent version of BASH installed.

From 129217e1471037a2ab141ca1cd2a5982211d0829 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 2 Apr 2012 13:47:25 +0800
Subject: [PATCH 0624/2585] - changed example instance from myinstance to web1

---
 usr/share/doc/escenic/ece-guide.org | 75 +++++++++++++----------------
 1 file changed, 34 insertions(+), 41 deletions(-)

diff --git a/usr/share/doc/escenic/ece-guide.org b/usr/share/doc/escenic/ece-guide.org
index 53dd8d46..67f5b05f 100644
--- a/usr/share/doc/escenic/ece-guide.org
+++ b/usr/share/doc/escenic/ece-guide.org
@@ -194,47 +194,40 @@ again will be reported by the "ece info" command.
 The "ece info" command will give you a lot of useful information about
 the current instance:
 #+BEGIN_SRC sh
-$ ece -i myinstance info
-[ece#engine-myinstance] Current instance: myinstance
-[ece#engine-myinstance] Instances available on myhost: myinstance
-[ece#engine-myinstance] Conf files parsed: /etc/escenic/ece-myinstance.conf
-/etc/escenic/ece.conf
-[ece#engine-myinstance] ECE location: /opt/escenic/engine
-[ece#engine-myinstance] Assembly Tool location: /opt/escenic/assemblytool
-[ece#engine-myinstance] Java location: /usr/lib/jvm/java-6-sun
-[ece#engine-myinstance] Log files:
-[ece#engine-myinstance] |-> System out log:
-/var/log/escenic/engine-myinstance.out
-[ece#engine-myinstance] |-> App server log:
-/opt/tomcat-myinstance/logs/localhost.2012-04-02.log
-[ece#engine-myinstance] |-> Log4j log: /var/log/escenic/ece-myinstance-messages
-[ece#engine-myinstance] |-> GC log: /var/log/escenic/engine-myinstance-gc.log
-[ece#engine-myinstance] Application server:
-[ece#engine-myinstance] |-> Status: DOWN
-[ece#engine-myinstance] |-> Port: 8080
-[ece#engine-myinstance] |-> Type: tomcat
-[ece#engine-myinstance] |-> Tomcat home: /opt/tomcat
-[ece#engine-myinstance] |-> Tomcat base: /opt/tomcat-myinstance
-[ece#engine-myinstance] Application server resources:
-[ece#engine-myinstance] |-> escenic/solr-base-uri:
-http://mysearch:8080/solr/
-[ece#engine-myinstance] Database:
-[ece#engine-myinstance] |-> name: jdbc/ECE_READ_DS
-[ece#engine-myinstance] |-> url:
-mysql://mydb:3306/ece5db?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;characterSetResults=UTF-8
-[ece#engine-myinstance] |-> username: ece5user
-[ece#engine-myinstance] |-> name: jdbc/ECE_UPDATE_DS
-[ece#engine-myinstance] |-> url:
-mysql://mydb:3306/ece5db?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;characterSetResults=UTF-8
-[ece#engine-myinstance] |-> username: ece5user
-[ece#engine-myinstance] Deployed web applications:
-[ece#engine-myinstance] |-> http://myhost:8080/escenic-admin
-[ece#engine-myinstance] Deployment state:
-[ece#engine-myinstance] |-> Version: mysite.com-1.2.3
-[ece#engine-myinstance] |-> EAR used:
-http://my.build.server.com/engine-mysite.com-1.2.3.ear
-[ece#engine-myinstance] |-> MD5 sum: 5881d1895c09c7b35a032806c6249433
-[ece#engine-myinstance] |-> Deployment date: Wed Mar 28 18:29:58 CST 2012  
+$ ece -i web1 info
+[ece#engine-web1] Current instance: web1
+[ece#engine-web1] Instances available on myhost: web1
+[ece#engine-web1] Conf files parsed: /etc/escenic/ece-web1.conf /etc/escenic/ece.conf
+[ece#engine-web1] ECE location: /opt/escenic/engine
+[ece#engine-web1] Assembly Tool location: /opt/escenic/assemblytool
+[ece#engine-web1] Java location: /usr/lib/jvm/java-6-sun
+[ece#engine-web1] Log files:
+[ece#engine-web1] |-> System out log: /var/log/escenic/engine-web1.out
+[ece#engine-web1] |-> App server log: /opt/tomcat-web1/logs/localhost.2012-04-02.log
+[ece#engine-web1] |-> Log4j log: /var/log/escenic/ece-web1-messages
+[ece#engine-web1] |-> GC log: /var/log/escenic/engine-web1-gc.log
+[ece#engine-web1] Application server:
+[ece#engine-web1] |-> Status: DOWN
+[ece#engine-web1] |-> Port: 8080
+[ece#engine-web1] |-> Type: tomcat
+[ece#engine-web1] |-> Tomcat home: /opt/tomcat
+[ece#engine-web1] |-> Tomcat base: /opt/tomcat-web1
+[ece#engine-web1] Application server resources:
+[ece#engine-web1] |-> escenic/solr-base-uri: http://mysearch:8080/solr/
+[ece#engine-web1] Database:
+[ece#engine-web1] |-> name: jdbc/ECE_READ_DS
+[ece#engine-web1] |-> url: mysql://mydb:3306/ece5db?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;characterSetResults=UTF-8
+[ece#engine-web1] |-> username: ece5user
+[ece#engine-web1] |-> name: jdbc/ECE_UPDATE_DS
+[ece#engine-web1] |-> url: mysql://mydb:3306/ece5db?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;characterSetResults=UTF-8
+[ece#engine-web1] |-> username: ece5user
+[ece#engine-web1] Deployed web applications:
+[ece#engine-web1] |-> http://myhost:8080/escenic-admin
+[ece#engine-web1] Deployment state:
+[ece#engine-web1] |-> Version: mysite.com-1.2.3
+[ece#engine-web1] |-> EAR used: http://my.build.server.com/engine-mysite.com-1.2.3.ear
+[ece#engine-web1] |-> MD5 sum: 5881d1895c09c7b35a032806c6249433
+[ece#engine-web1] |-> Deployment date: Wed Mar 28 18:29:58 CST 2012  
 #+END_SRC
 
 

From 1795c0c2421b62f64f1aaf98760728a7f43106fa Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 2 Apr 2012 15:59:44 +0800
Subject: [PATCH 0625/2585] - added default maintainer name and email -
 maintainer name and email are now overrideable by the   -e <email> and -n
 <name> parameters, e.g.:

  create-packages  -e support.online@vizrt.com -n Vizrt

- as a consequence, maintainer email and name are not determined
  dynamically by the calling user. It's important, and indeed
  mentioned in the Debian package contract that the package
  information always should list the correct maintainer so that he/she
  can be contacted about the package.
---
 usr/local/src/create-packages | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/usr/local/src/create-packages b/usr/local/src/create-packages
index 17f5d09e..290eb03a 100644
--- a/usr/local/src/create-packages
+++ b/usr/local/src/create-packages
@@ -8,14 +8,22 @@
 target_dir=target
 package_name=escenic-content-engine-installer
 package_version=$(date +%Y-%m-%d.%H%M%S)
+default_maintainer_name="Torstein Krause Johansen"
+default_maintainer_email=tkj@vizrt.com
 
 function clean_up() {
   rm -rf $target_dir
 }
 
 function get_user_options() {
-  while getopts ":p:r:" opt; do
+  while getopts ":p:e:n:r:" opt; do
     case $opt in
+      e)
+        maintainer_email=${OPTARG}
+        ;;
+      n)
+        maintainer_name=${OPTARG}
+        ;;
       r)
         package_version=${OPTARG}
         ;;
@@ -89,12 +97,11 @@ function set_up_target_directory() {
 }
 
 function get_name() {
-  name=$(grep $USER /etc/passwd | cut -d':' -f5 | cut -d',' -f1)
-  echo "${name}"
+  echo ${maintainer_name-$default_maintainer_name}
 }
 
 function get_email() {
-  echo ${USER}@${HOSTNAME}
+  echo ${maintainer_email-$default_maintainer_email}
 }
 
 function create_packages() {

From 679669627aada76df84c8f84b3bb197fde7de47a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 3 Apr 2012 12:36:08 +0800
Subject: [PATCH 0626/2585] - added YAML support.

  $ system-info -f yaml
  Overview of li140-120:
  Generated @ Tue Apr  3 12:30:34 CST 2012

    Overview of all the ECE instances on li140-120:

      Overview of instance cohen:
      - Current instance: cohen
      - Instances available on li140-120: cohen
      - Conf files parsed: /etc/escenic/ece-cohen.conf /etc/escenic/ece.conf
      - ECE location: /opt/escenic/engine
      - Assembly Tool location: /opt/escenic/assemblytool
      - Java location: /usr/lib/jvm/java-6-sun

        Log files:
        - System out log: /var/log/escenic/engine-cohen.out
        - App server log: /opt/tomcat-cohen/logs/localhost.2012-04-03.log
        - Log4j log: /var/log/escenic/li140-120-cohen-messages
        - GC log: /var/log/escenic/engine-cohen-gc.log

        Application server:
        - Status: DOWN
        - Port: 8080
        - PID:
        - Type: tomcat
        - Tomcat home: /opt/tomcat
        - Tomcat base: /opt/tomcat-cohen

        Application server resources:
        - escenic/solr-base-uri: http://li140-120:8080/solr/

        Database:
        - name: jdbc/ECE_READ_DS
        - url: jdbc:mysql://localhost:3306/ece5db?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;characterSetResults=UTF-8
        - username: ece5user
        - name: jdbc/ECE_UPDATE_DS
        - url: jdbc:mysql://localhost:3306/ece5db?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;characterSetResults=UTF-8
        - username: ece5user

    Java information:
      java version "1.6.0_26" Java(TM) SE Runtime Environment (build 1.6.0_26-b03) Java HotSpot(TM) Client VM (build 20.1-b02, mixed mode, sharing)

    Overview of all server services on li140-120:
      tcp        0      0 0.0.0.0:3306            0.0.0.0:*               LISTEN      -
      tcp        0      0 127.0.0.1:11211         0.0.0.0:*               LISTEN      -
      tcp        0      0 0.0.0.0:111             0.0.0.0:*               LISTEN      -
      tcp        0      0 0.0.0.0:3128            0.0.0.0:*               LISTEN      -
      tcp        0      0 127.0.0.1:25            0.0.0.0:*               LISTEN      -
      tcp        0      0 0.0.0.0:9022            0.0.0.0:*               LISTEN      -
      tcp        0      0 0.0.0.0:36062           0.0.0.0:*               LISTEN      -
      tcp6       0      0 :::6667                 :::*                    LISTEN      -
      tcp6       0      0 :::5678                 :::*                    LISTEN      -
      tcp6       0      0 ::1:25                  :::*                    LISTEN      -
      tcp6       0      0 :::9022                 :::*                    LISTEN      -
      Run system-info as  root to get more details in this listing

    Disks used on li140-120:
      Filesystem    Type    Size  Used Avail Use% Mounted on
      /dev/xvda     ext3     19G  8.9G  9.3G  50% /
      tmpfs        tmpfs    248M     0  248M   0% /lib/init/rw
      udev         tmpfs     10M  180K  9.9M   2% /dev
      tmpfs        tmpfs    248M     0  248M   0% /dev/shm

    Memory on li140-120:
      Total memory:  506876 kB
      Free memory:  70104 kB

    CPU(s) on li140-120:
      - Number of CPUs: 4
      - Model:   Intel(R) Xeon(R) CPU           L5520  @ 2.27GHz

    Operating system:

      Kernel:
      Linux li140-120 3.0.18-linode43 #1 SMP Mon Jan 30 11:44:09 EST 2012 i686 GNU/Linux

      Distribution:
      Distributor ID:	Debian
      Description:	Debian GNU/Linux 6.0.4 (squeeze)
      Release:	6.0.4
      Codename:	squeeze

      Installed packages:
      Desired=Unknown/Install/Remove/Purge/Hold
      | Status=Not/Inst/Conf-files/Unpacked/halF-conf/Half-inst/trig-aWait/Trig-pend
      |/ Err?=(none)/Reinst-required (Status,Err: uppercase=bad)
      ||/ Name                        Version                     Description
      +++-===========================-===========================-======================================================================
      ii  adduser                     3.112+nmu2                  add and remove users and groups
      ii  alien                       8.81                        convert and install rpm and other packages
      ii  ant                         1.8.0-4                     Java based build tool like make
      ii  ant-contrib                 1.0~b3+svn177-1             collection of tasks, types and other tools for Apache Ant
      ii  ant-optional                1.8.0-4                     Java based build tool like make - optional libraries
      ii  apt                         0.8.10.3+squeeze1           Advanced front-end for dpkg
      ii  apt-listchanges             2.85.7+squeeze1             package change history notification tool
      ii  apt-utils                   0.8.10.3+squeeze1           APT utility programs
      ii  aptitude                    0.6.3-3.2+squeeze1          terminal-based package manager (terminal interface only)
      ii  arping                      2.09-2                      sends IP and/or ARP pings (to the MAC address)
      ii  aspell                      0.60.6-4                    GNU Aspell spell-checker
      ii  aspell-en                   6.0-0-6                     English dictionary for GNU Aspell
      ii  at                          3.1.12-1+squeeze1           Delayed job execution and batch processing
      ii  auto-complete-el            1.3-1                       intelligent auto-completion extension for GNU Emacs
      ii  autopoint                   0.18.1.1-3                  The autopoint program from GNU gettext
      ii  base-files                  6.0squeeze4                 Debian base system miscellaneous files
      ii  base-passwd                 3.5.22                      Debian base system master password and group files
      ii  bash                        4.1-3                       The GNU Bourne Again SHell
      ii  bash-completion             1:1.2-3                     programmable completion for the bash shell
      ii  bc                          1.06.95-2                   The GNU bc arbitrary precision calculator language
      ii  bind9-host                  1:9.7.3.dfsg-1~squeeze4     Version of 'host' bundled with BIND 9.X
      ii  binutils                    2.20.1-16                   The GNU assembler, linker and binary utilities
      ii  bitlbee                     1.2.8-1                     An IRC to other chat networks gateway
      ii  bsdmainutils                8.0.13                      collection of more utilities from FreeBSD
      ii  bsdutils                    1:2.17.2-9                  Basic utilities from 4.4BSD-Lite
      ii  build-essential             11.5                        Informational list of build-essential packages
      ii  busybox                     1:1.17.1-8                  Tiny utilities for small and embedded systems
      ii  bzip2                       1.0.5-6+squeeze1            high-quality block-sorting file compressor - utilities
      ii  ca-certificates             20090814+nmu3squeeze1       Common CA certificates
      ii  console-setup               1.68+squeeze2               console font and keymap setup program
      ii  console-terminus            4.30-2                      Fixed-width fonts for fast reading on the Linux console
      ii  consolekit                  0.4.1-4                     framework for defining and tracking users, sessions and seats
      ii  coreutils                   8.5-1                       GNU core utilities
      ii  cpio                        2.11-4                      GNU cpio -- a program to manage archives of files
      ii  cpp                         4:4.4.5-1                   The GNU C preprocessor (cpp)
      ii  cpp-4.4                     4.4.5-8                     The GNU C preprocessor
      ii  cron                        3.0pl1-116                  process scheduling daemon
      ii  curl                        7.21.0-2.1+squeeze2         Get a file from an HTTP, HTTPS or FTP server
      ii  dash                        0.5.5.1-7.4                 POSIX-compliant shell
      ii  dbus                        1.2.24-4+squeeze1           simple interprocess messaging system
      ii  dbus-x11                    1.2.24-4+squeeze1           simple interprocess messaging system (X11 deps)
      ii  dc                          1.06.95-2                   The GNU dc arbitrary precision reverse-polish calculator
      ii  debconf                     1.5.36.1                    Debian configuration management system
      ii  debconf-i18n                1.5.36.1                    full internationalization support for debconf
      ii  debhelper                   8.0.0                       helper programs for debian/rules
      ii  debian-archive-keyring      2010.08.28                  GnuPG archive keys of the Debian archive
      ii  debian-faq                  4.0.4+nmu1                  The Debian FAQ
      ii  debianutils                 3.4                         Miscellaneous utilities specific to Debian
      ii  defoma                      0.11.11                     Debian Font Manager -- automatic font configuration framework
      ii  dict                        1.11.2+dfsg-3               dictionary client
      ii  dictionaries-common         1.5.17                      Common utilities for spelling dictionary tools
      ii  diffutils                   1:3.0-1                     File comparison utilities
      ii  discover                    2.1.2-5                     hardware identification system
      ii  discover-data               2.2010.10.18                Data lists for Discover hardware detection system
      ii  dmidecode                   2.9-1.2                     Dump Desktop Management Interface data
      ii  dmsetup                     2:1.02.48-5                 The Linux Kernel Device Mapper userspace library
      ii  dnsutils                    1:9.7.3.dfsg-1~squeeze4     Clients provided with BIND
      ii  doc-debian                  4.0.2                       Debian Project documentation and other documents
      ii  doc-linux-text              2008.08-1                   Linux HOWTOs and FAQs in ASCII format
      ii  dosfstools                  3.0.9-1                     utilities for making and checking MS-DOS FAT filesystems
      ii  dpkg                        1.15.8.12                   Debian package management system
      ii  dpkg-dev                    1.15.8.12                   Debian package development tools
      ii  e2fslibs                    1.41.12-4stable1            ext2/ext3/ext4 file system libraries
      ii  e2fsprogs                   1.41.12-4stable1            ext2/ext3/ext4 file system utilities
      ii  eject                       2.1.5+deb1+cvs20081104-7.1  ejects CDs and operates CD-Changers under Linux
      ii  emacs-goodies-el            34.1                        Miscellaneous add-ons for Emacs
      ii  emacs-jabber                0.8.0-2                     Jabber client for Emacsen
      ii  emacs-snapshot-bin-common   2:20120326-1+squeeze        The GNU Emacs editor's shared, architecture dependent files
      ii  emacs-snapshot-common       2:20120326-1+squeeze        The GNU Emacs editor's common infrastructure
      ii  emacs-snapshot-nox          2:20120326-1+squeeze        The GNU Emacs editor (without X support)
      ii  emacsen-common              1.4.22                      Common facilities for all emacsen
      ii  erc                         5.3-1                       an IRC client for Emacs
      ii  escenic-content-engine-inst 2012-03-20.110259           The Escenic Content Engine Installer.
      ii  exim4-base                  4.72-6+squeeze2             support files for all Exim MTA (v4) packages
      ii  exim4-config                4.72-6+squeeze2             configuration for the Exim MTA (v4)
      ii  exim4-daemon-light          4.72-6+squeeze2             lightweight Exim MTA (v4) daemon
      ii  fail2ban                    0.8.4-3                     bans IPs that cause multiple authentication errors
      ii  fakeroot                    1.14.4-1                    Gives a fake root environment
      ii  file                        5.04-5+squeeze1             Determines file type using "magic" numbers
      ii  finch                       2.7.3-1+squeeze2            text-based multi-protocol instant messaging client
      ii  findutils                   4.4.2-1+b1                  utilities for finding files--find, xargs
      ii  fontconfig                  2.8.0-2.1                   generic font configuration library - support binaries
      ii  fontconfig-config           2.8.0-2.1                   generic font configuration library - configuration
      ii  freepats                    20060219-1                  Free patch set for MIDI audio synthesis
      ii  ftp                         0.17-23                     The FTP client
      ii  fuse-utils                  2.8.4-1.1                   Filesystem in USErspace (utilities)
      ii  g++                         4:4.4.5-1                   The GNU C++ compiler
      ii  g++-4.4                     4.4.5-8                     The GNU C++ compiler
      ii  gawk                        1:3.1.7.dfsg-5              GNU awk, a pattern scanning and processing language
      ii  gcc                         4:4.4.5-1                   The GNU C compiler
      ii  gcc-4.4                     4.4.5-8                     The GNU C compiler
      ii  gcc-4.4-base                4.4.5-8                     The GNU Compiler Collection (base package)
      ii  gconf2                      2.28.1-6                    GNOME configuration database system (support tools)
      ii  gconf2-common               2.28.1-6                    GNOME configuration database system (common files)
      ii  geoip-database              1.4.7~beta6+dfsg-1          IP lookup command line tools that use the GeoIP library (country datab
      ii  gettext                     0.18.1.1-3                  GNU Internationalization utilities
      ii  gettext-base                0.18.1.1-3                  GNU Internationalization utilities for the base system
      ii  git                         1:1.7.2.5-3                 fast, scalable, distributed revision control system
      ii  global                      5.7.1-1                     Source code search and browse tools
      ii  gnupg                       1.4.10-4                    GNU privacy guard - a free PGP replacement
      ii  gnutls-bin                  2.8.6-1+squeeze2            the GNU TLS library - commandline utilities
      ii  gpgv                        1.4.10-4                    GNU privacy guard - signature verification tool
      ii  grep                        2.6.3-3                     GNU grep, egrep and fgrep
      ii  groff-base                  1.20.1-10                   GNU troff text-formatting system (base system components)
      ii  gstreamer0.10-nice          0.0.12-1                    ICE library (GStreamer plugin)
      ii  gstreamer0.10-plugins-bad   0.10.19-2+b2                GStreamer plugins from the "bad" set
      ii  gstreamer0.10-plugins-base  0.10.30-1                   GStreamer plugins from the "base" set
      ii  gstreamer0.10-plugins-good  0.10.24-1                   GStreamer plugins from the "good" set
      ii  gstreamer0.10-x             0.10.30-1                   GStreamer plugins for X11 and Pango
      ii  gvfs                        1.6.4-3                     userspace virtual filesystem - server
      ii  gzip                        1.3.12-9                    GNU compression utilities
      ii  hdparm                      9.32-1                      tune hard disk parameters for high performance
      ii  heirloom-mailx              12.4-2                      feature-rich BSD mail(1)
      ii  hicolor-icon-theme          0.12-1                      default fallback theme for FreeDesktop.org icon themes
      ii  host                        1:9.7.3.dfsg-1~squeeze4     Transitional package
      ii  hostname                    3.04                        utility to set/show the host name or domain name
      ii  html2text                   1.3.2a-15                   advanced HTML to text converter
      ii  hunspell-en-us              20070829-4                  English_american dictionary for hunspell
      ii  ifupdown                    0.6.10                      high level tools to configure network interfaces
      ii  info                        4.13a.dfsg.1-6              Standalone GNU Info documentation browser
      ii  initscripts                 2.88dsf-13.1                scripts for initializing and shutting down the system
      ii  insserv                     1.14.0-2                    Tool to organize boot sequence using LSB init.d script dependencies
      ii  install-info                4.13a.dfsg.1-6              Manage installed documentation in info format
      ii  installation-report         2.44                        system installation report
      ii  intltool-debian             0.35.0+20060710.1           Help i18n of RFC822 compliant config files
      ii  iproute                     20100519-3                  networking and traffic control tools
      ii  iptables                    1.4.8-3                     administration tools for packet filtering and NAT
      ii  iputils-ping                3:20100418-3                Tools to test the reachability of network hosts
      ii  isc-dhcp-client             4.1.1-P1-15+squeeze3        ISC DHCP client
      ii  isc-dhcp-common             4.1.1-P1-15+squeeze3        common files used by all the isc-dhcp* packages
      ii  iso-codes                   3.23-1                      ISO language, territory, currency, script codes and their translations
      ii  java-common                 0.40                        Base of all Java packages
      ii  js2-mode                    0~20090723b-0.1             Emacs mode for editing Javascript programs
      ii  kbd                         1.15.2-2                    Linux console font and keytable utilities
      ii  keyboard-configuration      1.68+squeeze2               system-wide keyboard preferences
      ii  less                        436-1                       pager program similar to more
      ii  libaa1                      1.4p5-38                    ascii art library
      ii  libacl1                     2.2.49-4                    Access control list shared library
      ii  libaio1                     0.3.107-7                   Linux kernel AIO access library - shared library
      ii  libalgorithm-diff-perl      1.19.02-2                   module to find differences between files
      ii  libalgorithm-diff-xs-perl   0.04-1                      module to find differences between files (XS accelerated)
      ii  libalgorithm-merge-perl     0.08-2                      Perl module for three-way merge of textual data
      ii  libapr1                     1.4.2-6+squeeze3            The Apache Portable Runtime Library
      ii  libasound2                  1.0.23-2.1                  shared library for ALSA applications
      ii  libaspell15                 0.60.6-4                    GNU Aspell spell-checker runtime library
      ii  libass4                     0.9.9-1                     library for SSA/ASS subtitles rendering
      ii  libatasmart4                0.17+git20100219-2          ATA S.M.A.R.T. reading and parsing library
      ii  libatk1.0-0                 1.30.0-1                    The ATK accessibility toolkit
      ii  libatk1.0-data              1.30.0-1                    Common files for the ATK accessibility toolkit
      ii  libattr1                    1:2.4.44-2                  Extended attribute shared library
      ii  libavahi-client3            0.6.27-2+squeeze1           Avahi client library
      ii  libavahi-common-data        0.6.27-2+squeeze1           Avahi common data files
      ii  libavahi-common3            0.6.27-2+squeeze1           Avahi common library
      ii  libavahi-glib1              0.6.27-2+squeeze1           Avahi glib integration library
      ii  libavc1394-0                0.5.3-1+b2                  control IEEE 1394 audio/video devices
      ii  libbind9-60                 1:9.7.3.dfsg-1~squeeze4     BIND9 Shared Library used by BIND
      ii  libblkid1                   2.17.2-9                    block device id library
      ii  libboost-iostreams1.42.0    1.42.0-4                    Boost.Iostreams Library
      ii  libbsd0                     0.2.0-1                     utility functions from BSD systems - shared library
      ii  libbz2-1.0                  1.0.5-6+squeeze1            high-quality block-sorting file compressor library - runtime
      ii  libc-bin                    2.11.3-3                    Embedded GNU C Library: Binaries
      ii  libc-dev-bin                2.11.3-3                    Embedded GNU C Library: Development binaries
      ii  libc6                       2.11.3-3                    Embedded GNU C Library: Shared libraries
      ii  libc6-dev                   2.11.3-3                    Embedded GNU C Library: Development Libraries and Header Files
      ii  libc6-i686                  2.11.3-3                    Embedded GNU C Library: Shared libraries [i686 optimized]
      ii  libcaca0                    0.99.beta17-1               colour ASCII art library
      ii  libcairo2                   1.8.10-6                    The Cairo 2D vector graphics library
      ii  libcap2                     1:2.19-3                    support for getting/setting POSIX.1e capabilities
      ii  libcdaudio1                 0.99.12p2-9                 library for controlling a CD-ROM when playing audio CDs
      ii  libcdparanoia0              3.10.2+debian-9             audio extraction tool for sampling CDs (library)
      ii  libcelt0-0                  0.7.1-1                     The CELT codec runtime library
      ii  libck-connector0            0.4.1-4                     ConsoleKit libraries
      ii  libcomerr2                  1.41.12-4stable1            common error description library
      ii  libcroco3                   0.6.2-1                     a generic Cascading Style Sheet (CSS) parsing and manipulation toolkit
      ii  libcups2                    1.4.4-7+squeeze1            Common UNIX Printing System(tm) - Core library
      ii  libcurl3                    7.21.0-2.1+squeeze2         Multi-protocol file transfer library (OpenSSL)
      ii  libcurl3-gnutls             7.21.0-2.1+squeeze2         Multi-protocol file transfer library (GnuTLS)
      ii  libcwidget3                 0.5.16-3                    high-level terminal interface library for C++ (runtime files)
      ii  libdatrie1                  0.2.4-1                     Double-array trie library
      ii  libdb4.6                    4.6.21-16                   Berkeley v4.6 Database Libraries [runtime]
      ii  libdb4.7                    4.7.25-9                    Berkeley v4.7 Database Libraries [runtime]
      ii  libdb4.8                    4.8.30-2                    Berkeley v4.8 Database Libraries [runtime]
      ii  libdbi-perl                 1.612-1                     Perl Database Interface (DBI)
      ii  libdbus-1-3                 1.2.24-4+squeeze1           simple interprocess messaging system
      ii  libdbus-glib-1-2            0.88-2.1                    simple interprocess messaging system (GLib-based shared library)
      ii  libdc1394-22                2.1.2-3                     high level programming interface for IEEE1394 digital camera
      ii  libdca0                     0.0.5-3                     decoding library for DTS Coherent Acoustics streams
      ii  libdevmapper1.02.1          2:1.02.48-5                 The Linux Kernel Device Mapper userspace library
      ii  libdirac-encoder0           1.0.2-3                     open and royalty free high quality codec - encoder library
      ii  libdirectfb-1.2-9           1.2.10.0-4                  direct frame buffer graphics - shared libraries
      ii  libdiscover2                2.1.2-5                     hardware identification library
      ii  libdns69                    1:9.7.3.dfsg-1~squeeze4     DNS Shared Library used by BIND
      ii  libdpkg-perl                1.15.8.12                   Dpkg perl modules
      ii  libdrm-intel1               2.4.21-1~squeeze3           Userspace interface to intel-specific kernel DRM services -- runtime
      ii  libdrm-radeon1              2.4.21-1~squeeze3           Userspace interface to radeon-specific kernel DRM services -- runtime
      ii  libdrm2                     2.4.21-1~squeeze3           Userspace interface to kernel DRM services -- runtime
      ii  libdv4                      1.0.0-2.1                   software library for DV format digital video (runtime lib)
      ii  libdvdnav4                  4.1.3-7                     DVD navigation library
      ii  libdvdread4                 4.1.3-10                    library for reading DVDs
      ii  libedit2                    2.11-20080614-2             BSD editline and history libraries
      ii  libeggdbus-1-0              0.6-1                       D-Bus bindings for GObject
      ii  libelf1                     0.148-1                     library to read and write ELF files
      ii  libenca0                    1.13-3                      Extremely Naive Charset Analyser - shared library files
      ii  libenchant1c2a              1.6.0-1                     a wrapper library for various spell checker engines
      ii  libept1                     1.0.4                       High-level library for managing Debian package information
      ii  liberror-perl               0.17-1                      Perl module for error/exception handling in an OO-ish way
      ii  libevent-1.4-2              1.4.13-stable-1             An asynchronous event notification library
      ii  libexempi3                  2.1.1-1                     library to parse XMP metadata (Library)
      ii  libexif12                   0.6.19-1                    library to parse EXIF files
      ii  libexpat1                   2.0.1-7                     XML parsing C library - runtime library
      ii  libfaad2                    2.7-6                       freeware Advanced Audio Decoder - runtime files
      ii  libffi5                     3.0.9-3                     Foreign Function Interface library runtime
      ii  libfftw3-3                  3.2.2-1                     library for computing Fast Fourier Transforms
      ii  libflac8                    1.2.1-2+b1                  Free Lossless Audio Codec - runtime C library
      ii  libflite1                   1.4-release-2               a small run-time speech synthesis engine - shared libraries
      ii  libfont-afm-perl            1.20-1                      Font::AFM - Interface to Adobe Font Metrics files
      ii  libfont-freetype-perl       0.03-1                      Read font files and render glyphs from Perl using FreeType2
      ii  libfontconfig1              2.8.0-2.1                   generic font configuration library - runtime
      ii  libfontenc1                 1:1.0.5-2                   X11 font encoding library
      ii  libfreetype6                2.4.2-2.1+squeeze4          FreeType 2 font engine, shared library files
      ii  libfuse2                    2.8.4-1.1                   Filesystem in USErspace library
      ii  libgail18                   2.20.1-2                    GNOME Accessibility Implementation Library -- shared libraries
      ii  libgc1c2                    1:6.8-1.2                   conservative garbage collector for C and C++
      ii  libgcc1                     1:4.4.5-8                   GCC support library
      ii  libgconf2-4                 2.28.1-6                    GNOME configuration database system (shared libraries)
      ii  libgcrypt11                 1.4.5-2                     LGPL Crypto library - runtime library
      ii  libgdbm3                    1.8.3-9                     GNU dbm database routines (runtime version)
      ii  libgdu0                     2.30.1-2                    GObject based Disk Utility Library
      ii  libgeoip1                   1.4.7~beta6+dfsg-1          A non-DNS IP-to-country resolver library
      ii  libgl1-mesa-dri             7.7.1-5                     A free implementation of the OpenGL API -- DRI modules
      ii  libgl1-mesa-glx             7.7.1-5                     A free implementation of the OpenGL API -- GLX runtime
      ii  libglib2.0-0                2.24.2-1                    The GLib library of C routines
      ii  libglib2.0-data             2.24.2-1                    Common files for GLib library
      ii  libglu1-mesa                7.7.1-5                     The OpenGL utility library (GLU)
      ii  libgme0                     0.5.5-2                     Playback library for video game music files - shared library
      ii  libgmp3c2                   2:4.3.2+dfsg-1              Multiprecision arithmetic library
      ii  libgnome-keyring0           2.30.1-1                    GNOME keyring services library
      ii  libgnutls26                 2.8.6-1+squeeze2            the GNU TLS library - runtime library
      ii  libgomp1                    4.4.5-8                     GCC OpenMP (GOMP) support library
      ii  libgpg-error0               1.6-1                       library for common error values and messages in GnuPG components
      ii  libgpgme11                  1.2.0-1.2                   GPGME - GnuPG Made Easy
      ii  libgpm2                     1.20.4-3.3                  General Purpose Mouse - shared library
      ii  libgsf-1-114                1.14.18-1                   Structured File Library - runtime version
      ii  libgsf-1-common             1.14.18-1                   Structured File Library - common files
      ii  libgsm1                     1.0.13-3                    Shared libraries for GSM speech compressor
      ii  libgssapi-krb5-2            1.8.3+dfsg-4squeeze5        MIT Kerberos runtime libraries - krb5 GSS-API Mechanism
      ii  libgssdp-1.0-2              0.8.0-2                     GObject-based library for SSDP
      ii  libgssglue1                 0.1-4                       mechanism-switch gssapi library
      ii  libgssrpc4                  1.8.3+dfsg-4squeeze5        MIT Kerberos runtime libraries - GSS enabled ONCRPC
      ii  libgstfarsight0.10-0        0.0.20-2                    Audio/Video communications framework: core library
      ii  libgstreamer-plugins-base0. 0.10.30-1                   GStreamer libraries from the "base" set
      ii  libgstreamer0.10-0          0.10.30-1                   Core GStreamer libraries and elements
      ii  libgtk2.0-0                 2.20.1-2                    The GTK+ graphical user interface library
      ii  libgtk2.0-bin               2.20.1-2                    The programs for the GTK+ graphical user interface library
      ii  libgtk2.0-common            2.20.1-2                    Common files for the GTK+ graphical user interface library
      ii  libgudev-1.0-0              164-3                       GObject-based wrapper library for libudev
      ii  libgupnp-1.0-3              0.14.0-2                    GObject-based library for UPnP
      ii  libgupnp-igd-1.0-3          0.1.7-3                     library to handle UPnP IGD port mapping
      ii  libhtml-format-perl         2.04-2                      format HTML syntax trees into text, PostScript or RTF
      ii  libhtml-parser-perl         3.66-1                      collection of modules that parse HTML text documents
      ii  libhtml-tagset-perl         3.20-2                      Data tables pertaining to HTML
      ii  libhtml-tree-perl           3.23-2                      Perl module to represent and create HTML syntax trees
      ii  libhunspell-1.2-0           1.2.11-1                    spell checker and morphological analyzer (shared library)
      ii  libice6                     2:1.0.6-2                   X11 Inter-Client Exchange library
      ii  libicu44                    4.4.1-8                     International Components for Unicode
      ii  libidl0                     0.8.14-0.1                  library for parsing CORBA IDL files
      ii  libidn11                    1.15-2                      GNU Libidn library, implementation of IETF IDN specifications
      ii  libiec61883-0               1.2.0-0.1                   an partial implementation of IEC 61883
      ii  libiptcdata0                1.0.4-1+b1                  Library to parse IPTC metadata
      ii  libisc62                    1:9.7.3.dfsg-1~squeeze4     ISC Shared Library used by BIND
      ii  libisccc60                  1:9.7.3.dfsg-1~squeeze4     Command Channel Library used by BIND
      ii  libisccfg62                 1:9.7.3.dfsg-1~squeeze4     Config File Handling Library used by BIND
      ii  libjack-jackd2-0            1.9.6~dfsg.1-2              JACK Audio Connection Kit (libraries)
      ii  libjasper1                  1.900.1-7+squeeze1          The JasPer JPEG-2000 runtime library
      ii  libjaula1                   1.4.0-3                     JSON parser/writer library for C++
      ii  libjaxp1.3-java             1.3.05-1                    Java XML parser and transformer APIs (DOM, SAX, JAXP, TrAX)
      ii  libjpeg62                   6b1-1                       The Independent JPEG Group's JPEG runtime library (version 6.2)
      ii  libk5crypto3                1.8.3+dfsg-4squeeze5        MIT Kerberos runtime libraries - Crypto Library
      ii  libkadm5clnt-mit7           1.8.3+dfsg-4squeeze5        MIT Kerberos runtime libraries - Administration Clients
      ii  libkadm5srv-mit7            1.8.3+dfsg-4squeeze5        MIT Kerberos runtime libraries - KDC and Admin Server
      ii  libkate1                    0.3.7-3                     Kate is a codec for karaoke and text encapsulation
      ii  libkdb5-4                   1.8.3+dfsg-4squeeze5        MIT Kerberos runtime libraries - Kerberos database
      ii  libkeyutils1                1.4-1                       Linux Key Management Utilities (library)
      ii  libkrb5-3                   1.8.3+dfsg-4squeeze5        MIT Kerberos runtime libraries
      ii  libkrb5support0             1.8.3+dfsg-4squeeze5        MIT Kerberos runtime libraries - Support library
      ii  libldap-2.4-2               2.4.23-7.2                  OpenLDAP libraries
      ii  liblocale-gettext-perl      1.05-6                      Using libc functions for internationalization in Perl
      ii  liblockfile1                1.08-4                      NFS-safe locking library, includes dotlockfile program
      ii  libltdl7                    2.2.6b-2                    A system independent dlopen wrapper for GNU libtool
      ii  liblua5.1-0                 5.1.4-5                     Simple, extensible, embeddable programming language
      ii  liblwres60                  1:9.7.3.dfsg-1~squeeze4     Lightweight Resolver Library used by BIND
      ii  liblzma2                    5.0.0-2                     XZ-format compression library
      ii  libmaa2                     1.2.0-1                     The maa programming library
      ii  libmagic1                   5.04-5+squeeze1             File type determination library using "magic" numbers
      ii  libmail-sendmail-perl       0.79.16-1                   Send email from a perl script
      ii  libmailtools-perl           2.06-1                      Manipulate email in perl programs
      ii  libmeanwhile1               1.0.2-3                     open implementation of the Lotus Sametime Community Client protocol
      ii  libmimic0                   1.0.4-2+b2                  A video codec for Mimic V2.x content
      ii  libmms0                     0.6-1+squeeze1              MMS stream protocol library - shared library
      ii  libmodplug1                 1:0.8.8.1-1+squeeze2        shared libraries for mod music based on ModPlug
      ii  libmpcdec6                  2:0.1~r459-1                MusePack decoder - library
      ii  libmpfr4                    3.0.0-2                     multiple precision floating-point computation
      ii  libmusicbrainz4c2a          2.1.5-4                     Second generation incarnation of the CD Index - library
      ii  libmysql-java               5.1.10+dfsg-2               Java database (JDBC) driver for MySQL
      ii  libmysqlclient16            5.1.61-rel13.2-430.squeeze  Percona Server database client library
      ii  libmysqlclient18            5.5.21-rel25.1-234.squeeze  Percona Server database client library
      ii  libncurses5                 5.7+20100313-5              shared libraries for terminal handling
      ii  libncursesw5                5.7+20100313-5              shared libraries for terminal handling (wide character support)
      ii  libnet-daemon-perl          0.43-1                      Perl module for building portable Perl daemons easily
      ii  libnet1                     1.1.4-2                     library for the construction and handling of network packets
      ii  libnewt0.52                 0.52.11-1                   Not Erik's Windowing Toolkit - text mode windowing with slang
      ii  libnfnetlink0               1.0.0-1                     Netfilter netlink library
      ii  libnfsidmap2                0.23-2                      An nfs idmapping library
      ii  libnice0                    0.0.12-1                    ICE library (shared library)
      ii  libnspr4-0d                 4.8.6-1                     NetScape Portable Runtime Library
      ii  libnss3-1d                  3.12.8-1+squeeze4           Network Security Service libraries
      ii  libntfs-3g75                1:2010.3.6-1                ntfs-3g filesystem in userspace (FUSE) library
      ii  libntfs10                   2.0.0-1+b1                  library that provides common NTFS access functions
      ii  libofa0                     0.9.3-3.1                   Library for acoustic fingerprinting
      ii  libogg0                     1.2.0~dfsg-1                Ogg bitstream library
      ii  liboil0.3                   0.3.17-2                    Library of Optimized Inner Loops
      ii  libopenspc0                 0.3.99a-2                   library for playing SPC files
      ii  libopts25                   1:5.10-1.1                  automated option processing library based on autogen
      ii  liborbit2                   1:2.14.18-0.1               libraries for ORBit2 - a CORBA ORB
      ii  liborc-0.4-0                1:0.4.6-2                   Library of Optimized Inner Loops Runtime Compiler
      ii  libpam-ck-connector         0.4.1-4                     ConsoleKit PAM module
      ii  libpam-modules              1.1.1-6.1+squeeze1          Pluggable Authentication Modules for PAM
      ii  libpam-runtime              1.1.1-6.1+squeeze1          Runtime support for the PAM library
      ii  libpam0g                    1.1.1-6.1+squeeze1          Pluggable Authentication Modules library
      ii  libpango1.0-0               1.28.3-1+squeeze2           Layout and rendering of internationalized text
      ii  libpango1.0-common          1.28.3-1+squeeze2           Modules and configuration files for the Pango
      ii  libparted0debian1           2.3-5                       The GNU Parted disk partitioning shared library
      ii  libpcap0.8                  1.1.1-2+squeeze1            system interface for user-level packet capture
      ii  libpci3                     1:3.1.7-6                   Linux PCI Utilities (shared library)
      ii  libpcre3                    8.02-1.1                    Perl 5 Compatible Regular Expression Library - runtime files
      ii  libperl5.10                 5.10.1-17squeeze3           shared Perl library
      ii  libpixman-1-0               0.16.4-1                    pixel-manipulation library for X and cairo
      ii  libplrpc-perl               0.2020-2                    Perl extensions for writing PlRPC servers and clients
      ii  libpng12-0                  1.2.44-1+squeeze3           PNG library - runtime
      ii  libpolkit-agent-1-0         0.96-4+squeeze1             PolicyKit Authentication Agent API
      ii  libpolkit-backend-1-0       0.96-4+squeeze1             PolicyKit backend API
      ii  libpolkit-gobject-1-0       0.96-4+squeeze1             PolicyKit Authorization API
      ii  libpopt0                    1.16-1                      lib for parsing cmdline parameters
      ii  libproxy0                   0.3.1-2                     automatic proxy configuration management library (shared)
      ii  libpth20                    2.0.7-16                    The GNU Portable Threads
      ii  libpurple-bin               2.7.3-1+squeeze2            multi-protocol instant messaging library - extra utilities
      ii  libpurple0                  2.7.3-1+squeeze2            multi-protocol instant messaging library
      ii  libraptor1                  1.4.21-2+squeeze1           Raptor RDF parser and serializer library
      ii  librasqal2                  0.9.20-1                    Rasqal RDF query library
      ii  libraw1394-11               2.0.5-2                     library for direct access to IEEE 1394 bus (aka FireWire)
      ii  librdf0                     1.0.10-3                    Redland Resource Description Framework (RDF) library
      ii  libreadline6                6.1-3                       GNU readline and history libraries, run-time libraries
      ii  librecode0                  3.6-17                      Shared library on which recode is based
      ii  librpcsecgss3               0.19-2                      allows secure rpc communication using the rpcsec_gss protocol
      ii  librpm1                     4.8.1-6+squeeze1            RPM shared library
      ii  librpmbuild1                4.8.1-6+squeeze1            RPM build shared library
      ii  librpmio1                   4.8.1-6+squeeze1            RPM IO shared library
      ii  librsvg2-2                  2.26.3-1                    SAX-based renderer library for SVG files (runtime)
      ii  libsasl2-2                  2.1.23.dfsg1-7              Cyrus SASL - authentication abstraction library
      ii  libsasl2-modules            2.1.23.dfsg1-7              Cyrus SASL - pluggable authentication modules
      ii  libschroedinger-1.0-0       1.0.9-2                     library for encoding/decoding of Dirac video streams
      ii  libselinux1                 2.0.96-1                    SELinux runtime shared libraries
      ii  libsepol1                   2.0.41-1                    SELinux library for manipulating binary security policies
      ii  libsgutils2-2               1.29-1                      utilities for devices using the SCSI command set (shared libraries)
      ii  libshout3                   2.2.2-5+b1                  MP3/Ogg Vorbis broadcast streaming library
      ii  libsigc++-2.0-0c2a          2.2.4.2-1                   type-safe Signal Framework for C++ - runtime
      ii  libsilc-1.1-2               1.1.10-2                    SILC generic library
      ii  libsilcclient-1.1-3         1.1.10-2                    SILC client library
      ii  libslang2                   2.2.2-4                     The S-Lang programming library - runtime version
      ii  libslv2-9                   0.6.6-5                     A library for simple use of LV2 plugins
      ii  libsm6                      2:1.1.1-1                   X11 Session Management library
      ii  libsndfile1                 1.0.21-3+squeeze1           Library for reading/writing audio files
      ii  libsoundtouch1c2            1.3.1-2                     sound stretching library
      ii  libsoup-gnome2.4-1          2.30.2-1+squeeze1           an HTTP library implementation in C -- GNOME support library
      ii  libsoup2.4-1                2.30.2-1+squeeze1           an HTTP library implementation in C -- Shared library
      ii  libspeex1                   1.2~rc1-1                   The Speex codec runtime library
      ii  libsqlite3-0                3.7.3-1                     SQLite 3 shared library
      ii  libss2                      1.41.12-4stable1            command-line interface parsing library
      ii  libssh2-1                   1.2.6-1                     SSH2 client-side library
      ii  libssl0.9.8                 0.9.8o-4squeeze7            SSL shared libraries
      ii  libstdc++6                  4.4.5-8                     The GNU Standard C++ Library v3
      ii  libstdc++6-4.4-dev          4.4.5-8                     The GNU Standard C++ Library v3 (development files)
      ii  libsys-hostname-long-perl   1.4-2                       Figure out the long (fully-qualified) hostname
      ii  libsysfs2                   2.1.0+repack-1              interface library to sysfs
      ii  libtag1-vanilla             1.6.3-1                     TagLib Audio Meta-Data Library (Vanilla flavour)
      ii  libtag1c2a                  1.6.3-1                     TagLib Audio Meta-Data Library
      ii  libtasn1-3                  2.7-1+squeeze+1             Manage ASN.1 structures (runtime)
      ii  libtcnative-1               1.1.20-1                    Tomcat native library using the apache portable runtime
      ii  libtext-charwidth-perl      0.04-6                      get display widths of characters on the terminal
      ii  libtext-iconv-perl          1.7-2                       converts between character sets in Perl
      ii  libtext-wrapi18n-perl       0.06-7                      internationalized substitute of Text::Wrap
      ii  libthai-data                0.1.14-2                    Data files for Thai language support library
      ii  libthai0                    0.1.14-2                    Thai language support library
      ii  libtheora0                  1.1.1+dfsg.1-3              The Theora Video Compression Codec
      ii  libtie-ixhash-perl          1.21-2                      ordered associative arrays for Perl
      ii  libtiff4                    3.9.4-5+squeeze3            Tag Image File Format (TIFF) library
      ii  libtimedate-perl            1.2000-1                    collection of modules to manipulate date/time information
      ii  libtokyocabinet8            1.4.37-6                    Tokyo Cabinet Database Libraries [runtime]
      ii  libts-0.0-0                 1.0-7                       touch screen library
      ii  libudev0                    164-3                       libudev shared library
      ii  libunistring0               0.9.3-3                     Unicode string library for C
      ii  liburi-perl                 1.54-2                      module to manipulate and access URI strings
      ii  libusb-0.1-4                2:0.1.12-16                 userspace USB programming library
      ii  libusb-1.0-0                2:1.0.8-2                   userspace USB programming library
      ii  libuuid1                    2.17.2-9                    Universally Unique ID library
      ii  libv4l-0                    0.8.0-1                     Collection of video4linux support libraries
      ii  libvarnishapi1              3.0.2-1~1squeeze1           shared libraries for Varnish
      ii  libvisual-0.4-0             0.4.0-3                     Audio visualization framework
      ii  libvisual-0.4-plugins       0.4.0.dfsg.1-2              Audio visualization framework plugins
      ii  libvorbis0a                 1.3.1-1+squeeze1            The Vorbis General Audio Compression Codec (Decoder library)
      ii  libvorbisenc2               1.3.1-1+squeeze1            The Vorbis General Audio Compression Codec (Encoder library)
      ii  libvpx0                     0.9.1-2                     VP8 video codec (shared library)
      ii  libwavpack1                 4.60.1-1                    an audio codec (lossy and lossless) - library
      ii  libwebkit-1.0-2             1.2.7-0+squeeze2            Web content engine library for Gtk+
      ii  libwebkit-1.0-common        1.2.7-0+squeeze2            Web content engine library for Gtk+ - data files
      ii  libwildmidi1                0.2.3.2-2                   software MIDI player library
      ii  libwrap0                    7.6.q-19                    Wietse Venema's TCP wrappers library
      ii  libwww-perl                 5.836-1                     Perl HTTP/WWW client/server library
      ii  libx11-6                    2:1.3.3-4                   X11 client-side library
      ii  libx11-data                 2:1.3.3-4                   X11 client-side library
      ii  libxapian22                 1.2.3-2                     Search engine library
      ii  libxau6                     1:1.0.6-1                   X11 authorisation library
      ii  libxaw7                     2:1.0.7-1                   X11 Athena Widget library
      ii  libxcb-atom1                0.3.6-1                     utility libraries for X C Binding -- atom
      ii  libxcb-render-util0         0.3.6-1                     utility libraries for X C Binding -- render-util
      ii  libxcb-render0              1.6-1                       X C Binding, render extension
      ii  libxcb1                     1.6-1                       X C Binding
      ii  libxcomposite1              1:0.4.2-1                   X11 Composite extension library
      ii  libxcursor1                 1:1.1.10-2                  X cursor management library
      ii  libxdamage1                 1:1.1.3-1                   X11 damaged region extension library
      ii  libxdmcp6                   1:1.0.3-2                   X11 Display Manager Control Protocol library
      ii  libxerces2-java             2.9.1-4.1                   Validating XML parser for Java with DOM level 3 support
      ii  libxext6                    2:1.1.2-1                   X11 miscellaneous extension library
      ii  libxfixes3                  1:4.0.5-1                   X11 miscellaneous 'fixes' extension library
      ii  libxfont1                   1:1.4.1-3                   X11 font rasterisation library
      ii  libxft2                     2.1.14-2                    FreeType-based font drawing library for X
      ii  libxi6                      2:1.3-6                     X11 Input extension library
      ii  libxinerama1                2:1.1-3                     X11 Xinerama extension library
      ii  libxml-parser-perl          2.36-1.1+b1                 Perl module for parsing XML files
      ii  libxml-twig-perl            1:3.34-1                    Perl module for processing huge XML documents in tree mode
      ii  libxml-xpathengine-perl     0.12-2                      re-usable XPath engine for DOM-like trees
      ii  libxml2                     2.7.8.dfsg-2+squeeze3       GNOME XML library
      ii  libxmu6                     2:1.0.5-2                   X11 miscellaneous utility library
      ii  libxmuu1                    2:1.0.5-2                   X11 miscellaneous micro-utility library
      ii  libxpm4                     1:3.5.8-1                   X11 pixmap library
      ii  libxrandr2                  2:1.3.0-3                   X11 RandR extension library
      ii  libxrender1                 1:0.9.6-1                   X Rendering Extension client library
      ii  libxslt1.1                  1.1.26-6                    XSLT 1.0 processing library - runtime library
      ii  libxss1                     1:1.2.0-2                   X11 Screen Saver extension library
      ii  libxt6                      1:1.0.7-1                   X11 toolkit intrinsics library
      ii  libxtst6                    2:1.1.0-3                   X11 Testing -- Record extension library
      ii  libxv1                      2:1.0.5-1                   X11 Video extension library
      ii  libxxf86dga1                2:1.1.1-2                   X11 Direct Graphics Access extension library
      ii  libxxf86vm1                 1:1.1.0-2                   X11 XFree86 video mode extension library
      ii  libyajl1                    1.0.8-1                     Yet Another JSON Library
      ii  libzbar0                    0.10+doc-4                  bar code scanner and decoder (library)
      ii  libzephyr4                  3.0-1                       Project Athena's notification service - non-Kerberos libraries
      ii  linux-libc-dev              2.6.32-41squeeze2           Linux support headers for userspace development
      ii  linux-sound-base            1.0.23+dfsg-2               base package for ALSA and OSS sound systems
      ii  locales                     2.11.3-3                    Embedded GNU C Library: National Language (locale) data [support]
      ii  login                       1:4.1.4.2+svn3283-2+squeeze system login tools
      ii  logrotate                   3.7.8-6                     Log rotation utility
      ii  lsb-base                    3.2-23.2squeeze1            Linux Standard Base 3.2 init script functionality
      ii  lsb-release                 3.2-23.2squeeze1            Linux Standard Base version reporting utility
      ii  lsof                        4.81.dfsg.1-1               List open files
      ii  m4                          1.4.14-3                    a macro processing language
      ii  magit                       0.7-1.1                     A Emacs interface for Git
      ii  make                        3.81-8                      An utility for Directing compilation.
      ii  man-db                      2.5.7-8                     on-line manual pager
      ii  manpages                    3.27-1                      Manual pages about using a GNU/Linux system
      ii  mawk                        1.3.3-15                    a pattern scanning and text processing language
      ii  memcached                   1.4.5-1                     A high-performance memory object caching system
      ii  mercurial                   1.6.4-1                     scalable distributed version control system
      ii  mercurial-common            1.6.4-1                     scalable distributed version control system (common files)
      ii  mime-support                3.48-1                      MIME files 'mime.types' & 'mailcap', and support programs
      ii  mingetty                    1.07-3                      Console-only getty
      ii  mlocate                     0.22.2-1                    quickly find files on the filesystem based on their name
      ii  module-init-tools           3.12-2+b1                   tools for managing Linux kernel modules
      ii  mount                       2.17.2-9                    Tools for mounting and manipulating filesystems
      ii  mtools                      4.0.12-1                    Tools for manipulating MSDOS files
      ii  mtr-tiny                    0.75-2                      Full screen ncurses traceroute tool
      ii  mutt                        1.5.20-9+squeeze2           text-based mailreader supporting MIME, GPG, PGP and threading
      ii  nano                        2.2.4-1                     small, friendly text editor inspired by Pico
      ii  ncurses-base                5.7+20100313-5              basic terminal type definitions
      ii  ncurses-bin                 5.7+20100313-5              terminal-related programs and man pages
      ii  ncurses-term                5.7+20100313-5              additional terminal type definitions
      ii  net-tools                   1.60-23                     The NET-3 networking toolkit
      ii  netbase                     4.45                        Basic TCP/IP networking system
      ii  netcat-traditional          1.10-38                     TCP/IP swiss army knife
      ii  nfs-common                  1:1.2.2-4squeeze2           NFS support files common to client and server
      ii  nmap                        5.00-3                      The Network Mapper
      ii  ntfs-3g                     1:2010.3.6-1                read-write NTFS driver for FUSE
      ii  ntfsprogs                   2.0.0-1+b1                  tools for doing neat things in NTFS partitions from Linux
      ii  ntp                         1:4.2.6.p2+dfsg-1+b1        Network Time Protocol daemon and utility programs
      ii  odbcinst                    2.2.14p2-1                  Helper program for accessing odbc ini files
      ii  odbcinst1debian2            2.2.14p2-1                  Support library for accessing odbc ini files
      ii  openssh-blacklist           0.4.1                       list of default blacklisted OpenSSH RSA and DSA keys
      ii  openssh-blacklist-extra     0.4.1                       list of non-default blacklisted OpenSSH RSA and DSA keys
      ii  openssh-client              1:5.5p1-6+squeeze1          secure shell (SSH) client, for secure access to remote machines
      ii  openssh-server              1:5.5p1-6+squeeze1          secure shell (SSH) server, for secure access from remote machines
      ii  openssl                     0.9.8o-4squeeze7            Secure Socket Layer (SSL) binary and related cryptographic tools
      ii  passwd                      1:4.1.4.2+svn3283-2+squeeze change and administer password and group data
      ii  patch                       2.6-2                       Apply a diff file to an original
      ii  pciutils                    1:3.1.7-6                   Linux PCI Utilities
      ii  percona-server-client       5.5.21-rel25.1-234.squeeze  Percona Server database client
      ii  percona-server-client-5.5   5.5.21-rel25.1-234.squeeze  Percona Server database client binaries
      ii  percona-server-common-5.5   5.5.21-rel25.1-234.squeeze  Percona Server database common files (e.g. /etc/mysql/my.cnf)
      ii  percona-server-server       5.5.21-rel25.1-234.squeeze  Percona Server database server
      ii  percona-server-server-5.5   5.5.21-rel25.1-234.squeeze  Percona Server database server binaries
      ii  perl                        5.10.1-17squeeze3           Larry Wall's Practical Extraction and Report Language
      ii  perl-base                   5.10.1-17squeeze3           minimal Perl system
      ii  perl-doc                    5.10.1-17squeeze3           Perl documentation
      ii  perl-modules                5.10.1-17squeeze3           Core Perl modules
      ii  phionvpn                    8-SP2                       phion VPN for linux.
      ii  pidgin-data                 2.7.3-1+squeeze2            multi-protocol instant messaging client - data files
      ii  po-debconf                  1.0.16+nmu1                 tool for managing templates file translations with gettext
      ii  policykit-1                 0.96-4+squeeze1             framework for managing administrative policies and privileges
      ii  policykit-1-gnome           0.96-3                      GNOME authentication agent for PolicyKit-1
      ii  portmap                     6.0.0-2                     RPC port mapper
      ii  procps                      1:3.2.8-9                   /proc file system utilities
      ii  psmisc                      22.11-1                     utilities that use the proc file system
      ii  puppet-el                   2.6.2-5+squeeze4            syntax highlighting for puppet manifests in emacs
      ii  python                      2.6.6-3+squeeze6            interactive high-level object-oriented language (default version)
      ii  python-apt                  0.7.100.1+squeeze1          Python interface to libapt-pkg
      ii  python-apt-common           0.7.100.1+squeeze1          Python interface to libapt-pkg (locales)
      ii  python-central              0.6.16+nmu1                 register and build utility for Python packages
      ii  python-dbus                 0.83.1-1                    simple interprocess messaging system (Python interface)
      ii  python-gobject              2.21.4+is.2.21.3-1          Python bindings for the GObject library
      ii  python-minimal              2.6.6-3+squeeze6            minimal subset of the Python language (default version)
      ii  python-pip                  0.7.2-1                     alternative Python package installer
      ii  python-pkg-resources        0.6.14-4                    Package Discovery and Resource Access using pkg_resources
      ii  python-reportbug            4.12.6                      Python modules for interacting with bug tracking systems
      ii  python-setuptools           0.6.14-4                    Python Distutils Enhancements (setuptools compatibility)
      ii  python-support              1.0.10                      automated rebuilding support for Python modules
      ii  python2.6                   2.6.6-8+b1                  An interactive high-level object-oriented language (version 2.6)
      ii  python2.6-minimal           2.6.6-8+b1                  A minimal subset of the Python language (version 2.6)
      ii  readline-common             6.1-3                       GNU readline and history libraries, common files
      ii  recode                      3.6-17                      Character set conversion utility
      ii  reportbug                   4.12.6                      reports bugs in the Debian distribution
      ii  rpm                         4.8.1-6+squeeze1            package manager for RPM
      ii  rpm-common                  4.8.1-6+squeeze1            common files for RPM
      ii  rpm2cpio                    4.8.1-6+squeeze1            tool to convert RPM package to CPIO archive
      ii  rsync                       3.0.7-2                     fast remote file copy program (like rcp)
      ii  rsyslog                     4.6.4-2                     enhanced multi-threaded syslogd
      ii  screen                      4.0.3-14                    terminal multiplexor with VT100/ANSI terminal emulation
      ii  sed                         4.2.1-7                     The GNU sed stream editor
      ii  sensible-utils              0.0.4                       Utilities for sensible alternative selection
      ii  sgml-base                   1.26+nmu1                   SGML infrastructure and SGML catalog file support
      ii  shared-mime-info            0.71-4                      FreeDesktop.org shared MIME database and spec
      ii  squid                       2.7.STABLE9-2.1             Internet object cache (WWW proxy cache)
      ii  squid-common                2.7.STABLE9-2.1             Internet object cache (WWW proxy cache) - common files
      ii  squid-langpack              20100628-1                  Localized error pages for Squid
      ii  strace                      4.5.20-2                    A system call tracer
      ii  sun-java6-bin               6.26-0squeeze1              Sun Java(TM) Runtime Environment (JRE) 6 (architecture dependent files
      ii  sun-java6-jdk               6.26-0squeeze1              Sun Java(TM) Development Kit (JDK) 6
      ii  sun-java6-jre               6.26-0squeeze1              Sun Java(TM) Runtime Environment (JRE) 6 (architecture independent fil
      ii  sysv-rc                     2.88dsf-13.1                System-V-like runlevel change mechanism
      ii  sysvinit                    2.88dsf-13.1                System-V-like init utilities
      ii  sysvinit-utils              2.88dsf-13.1                System-V-like utilities
      ii  tar                         1.23-3                      GNU version of the tar archiving utility
      ii  tasksel                     2.88                        Tool for selecting tasks for installation on Debian systems
      ii  tasksel-data                2.88                        Official tasks used for installation of Debian systems
      ii  tcpd                        7.6.q-19                    Wietse Venema's TCP wrapper utilities
      ii  telnet                      0.17-36                     The telnet client
      ii  texinfo                     4.13a.dfsg.1-6              Documentation system for on-line information and printed output
      ii  thttpd                      2.25b-11                    tiny/turbo/throttling HTTP server
      ii  time                        1.7-23.1                    The GNU time program for measuring cpu resource usage
      ii  traceroute                  1:2.0.15-1                  Traces the route taken by packets over an IPv4/IPv6 network
      ii  tsconf                      1.0-7                       touch screen library common files
      ii  ttf-dejavu-core             2.31-1                      Vera font family derivate with additional characters
      ii  tzdata                      2011n-0squeeze1             time zone and daylight-saving time data
      ii  ucf                         3.0025+nmu1                 Update Configuration File: preserve user changes to config files.
      ii  udev                        164-3                       /dev/ and hotplug management daemon
      ii  udisks                      1.0.1+git20100614-3         abstraction for enumerating block devices
      ii  unixodbc                    2.2.14p2-1                  ODBC tools libraries
      ii  unzip                       6.0-4                       De-archiver for .zip files
      ii  util-linux                  2.17.2-9                    Miscellaneous system utilities
      ii  varnish                     3.0.2-1~1squeeze1           state of the art, high-performance web accelerator
      ii  vim                         2:7.2.445+hg~cb94c42c0e1a-1 Vi IMproved - enhanced vi editor
      ii  vim-common                  2:7.2.445+hg~cb94c42c0e1a-1 Vi IMproved - Common files
      ii  vim-runtime                 2:7.2.445+hg~cb94c42c0e1a-1 Vi IMproved - Runtime files
      ii  vim-tiny                    2:7.2.445+hg~cb94c42c0e1a-1 Vi IMproved - enhanced vi editor - compact version
      ii  w3m                         0.5.2-9                     WWW browsable pager with excellent tables/frames support
      ii  wamerican                   6-3                         American English dictionary words for /usr/share/dict
      ii  wget                        1.12-2.1                    retrieves files from the web
      ii  whiptail                    0.52.11-1                   Displays user-friendly dialog boxes from shell scripts
      ii  whois                       5.0.10                      an intelligent whois client
      ii  x-ttcidfont-conf            32                          TrueType and CID fonts configuration for X
      ii  x11-common                  1:7.5+8+squeeze1            X Window System (X.Org) infrastructure
      ii  x11-utils                   7.5+4                       X11 utilities
      ii  xfonts-encodings            1:1.0.3-1                   Encodings for X.Org fonts
      ii  xfonts-utils                1:7.5+2                     X Window System font utility programs
      ii  xkb-data                    1.8-2                       X Keyboard Extension (XKB) configuration data
      ii  xml-core                    0.13                        XML infrastructure and XML catalog file support
      ii  xml-twig-tools              1:3.34-1                    Command line tools for processing XML documents
      ii  xprintidle                  0.2-4                       Small utility that prints user's idle time in X
      ii  xz-utils                    5.0.0-2                     XZ-format compression utilities
      ii  yasnippet                   0.6.1c-1                    A template system for Emacs
      ii  zlib1g                      1:1.2.3.4.dfsg-3            compression library - runtime
---
 usr/bin/system-info | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/usr/bin/system-info b/usr/bin/system-info
index 54ad37fa..b3cda258 100755
--- a/usr/bin/system-info
+++ b/usr/bin/system-info
@@ -17,6 +17,9 @@ generate_output_file_per_module=0
 output_dir=$(pwd)
 output_file=""
 
+current_indent_level=0
+INDENT="  "
+
 function init() {
   # first, try to be nice
   ece_scripts_dir=$(dirname $0)/../share/escenic/ece-scripts
@@ -47,6 +50,24 @@ function run_system_info_modules() {
   fi
 }
 
+## $1 : indent level, optional, if not set, will use the
+## current_indent_level
+function get_indent() {
+  local result=""
+
+  if [[ "${1}x" != "x" ]]; then
+    local number_of_indents=$1
+  else
+    local number_of_indents=$current_indent_level
+  fi
+  
+  for (( i = 0; i < $number_of_indents; i++ )); do
+    result="${INDENT}$result"
+  done
+
+  echo "$result"
+}
+
 function create_header() {
   local title="Overview of $HOSTNAME"
   
@@ -144,6 +165,8 @@ function print_list_item() {
     echo "* $@"
   elif [ $format == "json" ]; then
     echo "      \"$@\", "
+  elif [ $format == "yaml" ]; then
+    echo "$(get_indent)- $@"
   fi
 }
 
@@ -175,6 +198,9 @@ EOF
     cat <<EOF
 "$(json_escape_string $(echo $@ | sed 's/$/\\n/'))",
 EOF
+
+  elif [ $format == "yaml" ]; then
+    echo "$@" | sed "s/^/$(get_indent)/g"
   fi
 }
 
@@ -194,6 +220,10 @@ function print_h3_header() {
     cat <<EOF
     "$(make_string_into_json_label $@)" :
 EOF
+  elif [ $format == "yaml" ]; then
+    echo ""
+    echo "$(get_indent 2)${@}:"
+    current_indent_level=2
   fi
 }
 
@@ -205,6 +235,10 @@ function print_h4_header() {
     echo "<h4>$@</h4>"
   elif [ $format == "confluence" ]; then
     echo "h4. $@"
+  elif [ $format == "yaml" ]; then
+    echo ""
+    echo "$(get_indent 3)${@}:"
+    current_indent_level=3
   fi
 }
 
@@ -220,6 +254,10 @@ function print_h2_header() {
     cat <<EOF
   "$(echo $@ | tr [A-Z] [a-z] | sed 's/ /-/g')" : {
 EOF
+  elif [ $format == "yaml" ]; then
+    echo ""
+    echo "$(get_indent 1)${@}:"
+    current_indent_level=2
   fi
 }
 
@@ -236,6 +274,9 @@ function print_h1_header() {
     echo "<h1>$@</h1>"
   elif [ $format == "confluence" ]; then
     echo "h1. $@"
+  elif [ $format == "yaml" ]; then
+    echo "${@}:"
+    current_indent_level=0
   fi
 }
 
@@ -252,6 +293,8 @@ EOF
     echo "$@"
   elif [ $format == "json" ]; then
     echo "    \"message\": \"$@\","
+  elif [ $format == "yaml" ]; then
+    echo "$(get_indent)$@"
   fi
 }
 

From 8ba8940b9286335b7cf3f4ab671d8f05767fb47f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 3 Apr 2012 18:17:54 +0800
Subject: [PATCH 0627/2585] - added (moved code from deploy.sh) to common-io:  
 download_uri_target_to_dir - made deploy.sh use this method (ece deploy) -
 made content-engine.sh::set_up_assembly_tool use this new method - made
 content-engine.sh::assemble_deploy_and_restart_type use the new   'ece deploy
 --uri' directly. This means that fai_<profile>_ear now   should support URI
 based EARs, issue #54

---
 usr/share/escenic/ece-scripts/common-io.sh    | 21 +++++++++++++++++++
 .../ece-install.d/content-engine.sh           | 17 +++++++--------
 usr/share/escenic/ece-scripts/ece.d/deploy.sh | 15 ++-----------
 3 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/common-io.sh b/usr/share/escenic/ece-scripts/common-io.sh
index 0c681e05..a13c3590 100644
--- a/usr/share/escenic/ece-scripts/common-io.sh
+++ b/usr/share/escenic/ece-scripts/common-io.sh
@@ -85,3 +85,24 @@ function make_ln() {
   fi
 }
 
+## $1 : the URI, can be file:///tmp/file, http://server/file  or https://file
+## $2 : the target dir
+## returns : the local, downloaded file with absolute path
+function download_uri_target_to_dir() {
+  local uri=$1
+  local target_dir=$2
+  local file=""
+  
+  if [[ $uri == "http://"* || $uri == "https://"* ]]; then
+    run cd $target_dir
+    run wget $wget_opts $uri -O $(basename $uri)
+    file=$target_dir/$(basename $uri)
+  elif [[ $uri == "file://"* ]]; then
+      # length of file:// is 7
+    file=${file:7}
+  else
+    file=$uri
+  fi
+
+  echo $file
+}
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index e3090982..051932a6 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -234,14 +234,9 @@ EOF
     run cd $escenic_root_dir/assemblytool/publications
     
     for el in ${fai_publication_war_uri_list}; do
-      if [[ $el == http* ]]; then
-        run wget $wget_opts $el
-      elif [[ $el == file://* ]]; then
-        local file_with_path=$(echo $el | sed "s#file://##g")
-        run cp $file_with_path .
-      else
-        run cp ${el} .
-      fi
+      local download_file=$(
+        download_uri_target_to_dir $el $escenic_root_dir/assemblytool/publications
+      )
       
       if [ ! -e $(basename $el) ]; then
         print_and_log "Failed to get user publication $el."
@@ -557,8 +552,10 @@ function assemble_deploy_and_restart_type()
     # profiles in the same ece-install process.
   ece_command="ece -i $instance_name -t $type clean assemble deploy restart"
   if [ $(is_installing_from_ear) -eq 1 ]; then
-    run cp $ece_instance_ear_file $escenic_cache_dir/engine.ear
-    ece_command="ece -i $instance_name -t $type deploy restart"
+    ece_command="ece -i $instance_name
+      -t $type
+      deploy --uri $ece_instance_ear_file
+      restart"
     print_and_log "Deploying the supplied EAR on instance $instance_name"
     print_and_log "and restarting it ..."
   else
diff --git a/usr/share/escenic/ece-scripts/ece.d/deploy.sh b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
index 842f476f..ad1a9da7 100644
--- a/usr/share/escenic/ece-scripts/ece.d/deploy.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
@@ -46,20 +46,9 @@ function deploy() {
 
   if [ -n "$file" ]; then
     print_and_log "Deploying $file on $instance ..."
-    local downloaded_ear=$(basename $file)
-    if [[ $file == "http://"* || $file == "https://"* ]]; then
-      print_and_log "Downloading EAR $file ..."
-      run cd $cache_dir
-      run wget $wget_opts $file -O $(basename $file)
-      ear=$cache_dir/$(basename $file)
-    elif [[ $file == "file://"* ]]; then
-      # length of file:// is 7
-      ear=${file:7}
-    else
-      ear=$file
-    fi
+    ear=$(download_uri_target_to_dir $file $cache_dir)
     
-    if [ ! -e $ear ]; then
+    if [ ! -e "$ear" ]; then
         print_and_log "The EAR $ear_uri specified in $file could"
         print_and_log "not be retrieved. I will exit now. :-("
         exit 1

From 4b4baff578af1135d4aacda31cf1e074b79b8d11 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 3 Apr 2012 18:35:03 +0800
Subject: [PATCH 0628/2585] - moved verify_that_files_exist_and_are_readable
 from ece-install to   common-io - added support for checking HTTP/HTTPs URIs

---
 usr/sbin/ece-install                       | 17 --------------
 usr/share/escenic/ece-scripts/common-io.sh | 27 ++++++++++++++++++++++
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 571ad3ba..3095b9bd 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -746,23 +746,6 @@ function update_type_instances_to_start_up()
   fi
 }
 
-# verifies that the passed file(s) exist and are readable, depends on
-# set_archive_files_depending_on_profile
-function verify_that_files_exist_and_are_readable()
-{
-    debug "Verifying that the file(s) exist(s) and are readable: $@"
-    
-    for el in $@; do
-        if [ ! -e $el ]; then
-            print_and_log "The file" $el "doesn't exist. I will exit now."
-            remove_pid_and_exit_in_error
-        elif [ ! -r $el ]; then
-            print_and_log "The file" $el "isn't readable. I will exit now."
-            remove_pid_and_exit_in_error
-        fi
-    done
-}   
-
 function install_presentation_server()
 {
     print_and_log "Installing a presentation server on $HOSTNAME."
diff --git a/usr/share/escenic/ece-scripts/common-io.sh b/usr/share/escenic/ece-scripts/common-io.sh
index a13c3590..204f2693 100644
--- a/usr/share/escenic/ece-scripts/common-io.sh
+++ b/usr/share/escenic/ece-scripts/common-io.sh
@@ -106,3 +106,30 @@ function download_uri_target_to_dir() {
 
   echo $file
 }
+
+# verifies that the passed file(s) exist and are readable, depends on
+# set_archive_files_depending_on_profile
+function verify_that_files_exist_and_are_readable()
+{
+  debug "Verifying that the file(s) exist(s) and are readable: $@"
+  
+  for el in $@; do
+    if [[ $el == http* ]]; then
+      if [ $(curl -s -I $el | wc -l) -gt 0 ]; then
+        continue
+      else
+        print_and_log "The URI $el doesn't exist, I will exit now."
+        remove_pid_and_exit_in_error
+      fi  
+    fi
+    
+    if [ ! -e $el ]; then
+      print_and_log "The file" $el "doesn't exist. I will exit now."
+      remove_pid_and_exit_in_error
+    elif [ ! -r $el ]; then
+      print_and_log "The file" $el "isn't readable. I will exit now."
+      remove_pid_and_exit_in_error
+    fi
+  done
+}   
+

From b03076a0c6dfce4f9d32da2c01d97372c6824b05 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 4 Apr 2012 12:27:42 +0800
Subject: [PATCH 0629/2585] - removed logging from init since the log file
 isn't set yet here,   chicken and the egg ;-)

---
 usr/bin/ece | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 9a15a32f..1462ea86 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -27,7 +27,7 @@ http_user=""
 http_password=""
 wget_auth=""
 curl_auth=""
-log="/tmp/arne"
+log=""
 
 type_list="
 engine
@@ -94,7 +94,6 @@ function init() {
     
     # load ece-install modules
     for el in $dir/ece.d/*.sh; do
-      log "Loading $(basename $0) module:" $el
       source $el
     done
   else

From e34feae2048cc23a75f43fdd24f1e6631dce2d68 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 4 Apr 2012 14:26:52 +0800
Subject: [PATCH 0630/2585] - removed back tick which shouldn't be there,  the
 code for creating a   conf archive is now copy and paste-able

---
 usr/share/doc/escenic/ece-install-guide.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 79948744..f5ea40c1 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -575,7 +575,7 @@ $ tar czf /tmp/nursery-skeleton-solr-and-security.tar.gz \
   engine/security \
   engine/siteconfig/config-skeleton/ \
   engine/solr/conf \
-  engine/siteconfig/bootstrap-skeleton/`
+  engine/siteconfig/bootstrap-skeleton/
 #+END_SRC
 
 /tmp/nursery-skeleton-solr-and-security.tar.gz should now have everything

From f6ab9107dc389d9fabc9fc979d087b0b5dc7b2bb Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 4 Apr 2012 14:30:15 +0800
Subject: [PATCH 0631/2585] - added new method: extract_archive, will extract
 .zip, .tar.gz, .tgz   and tar.bz2 archives for you.

---
 usr/share/escenic/ece-scripts/common-bashing.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index 4b7ec125..3c1669bc 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -232,3 +232,14 @@ function is_archive_healthy() {
   fi
 }
 
+## $1 : the archive
+function extract_archive() {
+  if [[ "$1" == *".tar.gz" || "$1" == *".tgz" ]]; then
+    run tar xzf $1
+  elif [[ "$1" == *".tar.bz2" ]]; then
+    run tar xjf $1
+  elif [[ "$1" == *".zip" ]]; then
+    run unzip -q $1
+  fi
+}
+

From 8d528b63d42e5708b42f161cf7e07de28b2d3107 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 4 Apr 2012 14:30:40 +0800
Subject: [PATCH 0632/2585] - added more documentation to
 download_uri_target_to_dir

---
 usr/share/escenic/ece-scripts/common-io.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/common-io.sh b/usr/share/escenic/ece-scripts/common-io.sh
index 204f2693..c4c42b17 100644
--- a/usr/share/escenic/ece-scripts/common-io.sh
+++ b/usr/share/escenic/ece-scripts/common-io.sh
@@ -85,7 +85,9 @@ function make_ln() {
   fi
 }
 
-## $1 : the URI, can be file:///tmp/file, http://server/file  or https://file
+## $1 : the URI, can be file:///tmp/file, http://server/file or
+##      https://file. If $1 is a local file reference, it's used as it
+##      is.
 ## $2 : the target dir
 ## returns : the local, downloaded file with absolute path
 function download_uri_target_to_dir() {

From 4b8fd63d13cceab947a345f165d662d3d874d641 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 4 Apr 2012 14:33:36 +0800
Subject: [PATCH 0633/2585] - new feature: fai_<profile>_conf_archive now
 accepts the same set of   URIs that fai_<profile>_ear does. You can now
 specify the conf   archive via HTTP, HTTPs or file URIs.

  This closes #55

- improved user feedback when you're deploying using EARs, but not
  conf archives. This should improve the error hunting when not having
  ECE locally installed.
---
 usr/share/doc/escenic/ece-install-guide.org   |  8 +++++++
 .../ece-install.d/content-engine.sh           | 23 +++++++++++++------
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index f5ea40c1..748c6311 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -598,6 +598,14 @@ If you wish to provide Nursery configuration for the plugins, you
 simply put them in engine/siteconfig/config-skeleton inside your
 tarball, together with the other Nursery configuration files.
 
+The fai_presentation_conf_archive and fai_presentation_ear variables
+both accept the following types of value (here using the value of
+fai_presentation_ear as an example):
+- http://build.server/stable/engine-mysite.com-1.2.3.ear
+- https://build.server/stable/engine-mysite.com-1.2.3.ear
+- file:///var/lib/build/stable/engine-mysite.com-1.2.3.ear
+- /var/lib/build/stable/engine-mysite.com-1.2.3.ear
+
 ** Setting up virtual hosts
 Setting up virtual host definitions in the application server makes a
 some things easier, such as ECE plugins which set cookies based on
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 051932a6..7df76787 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -235,7 +235,9 @@ EOF
     
     for el in ${fai_publication_war_uri_list}; do
       local download_file=$(
-        download_uri_target_to_dir $el $escenic_root_dir/assemblytool/publications
+        download_uri_target_to_dir \
+          $el \
+          $escenic_root_dir/assemblytool/publications
       )
       
       if [ ! -e $(basename $el) ]; then
@@ -272,8 +274,13 @@ function set_up_basic_nursery_configuration() {
     print_and_log "Using the supplied Nursery & JAAS configuration from" 
     print_and_log "bundle: $ece_instance_conf_archive"
     local a_tmp_dir=$(mktemp -d)
+    local file=$(
+      download_uri_target_to_dir \
+        $ece_instance_conf_archive \
+        $a_tmp_dir
+    )
     run cd $a_tmp_dir
-    run tar xzf $ece_instance_conf_archive
+    extract_archive $file
     
     if [ -d ${a_tmp_dir}/engine/security ]; then
       run cp -r $a_tmp_dir/engine/security/ $common_nursery_dir/
@@ -285,6 +292,8 @@ function set_up_basic_nursery_configuration() {
     
     run cp -r engine/siteconfig/config-skeleton/* $common_nursery_dir/
   else
+    print_and_log "I'm using Nursery & JAAS configuration (skeleton) " \
+      "from $escenic_root_dir"
     run cp -r $escenic_root_dir/engine/siteconfig/config-skeleton/* \
       $common_nursery_dir/
     run cp -r $escenic_root_dir/engine/security/ $common_nursery_dir/
@@ -552,12 +561,12 @@ function assemble_deploy_and_restart_type()
     # profiles in the same ece-install process.
   ece_command="ece -i $instance_name -t $type clean assemble deploy restart"
   if [ $(is_installing_from_ear) -eq 1 ]; then
-    ece_command="ece -i $instance_name
-      -t $type
-      deploy --uri $ece_instance_ear_file
+    ece_command="ece -i $instance_name \
+      -t $type \
+      deploy --uri $ece_instance_ear_file \
       restart"
-    print_and_log "Deploying the supplied EAR on instance $instance_name"
-    print_and_log "and restarting it ..."
+    print_and_log "Deploying the $ece_instance_ear_file on "
+    print_and_log "instance $instance_name and restarting it ..."
   else
     print_and_log "Assembling, deploying & starting $instance_name ..."
   fi

From af7782a45598bc0a7d8a89b0cab19205a15df4fb Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 4 Apr 2012 15:12:27 +0800
Subject: [PATCH 0634/2585] - added tomcat logs directory to the self
 reporting, browsable   directories, you can now browse the tomcat logs
 through   http://server:5678/

- added a first, non-cron, run of system info so that
  http://server:5678/ immediately answers and you don't get a 404 on
  index.html before cron generates it one minute later.
---
 .../ece-scripts/ece-install.d/monitoring.sh       | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index b8436fba..db899b93 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -422,27 +422,36 @@ function install_system_info() {
   if [ $(grep -v ^# /etc/crontab | grep "$command" | wc -l) -lt 1 ]; then
     echo '* *     * * *   root    '$command >> /etc/crontab
   fi
-
+  
+  # doing a first run of system-info since cron will take a minute to start
+  eval $command
+  
   # creating symlinks like:
   # /var/www/system-info/var/log/escenic -> /var/log/escenic
   # /var/www/system-info/etc/escenic -> /etc/escenic
   make_dir ${dir}/$(dirname $escenic_log_dir)
-  make_dir ${dir}/$(dirname $escenic_conf_dir)
-  
   local target=${dir}/$(dirname ${escenic_log_dir})/$(basename ${escenic_log_dir})
   if [ ! -h $target ]; then
     run ln -s ${escenic_log_dir} $target
   fi
 
+  make_dir ${dir}/$(dirname $escenic_conf_dir)
   target=${dir}/$(dirname $escenic_conf_dir)/$(basename $escenic_conf_dir)
   if [ ! -h $target ]; then
     run ln -s ${escenic_conf_dir} $target
   fi
   
+  make_dir ${dir}/$tomcat_base
+  target=${dir}/$tomcat_base/logs
+  if [ ! -h $target ]; then
+    run ln -s $tomcat_base/logs $target
+  fi
+  
   # thttpd doesn't serve files if they've got the execution bit set
   # (it then think it's a misnamed CGI script)
   find $escenic_log_dir -type f | egrep ".log$|.out$" | xargs chmod 644
   find $escenic_conf_dir -type f | egrep ".conf$|.properties$" | xargs chmod 644
+  find $tomcat_base/logs -type f | egrep ".log$" | xargs chmod 644
 
   add_next_step "Always up to date system info: http://$HOSTNAME:$port/"
   add_next_step "you can also see system-info in the shell, type: system-info"

From 2f53e3f6dead9c69544b7c64f120af09d890b1fa Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 10 Apr 2012 13:52:14 +0200
Subject: [PATCH 0635/2585] - added diagram showing the different HTTP (& APT)
 caches and how   they're wired up in the VOSA system.

---
 .../escenic/images/vosa_http_caches.blockdiag   |  14 ++++++++++++++
 .../doc/escenic/images/vosa_http_caches.png     | Bin 0 -> 11529 bytes
 2 files changed, 14 insertions(+)
 create mode 100644 usr/share/doc/escenic/images/vosa_http_caches.blockdiag
 create mode 100644 usr/share/doc/escenic/images/vosa_http_caches.png

diff --git a/usr/share/doc/escenic/images/vosa_http_caches.blockdiag b/usr/share/doc/escenic/images/vosa_http_caches.blockdiag
new file mode 100644
index 00000000..d2c196e9
--- /dev/null
+++ b/usr/share/doc/escenic/images/vosa_http_caches.blockdiag
@@ -0,0 +1,14 @@
+blockdiag {
+  orientation = portrait;
+
+  pres1-apt [ label ="pres1: apt-get", color = "orange" ];
+  control-apt [ label ="control: apt-cacher", color = "green" ];
+  pres1-get [ label ="pres1: http_proxy=control:3128", color = "orange" ];
+  control-get [ label ="control: squid:3128", color = "green" ];
+  apt [ label ="vosa apt repo", color = "brown" ];
+  
+  pres1-apt -> control-apt -> apt, official-apt-repos, 3rd-party-apt-repos;
+  pres1-get -> control-get -> technet, ftp.vizrt.com [ label = "GETs" ];
+
+    
+}
diff --git a/usr/share/doc/escenic/images/vosa_http_caches.png b/usr/share/doc/escenic/images/vosa_http_caches.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5fa5b5aad72e4ab9a9b9d29bbe13fd09f8cfb81
GIT binary patch
literal 11529
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
SElMBnj>A^REQ=3#T>CHkgA0EE

literal 0
HcmV?d00001


From c4e9efbf48f2c748e40b26121a398dd1ea563e87 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 17 Apr 2012 19:29:02 +0800
Subject: [PATCH 0636/2585] - added diagrams for the VOSA "ECE & EAE machines",
 an effort to   standardise upon the production setup of Escenic based web
 sites.

---
 .../doc/escenic/images/vosa_eae_machine.png      | Bin 0 -> 2714 bytes
 .../doc/escenic/images/vosa_eae_machine.rackdiag |   9 +++++++++
 .../doc/escenic/images/vosa_ece_machine.png      | Bin 0 -> 3686 bytes
 .../doc/escenic/images/vosa_ece_machine.rackdiag |  11 +++++++++++
 4 files changed, 20 insertions(+)
 create mode 100644 usr/share/doc/escenic/images/vosa_eae_machine.png
 create mode 100644 usr/share/doc/escenic/images/vosa_eae_machine.rackdiag
 create mode 100644 usr/share/doc/escenic/images/vosa_ece_machine.png
 create mode 100644 usr/share/doc/escenic/images/vosa_ece_machine.rackdiag

diff --git a/usr/share/doc/escenic/images/vosa_eae_machine.png b/usr/share/doc/escenic/images/vosa_eae_machine.png
new file mode 100644
index 0000000000000000000000000000000000000000..3098bba6d7ac0866027de16f7a99543048545bea
GIT binary patch
literal 2714
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
CLDOdd

literal 0
HcmV?d00001

diff --git a/usr/share/doc/escenic/images/vosa_eae_machine.rackdiag b/usr/share/doc/escenic/images/vosa_eae_machine.rackdiag
new file mode 100644
index 00000000..52f0d31a
--- /dev/null
+++ b/usr/share/doc/escenic/images/vosa_eae_machine.rackdiag
@@ -0,0 +1,9 @@
+rackdiag {
+  rack {
+    ascending;
+    
+    2U;
+    1: analysis-engine:8080
+    2: db:3306
+  }
+}
diff --git a/usr/share/doc/escenic/images/vosa_ece_machine.png b/usr/share/doc/escenic/images/vosa_ece_machine.png
new file mode 100644
index 0000000000000000000000000000000000000000..13c42caf599c81d10e3d6600fed19ada9147fc63
GIT binary patch
literal 3686
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

literal 0
HcmV?d00001

diff --git a/usr/share/doc/escenic/images/vosa_ece_machine.rackdiag b/usr/share/doc/escenic/images/vosa_ece_machine.rackdiag
new file mode 100644
index 00000000..a5bb8a00
--- /dev/null
+++ b/usr/share/doc/escenic/images/vosa_ece_machine.rackdiag
@@ -0,0 +1,11 @@
+rackdiag {
+  rack {
+    ascending;
+    
+    4U;
+    1: cache-server:80
+    2: content-engine:8080
+    3: memory-cache:11211
+    4: search-server:8180
+  }
+}

From 42e50dfa3f102d345180e2a3fa39599f917e9a5a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 17 Apr 2012 20:55:29 +0800
Subject: [PATCH 0637/2585] - added script for signing DEB packages and adding
 these to a local   APT repository.

---
 .../src/sign-and-add-packages-to-apt-repo     | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 usr/local/src/sign-and-add-packages-to-apt-repo

diff --git a/usr/local/src/sign-and-add-packages-to-apt-repo b/usr/local/src/sign-and-add-packages-to-apt-repo
new file mode 100644
index 00000000..9abc1c8a
--- /dev/null
+++ b/usr/local/src/sign-and-add-packages-to-apt-repo
@@ -0,0 +1,26 @@
+#! /usr/bin/env bash                                                                                            
+
+dir=$1
+log=/tmp/$(basename $0).log
+apt_repo_dir=/var/www/apt
+
+if [[ ${dir}x == "x" || ! -d $dir ]]; then
+  echo "You must pass a valid directory to $(basename $0)"
+  echo "For example:"
+  echo "$(basename $0) /tmp/dir-with-a-lot-of-deb-files"
+  exit 1
+fi
+
+echo "I'm logging to $log"
+
+function get_name() {
+  dpkg --info $1 | sed 's/^[ ]//'g | grep ^Package | cut -d':' -f2
+}
+
+for el in $dir/*.deb; do
+  echo -n "Signing and adding $(basename $el) to the APT repository ... "
+  dpkg-sig --sign builder $el >> $log 2>> $log
+  reprepro -Vb $apt_repo_dir remove stable $(get_name $el) >> $log 2>> $log
+  reprepro --ask-passphrase -Vb $apt_repo_dir includedeb stable $el >> $log 2>> $log
+  echo "done"
+done

From baa56ee8f03656ffdef4a93209a7eef31fafcc95 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 17 Apr 2012 20:56:01 +0800
Subject: [PATCH 0638/2585] - renamed get_name to get_package_name to make it
 more self-descriptive

---
 usr/local/src/sign-and-add-packages-to-apt-repo | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/local/src/sign-and-add-packages-to-apt-repo b/usr/local/src/sign-and-add-packages-to-apt-repo
index 9abc1c8a..64cd9565 100644
--- a/usr/local/src/sign-and-add-packages-to-apt-repo
+++ b/usr/local/src/sign-and-add-packages-to-apt-repo
@@ -13,14 +13,14 @@ fi
 
 echo "I'm logging to $log"
 
-function get_name() {
+function get_package_name() {
   dpkg --info $1 | sed 's/^[ ]//'g | grep ^Package | cut -d':' -f2
 }
 
 for el in $dir/*.deb; do
   echo -n "Signing and adding $(basename $el) to the APT repository ... "
   dpkg-sig --sign builder $el >> $log 2>> $log
-  reprepro -Vb $apt_repo_dir remove stable $(get_name $el) >> $log 2>> $log
+  reprepro -Vb $apt_repo_dir remove stable $(get_package_name $el) >> $log 2>> $log
   reprepro --ask-passphrase -Vb $apt_repo_dir includedeb stable $el >> $log 2>> $log
   echo "done"
 done

From e68a0118516e80cf6bcd52bfc35bef1c3ee9a51a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 17 Apr 2012 22:24:44 +0800
Subject: [PATCH 0639/2585] - now using the GPG key for the DPKG signing

---
 usr/local/src/sign-and-add-packages-to-apt-repo | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/usr/local/src/sign-and-add-packages-to-apt-repo b/usr/local/src/sign-and-add-packages-to-apt-repo
index 64cd9565..bb976733 100644
--- a/usr/local/src/sign-and-add-packages-to-apt-repo
+++ b/usr/local/src/sign-and-add-packages-to-apt-repo
@@ -3,6 +3,7 @@
 dir=$1
 log=/tmp/$(basename $0).log
 apt_repo_dir=/var/www/apt
+gpg_key=AD747D97
 
 if [[ ${dir}x == "x" || ! -d $dir ]]; then
   echo "You must pass a valid directory to $(basename $0)"
@@ -18,9 +19,8 @@ function get_package_name() {
 }
 
 for el in $dir/*.deb; do
-  echo -n "Signing and adding $(basename $el) to the APT repository ... "
-  dpkg-sig --sign builder $el >> $log 2>> $log
-  reprepro -Vb $apt_repo_dir remove stable $(get_package_name $el) >> $log 2>> $log
-  reprepro --ask-passphrase -Vb $apt_repo_dir includedeb stable $el >> $log 2>> $log
-  echo "done"
+  echo "Signing and adding $(basename $el) to the APT repository ... "
+  dpkg-sig --sign builder -k $gpg_key $el
+  reprepro -Vb $apt_repo_dir remove stable $(get_package_name $el)
+  reprepro --ask-passphrase -Vb $apt_repo_dir includedeb stable $el
 done

From a5448576d9aab2943ba1a63849919ca94644d281 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 17 Apr 2012 22:38:16 +0800
Subject: [PATCH 0640/2585] - added puppet module for adding a APT repo -
 removed a lot of paths that reprepro creates by itself. - TODO:   * configure
 nginx   * ensure that the symlink to stable is working   * investigate i18
 problem when running apt-get update   * check if the hyphens are causing
 problems, move the module around?     ...oh well, now it's in git at least
 :-)

---
 etc/puppet/modules/vosa-apt-repo/init.pp | 31 ++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 etc/puppet/modules/vosa-apt-repo/init.pp

diff --git a/etc/puppet/modules/vosa-apt-repo/init.pp b/etc/puppet/modules/vosa-apt-repo/init.pp
new file mode 100644
index 00000000..727586e3
--- /dev/null
+++ b/etc/puppet/modules/vosa-apt-repo/init.pp
@@ -0,0 +1,31 @@
+package { 'reprepro': }
+package { 'nginx': }
+package { 'dpkg-sig': }
+
+file { '/var/www': ensure=> directory, owner => www-data, group => www-data }
+file { '/var/www/apt': ensure=> directory, owner => www-data, group => www-data }
+file { '/var/www/apt/conf': ensure=> directory, owner => www-data, group => www-data }
+
+file { '/var/www/apt/conf/distributions':
+  ensure=> file,
+  content=> "
+Origin: Vizrt Online
+Label: Vizrt Online APT repository
+Codename: squeeze
+Architectures: i386 amd64 source
+Components: main
+Description: Private APT repository for SAAS customer of Vizrt
+SignWith: yes
+",
+}
+
+file { '/var/www/apt/dists':
+  ensure=> directory,
+  owner =>
+  www-data,
+  group => www-data
+}
+file { '/var/www/apt/dists/stable':
+  ensure => link,
+  target => "/var/www/apt/dists/squeeze"
+}

From 0c381b626b00898ad81542ed585dc7572b296a60 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 18 Apr 2012 22:21:37 +0800
Subject: [PATCH 0641/2585] - will add packages to the non-free component
 (section) if the DEBs   reside in a directory called 'non-free'.

---
 usr/local/src/sign-and-add-packages-to-apt-repo | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/usr/local/src/sign-and-add-packages-to-apt-repo b/usr/local/src/sign-and-add-packages-to-apt-repo
index bb976733..dce3fc80 100644
--- a/usr/local/src/sign-and-add-packages-to-apt-repo
+++ b/usr/local/src/sign-and-add-packages-to-apt-repo
@@ -22,5 +22,12 @@ for el in $dir/*.deb; do
   echo "Signing and adding $(basename $el) to the APT repository ... "
   dpkg-sig --sign builder -k $gpg_key $el
   reprepro -Vb $apt_repo_dir remove stable $(get_package_name $el)
-  reprepro --ask-passphrase -Vb $apt_repo_dir includedeb stable $el
+
+  if [[ $(basename $(dirname $el)) == "non-free" ]]; then
+      component=non-free
+  else
+      component=main
+  fi
+  
+  reprepro --ask-passphrase -Vb $apt_repo_dir -C $component includedeb stable $el
 done

From 187885adc6818bc8e878718101b164ee94dbfab4 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 18 Apr 2012 22:47:14 +0800
Subject: [PATCH 0642/2585] - added non-free component

---
 etc/puppet/modules/vosa-apt-repo/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/puppet/modules/vosa-apt-repo/init.pp b/etc/puppet/modules/vosa-apt-repo/init.pp
index 727586e3..63688d57 100644
--- a/etc/puppet/modules/vosa-apt-repo/init.pp
+++ b/etc/puppet/modules/vosa-apt-repo/init.pp
@@ -13,7 +13,7 @@
 Label: Vizrt Online APT repository
 Codename: squeeze
 Architectures: i386 amd64 source
-Components: main
+Components: main non-free
 Description: Private APT repository for SAAS customer of Vizrt
 SignWith: yes
 ",

From 64f61875e6ae865e75c4e56e5dd26aa61414c797 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 19 Apr 2012 10:45:25 +0200
Subject: [PATCH 0643/2585] - moved the apt repo manifest to a new a better
 location which caters   for the (two) Puppet modules we want to have: vosa::
 and escenic::

---
 .../share/puppet/modules/vosa/manifests/apt_repo.pp               | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename etc/puppet/modules/vosa-apt-repo/init.pp => usr/share/puppet/modules/vosa/manifests/apt_repo.pp (100%)

diff --git a/etc/puppet/modules/vosa-apt-repo/init.pp b/usr/share/puppet/modules/vosa/manifests/apt_repo.pp
similarity index 100%
rename from etc/puppet/modules/vosa-apt-repo/init.pp
rename to usr/share/puppet/modules/vosa/manifests/apt_repo.pp

From 8e375c0002ca322500511b735630afe57769e8e4 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Thu, 19 Apr 2012 14:00:06 +0200
Subject: [PATCH 0644/2585] added a folder structure for the escenic puppet
 module added templates based on the 5.3 nursery skeleton. renamed them to
 erb. put README files in empty layer directories

---
 .../etc/escenic/engine/common/README.txt      |   0
 .../engine/default/Database.properties.erb    |  92 +++++++++
 .../engine/default/Initial.properties.erb     |  57 ++++++
 .../escenic/engine/default/RMI.properties.erb |  64 +++++++
 .../default/ServerConfig.properties.erb       | 175 ++++++++++++++++++
 .../HTMLCleanupSAXFilter.properties.erb       |  13 ++
 .../PostTidyRegExFieldCleaner.properties.erb  |  30 +++
 .../PreTidyRegExFieldCleaner.properties.erb   |  39 ++++
 .../escenic/profile/LoginLaw.properties.erb   |   4 +
 .../profile/LoginLawCache.properties.erb      |   5 +
 .../profile/MailNotifier.properties.erb       |  24 +++
 .../profile/ProfileManager.properties.erb     |  14 ++
 .../UserPresentationCache.properties.erb      |   9 +
 .../schedule/CleanupSchedule.properties.erb   |   4 +
 .../schedule/PardonSchedule.properties.erb    |   4 +
 .../service/CleanupService.properties.erb     |   7 +
 .../service/PardonOfficer.properties.erb      |   8 +
 .../schedule/OccurrenceHelper.properties.erb  |  15 ++
 .../OracleInvalidationService.properties.erb  |  32 ++++
 .../SquidInvalidationService.properties.erb   |  38 ++++
 .../ExampleReportConfiguration.properties.erb | 114 ++++++++++++
 .../xml/ExportConfiguration.properties.erb    |  41 ++++
 .../xml/ExportManager.properties.erb          |  12 ++
 .../xml/ImportReporter.properties.erb         |  63 +++++++
 .../xml/XMLImportService.properties.erb       |  10 +
 .../MigrationSetupService.properties.erb      |  25 +++
 .../StringSchedule.properties.erb             |  18 ++
 .../DelegatingSearchEngine.properties.erb     |   1 +
 .../webstart/StudioConfig.properties.erb      |  74 ++++++++
 .../webstudio/Preferences.properties.erb      | 117 ++++++++++++
 .../connector/ReadConnector.properties.erb    |  10 +
 .../connector/UpdateConnector.properties.erb  |  10 +
 .../io/api/MediaCategories.properties.erb     |  34 ++++
 .../JMagickVersionGenerator.properties.erb    |  11 ++
 .../ProxyVersionGenerator.properties.erb      |  38 ++++
 .../DependentCacheManager.properties.erb      |  24 +++
 .../managers/AgreementManager.properties.erb  |  48 +++++
 .../io/managers/ContentManager.properties.erb |  31 ++++
 .../HubConnectionManager.properties.erb       |  97 ++++++++++
 .../repository/LocalFileSystem.properties.erb |  14 ++
 .../repository/RealRepository.properties.erb  |  52 ++++++
 .../SectionRepository.properties.erb          |  42 +++++
 .../schedules/ArticleCleaner.properties.erb   |  26 +++
 .../DeleteArticlesService.properties.erb      |   7 +
 .../ExternalContentUpdater.properties.erb     |  16 ++
 .../HtmlCacheRefreshSchedule.properties.erb   |  16 ++
 .../io/schedules/PoolCleaner.properties.erb   |  26 +++
 .../search/DB2QueryTranslator.properties.erb  |  12 ++
 .../MsSQLQueryTranslator.properties.erb       |  12 ++
 .../io/search/OracleFullText.properties.erb   |   4 +
 .../OracleQueryTranslator.properties.erb      |  12 ++
 .../io/search/SearchManager.properties.erb    |   7 +
 .../SybaseQueryTranslator.properties.erb      |  12 ++
 .../services/ActivationService.properties.erb |   6 +
 .../DefaultPoolRemovePolicy.properties.erb    |  59 ++++++
 .../DeleteArticlesService.properties.erb      |  36 ++++
 .../ExternalContentManager.properties.erb     |  44 +++++
 .../neo/io/services/MailSender.properties.erb | 118 ++++++++++++
 .../services/PoolRemoveService.properties.erb |  52 ++++++
 .../services/RepositoryService.properties.erb |  20 ++
 .../GenericPublication.properties.erb         | 111 +++++++++++
 .../neo/util/PostCardSender.properties.erb    |  41 ++++
 .../etc/escenic/engine/family/README.txt      |   0
 .../etc/escenic/engine/instance/README.txt    |   0
 64 files changed, 2157 insertions(+)
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/README.txt
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/Database.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/Initial.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/RMI.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/ServerConfig.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/migration/filter/HTMLCleanupSAXFilter.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/migration/filter/PostTidyRegExFieldCleaner.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/migration/filter/PreTidyRegExFieldCleaner.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/LoginLaw.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/LoginLawCache.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/MailNotifier.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/ProfileManager.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/presentation/UserPresentationCache.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/schedule/CleanupSchedule.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/schedule/PardonSchedule.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/service/CleanupService.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/service/PardonOfficer.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/schedule/OccurrenceHelper.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/service/webcache/OracleInvalidationService.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/service/webcache/SquidInvalidationService.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/syndication/xml/ExampleReportConfiguration.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/syndication/xml/ExportConfiguration.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/syndication/xml/ExportManager.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/syndication/xml/ImportReporter.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/syndication/xml/XMLImportService.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/syndication/xml/service/MigrationSetupService.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/transformers/StringSchedule.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/webservice/search/DelegatingSearchEngine.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/webstart/StudioConfig.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/webstudio/Preferences.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/connector/ReadConnector.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/connector/UpdateConnector.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/io/api/MediaCategories.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/io/api/media/JMagickVersionGenerator.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/io/api/media/ProxyVersionGenerator.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/content/DependentCacheManager.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/managers/AgreementManager.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/managers/ContentManager.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/managers/HubConnectionManager.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/repository/LocalFileSystem.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/repository/RealRepository.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/repository/SectionRepository.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/schedules/ArticleCleaner.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/schedules/DeleteArticlesService.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/schedules/ExternalContentUpdater.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/schedules/HtmlCacheRefreshSchedule.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/schedules/PoolCleaner.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/search/DB2QueryTranslator.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/search/MsSQLQueryTranslator.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/search/OracleFullText.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/search/OracleQueryTranslator.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/search/SearchManager.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/search/SybaseQueryTranslator.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/ActivationService.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/DefaultPoolRemovePolicy.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/DeleteArticlesService.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/ExternalContentManager.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/MailSender.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/PoolRemoveService.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/RepositoryService.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/publications/GenericPublication.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/util/PostCardSender.properties.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/family/README.txt
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/escenic/engine/instance/README.txt

diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/README.txt b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/README.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/Database.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/Database.properties.erb
new file mode 100644
index 00000000..7ffb9efe
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/Database.properties.erb
@@ -0,0 +1,92 @@
+##############################################################################
+# SIMPLE DATABASE POOL CONFIGURATION
+##############################################################################
+# A properties files that exists solely to
+# configure other components.
+# This is not a component, just a .properties-file that contains values
+# which will be expanded by other components.
+#
+# By default, SimpleDBPool is configured to use these values.
+##############################################################################
+
+
+
+
+
+##############################################################################
+# DATABASE URL
+##############################################################################
+# The JDBC URL of the database.
+# Example Oracle
+#   url=jdbc:oracle:thin:@1.2.3.4:1521:ece
+#     where 1.2.3.4 is the host name running Oracle
+#           1521    is the port number of the TNS listener
+#           ece     is the name of the database
+#
+# Example Sybase
+#   url=jdbc:sybase:Tds:1.2.3.4:4100/ece4
+#     where 1.2.3.4 is the host name running Sybase
+#           4100    is the port number where Sybase is listening
+#           ece4     is the name of the database
+#
+# Example MsSQL
+#   url=jdbc:microsoft:sqlserver://1.2.3.4:1433;databasename=ece4;SelectMethod=cursor
+#     where 1.2.3.4 is the host name running the database
+#           1433    is the port number where MsSql is listening
+#           ece4      is the name of the database
+#
+# Example MySQL
+#   url=  url=jdbc:mysql://1.2.3.4/ece4?autoReconnect=true&jdbcCompliantTruncation=false
+#           jdbcCompliantTruncation is required for BLOBs to function correctly.
+#
+##############################################################################
+# url=
+
+
+
+##############################################################################
+# DATABASE DRIVER
+##############################################################################
+# The JDBC DRIVER to use when talking to the database.
+# Example
+#   Oracle:
+#     driver=oracle.jdbc.driver.OracleDriver
+#   Sybase:
+#     driver=com.sybase.jdbc2.jdbc.SybDriver
+#   MsSQL:
+#     driver=com.microsoft.jdbc.sqlserver.SQLServerDriver
+#   MySQL:
+#     driver=com.mysql.jdbc.Driver
+#   driver=
+#           
+##############################################################################
+# driver=
+
+
+##############################################################################
+# DATABASE USER ID
+##############################################################################
+# The user ID to use when accessing the database
+#
+# Examples:
+#   userid=ece_dbo
+#   userid=scott
+#           
+##############################################################################
+# userid=ece_dbo
+
+
+
+##############################################################################
+# DATABASE PASSWORD
+##############################################################################
+# The password to use when accessing the database
+#
+# Examples
+#   password=lano3rjk
+#   password=tiger
+#
+##############################################################################
+# password=
+
+
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/Initial.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/Initial.properties.erb
new file mode 100644
index 00000000..61701ebc
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/Initial.properties.erb
@@ -0,0 +1,57 @@
+############################################################################
+# Initial Component loader
+# Loads components in alphabetical order based on the key.
+# To add a service, uncomment one of the lines.
+############################################################################
+
+### NOTE ###
+### service.0 is reserved for Escenic Content Engine system services.
+### Do not define any services as service.0.whatever...
+
+############################################################################
+# RESIN GLOBAL PROPERTIES
+############################################################################
+# This is a EXPERIMENTAL service to make Escenic Content Engine run on the
+# Resin 3.0.x family of application servers. USE AT OWN RISK.
+#
+# * Enable this service if you want to test Escenic Content Engine on a
+#   Resin 3.0.x server.
+# * This service is part of the Escenic Content Engine system services, thus
+#   disregards the note above...
+############################################################################
+# service.0.00-globalProperties=/neo/io/services/GlobalProperties
+
+############################################################################
+# REMOTE EXPIRE SERVICE
+############################################################################
+# Remote Expire service is used to keep caches in sync between Escenic
+# engines and clients.
+#
+# * Enable this service if you have a multi-server installation, and these
+#   servers need to talk to each other to expire caches.
+# * Enable this service if this server is to support Escenic Content Studio
+############################################################################
+service.1.1-remote-expire=/neo/io/services/RemoteExpireServiceBootstrap
+
+
+############################################################################
+# REMOTE API EVENT SUPPORT
+############################################################################
+#
+# * Enable this service if this is a multiserver environment. This will enable 
+# * events to be sent to remote servers. See also /io/api/EventManager to
+# * configure the reome servers.
+############################################################################
+service.1.2.5-api=/io/api/RMIBootstrap
+
+############################################################################
+# XML IMPORT SERVICE
+############################################################################
+# Uncomment this to enable the xml import service. The default import
+# service will look for xml files to import every minute. There is an
+# example configuration for the import in
+# "/com/escenic/service/xml/importer/XMLImportConfiguration". After
+# the import is configured, it has to be added to
+# "/com/escenic/service/xml/importer/XMLImportService.importConfigurations".
+############################################################################
+#service.9.9-xml-import-service=/com/escenic/syndication/xml/XMLImportSchedule
\ No newline at end of file
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/RMI.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/RMI.properties.erb
new file mode 100644
index 00000000..7162c1b0
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/RMI.properties.erb
@@ -0,0 +1,64 @@
+############################################################################
+# RMI port setup file.  This file simply defines the host name and port
+# number where the RMI registry is located, for the services which
+# this physical server will register its RMI services.
+#
+# The defaults provided should suit almost all installations. 
+############################################################################
+
+
+### ------------------------------------------------------------------- ###
+### ------------------------------------------------------ Optional --- ###
+### ------------------------------------------------------------------- ###
+
+############################################################################
+# RMI PORT
+############################################################################
+# Engine (by default) starts an RMI registry on the following port, which
+# enables servers in a multi-server environment, and Escenic Content Studio
+# to contact it.  By default, this is done on port 8123.
+#
+# Escenic Content Engine also registers all its local services to this
+# local RMI registry.
+#
+# The default value should suffice in most cases.
+#
+# Default:
+#   port=8123
+#
+# Example:
+#   port=8800
+#   port=13581
+#
+############################################################################
+# port=8123
+
+
+
+
+############################################################################
+# RMI HOST NAME
+############################################################################
+# Escenic Content Engine registers all its local services to the registry
+# specified by the "host" property.  by default, it accesses the RMI
+# registry that it starts itself; located on the "local" host called
+# "127.0.0.1" (localhost).
+#
+# If, for some reason, a different RMI registry is to be used, simply
+# specify the host name, and all services will be registered on the remote
+# RMI registry.
+#
+# The default value should suffice in most cases.
+#
+# Default:
+#   host=127.0.0.1
+#
+# Example:
+#   host=localhost
+#   host=192.168.2.3
+#   host=rmiregistry.mycompany.com
+#
+############################################################################
+# host=127.0.0.1
+
+
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/ServerConfig.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/ServerConfig.properties.erb
new file mode 100644
index 00000000..6acf57af
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/ServerConfig.properties.erb
@@ -0,0 +1,175 @@
+############################################################################
+# Server configuration file.  This file has some mandatory configuration   #
+# entries, and a lot of optional configuration entries.                    #
+#                                                                          #
+# Normally, the optional configuration entries don't need to be touched    #
+# for a development server.                                                #
+#                                                                          #
+# Please note that many of these values are case sensitive!                #
+############################################################################
+
+
+### ------------------------------------------------------------------- ###
+### ----------------------------------------------------- Mandatory --- ###
+### ------------------------------------------------------------------- ###
+
+############################################################################
+# Information needed to identify database server  and i|o database version
+############################################################################
+# Escenic has to know what type of database it is talking to, to work
+# around quirks in the vendors' SQL semantics.  The four supported values
+# are:
+#   databaseProductName=Sybase
+#   databaseProductName=Oracle
+#   databaseProductName=MsSQL
+#   databaseProductName=MySQL
+#
+# Default:
+#   No default product name.
+############################################################################
+# databaseProductName=Oracle
+
+
+### ------------------------------------------------------------------- ###
+### ------------------------------------------------------ Optional --- ###
+### ------------------------------------------------------------------- ###
+
+
+############################################################################
+# PUBLICATION SPECIFIC FILES ON LOCAL FILE SYSTEM
+############################################################################
+# This directory is by default used to hold publication specific files
+# such as uploaded binary objects.
+#
+# By default, these are created in the /var/lib/escenic/engine/
+# directory.
+#
+# Normally, a common directory shared among all ECE instanses (using a
+# share network file system) is recommended
+# (e.g. /var/lib/escenic/engine/). However, when running multiple ECE
+# instances on one host (e.g. something you often want to do when
+# deploying test systems with multiple ECE stacks), you can give an
+# instance specific path for the uploaded files instead:
+#
+#   filePublicationRoot=/var/lib/escenic/engine/${escenic.server "default"}
+#
+# If the escenic.server system property is unspecified, a directory default
+# is used.
+#
+# It is recommended not to point this directory to the same directory where 
+# the webapps are deployed. That might cause problems in some application
+# servers like Tomcat.
+#
+# The directory is created on demand if it does not exist.
+#
+# Example:
+#   filePublicationRoot=/var/lib/escenic/engine/
+############################################################################
+# filePublicationRoot=/var/lib/escenic/engine/
+
+
+
+############################################################################
+# URL TO PUBLICATIONS
+############################################################################
+# This is the default-URL that publications will get when creating a new 
+# publication.
+#
+# This can be overridden by configure a component called 
+#    "/neo/publications/Pub-xxx"
+# where xxx is the name of the publication, or by configuring a component
+# called
+#    "/neo/publications/GenericPublication"
+# which defines the default behaviour of publications.
+# This file can override the publication URL for a specific site.
+#
+# By default, webpubliactionRoot + publicationName is used as URL for
+# a publication.
+#
+# This is the default value for ALL urls.  When upgrading from Dynamo, this
+# information must be set here, and NOT in the database.  If the database value
+# was different from what is configured here, the database value is
+# silently ignored.
+#
+# Exmaple:
+#   webPublicationRoot=http://my.test.site.com:8080/
+# 
+# --  Given that you have a publication called "live":
+#     * It would get the URL: 
+#         http://my.test.site.com:8080/live/
+#     * a component called /neo/publications/Pub-live couls override this
+#       URL and set it to "http://www.live.com", for example.  The application
+#       server must be configured to serve this web application at that URL.
+#
+# By default, the webPublicationRoot points to http://localhost:8080/
+############################################################################
+# webPublicationRoot=http://localhost:8080/
+
+
+
+
+############################################################################
+# ROOT TEMPLATE DIRECTORY
+############################################################################
+# Defines the directory where Escenic will find the WEB-INF directory to 
+# deploy to new web applications, and where to find the layoutDir specified
+# below.
+#
+# By default, the tempalte root points to the "template" directory
+# in the escenic installation directory.
+# Example:
+#   templateRoot=/etc/escenic/template/
+############################################################################
+# templateRoot=${escenic.root}template/
+
+
+############################################################################
+# TEMPORARY DIRECTORY
+############################################################################
+# Defines the directory where Escenic can create temporary files when it
+# needs to do so.  By default, the "tmp" directory in the escenic root
+# directory is used.
+#
+# If this directory does not exist, it will be created the first time
+# Escenic needs a temporary directory.  Escenic must be able to create this
+# directory, or have write access to the directory if it already exists.
+#
+# Default:
+#   tempDir=${java.io.tmpdir}
+#
+# Example:
+#   tempDir=/tmp/escenic
+#
+# Example:
+#   tempDir=/var/spool/escenic/
+############################################################################
+# tempDir=/tmp
+
+
+#Used to limit access to preview of not active content. trustedIP should be 
+#set to the IP of the server used for publishing
+#trustedIP=127.0.0.1
+
+
+############################################################################
+# Default layouts in this directory. All files in directory will be copied into
+# the "template" directory of the publication and registered with the system. 
+# May be edites by designers, etc.
+# This will override the above layouts.
+# This is relative to the "templateRoot" value configured for the
+#  "ServerConfig" component.
+#
+# By default, "jspdemo1", which is supplied, is used.
+############################################################################
+# layoutDir=jspdemo1
+
+
+#############################################################################
+#
+# Set this property to true to enable migration support.
+# Default is off.
+#  Default: 
+#  migrationEnabled=false
+#
+#############################################################################
+# migrationEnabled=true
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/migration/filter/HTMLCleanupSAXFilter.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/migration/filter/HTMLCleanupSAXFilter.properties.erb
new file mode 100644
index 00000000..d304b96e
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/migration/filter/HTMLCleanupSAXFilter.properties.erb
@@ -0,0 +1,13 @@
+$class=com.escenic.syndication.xml.filter.fieldcleaner.HTMLCleanupSAXFilter
+
+# This should convert all illegal XHTML tags (ECE tags or custom tags) to valid XHTML tags. 
+#fieldCleaner.100 = ./PreTidyRegExFieldCleaner
+
+# Cleans up the value with JTidy and produces a valid XHTML value. Please note that, after this field cleaner, the 
+# output value can be regarded as a valid XML structure. So, wrapping this with a root element should produce a valid 
+# XHTML/XML document.
+#fieldCleaner.300 = ./TidyFieldCleaner
+
+# If PreTidyRegExFieldCleaner converted something, they can be reverted here if necessary. For example, the reference 
+# tag is restored in this field cleaner.
+#fieldCleaner.350 = ./PostTidyRegExFieldCleaner
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/migration/filter/PostTidyRegExFieldCleaner.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/migration/filter/PostTidyRegExFieldCleaner.properties.erb
new file mode 100644
index 00000000..7f83cade
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/migration/filter/PostTidyRegExFieldCleaner.properties.erb
@@ -0,0 +1,30 @@
+$class = com.escenic.syndication.xml.filter.fieldcleaner.RegExFieldCleaner
+
+# NOTES:
+# This runs after the Tidy cleaner. So, we can revert any tags that were converted with PreTidyRegExFieldCleaner.
+#
+# Tidy converts all attributes to lower case at the moment. Please keep that in mind while adding expressions here.
+# To search for "<custom>" and replace it with "<span>", you can use the following properties:
+#
+#      searchExpression.100=<custom>
+#      replaceExpression.100=<span>
+#
+# Please note that, the index (i.e. 100) is important. The search/replace tokens are paired based on this index number.
+# It is recommended to use indices starting from 100 since indices smaller than that are used by the system internally.
+#
+# To learn more about the regular expressions, please visit:
+#    http://java.sun.com/j2se/1.5.0/docs/api/java/util/regex/Pattern.html
+#    http://java.sun.com/j2se/1.5.0/docs/api/java/util/regex/Matcher.html#replaceAll%28java.lang.String%29 
+#
+
+# Revert all "reference" elements
+#searchExpression.001   = <span x\\-escenic\\-type="reference"([^>]*)>\\s*</span>
+#replaceExpression.001  = <reference$1/>
+
+# Revert to "field" elements
+#searchExpression.002   = <span x\\-escenic\\-type="field"([^>]*)>(.*?)</span>
+#replaceExpression.002  = <field$1>$2</field>
+
+# Revert the "relation" element
+#searchExpression.003   = <span x\\-escenic\\-type="relation"([^>]*)>(.*?)</span>
+#replaceExpression.003  = <relation$1>$2</relation> 
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/migration/filter/PreTidyRegExFieldCleaner.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/migration/filter/PreTidyRegExFieldCleaner.properties.erb
new file mode 100644
index 00000000..59ea84f0
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/migration/filter/PreTidyRegExFieldCleaner.properties.erb
@@ -0,0 +1,39 @@
+$class = com.escenic.syndication.xml.filter.fieldcleaner.RegExFieldCleaner
+
+# NOTES:
+# This runs before the Tidy cleaner. So, we convert all ECE tags to valid XHTML tags and then PostTidyRegExFieldCleaner
+# would convert them back to ECE tags again.
+# Tidy does not create the short element syntax (e.g. <span/>). So, it is recommended to use "<span></span>" instead.
+# Tidy converts all attributes to lower case at the moment. Please keep that in mind while adding expressions here.
+#
+# To search for "<custom>" and replace it with "<span>", you can use the following properties:
+#
+#      searchExpression.100=<custom>
+#      replaceExpression.100=<span>
+#
+# Please note that, the index (i.e. 100) is important. The search/replace tokens are paired based on this index number.
+# It is recommended to use indices starting from 100 since indices smaller than that are used by the system internally.
+#
+# To learn more about the regular expressions, please visit:
+#    http://java.sun.com/j2se/1.5.0/docs/api/java/util/regex/Pattern.html
+#    http://java.sun.com/j2se/1.5.0/docs/api/java/util/regex/Matcher.html#replaceAll%28java.lang.String%29 
+#
+
+# Replace all "reference" with a "span" element
+#searchExpression.001   = <reference(.*?)(/>|>(.*?)</reference>)
+#replaceExpression.001  = <span x\\-escenic\\-type="reference"$1>$3</span>
+
+# Replace all "field" with a span
+#searchExpression.002   = <field(.*?)(/>|>(.*?)</field>)
+#replaceExpression.002  = <span x\\-escenic\\-type="field"$1>$3</span>
+
+# Replace all "relation" elements with a span
+#searchExpression.003   = <relation(.*?)(/>|>(.*?)</relation>)
+#replaceExpression.003  = <span x\\-escenic\\-type="relation"$1>$3</span>
+
+
+# Replace all "preform" and "mel" tags with <span class="com.escenic.preform"> and <span class="com.escenic.mel">. 
+# This can be used for other custom tags as well.
+#
+#searchExpression.100   = <(preform|mel)(.*?)(/>|>(.*?)</\\1>)
+#replaceExpression.100  = <span class="com.escenic.$1"$2>$4</span>
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/LoginLaw.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/LoginLaw.properties.erb
new file mode 100644
index 00000000..f1038897
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/LoginLaw.properties.erb
@@ -0,0 +1,4 @@
+#################################
+#Max number of login attempts before user is being suspended
+#################################
+#maxTries=
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/LoginLawCache.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/LoginLawCache.properties.erb
new file mode 100644
index 00000000..693ed235
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/LoginLawCache.properties.erb
@@ -0,0 +1,5 @@
+#The maximum size of the cache for failed logins
+#maxSize=
+#The number of items to throw out of cache
+#throwCount=
+
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/MailNotifier.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/MailNotifier.properties.erb
new file mode 100644
index 00000000..9641e10f
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/MailNotifier.properties.erb
@@ -0,0 +1,24 @@
+$class=com.escenic.profile.MailNotifier
+###########################################
+# The url which defines the message to be displayed in the email sent to the new user
+#
+# Example: 
+#       http://localhost:8080/profile/message.jsp
+###########################################
+#messageUrl=
+
+###########################################
+# The subject of the email sent to the new user
+#
+# Example: 
+#       Password notification
+###########################################
+#subject=
+
+###########################################
+# The component responsible for actually sending the mail
+#
+# Default: 
+#       /neo/io/services/MailSender
+###########################################
+#mailSender=/neo/io/services/MailSender
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/ProfileManager.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/ProfileManager.properties.erb
new file mode 100644
index 00000000..2bea1b85
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/ProfileManager.properties.erb
@@ -0,0 +1,14 @@
+#############################################
+#The law to use when handling failed logins
+#############################################
+#law=
+
+#############################################
+#The notifier to use when a new user is registred
+#############################################
+#registrationNotifier=
+
+#############################################
+#The notifier to use when a user requests a new password
+#############################################
+#passwordNotifier=
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/presentation/UserPresentationCache.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/presentation/UserPresentationCache.properties.erb
new file mode 100644
index 00000000..5246d594
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/presentation/UserPresentationCache.properties.erb
@@ -0,0 +1,9 @@
+##############################
+#The maximum size of the cache
+##############################
+#maxSize=
+
+##############################
+#The number of items to be thrown
+##############################
+#throwCount=
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/schedule/CleanupSchedule.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/schedule/CleanupSchedule.properties.erb
new file mode 100644
index 00000000..b302b183
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/schedule/CleanupSchedule.properties.erb
@@ -0,0 +1,4 @@
+################################
+#Defines when this schedule should run
+################################
+
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/schedule/PardonSchedule.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/schedule/PardonSchedule.properties.erb
new file mode 100644
index 00000000..b302b183
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/schedule/PardonSchedule.properties.erb
@@ -0,0 +1,4 @@
+################################
+#Defines when this schedule should run
+################################
+
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/service/CleanupService.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/service/CleanupService.properties.erb
new file mode 100644
index 00000000..021274e6
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/service/CleanupService.properties.erb
@@ -0,0 +1,7 @@
+#####################################
+#Defines how long a non verified profile should be present 
+#before being deleted from the system. The property is defined in days. 
+#Setting the property to '1' means that all non verified profiles will be deleted
+#after 1 day
+#####################################
+#timeToLive=
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/service/PardonOfficer.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/service/PardonOfficer.properties.erb
new file mode 100644
index 00000000..dd4c7c20
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/service/PardonOfficer.properties.erb
@@ -0,0 +1,8 @@
+##################################
+#This property defines how long a suspended profile should be suspended
+#before being automatically pardoned by the system. 
+#The property is defined in days. 
+#Setting the property to '1' means that all suspended profiles will be pardoned
+#after one day
+#################################
+#suspendTime=
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/schedule/OccurrenceHelper.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/schedule/OccurrenceHelper.properties.erb
new file mode 100644
index 00000000..1e412305
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/schedule/OccurrenceHelper.properties.erb
@@ -0,0 +1,15 @@
+############################################################################
+# Specify maximum number of occurrences per schedule
+############################################################################
+# When a content item containing a schedule field is stored, all of the event
+# occurrences defined by the schedule are indexed, and can be searched by
+# their start date. One can limit the maximum number of occurrences users are
+# allowed to specify by setting this property.
+#
+# Example:
+#  maxOccurrences=200
+#
+# Default:
+#  maxOccurrences=100
+############################################################################
+# maxOccurrences=100
\ No newline at end of file
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/service/webcache/OracleInvalidationService.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/service/webcache/OracleInvalidationService.properties.erb
new file mode 100644
index 00000000..9c0059f7
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/service/webcache/OracleInvalidationService.properties.erb
@@ -0,0 +1,32 @@
+# Hostname of the Oracle WebCache host (default: localhost).
+# host=localhost
+
+# Invalidation port number (see OWC admin page -> ports -> operation ports) (default: 9401).
+# port=9401
+
+# Username
+# webcacheUser=ias_admin
+
+# Password
+# webcachePassword=
+
+# Set this to true to enable the service at startup of ECE or false to disable it (default: false).
+# enabled=false
+
+# Wait this number of ms before updating (default: 5000).
+# waitMilliSecsBeforeUpdating=5000
+
+# Number of times to retry updating OWC if it fails (default: 3).
+# retryLimit=3
+
+# Interval to clear the retry list (default: 3600000 = 1 hour).
+# retryClearInterval=3600000
+
+# Socket timeout (in ms), 0=infinite (default: 0).
+# soTimeout=0
+
+# Force this port number in URLs sent to OWC (0=don't change) (default: 0).
+# Use this to change the port number in URLs returned by ECE.
+# Example: when ECE returns http://myserver.com/article123.ece or http://myserver.com:80/article123.ece 
+# using forcePort=7777 will send http://myserver.com:7777/article123.ece to OWC.
+# forcePort=0
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/service/webcache/SquidInvalidationService.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/service/webcache/SquidInvalidationService.properties.erb
new file mode 100644
index 00000000..826fdb6d
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/service/webcache/SquidInvalidationService.properties.erb
@@ -0,0 +1,38 @@
+###################################################################################################
+# Cache invalidation service for Squid.                                                           #
+# Tested with Squid 2.5 under Ubuntu Linux 6.06 (Dapper Drake)                                    #
+#                                                                                                 #
+# This properties file can also be used with Varnish, which was designed as a drop-in replacement #
+# for Squid.                                                                                      #
+#                                                                                                 #
+# NOTE: make sure your Squid configuration allows purging! It should contain something like this: #
+#                                                                                                 #                                                            
+#     acl purge method PURGE                                                                      #
+#     # Only allow purge requests from localhost                                                  #
+#     http_access allow purge localhost                                                           #
+#     # Deny for all others                                                                       #                                                            
+#     http_access deny purge                                                                      #
+#                                                                                                 #
+#                                                                                                 #
+###################################################################################################
+
+# Set this to true to enable the service at startup of ECE or false to disable it (default: false).
+# enabled=false
+
+# Wait this number of ms before updating (default: 5000).
+# waitMilliSecsBeforeUpdating=5000
+
+# Number of times to retry updating Squid if it fails (default: 3).
+# retryLimit=3
+
+# Interval to clear the retry list (default: 3600000 = 1 hour).
+# retryClearInterval=3600000
+
+# Socket timeout (in ms), 0=infinite (default: 0).
+# soTimeout=0
+
+# Force this port number in URLs sent to Squid (0=don't change) (default: 0).
+# Use this to change the port number in URLs returned by ECE.
+# Example: when ECE returns http://myserver.com/article123.ece or http://myserver.com:80/article123.ece 
+# using forcePort=3128 will send http://myserver.com:3128/article123.ece to Squid.
+# forcePort=0
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/syndication/xml/ExampleReportConfiguration.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/syndication/xml/ExampleReportConfiguration.properties.erb
new file mode 100644
index 00000000..79eae108
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/syndication/xml/ExampleReportConfiguration.properties.erb
@@ -0,0 +1,114 @@
+$class=com.escenic.syndication.xml.filter.ReportConfiguration
+
+############################################################################
+# Enable/disable statistics
+############################################################################
+# Specify whether to add statistics in the report.
+# Example:
+#   includeStatistics=true
+#   includeStatistics=false
+# Default:
+#   includeStatistics=false
+############################################################################
+# includeStatistics=true
+
+############################################################################
+# Boilerplate
+############################################################################
+# Used as the first line in the report.
+# Example:
+#   boilerplate=An automatic report from the XML import.
+# Default:
+#   boilerplate=An automatic report from the XML import.
+############################################################################
+# boilerplate=An automatic report from the XML import.
+
+############################################################################
+# Report file name
+############################################################################
+# Full path of the file to be used to write the report. If the file doesn't
+# exists, it will be created. The report will be appended to the file.
+# Example:
+#   filename=/home/user/import-report.txt
+# Default:
+#   None
+############################################################################
+# filename=/home/user/import-report.txt
+
+############################################################################
+# Email recipients
+############################################################################
+# Comma separated list of email address to be used to send the report .
+# Addresses must follow RFC822 syntax.
+# Example:
+#   recipients=user@domain.com
+#   recipients=User 1 <user1@domain.com>, User 2 <user2@domain.com>
+# Default:
+#   None
+############################################################################
+# recipients=user@domain.com
+
+############################################################################
+# Subject of the report email
+############################################################################
+# Subject of the report email
+# Example:
+#   subject=XML Import Report
+# Default:
+#   subject=XML Import Report
+############################################################################
+# subject=XML Import Report
+
+############################################################################
+# Enable/disable attachments
+############################################################################
+# Specify whether to attach the import file(s) with the report email.
+#   true - set true to attach file(s) with the report.
+#   false - set false to disable attachment.
+# Example:
+#   includeAttachment=true
+#   includeAttachment=false
+# Default:
+#   includeAttachment=false
+############################################################################
+# includeAttachment=true
+
+############################################################################
+# Maximum attachment size
+############################################################################
+# Maximum allowed size of attachment in KB. If the size the the import file
+# is more than this value, the file will not be attached with the report.
+# Set to -1 to attach file with any size.
+# Example:
+#   maxAttachmentSize=1024
+#   maxAttachmentSize=100
+# Default:
+#   maxAttachmentSize=1024
+############################################################################
+# maxAttachmentSize=1024
+
+############################################################################
+# Enable/disable stack trace
+############################################################################
+# Specify whether to print full stack trace of the exceptions in the report
+# Example:
+#   includeStackTrace=true
+#   includeStackTrace=false
+# Default:
+#   includeStackTrace=true
+############################################################################
+# includeStackTrace=false
+
+############################################################################
+# Enable/disable reporting
+############################################################################
+# Enable/disable reporting.
+#   true - set true to enable reporting.
+#   false - set false to disable reporting.
+# Example:
+#   enabled=true
+#   enabled=false
+# Default:
+#   enabled=true
+############################################################################
+# enabled=true
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/syndication/xml/ExportConfiguration.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/syndication/xml/ExportConfiguration.properties.erb
new file mode 100644
index 00000000..754b5862
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/syndication/xml/ExportConfiguration.properties.erb
@@ -0,0 +1,41 @@
+#
+# $Header: //depot/escenic/engine-dist/branches/5.3/src/main/resources/siteconfig/config-skeleton/com/escenic/syndication/xml/ExportConfiguration.properties#1 $
+#
+# Copyright (C) 2009 Escenic.
+# All Rights Reserved.  No use, copying or distribution of this
+# work may be made except in accordance with a valid license
+# agreement from Escenic.  This notice must be
+# included on all copies, modifications and derivatives of this
+# work.
+#
+
+#Export Configuration template
+$class=com.escenic.syndication.xml.ExportConfiguration
+name=Default export configuration (Please override with you own local configuration)
+
+objectLoader=/io/api/ObjectLoader
+entityResolver=/neo/io/services/ClasspathEntityResolver
+exportWriter=./StandardExportWriter
+transformer=./ExportTransformer
+
+# Which objects to export
+#objectTypes=*
+#sections=*
+#sectionsById=
+#publicationId=a valid publication id
+#enabled=false
+#disableEvents=false
+## Include referred objects
+#includeReferredObjects=true
+## Include referred binary files
+#includeReferredFiles=true
+
+## Where to look for xsl templates
+# templateDirectory=/absolute/path/to/xsl/directory
+# Default do not cache xsl
+#cache=false
+# Do not export objects that are imported
+#import=false
+
+### Setting default output directory
+#exportTarget=file://${java.io.tmpdir}
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/syndication/xml/ExportManager.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/syndication/xml/ExportManager.properties.erb
new file mode 100644
index 00000000..ec821f35
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/syndication/xml/ExportManager.properties.erb
@@ -0,0 +1,12 @@
+#
+# $Header: //depot/escenic/engine-dist/branches/5.3/src/main/resources/siteconfig/config-skeleton/com/escenic/syndication/xml/ExportManager.properties#1 $
+#
+# Copyright (C) 2009 Escenic.
+# All Rights Reserved.  No use, copying or distribution of this
+# work may be made except in accordance with a valid license
+# agreement from Escenic.  This notice must be
+# included on all copies, modifications and derivatives of this
+# work.
+#
+
+configuration.default=./ExportConfiguration
\ No newline at end of file
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/syndication/xml/ImportReporter.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/syndication/xml/ImportReporter.properties.erb
new file mode 100644
index 00000000..88c301de
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/syndication/xml/ImportReporter.properties.erb
@@ -0,0 +1,63 @@
+$class=com.escenic.syndication.xml.ImportReporter
+
+############################################################################
+# MailSender to use
+############################################################################
+# Specify the MailSender to use.
+# Example:
+#   emailSender=/neo/io/services/MailSender
+# Default:
+#   emailSender=/neo/io/services/MailSender
+############################################################################
+# emailSender=/neo/io/services/MailSender
+
+############################################################################
+# Report configurations
+############################################################################
+# Report configurations to use. See ExampleReportConfiguration.properties
+# for an example.
+# Allowed keys are:
+#   * SUCCESS
+#     - Indicates that an import was successful. and that no serious
+#       warnings were issued.
+#   * DEFERRED
+#     - Indicates that an import has been deferred because a temporary error
+#       stopped the import from completing. The import will be attempted
+#       during the next import cycle.
+#   * WARNING
+#     - Indicates that an import completed, but that a report of type
+#       warning was generated. The only difference between SUCCESS and
+#       WARNING is only the report generated. If a WARNING report is
+#       defined, and produces a report, then that report will be sent along
+#       with the SUCCESS report.
+#   * FAILURE
+#     - Indicates that an import failed.  Some elements may have been
+#       imported, but a portion of the source import file failed to be
+#       imported.
+# These keys must be in all uppercase.
+# Example:
+#   reportConfiguration.SUCCESS=./SuccessReportConfiguration
+#   reportConfiguration.DEFERRED=./DeferredReportConfiguration
+#   reportConfiguration.WARNING=./WarningReportConfiguration
+#   reportConfiguration.FAILURE=./FailureReportConfiguration
+# Default:
+#   None
+############################################################################
+# reportConfiguration.SUCCESS=./SuccessReportConfiguration
+# reportConfiguration.DEFERRED=./DeferredReportConfiguration
+# reportConfiguration.WARNING=./WarningReportConfiguration
+# reportConfiguration.FAILURE=./FailureReportConfiguration
+
+############################################################################
+# Enable/disable reporting
+############################################################################
+# Enable/disable reporting.
+#   true - set true to enable reporting.
+#   false - set false to disable reporting.
+# Example:
+#   enabled=true
+#   enabled=false
+# Default:
+#   enabled=true
+############################################################################
+# enabled=true
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/syndication/xml/XMLImportService.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/syndication/xml/XMLImportService.properties.erb
new file mode 100644
index 00000000..05f1ac23
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/syndication/xml/XMLImportService.properties.erb
@@ -0,0 +1,10 @@
+############################################################################
+# Add the import configurations to the import service
+############################################################################
+# Add the configured imports to the import service. This can be a list
+# of configurations.
+# Example:
+# importConfigurations=./myImport,./mySecondImport
+#
+############################################################################
+# importConfigurations=./XMLImportConfiguration
\ No newline at end of file
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/syndication/xml/service/MigrationSetupService.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/syndication/xml/service/MigrationSetupService.properties.erb
new file mode 100644
index 00000000..019839db
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/syndication/xml/service/MigrationSetupService.properties.erb
@@ -0,0 +1,25 @@
+$class=com.escenic.syndication.xml.service.MigrationSetupService
+
+# The directory where the import directories will be created. The migration
+# setup service creates directories in the following structure:
+#
+# ${migrationDirectory}
+# |-- publicationA (The "import" directory of this import configuration)
+#    |-- archive (The "archive" directory for this import configuration)
+#    |-- error (The "error" directory for this import configuration)
+# |-- publicationB
+#    |-- archive
+#    |-- error
+# ...(These directories are created for each publication)
+#
+# The directory structure is created when the application server starts. If
+# you create a publication, then you can use the doStartService/doStopService
+# method to recreate the import configurations for all publications again.
+#
+migrationDirectory=/var/spool/escenic/migration
+
+# The import reporter that will be used for all of the import configurations.
+# Please consult the Syndication Guide for further details on how to configure
+# an import reporter.
+#
+importReporter=/com/escenic/syndication/xml/ImportReporter
\ No newline at end of file
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/transformers/StringSchedule.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/transformers/StringSchedule.properties.erb
new file mode 100644
index 00000000..5917637f
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/transformers/StringSchedule.properties.erb
@@ -0,0 +1,18 @@
+############################################################################
+# Maximum number of occurrences to generate for schedule field
+############################################################################
+# Default value for the maximum number of occurrences to generate for
+# schedule field. This settings can be overridden by the content type
+# parameter "com.escenic.schedule.reccurence". If the value of the parameter
+# is grater than this property, that will be ignored.
+#
+# Example:
+#   maxOccurrence = 10
+#   maxOccurrence = 100
+#   maxOccurrence = 500
+#   maxOccurrence = 1000
+#
+# Default:
+#   maxOccurrence = 100
+############################################################################
+# maxOccurrence = 100
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/webservice/search/DelegatingSearchEngine.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/webservice/search/DelegatingSearchEngine.properties.erb
new file mode 100644
index 00000000..8e97218e
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/webservice/search/DelegatingSearchEngine.properties.erb
@@ -0,0 +1 @@
+#solrURI=http://localhost:8080/solr/select
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/webstart/StudioConfig.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/webstart/StudioConfig.properties.erb
new file mode 100644
index 00000000..3615ddfb
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/webstart/StudioConfig.properties.erb
@@ -0,0 +1,74 @@
+############################################
+# Specifies the location of the web service that Content Studio connects to.
+# In a default installation you do not need to specify this  property, as 
+# Content Studio will automatically look for the web service on the host 
+# and port where the Content Studio webapp itself is located.
+#
+# You therefore only need to specify this property if the web service has
+# been explicitly moved to a different host and/or port than the Content Studio
+# webapp.
+#
+# The web service URL must end with "index.xml".
+#
+############################################
+# property.com.escenic.client.webservice.url=http://<host>:<port>/webservice/index.xml
+
+############################################
+# These are the locations studio will put its cache directory in.
+#
+# The possible values include: 
+# - any absolute path (relative paths will be ignored). 
+# - the string java.io.tmpdir - in which case the user's temp directory will be used. 
+# - the string user.home - in which case the user's home directory will be used. 
+# - nothing - in which case the roaming profile will be used.
+#
+# Note that in properties files, backslashes must be escaped as follows: windowsvista=c:\\temp
+#
+############################################
+property.com.escenic.studio.cache.directory.windowsvista=java.io.tmpdir 
+property.com.escenic.studio.cache.directory.windowsxp=java.io.tmpdir 
+property.com.escenic.studio.cache.directory.macosx=java.io.tmpdir 
+property.com.escenic.studio.cache.directory.linux=java.io.tmpdir
+
+############################################
+# These are the fonts Content Studio will use by default. If the font name is not set and the system default font does not support
+# the desired language then Content Studio will try to find an arbitrary font based on Regional Settings.
+#
+# To specify the font, you may input Font Face Name or Font Family Name. We would recommend you to use Font Family Names.
+# For example: 'Verdana Bold', 'Verdana Bold Italic', 'Verdana Italic' are the Font Face Names and 'Verdana' is the Font Family Name of those Font Face Names.
+#
+# Note that if your specified font name has space between words, please use double quote(") as given in the example for Windows Vista.
+############################################
+
+#property.com.escenic.studio.font.windowsvista="Arial Unicode MS"
+#property.com.escenic.studio.font.windowsxp=
+#property.com.escenic.studio.font.macosx=
+#property.com.escenic.studio.font.linux=
+
+############################################
+# Uncomment the following line to enable the experimental pack200 support.
+#
+# Using this property will reduce the download size of Content Studio to one fifth of the uncompressed version.
+#
+# See also http://java.sun.com/javase/6/docs/technotes/guides/jweb/tools/pack200.html
+############################################
+# property.packEnabled=true 
+
+#######################################
+# Additional parameters for the java vm when launching Content Studio
+#
+# Default:
+# vmargs=-Xms128m -Xmx256m
+# Example:
+# vmargs=-Xms128m -Xmx512m
+######################################
+# vmargs=-Xms128m -Xmx512m
+
+############################################
+# Set the user time zone to content studio.
+#
+# Using this property content studio will show the given timezone.
+# 
+# Example: property.user.timezone=America/Vancouver
+############################################
+# property.user.timezone=America/Vancouver
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/webstudio/Preferences.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/webstudio/Preferences.properties.erb
new file mode 100644
index 00000000..cfb8fcf8
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/webstudio/Preferences.properties.erb
@@ -0,0 +1,117 @@
+##############################################
+#
+# This file contains configuration options for Escenic Web Studio.
+#
+##############################################
+
+
+###############################################
+# 
+# Defines the number of articles to be displayed on one page in the article archive
+#
+# Example: 
+#     property.articleSearchPageSize=20
+#
+# Default:
+#     20
+##############################################
+#property.articleSearchPageSize=
+
+###############################################
+# 
+# Defines the number of links to be displayed on one page in the link archive
+#
+# Example: 
+#     property.linkSearchPageSize=20
+#
+# Default:
+#     20
+##############################################
+#property.linkSearchPageSize=
+
+###############################################
+# 
+# Defines the number of images to be displayed on one page in the image archive
+#
+# Example: 
+#     property.imageSearchPageSize=20
+#
+# Default:
+#     12
+##############################################
+#property.imageSearchPageSize=
+
+###############################################
+# 
+# Defines the number of persons to be displayed on one page in the person archive
+#
+# Example: 
+#     property.personSearchPageSize=20
+#
+# Default:
+#     20
+##############################################
+#property.personSearchPageSize=
+
+###############################################
+# 
+# Defines the number of media to be displayed on one page in the media archive
+#
+# Example: 
+#     property.mediaSearchPageSize=20
+#
+# Default:
+#     20
+##############################################
+#property.mediaSearchPageSize=
+
+###############################################
+# 
+# Defines the number of topics to be displayed on one page in the topic archive
+#
+# Example: 
+#     property.topicSearchPageSize=20
+#
+# Default:
+#     20
+##############################################
+#property.topicSearchPageSize=
+
+###############################################
+# 
+# Defines the number of usergroups to be displayed on one page in the usergroup archive
+#
+# Example: 
+#     property.userGroupSearchPageSize=20
+#
+# Default:
+#     20
+##############################################
+#property.userGroupSearchPageSize=
+
+###############################################
+# 
+# Defines the number of profiles to be displayed on one page in the profile archive
+#
+# Example: 
+#     property.profileSearchPageSize=20
+#
+# Default:
+#     20
+##############################################
+#property.profileSearchPageSize=
+
+###############################################
+#
+# Defines that a 'Save & Close' button should be available. This button will be useful to encourage editors to
+# close the open work items when they are finished. This can be particularly useful for section front pages,
+# which several editors need access to. Closing the editor will release the lock and allow other users to access the
+# object.
+#
+# Example:
+#     property.displaySaveAndCloseButton=true
+#
+# Default:
+#     false
+##############################################
+#property.displaySaveAndCloseButton=
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/connector/ReadConnector.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/connector/ReadConnector.properties.erb
new file mode 100644
index 00000000..5ea63b51
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/connector/ReadConnector.properties.erb
@@ -0,0 +1,10 @@
+$class=neo.dbaccess.GenericDataConnector
+
+# The JNDI name of the data source as configured in the application
+# server. The data source name should be set to jdbc/ECE_READ_DS in
+# the application server configuration.
+dataSourceName=java:comp/env/jdbc/ECE_READ_DS
+
+# Leave these properties as they are unless otherwise noted.
+introspectorName=
+exceptionInterpreter=/neo/io/XOpenExceptionInterpreter
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/connector/UpdateConnector.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/connector/UpdateConnector.properties.erb
new file mode 100644
index 00000000..1c2341ce
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/connector/UpdateConnector.properties.erb
@@ -0,0 +1,10 @@
+$class=neo.dbaccess.GenericDataConnector
+
+# The JNDI name of the data source as configured in the application
+# server. The data source name should be set to jdbc/ECE_UPDATE_DS in
+# the application server configuration.
+dataSourceName=java:comp/env/jdbc/ECE_UPDATE_DS
+
+# Leave these properties as they are unless otherwise noted.
+introspectorName=
+exceptionInterpreter=/neo/io/XOpenExceptionInterpreter
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/io/api/MediaCategories.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/io/api/MediaCategories.properties.erb
new file mode 100644
index 00000000..5ae9a384
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/io/api/MediaCategories.properties.erb
@@ -0,0 +1,34 @@
+###################################################################
+# Media Categories
+###################################################################
+# This component groups file types into categories. These media
+# categories are used in the media search. New categories can be 
+# added.
+
+##################################################################
+# Audio category
+##################################################################
+# Group audio files into the audio category
+
+#mediaCategoryExtentions.audio=mp3,wav,au,aif,midi,mid,mpc
+
+##################################################################
+# Video category
+##################################################################
+# Group video files into the video category
+
+#mediaCategoryExtentions.video=mpeg,mpg,asf,avi
+
+##################################################################
+# Document category
+##################################################################
+# Group document files into the document category
+
+#mediaCategoryExtentions.documents=xls,txt,rtf,pdf,doc,htm,html,xml,ppt
+
+##################################################################
+# Foo category
+##################################################################
+# Example of new category. The category foo will match mediafiles 
+# of type foo and bar.
+# mediaCategoryExtentions.foo=foo,bar
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/io/api/media/JMagickVersionGenerator.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/io/api/media/JMagickVersionGenerator.properties.erb
new file mode 100644
index 00000000..f86e8e14
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/io/api/media/JMagickVersionGenerator.properties.erb
@@ -0,0 +1,11 @@
+$class=neo.xredsys.api.media.JMagickVersionGenerator
+#############################################################
+# REQUIREMENTS
+#############################################################
+#
+# Generating image versions using JMagick requires that
+# *JMagick version 5.5.6-0 is installed and working properly( see http://www.yeo.id.au/jmagick/) 
+#   for details on how to install JMagick 
+# *JMagick libraries is added to classpath
+#
+#############################################################
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/io/api/media/ProxyVersionGenerator.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/io/api/media/ProxyVersionGenerator.properties.erb
new file mode 100644
index 00000000..03c3ad1d
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/io/api/media/ProxyVersionGenerator.properties.erb
@@ -0,0 +1,38 @@
+$class=neo.xredsys.api.media.ProxyImageVersionGenerator
+
+############################################################################
+# RMI HOST NAME
+############################################################################
+# Defines the url to the remote service which generates image versions
+#
+# Example:
+#   host=localhost
+#   host=192.168.2.3
+#   host=rmiregistry.mycompany.com
+############################################################################
+registryHost=${/RMI.host}
+
+############################################################################
+# RMI PORT
+############################################################################
+#
+# Defines the port in which the remote service is running
+#
+# Example:
+#   port=8800
+#   port=13581
+#
+############################################################################
+registryPort=${/RMI.port}
+
+############################################################################
+# RMI BINDNAME
+############################################################################
+#
+# Defines the bindname of the remote service
+#
+# Default:
+#   /RemoteVersionGenerator
+#
+############################################################################
+bindName=/RemoteVersionGenerator
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/content/DependentCacheManager.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/content/DependentCacheManager.properties.erb
new file mode 100644
index 00000000..04e8c328
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/content/DependentCacheManager.properties.erb
@@ -0,0 +1,24 @@
+##############################################################################
+# Dependent Cache Manager
+##############################################################################
+# Manages the underlying cache mechanism that e.g. util:cache is using
+##############################################################################
+
+##############################################################################
+# postponeTime
+##############################################################################
+# The time delay for when a dependent cache's objects are
+# expired. The default value is 4000 milliseconds. This causes
+# updates to objects cached by util:cache to be stale for at least
+# 4000 milliseconds. The reason for having this is that it takes the
+# presentation layer at least 1000 milliseconds to generate the new
+# content. Increase the value if content that is cached by
+# util:cache is not up to date. 
+#
+# Example:
+#   postponeTime=10000
+#
+# Default:
+#    postponeTime=4000
+##############################################################################
+#postponeTime=
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/managers/AgreementManager.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/managers/AgreementManager.properties.erb
new file mode 100644
index 00000000..b5d88e19
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/managers/AgreementManager.properties.erb
@@ -0,0 +1,48 @@
+###############################################################################
+# Agreement Manager
+###############################################################################
+# The Agreement Manager is used to hook in Agreements, as defined in the
+# Escenic API Programming Guide, and described in an article on the Escenic
+# Technet.
+#
+# An Agreement is typically used to restrict access to content on a
+# per-section or per-article basis.
+###############################################################################
+# 
+# IMPORTANT:
+#   If a section names an agreement which isn't defined by the agreement
+#   manager, then Escenic Content Engine will render HTTP 500 Internal
+#   Server Errors, since this is a configuration error, either by the system
+#   administrator, or the section administrator.
+#
+###############################################################################
+
+
+
+###############################################################################
+# Agreement Partners
+###############################################################################
+# To create an Agreement Partner, see the API Programming Guide, or the
+# Technet.  An Agreement Partner must implement certain interfaces.
+#
+# Each agreement partner must be defined here in order for them to be used.
+# The name given here must be matched in the AgreementInfo field of the
+# section.
+#
+# Example:
+#   agreementPartner.basic=/agreements/BasicAuthenticationAgreement
+#
+# The section administrator might put the text "basic" in the agreement-info
+# field, to invoke this agreement whenever any content from that section
+# is to be used.
+#
+# Example:
+#   agreementPartner.sports=/com/customer/agreements/SportsAgreement
+#
+# In both cases, the value must be a valid component in the Nursery.
+#
+# Default:
+#    By default, no agreements are defined.
+###############################################################################
+
+
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/managers/ContentManager.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/managers/ContentManager.properties.erb
new file mode 100644
index 00000000..0b878589
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/managers/ContentManager.properties.erb
@@ -0,0 +1,31 @@
+##############################################################################
+# CONTENT MANAGER
+##############################################################################
+# Defines which connector to use for new and updated connectors
+##############################################################################
+
+
+
+
+##############################################################################
+# READCONNECTOR AND UPDATECONNECTOR
+##############################################################################
+# All database access is channeled through these two connectors.  The
+# readConnector and updateConnector properties are actually two other
+# components, and they are typically configured by themselves.
+# 
+# To configure the database, change the configuration of the target components.
+#
+# Example:
+#   readConnector=/neo/io/connector/Oracle03Read
+#   updateConnector=/neo/io/connector/Oracle03Update
+#
+#   readConnector=/connector/ReadConnector
+#   updateConnector=/connector/UpdateConnector
+#
+# By default, the connectors are the /neo/io/connector/SimpleDBPool connectors.
+##############################################################################
+
+# readConnector=/connector/ReadConnector
+# updateConnector=/connector/UpdateConnector
+
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/managers/HubConnectionManager.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/managers/HubConnectionManager.properties.erb
new file mode 100644
index 00000000..c99e07d7
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/managers/HubConnectionManager.properties.erb
@@ -0,0 +1,97 @@
+######################################################################
+# Hub Connection Manager
+######################################################################
+# Defines the connection to the RMI Hub, if the event system is set
+# up to use an RMI hub.
+#
+# The hub property specifies the URL of the hub itself.
+# The hostname property specifies the DNS or IP address of the server
+# The port property defines the port number of our exported RMI Objects
+# The serverName property specifies the unique name of _this_ server
+# 
+######################################################################
+
+
+######################################################################
+# Hub
+######################################################################
+# The RMI URL of the hub
+#
+# The Hub exports itself using its own RMI Registry. Typically, the
+# default RMI port is used, and the name "/hub/Hub"
+#
+# There is no default value here, and it must be specified in order
+# for the connection to the Hub to work properly.
+#
+# Example:
+#    hub=rmi://172.16.3.1:1099/hub/Hub
+#
+# Example:
+#    hub=rmi://publishing.mycompany.com:1099/hub/Hub
+#
+######################################################################
+# hub=
+
+
+
+######################################################################
+# Hostname
+######################################################################
+# For the Hub to be able to call back to the servers, the servers
+# must tell the Hub their preferred host names (or IP Address)
+#
+# There is no default value here, and it must be configured to the
+# host name or IP address that the Hub can use to talk to the server.
+#
+# Example:
+#    hostname=172.16.3.22
+#
+# Example:
+#    hostname=pub-01.mycompany.com
+#
+######################################################################
+# hostname=
+
+
+
+######################################################################
+# Port Number
+######################################################################
+# The port number that the Hub should use to connect to the server
+#
+# The default value is retrieved from the /RMI component, which is
+# used to export the registry.  The default value should suffice
+# in most installations.
+#
+# Example:
+#    port=8433
+#
+# Default:
+#    port=${/RMI.port}
+#
+######################################################################
+# port=${/RMI.port}
+
+
+
+######################################################################
+# Server Name
+######################################################################
+# The unique name of the server in the cluster.
+#
+# Each server in the cluster must hav its own unique name, which
+# will be used to distinguish the different servers from each other.
+#
+# By default, the value of the escenic.server system property is used.
+# Simply make sure that all the servers have unique escenic.server
+# names.
+#
+# Example:
+#    serverName=publishing-3
+#
+# Default:
+#    serverName=${escenic.server}
+#
+######################################################################
+# serverName=
+
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/repository/LocalFileSystem.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/repository/LocalFileSystem.properties.erb
new file mode 100644
index 00000000..0ea6c03c
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/repository/LocalFileSystem.properties.erb
@@ -0,0 +1,14 @@
+################################################################################
+# LOCAL FILE SYSTEM
+################################################################################
+$class=neo.util.filedist.LocalFileSystem
+
+################################################################################
+# Local directory for the repository
+################################################################################
+# localDir=C://io//streaming//repository
+
+################################################################################
+# Host name of this repository
+################################################################################
+# host=real.escenic.com
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/repository/RealRepository.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/repository/RealRepository.properties.erb
new file mode 100644
index 00000000..bfbf1df3
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/repository/RealRepository.properties.erb
@@ -0,0 +1,52 @@
+################################################################################
+# AN EXAMPLE REPOSITORY
+################################################################################
+$class=neo.util.filedist.FileRepository
+
+
+
+################################################################################
+# REPOSITORY NAME
+################################################################################
+# The symbolic name to give to this repository
+# The name is mandatory.  There is no default value.
+#
+# Example: 
+#   repositoryName=RealMedia
+################################################################################
+repositoryName=
+
+
+
+################################################################################
+# LIST OF HOSTS
+################################################################################
+# A host is a place which hosts files in this repository.  A repository
+# will typically talk to at least one host, often several hosts.
+# 
+# hosts=/repository/LocalFileSystem
+# hosts=/repository/MediaFtpServer02,/repository/MediaFtpServer03
+################################################################################
+hosts=
+
+################################################################################
+# MIME TYPES
+################################################################################
+# This required attribute defines which mime types this repository can handle
+#
+# Example: 
+#   mimeTypes=audio/x-pn-realaudio,audio/x-realaudio
+################################################################################
+mimeTypes=
+
+
+################################################################################
+# URL TO REPOSITORY
+################################################################################
+# The URL that gives access the root directory of the repository.
+# Not all repositories need this setting.  There is no default value.
+#
+# Example: 
+#   repositoryUrl=http://realmedia.somehost.com/repository/
+################################################################################
+repositoryUrl=
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/repository/SectionRepository.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/repository/SectionRepository.properties.erb
new file mode 100644
index 00000000..bcdc6de0
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/repository/SectionRepository.properties.erb
@@ -0,0 +1,42 @@
+#mimeTypes=sectionTree
+
+################################################################################
+# AN EXAMPLE REPOSITORY
+################################################################################
+$class=neo.util.filedist.FileRepository
+
+
+
+################################################################################
+# REPOSITORY NAME
+################################################################################
+# The symbolic name to give to this repository
+# The name is mandatory.  There is no default value.
+#
+# Example: 
+#   repositoryName=RealMedia
+################################################################################
+repositoryName=SectionTrees
+
+
+
+
+################################################################################
+# LIST OF HOSTS
+################################################################################
+# A host is a place which hosts files in this repository.
+# The hosts defined here must be set up fo the
+################################################################################
+hosts=/repositories/AppServ01Publications,/repositories/AppServ02Publications
+
+
+################################################################################
+# MIME TYPES
+################################################################################
+# This required attribute defines which mime types this repository can handle
+#
+# The "sectionTree" is a special mime-type used when updating the section tree
+# in some manner.
+################################################################################
+mimeTypes=sectionTree
+
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/schedules/ArticleCleaner.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/schedules/ArticleCleaner.properties.erb
new file mode 100644
index 00000000..41d479bb
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/schedules/ArticleCleaner.properties.erb
@@ -0,0 +1,26 @@
+######################################################
+# Article Cleaner Schedule
+######################################################
+# By default, this component is executed once per day
+# during the night.
+#
+# It should be disabled in a multi-server set-up,
+# to avoid deadlocks and so on.
+######################################################
+
+######################################################
+# Enable or disable service
+######################################################
+# By default it is enabled. In a multi-server
+# environment, the service should only be enabled on
+# on emachine.  Turn it off by setting the property
+# to false:
+#
+# Example:
+#   serviceEnabled = fakse
+#
+# Default:
+#   serviceEnabled = true
+######################################################
+# serviceEnabled = true
+
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/schedules/DeleteArticlesService.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/schedules/DeleteArticlesService.properties.erb
new file mode 100644
index 00000000..9e11489a
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/schedules/DeleteArticlesService.properties.erb
@@ -0,0 +1,7 @@
+# This will run the DeleteArticlesService at the specified
+# time. Default is at 04:00 every night. See
+# /neo/io/services/DeleteArticlesService for configuration of the
+# service. Add to Initial.properties to activate.
+
+hour=4
+
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/schedules/ExternalContentUpdater.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/schedules/ExternalContentUpdater.properties.erb
new file mode 100644
index 00000000..001765a7
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/schedules/ExternalContentUpdater.properties.erb
@@ -0,0 +1,16 @@
+###################################
+# Defines how often the background job refreshing and invalidating
+# externalcontentcache should be running. 
+# Minute property should be set higher than validTime defined in 
+# /neo/io/services/ExternalContentManager
+#
+# Default:
+#   hour=-1
+#   minute=5
+#
+# Example:
+#   hour=2
+#   minute=30
+###################################
+#minute=
+#hour=
\ No newline at end of file
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/schedules/HtmlCacheRefreshSchedule.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/schedules/HtmlCacheRefreshSchedule.properties.erb
new file mode 100644
index 00000000..92c5e1db
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/schedules/HtmlCacheRefreshSchedule.properties.erb
@@ -0,0 +1,16 @@
+#############################################################################
+# Schedule for automatic refresh of HTML caches.
+#############################################################################
+
+#############################################################################
+# The schedule for the specified component. You can specify minute and hour.
+# -1 means every minute or every hour.
+#
+# Default value is once evey hour, at twenty minutes past the hour.
+#
+# syntax:
+# minute=0,15,30,45
+# hour=0,6,12,18
+# Default:
+#############################################################################
+# minute=20
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/schedules/PoolCleaner.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/schedules/PoolCleaner.properties.erb
new file mode 100644
index 00000000..42974c01
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/schedules/PoolCleaner.properties.erb
@@ -0,0 +1,26 @@
+######################################################
+# Pool Cleaner Schedule
+######################################################
+# By default, this component is executed once per day
+# during the night.
+#
+# It should be disabled in a multi-server set-up,
+# to avoid deadlocks and so on.
+######################################################
+
+######################################################
+# Enable or disable service
+######################################################
+# By default it is enabled. In a multi-server
+# environment, the service should only be enabled on
+# on emachine.  Turn it off by setting the property
+# to false:
+#
+# Example:
+#   serviceEnabled = fakse
+#
+# Default:
+#   serviceEnabled = true
+######################################################
+# serviceEnabled = true
+
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/search/DB2QueryTranslator.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/search/DB2QueryTranslator.properties.erb
new file mode 100644
index 00000000..4b6a76b5
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/search/DB2QueryTranslator.properties.erb
@@ -0,0 +1,12 @@
+########################################
+#
+# Defines the minimum accepted length of a wildcard query
+#
+# Ex:
+#  if property is set to 2, es* is accepted, but e* is not
+#  if property is set to 4, esen* is accepted, but esc* is not
+#
+# Default:
+#   2
+########################################
+#minLengthWithWildcard=
\ No newline at end of file
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/search/MsSQLQueryTranslator.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/search/MsSQLQueryTranslator.properties.erb
new file mode 100644
index 00000000..4b6a76b5
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/search/MsSQLQueryTranslator.properties.erb
@@ -0,0 +1,12 @@
+########################################
+#
+# Defines the minimum accepted length of a wildcard query
+#
+# Ex:
+#  if property is set to 2, es* is accepted, but e* is not
+#  if property is set to 4, esen* is accepted, but esc* is not
+#
+# Default:
+#   2
+########################################
+#minLengthWithWildcard=
\ No newline at end of file
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/search/OracleFullText.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/search/OracleFullText.properties.erb
new file mode 100644
index 00000000..205ef295
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/search/OracleFullText.properties.erb
@@ -0,0 +1,4 @@
+# Set this to add a hint to the search sql. LEADING(XMLArticle) will
+# use the XMLArticle table as the leading table when executing the sql. 
+
+# hint=LEADING(XMLArticle)
\ No newline at end of file
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/search/OracleQueryTranslator.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/search/OracleQueryTranslator.properties.erb
new file mode 100644
index 00000000..4b6a76b5
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/search/OracleQueryTranslator.properties.erb
@@ -0,0 +1,12 @@
+########################################
+#
+# Defines the minimum accepted length of a wildcard query
+#
+# Ex:
+#  if property is set to 2, es* is accepted, but e* is not
+#  if property is set to 4, esen* is accepted, but esc* is not
+#
+# Default:
+#   2
+########################################
+#minLengthWithWildcard=
\ No newline at end of file
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/search/SearchManager.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/search/SearchManager.properties.erb
new file mode 100644
index 00000000..6a57aeea
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/search/SearchManager.properties.erb
@@ -0,0 +1,7 @@
+# Set the search engine implementation to use. 
+# Example
+# Database: searchEngine=/neo/io/search/DatabaseSearchEngine
+# Lucene: searchEngine=/com/escenic/lucy/LucySearchEngine
+#
+# searchEngine=/neo/io/search/DatabaseSearchEngine
+# defaultSearchEngine=/neo/io/search/DatabaseSearchEngine
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/search/SybaseQueryTranslator.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/search/SybaseQueryTranslator.properties.erb
new file mode 100644
index 00000000..4b6a76b5
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/search/SybaseQueryTranslator.properties.erb
@@ -0,0 +1,12 @@
+########################################
+#
+# Defines the minimum accepted length of a wildcard query
+#
+# Ex:
+#  if property is set to 2, es* is accepted, but e* is not
+#  if property is set to 4, esen* is accepted, but esc* is not
+#
+# Default:
+#   2
+########################################
+#minLengthWithWildcard=
\ No newline at end of file
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/ActivationService.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/ActivationService.properties.erb
new file mode 100644
index 00000000..298ebd7c
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/ActivationService.properties.erb
@@ -0,0 +1,6 @@
+###############
+# A list of activation observers. An observer will be notified each time an article or pool is activated
+# 
+# Default: none
+###############
+#activationObservers=
\ No newline at end of file
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/DefaultPoolRemovePolicy.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/DefaultPoolRemovePolicy.properties.erb
new file mode 100644
index 00000000..f0d2c262
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/DefaultPoolRemovePolicy.properties.erb
@@ -0,0 +1,59 @@
+###################################################################
+# POOL REMOVE POLICY
+###################################################################
+# This is used from PoolRemoveService to decide which articles should
+# be remove from a pool. 
+# This default implementation will keep the size of the pool at the 
+# limit defined in PoolRemoveService.properties by removing articles
+# from each column defined in the grid layout, beginning at last one,
+# until the limit is reached.
+# It will always leave the number of articles corresponding to the defined
+# number of elements in each column. If articles have been removed
+# from all columns without reaching the limit, articles may also
+# be removed from the workdesk.
+
+
+###################################################################
+# ARTCLES LEFT ON WORKDESK
+###################################################################
+# If it is necessary to remove articles from the workdesk, this 
+# number decides how many to leave.
+#
+# Default value: 5
+#
+# Example:
+#   articlesLeftOnWorkdesk=2
+###################################################################
+# articlesLeftOnWorkdesk=5
+
+
+###################################################################
+# COLUMN BUFFER
+###################################################################
+# This number will be added to the defined number of elements for each
+# column when deciding how many articles should be left in the 
+# column.
+#
+# Default value: 0
+#
+# Example:
+#   columnbuffer=2
+###################################################################
+# columnBuffer=5
+
+###################################################################
+# WORKDESK SORT ORDER
+###################################################################
+# Should the articles on wordesk be sorted before removing? Possible 
+# values are "none" and "articleId". If set to "none", articles will 
+# have the same order as in Studio and WebStudio. Articles will be 
+# removed from the bottom of the list. If set to "articleId", articles
+# will be sorted in articleId order. Articles with lowest id (oldest
+# articles) will be removed.
+#
+# Default value: none
+#
+# Example:
+#   workdeskSortOrder=articleId
+###################################################################
+# workdeskSortOrder=none
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/DeleteArticlesService.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/DeleteArticlesService.properties.erb
new file mode 100644
index 00000000..dac47c7a
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/DeleteArticlesService.properties.erb
@@ -0,0 +1,36 @@
+# This component will delete articles from Escenic. The articles will
+# not be set to state "deleted", but removed physically. See
+# /neo/io/schedules/DeleteArticleSchedule to configure when this
+# component is run.
+
+# List of sections to delete articles from. The list is comma separated.
+# Required.
+# sectionIds=21, 19
+
+# The publication to delete articles from
+# Required.
+# publicationId=19
+
+# Articles older than this age will be deleted.  If neither this or
+# one of the date parameters is set, all articles in the sections will
+# be deleted. The date used is the article's publishDate. Age is in
+# days. If you need to delete articles newer than one day you can use
+# fractions of a day: 1 hour = 1/24 day = 0.0417 day.
+# age=2
+
+# Include sub sections, default is false.
+# includeSubSections=false
+
+# Delete articles newer than this. Ignored if age is set.
+# Format is decided by default Locale.
+# fromDate=Dec 11, 2002 5:55:58 PM
+
+# Delete articles older than this. Ignored if age is set.
+# Format is decided by default Locale.
+# toDate=Dec 11, 2002 5:55:58 PM
+
+# Set this to false to actually delete the articles. When this value
+# is set to true no articles will be deleted, there will only be info
+# messages in the log about which articles will be deleted. The
+# default value is true.
+# previewOnly=false
\ No newline at end of file
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/ExternalContentManager.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/ExternalContentManager.properties.erb
new file mode 100644
index 00000000..740b857f
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/ExternalContentManager.properties.erb
@@ -0,0 +1,44 @@
+##########################################
+# Time (in seconds) content is valid in cache without being accessed. 
+# After this time content will be expired. Validtime should be set
+# higher than minutes-property defined in neo/io/schedules/ExternalContentUpdater 
+# and higher than refreshtime
+# 
+# Default: 3600
+#
+# Example:
+#   validTime=900 #every 15 minutes
+##########################################
+#validTime=
+
+##########################################
+# Time (in seconds) before content should be refreshed. 
+# Refreshtime should be set lower than validtime
+#
+# Default:  900 
+#
+# Example:
+#   refreshTime=600
+##########################################
+#refreshTime
+
+##########################################
+# Default timeout ( in milliseconds) on http get
+# 
+# Default: 2000
+#
+# Example:
+#   defaultTimeout=4000
+##########################################
+#defaultTimeout=
+
+##########################################
+# Timeout (in milliseconds) used when doing background refresh. 
+# Can be longer than 'normal' timeout
+#
+# Default: 6000
+#
+# Example:
+#   refreshTimeout=10000
+##########################################
+#refreshTimeout=
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/MailSender.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/MailSender.properties.erb
new file mode 100644
index 00000000..4caa6115
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/MailSender.properties.erb
@@ -0,0 +1,118 @@
+######################################################################
+# MAIL HOST NAME                                                     #
+######################################################################
+# The hostname (or IP address) of the mail server to use.  The
+# destination must be running a mail server accepting connections of
+# type smtp.
+#
+# Example:
+#   mailHost=mail.mycompany.com
+#
+# There is no default value. This must be configured in order for
+# Escenic to send mail.
+######################################################################
+# mailHost=
+
+
+######################################################################
+# MAILER NAME                                                        #
+######################################################################
+# The value to place in the "X-Mailer" header, if none is specified
+# by the mailing application.  In most cases, the default value can
+# be used.
+#
+# Example:
+#   defaultMailerName=Escenic Mail Sender
+#
+# Default:
+#   defaultMailerName=Escenic Mail Gateway
+#
+######################################################################
+# defaultMailerName=Escenic Mail Gateway
+
+
+######################################################################
+# DEFAULT MAIL SENDER                                                #
+######################################################################
+# The value to use as the sender, if none is specified by the mailing
+# application.  This value must be specified in order for mail to
+# work.  
+#
+# Example:
+#   defaultSender=escenic@myhost.com
+#
+# Example:
+#   defaultSender=support@my-hosting-partner.com
+#
+# Default:
+#   defaultSender=
+#
+######################################################################
+# defaultSender=
+
+
+
+######################################################################
+# DEFAULT SUBJECT                                                    #
+######################################################################
+# The value to use as the sender, if none is specified by the mailing
+# application.  In most cases, the default value can be used.
+#
+# Example:
+#   defaultSender=Corporation dot com Ltd.
+#
+# Default:
+#   defaultSender=Escenic
+#
+######################################################################
+# defaultSubject=No Subject Specified
+
+
+
+######################################################################
+# ADDITIONAL RECIPIENTS                                              #
+######################################################################
+# Any additional recipients that should be used when sending e-mail.
+# These recipients will receive any e-mail being sent out using this
+# e-mail component.
+#
+# Example:
+#   additionalRecipients=admin@mycompany.com
+#
+# Example:
+#   additionalRecipients=john@example.com,doe@example.com
+#
+# Default:
+#   additionalRecipients=
+# (no additional recpipents)
+#
+######################################################################
+# additionalRecipients=
+
+
+
+
+######################################################################
+# ENABLED                                                            #
+######################################################################
+# By default, the mail component in Escenic is disabled, because it
+# produces lots of error messages if it is not configured correctly.
+# When the mail component is configured correctly, change the
+# enabled value to "true" to enable mail sending.
+#
+# In a production environment, it is also useful to be able to halt
+# mail sending in case of mail server outages, or abuse of Escenic's
+# mail services.
+#
+# Note that if enabled=false, then an IllegalStateException will be
+# thrown to the caller, which is expected to handle this situation
+# gracefully.
+#
+# Example:
+#   enabled=true
+#
+# Default:
+#   enabled=false
+#
+######################################################################
+# enabled=false
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/PoolRemoveService.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/PoolRemoveService.properties.erb
new file mode 100644
index 00000000..25320688
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/PoolRemoveService.properties.erb
@@ -0,0 +1,52 @@
+###################################################################
+# POOL REMOVE SERVICE                      
+###################################################################
+# The pool remove service goes through the pools every night
+# and removes pool-entries if the pool has become too big.
+# 
+# This service is enabled by default, and should be disabled in 
+# multiple-server installations.
+
+
+
+###################################################################
+# ENABLED
+###################################################################
+# Enables or disables the pool remove service.
+#
+# Default value: true
+#
+# Example:
+#   serviceEnabled=false
+###################################################################
+# serviceEnabled=true
+
+###################################################################
+# DEFAULT LIMIT
+###################################################################
+# This is the limit when PoolRemoveService will kick in for a pool.
+# If there is more than this number of articles in the pool, 
+# articles will be removed from the pool. This value may be overridden
+# for individual publications by using the feature "pool.limit=xxx" in
+# features.properties.
+#
+# Default value: 200
+#
+# Example:
+#   defaultLimit=100
+###################################################################
+# defaultLimit=200
+
+###################################################################
+# POOL REMOVE POLICY
+###################################################################
+# It is possible to plug in different policies for which articles
+# should be removed from the pool.
+#
+# Default value: /neo/xredsys/services/DefaultPoolRemovePolicy
+#
+# Example:
+#   policy=/neo/xredsys/services/DefaultPoolRemovePolicy
+###################################################################
+# policy=/neo/xredsys/services/DefaultPoolRemovePolicy
+
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/RepositoryService.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/RepositoryService.properties.erb
new file mode 100644
index 00000000..ce264df2
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/RepositoryService.properties.erb
@@ -0,0 +1,20 @@
+# Repository service properties
+
+################################################################################
+# Temporary storage
+################################################################################
+# Repository service requires a temporary storage space.  By default
+# this is set to "tmp" inside Escenic.  
+#
+# tempDir=${escenic.root}/tmp
+################################################################################
+
+
+################################################################################
+# List of repositories
+################################################################################
+# Repositories is a comma-separated list of repositories
+# By default, no repositories are set up.
+#
+# repositories=
+################################################################################
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/publications/GenericPublication.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/publications/GenericPublication.properties.erb
new file mode 100644
index 00000000..6f61fd63
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/publications/GenericPublication.properties.erb
@@ -0,0 +1,111 @@
+############################################################################
+# Generic publication configuration file                                   #
+#                                                                          #
+# Normally, the optional configuration entries don't need to be touched    #
+# for a development server.                                                #
+#                                                                          #
+# Please note that many of these values are case sensitive!                #
+############################################################################
+
+
+### ------------------------------------------------------------------- ###
+### ------------------------------------------------------ Optional --- ###
+### ------------------------------------------------------------------- ###
+
+############################################################################
+# Define the default mapping for the root directory for a publication
+############################################################################
+# Based on the publication name, Escenic has to figure out where to place
+# (and later on where to find) the web application corresponding to each
+# publication.
+#
+# Escenic does this by defining a "template" for the root directory, and
+# the text "{publicationName}" will be replaced by the name of the
+# publication.
+#
+# Default value:
+#   rootDirectory=${/ServerConfig.filePublicationRoot}{publicationName}/
+#     #  a publication's root directory is defined to be the 
+#     #  "filePublicationRoot" parameter, followed by the publication name,
+#     #  followed by a trailing slash.
+#
+# Example:
+#   rootDirectory=/var/spool/escenic/{publicationName}/webapp/
+#     # a publication with name "xyzzy" will be placed in the 
+#     # /var/spool/escenic/xyzzy/webapp/ directory.
+#
+############################################################################
+# rootDirectory=${/ServerConfig.filePublicationRoot}{publicationName}/
+
+
+############################################################################
+# Define the default mapping for the "root url" for a publication
+############################################################################
+# This setting affects the URL's that will be presented on the web, and what
+# URL the publication will expect to find its own content.
+#
+# The calculated URL will also have effect on "preview" functionality, and
+# static HTML caching of pages.
+#
+# This setting has to end in a trailing slash for Escenic to work properly.
+#
+# Default value:
+#   url=${/ServerConfig.webPublicationRoot}{publicationName}/
+#     #  a publication's root directory is defined to be the 
+#     #  "webPublicationRoot" parameter, followed by the publication name,
+#     #  followed by a trailing slash.
+#     #  Since "webPublicationRoot" is by default "http://localhost:8080/"
+#     #  a publication called xyzzy will get the URL "http://localhost:8080/xyzzy/"
+#
+# Example:
+#   url=http://{publicationName}/
+#     # a publication with name "www.xyzzy.com" will get the URL
+#     # http://www.xyzzy.com/
+#
+############################################################################
+# url=${/ServerConfig.webPublicationRoot}{publicationName}/
+
+
+
+############################################################################
+# Define the default mapping for the multimedia archive for a publication
+############################################################################
+# This setting affects the placement of the multimedia archive for a given
+# publication.
+#
+# This setting has to end in a trailing slash for Escenic to work properly.
+#
+# Default value: (blank; mediaDirectory defaults to "multimedia" inside
+#                 the publication's root directory)
+#
+# Example:
+#   mediaDirectory=/mnt/sharedimages/{publicationName}/
+#     # a publication with name "www.xyzzy.com" will get the URL
+#     # /mnt/multimedia/www.xyzzy.com/ instead of the default
+#     # multimedia directory inside the publication's root.
+#
+############################################################################
+# mediaDirectory=
+
+
+
+############################################################################
+# Define the default mapping for the multimedia URL for a publication
+############################################################################
+# This setting affects the placement of the multimedia archive for a given
+# publication.
+#
+# This setting has to end in a trailing slash for Escenic to work properly.
+#
+# Default value: (blank; mediaUrl defaults to "multimedia" inside
+#                 the publication's root URL)
+#
+# Example:
+#   mediaUrl=http://sharedimages.mysite.com/{publicationName}/
+#     # a publication with name "www.xyzzy.com" will get the URL
+#     # http://sharedimages.mysite.com/www.xyzzy.com/ instead of the default
+#     # "multimedia" inside the publication's root URL.
+#
+############################################################################
+# mediaUrl=
+
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/util/PostCardSender.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/util/PostCardSender.properties.erb
new file mode 100644
index 00000000..3dc546d9
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/util/PostCardSender.properties.erb
@@ -0,0 +1,41 @@
+######################################################################
+# MAIL HOST NAME                                                     #
+######################################################################
+# The hostname (or IP address) of the mail server to use.  The
+# destination must be running a mail server accepting connections of
+# type smtp.
+#
+# Example:
+#   mailHost=mail.mycompany.com
+#
+# There is no default value. This must be configured in order for
+# Escenic to send mail.
+######################################################################
+# mailHost=
+
+######################################################################
+# Prototol                                                           #
+######################################################################
+# The protocol to use when sending mail.
+#
+# Example:
+#   protocol=smtp
+# 
+# Default:
+#   smtp
+######################################################################
+# protocol=
+
+######################################################################
+# Outport                                                            #
+######################################################################
+# The port to use when sending mail.
+#
+# Example:
+#   outPort=25
+#
+# Default:
+#   25
+######################################################################
+# outPort=
+
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/family/README.txt b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/family/README.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/instance/README.txt b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/instance/README.txt
new file mode 100644
index 00000000..e69de29b

From 4c57b2ddaeb5f31c053d73025be4e1a0edf3545e Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Thu, 19 Apr 2012 14:10:33 +0200
Subject: [PATCH 0645/2585] added the vip_db reference from the declaration

---
 .../etc/escenic/engine/default/Database.properties.erb         | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/Database.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/Database.properties.erb
index 7ffb9efe..6b1a5f9d 100644
--- a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/Database.properties.erb
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/Database.properties.erb
@@ -40,8 +40,7 @@
 #           jdbcCompliantTruncation is required for BLOBs to function correctly.
 #
 ##############################################################################
-# url=
-
+url=jdbc:mysql://<%=vip_db%>/ece4?autoReconnect=true&jdbcCompliantTruncation=false
 
 
 ##############################################################################

From 85f1dd6a5073388e483b28c18000ac761e17060e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 19 Apr 2012 14:25:26 +0200
Subject: [PATCH 0646/2585] - added script which lists all the variables that
 are used by any of   the Puppet modules.

  Example usage:
  $ bash list-all-used-variables.sh
  ./escenic/templates/etc/escenic/engine/default/Database.properties.erb :
  Some <%= object %> variable
---
 usr/share/puppet/modules/list-all-used-variables.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 usr/share/puppet/modules/list-all-used-variables.sh

diff --git a/usr/share/puppet/modules/list-all-used-variables.sh b/usr/share/puppet/modules/list-all-used-variables.sh
new file mode 100644
index 00000000..64ecf6fc
--- /dev/null
+++ b/usr/share/puppet/modules/list-all-used-variables.sh
@@ -0,0 +1,12 @@
+#! /usr/bin/env bash
+
+# lists all referenced Puppet (Ruby) variables.
+
+find . -name *.erb | xargs egrep \<%.*%\> | while read f; do
+  if [ $(echo $f | cut -d: -f2 | grep -v ^# | wc -l) -gt 0 ]; then
+    echo $(echo $f | cut -d: -f1) ":"
+    echo $f | cut -d: -f2-
+  fi
+done
+
+

From 1e8370772330517db791d1aec73ea891222331af Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 19 Apr 2012 14:27:30 +0200
Subject: [PATCH 0647/2585] - pretty printed the rest of the file statements.

---
 .../puppet/modules/vosa/manifests/apt_repo.pp | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/usr/share/puppet/modules/vosa/manifests/apt_repo.pp b/usr/share/puppet/modules/vosa/manifests/apt_repo.pp
index 63688d57..ae3e62c3 100644
--- a/usr/share/puppet/modules/vosa/manifests/apt_repo.pp
+++ b/usr/share/puppet/modules/vosa/manifests/apt_repo.pp
@@ -2,10 +2,21 @@
 package { 'nginx': }
 package { 'dpkg-sig': }
 
-file { '/var/www': ensure=> directory, owner => www-data, group => www-data }
-file { '/var/www/apt': ensure=> directory, owner => www-data, group => www-data }
-file { '/var/www/apt/conf': ensure=> directory, owner => www-data, group => www-data }
-
+file { '/var/www':
+  ensure=> directory,
+  owner => www-data,
+  group => www-data
+}
+file { '/var/www/apt':
+  ensure=> directory,
+  owner => www-data,
+  group => www-data
+}
+file { '/var/www/apt/conf':
+  ensure=> directory,
+  owner => www-data,
+  group => www-data
+}
 file { '/var/www/apt/conf/distributions':
   ensure=> file,
   content=> "
@@ -18,7 +29,6 @@
 SignWith: yes
 ",
 }
-
 file { '/var/www/apt/dists':
   ensure=> directory,
   owner =>

From f7d2d8e88c908941526d2fc6dde9319c9bd4f639 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 19 Apr 2012 14:27:43 +0200
Subject: [PATCH 0648/2585] - miniscule

---
 usr/bin/ece | 1 -
 1 file changed, 1 deletion(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 1462ea86..7ec5ab0f 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -1178,7 +1178,6 @@ function set_type_command_and_instance()
           continue
         fi
 
-         
         if [ "$el" == "-q" -o $el == "--quiet" ]; then
             quiet=1
             continue

From c0ccdc9348b67b12da6bbddc97250765c454a08e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 19 Apr 2012 21:01:44 +0800
Subject: [PATCH 0649/2585] - added varnish default and etc files

---
 .../escenic/templates/etc/default/varnish.erb | 106 ++++++++++++++++++
 .../templates/etc/varnish/default.vcl.erb     |  84 ++++++++++++++
 2 files changed, 190 insertions(+)
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/default/varnish.erb
 create mode 100644 usr/share/puppet/modules/escenic/templates/etc/varnish/default.vcl.erb

diff --git a/usr/share/puppet/modules/escenic/templates/etc/default/varnish.erb b/usr/share/puppet/modules/escenic/templates/etc/default/varnish.erb
new file mode 100644
index 00000000..1e9f4899
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/default/varnish.erb
@@ -0,0 +1,106 @@
+# Configuration file for varnish
+#
+# /etc/init.d/varnish expects the variables $DAEMON_OPTS, $NFILES and $MEMLOCK
+# to be set from this shell script fragment.
+#
+
+# Should we start varnishd at boot?  Set to "no" to disable.
+START=yes
+
+# Maximum number of open files (for ulimit -n)
+NFILES=131072
+
+# Maximum locked memory size (for ulimit -l)
+# Used for locking the shared memory log in memory.  If you increase log size,
+# you need to increase this number as well
+MEMLOCK=82000
+
+# Default varnish instance name is the local nodename.  Can be overridden with
+# the -n switch, to have more instances on a single server.
+# INSTANCE=$(uname -n)
+
+# This file contains 4 alternatives, please use only one.
+
+## Alternative 1, Minimal configuration, no VCL
+#
+# Listen on port 80, administration on localhost:6082, and forward to
+# content server on localhost:8080.  Use a 1GB fixed-size cache file.
+#
+# DAEMON_OPTS="-a :80 \
+#              -T localhost:6082 \
+# 	     -b localhost:8080 \
+# 	     -u varnish -g varnish \
+#            -S /etc/varnish/secret \
+# 	     -s file,/var/lib/varnish/$INSTANCE/varnish_storage.bin,1G"
+
+
+## Alternative 2, Configuration with VCL
+#
+# Listen on port 80, administration on localhost:6082, and forward to
+# one content server selected by the vcl file, based on the request.  Use a 1GB
+# fixed-size cache file.
+#
+DAEMON_OPTS="-a :80 \
+             -T localhost:6082 \
+             -f /etc/varnish/default.vcl \
+             -S /etc/varnish/secret \
+             -s malloc,256m"
+
+
+## Alternative 3, Advanced configuration
+#
+# See varnishd(1) for more information.
+#
+# # Main configuration file. You probably want to change it :)
+# VARNISH_VCL_CONF=/etc/varnish/default.vcl
+#
+# # Default address and port to bind to
+# # Blank address means all IPv4 and IPv6 interfaces, otherwise specify
+# # a host name, an IPv4 dotted quad, or an IPv6 address in brackets.
+# VARNISH_LISTEN_ADDRESS=
+# VARNISH_LISTEN_PORT=80
+#
+# # Telnet admin interface listen address and port
+# VARNISH_ADMIN_LISTEN_ADDRESS=127.0.0.1
+# VARNISH_ADMIN_LISTEN_PORT=6082
+#
+# # The minimum number of worker threads to start
+# VARNISH_MIN_THREADS=1
+#
+# # The Maximum number of worker threads to start
+# VARNISH_MAX_THREADS=1000
+#
+# # Idle timeout for worker threads
+# VARNISH_THREAD_TIMEOUT=120
+#
+# # Cache file location
+# VARNISH_STORAGE_FILE=/var/lib/varnish/$INSTANCE/varnish_storage.bin
+#
+# # Cache file size: in bytes, optionally using k / M / G / T suffix,
+# # or in percentage of available disk space using the % suffix.
+# VARNISH_STORAGE_SIZE=1G
+#
+# # File containing administration secret
+# VARNISH_SECRET_FILE=/etc/varnish/secret
+# 
+# # Backend storage specification
+# VARNISH_STORAGE="file,${VARNISH_STORAGE_FILE},${VARNISH_STORAGE_SIZE}"
+#
+# # Default TTL used when the backend does not specify one
+# VARNISH_TTL=120
+#
+# # DAEMON_OPTS is used by the init script.  If you add or remove options, make
+# # sure you update this section, too.
+# DAEMON_OPTS="-a ${VARNISH_LISTEN_ADDRESS}:${VARNISH_LISTEN_PORT} \
+#              -f ${VARNISH_VCL_CONF} \
+#              -T ${VARNISH_ADMIN_LISTEN_ADDRESS}:${VARNISH_ADMIN_LISTEN_PORT} \
+#              -t ${VARNISH_TTL} \
+#              -w ${VARNISH_MIN_THREADS},${VARNISH_MAX_THREADS},${VARNISH_THREAD_TIMEOUT} \
+# 	       -S ${VARNISH_SECRET_FILE} \
+#              -s ${VARNISH_STORAGE}"
+#
+
+
+## Alternative 4, Do It Yourself
+#
+# DAEMON_OPTS=""
diff --git a/usr/share/puppet/modules/escenic/templates/etc/varnish/default.vcl.erb b/usr/share/puppet/modules/escenic/templates/etc/varnish/default.vcl.erb
new file mode 100644
index 00000000..8cba0d1e
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/templates/etc/varnish/default.vcl.erb
@@ -0,0 +1,84 @@
+/* Varnish configuration for Escenic Content Engine              -*- java -*- */
+
+/* IPs that are allowed to access the administrative pages/webapps. */
+acl staff {
+  "localhost";
+}
+
+/* The IP of the Adactus/Mobilize server */
+acl adactus {
+  "203.33.232.216";
+}
+
+/* Our web server for serving static content */
+backend static {
+  .host = "localhost";
+  .port = "81";
+}
+
+backend quanah0 {
+  .host = "quanah";
+  .port = "8080";
+}
+
+/* The client director gives us session stickiness based on client
+ * IP. */
+director webdirector client {
+  {
+     .backend = quanah0;
+     .weight = 1;
+  }
+}
+
+sub vcl_recv {
+  if (!client.ip ~ staff &&
+      (req.url ~ "^/escenic" ||
+       req.url ~ "^/studio" ||
+       req.url ~ "^/munin" ||
+       req.url ~ "^/webservice" ||
+       req.url ~ "^/escenic-admin")) {
+     error 405 "Not allowed.";
+  }
+
+  /* Only Adactus/Mobilize is allowed to access the /binary context
+   * which contains all the full quality video files. */
+  if (!client.ip ~ adactus && req.url ~ "^/binary") {
+    error 405 "Not allowed.";
+  }
+
+  if (req.url ~ "^/munin") {
+    set req.url = regsub(req.url, "^/munin", "/");
+    set req.backend = static;
+  }
+  else {
+    set req.backend = webdirector;
+  }
+
+  if (req.url ~ "\.(png|gif|jpg|css|js)$" || req.url == "/favicon.ico") { 
+    remove req.http.Cookie;
+  }
+}
+
+ /* Called when content is fetched from the backend. */
+sub vcl_fetch {
+  /* Remove cookies from these resource types and cache them for a
+   * long time */
+  if (req.url ~ "\.(png|gif|jpg|css|js)$" || req.url == "/favicon.ico") { 
+    set beresp.ttl = 5h;
+    remove beresp.http.Set-Cookie;
+  }
+}
+
+sub vcl_deliver {
+  /* Adds debug header to the result so that we can easily see if a
+   * URL has been fetched from cache or not.
+   */
+  if (obj.hits > 0) {
+    set resp.http.X-Cache = "HIT #" + obj.hits;
+  }
+  else {
+    set resp.http.X-Cache = "MISS";
+  }
+
+  set resp.http.X-Cache-Backend = req.backend;
+}

From bd5c168dbd556007605538af3054868c54e3a3a0 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Thu, 19 Apr 2012 15:43:16 +0200
Subject: [PATCH 0650/2585] added erb variables for mobilize_vip,
 priveledged_ip_list and stripped all cookies

---
 .../engine/default/Database.properties.erb    |  4 +-
 .../templates/etc/varnish/default.vcl.erb     | 59 ++++++++-----------
 2 files changed, 25 insertions(+), 38 deletions(-)

diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/Database.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/Database.properties.erb
index 6b1a5f9d..62ab4215 100644
--- a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/Database.properties.erb
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/Database.properties.erb
@@ -59,7 +59,7 @@ url=jdbc:mysql://<%=vip_db%>/ece4?autoReconnect=true&jdbcCompliantTruncation=fal
 #   driver=
 #           
 ##############################################################################
-# driver=
+driver=com.mysql.jdbc.Driver
 
 
 ##############################################################################
@@ -72,7 +72,7 @@ url=jdbc:mysql://<%=vip_db%>/ece4?autoReconnect=true&jdbcCompliantTruncation=fal
 #   userid=scott
 #           
 ##############################################################################
-# userid=ece_dbo
+userid=<%=db_user%>
 
 
 
diff --git a/usr/share/puppet/modules/escenic/templates/etc/varnish/default.vcl.erb b/usr/share/puppet/modules/escenic/templates/etc/varnish/default.vcl.erb
index 8cba0d1e..a8be2a86 100644
--- a/usr/share/puppet/modules/escenic/templates/etc/varnish/default.vcl.erb
+++ b/usr/share/puppet/modules/escenic/templates/etc/varnish/default.vcl.erb
@@ -1,13 +1,17 @@
 /* Varnish configuration for Escenic Content Engine              -*- java -*- */
 
 /* IPs that are allowed to access the administrative pages/webapps. */
-acl staff {
-  "localhost";
+acl privileged_ip_list {
+  /* <%% privileged_ip_list.each do |ip| %> */
+<% privileged_ip_list.each do |ip| %>
+	"<%= ip %>";
+<% end %>
+	"localhost";
 }
 
-/* The IP of the Adactus/Mobilize server */
-acl adactus {
-  "203.33.232.216";
+/* The IP of the mobilize/Mobilize server */
+acl mobilize {
+  "<%= mobilize_vip %>";
 }
 
 /* Our web server for serving static content */
@@ -16,57 +20,41 @@ backend static {
   .port = "81";
 }
 
-backend quanah0 {
-  .host = "quanah";
+backend ece {
+  .host = "localhost";
   .port = "8080";
 }
 
-/* The client director gives us session stickiness based on client
- * IP. */
-director webdirector client {
-  {
-     .backend = quanah0;
-     .weight = 1;
-  }
-}
 
 sub vcl_recv {
-  if (!client.ip ~ staff &&
+  if (!client.ip ~ privileged_ip_list &&
       (req.url ~ "^/escenic" ||
        req.url ~ "^/studio" ||
        req.url ~ "^/munin" ||
        req.url ~ "^/webservice" ||
+       req.url ~ "^/indexer-webservice" ||
        req.url ~ "^/escenic-admin")) {
      error 405 "Not allowed.";
   }
 
-  /* Only Adactus/Mobilize is allowed to access the /binary context
+  /* Only Mobilize is allowed to access the /binary context
    * which contains all the full quality video files. */
-  if (!client.ip ~ adactus && req.url ~ "^/binary") {
+  if (!client.ip ~ mobilize && req.url ~ "^/binary") {
     error 405 "Not allowed.";
   }
 
-  if (req.url ~ "^/munin") {
-    set req.url = regsub(req.url, "^/munin", "/");
-    set req.backend = static;
-  }
-  else {
-    set req.backend = webdirector;
-  }
+  set req.backend = ece;
 
-  if (req.url ~ "\.(png|gif|jpg|css|js)$" || req.url == "/favicon.ico") { 
-    remove req.http.Cookie;
-  }
+	/* NIE does not need sessions on their website */
+  remove req.http.Cookie;
+	
+  
 }
 
- /* Called when content is fetched from the backend. */
+/* Called when content is fetched from the backend. */
 sub vcl_fetch {
-  /* Remove cookies from these resource types and cache them for a
-   * long time */
-  if (req.url ~ "\.(png|gif|jpg|css|js)$" || req.url == "/favicon.ico") { 
-    set beresp.ttl = 5h;
-    remove beresp.http.Set-Cookie;
-  }
+	/* NIE does not need sessions on their website */
+  remove beresp.http.Set-Cookie;
 }
 
 sub vcl_deliver {
@@ -79,6 +67,5 @@ sub vcl_deliver {
   else {
     set resp.http.X-Cache = "MISS";
   }
-
   set resp.http.X-Cache-Backend = req.backend;
 }

From e876f6fde5072ef8c3d388bf6b2e4a3b4e82ddc8 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Thu, 19 Apr 2012 10:49:23 -0700
Subject: [PATCH 0651/2585] vip_db -> db_vip (Torsteins rule: humanly
 pronouncable)

---
 .../etc/escenic/engine/default/Database.properties.erb          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/Database.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/Database.properties.erb
index 62ab4215..72da78ca 100644
--- a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/Database.properties.erb
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/Database.properties.erb
@@ -40,7 +40,7 @@
 #           jdbcCompliantTruncation is required for BLOBs to function correctly.
 #
 ##############################################################################
-url=jdbc:mysql://<%=vip_db%>/ece4?autoReconnect=true&jdbcCompliantTruncation=false
+url=jdbc:mysql://<%=db_vip%>/ece4?autoReconnect=true&jdbcCompliantTruncation=false
 
 
 ##############################################################################

From e22b1c76610fa956e1eef2c5c104d691b3292c85 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Thu, 19 Apr 2012 11:06:33 -0700
Subject: [PATCH 0652/2585] utilities module: first urility deploy all erb
 templates recursively from a folder on the puppet master

---
 .../modules/util/bin/listTemplatesErbFiles.sh |  3 +
 .../util/bin/listTemplatesSubDirectories.sh   |  2 +
 .../puppet/modules/util/manifests/init.pp     | 94 +++++++++++++++++++
 .../puppet/modules/util/manifests/site.pp     | 70 ++++++++++++++
 4 files changed, 169 insertions(+)
 create mode 100644 usr/share/puppet/modules/util/bin/listTemplatesErbFiles.sh
 create mode 100644 usr/share/puppet/modules/util/bin/listTemplatesSubDirectories.sh
 create mode 100644 usr/share/puppet/modules/util/manifests/init.pp
 create mode 100644 usr/share/puppet/modules/util/manifests/site.pp

diff --git a/usr/share/puppet/modules/util/bin/listTemplatesErbFiles.sh b/usr/share/puppet/modules/util/bin/listTemplatesErbFiles.sh
new file mode 100644
index 00000000..4756c8e0
--- /dev/null
+++ b/usr/share/puppet/modules/util/bin/listTemplatesErbFiles.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+/usr/bin/find $1 -type f | sed 's/.*templates\(.*\)\.erb/\1/'
+
diff --git a/usr/share/puppet/modules/util/bin/listTemplatesSubDirectories.sh b/usr/share/puppet/modules/util/bin/listTemplatesSubDirectories.sh
new file mode 100644
index 00000000..a1ea9ed3
--- /dev/null
+++ b/usr/share/puppet/modules/util/bin/listTemplatesSubDirectories.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+find $1 -type d | sed 's/.*templates\(.*\)/\1/'
\ No newline at end of file
diff --git a/usr/share/puppet/modules/util/manifests/init.pp b/usr/share/puppet/modules/util/manifests/init.pp
new file mode 100644
index 00000000..e94aa6c6
--- /dev/null
+++ b/usr/share/puppet/modules/util/manifests/init.pp
@@ -0,0 +1,94 @@
+class issues {
+
+$engineTemplatesDirectory = "/etc/puppetlabs/puppet/modules/${name}/templates/etc/escenic/engine"
+
+
+$engineTemplateDirectories = split(generate($shListTemplatesSubDirectories,$engineTemplatesDirectory) , "\n")
+file { $engineTemplateDirectories:
+    ensure => directory,
+}
+
+$erbFileNames = split(generate($shListTemplatesErbFiles, $engineTemplatesDirectory), "\n")
+$moduleName = $name
+templated_file{$erbFileNames:}
+
+
+# nginx
+package { 'webserver':
+    name => nginx,
+    ensure => installed,
+    before => File ['nginx-default'],
+}
+
+file { 'nginx-default':
+  name => '/etc/nginx/sites-available/default',
+  source => "puppet:///modules/issues/nginx-config/default",
+}
+
+user { 'jiraexplorer':
+	ensure => present,
+	managehome => true,
+}
+
+file { 'www':
+  name => '/home/jiraexplorer/www/',
+  ensure => directory,
+  group => www-data,
+  require => [File['nginx-default'],User['jiraexplorer']]
+}
+file { '/home/jiraexplorer/www/50x.html':
+  source => "puppet:///modules/issues/nginx-config/50x.html",
+  require => User['jiraexplorer'],
+}
+
+service { 'nginx':
+    ensure     => running,
+    enable     => true,
+    hasrestart => true,
+    hasstatus  => true,
+    subscribe  => File['nginx-default'],
+		require => File['nginx-default']
+}
+
+
+# feed publisher
+
+file { 'jiraExplorer-1.0-jar':
+	name => '/home/jiraexplorer/jiraExplorer-1.0-jar-with-dependencies.jar',
+  source => "puppet:///modules/issues/jiraExplorer-1.0-jar-with-dependencies.jar",
+  require => User['jiraexplorer']
+}
+
+file { 'RssToAtom.xsl':
+  name => '/home/jiraexplorer/RssToAtom.xsl',
+  source => "puppet:///modules/issues/RssToAtom.xsl",
+  require => User['jiraexplorer']
+}
+
+file { 'JiraExplorerConfiguration.properties':
+  name => '/home/jiraexplorer/JiraExplorerConfiguration.properties',
+  source => "puppet:///modules/issues/JiraExplorerConfiguration.properties",
+  require => User['jiraexplorer']
+}
+package { 'java':
+    name => openjdk-6-jdk,
+    ensure => installed,
+}
+
+
+# cron job to run feed publisher
+
+cron { 'refresh-knownissues' :
+	command => 'java -jar -DpropertyFilePath=/home/jiraexplorer/JiraExplorerConfiguration.properties /home/jiraexplorer/jiraExplorer-1.0-jar-with-dependencies.jar',
+	user => root,
+	minute => 0-59,
+	require => [
+		Package['java'], 
+		File['JiraExplorerConfiguration.properties'], 
+		File['RssToAtom.xsl'], 
+		File['jiraExplorer-1.0-jar'],
+		File['www'],
+	]
+}
+
+}
\ No newline at end of file
diff --git a/usr/share/puppet/modules/util/manifests/site.pp b/usr/share/puppet/modules/util/manifests/site.pp
new file mode 100644
index 00000000..72b1fcf7
--- /dev/null
+++ b/usr/share/puppet/modules/util/manifests/site.pp
@@ -0,0 +1,70 @@
+
+## site.pp ##
+
+# This file (/etc/puppetlabs/puppet/manifests/site.pp) is the main entry point
+# used when an agent connects to a master and asks for an updated configuration.
+#
+# Global objects like filebuckets and resource defaults should go in this file,
+# as should the default node definition. (The default node can be omitted
+# if you use the console and don't define any other nodes in site.pp. See
+# http://docs.puppetlabs.com/guides/language_guide.html#nodes for more on
+# node definitions.)
+
+## Active Configurations ##
+
+# PRIMARY FILEBUCKET
+# This configures puppet agent and puppet inspect to back up file contents when
+# they run. The Puppet Enterprise console needs this to display file contents
+# and differences.
+
+# Define filebucket 'main':
+filebucket { 'main':
+  server => 'puppet.velthovenhome.net',
+  path   => false,
+}
+
+# Make filebucket 'main' the default backup location for all File resources:
+File { backup => 'main' }
+
+# DEFAULT NODE
+# Node definitions in this file are merged with node data from the console. See
+# http://docs.puppetlabs.com/guides/language_guide.html#nodes for more on
+# node definitions.
+
+# The default node definition matches any node lacking a more specific node
+# definition. If there are no other nodes in this file, classes declared here
+# will be included in every node's catalog, *in addition* to any classes
+# specified in the console for that node.
+
+$database_machine = "alexander"
+
+
+
+
+$puppet_bin = "/etc/puppetlabs/puppet/bin/"
+$shListTemplatesErbFiles = "${puppet_bin}listTemplatesErbFiles.sh"
+$shListTemplatesSubDirectories = "${puppet_bin}listTemplatesSubDirectories.sh"
+
+
+define templated_file() {
+    file { $name:
+        ensure => file,
+        content => template("${moduleName}${name}.erb"),
+    }
+}
+                        
+
+
+
+
+node default {
+  # This is where you can declare classes for all nodes.
+  # Example:
+  #   class { 'my_class': }
+}
+
+node 'issues.velthovenhome.net' {
+    include issues
+#    $fileNames = split( generate("/usr/bin/find", $puppetMasterTemplatePath,"-type", "f", "-print0"), "\0")
+#    templated_file{$fileNames:}
+}

From 74bb7d69a30c8590c538fa1a54fbe22f5587230e Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Thu, 19 Apr 2012 11:11:45 -0700
Subject: [PATCH 0653/2585] some cleanup

---
 .../puppet/modules/util/manifests/init.pp     | 82 +------------------
 .../puppet/modules/util/manifests/site.pp     | 56 -------------
 2 files changed, 1 insertion(+), 137 deletions(-)

diff --git a/usr/share/puppet/modules/util/manifests/init.pp b/usr/share/puppet/modules/util/manifests/init.pp
index e94aa6c6..74498a2e 100644
--- a/usr/share/puppet/modules/util/manifests/init.pp
+++ b/usr/share/puppet/modules/util/manifests/init.pp
@@ -1,8 +1,7 @@
-class issues {
+class util {
 
 $engineTemplatesDirectory = "/etc/puppetlabs/puppet/modules/${name}/templates/etc/escenic/engine"
 
-
 $engineTemplateDirectories = split(generate($shListTemplatesSubDirectories,$engineTemplatesDirectory) , "\n")
 file { $engineTemplateDirectories:
     ensure => directory,
@@ -12,83 +11,4 @@
 $moduleName = $name
 templated_file{$erbFileNames:}
 
-
-# nginx
-package { 'webserver':
-    name => nginx,
-    ensure => installed,
-    before => File ['nginx-default'],
-}
-
-file { 'nginx-default':
-  name => '/etc/nginx/sites-available/default',
-  source => "puppet:///modules/issues/nginx-config/default",
-}
-
-user { 'jiraexplorer':
-	ensure => present,
-	managehome => true,
-}
-
-file { 'www':
-  name => '/home/jiraexplorer/www/',
-  ensure => directory,
-  group => www-data,
-  require => [File['nginx-default'],User['jiraexplorer']]
-}
-file { '/home/jiraexplorer/www/50x.html':
-  source => "puppet:///modules/issues/nginx-config/50x.html",
-  require => User['jiraexplorer'],
-}
-
-service { 'nginx':
-    ensure     => running,
-    enable     => true,
-    hasrestart => true,
-    hasstatus  => true,
-    subscribe  => File['nginx-default'],
-		require => File['nginx-default']
-}
-
-
-# feed publisher
-
-file { 'jiraExplorer-1.0-jar':
-	name => '/home/jiraexplorer/jiraExplorer-1.0-jar-with-dependencies.jar',
-  source => "puppet:///modules/issues/jiraExplorer-1.0-jar-with-dependencies.jar",
-  require => User['jiraexplorer']
-}
-
-file { 'RssToAtom.xsl':
-  name => '/home/jiraexplorer/RssToAtom.xsl',
-  source => "puppet:///modules/issues/RssToAtom.xsl",
-  require => User['jiraexplorer']
-}
-
-file { 'JiraExplorerConfiguration.properties':
-  name => '/home/jiraexplorer/JiraExplorerConfiguration.properties',
-  source => "puppet:///modules/issues/JiraExplorerConfiguration.properties",
-  require => User['jiraexplorer']
-}
-package { 'java':
-    name => openjdk-6-jdk,
-    ensure => installed,
-}
-
-
-# cron job to run feed publisher
-
-cron { 'refresh-knownissues' :
-	command => 'java -jar -DpropertyFilePath=/home/jiraexplorer/JiraExplorerConfiguration.properties /home/jiraexplorer/jiraExplorer-1.0-jar-with-dependencies.jar',
-	user => root,
-	minute => 0-59,
-	require => [
-		Package['java'], 
-		File['JiraExplorerConfiguration.properties'], 
-		File['RssToAtom.xsl'], 
-		File['jiraExplorer-1.0-jar'],
-		File['www'],
-	]
-}
-
 }
\ No newline at end of file
diff --git a/usr/share/puppet/modules/util/manifests/site.pp b/usr/share/puppet/modules/util/manifests/site.pp
index 72b1fcf7..d2cc02e6 100644
--- a/usr/share/puppet/modules/util/manifests/site.pp
+++ b/usr/share/puppet/modules/util/manifests/site.pp
@@ -1,46 +1,4 @@
 
-## site.pp ##
-
-# This file (/etc/puppetlabs/puppet/manifests/site.pp) is the main entry point
-# used when an agent connects to a master and asks for an updated configuration.
-#
-# Global objects like filebuckets and resource defaults should go in this file,
-# as should the default node definition. (The default node can be omitted
-# if you use the console and don't define any other nodes in site.pp. See
-# http://docs.puppetlabs.com/guides/language_guide.html#nodes for more on
-# node definitions.)
-
-## Active Configurations ##
-
-# PRIMARY FILEBUCKET
-# This configures puppet agent and puppet inspect to back up file contents when
-# they run. The Puppet Enterprise console needs this to display file contents
-# and differences.
-
-# Define filebucket 'main':
-filebucket { 'main':
-  server => 'puppet.velthovenhome.net',
-  path   => false,
-}
-
-# Make filebucket 'main' the default backup location for all File resources:
-File { backup => 'main' }
-
-# DEFAULT NODE
-# Node definitions in this file are merged with node data from the console. See
-# http://docs.puppetlabs.com/guides/language_guide.html#nodes for more on
-# node definitions.
-
-# The default node definition matches any node lacking a more specific node
-# definition. If there are no other nodes in this file, classes declared here
-# will be included in every node's catalog, *in addition* to any classes
-# specified in the console for that node.
-
-$database_machine = "alexander"
-
-
-
-
 $puppet_bin = "/etc/puppetlabs/puppet/bin/"
 $shListTemplatesErbFiles = "${puppet_bin}listTemplatesErbFiles.sh"
 $shListTemplatesSubDirectories = "${puppet_bin}listTemplatesSubDirectories.sh"
@@ -54,17 +12,3 @@
 }
                         
 
-
-
-
-node default {
-  # This is where you can declare classes for all nodes.
-  # Example:
-  #   class { 'my_class': }
-}
-
-node 'issues.velthovenhome.net' {
-    include issues
-#    $fileNames = split( generate("/usr/bin/find", $puppetMasterTemplatePath,"-type", "f", "-print0"), "\0")
-#    templated_file{$fileNames:}
-}

From e0b215c8d96a1dd90d14425110fde79a7f37b985 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Thu, 19 Apr 2012 12:59:32 -0700
Subject: [PATCH 0654/2585] renaming site.pp: deleting first

---
 usr/share/puppet/modules/util/manifests/site.pp | 14 --------------
 1 file changed, 14 deletions(-)
 delete mode 100644 usr/share/puppet/modules/util/manifests/site.pp

diff --git a/usr/share/puppet/modules/util/manifests/site.pp b/usr/share/puppet/modules/util/manifests/site.pp
deleted file mode 100644
index d2cc02e6..00000000
--- a/usr/share/puppet/modules/util/manifests/site.pp
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$puppet_bin = "/etc/puppetlabs/puppet/bin/"
-$shListTemplatesErbFiles = "${puppet_bin}listTemplatesErbFiles.sh"
-$shListTemplatesSubDirectories = "${puppet_bin}listTemplatesSubDirectories.sh"
-
-
-define templated_file() {
-    file { $name:
-        ensure => file,
-        content => template("${moduleName}${name}.erb"),
-    }
-}
-                        
-

From d29e43c25f065f34b4ce7063e335dd7f3ba648eb Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Thu, 19 Apr 2012 13:00:37 -0700
Subject: [PATCH 0655/2585] renaming site.pp: adding as templating.pp

---
 .../puppet/modules/util/manifests/templating.pp    | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 usr/share/puppet/modules/util/manifests/templating.pp

diff --git a/usr/share/puppet/modules/util/manifests/templating.pp b/usr/share/puppet/modules/util/manifests/templating.pp
new file mode 100644
index 00000000..d2cc02e6
--- /dev/null
+++ b/usr/share/puppet/modules/util/manifests/templating.pp
@@ -0,0 +1,14 @@
+
+$puppet_bin = "/etc/puppetlabs/puppet/bin/"
+$shListTemplatesErbFiles = "${puppet_bin}listTemplatesErbFiles.sh"
+$shListTemplatesSubDirectories = "${puppet_bin}listTemplatesSubDirectories.sh"
+
+
+define templated_file() {
+    file { $name:
+        ensure => file,
+        content => template("${moduleName}${name}.erb"),
+    }
+}
+                        
+

From 0a16e456466db3b846a6324605f4be8b9de099de Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Thu, 19 Apr 2012 13:04:05 -0700
Subject: [PATCH 0656/2585] add some rename some

---
 .../modules/util/bin/list-all-used-variables.sh      | 12 ++++++++++++
 ...platesErbFiles.sh => list-templates-erb-files.sh} |  0
 ...rectories.sh => list-templates-subdirectories.sh} |  0
 3 files changed, 12 insertions(+)
 create mode 100755 usr/share/puppet/modules/util/bin/list-all-used-variables.sh
 rename usr/share/puppet/modules/util/bin/{listTemplatesErbFiles.sh => list-templates-erb-files.sh} (100%)
 rename usr/share/puppet/modules/util/bin/{listTemplatesSubDirectories.sh => list-templates-subdirectories.sh} (100%)

diff --git a/usr/share/puppet/modules/util/bin/list-all-used-variables.sh b/usr/share/puppet/modules/util/bin/list-all-used-variables.sh
new file mode 100755
index 00000000..64ecf6fc
--- /dev/null
+++ b/usr/share/puppet/modules/util/bin/list-all-used-variables.sh
@@ -0,0 +1,12 @@
+#! /usr/bin/env bash
+
+# lists all referenced Puppet (Ruby) variables.
+
+find . -name *.erb | xargs egrep \<%.*%\> | while read f; do
+  if [ $(echo $f | cut -d: -f2 | grep -v ^# | wc -l) -gt 0 ]; then
+    echo $(echo $f | cut -d: -f1) ":"
+    echo $f | cut -d: -f2-
+  fi
+done
+
+
diff --git a/usr/share/puppet/modules/util/bin/listTemplatesErbFiles.sh b/usr/share/puppet/modules/util/bin/list-templates-erb-files.sh
similarity index 100%
rename from usr/share/puppet/modules/util/bin/listTemplatesErbFiles.sh
rename to usr/share/puppet/modules/util/bin/list-templates-erb-files.sh
diff --git a/usr/share/puppet/modules/util/bin/listTemplatesSubDirectories.sh b/usr/share/puppet/modules/util/bin/list-templates-subdirectories.sh
similarity index 100%
rename from usr/share/puppet/modules/util/bin/listTemplatesSubDirectories.sh
rename to usr/share/puppet/modules/util/bin/list-templates-subdirectories.sh

From 4f1ed04eef82da88ff74e904c8566df317bdb9a4 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 20 Apr 2012 09:04:16 +0200
Subject: [PATCH 0657/2585] - now prints hits in red using egrep --color

---
 usr/share/puppet/modules/list-all-used-variables.sh | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/usr/share/puppet/modules/list-all-used-variables.sh b/usr/share/puppet/modules/list-all-used-variables.sh
index 64ecf6fc..72519e4d 100644
--- a/usr/share/puppet/modules/list-all-used-variables.sh
+++ b/usr/share/puppet/modules/list-all-used-variables.sh
@@ -2,10 +2,15 @@
 
 # lists all referenced Puppet (Ruby) variables.
 
-find . -name *.erb | xargs egrep \<%.*%\> | while read f; do
-  if [ $(echo $f | cut -d: -f2 | grep -v ^# | wc -l) -gt 0 ]; then
-    echo $(echo $f | cut -d: -f1) ":"
-    echo $f | cut -d: -f2-
+function red() {
+ echo -e "\E[37;31m\033[1m${@}\033[0m"
+}
+
+find . -name *.erb | while read f; do
+  if [ $(egrep \<%.*%\> $f | wc -l) -gt 0 ]; then
+    echo $f "uses these variables:"
+    s=$(grep \<%.*%\> $f | grep -v ^#)
+    echo "$s" | egrep --color "<%.*%>"
   fi
 done
 

From b49fe7b5d1e5476285026a302569a8c0c539bd25 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 20 Apr 2012 09:08:30 +0200
Subject: [PATCH 0658/2585] - added line numbers

---
 .../puppet/util/list-all-used-variables.sh      | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100755 usr/share/puppet/util/list-all-used-variables.sh

diff --git a/usr/share/puppet/util/list-all-used-variables.sh b/usr/share/puppet/util/list-all-used-variables.sh
new file mode 100755
index 00000000..120bea7c
--- /dev/null
+++ b/usr/share/puppet/util/list-all-used-variables.sh
@@ -0,0 +1,17 @@
+#! /usr/bin/env bash
+
+# lists all referenced Puppet (Ruby) variables.
+
+function red() {
+ echo -e "\E[37;31m\033[1m${@}\033[0m"
+}
+
+find . -name *.erb | while read f; do
+  if [ $(egrep \<%.*%\> $f | wc -l) -gt 0 ]; then
+    echo $f "uses these variables:"
+    s=$(grep -n \<%.*%\> $f | grep -v ^#)
+    echo "$s" | egrep --color "<%.*%>"
+  fi
+done
+
+

From b2f9bf9a52722e1ca0d33058fcfd204f24d4b0be Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 20 Apr 2012 09:45:24 +0200
Subject: [PATCH 0659/2585] - added list_all_ruby_variable_expressions (-c) -
 added list_all_ruby_variables_machine_readable (-m) - put the listing of all
 Ruby expressions into its own function:   list_all_ruby_expressions - added
 help screen:

  $ list-all-used-variables.sh -h
  Usage: list-all-used-variables.sh [OPTION]

  OPTIONS:
     -a    List all Ruby expressions listed per file. This options is
           also the default behaviour if no option is specified.
     -c    List only Ruby variables listed per file
     -m    List all Ruby variables used in all files,
           machine readable.
     -h    This help screen.
---
 .../puppet/util/list-all-used-variables.sh    | 70 +++++++++++++++++--
 1 file changed, 63 insertions(+), 7 deletions(-)

diff --git a/usr/share/puppet/util/list-all-used-variables.sh b/usr/share/puppet/util/list-all-used-variables.sh
index 120bea7c..c30137d9 100755
--- a/usr/share/puppet/util/list-all-used-variables.sh
+++ b/usr/share/puppet/util/list-all-used-variables.sh
@@ -3,15 +3,71 @@
 # lists all referenced Puppet (Ruby) variables.
 
 function red() {
- echo -e "\E[37;31m\033[1m${@}\033[0m"
+  echo -e "\E[37;31m\033[1m${@}\033[0m"
 }
 
-find . -name *.erb | while read f; do
-  if [ $(egrep \<%.*%\> $f | wc -l) -gt 0 ]; then
-    echo $f "uses these variables:"
-    s=$(grep -n \<%.*%\> $f | grep -v ^#)
-    echo "$s" | egrep --color "<%.*%>"
-  fi
+function list_all_ruby_expressions() {
+  find . -name "*.erb" | while read f; do
+    if [ $(egrep \<%.*%\> $f | wc -l) -gt 0 ]; then
+      echo $f "uses these Ruby expressions:"
+      s=$(grep -n \<%.*%\> $f | grep -v ^#)
+      echo "$s" | egrep --color "<%.*%>"
+    fi
+  done
+}
+
+function list_all_ruby_variable_expressions() {
+  find . -name "*.erb" | while read f; do
+    if [ $(egrep \<%=.*%\> $f | wc -l) -gt 0 ]; then
+      if [ -z "$1" ]; then
+        echo $f "uses these variables:"
+      fi
+      
+      s=$(grep -n \<%=.*%\> $f | grep -v ^#)
+
+      echo "$s" | \
+        sed 's#\(.*\)<%=\(.*\)%>\(.*\)#\2#' | \
+        sed 's#^[ ]##g'
+    fi
+  done
+}
+
+function list_all_ruby_variables_machine_readable() {
+  list_all_ruby_variable_expressions no-paths | \
+    sort | \
+    uniq
+}
+
+while getopts "acmh" opt; do
+  case $opt in
+    a)
+      list_all_ruby_expressions
+      exit 0
+      ;;
+    c)
+      list_all_ruby_variable_expressions
+      exit 0
+      ;;
+    m)
+      list_all_ruby_variables_machine_readable
+      exit 0
+      ;;
+    h)
+cat <<EOF
+Usage: $(basename $0) [OPTION]
+
+OPTIONS:
+   -a    List all Ruby expressions listed per file. This options is also
+         the default behaviour if no option is specified.
+   -c    List only Ruby variables listed per file
+   -m    List all Ruby variables used in all files, machine readable.
+   -h    This help screen.
+
+EOF
+      exit 0
+      ;;
+  esac
 done
 
+list_all_ruby_expressions
 

From 7fa40ac093455f7b3828194021d78458998c8e7a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 20 Apr 2012 09:50:17 +0200
Subject: [PATCH 0660/2585] - deleted/moved the list-all-used-variables.sh from
 modules & and   modules/util/bin, it's now in usr/share/puppet/util so that
 it can   be called from the root like:

  $ cd /usr/share/puppet
  $ ./util/list-all-used-variables.sh
  ./modules/escenic/templates/etc/escenic/engine/default/Database.properties.erb uses these Ruby expressions:
  43:url=jdbc:mysql://<%=db_vip%>/ece4?autoReconnect=true&jdbcCompliantTruncation=false
  75:userid=<%=db_user%>
  ./modules/escenic/templates/etc/varnish/default.vcl.erb uses these Ruby expressions:
  5:  /* <%% privileged_ip_list.each do |ip| %> */
  6:<% privileged_ip_list.each do |ip| %>
  7:      "<%= ip %>";
  8:<% end %>
  14:  "<%= mobilize_vip %>";
---
 .../puppet/modules/list-all-used-variables.sh   | 17 -----------------
 .../modules/util/bin/list-all-used-variables.sh | 12 ------------
 2 files changed, 29 deletions(-)
 delete mode 100644 usr/share/puppet/modules/list-all-used-variables.sh
 delete mode 100755 usr/share/puppet/modules/util/bin/list-all-used-variables.sh

diff --git a/usr/share/puppet/modules/list-all-used-variables.sh b/usr/share/puppet/modules/list-all-used-variables.sh
deleted file mode 100644
index 72519e4d..00000000
--- a/usr/share/puppet/modules/list-all-used-variables.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /usr/bin/env bash
-
-# lists all referenced Puppet (Ruby) variables.
-
-function red() {
- echo -e "\E[37;31m\033[1m${@}\033[0m"
-}
-
-find . -name *.erb | while read f; do
-  if [ $(egrep \<%.*%\> $f | wc -l) -gt 0 ]; then
-    echo $f "uses these variables:"
-    s=$(grep \<%.*%\> $f | grep -v ^#)
-    echo "$s" | egrep --color "<%.*%>"
-  fi
-done
-
-
diff --git a/usr/share/puppet/modules/util/bin/list-all-used-variables.sh b/usr/share/puppet/modules/util/bin/list-all-used-variables.sh
deleted file mode 100755
index 64ecf6fc..00000000
--- a/usr/share/puppet/modules/util/bin/list-all-used-variables.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /usr/bin/env bash
-
-# lists all referenced Puppet (Ruby) variables.
-
-find . -name *.erb | xargs egrep \<%.*%\> | while read f; do
-  if [ $(echo $f | cut -d: -f2 | grep -v ^# | wc -l) -gt 0 ]; then
-    echo $(echo $f | cut -d: -f1) ":"
-    echo $f | cut -d: -f2-
-  fi
-done
-
-

From 620254d65c4e8ebef0b57b8c595acccb82ba4c06 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 20 Apr 2012 09:53:15 +0200
Subject: [PATCH 0661/2585] - added check for non existent parameter

---
 usr/share/puppet/util/list-all-used-variables.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/usr/share/puppet/util/list-all-used-variables.sh b/usr/share/puppet/util/list-all-used-variables.sh
index c30137d9..b60eb8f5 100755
--- a/usr/share/puppet/util/list-all-used-variables.sh
+++ b/usr/share/puppet/util/list-all-used-variables.sh
@@ -66,6 +66,9 @@ OPTIONS:
 EOF
       exit 0
       ;;
+    ?)
+      exit 1
+      ;;
   esac
 done
 

From ec1784acff4335ef13bda4f2742599ea9cbd8010 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 20 Apr 2012 12:53:51 +0200
Subject: [PATCH 0662/2585] - added manifest for installing and setting up an
 APT cache/proxy.

---
 .../modules/vosa/manifests/apt_cache.pp       | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 usr/share/puppet/modules/vosa/manifests/apt_cache.pp

diff --git a/usr/share/puppet/modules/vosa/manifests/apt_cache.pp b/usr/share/puppet/modules/vosa/manifests/apt_cache.pp
new file mode 100644
index 00000000..87118b28
--- /dev/null
+++ b/usr/share/puppet/modules/vosa/manifests/apt_cache.pp
@@ -0,0 +1,38 @@
+# Installs an APT cache/proxy for other APT based machines can
+# use. The hosts may use different APT based systems with different
+# package pools. For instance, some hosts can run Ubuntu LTS, others
+# Ubuntu 12.04 while others run Debian stable. The cache will handle
+# all of this transparently.
+package { 'apt-cacher': }
+
+# would be great to use augeas here, but it currently doesn't support
+# apt-cacher :-(
+file { '/etc/apt-cacher/apt-cacher.conf':
+  ensure => file,
+  content => "
+# This file has been configured by Puppet
+admin_email=root@localhost
+allowed_hosts=*
+allowed_hosts_6=fec0::/16
+cache_dir=/var/cache/apt-cacher
+clean_cache=0
+daemon_port=3142
+debug=0
+denied_hosts=
+denied_hosts_6=
+expire_hours=0
+generate_reports=1
+group=www-data
+limit=0
+logdir=/var/log/apt-cacher
+offline_mode=0
+use_proxy=0
+use_proxy_auth=0
+user=www-data
+"
+}
+
+service { apt-cacher:
+  ensure => running,
+  subscribe => File["/etc/apt-cacher/apt-cacher.conf"],
+}

From f78575a4c29dfa585c8e984b083db9cdedb77882 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 20 Apr 2012 13:35:21 +0200
Subject: [PATCH 0663/2585] - added setup of /etc/default/apt-cacher, without
 it apt-cacher will   not start :-)

---
 usr/share/puppet/modules/vosa/manifests/apt_cache.pp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/usr/share/puppet/modules/vosa/manifests/apt_cache.pp b/usr/share/puppet/modules/vosa/manifests/apt_cache.pp
index 87118b28..7afb2ac2 100644
--- a/usr/share/puppet/modules/vosa/manifests/apt_cache.pp
+++ b/usr/share/puppet/modules/vosa/manifests/apt_cache.pp
@@ -32,6 +32,15 @@
 "
 }
 
+file { '/etc/default/apt-cacher':
+  ensure => file,
+  content => "
+# This file has been configured by Puppet
+AUTOSTART=1
+"
+}
+
+  
 service { apt-cacher:
   ensure => running,
   subscribe => File["/etc/apt-cacher/apt-cacher.conf"],

From 77cd325d24fff6971a36f5eba7ac5b5923529c55 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 20 Apr 2012 13:45:55 +0200
Subject: [PATCH 0664/2585] - the service name wasn't quoted. It did work
 without, but I added the   quotes nevertheless.

---
 usr/share/puppet/modules/vosa/manifests/apt_cache.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/puppet/modules/vosa/manifests/apt_cache.pp b/usr/share/puppet/modules/vosa/manifests/apt_cache.pp
index 7afb2ac2..8f71a113 100644
--- a/usr/share/puppet/modules/vosa/manifests/apt_cache.pp
+++ b/usr/share/puppet/modules/vosa/manifests/apt_cache.pp
@@ -41,7 +41,7 @@
 }
 
   
-service { apt-cacher:
+service { 'apt-cacher':
   ensure => running,
   subscribe => File["/etc/apt-cacher/apt-cacher.conf"],
 }

From bd6162bd87f814e5cdae8b4555f37030332c7aab Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 20 Apr 2012 14:39:41 +0200
Subject: [PATCH 0665/2585] - added global variables currently used in our
 Puppet modules

---
 etc/puppet/manifests/site.pp | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 etc/puppet/manifests/site.pp

diff --git a/etc/puppet/manifests/site.pp b/etc/puppet/manifests/site.pp
new file mode 100644
index 00000000..9740a234
--- /dev/null
+++ b/etc/puppet/manifests/site.pp
@@ -0,0 +1,7 @@
+# global variables
+$control_host = "control"
+$apt_proxy_host = "$control_host"
+$db_user = "ece5user"
+$db_vip = ""
+$privileged_ip_list = ""
+$mobilize_vip = ""

From aa1d2ba4c1c02b954c302f0107e8f08c519d2f2e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 20 Apr 2012 14:41:21 +0200
Subject: [PATCH 0666/2585] - added global-variables.pp with the variables
 we're currently using   in our module templates - added APT client
 configuration for using the APT proxy (which   typically runs on the control
 server).

---
 etc/puppet/manifests/{site.pp => global-variables.pp}            | 0
 .../modules/vosa/templates/etc/apt/apt.conf.d/90apt-proxy.erb    | 1 +
 2 files changed, 1 insertion(+)
 rename etc/puppet/manifests/{site.pp => global-variables.pp} (100%)
 create mode 100644 usr/share/puppet/modules/vosa/templates/etc/apt/apt.conf.d/90apt-proxy.erb

diff --git a/etc/puppet/manifests/site.pp b/etc/puppet/manifests/global-variables.pp
similarity index 100%
rename from etc/puppet/manifests/site.pp
rename to etc/puppet/manifests/global-variables.pp
diff --git a/usr/share/puppet/modules/vosa/templates/etc/apt/apt.conf.d/90apt-proxy.erb b/usr/share/puppet/modules/vosa/templates/etc/apt/apt.conf.d/90apt-proxy.erb
new file mode 100644
index 00000000..bd536ea5
--- /dev/null
+++ b/usr/share/puppet/modules/vosa/templates/etc/apt/apt.conf.d/90apt-proxy.erb
@@ -0,0 +1 @@
+Acquire::http::Proxy "http://<%= apt_proxy_host %>:3142";

From ecdd1029d22be5d2eb5b6b804334e5e651cb0912 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 20 Apr 2012 14:47:46 +0200
Subject: [PATCH 0667/2585] - added vizrt.list APT sources list

---
 .../modules/vosa/templates/etc/apt/sources.list.d/vizrt.list.erb | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 usr/share/puppet/modules/vosa/templates/etc/apt/sources.list.d/vizrt.list.erb

diff --git a/usr/share/puppet/modules/vosa/templates/etc/apt/sources.list.d/vizrt.list.erb b/usr/share/puppet/modules/vosa/templates/etc/apt/sources.list.d/vizrt.list.erb
new file mode 100644
index 00000000..d413d2e2
--- /dev/null
+++ b/usr/share/puppet/modules/vosa/templates/etc/apt/sources.list.d/vizrt.list.erb
@@ -0,0 +1 @@
+deb http://<%= apt_vizrt_user %>:<%= apt_vizrt_password %>@apt.vizrt.com stable main

From e2030ee2f47e286335db4104930507609c88b67c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 20 Apr 2012 14:50:12 +0200
Subject: [PATCH 0668/2585] - added the apt.vizrt.com specific variables

---
 etc/puppet/manifests/global-variables.pp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/etc/puppet/manifests/global-variables.pp b/etc/puppet/manifests/global-variables.pp
index 9740a234..badaf59e 100644
--- a/etc/puppet/manifests/global-variables.pp
+++ b/etc/puppet/manifests/global-variables.pp
@@ -1,7 +1,13 @@
 # global variables
 $control_host = "control"
+
+$apt_vizrt_user = ""
+$apt_vizrt_password = ""
 $apt_proxy_host = "$control_host"
+
 $db_user = "ece5user"
 $db_vip = ""
+
 $privileged_ip_list = ""
+
 $mobilize_vip = ""

From a72b20b5202c73f22cf5041c69a84a27f12027a3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 23 Apr 2012 10:40:57 +0200
Subject: [PATCH 0669/2585] - moved package definitions and scripts from
 /usr/local/src to   /usr/share/escenic/package-scripts

---
 usr/{local/src => share/escenic/package-scripts}/create-packages  | 0
 .../escenic/package-scripts}/escenic-common-scripts/control       | 0
 .../escenic/package-scripts}/escenic-common-scripts/postinst      | 0
 .../package-scripts}/escenic-content-engine-installer/control     | 0
 .../package-scripts}/escenic-content-engine-installer/postinst    | 0
 .../package-scripts}/escenic-content-engine-scripts/control       | 0
 .../package-scripts}/escenic-content-engine-scripts/postinst      | 0
 .../escenic/package-scripts}/sign-and-add-packages-to-apt-repo    | 0
 .../src/debian => share/escenic/package-scripts}/vosa/control     | 0
 9 files changed, 0 insertions(+), 0 deletions(-)
 rename usr/{local/src => share/escenic/package-scripts}/create-packages (100%)
 rename usr/{local/src/debian => share/escenic/package-scripts}/escenic-common-scripts/control (100%)
 rename usr/{local/src/debian => share/escenic/package-scripts}/escenic-common-scripts/postinst (100%)
 rename usr/{local/src/debian => share/escenic/package-scripts}/escenic-content-engine-installer/control (100%)
 rename usr/{local/src/debian => share/escenic/package-scripts}/escenic-content-engine-installer/postinst (100%)
 rename usr/{local/src/debian => share/escenic/package-scripts}/escenic-content-engine-scripts/control (100%)
 rename usr/{local/src/debian => share/escenic/package-scripts}/escenic-content-engine-scripts/postinst (100%)
 rename usr/{local/src => share/escenic/package-scripts}/sign-and-add-packages-to-apt-repo (100%)
 rename usr/{local/src/debian => share/escenic/package-scripts}/vosa/control (100%)

diff --git a/usr/local/src/create-packages b/usr/share/escenic/package-scripts/create-packages
similarity index 100%
rename from usr/local/src/create-packages
rename to usr/share/escenic/package-scripts/create-packages
diff --git a/usr/local/src/debian/escenic-common-scripts/control b/usr/share/escenic/package-scripts/escenic-common-scripts/control
similarity index 100%
rename from usr/local/src/debian/escenic-common-scripts/control
rename to usr/share/escenic/package-scripts/escenic-common-scripts/control
diff --git a/usr/local/src/debian/escenic-common-scripts/postinst b/usr/share/escenic/package-scripts/escenic-common-scripts/postinst
similarity index 100%
rename from usr/local/src/debian/escenic-common-scripts/postinst
rename to usr/share/escenic/package-scripts/escenic-common-scripts/postinst
diff --git a/usr/local/src/debian/escenic-content-engine-installer/control b/usr/share/escenic/package-scripts/escenic-content-engine-installer/control
similarity index 100%
rename from usr/local/src/debian/escenic-content-engine-installer/control
rename to usr/share/escenic/package-scripts/escenic-content-engine-installer/control
diff --git a/usr/local/src/debian/escenic-content-engine-installer/postinst b/usr/share/escenic/package-scripts/escenic-content-engine-installer/postinst
similarity index 100%
rename from usr/local/src/debian/escenic-content-engine-installer/postinst
rename to usr/share/escenic/package-scripts/escenic-content-engine-installer/postinst
diff --git a/usr/local/src/debian/escenic-content-engine-scripts/control b/usr/share/escenic/package-scripts/escenic-content-engine-scripts/control
similarity index 100%
rename from usr/local/src/debian/escenic-content-engine-scripts/control
rename to usr/share/escenic/package-scripts/escenic-content-engine-scripts/control
diff --git a/usr/local/src/debian/escenic-content-engine-scripts/postinst b/usr/share/escenic/package-scripts/escenic-content-engine-scripts/postinst
similarity index 100%
rename from usr/local/src/debian/escenic-content-engine-scripts/postinst
rename to usr/share/escenic/package-scripts/escenic-content-engine-scripts/postinst
diff --git a/usr/local/src/sign-and-add-packages-to-apt-repo b/usr/share/escenic/package-scripts/sign-and-add-packages-to-apt-repo
similarity index 100%
rename from usr/local/src/sign-and-add-packages-to-apt-repo
rename to usr/share/escenic/package-scripts/sign-and-add-packages-to-apt-repo
diff --git a/usr/local/src/debian/vosa/control b/usr/share/escenic/package-scripts/vosa/control
similarity index 100%
rename from usr/local/src/debian/vosa/control
rename to usr/share/escenic/package-scripts/vosa/control

From c74285d0d97fce5126e4bd6b12222e42f04b5a0b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 23 Apr 2012 10:41:56 +0200
Subject: [PATCH 0670/2585] - added

---
 usr/share/escenic/build-scripts/README | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 usr/share/escenic/build-scripts/README

diff --git a/usr/share/escenic/build-scripts/README b/usr/share/escenic/build-scripts/README
new file mode 100644
index 00000000..31a93565
--- /dev/null
+++ b/usr/share/escenic/build-scripts/README
@@ -0,0 +1,2 @@
+This is the home of build descriptors and build scripts, related to
+Escenic Content Engine projects.

From f56cb389b44a67ef087ef354455eb41c3b5faaa3 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Mon, 23 Apr 2012 06:20:22 -0700
Subject: [PATCH 0671/2585] removed the path to find and added a filter for
 *.erb

---
 usr/share/puppet/modules/util/bin/list-templates-erb-files.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 usr/share/puppet/modules/util/bin/list-templates-erb-files.sh

diff --git a/usr/share/puppet/modules/util/bin/list-templates-erb-files.sh b/usr/share/puppet/modules/util/bin/list-templates-erb-files.sh
old mode 100644
new mode 100755
index 4756c8e0..eb244c25
--- a/usr/share/puppet/modules/util/bin/list-templates-erb-files.sh
+++ b/usr/share/puppet/modules/util/bin/list-templates-erb-files.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
-/usr/bin/find $1 -type f | sed 's/.*templates\(.*\)\.erb/\1/'
+find $1 -type f -name '*.erb' | sed 's/.*templates\(.*\)\.erb/\1/'
 

From 14d88ac980fa1e63f1069d790ac01377d51f6cc1 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Mon, 23 Apr 2012 06:21:00 -0700
Subject: [PATCH 0672/2585] removed path to find and added a filter for *.erb

---
 .../puppet/modules/util/bin/list-templates-subdirectories.sh    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 usr/share/puppet/modules/util/bin/list-templates-subdirectories.sh

diff --git a/usr/share/puppet/modules/util/bin/list-templates-subdirectories.sh b/usr/share/puppet/modules/util/bin/list-templates-subdirectories.sh
old mode 100644
new mode 100755
index a1ea9ed3..c16d4123
--- a/usr/share/puppet/modules/util/bin/list-templates-subdirectories.sh
+++ b/usr/share/puppet/modules/util/bin/list-templates-subdirectories.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-find $1 -type d | sed 's/.*templates\(.*\)/\1/'
\ No newline at end of file
+find $1 -type d -name '*.erb' | sed 's/.*templates\(.*\)/\1/'
\ No newline at end of file

From 851015e710ba700c05ba3a5de253149a38edb226 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Mon, 23 Apr 2012 06:31:19 -0700
Subject: [PATCH 0673/2585] under construction, first checkin

---
 usr/share/puppet/modules/util/manifests/templated_file.pp | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 usr/share/puppet/modules/util/manifests/templated_file.pp

diff --git a/usr/share/puppet/modules/util/manifests/templated_file.pp b/usr/share/puppet/modules/util/manifests/templated_file.pp
new file mode 100644
index 00000000..ba5e8054
--- /dev/null
+++ b/usr/share/puppet/modules/util/manifests/templated_file.pp
@@ -0,0 +1,6 @@
+define util::templated_file($file_path = $title, $tmodule_name) {
+    file { $file_path:
+        ensure => file,
+        content => template("${tmodule_name}${name}.erb"),
+    }
+}

From c0d7759ac00f92a239a02d6aa4cc289d0a91cf5c Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Mon, 23 Apr 2012 06:32:02 -0700
Subject: [PATCH 0674/2585] under construction; getting there

---
 .../puppet/modules/util/manifests/templated_files.pp | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 usr/share/puppet/modules/util/manifests/templated_files.pp

diff --git a/usr/share/puppet/modules/util/manifests/templated_files.pp b/usr/share/puppet/modules/util/manifests/templated_files.pp
new file mode 100644
index 00000000..819d4498
--- /dev/null
+++ b/usr/share/puppet/modules/util/manifests/templated_files.pp
@@ -0,0 +1,12 @@
+define util::templated_files($pa_util_module_directory, $pa_template_module_name, $pa_template_directory){
+
+	$template_subdirectories = split(generate("${pa_util_module_directory}bin/list-templates-subdirectories.sh",$pa_template_directory) , "\n")
+	file { $template_subdirectories:
+	    ensure => directory,
+	}
+	$erb_filepaths = split(generate("${pa_util_module_directory}bin/list-templates-erb-files.sh", $pa_template_directory), "\n")
+	util::templated_file{$erb_filepaths: 
+		tmodule_name => $pa_template_module_name,
+	}
+
+}

From e9827c22dfeb59f3e8ff05d6f6dc8d902d95a4ca Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Mon, 23 Apr 2012 06:33:46 -0700
Subject: [PATCH 0675/2585] cleanup

---
 usr/share/puppet/modules/util/manifests/init.pp    | 14 --------------
 .../puppet/modules/util/manifests/templating.pp    | 14 --------------
 2 files changed, 28 deletions(-)
 delete mode 100644 usr/share/puppet/modules/util/manifests/init.pp
 delete mode 100644 usr/share/puppet/modules/util/manifests/templating.pp

diff --git a/usr/share/puppet/modules/util/manifests/init.pp b/usr/share/puppet/modules/util/manifests/init.pp
deleted file mode 100644
index 74498a2e..00000000
--- a/usr/share/puppet/modules/util/manifests/init.pp
+++ /dev/null
@@ -1,14 +0,0 @@
-class util {
-
-$engineTemplatesDirectory = "/etc/puppetlabs/puppet/modules/${name}/templates/etc/escenic/engine"
-
-$engineTemplateDirectories = split(generate($shListTemplatesSubDirectories,$engineTemplatesDirectory) , "\n")
-file { $engineTemplateDirectories:
-    ensure => directory,
-}
-
-$erbFileNames = split(generate($shListTemplatesErbFiles, $engineTemplatesDirectory), "\n")
-$moduleName = $name
-templated_file{$erbFileNames:}
-
-}
\ No newline at end of file
diff --git a/usr/share/puppet/modules/util/manifests/templating.pp b/usr/share/puppet/modules/util/manifests/templating.pp
deleted file mode 100644
index d2cc02e6..00000000
--- a/usr/share/puppet/modules/util/manifests/templating.pp
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$puppet_bin = "/etc/puppetlabs/puppet/bin/"
-$shListTemplatesErbFiles = "${puppet_bin}listTemplatesErbFiles.sh"
-$shListTemplatesSubDirectories = "${puppet_bin}listTemplatesSubDirectories.sh"
-
-
-define templated_file() {
-    file { $name:
-        ensure => file,
-        content => template("${moduleName}${name}.erb"),
-    }
-}
-                        
-

From 707cd0059308e9587d68fc34c21aab8ea3d9ea95 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Mon, 23 Apr 2012 06:38:46 -0700
Subject: [PATCH 0676/2585] cleanup parameter names

---
 usr/share/puppet/modules/util/manifests/templated_file.pp | 4 ++--
 .../puppet/modules/util/manifests/templated_files.pp      | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/usr/share/puppet/modules/util/manifests/templated_file.pp b/usr/share/puppet/modules/util/manifests/templated_file.pp
index ba5e8054..db1b797c 100644
--- a/usr/share/puppet/modules/util/manifests/templated_file.pp
+++ b/usr/share/puppet/modules/util/manifests/templated_file.pp
@@ -1,6 +1,6 @@
-define util::templated_file($file_path = $title, $tmodule_name) {
+define util::templated_file($file_path = $title, $module_name) {
     file { $file_path:
         ensure => file,
-        content => template("${tmodule_name}${name}.erb"),
+        content => template("${module_name}${file_path}.erb"),
     }
 }
diff --git a/usr/share/puppet/modules/util/manifests/templated_files.pp b/usr/share/puppet/modules/util/manifests/templated_files.pp
index 819d4498..aafce871 100644
--- a/usr/share/puppet/modules/util/manifests/templated_files.pp
+++ b/usr/share/puppet/modules/util/manifests/templated_files.pp
@@ -1,12 +1,12 @@
-define util::templated_files($pa_util_module_directory, $pa_template_module_name, $pa_template_directory){
+define util::templated_files($util_module_directory, $template_module_name, $template_directory){
 
-	$template_subdirectories = split(generate("${pa_util_module_directory}bin/list-templates-subdirectories.sh",$pa_template_directory) , "\n")
+	$template_subdirectories = split(generate("${util_module_directory}bin/list-templates-subdirectories.sh",$template_directory) , "\n")
 	file { $template_subdirectories:
 	    ensure => directory,
 	}
-	$erb_filepaths = split(generate("${pa_util_module_directory}bin/list-templates-erb-files.sh", $pa_template_directory), "\n")
+	$erb_filepaths = split(generate("${util_module_directory}bin/list-templates-erb-files.sh", $template_directory), "\n")
 	util::templated_file{$erb_filepaths: 
-		tmodule_name => $pa_template_module_name,
+		module_name => $template_module_name,
 	}
 
 }

From 628c3bb54d58a51e60a5197fccaaaf0601ac51f2 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Mon, 23 Apr 2012 06:40:19 -0700
Subject: [PATCH 0677/2585] better plural

---
 .../modules/util/manifests/templated_file_list.pp    | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 usr/share/puppet/modules/util/manifests/templated_file_list.pp

diff --git a/usr/share/puppet/modules/util/manifests/templated_file_list.pp b/usr/share/puppet/modules/util/manifests/templated_file_list.pp
new file mode 100644
index 00000000..aafce871
--- /dev/null
+++ b/usr/share/puppet/modules/util/manifests/templated_file_list.pp
@@ -0,0 +1,12 @@
+define util::templated_files($util_module_directory, $template_module_name, $template_directory){
+
+	$template_subdirectories = split(generate("${util_module_directory}bin/list-templates-subdirectories.sh",$template_directory) , "\n")
+	file { $template_subdirectories:
+	    ensure => directory,
+	}
+	$erb_filepaths = split(generate("${util_module_directory}bin/list-templates-erb-files.sh", $template_directory), "\n")
+	util::templated_file{$erb_filepaths: 
+		module_name => $template_module_name,
+	}
+
+}

From 2ccf8fba731a7b1fe55b3a4bc54664cf86a01fa3 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Mon, 23 Apr 2012 06:43:36 -0700
Subject: [PATCH 0678/2585] .

---
 .../modules/util/manifests/templated_file_list.pp      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/usr/share/puppet/modules/util/manifests/templated_file_list.pp b/usr/share/puppet/modules/util/manifests/templated_file_list.pp
index aafce871..e236cc06 100644
--- a/usr/share/puppet/modules/util/manifests/templated_file_list.pp
+++ b/usr/share/puppet/modules/util/manifests/templated_file_list.pp
@@ -1,11 +1,11 @@
-define util::templated_files($util_module_directory, $template_module_name, $template_directory){
+define util::templated_file_list($util_module_directory, $template_module_name, $template_directory){
 
-	$template_subdirectories = split(generate("${util_module_directory}bin/list-templates-subdirectories.sh",$template_directory) , "\n")
-	file { $template_subdirectories:
+	$template_subdirectory_list = split(generate("${util_module_directory}bin/list-templates-subdirectories.sh",$template_directory) , "\n")
+	file { $template_subdirectory_list:
 	    ensure => directory,
 	}
-	$erb_filepaths = split(generate("${util_module_directory}bin/list-templates-erb-files.sh", $template_directory), "\n")
-	util::templated_file{$erb_filepaths: 
+	$erb_filepath_list = split(generate("${util_module_directory}bin/list-templates-erb-files.sh", $template_directory), "\n")
+	util::templated_file{$erb_filepath_list: 
 		module_name => $template_module_name,
 	}
 

From beadfcdf21297d20298e1db56e808e848d509c4a Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Mon, 23 Apr 2012 06:44:21 -0700
Subject: [PATCH 0679/2585] cleanup

---
 .../puppet/modules/util/manifests/templated_files.pp | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 usr/share/puppet/modules/util/manifests/templated_files.pp

diff --git a/usr/share/puppet/modules/util/manifests/templated_files.pp b/usr/share/puppet/modules/util/manifests/templated_files.pp
deleted file mode 100644
index aafce871..00000000
--- a/usr/share/puppet/modules/util/manifests/templated_files.pp
+++ /dev/null
@@ -1,12 +0,0 @@
-define util::templated_files($util_module_directory, $template_module_name, $template_directory){
-
-	$template_subdirectories = split(generate("${util_module_directory}bin/list-templates-subdirectories.sh",$template_directory) , "\n")
-	file { $template_subdirectories:
-	    ensure => directory,
-	}
-	$erb_filepaths = split(generate("${util_module_directory}bin/list-templates-erb-files.sh", $template_directory), "\n")
-	util::templated_file{$erb_filepaths: 
-		module_name => $template_module_name,
-	}
-
-}

From 04edd58846b3b552aed1364eac638abf563cd190 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Mon, 23 Apr 2012 08:00:08 -0700
Subject: [PATCH 0680/2585] added documentation

---
 .../util/manifests/templated_file_list.pp     | 46 ++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

diff --git a/usr/share/puppet/modules/util/manifests/templated_file_list.pp b/usr/share/puppet/modules/util/manifests/templated_file_list.pp
index e236cc06..7e74d8bc 100644
--- a/usr/share/puppet/modules/util/manifests/templated_file_list.pp
+++ b/usr/share/puppet/modules/util/manifests/templated_file_list.pp
@@ -1,4 +1,48 @@
-define util::templated_file_list($util_module_directory, $template_module_name, $template_directory){
+# = Defined type: util::templated_file_list
+#
+# This type declares a directory of templates to be deployed to a node
+#
+# == Parameters:
+#
+#	$title::								  The name of the declaration: It should start with a slash and point to the subdirectory in the 
+#														{module}/templates directory that needs to be deployed.
+#
+# $util_module_directory::  This parameter must point to the directory where 
+#														https://github.com/skybert/ece-scripts/tree/master/usr/share/puppet/modules/util
+#                   				is deployed on your puppet master
+#														default: "/etc/puppet/modules/util/"
+#
+# $template_module_name::  The module that has the templates in its templates folder.
+#
+# $module_template_directory::  The directory where the source module has its template root: 
+#																for instance: "/home/thomas/ece-scripts/usr/share/puppet/modules/escenic/templates/"
+#
+# == Actions:
+#   ensures that all files like {file}.{ext}.erb are run through the erb engine and deployed to the node as {file}.{ext}
+#
+# == Requires:
+#  all directories must have a slash at the end
+#
+# == Sample Usage:
+# 
+#			util::templated_file_list{'/etc/escenic/engine/':
+#				template_module_name => "escenic",
+#				module_template_directory => "/etc/puppet/modules/escenic/templates/",
+#				util_module_directory => "/etc/puppet/modules/util/",
+#			}
+#
+#			or better:
+#
+#			util::templated_file_list{'/etc/escenic/engine/':
+#				template_module_name => "escenic",
+#				module_template_directory => "/etc/puppet/modules/escenic/templates/",
+#			}
+#
+define util::templated_file_list($util_module_directory = "/etc/puppet/modules/util/", $template_module_name, $module_template_directory){
+
+	$template_directory = "${module_template_directory}${title}"
+	#notice($template_directory)
+	#notify{$template_directory:}
 
 	$template_subdirectory_list = split(generate("${util_module_directory}bin/list-templates-subdirectories.sh",$template_directory) , "\n")
 	file { $template_subdirectory_list:

From ee0e11a33c73ab9bd804159d181f0e965b0bc824 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 23 Apr 2012 23:01:59 +0800
Subject: [PATCH 0681/2585] - added engine.pp with escenic:engine - it now can
 set up a (non sufficient) ece-install.conf depending on   the type of engine
 that's specified in the system declaration.

---
 .../modules/escenic/manifests/engine.pp       | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 usr/share/puppet/modules/escenic/manifests/engine.pp

diff --git a/usr/share/puppet/modules/escenic/manifests/engine.pp b/usr/share/puppet/modules/escenic/manifests/engine.pp
new file mode 100644
index 00000000..9241fcf7
--- /dev/null
+++ b/usr/share/puppet/modules/escenic/manifests/engine.pp
@@ -0,0 +1,35 @@
+$default_engine_type = "pres"
+$default_pres_search_host = "search-pres"
+$default_edit_search_host = "edit-pres"
+
+define escenic::engine(
+  $type = $default_engine_type,
+  $search_host = "")
+{
+  if ($search_host == "") {
+    if ($type == "editor") {
+      $real_search_host = $default_edit_search_host
+     }
+     else {
+       if ($type == "presentation") {
+         $real_search_host = $default_pres_search_host
+       }
+       else {
+         fail("You specified an invalid type=$type")
+       }
+     }  
+  }   
+  else {
+    $real_search_host = $search_host
+  }
+   
+  $common_content="                                                                                                     fai_enabled=1                                                                                                         fai_${type}_install=1                                                                                                 fai_${type}_search_host=${real_search_host}                                                                           fai_${type}_db_host=$db_host                                                                                            "
+  $editor_content="                                                                                                     # editor specific                                                                                                                "
+   
+  file { "/root/ece-install-$name.conf":
+    content =>  $type ? {
+      editor => "$common_content $editor_content",
+      default => "# you specific a non existant profile: $type"
+    }
+  }  
+}

From 92749b7f2b18e4d81167b4c498da76e46e998509 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 23 Apr 2012 23:02:51 +0800
Subject: [PATCH 0682/2585] - added puppet module for APT cache/proxy clients -
 added puppet module for all clients wanting to use the Vizrt APT  
 repository.

---
 usr/share/puppet/modules/vosa/manifests/apt_cache_client.pp | 6 ++++++
 .../puppet/modules/vosa/manifests/vizrt_apt_repo_client.pp  | 5 +++++
 2 files changed, 11 insertions(+)
 create mode 100644 usr/share/puppet/modules/vosa/manifests/apt_cache_client.pp
 create mode 100644 usr/share/puppet/modules/vosa/manifests/vizrt_apt_repo_client.pp

diff --git a/usr/share/puppet/modules/vosa/manifests/apt_cache_client.pp b/usr/share/puppet/modules/vosa/manifests/apt_cache_client.pp
new file mode 100644
index 00000000..9eebf1a5
--- /dev/null
+++ b/usr/share/puppet/modules/vosa/manifests/apt_cache_client.pp
@@ -0,0 +1,6 @@
+class vosa::apt_cache_client {
+  file { '/etc/apt/apt.conf.d/90apt-proxy' :
+    content => template('vosa2/etc/apt/apt.conf.d/90apt-proxy.erb')
+  }
+}
+
diff --git a/usr/share/puppet/modules/vosa/manifests/vizrt_apt_repo_client.pp b/usr/share/puppet/modules/vosa/manifests/vizrt_apt_repo_client.pp
new file mode 100644
index 00000000..1afe9354
--- /dev/null
+++ b/usr/share/puppet/modules/vosa/manifests/vizrt_apt_repo_client.pp
@@ -0,0 +1,5 @@
+class vosa::vizrt_apt_repo_client {
+  file { '/etc/apt/sources.list.d/vizrt.list' :
+    content => template('vosa2/etc/apt/sources.list.d/vizrt.list.erb')
+  }
+}

From 5209df3e64950a713fe53c9d8ef431e654a57ac9 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Mon, 23 Apr 2012 08:10:14 -0700
Subject: [PATCH 0683/2585] .

---
 usr/share/puppet/modules/util/manifests/templated_file.pp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/usr/share/puppet/modules/util/manifests/templated_file.pp b/usr/share/puppet/modules/util/manifests/templated_file.pp
index db1b797c..71ac0baf 100644
--- a/usr/share/puppet/modules/util/manifests/templated_file.pp
+++ b/usr/share/puppet/modules/util/manifests/templated_file.pp
@@ -1,6 +1,8 @@
 define util::templated_file($file_path = $title, $module_name) {
+	notice($file_path)
+	notice("${module_name}${title}.erb")
     file { $file_path:
         ensure => file,
-        content => template("${module_name}${file_path}.erb"),
+        content => template("${module_name}${title}.erb"),
     }
 }

From 19627ca467c44e347f4e79e9772356cd06c7860a Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Tue, 24 Apr 2012 00:07:32 -0700
Subject: [PATCH 0684/2585] removed som logging

---
 usr/share/puppet/modules/util/manifests/templated_file.pp      | 2 --
 usr/share/puppet/modules/util/manifests/templated_file_list.pp | 2 --
 2 files changed, 4 deletions(-)

diff --git a/usr/share/puppet/modules/util/manifests/templated_file.pp b/usr/share/puppet/modules/util/manifests/templated_file.pp
index 71ac0baf..cc142af6 100644
--- a/usr/share/puppet/modules/util/manifests/templated_file.pp
+++ b/usr/share/puppet/modules/util/manifests/templated_file.pp
@@ -1,6 +1,4 @@
 define util::templated_file($file_path = $title, $module_name) {
-	notice($file_path)
-	notice("${module_name}${title}.erb")
     file { $file_path:
         ensure => file,
         content => template("${module_name}${title}.erb"),
diff --git a/usr/share/puppet/modules/util/manifests/templated_file_list.pp b/usr/share/puppet/modules/util/manifests/templated_file_list.pp
index 7e74d8bc..6975266f 100644
--- a/usr/share/puppet/modules/util/manifests/templated_file_list.pp
+++ b/usr/share/puppet/modules/util/manifests/templated_file_list.pp
@@ -41,8 +41,6 @@
 define util::templated_file_list($util_module_directory = "/etc/puppet/modules/util/", $template_module_name, $module_template_directory){
 
 	$template_directory = "${module_template_directory}${title}"
-	#notice($template_directory)
-	#notify{$template_directory:}
 
 	$template_subdirectory_list = split(generate("${util_module_directory}bin/list-templates-subdirectories.sh",$template_directory) , "\n")
 	file { $template_subdirectory_list:

From 95c4adfa36c6a0233c3bddfe2142d5a1e5da339d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 24 Apr 2012 23:43:05 +0800
Subject: [PATCH 0685/2585] - adjusted the paths of create-packages, these were
 not working after   moving the package descriptors from /usr/local/src -
 moved all the package descriptors from   /usr/share/escenic/package-scripts
 to   /usr/share/escenic/package-scripts/debian

---
 .../escenic/package-scripts/create-packages   | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 290eb03a..1acd8c42 100644
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -51,10 +51,10 @@ function set_up_target_directory() {
     mkdir -p $target_dir/usr/share/doc/escenic
     mkdir -p $target_dir/usr/share/escenic/ece-scripts
     
-    cp -r ../../sbin/{ece-install,drop-and-create-ecedb} $target_dir/usr/sbin/
-    cp -r ../../share/escenic/ece-scripts/ece-install.d/ \
+    cp -r ../../../sbin/{ece-install,drop-and-create-ecedb} $target_dir/usr/sbin/
+    cp -r ../../escenic/ece-scripts/ece-install.d/ \
       $target_dir/usr/share/escenic/ece-scripts/
-    cp -r ../../share/doc/escenic/ece-install-guide.{org,html} \
+    cp -r ../../doc/escenic/ece-install-guide.{org,html} \
       $target_dir/usr/share/doc/escenic
     
   elif [[ $package_name == "escenic-content-engine-scripts" ]]; then
@@ -62,32 +62,32 @@ function set_up_target_directory() {
     mkdir -p $target_dir/usr/share/doc/escenic
     mkdir -p $target_dir/usr/share/escenic/ece-scripts
 
-    cp -r ../../bin/{ece,system-info} $target_dir/usr/bin/
+    cp -r ../../../bin/{ece,system-info} $target_dir/usr/bin/
 
-    cp -r ../../share/escenic/ece-scripts/system-info.d \
+    cp -r ../../escenic/ece-scripts/system-info.d \
       $target_dir/usr/share/escenic/ece-scripts/
     
-    cp -r ../../share/doc/escenic/{ece,system-info}-guide.{org,html} \
+    cp -r ../../doc/escenic/{ece,system-info}-guide.{org,html} \
       $target_dir/usr/share/doc/escenic
-    cp -r ../../../etc/escenic/ $target_dir/etc/
-    cp -r ../../../etc/default/ece $target_dir/etc/default/
-    cp -r ../../../etc/init.d/ece $target_dir/etc/init.d/
+    cp -r ../../../../etc/escenic/ $target_dir/etc/
+    cp -r ../../../../etc/default/ece $target_dir/etc/default/
+    cp -r ../../../../etc/init.d/ece $target_dir/etc/init.d/
     
   elif [[ $package_name == "vosa" ]]; then
     mkdir -p $target_dir/usr/share/doc/vosa
     
-    cp -r ../../bin/vosa $target_dir/usr/bin/
-    cp -r ../../share/vizrt/ $target_dir/usr/share/
-    cp -r ../../share/doc/vizrt/*.org $target_dir/usr/share/doc/vosa/
+    cp -r ../../../bin/vosa $target_dir/usr/bin/
+    cp -r ../../vizrt/ $target_dir/usr/share/
+    cp -r ../../doc/vizrt/*.org $target_dir/usr/share/doc/vosa/
   elif [[ $package_name == "escenic-common-scripts" ]]; then
     # both the installer and ece-scripts use the common scripts and
     # web resources.
     mkdir -p $target_dir/usr/share/escenic/ece-scripts
-    cp -r ../../share/escenic/ece-scripts/common* \
+    cp -r ../../escenic/ece-scripts/common* \
       $target_dir/usr/share/escenic/ece-scripts/
-    cp -r ../../share/escenic/ece-scripts/*.css \
+    cp -r ../../escenic/ece-scripts/*.css \
       $target_dir/usr/share/escenic/ece-scripts/
-    cp -r ../../share/escenic/ece-scripts/*.html \
+    cp -r ../../escenic/ece-scripts/*.html \
       $target_dir/usr/share/escenic/ece-scripts/
   fi
 

From acc48736fcffa28297dda429ebc3e5d9ae080307 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 24 Apr 2012 23:44:52 +0800
Subject: [PATCH 0686/2585] - moved the package descriptors from  
 /usr/share/escenic/package-scripts to
 /usr/share/escenic/package-scripts/debian

---
 .../package-scripts/{ => debian}/escenic-common-scripts/control   | 0
 .../package-scripts/{ => debian}/escenic-common-scripts/postinst  | 0
 .../{ => debian}/escenic-content-engine-installer/control         | 0
 .../{ => debian}/escenic-content-engine-installer/postinst        | 0
 .../{ => debian}/escenic-content-engine-scripts/control           | 0
 .../{ => debian}/escenic-content-engine-scripts/postinst          | 0
 6 files changed, 0 insertions(+), 0 deletions(-)
 rename usr/share/escenic/package-scripts/{ => debian}/escenic-common-scripts/control (100%)
 rename usr/share/escenic/package-scripts/{ => debian}/escenic-common-scripts/postinst (100%)
 rename usr/share/escenic/package-scripts/{ => debian}/escenic-content-engine-installer/control (100%)
 rename usr/share/escenic/package-scripts/{ => debian}/escenic-content-engine-installer/postinst (100%)
 rename usr/share/escenic/package-scripts/{ => debian}/escenic-content-engine-scripts/control (100%)
 rename usr/share/escenic/package-scripts/{ => debian}/escenic-content-engine-scripts/postinst (100%)

diff --git a/usr/share/escenic/package-scripts/escenic-common-scripts/control b/usr/share/escenic/package-scripts/debian/escenic-common-scripts/control
similarity index 100%
rename from usr/share/escenic/package-scripts/escenic-common-scripts/control
rename to usr/share/escenic/package-scripts/debian/escenic-common-scripts/control
diff --git a/usr/share/escenic/package-scripts/escenic-common-scripts/postinst b/usr/share/escenic/package-scripts/debian/escenic-common-scripts/postinst
similarity index 100%
rename from usr/share/escenic/package-scripts/escenic-common-scripts/postinst
rename to usr/share/escenic/package-scripts/debian/escenic-common-scripts/postinst
diff --git a/usr/share/escenic/package-scripts/escenic-content-engine-installer/control b/usr/share/escenic/package-scripts/debian/escenic-content-engine-installer/control
similarity index 100%
rename from usr/share/escenic/package-scripts/escenic-content-engine-installer/control
rename to usr/share/escenic/package-scripts/debian/escenic-content-engine-installer/control
diff --git a/usr/share/escenic/package-scripts/escenic-content-engine-installer/postinst b/usr/share/escenic/package-scripts/debian/escenic-content-engine-installer/postinst
similarity index 100%
rename from usr/share/escenic/package-scripts/escenic-content-engine-installer/postinst
rename to usr/share/escenic/package-scripts/debian/escenic-content-engine-installer/postinst
diff --git a/usr/share/escenic/package-scripts/escenic-content-engine-scripts/control b/usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/control
similarity index 100%
rename from usr/share/escenic/package-scripts/escenic-content-engine-scripts/control
rename to usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/control
diff --git a/usr/share/escenic/package-scripts/escenic-content-engine-scripts/postinst b/usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/postinst
similarity index 100%
rename from usr/share/escenic/package-scripts/escenic-content-engine-scripts/postinst
rename to usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/postinst

From 02f6bcde822cc8c37ce7a3245f20aa633263dc98 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 24 Apr 2012 23:46:50 +0800
Subject: [PATCH 0687/2585] - moved the vosa package descriptors to the debian
 directory with the   others.

---
 usr/share/escenic/package-scripts/{ => debian}/vosa/control | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename usr/share/escenic/package-scripts/{ => debian}/vosa/control (100%)

diff --git a/usr/share/escenic/package-scripts/vosa/control b/usr/share/escenic/package-scripts/debian/vosa/control
similarity index 100%
rename from usr/share/escenic/package-scripts/vosa/control
rename to usr/share/escenic/package-scripts/debian/vosa/control

From d06a5d1a6fb17a5b16bb03ad2915e911b22a738c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 25 Apr 2012 12:55:09 +0200
Subject: [PATCH 0688/2585] - the uec/cloud software now doesn't handle the
 /etc/hosts. We need to   set this to manual as we want to control its
 contents. Without this,   we have problems managing the virtual clients (with
 puppet).

---
 usr/share/vizrt/vosa/commands/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/vizrt/vosa/commands/install.sh b/usr/share/vizrt/vosa/commands/install.sh
index 6e96e475..894443fe 100755
--- a/usr/share/vizrt/vosa/commands/install.sh
+++ b/usr/share/vizrt/vosa/commands/install.sh
@@ -143,7 +143,7 @@ function create_overlay() {
   else 
     cat >> ${tempdir}/overlay/updates/var/lib/cloud/data/cache/nocloud/user-data <<EOF
 #cloud-config
-manage_etc_hosts: true
+manage_etc_hosts: false
 timezone: ${install_config_timezone}
 apt_update: true
 apt_upgrade: false

From 5b7778ee6f73d05d9e5137a7408b5add3b962fc2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 25 Apr 2012 14:34:03 +0200
Subject: [PATCH 0689/2585] - added support for adding packages to different
 suites, default suite   is "stable".

- usage:
  sign-and-add-packages-to-apt-repo <package-dir> [stable|unstable]
---
 .../package-scripts/sign-and-add-packages-to-apt-repo  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/package-scripts/sign-and-add-packages-to-apt-repo b/usr/share/escenic/package-scripts/sign-and-add-packages-to-apt-repo
index dce3fc80..5088aae2 100644
--- a/usr/share/escenic/package-scripts/sign-and-add-packages-to-apt-repo
+++ b/usr/share/escenic/package-scripts/sign-and-add-packages-to-apt-repo
@@ -1,6 +1,10 @@
-#! /usr/bin/env bash                                                                                            
+#! /usr/bin/env bash
 
 dir=$1
+
+# suite is either stable or unstable (testing hasn't been added yet),
+# default is stable.
+suite=${2-stable}
 log=/tmp/$(basename $0).log
 apt_repo_dir=/var/www/apt
 gpg_key=AD747D97
@@ -21,7 +25,7 @@ function get_package_name() {
 for el in $dir/*.deb; do
   echo "Signing and adding $(basename $el) to the APT repository ... "
   dpkg-sig --sign builder -k $gpg_key $el
-  reprepro -Vb $apt_repo_dir remove stable $(get_package_name $el)
+  reprepro -Vb $apt_repo_dir remove $suite $(get_package_name $el)
 
   if [[ $(basename $(dirname $el)) == "non-free" ]]; then
       component=non-free
@@ -29,5 +33,5 @@ for el in $dir/*.deb; do
       component=main
   fi
   
-  reprepro --ask-passphrase -Vb $apt_repo_dir -C $component includedeb stable $el
+  reprepro --ask-passphrase -Vb $apt_repo_dir -C $component includedeb $suite $el
 done

From 1ae2b0ada38a6927860014b55135765910db55bb Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 25 Apr 2012 22:37:38 +0800
Subject: [PATCH 0690/2585] - escenic::engine now sets up an
 ece-install-<type>.conf capable of   doing an EAR/conf archive based
 installation.

---
 .../modules/escenic/manifests/engine.pp       | 55 ++++++++++---------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/usr/share/puppet/modules/escenic/manifests/engine.pp b/usr/share/puppet/modules/escenic/manifests/engine.pp
index 9241fcf7..7a95c77a 100644
--- a/usr/share/puppet/modules/escenic/manifests/engine.pp
+++ b/usr/share/puppet/modules/escenic/manifests/engine.pp
@@ -1,35 +1,36 @@
-$default_engine_type = "pres"
-$default_pres_search_host = "search-pres"
-$default_edit_search_host = "edit-pres"
-
 define escenic::engine(
   $type = $default_engine_type,
-  $search_host = "")
+  $search_host = "localhost",
+  $conf_archive_uri)
 {
-  if ($search_host == "") {
-    if ($type == "editor") {
-      $real_search_host = $default_edit_search_host
-     }
-     else {
-       if ($type == "presentation") {
-         $real_search_host = $default_pres_search_host
-       }
-       else {
-         fail("You specified an invalid type=$type")
-       }
-     }  
-  }   
-  else {
-    $real_search_host = $search_host
-  }
-   
-  $common_content="                                                                                                     fai_enabled=1                                                                                                         fai_${type}_install=1                                                                                                 fai_${type}_search_host=${real_search_host}                                                                           fai_${type}_db_host=$db_host                                                                                            "
-  $editor_content="                                                                                                     # editor specific                                                                                                                "
-   
+  $common_content="
+technet_user=$technet_user
+technet_password=$technet_password
+
+fai_${type}_conf_archive=$conf_archive_uri
+fai_${type}_ear=$ear_uri
+fai_${type}_install=1
+fai_${type}_search_host=${search_host}
+fai_db_host=$db_host
+fai_db_password=$db_password
+fai_db_schema=$db_schema
+fai_db_user=$db_user
+fai_enabled=1
+fai_keep_off_etc_hosts=1
+fai_monitoring_server_ip=$monitoring_server_ip
+"
+  $editor_content="
+# editor specific
+"
+  $presentation_content="
+# presentation specific
+"
+
   file { "/root/ece-install-$name.conf":
     content =>  $type ? {
       editor => "$common_content $editor_content",
-      default => "# you specific a non existant profile: $type"
+      presentation => "$common_content $presentation_content",
+      default => "# you specific a non existant profile: $type",
     }
-  }  
+  }
 }

From a6689a8a1df8ed3f38e11c7dd28f8a56cbf38cb5 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 25 Apr 2012 22:40:16 +0800
Subject: [PATCH 0691/2585] - added APT configuration for adding a second pool
 for unstable   packages.

---
 .../puppet/modules/vosa/manifests/apt_repo.pp      | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/usr/share/puppet/modules/vosa/manifests/apt_repo.pp b/usr/share/puppet/modules/vosa/manifests/apt_repo.pp
index ae3e62c3..b6529212 100644
--- a/usr/share/puppet/modules/vosa/manifests/apt_repo.pp
+++ b/usr/share/puppet/modules/vosa/manifests/apt_repo.pp
@@ -21,11 +21,21 @@
   ensure=> file,
   content=> "
 Origin: Vizrt Online
-Label: Vizrt Online APT repository
+Label: Vizrt SaaS customer APT repository
+Suite: stable
 Codename: squeeze
 Architectures: i386 amd64 source
 Components: main non-free
-Description: Private APT repository for SAAS customer of Vizrt
+Description: Vizrt SaaS customer APT repository
+SignWith: yes
+
+Origin: Vizrt Online
+Label: Vizrt SaaS customer APT repository
+Suite: unstable
+Codename: sid
+Architectures: i386 amd64 source
+Components: main non-free
+Description: Vizrt SaaS customer APT repository
 SignWith: yes
 ",
 }

From 1880a5d05f9c6585116f06db8a902f5cff5cf626 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 25 Apr 2012 22:50:05 +0800
Subject: [PATCH 0692/2585] - added the markup of the index.html on
 apt.vizrt.com

---
 .../escenic/package-scripts/html/index.html   | 105 ++++++++++++++++++
 1 file changed, 105 insertions(+)
 create mode 100644 usr/share/escenic/package-scripts/html/index.html

diff --git a/usr/share/escenic/package-scripts/html/index.html b/usr/share/escenic/package-scripts/html/index.html
new file mode 100644
index 00000000..a2ff9689
--- /dev/null
+++ b/usr/share/escenic/package-scripts/html/index.html
@@ -0,0 +1,105 @@
+<!DOCTYPE html PUBLIC
+"-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
+>
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>Welcome to the Vizrt APT repository</title>
+    <style type="text/css">
+      h1, a { color: orange; }
+      a:decoration { none; }
+      body {
+        margin-top: 3%;
+        margin-left: 10%;
+        margin-right: 10%;
+      }
+      pre {
+        border: thin solid black;
+        padding: 1em;
+      }
+    </style>
+  </head>
+  <body>
+    <svg
+        id="vizrt-logo"
+        version="1.1"
+        width="138"
+        height="84"
+        > 
+      <g
+          id="g12"
+          transform="matrix(1.25,0,0,-1.25,-451.34003,425.24315)"> 
+        <g
+            id="g14"
+            transform="matrix(0.0246257,0,0,0.02458666,313.76213,231.21317)"> 
+          <path
+              d="m 3060.56,3437.2 -209.9,-593.4 -207.05,593.4 -215.82,0 326.08,-866.38 184.92,0 332.24,866.38 -210.47,0"
+              style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
+              id="path16"/> 
+          <path
+              d="m 3473.3,2569.82 193.547,0 0,866.531 -193.547,0 0,-866.531 z"
+              style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
+              id="path18"/> 
+          <path
+              d="m 3916.16,3436.36 -0.14,-177.24 364.23,0 -372.91,-554.74 0,-133.56 616.08,0 0,175.25 -374.66,0 366.68,550.78 0,139.51 -599.28,0"
+              style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
+              id="path20"/> 
+          <path
+              d="m 4961.8,3436.66 c -56.15,0 -99.9,-9.02 -144.01,-53.04 -42.13,-42.13 -63.55,-93.63 -63.55,-153.7 l 0,-658.85 193.26,0 0,629.18 c 0,16.39 5.76,30.04 17.53,41.82 9.79,9.87 32.16,17.44 52.18,17.44 l 161.49,0 0,177.15 -216.9,0"
+              style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
+              id="path22"/> 
+          <path
+              d="m 5367.91,3699.54 0,-915.91 c 0,-58.68 20.75,-109.43 62.13,-150.8 43.31,-43.47 85.57,-62.01 141.03,-62.01 l 212.69,0 0,174.7 -158.78,0 c -15.96,0 -28.96,5.5 -40.72,16.87 -11.19,11.53 -16.76,24.5 -16.76,40.65 l 0,456.42 216.26,0 0,176.39 -216.26,0 0,263.69 -199.59,0"
+              style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
+              id="path24"/> 
+          <path
+              d="m 1921.16,3066.86 c -0.39,-514.15 173.24,-988.49 465.56,-1367.51 l 69.26,204.63 c -205.49,300.61 -333.44,658.06 -355.3,1043.68 l -179.52,119.2"
+              style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
+              id="path26"/> 
+          <path
+              d="m 6404.28,3065.28 c 0.49,513.97 -173.17,988.55 -465.37,1367.26 l -69.46,-204.34 c 205.52,-300.7 333.61,-658.34 355.24,-1043.68 l 179.59,-119.24"
+              style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
+              id="path28"/> 
+          
+        </g> 
+      </g> 
+    </svg>    
+    <h1>Welcome to the Vizrt APT repository</h1>
+    <p>
+      To use this repository, do:
+    </p>
+    <pre># curl -s http://apt.vizrt.com/archive.key | apt-key add -
+# echo "deb http://apt.vizrt.com stable main" > /etc/apt/sources.list.d/vizrt.list
+# apt-get update</pre>
+    <p>
+      You can now install any packages from this repository with
+      <code>apt-get</code>, e.g.:
+    </p>
+    <pre># apt-get install escenic-content-engine-installer</pre>
+    <p>
+      to install <code>ece-install</code>, or:
+    </p>
+    <pre># apt-get install escenic-content-engine-installer</pre>
+    <p>
+      to install the <code>vosa</code> scripts for managing KVM
+      images.
+    </p>
+    <p>
+      There is also an <code>unstable</code> pool of packages in case
+      you want to live on the bleeding edge. These packages are
+      updated daily so beware. To live on the bleeding edge, replace
+      <code> stable </code> with <code> unstable </code> in
+      <code>/etc/apt/sources.list.d/vizrt.list</code>
+    </p>
+    <p>
+      If you find any issues with these packages, please report this on github:
+      <a href="https://github.com/escenic/ece-scripts/issues">
+        https://github.com/escenic/ece-scripts/issues
+      </a>
+    </p>
+    <p>
+      Enjoy!
+    </p>
+    <p>-<em>Vizrt Online</em></p>
+  </body>
+</html>

From afe2b41c1840d7183ed2cd0d0e2ef36076c621e9 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 26 Apr 2012 12:57:17 +0200
Subject: [PATCH 0693/2585] - added message to the postinst script of the vosa
 and   escenic-content-engine-installer packages that this software is  
 currently unsupported and all issues should be reported on github.

---
 .../escenic-content-engine-installer/postinst   | 10 ++++++++++
 .../package-scripts/debian/vosa/postinst        | 17 +++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 usr/share/escenic/package-scripts/debian/vosa/postinst

diff --git a/usr/share/escenic/package-scripts/debian/escenic-content-engine-installer/postinst b/usr/share/escenic/package-scripts/debian/escenic-content-engine-installer/postinst
index 9f4c9f1c..01808e8f 100755
--- a/usr/share/escenic/package-scripts/debian/escenic-content-engine-installer/postinst
+++ b/usr/share/escenic/package-scripts/debian/escenic-content-engine-installer/postinst
@@ -3,5 +3,15 @@
 
 chmod +x /usr/sbin/ece-install
 
+cat <<EOF
+Thank you for installing ece-install. This is currently un-supported
+software as it's undergoing heavy development. Report any issues to
+https://github.com/escenic/ece-scripts/issues
+
+Have fun!
+
+-Vizrt Online 
+EOF
+
 exit 0
 
diff --git a/usr/share/escenic/package-scripts/debian/vosa/postinst b/usr/share/escenic/package-scripts/debian/vosa/postinst
new file mode 100644
index 00000000..6cca8d6c
--- /dev/null
+++ b/usr/share/escenic/package-scripts/debian/vosa/postinst
@@ -0,0 +1,17 @@
+#! /usr/bin/env bash
+# set -e
+
+chmod +x /usr/bin/vosa
+
+cat <<EOF
+Thank you for installing the vosa package. This is currently
+un-supported software as it's undergoing heavy development. Report any
+issues to https://github.com/escenic/ece-scripts/issues
+
+Have fun!
+
+-Vizrt Online 
+EOF
+
+exit 0
+

From 3e50262d1d74eed74adfba464df97887fa0a9401 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 27 Apr 2012 15:45:55 +0200
Subject: [PATCH 0694/2585] - added support for creating (escenic) user on
 RedHat (with   useradd). Funnily enough, this wasn't failing on CentOS, they
 must   have adduser pointing to  the real adduser and not useradd that  
 RedHat has. Note to self: RedHat _is_ different from CentOS.

  This fix closes #57
---
 usr/share/escenic/ece-scripts/common-os.sh | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index b8e6fe32..a0c0685a 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -61,10 +61,18 @@ function create_user_and_group_if_not_present() {
   
   if [ $(grep $user /etc/passwd | wc -l) -lt 1 ]; then
     print_and_log "Creating UNIX user $user ..."
-        # TODO add support for useradd
-    run adduser $user \
-      --disabled-password \
-      --gecos "Escenic-user,Room,Work,Home,Other"
+
+    if [ $on_debian_or_derivative -eq 1 ]; then
+      run adduser $user \
+        --disabled-password \
+        --gecos "Escenic-user,Room,Work,Home,Other"
+    fi
+    
+    if [ $on_redhat_or_derivative -eq 1 ]; then
+      run useradd $user \
+        --comment "Escenic-user,Room,Work,Home,Other"
+    fi
+    
     add_next_step "I created a new UNIX user called $user"
     add_next_step "and you must set a password using: passwd $user"
   fi

From c6b45beafcfbc16bdcfe06a7456e200f8261712c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 27 Apr 2012 15:58:15 +0200
Subject: [PATCH 0695/2585] - ece-install no longer fails on RedHat because it
 uses the wrong path   to my.cnf. This closes #59

---
 usr/share/escenic/ece-scripts/ece-install.d/database.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index c30c1286..29b73473 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -257,6 +257,9 @@ function configure_mysql_for_replication() {
   print_and_log "Configuring DB for replication ..."
   
   local file=/etc/mysql/my.cnf
+  if [ $on_redhat_or_derivative -eq 1 ]; then
+    file=/etc/my.cnf
+  fi
 
   # On old versions of MySQL/Percona, this file isn't there by
   # default, although it's read from /etc/init.d/mysql

From 6387f785994e7f00ebd2c817afb3e73321e6ab08 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 27 Apr 2012 16:02:04 +0200
Subject: [PATCH 0696/2585] - slight change in the test of the my.cnf variables
 to set up the   master DB (for replication). The changes should make this
 (more)   compatible with RedHat.

---
 usr/share/escenic/ece-scripts/ece-install.d/database.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 29b73473..a7d6e3ce 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -271,8 +271,8 @@ EOF
 
   # replication log configuration of the master
   if [ $db_master -eq 1 ]; then
-    local old="#server-id.*= 1"
-    local new="server-id = 1"
+    local old="#server-id.*=.*1"
+    local new="server-id=1"
     
     if [ $(grep ^"$old" $file | wc -l) -gt 0 ]; then
       sed -i "s~^$old~$new~g" $file

From 1c09f2e92b01ab32e3836a694c3b4764138e7528 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 27 Apr 2012 16:05:15 +0200
Subject: [PATCH 0697/2585] - don't install thttpd (for the self reporting) on
 RedHat as it's not   available in the standard YUM repository (tested on
 RedHat 6.2).

---
 usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index db899b93..1ccc6361 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -386,6 +386,11 @@ EOF
 ## Installs and sets up self-reporting of the current host
 function install_system_info() {
   print_and_log "Setting up self-reporting module on $HOSTNAME ..."
+
+  # we don't support RedHat right now
+  if [ $on_redhat_or_derivative -eq 1 ]; then
+    return
+  fi
   
   install_packages_if_missing thttpd
   assert_pre_requisite thttpd

From 01b512b8a2b3bbcdfe8346ca6992bb1ba1374aa7 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Fri, 27 Apr 2012 16:13:46 +0200
Subject: [PATCH 0698/2585] Added proxy support

---
 usr/bin/vosa                                        | 3 ++-
 usr/share/vizrt/vosa/commands/install.sh            | 1 +
 usr/share/vizrt/vosa/commands/install_config_parser | 5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 7214f8f3..6f3c826c 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -130,8 +130,9 @@ ip_address 172.24.201.202
 netmask 255.255.0.0
 gateway 172.24.1.1
 
-# address of mirror to use (defaults to mirror://mirrors.ubuntu.com/mirrors.txt)
+# address of mirror and/or proxy to use (defaults to mirror://mirrors.ubuntu.com/mirrors.txt)
 # mirror http://no.archive.ubuntu.com/
+# proxy http://my-local-proxy:3142/
 user_data /etc/vizrt/vosa/user-data/puppet-client.txt
 
 # Host name give to the machine. defaults to the name of the vm instance
diff --git a/usr/share/vizrt/vosa/commands/install.sh b/usr/share/vizrt/vosa/commands/install.sh
index 894443fe..0017ccef 100755
--- a/usr/share/vizrt/vosa/commands/install.sh
+++ b/usr/share/vizrt/vosa/commands/install.sh
@@ -148,6 +148,7 @@ timezone: ${install_config_timezone}
 apt_update: true
 apt_upgrade: false
 apt_mirror: ${install_config_mirror}
+apt_proxy: ${install_config_proxy}
 EOF
   fi
 
diff --git a/usr/share/vizrt/vosa/commands/install_config_parser b/usr/share/vizrt/vosa/commands/install_config_parser
index d2794de3..cbf4597a 100644
--- a/usr/share/vizrt/vosa/commands/install_config_parser
+++ b/usr/share/vizrt/vosa/commands/install_config_parser
@@ -11,6 +11,7 @@ install_config_gateway=
 install_config_timezone=
 install_config_user_data=
 install_config_mirror=mirror://mirrors.ubuntu.com/mirrors.txt
+install_config_proxy=
 
 
 function install_config_ip_address() {
@@ -53,6 +54,10 @@ function install_config_mirror() {
   install_config_mirror=$1
 }
 
+function install_config_proxy() {
+  install_config_proxy=$1
+}
+
 # Handle arrays
 
 declare -a install_config_ssh_keys

From ffdfcde67ea00cb5d42b1e88f2440ff7dbc9020d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 27 Apr 2012 16:14:34 +0200
Subject: [PATCH 0699/2585] - moved not installing system info :5678 on RedHat,
 so not printing it   either :)

---
 usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index 1ccc6361..1e1238d4 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -385,13 +385,13 @@ EOF
 
 ## Installs and sets up self-reporting of the current host
 function install_system_info() {
-  print_and_log "Setting up self-reporting module on $HOSTNAME ..."
-
   # we don't support RedHat right now
   if [ $on_redhat_or_derivative -eq 1 ]; then
     return
   fi
   
+  print_and_log "Setting up self-reporting module on $HOSTNAME ..."
+  
   install_packages_if_missing thttpd
   assert_pre_requisite thttpd
 

From 3c16d3bbe7668c62144ded2a91373ba55f36f7ab Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 27 Apr 2012 16:58:18 +0200
Subject: [PATCH 0700/2585] - added support for installing the NFS server on
 RedHat

---
 .../ece-scripts/ece-install.d/network-file-system.sh      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh b/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
index aa621ff4..c35f8330 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
@@ -19,7 +19,13 @@ function get_nfs_configuration() {
 
 function install_nfs_server() {
   print_and_log "Installing an NFS server on $HOSTNAME ..."
-  install_packages_if_missing "portmap nfs-kernel-server nfs-common"
+  local packages="portmap nfs-kernel-server nfs-common"
+  
+  if [ $on_redhat_or_derivative -eq 1 ]; then
+    packages="nfs-utils"
+  fi
+  
+  install_packages_if_missing "$packages"
   get_nfs_configuration
 
   local i=1

From acfb798be7b0cc75e148d3613fab404d87e8e762 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 27 Apr 2012 17:09:37 +0200
Subject: [PATCH 0701/2585] - started to add support for RedHat for installing
 an NFS server. This   is related to #60

---
 .../ece-install.d/network-file-system.sh          | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh b/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
index c35f8330..538e87bd 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
@@ -19,10 +19,10 @@ function get_nfs_configuration() {
 
 function install_nfs_server() {
   print_and_log "Installing an NFS server on $HOSTNAME ..."
-  local packages="portmap nfs-kernel-server nfs-common"
   
+  local packages="portmap nfs-kernel-server nfs-common"
   if [ $on_redhat_or_derivative -eq 1 ]; then
-    packages="nfs-utils"
+    packages="portmap nfs-utils"
   fi
   
   install_packages_if_missing "$packages"
@@ -48,10 +48,15 @@ EOF
 
   # nfs-kernel-server complains on Ubuntu if this directory doesn't exist
   make_dir /etc/exports.d
-  
-  run /etc/init.d/portmap restart
-  run /etc/init.d/nfs-kernel-server restart
 
+  if [ $on_debian_or_derivative -eq 1 ]; then
+    run /etc/init.d/portmap restart
+    run /etc/init.d/nfs-kernel-server restart
+  elif [ $on_redhat_or_derivative -eq 1 ]; then
+    service rpcbind start
+    service nfs start
+  fi
+  
   add_next_step "An NFS server has been installed on ${HOSTNAME},"
   add_next_step "NFS exports: $nfs_export_list"
 }

From 7065e5569aaf8fdee465d1428f20ef8228db6132 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 27 Apr 2012 17:26:38 +0200
Subject: [PATCH 0702/2585] - added on_redhat variable to differentiate between
 CentOS and RedHat   proper.

---
 usr/sbin/ece-install | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 3095b9bd..fb994576 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -66,6 +66,7 @@ appserver_port=8080
 on_debian_or_derivative=0
 on_redhat_or_derivative=0
 on_debian=0
+on_redhat=0
 on_ubuntu=0
 force_packages=0
 
@@ -641,6 +642,10 @@ function common_pre_install()
     if [ -e /etc/redhat-release ]; then
       on_redhat_or_derivative=1
       install_packages_if_missing "redhat-lsb"
+
+      if [ $(lsb_release -i | grep RedHat | wc -l) -gt 0 ]; then
+        on_redhat=1
+      fi
     fi
 
     assert_pre_requisite lsb_release

From 8d0af69cdbdc7fd509ebb347221caf403cb8c1fb Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 27 Apr 2012 17:27:23 +0200
Subject: [PATCH 0703/2585] - changes to the startup of the init.d services to
 make the NFS   installation work on RedHat

---
 .../escenic/ece-scripts/ece-install.d/network-file-system.sh  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh b/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
index 538e87bd..c893b903 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
@@ -53,8 +53,8 @@ EOF
     run /etc/init.d/portmap restart
     run /etc/init.d/nfs-kernel-server restart
   elif [ $on_redhat_or_derivative -eq 1 ]; then
-    service rpcbind start
-    service nfs start
+    run service rpcbind start
+    run service nfs start
   fi
   
   add_next_step "An NFS server has been installed on ${HOSTNAME},"

From b70957e328e0a5fd72ae9ca3d08de0d7fc4f184f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 27 Apr 2012 17:43:55 +0200
Subject: [PATCH 0704/2585] - fix in "ece versions" :: added a time out of 30
 seconds so that it   will not hang 900 seconds which is the default for wget.

  The use case is typically if ECE fails to deliver the /escenic-admin
  pages (which 'ece versions' uses) because of e.g. a missing DB.
---
 usr/bin/ece | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 7ec5ab0f..fe8399e4 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -1370,7 +1370,7 @@ function list_versions()
     url=$(get_escenic_admin_url)/$version_manager
         
     print "Installed on the ${instance} instance running on port ${port}:"
-    wget $wget_auth -O - $url  2>/dev/null | \
+    wget --timeout 30 $wget_auth -O - $url  2>/dev/null | \
         grep "\[\[" | \
         sed 's/\[//g' | \
         sed 's/\]//g' | \

From a38abf2e7b1c0fce6d8d66b3a4e3dd43ae8850d8 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Mon, 30 Apr 2012 09:35:35 +0200
Subject: [PATCH 0705/2585] Removed some verboseness for rpm based
 system-infos! sorted the list

---
 usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
index bd30e419..5465d184 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
@@ -14,7 +14,7 @@ print_h3_header "Installed packages"
 if [ $(which dpkg)x != "x" ]; then
   print_pre_text "$(dpkg -l 2>/dev/null)"
 elif [ $(which rpm)x != "x" ]; then
-  print_pre_text "$(rpm -qla 2>/dev/null)"
+  print_pre_text "$(rpm -qa | sort 2>/dev/null)"
 fi
 
 # of the h2

From d6d89682e3d48c600b4f216bf2375b8d2592f7f3 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Mon, 30 Apr 2012 09:41:29 +0200
Subject: [PATCH 0706/2585] Moved startup of puppet to separate file, to allow
 further customization before starting puppet (like installing ECE).

---
 usr/share/vizrt/vosa/post-install-hooks/start-puppet.sh | 4 ++++
 usr/share/vizrt/vosa/puppet/client-postinst-script.tmpl | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100755 usr/share/vizrt/vosa/post-install-hooks/start-puppet.sh

diff --git a/usr/share/vizrt/vosa/post-install-hooks/start-puppet.sh b/usr/share/vizrt/vosa/post-install-hooks/start-puppet.sh
new file mode 100755
index 00000000..97a81ff0
--- /dev/null
+++ b/usr/share/vizrt/vosa/post-install-hooks/start-puppet.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+ssh -F $2/ssh.conf root@guest /etc/init.d/puppet start || exit 2
+
diff --git a/usr/share/vizrt/vosa/puppet/client-postinst-script.tmpl b/usr/share/vizrt/vosa/puppet/client-postinst-script.tmpl
index 21edc359..06f1ef61 100644
--- a/usr/share/vizrt/vosa/puppet/client-postinst-script.tmpl
+++ b/usr/share/vizrt/vosa/puppet/client-postinst-script.tmpl
@@ -65,7 +65,3 @@ ssh -F $2/ssh.conf root@guest rm -f /usr/sbin/policy-rc.d || exit 2
 # Make it possible to start puppet
 ssh -F $2/ssh.conf root@guest perl -pi -e 's/^START=.*/START=yes/' /etc/default/puppet || exit 2
 
-# Finally start puppet!!!
-ssh -F $2/ssh.conf root@guest /etc/init.d/puppet start || exit 2
-
-

From 8e912b4cde4a4d40c12e589885e8b2c3c95f27fc Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 30 Apr 2012 11:04:42 +0200
Subject: [PATCH 0707/2585] - not running the nagios-nrpe-server restart within
 the run() wrapper   as it often fails because of a bug in the Nagios DEB
 package.

---
 usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index 1e1238d4..2bf6c062 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -133,7 +133,7 @@ function install_nagios_node()
   # bug in nagios-nrpe-server, restart fails (sometimes) if the PID
   # isn't there (!)
   run touch /var/run/nagios/nrpe.pid
-  run /etc/init.d/nagios-nrpe-server restart
+  /etc/init.d/nagios-nrpe-server restart 1>>$log 2>>$log
   
   add_next_step "A Nagios NRPE node has been installed on ${HOSTNAME}"
 }

From 1cb785a7b851ab387b631d02010c9f8f6b2df075 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 30 Apr 2012 11:08:52 +0200
Subject: [PATCH 0708/2585] - moved system-info from escenic-engine-scripts to 
  escenic-common-scripts, this to 1) make it clear that it's of value   to
 non-ECE hosts too and 2) circumvent a bug/feature in RPM where it   has
 problems installing because of /etc/init.d/ece contains   /etc/init.d

---
 .../escenic/package-scripts/create-packages    | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 1acd8c42..91553f32 100644
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -62,12 +62,9 @@ function set_up_target_directory() {
     mkdir -p $target_dir/usr/share/doc/escenic
     mkdir -p $target_dir/usr/share/escenic/ece-scripts
 
-    cp -r ../../../bin/{ece,system-info} $target_dir/usr/bin/
+    cp -r ../../../bin/ece $target_dir/usr/bin/
 
-    cp -r ../../escenic/ece-scripts/system-info.d \
-      $target_dir/usr/share/escenic/ece-scripts/
-    
-    cp -r ../../doc/escenic/{ece,system-info}-guide.{org,html} \
+    cp -r ../../doc/escenic/system-info-guide.{org,html} \
       $target_dir/usr/share/doc/escenic
     cp -r ../../../../etc/escenic/ $target_dir/etc/
     cp -r ../../../../etc/default/ece $target_dir/etc/default/
@@ -80,6 +77,17 @@ function set_up_target_directory() {
     cp -r ../../vizrt/ $target_dir/usr/share/
     cp -r ../../doc/vizrt/*.org $target_dir/usr/share/doc/vosa/
   elif [[ $package_name == "escenic-common-scripts" ]]; then
+    mkdir -p $target_dir/usr/share/doc/escenic
+    mkdir -p $target_dir/usr/share/escenic/ece-scripts
+    
+    # system-info is useful for all packages, hence goes to
+    # escenic-common-scripts.
+    cp -r ../../../bin/system-info $target_dir/usr/bin/
+    cp -r ../../escenic/ece-scripts/system-info.d \
+      $target_dir/usr/share/escenic/ece-scripts/
+    cp -r ../../doc/escenic/system-info-guide.{org,html} \
+      $target_dir/usr/share/doc/escenic
+    
     # both the installer and ece-scripts use the common scripts and
     # web resources.
     mkdir -p $target_dir/usr/share/escenic/ece-scripts

From 1751a784e2b7ec6490c9ac01a04a1c913f54607f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 30 Apr 2012 11:20:54 +0200
Subject: [PATCH 0709/2585] - only list java information if java is found in
 path.

---
 .../escenic/ece-scripts/system-info.d/44-java-info.sh  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/44-java-info.sh b/usr/share/escenic/ece-scripts/system-info.d/44-java-info.sh
index fd51fd91..27fb0087 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/44-java-info.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/44-java-info.sh
@@ -1,8 +1,8 @@
 #! /usr/bin/env bash
 
-# by tkj@vizrt.com
-
-print_h2_header "Java information"
-print_pre_text $(java -version 2>&1)
-print_section_end
+if [ $(which java 2>/dev/null | wc -l) -gt 0 ]; then
+  print_h2_header "Java information"
+  print_pre_text $(java -version 2>&1)
+  print_section_end
+fi
 

From 38d6ac7ad8c1cba050ffeb29045d5d2ee6dd1a81 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 30 Apr 2012 11:35:41 +0200
Subject: [PATCH 0710/2585] - added simple module for KVM reporting

---
 .../ece-scripts/system-info.d/77-list-kvm-info.sh    | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 usr/share/escenic/ece-scripts/system-info.d/77-list-kvm-info.sh

diff --git a/usr/share/escenic/ece-scripts/system-info.d/77-list-kvm-info.sh b/usr/share/escenic/ece-scripts/system-info.d/77-list-kvm-info.sh
new file mode 100644
index 00000000..90e6e003
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/system-info.d/77-list-kvm-info.sh
@@ -0,0 +1,12 @@
+#! /usr/bin/env bash
+
+if [ $(ps -u root | grep kvm | grep -v kvm-irqfd-clean | wc -l) -gt 0 ]; then
+  i=1
+  ps auxww | grep kvm | grep .img | sed "s/^root.*kvm/kvm/" | while read line; do
+    print_h3_header "KVM image #${i} on $HOSTNAME"
+    print_pre_text "$line"
+    i=$(( $i + 1 ))
+  done
+fi
+
+

From e45dc4e62ee0ffaff2e0533fa8cd8cc7c305c9d8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 30 Apr 2012 11:36:09 +0200
Subject: [PATCH 0711/2585] - added h2 overview header for KVM guests

---
 usr/share/escenic/ece-scripts/system-info.d/77-list-kvm-info.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/77-list-kvm-info.sh b/usr/share/escenic/ece-scripts/system-info.d/77-list-kvm-info.sh
index 90e6e003..36d1b4a3 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/77-list-kvm-info.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/77-list-kvm-info.sh
@@ -2,6 +2,7 @@
 
 if [ $(ps -u root | grep kvm | grep -v kvm-irqfd-clean | wc -l) -gt 0 ]; then
   i=1
+  print_h2_header "KVM guests on $HOSTNAME"
   ps auxww | grep kvm | grep .img | sed "s/^root.*kvm/kvm/" | while read line; do
     print_h3_header "KVM image #${i} on $HOSTNAME"
     print_pre_text "$line"

From 7029e7319064188b40d2d1068a582077646da2d9 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 30 Apr 2012 12:30:33 +0200
Subject: [PATCH 0712/2585] - ensure_variable_is_set now also prints negatives
 to the log file

---
 usr/share/escenic/ece-scripts/common-bashing.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index 3c1669bc..902f0524 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -205,7 +205,7 @@ function ensure_variable_is_set() {
       continue
     fi
     
-    print "You need to specifiy '$el' in your $conf_file"
+    print_and_log "You need to specifiy '$el' in your $conf_file"
     requirements_failed=1
   done
   

From c4286f5ea6c8f49c502c34f3083afac2fd542640 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 30 Apr 2012 12:58:22 +0200
Subject: [PATCH 0713/2585] - change my.cnf value server-id to not have spaces,
 so that it's   possible to use the same configuration code on RedHat and
 Debian.

---
 usr/share/escenic/ece-scripts/ece-install.d/database.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index a7d6e3ce..2ad42cab 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -319,7 +319,7 @@ EOF
     add_next_step $message
   else
     local old="#server-id.*= 1"
-    local new="server-id = 2"
+    local new="server-id=2"
     
     if [ $(grep ^"$old" $file | wc -l) -gt 0 ]; then
       sed -i "s~^$old~$new~g" $file

From 947ee074f1120d108a247836ad12a980980bed62 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 30 Apr 2012 13:01:45 +0200
Subject: [PATCH 0714/2585] - fixed the installation of heartbeat on REHL 6.
 Man, it's painful   working with REHL, it's even more painful than CentOS :-(

  For this particular case (heartbeat), two third party repos are
  needed and on of the PGP installations is a pure rpm --import <uri>
  job (no package, no standard location to look for the right key).

  Oh well, heartbeat installation now runs through on REHL 6.2
---
 .../ece-scripts/ece-install.d/vip-provier.sh  | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/vip-provier.sh b/usr/share/escenic/ece-scripts/ece-install.d/vip-provier.sh
index 1f890e5c..51b453e5 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/vip-provier.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/vip-provier.sh
@@ -31,7 +31,31 @@ function get_vip_configuration() {
 
 function install_vip_provider() {
   print_and_log "Installing a VIP provider on $HOSTNAME"
-  install_packages_if_missing heartbeat
+  
+  if [ $on_redhat -eq 1 ]; then
+    run cd /etc/yum.repos.d/
+    # TODO support for other versions of REHL
+    if [ $(lsb_release -s  -r | sed 's/\.//') -ge 60 ]; then
+      # need the community EPEL repo
+      rpm -Uvh http://dl.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-5.noarch.rpm
+
+      # need the Scientific Linux repo
+      cat > /etc/yum.repos.d/scientific_linux.repo <<EOF
+[scientific-linux]
+name=Scientific Linux
+baseurl=http://ftp.scientificlinux.org/linux/scientific/6/x86_64/os/
+enabled=0
+EOF
+      # ...and SL doesn't provide a release RPM so we must manually
+      # import the key here.
+      rpm --import http://ftp.scientificlinux.org/linux/scientific/6/x86_64/os/RPM-GPG-KEY-sl
+      
+      run yum install -y --enablerepo=scientific-linux heartbeat
+    fi
+  else
+    install_packages_if_missing heartbeat
+  fi
+    
   get_vip_configuration
   assure_vip_hosts_are_resolvable
   set_kernel_vip_parameters

From 89787db39a647cd0f7736efebb848ab1ed9870c6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 30 Apr 2012 13:13:18 +0200
Subject: [PATCH 0715/2585] - introduced new -q (quiet) switch to system-info

---
 usr/bin/system-info | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/usr/bin/system-info b/usr/bin/system-info
index b3cda258..4ae6def9 100755
--- a/usr/bin/system-info
+++ b/usr/bin/system-info
@@ -19,6 +19,7 @@ output_file=""
 
 current_indent_level=0
 INDENT="  "
+quiet=0
 
 function init() {
   # first, try to be nice
@@ -299,11 +300,14 @@ EOF
 }
 
 function get_user_options() {
-  while getopts ":d:o:i:f:u:m" opt; do
+  while getopts ":d:o:i:f:u:m:q" opt; do
     case $opt in
       i)
         instance=${OPTARG}
         ;;
+      q)
+        quiet=1
+        ;;
       d)
         output_dir=${OPTARG}
         mkdir -p $output_dir

From 5f3c94579e4d67256f52406157c390c6d34debac Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 30 Apr 2012 13:14:30 +0200
Subject: [PATCH 0716/2585] - made use of new -q (quiet) switch to system-info;
 will now not list   installed packages if -q is passed to system-info

---
 .../ece-scripts/system-info.d/66-list-os-info.sh     | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
index 5465d184..d6c5c16d 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
@@ -10,11 +10,13 @@ print_pre_text $(uname -a)
 print_h3_header "Distribution"
 print_pre_text "$(lsb_release  -a 2>/dev/null)"
 
-print_h3_header "Installed packages"
-if [ $(which dpkg)x != "x" ]; then
-  print_pre_text "$(dpkg -l 2>/dev/null)"
-elif [ $(which rpm)x != "x" ]; then
-  print_pre_text "$(rpm -qa | sort 2>/dev/null)"
+if [ $quiet -eq 0 ]; then
+  print_h3_header "Installed packages"
+  if [ $(which dpkg)x != "x" ]; then
+    print_pre_text "$(dpkg -l 2>/dev/null)"
+  elif [ $(which rpm)x != "x" ]; then
+    print_pre_text "$(rpm -qa | sort 2>/dev/null)"
+  fi
 fi
 
 # of the h2

From dc69b60243754e95ef86329c157379faaf7b5052 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 30 Apr 2012 13:16:39 +0200
Subject: [PATCH 0717/2585] - changed from "quiet" parameter to "verbose", so
 that the default   behaviour is not to flood the user with information :-)

  $ system-info
  [.. normal ..]

  $ system-info -v
  [.. more than normal ..]
---
 usr/bin/system-info                                       | 8 ++++----
 .../escenic/ece-scripts/system-info.d/66-list-os-info.sh  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/usr/bin/system-info b/usr/bin/system-info
index 4ae6def9..ed189c8c 100755
--- a/usr/bin/system-info
+++ b/usr/bin/system-info
@@ -19,7 +19,7 @@ output_file=""
 
 current_indent_level=0
 INDENT="  "
-quiet=0
+verbose=0
 
 function init() {
   # first, try to be nice
@@ -300,13 +300,13 @@ EOF
 }
 
 function get_user_options() {
-  while getopts ":d:o:i:f:u:m:q" opt; do
+  while getopts ":d:o:i:f:u:m:v" opt; do
     case $opt in
       i)
         instance=${OPTARG}
         ;;
-      q)
-        quiet=1
+      v)
+        verbose=1
         ;;
       d)
         output_dir=${OPTARG}
diff --git a/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
index d6c5c16d..83f48eef 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
@@ -10,7 +10,7 @@ print_pre_text $(uname -a)
 print_h3_header "Distribution"
 print_pre_text "$(lsb_release  -a 2>/dev/null)"
 
-if [ $quiet -eq 0 ]; then
+if [ $verbose -eq 1 ]; then
   print_h3_header "Installed packages"
   if [ $(which dpkg)x != "x" ]; then
     print_pre_text "$(dpkg -l 2>/dev/null)"

From 1f377386b5f30b5603ee4258dd0295067c94c8e8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 30 Apr 2012 14:08:56 +0200
Subject: [PATCH 0718/2585] - fixed /etc/fstab comment

---
 .../escenic/ece-scripts/ece-install.d/network-file-system.sh    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh b/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
index c893b903..09381fc3 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
@@ -74,7 +74,7 @@ function install_nfs_client() {
     local entry="${nfs_server_address}:$el ${nfs_client_mount_point_parent}/$(basename $0) nfs defaults 0 0"
     if [ $(grep "$entry" $file | wc -l) -lt 1 ]; then
       cat >> $file <<EOF
-# added by $(basename $el) @ $(date)
+# added by $(basename $0) @ $(date)
 ${nfs_server_address}:$el ${nfs_client_mount_point_parent}/$(basename $el) nfs defaults 0 0
 EOF
     fi

From f5897f535cc1e9477943cf6be66c946104d824a1 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 30 Apr 2012 14:32:09 +0200
Subject: [PATCH 0719/2585] - we don't need to set the url, driver or user
 credentials in the   Database.properties as this value is read from the JNDI
 properties.

---
 .../etc/escenic/engine/default/Database.properties.erb      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/Database.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/Database.properties.erb
index 72da78ca..4c17e1a3 100644
--- a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/Database.properties.erb
+++ b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/Database.properties.erb
@@ -40,7 +40,7 @@
 #           jdbcCompliantTruncation is required for BLOBs to function correctly.
 #
 ##############################################################################
-url=jdbc:mysql://<%=db_vip%>/ece4?autoReconnect=true&jdbcCompliantTruncation=false
+# url=jdbc:mysql://<%=db_vip%>/ece4?autoReconnect=true&jdbcCompliantTruncation=false
 
 
 ##############################################################################
@@ -59,7 +59,7 @@ url=jdbc:mysql://<%=db_vip%>/ece4?autoReconnect=true&jdbcCompliantTruncation=fal
 #   driver=
 #           
 ##############################################################################
-driver=com.mysql.jdbc.Driver
+# driver=com.mysql.jdbc.Driver
 
 
 ##############################################################################
@@ -72,7 +72,7 @@ driver=com.mysql.jdbc.Driver
 #   userid=scott
 #           
 ##############################################################################
-userid=<%=db_user%>
+# userid=<%=db_user%>
 
 
 

From e4b52d6d6db30e97948930d67e190aa670e82aee Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 30 Apr 2012 15:04:31 +0200
Subject: [PATCH 0720/2585] - improved set up of NFS clients with regards to
 ECE and the   multimedia archive: the NFS client installation profile is a
 generic   one and will create local mount points based on the export list.
 For   instance, if the export list contains /exports/multimedia, the NFS  
 client profile will create /mnt/multimedia (or a directory called  
 mutlimedia in some other parent directory). What we need, however,   is
 access to the publication specific directories for the mutlimedia   archive.

  For this reason, ece-install now creates links to the publication
  mutlimedia in the $escenic_data_dir/engine, e.g.:

  /var/lib/escenic/engine/nie -> /mnt/multimedia/nie
  /var/lib/escenic/engine/golf -> /mnt/multimedia/golf

  Other exports, that are not called multimedia, will not be symlinked
  into the escenic_data_dir.
---
 .../ece-install.d/network-file-system.sh      | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh b/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
index 09381fc3..6570f261 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
@@ -81,8 +81,26 @@ EOF
 
     local mount_point=${nfs_client_mount_point_parent}/$(basename $el)
     make_dir $mount_point
-    run mount $mount_point
+
+    # the spaces inside the grep test are intentional
+    if [ $(mount | grep " ${mount_point} " | wc -l) -eq 0 ]; then
+      run mount $mount_point
+    fi
+    
     mount_point_list="$mount_point $mount_point_list"
+
+    # creating symlinks from the mount point's mm archives to the data
+    # directory.
+    if [[ $(basename $el) == "multimedia" ]]; then
+      for ele in $(find $mount_point \
+        -maxdepth 1 \
+        -type d | \
+        sed "s#${mount_point}##"); do
+        if [ ! -e $escenic_data_dir/engine/$(basename $ele) ]; then
+          ln -s $mount_point/${ele} $escenic_data_dir/engine/$(basename $ele)
+        fi
+      done
+    fi
   done
 
   add_next_step "An NFS client has been added to $HOSTNAME"

From 15a8225bf746ff4713ea1e929afdc75a227b615f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 30 Apr 2012 15:21:54 +0200
Subject: [PATCH 0721/2585] - hardening when setting up self reporting: now
 checks if the   directories containing the desired browse-able configuration
 and log   files actually exists before running find and chmod in/on them.

---
 .../ece-scripts/ece-install.d/monitoring.sh   | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index 2bf6c062..e1ace8b2 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -453,11 +453,22 @@ function install_system_info() {
   fi
   
   # thttpd doesn't serve files if they've got the execution bit set
-  # (it then think it's a misnamed CGI script)
-  find $escenic_log_dir -type f | egrep ".log$|.out$" | xargs chmod 644
-  find $escenic_conf_dir -type f | egrep ".conf$|.properties$" | xargs chmod 644
-  find $tomcat_base/logs -type f | egrep ".log$" | xargs chmod 644
-
+  # (it then think it's a misnamed CGI script). Hence, we must ensure
+  # the execute bit is set.
+  if [ -d $escenic_log_dir ]; then
+    find $escenic_log_dir -type f | egrep ".log$|.out$" | xargs chmod 644
+  fi
+  
+  if [ -d $escenic_conf_dir ]; then
+    find $escenic_conf_dir -type f | \
+      egrep ".conf$|.properties$" | \
+      xargs chmod 644
+  fi
+  
+  if [ -d  $tomcat_base/logs ]; then
+    find $tomcat_base/logs -type f | egrep ".log$" | xargs chmod 644
+  fi
+  
   add_next_step "Always up to date system info: http://$HOSTNAME:$port/"
   add_next_step "you can also see system-info in the shell, type: system-info"
 }

From 5a206408148583b05c2927dde1a04ccb5ce1b205 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 2 May 2012 10:06:43 +0200
Subject: [PATCH 0722/2585] - added vosa status to the system-info report (just
 in front of the   KVM guests)

---
 .../ece-scripts/system-info.d/77-list-kvm-info.sh     | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/77-list-kvm-info.sh b/usr/share/escenic/ece-scripts/system-info.d/77-list-kvm-info.sh
index 36d1b4a3..d2826a57 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/77-list-kvm-info.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/77-list-kvm-info.sh
@@ -1,8 +1,17 @@
 #! /usr/bin/env bash
 
+if [ $(which vosa | wc -l) -gt 0 ]; then
+  print_h2_header "VOSA status"
+  print_un_ordered_list_start
+  vosa status | while read line; do
+    print_list_item "$line"
+  done
+  print_un_ordered_list_end
+fi
+
 if [ $(ps -u root | grep kvm | grep -v kvm-irqfd-clean | wc -l) -gt 0 ]; then
   i=1
-  print_h2_header "KVM guests on $HOSTNAME"
+  print_h2_header "KVM guests running on $HOSTNAME"
   ps auxww | grep kvm | grep .img | sed "s/^root.*kvm/kvm/" | while read line; do
     print_h3_header "KVM image #${i} on $HOSTNAME"
     print_pre_text "$line"

From 704c64eb1727c3539aa1b7755d63977bba806920 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Wed, 2 May 2012 11:13:40 +0200
Subject: [PATCH 0723/2585] vosa: Adding possibility to run the puppet agent
 from a postinstall script

---
 .../vizrt/vosa/post-install-hooks/run-puppet-agent.sh    | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100755 usr/share/vizrt/vosa/post-install-hooks/run-puppet-agent.sh

diff --git a/usr/share/vizrt/vosa/post-install-hooks/run-puppet-agent.sh b/usr/share/vizrt/vosa/post-install-hooks/run-puppet-agent.sh
new file mode 100755
index 00000000..206fb1aa
--- /dev/null
+++ b/usr/share/vizrt/vosa/post-install-hooks/run-puppet-agent.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+echo "Applying the initial puppet configuration, once."
+ssh -F $2/ssh.conf root@guest puppet agent --verbose --no-daemonize --onetime || exit 2
+sleep 1;
+echo "Reapplying puppet, to ensure all changes are in, and that puppet still works!"
+ssh -F $2/ssh.conf root@guest puppet agent --verbose --no-daemonize --onetime || exit 2
+
+

From 0769af68c7a0be8a705f5b6d22c8b4888fd5ba2c Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Wed, 2 May 2012 11:16:20 +0200
Subject: [PATCH 0724/2585] vosa: Print out what it's doing...

---
 usr/share/vizrt/vosa/post-install-hooks/start-puppet.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/vizrt/vosa/post-install-hooks/start-puppet.sh b/usr/share/vizrt/vosa/post-install-hooks/start-puppet.sh
index 97a81ff0..69013911 100755
--- a/usr/share/vizrt/vosa/post-install-hooks/start-puppet.sh
+++ b/usr/share/vizrt/vosa/post-install-hooks/start-puppet.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
 
+echo "Starting puppet agent"
 ssh -F $2/ssh.conf root@guest /etc/init.d/puppet start || exit 2
 

From 21e17158e70adc0c7c456ddb7c3e4d39d87aba10 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 2 May 2012 11:55:35 +0200
Subject: [PATCH 0725/2585] - added re-direction of standard error if the vosa
 command couldn't be   found.

---
 usr/share/escenic/ece-scripts/system-info.d/77-list-kvm-info.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/77-list-kvm-info.sh b/usr/share/escenic/ece-scripts/system-info.d/77-list-kvm-info.sh
index d2826a57..6324bd22 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/77-list-kvm-info.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/77-list-kvm-info.sh
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-if [ $(which vosa | wc -l) -gt 0 ]; then
+if [ $(which vosa 2>/dev/null | wc -l) -gt 0 ]; then
   print_h2_header "VOSA status"
   print_un_ordered_list_start
   vosa status | while read line; do

From d43ca3e203a37b5cd3c2918e90bc514556ef363c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 2 May 2012 14:28:05 +0200
Subject: [PATCH 0726/2585] - added two layers to the Nursery configuration;
 vosa and environment,   the finished layer list now looks like this:

  # ECE :: default layer
  layer.01 = /layers/default/Layer

  # ECE :: plugins layer
  layer.02 = /layers/addon/Layer

  # VOSA :: common VOSA/SaaS layer
  layer.03 = /layers/vosa/Layer

  # Customer :: common layer
  layer.04 = /layers/common/Layer

  # Customer :: family/group layer (e.g. presentation, editorial)
  layer.05 = /layers/family/Layer

  # Customer :: environment layer (e.g. testing, staging, production)
  layer.06 = /layers/environment/Layer

  # Customer :: host specific layer
  layer.07 = /layers/host/Layer

  # Customer :: instance specific layer
  layer.08 = /layers/instance/Layer
---
 .../ece-install.d/content-engine.sh           | 110 ++++++++++++------
 1 file changed, 74 insertions(+), 36 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 7df76787..98e8d031 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -171,26 +171,62 @@ function set_up_assembly_tool() {
     run unzip -q -u $download_dir/assemblytool*zip
   fi
 
-    # adding an instance layer to the Nursery configuration
+  # adding an instance layer to the Nursery configuration
   run cp -r $escenic_root_dir/engine/siteconfig/bootstrap-skeleton \
     $escenic_root_dir/assemblytool/conf
   run cd $escenic_root_dir/assemblytool/conf/
+  run cp -r layers/host layers/environment
   run cp -r layers/host layers/instance
+  run cp -r layers/host layers/vosa
+  cat > layers/environment/Files.properties <<EOF
+\$class=neo.nursery.FileSystemDepot
+fileSystemRoot = $escenic_conf_dir/engine/environment/\${com.escenic.environment}/
+EOF
   cat > layers/instance/Files.properties <<EOF
 \$class=neo.nursery.FileSystemDepot
 fileSystemRoot = $escenic_conf_dir/engine/instance/\${com.escenic.instance}/
 EOF
-  echo "" >> Nursery.properties
-  echo "layer.06 = /layers/instance/Layer" >> Nursery.properties
+  cat > layers/vosa/Files.properties <<EOF
+\$class=neo.nursery.FileSystemDepot
+fileSystemRoot = $escenic_conf_dir/engine/vosa/
+EOF
+
+  cat > Nursery.properties <<EOF
+# Configuration layers set up by $(basename $0) @ $(date)
+
+# ECE :: default layer
+layer.01 = /layers/default/Layer
+
+# ECE :: plugins layer
+layer.02 = /layers/addon/Layer
+
+# VOSA :: common VOSA/SaaS layer
+layer.03 = /layers/vosa/Layer
 
-    # fixing the path to the Nursery configuration according to
-    # escenic_conf_dir which may have been overridden by the user.
+# Customer :: common layer
+layer.04 = /layers/common/Layer
+
+# Customer :: family/group layer (e.g. presentation, editorial)
+layer.05 = /layers/family/Layer
+
+# Customer :: environment layer (e.g. testing, staging, production)
+layer.06 = /layers/environment/Layer
+
+# Customer :: host specific layer 
+layer.07 = /layers/host/Layer
+
+# Customer :: instance specific layer
+layer.08 = /layers/instance/Layer
+EOF
+
+  # fixing the path to the Nursery configuration according to
+  # escenic_conf_dir which may have been overridden by the user.
   for el in $(find $escenic_root_dir/assemblytool/conf -name Files.properties)
   do
     sed -i "s#/etc/escenic#${escenic_conf_dir}#g" $el
   done
   
-    # set up which plugins to use
+  # set up which plugins to use
   cd $escenic_root_dir/assemblytool/
   make_dir plugins
   cd plugins
@@ -202,8 +238,8 @@ EOF
       continue
     fi
     
-        # nuisance to get the community engine and analysis engine,
-        # but not the engine
+    # nuisance to get the community engine and analysis engine, but
+    # not the engine
     if [ $(echo $directory | \
       grep engine | \
       grep -v community | \
@@ -259,8 +295,8 @@ EOF
 function set_up_basic_nursery_configuration() {
   print_and_log "Setting up basic Nursery configuration ..."
 
-    # we always copy the default plugin configuration (even if there
-    # is an archive)
+  # we always copy the default plugin configuration (even if there is
+  # an archive)
   for el in $escenic_root_dir/assemblytool/plugins/*; do
     if [ ! -d $el/misc/siteconfig/ ]; then
       continue
@@ -268,8 +304,8 @@ function set_up_basic_nursery_configuration() {
     run cp -r $el/misc/siteconfig/* $common_nursery_dir/
   done
 
-    # Then we see if we're using configuration archives, if yes, use
-    # the JAAS and Nursery configuraiton from here.
+  # Then we see if we're using configuration archives, if yes, use the
+  # JAAS and Nursery configuraiton from here.
   if [ $(is_using_conf_archive) -eq 1 ]; then
     print_and_log "Using the supplied Nursery & JAAS configuration from" 
     print_and_log "bundle: $ece_instance_conf_archive"
@@ -371,7 +407,7 @@ function set_up_instance_specific_nursery_configuration() {
   file=$escenic_conf_dir/engine/instance/$instance_name/$nursery_context
   make_dir $(dirname $file)
   
-    # we don't touch it if the file already exists.
+  # we don't touch it if the file already exists.
   if [ ! -e $file ]; then
     run echo "hostname=$HOSTNAME" >> $file
   fi
@@ -391,8 +427,8 @@ EOF
   make_ln $common_nursery_dir/trace.properties
   run ln -sf trace.properties log4j.properies
 
-    # since the solr webapp otherwise will pollute our logs, we ask
-    # Tomcat specifically to make it log to dedicated logger.
+  # since the solr webapp otherwise will pollute our logs, we ask
+  # Tomcat specifically to make it log to dedicated logger.
   if [ $install_profile_number -eq $PROFILE_SEARCH_SERVER -o \
     $install_profile_number -eq $PROFILE_ALL_IN_ONE ]; then
     cat > $tomcat_base/conf/logging.properties <<EOF
@@ -436,9 +472,9 @@ function install_ece_third_party_packages
   
   if [ $on_debian_or_derivative -eq 1 ]; then
     if [ $on_ubuntu -eq 1 ]; then
-            # Sun Java was removed in Ubuntu in 11.10 and later also
-            # from LTS 10.04, hence Hardy is the last one with these
-            # packges now (2012-02-20 11:22)
+      # Sun Java was removed in Ubuntu in 11.10 and later also from
+      # LTS 10.04, hence Hardy is the last one with these packges now
+      # (2012-02-20 11:22)
       local version_needs_local_java_deb=1004
       local version=$(lsb_release -s -r | sed "s#\.##g")
       
@@ -471,28 +507,30 @@ function install_ece_third_party_packages
     echo "sun-java6-jdk shared/accepted-sun-dlj-v1-1 boolean true" | \
       debconf-set-selections
 
-        # install sun-java6-jdk first so that ant doesn't pull down OpenJDK
+    # install sun-java6-jdk first so that ant doesn't pull down
+    # OpenJDK
     local packages="sun-java6-jdk"
     install_packages_if_missing $packages
 
     packages="
-          ant
-          ant-contrib
-          ant-optional
-          libapr1
-          libtcnative-1
-          libmysql-java
-          memcached
-          wget"
+      ant
+      ant-contrib
+      ant-optional
+      libapr1
+      libtcnative-1
+      libmysql-java
+      memcached
+      wget
+    "
   elif [ $on_redhat_or_derivative -eq 1 ]; then
     packages="
-        ant
-        ant-contrib
-        ant-nodeps
-        apr
-        memcached
-        mysql-connector-java
-        wget
+      ant
+      ant-contrib
+      ant-nodeps
+      apr
+      memcached
+      mysql-connector-java
+      wget
     "
 
     # TODO no tomcat APR wrappers in official repositories
@@ -557,8 +595,8 @@ function assemble_deploy_and_restart_type()
 {
   set_correct_permissions
 
-    # need to run clean here since we might be running multiple
-    # profiles in the same ece-install process.
+  # need to run clean here since we might be running multiple profiles
+  # in the same ece-install process.
   ece_command="ece -i $instance_name -t $type clean assemble deploy restart"
   if [ $(is_installing_from_ear) -eq 1 ]; then
     ece_command="ece -i $instance_name \

From 3f4e2cf70484d04be05c3dc9d2bb7a4aa157e18b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 2 May 2012 14:54:03 +0200
Subject: [PATCH 0727/2585] - changed the default (APT) repo from jp to no as
 the ece-install   development is now conducted in Norway.

---
 usr/sbin/ece-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index fb994576..ad677b31 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -37,7 +37,7 @@ escenic_crash_dir=/var/crash/${dir_suffix}
 appserver_parent_dir=/opt
 
 # country code for selecting the correct (APT) mirror.
-mirror_country_suffix=jp
+mirror_country_suffix=no
 
 # The script will install the sun-java6-jdk package on Debian based
 # systems and this is the path of the JAVA home with this package. If

From 5266e215f77fffb9c3ee56690672d1e7b2f36af7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 2 May 2012 15:06:57 +0200
Subject: [PATCH 0728/2585] - fixed get_percona_supported_list after percona
 has updated their web   page (for instance: vanilla mysql would be installed
 instead of   Percona on oneiric)and improved on it for getting the list.

---
 .../escenic/ece-scripts/ece-install.d/database.sh      | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 2ad42cab..34e93291 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -9,12 +9,10 @@ if [[ $(uname -m) != "x86_64" ]]; then
 fi
 
 function get_percona_supported_list() {
-  echo $(
-    curl -s http://repo.percona.com/apt/dists/ | \
-      grep ^"<li><a href" | \
-      cut -d'"' -f2 | \
-      cut -d'/' -f1
-  )
+  curl -s http://repo.percona.com/apt/dists/ | \
+    grep "DIR" | \
+    sed -e 's#.*href=\"\(.*\)\">.*</a>.*#\1#' -e 's#/##g' | \
+    grep -v apt
 }
 
 ## $1: optional parameter, binaries_only. If passed, $1=binaries_only,

From 2625ff23060d63508e7a73b5ee64fcf2775a8246 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 2 May 2012 16:39:19 +0200
Subject: [PATCH 0729/2585] - added new ece.conf variable: ece_environment. 
 Set this one if you   wish to have a Nursery configuration layer special to
 the kind of   environment you're running. An enviornment in this context is: 
  development, test, staging and prodution.

- ece now sets the system variable com.escenic.enviornment if it's set
  in ece.onf
---
 etc/escenic/ece.conf | 7 +++++++
 usr/bin/ece          | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/etc/escenic/ece.conf b/etc/escenic/ece.conf
index 041cd81a..e3f1da58 100644
--- a/etc/escenic/ece.conf
+++ b/etc/escenic/ece.conf
@@ -23,6 +23,13 @@ ece_home=/opt/escenic/engine
 # ece_server=rolling
 # ece_server_hostname=quanah.escenic.com
 
+########################################################################
+# Set this one if you wish to have a Nursery configuration layer
+# special to the kind of enviornment you're running. An enviornment in
+# this context is: development, test, staging and prodution.
+########################################################################
+# ece_environment=production
+
 ########################################################################
 # Setting the java home, yes lowercase is correct ;-)
 ########################################################################
diff --git a/usr/bin/ece b/usr/bin/ece
index fe8399e4..da53a2c9 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -361,6 +361,10 @@ function set_instance_settings()
         ece_args=$ece_args" -Dcom.escenic.instance=$instance"
     fi
 
+    if [ -n "$ece_environment" ]; then
+        ece_args=$ece_args" -Dcom.escenic.environment=${ece_environment}"
+    fi
+
     if [ "$ece_server_hostname" ]; then
         ece_args=$ece_args" -Djava.rmi.server.hostname=$ece_server_hostname"
     fi

From 3dd6ce26c65281a9629c667a6fad7f51ecd8e6c7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 2 May 2012 16:42:25 +0200
Subject: [PATCH 0730/2585] - engine_dir_list now contains the environment and
 instance - updated documentation on why some of the Nursery layer directory  
 entry points are created in /etc. - moved the method
 set_up_engine_directories from the main ece-install   to the content-engine
 module.

---
 usr/sbin/ece-install | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index ad677b31..031d9d1f 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -132,13 +132,6 @@ function init() {
   fi
 }
 
-function set_up_engine_directories()
-{
-    for el in $engine_dir_list; do
-        make_dir $el
-    done
-}
-
 function download_escenic_components()
 {
     if [ $ece_software_setup_completed -eq 1 ]; then
@@ -604,12 +597,14 @@ function common_pre_install()
     # overridden in ece-install.conf
     common_nursery_dir=$escenic_conf_dir/engine/common
     
-    # Because of issue VF-3559, we also
-    # create the default family and host directories.
+    # Because of issue VF-3559, we also create the default family and
+    # host directories (fixed in 5.4.0.x).
     engine_dir_list="
       $common_nursery_dir
       $escenic_conf_dir/engine/family/default
+      $escenic_conf_dir/engine/environment
       $escenic_conf_dir/engine/host/localhost
+      $escenic_conf_dir/engine/instance
       $escenic_root_dir
       $escenic_cache_dir
       $escenic_crash_dir

From 4460634701de6b294d66bb5976c89859c3160d99 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 2 May 2012 16:42:45 +0200
Subject: [PATCH 0731/2585] - moved the method set_up_engine_directories from
 the main ece-install   to the content-engine module.

---
 .../escenic/ece-scripts/ece-install.d/content-engine.sh      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 98e8d031..05c35d54 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -613,3 +613,8 @@ function assemble_deploy_and_restart_type()
   exit_on_error "su - $ece_user -c \"$ece_command\""
 }
 
+function set_up_engine_directories() {
+  for el in $engine_dir_list; do
+    make_dir $el
+  done
+}

From de262824c97ba180fc86e3dc524df5d9cf26c1f2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 2 May 2012 16:53:25 +0200
Subject: [PATCH 0732/2585] - moved the installation of the ece scripts
 themselves (i.e. the   /usr/bin/ece, the /etc/init.d/ece, /etc/default/ece + 
  /etc/escenic/ece[-<instance].conf to its own module.

- added support installing the ece-scripts from the Vizrt APT
  repository if running on a Debian based system.
---
 usr/sbin/ece-install                          | 57 --------------
 .../ece-scripts/ece-install.d/ece-scripts.sh  | 74 +++++++++++++++++++
 2 files changed, 74 insertions(+), 57 deletions(-)
 create mode 100644 usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 031d9d1f..7f8ca5f0 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -218,63 +218,6 @@ function install_common_os_packages()
   done
 }
 
-function set_up_ece_scripts()
-{
-  print_and_log 'Setting up the ece UNIX scripts ...'
-
-  run cd $download_dir
-  if [ -d ece-scripts ]; then
-    (
-      run cd ece-scripts
-      run git pull
-    )
-  else
-    run git clone $ece_scripts_git_source
-  fi
-  
-  run cp -r ece-scripts/usr/* /usr/
-  run cp -r ece-scripts/etc/bash_completion.d/ece /etc/bash_completion.d/
-  run cp -r ece-scripts/etc/init.d/* /etc/init.d/
-
-  for el in ece-scripts/etc/default/*; do
-    local file=/etc/default/$(basename $el)
-    if [ -e $file ]; then
-      print_and_log "$file already exists, not overwriting it"
-      continue
-    fi
-    run cp $el /etc/default/
-  done
-  
-  for el in ece-scripts/etc/escenic/*; do
-    local file=/etc/escenic/$(basename $el)
-    if [ -e $file ]; then
-      print_and_log "$file already exists, not overwriting it"
-      continue
-    fi
-    run cp $el /etc/escenic/
-  done
-  
-  local file=${escenic_conf_dir}/ece.conf
-  set_conf_file_value assemblytool_home ${escenic_root_dir}/assemblytool $file
-  set_conf_file_value backup_dir ${escenic_backups_dir} $file
-  set_conf_file_value cache_dir ${escenic_cache_dir} ${file}
-  set_conf_file_value data_dir ${escenic_data_dir} ${file}
-  set_conf_file_value ece_home ${escenic_root_dir}/engine ${file}
-  set_conf_file_value escenic_conf_dir ${escenic_conf_dir} ${file}
-  set_conf_file_value heap_dump_dir ${escenic_crash_dir} ${file}
-  set_conf_file_value java_home ${java_home} ${file}
-  set_conf_file_value log_dir ${escenic_log_dir} ${file}
-  set_conf_file_value pid_dir ${escenic_run_dir} ${file}
-  set_conf_file_value rmi_hub_conf ${escenic_conf_dir}/rmi-hub ${file}
-  set_conf_file_value solr_home ${escenic_data_dir}/solr ${file}
-  set_conf_file_value ece_security_configuration_dir \
-    ${escenic_conf_dir}/engine/common/security \
-    ${file}
-
-  run sed -i "s#/etc/escenic#${escenic_conf_dir}#g" /etc/bash_completion.d/ece
-  run sed -i "s#/opt/escenic#${escenic_root_dir}#g" /etc/bash_completion.d/ece
-}
-
 # don't quote values when setting conf file values with
 # set_conf_file_value. This is a hack-ish variable due to EAE's
 # handling of .cfg files.
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh b/usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh
new file mode 100644
index 00000000..1703a49e
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh
@@ -0,0 +1,74 @@
+#! /usr/bin/env bash
+
+# code for the ece-scripts themselves
+
+function install_ece_scripts_with_apt() {
+  curl -s http://apt.vizrt.com/archive.key 2>> $log | apt-key add -
+  add_apt_source "deb http://apt.vizrt.com stable main"
+  install_packages_if_missing escenic-content-engine-scripts
+}
+
+function install_ece_scripts_with_git() {
+  run cd $download_dir
+  if [ -d ece-scripts ]; then
+    (
+      run cd ece-scripts
+      run git pull
+    )
+  else
+    run git clone $ece_scripts_git_source
+  fi
+  
+  run cp -r ece-scripts/usr/* /usr/
+  run cp -r ece-scripts/etc/bash_completion.d/ece /etc/bash_completion.d/
+  run cp -r ece-scripts/etc/init.d/* /etc/init.d/
+
+  for el in ece-scripts/etc/default/*; do
+    local file=/etc/default/$(basename $el)
+    if [ -e $file ]; then
+      print_and_log "$file already exists, not overwriting it"
+      continue
+    fi
+    run cp $el /etc/default/
+  done
+  
+  for el in ece-scripts/etc/escenic/*; do
+    local file=/etc/escenic/$(basename $el)
+    if [ -e $file ]; then
+      print_and_log "$file already exists, not overwriting it"
+      continue
+    fi
+    run cp $el /etc/escenic/
+  done
+}
+
+function set_up_ece_scripts()
+{
+  print_and_log 'Setting up the ece UNIX scripts ...'
+
+  if [ $on_debian_or_derivative -eq 1 ]; then
+    install_ece_scripts_with_apt
+  else
+    install_ece_scripts_with_git
+  fi
+  
+  local file=${escenic_conf_dir}/ece.conf
+  set_conf_file_value assemblytool_home ${escenic_root_dir}/assemblytool $file
+  set_conf_file_value backup_dir ${escenic_backups_dir} $file
+  set_conf_file_value cache_dir ${escenic_cache_dir} ${file}
+  set_conf_file_value data_dir ${escenic_data_dir} ${file}
+  set_conf_file_value ece_home ${escenic_root_dir}/engine ${file}
+  set_conf_file_value escenic_conf_dir ${escenic_conf_dir} ${file}
+  set_conf_file_value heap_dump_dir ${escenic_crash_dir} ${file}
+  set_conf_file_value java_home ${java_home} ${file}
+  set_conf_file_value log_dir ${escenic_log_dir} ${file}
+  set_conf_file_value pid_dir ${escenic_run_dir} ${file}
+  set_conf_file_value rmi_hub_conf ${escenic_conf_dir}/rmi-hub ${file}
+  set_conf_file_value solr_home ${escenic_data_dir}/solr ${file}
+  set_conf_file_value ece_security_configuration_dir \
+    ${escenic_conf_dir}/engine/common/security \
+    ${file}
+
+  run sed -i "s#/etc/escenic#${escenic_conf_dir}#g" /etc/bash_completion.d/ece
+  run sed -i "s#/opt/escenic#${escenic_root_dir}#g" /etc/bash_completion.d/ece
+}

From de383567a07e8cc51c1826b295478a2f207f4639 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 2 May 2012 16:58:35 +0200
Subject: [PATCH 0733/2585] - redirect the output from apt-key add to the log
 file

---
 usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh b/usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh
index 1703a49e..9ee79d28 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh
@@ -3,7 +3,8 @@
 # code for the ece-scripts themselves
 
 function install_ece_scripts_with_apt() {
-  curl -s http://apt.vizrt.com/archive.key 2>> $log | apt-key add -
+  curl -s http://apt.vizrt.com/archive.key 2>> $log | \
+    apt-key add - 1>> $log 2>> $log
   add_apt_source "deb http://apt.vizrt.com stable main"
   install_packages_if_missing escenic-content-engine-scripts
 }

From 3048a26465118df9b62603b7fa142a2b17d126d9 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 3 May 2012 09:35:20 +0200
Subject: [PATCH 0734/2585] - introduced a new configuration parameter
 fai_apt_vizrt_pool which   allows you to set the package pool to install
 from. The default is   stable, but "unstable" would be desired for folks
 wanting to install   the latest greatest packages.

  fai_apt_vizrt_pool=unstable
---
 usr/share/doc/escenic/ece-install-guide.org                | 1 +
 usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 748c6311..6a3b8424 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -671,6 +671,7 @@ $HOME/ece-install.conf file of the root user:
 | fai_analysis_name                   | analysis1                                         | EAE instance name                                                                                                                     |
 | fai_analysis_port                   | 8080                                              | Port of the EAE                                                                                                                       |
 | fai_analysis_shutdown               | 8005                                              | Shutdown port for the EAE app server                                                                                                  |
+| fai_apt_vizrt_pool                  | stable                                            | Which package pool in the Vizrt APT to install package from.                                                                          |
 | fai_cache_backends                  | ${HOSTNAME}:8080                                  | Space separated, e.g. "app1:8080 app2:8080"                                                                                           |
 | fai_cache_install                   | 0                                                 | Install cache server profile                                                                                                          |
 | fai_db_drop_old_db_first            | 0                                                 | Warning: this will drop the old database before installing a new one                                                                  |
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh b/usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh
index 9ee79d28..4288d754 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh
@@ -5,7 +5,9 @@
 function install_ece_scripts_with_apt() {
   curl -s http://apt.vizrt.com/archive.key 2>> $log | \
     apt-key add - 1>> $log 2>> $log
-  add_apt_source "deb http://apt.vizrt.com stable main"
+
+  local package_pool=${fai_apt_vizrt_pool-stable}
+  add_apt_source "deb http://apt.vizrt.com ${package_pool} main"
   install_packages_if_missing escenic-content-engine-scripts
 }
 

From 84ebeef8010de6103a4c5ad73d09b4276c15a210 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 3 May 2012 12:16:01 +0200
Subject: [PATCH 0735/2585] - added BASH completion scripts to the
 escenic-content-engine-scripts package

---
 usr/share/escenic/package-scripts/create-packages | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 91553f32..0bd36ba8 100644
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -67,6 +67,7 @@ function set_up_target_directory() {
     cp -r ../../doc/escenic/system-info-guide.{org,html} \
       $target_dir/usr/share/doc/escenic
     cp -r ../../../../etc/escenic/ $target_dir/etc/
+    cp -r ../../../../etc/bash_completion.d/ $target_dir/etc/
     cp -r ../../../../etc/default/ece $target_dir/etc/default/
     cp -r ../../../../etc/init.d/ece $target_dir/etc/init.d/
     

From 92310cf505baab186c7e8c6cd850679d1fcc249e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 3 May 2012 12:20:30 +0200
Subject: [PATCH 0736/2585] - no longer include .html files in
 escenic-common-scripts

---
 usr/share/escenic/package-scripts/create-packages | 2 --
 1 file changed, 2 deletions(-)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 0bd36ba8..e1868818 100644
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -96,8 +96,6 @@ function set_up_target_directory() {
       $target_dir/usr/share/escenic/ece-scripts/
     cp -r ../../escenic/ece-scripts/*.css \
       $target_dir/usr/share/escenic/ece-scripts/
-    cp -r ../../escenic/ece-scripts/*.html \
-      $target_dir/usr/share/escenic/ece-scripts/
   fi
 
   debian_dir=$target_dir/DEBIAN

From 5b7ebfdebea8e129d975d0e026f450fc045c8362 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 3 May 2012 12:35:41 +0200
Subject: [PATCH 0737/2585] - the vosa package now includes BASH completion -
 the escenic-content-engine-scripts package now includes BASH   completion -
 documentation now included correctly in all the packages - the engine-scripts
 package gets for the first time its documentation   and ece.d modules
 packaged.

---
 .../escenic/package-scripts/create-packages   | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index e1868818..17c3257c 100644
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -61,22 +61,34 @@ function set_up_target_directory() {
     mkdir -p $target_dir/etc/init.d
     mkdir -p $target_dir/usr/share/doc/escenic
     mkdir -p $target_dir/usr/share/escenic/ece-scripts
+    mkdir -p $target_dir/etc/bash_completion.d
 
+    # bin
     cp -r ../../../bin/ece $target_dir/usr/bin/
+    cp -r ../../escenic/ece-scripts/ece.d/ \
+      $target_dir/usr/share/escenic/ece-scripts/
 
-    cp -r ../../doc/escenic/system-info-guide.{org,html} \
-      $target_dir/usr/share/doc/escenic
+    # conf
     cp -r ../../../../etc/escenic/ $target_dir/etc/
-    cp -r ../../../../etc/bash_completion.d/ $target_dir/etc/
+    cp -r ../../../../etc/bash_completion.d/ece \
+      $target_dir/etc/bash_completion.d
     cp -r ../../../../etc/default/ece $target_dir/etc/default/
     cp -r ../../../../etc/init.d/ece $target_dir/etc/init.d/
+
+    # doc
+    cp -r ../../doc/escenic/ece-guide.{org,html} \
+      $target_dir/usr/share/doc/escenic
     
   elif [[ $package_name == "vosa" ]]; then
     mkdir -p $target_dir/usr/share/doc/vosa
+    mkdir -p $target_dir/etc/bash_completion.d
     
     cp -r ../../../bin/vosa $target_dir/usr/bin/
     cp -r ../../vizrt/ $target_dir/usr/share/
     cp -r ../../doc/vizrt/*.org $target_dir/usr/share/doc/vosa/
+    cp -r ../../../../etc/bash_completion.d/vosa \
+      $target_dir/etc/bash_completion.d/
+    
   elif [[ $package_name == "escenic-common-scripts" ]]; then
     mkdir -p $target_dir/usr/share/doc/escenic
     mkdir -p $target_dir/usr/share/escenic/ece-scripts
@@ -96,6 +108,8 @@ function set_up_target_directory() {
       $target_dir/usr/share/escenic/ece-scripts/
     cp -r ../../escenic/ece-scripts/*.css \
       $target_dir/usr/share/escenic/ece-scripts/
+    cp -r ../../escenic/ece-scripts/*.html \
+      $target_dir/usr/share/escenic/ece-scripts/
   fi
 
   debian_dir=$target_dir/DEBIAN

From f7f0743e2940edf34130a8b17d23fe71975b75f1 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 3 May 2012 13:13:15 +0200
Subject: [PATCH 0738/2585] - uses a file variable instead of the full path to
 the bash completion   file every time.

---
 usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh b/usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh
index 4288d754..8a8d948c 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh
@@ -72,6 +72,7 @@ function set_up_ece_scripts()
     ${escenic_conf_dir}/engine/common/security \
     ${file}
 
-  run sed -i "s#/etc/escenic#${escenic_conf_dir}#g" /etc/bash_completion.d/ece
-  run sed -i "s#/opt/escenic#${escenic_root_dir}#g" /etc/bash_completion.d/ece
+  file=/etc/bash_completion.d/ece
+  run sed -i "s#/etc/escenic#${escenic_conf_dir}#g" $file
+  run sed -i "s#/opt/escenic#${escenic_root_dir}#g" $file
 }

From 326bdecf86e3a869b73c17c326b37978c1b3e43a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 3 May 2012 13:29:10 +0200
Subject: [PATCH 0739/2585] - hardening of get_conf_value (remove duplicate
 lines)

---
 usr/sbin/ece-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 7f8ca5f0..a99024cb 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -746,7 +746,7 @@ function get_conf_value()
         remove_pid_and_exit_in_error
     fi
 
-    if [ $(grep $1 $conf_file | grep -v ^# | wc -l) -gt 0 ]; then
+    if [ $(grep $1 $conf_file | grep -v ^# | sort | uniq | wc -l) -gt 0 ]; then
         echo $(grep $1 $conf_file | grep -v ^# | cut -d'=' -f2)
     fi
 }

From dc0e952d1e78fba301611b43719eb40a8eb31e22 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 3 May 2012 13:41:57 +0200
Subject: [PATCH 0740/2585] - added documentation for fai_monitoring_host_list

---
 usr/share/doc/escenic/ece-install-guide.org | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 6a3b8424..a6d68eea 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -690,6 +690,7 @@ $HOME/ece-install.conf file of the root user:
 | fai_enabled                         | 0                                                 | Whether or not to run ece-install in FAI mode                                                                                         |
 | fai_keep_off_etc_hosts              | 0                                                 | Set this to 1 if you don't want ece-install adding entries to /etc/hosts                                                              |
 | fai_monitoring_install              | 0                                                 | Install the monitoring server profile.                                                                                                |
+| fai_monitoring_host_list            | ""                                                | Quoted, space separated list of <host>:<ip> pairs, e.g.: "pres1:10.72.227.250 pres2:10.72.227.251"                                    |
 | fai_monitoring_munin_node_list      | ""                                                | Set this to a whitespace separated list of nodes that munin should monitor                                                            |
 | fai_monitoring_server_ip            | 127.0.0.1                                         | The IP of the monitoring server.                                                                                                      |
 | fai_nfs_allowed_client_network      | ""                                                | IP/netmwask of allowed NFS clients, example: 192.168.1.0/255.255.255.0                                                                |

From 2fe39dc4bf53136331ad6f10a09831d8ae29695c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 3 May 2012 13:57:12 +0200
Subject: [PATCH 0741/2585] - pernickety

---
 usr/bin/vosa | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 6f3c826c..100482f4 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -558,7 +558,7 @@ function do_uninstall() {
     fi
     local status=( $(really_do_status $instance_dir) )
     if [ "${status[3]}" == "alive" ] ; then
-      echo "$instance_name is alive. Stop it first. exiting"
+      echo "$instance_name is alive. Stop it first. Exiting."
       exit 1
     fi
     if [ "${status[3]}" == "dead" ] ; then

From 36adfe7edf546f09f19a84a2865f7cb3a633b29c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 3 May 2012 15:21:37 +0200
Subject: [PATCH 0742/2585] - fix in set_up_monitoring_host_def, host_name was
 never set

---
 .../escenic/ece-scripts/ece-install.d/monitoring.sh  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index e1ace8b2..e0be3a8e 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -77,22 +77,22 @@ function install_nagios_monitoring_server()
 ## $2 <host name>:<ip>, e.g.: fire:192.168.1.100
 function set_up_monitoring_host_def()
 {
-  local file=/etc/icinga/objects/${host_name}_icinga.cfg
-  if [[ $1 == $MONITORING_VENDOR_NAGIOS ]]; then
-    file=/etc/nagios3/conf.d/${host_name}_nagios2.cfg
-  fi
-  
   local old_ifs=$IFS
   IFS='#'
   read host_name ip <<< "$2"
   IFS=$old_ifs
   
+  local file=/etc/icinga/objects/${host_name}_icinga.cfg
+  if [[ $1 == $MONITORING_VENDOR_NAGIOS ]]; then
+    file=/etc/nagios3/conf.d/${host_name}_nagios2.cfg
+  fi
+  
   if [ $(grep "host_name $host_name" $file 2>/dev/null | wc -l) -gt 0 ]; then
     print "$1 host" $host_name "already defined, skipping it."
     return
   fi
 
-    # TODO add more services based on what kind of host it is.
+  # TODO add more services based on what kind of host it is.
   cat >> $file <<EOF
 define host {
   use generic-host

From 336e4fce291262bdafb3e51f9729a99c2f855147 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 3 May 2012 15:26:59 +0200
Subject: [PATCH 0743/2585] - added default ("unknown") value to the
 com.escenic.environment, in   case it isn't set. This ensure that
 Nursery/fileSystemRoot doesn't   try to resolve a path with a double slash in
 it.

---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 05c35d54..9f7b9da7 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -180,7 +180,7 @@ function set_up_assembly_tool() {
   run cp -r layers/host layers/vosa
   cat > layers/environment/Files.properties <<EOF
 \$class=neo.nursery.FileSystemDepot
-fileSystemRoot = $escenic_conf_dir/engine/environment/\${com.escenic.environment}/
+fileSystemRoot = $escenic_conf_dir/engine/environment/\${com.escenic.environment "unknown"}/
 EOF
   cat > layers/instance/Files.properties <<EOF
 \$class=neo.nursery.FileSystemDepot

From b34a6ea5994816e3f46a1c1ab287481097f800ae Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 3 May 2012 15:35:51 +0200
Subject: [PATCH 0744/2585] - since systme-info is a pre-requisite for
 install_system_info /   :5678, the install_system_info now installs the  
 escenic-common-scripts (if we're on a Debian based system).

---
 usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index e0be3a8e..ce8cc8f7 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -392,7 +392,7 @@ function install_system_info() {
   
   print_and_log "Setting up self-reporting module on $HOSTNAME ..."
   
-  install_packages_if_missing thttpd
+  install_packages_if_missing thttpd escenic-common-scripts
   assert_pre_requisite thttpd
 
   local port=${fai_reporting_port-5678}

From 845f34b25128c48db4ce59657ca57fce5d5cc849 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 3 May 2012 15:39:54 +0200
Subject: [PATCH 0745/2585] - added default instance "default" in case none is
 passed (to Nursery).

---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 9f7b9da7..d521315b 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -184,7 +184,7 @@ fileSystemRoot = $escenic_conf_dir/engine/environment/\${com.escenic.environment
 EOF
   cat > layers/instance/Files.properties <<EOF
 \$class=neo.nursery.FileSystemDepot
-fileSystemRoot = $escenic_conf_dir/engine/instance/\${com.escenic.instance}/
+fileSystemRoot = $escenic_conf_dir/engine/instance/\${com.escenic.instance "default"}/
 EOF
   cat > layers/vosa/Files.properties <<EOF
 \$class=neo.nursery.FileSystemDepot

From 0cff93587072f8f3a105c3b93dd436093c04911f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 3 May 2012 15:44:02 +0200
Subject: [PATCH 0746/2585] - moved nursey configuration moved from default to
 common Nursery   layer

---
 .../escenic/engine/{default => common}/Database.properties.erb    | 0
 .../etc/escenic/engine/{default => common}/Initial.properties.erb | 0
 .../etc/escenic/engine/{default => common}/RMI.properties.erb     | 0
 .../engine/{default => common}/ServerConfig.properties.erb        | 0
 .../escenic/migration/filter/HTMLCleanupSAXFilter.properties.erb  | 0
 .../migration/filter/PostTidyRegExFieldCleaner.properties.erb     | 0
 .../migration/filter/PreTidyRegExFieldCleaner.properties.erb      | 0
 .../com/escenic/profile/LoginLaw.properties.erb                   | 0
 .../com/escenic/profile/LoginLawCache.properties.erb              | 0
 .../com/escenic/profile/MailNotifier.properties.erb               | 0
 .../com/escenic/profile/ProfileManager.properties.erb             | 0
 .../profile/presentation/UserPresentationCache.properties.erb     | 0
 .../com/escenic/profile/schedule/CleanupSchedule.properties.erb   | 0
 .../com/escenic/profile/schedule/PardonSchedule.properties.erb    | 0
 .../com/escenic/profile/service/CleanupService.properties.erb     | 0
 .../com/escenic/profile/service/PardonOfficer.properties.erb      | 0
 .../com/escenic/schedule/OccurrenceHelper.properties.erb          | 0
 .../service/webcache/OracleInvalidationService.properties.erb     | 0
 .../service/webcache/SquidInvalidationService.properties.erb      | 0
 .../syndication/xml/ExampleReportConfiguration.properties.erb     | 0
 .../escenic/syndication/xml/ExportConfiguration.properties.erb    | 0
 .../com/escenic/syndication/xml/ExportManager.properties.erb      | 0
 .../com/escenic/syndication/xml/ImportReporter.properties.erb     | 0
 .../com/escenic/syndication/xml/XMLImportService.properties.erb   | 0
 .../syndication/xml/service/MigrationSetupService.properties.erb  | 0
 .../com/escenic/transformers/StringSchedule.properties.erb        | 0
 .../webservice/search/DelegatingSearchEngine.properties.erb       | 0
 .../com/escenic/webstart/StudioConfig.properties.erb              | 0
 .../com/escenic/webstudio/Preferences.properties.erb              | 0
 .../{default => common}/connector/ReadConnector.properties.erb    | 0
 .../{default => common}/connector/UpdateConnector.properties.erb  | 0
 .../{default => common}/io/api/MediaCategories.properties.erb     | 0
 .../io/api/media/JMagickVersionGenerator.properties.erb           | 0
 .../io/api/media/ProxyVersionGenerator.properties.erb             | 0
 .../neo/io/content/DependentCacheManager.properties.erb           | 0
 .../neo/io/managers/AgreementManager.properties.erb               | 0
 .../neo/io/managers/ContentManager.properties.erb                 | 0
 .../neo/io/managers/HubConnectionManager.properties.erb           | 0
 .../neo/io/repository/LocalFileSystem.properties.erb              | 0
 .../neo/io/repository/RealRepository.properties.erb               | 0
 .../neo/io/repository/SectionRepository.properties.erb            | 0
 .../neo/io/schedules/ArticleCleaner.properties.erb                | 0
 .../neo/io/schedules/DeleteArticlesService.properties.erb         | 0
 .../neo/io/schedules/ExternalContentUpdater.properties.erb        | 0
 .../neo/io/schedules/HtmlCacheRefreshSchedule.properties.erb      | 0
 .../neo/io/schedules/PoolCleaner.properties.erb                   | 0
 .../neo/io/search/DB2QueryTranslator.properties.erb               | 0
 .../neo/io/search/MsSQLQueryTranslator.properties.erb             | 0
 .../neo/io/search/OracleFullText.properties.erb                   | 0
 .../neo/io/search/OracleQueryTranslator.properties.erb            | 0
 .../neo/io/search/SearchManager.properties.erb                    | 0
 .../neo/io/search/SybaseQueryTranslator.properties.erb            | 0
 .../neo/io/services/ActivationService.properties.erb              | 0
 .../neo/io/services/DefaultPoolRemovePolicy.properties.erb        | 0
 .../neo/io/services/DeleteArticlesService.properties.erb          | 0
 .../neo/io/services/ExternalContentManager.properties.erb         | 0
 .../{default => common}/neo/io/services/MailSender.properties.erb | 0
 .../neo/io/services/PoolRemoveService.properties.erb              | 0
 .../neo/io/services/RepositoryService.properties.erb              | 0
 .../neo/publications/GenericPublication.properties.erb            | 0
 .../{default => common}/neo/util/PostCardSender.properties.erb    | 0
 61 files changed, 0 insertions(+), 0 deletions(-)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/Database.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/Initial.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/RMI.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/ServerConfig.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/com/escenic/migration/filter/HTMLCleanupSAXFilter.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/com/escenic/migration/filter/PostTidyRegExFieldCleaner.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/com/escenic/migration/filter/PreTidyRegExFieldCleaner.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/com/escenic/profile/LoginLaw.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/com/escenic/profile/LoginLawCache.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/com/escenic/profile/MailNotifier.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/com/escenic/profile/ProfileManager.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/com/escenic/profile/presentation/UserPresentationCache.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/com/escenic/profile/schedule/CleanupSchedule.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/com/escenic/profile/schedule/PardonSchedule.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/com/escenic/profile/service/CleanupService.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/com/escenic/profile/service/PardonOfficer.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/com/escenic/schedule/OccurrenceHelper.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/com/escenic/service/webcache/OracleInvalidationService.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/com/escenic/service/webcache/SquidInvalidationService.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/com/escenic/syndication/xml/ExampleReportConfiguration.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/com/escenic/syndication/xml/ExportConfiguration.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/com/escenic/syndication/xml/ExportManager.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/com/escenic/syndication/xml/ImportReporter.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/com/escenic/syndication/xml/XMLImportService.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/com/escenic/syndication/xml/service/MigrationSetupService.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/com/escenic/transformers/StringSchedule.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/com/escenic/webservice/search/DelegatingSearchEngine.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/com/escenic/webstart/StudioConfig.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/com/escenic/webstudio/Preferences.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/connector/ReadConnector.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/connector/UpdateConnector.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/io/api/MediaCategories.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/io/api/media/JMagickVersionGenerator.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/io/api/media/ProxyVersionGenerator.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/neo/io/content/DependentCacheManager.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/neo/io/managers/AgreementManager.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/neo/io/managers/ContentManager.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/neo/io/managers/HubConnectionManager.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/neo/io/repository/LocalFileSystem.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/neo/io/repository/RealRepository.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/neo/io/repository/SectionRepository.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/neo/io/schedules/ArticleCleaner.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/neo/io/schedules/DeleteArticlesService.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/neo/io/schedules/ExternalContentUpdater.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/neo/io/schedules/HtmlCacheRefreshSchedule.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/neo/io/schedules/PoolCleaner.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/neo/io/search/DB2QueryTranslator.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/neo/io/search/MsSQLQueryTranslator.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/neo/io/search/OracleFullText.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/neo/io/search/OracleQueryTranslator.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/neo/io/search/SearchManager.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/neo/io/search/SybaseQueryTranslator.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/neo/io/services/ActivationService.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/neo/io/services/DefaultPoolRemovePolicy.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/neo/io/services/DeleteArticlesService.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/neo/io/services/ExternalContentManager.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/neo/io/services/MailSender.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/neo/io/services/PoolRemoveService.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/neo/io/services/RepositoryService.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/neo/publications/GenericPublication.properties.erb (100%)
 rename usr/share/puppet/modules/escenic/templates/etc/escenic/engine/{default => common}/neo/util/PostCardSender.properties.erb (100%)

diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/Database.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/Database.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/Database.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/Database.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/Initial.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/Initial.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/Initial.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/Initial.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/RMI.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/RMI.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/RMI.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/RMI.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/ServerConfig.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/ServerConfig.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/ServerConfig.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/ServerConfig.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/migration/filter/HTMLCleanupSAXFilter.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/migration/filter/HTMLCleanupSAXFilter.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/migration/filter/HTMLCleanupSAXFilter.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/migration/filter/HTMLCleanupSAXFilter.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/migration/filter/PostTidyRegExFieldCleaner.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/migration/filter/PostTidyRegExFieldCleaner.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/migration/filter/PostTidyRegExFieldCleaner.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/migration/filter/PostTidyRegExFieldCleaner.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/migration/filter/PreTidyRegExFieldCleaner.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/migration/filter/PreTidyRegExFieldCleaner.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/migration/filter/PreTidyRegExFieldCleaner.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/migration/filter/PreTidyRegExFieldCleaner.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/LoginLaw.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/profile/LoginLaw.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/LoginLaw.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/profile/LoginLaw.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/LoginLawCache.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/profile/LoginLawCache.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/LoginLawCache.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/profile/LoginLawCache.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/MailNotifier.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/profile/MailNotifier.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/MailNotifier.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/profile/MailNotifier.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/ProfileManager.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/profile/ProfileManager.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/ProfileManager.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/profile/ProfileManager.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/presentation/UserPresentationCache.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/profile/presentation/UserPresentationCache.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/presentation/UserPresentationCache.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/profile/presentation/UserPresentationCache.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/schedule/CleanupSchedule.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/profile/schedule/CleanupSchedule.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/schedule/CleanupSchedule.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/profile/schedule/CleanupSchedule.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/schedule/PardonSchedule.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/profile/schedule/PardonSchedule.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/schedule/PardonSchedule.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/profile/schedule/PardonSchedule.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/service/CleanupService.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/profile/service/CleanupService.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/service/CleanupService.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/profile/service/CleanupService.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/service/PardonOfficer.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/profile/service/PardonOfficer.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/profile/service/PardonOfficer.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/profile/service/PardonOfficer.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/schedule/OccurrenceHelper.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/schedule/OccurrenceHelper.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/schedule/OccurrenceHelper.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/schedule/OccurrenceHelper.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/service/webcache/OracleInvalidationService.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/service/webcache/OracleInvalidationService.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/service/webcache/OracleInvalidationService.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/service/webcache/OracleInvalidationService.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/service/webcache/SquidInvalidationService.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/service/webcache/SquidInvalidationService.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/service/webcache/SquidInvalidationService.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/service/webcache/SquidInvalidationService.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/syndication/xml/ExampleReportConfiguration.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/syndication/xml/ExampleReportConfiguration.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/syndication/xml/ExampleReportConfiguration.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/syndication/xml/ExampleReportConfiguration.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/syndication/xml/ExportConfiguration.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/syndication/xml/ExportConfiguration.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/syndication/xml/ExportConfiguration.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/syndication/xml/ExportConfiguration.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/syndication/xml/ExportManager.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/syndication/xml/ExportManager.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/syndication/xml/ExportManager.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/syndication/xml/ExportManager.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/syndication/xml/ImportReporter.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/syndication/xml/ImportReporter.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/syndication/xml/ImportReporter.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/syndication/xml/ImportReporter.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/syndication/xml/XMLImportService.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/syndication/xml/XMLImportService.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/syndication/xml/XMLImportService.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/syndication/xml/XMLImportService.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/syndication/xml/service/MigrationSetupService.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/syndication/xml/service/MigrationSetupService.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/syndication/xml/service/MigrationSetupService.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/syndication/xml/service/MigrationSetupService.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/transformers/StringSchedule.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/transformers/StringSchedule.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/transformers/StringSchedule.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/transformers/StringSchedule.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/webservice/search/DelegatingSearchEngine.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/webservice/search/DelegatingSearchEngine.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/webservice/search/DelegatingSearchEngine.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/webservice/search/DelegatingSearchEngine.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/webstart/StudioConfig.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/webstart/StudioConfig.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/webstart/StudioConfig.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/webstart/StudioConfig.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/webstudio/Preferences.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/webstudio/Preferences.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/com/escenic/webstudio/Preferences.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/com/escenic/webstudio/Preferences.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/connector/ReadConnector.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/connector/ReadConnector.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/connector/ReadConnector.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/connector/ReadConnector.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/connector/UpdateConnector.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/connector/UpdateConnector.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/connector/UpdateConnector.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/connector/UpdateConnector.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/io/api/MediaCategories.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/io/api/MediaCategories.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/io/api/MediaCategories.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/io/api/MediaCategories.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/io/api/media/JMagickVersionGenerator.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/io/api/media/JMagickVersionGenerator.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/io/api/media/JMagickVersionGenerator.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/io/api/media/JMagickVersionGenerator.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/io/api/media/ProxyVersionGenerator.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/io/api/media/ProxyVersionGenerator.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/io/api/media/ProxyVersionGenerator.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/io/api/media/ProxyVersionGenerator.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/content/DependentCacheManager.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/content/DependentCacheManager.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/content/DependentCacheManager.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/content/DependentCacheManager.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/managers/AgreementManager.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/managers/AgreementManager.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/managers/AgreementManager.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/managers/AgreementManager.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/managers/ContentManager.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/managers/ContentManager.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/managers/ContentManager.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/managers/ContentManager.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/managers/HubConnectionManager.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/managers/HubConnectionManager.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/managers/HubConnectionManager.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/managers/HubConnectionManager.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/repository/LocalFileSystem.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/repository/LocalFileSystem.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/repository/LocalFileSystem.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/repository/LocalFileSystem.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/repository/RealRepository.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/repository/RealRepository.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/repository/RealRepository.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/repository/RealRepository.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/repository/SectionRepository.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/repository/SectionRepository.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/repository/SectionRepository.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/repository/SectionRepository.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/schedules/ArticleCleaner.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/schedules/ArticleCleaner.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/schedules/ArticleCleaner.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/schedules/ArticleCleaner.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/schedules/DeleteArticlesService.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/schedules/DeleteArticlesService.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/schedules/DeleteArticlesService.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/schedules/DeleteArticlesService.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/schedules/ExternalContentUpdater.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/schedules/ExternalContentUpdater.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/schedules/ExternalContentUpdater.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/schedules/ExternalContentUpdater.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/schedules/HtmlCacheRefreshSchedule.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/schedules/HtmlCacheRefreshSchedule.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/schedules/HtmlCacheRefreshSchedule.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/schedules/HtmlCacheRefreshSchedule.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/schedules/PoolCleaner.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/schedules/PoolCleaner.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/schedules/PoolCleaner.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/schedules/PoolCleaner.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/search/DB2QueryTranslator.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/search/DB2QueryTranslator.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/search/DB2QueryTranslator.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/search/DB2QueryTranslator.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/search/MsSQLQueryTranslator.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/search/MsSQLQueryTranslator.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/search/MsSQLQueryTranslator.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/search/MsSQLQueryTranslator.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/search/OracleFullText.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/search/OracleFullText.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/search/OracleFullText.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/search/OracleFullText.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/search/OracleQueryTranslator.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/search/OracleQueryTranslator.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/search/OracleQueryTranslator.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/search/OracleQueryTranslator.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/search/SearchManager.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/search/SearchManager.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/search/SearchManager.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/search/SearchManager.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/search/SybaseQueryTranslator.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/search/SybaseQueryTranslator.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/search/SybaseQueryTranslator.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/search/SybaseQueryTranslator.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/ActivationService.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/services/ActivationService.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/ActivationService.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/services/ActivationService.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/DefaultPoolRemovePolicy.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/services/DefaultPoolRemovePolicy.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/DefaultPoolRemovePolicy.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/services/DefaultPoolRemovePolicy.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/DeleteArticlesService.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/services/DeleteArticlesService.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/DeleteArticlesService.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/services/DeleteArticlesService.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/ExternalContentManager.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/services/ExternalContentManager.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/ExternalContentManager.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/services/ExternalContentManager.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/MailSender.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/services/MailSender.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/MailSender.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/services/MailSender.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/PoolRemoveService.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/services/PoolRemoveService.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/PoolRemoveService.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/services/PoolRemoveService.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/RepositoryService.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/services/RepositoryService.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/io/services/RepositoryService.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/io/services/RepositoryService.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/publications/GenericPublication.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/publications/GenericPublication.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/publications/GenericPublication.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/publications/GenericPublication.properties.erb
diff --git a/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/util/PostCardSender.properties.erb b/usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/util/PostCardSender.properties.erb
similarity index 100%
rename from usr/share/puppet/modules/escenic/templates/etc/escenic/engine/default/neo/util/PostCardSender.properties.erb
rename to usr/share/puppet/modules/escenic/templates/etc/escenic/engine/common/neo/util/PostCardSender.properties.erb

From 296fbd285c368dc478c184a876de34a6dd8c3ab7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 3 May 2012 15:51:22 +0200
Subject: [PATCH 0747/2585] - fixed the index.html, for a while, it has been
 chopped up

---
 usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index ce8cc8f7..9a755cfc 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -317,7 +317,7 @@ EOF
     echo '<li><a href="/icinga">Icinga</a> (an enhanced Nagios)</li>' \
       >> $file
   fi
-  cat > $file <<EOF
+  cat >> $file <<EOF
       <li><a href="/munin">Munin</a></li>
     </ul>
   </body>

From c9931cf5678f7537c30653abb5e6c8987daee2aa Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 3 May 2012 16:00:29 +0200
Subject: [PATCH 0748/2585] - moved add_next_step to common-bashing - added new
 method to list the next steps (array), available in   common-bashing - moved
 the add_apt_source to common-os

---
 usr/sbin/ece-install                          | 37 +------------------
 .../escenic/ece-scripts/common-bashing.sh     | 22 +++++++++++
 usr/share/escenic/ece-scripts/common-os.sh    | 12 ++++++
 3 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index a99024cb..bd10c6cc 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -75,11 +75,6 @@ force_packages=0
 # ECE software components.
 ece_software_setup_completed=0
 
-# the next steps printed when the user has installed his/her
-# components.
-next_steps=()
-
-
 technet_download_list="
 http://technet.escenic.com/downloads/assemblytool-2.0.2.zip
 http://technet.escenic.com/downloads/release/53/analysis-engine-2.3.7.0.zip
@@ -329,10 +324,8 @@ function print_status_and_next_steps()
         add_next_step "Install info: "\ "/usr/share/doc/escenic/ece-install-guide.txt"
         add_next_step "Guide books: http://documentation.vizrt.com/ece-5.3.html"
     fi
-    
-    for (( i = 0; i < ${#next_steps[@]}; i++ )); do
-        print "  - " ${next_steps[$i]}
-    done
+
+    print_next_step_list
 
     print $'\n'"Enjoy your time with Escenic Content Engine!"$'\n'
     print "-$(red Vizrt) Online"
@@ -605,32 +598,6 @@ function common_pre_install()
     set_up_user_environment
 }
 
-function add_apt_source() {
-  local escenic_sources=/etc/apt/sources.list.d/escenic.list
-  if [[ ! -e $escenic_sources &&
-        $(grep "$@" /etc/apt/sources.list | wc -l) -lt 1 ]]; then
-    echo "$@" >> $escenic_sources
-    run apt-get update
-  elif [ $(grep "$@" $escenic_sources | wc -l) -lt 1 ]; then
-    echo "$@" >> $escenic_sources
-    run apt-get update
-  fi
-}
-
-# Parameters:
-# $1 : your added line
-function add_next_step()
-{
-    next_steps[${#next_steps[@]}]="$@"
-    return
-    
-    if [ -n "$next_steps" ]; then
-        next_steps=${next_steps}$'\n'"[$(basename $0)] "${1}
-    else
-        next_steps="[$(basename $0)] $@"
-    fi
-}
-
 # $1 is the default instance name, the calee is responsible for
 # setting this.
 function ask_for_instance_name()
diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index 902f0524..2e7aca77 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -243,3 +243,25 @@ function extract_archive() {
   fi
 }
 
+# the next steps printed when the user has installed his/her
+# components.
+next_steps=()
+
+## Parameters:
+## $1 : your added line
+function add_next_step() {
+  next_steps[${#next_steps[@]}]="$@"
+  return
+  
+  if [ -n "$next_steps" ]; then
+    next_steps=${next_steps}$'\n'"[$(basename $0)] "${1}
+  else
+    next_steps="[$(basename $0)] $@"
+  fi
+}
+
+function print_next_step_list() {
+  for (( i = 0; i < ${#next_steps[@]}; i++ )); do
+    print "  - " ${next_steps[$i]}
+  done
+}
diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index a0c0685a..6b3d8822 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -164,3 +164,15 @@ function get_total_memory_in_mega_bytes() {
     echo $(( $total_in_kb / 1024 ))
   fi
 }
+
+function add_apt_source() {
+  local escenic_sources=/etc/apt/sources.list.d/escenic.list
+  if [[ ! -e $escenic_sources &&
+        $(grep "$@" /etc/apt/sources.list | wc -l) -lt 1 ]]; then
+    echo "$@" >> $escenic_sources
+    run apt-get update
+  elif [ $(grep "$@" $escenic_sources | wc -l) -lt 1 ]; then
+    echo "$@" >> $escenic_sources
+    run apt-get update
+  fi
+}

From 3cbe422d1b3d7fcd6bb835034773033220f3dca8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 3 May 2012 16:07:17 +0200
Subject: [PATCH 0749/2585] - common_pre_install now sets up the Vizrt APT
 repository and installs   escenic-common-scripts. - simplified the set up of
 the ece-scripts package in ece-scripts.sh

---
 usr/sbin/ece-install                               | 14 ++++++++++++++
 .../ece-scripts/ece-install.d/ece-scripts.sh       | 11 +----------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index bd10c6cc..a9d7d025 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -211,6 +211,20 @@ function install_common_os_packages()
   for el in lsb_release curl wget git unzip; do
     assert_pre_requisite $el
   done
+
+  # all hosts need the system-info package, hence we'll install the
+  # escenic-content-engine package here if on a Debian based
+  # system. If not, we'll just leave it, it'll be made available on
+  # ther systems through git.
+  if [ $on_debian_or_derivative -eq 1 ]; then
+    curl -s http://apt.vizrt.com/archive.key 2>> $log | \
+      apt-key add - 1>> $log 2>> $log
+    local package_pool=${fai_apt_vizrt_pool-stable}
+    add_apt_source "deb http://apt.vizrt.com ${package_pool} main"
+
+    install_packages_if_missing escenic-common-scripts
+  fi
+  
 }
 
 # don't quote values when setting conf file values with
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh b/usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh
index 8a8d948c..7809dc33 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh
@@ -2,15 +2,6 @@
 
 # code for the ece-scripts themselves
 
-function install_ece_scripts_with_apt() {
-  curl -s http://apt.vizrt.com/archive.key 2>> $log | \
-    apt-key add - 1>> $log 2>> $log
-
-  local package_pool=${fai_apt_vizrt_pool-stable}
-  add_apt_source "deb http://apt.vizrt.com ${package_pool} main"
-  install_packages_if_missing escenic-content-engine-scripts
-}
-
 function install_ece_scripts_with_git() {
   run cd $download_dir
   if [ -d ece-scripts ]; then
@@ -50,7 +41,7 @@ function set_up_ece_scripts()
   print_and_log 'Setting up the ece UNIX scripts ...'
 
   if [ $on_debian_or_derivative -eq 1 ]; then
-    install_ece_scripts_with_apt
+    install_packages_if_missing escenic-content-engine-scripts
   else
     install_ece_scripts_with_git
   fi

From f2d47e0e744f5929dbb726956cc71462f1261773 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 3 May 2012 16:22:01 +0200
Subject: [PATCH 0750/2585] - added remove_dir

---
 usr/share/escenic/ece-scripts/common-io.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/common-io.sh b/usr/share/escenic/ece-scripts/common-io.sh
index c4c42b17..15370c28 100644
--- a/usr/share/escenic/ece-scripts/common-io.sh
+++ b/usr/share/escenic/ece-scripts/common-io.sh
@@ -67,6 +67,12 @@ function make_dir() {
   fi
 }
 
+function remove_dir() {
+  if [ -d $1 ]; then
+    run rmdir $1
+  fi
+}
+
 function make_ln() {
   if [ $2 ]; then
     if [ -e $1 -a ! -h $2 ]; then

From df0cc9d09c5992f383dc615af1e2212206c570b5 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 3 May 2012 16:37:13 +0200
Subject: [PATCH 0751/2585] - the nagios & icinga have been excluded from the
 summary for a while   :( Fixed now

---
 usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index 9a755cfc..cc36a2b5 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -312,10 +312,9 @@ function create_monitoring_server_overview()
     <ul>
 EOF
   if [[ $1 == $MONITORING_VENDOR_NAGIOS ]]; then
-    echo '<li><a href="/nagios3">Nagios</a></li>' \
-      else
-    echo '<li><a href="/icinga">Icinga</a> (an enhanced Nagios)</li>' \
-      >> $file
+    echo '<li><a href="/nagios3">Nagios</a></li>' >> $file
+  else
+    echo '<li><a href="/icinga">Icinga</a> (an enhanced Nagios)</li>' >> $file
   fi
   cat >> $file <<EOF
       <li><a href="/munin">Munin</a></li>

From 71cc2544aa1f7ef734dfb8cc3034970c6530127c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 3 May 2012 16:47:29 +0200
Subject: [PATCH 0752/2585] - added vizrt CSS (from vizrt.css) and vizrt SVG
 (from svg html include)

---
 usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index cc36a2b5..2e61d20a 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -307,7 +307,13 @@ function create_monitoring_server_overview()
   local file=/var/www/index.html
   cat > $file <<EOF
 <html>
+  <head>
+    <style type="text/css">
+$(cat < ../vizrt.css)   
+    </style>
+  </head>
   <body>
+$(cat < ../vizrt-logo-svg.html)
     <h1>Welcome to the might monitoring server @ ${HOSTNAME}</h1>
     <ul>
 EOF

From 0dcf0a05b4df56dc3288002addd1b133c314b3a8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 3 May 2012 16:52:08 +0200
Subject: [PATCH 0753/2585] - (hopefully) fixed external file includes

---
 usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index 2e61d20a..5fbdf211 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -309,11 +309,11 @@ function create_monitoring_server_overview()
 <html>
   <head>
     <style type="text/css">
-$(cat < ../vizrt.css)   
+$(cat ../vizrt.css)   
     </style>
   </head>
   <body>
-$(cat < ../vizrt-logo-svg.html)
+$(cat ../vizrt-logo-svg.html)
     <h1>Welcome to the might monitoring server @ ${HOSTNAME}</h1>
     <ul>
 EOF

From cd5d6461f02637f80c33d0b7e650b9aed11333ce Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 3 May 2012 16:58:42 +0200
Subject: [PATCH 0754/2585] - should no longer add duplicate entries in  
 /etc/munin/munin-conf.d/escenic.conf - fixed indentation in
 /etc/munin/munin-conf.d/escenic.conf

---
 .../ece-scripts/ece-install.d/monitoring.sh     | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index 5fbdf211..93178770 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -274,12 +274,16 @@ function install_munin_gatherer()
   fi
 
   for el in $node_list; do
-    print_and_log "Adding ${el} to the Munin gatherer on ${HOSTNAME} ..."
     local file=/etc/munin/munin-conf.d/escenic.conf
+    if [ $(grep "\[${el}\]" $file | wc -l) -eq 0 ]; then
+      continue
+    fi
+    
+    print_and_log "Adding ${el} to the Munin gatherer on ${HOSTNAME} ..."
     cat >> $file <<EOF
-    [${el}]
-    address $(get_ip $el)
-    use_node_name yes
+[${el}]
+address $(get_ip $el)
+use_node_name yes
 EOF
   done
 
@@ -318,9 +322,10 @@ $(cat ../vizrt-logo-svg.html)
     <ul>
 EOF
   if [[ $1 == $MONITORING_VENDOR_NAGIOS ]]; then
-    echo '<li><a href="/nagios3">Nagios</a></li>' >> $file
+    echo '    <li><a href="/nagios3">Nagios</a></li>' >> $file
   else
-    echo '<li><a href="/icinga">Icinga</a> (an enhanced Nagios)</li>' >> $file
+    echo '    <li><a href="/icinga">Icinga</a> (an enhanced Nagios)</li>' \
+      >> $file
   fi
   cat >> $file <<EOF
       <li><a href="/munin">Munin</a></li>

From 69a67e8e6b5eb2ee33d8de4a63e33d83af5ff2bf Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 4 May 2012 09:43:23 +0200
Subject: [PATCH 0755/2585] - added DEB control for the escenic-munin-plugins
 package

---
 .../package-scripts/debian/escenic-munin-plugins/control | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 usr/share/escenic/package-scripts/debian/escenic-munin-plugins/control

diff --git a/usr/share/escenic/package-scripts/debian/escenic-munin-plugins/control b/usr/share/escenic/package-scripts/debian/escenic-munin-plugins/control
new file mode 100644
index 00000000..e6bb528d
--- /dev/null
+++ b/usr/share/escenic/package-scripts/debian/escenic-munin-plugins/control
@@ -0,0 +1,9 @@
+Package: escenic-munin-plugins
+Version: VERSION
+Section: base
+Priority: optional
+Architecture: all
+Maintainer: MAINTAINER_NAME <MAINTAINER_EMAIL>
+Description: Munin plugins for the Escenic Content Engine.
+
+ 
\ No newline at end of file

From b8e0236da943e4e4244ebc293a29c50821f0d150 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 4 May 2012 10:03:53 +0200
Subject: [PATCH 0756/2585] - added postinst for escenic-munin-plugins which
 re-runs the   munin-node link generation/plugins install.

---
 .../package-scripts/debian/escenic-munin-plugins/postinst   | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100755 usr/share/escenic/package-scripts/debian/escenic-munin-plugins/postinst

diff --git a/usr/share/escenic/package-scripts/debian/escenic-munin-plugins/postinst b/usr/share/escenic/package-scripts/debian/escenic-munin-plugins/postinst
new file mode 100755
index 00000000..97ca45fa
--- /dev/null
+++ b/usr/share/escenic/package-scripts/debian/escenic-munin-plugins/postinst
@@ -0,0 +1,6 @@
+#! /usr/bin/env bash
+
+munin-node-configure --shell --suggest | bash
+
+exit 0
+

From 686dda340cbcc15ccde1e2b39fb1fe53822fc610 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 4 May 2012 10:29:27 +0200
Subject: [PATCH 0757/2585] - added building of the escenic-munin-plugins
 package

- added -l switch to list all the packages the script can build. Using
  this, it's easy to generate all the packages like this:

  for el in $(bash ./create-packages -l); do
    bash create-packages -p $el;
  done

- moved the setting up of the individual packages into package
  specific methods. A few lines of common code is kept.
---
 .../escenic/package-scripts/create-packages   | 168 +++++++++++-------
 1 file changed, 103 insertions(+), 65 deletions(-)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 17c3257c..386fa18a 100644
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -10,14 +10,23 @@ package_name=escenic-content-engine-installer
 package_version=$(date +%Y-%m-%d.%H%M%S)
 default_maintainer_name="Torstein Krause Johansen"
 default_maintainer_email=tkj@vizrt.com
+wget_opts="--continue --inet4-only --quiet"
 
 function clean_up() {
   rm -rf $target_dir
 }
 
+function list_packages_that_can_be_built() {
+  declare -F | grep set_up | cut -d'_' -f3-
+}
+
 function get_user_options() {
-  while getopts ":p:e:n:r:" opt; do
+  while getopts ":p:e:n:r:l" opt; do
     case $opt in
+      l)
+        list_packages_that_can_be_built
+        exit 0
+        ;;
       e)
         maintainer_email=${OPTARG}
         ;;
@@ -43,73 +52,17 @@ function get_user_options() {
   
 }
 
-function set_up_target_directory() {
-  mkdir -p $target_dir/{etc,usr,/etc/default}
-  mkdir -p $target_dir/usr/{bin,sbin,share/doc}
-  
+function create_target_directory() {
   if [[ $package_name == "escenic-content-engine-installer" ]]; then
-    mkdir -p $target_dir/usr/share/doc/escenic
-    mkdir -p $target_dir/usr/share/escenic/ece-scripts
-    
-    cp -r ../../../sbin/{ece-install,drop-and-create-ecedb} $target_dir/usr/sbin/
-    cp -r ../../escenic/ece-scripts/ece-install.d/ \
-      $target_dir/usr/share/escenic/ece-scripts/
-    cp -r ../../doc/escenic/ece-install-guide.{org,html} \
-      $target_dir/usr/share/doc/escenic
-    
+    set_up_escenic-content-engine-installer
   elif [[ $package_name == "escenic-content-engine-scripts" ]]; then
-    mkdir -p $target_dir/etc/init.d
-    mkdir -p $target_dir/usr/share/doc/escenic
-    mkdir -p $target_dir/usr/share/escenic/ece-scripts
-    mkdir -p $target_dir/etc/bash_completion.d
-
-    # bin
-    cp -r ../../../bin/ece $target_dir/usr/bin/
-    cp -r ../../escenic/ece-scripts/ece.d/ \
-      $target_dir/usr/share/escenic/ece-scripts/
-
-    # conf
-    cp -r ../../../../etc/escenic/ $target_dir/etc/
-    cp -r ../../../../etc/bash_completion.d/ece \
-      $target_dir/etc/bash_completion.d
-    cp -r ../../../../etc/default/ece $target_dir/etc/default/
-    cp -r ../../../../etc/init.d/ece $target_dir/etc/init.d/
-
-    # doc
-    cp -r ../../doc/escenic/ece-guide.{org,html} \
-      $target_dir/usr/share/doc/escenic
-    
+    set_up_escenic-content-engine-installer
   elif [[ $package_name == "vosa" ]]; then
-    mkdir -p $target_dir/usr/share/doc/vosa
-    mkdir -p $target_dir/etc/bash_completion.d
-    
-    cp -r ../../../bin/vosa $target_dir/usr/bin/
-    cp -r ../../vizrt/ $target_dir/usr/share/
-    cp -r ../../doc/vizrt/*.org $target_dir/usr/share/doc/vosa/
-    cp -r ../../../../etc/bash_completion.d/vosa \
-      $target_dir/etc/bash_completion.d/
-    
+    set_up_vosa
   elif [[ $package_name == "escenic-common-scripts" ]]; then
-    mkdir -p $target_dir/usr/share/doc/escenic
-    mkdir -p $target_dir/usr/share/escenic/ece-scripts
-    
-    # system-info is useful for all packages, hence goes to
-    # escenic-common-scripts.
-    cp -r ../../../bin/system-info $target_dir/usr/bin/
-    cp -r ../../escenic/ece-scripts/system-info.d \
-      $target_dir/usr/share/escenic/ece-scripts/
-    cp -r ../../doc/escenic/system-info-guide.{org,html} \
-      $target_dir/usr/share/doc/escenic
-    
-    # both the installer and ece-scripts use the common scripts and
-    # web resources.
-    mkdir -p $target_dir/usr/share/escenic/ece-scripts
-    cp -r ../../escenic/ece-scripts/common* \
-      $target_dir/usr/share/escenic/ece-scripts/
-    cp -r ../../escenic/ece-scripts/*.css \
-      $target_dir/usr/share/escenic/ece-scripts/
-    cp -r ../../escenic/ece-scripts/*.html \
-      $target_dir/usr/share/escenic/ece-scripts/
+    set_up_escenic-common-scripts
+  elif [[ $package_name == "escenic-munin-plugins" ]]; then
+    set_up_escenic-munin-plugins
   fi
 
   debian_dir=$target_dir/DEBIAN
@@ -117,6 +70,91 @@ function set_up_target_directory() {
   cp debian/${package_name}/* $debian_dir
 }
 
+function set_up_escenic-content-engine-installer() {
+  mkdir -p $target_dir/{etc,usr,/etc/default}
+  mkdir -p $target_dir/usr/{bin,sbin,share/doc}
+  mkdir -p $target_dir/usr/share/doc/escenic
+  mkdir -p $target_dir/usr/share/escenic/ece-scripts
+  
+  cp -r ../../../sbin/{ece-install,drop-and-create-ecedb} $target_dir/usr/sbin/
+  cp -r ../../escenic/ece-scripts/ece-install.d/ \
+    $target_dir/usr/share/escenic/ece-scripts/
+  cp -r ../../doc/escenic/ece-install-guide.{org,html} \
+    $target_dir/usr/share/doc/escenic
+} 
+
+function set_up_escenic-content-engine-installer() {
+  mkdir -p $target_dir/{etc,usr,/etc/default}
+  mkdir -p $target_dir/usr/{bin,sbin,share/doc}
+  mkdir -p $target_dir/etc/init.d
+  mkdir -p $target_dir/usr/share/doc/escenic
+  mkdir -p $target_dir/usr/share/escenic/ece-scripts
+  mkdir -p $target_dir/etc/bash_completion.d
+
+  # bin
+  cp -r ../../../bin/ece $target_dir/usr/bin/
+  cp -r ../../escenic/ece-scripts/ece.d/ \
+    $target_dir/usr/share/escenic/ece-scripts/
+
+  # conf
+  cp -r ../../../../etc/escenic/ $target_dir/etc/
+  cp -r ../../../../etc/bash_completion.d/ece \
+    $target_dir/etc/bash_completion.d
+  cp -r ../../../../etc/default/ece $target_dir/etc/default/
+  cp -r ../../../../etc/init.d/ece $target_dir/etc/init.d/
+
+  # doc
+  cp -r ../../doc/escenic/ece-guide.{org,html} \
+    $target_dir/usr/share/doc/escenic
+}
+
+function set_up_vosa() {
+  mkdir -p $target_dir/{etc,usr,/etc/default}
+  mkdir -p $target_dir/usr/{bin,sbin,share/doc}
+  mkdir -p $target_dir/usr/share/doc/vosa
+  mkdir -p $target_dir/etc/bash_completion.d
+  
+  cp -r ../../../bin/vosa $target_dir/usr/bin/
+  cp -r ../../vizrt/ $target_dir/usr/share/
+  cp -r ../../doc/vizrt/*.org $target_dir/usr/share/doc/vosa/
+  cp -r ../../../../etc/bash_completion.d/vosa \
+    $target_dir/etc/bash_completion.d/
+}
+
+function set_up_escenic-common-scripts() {
+  mkdir -p $target_dir/{etc,usr,/etc/default}
+  mkdir -p $target_dir/usr/{bin,sbin,share/doc}
+  mkdir -p $target_dir/usr/share/doc/escenic
+  mkdir -p $target_dir/usr/share/escenic/ece-scripts
+  
+  # system-info is useful for all packages, hence goes to
+  # escenic-common-scripts.
+  cp -r ../../../bin/system-info $target_dir/usr/bin/
+  cp -r ../../escenic/ece-scripts/system-info.d \
+    $target_dir/usr/share/escenic/ece-scripts/
+  cp -r ../../doc/escenic/system-info-guide.{org,html} \
+    $target_dir/usr/share/doc/escenic
+  
+  # both the installer and ece-scripts use the common scripts and
+  # web resources.
+  cp -r ../../escenic/ece-scripts/common* \
+    $target_dir/usr/share/escenic/ece-scripts/
+  cp -r ../../escenic/ece-scripts/*.css \
+    $target_dir/usr/share/escenic/ece-scripts/
+  cp -r ../../escenic/ece-scripts/*.html \
+    $target_dir/usr/share/escenic/ece-scripts/
+}
+
+function set_up_escenic-munin-plugins() {
+  mkdir -p $target_dir/usr/share/munin/plugins
+  
+  local file=$target_dir/usr/share/munin/plugins/escenic_jstat_
+  wget $wget_opts \
+    -O $file \
+    https://github.com/mogsie/escenic-munin/raw/master/escenic_jstat_ \
+  chmod 755 $file
+}
+
 function get_name() {
   echo ${maintainer_name-$default_maintainer_name}
 }
@@ -164,6 +202,6 @@ function list_packages() {
 
 clean_up
 get_user_options $@
-set_up_target_directory
+create_target_directory
 create_packages
 list_packages

From 72b3627c678760df21140793b3c15fa60766967f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 4 May 2012 10:36:50 +0200
Subject: [PATCH 0758/2585] - set the execute bit - used echo instead of ls for
 listing the generated packages

---
 usr/share/escenic/package-scripts/create-packages | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 usr/share/escenic/package-scripts/create-packages

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
old mode 100644
new mode 100755
index 386fa18a..c86ad0ac
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -197,7 +197,7 @@ function create_packages() {
 
 function list_packages() {
   echo "Sir, the packages are now ready:"
-  ls $target_dir/*.{deb,rpm}
+  echo $target_dir/*.{deb,rpm}
 }
 
 clean_up

From 5ebb47c3033e73d66b3f15b69bdb46f57b3b75cf Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 4 May 2012 10:56:02 +0200
Subject: [PATCH 0759/2585] - the munin plugins are not git cloned from
 mogsie's github repository   at https://github.com/mogsie/escenic-munin

- this means that now, all munin plugins available on that repository,
  will be included in the escenic-munin-plugin
---
 .../escenic/package-scripts/create-packages     | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index c86ad0ac..9efe84da 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -5,7 +5,7 @@
 
 # by tkj@vizrt.com
 
-target_dir=target
+target_dir=${PWD}/target
 package_name=escenic-content-engine-installer
 package_version=$(date +%Y-%m-%d.%H%M%S)
 default_maintainer_name="Torstein Krause Johansen"
@@ -147,12 +147,15 @@ function set_up_escenic-common-scripts() {
 
 function set_up_escenic-munin-plugins() {
   mkdir -p $target_dir/usr/share/munin/plugins
-  
-  local file=$target_dir/usr/share/munin/plugins/escenic_jstat_
-  wget $wget_opts \
-    -O $file \
-    https://github.com/mogsie/escenic-munin/raw/master/escenic_jstat_ \
-  chmod 755 $file
+
+  local dir=$(mktemp -d)
+  (
+    cd $dir
+    git clone http://github.com/mogsie/escenic-munin.git
+    cp escenic-munin/*_ $target_dir/usr/share/munin/plugins
+    chmod 755 $file $target_dir/usr/share/munin/plugins
+  )
+  rm -rf $dir
 }
 
 function get_name() {

From dd0eb52463f991fc636dfefc17e008ed7d21e115 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 4 May 2012 11:24:54 +0200
Subject: [PATCH 0760/2585] - added dependency on munin-node 1.4 or up -
 removed erroneous trailing new line in the control file

---
 .../package-scripts/debian/escenic-munin-plugins/control       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/usr/share/escenic/package-scripts/debian/escenic-munin-plugins/control b/usr/share/escenic/package-scripts/debian/escenic-munin-plugins/control
index e6bb528d..b884e70e 100644
--- a/usr/share/escenic/package-scripts/debian/escenic-munin-plugins/control
+++ b/usr/share/escenic/package-scripts/debian/escenic-munin-plugins/control
@@ -1,9 +1,8 @@
 Package: escenic-munin-plugins
 Version: VERSION
+Depends: munin-node (>= 1.4)
 Section: base
 Priority: optional
 Architecture: all
 Maintainer: MAINTAINER_NAME <MAINTAINER_EMAIL>
 Description: Munin plugins for the Escenic Content Engine.
-
- 
\ No newline at end of file

From 1adccb8ab662b2afe7af06a89370d43461079efa Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 4 May 2012 11:31:34 +0200
Subject: [PATCH 0761/2585] - ece-install now sets up the Escenic Munin plugins
 by using the DEB   package from apt.vizrt.com. Non-Debian systems fall back
 to the old   wget approach.

  TODO: use standard munin-node commands to enable the escenic plugins
  instead of manually setting up the links.
---
 .../ece-scripts/ece-install.d/monitoring.sh   | 33 ++++++++++++-------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index 93178770..de542a7a 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -26,7 +26,7 @@ function install_nagios_monitoring_server()
       ${fai_monitoring_admin_password-admin}
   fi
   
-    # enable remote commands
+  # enable remote commands
   if [[ $monitoring_vendor == $MONITORING_VENDOR_NAGIOS ]]; then
     local file=/etc/nagios3/nagios.cfg
   else
@@ -182,7 +182,22 @@ allow ${escaped_munin_gather_ip}
 EOF
   fi
   
-    # install the escenic_jstat munin plugin
+  # install the escenic_jstat munin plugin
+  install_escenic_munin_plugins
+  
+  if [ $on_debian_or_derivative -eq 1 ]; then
+    run service munin-node restart
+  fi
+
+  add_next_step "A Munin node has been installed on $HOSTNAME"
+}
+
+function install_escenic_munin_plugins() {
+  if [ $on_debian_or_derivative -eq 1 ]; then
+    install_packages_if_missing escenic-munin-plugins
+    return 
+  fi
+  
   local file=/usr/share/munin/plugins/escenic_jstat_
   run wget $wget_opts \
     https://github.com/mogsie/escenic-munin/raw/master/escenic_jstat_ \
@@ -209,15 +224,15 @@ EOF
 	    make_ln escenic_jstat_ escenic_jstat_${current_instance}${module}
     done
 
-        # we need to hack a bit since escenic_jstat_ looks for
-        # instance PIDs in $escenic_run_dir ece-<instance>.pid. It's
-        # now <type>-<instance>.pid
+    # we need to hack a bit since escenic_jstat_ looks for
+    # instance PIDs in $escenic_run_dir ece-<instance>.pid. It's
+    # now <type>-<instance>.pid
     file=$escenic_run_dir/$type-${instance_name}.pid
     if [ ! -e $file ]; then
       run touch $file
     fi
 
-        # enabling the instance specific munin entries:
+    # enabling the instance specific munin entries:
     for el in /usr/share/munin/plugins/escenic_jstat_[a-z]*; do
       run cd /etc/munin/plugins
       make_ln $el
@@ -235,14 +250,8 @@ user $ece_user
 EOF
   fi
   
-  if [ $on_debian_or_derivative -eq 1 ]; then
-    run service munin-node restart
-  fi
-
-  add_next_step "A Munin node has been installed on $HOSTNAME"
 }
 
-
 function install_munin_gatherer()
 {
   print_and_log "Installing a Munin gatherer on $HOSTNAME ..."

From 315f05457880b2e176f27f9787f3be7dd6c8228f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 4 May 2012 11:47:22 +0200
Subject: [PATCH 0762/2585] - now uses wget & zip to pull the latest changes
 from mogsie's github   repo - now includes the escenic-munin-plugins
 documentation

---
 usr/share/escenic/package-scripts/create-packages | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 9efe84da..904b566c 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -147,12 +147,18 @@ function set_up_escenic-common-scripts() {
 
 function set_up_escenic-munin-plugins() {
   mkdir -p $target_dir/usr/share/munin/plugins
+  local doc_dir=$target_dir/usr/share/doc/escenic/escenic-munin-plugin
+  mkdir -p $doc_dir
 
   local dir=$(mktemp -d)
   (
     cd $dir
-    git clone http://github.com/mogsie/escenic-munin.git
-    cp escenic-munin/*_ $target_dir/usr/share/munin/plugins
+    wget $wget_opts https://github.com/mogsie/escenic-munin/zipball/master
+    unzip master
+    cp $dir/mogsie-escenic-munin*/*_ $target_dir/usr/share/munin/plugins
+    cp $dir/mogsie-escenic-munin*/README.md $doc_dir
+    cp $dir/mogsie-escenic-munin*/site/* $doc_dir
+    
     chmod 755 $file $target_dir/usr/share/munin/plugins
   )
   rm -rf $dir

From 7de0e58ceedc2e49a0e3889c103d42eb06502e6b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 4 May 2012 11:52:45 +0200
Subject: [PATCH 0763/2585] - now uses tarballs instead of ZIPs

---
 usr/share/escenic/package-scripts/create-packages | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 904b566c..561adf5f 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -153,8 +153,8 @@ function set_up_escenic-munin-plugins() {
   local dir=$(mktemp -d)
   (
     cd $dir
-    wget $wget_opts https://github.com/mogsie/escenic-munin/zipball/master
-    unzip master
+    wget $wget_opts https://github.com/mogsie/escenic-munin/tarball/master
+    tar xzf master
     cp $dir/mogsie-escenic-munin*/*_ $target_dir/usr/share/munin/plugins
     cp $dir/mogsie-escenic-munin*/README.md $doc_dir
     cp $dir/mogsie-escenic-munin*/site/* $doc_dir

From cfd64640d874c45d7cdf5056ed74c8b81b5d981c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 4 May 2012 12:13:13 +0200
Subject: [PATCH 0764/2585] - added verbose extraction of the tarball (hudson
 debugging)

---
 usr/share/escenic/package-scripts/create-packages | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 561adf5f..18ab5297 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -154,7 +154,7 @@ function set_up_escenic-munin-plugins() {
   (
     cd $dir
     wget $wget_opts https://github.com/mogsie/escenic-munin/tarball/master
-    tar xzf master
+    tar xvzf master
     cp $dir/mogsie-escenic-munin*/*_ $target_dir/usr/share/munin/plugins
     cp $dir/mogsie-escenic-munin*/README.md $doc_dir
     cp $dir/mogsie-escenic-munin*/site/* $doc_dir

From 67a8e2e0cb75ba75b69e5b5ca45fa624937fb55a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 4 May 2012 12:57:44 +0200
Subject: [PATCH 0765/2585] - confirmed that the hudson build works, removed
 the verbose   extraction.

---
 usr/share/escenic/package-scripts/create-packages | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 18ab5297..561adf5f 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -154,7 +154,7 @@ function set_up_escenic-munin-plugins() {
   (
     cd $dir
     wget $wget_opts https://github.com/mogsie/escenic-munin/tarball/master
-    tar xvzf master
+    tar xzf master
     cp $dir/mogsie-escenic-munin*/*_ $target_dir/usr/share/munin/plugins
     cp $dir/mogsie-escenic-munin*/README.md $doc_dir
     cp $dir/mogsie-escenic-munin*/site/* $doc_dir

From 2dfb27765f59fea7a048fe7d77af96a22f6d57d9 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 4 May 2012 13:00:16 +0200
Subject: [PATCH 0766/2585] - added restart of the munin-node

---
 .../package-scripts/debian/escenic-munin-plugins/postinst        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/package-scripts/debian/escenic-munin-plugins/postinst b/usr/share/escenic/package-scripts/debian/escenic-munin-plugins/postinst
index 97ca45fa..f2e83b58 100755
--- a/usr/share/escenic/package-scripts/debian/escenic-munin-plugins/postinst
+++ b/usr/share/escenic/package-scripts/debian/escenic-munin-plugins/postinst
@@ -1,6 +1,7 @@
 #! /usr/bin/env bash
 
 munin-node-configure --shell --suggest | bash
+service munin-node restart
 
 exit 0
 

From d26fd74fb5848b137502cc4c5cfc174023dcb622 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 4 May 2012 13:12:03 +0200
Subject: [PATCH 0767/2585] - will now not attempt to install sun-java6-jdk if
 the java binary in   PATH is Sun Java.

  This should fix issue #61 where the ece-install would 1) not create
  Java packages since Java is already installed (manually) on the
  machine and 2) still attempt to install the package to prevent that
  Open JDK got pulled down when installing ant.

  This means, that for systems where Java has been manually installed,
  they will still get another/Open JDK installed when installing Ant &
  friends.
---
 .../ece-scripts/ece-install.d/content-engine.sh      | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index d521315b..1dfb8ad2 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -507,10 +507,16 @@ function install_ece_third_party_packages
     echo "sun-java6-jdk shared/accepted-sun-dlj-v1-1 boolean true" | \
       debconf-set-selections
 
-    # install sun-java6-jdk first so that ant doesn't pull down
-    # OpenJDK
+    # Here, we install sun-java6-jdk first so that ant doesn't pull
+    # down OpenJDK.
+    #
+    # This if guard is in palce to not attempt to install the package
+    # if Sun Java already is installed (typically, manually
+    # installed).
     local packages="sun-java6-jdk"
-    install_packages_if_missing $packages
+    if [ $(has_sun_java_installed) -eq 0 ]; then
+      install_packages_if_missing $packages
+    fi
 
     packages="
       ant

From b1a1370362fe8b8e9a2a1fb19a3e2644f18ce25e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 4 May 2012 13:16:21 +0200
Subject: [PATCH 0768/2585] - updated documentation to match implementation;
 the monitoring node   list is defined as

  fai_monitoring_host_list="pres1#10.72.227.250 pres2#10.72.227.251"

  and not

  fai_monitoring_host_list="pres1:10.72.227.250 pres2:10.72.227.251"
---
 usr/share/doc/escenic/ece-install-guide.org               | 2 +-
 usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index a6d68eea..5a47168f 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -690,7 +690,7 @@ $HOME/ece-install.conf file of the root user:
 | fai_enabled                         | 0                                                 | Whether or not to run ece-install in FAI mode                                                                                         |
 | fai_keep_off_etc_hosts              | 0                                                 | Set this to 1 if you don't want ece-install adding entries to /etc/hosts                                                              |
 | fai_monitoring_install              | 0                                                 | Install the monitoring server profile.                                                                                                |
-| fai_monitoring_host_list            | ""                                                | Quoted, space separated list of <host>:<ip> pairs, e.g.: "pres1:10.72.227.250 pres2:10.72.227.251"                                    |
+| fai_monitoring_host_list            | ""                                                | Quoted, space separated list of <host>#<ip> pairs, e.g.: "pres1#10.72.227.250 pres2#10.72.227.251"                                    |
 | fai_monitoring_munin_node_list      | ""                                                | Set this to a whitespace separated list of nodes that munin should monitor                                                            |
 | fai_monitoring_server_ip            | 127.0.0.1                                         | The IP of the monitoring server.                                                                                                      |
 | fai_nfs_allowed_client_network      | ""                                                | IP/netmwask of allowed NFS clients, example: 192.168.1.0/255.255.255.0                                                                |
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index de542a7a..cdb5a0c3 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -74,7 +74,7 @@ function install_nagios_monitoring_server()
 ## Sets up the definition file for a given monitoring host.
 ##
 ## $1 nagios flavour/vendor
-## $2 <host name>:<ip>, e.g.: fire:192.168.1.100
+## $2 <host name>#<ip>, e.g.: fire#192.168.1.100
 function set_up_monitoring_host_def()
 {
   local old_ifs=$IFS

From 38d440b23ad21c88969819f5d268545b77bb39b3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 4 May 2012 13:23:40 +0200
Subject: [PATCH 0769/2585] - amazing how much chaos a two wee small copy and
 paste errors can do ...

---
 usr/share/escenic/package-scripts/create-packages | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 561adf5f..196e2991 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -56,7 +56,7 @@ function create_target_directory() {
   if [[ $package_name == "escenic-content-engine-installer" ]]; then
     set_up_escenic-content-engine-installer
   elif [[ $package_name == "escenic-content-engine-scripts" ]]; then
-    set_up_escenic-content-engine-installer
+    set_up_escenic-content-engine-scripts
   elif [[ $package_name == "vosa" ]]; then
     set_up_vosa
   elif [[ $package_name == "escenic-common-scripts" ]]; then
@@ -83,7 +83,7 @@ function set_up_escenic-content-engine-installer() {
     $target_dir/usr/share/doc/escenic
 } 
 
-function set_up_escenic-content-engine-installer() {
+function set_up_escenic-content-engine-scripts() {
   mkdir -p $target_dir/{etc,usr,/etc/default}
   mkdir -p $target_dir/usr/{bin,sbin,share/doc}
   mkdir -p $target_dir/etc/init.d

From 90994b27b8b40e1028562d8ca0d99f9cc50ff700 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 4 May 2012 13:36:10 +0200
Subject: [PATCH 0770/2585] - fixed error when checking for existing entries in
 the escenic.conf   from previous runs (and we're running this test on a fresh
 system).

---
 usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index cdb5a0c3..824560f8 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -284,7 +284,7 @@ function install_munin_gatherer()
 
   for el in $node_list; do
     local file=/etc/munin/munin-conf.d/escenic.conf
-    if [ $(grep "\[${el}\]" $file | wc -l) -eq 0 ]; then
+    if [[ -e $file &&  $(grep "\[${el}\]" $file | wc -l) -eq 0 ]]; then
       continue
     fi
     
@@ -331,9 +331,9 @@ $(cat ../vizrt-logo-svg.html)
     <ul>
 EOF
   if [[ $1 == $MONITORING_VENDOR_NAGIOS ]]; then
-    echo '    <li><a href="/nagios3">Nagios</a></li>' >> $file
+    echo '      <li><a href="/nagios3">Nagios</a></li>' >> $file
   else
-    echo '    <li><a href="/icinga">Icinga</a> (an enhanced Nagios)</li>' \
+    echo '      <li><a href="/icinga">Icinga</a> (an enhanced Nagios)</li>' \
       >> $file
   fi
   cat >> $file <<EOF

From bf089574534a6a13d8b6d3c794e07e2257b5527f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 4 May 2012 13:44:17 +0200
Subject: [PATCH 0771/2585] - ece-isntall show now add _all_ the hosts defined
 in the   fai_munin_node_list

---
 usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index 824560f8..c34f3a0a 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -284,7 +284,8 @@ function install_munin_gatherer()
 
   for el in $node_list; do
     local file=/etc/munin/munin-conf.d/escenic.conf
-    if [[ -e $file &&  $(grep "\[${el}\]" $file | wc -l) -eq 0 ]]; then
+    if [[ -e $file &&  $(grep '\['${el}'\]' $file | wc -l) -eq 0 ]]; then
+      print_and_log "${el} already exists on the ${HOSTNAME} Munin gatherer ..."
       continue
     fi
     

From 5220a235f67aec33728da77c9a091cb56a447312 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 4 May 2012 13:49:10 +0200
Subject: [PATCH 0772/2585] - argh

---
 usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index c34f3a0a..7965ccbc 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -284,7 +284,7 @@ function install_munin_gatherer()
 
   for el in $node_list; do
     local file=/etc/munin/munin-conf.d/escenic.conf
-    if [[ -e $file &&  $(grep '\['${el}'\]' $file | wc -l) -eq 0 ]]; then
+    if [[ -e $file &&  $(grep '\['${el}'\]' $file | wc -l) -gt 0 ]]; then
       print_and_log "${el} already exists on the ${HOSTNAME} Munin gatherer ..."
       continue
     fi

From be8851ad9a5a0087b0f00c8bf62e54e9956a5754 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 4 May 2012 13:59:37 +0200
Subject: [PATCH 0773/2585] - fixed the inclusion of web resources for the
 monitor overview

---
 .../escenic/ece-scripts/ece-install.d/monitoring.sh  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index 7965ccbc..b5a159f9 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -319,18 +319,22 @@ EOF
 function create_monitoring_server_overview()
 {
   local file=/var/www/index.html
-  cat > $file <<EOF
+  local title="Welcome to the mighty monitoring server @ ${HOSTNAME}"
+  
+cat > $file <<EOF
 <html>
   <head>
+    <title>$title</title>
     <style type="text/css">
-$(cat ../vizrt.css)   
+$(cat $(dirname $BASH_SOURCE)/../vizrt.css)
     </style>
   </head>
   <body>
-$(cat ../vizrt-logo-svg.html)
-    <h1>Welcome to the might monitoring server @ ${HOSTNAME}</h1>
+$(cat $(dirname $BASH_SOURCE)/../vizrt-logo-svg.html)
+    <h1>$title</h1>
     <ul>
 EOF
+
   if [[ $1 == $MONITORING_VENDOR_NAGIOS ]]; then
     echo '      <li><a href="/nagios3">Nagios</a></li>' >> $file
   else

From 49e819d4197d718b42835858fed01e9e747f7269 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Fri, 4 May 2012 14:37:24 +0200
Subject: [PATCH 0774/2585] Made ece-install default to try installing the
 escenic-content-engine-installer package instead of github tarballs

---
 usr/bin/vosa                                  |  6 +++-
 .../vosa/post-install-hooks/install-engine.sh | 34 ++++++++++++++-----
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 100482f4..b1b26d6e 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -607,7 +607,11 @@ function do_install() {
       echo "$instance_name is not enabled, enable it on this host first"
       exit 1
     fi
-    ${commands}/install.sh "$instance_dir" "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name"
+    ${commands}/install.sh \
+      "$instance_dir" \
+      "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" \
+       2>&1 |
+       tee /var/log/vosa-install-$instance_name.log
   }
 }
 
diff --git a/usr/share/vizrt/vosa/post-install-hooks/install-engine.sh b/usr/share/vizrt/vosa/post-install-hooks/install-engine.sh
index a49cf881..ed9cb3bc 100755
--- a/usr/share/vizrt/vosa/post-install-hooks/install-engine.sh
+++ b/usr/share/vizrt/vosa/post-install-hooks/install-engine.sh
@@ -22,20 +22,36 @@ if [ -z "$ece_install_conf_files" ] ; then
 fi
 
 # ensure we have an ece-install image, download one.
-if [ ! -r $2/ece-install ] ; then
-  if [ -r $1/ece-install ] ; then
-    cp $1/ece-install $2
-  else
-    wget "https://github.com/skybert/ece-scripts/tarball/master" -O $2/ece-install.tar.gz
+ssh -F $2/ssh.conf root@guest test -x /usr/sbin/ece-install
+rc=$?
+
+if [ $rc == 0 ] ; then
+  ECE_INSTALLER=/usr/sbin/ece-install
+fi
+
+if [ -z "$ECE_INSTALLER" ] ; then
+  ssh -F $2/ssh.conf root@guest apt-cache show escenic-content-engine-installer > /dev/null &&
+  echo "Attempting to install escenic-content-engine-installer packge" &&
+  ssh -F $2/ssh.conf root@guest apt-get install -y -o DPkg::Options::=--force-confold \
+      escenic-content-engine-installer
+  if [ $? == 0 ] ; then
+    ECE_INSTALLER=/usr/sbin/ece-install
   fi
 fi
 
-scp -F $2/ssh.conf $2/ece-install.tar.gz $1/ece-install*.conf root@guest:
+if [ -z "$ECE_INSTALLER" ] ; then
+  wget "https://github.com/skybert/ece-scripts/tarball/master" -O $2/ece-install.tar.gz
+  scp -F $2/ssh.conf $2/ece-install.tar.gz root@guest:
+  ssh -F $2/ssh.conf root@guest tar xfz ece-install.tar.gz
+  ECE_INSTALLER="bash *-ece-scripts-*/usr/sbin/ece-install"
+fi
+
+scp -F $2/ssh.conf $1/ece-install*.conf root@guest:
 
-ssh -F $2/ssh.conf root@guest tar xfz ece-install.tar.gz
 for conf in $ece_install_conf_files ; do
-  echo "Performing ece-install with -f $conf"
-  ssh -F $2/ssh.conf root@guest bash *-ece-scripts-*/usr/sbin/ece-install -f "$conf" || exit $? 
+  echo "Performing $ECE_INSTALLER with -f $conf"
+  ssh -F $2/ssh.conf root@guest $ECE_INSTALLER -f "$conf" || exit $? 
   echo "---------8<-------------------------"
 done
 
+

From 193c65579a56aca47b6290f33f56898c68357101 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 4 May 2012 16:50:52 +0200
Subject: [PATCH 0775/2585] - added more documentation on setting up the
 monitoring profile. Now   all the options are explained :-)

---
 usr/share/doc/escenic/ece-install-guide.org | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 5a47168f..686202d4 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -689,9 +689,13 @@ $HOME/ece-install.conf file of the root user:
 | fai_editor_shutdown                 | 8005                                              | Shutdown port of the editor instance                                                                                                  |
 | fai_enabled                         | 0                                                 | Whether or not to run ece-install in FAI mode                                                                                         |
 | fai_keep_off_etc_hosts              | 0                                                 | Set this to 1 if you don't want ece-install adding entries to /etc/hosts                                                              |
-| fai_monitoring_install              | 0                                                 | Install the monitoring server profile.                                                                                                |
+| fai_monitoring_admin_password       | No telling you here ;-)                           | The admin password of the web interface(s). Currenlty only set for Icinga.                                                            |
+| fai_monitoring_ece_host_list        | ""                                                | Hosts running one or more ECE instance                                                                                                |
 | fai_monitoring_host_list            | ""                                                | Quoted, space separated list of <host>#<ip> pairs, e.g.: "pres1#10.72.227.250 pres2#10.72.227.251"                                    |
+| fai_monitoring_install              | 0                                                 | Install the monitoring server profile.                                                                                                |
 | fai_monitoring_munin_node_list      | ""                                                | Set this to a whitespace separated list of nodes that munin should monitor                                                            |
+| fai_monitoring_nagios_flavour       | icinga                                            | Flavour of Nagios, possible options: icigina & nagios                                                                                 |
+| fai_monitoring_search_host_list     | ""                                                | Hosts running search instance(s) (Solr + indexer)                                                                                     |
 | fai_monitoring_server_ip            | 127.0.0.1                                         | The IP of the monitoring server.                                                                                                      |
 | fai_nfs_allowed_client_network      | ""                                                | IP/netmwask of allowed NFS clients, example: 192.168.1.0/255.255.255.0                                                                |
 | fai_nfs_client_install              | 0                                                 | Installs an NFS client                                                                                                                |

From c95ad64c711e4bb809645041bb6beab09b7fd1e9 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 7 May 2012 09:16:07 +0200
Subject: [PATCH 0776/2585] - added $class=neo.nursery.Bootstrapper to the
 Nursery.properties that   ece-install::content-engine::set_up_assembly_tool
 generates.

  Thanks to @opvanderkraaij for tracking this one down.
---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 1dfb8ad2..7d7155ea 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -194,6 +194,8 @@ EOF
   cat > Nursery.properties <<EOF
 # Configuration layers set up by $(basename $0) @ $(date)
 
+$class=neo.nursery.Bootstrapper
+
 # ECE :: default layer
 layer.01 = /layers/default/Layer
 

From 425037519e2b643ca863d861751fb86d5664793d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 7 May 2012 10:06:53 +0200
Subject: [PATCH 0777/2585] - /etc/init.d/ece was sourcing its configuration by
 doing $(basename   $0), this doesn't (always?) work when running from the
 runlevel   scripts as basename $0 then will be "S20ece" and not "ece", hence 
  leading to the configuration file not being found.

  This close #62
---
 etc/init.d/ece | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/init.d/ece b/etc/init.d/ece
index 9ed84d73..b0b2ce57 100755
--- a/etc/init.d/ece
+++ b/etc/init.d/ece
@@ -58,8 +58,8 @@ conf_file_location_list="
 function read_conf_file()
 {
     for el in $conf_file_location_list; do
-        if [ -r $el/`basename $0` ]; then
-            source $el/`basename $0`
+        if [ -r $el/ece ]; then
+            source $el/ece
             found_conf=1
             break
         fi

From 3793840fef979315001ef74f7c050d66edc9b5b8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 7 May 2012 10:09:43 +0200
Subject: [PATCH 0778/2585] - one more fix for #62, remove the dependency on
 remote FSs to be up,   local FS should do.

---
 etc/init.d/ece | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/init.d/ece b/etc/init.d/ece
index b0b2ce57..5b071337 100755
--- a/etc/init.d/ece
+++ b/etc/init.d/ece
@@ -5,8 +5,8 @@
 
 ### BEGIN INIT INFO
 # Provides:          ece
-# Required-Start:    $remote_fs $network $syslog
-# Required-Stop:     $remote_fs $network $syslog
+# Required-Start:    $local_fs $network $syslog
+# Required-Stop:     $local_fs $network $syslog
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Escenic Content Engine

From 13117820e925b8c69817763aae683f5c89324e5a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 7 May 2012 13:17:58 +0200
Subject: [PATCH 0779/2585] - added support for updating the teaser-type
 publication resource.

---
 usr/bin/ece | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/usr/bin/ece b/usr/bin/ece
index da53a2c9..87496993 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -1419,6 +1419,9 @@ function update_publication_resources()
         image-version)
             url=${url}/${publication}/escenic/image-version
             ;;
+        teaser-type)
+            url=${url}/${publication}/escenic/teaser-type
+            ;;
         menu)
             url=${url}/${publication}/escenic/plugin/menu
             ;;

From 82a75a2951d171ddf1b495e3aba04de524ade3d9 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Mon, 7 May 2012 21:17:52 +0200
Subject: [PATCH 0780/2585] Moved the postinst scripts to separate command:
 vosa postinst.

---
 usr/bin/vosa                              | 29 ++++++++
 usr/share/vizrt/vosa/commands/install.sh  | 19 -----
 usr/share/vizrt/vosa/commands/postinst.sh | 86 +++++++++++++++++++++++
 3 files changed, 115 insertions(+), 19 deletions(-)
 create mode 100755 usr/share/vizrt/vosa/commands/postinst.sh

diff --git a/usr/bin/vosa b/usr/bin/vosa
index b1b26d6e..23132202 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -615,6 +615,35 @@ function do_install() {
   }
 }
 
+## Installs software to a newly provisioned instance
+##
+## All postinst hooks defined in the instance's postinst hook
+## will be run.  It should only be necessary to run this command
+## once, as it should run to completion giving you a completely
+## installed machine.
+##
+## It is possible to postinst an instance that has already been
+## postinst'ed.  It is only possible to postinst an instance
+## that is running.
+function do_postinst() {
+  requires_instance_dir && {
+    local status=( $(really_do_status $instance_dir) )
+    if [ "${status[2]}" != "installed" ] ; then
+      echo "$instance_name is not installed. Install before running any postinst."
+      exit 1
+    fi
+    if [ "${status[3]}" != "alive" ] ; then
+      echo "$instance_name is not alive, start it first."
+      exit 1
+    fi
+    ${commands}/postinst.sh \
+      "$instance_dir" \
+      "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" \
+       2>&1 |
+       tee -a /var/log/vosa-postinst-$instance_name.log
+  }
+}
+
 ## Starts a stopped instance.
 ##
 ## Starts an installed instance that has been stopped or has died
diff --git a/usr/share/vizrt/vosa/commands/install.sh b/usr/share/vizrt/vosa/commands/install.sh
index 0017ccef..a3e85754 100755
--- a/usr/share/vizrt/vosa/commands/install.sh
+++ b/usr/share/vizrt/vosa/commands/install.sh
@@ -198,24 +198,6 @@ function delete_overlay() {
   rm -f ${image}/updates.iso 
 }
 
-function postinstall() {
-  for o in "${install_config_postinstall[@]}" ; do
-    echo "Executing postinstall $o"
-    if [ "${o:0:1}" == "/" ] ; then
-      local cmd=$o
-    else
-      local cmd="$(dirname $0)/../post-install-hooks/$o"
-    fi
-    if [ ! -x "$cmd" ] ; then
-      echo "Unable to execute non-executable post-install hook: $cmd"
-      delete_overlay
-      exit 1
-    fi
-    cmd=$(readlink -f "$cmd")
-    $cmd "$config" "$image" || exitonerror $? "Postinstall script $cmd exited nonzero return code."
-  done
-}
-
 copy_original_image
 resize_original_image
 generate_ssh_key
@@ -228,6 +210,5 @@ create_overlay
 # chain to boot.sh to actually start the image.
 $(dirname $0)/boot.sh $1 $2
 
-postinstall
 delete_overlay
 
diff --git a/usr/share/vizrt/vosa/commands/postinst.sh b/usr/share/vizrt/vosa/commands/postinst.sh
new file mode 100755
index 00000000..093874d9
--- /dev/null
+++ b/usr/share/vizrt/vosa/commands/postinst.sh
@@ -0,0 +1,86 @@
+#!/bin/bash
+
+# Performs post installation tasks on a VM.
+
+# Expects a single argument, namely a directory or symlink to a directory
+# which contains a "vosa" configuration, and a second directory, which
+# should exist which is where run-time files are kept / will be kept.
+
+# This command will configure the VM as described by relevant files in the
+# first directory.
+
+# Usually this command is executed from "/usr/bin/vosa -i somevm postinst"
+# or similar.
+
+debug=3
+
+function decho() {
+  if [ $debug -ge $1 ] ; then
+    echo "${@:2}"
+  fi
+}
+
+function exitonerror() {
+  rc=$1
+  if [ "$rc" != "0" ] ; then
+    echo "$2 (rc=$rc)"
+    exit 2
+  fi
+}
+
+source $(dirname $0)/functions
+source $(dirname $0)/install_config_parser
+
+config=$1
+image=$2
+
+if [ -z "$image" -o -z "$config" ] ; then
+  echo "You need to specify a config directory (e.g. /etc/vizrt/vosa/enabled.d/foo) "
+  echo "and a place to hold the installation (e.g. /usr/lib/vizrt/vosa/images/foo)"
+  echo "the former MUST exist and contain vosa configuration files"
+  echo "the latter MUST exist and contain run-time files."
+  exit 1
+fi
+
+# basic error checking
+if [ ! -d "$config" ] ; then
+  echo "Config directory $config isn't a directory."
+  exit 1
+fi
+
+if [ ! -d "$image" -o ! -w "$image" ] ; then
+  echo "image directory $image does not exist, or is not writable.  Can't continue."
+  exit 1
+fi
+
+# todo: verify that basename and image don't end with slashes...
+
+if [ "$(basename "$image")" != "$(basename "$config")" ] ; then
+  echo "$image and $config appear to try to name different VMs. Try using $(basename $config) instead."
+  exit 2
+fi
+
+hostname=$(basename "$image")
+
+# Parse all install config items
+parse_config_file $config/install.conf install_config_
+
+function postinstall() {
+  for o in "${install_config_postinstall[@]}" ; do
+    echo "Executing postinstall $o"
+    if [ "${o:0:1}" == "/" ] ; then
+      local cmd=$o
+    else
+      local cmd="$(dirname $0)/../post-install-hooks/$o"
+    fi
+    if [ ! -x "$cmd" ] ; then
+      echo "Unable to execute non-executable post-install hook: $cmd"
+      exit 1
+    fi
+    cmd=$(readlink -f "$cmd")
+    $cmd "$config" "$image" || exitonerror $? "Postinstall script $cmd exited nonzero return code."
+  done
+}
+
+postinstall
+

From d009552adcd19235e70c8f2374ba692fdef24ca4 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Mon, 7 May 2012 21:33:55 +0200
Subject: [PATCH 0781/2585] Add ssh keys to root as well as ubuntu user.

---
 usr/share/vizrt/vosa/commands/install.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/usr/share/vizrt/vosa/commands/install.sh b/usr/share/vizrt/vosa/commands/install.sh
index a3e85754..a8f10d74 100755
--- a/usr/share/vizrt/vosa/commands/install.sh
+++ b/usr/share/vizrt/vosa/commands/install.sh
@@ -159,10 +159,13 @@ EOF
   chmod 700 ${tempdir}/overlay/updates/root/.ssh
   mkdir -p ${tempdir}/overlay/updates/home/ubuntu/.ssh
   chmod 700 ${tempdir}/overlay/updates/home/ubuntu/.ssh
-  cp "${image}/id_dsa.pub" "${tempdir}/overlay/updates/home/ubuntu/.ssh/authorized_keys"; exitonerror $? "Unable to install id_dsa.pub" 
-  cp "${image}/id_dsa.pub" "${tempdir}/overlay/updates/root/.ssh/authorized_keys"; exitonerror $? "Unable to install id_dsa.pub for root" 
+  if [ -r "${image}/id_dsa.pub" ] ; then
+    cp "${image}/id_dsa.pub" "${tempdir}/overlay/updates/root/.ssh/authorized_keys"; exitonerror $? "Unable to install id_dsa.pub for root" 
+    cp "${image}/id_dsa.pub" "${tempdir}/overlay/updates/home/ubuntu/.ssh/authorized_keys"; exitonerror $? "Unable to install id_dsa.pub" 
+  fi
   for o in "${install_config_ssh_keys[@]}" ; do
-    cat $o >> ${tempdir}/overlay/updates/home/ubuntu/.ssh/authorized_keys; exitonerror $? "Unable to add authorized key $o" 
+    cat $o >> ${tempdir}/overlay/updates/root/.ssh/authorized_keys; exitonerror $? "Unable to add authorized key $o to root" 
+    cat $o >> ${tempdir}/overlay/updates/home/ubuntu/.ssh/authorized_keys; exitonerror $? "Unable to add authorized key $o to ubuntu" 
   done
 
   chmod 600 ${tempdir}/overlay/updates/root/.ssh/authorized_keys; exitonerror $? "Unable to chmod 600 authorized_keys" 

From 3119abf29d3ac166320db7812a777cca99b10571 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Tue, 8 May 2012 01:10:13 +0200
Subject: [PATCH 0782/2585] Added postinstall to run puppet as cronjob instead
 of starting it.

---
 .../post-install-hooks/cron-puppet-agent.sh    | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100755 usr/share/vizrt/vosa/post-install-hooks/cron-puppet-agent.sh

diff --git a/usr/share/vizrt/vosa/post-install-hooks/cron-puppet-agent.sh b/usr/share/vizrt/vosa/post-install-hooks/cron-puppet-agent.sh
new file mode 100755
index 00000000..83914ba2
--- /dev/null
+++ b/usr/share/vizrt/vosa/post-install-hooks/cron-puppet-agent.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+pseudorandom_minute=$[ 0x$(basename $1 | md5sum - | cut -f 1 -d ' ') % 60]
+if [ $pseudorandom_minute -lt 0 ] ; then
+  pseudorandom_minute=$(( - $pseudorandom_minute ))
+fi
+
+echo "Installing cron job"
+ssh -F $2/ssh.conf root@guest tee /etc/cron.d/vosa-puppet-agent || exit 2 <<EOF
+# Installed by vosa on $(date --iso)
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
+$pseudorandom_minute * * * * root puppet agent --no-daemonize --onetime
+EOF
+sleep 1;
+
+

From 2befc7efafe68937df460cd5868a4f14f66a3982 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Tue, 8 May 2012 10:59:31 +0200
Subject: [PATCH 0783/2585] Removed puppet from initial boot.  Restarting cron
 for time zone to take effect. Fixed bug in tee.

---
 .../vizrt/vosa/post-install-hooks/cron-puppet-agent.sh     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/usr/share/vizrt/vosa/post-install-hooks/cron-puppet-agent.sh b/usr/share/vizrt/vosa/post-install-hooks/cron-puppet-agent.sh
index 83914ba2..500e222d 100755
--- a/usr/share/vizrt/vosa/post-install-hooks/cron-puppet-agent.sh
+++ b/usr/share/vizrt/vosa/post-install-hooks/cron-puppet-agent.sh
@@ -5,14 +5,17 @@ if [ $pseudorandom_minute -lt 0 ] ; then
   pseudorandom_minute=$(( - $pseudorandom_minute ))
 fi
 
+ssh -F $2/ssh.conf root@guest update-rc.d -f puppet remove
+
 echo "Installing cron job"
-ssh -F $2/ssh.conf root@guest tee /etc/cron.d/vosa-puppet-agent || exit 2 <<EOF
+ssh -F $2/ssh.conf root@guest tee /etc/cron.d/vosa-puppet-agent <<EOF
 # Installed by vosa on $(date --iso)
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 
 $pseudorandom_minute * * * * root puppet agent --no-daemonize --onetime
 EOF
-sleep 1;
 
 
+# Restarting cron for new time zone to take effect.
+ssh -F $2/ssh.conf root@guest service cron restart

From 8b23407e4b0ed2dabb791b4fa48fc772ec6d8658 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 8 May 2012 16:38:41 +0200
Subject: [PATCH 0784/2585] - bug fix: if fai_search_indexer_ws_uri isn't
 specified, the indexer   webservice URI would contain two http:// prefixes
 (!)

---
 usr/share/escenic/ece-scripts/ece-install.d/app-server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 36f600d0..46ed6118 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -356,7 +356,7 @@ EOF
     cat >> $tomcat_base/conf/context.xml <<EOF
   <Environment
       name="escenic/indexer-webservice"
-      value="http://${indexer_ws_uri}"
+      value="${indexer_ws_uri}"
       type="java.lang.String"
       override="false"
   />

From e823b4aae22aeec095084092efb6f9258696d653 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 8 May 2012 16:47:28 +0200
Subject: [PATCH 0785/2585] - added "vosa push" to push out files to a given
 instance. Gate safely   be sourced by other scripts as all features are
 encapsulated in   functions.

---
 usr/share/vizrt/vosa/commands/push.sh | 70 +++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 usr/share/vizrt/vosa/commands/push.sh

diff --git a/usr/share/vizrt/vosa/commands/push.sh b/usr/share/vizrt/vosa/commands/push.sh
new file mode 100644
index 00000000..e12d026d
--- /dev/null
+++ b/usr/share/vizrt/vosa/commands/push.sh
@@ -0,0 +1,70 @@
+#! /usr/bin/env bash
+
+# vosa module which pushes instance changes (setting files mostly) to
+# the given instance
+
+# easy for now, this must be set by the callee
+instance=$1
+files_dir=/var/lib/vizrt/vosa/files
+lock_file=/var/lock/$(basename $0 .sh).lock
+outgoing=1
+
+tmp_known_hosts_file=$(mktemp)
+rsync_opts="
+--recursive
+--links
+--perms
+--group
+--owner
+--compress
+--itemize-changes
+"
+rsync_additional_outgoing_opts="
+--dry-run
+--verbose
+"
+
+rsync_ssh_opts="-o BatchMode=yes \
+-o UserKnownHostsFile=${tmp_known_hosts_file} \
+-o StrictHostKeyChecking=no"
+
+
+function pre_push_changes() {
+  if [ -e $lock_file ];then
+    echo $lock_file "exists, I will exit :-("
+    exit 1
+  else
+    touch $lock_file
+  fi
+}
+
+function push_changes() {
+  for el in common $instance; do
+    if [ $outgoing -eq 0 ]; then
+      rsync $rsync_opts -e "ssh $rsync_ssh_opts" $files_dir/$el/ ${instance}:/
+    else
+      rsync $rsync_opts \
+        $rsync_additional_outgoing_opts \
+        -e "ssh $rsync_ssh_opts" \
+        $files_dir/$el/ \
+        ${instance}:/
+    fi
+
+  done
+}
+
+function post_push_changes() {
+  if [ -e $tmp_known_hosts_file ]; then
+    rm $tmp_known_hosts_file
+  fi
+
+  if [ -e $lock_file ]; then
+    rm $lock_file
+  fi
+}
+
+# the callee needs to to do:
+#
+# pre_push_changes
+# push_changes
+# post_push_changes

From 1e5f2f995037345bfd4a7a34b145b33304e77b7d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 9 May 2012 10:05:12 +0200
Subject: [PATCH 0786/2585] - ece assemble would fail if the test JAR for some
 reason was present   in the plugin (or ECE for that matter), e.g.:

  plugin-1.2.3.jar and plugin-1.2.3-tests.jar

  ece assemble will not handle this corner case and disregard
  -tests.jar as significant (or -tests as a version string to be
  precise).

  This closes #64

- better feedback on the artifact/library which is duplicated
  ('plugin' instead of 'plugin-').
---
 usr/bin/ece | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 87496993..7f22becd 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -923,14 +923,21 @@ function assemble()
     
     cd $assemblytool_home/dist/.work/ear/lib
     for el in *.jar; do
-        jar=$(basename $(echo $el | sed  -e  's/[0-9]//g') .jar | sed 's/\.//g')
-        if [ $(echo $known_unharmful_duplicates | grep $jar | wc -l) -gt 0 ]; then
-            continue
-        fi
-        if [ $(\ls *.jar | grep "^${jar}[0-9]" | wc -l) -gt 1 ]; then
-            duplicates_found=1
-            debug "More than one version of $jar"
-        fi
+      jar=$(basename $(echo $el | sed  -e  's/[0-9]//g') .jar | sed 's/\.//g')
+      if [ $(echo $known_unharmful_duplicates | grep $jar | wc -l) -gt 0 ]; then
+        continue
+      fi
+
+      # we check for duplicate JARs like plugin-1.2.3.jar and
+      # plugin-1.2.4.jar. We remove plugin-1.2.3-tests.jar out the
+      # equations (if it happens to be there).
+      if [ $(\ls *.jar | \
+        sed -e 's/\.//g' -e 's/.jar$//g' -e 's/-test$//g' | \
+        grep "^${jar}[0-9]" | \
+        wc -l) -gt 1 ]; then
+        duplicates_found=1
+        debug "More than one version of $(echo $jar | sed 's/-$//g')"
+      fi
     done
 
     if [ "$duplicates_found" -eq 1 ]; then

From 11e31322d41f813225550681e5305aedfc6f23f0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 9 May 2012 10:27:56 +0200
Subject: [PATCH 0787/2585] - set default output format to yaml, it's easier
 than ORG to read in the shell.

---
 usr/bin/system-info | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/bin/system-info b/usr/bin/system-info
index ed189c8c..c5a9966d 100755
--- a/usr/bin/system-info
+++ b/usr/bin/system-info
@@ -11,8 +11,8 @@
 
 ece_user=""
 
-## possible values: html, org, confluence, json (not coplete)
-format=org
+## possible values: html, org, confluence, yaml, json (not complete)
+format=yaml
 generate_output_file_per_module=0
 output_dir=$(pwd)
 output_file=""

From 9766056ff1a92ef8c7a0780b4045e2ac113dc0bf Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 9 May 2012 11:18:08 +0200
Subject: [PATCH 0788/2585] - more fixing on the search for duplicate JARs. I
 can no longer   re-produce #64 and consider it closed.

---
 usr/bin/ece | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 7f22becd..32d18bda 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -932,8 +932,10 @@ function assemble()
       # plugin-1.2.4.jar. We remove plugin-1.2.3-tests.jar out the
       # equations (if it happens to be there).
       if [ $(\ls *.jar | \
-        sed -e 's/\.//g' -e 's/.jar$//g' -e 's/-test$//g' | \
+        sed -e 's/\.jar//' -e 's/-tests$//g' | \
         grep "^${jar}[0-9]" | \
+        sort | \
+        uniq | \
         wc -l) -gt 1 ]; then
         duplicates_found=1
         debug "More than one version of $(echo $jar | sed 's/-$//g')"

From 641fcc074dfdd26a00e7ddadc1cebea698552bb0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 9 May 2012 15:11:57 +0200
Subject: [PATCH 0789/2585] - added support for remote conf archives for search
 servers. Now the   fai_search_conf_archive can be a URI just as it can be for
 editorial   and presentation servers.

---
 .../escenic/ece-scripts/ece-install.d/search-server.sh   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
index fd293f8b..104bf96a 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
@@ -35,14 +35,19 @@ function set_up_solr()
 {
   run_hook set_up_solr.preinst
   
-  print_and_log "Setting up solr ..."
+  print_and_log "Setting up Solr ..."
   if [ ! -d $escenic_conf_dir/solr ]; then
     if [ $(is_using_conf_archive) -eq 1 ]; then
       print_and_log "Using the supplied Solr configuration from" 
       print_and_log "bundle: $ece_instance_conf_archive"
       local a_tmp_dir=$(mktemp -d)
+      local file=$(
+        download_uri_target_to_dir \
+          $ece_instance_conf_archive \
+          $a_tmp_dir
+      )
       run cd $a_tmp_dir
-      run tar xzf $ece_instance_conf_archive engine/solr/conf
+      run tar xzf $(basename $ece_instance_conf_archive) engine/solr/conf
       run cp -r engine/solr/conf $escenic_conf_dir/solr
       run rm -r $a_tmp_dir
     else

From e895d17f70982045762e8f5a9dff4a8aaed2921e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 9 May 2012 15:54:42 +0200
Subject: [PATCH 0790/2585] - system-info could under some circumstances, when
 there was an   instance found in /etc/escenic/ece-<instance>.conf which
 wasn't   installed properly, the system-info command would generate an error 
  like:

     Overview of instance cohen:
     /usr/bin/../share/escenic/ece-scripts/ece.d/info.sh: line 29: [: too many arguments
     - Current instance: cohen

  This has now been fixed.
---
 usr/share/escenic/ece-scripts/ece.d/info.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/info.sh b/usr/share/escenic/ece-scripts/ece.d/info.sh
index eac4225f..bc9c4483 100644
--- a/usr/share/escenic/ece-scripts/ece.d/info.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/info.sh
@@ -26,7 +26,7 @@ function get_info_for_type() {
     print "|-> Status:" $(get_status)
     print "|-> Port:" $port
 
-    if [ $(get_status | cut -d' ' -f1) == "UP" ]; then
+    if [ $(get_status | grep UP | wc -l) -gt 0 ]; then
       print "|-> PID:" $type_pid
     fi
     

From 1032ab612ec1ff7a60fa57228ed46abbcf31e9df Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 9 May 2012 16:17:24 +0200
Subject: [PATCH 0791/2585] - added wrapper around the vosa::push module. Can
 be removed once vosa -i   <instance> push has been implemented.

---
 usr/bin/vosa-push | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 usr/bin/vosa-push

diff --git a/usr/bin/vosa-push b/usr/bin/vosa-push
new file mode 100644
index 00000000..987c9298
--- /dev/null
+++ b/usr/bin/vosa-push
@@ -0,0 +1,43 @@
+#! /usr/bin/env bash
+
+# wrapper around the vosa::push module. Can be removed once vosa -i
+# <instance> push has been implemented.
+
+source ../share/vizrt/vosa/commands/push.sh
+outgoing=0
+instance=""
+
+function get_user_options() {
+  while getopts ":i:o" opt; do
+    case $opt in
+      i)
+        instance=${OPTARG}
+        ;;
+      o)
+        outgoing=1
+        ;;
+      \?)
+        echo "Invalid option: -$OPTARG" >&2
+        exit 1
+        ;;
+      :)
+        echo "Option -$OPTARG requires an argument." >&2
+        exit 1
+        ;;
+      *)
+        echo command is $OPTARG
+        exit 0
+    esac
+  done
+}
+
+get_user_options $@
+
+if [ -z "${instance}" ]; then
+  echo "You must specify instance with $(basename $0) -i <instance>"
+  exit 1
+fi
+
+pre_push_changes
+push_changes
+post_push_changes

From 8db3e413de23039f2592858cd7ac63227a0a7a23 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 9 May 2012 16:19:18 +0200
Subject: [PATCH 0792/2585] - moved assemble code to its own module

---
 .../escenic/ece-scripts/ece.d/assemble.sh     | 71 +++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 usr/share/escenic/ece-scripts/ece.d/assemble.sh

diff --git a/usr/share/escenic/ece-scripts/ece.d/assemble.sh b/usr/share/escenic/ece-scripts/ece.d/assemble.sh
new file mode 100644
index 00000000..bd5f87bc
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece.d/assemble.sh
@@ -0,0 +1,71 @@
+assemble_attempts=0
+
+function assemble()
+{
+  if [ "$assemble_attempts" -gt 1 ]; then
+    print "I've tried to assemble twice now and FAILED :-("
+    print "You probably have multiple versions of one or more plugins"
+    print "Check your plugins directory, sort it out and try again."
+    exit 1
+  fi
+  assemble_attempts=$(( $assemble_attempts + 1 ))
+  
+  if [[ "$type" != "engine" && "$type" != "search" ]]; then
+    print "You cannot assemble instances of type $type"
+    exit 1
+  fi
+
+  message="Assembling your EAR file"
+  print $message "..."
+  log $message "..." >> $log
+
+  cd $assemblytool_home && \
+    ant -q ear -DskipRedundancyCheck=true \
+    1>>$log \
+    2>>$log
+  exit_on_error "$message"
+
+  # test to see if the new versions of ECE & plugins are upgrades of
+  # the previous ones
+  duplicates_found=0
+  known_unharmful_duplicates="activation- $'\n' ehcache-$'\n' stax-api-$'\n'"
+  
+  cd $assemblytool_home/dist/.work/ear/lib
+  for el in *.jar; do
+    jar=$(basename $(echo $el | sed  -e  's/[0-9]//g') .jar | sed 's/\.//g')
+    if [ $(echo $known_unharmful_duplicates | grep $jar | wc -l) -gt 0 ]; then
+      continue
+    fi
+
+    # we check for duplicate JARs like plugin-1.2.3.jar and
+    # plugin-1.2.4.jar. We remove plugin-1.2.3-tests.jar out the
+    # equations (if it happens to be there).
+    if [ $(\ls *.jar | \
+      sed -e 's/\.jar//' -e 's/-tests$//g' | \
+      grep "^${jar}[0-9]" | \
+      sort | \
+      uniq | \
+      wc -l) -gt 1 ]; then
+      duplicates_found=1
+      debug "More than one version of $(echo $jar | sed 's/-$//g')"
+    fi
+  done
+
+  if [ "$duplicates_found" -eq 1 ]; then
+    print "Multiple versions of ECE and/or 3rd party libraries found."
+    print "Remember, you need to run '$(basename $0) clean assemble' when "
+    print "upgrading either ECE or one of the plugins."
+    print "I will now clean it up for you and re-run the assembly."
+    clean_up
+    assemble
+  fi
+  
+  mkdir -p $ear_cache_dir/
+  exit_on_error "creating $ear_cache_dir"
+
+  cp $assemblytool_home/dist/engine.ear $cache_dir
+  exit_on_error "copying ear to $ear_cache_dir"
+
+  debug $assemblytool_home/dist/engine.ear "is now ready"
+}
+

From bb99f8e982f2d942186e0678dba0e18c15eda384 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 9 May 2012 16:19:39 +0200
Subject: [PATCH 0793/2585] - moved assembly specific code to its own module

---
 usr/bin/ece | 71 -----------------------------------------------------
 1 file changed, 71 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 32d18bda..e9b313f3 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -889,77 +889,6 @@ function restart_type()
     start_type
 }    
 
-assemble_attempts=0
-
-function assemble()
-{
-    if [ "$assemble_attempts" -gt 1 ]; then
-        print "I've tried to assemble twice now and FAILED :-("
-        print "You probably have multiple versions of one or more plugins"
-        print "Check your plugins directory, sort it out and try again."
-        exit 1
-    fi
-    assemble_attempts=$(( $assemble_attempts + 1 ))
-    
-    if [[ "$type" != "engine" && "$type" != "search" ]]; then
-        print "You cannot assemble instances of type $type"
-        exit 1
-    fi
-
-    message="Assembling your EAR file"
-    print $message "..."
-    log $message "..." >> $log
-
-    cd $assemblytool_home && \
-        ant -q ear -DskipRedundancyCheck=true \
-        1>>$log \
-        2>>$log
-    exit_on_error "$message"
-
-    # test to see if the new versions of ECE & plugins are upgrades of
-    # the previous ones
-    duplicates_found=0
-    known_unharmful_duplicates="activation- $'\n' ehcache-$'\n' stax-api-$'\n'"
-    
-    cd $assemblytool_home/dist/.work/ear/lib
-    for el in *.jar; do
-      jar=$(basename $(echo $el | sed  -e  's/[0-9]//g') .jar | sed 's/\.//g')
-      if [ $(echo $known_unharmful_duplicates | grep $jar | wc -l) -gt 0 ]; then
-        continue
-      fi
-
-      # we check for duplicate JARs like plugin-1.2.3.jar and
-      # plugin-1.2.4.jar. We remove plugin-1.2.3-tests.jar out the
-      # equations (if it happens to be there).
-      if [ $(\ls *.jar | \
-        sed -e 's/\.jar//' -e 's/-tests$//g' | \
-        grep "^${jar}[0-9]" | \
-        sort | \
-        uniq | \
-        wc -l) -gt 1 ]; then
-        duplicates_found=1
-        debug "More than one version of $(echo $jar | sed 's/-$//g')"
-      fi
-    done
-
-    if [ "$duplicates_found" -eq 1 ]; then
-        print "Multiple versions of ECE and/or 3rd party libraries found."
-        print "Remember, you need to run '$(basename $0) clean assemble' when "
-        print "upgrading either ECE or one of the plugins."
-        print "I will now clean it up for you and re-run the assembly."
-        clean_up
-        assemble
-    fi
-    
-    mkdir -p $ear_cache_dir/
-    exit_on_error "creating $ear_cache_dir"
-
-    cp $assemblytool_home/dist/engine.ear $cache_dir
-    exit_on_error "copying ear to $ear_cache_dir"
-
-    debug $assemblytool_home/dist/engine.ear "is now ready"
-}
-
 # creates DEB and RPM packages suitable for deploying any kind of ECE
 # instance that was previously assembled.
 function create_packages()

From 655609b32331e24323117199b69866002ae09743 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 10 May 2012 10:58:33 +0200
Subject: [PATCH 0794/2585] - added support for installing an NFS client on a
 RedHat based system - fixed the (corner?) case were the escenic_data_dir
 (typically   /var/lib/escenic) doesn't exist at the time of setting up the
 NFS   client. ece-install now correctly sets up symlinks in  
 /var/lib/escenic/engine for each of the publications hosted on the  
 multimedia NFS share.

---
 .../ece-scripts/ece-install.d/network-file-system.sh      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh b/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
index 6570f261..1e9b27f5 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
@@ -63,8 +63,13 @@ EOF
 
 function install_nfs_client() {
   print_and_log "Installing an NFS client on $HOSTNAME ..."
+
+  local packages="nfs-common"
+  if [ $on_redhat_or_derivative -eq 1 ]; then
+    packages="nfs-utils"
+  fi
   
-  install_packages_if_missing "nfs-common"
+  install_packages_if_missing $packages
   get_nfs_configuration
 
   local mount_point_list=""
@@ -97,6 +102,7 @@ EOF
         -type d | \
         sed "s#${mount_point}##"); do
         if [ ! -e $escenic_data_dir/engine/$(basename $ele) ]; then
+          make_dir $escenic_data_dir/engine
           ln -s $mount_point/${ele} $escenic_data_dir/engine/$(basename $ele)
         fi
       done

From 588314c877cf067c24f2fe20205bd1ff1853be98 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 10 May 2012 12:39:02 +0200
Subject: [PATCH 0795/2585] Made system-info actually provide valid yaml output
 in more cases.  Still some strings appear where they should not. Maybe make
 everything list items (like the HTML output is, more or less)

---
 usr/bin/system-info                                | 14 +++++++++++---
 .../ece-scripts/system-info.d/66-list-hw-info.sh   |  7 +++++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/usr/bin/system-info b/usr/bin/system-info
index c5a9966d..4475e394 100755
--- a/usr/bin/system-info
+++ b/usr/bin/system-info
@@ -90,6 +90,13 @@ EOF
 {
   "title": "$title",
   "generated-date": "$(date)",
+EOF
+  elif [ $format == "yaml" ]; then
+    cat <<EOF
+---
+title: $title
+generated-date: $(date)
+report:
 EOF
   else
     print_h1_header $title
@@ -167,7 +174,7 @@ function print_list_item() {
   elif [ $format == "json" ]; then
     echo "      \"$@\", "
   elif [ $format == "yaml" ]; then
-    echo "$(get_indent)- $@"
+    echo "$(get_indent) - $@"
   fi
 }
 
@@ -201,7 +208,8 @@ EOF
 EOF
 
   elif [ $format == "yaml" ]; then
-    echo "$@" | sed "s/^/$(get_indent)/g"
+    echo "|" | sed "s/^/$(get_indent) /g"
+    echo "$@" | sed "s/^/$(get_indent)  /g"
   fi
 }
 
@@ -295,7 +303,7 @@ EOF
   elif [ $format == "json" ]; then
     echo "    \"message\": \"$@\","
   elif [ $format == "yaml" ]; then
-    echo "$(get_indent)$@"
+    echo "$(get_indent)message: $@"
   fi
 }
 
diff --git a/usr/share/escenic/ece-scripts/system-info.d/66-list-hw-info.sh b/usr/share/escenic/ece-scripts/system-info.d/66-list-hw-info.sh
index 0254ef2d..b2cdffb3 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/66-list-hw-info.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/66-list-hw-info.sh
@@ -4,8 +4,11 @@ print_pre_text "$(df -hT)"
 print_section_end
 
 print_h2_header "Memory on $HOSTNAME"
-print_pre_text "Total memory: " `grep MemTotal /proc/meminfo | cut -d':' -f2`
-print_pre_text "Free memory: " `grep MemFree /proc/meminfo | cut -d':' -f2`
+print_pre_text "$( cat <<EOF
+Total memory: `grep MemTotal /proc/meminfo | cut -d':' -f2`
+Free memory: `grep MemFree /proc/meminfo | cut -d':' -f2`
+EOF
+)"
 print_section_end
 
 print_h2_header "CPU(s) on $HOSTNAME"

From 9a333e277f105ff7b2dd11a8692a315ec69920a9 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 10 May 2012 14:31:22 +0200
Subject: [PATCH 0796/2585] - will now set up /var/spool/escenic/import instead
 of   /var/spool/escenic/migration

---
 usr/sbin/ece-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index a9d7d025..b3097a2e 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -562,7 +562,7 @@ function common_pre_install()
       $escenic_data_dir/solr/data
       $escenic_log_dir
       $escenic_run_dir
-      $escenic_spool_dir/migration
+      $escenic_spool_dir/import
     "
     ece_install_env=${escenic_run_dir}/$(basename $0).env
 

From ca1c5c0d02e73f04316f631e9d0fe22a54c37287 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 10 May 2012 15:27:41 +0200
Subject: [PATCH 0797/2585] - added --ignore-times and --checksum to change the
 rsync behaviour on   servers where the clocks are drifting (!). This
 combination seems to   work well, even though is more resource hungry than
 the default   operation. - added exclusion of emacs/~ backup files (but it
 doesn't seem to work   even though this is the way they describe it in the
 manual).

---
 usr/share/vizrt/vosa/commands/push.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/usr/share/vizrt/vosa/commands/push.sh b/usr/share/vizrt/vosa/commands/push.sh
index e12d026d..750ae7b7 100644
--- a/usr/share/vizrt/vosa/commands/push.sh
+++ b/usr/share/vizrt/vosa/commands/push.sh
@@ -18,6 +18,9 @@ rsync_opts="
 --owner
 --compress
 --itemize-changes
+--ignore-times
+--checksum
+--exclude '*~'
 "
 rsync_additional_outgoing_opts="
 --dry-run

From f84f8302862cb4e058cf0b9b8fe559fa4cfafc5f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 11 May 2012 11:37:08 +0200
Subject: [PATCH 0798/2585] =?UTF-8?q?-=20added=20build.sh,=20written=20by?=
 =?UTF-8?q?=20@oschon=20/=20Olaf=20Sch=C3=B6n.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 usr/share/escenic/build-scripts/build.sh | 165 +++++++++++++++++++++++
 1 file changed, 165 insertions(+)
 create mode 100755 usr/share/escenic/build-scripts/build.sh

diff --git a/usr/share/escenic/build-scripts/build.sh b/usr/share/escenic/build-scripts/build.sh
new file mode 100755
index 00000000..d1cd6c91
--- /dev/null
+++ b/usr/share/escenic/build-scripts/build.sh
@@ -0,0 +1,165 @@
+################################################################################
+#
+# VOSA - build server script - customer x
+#
+################################################################################
+
+# customer
+CUSTOMER=myproject
+
+# date used for .ear naming 
+DATE=`date +%F_%H%M`
+
+# svn information
+SVN_BASE=https://mysvnserver.com/svn/MYPROJECT/
+SVN_PATH=
+
+SVN_USER=myproject-build-user
+SVN_PASSWORD=yesyouwouuldlikethatwouldntyou
+
+# release label for .ear naming - default: trunk
+RELEASE_LABEL=trunk
+
+# clean up customer home
+function home_preparation {
+
+  rm ~/plugins/*
+  rm ~/engine
+  rm ~/assemblytool/publications/*
+  rm ~/assemblytool/lib/*
+  rm -rf src
+  mkdir src
+  #TODO: make a place where everything common to all ears go.
+  ln -s /opt/escenic/assemblytool/lib/java_memcached-release_2.0.1.jar assemblytool/lib/
+
+}
+
+# checkout customer project
+function svn_checkout {
+
+  type=$1
+
+  if [ "$type" = "trunk" ]; then
+    SVN_PATH=trunk
+    RELEASE_LABEL=$type
+  elif [ "$type" = "branch" ]; then
+    SVN_PATH=branches/$2
+    RELEASE_LABEL=$type-$2
+  elif [ "$type" = "tag" ]; then
+    SVN_PATH=tags/$2
+    RELEASE_LABEL=$type-$2
+  fi
+
+  if [ "$SVN_PATH" = "" ]; then
+    echo "No svn path chosen! Will use 'trunk'."
+    SVN_PATH=trunk
+  fi
+
+  echo "Initiating svn checkout of $SVN_PATH"
+  svn checkout --username=$SVN_USER --password=$SVN_PASSWORD $SVN_BASE$SVN_PATH src/.
+
+}
+
+# parse version based on property from src/pom.xml
+function parse_version {
+  export $1=`sed "/<$2>/!d;s/ *<\/\?$2> *//g" ~/src/pom.xml | tr -d $'\r' `
+}
+
+# symlink component from /opt/vosa/.
+function symlink_distribution {
+  ln -s /opt/vosa/$1 ~/$2
+}
+
+function symlink_ece_components {
+
+  # Version - Escenic Content Engine
+  parse_version ENGINE_VERSION vosa.engine.version
+  symlink_distribution engine/engine-$ENGINE_VERSION engine
+
+  # Version - Geo Code
+  parse_version GEOCODE_VERSION vosa.geocode.version
+  symlink_distribution plugins/geocode-$GEOCODE_VERSION plugins/geocode
+
+  # Version - Poll
+  parse_version POLL_VERSION vosa.poll.version
+  symlink_distribution plugins/poll-$POLL_VERSION plugins/poll
+
+  # Version - Menu Editor
+  parse_version MENU_EDITOR_VERSION vosa.menu-editor.version
+  symlink_distribution plugins/menu-editor-$MENU_EDITOR_VERSION plugins/menu-editor
+
+  # Version - XML Editor
+  parse_version XML_EDITOR_VERSION vosa.xml-editor.version
+  symlink_distribution plugins/xml-editor-$XML_EDITOR_VERSION plugins/xml-editor
+
+  # Version - Analysis Engine
+  parse_version ANALYSIS_ENGINE_VERSION vosa.analysis-engine.version
+  symlink_distribution plugins/analysis-engine-$ANALYSIS_ENGINE_VERSION plugins/analysis-engine
+
+  # Version - Forum
+  parse_version FORUM_VERSION vosa.forum.version
+  symlink_distribution plugins/forum-$FORUM_VERSION plugins/forum
+
+  # Version - Widget Framework Common
+  parse_version WIDGET_FRAMEWORK_COMMON_VERSION vosa.widget-framework-common.version
+  symlink_distribution plugins/widget-framework-common-$WIDGET_FRAMEWORK_COMMON_VERSION plugins/widget-framework-common
+
+}
+
+# symlink .war files from target/
+function symlink_target {
+
+  # global classpath
+  for f in $(ls -d ~/src/vosa-assembly/target/lib/*);
+    do ln -s $f ~/assemblytool/lib;
+  done
+
+  # publications
+  for f in $(ls -d ~/src/vosa-assembly/target/wars/*);
+    do ln -s $f ~/assemblytool/publications;
+  done
+
+}
+
+function release {
+
+  home_preparation
+
+  svn_checkout $1 $2
+  revision=`svn info src | grep -i Revision | awk '{print $2}'`
+
+  symlink_ece_components
+
+  cd src
+  mvn clean package
+
+  cd vosa-assembly/target
+  unzip vosa-assembly.zip
+
+  symlink_target
+
+  cd ~/assemblytool
+  ant -q ear -DskipRedundancyCheck=true
+
+  cp dist/engine.ear ~/releases/$CUSTOMER-$RELEASE_LABEL-rev$revision-$DATE.ear
+
+}
+
+################################################
+# VOSA - Build Server Script
+################################################
+
+case "$1" in
+
+release)
+
+  release $2 $3
+  ;;
+
+*)
+  echo $"Usage: $0 {release}"
+  exit 2
+esac
+
+exit $?
+

From 2ad0eb95c0783b6f885ec3da17595bbf10579874 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Fri, 11 May 2012 21:02:11 +0200
Subject: [PATCH 0799/2585] Made option to remove "temporary" information like
 the time of the day and the amount of free memory.

This makes it possible to diff two successive runs of system-info to see how a system has changed.
For system-info.d scripts, a new variable "temporaries" is set to 1 (the default) to show temporary
information.  If set to 0, temporary information should be avoided in the output.

Temporary information is defined as information which changes as a side effect of normal system
operation, like the fill size of buffers, available memory or disk, the number or state of network
connections and so on.
---
 usr/bin/system-info                           | 12 ++++++++++-
 .../system-info.d/66-list-hw-info.sh          | 20 +++++++++++--------
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/usr/bin/system-info b/usr/bin/system-info
index 4475e394..a4c59a08 100755
--- a/usr/bin/system-info
+++ b/usr/bin/system-info
@@ -20,6 +20,7 @@ output_file=""
 current_indent_level=0
 INDENT="  "
 verbose=0
+temporaries=1
 
 function init() {
   # first, try to be nice
@@ -95,7 +96,13 @@ EOF
     cat <<EOF
 ---
 title: $title
+EOF
+    if [ $temporaries -eq 1 ] ; then
+      cat <<EOF
 generated-date: $(date)
+EOF
+    fi
+    cat <<EOF
 report:
 EOF
   else
@@ -308,7 +315,7 @@ EOF
 }
 
 function get_user_options() {
-  while getopts ":d:o:i:f:u:m:v" opt; do
+  while getopts ":d:o:i:f:u:mvs" opt; do
     case $opt in
       i)
         instance=${OPTARG}
@@ -316,6 +323,9 @@ function get_user_options() {
       v)
         verbose=1
         ;;
+      s)
+        temporaries=0
+        ;;
       d)
         output_dir=${OPTARG}
         mkdir -p $output_dir
diff --git a/usr/share/escenic/ece-scripts/system-info.d/66-list-hw-info.sh b/usr/share/escenic/ece-scripts/system-info.d/66-list-hw-info.sh
index b2cdffb3..ca6fa535 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/66-list-hw-info.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/66-list-hw-info.sh
@@ -1,14 +1,17 @@
 
-print_h2_header "Disks used on $HOSTNAME"
-print_pre_text "$(df -hT)"
-print_section_end
+if [ "$skip_temporaries" != "1" ] ; then
+  print_h2_header "Disks used on $HOSTNAME"
+  print_pre_text "$(df -hT)"
+  print_section_end
+fi
 
 print_h2_header "Memory on $HOSTNAME"
-print_pre_text "$( cat <<EOF
-Total memory: `grep MemTotal /proc/meminfo | cut -d':' -f2`
-Free memory: `grep MemFree /proc/meminfo | cut -d':' -f2`
-EOF
-)"
+local pre_text="Total memory: `grep MemTotal /proc/meminfo | cut -d':' -f2`
+"
+if [ $temporaries -eq 1 ] ; then
+  pre_text="${pre_text}Free memory: `grep MemFree /proc/meminfo | cut -d':' -f2`"
+fi
+print_pre_text "${pre_text}"
 print_section_end
 
 print_h2_header "CPU(s) on $HOSTNAME"
@@ -22,3 +25,4 @@ print_list_item "Model: \
     uniq)"
 print_un_ordered_list_end
 print_section_end
+

From 7fb1125025e590add537469fe346cb7a5733a9a0 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Fri, 11 May 2012 21:29:46 +0200
Subject: [PATCH 0800/2585] Fixed typo in temporaries checking. no longer
 prints disk information

---
 usr/share/escenic/ece-scripts/system-info.d/66-list-hw-info.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/66-list-hw-info.sh b/usr/share/escenic/ece-scripts/system-info.d/66-list-hw-info.sh
index ca6fa535..2b84148a 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/66-list-hw-info.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/66-list-hw-info.sh
@@ -1,5 +1,5 @@
 
-if [ "$skip_temporaries" != "1" ] ; then
+if [ $temporaries -eq 1 ] ; then
   print_h2_header "Disks used on $HOSTNAME"
   print_pre_text "$(df -hT)"
   print_section_end

From 5a16898af21974a8c150c3b934cf4386e844b2f3 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Fri, 11 May 2012 23:59:33 +0200
Subject: [PATCH 0801/2585] Added list of logged in users to system-info

---
 .../ece-scripts/system-info.d/55-list-users.sh    | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100755 usr/share/escenic/ece-scripts/system-info.d/55-list-users.sh

diff --git a/usr/share/escenic/ece-scripts/system-info.d/55-list-users.sh b/usr/share/escenic/ece-scripts/system-info.d/55-list-users.sh
new file mode 100755
index 00000000..1e2a9596
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/system-info.d/55-list-users.sh
@@ -0,0 +1,15 @@
+#! /usr/bin/env bash
+
+print_h2_header "Logged in users"
+print_un_ordered_list_start
+who -H | while read line; do
+  print_list_item "$line"
+done
+print_un_ordered_list_end
+
+print_h2_header "Last Boot"
+who -b | while read line; do
+  print_pre_text "$line"
+done
+
+

From 91d68508a1d977a413ab95c38526bd50bc6658f3 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Sat, 12 May 2012 00:20:09 +0200
Subject: [PATCH 0802/2585] system-info: Services no longer expose pid file

---
 usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh b/usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh
index 8d2f9ee1..df9f93c9 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh
@@ -1,6 +1,6 @@
 
 print_h2_header "Overview of all server services on $HOSTNAME"
-print_pre_text "$(netstat -nlp 2>/dev/null | grep ^tcp | grep LISTEN)"
+print_pre_text "$(netstat -ntlp 2>/dev/null | sed -r s,[0-9]+/,,)"
 
 if [ $(whoami) != "root" ]; then
   print_p_text "Run $(basename $0) as  root to get more details in this listing"

From cf57811892c6f80cc9b71888b6dd7b076d50a591 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Sat, 12 May 2012 00:20:55 +0200
Subject: [PATCH 0803/2585] system-info: List users as preformatted text

---
 .../escenic/ece-scripts/system-info.d/55-list-users.sh | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/55-list-users.sh b/usr/share/escenic/ece-scripts/system-info.d/55-list-users.sh
index 1e2a9596..6e2208ec 100755
--- a/usr/share/escenic/ece-scripts/system-info.d/55-list-users.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/55-list-users.sh
@@ -1,15 +1,9 @@
 #! /usr/bin/env bash
 
 print_h2_header "Logged in users"
-print_un_ordered_list_start
-who -H | while read line; do
-  print_list_item "$line"
-done
-print_un_ordered_list_end
+print_pre_text "$(who -H)"
 
 print_h2_header "Last Boot"
-who -b | while read line; do
-  print_pre_text "$line"
-done
+print_pre_text "$(who -b)"
 
 

From f3fdcf90e98411fa7cff3f69a9b1c6fc7060538d Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Sat, 12 May 2012 00:52:06 +0200
Subject: [PATCH 0804/2585] system-info: made service list clean up the command
 line, to avoid unnecessary diffs

---
 usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh b/usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh
index df9f93c9..a0c52bd8 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh
@@ -1,6 +1,6 @@
 
 print_h2_header "Overview of all server services on $HOSTNAME"
-print_pre_text "$(netstat -ntlp 2>/dev/null | sed -r s,[0-9]+/,,)"
+print_pre_text "$(netstat -ntlp 2>/dev/null | sed -r 's,[0-9]+/([-\.a-z0-9]*).*,\1,' )"
 
 if [ $(whoami) != "root" ]; then
   print_p_text "Run $(basename $0) as  root to get more details in this listing"

From 7a794a692a39442af074fcb43213421b8250ef78 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Sat, 12 May 2012 01:03:15 +0200
Subject: [PATCH 0805/2585] Remove uptime from vosa status

---
 usr/share/escenic/ece-scripts/system-info.d/77-list-kvm-info.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/77-list-kvm-info.sh b/usr/share/escenic/ece-scripts/system-info.d/77-list-kvm-info.sh
index 6324bd22..c353e036 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/77-list-kvm-info.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/77-list-kvm-info.sh
@@ -3,7 +3,7 @@
 if [ $(which vosa 2>/dev/null | wc -l) -gt 0 ]; then
   print_h2_header "VOSA status"
   print_un_ordered_list_start
-  vosa status | while read line; do
+  vosa status | cut -d ' ' -f 1-5 | while read line; do
     print_list_item "$line"
   done
   print_un_ordered_list_end

From abb97591e2d6986a18e65eb5add1f5d3116bf8e9 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 14 May 2012 10:30:26 +0200
Subject: [PATCH 0806/2585] - added timezone, both checking /etc/timezone and
 $TZ:

    Timezone:
     - Europe/Oslo (from /etc/timezone)
     - Asia/Taipei (from root's environment variable)
---
 .../escenic/ece-scripts/system-info.d/66-list-os-info.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
index 83f48eef..e4e855e6 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
@@ -19,5 +19,14 @@ if [ $verbose -eq 1 ]; then
   fi
 fi
 
+print_h3_header "Timezone"
+print_un_ordered_list_start
+print_list_item "$(cat /etc/timezone) (from /etc/timezone)"
+if [ -n "$TZ" ]; then
+  print_list_item "$(echo $TZ) (from ${USER}'s environment variable)"
+fi
+print_un_ordered_list_end
+
 # of the h2
 print_section_end
+

From 7152b66efa51194b237348ae08851fac5089232c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 15 May 2012 09:36:36 +0200
Subject: [PATCH 0807/2585] - Ubuntu 12.04 doesn't have bc per default, hence
 adding it to the   install_common_os_packages.

  This *should* fix the problem where ece-install fails to calculate
  the memory size for systems with less than 2GB ram, producing silly
  values in the ece-<instance>.conf for the max and min heap size.
---
 usr/sbin/ece-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index b3097a2e..2a4098fc 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -205,7 +205,7 @@ function install_common_os_packages()
     fi
   fi
   
-  local packages="curl $git_package wget unzip"
+  local packages="curl $git_package wget unzip bc"
   install_packages_if_missing $packages
   
   for el in lsb_release curl wget git unzip; do

From a45722db94a24c0736cb205f791a9fda733d4e55 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 15 May 2012 10:54:54 +0200
Subject: [PATCH 0808/2585] - added a new package: escenic-build-scripts

---
 usr/share/escenic/package-scripts/create-packages    |  9 ++++++++-
 .../debian/escenic-build-scripts/control             | 12 ++++++++++++
 .../debian/escenic-build-scripts/postinst            |  4 ++++
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 usr/share/escenic/package-scripts/debian/escenic-build-scripts/control
 create mode 100755 usr/share/escenic/package-scripts/debian/escenic-build-scripts/postinst

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 196e2991..30f363cb 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -59,6 +59,8 @@ function create_target_directory() {
     set_up_escenic-content-engine-scripts
   elif [[ $package_name == "vosa" ]]; then
     set_up_vosa
+  elif [[ $package_name == "escenic-build-scripts" ]]; then
+    set_up_escenic-build-scripts
   elif [[ $package_name == "escenic-common-scripts" ]]; then
     set_up_escenic-common-scripts
   elif [[ $package_name == "escenic-munin-plugins" ]]; then
@@ -81,7 +83,12 @@ function set_up_escenic-content-engine-installer() {
     $target_dir/usr/share/escenic/ece-scripts/
   cp -r ../../doc/escenic/ece-install-guide.{org,html} \
     $target_dir/usr/share/doc/escenic
-} 
+}
+
+function set_up_escenic-build-scripts() {
+  mkdir -p $target_dir/usr/share/escenic/build-scripts
+  cp ../build-scripts/build.sh $target_dir/usr/share/escenic/build-scripts/
+}
 
 function set_up_escenic-content-engine-scripts() {
   mkdir -p $target_dir/{etc,usr,/etc/default}
diff --git a/usr/share/escenic/package-scripts/debian/escenic-build-scripts/control b/usr/share/escenic/package-scripts/debian/escenic-build-scripts/control
new file mode 100644
index 00000000..fcf40c9c
--- /dev/null
+++ b/usr/share/escenic/package-scripts/debian/escenic-build-scripts/control
@@ -0,0 +1,12 @@
+Package: escenic-build-scripts
+Version: VERSION
+Section: base
+Priority: optional
+Architecture: all
+Maintainer: MAINTAINER_NAME <MAINTAINER_EMAIL>
+Description: Build scripts used for build servers and/or development
+  environments for typical Escenic projects.  
+  .
+  See the documentation in /usr/share/doc/escenic/ for further
+  details.
+ 
\ No newline at end of file
diff --git a/usr/share/escenic/package-scripts/debian/escenic-build-scripts/postinst b/usr/share/escenic/package-scripts/debian/escenic-build-scripts/postinst
new file mode 100755
index 00000000..e15ca1c2
--- /dev/null
+++ b/usr/share/escenic/package-scripts/debian/escenic-build-scripts/postinst
@@ -0,0 +1,4 @@
+#! /usr/bin/env bash
+
+exit 0
+

From 584a27af4580c63eb4c8047e3750b133c0d9d18d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Tue, 15 May 2012 14:26:12 +0200
Subject: [PATCH 0809/2585] Verifying builder sandbox

---
 usr/share/escenic/build-scripts/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/build.sh b/usr/share/escenic/build-scripts/build.sh
index d1cd6c91..ee67babc 100755
--- a/usr/share/escenic/build-scripts/build.sh
+++ b/usr/share/escenic/build-scripts/build.sh
@@ -5,7 +5,7 @@
 ################################################################################
 
 # customer
-CUSTOMER=myproject
+CUSTOMER=test
 
 # date used for .ear naming 
 DATE=`date +%F_%H%M`

From 89cf219111d90fd4d04f172da553e633d28754b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Tue, 15 May 2012 16:37:47 +0200
Subject: [PATCH 0810/2585] build.sh is now more robust

---
 usr/share/escenic/build-scripts/build.sh | 241 ++++++++++++++++-------
 1 file changed, 169 insertions(+), 72 deletions(-)

diff --git a/usr/share/escenic/build-scripts/build.sh b/usr/share/escenic/build-scripts/build.sh
index ee67babc..1e574afd 100755
--- a/usr/share/escenic/build-scripts/build.sh
+++ b/usr/share/escenic/build-scripts/build.sh
@@ -1,73 +1,156 @@
+#! /usr/bin/env bash
+
 ################################################################################
 #
 # VOSA - build server script - customer x
 #
 ################################################################################
 
-# customer
-CUSTOMER=test
+# Common variables
+log=~/build.log
+pid_file=~/build.pid
+build_date=`date +%F_%H%M`
+vosa_root_dir=/opt/vosa
+assemblytool_root_dir=~/assemblytool
+assemblytool_pub_dir=$assemblytool_root_dir/publications
+assemblytool_lib_dir=$assemblytool_root_dir/lib
+svn_src_dir=~/src
+release_dir=~/releases
+plugin_dir=~/plugins
+engine_root_dir=~/engine
+
+##
+function fetch_configuration
+{
+  conf_file=~/build.conf
+  source $conf_file
+}
 
-# date used for .ear naming 
-DATE=`date +%F_%H%M`
+##
+function init
+{
+  source $ece_scripts_home/common-bashing.sh
+  source $ece_scripts_home/common-io.sh
+}
 
-# svn information
-SVN_BASE=https://mysvnserver.com/svn/MYPROJECT/
-SVN_PATH=
+## TODO - doc
+function set_pid {
+  if [ -e $pid_file ]; then
+    print "Instance of $(basename $0) already running!"
+    exit 1
+  else
+    echo $BASHPID > $pid_file
+  fi
+}
 
-SVN_USER=myproject-build-user
-SVN_PASSWORD=yesyouwouuldlikethatwouldntyou
+function common_post_build {
+  run rm $pid_file
+}
 
-# release label for .ear naming - default: trunk
-RELEASE_LABEL=trunk
+##
+function get_user_options
+{
+  while getopts ":b:t:" opt; do
+    case $opt in
+      b)
+        svn_path=branches/${OPTARG}
+        release_label=branch-${OPTARG}
+        ;;
+      t)
+        svn_path=tags/${OPTARG}
+        release_label=tag-${OPTARG}
+        ;;
+      \?)
+        print "Invalid option: -$OPTARG" >&2
+        remove_pid_and_exit_in_error
+        ;;
+      :)
+        print "Option -$OPTARG requires an argument." >&2
+        remove_pid_and_exit_in_error
+        ;;
+    esac
+  done
 
-# clean up customer home
-function home_preparation {
+}
 
-  rm ~/plugins/*
-  rm ~/engine
-  rm ~/assemblytool/publications/*
-  rm ~/assemblytool/lib/*
-  rm -rf src
-  mkdir src
-  #TODO: make a place where everything common to all ears go.
-  ln -s /opt/escenic/assemblytool/lib/java_memcached-release_2.0.1.jar assemblytool/lib/
+##
+function verify_configuration {
+  ensure_variable_is_set customer
+  ensure_variable_is_set svn_base
+  ensure_variable_is_set svn_user
+  ensure_variable_is_set svn_password
+}
 
+##
+function verify_vosa {
+  if [ ! -d $assemblytool_root_dir ]; then
+    print_and_log "$assemblytool_root_dir is required, but it doesn't exist!"
+    remove_pid_and_exit_in_error
+  fi
+  if [ ! -d $release_dir ]; then
+    print_and_log "$release_dir did not exist so it has been created."
+    make_dir $release_dir
+  fi
 }
 
-# checkout customer project
-function svn_checkout {
+# clean up customer home
+function home_preparation
+{
+  if [ -e "$plugin_dir" ]; then
+    run rm -rf $plugin_dir
+    make_dir $plugin_dir
+  fi
+
+  if [ -e "$engine_root_dir" ]; then
+    run rm $engine_root_dir
+  fi
+
+  if [ -e "$assemblytool_pub_dir" ]; then
+    run rm -rf $assemblytool_pub_dir
+    make_dir $assemblytool_pub_dir
+  fi
 
-  type=$1
-
-  if [ "$type" = "trunk" ]; then
-    SVN_PATH=trunk
-    RELEASE_LABEL=$type
-  elif [ "$type" = "branch" ]; then
-    SVN_PATH=branches/$2
-    RELEASE_LABEL=$type-$2
-  elif [ "$type" = "tag" ]; then
-    SVN_PATH=tags/$2
-    RELEASE_LABEL=$type-$2
+  if [ -e "$assemblytool_lib_dir" ]; then
+    run rm -rf $assemblytool_lib_dir
+    make_dir $assemblytool_lib_dir
   fi
 
-  if [ "$SVN_PATH" = "" ]; then
-    echo "No svn path chosen! Will use 'trunk'."
-    SVN_PATH=trunk
+  if [ -e "$svn_src_dir" ]; then
+    run rm -rf $svn_src_dir
+    make_dir $svn_src_dir
   fi
+}
 
-  echo "Initiating svn checkout of $SVN_PATH"
-  svn checkout --username=$SVN_USER --password=$SVN_PASSWORD $SVN_BASE$SVN_PATH src/.
+## TODO: make a place where everything common to all ears go.
+function add_vosa_libs
+{
+  
+  ln -s /opt/escenic/assemblytool/lib/java_memcached-release_2.0.1.jar ~/assemblytool/lib/
+}
+
+
+## Checkout customer project
+function svn_checkout {
+
+  if [ -z "$svn_path" ]; then
+    svn_path=trunk
+    release_label=$svn_path
+    print_and_log "No svn path chosen! Will use 'trunk'!"
+  fi
+  print_and_log "Initiating svn checkout of $svn_path ..."
+  #TODO run?
+  svn checkout --username=$svn_user --password=$svn_password $svn_base$svn_path $svn_src_dir/.
 
 }
 
 # parse version based on property from src/pom.xml
 function parse_version {
-  export $1=`sed "/<$2>/!d;s/ *<\/\?$2> *//g" ~/src/pom.xml | tr -d $'\r' `
+  run export $1=`sed "/<$2>/!d;s/ *<\/\?$2> *//g" $svn_src_dir/pom.xml | tr -d $'\r' `
 }
 
 # symlink component from /opt/vosa/.
 function symlink_distribution {
-  ln -s /opt/vosa/$1 ~/$2
+  run ln -s $vosa_root_dir/$1 ~/$2
 }
 
 function symlink_ece_components {
@@ -110,56 +193,70 @@ function symlink_ece_components {
 function symlink_target {
 
   # global classpath
-  for f in $(ls -d ~/src/vosa-assembly/target/lib/*);
-    do ln -s $f ~/assemblytool/lib;
+  for f in $(ls -d $svn_src_dir/vosa-assembly/target/lib/*);
+    do run ln -s $f $assemblytool_lib_dir;
   done
 
   # publications
-  for f in $(ls -d ~/src/vosa-assembly/target/wars/*);
-    do ln -s $f ~/assemblytool/publications;
+  for f in $(ls -d $svn_src_dir/vosa-assembly/target/wars/*);
+    do ln -s $f $assemblytool_pub_dir;
   done
 
 }
 
-function release {
+##
+function release 
+{
 
   home_preparation
 
-  svn_checkout $1 $2
-  revision=`svn info src | grep -i Revision | awk '{print $2}'`
+  run svn_checkout
+
+  revision=`svn info $svn_src_dir | grep -i Revision | awk '{print $2}'`
+  
+  if [ -z "$revision" ]; then
+    print_and_log "Failed to fetch current revision number, exiting! :-("
+    remove_pid_and_exit_in_error
+  fi
+
 
   symlink_ece_components
 
-  cd src
-  mvn clean package
+  run cd $svn_src_dir
+  run mvn clean package
 
-  cd vosa-assembly/target
-  unzip vosa-assembly.zip
+  run cd $svn_src_dir/vosa-assembly/target
+  run unzip vosa-assembly.zip
 
   symlink_target
 
-  cd ~/assemblytool
-  ant -q ear -DskipRedundancyCheck=true
+  run cd $assemblytool_root_dir
+  run ant -q clean ear -DskipRedundancyCheck=true
 
-  cp dist/engine.ear ~/releases/$CUSTOMER-$RELEASE_LABEL-rev$revision-$DATE.ear
+  resulting_ear=$customer-$release_label-rev$revision-$build_date.ear
+  run cp $assemblytool_root_dir/dist/engine.ear $release_dir/$resulting_ear
+  
+  if [ ! -e "$release_dir/$resulting_ear" ]; then
+    print_and_log "I'm done, but the .ear is still missing, exiting! :-("
+    remove_pid_and_exit_in_error
+  fi
 
 }
 
-################################################
-# VOSA - Build Server Script
-################################################
-
-case "$1" in
-
-release)
-
-  release $2 $3
-  ;;
-
-*)
-  echo $"Usage: $0 {release}"
-  exit 2
-esac
-
-exit $?
+##
+function print_result
+{
+  print_and_log "BUILD SUCCESSFUL!"
+  print_and_log "You'll find the release here: http://builder.vizrtsaas.com/$customer/releases/$resulting_ear"
+}
 
+set_pid
+fetch_configuration
+init
+get_user_options $@
+verify_configuration
+home_preparation
+verify_vosa
+release
+print_result
+common_post_build

From ef182a6dde0ea83f190dff7ba506a8f02a59e139 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Tue, 15 May 2012 16:42:46 +0200
Subject: [PATCH 0811/2585] included vosa special libs in the build process

---
 usr/share/escenic/build-scripts/build.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/build.sh b/usr/share/escenic/build-scripts/build.sh
index 1e574afd..256081e1 100755
--- a/usr/share/escenic/build-scripts/build.sh
+++ b/usr/share/escenic/build-scripts/build.sh
@@ -125,7 +125,7 @@ function home_preparation
 function add_vosa_libs
 {
   
-  ln -s /opt/escenic/assemblytool/lib/java_memcached-release_2.0.1.jar ~/assemblytool/lib/
+  ln -s /opt/escenic/assemblytool/lib/java_memcached-release_2.0.1.jar $assemblytool_lib_dir/
 }
 
 
@@ -230,6 +230,8 @@ function release
 
   symlink_target
 
+  add_vosa_libs
+
   run cd $assemblytool_root_dir
   run ant -q clean ear -DskipRedundancyCheck=true
 

From c75bff3b4658c7f638953f835211de8b193cef2f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 16 May 2012 12:12:02 +0200
Subject: [PATCH 0812/2585] - added script that will check the passed log4j for
 Escenic Content   Engine related import errors and attempt to provide useful 
  information on which actions to take to remedy them.

---
 .../import-scripts/import-error-log-analyzer  | 58 +++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 usr/share/escenic/import-scripts/import-error-log-analyzer

diff --git a/usr/share/escenic/import-scripts/import-error-log-analyzer b/usr/share/escenic/import-scripts/import-error-log-analyzer
new file mode 100644
index 00000000..4646959b
--- /dev/null
+++ b/usr/share/escenic/import-scripts/import-error-log-analyzer
@@ -0,0 +1,58 @@
+#! /usr/bin/env bash
+
+# by tkj@vizrt.com
+
+## Will check the passed log4j for import related errors and attempt
+## to provide useful information on which actions to take to remedy
+## them.
+
+## $1 :: the log4j log (often called Escenic-error.log)
+
+function check_picture_file() {
+  local dir=$(dirname "$1")
+  local file_name=$(basename "$1")
+  local alternative=$(find $dir -maxdepth 1 | grep -i "$file_name")
+
+  # first check if the image is size=0
+  if [ $(find $dir -name $file_name -maxdepth 1 -type f -size 0 | wc -l) -gt 0 ]; then
+    cat <<EOF
+The file $1 is empty (size = 0 bytes)
+====
+EOF
+    return
+  fi
+
+  if [[ -n "$alternative" && $(echo $alternative | wc -l) -gt 0 ]]; then
+    cat <<EOF
+The file $1
+was missing from your import data set It was referred to from one of
+your XML files, perhaps you meant this one?
+
+   $alternative
+Suggested command to fix this:
+   mv "$alternative" \\
+      "$1"
+====
+EOF
+  fi
+}
+
+function analyse_this() {
+  if [ ! -e $1 ]; then
+    echo $1 "doesn't exist :-("
+    exit 1
+  fi
+  
+  grep "Invalid image file" $1 | \
+    grep ^java.io.IOException | \
+    cut -d' ' -f5 | \
+    sed 's/\.$//g' | \
+    while read picture_path; do
+    check_picture_file "$picture_path"
+  done
+
+}
+
+log_file=$1
+analyse_this $log_file
+

From 4bb81d4b271f3dd832fd42d1bc55ef9291efbb35 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 16 May 2012 15:22:47 +0200
Subject: [PATCH 0813/2585] - ece list-instances, which is called from the TAB
 completion no   longer performs a check for write access to run and log
 directories,   this should fix and close #63

---
 usr/bin/ece | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index e9b313f3..cdb28d0b 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -453,6 +453,10 @@ function sanity_check()
         exit 1
     fi
     
+    if [ "$(echo $command)" == "list-instances" ]; then
+      return
+    fi
+
     verify_that_directory_and_file_are_writeable $log
     verify_that_directory_and_file_are_writeable $pid_file
 
@@ -461,10 +465,6 @@ function sanity_check()
         exit 1
     fi
 
-    if [ "$(echo $command)" == "list-instances" ]; then
-      return
-    fi
-
     local instance_list=$(get_instance_list)
     # checks if the user is using the default instance when he/she
     # really wants to start one of the instances installed on the

From b82fff3294c17cbfda674578cad0af423e4bbbbe Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 16 May 2012 16:05:29 +0200
Subject: [PATCH 0814/2585] - moved log specific code to an dedicated logs.sh
 module - fixed issue where "ece loglist" wouldn't list the log4j log  
 (regression bug).

  This change closes #67
---
 usr/bin/ece                                 | 65 +--------------------
 usr/share/escenic/ece-scripts/ece.d/logs.sh | 61 +++++++++++++++++++
 2 files changed, 62 insertions(+), 64 deletions(-)
 create mode 100644 usr/share/escenic/ece-scripts/ece.d/logs.sh

diff --git a/usr/bin/ece b/usr/bin/ece
index cdb28d0b..059357a8 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -220,7 +220,7 @@ function set_common_settings()
     
     gc_log=${log_dir}/${type}-${instance}-gc.log
 
-    log_list="
+    log4j_file_list="
       $log_dir/${HOSTNAME}-${instance}-messages
       $log_dir/messages
       $log_dir/Escenic-error.log
@@ -1013,69 +1013,6 @@ EOF
     run rm -rf ${dir}
 }
 
-function get_gc_log() {
-  echo ${gc_log}
-}
-
-function get_log4j_log()
-{
-    for el in $log_file_list; do
-        if [ -r $el ]; then
-            echo $el
-            return
-        fi
-    done
-
-    echo ""
-}
-
-function tail_messages_log()
-{
-    log4j_log=$(get_log4j_log)
-    print "tailing $log4j_log"
-    tail -f $log4j_log
-}
-
-function tail_out_log()
-{
-    tail_list=$log
-
-    # if needs be, we can add more system out logs here. For now,
-    # we're sticking with the default one.
-    
-    print "Tailing the system out log $tail_list"
-    tail -f $tail_list
-}
-
-function get_app_log()
-{
-    local app_log=""
-    if [ "$appserver" == "tomcat" ]; then
-        app_log=$tomcat_base/logs/localhost.`date +%F`.log
-    elif [ "$appserver" == "resin" -a -e $resin_home/log/jvm-default.log ]; then
-        app_log=$resin_home/log/jvm-default.log
-    else
-        print "I don't know where the logs for $appserver are."
-        print "Ask support@escenic.com to add support for $appserver in "
-        print "tail_app_log()"
-        exit 1
-    fi
-
-    echo $app_log
-}
-
-
-function tail_app_log()
-{
-    if [ "$type" == "rmi-hub" ]; then
-        print "There is no application server log for $type"
-        exit 1
-    fi
-    
-    print "Tailing the application server log $(get_app_log)"
-    tail -f $(get_app_log)
-}
-
 function make_thread_dump()
 {
 
diff --git a/usr/share/escenic/ece-scripts/ece.d/logs.sh b/usr/share/escenic/ece-scripts/ece.d/logs.sh
new file mode 100644
index 00000000..c3e98ec2
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece.d/logs.sh
@@ -0,0 +1,61 @@
+function get_gc_log() {
+  echo ${gc_log}
+}
+
+function get_log4j_log() {
+  for el in $log4j_file_list; do
+    if [ -r $el ]; then
+      echo $el
+      return
+    fi
+  done
+
+  echo ""
+}
+
+function tail_messages_log()
+{
+  log4j_log=$(get_log4j_log)
+  print "tailing $log4j_log"
+  tail -f $log4j_log
+}
+
+function tail_out_log()
+{
+  tail_list=$log
+
+    # if needs be, we can add more system out logs here. For now,
+    # we're sticking with the default one.
+  
+  print "Tailing the system out log $tail_list"
+  tail -f $tail_list
+}
+
+function get_app_log()
+{
+  local app_log=""
+  if [ "$appserver" == "tomcat" ]; then
+    app_log=$tomcat_base/logs/localhost.`date +%F`.log
+  elif [ "$appserver" == "resin" -a -e $resin_home/log/jvm-default.log ]; then
+    app_log=$resin_home/log/jvm-default.log
+  else
+    print "I don't know where the logs for $appserver are."
+    print "Ask support@escenic.com to add support for $appserver in "
+    print "tail_app_log()"
+    exit 1
+  fi
+
+  echo $app_log
+}
+
+
+function tail_app_log()
+{
+  if [ "$type" == "rmi-hub" ]; then
+    print "There is no application server log for $type"
+    exit 1
+  fi
+  
+  print "Tailing the application server log $(get_app_log)"
+  tail -f $(get_app_log)
+}

From 127d012660cd3b4bb9979bd677536dd86b1181e2 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Fri, 18 May 2012 08:30:46 +0200
Subject: [PATCH 0815/2585] Moved list of logged in users. Removed logged in
 users from "permanent" report.

---
 .../escenic/ece-scripts/system-info.d/55-list-users.sh | 10 +++++-----
 .../ece-scripts/system-info.d/66-list-os-info.sh       |  4 ++++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/55-list-users.sh b/usr/share/escenic/ece-scripts/system-info.d/55-list-users.sh
index 6e2208ec..951e2f44 100755
--- a/usr/share/escenic/ece-scripts/system-info.d/55-list-users.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/55-list-users.sh
@@ -1,9 +1,9 @@
 #! /usr/bin/env bash
 
-print_h2_header "Logged in users"
-print_pre_text "$(who -H)"
-
-print_h2_header "Last Boot"
-print_pre_text "$(who -b)"
+# Logged in users counts as "temporary" information.
+if [ $temporaries -eq 1 ] ; then
+  print_h2_header "Logged in users"
+  print_pre_text "$(who -H)"
+fi
 
 
diff --git a/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
index e4e855e6..64df0d3b 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
@@ -27,6 +27,10 @@ if [ -n "$TZ" ]; then
 fi
 print_un_ordered_list_end
 
+
+print_h3_header "Last Boot"
+print_pre_text "$(who -b)"
+
 # of the h2
 print_section_end
 

From 15ef2df8599d065ac381cffe8a36554a66f65bc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Fri, 18 May 2012 09:39:20 +0200
Subject: [PATCH 0816/2585] added engine-backport-1.0-SNAPSHOT.jar as vosa lib
 resource

---
 usr/share/escenic/build-scripts/build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/build-scripts/build.sh b/usr/share/escenic/build-scripts/build.sh
index 256081e1..ebb92002 100755
--- a/usr/share/escenic/build-scripts/build.sh
+++ b/usr/share/escenic/build-scripts/build.sh
@@ -126,6 +126,7 @@ function add_vosa_libs
 {
   
   ln -s /opt/escenic/assemblytool/lib/java_memcached-release_2.0.1.jar $assemblytool_lib_dir/
+  ln -s $vosa_root_dir/lib/engine-backport-1.0-SNAPSHOT.jar $assemblytool_lib_dir/
 }
 
 

From e970c03f80b838fb6abef0de723386a8f8aa8e0c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 22 May 2012 11:47:34 +0200
Subject: [PATCH 0817/2585] - Normally, the file shre will already have a
 binary folder, which the   above loop would then set up a link to on the NFS
 client. However,   in case the shared binary endpoint doesn't already exist,
 create it   on the shared system and symlink to it.

---
 .../ece-scripts/ece-install.d/network-file-system.sh   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh b/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
index 1e9b27f5..c0db3c6c 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
@@ -106,6 +106,16 @@ EOF
           ln -s $mount_point/${ele} $escenic_data_dir/engine/$(basename $ele)
         fi
       done
+
+      # Normally, the file shre will already have a binary folder,
+      # which the above loop would then set up a link to on the NFS
+      # client. However, in case the shared binary endpoint doesn't
+      # already exist, create it on the shared system and symlink to
+      # it.
+      if [ ! -e $escenic_data_dir/engine/binary ]; then
+        make_dir $mount_point/binary
+        ln -s $mount_point/binary $escenic_data_dir/engine/binary
+      fi
     fi
   done
 

From bf9405e8b805f5f0af74d4d06160aab8c9baceb9 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 22 May 2012 11:48:57 +0200
Subject: [PATCH 0818/2585] - type

---
 .../escenic/ece-scripts/ece-install.d/network-file-system.sh    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh b/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
index c0db3c6c..e7903dab 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
@@ -107,7 +107,7 @@ EOF
         fi
       done
 
-      # Normally, the file shre will already have a binary folder,
+      # Normally, the file share will already have a binary folder,
       # which the above loop would then set up a link to on the NFS
       # client. However, in case the shared binary endpoint doesn't
       # already exist, create it on the shared system and symlink to

From 3d7ac5a7bbfbf32deaefe6fb7698e5d16806448c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 22 May 2012 13:44:43 +0200
Subject: [PATCH 0819/2585] - using --cvs-exclude rather than explicit excludes
 (which didn't work   by the way!). Now, these file masks are ignored:

  RCS SCCS CVS CVS.adm RCSLOG cvslog.* tags TAGS .make.state
  .nse_depinfo *~ #* .#* ,* _$* *$ *.old *.bak
  *.BAK *.orig *.rej .del-* *.a *.olb *.o *.obj
  *.so *.exe *.Z *.elc *.ln core .svn/ .git/ .bzr/
---
 usr/share/vizrt/vosa/commands/push.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/vizrt/vosa/commands/push.sh b/usr/share/vizrt/vosa/commands/push.sh
index 750ae7b7..50318bac 100644
--- a/usr/share/vizrt/vosa/commands/push.sh
+++ b/usr/share/vizrt/vosa/commands/push.sh
@@ -20,7 +20,7 @@ rsync_opts="
 --itemize-changes
 --ignore-times
 --checksum
---exclude '*~'
+--cvs-exclude
 "
 rsync_additional_outgoing_opts="
 --dry-run

From 7b49c750323556a1f1bb2087e8dcd4b830d2fe50 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 22 May 2012 14:36:30 +0200
Subject: [PATCH 0820/2585] - added ca-certificates to the list of common
 packages installed. The   reason is that *sometimes* it's not installed (had
 the incident on a   clean Ubuntu server image), and curl and git commands
 which uses   HTTPS will then fail.

---
 usr/sbin/ece-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 2a4098fc..58512da7 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -205,7 +205,7 @@ function install_common_os_packages()
     fi
   fi
   
-  local packages="curl $git_package wget unzip bc"
+  local packages="curl $git_package wget unzip bc ca-certificates"
   install_packages_if_missing $packages
   
   for el in lsb_release curl wget git unzip; do

From 7185d7abc0de285a35cee56a212b1191dcde650e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 22 May 2012 15:18:21 +0200
Subject: [PATCH 0821/2585] - added get_memory_usage_of_pid - added
 get_memory_summary_of_pid - these use the /proc file systems directly, hence
 only working on   Linux.

---
 usr/share/escenic/ece-scripts/common-io.sh | 30 +++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/common-io.sh b/usr/share/escenic/ece-scripts/common-io.sh
index 15370c28..708ea6fc 100644
--- a/usr/share/escenic/ece-scripts/common-io.sh
+++ b/usr/share/escenic/ece-scripts/common-io.sh
@@ -139,5 +139,33 @@ function verify_that_files_exist_and_are_readable()
       remove_pid_and_exit_in_error
     fi
   done
-}   
+}
+
+function get_memory_usage_of_pid() {
+  local file=/proc/$1/status
+  if [ ! -e $file ]; then
+    return
+  fi
+
+  grep VmSize $file | cut -d ":" -f2 | sed 's/^[ \t]*//g'
+}
+
+function get_memory_summary_of_pid() {
+  local file=/proc/$1/status
+  if [ ! -e $file ]; then
+    return
+  fi
+
+  local size=$(
+    grep VmSize $file | cut -d ":" -f2 | sed 's/^[ \t]*//g'
+  )
+  local peak=$(
+    grep VmPeak $file | cut -d ":" -f2 | sed 's/^[ \t]*//g'
+  )
+
+  echo "${size} (peaked at: $peak)"
+}
+
+
+
 

From 4e665eb89faf57b01feb7cdd492f7db7fe53648d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 22 May 2012 15:19:45 +0200
Subject: [PATCH 0822/2585] - added memory usage to "ece info", it's now listed
 for each of the   app servers, e.g.:

  [ece#engine-cohen] Application server:
  [ece#engine-cohen] |-> Status: UP 0d 0h 30m 28s
  [ece#engine-cohen] |-> Port: 8080
  [ece#engine-cohen] |-> PID: 13511
  [ece#engine-cohen] |-> Memory usage: 730020 kB (peaked at: 730300 kB)
---
 usr/share/escenic/ece-scripts/ece.d/info.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/ece-scripts/ece.d/info.sh b/usr/share/escenic/ece-scripts/ece.d/info.sh
index bc9c4483..11644bd9 100644
--- a/usr/share/escenic/ece-scripts/ece.d/info.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/info.sh
@@ -28,6 +28,7 @@ function get_info_for_type() {
 
     if [ $(get_status | grep UP | wc -l) -gt 0 ]; then
       print "|-> PID:" $type_pid
+      print "|-> Memory usage:" $(get_memory_summary_of_pid $type_pid)
     fi
     
     print "|-> Type: " $appserver

From e8e34472e903bead3f6ceb8216484aa014d3603c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 22 May 2012 15:21:15 +0200
Subject: [PATCH 0823/2585] - moved the get_memory_usage_of_pid & _summary to
 common-os

---
 usr/share/escenic/ece-scripts/common-os.sh | 29 ++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index 6b3d8822..79242d8f 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -176,3 +176,32 @@ function add_apt_source() {
     run apt-get update
   fi
 }
+
+function get_memory_usage_of_pid() {
+  local file=/proc/$1/status
+  if [ ! -e $file ]; then
+    # TODO add support for non-Linux systems
+    return
+  fi
+
+  grep VmSize $file | cut -d ":" -f2 | sed 's/^[ \t]*//g'
+}
+
+function get_memory_summary_of_pid() {
+  local file=/proc/$1/status
+  if [ ! -e $file ]; then
+    # TODO add support for non-Linux systems
+    return
+  fi
+
+  local size=$(
+    grep VmSize $file | cut -d ":" -f2 | sed 's/^[ \t]*//g'
+  )
+  local peak=$(
+    grep VmPeak $file | cut -d ":" -f2 | sed 's/^[ \t]*//g'
+  )
+
+  echo "${size} (peaked at: $peak)"
+}
+
+

From 8316e078c19e75986bfa476f1e41126e82221506 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 22 May 2012 15:21:36 +0200
Subject: [PATCH 0824/2585] - moved memory stats from common-io to common-os

---
 usr/share/escenic/ece-scripts/common-io.sh | 28 ----------------------
 1 file changed, 28 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/common-io.sh b/usr/share/escenic/ece-scripts/common-io.sh
index 708ea6fc..ea350fa9 100644
--- a/usr/share/escenic/ece-scripts/common-io.sh
+++ b/usr/share/escenic/ece-scripts/common-io.sh
@@ -141,31 +141,3 @@ function verify_that_files_exist_and_are_readable()
   done
 }
 
-function get_memory_usage_of_pid() {
-  local file=/proc/$1/status
-  if [ ! -e $file ]; then
-    return
-  fi
-
-  grep VmSize $file | cut -d ":" -f2 | sed 's/^[ \t]*//g'
-}
-
-function get_memory_summary_of_pid() {
-  local file=/proc/$1/status
-  if [ ! -e $file ]; then
-    return
-  fi
-
-  local size=$(
-    grep VmSize $file | cut -d ":" -f2 | sed 's/^[ \t]*//g'
-  )
-  local peak=$(
-    grep VmPeak $file | cut -d ":" -f2 | sed 's/^[ \t]*//g'
-  )
-
-  echo "${size} (peaked at: $peak)"
-}
-
-
-
-

From 3aa6d1dc54d4e46b6afe2308b35adc287479cc28 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 22 May 2012 15:48:18 +0200
Subject: [PATCH 0825/2585] - removed the trailing white space of the "system
 boot" output.

---
 usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
index 64df0d3b..3753fa5b 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
@@ -29,7 +29,7 @@ print_un_ordered_list_end
 
 
 print_h3_header "Last Boot"
-print_pre_text "$(who -b)"
+print_pre_text "$(who -b) | sed 's/^[ ]*//g"
 
 # of the h2
 print_section_end

From 447a122425062d19331eeb55e5bbfbd4fa34a388 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 23 May 2012 10:12:09 +0200
Subject: [PATCH 0826/2585] - haha! the sed command itself got included in the
 output :)

---
 usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
index 3753fa5b..11cf764c 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
@@ -29,7 +29,7 @@ print_un_ordered_list_end
 
 
 print_h3_header "Last Boot"
-print_pre_text "$(who -b) | sed 's/^[ ]*//g"
+print_pre_text "$(who -b | sed 's/^[ ]*//g)"
 
 # of the h2
 print_section_end

From aaa0faab2ebabf9bc5aac4a1fdeda7412f13bd42 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 23 May 2012 10:15:31 +0200
Subject: [PATCH 0827/2585] - missing quote in the sed, gee!

---
 usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
index 11cf764c..b6f20dd9 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
@@ -29,7 +29,7 @@ print_un_ordered_list_end
 
 
 print_h3_header "Last Boot"
-print_pre_text "$(who -b | sed 's/^[ ]*//g)"
+print_pre_text "$(who -b | sed 's/^[ ]*//g')"
 
 # of the h2
 print_section_end

From 76608e81ca2c3c809aeab98322c8f62fc95eff56 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 23 May 2012 10:20:16 +0200
Subject: [PATCH 0828/2585] - removed "system-boot" from the system value as
 "last boot" is   already in the header.

---
 usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
index b6f20dd9..5725a29a 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
@@ -29,7 +29,7 @@ print_un_ordered_list_end
 
 
 print_h3_header "Last Boot"
-print_pre_text "$(who -b | sed 's/^[ ]*//g')"
+print_pre_text "$(who -b | sed -e 's/[a-z]*//g' -e 's/^[ ]*//g')"
 
 # of the h2
 print_section_end

From 25c55248a7e1598a874b78df363d3f9ad57803d6 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Wed, 23 May 2012 11:08:31 +0200
Subject: [PATCH 0829/2585] Exporting hostname for the benefit of the spawned
 java process

---
 usr/bin/ece | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/bin/ece b/usr/bin/ece
index 059357a8..70c24f18 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -691,6 +691,7 @@ ${escenic_conf_dir}
 function start_type()
 {
     unset CLASSPATH
+    export HOSTNAME
     message="Starting the $instance instance of $type on $HOSTNAME ..."
     print_and_log $message
     

From a1ecd4ed7dff545223c93a2eb668473e7019b4ed Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 23 May 2012 15:32:07 +0200
Subject: [PATCH 0830/2585] - added
 verify_that_directory_and_file_are_writeable

---
 usr/share/escenic/ece-scripts/common-io.sh | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/common-io.sh b/usr/share/escenic/ece-scripts/common-io.sh
index ea350fa9..f07fcae1 100644
--- a/usr/share/escenic/ece-scripts/common-io.sh
+++ b/usr/share/escenic/ece-scripts/common-io.sh
@@ -141,3 +141,22 @@ function verify_that_files_exist_and_are_readable()
   done
 }
 
+function verify_that_directory_and_file_are_writeable() {
+  local dir=`dirname $1`
+  if [ ! -e $dir ]; then
+    print $1: $dir " doesn't exist"
+    exit 1
+  fi
+  if [ ! -w $dir ]; then
+    print $1: $dir " isn't writable for user $USER"
+    exit 1
+  fi
+
+  if [ -e $1 ]; then
+    if [ ! -w $1 ]; then
+      print $1 "exists, "
+      print "but isn't write-able for user $USER"
+      exit 1
+    fi
+  fi
+}

From 5ffd3a6822c8268034527b570546754a777ec2f6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 23 May 2012 15:38:22 +0200
Subject: [PATCH 0831/2585] - renamed command from loglist to list-logs to be
 in tandem with list-instances.

---
 etc/bash_completion.d/ece | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/bash_completion.d/ece b/etc/bash_completion.d/ece
index 3db3a725..2c946110 100644
--- a/etc/bash_completion.d/ece
+++ b/etc/bash_completion.d/ece
@@ -5,7 +5,7 @@ _ece_commands()
     local cur=${COMP_WORDS[COMP_CWORD]}
     local prev=${COMP_WORDS[COMP_CWORD-1]}
 
-    commands="applog assemble backup clean deploy edit help info kill log loglist
+    commands="applog assemble backup clean deploy edit help info kill log list-logs
               flush outlog package restart start status stop threaddump update versions
               list-instances
     "

From 7b5d2019353aa45bc3f329f4a80a554c43ace253 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 23 May 2012 15:38:42 +0200
Subject: [PATCH 0832/2585] - renamed command from loglist to list-logs to be
 in tandem with   list-instances. - moved a number of commands into their own
 ece.d modules

---
 usr/bin/ece | 508 +---------------------------------------------------
 1 file changed, 1 insertion(+), 507 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 059357a8..e19bbd34 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -102,29 +102,6 @@ function init() {
   fi
 }
 
-function verify_that_directory_and_file_are_writeable()
-{
-    dir=`dirname $1`
-    if [ ! -e $dir ]; then
-        print $1: $dir " doesn't exist"
-        exit 1
-    fi
-    if [ ! -w $dir ]; then
-        print $1: $dir " isn't writable for user $USER"
-        exit 1
-    fi
-
-    if [ -e $1 ]; then
-        if [ ! -w $1 ]; then
-            print $1 "exists, "
-            print "but isn't write-able for user $USER"
-            print "check the permissions and that $USER is the correct one"
-            print "to run "`basename $0`
-            exit 1
-        fi
-    fi
-}
-
 ####################################################################
 # Ensures that all required fields are set. Will report all missing
 # required fields before failing.
@@ -577,460 +554,6 @@ function get_actual_file()
     echo ${real_file}
 }
 
-function backup_type()
-{
-   message="Backing up the $instance instance of $type on $HOSTNAME ..."
-   print $message
-   log $message
-
-   if [ "$type" == "rmi-hub" ]; then
-       ensure_that_required_fields_are_set $hub_required_fields
-   elif [ "$type" == "search" ]; then
-        # TODO trim & tun the default parameters for the search
-        # instance.
-       ensure_that_required_fields_are_set $engine_required_fields
-   elif [ "$type" == "engine" ]; then
-       ensure_that_required_fields_are_set $engine_required_fields
-   elif [ "$type" == "analysis" ]; then
-       ensure_that_required_fields_are_set $analysis_required_fields
-   fi
-    
-   # TODO add support for backup_dir in ece.conf
-   if [ -z "$backup_dir" ]; then
-       backup_dir=/var/backups/escenic
-   fi
-   if [ ! -w $backup_dir ]; then
-       print $backup_dir "must exist & be write-able for $USER"
-       exit 1
-   fi
-
-   if [ "$appserver" == "tomcat" ]; then
-       if [ ! -d $tomcat_base/conf ]; then
-           print $tomcat_base/conf "doesn't exist :-("
-           print "check your ece.conf the $instance instance of type $type"
-           exit 1
-       fi
-       
-       connect_string=$(find $tomcat_base/conf | xargs \
-           grep jdbc | \
-           grep url | \
-           head -1 | \
-           cut -d'"' -f2)
-       db_port=$(echo $connect_string | cut -d':' -f4 | cut -d'/' -f1)
-       db=$(echo $connect_string | cut -d'/' -f4 | cut -d'?' -f1)
-       db_host=$(echo $connect_string | cut -d'/' -f3- | cut -d':' -f1)
-
-       db_user=$(find $tomcat_base/conf -name "*.xml" | \
-           grep -v tomcat-users.xml | xargs \
-           grep username | \
-           grep -v \<user | \
-           head -1 | \
-           cut -d'"' -f2)
-       db_password=$(find $tomcat_base/conf -name "*.xml" | \
-           grep -v tomcat-users.xml | xargs \
-           grep password | \
-           head -1 | \
-           cut -d'"' -f2)
-
-       db_backup_file=$backup_dir/${db}-$(date --iso).sql.gz
-       mysqldump -u ${db_user} \
-           -p${db_password} \
-           -h ${db_host} \
-           -P ${db_port} ${db} | \
-           gzip - \
-           > $db_backup_file
-
-       print "Database dumped: $db_backup_file"
-   fi
-   
-   archive_file=$backup_dir/${type}-${instance}-backup-$(date --iso).tar
-   possible_backup="
-${escenic_conf_dir} 
-/opt/escenic 
-/etc/init.d/ece
-/etc/default/ece
-/etc/inti.d/rmi-hub
-/var/lib/escenic
-"
-   actual_backup=""
-   for el in $possible_backup; do
-       if [ "$el" == "/opt/escenic" -a $backup_exclude_binaries -eq 1 ]; then
-           continue
-       elif [ -r "$el" ]; then
-           actual_backup="$el $actual_backup"
-       fi
-   done
-
-   if [ "$appserver" == "tomcat" -a "$backup_exclude_binaries" -eq 0 ]; then
-       actual_backup="$(get_actual_file $tomcat_home) $tomcat_base $actual_backup"
-   fi
-
-   print "Creating snapshot ... (this will take a while)"
-   run tar cf $archive_file \
-       $actual_backup \
-       $db_backup_file
-
-   message="Backup ready: $archive_file"
-   print $message
-   log $message
-   print "The backup arhcive includes:"
-   print "- Database snapshot"
-   print "- All Solr & Escenic data files from /var/lib/escenic"
-
-   if [ "$backup_exclude_binaries" -eq 0 ]; then
-       print "- All app servers in /opt"
-       print "- All Escenic binaries & publication templates in /opt/escenic"
-   fi
-   
-   print "- All configuration in ${escenic_conf_dir} and /etc/default/ece"
-   print "- All bootstrap scripts from /etc/init.d"
-   print "Enjoy!"
- }
-
-
-function start_type()
-{
-    unset CLASSPATH
-    message="Starting the $instance instance of $type on $HOSTNAME ..."
-    print_and_log $message
-    
-    if [ "$type" == "rmi-hub" ]; then
-        ensure_that_required_fields_are_set $hub_required_fields
-
-        if [ -r $rmi_hub_conf ]; then
-            export CLASSPATH=$rmi_hub_conf:$CLASSPATH
-        else
-            print $rmi_hub_conf "must point to a valid Nursery configuration"
-            print "for the rmi-hub, you may copy the one found in"
-            print "$ece_home/contrib/rmi-hub/config."
-            print "Exiting :-("
-            exit 1
-        fi
-        
-        for el in $rmi_hub_home/lib/*.jar; do
-            export CLASSPATH=$CLASSPATH:$el
-        done
-
-        $java_home/bin/java \
-            -Djava.rmi.server.hostname=${ece_server_hostname} \
-            neo.nursery.GlobalBus /Initial \
-            1>>$log \
-            2>>$log & pid=$!
-        
-        echo $pid > $pid_file
-        exit 0
-
-    elif [ "$type" == "search" ]; then
-        # TODO trim & tun the default parameters for the search
-        # instance.
-        ensure_that_required_fields_are_set $engine_required_fields
-    elif [ "$type" == "engine" ]; then
-        ensure_that_required_fields_are_set $engine_required_fields
-        if [ ! -d "$ece_security_configuration_dir" ] ; then
-            print "ece_security_configuration_dir $ece_security_configuration_dir"
-            print "did not exist."
-            print "Exiting :-("
-            exit 1
-        fi
-    elif [ "$type" == "analysis" ]; then
-        ensure_that_required_fields_are_set $analysis_required_fields
-    fi
-
-    # indexer and engine are treated the same
-    case $appserver in
-        tomcat)
-            # Tomcat respects JAVA_OPTS set in configure(), so no need
-            # to set them here.
-
-            if [ ! -x $tomcat_home/bin/catalina.sh ]; then
-                print "$tomcat_home/bin/catalina.sh was not executable"
-                print "unable to start tomcat"
-                exit 1
-            fi
-
-            # We call run here to get the log output to the stdout log
-            $tomcat_home/bin/catalina.sh run \
-                1>>$log \
-                2>>$log & pid=$!
-            ;;
-        oc4j)
-            export OC4J_JVM_ARGS=$ece_args
-            $oc4j_home/bin/oc4j -start\
-                1>>$log\
-                2>>$log & pid=$!
-            ;;
-        resin)
-            # Resin has stared insisting on a -J prefix of the -D
-            # prefixes :-) Tested with Resin 3.0.25
-            resin_ece_args=`echo $ece_args | sed 's/-D/-J-D/g'`
-            
-            # works for Resin 3.0
-            if [ -e $resin_home/bin/wrapper.pl ]; then
-                exec perl $resin_home/bin/wrapper.pl \
-                    -chdir \
-                    -name httpd \
-                    -class com.caucho.server.resin.Resin \
-                    $resin_ece_args ${1+"$@"} \
-                    1>>$log \
-                    2>>$log & pid=$!
-            else
-                # works for Resin 3.1
-                $java_home/bin/java $ece_args \
-                    -jar $resin_home/lib/resin.jar \
-                    start \
-                    1>>$log \
-                    2>>$log & pid=$!
-            fi
-            ;;
-        jboss)
-            $jboss_home/bin/run.sh \
-                -b 0.0.0.0 \
-                -c $jboss_conf \
-                1>>$log \
-                2>>$log & pid=$!
-            ;;
-        *)
-            echo "" # extra line feed, because of the echo -n above
-            print "No appserver is defined in $ece_conf"
-            exit 1
-    esac
-    
-    if [ $pid ]; then
-        verify_that_directory_and_file_are_writeable $pid_file
-        echo $pid > $pid_file
-    fi
-    
-    exit_on_error $message
-}
-
-function stop_type()
-{
-    message="Stopping the $instance instance of $type on $HOSTNAME ..."
-
-    if [ -n "$type_pid" ]; then
-        log $message
-        print $message
-
-        if [ -r $pid_file ]; then
-            if [ "$type_pid" != "`cat $pid_file`" ]; then
-                print "Is running, but was not started with `basename $0`"
-                print "system PID $ece_pid differs from the PID in $pid_file"
-                print "removing dangling PID file $pid_file. "
-                print "In future, be sure to use $0 to start "
-                print "and stop your $type"
-                run kill $type_pid
-                rm $pid_file
-                return
-            fi
-        fi
-
-        for i in {0..5}; do
-            set_type_pid
-            
-            if [ -n "$type_pid" ]; then
-                run kill $type_pid
-            else
-                debug "Previous gracious kill attempt of $instance succeeded."
-                break
-            fi
-            
-            sleep 1
-        done
-
-        set_type_pid
-        if [ -n "$type_pid" ]; then
-            print_and_log "I could not stop $type instance $instance gracefully,"
-            print_and_log "I will now use force."
-            run kill -9 $type_pid
-        fi
-        
-
-        if [ -e $pid_file ]; then
-            run rm $pid_file
-        fi
-    else
-        print "The $instance instance of $type on $HOSTNAME is NOT running"
-    fi
-    
-    exit_on_error $message
-}
-
-function kill_type()
-{
-    if [ -n "$type_pid" ]; then
-        message="Using force to stop the $instance instance of $type on $HOSTNAME ..."
-        log $message
-        print $message
-        kill -9 $type_pid
-        if [ -w $pid_file ]; then
-            rm $pid_file
-        fi
-    else
-        print "No $instance instance of $type on $HOSTNAME to be killed"
-    fi
-    
-    exit_on_error "kill_type"
-}
-
-function restart_type()
-{
-    stop_type
-
-    # sometimes the JVM refuses to shut down when doing a graceful
-    # kill, therefore, if it's still running after the sleep above, we
-    # use brute force to kill it.
-    set_type_pid
-    if [ -n "$type_pid" ]; then
-        message="The $instance instance of $type failed to stop gracefully"
-        print_and_log $message
-        kill_type
-    fi
-    
-    start_type
-}    
-
-# creates DEB and RPM packages suitable for deploying any kind of ECE
-# instance that was previously assembled.
-function create_packages()
-{
-    local ear=$cache_dir/engine.ear
-    if [ ! -e $ear ]; then
-        print_and_log "$ear does not exist. "
-        print_and_log "Did you run '"`basename $0`" -i" $instance "assemble'?"
-        exit 1
-    fi
-
-    local dir=$(mktemp -d)
-    local package_dir=$dir/debian
-    local package_name=""
-    
-    if [ "$type" == "engine" ]; then
-        package_name="escenic-content-engine-${instance}"
-    elif [ "$type" == "search" ]; then
-        package_name="escenic-search-engine-${instance}"
-    elif [ "$type" == "rmi-hub" ]; then
-        package_name="escenic-rmi-hub"
-    elif [ "$type" == "analysis" ]; then
-        package_name="escenic-analysis-engine-${instance}"
-    fi
-    
-    # TODO the version might be a bit on the extreme side. Could come
-    # from the SCM (if available)
-    local version=$(date +%s)
-
-    run mkdir -p $package_dir/DEBIAN
-    cat > $package_dir/DEBIAN/control <<EOF
-Package: $package_name
-Version: $version
-Section: base
-Priority: optional
-Architecture: all
-Maintainer: Torstein Krause Johansen <tkj@vizrt.com>
-Description: The Escenic Content Engine of type ${type}
-  for the ${instance} instance. Built on $HOSTNAME
-EOF
-
-    case $appserver in
-        tomcat)
-            local tomcat_base_dir=${package_dir}${tomcat_base}
-            local tomcat_escenic_dir=${tomcat_base_dir}/escenic
-
-            # lib
-            run mkdir -p ${tomcat_escenic_dir}
-            run cd ${tomcat_escenic_dir}
-            run jar xf ${ear} lib
-
-            # war
-            run mkdir -p ${tomcat_base_dir}/webapps
-            run cd ${tomcat_base_dir}/webapps
-            for el in $(jar tf ${ear} | grep .war$); do
-                if [ -n "${deploy_webapp_white_list}" ]; then
-                    for ele in $deploy_webapp_white_list; do
-                        if [ ${el} == ${ele}.war ]; then
-                            run jar xf ${ear} ${el}
-                        fi
-                    done
-                else
-                    run jar xf ${ear} ${el}
-                fi
-            done
-
-            # putting this block here so that anything overridden in
-            # tomcat_base takes precedence over tomcat_home
-            if [ "${everything_but_the_kitchen_sink}" -eq 1 ]; then
-                (
-                    local tomcat_home_dir=${package_dir}${tomcat_home}
-                    run mkdir -p ${tomcat_home_dir}
-                    run cd ${tomcat_home_dir}
-                    run cp -r ${tomcat_home}/{bin,lib} ${tomcat_home_dir}
-
-                    local etc_escenic_dir=${package_dir}${escenic_conf_dir}
-                    run mkdir -p ${etc_escenic_dir}
-                    cd ${etc_escenic_dir}
-                    run cp -r ${escenic_conf_dir}/{ece,ece-${instance}}.conf \
-                        ${etc_escenic_dir}
-
-                    run mkdir -p ${etc_escenic_dir}/engine
-                    run cp -r ${escenic_conf_dir}/engine/common \
-                        ${etc_escenic_dir}
-                    
-                    run mkdir -p ${etc_escenic_dir}/engine/instance
-                    run cp -r ${escenic_conf_dir}/engine/instance/${instance} \
-                        ${etc_escenic_dir}
-                )
-            fi
-            
-            # copy these from the current configuration: bin, conf
-            run cp -r ${tomcat_base}/{bin,conf} ${tomcat_base_dir}
-
-            # these just need to be there: logs, temp
-            run mkdir ${tomcat_base_dir}/{logs,temp}
-
-            # build the packages
-            cd ${dir}
-            run dpkg-deb --build debian
-            local deb_package=${package_name}-${version}.deb
-            run mv debian.deb ${deb_package}
-            
-            if [[ -x /usr/bin/alien && -x /usr/bin/fakeroot ]]; then
-                run fakeroot alien --to-rpm --scripts ${deb_package}
-                run mv *.rpm ${cache_dir}
-                print "RPM package of your $instance $type instance with build"
-                print "version $version is now available:"
-                print $(echo /var/cache/escenic/${package_name}-${version}*.rpm)
-            fi
-            
-            mv *.deb ${cache_dir}
-            print "DEB package of your $instance $type instance with with build"
-            print "version $version is now available:"
-            print /var/cache/escenic/${deb_package}
-            ;;
-        *)
-            print "Package creation is only supported on Tomcat so far."
-            ;;
-    esac
-
-    run rm -rf ${dir}
-}
-
-function make_thread_dump()
-{
-
-    if [ -n "$type_pid" ]; then
-        print "Thread dump (PID" $type_pid") written to system out log."
-        print "Type 'ece -t $type -i $instance outlog' to see it or view"
-        print $log "directly."
-
-        if [ -x $java_home/bin/jstack ]; then
-            jstack -l $type_pid >> $log
-        else
-            kill -QUIT $type_pid >> $log
-        fi
-    else
-        print "$(get_status)"
-    fi
-}
-
 function set_type_command_and_instance()
 {
     local next_is_type=0
@@ -1177,20 +700,6 @@ function set_type_command_and_instance()
     fi
 }
 
-function clean_up()
-{
-    if [ "$type" == "engine" ]; then
-        print "Cleaning up generated files in $assemblytool_home ..." 
-        run cd $assemblytool_home
-        run ant clean
-    fi
-
-    if [ -d /var/cache/escenic ]; then
-        print "Cleaning up ear, deb and rpm files in /var/cache/escenic ..." 
-        run rm -rf /var/cache/escenic/*.{rpm,deb,ear}
-    fi
-}
-
 function set_id()
 {
     if [ "$instance" == "default" ]; then
@@ -1358,21 +867,6 @@ function update_publication_resources()
     fi
 }
 
-function show_all_log_paths()
-{
-    if [ "$quiet" -eq 0 ]; then
-        print "System out log: "$log
-        print "App server log: "$(get_app_log)
-        print "log4j log:  "$(get_log4j_log)
-        print "GC log:  "$(get_gc_log)
-    else
-        echo $log
-        echo $(get_app_log)
-        echo $(get_log4j_log)
-        echo $(get_gc_log)
-    fi
-}
-
 function read_rc_file_if_present()
 {
     local rc_file=$HOME/.ecerc
@@ -1494,7 +988,7 @@ for el in $command; do
         log)
             tail_messages_log
             ;;
-        loglist)
+        list-logs)
             show_all_log_paths
             ;;
         outlog)

From a52d593e36cca52c2f856bac5974ee19524b9747 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 23 May 2012 15:38:56 +0200
Subject: [PATCH 0833/2585] - added get_catalina_out_file

---
 usr/share/escenic/ece-scripts/ece.d/logs.sh | 25 +++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece.d/logs.sh b/usr/share/escenic/ece-scripts/ece.d/logs.sh
index c3e98ec2..c50ed098 100644
--- a/usr/share/escenic/ece-scripts/ece.d/logs.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/logs.sh
@@ -59,3 +59,28 @@ function tail_app_log()
   print "Tailing the application server log $(get_app_log)"
   tail -f $(get_app_log)
 }
+
+function show_all_log_paths()
+{
+  if [ "$quiet" -eq 0 ]; then
+    print "System out log: "$log
+    print "App server log: "$(get_app_log)
+    print "log4j log:  "$(get_log4j_log)
+    print "GC log:  "$(get_gc_log)
+    if [[ $appserver == "tomcat" ]]; then
+      print "Tomcat system out log:" $(get_catalina_out_file)
+    fi
+  else
+    echo $log
+    echo $(get_app_log)
+    echo $(get_log4j_log)
+    echo $(get_gc_log)
+    if [[ $appserver == "tomcat" ]]; then
+      echo $(get_catalina_out_file)
+    fi
+  fi
+}
+
+function get_catalina_out_file() {
+  echo $log_dir/${instance}-catalina.out
+}

From e2b9d53fe90f695bf3a18cf70abab3d4834ab60f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 23 May 2012 15:39:13 +0200
Subject: [PATCH 0834/2585] - added start_type code to its own module

---
 usr/share/escenic/ece-scripts/ece.d/start.sh | 117 +++++++++++++++++++
 1 file changed, 117 insertions(+)
 create mode 100644 usr/share/escenic/ece-scripts/ece.d/start.sh

diff --git a/usr/share/escenic/ece-scripts/ece.d/start.sh b/usr/share/escenic/ece-scripts/ece.d/start.sh
new file mode 100644
index 00000000..d1eccbeb
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece.d/start.sh
@@ -0,0 +1,117 @@
+# by tkj@vizrt.com
+
+function start_type() {
+  unset CLASSPATH
+  message="Starting the $instance instance of $type on $HOSTNAME ..."
+  print_and_log $message
+  
+  if [ "$type" == "rmi-hub" ]; then
+    ensure_that_required_fields_are_set $hub_required_fields
+
+    if [ -r $rmi_hub_conf ]; then
+      export CLASSPATH=$rmi_hub_conf:$CLASSPATH
+    else
+      print $rmi_hub_conf "must point to a valid Nursery configuration"
+      print "for the rmi-hub, you may copy the one found in"
+      print "$ece_home/contrib/rmi-hub/config."
+      print "Exiting :-("
+      exit 1
+    fi
+    
+    for el in $rmi_hub_home/lib/*.jar; do
+      export CLASSPATH=$CLASSPATH:$el
+    done
+
+    $java_home/bin/java \
+      -Djava.rmi.server.hostname=${ece_server_hostname} \
+      neo.nursery.GlobalBus /Initial \
+      1>>$log \
+      2>>$log & pid=$!
+    
+    echo $pid > $pid_file
+    exit 0
+
+  elif [ "$type" == "search" ]; then
+    # TODO trim & tun the default parameters for the search
+    # instance.
+    ensure_that_required_fields_are_set $engine_required_fields
+  elif [ "$type" == "engine" ]; then
+    ensure_that_required_fields_are_set $engine_required_fields
+    if [ ! -d "$ece_security_configuration_dir" ] ; then
+      print "ece_security_configuration_dir $ece_security_configuration_dir"
+      print "did not exist."
+      print "Exiting :-("
+      exit 1
+    fi
+  elif [ "$type" == "analysis" ]; then
+    ensure_that_required_fields_are_set $analysis_required_fields
+  fi
+
+  verify_that_directory_and_file_are_writeable $pid_file
+  
+  # indexer and engine are treated the same
+  case $appserver in
+    tomcat)
+      # Tomcat respects JAVA_OPTS set in configure(), so no need to
+      # set them here.
+      if [ ! -x $tomcat_home/bin/catalina.sh ]; then
+        print "$tomcat_home/bin/catalina.sh was not executable"
+        print "unable to start tomcat"
+        exit 1
+      fi
+
+      export CATALINA_PID=$pid_file
+      export CATALINA_OUT=$(get_catalina_out_file)
+      $tomcat_home/bin/catalina.sh start \
+        1>>$log \
+        2>>$log
+      ;;
+    oc4j)
+      export OC4J_JVM_ARGS=$ece_args
+      $oc4j_home/bin/oc4j -start\
+                1>>$log\
+                2>>$log & pid=$!
+      echo $pid > $pid_file
+      ;;
+    resin)
+            # Resin has stared insisting on a -J prefix of the -D
+            # prefixes :-) Tested with Resin 3.0.25
+      resin_ece_args=`echo $ece_args | sed 's/-D/-J-D/g'`
+      
+            # works for Resin 3.0
+      if [ -e $resin_home/bin/wrapper.pl ]; then
+        exec perl $resin_home/bin/wrapper.pl \
+          -chdir \
+          -name httpd \
+          -class com.caucho.server.resin.Resin \
+          $resin_ece_args ${1+"$@"} \
+          1>>$log \
+          2>>$log & pid=$!
+        echo $pid > $pid_file
+      else
+                # works for Resin 3.1
+        $java_home/bin/java $ece_args \
+          -jar $resin_home/lib/resin.jar \
+          start \
+          1>>$log \
+          2>>$log & pid=$!
+        echo $pid > $pid_file
+      fi
+      ;;
+    jboss)
+      $jboss_home/bin/run.sh \
+        -b 0.0.0.0 \
+        -c $jboss_conf \
+        1>>$log \
+        2>>$log & pid=$!
+      echo $pid > $pid_file
+      ;;
+    *)
+      echo "" # extra line feed, because of the echo -n above
+      print "No appserver is defined in $ece_conf"
+      exit 1
+  esac
+  
+  
+  exit_on_error $message
+}

From d4901223e18998632e9fed3e0be8061212e80618 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 23 May 2012 16:13:46 +0200
Subject: [PATCH 0835/2585] - moved help to its own odule

---
 usr/bin/ece | 61 -----------------------------------------------------
 1 file changed, 61 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index e19bbd34..0608ce73 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -907,67 +907,6 @@ set_type_settings
 set_instance_settings
 sanity_check
 
-
-function print_help()
-{
-    echo "Usage: $0 [-t <type>] [-i <instance>] <command>"
-    echo ""
-    echo "DESCRIPTION"
-    echo " -t --type <type>"
-    echo "      The following types are available:"
-    echo "      engine  -  The Escenic Content Engine, this is the default"
-    echo "                 and is the assumed type if none is specified."
-    echo "      search  -  A standalone search indexer and solr instance"
-    echo "      rmi-hub -  The RMI hub responsible for the internal "
-    echo "                 communication between the ECE instances."
-    echo "      analysis - The Escenic Analysis Engine also knows as 'Stats'"
-    echo ""
-    echo " -i --instance <instance>" 
-    echo "      The type instance, such as editor1, web1 or search1"
-    echo ""
-    echo " -f --file <file> } --uri <uri>"
-    echo "      Specificies the file that the given comand shall act upon."
-    echo "      Right now, this only entails the 'deploy' command".
-    echo ""
-    echo " -p --publication <publication>" 
-    echo "      Needed only for updating publication resources"
-    echo ""
-    echo " -r --resource <resource>" 
-    echo "      Used for updating publication resources."
-    echo "      Must be one of: content-type, feature, layout, layout-group"
-    echo "                      image-version, menu"
-    echo " -q --quiet"
-    echo "      Makes $(basename $0) as quiet as possible."
-    echo ""
-    echo " -v --verbose"
-    echo "      Prints out debug statements, useful for debugging."
-    echo ""
-    echo "The following commands are available:"
-    echo "   applog     the type's app server log"
-    echo "   assemble   runs the Assembly Tool *)"
-    echo "   backup     backs up an entire instance (takes time)"
-    echo "   clean      removes temporary files created by $0 *)"
-    echo "   deploy     deploys the assembled EAR *)"
-    echo "   edit       lets you edit a publication resource"
-    echo "   flush      flushes all ECE caches ('Clear all caches') *)"
-    echo "   help       prints this help screen"
-    echo "   info       prints various info about the selected ECE instance"
-    echo "   kill       uses force to stop the type"
-    echo "   log        the type's log4j log **)"
-    echo "   loglist    list all the log paths"
-    echo "   outlog     the $id script log (system out log)"
-    echo "   restart    restarts the type"
-    echo "   start      starts the type"
-    echo "   status     checks if the type is running"
-    echo "   stop       stops the type"
-    echo "   threaddump write a thread dump to standard out (system out log)"
-    echo "   update     update publication resources"
-    echo "   versions   lists the ECE component versions"
-    echo ""
-    echo "*) only applicable if type is 'engine'"
-    echo "**) not applicable if type is 'rmi-hub'"
-}    
-
 for el in $command; do
     case "$el" in
         start)

From 6743bb25b3e898b12f7fb235cebe156e16eb081f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 23 May 2012 16:26:09 +0200
Subject: [PATCH 0836/2585] - when using Tomcat app servers, we're now first
 exporting   catalina_PID and then using "catalina.sh start". This means that 
  Tomcat now sets the PID file itself and it should hence always be   bullet
 proof.

  This change should hopefully do away some problems we've seen when
  running multiple (funnily named, long server names?) instances on
  the same host and the PID/status has been confused.

- the tomcat catalina.out is now written to escenic_log_dir together
  with the other logs, typically, this will mean
  /var/log/escenic/<instance>-catalina.out

  The new catalina out log is now included with the list-logs command

- renamed the loglist command to list-logs to be in sync with
  list-instances

- moved code into own modules for the following commands:
  * backup
  * clean
  * help
  * kill
  * package
  * restart
  * stop
  * thread dump
---
 usr/share/escenic/ece-scripts/ece.d/backup.sh | 108 ++++++++++++++++
 usr/share/escenic/ece-scripts/ece.d/clean.sh  |  12 ++
 usr/share/escenic/ece-scripts/ece.d/help.sh   |  61 +++++++++
 usr/share/escenic/ece-scripts/ece.d/kill.sh   |  16 +++
 .../escenic/ece-scripts/ece.d/package.sh      | 122 ++++++++++++++++++
 .../escenic/ece-scripts/ece.d/restart.sh      |  16 +++
 usr/share/escenic/ece-scripts/ece.d/stop.sh   |  51 ++++++++
 .../escenic/ece-scripts/ece.d/thread-dump.sh  |  16 +++
 8 files changed, 402 insertions(+)
 create mode 100644 usr/share/escenic/ece-scripts/ece.d/backup.sh
 create mode 100644 usr/share/escenic/ece-scripts/ece.d/clean.sh
 create mode 100644 usr/share/escenic/ece-scripts/ece.d/help.sh
 create mode 100644 usr/share/escenic/ece-scripts/ece.d/kill.sh
 create mode 100644 usr/share/escenic/ece-scripts/ece.d/package.sh
 create mode 100644 usr/share/escenic/ece-scripts/ece.d/restart.sh
 create mode 100644 usr/share/escenic/ece-scripts/ece.d/stop.sh
 create mode 100644 usr/share/escenic/ece-scripts/ece.d/thread-dump.sh

diff --git a/usr/share/escenic/ece-scripts/ece.d/backup.sh b/usr/share/escenic/ece-scripts/ece.d/backup.sh
new file mode 100644
index 00000000..e001f729
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece.d/backup.sh
@@ -0,0 +1,108 @@
+
+function backup_type() {
+  local message="Backing up the $instance instance of $type on $HOSTNAME ..."
+  print_and_log $message
+
+  if [ "$type" == "rmi-hub" ]; then
+    ensure_that_required_fields_are_set $hub_required_fields
+  elif [ "$type" == "search" ]; then
+        # TODO trim & tun the default parameters for the search
+        # instance.
+    ensure_that_required_fields_are_set $engine_required_fields
+  elif [ "$type" == "engine" ]; then
+    ensure_that_required_fields_are_set $engine_required_fields
+  elif [ "$type" == "analysis" ]; then
+    ensure_that_required_fields_are_set $analysis_required_fields
+  fi
+  
+   # TODO add support for backup_dir in ece.conf
+  if [ -z "$backup_dir" ]; then
+    backup_dir=/var/backups/escenic
+  fi
+  if [ ! -w $backup_dir ]; then
+    print $backup_dir "must exist & be write-able for $USER"
+    exit 1
+  fi
+
+  if [ "$appserver" == "tomcat" ]; then
+    if [ ! -d $tomcat_base/conf ]; then
+      print $tomcat_base/conf "doesn't exist :-("
+      print "check your ece.conf the $instance instance of type $type"
+      exit 1
+    fi
+    
+    connect_string=$(find $tomcat_base/conf | xargs \
+      grep jdbc | \
+      grep url | \
+      head -1 | \
+      cut -d'"' -f2)
+    db_port=$(echo $connect_string | cut -d':' -f4 | cut -d'/' -f1)
+    db=$(echo $connect_string | cut -d'/' -f4 | cut -d'?' -f1)
+    db_host=$(echo $connect_string | cut -d'/' -f3- | cut -d':' -f1)
+
+    db_user=$(find $tomcat_base/conf -name "*.xml" | \
+      grep -v tomcat-users.xml | xargs \
+      grep username | \
+      grep -v \<user | \
+      head -1 | \
+      cut -d'"' -f2)
+    db_password=$(find $tomcat_base/conf -name "*.xml" | \
+      grep -v tomcat-users.xml | xargs \
+      grep password | \
+      head -1 | \
+      cut -d'"' -f2)
+
+    db_backup_file=$backup_dir/${db}-$(date --iso).sql.gz
+    mysqldump -u ${db_user} \
+      -p${db_password} \
+      -h ${db_host} \
+      -P ${db_port} ${db} | \
+      gzip - \
+      > $db_backup_file
+
+    print "Database dumped: $db_backup_file"
+  fi
+  
+  archive_file=$backup_dir/${type}-${instance}-backup-$(date --iso).tar
+  possible_backup="
+${escenic_conf_dir} 
+/opt/escenic 
+/etc/init.d/ece
+/etc/default/ece
+/etc/inti.d/rmi-hub
+/var/lib/escenic
+"
+  actual_backup=""
+  for el in $possible_backup; do
+    if [ "$el" == "/opt/escenic" -a $backup_exclude_binaries -eq 1 ]; then
+      continue
+    elif [ -r "$el" ]; then
+      actual_backup="$el $actual_backup"
+    fi
+  done
+
+  if [ "$appserver" == "tomcat" -a "$backup_exclude_binaries" -eq 0 ]; then
+    actual_backup="$(get_actual_file $tomcat_home) $tomcat_base $actual_backup"
+  fi
+
+  print "Creating snapshot ... (this will take a while)"
+  run tar cf $archive_file \
+    $actual_backup \
+    $db_backup_file
+
+  message="Backup ready: $archive_file"
+  print $message
+  log $message
+  print "The backup arhcive includes:"
+  print "- Database snapshot"
+  print "- All Solr & Escenic data files from /var/lib/escenic"
+
+  if [ "$backup_exclude_binaries" -eq 0 ]; then
+    print "- All app servers in /opt"
+    print "- All Escenic binaries & publication templates in /opt/escenic"
+  fi
+  
+  print "- All configuration in ${escenic_conf_dir} and /etc/default/ece"
+  print "- All bootstrap scripts from /etc/init.d"
+  print "Enjoy!"
+}
diff --git a/usr/share/escenic/ece-scripts/ece.d/clean.sh b/usr/share/escenic/ece-scripts/ece.d/clean.sh
new file mode 100644
index 00000000..a994c63f
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece.d/clean.sh
@@ -0,0 +1,12 @@
+function clean_up() {
+  if [ "$type" == "engine" ]; then
+    print "Cleaning up generated files in $assemblytool_home ..." 
+    run cd $assemblytool_home
+    run ant clean
+  fi
+
+  if [ -d /var/cache/escenic ]; then
+    print "Cleaning up ear, deb and rpm files in /var/cache/escenic ..." 
+    run rm -rf /var/cache/escenic/*.{rpm,deb,ear}
+  fi
+}
diff --git a/usr/share/escenic/ece-scripts/ece.d/help.sh b/usr/share/escenic/ece-scripts/ece.d/help.sh
new file mode 100644
index 00000000..974be9f3
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece.d/help.sh
@@ -0,0 +1,61 @@
+function print_help() {
+  cat <<EOF
+Usage: $(basename $0) [-t <type>] [-i <instance>] <command>
+"
+DESCRIPTION"
+-t --type <type>
+     The following types are available:
+       engine  -  The Escenic Content Engine, this is the default
+                  and is the assumed type if none is specified.
+       search  -  A standalone search indexer and solr instance
+       rmi-hub -  The RMI hub responsible for the internal 
+                  communication between the ECE instances.
+       analysis - The Escenic Analysis Engine also knows as 'Stats'
+
+ -i --instance <instance> 
+      The type instance, such as editor1, web1 or search1
+
+ -f --file <file> } --uri <uri>
+      Specificies the file that the given comand shall act upon.
+      Right now, this only entails the 'deploy' command.
+
+ -p --publication <publication> 
+      Needed only for updating publication resources
+
+ -r --resource <resource> 
+      Used for updating publication resources.
+      Must be one of: content-type, feature, layout, layout-group
+                      image-version, menu
+ -q --quiet
+      Makes $(basename $0) as quiet as possible.
+
+ -v --verbose
+      Prints out debug statements, useful for debugging.
+
+The following commands are available:
+   applog         the type's app server log
+   assemble       runs the Assembly Tool *)
+   backup         backs up an entire instance (takes time)
+   clean          removes temporary files created by $(basename $0) *)
+   deploy         deploys the assembled EAR *)
+   edit           lets you edit a publication resource
+   flush          flushes all ECE caches ('Clear all caches') *)
+   help           prints this help screen
+   info           prints various info about the selected ECE instance
+   kill           uses force to stop the type
+   list-instances list all instances on $HOSTNAME
+   list-logs      list all the log paths
+   log            the type's log4j log **)
+   outlog         the $id script log (system out log)
+   restart        restarts the type
+   start          starts the type
+   status         checks if the type is running
+   stop           stops the type
+   threaddump     write a thread dump to standard out (system out log)
+   update         update publication resources
+   versions       lists the ECE component versions
+
+*) only applicable if type is 'engine'
+**) not applicable if type is 'rmi-hub'
+EOF
+}    
diff --git a/usr/share/escenic/ece-scripts/ece.d/kill.sh b/usr/share/escenic/ece-scripts/ece.d/kill.sh
new file mode 100644
index 00000000..82564e49
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece.d/kill.sh
@@ -0,0 +1,16 @@
+# by tkj@vizrt.com
+function kill_type() {
+  if [ -n "$type_pid" ]; then
+    message="Using force to stop the $instance instance of $type on $HOSTNAME ..."
+    log $message
+    print $message
+    kill -9 $type_pid
+    if [ -w $pid_file ]; then
+      rm $pid_file
+    fi
+  else
+    print "No $instance instance of $type on $HOSTNAME to be killed"
+  fi
+  
+  exit_on_error "kill_type"
+}
diff --git a/usr/share/escenic/ece-scripts/ece.d/package.sh b/usr/share/escenic/ece-scripts/ece.d/package.sh
new file mode 100644
index 00000000..1d491573
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece.d/package.sh
@@ -0,0 +1,122 @@
+# creates DEB and RPM packages suitable for deploying any kind of ECE
+# instance that was previously assembled.
+function create_packages() {
+  local ear=$cache_dir/engine.ear
+  if [ ! -e $ear ]; then
+    print_and_log "$ear does not exist. "
+    print_and_log "Did you run '"`basename $0`" -i" $instance "assemble'?"
+    exit 1
+  fi
+
+  local dir=$(mktemp -d)
+  local package_dir=$dir/debian
+  local package_name=""
+  
+  if [ "$type" == "engine" ]; then
+    package_name="escenic-content-engine-${instance}"
+  elif [ "$type" == "search" ]; then
+    package_name="escenic-search-engine-${instance}"
+  elif [ "$type" == "rmi-hub" ]; then
+    package_name="escenic-rmi-hub"
+  elif [ "$type" == "analysis" ]; then
+    package_name="escenic-analysis-engine-${instance}"
+  fi
+  
+    # TODO the version might be a bit on the extreme side. Could come
+    # from the SCM (if available)
+  local version=$(date +%s)
+
+  run mkdir -p $package_dir/DEBIAN
+  cat > $package_dir/DEBIAN/control <<EOF
+Package: $package_name
+Version: $version
+Section: base
+Priority: optional
+Architecture: all
+Maintainer: Torstein Krause Johansen <tkj@vizrt.com>
+Description: The Escenic Content Engine of type ${type}
+  for the ${instance} instance. Built on $HOSTNAME
+EOF
+
+  case $appserver in
+    tomcat)
+      local tomcat_base_dir=${package_dir}${tomcat_base}
+      local tomcat_escenic_dir=${tomcat_base_dir}/escenic
+
+            # lib
+      run mkdir -p ${tomcat_escenic_dir}
+      run cd ${tomcat_escenic_dir}
+      run jar xf ${ear} lib
+
+            # war
+      run mkdir -p ${tomcat_base_dir}/webapps
+      run cd ${tomcat_base_dir}/webapps
+      for el in $(jar tf ${ear} | grep .war$); do
+        if [ -n "${deploy_webapp_white_list}" ]; then
+          for ele in $deploy_webapp_white_list; do
+            if [ ${el} == ${ele}.war ]; then
+              run jar xf ${ear} ${el}
+            fi
+          done
+        else
+          run jar xf ${ear} ${el}
+        fi
+      done
+
+            # putting this block here so that anything overridden in
+            # tomcat_base takes precedence over tomcat_home
+      if [ "${everything_but_the_kitchen_sink}" -eq 1 ]; then
+        (
+          local tomcat_home_dir=${package_dir}${tomcat_home}
+          run mkdir -p ${tomcat_home_dir}
+          run cd ${tomcat_home_dir}
+          run cp -r ${tomcat_home}/{bin,lib} ${tomcat_home_dir}
+
+          local etc_escenic_dir=${package_dir}${escenic_conf_dir}
+          run mkdir -p ${etc_escenic_dir}
+          cd ${etc_escenic_dir}
+          run cp -r ${escenic_conf_dir}/{ece,ece-${instance}}.conf \
+            ${etc_escenic_dir}
+
+          run mkdir -p ${etc_escenic_dir}/engine
+          run cp -r ${escenic_conf_dir}/engine/common \
+            ${etc_escenic_dir}
+          
+          run mkdir -p ${etc_escenic_dir}/engine/instance
+          run cp -r ${escenic_conf_dir}/engine/instance/${instance} \
+            ${etc_escenic_dir}
+        )
+      fi
+      
+            # copy these from the current configuration: bin, conf
+      run cp -r ${tomcat_base}/{bin,conf} ${tomcat_base_dir}
+
+            # these just need to be there: logs, temp
+      run mkdir ${tomcat_base_dir}/{logs,temp}
+
+            # build the packages
+      cd ${dir}
+      run dpkg-deb --build debian
+      local deb_package=${package_name}-${version}.deb
+      run mv debian.deb ${deb_package}
+      
+      if [[ -x /usr/bin/alien && -x /usr/bin/fakeroot ]]; then
+        run fakeroot alien --to-rpm --scripts ${deb_package}
+        run mv *.rpm ${cache_dir}
+        print "RPM package of your $instance $type instance with build"
+        print "version $version is now available:"
+        print $(echo /var/cache/escenic/${package_name}-${version}*.rpm)
+      fi
+      
+      mv *.deb ${cache_dir}
+      print "DEB package of your $instance $type instance with with build"
+      print "version $version is now available:"
+      print /var/cache/escenic/${deb_package}
+      ;;
+    *)
+      print "Package creation is only supported on Tomcat so far."
+      ;;
+  esac
+
+  run rm -rf ${dir}
+}
diff --git a/usr/share/escenic/ece-scripts/ece.d/restart.sh b/usr/share/escenic/ece-scripts/ece.d/restart.sh
new file mode 100644
index 00000000..8afec933
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece.d/restart.sh
@@ -0,0 +1,16 @@
+# by tkj@vizrt.com
+function restart_type() {
+  stop_type
+
+    # sometimes the JVM refuses to shut down when doing a graceful
+    # kill, therefore, if it's still running after the sleep above, we
+    # use brute force to kill it.
+  set_type_pid
+  if [ -n "$type_pid" ]; then
+    message="The $instance instance of $type failed to stop gracefully"
+    print_and_log $message
+    kill_type
+  fi
+  
+  start_type
+}
diff --git a/usr/share/escenic/ece-scripts/ece.d/stop.sh b/usr/share/escenic/ece-scripts/ece.d/stop.sh
new file mode 100644
index 00000000..073d1a17
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece.d/stop.sh
@@ -0,0 +1,51 @@
+# by tkj@vizrt.com
+function stop_type() {
+  local message="Stopping the $instance instance of $type on $HOSTNAME ..."
+
+  if [ -n "$type_pid" ]; then
+    log $message
+    print $message
+
+    if [ -r $pid_file ]; then
+      if [ "$type_pid" != "`cat $pid_file`" ]; then
+        print "Is running, but was not started with `basename $0`"
+        print "system PID $ece_pid differs from the PID in $pid_file"
+        print "removing dangling PID file $pid_file. "
+        print "In future, be sure to use $0 to start "
+        print "and stop your $type"
+        run kill $type_pid
+        rm $pid_file
+        return
+      fi
+    fi
+
+    for i in {0..5}; do
+      set_type_pid
+      
+      if [ -n "$type_pid" ]; then
+        run kill $type_pid
+      else
+        debug "Previous gracious kill attempt of $instance succeeded."
+        break
+      fi
+      
+      sleep 1
+    done
+
+    set_type_pid
+    if [ -n "$type_pid" ]; then
+      print_and_log "I could not stop $type instance $instance gracefully,"
+      print_and_log "I will now use force."
+      run kill -9 $type_pid
+    fi
+    
+
+    if [ -e $pid_file ]; then
+      run rm $pid_file
+    fi
+  else
+    print "The $instance instance of $type on $HOSTNAME is NOT running"
+  fi
+  
+  exit_on_error $message
+}
diff --git a/usr/share/escenic/ece-scripts/ece.d/thread-dump.sh b/usr/share/escenic/ece-scripts/ece.d/thread-dump.sh
new file mode 100644
index 00000000..e511fed6
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece.d/thread-dump.sh
@@ -0,0 +1,16 @@
+function make_thread_dump() {
+
+  if [ -n "$type_pid" ]; then
+    print "Thread dump (PID" $type_pid") written to system out log."
+    print "Type 'ece -t $type -i $instance outlog' to see it or view"
+    print $log "directly."
+
+    if [ -x $java_home/bin/jstack ]; then
+      jstack -l $type_pid >> $log
+    else
+      kill -QUIT $type_pid >> $log
+    fi
+  else
+    print "$(get_status)"
+  fi
+}

From 5a62df0c3d81987ee29bd0b00cebcd0d3e15fb0c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 23 May 2012 16:55:22 +0200
Subject: [PATCH 0837/2585] - code consistency: opening braces on the first
 line.

---
 usr/share/escenic/ece-scripts/ece.d/logs.sh | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/logs.sh b/usr/share/escenic/ece-scripts/ece.d/logs.sh
index c50ed098..f1c8ae35 100644
--- a/usr/share/escenic/ece-scripts/ece.d/logs.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/logs.sh
@@ -13,15 +13,13 @@ function get_log4j_log() {
   echo ""
 }
 
-function tail_messages_log()
-{
+function tail_messages_log() {
   log4j_log=$(get_log4j_log)
   print "tailing $log4j_log"
   tail -f $log4j_log
 }
 
-function tail_out_log()
-{
+function tail_out_log() {
   tail_list=$log
 
     # if needs be, we can add more system out logs here. For now,
@@ -31,8 +29,7 @@ function tail_out_log()
   tail -f $tail_list
 }
 
-function get_app_log()
-{
+function get_app_log() {
   local app_log=""
   if [ "$appserver" == "tomcat" ]; then
     app_log=$tomcat_base/logs/localhost.`date +%F`.log
@@ -49,8 +46,7 @@ function get_app_log()
 }
 
 
-function tail_app_log()
-{
+function tail_app_log() {
   if [ "$type" == "rmi-hub" ]; then
     print "There is no application server log for $type"
     exit 1
@@ -60,8 +56,7 @@ function tail_app_log()
   tail -f $(get_app_log)
 }
 
-function show_all_log_paths()
-{
+function show_all_log_paths() {
   if [ "$quiet" -eq 0 ]; then
     print "System out log: "$log
     print "App server log: "$(get_app_log)

From 6b3f46dd4b6da51fa76033b9ebd6191232fcbbbd Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 23 May 2012 16:55:41 +0200
Subject: [PATCH 0838/2585] - braces on the opening line

---
 usr/share/escenic/ece-scripts/ece.d/assemble.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/assemble.sh b/usr/share/escenic/ece-scripts/ece.d/assemble.sh
index bd5f87bc..93ba49cc 100644
--- a/usr/share/escenic/ece-scripts/ece.d/assemble.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/assemble.sh
@@ -1,7 +1,6 @@
 assemble_attempts=0
 
-function assemble()
-{
+function assemble() {
   if [ "$assemble_attempts" -gt 1 ]; then
     print "I've tried to assemble twice now and FAILED :-("
     print "You probably have multiple versions of one or more plugins"

From c3a79f2a4275768a3c8582cd44c62800e1d83efc Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 23 May 2012 16:57:13 +0200
Subject: [PATCH 0839/2585] - code consistency, opening braces on the first
 line.

---
 usr/bin/ece | 75 ++++++++++++++++++-----------------------------------
 1 file changed, 25 insertions(+), 50 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index a3e250f6..abffd0ea 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -106,8 +106,7 @@ function init() {
 # Ensures that all required fields are set. Will report all missing
 # required fields before failing.
 ####################################################################
-function ensure_that_required_fields_are_set()
-{
+function ensure_that_required_fields_are_set() {
     requirements_failed=0
     
     for el in $@; do
@@ -126,8 +125,7 @@ function ensure_that_required_fields_are_set()
 
 ece_conf_files_read=()
 
-function read_conf_file()
-{
+function read_conf_file() {
     for el in $conf_file_location_list; do
         if [ -r $el/$1 ]; then
             debug "found $1 in $el, reading it"
@@ -141,8 +139,7 @@ function read_conf_file()
 ## If the system is installed using the recommended paths, the method
 ## will return a list of the instances configured in
 ## ${escenic_conf_dir}/ece-*.conf
-function get_instance_list()
-{
+function get_instance_list() {
     local allowed_types="engine analysis changelogd search rmi-hub"
     instance_list=""
     for el in $(\ls /etc/escenic/ece-*.conf 2>/dev/null); do
@@ -165,8 +162,7 @@ function get_instance_list()
     echo $instance_list
 }
 
-function set_common_settings()
-{
+function set_common_settings() {
     # This behaviour can be overridden by specifying a list of
     # locations in the environment variable ECE_CONF_LOCATIONS
     if [ -n "$ECE_CONF_LOCATIONS" ] ; then
@@ -209,15 +205,13 @@ function set_common_settings()
     fi
 }
 
-function set_type_settings()
-{
+function set_type_settings() {
     # optional: possible to have type specific conf file,
     # will take precedences over the common one.
     read_conf_file `basename $0`-$type.conf
 }
 
-function set_type_pid()
-{
+function set_type_pid() {
     if [ "$(uname)" == "Linux" ]; then
         ps_options="auxww"
     else
@@ -241,8 +235,7 @@ function set_type_pid()
     debug "type_pid is now=$type_pid"
 }
 
-function set_type_port()
-{
+function set_type_port() {
     host=localhost
     # port set in ece[-instance].conf takes precedence
     if [ -n "${appserver_port}" ]; then
@@ -272,8 +265,7 @@ function set_type_port()
     debug "set_type_port=$port"
 }
 
-function set_instance_settings()
-{
+function set_instance_settings() {
     # optional: possible to have instance specific conf files,
     # these will take precedence over the other two
     read_conf_file `basename $0`-$instance.conf
@@ -422,8 +414,7 @@ function set_instance_settings()
     debug JAVA_OPTS=$JAVA_OPTS
 }
 
-function sanity_check()
-{
+function sanity_check() {
     if [ "$(whoami)" == "root" ]; then
         print "Sorry, you cannot be root when running $(basename $0)"
         print "The root user can only use /etc/init.d/ece"
@@ -528,8 +519,7 @@ function add_memcached_support() {
 # passed file is a link, the link target is returned instead.
 #
 # $1 - the file (which could be a link)
-function get_actual_file()
-{
+function get_actual_file() {
     if [ -h ${1} ]; then
         dir=$(dirname $1)
         real_file=$(ls -l ${1} | awk '{print $11}')
@@ -556,8 +546,7 @@ function get_actual_file()
 
 <<<<<<< HEAD
 =======
-function backup_type()
-{
+function backup_type() {
    message="Backing up the $instance instance of $type on $HOSTNAME ..."
    print $message
    log $message
@@ -667,8 +656,7 @@ ${escenic_conf_dir}
  }
 
 
-function start_type()
-{
+function start_type() {
     unset CLASSPATH
     export HOSTNAME
     message="Starting the $instance instance of $type on $HOSTNAME ..."
@@ -783,8 +771,7 @@ function start_type()
     exit_on_error $message
 }
 
-function stop_type()
-{
+function stop_type() {
     message="Stopping the $instance instance of $type on $HOSTNAME ..."
 
     if [ -n "$type_pid" ]; then
@@ -835,8 +822,7 @@ function stop_type()
     exit_on_error $message
 }
 
-function kill_type()
-{
+function kill_type() {
     if [ -n "$type_pid" ]; then
         message="Using force to stop the $instance instance of $type on $HOSTNAME ..."
         log $message
@@ -852,8 +838,7 @@ function kill_type()
     exit_on_error "kill_type"
 }
 
-function restart_type()
-{
+function restart_type() {
     stop_type
 
     # sometimes the JVM refuses to shut down when doing a graceful
@@ -871,8 +856,7 @@ function restart_type()
 
 # creates DEB and RPM packages suitable for deploying any kind of ECE
 # instance that was previously assembled.
-function create_packages()
-{
+function create_packages() {
     local ear=$cache_dir/engine.ear
     if [ ! -e $ear ]; then
         print_and_log "$ear does not exist. "
@@ -993,8 +977,7 @@ EOF
     run rm -rf ${dir}
 }
 
-function make_thread_dump()
-{
+function make_thread_dump() {
 
     if [ -n "$type_pid" ]; then
         print "Thread dump (PID" $type_pid") written to system out log."
@@ -1012,8 +995,7 @@ function make_thread_dump()
 }
 
 >>>>>>> 25c55248a7e1598a874b78df363d3f9ad57803d6
-function set_type_command_and_instance()
-{
+function set_type_command_and_instance() {
     local next_is_type=0
     local next_is_instance=0
     local next_is_publication=0
@@ -1158,8 +1140,7 @@ function set_type_command_and_instance()
     fi
 }
 
-function set_id()
-{
+function set_id() {
     if [ "$instance" == "default" ]; then
         id="["`basename $0`"#${type}]"
     else
@@ -1171,8 +1152,7 @@ function set_id()
         and instance is $instance
 }
 
-function get_status()
-{
+function get_status() {
     if [ -z "$type_pid" ]; then
         echo "DOWN"
         exit 0
@@ -1203,8 +1183,7 @@ function get_status()
     echo "UP" ${days}d ${hours}h ${minutes}m ${seconds_left}s
 }
 
-function list_versions()
-{
+function list_versions() {
     if [ -z "$type_pid" ]; then
         print "$instance instance of $type on $HOSTNAME is NOT running"
         exit 1
@@ -1231,8 +1210,7 @@ function list_versions()
         sort
 }
 
-function update_publication_resources()
-{
+function update_publication_resources() {
     if [[ ! -r $resource && -z "$1" ]]; then
         print $resource "doesn't exist. I will exit :-("
         exit 1
@@ -1325,23 +1303,20 @@ function update_publication_resources()
     fi
 }
 
-function read_rc_file_if_present()
-{
+function read_rc_file_if_present() {
     local rc_file=$HOME/.ecerc
     if [ -r $rc_file ]; then
         source $rc_file
     fi
 }
 
-function get_escenic_admin_url()
-{
+function get_escenic_admin_url() {
     set_type_port
     local url=http://${host}:${port}/escenic-admin
     echo ${url}
 }
 
-function flush_caches()
-{
+function flush_caches() {
     if [ "${type}" != "engine" ]; then
         print "You cannot flush the caches of a ${type} instance"
         return

From 0bc8a8bcb1c70779444d2c45b4a8614da6f27386 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 23 May 2012 17:00:36 +0200
Subject: [PATCH 0840/2585] - old, now modularised methods got merged by a
 mistake. Removed them   as they now live in their own modules.

---
 usr/bin/ece | 451 ----------------------------------------------------
 1 file changed, 451 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index abffd0ea..bb3a1631 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -544,457 +544,6 @@ function get_actual_file() {
     echo ${real_file}
 }
 
-<<<<<<< HEAD
-=======
-function backup_type() {
-   message="Backing up the $instance instance of $type on $HOSTNAME ..."
-   print $message
-   log $message
-
-   if [ "$type" == "rmi-hub" ]; then
-       ensure_that_required_fields_are_set $hub_required_fields
-   elif [ "$type" == "search" ]; then
-        # TODO trim & tun the default parameters for the search
-        # instance.
-       ensure_that_required_fields_are_set $engine_required_fields
-   elif [ "$type" == "engine" ]; then
-       ensure_that_required_fields_are_set $engine_required_fields
-   elif [ "$type" == "analysis" ]; then
-       ensure_that_required_fields_are_set $analysis_required_fields
-   fi
-    
-   # TODO add support for backup_dir in ece.conf
-   if [ -z "$backup_dir" ]; then
-       backup_dir=/var/backups/escenic
-   fi
-   if [ ! -w $backup_dir ]; then
-       print $backup_dir "must exist & be write-able for $USER"
-       exit 1
-   fi
-
-   if [ "$appserver" == "tomcat" ]; then
-       if [ ! -d $tomcat_base/conf ]; then
-           print $tomcat_base/conf "doesn't exist :-("
-           print "check your ece.conf the $instance instance of type $type"
-           exit 1
-       fi
-       
-       connect_string=$(find $tomcat_base/conf | xargs \
-           grep jdbc | \
-           grep url | \
-           head -1 | \
-           cut -d'"' -f2)
-       db_port=$(echo $connect_string | cut -d':' -f4 | cut -d'/' -f1)
-       db=$(echo $connect_string | cut -d'/' -f4 | cut -d'?' -f1)
-       db_host=$(echo $connect_string | cut -d'/' -f3- | cut -d':' -f1)
-
-       db_user=$(find $tomcat_base/conf -name "*.xml" | \
-           grep -v tomcat-users.xml | xargs \
-           grep username | \
-           grep -v \<user | \
-           head -1 | \
-           cut -d'"' -f2)
-       db_password=$(find $tomcat_base/conf -name "*.xml" | \
-           grep -v tomcat-users.xml | xargs \
-           grep password | \
-           head -1 | \
-           cut -d'"' -f2)
-
-       db_backup_file=$backup_dir/${db}-$(date --iso).sql.gz
-       mysqldump -u ${db_user} \
-           -p${db_password} \
-           -h ${db_host} \
-           -P ${db_port} ${db} | \
-           gzip - \
-           > $db_backup_file
-
-       print "Database dumped: $db_backup_file"
-   fi
-   
-   archive_file=$backup_dir/${type}-${instance}-backup-$(date --iso).tar
-   possible_backup="
-${escenic_conf_dir} 
-/opt/escenic 
-/etc/init.d/ece
-/etc/default/ece
-/etc/inti.d/rmi-hub
-/var/lib/escenic
-"
-   actual_backup=""
-   for el in $possible_backup; do
-       if [ "$el" == "/opt/escenic" -a $backup_exclude_binaries -eq 1 ]; then
-           continue
-       elif [ -r "$el" ]; then
-           actual_backup="$el $actual_backup"
-       fi
-   done
-
-   if [ "$appserver" == "tomcat" -a "$backup_exclude_binaries" -eq 0 ]; then
-       actual_backup="$(get_actual_file $tomcat_home) $tomcat_base $actual_backup"
-   fi
-
-   print "Creating snapshot ... (this will take a while)"
-   run tar cf $archive_file \
-       $actual_backup \
-       $db_backup_file
-
-   message="Backup ready: $archive_file"
-   print $message
-   log $message
-   print "The backup arhcive includes:"
-   print "- Database snapshot"
-   print "- All Solr & Escenic data files from /var/lib/escenic"
-
-   if [ "$backup_exclude_binaries" -eq 0 ]; then
-       print "- All app servers in /opt"
-       print "- All Escenic binaries & publication templates in /opt/escenic"
-   fi
-   
-   print "- All configuration in ${escenic_conf_dir} and /etc/default/ece"
-   print "- All bootstrap scripts from /etc/init.d"
-   print "Enjoy!"
- }
-
-
-function start_type() {
-    unset CLASSPATH
-    export HOSTNAME
-    message="Starting the $instance instance of $type on $HOSTNAME ..."
-    print_and_log $message
-    
-    if [ "$type" == "rmi-hub" ]; then
-        ensure_that_required_fields_are_set $hub_required_fields
-
-        if [ -r $rmi_hub_conf ]; then
-            export CLASSPATH=$rmi_hub_conf:$CLASSPATH
-        else
-            print $rmi_hub_conf "must point to a valid Nursery configuration"
-            print "for the rmi-hub, you may copy the one found in"
-            print "$ece_home/contrib/rmi-hub/config."
-            print "Exiting :-("
-            exit 1
-        fi
-        
-        for el in $rmi_hub_home/lib/*.jar; do
-            export CLASSPATH=$CLASSPATH:$el
-        done
-
-        $java_home/bin/java \
-            -Djava.rmi.server.hostname=${ece_server_hostname} \
-            neo.nursery.GlobalBus /Initial \
-            1>>$log \
-            2>>$log & pid=$!
-        
-        echo $pid > $pid_file
-        exit 0
-
-    elif [ "$type" == "search" ]; then
-        # TODO trim & tun the default parameters for the search
-        # instance.
-        ensure_that_required_fields_are_set $engine_required_fields
-    elif [ "$type" == "engine" ]; then
-        ensure_that_required_fields_are_set $engine_required_fields
-        if [ ! -d "$ece_security_configuration_dir" ] ; then
-            print "ece_security_configuration_dir $ece_security_configuration_dir"
-            print "did not exist."
-            print "Exiting :-("
-            exit 1
-        fi
-    elif [ "$type" == "analysis" ]; then
-        ensure_that_required_fields_are_set $analysis_required_fields
-    fi
-
-    # indexer and engine are treated the same
-    case $appserver in
-        tomcat)
-            # Tomcat respects JAVA_OPTS set in configure(), so no need
-            # to set them here.
-
-            if [ ! -x $tomcat_home/bin/catalina.sh ]; then
-                print "$tomcat_home/bin/catalina.sh was not executable"
-                print "unable to start tomcat"
-                exit 1
-            fi
-
-            # We call run here to get the log output to the stdout log
-            $tomcat_home/bin/catalina.sh run \
-                1>>$log \
-                2>>$log & pid=$!
-            ;;
-        oc4j)
-            export OC4J_JVM_ARGS=$ece_args
-            $oc4j_home/bin/oc4j -start\
-                1>>$log\
-                2>>$log & pid=$!
-            ;;
-        resin)
-            # Resin has stared insisting on a -J prefix of the -D
-            # prefixes :-) Tested with Resin 3.0.25
-            resin_ece_args=`echo $ece_args | sed 's/-D/-J-D/g'`
-            
-            # works for Resin 3.0
-            if [ -e $resin_home/bin/wrapper.pl ]; then
-                exec perl $resin_home/bin/wrapper.pl \
-                    -chdir \
-                    -name httpd \
-                    -class com.caucho.server.resin.Resin \
-                    $resin_ece_args ${1+"$@"} \
-                    1>>$log \
-                    2>>$log & pid=$!
-            else
-                # works for Resin 3.1
-                $java_home/bin/java $ece_args \
-                    -jar $resin_home/lib/resin.jar \
-                    start \
-                    1>>$log \
-                    2>>$log & pid=$!
-            fi
-            ;;
-        jboss)
-            $jboss_home/bin/run.sh \
-                -b 0.0.0.0 \
-                -c $jboss_conf \
-                1>>$log \
-                2>>$log & pid=$!
-            ;;
-        *)
-            echo "" # extra line feed, because of the echo -n above
-            print "No appserver is defined in $ece_conf"
-            exit 1
-    esac
-    
-    if [ $pid ]; then
-        verify_that_directory_and_file_are_writeable $pid_file
-        echo $pid > $pid_file
-    fi
-    
-    exit_on_error $message
-}
-
-function stop_type() {
-    message="Stopping the $instance instance of $type on $HOSTNAME ..."
-
-    if [ -n "$type_pid" ]; then
-        log $message
-        print $message
-
-        if [ -r $pid_file ]; then
-            if [ "$type_pid" != "`cat $pid_file`" ]; then
-                print "Is running, but was not started with `basename $0`"
-                print "system PID $ece_pid differs from the PID in $pid_file"
-                print "removing dangling PID file $pid_file. "
-                print "In future, be sure to use $0 to start "
-                print "and stop your $type"
-                run kill $type_pid
-                rm $pid_file
-                return
-            fi
-        fi
-
-        for i in {0..5}; do
-            set_type_pid
-            
-            if [ -n "$type_pid" ]; then
-                run kill $type_pid
-            else
-                debug "Previous gracious kill attempt of $instance succeeded."
-                break
-            fi
-            
-            sleep 1
-        done
-
-        set_type_pid
-        if [ -n "$type_pid" ]; then
-            print_and_log "I could not stop $type instance $instance gracefully,"
-            print_and_log "I will now use force."
-            run kill -9 $type_pid
-        fi
-        
-
-        if [ -e $pid_file ]; then
-            run rm $pid_file
-        fi
-    else
-        print "The $instance instance of $type on $HOSTNAME is NOT running"
-    fi
-    
-    exit_on_error $message
-}
-
-function kill_type() {
-    if [ -n "$type_pid" ]; then
-        message="Using force to stop the $instance instance of $type on $HOSTNAME ..."
-        log $message
-        print $message
-        kill -9 $type_pid
-        if [ -w $pid_file ]; then
-            rm $pid_file
-        fi
-    else
-        print "No $instance instance of $type on $HOSTNAME to be killed"
-    fi
-    
-    exit_on_error "kill_type"
-}
-
-function restart_type() {
-    stop_type
-
-    # sometimes the JVM refuses to shut down when doing a graceful
-    # kill, therefore, if it's still running after the sleep above, we
-    # use brute force to kill it.
-    set_type_pid
-    if [ -n "$type_pid" ]; then
-        message="The $instance instance of $type failed to stop gracefully"
-        print_and_log $message
-        kill_type
-    fi
-    
-    start_type
-}    
-
-# creates DEB and RPM packages suitable for deploying any kind of ECE
-# instance that was previously assembled.
-function create_packages() {
-    local ear=$cache_dir/engine.ear
-    if [ ! -e $ear ]; then
-        print_and_log "$ear does not exist. "
-        print_and_log "Did you run '"`basename $0`" -i" $instance "assemble'?"
-        exit 1
-    fi
-
-    local dir=$(mktemp -d)
-    local package_dir=$dir/debian
-    local package_name=""
-    
-    if [ "$type" == "engine" ]; then
-        package_name="escenic-content-engine-${instance}"
-    elif [ "$type" == "search" ]; then
-        package_name="escenic-search-engine-${instance}"
-    elif [ "$type" == "rmi-hub" ]; then
-        package_name="escenic-rmi-hub"
-    elif [ "$type" == "analysis" ]; then
-        package_name="escenic-analysis-engine-${instance}"
-    fi
-    
-    # TODO the version might be a bit on the extreme side. Could come
-    # from the SCM (if available)
-    local version=$(date +%s)
-
-    run mkdir -p $package_dir/DEBIAN
-    cat > $package_dir/DEBIAN/control <<EOF
-Package: $package_name
-Version: $version
-Section: base
-Priority: optional
-Architecture: all
-Maintainer: Torstein Krause Johansen <tkj@vizrt.com>
-Description: The Escenic Content Engine of type ${type}
-  for the ${instance} instance. Built on $HOSTNAME
-EOF
-
-    case $appserver in
-        tomcat)
-            local tomcat_base_dir=${package_dir}${tomcat_base}
-            local tomcat_escenic_dir=${tomcat_base_dir}/escenic
-
-            # lib
-            run mkdir -p ${tomcat_escenic_dir}
-            run cd ${tomcat_escenic_dir}
-            run jar xf ${ear} lib
-
-            # war
-            run mkdir -p ${tomcat_base_dir}/webapps
-            run cd ${tomcat_base_dir}/webapps
-            for el in $(jar tf ${ear} | grep .war$); do
-                if [ -n "${deploy_webapp_white_list}" ]; then
-                    for ele in $deploy_webapp_white_list; do
-                        if [ ${el} == ${ele}.war ]; then
-                            run jar xf ${ear} ${el}
-                        fi
-                    done
-                else
-                    run jar xf ${ear} ${el}
-                fi
-            done
-
-            # putting this block here so that anything overridden in
-            # tomcat_base takes precedence over tomcat_home
-            if [ "${everything_but_the_kitchen_sink}" -eq 1 ]; then
-                (
-                    local tomcat_home_dir=${package_dir}${tomcat_home}
-                    run mkdir -p ${tomcat_home_dir}
-                    run cd ${tomcat_home_dir}
-                    run cp -r ${tomcat_home}/{bin,lib} ${tomcat_home_dir}
-
-                    local etc_escenic_dir=${package_dir}${escenic_conf_dir}
-                    run mkdir -p ${etc_escenic_dir}
-                    cd ${etc_escenic_dir}
-                    run cp -r ${escenic_conf_dir}/{ece,ece-${instance}}.conf \
-                        ${etc_escenic_dir}
-
-                    run mkdir -p ${etc_escenic_dir}/engine
-                    run cp -r ${escenic_conf_dir}/engine/common \
-                        ${etc_escenic_dir}
-                    
-                    run mkdir -p ${etc_escenic_dir}/engine/instance
-                    run cp -r ${escenic_conf_dir}/engine/instance/${instance} \
-                        ${etc_escenic_dir}
-                )
-            fi
-            
-            # copy these from the current configuration: bin, conf
-            run cp -r ${tomcat_base}/{bin,conf} ${tomcat_base_dir}
-
-            # these just need to be there: logs, temp
-            run mkdir ${tomcat_base_dir}/{logs,temp}
-
-            # build the packages
-            cd ${dir}
-            run dpkg-deb --build debian
-            local deb_package=${package_name}-${version}.deb
-            run mv debian.deb ${deb_package}
-            
-            if [[ -x /usr/bin/alien && -x /usr/bin/fakeroot ]]; then
-                run fakeroot alien --to-rpm --scripts ${deb_package}
-                run mv *.rpm ${cache_dir}
-                print "RPM package of your $instance $type instance with build"
-                print "version $version is now available:"
-                print $(echo /var/cache/escenic/${package_name}-${version}*.rpm)
-            fi
-            
-            mv *.deb ${cache_dir}
-            print "DEB package of your $instance $type instance with with build"
-            print "version $version is now available:"
-            print /var/cache/escenic/${deb_package}
-            ;;
-        *)
-            print "Package creation is only supported on Tomcat so far."
-            ;;
-    esac
-
-    run rm -rf ${dir}
-}
-
-function make_thread_dump() {
-
-    if [ -n "$type_pid" ]; then
-        print "Thread dump (PID" $type_pid") written to system out log."
-        print "Type 'ece -t $type -i $instance outlog' to see it or view"
-        print $log "directly."
-
-        if [ -x $java_home/bin/jstack ]; then
-            jstack -l $type_pid >> $log
-        else
-            kill -QUIT $type_pid >> $log
-        fi
-    else
-        print "$(get_status)"
-    fi
-}
-
->>>>>>> 25c55248a7e1598a874b78df363d3f9ad57803d6
 function set_type_command_and_instance() {
     local next_is_type=0
     local next_is_instance=0

From c1e59a4200e82450272c8bc2a0eda033fa24b773 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 23 May 2012 17:09:39 +0200
Subject: [PATCH 0841/2585] - moved flush specific code to its own module.

---
 usr/share/escenic/ece-scripts/ece.d/flush.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 usr/share/escenic/ece-scripts/ece.d/flush.sh

diff --git a/usr/share/escenic/ece-scripts/ece.d/flush.sh b/usr/share/escenic/ece-scripts/ece.d/flush.sh
new file mode 100644
index 00000000..f6282436
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece.d/flush.sh
@@ -0,0 +1,14 @@
+function flush_caches() {
+  if [ "${type}" != "engine" ]; then
+    print "You cannot flush the caches of a ${type} instance"
+    return
+  fi
+  
+  print "Flushing all of ${instance}'s caches on $HOSTNAME"
+  local url=$(get_escenic_admin_url)/do/publication/clearallcaches
+  wget $wget_auth \
+    -O - \
+    --post-data='confirm=Confirm' \
+    $url \
+    1>>$log 2>>$log
+}

From 62e0618fad839e70b13b1df3762ed02b7508aedd Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 23 May 2012 17:11:41 +0200
Subject: [PATCH 0842/2585] - moved code for "ece versions", "ece edit" and
 "edit update" into   their own modules.

---
 usr/bin/ece                                   | 171 ------------------
 usr/share/escenic/ece-scripts/ece.d/deploy.sh |  44 ++++-
 .../ece.d/publication-resources.sh            |  92 ++++++++++
 .../escenic/ece-scripts/ece.d/versions.sh     |  28 +++
 4 files changed, 160 insertions(+), 175 deletions(-)
 create mode 100644 usr/share/escenic/ece-scripts/ece.d/publication-resources.sh
 create mode 100644 usr/share/escenic/ece-scripts/ece.d/versions.sh

diff --git a/usr/bin/ece b/usr/bin/ece
index bb3a1631..24f99ce5 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -478,42 +478,6 @@ function run() {
   exit_on_error "$@"
 }
 
-## $1 : dir of the webapp 
-function add_memcached_support() {
-    if [[ "$do_not_add_memcached_support" == "1" ]]; then
-        return
-    fi
-
-    if [ ! -d "$1" ]; then
-        log $1 "doesn't exist"
-        return
-    fi
-
-    local exempt_from_memcached_list="
-      escenic escenic-admin indexer-webservice indexer-webapp studio
-      inpage-ws dashboard
-    "
-
-    for el in $exempt_from_memcached_list; do
-        if [[ $(basename $1) == "$el" ]]; then
-          return
-        fi
-    done
-
-    log "Adding memcached support in $1 ..."
-    local dir=$1/WEB-INF/localconfig/neo/xredsys/presentation/cache
-    run mkdir -p $dir
-    local file=$dir/PresentationArticleCache.properties
-
-    if [[ -e $file && $(grep "\$class" $file | wc -l) -gt 0 ]]; then
-        sed -i "s#\$class=.*#\$class=neo.util.cache.Memcached#g" $file
-    else
-        echo "\$class=neo.util.cache.Memcached" >> $file
-    fi
-
-    exit_on_error "sed on $file"
-}
-
 # Returns the file (can be a directory) passed to the function only
 # if it's the actual file/directory and not a link to it. If the
 # passed file is a link, the link target is returned instead.
@@ -732,126 +696,6 @@ function get_status() {
     echo "UP" ${days}d ${hours}h ${minutes}m ${seconds_left}s
 }
 
-function list_versions() {
-    if [ -z "$type_pid" ]; then
-        print "$instance instance of $type on $HOSTNAME is NOT running"
-        exit 1
-    fi
-    
-    set_type_port
-    
-    version_manager=browser/Global/neo/io/managers/VersionManager
-    url=$(get_escenic_admin_url)/$version_manager
-        
-    print "Installed on the ${instance} instance running on port ${port}:"
-    wget --timeout 30 $wget_auth -O - $url  2>/dev/null | \
-        grep "\[\[" | \
-        sed 's/\[//g' | \
-        sed 's/\]//g' | \
-        sed 's/Name\=io/Name\=content-engine/g' | \
-        sed 's/Name\=//g' | \
-        sed 's/\;\ Version\=/\ /g' | \
-        awk -F',' '{for (i = 1; i <= NF; i++) print "   * " $i;}' | \
-        # This is a hack since that for some reason, cannot get
-        # sub(/^[ \t]+/, "") to work inside the loop for $i, it seems
-        # to always operate on the incoming line.
-        sed 's/\*\ \ \ /\*/g' | \
-        sort
-}
-
-function update_publication_resources() {
-    if [[ ! -r $resource && -z "$1" ]]; then
-        print $resource "doesn't exist. I will exit :-("
-        exit 1
-    fi
-
-    if [ -z $publication ]; then
-        print "You must specify which publication to update (-p <publication>)"
-        exit 1
-    fi
-    
-    local url=$(get_escenic_admin_url)/publication-resources
-
-    case "$(basename $resource)" in
-        content-type)
-            url=${url}/${publication}/escenic/content-type
-            ;;
-        feature)
-            url=${url}/${publication}/escenic/feature
-            ;;
-        layout)
-            url=${url}/${publication}/escenic/layout
-            ;;
-        layout-group)
-            url=${url}/${publication}/escenic/layout-group
-            ;;
-        image-version)
-            url=${url}/${publication}/escenic/image-version
-            ;;
-        teaser-type)
-            url=${url}/${publication}/escenic/teaser-type
-            ;;
-        menu)
-            url=${url}/${publication}/escenic/plugin/menu
-            ;;
-        security)
-            url=${url}/${publication}/escenic/plugin/community/security
-            ;;
-        root-section-parameters)
-            do_put=true
-            url=$(get_escenic_admin_url)
-            url=${url}/section-parameters-declared/${publication}
-            ;;
-        *)
-            print "Invalid resource: $(basename $resource) :-("
-            exit 1
-    esac        
-
-    local tmp_dir=$(mktemp -d)
-    
-    if [ $1 ]; then
-        if [[ -z "$EDITOR" || ! -x $(which $EDITOR) ]]; then
-            print "You must have a valid editor defined in your EDITOR variable"
-            exit 1
-        fi
-        
-        run cd $tmp_dir;
-        run wget $wget_auth $url -O ${resource}
-        md5sum ${resource} > ${resource}.md5sum
-        exit_on_error "md5sum ${resource}"
-
-        $EDITOR ${resource}
-        md5sum -c ${resource}.md5sum \
-            1>>$log \
-            2>>$log
-        if [ $? -eq 0 ]; then
-            print "You didn't make any changes to ${resource}, I will exit."
-            exit 1
-        fi
-    fi
-    
-    print "Updating the $(basename $resource) resource for the $publication" \
-        "publication ..."
-    
-    debug POSTing $resource to $url
-    if [[ -n "$do_put" && "$do_put" == "true" ]]; then
-        curl -T ${resource} \
-          ${curl_auth} \
-            ${url} \
-            1>>$log 2>>$log
-    else
-        wget $wget_auth \
-            -O - \
-            --post-file ${resource} \
-            $url \
-            1>>$log 2>>$log
-    fi
-
-    if [ -d $tmp_dir ]; then
-        run rm -rf $tmp_dir
-    fi
-}
-
 function read_rc_file_if_present() {
     local rc_file=$HOME/.ecerc
     if [ -r $rc_file ]; then
@@ -865,21 +709,6 @@ function get_escenic_admin_url() {
     echo ${url}
 }
 
-function flush_caches() {
-    if [ "${type}" != "engine" ]; then
-        print "You cannot flush the caches of a ${type} instance"
-        return
-    fi
-    
-    print "Flushing all of ${instance}'s caches on $HOSTNAME"
-    local url=$(get_escenic_admin_url)/do/publication/clearallcaches
-    wget $wget_auth \
-        -O - \
-        --post-data='confirm=Confirm' \
-        $url \
-        1>>$log 2>>$log
-}
-
 init
 read_rc_file_if_present
 set_type_command_and_instance $@
diff --git a/usr/share/escenic/ece-scripts/ece.d/deploy.sh b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
index ad1a9da7..f0cec391 100644
--- a/usr/share/escenic/ece-scripts/ece.d/deploy.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
@@ -1,7 +1,7 @@
 wget_opts="--continue --inet4-only --quiet"
 
 function get_state_file() {
-   echo $data_dir/${instance}.state
+  echo $data_dir/${instance}.state
 }
 
 ## $1 : local EAR file
@@ -49,9 +49,9 @@ function deploy() {
     ear=$(download_uri_target_to_dir $file $cache_dir)
     
     if [ ! -e "$ear" ]; then
-        print_and_log "The EAR $ear_uri specified in $file could"
-        print_and_log "not be retrieved. I will exit now. :-("
-        exit 1
+      print_and_log "The EAR $ear_uri specified in $file could"
+      print_and_log "not be retrieved. I will exit now. :-("
+      exit 1
     fi
   fi
   
@@ -176,3 +176,39 @@ function deploy() {
   run rm -rf ${dir}
   update_deployment_state_file $ear
 }
+
+## $1 : dir of the webapp 
+function add_memcached_support() {
+  if [[ "$do_not_add_memcached_support" == "1" ]]; then
+    return
+  fi
+
+  if [ ! -d "$1" ]; then
+    log $1 "doesn't exist"
+    return
+  fi
+
+  local exempt_from_memcached_list="
+      escenic escenic-admin indexer-webservice indexer-webapp studio
+      inpage-ws dashboard
+    "
+
+  for el in $exempt_from_memcached_list; do
+    if [[ $(basename $1) == "$el" ]]; then
+      return
+    fi
+  done
+
+  log "Adding memcached support in $1 ..."
+  local dir=$1/WEB-INF/localconfig/neo/xredsys/presentation/cache
+  run mkdir -p $dir
+  local file=$dir/PresentationArticleCache.properties
+
+  if [[ -e $file && $(grep "\$class" $file | wc -l) -gt 0 ]]; then
+    sed -i "s#\$class=.*#\$class=neo.util.cache.Memcached#g" $file
+  else
+    echo "\$class=neo.util.cache.Memcached" >> $file
+  fi
+
+  exit_on_error "sed on $file"
+}
diff --git a/usr/share/escenic/ece-scripts/ece.d/publication-resources.sh b/usr/share/escenic/ece-scripts/ece.d/publication-resources.sh
new file mode 100644
index 00000000..1636ce04
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece.d/publication-resources.sh
@@ -0,0 +1,92 @@
+function update_publication_resources() {
+  if [[ ! -r $resource && -z "$1" ]]; then
+    print $resource "doesn't exist. I will exit :-("
+    exit 1
+  fi
+
+  if [ -z $publication ]; then
+    print "You must specify which publication to update (-p <publication>)"
+    exit 1
+  fi
+  
+  local url=$(get_escenic_admin_url)/publication-resources
+
+  case "$(basename $resource)" in
+    content-type)
+      url=${url}/${publication}/escenic/content-type
+      ;;
+    feature)
+      url=${url}/${publication}/escenic/feature
+      ;;
+    layout)
+      url=${url}/${publication}/escenic/layout
+      ;;
+    layout-group)
+      url=${url}/${publication}/escenic/layout-group
+      ;;
+    image-version)
+      url=${url}/${publication}/escenic/image-version
+      ;;
+    teaser-type)
+      url=${url}/${publication}/escenic/teaser-type
+      ;;
+    menu)
+      url=${url}/${publication}/escenic/plugin/menu
+      ;;
+    security)
+      url=${url}/${publication}/escenic/plugin/community/security
+      ;;
+    root-section-parameters)
+      do_put=true
+      url=$(get_escenic_admin_url)
+      url=${url}/section-parameters-declared/${publication}
+      ;;
+    *)
+      print "Invalid resource: $(basename $resource) :-("
+      exit 1
+  esac        
+
+  local tmp_dir=$(mktemp -d)
+  
+  if [ $1 ]; then
+    if [[ -z "$EDITOR" || ! -x $(which $EDITOR) ]]; then
+      print "You must have a valid editor defined in your EDITOR variable"
+      exit 1
+    fi
+    
+    run cd $tmp_dir;
+    run wget $wget_auth $url -O ${resource}
+    md5sum ${resource} > ${resource}.md5sum
+    exit_on_error "md5sum ${resource}"
+
+    $EDITOR ${resource}
+    md5sum -c ${resource}.md5sum \
+      1>>$log \
+      2>>$log
+    if [ $? -eq 0 ]; then
+      print "You didn't make any changes to ${resource}, I will exit."
+      exit 1
+    fi
+  fi
+  
+  print "Updating the $(basename $resource) resource for the $publication" \
+    "publication ..."
+  
+  debug POSTing $resource to $url
+  if [[ -n "$do_put" && "$do_put" == "true" ]]; then
+    curl -T ${resource} \
+      ${curl_auth} \
+      ${url} \
+      1>>$log 2>>$log
+  else
+    wget $wget_auth \
+      -O - \
+      --post-file ${resource} \
+      $url \
+      1>>$log 2>>$log
+  fi
+
+  if [ -d $tmp_dir ]; then
+    run rm -rf $tmp_dir
+  fi
+}
diff --git a/usr/share/escenic/ece-scripts/ece.d/versions.sh b/usr/share/escenic/ece-scripts/ece.d/versions.sh
new file mode 100644
index 00000000..2c52edde
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece.d/versions.sh
@@ -0,0 +1,28 @@
+
+function list_versions() {
+  if [ -z "$type_pid" ]; then
+    print "$instance instance of $type on $HOSTNAME is NOT running"
+    exit 1
+  fi
+  
+  set_type_port
+  
+  version_manager=browser/Global/neo/io/managers/VersionManager
+  url=$(get_escenic_admin_url)/$version_manager
+  
+  print "Installed on the ${instance} instance running on port ${port}:"
+  wget --timeout 30 $wget_auth -O - $url  2>/dev/null | \
+    grep "\[\[" | \
+    sed 's/\[//g' | \
+    sed 's/\]//g' | \
+    sed 's/Name\=io/Name\=content-engine/g' | \
+    sed 's/Name\=//g' | \
+    sed 's/\;\ Version\=/\ /g' | \
+    awk -F',' '{for (i = 1; i <= NF; i++) print "   * " $i;}' | \
+    sed 's/\*\ \ \ /\*/g' | \
+    sort
+
+    # The last sed is a hack since that for some reason, cannot get
+    # sub(/^[ \t]+/, "") to work inside the loop for $i, it seems
+    # to always operate on the incoming line.
+}

From 0f792a7ad52e36ec79e2eef43e6a137d876c0438 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 23 May 2012 17:22:09 +0200
Subject: [PATCH 0843/2585] - sorting and naming of the list-logs for tomcat
 out log; now it's   listed like this:

  $ ece -i cohen list-logs
  [ece#engine-cohen] App server log: /opt/tomcat-cohen/logs/localhost.2012-05-23.log
  [ece#engine-cohen] App server out log: /var/log/escenic/cohen-catalina.out
  [ece#engine-cohen] Log4j log: /var/log/escenic/li140-120-cohen-messages
  [ece#engine-cohen] GC log: /var/log/escenic/engine-cohen-gc.log
  [ece#engine-cohen] ece script log: /var/log/escenic/engine-cohen.out

  and with -q:

  $ ece -i cohen list-logs -q
  /opt/tomcat-cohen/logs/localhost.2012-05-23.log
  /var/log/escenic/cohen-catalina.out
  /var/log/escenic/li140-120-cohen-messages
  /var/log/escenic/engine-cohen-gc.log
  /var/log/escenic/engine-cohen.out
---
 usr/share/escenic/ece-scripts/ece.d/logs.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/logs.sh b/usr/share/escenic/ece-scripts/ece.d/logs.sh
index f1c8ae35..b4bd57e9 100644
--- a/usr/share/escenic/ece-scripts/ece.d/logs.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/logs.sh
@@ -58,21 +58,21 @@ function tail_app_log() {
 
 function show_all_log_paths() {
   if [ "$quiet" -eq 0 ]; then
-    print "System out log: "$log
     print "App server log: "$(get_app_log)
-    print "log4j log:  "$(get_log4j_log)
-    print "GC log:  "$(get_gc_log)
     if [[ $appserver == "tomcat" ]]; then
-      print "Tomcat system out log:" $(get_catalina_out_file)
+      print "App server out log:" $(get_catalina_out_file)
     fi
+    print "Log4j log:  "$(get_log4j_log)
+    print "GC log:  "$(get_gc_log)
+    print "$(basename $0) script log: "$log
   else
-    echo $log
     echo $(get_app_log)
-    echo $(get_log4j_log)
-    echo $(get_gc_log)
     if [[ $appserver == "tomcat" ]]; then
       echo $(get_catalina_out_file)
     fi
+    echo $(get_log4j_log)
+    echo $(get_gc_log)
+    echo $log
   fi
 }
 

From 0262a65bfa2a9f526c0b481a93d1d9bcec1afc09 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 24 May 2012 12:25:57 +0200
Subject: [PATCH 0844/2585] - added guidance on how to update the publication
 resources using the   ece script, as well as how to flush all the ECE caches.

---
 usr/share/doc/escenic/ece-guide.org | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/usr/share/doc/escenic/ece-guide.org b/usr/share/doc/escenic/ece-guide.org
index 67f5b05f..fc31f761 100644
--- a/usr/share/doc/escenic/ece-guide.org
+++ b/usr/share/doc/escenic/ece-guide.org
@@ -190,6 +190,22 @@ ece will understand this as version: mysite.com-2.314 and write this
 to its deployment state file: /var/lib/escenic/<instance>.state, which
 again will be reported by the "ece info" command.
 
+* Updating the Publication Resources
+It's easy to update the publication resources using the ece script. If
+you have all these publication resources in your current directory,
+you can update them just by:
+#+BEGIN_SRC sh
+$ for el in layout* feature teaser-type content-type ; do 
+  ece -i myinstance -p mypub -r $el update; 
+done  
+#+END_SRC
+
+In this connection, it might be of your interest to also flush all the
+ECE caches on all the instances, this you can easily do with:
+#+BEGIN_SRC sh
+$ ece -i myinstance flush
+#+END_SRC
+
 * Getting information about the ECE instance
 The "ece info" command will give you a lot of useful information about
 the current instance:
@@ -230,7 +246,6 @@ $ ece -i web1 info
 [ece#engine-web1] |-> Deployment date: Wed Mar 28 18:29:58 CST 2012  
 #+END_SRC
 
-
 * Installation
 The ece script and ece.conf may be used on any Unix like system that
 has a fairly recent version of BASH installed.

From db6b7d0f3e98c8ddf107bc91280bf7aa92de5b0d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 25 May 2012 12:33:49 +0200
Subject: [PATCH 0845/2585] - fixed bug which sometimes could lead to paths
 being constructed,   e.g. through <c:url/> which would produce undesired
 links:   http://search/simple.do instead of http://search/simple.do

  The reason for this, is that the WF would configure the search URL
  from the Struts mapping configuration, e.g.: "/search" and then
  later use <c:url/> with this value. Since <c:url/> would first ask
  the app server for the path, which was '/' and then append the
  Struts mapping value, "/search", the result ended up being
  "//search", which doesn't work as we don't have the "search" domain
  name.
---
 usr/share/escenic/ece-scripts/ece-install.d/app-server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 46ed6118..09745e32 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -306,7 +306,7 @@ EOF
       <Host name="${domain}" appBase="webapps" autoDeploy="false">
         <Context displayName="${domain}"
                  docBase="${publication}"
-                 path="/"
+                 path=""
         />
       </Host>
 EOF

From a588bf75ff3b59e48ae7879d5ae92ab653477721 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 25 May 2012 13:12:52 +0200
Subject: [PATCH 0846/2585] - updated the documentation on the setup of virtual
 hosts in Tomcat.

---
 usr/share/doc/escenic/ece-install-guide.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 686202d4..d9a241e3 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -629,7 +629,7 @@ This will produce the following stanzas in server.xml:
 <Host name="fire.escenic.com" appBase="webapps" autoDeploy="false">
   <Context displayName="fire.escenic.com"
            docBase="firepub"
-           path="/"
+           path=""
   />
 </Host>
 <Host name="ild.escenic.com" appBase="webapps" autoDeploy="false">

From 5c43f86a5e8a6899f2b77d7f2cbd0a15d4e011c0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 30 May 2012 11:37:25 +0200
Subject: [PATCH 0847/2585] - improved handling of parent directories not
 existing - added verify log file

---
 .../import-scripts/import-error-log-analyzer  | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/usr/share/escenic/import-scripts/import-error-log-analyzer b/usr/share/escenic/import-scripts/import-error-log-analyzer
index 4646959b..2b312f5f 100644
--- a/usr/share/escenic/import-scripts/import-error-log-analyzer
+++ b/usr/share/escenic/import-scripts/import-error-log-analyzer
@@ -11,6 +11,18 @@
 function check_picture_file() {
   local dir=$(dirname "$1")
   local file_name=$(basename "$1")
+
+  if [ ! -d $dir ]; then
+    cat <<EOF 
+Directory doesn't exist: $dir
+doesn't exist. It's referenced via the image:
+$1
+====
+EOF
+    return 
+  fi
+  
+  
   local alternative=$(find $dir -maxdepth 1 | grep -i "$file_name")
 
   # first check if the image is size=0
@@ -23,6 +35,19 @@ EOF
   fi
 
   if [[ -n "$alternative" && $(echo $alternative | wc -l) -gt 0 ]]; then
+    if [[ "$1" == "$alternative" ]]; then
+      cat <<EOF
+The XML refered to ${1}
+which exists. This means either that the file wasn't there before when
+the import failed or that the file itself is unusable.
+====
+$(ls -lh "$1")
+$(file -i "$1")
+====
+EOF
+      return
+    fi
+
     cat <<EOF
 The file $1
 was missing from your import data set It was referred to from one of
@@ -37,6 +62,12 @@ EOF
   fi
 }
 
+function list_sax_errors() {
+  echo "There are illegal elements, attributes and/or contents in the XML:"
+  grep ^"Caused by: org.xml.sax.SAXParseException:" "$1" | sort | uniq
+  echo "===="
+}  
+
 function analyse_this() {
   if [ ! -e $1 ]; then
     echo $1 "doesn't exist :-("
@@ -47,12 +78,29 @@ function analyse_this() {
     grep ^java.io.IOException | \
     cut -d' ' -f5 | \
     sed 's/\.$//g' | \
+    sort | \
+    uniq | \
     while read picture_path; do
     check_picture_file "$picture_path"
   done
+  
+  list_sax_errors "$1"
+}
 
+function verify_log_file() {
+  if [ -z "$log_file" ]; then
+    echo "Usage: $(basename $0): <log file>"
+    exit 1
+  elif [ ! -e "$log_file" ]; then
+    echo "$log_file doesn't exist :-("
+    exit 1
+  elif [ ! -r "$log_file" ]; then
+    echo "$log_file isn't readable :-("
+    exit 1
+  fi
 }
 
 log_file=$1
+verify_log_file
 analyse_this $log_file
 

From 8c2af0d9791836cced60b82ab63c3132f90c9d89 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 31 May 2012 08:40:52 +0200
Subject: [PATCH 0848/2585] Improved stability of kvm hosts: noapic in the
 guests and vhost=on on the host

---
 usr/share/vizrt/vosa/commands/boot.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/usr/share/vizrt/vosa/commands/boot.sh b/usr/share/vizrt/vosa/commands/boot.sh
index 5d799057..bff9e0e4 100755
--- a/usr/share/vizrt/vosa/commands/boot.sh
+++ b/usr/share/vizrt/vosa/commands/boot.sh
@@ -201,9 +201,10 @@ function boot_kvm() {
   -balloon "virtio"
   -drive "file=${img},if=virtio,cache=none"
   -kernel ${kernel}
-  -net "nic,model=virtio,macaddr=${install_config_macaddr}"
-  -net "tap,ifname=$tapinterface,script=no,downscript=no")
+  -device "virtio-net-pci,mac=${install_config_macaddr},netdev=net0"
+  -netdev "tap,id=net0,ifname=$tapinterface,script=no,downscript=no,vhost=on")
   
+#  -net "nic,model=virtio,macaddr=${install_config_macaddr}"
 # http://dwdwwebcache.googleusercontent.com/search?q=cache:mEAjcA2zHosJ:kerneltrap.org/mailarchive/linux-kvm/2010/1/26/6257297/thread+qemu-kvm+acpi+shutdown&cd=1&hl=no&ct=clnk&gl=no
 # http://kerneltrap.org/mailarchive/linux-kvm/2010/1/26/6257297/thread
 # provide a monitor socket to talk to kvm.   /var/run?
@@ -214,7 +215,7 @@ function boot_kvm() {
     xupdate="xupdate=vdb:mnt"
   fi
 
-  startupcmd=("${startupcmd[@]}" -append "root=/dev/vda ro init=/usr/lib/cloud-init/uncloud-init ds=${cloud_param} ubuntu-pass=random $xupdate" )
+  startupcmd=("${startupcmd[@]}" -append "root=/dev/vda noapic ro init=/usr/lib/cloud-init/uncloud-init ds=${cloud_param} ubuntu-pass=random $xupdate" )
 
   ps > /dev/null -fC "kvm/${hostname}" && {
     echo "This instance of KVM is already running.  Just see here:"

From d6f07cc4cad5651280b0a830eb087718129aa8ab Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 31 May 2012 16:45:24 +0200
Subject: [PATCH 0849/2585] - added support for EAE in create_ecedb, issue #68.
 TODO need to test   this on a fresh installation. - added method for running
 just one SQL file, run_db_script_file - re-indented the code so it looks like
 the other modules

---
 usr/sbin/drop-and-create-ecedb | 107 ++++++++++++++++++---------------
 1 file changed, 59 insertions(+), 48 deletions(-)

diff --git a/usr/sbin/drop-and-create-ecedb b/usr/sbin/drop-and-create-ecedb
index 5c0d13e6..86627622 100644
--- a/usr/sbin/drop-and-create-ecedb
+++ b/usr/sbin/drop-and-create-ecedb
@@ -32,22 +32,22 @@ debug=0
 
 function debug()
 {
-    if [ $debug -eq 1 ]; then
-        echo $my_id $1
-    fi
-    
+  if [ $debug -eq 1 ]; then
+    echo $my_id $1
+  fi
+  
 }
 
 function exit_on_the_first_error()
 {
-    if [ $? -eq 1 ]; then
-        echo $my_id $@ "FAILED, exiting :-("
-        exit 1
-    fi
+  if [ $? -eq 1 ]; then
+    echo $my_id $@ "FAILED, exiting :-("
+    exit 1
+  fi
 }
 
 function create_oracle_ece_user() {
-    sqlplus /nolog << EOF
+  sqlplus /nolog << EOF
       connect /as sysdba;
       create user $db_user
         identified by $db_password
@@ -60,57 +60,60 @@ function create_oracle_ece_user() {
 EOF
 }
 
-function run_db_scripts()
-{
-    for el in $db_fn_list; do
-        file=$1/$el.sql
-        debug "running $file ..."
-        if [ -e $1/$el.sql ]; then
-            if [ $db_product = "oracle" ]; then
-                sqlplus $db_user/$db_password @$file
-            else
-                mysql -u $db_user -p$db_password -h $db_host $db_schema < $file
-            fi
-        fi
-        exit_on_the_first_error "running $el"
-    done
+function run_db_script_file() {
+  if [ $db_product = "oracle" ]; then
+    sqlplus $db_user/$db_password @$file
+  else
+    mysql -u $db_user -p$db_password -h $db_host $db_schema < $file
+  fi
+}
+
+function run_db_scripts() {
+  for el in $db_fn_list; do
+    file=$1/$el.sql
+    if [ -e $1/$el.sql ]; then
+      debug "running $file ..."
+      run_db_script_file $file
+    fi
+    exit_on_the_first_error "running $el"
+  done
 }
 
 function pre_install_new_ecedb()
 {
-    if [ $create_oracle_user -eq 1 ]; then
-        create_oracle_ece_user
-    fi
+  if [ $create_oracle_user -eq 1 ]; then
+    create_oracle_ece_user
+  fi
 
-    if [ $drop_db_first -eq 1 ]; then
-        debug "dropping and re-creating $db_schema on $db_host ..."
-        if [ $db_product = "mysql" ]; then
-            mysql -h $db_host << EOF
+  if [ $drop_db_first -eq 1 ]; then
+    debug "dropping and re-creating $db_schema on $db_host ..."
+    if [ $db_product = "mysql" ]; then
+      mysql -h $db_host << EOF
 drop database $db_schema;
 EOF
-        else
-            sqlplus /nolog << EOF
+    else
+      sqlplus /nolog << EOF
 connect /as sysdba;
 drop tablespace $tablespace_data including contents;
 drop tablespace $tablespace_index including contents;
 EOF
-        fi
     fi
+  fi
 }
-    
+
 function create_schema()
 {
     # we first create the DB (or, if drop_db_first is 1, we've just
     # dropped it above) before running the SQL scripts.
-    if [ $db_product = "mysql" ]; then
-        mysql -h $db_host << EOF
+  if [ $db_product = "mysql" ]; then
+    mysql -h $db_host << EOF
 create database $db_schema character set utf8 collate utf8_general_ci;
 grant all on $db_schema.* to $db_user@'%' identified by '$db_password';
 grant all on $db_schema.* to $db_user@'localhost' identified by '$db_password';
 EOF
-        exit_on_the_first_error "create db"
-    else
-        sqlplus /nolog << EOF
+    exit_on_the_first_error "create db"
+  else
+    sqlplus /nolog << EOF
 connect /as sysdba;
   
 create tablespace $tablespace_data 
@@ -125,7 +128,7 @@ size 100M reuse
 autoextend on next 50M maxsize 2047M
 extent management local autoallocate;          
 EOF
-    fi
+  fi
 }
 
 db_fn_list="
@@ -141,16 +144,24 @@ history
 
 function create_ecedb()
 {
-    create_schema
-    run_db_scripts $ece_home/database/$db_product
+  create_schema
+  run_db_scripts $ece_home/database/$db_product
 
-    if [ -e $ece_home/plugins ]; then
-        for el in `find -L $ece_home/plugins -name $db_product`; do
-            run_db_scripts $el
-        done
-    fi
+  if [ -e $ece_home/plugins ]; then
+    for el in `find -L $ece_home/plugins -name $db_product`; do
+      run_db_scripts $el
+    done
+    # EAE, if there's more than one version of EAE plugin, the latest
+    # one will be used.
+    for el in $(find -L $ece_home/plugins -name eae-${db_product}.sql | \
+      grep -v upgrade | \
+      sort -r | \
+      head -1); do
+      run_db_script_file $el
+    done
+  fi
 
-    debug "${id} ${db_product}://${db_host}/${db_schema} is now ready for ${db_user}/${db_password}"
+  debug "${id} ${db_product}://${db_host}/${db_schema} is now ready for ${db_user}/${db_password}"
 }
 
 # pre_install_new_ecedb

From 4c76c88f8a6740027f11bdd6276aae60a72b3abf Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 31 May 2012 16:46:36 +0200
Subject: [PATCH 0850/2585] - added hardening to the way .bashrc adds TAB
 completion for ece, it   now only sources the file if it exists.

---
 usr/sbin/ece-install | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 58512da7..14d308aa 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -385,7 +385,11 @@ function set_up_user_environment()
   
   if [ $(grep bash_completion.d/ece ${bashrc} 2>/dev/null | \
     wc -l) -lt 1 ]; then
-    echo ". /etc/bash_completion.d/ece" >> ${bashrc}
+    cat >> ${bashrc} <<EOF
+if [ -e /etc/bash_completion.d/ece ]; then
+  . /etc/bash_completion.d/ece
+fi
+EOF
   fi
   
   if [ $(grep ECE_CONF_LOCATIONS ${bashrc} | wc -l) -eq 0 ]; then

From f7c836540613ef3f5d1feb3aaf67116c96141c34 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 31 May 2012 16:48:20 +0200
Subject: [PATCH 0851/2585] - remove trailing newline inside the generated
 server.xml

---
 usr/share/escenic/ece-scripts/ece-install.d/app-server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 09745e32..4dced028 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -317,8 +317,8 @@ EOF
     </Engine>
   </Service>
 </Server>
-
 EOF
+
   cat > $tomcat_base/conf/context.xml <<EOF
 <?xml version='1.0' encoding='utf-8'?>
 <Context>

From 0dbe5aa0a7dc522502ef40fb27e81f7a65930729 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 31 May 2012 16:48:42 +0200
Subject: [PATCH 0852/2585] - fixed indentation on code comment

---
 usr/share/escenic/ece-scripts/ece.d/deploy.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/deploy.sh b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
index f0cec391..462ca76b 100644
--- a/usr/share/escenic/ece-scripts/ece.d/deploy.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
@@ -75,11 +75,10 @@ function deploy() {
   
   case $appserver in
     tomcat)
-            # We do not want the Escenic jars to share the same
-            # classloader folder as tomcat does We thereby want
-            # clients to use a separate escenic classloader to avoid
-            # strange upgrade problems i.e wrong versions of certain
-            # libraries.
+      # We do not want the Escenic jars to share the same classloader
+      # folder as tomcat does We thereby want clients to use a
+      # separate escenic classloader to avoid strange upgrade problems
+      # i.e wrong versions of certain libraries.
       if [ -d $tomcat_base/escenic/lib ]; then
         if [ `ls $tomcat_base/escenic/lib | grep .jar | wc -l` -gt 0 ]; then
           rm $tomcat_base/escenic/lib/*.jar

From 97eedf4f05ca68e39c0cbab6c1b0fc45f6dfeaa2 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 31 May 2012 21:18:09 +0200
Subject: [PATCH 0853/2585] Added initial init.d script for vosa

---
 etc/init.d/vosa | 114 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 114 insertions(+)
 create mode 100644 etc/init.d/vosa

diff --git a/etc/init.d/vosa b/etc/init.d/vosa
new file mode 100644
index 00000000..575c5009
--- /dev/null
+++ b/etc/init.d/vosa
@@ -0,0 +1,114 @@
+#! /usr/bin/env bash
+
+#          version: $Revision: #1 $ $Date: 2011/02/18 $
+#           author: mogsie@vizrt.com
+
+### BEGIN INIT INFO
+# Provides:          vosa
+# Required-Start:    $remote_fs $network $syslog
+# Required-Stop:     $remote_fs $network $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Vizrt Online Components
+### END INIT INFO
+
+#################################################################
+# Usage:
+# * copy this script to /etc/init.d/vosa
+# 
+# * copy its configuration file to /etc/default/vosa (or
+# * /etc/conf.d/vosa on Gentoo based disitributions)
+#
+# * make sure it's executable, chmod +x /etc/init.d/vosa
+#
+# * add it to the desired runlevels. On Debian based systems this
+#  would be: update-rc.d vosa defaults
+#######################################################################
+
+if [ $(whoami) != "root" ] ; then
+    echo "Sorry, you must be root to run $0"
+    exit 1
+fi
+
+#######################################################################
+# Default values
+#######################################################################
+dir_list="
+/var/run/vizrt/vosa
+"
+
+vosa_instance_list=
+for a in /etc/vizrt/vosa/enabled.d/* ; do
+  if [ -L "$a" -a -r "$a" ] ; then
+    vosa_instance_list="$vosa_instance_list $(basename "$a")"
+  fi
+done
+
+vosa_script=/usr/bin/vosa
+
+# The values above may be overidden a file named the same as this
+# init.d script. This init.d configuration must also hold the
+# variables controlling which vosa instances to start. The list of
+# locations per default caters (at least) for Debian, RedHat & Gentoo
+# based systems:
+conf_file_location_list="
+/etc/default
+/etc/conf.d
+/etc/sysconfig
+"
+
+function read_conf_file()
+{
+    for el in $conf_file_location_list; do
+        if [ -r $el/`basename $0` ]; then
+            source $el/`basename $0`
+            found_conf=1
+            break
+        fi
+    done
+
+#    if [ -z $found_conf ]; then
+#        echo "Couldn't find configuration for $0, exiting :-("
+#        exit 1
+#    fi
+}
+
+function ensure_dirs_are_ok()
+{
+    for el in $dir_list; do
+        if [ ! -d $el ]; then
+            mkdir -p $el
+        fi
+# don't change owner; root is fine...
+#        chown --changes -R $vosa_unix_user:$vosa_unix_group $el
+    done
+}
+
+function ensure_vosa_script_is_ok()
+{
+    if [ ! -r $vosa_script ]; then
+        echo "Couldn't read $vosa_script"
+        exit 1
+    elif [ ! -x $vosa_script ]; then
+        echo "$vosa_script needs to be executable (do: chmod +x $vosa_script)"
+        exit 1
+    fi
+    
+}
+
+function execute_command()
+{
+    for el in $vosa_instance_list; do
+        $vosa_script -i $el $1
+    done
+}
+
+if [ $1 ]; then
+    # todo: whitelist to start, stop, status.
+    read_conf_file
+    ensure_vosa_script_is_ok
+    ensure_dirs_are_ok
+    execute_command $1
+else
+    echo "Usage: `basename $0` <start|stop|status>"
+fi

From c8b8cffdc66d0068c0a782ddbacb26bf67975eec Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 5 Jun 2012 13:03:35 +0200
Subject: [PATCH 0854/2585] - added lucy and dashboard support to the build
 script

---
 usr/share/escenic/build-scripts/build.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/usr/share/escenic/build-scripts/build.sh b/usr/share/escenic/build-scripts/build.sh
index ebb92002..4a3359e6 100755
--- a/usr/share/escenic/build-scripts/build.sh
+++ b/usr/share/escenic/build-scripts/build.sh
@@ -184,6 +184,14 @@ function symlink_ece_components {
   parse_version FORUM_VERSION vosa.forum.version
   symlink_distribution plugins/forum-$FORUM_VERSION plugins/forum
 
+  # Version - Dashboard
+  parse_version DASHBOARD_VERSION vosa.dashboard.version
+  symlink_distribution plugins/dashboard-$DASHBOARD_VERSION plugins/dashboard
+
+  # Version - Lucy
+  parse_version LUCY_VERSION vosa.lucy.version
+  symlink_distribution plugins/lucy-$LUCY_VERSION plugins/lucy
+  
   # Version - Widget Framework Common
   parse_version WIDGET_FRAMEWORK_COMMON_VERSION vosa.widget-framework-common.version
   symlink_distribution plugins/widget-framework-common-$WIDGET_FRAMEWORK_COMMON_VERSION plugins/widget-framework-common

From e39b445a19fd66a1b747f9e33ced9ab8e545c26c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 5 Jun 2012 13:04:21 +0200
Subject: [PATCH 0855/2585] - removed a new line

---
 usr/share/escenic/build-scripts/build.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/build.sh b/usr/share/escenic/build-scripts/build.sh
index 4a3359e6..5944cc98 100755
--- a/usr/share/escenic/build-scripts/build.sh
+++ b/usr/share/escenic/build-scripts/build.sh
@@ -195,7 +195,6 @@ function symlink_ece_components {
   # Version - Widget Framework Common
   parse_version WIDGET_FRAMEWORK_COMMON_VERSION vosa.widget-framework-common.version
   symlink_distribution plugins/widget-framework-common-$WIDGET_FRAMEWORK_COMMON_VERSION plugins/widget-framework-common
-
 }
 
 # symlink .war files from target/

From 128351d9afc0b262d38d59aaa215538dceb81681 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 5 Jun 2012 13:05:26 +0200
Subject: [PATCH 0856/2585] - added message when starting the build script

---
 usr/share/escenic/build-scripts/build.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/build-scripts/build.sh b/usr/share/escenic/build-scripts/build.sh
index 5944cc98..489a9100 100755
--- a/usr/share/escenic/build-scripts/build.sh
+++ b/usr/share/escenic/build-scripts/build.sh
@@ -215,7 +215,8 @@ function symlink_target {
 ##
 function release 
 {
-
+  print_and_log "Starting build @ $(date) ..."
+  
   home_preparation
 
   run svn_checkout
@@ -256,7 +257,7 @@ function release
 ##
 function print_result
 {
-  print_and_log "BUILD SUCCESSFUL!"
+  print_and_log "Build SUCCESSFUL!"
   print_and_log "You'll find the release here: http://builder.vizrtsaas.com/$customer/releases/$resulting_ear"
 }
 

From 5a1197506abff5dfcab23c32d20fdba228c1445f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 5 Jun 2012 14:45:53 +0200
Subject: [PATCH 0857/2585] - re-applied
 25c55248a7e1598a874b78df363d3f9ad57803d6 as the   start_type function now
 resides in the start.sh ece module.

---
 usr/share/escenic/ece-scripts/ece.d/start.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/ece-scripts/ece.d/start.sh b/usr/share/escenic/ece-scripts/ece.d/start.sh
index d1eccbeb..c95a0dba 100644
--- a/usr/share/escenic/ece-scripts/ece.d/start.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/start.sh
@@ -2,6 +2,7 @@
 
 function start_type() {
   unset CLASSPATH
+  export HOSTNAME
   message="Starting the $instance instance of $type on $HOSTNAME ..."
   print_and_log $message
   

From a5a48a193b494181dee5ff8b56feba1e4b10cb2a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 5 Jun 2012 15:06:17 +0200
Subject: [PATCH 0858/2585] - ece-install now sets up a 9th layer; the server
 layer,   i.e. /etc/escenic/engine/server/<server>/ this layer is a  
 combination between the host and the instance. - hardening: added run
 wrappers to some commands inside   set_up_assembly_tool

---
 .../ece-scripts/ece-install.d/content-engine.sh    | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 7d7155ea..9b43c6e0 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -178,6 +178,8 @@ function set_up_assembly_tool() {
   run cp -r layers/host layers/environment
   run cp -r layers/host layers/instance
   run cp -r layers/host layers/vosa
+  run cp -r layers/host layers/server
+  
   cat > layers/environment/Files.properties <<EOF
 \$class=neo.nursery.FileSystemDepot
 fileSystemRoot = $escenic_conf_dir/engine/environment/\${com.escenic.environment "unknown"}/
@@ -189,6 +191,10 @@ EOF
   cat > layers/vosa/Files.properties <<EOF
 \$class=neo.nursery.FileSystemDepot
 fileSystemRoot = $escenic_conf_dir/engine/vosa/
+EOF
+  cat > layers/server/Files.properties <<EOF
+\$class=neo.nursery.FileSystemDepot
+fileSystemRoot = $escenic_conf_dir/engine/server/\${escenic.server "default"}/
 EOF
 
   cat > Nursery.properties <<EOF
@@ -219,6 +225,10 @@ layer.07 = /layers/host/Layer
 
 # Customer :: instance specific layer
 layer.08 = /layers/instance/Layer
+
+# Customer :: "escenic.server" specific layer, this layer is a
+# combination of the host and the instance.
+layer.09 = /layers/server/Layer
 EOF
 
   # fixing the path to the Nursery configuration according to
@@ -229,9 +239,9 @@ EOF
   done
   
   # set up which plugins to use
-  cd $escenic_root_dir/assemblytool/
+  run cd $escenic_root_dir/assemblytool/
   make_dir plugins
-  cd plugins
+  run cd plugins
   find ../../ -maxdepth 1 -type d | \
     grep -v assemblytool | \
     while read directory; do

From 82003073a9c34f52eb24a7af1befeb906bf7d906 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 6 Jun 2012 11:02:25 +0200
Subject: [PATCH 0859/2585] - build.sh will no add an assembly descriptor for
 the dashboard   publication if the Dashboard plugin is installed.

  With this in place, the EAR produced will contain the
  dashboard.war.
---
 usr/share/escenic/build-scripts/build.sh | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/build.sh b/usr/share/escenic/build-scripts/build.sh
index 489a9100..af9f796c 100755
--- a/usr/share/escenic/build-scripts/build.sh
+++ b/usr/share/escenic/build-scripts/build.sh
@@ -241,6 +241,8 @@ function release
 
   add_vosa_libs
 
+  add_dashboard_descriptor
+
   run cd $assemblytool_root_dir
   run ant -q clean ear -DskipRedundancyCheck=true
 
@@ -254,16 +256,29 @@ function release
 
 }
 
+function add_dashboard_descriptor() {
+  if [ -d ${plugins/dashboard} ]; then
+    print_and_log "Adding an assembly descriptor for Dashboard ..." 
+    cat >> $assemblytool_root_dir/publications/dashboard.properties <<EOF
+source-war: ../../plugins/dashboard/wars/dashboard-webapp.war
+context-root: /dashboard
+EOF
+  else
+    print_and_log "The Dashboard plugin is not available, not making descriptor for it."
+  fi
+}
+
 ##
 function print_result
 {
-  print_and_log "Build SUCCESSFUL!"
+  print_and_log "Build SUCCESSFUL! @ $(date)"
   print_and_log "You'll find the release here: http://builder.vizrtsaas.com/$customer/releases/$resulting_ear"
 }
 
 set_pid
 fetch_configuration
 init
+print_and_log "Starting building @ $(date)"
 get_user_options $@
 verify_configuration
 home_preparation

From 65c218a4a50fcabeb75e4a82c785d118c712d1c6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 8 Jun 2012 10:38:47 +0200
Subject: [PATCH 0860/2585] - added diff and cat module for vosa files - added
 vosa-cat wrapper script for the diff and cat commands. Usage:

  vosa-cat -i <instance> -f <file> -s <src directory>
  vosa-cat -i pres1 -f /etc/varnish/default.vcl -s /home/torstein/src/nie/server-admin/pres1
---
 usr/bin/vosa-cat | 80 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 usr/bin/vosa-cat

diff --git a/usr/bin/vosa-cat b/usr/bin/vosa-cat
new file mode 100644
index 00000000..3dfe6a25
--- /dev/null
+++ b/usr/bin/vosa-cat
@@ -0,0 +1,80 @@
+#! /usr/bin/env bash
+
+# source ../share/vizrt/vosa/commands/diff.sh
+
+vosa_dir=/var/lib/vizrt/vosa/files
+
+function get_user_options() {
+  while getopts ":i:f:s:" opt; do
+    case $opt in
+      i)
+        instance=${OPTARG}
+        ;;
+      f)
+        vosa_input_file=${OPTARG}
+        ;;
+      s)
+        scm_dir=${OPTARG}
+        ;;
+      \?)
+        echo "Invalid option: -$OPTARG" >&2
+        exit 1
+        ;;
+      :)
+        echo "Option -$OPTARG requires an argument." >&2
+        exit 1
+        ;;
+      *)
+        echo command is $OPTARG
+        exit 0
+    esac
+  done
+}
+
+get_user_options $@
+
+if [ -z "${instance}" ]; then
+  echo "You must specify instance with $(basename $0) -i <instance>"
+  exit 1
+fi
+if [ -z "${vosa_input_file}" ]; then
+  echo "You must specify vosa input file with $(basename $0) -f <relative file>"
+  exit 1
+fi
+
+function get_vosa_file() {
+  local file=${vosa_dir}/${instance}/$vosa_input_file
+  if [ -e ${file} ]; then
+    echo $file
+  else
+    file=${vosa_dir}/common/$vosa_input_file
+    if [ -e ${file} ]; then
+      echo $file
+    fi
+  fi
+}
+
+function cat_vosa_file() {
+  local file=$(get_vosa_file)
+  if [ -e ${file} ]; then
+    echo "Contents of $file"
+    echo "===="
+    cat $file
+    echo "===="
+  else
+    echo "Couldn't find $vosa_input_file in any of the vosa file layers"
+    exit 1
+  fi
+}
+
+function diff_vosa_file() {
+  local vosa_file=$(get_vosa_file)
+  diff $vosa_file $scm_dir/$vosa_input_file
+}
+
+if [ -z "${scm_dir}" ]; then
+  cat_vosa_file
+else
+  diff_vosa_file
+fi
+

From ec5d6f5dec11da87ce3e44b8e0ca4e1f86634775 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 14 Jun 2012 13:13:50 +0200
Subject: [PATCH 0861/2585] Fixed typo in initial bootstrapping phase causing
 Nursery not to work

---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 9b43c6e0..9b2a8ca7 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -200,7 +200,7 @@ EOF
   cat > Nursery.properties <<EOF
 # Configuration layers set up by $(basename $0) @ $(date)
 
-$class=neo.nursery.Bootstrapper
+\$class=neo.nursery.Bootstrapper
 
 # ECE :: default layer
 layer.01 = /layers/default/Layer

From 80f6ab6bd4964539062ac8531779e1bc8c005a01 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Fri, 15 Jun 2012 15:41:55 +0200
Subject: [PATCH 0862/2585] Updated comments to reflect upcoming changes

---
 usr/bin/vosa | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 23132202..0cb813a7 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -421,9 +421,10 @@ function verify_installation() {
 ##      The first column is the instance name itself.
 ##      An instance may be enabled (see "vosa enable")
 ##  - enabled
-##      Only enabled instances are "supposed" to run on this
-##      physical machine.
-##      An enabled instance *is* supposed to run on this machine.
+##      Only enabled instances are "supposed" to be managed by this
+##      machine.
+##      An enabled instance *is* supposed to be managed by this
+##      machine.
 ##      An enabled instance may later be be installed. (see
 ##      "vosa install")
 ##  - installed
@@ -438,11 +439,10 @@ function verify_installation() {
 ##      An instance that has been started will probably be alive, but
 ##      if the instance is killed or dies for whatever reason other
 ##      than the "vosa stop" command, it will be labeled as "dead".
-##  - pid (of an alive instance)
-##  - uptime (of an alive instance)
+##  - pid (of the kvm instance) or instance-id (of an amazon VM)
+##  - uptime (of any alive instance)
 ##      Only shown for instances that are "alive".
-##      For informational purposes, the pid and the uptime of the pid
-##      are shown in dd-hh:mm:ss format.
+##      uptime is shown in dd-hh:mm:ss format.
 function do_status() {
   verify_installation
   if [ -z "$instance_dir" ] ; then

From c64b86730cb33f5b8ad9a4bd81d3205596bfb62e Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Fri, 15 Jun 2012 15:46:33 +0200
Subject: [PATCH 0863/2585] Refactored vosa status to be a bit flatter

---
 usr/bin/vosa | 48 ++++++++++++++++++++++++++++++++----------------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 0cb813a7..3fa8ffff 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -459,28 +459,44 @@ function do_status() {
 
 function really_do_status () {
     local output
+    local done=0
     local avdir="${available_dir}/$(basename $1)"
     local endir="${enabled_dir}/$(basename $1)"
     output=( $(basename $1) )
-    if [ -d "$avdir" ] ; then
+    if [ ! -d "$avdir" ] ; then
+      done=1
+    fi
+
+    if [ $done -eq 0 ] ; then
       if [ ! -L "$endir" ] ; then
         output=( ${output[@]} disabled );
+        done=1
+      fi
+    fi
+
+    if [ $done -eq 0 ] ; then
+      output=( ${output[@]} enabled );
+      local vmdir=$(readlink -f ${avdir}/../../../../../var/lib/vizrt/vosa/images/$(basename $1))
+      if [ ! -d "$vmdir" ] ; then
+        done=1
+      fi
+    fi
+
+    if [ $done -eq 0 ] ; then
+      output=( ${output[@]} installed );
+      local pidfile=$(echo_rundir_of $(basename $1))/$(basename $1).pid
+      if [ ! -r "$pidfile" ] ; then
+        done=1
+      fi
+    fi
+
+    if [ $done -eq 0 ] ; then
+      if ! ps > /dev/null $(<$pidfile) ; then
+        output=( ${output[@]} dead );
       else
-        output=( ${output[@]} enabled );
-        local vmdir=$(readlink -f ${avdir}/../../../../../var/lib/vizrt/vosa/images/$(basename $1))
-        if [ -d "$vmdir" ] ; then
-          output=( ${output[@]} installed );
-          local pidfile=$(echo_rundir_of $(basename $1))/$(basename $1).pid
-          if [ -r "$pidfile" ] ; then
-            if ! ps > /dev/null $(<$pidfile) ; then
-              output=( ${output[@]} dead );
-            else
-              output=( ${output[@]} alive )
-              output=( ${output[@]} $(<$pidfile) );
-              output=( ${output[@]} "$( ps -p "$(<$pidfile)" -o "etime=" )" );
-            fi
-          fi
-        fi
+        output=( ${output[@]} alive )
+        output=( ${output[@]} $(<$pidfile) );
+        output=( ${output[@]} "$( ps -p "$(<$pidfile)" -o "etime=" )" );
       fi
     fi
     echo ${output[@]}

From a7fb6052d7131f10f8234660672a8bf8d79f16e8 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Sat, 16 Jun 2012 00:17:36 +0200
Subject: [PATCH 0864/2585] Implemented support for vosa status if there's an
 amazon.conf file in /etc and amazon.state file in /var/lib.

---
 usr/bin/vosa | 61 ++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 52 insertions(+), 9 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 3fa8ffff..c52d3396 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -460,6 +460,7 @@ function do_status() {
 function really_do_status () {
     local output
     local done=0
+    local aws=0
     local avdir="${available_dir}/$(basename $1)"
     local endir="${enabled_dir}/$(basename $1)"
     output=( $(basename $1) )
@@ -483,20 +484,62 @@ function really_do_status () {
     fi
 
     if [ $done -eq 0 ] ; then
-      output=( ${output[@]} installed );
-      local pidfile=$(echo_rundir_of $(basename $1))/$(basename $1).pid
-      if [ ! -r "$pidfile" ] ; then
-        done=1
+      if [ -r $avdir/amazon.conf ] ; then
+        aws=1
+      fi
+
+      if [ $aws -eq 0 ] ; then
+        output=( ${output[@]} installed );
+        local pidfile=$(echo_rundir_of $(basename $1))/$(basename $1).pid
+        if [ ! -r "$pidfile" ] ; then
+          done=1
+        fi
+      else
+        local statefile=$vmdir/amazon.state
+        if [ ! -r $statefile ] ; then
+          output=( ${output[@]} unknown );
+          # MUST have state to know the instance ID in amazon...
+          done=1
+        fi
+
+        local aws_instance=
+        if [ $done -eq 0 ] ; then
+          # Parse the statefile and find its instance ID
+          if [ -r $statefile ] ; then
+            aws_instance=$(awk < "$statefile" '/^INSTANCE/ { print $2 }')
+          fi
+
+          if [ -z "$aws_instance" ] ; then
+            output=( ${output[@]} invalid );
+            done=1
+          fi
+        fi
       fi
     fi
 
     if [ $done -eq 0 ] ; then
-      if ! ps > /dev/null $(<$pidfile) ; then
-        output=( ${output[@]} dead );
+      if [ $aws -eq 0 ] ; then
+        if ! ps > /dev/null $(<$pidfile) ; then
+          output=( ${output[@]} dead );
+        else
+          output=( ${output[@]} alive )
+          output=( ${output[@]} $(<$pidfile) );
+          output=( ${output[@]} "$( ps -p "$(<$pidfile)" -o "etime=" )" );
+        fi
       else
-        output=( ${output[@]} alive )
-        output=( ${output[@]} $(<$pidfile) );
-        output=( ${output[@]} "$( ps -p "$(<$pidfile)" -o "etime=" )" );
+        # Update the aws statefile
+        if [ -w $statefile ] ; then
+          ec2-describe-instances $AWS_COMMON_OPTIONS $aws_instance > $statefile
+        fi
+        aws_state=$(awk < "$statefile" '/^INSTANCE/ { print $6 }')
+        aws_zone=$(awk < "$statefile" '/^INSTANCE/ { print $11 }')
+        aws_start=$(awk < "$statefile" '/^INSTANCE/ { print $10 }')
+        if [ -z "$aws_state" ] ; then
+          output=( ${output[@]} unknown $aws_instance )
+        else
+          output=( ${output[@]} ${aws_state} ${aws_zone}/${aws_instance} )
+          output=( ${output[@]} ${aws_start} )
+        fi
       fi
     fi
     echo ${output[@]}

From 904e06f846756b93ffd3a69ebf0df34a91760b27 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Sun, 17 Jun 2012 17:57:44 +0200
Subject: [PATCH 0865/2585] vosa status now uses key+certificate declared in
 amazon.conf.

---
 usr/bin/vosa                                  | 40 ++++++++++++++++---
 .../vizrt/vosa/commands/amazon_config_parser  | 40 +++++++++++++++++++
 2 files changed, 74 insertions(+), 6 deletions(-)
 create mode 100644 usr/share/vizrt/vosa/commands/amazon_config_parser

diff --git a/usr/bin/vosa b/usr/bin/vosa
index c52d3396..e4388908 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -457,6 +457,22 @@ function do_status() {
   fi
 }
 
+
+have_read_amazon_config=0
+function read_amazon_config() {
+  [[ $have_read_amazon_config -eq 1 ]] && return
+  source $commands/functions
+  source $commands/amazon_config_parser
+  # Parse all amazon config items
+  parse_config_file $1 amazon_config_
+
+  unset AWS_COMMON_OPTIONS
+  AWS_COMMON_OPTIONS="${AWS_COMMON_OPTIONS} --private-key $amazon_config_key "
+  AWS_COMMON_OPTIONS="${AWS_COMMON_OPTIONS} --cert $amazon_config_certificate "
+  AWS_COMMON_OPTIONS="${AWS_COMMON_OPTIONS} --region $amazon_config_region "
+  have_read_amazon_config=1
+}
+
 function really_do_status () {
     local output
     local done=0
@@ -486,6 +502,7 @@ function really_do_status () {
     if [ $done -eq 0 ] ; then
       if [ -r $avdir/amazon.conf ] ; then
         aws=1
+        read_amazon_config $avdir/amazon.conf
       fi
 
       if [ $aws -eq 0 ] ; then
@@ -495,8 +512,9 @@ function really_do_status () {
           done=1
         fi
       else
+        local bootstatefile=$vmdir/amazon.bootstate
         local statefile=$vmdir/amazon.state
-        if [ ! -r $statefile ] ; then
+        if [ ! -r $bootstatefile ] ; then
           output=( ${output[@]} unknown );
           # MUST have state to know the instance ID in amazon...
           done=1
@@ -505,8 +523,8 @@ function really_do_status () {
         local aws_instance=
         if [ $done -eq 0 ] ; then
           # Parse the statefile and find its instance ID
-          if [ -r $statefile ] ; then
-            aws_instance=$(awk < "$statefile" '/^INSTANCE/ { print $2 }')
+          if [ -r $bootstatefile ] ; then
+            aws_instance=$(awk < "$bootstatefile" -F '\t' '/^INSTANCE/ { print $2 }')
           fi
 
           if [ -z "$aws_instance" ] ; then
@@ -527,19 +545,29 @@ function really_do_status () {
           output=( ${output[@]} "$( ps -p "$(<$pidfile)" -o "etime=" )" );
         fi
       else
+        local rc=0
         # Update the aws statefile
         if [ -w $statefile ] ; then
           ec2-describe-instances $AWS_COMMON_OPTIONS $aws_instance > $statefile
+          echo ec2-describe-instances $AWS_COMMON_OPTIONS $aws_instance
+          local rc=$?
         fi
-        aws_state=$(awk < "$statefile" '/^INSTANCE/ { print $6 }')
-        aws_zone=$(awk < "$statefile" '/^INSTANCE/ { print $11 }')
-        aws_start=$(awk < "$statefile" '/^INSTANCE/ { print $10 }')
+        if [ ! -r $statefile ] ; then
+          statefile=$bootstatefile
+          local stale=1
+        fi
+        aws_state=$(awk < "$statefile" -F '\t' '/^INSTANCE/ { print $6 }')
+        aws_zone=$(awk < "$statefile" -F '\t' '/^INSTANCE/ { print $12 }')
+        aws_start=$(awk < "$statefile" -F '\t' '/^INSTANCE/ { print $11 }')
         if [ -z "$aws_state" ] ; then
           output=( ${output[@]} unknown $aws_instance )
         else
           output=( ${output[@]} ${aws_state} ${aws_zone}/${aws_instance} )
           output=( ${output[@]} ${aws_start} )
         fi
+        if [ "$stale" == "1" ] ; then
+          output=( ${output[@]} STALE)
+        fi
       fi
     fi
     echo ${output[@]}
diff --git a/usr/share/vizrt/vosa/commands/amazon_config_parser b/usr/share/vizrt/vosa/commands/amazon_config_parser
new file mode 100644
index 00000000..07eef75a
--- /dev/null
+++ b/usr/share/vizrt/vosa/commands/amazon_config_parser
@@ -0,0 +1,40 @@
+# bash functions common to the vosa commands
+# e.g. parsing a config file
+
+
+amazon_config_key=
+amazon_config_certificate=
+amazon_config_user_data=
+amazon_config_region=
+amazon_config_availability_zone=
+
+
+function amazon_config_key() {
+  amazon_config_key=$1
+}
+
+function amazon_config_certificate() {
+  amazon_config_certificate=$1
+}
+
+function amazon_config_user_data() {
+  amazon_config_user_data=$1
+}
+
+function amazon_config_region() {
+  amazon_config_region=$1
+}
+
+function amazon_config_availability_zone() {
+  amazon_config_availability_zone=$1
+}
+
+# Handle arrays
+
+declare -a amazon_config_ssh_keys
+declare -a amazon_config_overlay
+declare -a amazon_config_postinstall
+
+function amazon_config_postinstall() {
+  amazon_config_postinstall=( "${amazon_config_postinstall[@]}" "$1" )
+}

From 54dafc6ad42fcf649e002ed1d57391f946334089 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Sun, 17 Jun 2012 21:30:33 +0200
Subject: [PATCH 0866/2585] Added support for starting EC2 instances using vosa

---
 usr/bin/vosa                               |  20 +++-
 usr/share/vizrt/vosa/commands/ec2-start.sh | 112 +++++++++++++++++++++
 2 files changed, 127 insertions(+), 5 deletions(-)
 create mode 100755 usr/share/vizrt/vosa/commands/ec2-start.sh

diff --git a/usr/bin/vosa b/usr/bin/vosa
index e4388908..984a2e17 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -64,6 +64,9 @@ function requires_instance_dir() {
     usage=1
     return 1
   fi
+
+  aws=0
+  [ -r $instance_dir/amazon.conf ] && aws=1
 }
 function prohibits_instance_dir() {
   if [ ! -z "$instance_dir" -o ! -z "${instance_name}" ] ; then
@@ -512,7 +515,7 @@ function really_do_status () {
           done=1
         fi
       else
-        local bootstatefile=$vmdir/amazon.bootstate
+        local bootstatefile=$vmdir/amazon.initialstate
         local statefile=$vmdir/amazon.state
         if [ ! -r $bootstatefile ] ; then
           output=( ${output[@]} unknown );
@@ -532,6 +535,9 @@ function really_do_status () {
             done=1
           fi
         fi
+        if [ $done -eq 0 ] ; then
+          output=( ${output[@]} installed );
+        fi
       fi
     fi
 
@@ -745,15 +751,19 @@ function do_start() {
   # TODO: let's make this command wait for SSH access before returning?
   requires_instance_dir && {
     local status=( $(really_do_status $instance_dir) )
-    if [ "${status[3]}" == "alive" ] ; then
-      echo "$instance_name is alive. No need to start it."
+    if [ "${status[3]}" == "alive" -o "${status[3]}" == "running" ] ; then
+      echo "$instance_name is ${status[3]}. No need to start it."
       exit 1
     fi
     if [ "${status[2]}" != "installed" ] ; then
-      echo "$instance_name is not installed. I can't start it."
+      echo "$instance_name is not installed, it's ${status[2]}. I can't start it."
       exit 1
     fi
-    ${commands}/boot.sh "$instance_dir" "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name"
+    if [ $aws -eq 1 ] ; then
+      ${commands}/ec2-start.sh "$instance_dir" "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name"
+    else
+      ${commands}/boot.sh "$instance_dir" "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name"
+    fi
   }
 }
 
diff --git a/usr/share/vizrt/vosa/commands/ec2-start.sh b/usr/share/vizrt/vosa/commands/ec2-start.sh
new file mode 100755
index 00000000..3234ad77
--- /dev/null
+++ b/usr/share/vizrt/vosa/commands/ec2-start.sh
@@ -0,0 +1,112 @@
+#!/bin/bash
+
+# Boots an amazon instance.
+
+# Expects two arguments, namely a directory or symlink to a directory which
+# contains a "vosa" configuration, and a second directory,
+# which is where statefiles can be stored.
+
+# Usually this command is executed from "/usr/bin/vosa -i somevm start"
+# or similar.
+
+if [ -z "$EC2_START_BINARY" ] ; then
+  EC2_START_BINARY=$(which 2>/dev/null ec2-start-instances) ||
+  EC2_START_BINARY=$(which 2>/dev/null ec2start)
+fi
+
+if [ -z "$EC2_START_BINARY" -o ! -x $EC2_START_BINARY ] ; then
+  echo "Unable to figure out where ec2-run-instances is installed."
+  echo "export EC2_START_BINARY to make it work."
+  exit 2
+fi
+
+debug=3
+
+function decho() {
+  if [ $debug -ge $1 ] ; then
+    echo "${@:2}"
+  fi
+}
+
+function exitonerror() {
+  rc=$1
+  if [ "$rc" != "0" ] ; then
+    echo "$2 (rc=$rc)"
+    exit 2
+  fi
+}
+
+
+config=$1
+image=$2
+
+if [ -z "$image" -o -z "$config" ] ; then
+  echo "You need to specify a config directory (e.g. /etc/vizrt/vosa/enabled.d/foo) "
+  echo "and a place to hold the installation (e.g. /usr/lib/vizrt/vosa/images/foo)"
+  echo "the former MUST exist and contain vosa configuration files"
+  echo "the latter MUST also exist, and contain amazon.initialstate etc"
+  exit 1
+fi
+
+# basic error checking
+if [ ! -d "$config" ] ; then
+  echo "Config directory $config isn't a directory."
+  exit 1
+fi
+
+if [ ! -d "$image" ] ; then
+  echo "image directory $image does not exist.  Can't continue."
+  exit 1
+fi
+
+# todo: verify that basename and image don't end with slashes...
+
+if [ "$(basename "$image")" != "$(basename "$config")" ] ; then
+  echo "$image and $config appear to try to name different VMs. Try using $(basename $config) instead."
+  exit 2
+fi
+
+
+have_read_amazon_config=0
+function read_amazon_config() {
+  [[ $have_read_amazon_config -eq 1 ]] && return
+  source $(dirname $0)/functions
+  source $(dirname $0)/amazon_config_parser
+  # Parse all amazon config items
+  parse_config_file $1 amazon_config_
+
+  unset AWS_COMMON_OPTIONS
+  AWS_COMMON_OPTIONS="${AWS_COMMON_OPTIONS} --private-key $amazon_config_key "
+  AWS_COMMON_OPTIONS="${AWS_COMMON_OPTIONS} --cert $amazon_config_certificate "
+  AWS_COMMON_OPTIONS="${AWS_COMMON_OPTIONS} --region $amazon_config_region "
+  have_read_amazon_config=1
+}
+
+function get_aws_instance() {
+  bootstatefile=$image/amazon.initialstate
+  aws_instance=$(awk < "$bootstatefile" -F '\t' '/^INSTANCE/ { print $2 }')
+}
+
+
+function boot_ec2() {
+
+  decho 1 "Starting the machine"
+  startupcmd=(
+  $EC2_START_BINARY
+  $AWS_COMMON_OPTIONS
+  $aws_instance
+  )
+  echo "Command to start this EC2 instance:"
+  echo "${startupcmd[@]}"
+  "${startupcmd[@]}"
+  local rc
+  rc=$?
+  if [ $rc != 0 ] ; then
+    exitonerror $rc "Unable to start EC2 :-/"
+  fi
+}
+
+
+read_amazon_config $1/amazon.conf
+get_aws_instance
+boot_ec2

From d52bbd365ba142504085d58f9f92516f2ca93593 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Sun, 17 Jun 2012 23:30:12 +0200
Subject: [PATCH 0867/2585] Added support for stopping EC2 instances using
 vosa.

---
 usr/bin/vosa                             |  35 ++++---
 usr/share/vizrt/vosa/commands/ec2-cmd.sh | 117 +++++++++++++++++++++++
 2 files changed, 141 insertions(+), 11 deletions(-)
 create mode 100755 usr/share/vizrt/vosa/commands/ec2-cmd.sh

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 984a2e17..a5a086f9 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -555,7 +555,7 @@ function really_do_status () {
         # Update the aws statefile
         if [ -w $statefile ] ; then
           ec2-describe-instances $AWS_COMMON_OPTIONS $aws_instance > $statefile
-          echo ec2-describe-instances $AWS_COMMON_OPTIONS $aws_instance
+          #echo ec2-describe-instances $AWS_COMMON_OPTIONS $aws_instance
           local rc=$?
         fi
         if [ ! -r $statefile ] ; then
@@ -780,25 +780,25 @@ function do_stop() {
   requires_instance_dir && {
     local status=( $(really_do_status $instance_dir) )
     if [ "${status[2]}" != "installed" ] ; then
-      echo "$instance_name is not installed. I can't stop it."
+      echo "$instance_name is not installed, it's ${status[2]}. I can't stop it."
       exit 1
     fi
-    if [ "${status[3]}" == "alive" ] ; then
+    if [ "${status[3]}" == "running" ] ; then
       shutdown "${status[0]}"
       # should now be "dead" if we asked it.
     fi
-    # regardless of this, we _want_ it to die. remove pidfile.
-    # TODO: continue trying to kill it more forcibly, and
-    # remove the pidfile when it's done.
-    local pidfile=$(echo_rundir_of ${status[0]})/${status[0]}.pid
-    rm -f $pidfile
+    if [ $aws -eq 0 ] ; then
+      # regardless of this, we _want_ it to die. remove pidfile.
+      # TODO: continue trying to kill it more forcibly, and
+      # remove the pidfile when it's done.
+      local pidfile=$(echo_rundir_of ${status[0]})/${status[0]}.pid
+      rm -f $pidfile
+    fi
   }
 }
 
-
-
 # Performs a graceful shutdown of the guest
-function shutdown() {
+function shutdown_kvm() {
   local pid=$(<$(echo_rundir_of $1)/$1.pid)
   if [ -z "$pid" ] ; then
     return 0
@@ -851,6 +851,19 @@ function shutdown() {
   }
 }
 
+function shutdown_aws() {
+  ${commands}/ec2-cmd.sh "$instance_dir" "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" "stop-instances" INSTANCE
+}
+
+# Shuts
+function shutdown() {
+  if [ $aws -eq 1 ] ; then
+    shutdown_aws "${@}"
+  else
+    shutdown_kvm "${@}"
+  fi
+}
+
 
 function unknown-argument() {
   echo "Unknown argument $@"
diff --git a/usr/share/vizrt/vosa/commands/ec2-cmd.sh b/usr/share/vizrt/vosa/commands/ec2-cmd.sh
new file mode 100755
index 00000000..08000f6a
--- /dev/null
+++ b/usr/share/vizrt/vosa/commands/ec2-cmd.sh
@@ -0,0 +1,117 @@
+#!/bin/bash
+
+# Boots an amazon instance.
+
+# Expects three arguments, namely a directory or symlink to a directory which
+# contains a "vosa" configuration, and a second directory,
+# which is where statefiles can be stored, followed by the ec2 command
+# that should be executed, and any additional arguments.
+
+# Usually this command is executed from "/usr/bin/vosa -i somevm start"
+# or similar.
+
+cmd=$3
+
+if [ -z "$EC2_BINARY" ] ; then
+  EC2_BINARY=$(which 2>/dev/null ec2-$cmd)
+fi
+
+if [ -z "$EC2_BINARY" -o ! -x $EC2_BINARY ] ; then
+  echo "Unable to figure out where ec2-run-instances is installed."
+  echo "export EC2_BINARY to make it work."
+  exit 2
+fi
+
+debug=3
+
+function decho() {
+  if [ $debug -ge $1 ] ; then
+    echo "${@:2}"
+  fi
+}
+
+function exitonerror() {
+  rc=$1
+  if [ "$rc" != "0" ] ; then
+    echo "$2 (rc=$rc)"
+    exit 2
+  fi
+}
+
+
+config=$1
+image=$2
+
+if [ -z "$image" -o -z "$config" ] ; then
+  echo "You need to specify a config directory (e.g. /etc/vizrt/vosa/enabled.d/foo) "
+  echo "and a place to hold the installation (e.g. /usr/lib/vizrt/vosa/images/foo)"
+  echo "the former MUST exist and contain vosa configuration files"
+  echo "the latter MUST also exist, and contain amazon.initialstate etc"
+  exit 1
+fi
+
+# basic error checking
+if [ ! -d "$config" ] ; then
+  echo "Config directory $config isn't a directory."
+  exit 1
+fi
+
+if [ ! -d "$image" ] ; then
+  echo "image directory $image does not exist.  Can't continue."
+  exit 1
+fi
+
+# todo: verify that basename and image don't end with slashes...
+
+if [ "$(basename "$image")" != "$(basename "$config")" ] ; then
+  echo "$image and $config appear to try to name different VMs. Try using $(basename $config) instead."
+  exit 2
+fi
+
+
+have_read_amazon_config=0
+function read_amazon_config() {
+  [[ $have_read_amazon_config -eq 1 ]] && return
+  source $(dirname $0)/functions
+  source $(dirname $0)/amazon_config_parser
+  # Parse all amazon config items
+  parse_config_file $1 amazon_config_
+
+  unset AWS_COMMON_OPTIONS
+  AWS_COMMON_OPTIONS="${AWS_COMMON_OPTIONS} --private-key $amazon_config_key "
+  AWS_COMMON_OPTIONS="${AWS_COMMON_OPTIONS} --cert $amazon_config_certificate "
+  AWS_COMMON_OPTIONS="${AWS_COMMON_OPTIONS} --region $amazon_config_region "
+  have_read_amazon_config=1
+}
+
+function get_aws_instance() {
+  bootstatefile=$image/amazon.initialstate
+  aws_instance=$(awk < "$bootstatefile" -F '\t' '/^INSTANCE/ { print $2 }')
+}
+
+
+function invoke_ec2() {
+
+  decho 1 "Invoking $EC2_BINARY"
+  local cmdline=(
+  $EC2_BINARY
+  $AWS_COMMON_OPTIONS
+  "${@}"
+  )
+  echo "Command to run on ec2:"
+  echo "${cmdline[@]}"
+  "${cmdline[@]}"
+  local rc
+  rc=$?
+  if [ $rc != 0 ] ; then
+    exitonerror $rc "Unable to run command $EC2_BINARY."
+  fi
+}
+
+
+read_amazon_config $1/amazon.conf
+get_aws_instance
+shift
+shift
+shift
+invoke_ec2 "${@/INSTANCE/$aws_instance}"

From dc2f50107926df6869866fa517fc71cadd937d8b Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Mon, 18 Jun 2012 00:25:05 +0200
Subject: [PATCH 0868/2585] Initial and rudimentary support for creating amazon
 images from the vosa command line.  Not many options supported yet.

---
 usr/bin/vosa                                  | 27 +++++++++++++++----
 .../vizrt/vosa/commands/amazon_config_parser  | 12 ++++++---
 usr/share/vizrt/vosa/commands/ec2-cmd.sh      |  9 +++++--
 3 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index a5a086f9..d024fa84 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -700,11 +700,28 @@ function do_install() {
       echo "$instance_name is not enabled, enable it on this host first"
       exit 1
     fi
-    ${commands}/install.sh \
-      "$instance_dir" \
-      "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" \
-       2>&1 |
-       tee /var/log/vosa-install-$instance_name.log
+    if [ $aws -eq 1 ] ; then
+      mkdir "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" || exit 2
+      read_amazon_config $instance_dir/amazon.conf
+      # TODO: sanitize "required" variables
+      ${commands}/ec2-cmd.sh \
+        "$instance_dir" \
+        "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" \
+        run-instances \
+        ${amazon_config_image} \
+        ${amazon_config_type/#/--instance-type }  \
+        ${amazon_config_ssh_keypair/#/--key }  \
+        ${amazon_config_group[@]/#/--group } \
+        ${amazon_config_subnet/#/--subnet }
+
+        #${amazon_config_user_data/#/--user-data-file } \
+    else 
+      ${commands}/install.sh \
+        "$instance_dir" \
+        "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" \
+         2>&1 |
+         tee /var/log/vosa-install-$instance_name.log
+    fi
   }
 }
 
diff --git a/usr/share/vizrt/vosa/commands/amazon_config_parser b/usr/share/vizrt/vosa/commands/amazon_config_parser
index 07eef75a..46746517 100644
--- a/usr/share/vizrt/vosa/commands/amazon_config_parser
+++ b/usr/share/vizrt/vosa/commands/amazon_config_parser
@@ -7,6 +7,7 @@ amazon_config_certificate=
 amazon_config_user_data=
 amazon_config_region=
 amazon_config_availability_zone=
+amazon_config_image=
 
 
 function amazon_config_key() {
@@ -29,12 +30,15 @@ function amazon_config_availability_zone() {
   amazon_config_availability_zone=$1
 }
 
+function amazon_config_image() {
+  amazon_config_image=$1
+}
+
 # Handle arrays
 
-declare -a amazon_config_ssh_keys
-declare -a amazon_config_overlay
+declare -a amazon_config_group
 declare -a amazon_config_postinstall
 
-function amazon_config_postinstall() {
-  amazon_config_postinstall=( "${amazon_config_postinstall[@]}" "$1" )
+function amazon_config_group() {
+  amazon_config_group=( "${amazon_config_group[@]}" "$1" )
 }
diff --git a/usr/share/vizrt/vosa/commands/ec2-cmd.sh b/usr/share/vizrt/vosa/commands/ec2-cmd.sh
index 08000f6a..4f1a53a4 100755
--- a/usr/share/vizrt/vosa/commands/ec2-cmd.sh
+++ b/usr/share/vizrt/vosa/commands/ec2-cmd.sh
@@ -86,7 +86,9 @@ function read_amazon_config() {
 
 function get_aws_instance() {
   bootstatefile=$image/amazon.initialstate
-  aws_instance=$(awk < "$bootstatefile" -F '\t' '/^INSTANCE/ { print $2 }')
+  if [ -r $bootstatefile ] ; then
+    aws_instance=$(awk < "$bootstatefile" -F '\t' '/^INSTANCE/ { print $2 }')
+  fi
 }
 
 
@@ -100,7 +102,10 @@ function invoke_ec2() {
   )
   echo "Command to run on ec2:"
   echo "${cmdline[@]}"
-  "${cmdline[@]}"
+  "${cmdline[@]}" | tee $image/amazon.laststate
+  if [ $cmd == "run-instances" -a ! -e $bootstatefile ] ; then
+    cp $image/amazon.laststate $bootstatefile
+  fi
   local rc
   rc=$?
   if [ $rc != 0 ] ; then

From 2ab5d82f77535fb9c0acb89328d8dfa3f647554b Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Mon, 18 Jun 2012 00:33:29 +0200
Subject: [PATCH 0869/2585] support passing an ssh keypair, the instance type
 and subnet to new EC2 instances

---
 .../vizrt/vosa/commands/amazon_config_parser  | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/usr/share/vizrt/vosa/commands/amazon_config_parser b/usr/share/vizrt/vosa/commands/amazon_config_parser
index 46746517..7f00b51c 100644
--- a/usr/share/vizrt/vosa/commands/amazon_config_parser
+++ b/usr/share/vizrt/vosa/commands/amazon_config_parser
@@ -7,7 +7,10 @@ amazon_config_certificate=
 amazon_config_user_data=
 amazon_config_region=
 amazon_config_availability_zone=
+amazon_config_ssh_keypair=
 amazon_config_image=
+amazon_config_type=
+amazon_config_subnet=
 
 
 function amazon_config_key() {
@@ -30,15 +33,31 @@ function amazon_config_availability_zone() {
   amazon_config_availability_zone=$1
 }
 
+function amazon_config_ssh_keypair() {
+  amazon_config_ssh_keypair=$1
+}
+
 function amazon_config_image() {
   amazon_config_image=$1
 }
 
+function amazon_config_type() {
+  amazon_config_type=$1
+}
+
+function amazon_config_subnet() {
+  amazon_config_subnet=$1
+}
+
 # Handle arrays
 
 declare -a amazon_config_group
 declare -a amazon_config_postinstall
 
+function amazon_config_postinstall() {
+  amazon_config_postinstall=( "${amazon_config_postinstall[@]}" "$1" )
+}
+
 function amazon_config_group() {
   amazon_config_group=( "${amazon_config_group[@]}" "$1" )
 }

From 3b650c5a0e15132120117e4bc8b1eda5c882bf53 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Mon, 18 Jun 2012 15:14:27 +0200
Subject: [PATCH 0870/2585] Fixed a bug with kvm instances. Added disable
 command to remove a symlink (completeness). Updated documentation to match
 ec2 instance usage.  Added (yet unused) debug option.

---
 usr/bin/vosa | 41 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index d024fa84..e5a359c7 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -19,12 +19,16 @@ usage=0
 ### To add an option, add it to the optstring, as defined in getopts, in alphabetical order.
 ### Also add a function "option-x" where x is the option. $1 will be the option value, if any.
 ### set any variables needed to default values as globals first.
-OPTSTRING=":i:v:h"
+OPTSTRING=":i:v:hd"
 
 function option-h() {
   usage=1
 }
 
+function option-d() {
+  debug=$((debug + 1))
+}
+
 function option-i() {
   if [[ "${1}" =~ ^[-a-z0-9]*$ ]] ; then
     instance_dir=${available_dir}/$1
@@ -58,7 +62,6 @@ enabled_dir=$(readlink -f ${enabled_dir})
 
 
 function requires_instance_dir() {
-  
   if [ -z "$instance_dir" -o -z "${instance_name}" ] ; then
     echo "Instance is required"
     usage=1
@@ -67,6 +70,7 @@ function requires_instance_dir() {
 
   aws=0
   [ -r $instance_dir/amazon.conf ] && aws=1
+  return 0
 }
 function prohibits_instance_dir() {
   if [ ! -z "$instance_dir" -o ! -z "${instance_name}" ] ; then
@@ -344,7 +348,7 @@ function do_download() {
 ## Provides even more help.
 function do_longhelp() {
   cat <<EOF
-$0 is a command to manage virtual machines running under
+$(basename "$0") is a command to manage virtual machines running under
 the regime of Vizrt Online System Administration.
 
 "$0 status" gives you a quick overview of the VMs known
@@ -443,9 +447,13 @@ function verify_installation() {
 ##      if the instance is killed or dies for whatever reason other
 ##      than the "vosa stop" command, it will be labeled as "dead".
 ##  - pid (of the kvm instance) or instance-id (of an amazon VM)
+##      For kvm instances, the pid is printed.
+##      For ec2 instances, the instance-id and availability zone is
+##      printed, separated by a slash.
 ##  - uptime (of any alive instance)
 ##      Only shown for instances that are "alive".
 ##      uptime is shown in dd-hh:mm:ss format.
+##      AWS instances print the start date (TODO: fix this discrepancy)
 function do_status() {
   verify_installation
   if [ -z "$instance_dir" ] ; then
@@ -617,6 +625,33 @@ function do_enable() {
 }
 
 
+## Tells vosa that it should ignore an instance definition
+##
+## vosa -i <instance> disable
+##     Disables <instance> on this host.
+##
+## vosa will remove the symlink in /etc/vizrt/vosa/enabled.d/
+## pointing to "../available.d/<instance>".  This is all that is
+## required to disable an instance.
+##
+## An disabled instance can not be installed, but may be enabled
+## later.
+function do_disable() {
+  requires_instance_dir && {
+    if [ ! -d ${available_dir}/$instance_name ] ; then
+      echo "$instance_name is not an available instance"
+      exit 1
+    fi
+    if [ ! -L ${enabled_dir}/$instance_name ] ; then
+      echo "$instance_name is not enabled"
+      exit 1
+    fi
+    rm "${enabled_dir}/$instance_name" || exit 1
+    echo "$instance_name has been disabled"
+  }
+}
+
+
 
 ## Removes the installed image of an instance
 ##

From 5eb7d5f35d1485ffb579e974a82a5e138c7290df Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Mon, 18 Jun 2012 16:58:19 +0200
Subject: [PATCH 0871/2585] Made do_start use the generic ec2-cmd.sh. Made a
 determine-ip shellscript which will ask amazon what the public or private IP
 of a host is and generate an ssh.conf file.

---
 usr/bin/vosa                                  |   9 +-
 .../vizrt/vosa/commands/ec2-determine-ip.sh   |  79 ++++++++++++
 usr/share/vizrt/vosa/commands/ec2-start.sh    | 112 ------------------
 3 files changed, 87 insertions(+), 113 deletions(-)
 create mode 100755 usr/share/vizrt/vosa/commands/ec2-determine-ip.sh
 delete mode 100755 usr/share/vizrt/vosa/commands/ec2-start.sh

diff --git a/usr/bin/vosa b/usr/bin/vosa
index e5a359c7..52ef6c08 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -812,7 +812,14 @@ function do_start() {
       exit 1
     fi
     if [ $aws -eq 1 ] ; then
-      ${commands}/ec2-start.sh "$instance_dir" "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name"
+      ${commands}/ec2-cmd.sh \
+        "$instance_dir" \
+        "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" \
+        "start-instances" INSTANCE
+      # The word INSTANCE is replaced with the instance.
+      ${commands}/ec2-determine-ip.sh \
+        "$instance_dir" \
+        "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" \
     else
       ${commands}/boot.sh "$instance_dir" "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name"
     fi
diff --git a/usr/share/vizrt/vosa/commands/ec2-determine-ip.sh b/usr/share/vizrt/vosa/commands/ec2-determine-ip.sh
new file mode 100755
index 00000000..d5a527bf
--- /dev/null
+++ b/usr/share/vizrt/vosa/commands/ec2-determine-ip.sh
@@ -0,0 +1,79 @@
+#!/bin/bash
+
+# Determines which IP to use to access a newly started or booted amazon instance.
+
+# Expects two arguments, namely a directory or symlink to a directory which
+# contains a "vosa" configuration, and a second directory,
+# which is where statefiles can be stored, followed by the ec2 command
+# that should be executed, and any additional arguments.
+
+# Usually this command is executed from "/usr/bin/vosa -i somevm start"
+# or similar.
+
+config=$1
+image=$2
+
+have_read_amazon_config=0
+function read_amazon_config() {
+  [[ $have_read_amazon_config -eq 1 ]] && return
+  source $(dirname $0)/functions
+  source $(dirname $0)/amazon_config_parser
+  # Parse all amazon config items
+  parse_config_file $1 amazon_config_
+
+  unset AWS_COMMON_OPTIONS
+  AWS_COMMON_OPTIONS="${AWS_COMMON_OPTIONS} --private-key $amazon_config_key "
+  AWS_COMMON_OPTIONS="${AWS_COMMON_OPTIONS} --cert $amazon_config_certificate "
+  AWS_COMMON_OPTIONS="${AWS_COMMON_OPTIONS} --region $amazon_config_region "
+  have_read_amazon_config=1
+}
+
+
+read_amazon_config $config/amazon.conf
+
+
+statefile="${image}/amazon.state"
+
+if [ ! -w  "${statefile}" ] ; then
+  echo "Unable to write to ${statefile}... aborting"
+  exit 2
+fi
+
+for a in 1 2 3 4 5 6 7 8 9 10 ; do
+  output="$($(dirname $0)/ec2-cmd.sh \
+    "$config" \
+    "$image" \
+    "describe-instances" "INSTANCE")"
+
+  if [ ! -z "$output" ] ; then
+    echo "$output" > "$statefile"
+  fi
+
+  if [ "$amazon_config_ssh_access" == "public" ] ; then
+    ip_address=$(awk < "$statefile" -F '\t' '/^INSTANCE/ { print $17 }')
+  else
+    ip_address=$(awk < "$statefile" -F '\t' '/^INSTANCE/ { print $18 }')
+  fi
+  if [ ! -z "$ip_address" ] ; then
+    break;
+  fi
+  sleep 4;
+  continue;
+done
+
+if [ -z "$ip_address" ] ; then
+  echo "Unable to determine $amazon_config_ssh_access IP address for $(basename "$1")."
+  exit 2
+fi
+
+cat > $image/ssh.conf <<EOF
+Host guest
+  IdentityFile $amazon_config_ssh_private_key
+  HostName $ip_address
+  User ubuntu
+  BatchMode yes
+  UserKnownHostsFile $image/ssh_known_hosts
+  StrictHostKeyChecking no
+
+EOF
+
diff --git a/usr/share/vizrt/vosa/commands/ec2-start.sh b/usr/share/vizrt/vosa/commands/ec2-start.sh
deleted file mode 100755
index 3234ad77..00000000
--- a/usr/share/vizrt/vosa/commands/ec2-start.sh
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/bin/bash
-
-# Boots an amazon instance.
-
-# Expects two arguments, namely a directory or symlink to a directory which
-# contains a "vosa" configuration, and a second directory,
-# which is where statefiles can be stored.
-
-# Usually this command is executed from "/usr/bin/vosa -i somevm start"
-# or similar.
-
-if [ -z "$EC2_START_BINARY" ] ; then
-  EC2_START_BINARY=$(which 2>/dev/null ec2-start-instances) ||
-  EC2_START_BINARY=$(which 2>/dev/null ec2start)
-fi
-
-if [ -z "$EC2_START_BINARY" -o ! -x $EC2_START_BINARY ] ; then
-  echo "Unable to figure out where ec2-run-instances is installed."
-  echo "export EC2_START_BINARY to make it work."
-  exit 2
-fi
-
-debug=3
-
-function decho() {
-  if [ $debug -ge $1 ] ; then
-    echo "${@:2}"
-  fi
-}
-
-function exitonerror() {
-  rc=$1
-  if [ "$rc" != "0" ] ; then
-    echo "$2 (rc=$rc)"
-    exit 2
-  fi
-}
-
-
-config=$1
-image=$2
-
-if [ -z "$image" -o -z "$config" ] ; then
-  echo "You need to specify a config directory (e.g. /etc/vizrt/vosa/enabled.d/foo) "
-  echo "and a place to hold the installation (e.g. /usr/lib/vizrt/vosa/images/foo)"
-  echo "the former MUST exist and contain vosa configuration files"
-  echo "the latter MUST also exist, and contain amazon.initialstate etc"
-  exit 1
-fi
-
-# basic error checking
-if [ ! -d "$config" ] ; then
-  echo "Config directory $config isn't a directory."
-  exit 1
-fi
-
-if [ ! -d "$image" ] ; then
-  echo "image directory $image does not exist.  Can't continue."
-  exit 1
-fi
-
-# todo: verify that basename and image don't end with slashes...
-
-if [ "$(basename "$image")" != "$(basename "$config")" ] ; then
-  echo "$image and $config appear to try to name different VMs. Try using $(basename $config) instead."
-  exit 2
-fi
-
-
-have_read_amazon_config=0
-function read_amazon_config() {
-  [[ $have_read_amazon_config -eq 1 ]] && return
-  source $(dirname $0)/functions
-  source $(dirname $0)/amazon_config_parser
-  # Parse all amazon config items
-  parse_config_file $1 amazon_config_
-
-  unset AWS_COMMON_OPTIONS
-  AWS_COMMON_OPTIONS="${AWS_COMMON_OPTIONS} --private-key $amazon_config_key "
-  AWS_COMMON_OPTIONS="${AWS_COMMON_OPTIONS} --cert $amazon_config_certificate "
-  AWS_COMMON_OPTIONS="${AWS_COMMON_OPTIONS} --region $amazon_config_region "
-  have_read_amazon_config=1
-}
-
-function get_aws_instance() {
-  bootstatefile=$image/amazon.initialstate
-  aws_instance=$(awk < "$bootstatefile" -F '\t' '/^INSTANCE/ { print $2 }')
-}
-
-
-function boot_ec2() {
-
-  decho 1 "Starting the machine"
-  startupcmd=(
-  $EC2_START_BINARY
-  $AWS_COMMON_OPTIONS
-  $aws_instance
-  )
-  echo "Command to start this EC2 instance:"
-  echo "${startupcmd[@]}"
-  "${startupcmd[@]}"
-  local rc
-  rc=$?
-  if [ $rc != 0 ] ; then
-    exitonerror $rc "Unable to start EC2 :-/"
-  fi
-}
-
-
-read_amazon_config $1/amazon.conf
-get_aws_instance
-boot_ec2

From b981a080a2aa31888b5dacb35333f2dc213e4b46 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Mon, 18 Jun 2012 17:32:12 +0200
Subject: [PATCH 0872/2585] Determine IP after install _and_ start. Added
 generation of ssh.conf with private key. Fixed bug in statefile not existing
 during install.  vosa install followed by ssh works now.

---
 usr/bin/vosa                                  |  6 ++++
 .../vizrt/vosa/commands/amazon_config_parser  | 28 +++++++++++++------
 .../vizrt/vosa/commands/ec2-determine-ip.sh   |  7 ++++-
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 52ef6c08..646f4da1 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -744,12 +744,18 @@ function do_install() {
         "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" \
         run-instances \
         ${amazon_config_image} \
+        ${amazon_config_availability_zone/#/--availability-zone }  \
         ${amazon_config_type/#/--instance-type }  \
         ${amazon_config_ssh_keypair/#/--key }  \
         ${amazon_config_group[@]/#/--group } \
         ${amazon_config_subnet/#/--subnet }
 
         #${amazon_config_user_data/#/--user-data-file } \
+
+      ${commands}/ec2-determine-ip.sh \
+        "$instance_dir" \
+        "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" \
+
     else 
       ${commands}/install.sh \
         "$instance_dir" \
diff --git a/usr/share/vizrt/vosa/commands/amazon_config_parser b/usr/share/vizrt/vosa/commands/amazon_config_parser
index 7f00b51c..5f9e8960 100644
--- a/usr/share/vizrt/vosa/commands/amazon_config_parser
+++ b/usr/share/vizrt/vosa/commands/amazon_config_parser
@@ -2,15 +2,17 @@
 # e.g. parsing a config file
 
 
-amazon_config_key=
-amazon_config_certificate=
-amazon_config_user_data=
-amazon_config_region=
-amazon_config_availability_zone=
-amazon_config_ssh_keypair=
-amazon_config_image=
-amazon_config_type=
-amazon_config_subnet=
+unset amazon_config_key
+unset amazon_config_certificate
+unset amazon_config_user_data
+unset amazon_config_region
+unset amazon_config_availability_zone
+unset amazon_config_ssh_keypair
+unset amazon_config_ssh_access
+unset amazon_config_ssh_private_key
+unset amazon_config_image
+unset amazon_config_type
+unset amazon_config_subnet
 
 
 function amazon_config_key() {
@@ -37,6 +39,14 @@ function amazon_config_ssh_keypair() {
   amazon_config_ssh_keypair=$1
 }
 
+function amazon_config_ssh_access() {
+  amazon_config_ssh_access=$1
+}
+
+function amazon_config_ssh_private_key() {
+  amazon_config_ssh_private_key=$1
+}
+
 function amazon_config_image() {
   amazon_config_image=$1
 }
diff --git a/usr/share/vizrt/vosa/commands/ec2-determine-ip.sh b/usr/share/vizrt/vosa/commands/ec2-determine-ip.sh
index d5a527bf..14db60bb 100755
--- a/usr/share/vizrt/vosa/commands/ec2-determine-ip.sh
+++ b/usr/share/vizrt/vosa/commands/ec2-determine-ip.sh
@@ -34,11 +34,16 @@ read_amazon_config $config/amazon.conf
 
 statefile="${image}/amazon.state"
 
-if [ ! -w  "${statefile}" ] ; then
+if [ ! -w  "${image}" ] ; then
   echo "Unable to write to ${statefile}... aborting"
   exit 2
 fi
 
+if [ -r ${statefile} -a ! -w  "${statefile}" ] ; then
+  echo "${statefile} exists but is not writable. aborting"
+  exit 2
+fi
+
 for a in 1 2 3 4 5 6 7 8 9 10 ; do
   output="$($(dirname $0)/ec2-cmd.sh \
     "$config" \

From 68a4bf39cb0470cab48f2ce014d3e4cf77db88d3 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Mon, 18 Jun 2012 17:51:50 +0200
Subject: [PATCH 0873/2585] Added support for user-data again

---
 usr/bin/vosa | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 646f4da1..4fe7f3f4 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -748,9 +748,9 @@ function do_install() {
         ${amazon_config_type/#/--instance-type }  \
         ${amazon_config_ssh_keypair/#/--key }  \
         ${amazon_config_group[@]/#/--group } \
+        ${amazon_config_user_data/#/--user-data-file } \
         ${amazon_config_subnet/#/--subnet }
 
-        #${amazon_config_user_data/#/--user-data-file } \
 
       ${commands}/ec2-determine-ip.sh \
         "$instance_dir" \

From 67dee5c20ecf53b666ca3b6af82102d320c18736 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Mon, 18 Jun 2012 17:57:35 +0200
Subject: [PATCH 0874/2585] Support postinst for "running" ec2 instances

---
 usr/bin/vosa | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 4fe7f3f4..1855b348 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -783,8 +783,8 @@ function do_postinst() {
       echo "$instance_name is not installed. Install before running any postinst."
       exit 1
     fi
-    if [ "${status[3]}" != "alive" ] ; then
-      echo "$instance_name is not alive, start it first."
+    if [ "${status[3]}" != "alive" -a "${status[3]}" != "running" ] ; then
+      echo "$instance_name is not alive/running, start it first."
       exit 1
     fi
     ${commands}/postinst.sh \

From ed838efcf33d880ef52cca04ec016b4c962d59a0 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Tue, 19 Jun 2012 00:11:44 +0200
Subject: [PATCH 0875/2585] Fixed postinstall hook to wait correctly for any
 "boot-finished" file.  Fixed postinstall hook to ssh as the (default) user
 specified in ssh.conf.

---
 usr/share/vizrt/vosa/post-install-hooks/permit-root-login.sh | 5 +++++
 usr/share/vizrt/vosa/post-install-hooks/wait-for-ssh.sh      | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100755 usr/share/vizrt/vosa/post-install-hooks/permit-root-login.sh

diff --git a/usr/share/vizrt/vosa/post-install-hooks/permit-root-login.sh b/usr/share/vizrt/vosa/post-install-hooks/permit-root-login.sh
new file mode 100755
index 00000000..ec5b7dab
--- /dev/null
+++ b/usr/share/vizrt/vosa/post-install-hooks/permit-root-login.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# 0wn the machine lol
+ssh -F $2/ssh.conf guest 'sudo cp /home/ubuntu/.ssh/authorized_keys /root/.ssh/'
+
diff --git a/usr/share/vizrt/vosa/post-install-hooks/wait-for-ssh.sh b/usr/share/vizrt/vosa/post-install-hooks/wait-for-ssh.sh
index 2d530097..33b751de 100755
--- a/usr/share/vizrt/vosa/post-install-hooks/wait-for-ssh.sh
+++ b/usr/share/vizrt/vosa/post-install-hooks/wait-for-ssh.sh
@@ -3,7 +3,7 @@
 echo -n "Waiting for ssh access..."
 for a in $(seq 1 90) ; do
   echo -n .
-  ssh -q -F $2/ssh.conf root@guest id > /dev/null
+  ssh -q -F $2/ssh.conf guest id > /dev/null
   if [ $? == 0 ] ; then
     pid=1
     echo
@@ -13,7 +13,7 @@ for a in $(seq 1 90) ; do
     while [ "$pid" != 0 ] ;
     do
       echo -n .
-      ssh -q -F $2/ssh.conf root@guest ls /var/lib/cloud/instances/nocloud/boot-finished > /dev/null 2>&1
+      ssh -q -F $2/ssh.conf guest ls /var/lib/cloud/instances/*/boot-finished > /dev/null 2>&1
       pid=$?
       sleep 1;
     done

From 4186059981a086fc171a5866551eea78ea1245e8 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Tue, 19 Jun 2012 00:47:24 +0200
Subject: [PATCH 0876/2585] Made ec2-cmd return its error codes when
 ec2-foo-bar commands fail for whatever reasons.

---
 usr/share/vizrt/vosa/commands/ec2-cmd.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/usr/share/vizrt/vosa/commands/ec2-cmd.sh b/usr/share/vizrt/vosa/commands/ec2-cmd.sh
index 4f1a53a4..764b81db 100755
--- a/usr/share/vizrt/vosa/commands/ec2-cmd.sh
+++ b/usr/share/vizrt/vosa/commands/ec2-cmd.sh
@@ -34,7 +34,7 @@ function exitonerror() {
   rc=$1
   if [ "$rc" != "0" ] ; then
     echo "$2 (rc=$rc)"
-    exit 2
+    exit $rc
   fi
 }
 
@@ -100,14 +100,17 @@ function invoke_ec2() {
   $AWS_COMMON_OPTIONS
   "${@}"
   )
+  local rc
   echo "Command to run on ec2:"
   echo "${cmdline[@]}"
-  "${cmdline[@]}" | tee $image/amazon.laststate
+  echo "# date $(date --iso)" >> /var/log/vosa-$(basename "$1")-ec2.log
+  echo "${cmdline[@]}" >> /var/log/vosa-$(basename "$1")-ec2.log
+  local laststate="$("${cmdline[@]}")"
+  rc=$?
+  echo "${laststate}" | tee $image/amazon.laststate
   if [ $cmd == "run-instances" -a ! -e $bootstatefile ] ; then
     cp $image/amazon.laststate $bootstatefile
   fi
-  local rc
-  rc=$?
   if [ $rc != 0 ] ; then
     exitonerror $rc "Unable to run command $EC2_BINARY."
   fi

From 03e3bc4883b2a0da075188f9c8ec33a5d3416523 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Tue, 19 Jun 2012 00:48:25 +0200
Subject: [PATCH 0877/2585] Implemented uninstall (i.e. terminate) for amazon
 instances.

---
 usr/bin/vosa | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 1855b348..6dc37e4b 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -657,6 +657,7 @@ function do_disable() {
 ##
 ## This deletes the contents of the directory
 ## /var/lib/vizrt/vosa/images/<instance>/ if it exists.
+## An amazon backed instance is terminated and cannot be recovered.
 ##
 ## Removing the installed image of an instance makes it impossible to
 ## start the instance unless it is (re)installed later.  Uninstalling
@@ -666,6 +667,12 @@ function do_disable() {
 ## and it will be possible to restore an old backup by manually moving
 ## the backup directory back into /var/lib/vizrt/vosa/images/
 ##
+## Amazon EC2 instances will be completely lost, as the instances are
+## terminated, meaning they go away and cannot be revived.
+## If an instance has "termination protection" turned on, then uninstalling
+## this way will not work.  Enable termination protection to make it
+## impossible to accidentally uninstall a valuable image.
+##
 ## It is not possible to uninstall an instance that is running, or
 ## that _should_ be running (i.e. if a .pid file exists).
 ##
@@ -685,7 +692,7 @@ function do_uninstall() {
       exit 1
     fi
     local status=( $(really_do_status $instance_dir) )
-    if [ "${status[3]}" == "alive" ] ; then
+    if [ "${status[3]}" == "alive" -a "${status[3]}" != "running" ] ; then
       echo "$instance_name is alive. Stop it first. Exiting."
       exit 1
     fi
@@ -696,6 +703,14 @@ function do_uninstall() {
     local imgdir=$(readlink -f ${instance_dir}/../../../../../var/lib/vizrt/vosa/images/$instance_name/)
     local backupdir="/var/backup/vizrt/vosa/$instance_name"
     local backupparent="/var/backup/vizrt/vosa"
+    if [ $aws -eq 1 ] ; then
+      ${commands}/ec2-cmd.sh \
+        "$instance_dir" \
+        "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" \
+        "terminate-instances" "INSTANCE" || exit $?
+      # If the terminate-instances command fails, don't remove the instance directory
+      # But what if it's terminated twice?
+    fi
     if [ ! -z "$imgdir" -a -d "$imgdir" ] ; then
       if [ -w "$backupparent" ] ; then
         # todo: rotate a few times?

From 206866403cb2236f774e6712927f1cc959f081fc Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Tue, 19 Jun 2012 01:17:54 +0200
Subject: [PATCH 0878/2585] Fixed uninstall to wait for an instance to not be
 running

---
 usr/bin/vosa | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 6dc37e4b..e5b7d153 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -692,7 +692,7 @@ function do_uninstall() {
       exit 1
     fi
     local status=( $(really_do_status $instance_dir) )
-    if [ "${status[3]}" == "alive" -a "${status[3]}" != "running" ] ; then
+    if [ "${status[3]}" == "alive" -o "${status[3]}" == "running" ] ; then
       echo "$instance_name is alive. Stop it first. Exiting."
       exit 1
     fi

From 4c550deedbd77e5d83899bed4faba7332a45cff4 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Tue, 19 Jun 2012 01:27:42 +0200
Subject: [PATCH 0879/2585] Tried more to get the return code of the ec2
 command to bubble out to the shell.

---
 usr/share/vizrt/vosa/commands/ec2-cmd.sh | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/usr/share/vizrt/vosa/commands/ec2-cmd.sh b/usr/share/vizrt/vosa/commands/ec2-cmd.sh
index 764b81db..253a69db 100755
--- a/usr/share/vizrt/vosa/commands/ec2-cmd.sh
+++ b/usr/share/vizrt/vosa/commands/ec2-cmd.sh
@@ -12,12 +12,19 @@
 
 cmd=$3
 
+if [ -z "$cmd" ] ; then
+  echo "Three parameters are required, of which the third one is the"
+  echo "name of the ec2-prefixed command to run, minus the ec2-prefix"
+  echo "for example 'run-instances' or 'describe-instances'."
+  exit 3
+fi
+
 if [ -z "$EC2_BINARY" ] ; then
   EC2_BINARY=$(which 2>/dev/null ec2-$cmd)
 fi
 
-if [ -z "$EC2_BINARY" -o ! -x $EC2_BINARY ] ; then
-  echo "Unable to figure out where ec2-run-instances is installed."
+if [ -z "$EC2_BINARY" -o ! -x "$EC2_BINARY" ] ; then
+  echo "Unable to figure out where ec2-$cmd is installed."
   echo "export EC2_BINARY to make it work."
   exit 2
 fi
@@ -100,19 +107,20 @@ function invoke_ec2() {
   $AWS_COMMON_OPTIONS
   "${@}"
   )
-  local rc
+  rc=1
   echo "Command to run on ec2:"
   echo "${cmdline[@]}"
-  echo "# date $(date --iso)" >> /var/log/vosa-$(basename "$1")-ec2.log
-  echo "${cmdline[@]}" >> /var/log/vosa-$(basename "$1")-ec2.log
-  local laststate="$("${cmdline[@]}")"
+  echo "# date $(date --iso)" >> /var/log/vosa-$(basename "$image")-ec2.log
+  echo "${cmdline[@]}" >> /var/log/vosa-$(basename "$image")-ec2.log
+  laststate="$("${cmdline[@]}" 2>> /var/log/vosa-$(basename "$image")-ec2.log)" 
   rc=$?
+  echo "# return code $rc, $(echo -n "$laststate" | wc -c) bytes output" >> /var/log/vosa-$(basename "$image")-ec2.log
   echo "${laststate}" | tee $image/amazon.laststate
   if [ $cmd == "run-instances" -a ! -e $bootstatefile ] ; then
     cp $image/amazon.laststate $bootstatefile
   fi
   if [ $rc != 0 ] ; then
-    exitonerror $rc "Unable to run command $EC2_BINARY."
+    exitonerror $rc "$EC2_BINARY returned with error."
   fi
 }
 
@@ -123,3 +131,4 @@ shift
 shift
 shift
 invoke_ec2 "${@/INSTANCE/$aws_instance}"
+

From b6df0798b1f22c9dd38b8ad1a3b8f34ef7daa36f Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Tue, 19 Jun 2012 12:22:09 +0200
Subject: [PATCH 0880/2585] Updated documentation to make it match amazon based
 instances. Added amazon skeleton with documented configuration.

---
 usr/bin/vosa                       | 130 +++++++++++++++++++++++++++--
 usr/share/doc/vizrt/vosa-guide.org |  93 ++++++++++++++++-----
 2 files changed, 197 insertions(+), 26 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index e5b7d153..60937a19 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -101,9 +101,9 @@ EOF
 function do_init() {
   mkdir -p /etc/vizrt/vosa/available.d || exit 2
   mkdir -p /etc/vizrt/vosa/enabled.d || exit 2
-  mkdir -p /etc/vizrt/vosa/skeleton || exit 2
-  if [ ! -r /etc/vizrt/vosa/skeleton/install.conf ] ; then
-    cat > /etc/vizrt/vosa/skeleton/install.conf <<EOF
+  mkdir -p /etc/vizrt/vosa/skeleton-kvm || exit 2
+  if [ ! -r /etc/vizrt/vosa/skeleton-kvm/install.conf ] ; then
+    cat > /etc/vizrt/vosa/skeleton-kvm/install.conf <<EOF
 # Installation time configuration
 
 # The lines in this files are parsed in-order.  The bottom most
@@ -199,8 +199,8 @@ postinstall make-a-motd.sh
 EOF
   fi
 
-  if [ ! -r /etc/vizrt/vosa/skeleton/boot.conf ] ; then
-    cat > /etc/vizrt/vosa/skeleton/boot.conf <<EOF
+  if [ ! -r /etc/vizrt/vosa/skeleton-kvm/boot.conf ] ; then
+    cat > /etc/vizrt/vosa/skeleton-kvm/boot.conf <<EOF
 #-----------------------------------------------------------------------#
 # Run-time configuration options
 #-----------------------------------------------------------------------#
@@ -237,6 +237,126 @@ EOF
   #include /etc/vizrt/vosa/common.conf
 
 
+  mkdir -p /etc/vizrt/vosa/skeleton-amazon || exit 2
+  if [ ! -r /etc/vizrt/vosa/skeleton-amazon/amazon.conf ] ; then
+    cat > /etc/vizrt/vosa/skeleton-amazon/amazon.conf <<EOF
+# This file defines an EC2 amazon instance.
+
+# The lines in this files are parsed in-order.  The bottom most
+# values override top ones of the same name, unless the stanza has
+# been defined as having multiple values, in which case the values
+# will be appended in the order they appear in the file.
+
+
+# EC2 SIGNING KEYS --------------------------------------------
+# Private key.  The file should only be readable by the user
+# designated to run the vosa commands.
+#
+# To create a private key, use the following command:
+#   openssl genrsa -out private-key.pem 1024
+#
+key /var/lib/vizrt/vosa/credentials/private-key.pem
+
+# Public certificate.  The certificate must be uploaded to amazon. All
+# interactions with the server will be signed with the private key; and
+# Amazon will use the certificate to verify that the request is legitimate.
+#
+# To create the certificate, use the following commands:
+#   openssl req -new -key private-key.pem -out certificate-request.pem
+#   openssl x509 -req -in signing-request.pem -signkey private-key.pem
+#            -out certificate.pem
+#
+certificate /var/lib/vizrt/vosa/credentials/certificate.pem
+
+
+# REGION ------------------------------------------------------
+# The amazon region to connect to, and the availability zone to deploy
+# this instance to.
+#
+region eu-west-1
+
+# If you don't specify the availability zone, a random one will be chosen by
+# Amazon.  For high availability, it is important to control the availability
+# zones of the different machines.
+#
+availability_zone eu-west-1b
+
+
+# INSTANCE PARAMETERS -----------------------------------------
+# the AMI ID of the machine to use.  vosa works with uec images.
+# See http://uec-images.ubuntu.com/releases/ for a list of the AMIs
+# Use an AMI ID corresponding to the region in question.
+#
+image ami-81c5fdf5
+
+# Machine type.  e.g. t1.micro, m1.small, m1.medium, m1.large, m1.xlarge,
+# c1.medium, c1.xlarge, m2.xlarge, m2.2xlarge, m2.4xlarge, cc1.4xlarge,
+# cg1.4xlarge, cc2.8xlarge.  See http://aws.amazon.com/ec2/instance-types/
+# Amazon defaults to m1.small.  Certain types might not work in certain
+# regions, or in a VPC subnet (e.g. t1.micro doesn't work in a VPC).
+#
+# type m1.small
+
+# Security groups. To add newly created instances to a specific security
+# group other than the "default" group, specify it here.
+#
+# This option may be specified many times, in order to add it to many
+# groups.
+#
+# group internet
+
+# VPC Subnet ID. If you're using a VPC, you need to specify the subnet
+# ID of the subnet you wish this instance to be deployed into.  If you
+# don't supply a subnet, the instance will be deployed "on the internet"
+# and be given one of your precious internet addresses.
+#
+# subnet subnet-43890
+
+
+# USER DATA ---------------------------------------------------
+# Specify a user data file that will be specified on installation.
+# The file should be in the form of a user-data file supported by
+# the AMI chosen
+#
+# user_data /etc/vizrt/vosa/user-data/puppet-client.txt
+# user_data /usr/share/vizrt/vosa/user-data/so-something.txt
+
+
+# SSH ACCESS --------------------------------------------------
+# SSH Keypair
+# The name of the SSH key to use to seed the "ubuntu" user.  The key
+# pair must already be uploaded to the Amazon account to the region
+# in question
+#
+ssh_keypair control-key
+
+# Use public or private IP to access the machine using SSH? The machine
+# running vosa uses ssh to access the newly created instance, and needs
+# to be told if it should use the public or private IP when attempting
+# to access it using SSH.
+#
+# If the machine running vosa is co-located with the newly created instance
+# (e.g. they are in the same subnet, or in the same VPC with a functioning
+# routing table) then use "private".  If the machine running vosa is _not_
+# able to use an instance's private IP to access it, then its public IP must
+# be used.  If a machine doesn't get a public IP then setting this to public
+# will not work.
+#
+# Defaults to private IP
+#
+# ssh_access public
+
+# SSH identity.  An SSH private key that should be used by postinstall hooks
+# in order to gain access to the "ubuntu" or "root" user.  Typically, this
+# is the private key which corresponds to the "ssh_keypair" specified above.
+# This allows vosa to ssh directly into the guest and install software.
+#
+# This file should be in a form suitable for the "-i" option to ssh(1).
+#
+ssh_private_key /var/lib/vizrt/vosa/credentials/ssh-private-key.pem
+
+EOF
+  fi
   mkdir -p /etc/vizrt/vosa/user-data || exit 2
   if [ ! -r /etc/vizrt/vosa/user-data/puppetmaster.pp ] ; then
     cat > /etc/vizrt/vosa/user-data/puppetmaster.pp <<EOF
diff --git a/usr/share/doc/vizrt/vosa-guide.org b/usr/share/doc/vizrt/vosa-guide.org
index 0c271d2d..6750b745 100644
--- a/usr/share/doc/vizrt/vosa-guide.org
+++ b/usr/share/doc/vizrt/vosa-guide.org
@@ -48,19 +48,32 @@ The Vosa scripts do just that.
 
 A short definition file tells vosa what base image to start with;
 this is an Ubuntu Enterprise Cloud image, but in theory other image
-types could be supported.  The file also provides it an IP address
-and the machine's time zone, and so on.  Most importantly, these
-files also tell vosa what to do with the virtual machine once it
-has booted, so-called "post install hooks".  Each of these are
-executed when the "first boot" has completed.  These hooks run
-only the first time the virtual machine has booted, and should be
-written in such a way that they end up with a production ready
-system that can go straight into production.
-
-The machines can be stopped, started, and so on, and since vosa
-relies on simple kvm, you can access the kvm monitor or vnc if you
-want to.  Vosa also sets up throw-away ssh keys that the host uses
-to interact with the guest during the first boot.
+types could be supported.  The file also provides networking
+parameters and so on.  Most importantly, these files also tell vosa
+what to do with the virtual machine once it has booted, so-called
+"post install hooks".  Each of these are executed when the "first
+boot" has completed.  These hooks run only the first time the
+virtual machine has booted, and should be written in such a way that
+they end up with a production ready system that can go straight into
+production.
+
+** Amazon or Physical?
+
+Vosa supports two flavours of virtualization, namely one based on
+Amazon's excellent Elastic Compute Cloud (EC2), and one based on the
+excellent Open Source Kernel-based Virtual Machine (KVM).  Vosa aims
+to blur the boundaries of these two types of virtualization, making
+it possible to use the same technologies for installing software.
+The possibility of using local hardware makes it possible to run a
+cheap stack of virtual machines using the same method of installing
+software as the production environment.  Developers can also have a
+local "stack" of virtual machines, and not have to rely on AWS for
+virtualization.
+
+In the absence of EC2 metadata service that's available to real
+cloud instances, the kvm flavour of virtualization allows some
+additional perks, like vnc support, and it generates "throw-away"
+SSH keys which are used for a single kvm instance.
 
 ** What can I do with this?
 
@@ -81,8 +94,9 @@ vosa.
 
 ** Requirements:
 
-In order to benefit from vosa, you need the following:
+In order to benefit from running vosa with kvm, you need the following
 
+- A physical machine that supports virtualization
 - kvm or qemu-kvm
 - genisoimage
 - nc
@@ -93,7 +107,45 @@ In order to benefit from vosa, you need the following:
 In theory, it should be possible to script this too, or to get e.g.
 puppet to do this for us.  Watch this space!
 
-** Setup
+In order to benefit from running vosa with ec2, you need the following
+
+- Amazon account
+- ec2-api-tools
+- A named SSH keypair
+- Signing key
+
+** Setting up vosa on EC2
+
+Commonly, setting up vosa in the cloud entails first making an EC2
+instance that will act as "the control server".  vosa will typically
+be installed there.
+
+   : apt-get install vosa
+
+The vosa command should now work (to a certain extent)
+
+   : vosa help
+   : vosa commands
+   : vosa longhelp | less
+
+To make vosa usable, you need to initialize it:
+
+   : sudo vosa init
+
+This will create the /etc/vizrt/vosa directory structure, and a
+skeleton of a virtual machine definition.
+
+   : sudo cp -r /etc/vizrt/vosa/skeleton-amazon /etc/vizrt/vosa/available.d/my-first-vosa
+
+Configure the my-first-vosa/amazon.conf file as you see fit.  This would include:
+
+- Generate (or re-use) an SSH private key, and uploading the public key to Amazon
+- Generate (or re-use) an EC2 API signing key, and uploading the certificate to Amazon
+- Create a VPC and subnet (if you want to deploy the instances to a VPC subnet)
+
+Details on these steps are outlined in the sample amazon.conf file.
+
+** Setting up vosa on bare metal (kvm)
 
 Setting up vosa entails a few manual installation steps.  Among other
 things it will
@@ -108,8 +160,7 @@ things it will
 So without further ado, let's get started.  First of all, we need to
 onstall the vosa command itself and its required libraries:
 
-   : ln -s $PWD/usr/bin/vosa /usr/bin/vosa
-   : ln -s $PWD/usr/share/vizrt/ /usr/share/vizrt
+   : apt-get install vosa
 
 The vosa command should now work (to a certain extent)
 
@@ -171,7 +222,7 @@ install.conf) in a directory.  "vosa init" has already created a
 documented skeleton which you can customize as you see fit.
 
    : mkdir /etc/vizrt/vosa/available.d/my-first-vm &&
-   : cp /etc/vizrt/vosa/skeleton/* /etc/vizrt/vosa/available.d/my-first-vm/
+   : cp /etc/vizrt/vosa/skeleton-kvm/* /etc/vizrt/vosa/available.d/my-first-vm/
    : vi /etc/vizrt/vosa/available.d/my-first-vm/*
 
 Note that the name you choose ("my-first-vm") must be a valid
@@ -210,7 +261,7 @@ the name of the virtual machine; in this case "my-first-vm"
 
 When it's done you can SSH into the system:
 
-   : ssh -F /var/lib/vizrt/vosa/my-first-vm/ssh.conf root@guest
+   : ssh -F /var/lib/vizrt/vosa/my-first-vm/ssh.conf guest
 
 Not that you should need to do that, of course.
 
@@ -224,8 +275,8 @@ To make this possible, vosa supplies a post-install hook. This hook:
 - configures the puppet master to use hostnames instead of its DNS
   name for certificates
 - configures a self signed certificate for all guests (mainly to avoid
-  having to sign or auto-sign the puppets, since that would be
-  problematic when a puppet happens to be re-installed)
+  having to sign or auto-sign the puppets, since that is problematic
+  when a machine is re-installed)
 - creates vosa post-installation hook to set up a pre-authenticated
   puppet in /etc/vizrt/vosa/puppet/<puppetmaster-name>-client.sh
 

From cababc0033446ce879323f43e2aa5875b9c08f93 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Wed, 20 Jun 2012 00:00:09 +0200
Subject: [PATCH 0881/2585] Fixed bug where postinst wait-for-ssh would timeout
 if vosa was itself run in the cloud.

---
 usr/share/vizrt/vosa/post-install-hooks/wait-for-ssh.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/vizrt/vosa/post-install-hooks/wait-for-ssh.sh b/usr/share/vizrt/vosa/post-install-hooks/wait-for-ssh.sh
index 33b751de..a790be33 100755
--- a/usr/share/vizrt/vosa/post-install-hooks/wait-for-ssh.sh
+++ b/usr/share/vizrt/vosa/post-install-hooks/wait-for-ssh.sh
@@ -13,7 +13,7 @@ for a in $(seq 1 90) ; do
     while [ "$pid" != 0 ] ;
     do
       echo -n .
-      ssh -q -F $2/ssh.conf guest ls /var/lib/cloud/instances/*/boot-finished > /dev/null 2>&1
+      ssh -q -F $2/ssh.conf guest ls /var/lib/cloud/instances/\*/boot-finished > /dev/null 2>&1
       pid=$?
       sleep 1;
     done

From ac4082270b55ac86b0a4eb37df00e503de538236 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Mon, 25 Jun 2012 10:28:08 +0200
Subject: [PATCH 0882/2585] Made usr/bin/vosa exit the vosa command if they
 exit with any errors.

---
 usr/bin/vosa | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 60937a19..6c143af7 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -897,6 +897,10 @@ function do_install() {
         "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" \
          2>&1 |
          tee /var/log/vosa-install-$instance_name.log
+      local rc=${PIPESTATUS[0]}
+      if [ "$rc" != "0" ] ; then
+        exit $rc
+      fi
     fi
   }
 }
@@ -927,6 +931,10 @@ function do_postinst() {
       "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" \
        2>&1 |
        tee -a /var/log/vosa-postinst-$instance_name.log
+    local rc=${PIPESTATUS[0]}
+    if [ "$rc" != "0" ] ; then
+      exit $rc
+    fi
   }
 }
 
@@ -962,7 +970,7 @@ function do_start() {
         "$instance_dir" \
         "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" \
     else
-      ${commands}/boot.sh "$instance_dir" "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name"
+      ${commands}/boot.sh "$instance_dir" "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" || exit $?
     fi
   }
 }

From dd2af203d7c1c27954dbc1df0dc60682141555ee Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Mon, 25 Jun 2012 10:28:34 +0200
Subject: [PATCH 0883/2585] Made install.sh return correct response code.

---
 usr/share/vizrt/vosa/commands/install.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/usr/share/vizrt/vosa/commands/install.sh b/usr/share/vizrt/vosa/commands/install.sh
index a8f10d74..ff3ec5d0 100755
--- a/usr/share/vizrt/vosa/commands/install.sh
+++ b/usr/share/vizrt/vosa/commands/install.sh
@@ -213,5 +213,7 @@ create_overlay
 # chain to boot.sh to actually start the image.
 $(dirname $0)/boot.sh $1 $2
 
+rc=$?
 delete_overlay
 
+exit $rc

From b7cc29cc85b0d375d3bd754b749c658c0a4bdea0 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Mon, 25 Jun 2012 11:52:21 +0200
Subject: [PATCH 0884/2585] Fixed stupid whitespace bug

---
 usr/bin/vosa | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 6c143af7..6deff27d 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -970,7 +970,7 @@ function do_start() {
         "$instance_dir" \
         "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" \
     else
-      ${commands}/boot.sh "$instance_dir" "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" || exit $?
+      ${commands}/boot.sh "$instance_dir" "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" || exit $?
     fi
   }
 }

From 85318406603a1c08575ecc228fc213b4dca21b7a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 25 Jun 2012 16:31:59 +0200
Subject: [PATCH 0885/2585] - changed the default package pool to unstable
 until we've got sane   stable packages.

  As always, this can be overrriden with:

     fai_apt_vizrt_pool=stable
---
 usr/sbin/ece-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 14d308aa..7c53aa72 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -219,7 +219,7 @@ function install_common_os_packages()
   if [ $on_debian_or_derivative -eq 1 ]; then
     curl -s http://apt.vizrt.com/archive.key 2>> $log | \
       apt-key add - 1>> $log 2>> $log
-    local package_pool=${fai_apt_vizrt_pool-stable}
+    local package_pool=${fai_apt_vizrt_pool-unstable}
     add_apt_source "deb http://apt.vizrt.com ${package_pool} main"
 
     install_packages_if_missing escenic-common-scripts

From 58e979d36cc4c3141370615a6e3d8a6a780eb573 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@geronimo>
Date: Mon, 25 Jun 2012 17:29:43 +0200
Subject: [PATCH 0886/2585] - the search server related JNDI variables were not
 set up for the   all-in-one profile. This has now been fixed. This closes #71

  Thanks to @racoonlab for raising this issue.
---
 usr/share/escenic/ece-scripts/ece-install.d/app-server.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 4dced028..cf09232e 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -352,7 +352,8 @@ EOF
 EOF
   fi
 
-  if [ $install_profile_number -eq $PROFILE_SEARCH_SERVER ]; then
+  if [ $install_profile_number -eq $PROFILE_SEARCH_SERVER -o \
+    $install_profile_number -eq $PROFILE_ALL_IN_ONE ]; then
     cat >> $tomcat_base/conf/context.xml <<EOF
   <Environment
       name="escenic/indexer-webservice"

From ea9ff4014ba5b5258c22515ab855b7909c95a1b2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 26 Jun 2012 12:24:16 +0200
Subject: [PATCH 0887/2585] - added new configuration parameter
 fai_db_schema_only, when set to 1,   the SQL scripts from ECE & plugins + EAE
 are not run. #74 - changing the handling of EAE SQL scripts to see if it
 makes a   difference, not tested yet. #68

---
 usr/sbin/drop-and-create-ecedb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/usr/sbin/drop-and-create-ecedb b/usr/sbin/drop-and-create-ecedb
index 86627622..af347ac5 100644
--- a/usr/sbin/drop-and-create-ecedb
+++ b/usr/sbin/drop-and-create-ecedb
@@ -145,6 +145,12 @@ history
 function create_ecedb()
 {
   create_schema
+
+  if [ ${fai_db_schema_only-0} -eq 1 ]; then
+    print_and_log "fai_db_schema_only=1, not running the ECE & plugin SQL files"
+    return
+  fi
+  
   run_db_scripts $ece_home/database/$db_product
 
   if [ -e $ece_home/plugins ]; then
@@ -153,7 +159,7 @@ function create_ecedb()
     done
     # EAE, if there's more than one version of EAE plugin, the latest
     # one will be used.
-    for el in $(find -L $ece_home/plugins -name eae-${db_product}.sql | \
+    for el in $(find $escenic_root_dir -name eae-${db_product}.sql | \
       grep -v upgrade | \
       sort -r | \
       head -1); do

From b4130c2a544e7f88215228cf12da24ec709f8676 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 26 Jun 2012 12:27:13 +0200
Subject: [PATCH 0888/2585] - changed the user feedback given when the
 fai_db_schema_only is set.

---
 usr/sbin/drop-and-create-ecedb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/drop-and-create-ecedb b/usr/sbin/drop-and-create-ecedb
index af347ac5..c5de61f9 100644
--- a/usr/sbin/drop-and-create-ecedb
+++ b/usr/sbin/drop-and-create-ecedb
@@ -147,7 +147,7 @@ function create_ecedb()
   create_schema
 
   if [ ${fai_db_schema_only-0} -eq 1 ]; then
-    print_and_log "fai_db_schema_only=1, not running the ECE & plugin SQL files"
+    print_and_log "Not running the ECE & plugin SQL files as you requested."
     return
   fi
   

From d917d3eb6d4a9872084b051623c89dfe4fc8677a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@geronimo>
Date: Wed, 27 Jun 2012 12:03:51 +0200
Subject: [PATCH 0889/2585] - fixed (non critical) bug when restoring a DB
 where ece-install would   complain because the test to see if replication was
 enabled would   fail as it assumed some settings to be set which were only
 set when   running the fai_*_install profiles.

  This has now been fixed, a new method has been introduced:
  set_ecedb_conf which is called from all methods that needs it.

  This fix was done as a part of issue #72

- when restoring the DB, it would not be possible to do this if an
  existing DB of the same name already existed. More specifically, it
  was not possible to override this by setting
  fai_db_drop_old_db_first=1.

  This has now been fixed as a part of issue #72
---
 .../ece-scripts/ece-install.d/database.sh      | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 34e93291..00b75ad5 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -109,7 +109,7 @@ function install_database_server()
     set_up_ecedb
   fi
 
-  if [ $db_replication -eq 1 ]; then
+  if [ ${db_replication-0} -eq 1 ]; then
     if [ $db_master -eq 1 ]; then
       create_replication_user
     fi
@@ -121,6 +121,15 @@ function install_database_server()
   fi
 }
 
+function set_ecedb_conf() {
+  # the user may override standard DB settings in ece-install.conf
+  set_db_settings_from_fai_conf
+  set_db_defaults_if_not_set
+
+  # the methods in drop-and-create-ecedb needs ece_home to be set
+  ece_home=${escenic_root_dir}/engine
+}
+
 function set_up_ecedb()
 {
   print_and_log "Setting up the ECE database schema ..."
@@ -147,12 +156,7 @@ function set_up_ecedb()
     fi
   done
 
-  # the user may override standard DB settings in ece-install.conf
-  set_db_settings_from_fai_conf
-  set_db_defaults_if_not_set
-
-  # the methods in drop-and-create-ecedb needs ece_home to be set
-  ece_home=${escenic_root_dir}/engine
+  set_ecedb_conf
   pre_install_new_ecedb
   create_ecedb
   

From 1d19ca023d399a725483348855c859524e173449 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@geronimo>
Date: Wed, 27 Jun 2012 12:04:23 +0200
Subject: [PATCH 0890/2585] - pre_install_new_ecedb now calls the new method
 set_ecedb_conf, this   is to make it work when running the
 fai_restore_from_backup profile.

---
 usr/sbin/drop-and-create-ecedb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/usr/sbin/drop-and-create-ecedb b/usr/sbin/drop-and-create-ecedb
index c5de61f9..ca4a2c4a 100644
--- a/usr/sbin/drop-and-create-ecedb
+++ b/usr/sbin/drop-and-create-ecedb
@@ -81,6 +81,8 @@ function run_db_scripts() {
 
 function pre_install_new_ecedb()
 {
+  set_ecedb_conf
+  
   if [ $create_oracle_user -eq 1 ]; then
     create_oracle_ece_user
   fi

From 649731fc2de5ed9707f0c3203d4f3fe6e67ee039 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@geronimo>
Date: Wed, 27 Jun 2012 12:58:14 +0200
Subject: [PATCH 0891/2585] - hardened "ece clean" by the way of the
 clean::clean_up   method. It will now not fail if the assembly tool home
 doesn't   exist.

  This is needed to be able to restore a backup on a system which
  doesn't have /opt/escenic/assemblytool, related to issue #72
---
 usr/share/escenic/ece-scripts/ece.d/clean.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/clean.sh b/usr/share/escenic/ece-scripts/ece.d/clean.sh
index a994c63f..eb0380b0 100644
--- a/usr/share/escenic/ece-scripts/ece.d/clean.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/clean.sh
@@ -1,5 +1,5 @@
 function clean_up() {
-  if [ "$type" == "engine" ]; then
+  if [[ "$type" == "engine" && -d $assemblytool_home ]]; then
     print "Cleaning up generated files in $assemblytool_home ..." 
     run cd $assemblytool_home
     run ant clean

From c9c19e22a53e465bda74d4be12408248e74c0493 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@geronimo>
Date: Wed, 27 Jun 2012 14:38:06 +0200
Subject: [PATCH 0892/2585] - added many more options to the "ece backup"
 command to make it   useful in more scenarios:

  --exclude-conf       :: will exclude /etc/escenic, /etc/default/ece and
                          /opt/tomcat-<instance>/conf
  --exclude-solr       :: will exclude the solr data files
  --exclude-db         :: will exclude the database dump
  --exclude-multimedia :: will exclude the ECE multimedia archive

  These options complement the existing:

  --exclude-binaries   :: will exclude the software binaries in
    /opt/escenic, /opt/tomcat (or target of such a symlink), as well as
    catalina base, e.g. /opt/tomcat-<instance>
---
 usr/bin/ece                                   |  16 ++
 usr/share/escenic/ece-scripts/ece.d/backup.sh | 140 ++++++++++++------
 2 files changed, 112 insertions(+), 44 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 24f99ce5..75aca109 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -23,6 +23,10 @@ type=engine
 instance=default
 command=""
 backup_exclude_binaries=0
+backup_exclude_conf=0
+backup_exclude_solr=0
+backup_exclude_multimedia=0
+backup_exclude_db=0
 http_user=""
 http_password=""
 wget_auth=""
@@ -630,6 +634,18 @@ function set_type_command_and_instance() {
         if [ "$el" == "--exclude-binaries" ]; then
             backup_exclude_binaries=1
             continue
+        elif [ "$el" == "--exclude-solr" ]; then
+            backup_exclude_solr=1
+            continue
+        elif [ "$el" == "--exclude-conf" ]; then
+            backup_exclude_conf=1
+            continue
+        elif [ "$el" == "--exclude-multimedia" ]; then
+            backup_exclude_multimedia=1
+            continue
+        elif [ "$el" == "--exclude-db" ]; then
+            backup_exclude_db=1
+            continue
         fi
         
         # the only thing left at this point, is the command
diff --git a/usr/share/escenic/ece-scripts/ece.d/backup.sh b/usr/share/escenic/ece-scripts/ece.d/backup.sh
index e001f729..e137a967 100644
--- a/usr/share/escenic/ece-scripts/ece.d/backup.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/backup.sh
@@ -1,4 +1,3 @@
-
 function backup_type() {
   local message="Backing up the $instance instance of $type on $HOSTNAME ..."
   print_and_log $message
@@ -24,13 +23,107 @@ function backup_type() {
     exit 1
   fi
 
+  actual_backup=""
+
+  if [ ${backup_exclude_db-0} -eq 0 ]; then
+    backup_db
+  else
+    print "Skipping DB, not including the database dump"
+  fi
+  
+  archive_file=$backup_dir/${type}-${instance}-backup-$(date --iso).tar
+  possible_backup="
+${data_dir}
+${data_dir}/engine
+${ece_home} 
+${escenic_conf_dir} 
+${solr_home}
+/etc/default/ece
+/etc/init.d/ece
+/etc/inti.d/rmi-hub
+"
+  for el in $possible_backup; do
+    if [ "$el" == "${ece_home}" -a $backup_exclude_binaries -eq 1 ]; then
+      print "Skpping software binaries, not including $ece_home"
+      continue
+    elif [ "$el" == "${escenic_conf_dir}" -a $backup_exclude_conf -eq 1 ]; then
+      print "Skpping configuration, not including $escenic_conf_dir"
+      continue
+    elif [ "$el" == "/etc/default/ece" -a $backup_exclude_conf -eq 1 ]; then
+      print "Skpping configuration, not including /etc/default/ece"
+      continue
+    elif [ $appserver == "tomcat" -a \
+      "$el" == "$tomcat_base/conf" -a \
+      $backup_exclude_conf -eq 1 ]; then
+      print "Skpping configuration, not including $tomcat_base/conf"
+      continue
+    elif [ "$el" == "${data_dir}" ]; then
+      # special handling of the data dir itself (it has a lot of data,
+      # we handle engine and solr data seperately)
+      actual_backup="$(ls $data_dir/*.state 2>/dev/null) $actual_backup"
+    elif [ "$el" == "${solr_home}" -a $backup_exclude_solr -eq 1 ]; then
+      print "Skipping Solr data files, not including $solr_home"
+      continue
+    elif [ "$el" == "${data_dir}/engine" \
+      -a $backup_exclude_multimedia -eq 1 ]; then
+      print "Skipping the multimedia archive, not including $data_dir/engine"
+      continue
+    elif [ -r "$el" ]; then
+      actual_backup="$el $actual_backup"
+    fi
+  done
+
+  if [ "$appserver" == "tomcat" -a "$backup_exclude_binaries" -eq 0 ]; then
+    for el in $(get_actual_file $tomcat_home) $tomcat_base; do
+      if [ -d $el ]; then
+        actual_backup="$el $actual_backup"
+      fi
+    done
+  fi
+
+  print "Creating snapshot ... (this may take a while)"
+  run tar cf $archive_file \
+    $actual_backup
+
+  local size=$(du -h $archive_file | cut -d'/' -f1)
+  message="Backup ready: $archive_file size: $size"
+  print $message
+  log $message
+  print "The backup arhcive includes:"
+  
+  if [ ${backup_exclude_db-0} -eq 0 ]; then
+    print "- Database snapshot"
+  fi
+
+  if [ ${backup_exclude_solr-0} -eq 0 ]; then
+    print "- All Solr in $solr_home"
+  fi
+  
+  if [ ${backup_exclude_multimedia-0} -eq 0 ]; then
+    print "- All Escenic data files in $data_dir/engine"
+  fi
+  
+  if [ "${backup_exclude_binaries-0}" -eq 0 ]; then
+    print "- All app servers in /opt"
+    print "- All Escenic software binaries in $ece_home"
+  fi
+  
+  if [ "${backup_exclude_conf-0}" -eq 0 ]; then
+    print "- All configuration in ${escenic_conf_dir} and /etc/default/ece"
+  fi
+  
+  print "- All bootstrap scripts from /etc/init.d"
+  print "Enjoy!"
+}
+
+function backup_db() {
   if [ "$appserver" == "tomcat" ]; then
     if [ ! -d $tomcat_base/conf ]; then
       print $tomcat_base/conf "doesn't exist :-("
       print "check your ece.conf the $instance instance of type $type"
       exit 1
     fi
-    
+
     connect_string=$(find $tomcat_base/conf | xargs \
       grep jdbc | \
       grep url | \
@@ -61,48 +154,7 @@ function backup_type() {
       > $db_backup_file
 
     print "Database dumped: $db_backup_file"
-  fi
-  
-  archive_file=$backup_dir/${type}-${instance}-backup-$(date --iso).tar
-  possible_backup="
-${escenic_conf_dir} 
-/opt/escenic 
-/etc/init.d/ece
-/etc/default/ece
-/etc/inti.d/rmi-hub
-/var/lib/escenic
-"
-  actual_backup=""
-  for el in $possible_backup; do
-    if [ "$el" == "/opt/escenic" -a $backup_exclude_binaries -eq 1 ]; then
-      continue
-    elif [ -r "$el" ]; then
-      actual_backup="$el $actual_backup"
-    fi
-  done
 
-  if [ "$appserver" == "tomcat" -a "$backup_exclude_binaries" -eq 0 ]; then
-    actual_backup="$(get_actual_file $tomcat_home) $tomcat_base $actual_backup"
+    actual_backup="$db_backup_file $actual_backup"
   fi
-
-  print "Creating snapshot ... (this will take a while)"
-  run tar cf $archive_file \
-    $actual_backup \
-    $db_backup_file
-
-  message="Backup ready: $archive_file"
-  print $message
-  log $message
-  print "The backup arhcive includes:"
-  print "- Database snapshot"
-  print "- All Solr & Escenic data files from /var/lib/escenic"
-
-  if [ "$backup_exclude_binaries" -eq 0 ]; then
-    print "- All app servers in /opt"
-    print "- All Escenic binaries & publication templates in /opt/escenic"
-  fi
-  
-  print "- All configuration in ${escenic_conf_dir} and /etc/default/ece"
-  print "- All bootstrap scripts from /etc/init.d"
-  print "Enjoy!"
 }

From ef672ef509fa72d1d969bfc0986ddbf67d6f5fe7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@geronimo>
Date: Wed, 27 Jun 2012 14:47:11 +0200
Subject: [PATCH 0893/2585] - added --exclude-init to exclude the init.d
 scripts

---
 usr/bin/ece                                   |  4 ++++
 usr/share/escenic/ece-scripts/ece.d/backup.sh | 10 ++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 75aca109..8170268e 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -27,6 +27,7 @@ backup_exclude_conf=0
 backup_exclude_solr=0
 backup_exclude_multimedia=0
 backup_exclude_db=0
+backup_exclude_init=0
 http_user=""
 http_password=""
 wget_auth=""
@@ -646,6 +647,9 @@ function set_type_command_and_instance() {
         elif [ "$el" == "--exclude-db" ]; then
             backup_exclude_db=1
             continue
+        elif [ "$el" == "--exclude-init" ]; then
+            backup_exclude_init=1
+            continue
         fi
         
         # the only thing left at this point, is the command
diff --git a/usr/share/escenic/ece-scripts/ece.d/backup.sh b/usr/share/escenic/ece-scripts/ece.d/backup.sh
index e137a967..7843610b 100644
--- a/usr/share/escenic/ece-scripts/ece.d/backup.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/backup.sh
@@ -40,7 +40,7 @@ ${escenic_conf_dir}
 ${solr_home}
 /etc/default/ece
 /etc/init.d/ece
-/etc/inti.d/rmi-hub
+/etc/init.d/rmi-hub
 "
   for el in $possible_backup; do
     if [ "$el" == "${ece_home}" -a $backup_exclude_binaries -eq 1 ]; then
@@ -68,6 +68,9 @@ ${solr_home}
       -a $backup_exclude_multimedia -eq 1 ]; then
       print "Skipping the multimedia archive, not including $data_dir/engine"
       continue
+    elif [ "$el" == "/etc/init.d/*" -a $backup_exclude_init -eq 1 ]; then
+      print "Skipping the init.d scripts in /etc/init.d"
+      continue
     elif [ -r "$el" ]; then
       actual_backup="$el $actual_backup"
     fi
@@ -112,7 +115,10 @@ ${solr_home}
     print "- All configuration in ${escenic_conf_dir} and /etc/default/ece"
   fi
   
-  print "- All bootstrap scripts from /etc/init.d"
+  if [ "${backup_exclude_init-0}" -eq 0 ]; then
+    print "- All bootstrap scripts from /etc/init.d"
+  fi
+  
   print "Enjoy!"
 }
 

From 9afa82f2d813a92bca43d1a054bb8da8043173fc Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@geronimo>
Date: Wed, 27 Jun 2012 15:26:55 +0200
Subject: [PATCH 0894/2585] - added support for --exclude-state to compliment
 the exclude   list. It's now possible to exclude absolutely everything:

  $ ece -i dev1 backup \
      --exclude-binaries \
      --exclude-solr \
      --exclude-init \
      --exclude-conf \
      --exclude-db  \
      --exclude-state \
      --exclude-multimedia

  In which case, ece rightfully complains at the end:

  [ece#engine-dev1] Cleaning up generated files in /opt/escenic/assemblytool ...
  [ece#engine-dev1] Cleaning up ear, deb and rpm files in /var/cache/escenic ...
  [ece#engine-dev1] Backing up the dev1 instance of engine on quanah ...
  [ece#engine-dev1] Skipping DB, not including the database dump
  [ece#engine-dev1] Skipping the multimedia archive, not including /var/lib/escenic/engine
  [ece#engine-dev1] Skpping software binaries, not including /opt/escenic/engine
  [ece#engine-dev1] Skpping configuration, not including /etc/escenic
  [ece#engine-dev1] Skipping Solr data files, not including /var/lib/escenic/solr
  [ece#engine-dev1] Skpping configuration, not including /opt/tomcat-dev1/conf
  [ece#engine-dev1] Skpping configuration, not including /etc/default/ece
  [ece#engine-dev1] Skipping the init.d scripts, not including /etc/init.d/ece
  [ece#engine-dev1] Skipping the init.d scripts, not including /etc/init.d/rmi-hub
  [ece#engine-dev1] You have excluded everything, nothing to backup :-(

  :-)

  This should give all the flexibility needed on the backup side to
  fulfil issue #72 and similar cases.
---
 usr/bin/ece                                   |  8 ++++++--
 usr/share/escenic/ece-scripts/ece.d/backup.sh | 20 ++++++++++++++++---
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 8170268e..0f344bc8 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -24,10 +24,11 @@ instance=default
 command=""
 backup_exclude_binaries=0
 backup_exclude_conf=0
-backup_exclude_solr=0
-backup_exclude_multimedia=0
 backup_exclude_db=0
 backup_exclude_init=0
+backup_exclude_multimedia=0
+backup_exclude_solr=0
+backup_exclude_state=0
 http_user=""
 http_password=""
 wget_auth=""
@@ -650,6 +651,9 @@ function set_type_command_and_instance() {
         elif [ "$el" == "--exclude-init" ]; then
             backup_exclude_init=1
             continue
+        elif [ "$el" == "--exclude-state" ]; then
+            backup_exclude_state=1
+            continue
         fi
         
         # the only thing left at this point, is the command
diff --git a/usr/share/escenic/ece-scripts/ece.d/backup.sh b/usr/share/escenic/ece-scripts/ece.d/backup.sh
index 7843610b..9af1aab6 100644
--- a/usr/share/escenic/ece-scripts/ece.d/backup.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/backup.sh
@@ -38,6 +38,7 @@ ${data_dir}/engine
 ${ece_home} 
 ${escenic_conf_dir} 
 ${solr_home}
+${tomcat_base}/conf
 /etc/default/ece
 /etc/init.d/ece
 /etc/init.d/rmi-hub
@@ -60,7 +61,10 @@ ${solr_home}
     elif [ "$el" == "${data_dir}" ]; then
       # special handling of the data dir itself (it has a lot of data,
       # we handle engine and solr data seperately)
-      actual_backup="$(ls $data_dir/*.state 2>/dev/null) $actual_backup"
+
+      if [ ${backup_exclude_state-0} -eq 0 ]; then
+        actual_backup="$(ls $data_dir/*.state 2>/dev/null) $actual_backup"
+      fi
     elif [ "$el" == "${solr_home}" -a $backup_exclude_solr -eq 1 ]; then
       print "Skipping Solr data files, not including $solr_home"
       continue
@@ -68,14 +72,15 @@ ${solr_home}
       -a $backup_exclude_multimedia -eq 1 ]; then
       print "Skipping the multimedia archive, not including $data_dir/engine"
       continue
-    elif [ "$el" == "/etc/init.d/*" -a $backup_exclude_init -eq 1 ]; then
-      print "Skipping the init.d scripts in /etc/init.d"
+    elif [[ "$el" == "/etc/init.d/"* && $backup_exclude_init -eq 1 ]]; then
+      print "Skipping the init.d scripts, not including $el"
       continue
     elif [ -r "$el" ]; then
       actual_backup="$el $actual_backup"
     fi
   done
 
+  # tomcat binaries, both home and base.
   if [ "$appserver" == "tomcat" -a "$backup_exclude_binaries" -eq 0 ]; then
     for el in $(get_actual_file $tomcat_home) $tomcat_base; do
       if [ -d $el ]; then
@@ -84,6 +89,11 @@ ${solr_home}
     done
   fi
 
+  if [ -z "$actual_backup" ]; then
+    print "You have excluded everything, $(red nothing to backup) :-("
+    exit 0
+  fi
+  
   print "Creating snapshot ... (this may take a while)"
   run tar cf $archive_file \
     $actual_backup
@@ -119,6 +129,10 @@ ${solr_home}
     print "- All bootstrap scripts from /etc/init.d"
   fi
   
+  if [ "${backup_exclude_state-0}" -eq 0 ]; then
+    print "- All state files in $data_dir"
+  fi
+  
   print "Enjoy!"
 }
 

From 37883bdc4fa1396bf98ee957656f8129a8572d01 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@geronimo>
Date: Wed, 27 Jun 2012 15:32:47 +0200
Subject: [PATCH 0895/2585] - added TAB completion to all --exclude-* options
 available for the   backup command.

  Example usage:

  $ ece -i dev1 backup --exclude-[TAB]
  --exclude-binaries    --exclude-db          --exclude-multimedia  --exclude-state
  --exclude-conf        --exclude-init        --exclude-solr

  This was done as a part of #72
---
 etc/bash_completion.d/ece | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/etc/bash_completion.d/ece b/etc/bash_completion.d/ece
index 2c946110..1585c05e 100644
--- a/etc/bash_completion.d/ece
+++ b/etc/bash_completion.d/ece
@@ -28,7 +28,16 @@ _ece_commands()
 
     case "$prev" in
         backup)
-            completions="--exclude-binaries $commands"
+            exclude_list="
+              --exclude-binaries
+              --exclude-solr
+              --exclude-init
+              --exclude-conf
+              --exclude-db  
+              --exclude-state
+              --exclude-multimedia
+            "
+            completions="$exclude_list $commands"
             ;;
         deploy)
             completions="--file --uri $commands"

From ec9f882ad4ce02f00e318bda2b169f02eb5816f5 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@geronimo>
Date: Wed, 27 Jun 2012 16:05:33 +0200
Subject: [PATCH 0896/2585] - "ece clean" now also cleans up the given
 instance's temp and work   directories, the full drill is now:

  $ ece -i dev1 clean
  [ece#engine-dev1] Cleaning up generated files in /opt/escenic/assemblytool ...
  [ece#engine-dev1] Cleaning up ear, deb and rpm files in /var/cache/escenic ...
  [ece#engine-dev1] Cleaning up dev1's work directory in /opt/tomcat-dev1/work ...
  [ece#engine-dev1] Cleaning up dev1's temp directory in /opt/tomcat-dev1/temp ...

  This was done as a part of issue #72
---
 usr/share/escenic/ece-scripts/ece.d/clean.sh | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece.d/clean.sh b/usr/share/escenic/ece-scripts/ece.d/clean.sh
index eb0380b0..61e87c2a 100644
--- a/usr/share/escenic/ece-scripts/ece.d/clean.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/clean.sh
@@ -9,4 +9,17 @@ function clean_up() {
     print "Cleaning up ear, deb and rpm files in /var/cache/escenic ..." 
     run rm -rf /var/cache/escenic/*.{rpm,deb,ear}
   fi
+
+  if [[ $appserver == "tomcat" ]]; then
+    local dir_list="
+    $tomcat_base/work
+    $tomcat_base/temp
+    "
+    for el in $dir_list; do
+      if [ -d $el ]; then
+        print "Cleaning up ${instance}'s $(basename $el) directory in $el ..."
+        run rm -rf $el/*
+      fi
+    done
+  fi
 }

From 2819382e2fc9092f19731cf7eea5f529b5121983 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@geronimo>
Date: Wed, 27 Jun 2012 16:26:17 +0200
Subject: [PATCH 0897/2585] - fix to set_correct_permissions which again is
 called from   common_post_install: it now adds the ECE group as group to the 
  tomcat_home (note: different from _base). This ensures that the ECE   user
 can read and execute all files in tomcat_home, e.g. when   performing backup
 of the directory.

  This issue as done as a part of #72
---
 usr/sbin/ece-install | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 7c53aa72..beaf4430 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -307,10 +307,17 @@ function set_correct_permissions()
 
         run chown -R ${ece_user}:${ece_group} $el
     done
-    
+
     if [ -d "$tomcat_base" ]; then
         run chown -R ${ece_user}:${ece_group} $tomcat_base
     fi
+
+    # it's important that the ECE user has access to read the
+    # tomcat_home files, e.g. when creating a backup of it.
+    if [ -d "$tomcat_home" ]; then
+        run chgrp -R ${ece_group} $tomcat_home
+        run chmod -R g+rx $tomcat_home
+    fi
 }
 
 function print_status_and_next_steps()

From 92bfa0997e7f31ce9bb01cf578f653df94f7c85f Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 28 Jun 2012 10:26:06 +0200
Subject: [PATCH 0898/2585] Removed consolehandler from common logging, to
 avoid duplicate logging (only in search instances for now)

---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 9b2a8ca7..32f8e779 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -446,7 +446,7 @@ EOF
     cat > $tomcat_base/conf/logging.properties <<EOF
 handlers = 1catalina.org.apache.juli.FileHandler, 2localhost.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler, 6localhost.org.apache.juli.FileHandler
 
-.handlers = 1catalina.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
+.handlers = 1catalina.org.apache.juli.FileHandler
 
 1catalina.org.apache.juli.FileHandler.level = FINE
 1catalina.org.apache.juli.FileHandler.directory = \$\{catalina.base\}/logs

From 24c385e923fe34180e79fe6a64c240f27f5b90ca Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@geronimo>
Date: Thu, 28 Jun 2012 11:52:55 +0200
Subject: [PATCH 0899/2585] - it's wrong that "ece backup" implicitly calls
 "ece clean".

---
 usr/bin/ece | 1 -
 1 file changed, 1 deletion(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 0f344bc8..339f2d64 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -802,7 +802,6 @@ for el in $command; do
             update_publication_resources "edit_first"
             ;;
         backup)
-            clean_up
             backup_type
             ;;
         flush)

From 0ef225e319e5db2d7dbe29c86039c0edfe6b4089 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@geronimo>
Date: Thu, 28 Jun 2012 12:42:01 +0200
Subject: [PATCH 0900/2585] - added support for wiping the slate clean before
 restoring a backup:

  fai_restore_pre_wipe_solr=1
  fai_restore_pre_wipe_logs=1
  fai_restore_pre_wipe_cache=1
  fai_restore_pre_wipe_crash=1

  or simply:

  fai_restore_pre_wipe_all=1

  This was a part of the request from @oschon issue #72

- added hardening to the setting of permissions at the end of the
  restore porcess: the directories on which to set permissions is
  determined by the /etc/default/ece. However, if this file for some
  reason contained non existent instances at the time of the backup,
  the restore would fail. This has now been fixed.
---
 .../ece-install.d/restore-from-backup.sh      | 41 ++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/restore-from-backup.sh b/usr/share/escenic/ece-scripts/ece-install.d/restore-from-backup.sh
index 3313da65..128a071e 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/restore-from-backup.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/restore-from-backup.sh
@@ -1,3 +1,35 @@
+function remove_directory_contents_if_exists() {
+  if [ -z $1 ]; then
+    return
+  elif [ ! -d $1 ]; then
+    return
+  fi
+
+  print_and_log "Restore preparations: removing all files in $1 ..."
+  run rm -rf ${1}/*
+}
+
+## remove generated files of various sorts, to make the slate as clean
+## as possible before restoring a backup
+function wipe_the_slate_clean() {
+  if [ ${fai_restore_pre_wipe_solr-0} -eq 1 \
+    -o ${fai_restore_pre_wipe_all-0} -eq 1 ]; then
+    remove_directory_contents_if_exists ${escenic_data_dir}/solr/data
+  fi
+  if [ ${fai_restore_pre_wipe_logs-0} -eq 1 \
+    -o ${fai_restore_pre_wipe_all-0} -eq 1 ]; then
+    remove_directory_contents_if_exists ${escenic_log_dir}
+  fi
+  if [ ${fai_restore_pre_wipe_cache-0} -eq 1 \
+    -o ${fai_restore_pre_wipe_all-0} -eq 1 ]; then
+    remove_directory_contents_if_exists ${escenic_cache_dir}
+  fi
+  if [ ${fai_restore_pre_wipe_crash-0} -eq 1 \
+    -o ${fai_restore_pre_wipe_all-0} -eq 1 ]; then
+    remove_directory_contents_if_exists ${escenic_crash_dir}
+  fi
+}
+
 function restore_from_backup()
 {
   local restore_all=0
@@ -7,6 +39,8 @@ function restore_from_backup()
   local restore_conf=0
   local backup_file=""
   local backup_dir=$escenic_backups_dir
+
+  wipe_the_slate_clean
   
   if [ $(get_boolean_conf_value fai_enabled) -eq 1 -a \
     $(get_boolean_conf_value fai_restore_from_backup) -eq 1 ]; then
@@ -172,7 +206,12 @@ function restore_from_backup()
         print_and_log $s
         s="and $escenic_conf_dir/ece*.conf"
         print_and_log $s
-        run chown -R ${ece_user}:${ece_group} ${directories}
+        for el in ${directories}; do
+          if [ ! -d $el ]; then
+            continue
+          fi
+          run chown -R ${ece_user}:${ece_group} ${el}
+        done  
       fi
     fi
   fi

From 626c1120623fb10245e894c3d73ed1ddc325413a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@geronimo>
Date: Thu, 28 Jun 2012 12:49:53 +0200
Subject: [PATCH 0901/2585] - added clear_generated_files, which again is
 called before "ece   backup" is called.

---
 usr/share/escenic/ece-scripts/ece.d/backup.sh | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece.d/backup.sh b/usr/share/escenic/ece-scripts/ece.d/backup.sh
index 9af1aab6..c800f2ab 100644
--- a/usr/share/escenic/ece-scripts/ece.d/backup.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/backup.sh
@@ -1,7 +1,30 @@
+function clear_generated_files() {
+  if [ -d ${assemblytool_home} ]; then
+    print "Cleaning up generated files in $assemblytool_home ..." 
+    run cd $assemblytool_home
+    run ant clean
+  fi
+
+  if [[ $appserver == "tomcat" ]]; then
+    local dir_list="
+    $tomcat_base/work
+    $tomcat_base/temp
+    "
+    for el in $dir_list; do
+      if [ -d $el ]; then
+        print "Cleaning up ${instance}'s $(basename $el) directory in $el ..."
+        run rm -rf $el/*
+      fi
+    done
+  fi
+}
+
 function backup_type() {
   local message="Backing up the $instance instance of $type on $HOSTNAME ..."
   print_and_log $message
 
+  clear_generated_files
+
   if [ "$type" == "rmi-hub" ]; then
     ensure_that_required_fields_are_set $hub_required_fields
   elif [ "$type" == "search" ]; then

From 55477ab10e6bf7f61c9ed98f10c1a64297b92b52 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 2 Jul 2012 12:27:35 +0200
Subject: [PATCH 0902/2585] - The git project oab-java6 changed its .sh file
 from oab-java6.sh to   oab-java.sh since it now also caters for Java 7. This
 rename was   done in this commit:  
 https://github.com/flexiondotorg/oab-java6/commit/c2e231e25730fb3eff8bde6ad74bcdfc26353416

  This change to ece-install::java closes issue #80

  Thanks to @LyncheOlaf for raising this issue.
---
 usr/share/escenic/ece-scripts/ece-install.d/java.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/java.sh b/usr/share/escenic/ece-scripts/ece-install.d/java.sh
index 48544acb..b5c1c748 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/java.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/java.sh
@@ -13,7 +13,7 @@ function create_java_deb_packages_and_repo() {
   run cd $tmp_dir
   run git clone https://github.com/flexiondotorg/oab-java6.git
   run cd oab-java6
-  run bash oab-java6.sh
+  run bash oab-java.sh
   run rm -rf $tmp_dir
     
   add_next_step "Local APT repository with Sun/Oracle Java packages"

From 4f04eea3fc52ff9e02ab3df28c90bd06028feefd Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 2 Jul 2012 13:19:14 +0200
Subject: [PATCH 0903/2585] - added to test to get_privileged_hosts to see if
 the IPs/hosts found   can be resolved by the host. This should really
 normally be the   case, but on special instances, like when operating on
 Amazon, it   can be that the outputs of 'w' will list a host which isn't  
 resolvable by the current host itself.

  The implications of this was that Varnish would fail to start as it
  has the non resolvable hosts in its ACL.
---
 usr/sbin/ece-install | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index beaf4430..2479a6e0 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -464,7 +464,11 @@ function get_privileged_hosts() {
       sort | \
       uniq
   ); do
-    privileged_hosts=${privileged_hosts}" "${ip}
+    # ensure that all privileged_hosts are resolvable, or else
+    # services which uses them, like Varnish, may fail to start.
+    if [ $(host ${ip} | grep "not found" | wc -l) -eq 0 ]; then
+      privileged_hosts=${privileged_hosts}" "${ip}
+    fi
   done
 
   echo ${privileged_hosts}

From 88b18c75db96bf3f3262de26c631e9379e7cbfc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Mon, 2 Jul 2012 13:36:07 +0200
Subject: [PATCH 0904/2585] Changed from -e to -h for symlink check and
 removal.

---
 usr/share/escenic/build-scripts/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/build.sh b/usr/share/escenic/build-scripts/build.sh
index af9f796c..2d43a9fb 100755
--- a/usr/share/escenic/build-scripts/build.sh
+++ b/usr/share/escenic/build-scripts/build.sh
@@ -101,7 +101,7 @@ function home_preparation
     make_dir $plugin_dir
   fi
 
-  if [ -e "$engine_root_dir" ]; then
+  if [ -h "$engine_root_dir" ]; then
     run rm $engine_root_dir
   fi
 

From 71b1047613a821b2ecb787ed2200cfcfdde40efa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Mon, 2 Jul 2012 13:51:01 +0200
Subject: [PATCH 0905/2585] build.sh will now accept an empty global classpath
 in a project.

---
 usr/share/escenic/build-scripts/build.sh | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/usr/share/escenic/build-scripts/build.sh b/usr/share/escenic/build-scripts/build.sh
index 2d43a9fb..1d78e915 100755
--- a/usr/share/escenic/build-scripts/build.sh
+++ b/usr/share/escenic/build-scripts/build.sh
@@ -201,15 +201,18 @@ function symlink_ece_components {
 function symlink_target {
 
   # global classpath
-  for f in $(ls -d $svn_src_dir/vosa-assembly/target/lib/*);
-    do run ln -s $f $assemblytool_lib_dir;
-  done
+  if [ -e "$svn_src_dir/vosa-assembly/target/lib" ]; then
+    for f in $(ls -d $svn_src_dir/vosa-assembly/target/lib/*);
+      do run ln -s $f $assemblytool_lib_dir;
+    done
+  fi
 
   # publications
-  for f in $(ls -d $svn_src_dir/vosa-assembly/target/wars/*);
-    do ln -s $f $assemblytool_pub_dir;
-  done
-
+  if [ -e "$svn_src_dir/vosa-assembly/target/wars" ]; then
+    for f in $(ls -d $svn_src_dir/vosa-assembly/target/wars/*);
+      do ln -s $f $assemblytool_pub_dir;
+    done
+  fi
 }
 
 ##

From fe16626a8ea0f9c0f9dc3b188aac7d48d9d42b0d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 2 Jul 2012 14:19:21 +0200
Subject: [PATCH 0906/2585] - since thttpd has been removed from the Ubuntu
 12.04 [1], I've now   re-implemented
 ece-install::monitoring::install_system_info using   lighttpd instead of
 thttpd.

  This re-implementation has been successfully tested on Ubuntu 12.04
  using a clean system without lighttpd and with an lighttpd with
  other values than ece-install wants.

  This closes #81

  [1] http://www.ubuntuupdates.org/package/core/precise/universe/base/thttpd
---
 .../ece-scripts/ece-install.d/monitoring.sh   | 35 ++++++++-----------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index b5a159f9..b32a39ab 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -414,37 +414,32 @@ function install_system_info() {
     return
   fi
   
-  print_and_log "Setting up self-reporting module on $HOSTNAME ..."
+  print_and_log "Setting up a self-reporting module on $HOSTNAME ..."
   
-  install_packages_if_missing thttpd escenic-common-scripts
-  assert_pre_requisite thttpd
+  install_packages_if_missing lighttpd escenic-common-scripts
+  assert_pre_requisite lighttpd
 
   local port=${fai_reporting_port-5678}
   local dir=${fai_reporting_dir-/var/www/system-info}
   make_dir $dir
   
-  # configure dhttpd
-  local file=/etc/thttpd/thttpd.conf
+  # configure the web server
+  local file=/etc/lighttpd/lighttpd.conf
 
   # set the port
-  sed -i "s~^port=80~port=$port~g" $file
+  local property=server.port
+  if [ $(grep ^server.port $file | wc -l) -eq 0 ]; then
+    echo "${property} = \"${port}\"" >> $file
+  else
+    run sed -i "s~^${property}.*=.*$~${property}=\"${port}\"~g" $file
+  fi
   
   # set the document root
-  sed -i "s~^dir=/var/www$~dir=$dir~g" $file
-  
-  # set a non-chroot environment to make the symlinking outside the
-  # document root work
-  sed -i "s~^#nochroot~nochroot~g" $file
-  sed -i "s~^chroot~#chroot~g" $file
-
-  # prevent symlink checking
-  sed -i "s~^symlinks~#symlinks~g" $file
-  sed -i "s~^#nosymlinks~nosymlinks~g" $file
+  property=server.document-root
+  run sed -i "s~^${property}.*=.*\"/var/www\"$~${property}=\"$dir\"~g" $file
   
-  # make thttpd start
-  file=/etc/default/thttpd
-  sed -i "s~^ENABLED=no~ENABLED=yes~g" $file
-  run /etc/init.d/thttpd restart
+  # make the web server start
+  run /etc/init.d/lighttpd restart
   
   # set system-info to be run every minute on the host
   local command="system-info -f html -u $ece_user > $dir/index.html"

From f115055b16a6e413a562c827828de3e27d89d9dd Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 2 Jul 2012 14:19:46 +0200
Subject: [PATCH 0907/2585] - wait a tad longer for getting EAE up

---
 usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh
index a4c99b0c..29987dd2 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh
@@ -29,7 +29,7 @@ function install_analysis_server()
   su - $ece_user -c "$ece_command" 1>>$log 2>>$log
   exit_on_error "su - $ece_user -c \"$ece_command\""
 
-  local seconds=3
+  local seconds=5
   print_and_log "Waiting ${seconds} seconds for EAE to come up ..."
   sleep 10
   

From 1d352145a71a4e129c1406e7dfe97428e151a107 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 3 Jul 2012 13:15:47 +0200
Subject: [PATCH 0908/2585] - added system-info module for listing IPs of a
 host:

  Overview of IPs on myhost:

    Interfaces and their IPs:
     |
      eth0      Link encap:Ethernet  HWaddr f2:3c:91:df:9e:ed
                inet addr:192.168.193.120  Bcast:192.168.193.255  Mask:255.255.255.0

      tun0      Link encap:Ethernet  HWaddr 9a:e9:f4:e5:38:d7
                inet addr:9.120.24.54  Bcast:9.120.24.254  Mask:255.0.0.0

    myhost's IP when accessing the world:
     |
      192.168.193.120

   And yes, the IPs in this example is just gibberish ;-)
---
 .../escenic/ece-scripts/system-info.d/55-list-ips.sh   | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 usr/share/escenic/ece-scripts/system-info.d/55-list-ips.sh

diff --git a/usr/share/escenic/ece-scripts/system-info.d/55-list-ips.sh b/usr/share/escenic/ece-scripts/system-info.d/55-list-ips.sh
new file mode 100644
index 00000000..609a524a
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/system-info.d/55-list-ips.sh
@@ -0,0 +1,10 @@
+
+print_h2_header "Overview of IPs on $HOSTNAME"
+
+print_h3_header "Interfaces and their IPs"
+print_pre_text "$(/sbin/ifconfig | grep -v inet6 | egrep -v "127.0" | grep inet -B 1 | sed 's/--//g')"
+
+print_h3_header "${HOSTNAME}'s IP when accessing the world"
+print_pre_text "$(curl --silent --connect-timeout 3 ifconfig.me 2>/dev/null)"
+
+print_section_end

From 367caf353ae53db6eec522b623110cd2b32aa705 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 3 Jul 2012 13:58:55 +0200
Subject: [PATCH 0909/2585] - added support for Aamzon RDS, added new parameter
 called   fai_db_sql_only=1. If set, it will not install the database server  
 software (i.e. no Percona), only a MySQL client.

---
 usr/sbin/drop-and-create-ecedb                |  4 ++-
 .../ece-scripts/ece-install.d/database.sh     | 25 ++++++++++++-------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/usr/sbin/drop-and-create-ecedb b/usr/sbin/drop-and-create-ecedb
index ca4a2c4a..923973d9 100644
--- a/usr/sbin/drop-and-create-ecedb
+++ b/usr/sbin/drop-and-create-ecedb
@@ -146,7 +146,9 @@ history
 
 function create_ecedb()
 {
-  create_schema
+  if [ ${fai_db_sql_only-0} -eq 0 ]; then
+    create_schema
+  fi
 
   if [ ${fai_db_schema_only-0} -eq 1 ]; then
     print_and_log "Not running the ECE & plugin SQL files as you requested."
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 00b75ad5..0d7c4fb2 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -23,7 +23,7 @@ function install_database_server()
 
   source $(dirname $0)/drop-and-create-ecedb
 
-  if [ $on_debian_or_derivative -eq 1 ]; then
+  if [ $on_debian_or_derivative -eq 1 -a ${fai_db_sql_only-0} -eq 0 ]; then
 
     code_name=$(lsb_release -s -c)
     
@@ -91,17 +91,24 @@ function install_database_server()
       Percona-Server-server-55
       Percona-Server-client-55"
   fi
-  
-  install_packages_if_missing $packages
-  force_packages=0
 
-  if [ $on_redhat_or_derivative -eq 1 ]; then
-    run chkconfig --level 35 mysql on
-    run /etc/init.d/mysql restart
-  fi
+  if [ ${fai_db_sql_only-0} -eq 0 ]; then
+    install_packages_if_missing $packages
+    force_packages=0
 
+    if [ $on_redhat_or_derivative -eq 1 ]; then
+      run chkconfig --level 35 mysql on
+      run /etc/init.d/mysql restart
+    fi
+
+    assert_pre_requisite mysqld
+  else
+    # when only running the SQL scripts, typically when using Amazon
+    # RDS, we need the mysql-client.
+    install_packages_if_missing "mysql-client"
+  fi
+  
   assert_pre_requisite mysql
-  assert_pre_requisite mysqld
 
   if [ -z "$1" ]; then
     download_escenic_components

From 9d4d132ba259d19f24431f96ff15c819177f7369 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 3 Jul 2012 14:57:31 +0200
Subject: [PATCH 0910/2585] - added system-info module for listing outgoing
 connections. It will   not list connections originating of any of the host's
 own IPs.

  List of my-host's outgoing connections:
     - 127.0.0.1:45306
     - 127.0.0.1:6667           17546/emacs
     - 172.24.10.102:6667       17546/emacs
     - 172.24.10.27:143         17546/emacs
     - 176.34.120.177:22        17826/ssh
     - 176.34.120.177:22        4801/ssh
     - 2a00:1450:8005::7d:5223
     - 2a00:1450:8005::7d:5223
     - 50.17.205.57:5222
     - 62.101.198.35:10401
     - 62.101.198.35:23200
     - 62.101.198.35:49518
     - 62.101.198.35:5009
     - 62.101.198.35:52094
     - 62.101.198.35:58970
     - 62.101.198.35:691
     - 62.101.198.35:8876
     - 64.4.61.77:1863
     - 83.241.192.13:5222
---
 .../55-list-outgoing-connections.sh           | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 usr/share/escenic/ece-scripts/system-info.d/55-list-outgoing-connections.sh

diff --git a/usr/share/escenic/ece-scripts/system-info.d/55-list-outgoing-connections.sh b/usr/share/escenic/ece-scripts/system-info.d/55-list-outgoing-connections.sh
new file mode 100644
index 00000000..f82dae01
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/system-info.d/55-list-outgoing-connections.sh
@@ -0,0 +1,32 @@
+
+print_h2_header "List of ${HOSTNAME}'s outgoing connections"
+
+local_ip_list=$(/sbin/ifconfig | \
+  grep inet | \
+  grep -v inet6 | \
+  grep -v 127.0 | \
+  cut -d':' -f2 | \
+  cut -d' ' -f1)
+
+egrep="arne"
+
+for el in $local_ip_list; do
+  egrep="127.0.⎈|$el"
+done
+
+print_un_ordered_list_start
+
+netstat --numeric --program --tcp 2>/dev/null | \
+  grep ESTABLISHED | \
+  awk '{print $5,$7}' | \
+  sed 's/-$//g' | \
+  egrep -v "$egrep" | \
+  column -t | \
+  sort | while read f; do
+  # here we could also create graphics $f contains both destination
+  # IP, port and originating PID and program
+  print_list_item "$f"
+done
+print_un_ordered_list_end
+
+print_section_end

From 9cfcf90fd295af02c4c2b2e0b68bd7d93b1e016f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 3 Jul 2012 15:12:11 +0200
Subject: [PATCH 0911/2585] - improved the section on getting and running
 ece-install

---
 usr/share/doc/escenic/ece-install-guide.org | 60 +++++++++++++++++++--
 1 file changed, 57 insertions(+), 3 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index d9a241e3..b4660c6a 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -46,14 +46,26 @@ sure that GNU's tools take precedence in the command PATH offered to
 ece-install.
 
 * Downloading the ece-install Script
-The ece-install script can be downloaded from:
-https://raw.github.com/skybert/ece-scripts/master/usr/sbin/ece-install
-or be downloaded together with the other ece-scripts using git:
+The easiest way of getting ece-install is to use git. Type this in
+your shell:
 #+BEGIN_SRC conf
 $ git clone https://github.com/skybert/ece-scripts.git
 #+END_SRC
 
+The reason why we want you to use git to download ece-install, is that
+you later easily can get the latest changes (for instance after we fix
+one of your reported issues), by doing "git pull" inside the
+ece-scripts directory.
+
+(If you have problems installing git, you can also download as a ZIP
+archive here: https://github.com/skybert/ece-scripts/zipball/master)
+
 * Running the ece-install Script
+After getting the latest version of ece-scripts, you run it with:
+#+BEGIN_SRC sh
+# bash ece-scripts/usr/sbin/ece-install  
+#+END_SRC
+
 ** Requires super user privileges
 You must run the script as the root user.  If you start the script as
 a regular user, it will complain:
@@ -973,3 +985,45 @@ the host that runs the install script.
 The following output is produced from ece-install:
 #+INCLUDE: "~/tmp/ece-install.out" src text
 
+
+* Exceptions
+** Easily 500
+{~} what now... while true; do curl -s  -I
+"http://newindianexpress.com//cities/chennai/article555367.ece%C2%^C";
+done
+
+
+** 2012-07-02 16:24
+2012-07-02 17:30:15,589 ERROR [http-8080-34]
+(com.escenic.framework.search.solr.SolrSearchEngine) solr search
+failed
+org.apache.solr.client.solrj.SolrServerException: Error executing
+query
+
+␐[..]
+
+Caused by: org.apache.solr.common.SolrException: Bad Request
+
+Bad Request
+
+request: http://localhost:8081/solr/select?sort=score
+desc&fl=*&start=0&q=(smoking OR scenes:censor OR board OR damages OR
+people`s OR health)+section:(3)+contenttype:
+(news)+publication:(nie)+(state:(published)+expiredate:[2012-07-02T12:00:15Z
+TO *]+activatedate:[* TO
+2012-07-02T12:00:15Z])+publishdate:[1970-01-01T00:00:00Z TO
+2012-07-02T12:00:15Z]&rows=15&wt=javabin&version=1
+        at
+        org.apache.solr.client.solrj.impl.CommonsHttpSolrServer.request(CommonsHttpSolrServer.java:424)
+        at
+        org.apache.solr.client.solrj.impl.CommonsHttpSolrServer.request(CommonsHttpSolrServer.java:243)
+        at
+        org.apache.solr.client.solrj.request.QueryRequest.process(QueryRequest.java:89)
+        ... 108 more
+2012-07-02 17:30:15,593 ERROR [http-8080-34]
+(com.escenic.framework.search.solr.action.SearchAction) Error while
+executing search
+java.lang.NullPointerException
+        at
+        com.escenic.framework.search.solr.action.SearchAction.execute(SearchAction.java:56)
+

From 879ba9ffafb88df9e0e2471878115e996db36243 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 3 Jul 2012 15:12:58 +0200
Subject: [PATCH 0912/2585] - removed the parenthesis

---
 usr/share/doc/escenic/ece-install-guide.org | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index b4660c6a..1d8dd498 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -57,8 +57,8 @@ you later easily can get the latest changes (for instance after we fix
 one of your reported issues), by doing "git pull" inside the
 ece-scripts directory.
 
-(If you have problems installing git, you can also download as a ZIP
-archive here: https://github.com/skybert/ece-scripts/zipball/master)
+If you have problems installing git, you can also download as a ZIP
+archive here: https://github.com/skybert/ece-scripts/zipball/master
 
 * Running the ece-install Script
 After getting the latest version of ece-scripts, you run it with:

From 053cf9c20bb415c36ae301d191cbbbe9eb1bbbff Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 3 Jul 2012 15:13:57 +0200
Subject: [PATCH 0913/2585] - too many words

---
 usr/share/doc/escenic/ece-install-guide.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 1d8dd498..0c729ddf 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -57,7 +57,7 @@ you later easily can get the latest changes (for instance after we fix
 one of your reported issues), by doing "git pull" inside the
 ece-scripts directory.
 
-If you have problems installing git, you can also download as a ZIP
+If you have problems installing git, you can also download a ZIP
 archive here: https://github.com/skybert/ece-scripts/zipball/master
 
 * Running the ece-install Script

From 6a9b52a3810eecf5f6af56f12a228747703e4de9 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 3 Jul 2012 15:16:51 +0200
Subject: [PATCH 0914/2585] - typo

---
 .../ece-scripts/system-info.d/55-list-outgoing-connections.sh   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/55-list-outgoing-connections.sh b/usr/share/escenic/ece-scripts/system-info.d/55-list-outgoing-connections.sh
index f82dae01..1b975e28 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/55-list-outgoing-connections.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/55-list-outgoing-connections.sh
@@ -11,7 +11,7 @@ local_ip_list=$(/sbin/ifconfig | \
 egrep="arne"
 
 for el in $local_ip_list; do
-  egrep="127.0.⎈|$el"
+  egrep="127.0.|$el"
 done
 
 print_un_ordered_list_start

From e80965d1a2b56fe15f325797d2dd39a8e4787262 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@cochise.vizrt.internal>
Date: Tue, 3 Jul 2012 17:37:07 +0200
Subject: [PATCH 0915/2585] Two new flabbergasting features!

1) system-info will now list all current outgoing connections from the
current host along with which process it is (with process name) and
how many connections that process has open to the same target (if more
than one, like DB connections).

  List of cochise's outgoing connections:
     - 7162/opera 2 conns -> 233.12.120.177:8080
     - 7162/opera 2 conns -> 233.12.120.177:8080
     - 9455/ssh 1 conns -> 551.11.13.2:22
     - 7162/opera 1 conns -> 233.12.120.177:8080
     - 6058/dropbox 1 conns -> 199.47.218.147:80
     - 32241/ssh 1 conns -> 192.168.1.233:2343
     - 2730/ssh 1 conns -> 192.168.1.233:2343
     - 2500/firefox-bin 1 conns -> 76.27.219.195:443
     - 2500/firefox-bin 1 conns -> 89.19.192.41:443
     - 2500/firefox-bin 1 conns -> 873.194.32.53:443
     - 23495/ssh 1 conns -> 192.168.1.233:2343
     - 23084/ssh 1 conns -> 192.168.1.233:2343
     - 21847/ssh 1 conns -> 192.168.1.233:2343
     - 20914/ssh 1 conns -> 192.168.1.233:2343
     - 15926/ssh 1 conns -> 192.168.1.233:2343
     - 13349/gmpc 1 conns -> 55.198.52.5:80
     - 13349/gmpc 1 conns -> 890.18.221.162:80

The conscious reader will spot that the below example is from my
laptop, so the process names are obvious different from that of a
server, but the concept is _exactly_ the same, nevertheless.

2) Furthermore, if blockdiag is installed and the current user has
write access to /var/www/system-info, it will also generate a diagram
based on the information obtained in 1) giving an up to date
architectural overview of the current server!

  Current archicture overview:
     |
      cochise's diagram: http://cochise:5678/cochise.png

Generating the PNG takes some additional seconds so some folks will
probably want to turn this off, in which case the following setting in
/etc/default/system-info is supported:

  do_not_generate_diagram=1
---
 .../55-list-outgoing-connections.sh           | 99 ++++++++++++++-----
 1 file changed, 76 insertions(+), 23 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/55-list-outgoing-connections.sh b/usr/share/escenic/ece-scripts/system-info.d/55-list-outgoing-connections.sh
index 1b975e28..c63be2fc 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/55-list-outgoing-connections.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/55-list-outgoing-connections.sh
@@ -1,32 +1,85 @@
+function get_random_color() {
+  color_array=($(echo "orange green red cyan red pink grey yellow"))
+  number_of_colors=${#color_array[*]}
+  color=${color_array[$((RANDOM % number_of_colors))]}
+  echo "${color}"
+}
 
-print_h2_header "List of ${HOSTNAME}'s outgoing connections"
+function create_blockdiag_src() {
+  echo "blockdiag {"
+  
+  echo "$@" | while read f; do
+    read count program target <<< "$f"
+    echo \"${program}\" "[color=\"$(get_random_color)\"];"
+    only_program=$(echo $program | cut -d'/' -f2)
+    echo '  '\"${program}\" "->" \"${target}\" "[label=\"$count conn\"];"
+  done
 
-local_ip_list=$(/sbin/ifconfig | \
-  grep inet | \
-  grep -v inet6 | \
-  grep -v 127.0 | \
-  cut -d':' -f2 | \
-  cut -d' ' -f1)
+  echo "}"
+}
 
-egrep="arne"
+function generate_blockdiag() {
+  local dir=/var/www/system-info
+  if [ ! -w $dir ]; then
+    return
+  fi
 
-for el in $local_ip_list; do
-  egrep="127.0.|$el"
-done
+  local tmp=$dir/${HOSTNAME}.blockdiag
+  echo "$@" > $tmp
+  local png_file=$dir/${HOSTNAME}.png
+  blockdiag -o $png_file $tmp
 
-print_un_ordered_list_start
+  print_h2_header "Current archicture overview"
+  print_pre_text "${HOSTNAME}'s diagram: http://${HOSTNAME}:5678/${HOSTNAME}.png"
+}
+
+function get_outbound_connections() {
+  local local_ip_list=$(/sbin/ifconfig | \
+    grep inet | \
+    grep -v inet6 | \
+    grep -v 127.0 | \
+    cut -d':' -f2 | \
+    cut -d' ' -f1)
+
+  local egrep="127.0."
+
+  for el in $local_ip_list; do
+    egrep="${egrep}|$el"
+  done
 
-netstat --numeric --program --tcp 2>/dev/null | \
-  grep ESTABLISHED | \
-  awk '{print $5,$7}' | \
-  sed 's/-$//g' | \
-  egrep -v "$egrep" | \
-  column -t | \
-  sort | while read f; do
-  # here we could also create graphics $f contains both destination
-  # IP, port and originating PID and program
-  print_list_item "$f"
+  netstat --numeric --program --tcp 2>/dev/null | \
+    grep ESTABLISHED | \
+    awk '{print $7,$5}' | \
+    sed 's/-$//g' | \
+    egrep -v "$egrep" | \
+    column -t | \
+    uniq -c | \
+    sort -r | \
+    sed 's/^[ ]*//g'
+}
+
+function create_diagram_if_possible() {
+  if [ -r /etc/default/system-info ]; then
+    source /etc/default/system-info
+    if [ ${do_not_generate_diagram-0} -eq 1 ]; then
+      return
+    fi
+  fi
+
+  which blockdiag 1>/dev/null
+  if [ $? -eq 0 ]; then
+    blockdiag_src=$(create_blockdiag_src "$outbound_connections")
+    generate_blockdiag "$blockdiag_src"
+  fi
+}
+
+print_h2_header "List of ${HOSTNAME}'s outgoing connections"
+print_un_ordered_list_start
+outbound_connections="$(get_outbound_connections)"
+echo "$outbound_connections"  | while read f; do
+  read count program target <<< "$f"
+  print_list_item "$program $count conns -> $target"
 done
 print_un_ordered_list_end
 
-print_section_end
+create_diagram_if_possible

From 85ce6c208863238e0a467333812fed72b942542a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 3 Jul 2012 22:25:04 +0200
Subject: [PATCH 0916/2585] - if -s is passed to system-info, the outgoing
 connections will not be   listed (temporaries=0).

---
 .../55-list-outgoing-connections.sh           | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/55-list-outgoing-connections.sh b/usr/share/escenic/ece-scripts/system-info.d/55-list-outgoing-connections.sh
index c63be2fc..ad99722f 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/55-list-outgoing-connections.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/55-list-outgoing-connections.sh
@@ -73,13 +73,22 @@ function create_diagram_if_possible() {
   fi
 }
 
-print_h2_header "List of ${HOSTNAME}'s outgoing connections"
-print_un_ordered_list_start
 outbound_connections="$(get_outbound_connections)"
-echo "$outbound_connections"  | while read f; do
-  read count program target <<< "$f"
-  print_list_item "$program $count conns -> $target"
-done
-print_un_ordered_list_end
 
+function list_outgoing_connections() {
+  if [ ${temporaries-1} -eq 0 ]; then
+    return
+  fi
+  
+  print_h2_header "List of ${HOSTNAME}'s outgoing connections"
+  print_un_ordered_list_start
+  echo "$outbound_connections"  | while read f; do
+    read count program target <<< "$f"
+    print_list_item "$program $count conns -> $target"
+  done
+  print_un_ordered_list_end
+
+}
+
+list_outgoing_connections
 create_diagram_if_possible

From 3f77938f374552c8ea6db31b52f08d40db1e0365 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 3 Jul 2012 22:33:53 +0200
Subject: [PATCH 0917/2585] - added conffiles file to the Debian package
 configuration. This   should ensure that the /etc/default/ece and
 /etc/escenic/ece.conf   are neither upgraded nor removed without explicit
 user intervention.

---
 .../debian/escenic-content-engine-scripts/conffiles            | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/conffiles

diff --git a/usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/conffiles b/usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/conffiles
new file mode 100644
index 00000000..f33dc4c2
--- /dev/null
+++ b/usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/conffiles
@@ -0,0 +1,3 @@
+/etc/default/ece
+/etc/escenic/ece.conf
+

From cc5aad39250c34e29fc3cd7a9fcbbe57565b5dfb Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 3 Jul 2012 22:35:26 +0200
Subject: [PATCH 0918/2585] - added conffiles file as a part of issue #83

---
 .../debian/escenic-content-engine-scripts/conffiles              | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/conffiles b/usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/conffiles
index f33dc4c2..d317f496 100644
--- a/usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/conffiles
+++ b/usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/conffiles
@@ -1,3 +1,4 @@
 /etc/default/ece
 /etc/escenic/ece.conf
 
+

From 8aa47d1f00d0750b239bba5d71025a223f21e356 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@cochise.vizrt.internal>
Date: Wed, 4 Jul 2012 09:11:46 +0200
Subject: [PATCH 0919/2585] - added system-info defaults files - added
 conffiles control file for the escenic-common-scripts package

---
 etc/default/system-info                                        | 3 +++
 .../package-scripts/debian/escenic-common-scripts/conffiles    | 1 +
 .../debian/escenic-content-engine-scripts/conffiles            | 2 --
 3 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 etc/default/system-info
 create mode 100644 usr/share/escenic/package-scripts/debian/escenic-common-scripts/conffiles

diff --git a/etc/default/system-info b/etc/default/system-info
new file mode 100644
index 00000000..ec078780
--- /dev/null
+++ b/etc/default/system-info
@@ -0,0 +1,3 @@
+# If you have blockdiag installed, but don't want system-info to
+# generate diagrams, uncomment the following line:
+# do_not_generate_diagram=1
diff --git a/usr/share/escenic/package-scripts/debian/escenic-common-scripts/conffiles b/usr/share/escenic/package-scripts/debian/escenic-common-scripts/conffiles
new file mode 100644
index 00000000..da2640f2
--- /dev/null
+++ b/usr/share/escenic/package-scripts/debian/escenic-common-scripts/conffiles
@@ -0,0 +1 @@
+/etc/default/system-info
diff --git a/usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/conffiles b/usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/conffiles
index d317f496..e3c5657d 100644
--- a/usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/conffiles
+++ b/usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/conffiles
@@ -1,4 +1,2 @@
 /etc/default/ece
 /etc/escenic/ece.conf
-
-

From f0ffcd173c09ff4e071cff943a3dbd7d15172d7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Wed, 4 Jul 2012 14:03:30 +0200
Subject: [PATCH 0920/2585] Added new script builder.sh used for managing the
 builder.

---
 usr/share/escenic/build-scripts/builder.sh | 150 +++++++++++++++++++++
 1 file changed, 150 insertions(+)
 create mode 100755 usr/share/escenic/build-scripts/builder.sh

diff --git a/usr/share/escenic/build-scripts/builder.sh b/usr/share/escenic/build-scripts/builder.sh
new file mode 100755
index 00000000..ad20c98d
--- /dev/null
+++ b/usr/share/escenic/build-scripts/builder.sh
@@ -0,0 +1,150 @@
+#! /usr/bin/env bash
+################################################################################
+#
+# Script for managing "the builder"
+#
+################################################################################
+
+# Common variables
+ece_scripts_home=/usr/share/escenic/ece-scripts
+log=~/builder.log
+pid_file=~/builder.pid
+root_dir=~/
+
+##
+function fetch_configuration
+{
+  conf_file=~/builder.conf
+  source $conf_file
+}
+
+##
+function init
+{
+  source $ece_scripts_home/common-bashing.sh
+  source $ece_scripts_home/common-io.sh
+}
+
+## TODO - doc
+function set_pid {
+  if [ -e $pid_file ]; then
+    print "Instance of $(basename $0) already running!"
+    exit 1
+  else
+    echo $BASHPID > $pid_file
+  fi
+}
+
+function common_post_action {
+  run rm $pid_file
+}
+
+##
+function get_user_options
+{
+  while getopts ":a:l:u:" opt; do
+    case $opt in
+      a)
+        echo "Add artifact ${OPTARG}!"
+	add_artifact ${OPTARG}
+        ;;
+      l)
+        echo "Add list of artifacts ${OPTARG}!"
+        for f in $(cat ${OPTARG}); 
+        do
+          add_artifact $f
+        done
+        ;;
+      u)
+        echo "Add user ${OPTARG}!"
+	;;
+      \?)
+        print "Invalid option: -$OPTARG" >&2
+        remove_pid_and_exit_in_error
+        ;;
+      :)
+        print "Option -$OPTARG requires an argument." >&2
+        remove_pid_and_exit_in_error
+        ;;
+    esac
+  done
+
+}
+
+##
+function add_artifact 
+{
+  engine_found=0
+  plugin_found=0
+  plugin_pattern=""
+  if [ -e "$root_dir/downloads" ]; then
+    run rm -rf $root_dir/downloads
+    make_dir $root_dir/downloads
+    make_dir $root_dir/downloads/unpack
+  fi
+  if [[ "$1" == *\/engine-* ]]; then
+    engine_found=1
+    print ""
+  fi
+  for f in $escenic_plugin_indentifiers; do
+    if [[ "$1" == *$f* ]]; then
+      plugin_found=1
+      plugin_pattern=$f
+    fi
+  done  
+  if [ $engine_found -eq 1 ] && [ $plugin_found -eq 1 ]; then
+    print "The requested resource $1 has been identified as both an engine and a plugin. Exiting!" >&2
+    remove_pid_and_exit_in_error
+  elif [ $engine_found -eq 1 ]; then
+    run wget --http-user=$technet_user --http-password=$technet_password $1 -O $root_dir/downloads/unpack/resource.zip
+    run cd $root_dir/downloads/unpack
+    run unzip $root_dir/downloads/unpack/resource.zip
+    for f in $(ls -d $root_dir/downloads/unpack/*);
+      do
+        filename=$(basename "$f")
+        echo "$filename" | grep '[0-9]' | grep -q 'engine'
+        if [ $? = 0 ]; then
+          echo "Directory contains numbers and \"engine\" so it is most likely valid!"
+          if [ ! -d "$root_dir/engine/$filename" ]; then
+            run mv $f $root_dir/engine/.
+          else
+            print_and_log "$root_dir/engine/$filename already exists and will be ignored!"
+          fi 
+        fi
+    done
+  elif [ $plugin_found -eq 1 ]; then
+    run wget --http-user=$technet_user --http-password=$technet_password $1 -O $root_dir/downloads/unpack/resource.zip
+    run cd $root_dir/downloads/unpack
+    run unzip $root_dir/downloads/unpack/resource.zip
+    run rm -f $root_dir/downloads/unpack/resource.zip
+    for f in $(ls -d $root_dir/downloads/unpack/*);
+      do
+        filename=$(basename "$f")
+        echo "$filename" | grep '[0-9]' | grep -q "$plugin_pattern"
+        if [ $? = 0 ]; then
+          echo "Directory contains numbers and \"$plugin_pattern\" so it is most likely valid!"
+          if [ ! -d "$root_dir/plugins/$filename" ]; then
+            run mv $f $root_dir/plugins/.
+          else
+            print_and_log "$root_dir/plugins/$filename already exists and will be ignored!"
+          fi
+        else
+          test=`echo $1 | sed "s/.*-\(.*\)\.[a-zA-Z0-9]\{3\}$/\1/"`     
+          echo "$plugin_pattern-$test"
+          print_and_log "Resource $1 identified as a $plugin_pattern plugin, but failed the naming convention test after being unpacked, trying to recover..."
+          if [ ! -d $root_dir/plugins/$plugin_pattern-$test ]; then
+            run mv $f $root_dir/plugins/$plugin_pattern-$test
+          fi
+        fi
+    done
+  else
+    print_and_log "No valid resource identified using $1, exiting!"
+  fi
+}
+
+set_pid
+fetch_configuration
+init
+print_and_log "Starting building @ $(date)"
+get_user_options $@
+common_post_action

From 0986eb84f58f08db4c96070665a476fe644be076 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@cochise.vizrt.internal>
Date: Thu, 5 Jul 2012 10:01:51 +0200
Subject: [PATCH 0921/2585] - the (new) /etc/default/system-info wasn't
 included in the   escenic-common-scripts package setup.

  The building of the escenic-common-scripts now builds again.
---
 usr/share/escenic/package-scripts/create-packages | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 30f363cb..67536e7e 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-# script fro creating DEB and RPM packages of the vosa, ece-install
+# script for creating DEB and RPM packages of the vosa, ece-install
 # and ece scripts.
 
 # by tkj@vizrt.com
@@ -139,6 +139,7 @@ function set_up_escenic-common-scripts() {
   cp -r ../../../bin/system-info $target_dir/usr/bin/
   cp -r ../../escenic/ece-scripts/system-info.d \
     $target_dir/usr/share/escenic/ece-scripts/
+  cp ../../../../etc/default/system-info $target_dir/etc/default/
   cp -r ../../doc/escenic/system-info-guide.{org,html} \
     $target_dir/usr/share/doc/escenic
   

From 2bab5864204da86d3bfdb1c2585f87ad4c6a3a99 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@cochise.vizrt.internal>
Date: Thu, 5 Jul 2012 11:20:17 +0200
Subject: [PATCH 0922/2585] - will now give an overview of each ECE instance's
 errors sorted by   their count (currently only supports the log4j log):

      Overview of cohen's errors:
       |
        10 (com.escenic.framework.search.solr.SolrSearchEngine) solr search failed
        10 (com.escenic.framework.search.solr.action.SearchAction) Error while executing search
        1 (org.apache.xmlrpc.server.XmlRpcErrorLogger) Failed to parse XML-RPC request: Content is not allowed in prolog.

   If the silent parameters is passed (no temporaries), this listing
   is omitted.
---
 .../system-info.d/11-list-ece-overview.sh     | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh b/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
index 404a29d4..629ba660 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
@@ -38,6 +38,26 @@ function create_ece_overview() {
   done
   
   print_un_ordered_list_end
+
+  if [ ${temporaries-1} -eq 1 ]; then
+    list_error_overview_for_instance $1
+  fi
+}
+
+## $1 :: the instance name
+function list_error_overview_for_instance() {
+  local file=/var/log/escenic/${HOSTNAME}-${1}-messages
+  if [ ! -r $file ]; then
+    return
+  fi
+
+  print_h4_header "Overview of ${1}'s errors"
+  local errors="$(grep ERROR ${file} | cut -d' ' -f6- | sort | uniq -c | sort -n -r | sed 's/^[ ]*//g')"
+  if [ $(echo "$errors" | wc -c) -lt 5 ]; then
+      print_pre_text "There are no errors in today's log ($file)"
+  else
+      print_pre_text "$errors"
+  fi
 }
 
 function get_overview_of_all_instances() {

From d8d77961f64ad8da38042e024278c602d5f0448b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@cochise.vizrt.internal>
Date: Thu, 5 Jul 2012 11:38:55 +0200
Subject: [PATCH 0923/2585] - that grey background colour is SO hard to read

---
 usr/share/escenic/ece-scripts/vizrt.css | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/vizrt.css b/usr/share/escenic/ece-scripts/vizrt.css
index 1d1a95c6..c37a1225 100644
--- a/usr/share/escenic/ece-scripts/vizrt.css
+++ b/usr/share/escenic/ece-scripts/vizrt.css
@@ -3,10 +3,6 @@ body {
   margin: 70px 70px 0px 50px;
 }
 
-pre {
-  background-color: grey;
-}
-
 h1, h2, h3, h4 {
   color: #e88424;
 }

From c20c0a44d1dd1064176f679b11cb652339789538 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 5 Jul 2012 12:50:37 +0200
Subject: [PATCH 0924/2585] - ece deploy would complain if the directory of the
 state file,   typically /var/lib/escenic wasn't write-able. However, the
 error   message was confusing as it listed the .state file itself. Hence, if 
  the .state file was writable, but the directory was note, this would   lead
 to confusing error messages.

---
 usr/share/escenic/ece-scripts/ece.d/deploy.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/deploy.sh b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
index 462ca76b..91e6ef8c 100644
--- a/usr/share/escenic/ece-scripts/ece.d/deploy.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
@@ -22,7 +22,7 @@ function update_deployment_state_file() {
   local state_file=$(get_state_file)
 
   if [ ! -w $(dirname $state_file) ]; then
-    print_and_log "I cannot write to $state_file, I will exit :-("
+    print_and_log "I cannot write to $(dirname state_file), I will exit :-("
     exit 1
   fi
 

From 34f98c2f0f31b96fed05bf23c7716cbd520b2f3f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 5 Jul 2012 12:57:24 +0200
Subject: [PATCH 0925/2585] - commend out the chown-ing of directories when
 doing any init.d   operation.

  TODO make this configurable through /etc/default/ece For now, leave
  it out as it becomes real performance killer when run in production.
---
 etc/init.d/ece | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/etc/init.d/ece b/etc/init.d/ece
index 5b071337..a9bc2d5d 100755
--- a/etc/init.d/ece
+++ b/etc/init.d/ece
@@ -77,7 +77,12 @@ function ensure_dirs_are_ok()
         if [ ! -d $el ]; then
             mkdir -p $el
         fi
-        chown --changes -R $ece_unix_user:$ece_unix_group $el
+        
+        # TODO make this configurable through /etc/default/ece For
+        # now, leave it out as it becomes real performance killer when
+        # run in production.
+        #
+        # chown --changes -R $ece_unix_user:$ece_unix_group $el
     done
 }
 

From 02a247c156f5c7646301048fff990de8fc3bc13e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Thu, 5 Jul 2012 15:12:59 +0200
Subject: [PATCH 0926/2585] Changed maven goal package into install to include
 all possible build phases fro now...

---
 usr/share/escenic/build-scripts/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/build.sh b/usr/share/escenic/build-scripts/build.sh
index 1d78e915..a5b6b051 100755
--- a/usr/share/escenic/build-scripts/build.sh
+++ b/usr/share/escenic/build-scripts/build.sh
@@ -235,7 +235,7 @@ function release
   symlink_ece_components
 
   run cd $svn_src_dir
-  run mvn clean package
+  run mvn clean install
 
   run cd $svn_src_dir/vosa-assembly/target
   run unzip vosa-assembly.zip

From 3c88fdd8bf911d08a69d64bba46661bdfbfbc8ba Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@cochise.vizrt.internal>
Date: Fri, 6 Jul 2012 12:59:39 +0200
Subject: [PATCH 0927/2585] - increased the connection timeout from 3 to 5 when
 using curl to get   the public IP of the host

---
 usr/share/escenic/ece-scripts/system-info.d/55-list-ips.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/55-list-ips.sh b/usr/share/escenic/ece-scripts/system-info.d/55-list-ips.sh
index 609a524a..923b0f0f 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/55-list-ips.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/55-list-ips.sh
@@ -5,6 +5,6 @@ print_h3_header "Interfaces and their IPs"
 print_pre_text "$(/sbin/ifconfig | grep -v inet6 | egrep -v "127.0" | grep inet -B 1 | sed 's/--//g')"
 
 print_h3_header "${HOSTNAME}'s IP when accessing the world"
-print_pre_text "$(curl --silent --connect-timeout 3 ifconfig.me 2>/dev/null)"
+print_pre_text "$(curl --silent --connect-timeout 5 ifconfig.me 2>/dev/null)"
 
 print_section_end

From d931abdca123ab057d702aef0fe31f8e92745d2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Fri, 6 Jul 2012 15:20:46 +0200
Subject: [PATCH 0928/2585] Added support for WF 2.0

---
 usr/share/escenic/build-scripts/build.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/usr/share/escenic/build-scripts/build.sh b/usr/share/escenic/build-scripts/build.sh
index a5b6b051..c36ad334 100755
--- a/usr/share/escenic/build-scripts/build.sh
+++ b/usr/share/escenic/build-scripts/build.sh
@@ -195,6 +195,11 @@ function symlink_ece_components {
   # Version - Widget Framework Common
   parse_version WIDGET_FRAMEWORK_COMMON_VERSION vosa.widget-framework-common.version
   symlink_distribution plugins/widget-framework-common-$WIDGET_FRAMEWORK_COMMON_VERSION plugins/widget-framework-common
+
+  # Version - Widget Framework
+  parse_version WIDGET_FRAMEWORK_VERSION vosa.widget-framework.version
+  symlink_distribution plugins/widget-framework-$WIDGET_FRAMEWORK_VERSION plugins/widget-framework
+
 }
 
 # symlink .war files from target/

From 4444505d200e7a84c54a324d073c2149befba241 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Fri, 6 Jul 2012 15:44:45 +0200
Subject: [PATCH 0929/2585] Compensated for the name core in WF release

---
 usr/share/escenic/build-scripts/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/build.sh b/usr/share/escenic/build-scripts/build.sh
index c36ad334..e55c4244 100755
--- a/usr/share/escenic/build-scripts/build.sh
+++ b/usr/share/escenic/build-scripts/build.sh
@@ -198,7 +198,7 @@ function symlink_ece_components {
 
   # Version - Widget Framework
   parse_version WIDGET_FRAMEWORK_VERSION vosa.widget-framework.version
-  symlink_distribution plugins/widget-framework-$WIDGET_FRAMEWORK_VERSION plugins/widget-framework
+  symlink_distribution plugins/widget-framework-core-$WIDGET_FRAMEWORK_VERSION plugins/widget-framework
 
 }
 

From e5644023e34d5d50bb21e47b6c9e5f064d0838e5 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 6 Jul 2012 16:45:53 +0200
Subject: [PATCH 0930/2585] - ece info will now generate an architecture
 diagram in blockdiag   format for each of the ECE instances:

  [ece#engine-cohen] Architecture diagram:
  [ece#engine-cohen] |-> /var/cache/escenic/cohen.blockdiag

  It will provide the current architecture of the running instance,
  complete with number of connections to the various external services
  such as the database and search/solr.
---
 usr/share/escenic/ece-scripts/ece.d/info.sh | 39 +++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece.d/info.sh b/usr/share/escenic/ece-scripts/ece.d/info.sh
index 11644bd9..e0a845b5 100644
--- a/usr/share/escenic/ece-scripts/ece.d/info.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/info.sh
@@ -52,6 +52,7 @@ function get_info_for_type() {
   fi
 
   print_deployment_state
+  create_block_diag_for_instance
 }
 
 print_deployment_state() {
@@ -135,3 +136,41 @@ function print_tomcat_resources() {
     print "|-> user $USER cannot read $file"
   fi
 }
+
+## doesn't use /etc/services on purpose
+function visualise_known_ports() {
+  local the_host=$(echo $1 | cut -d':' -f1)
+  local the_port=$(echo $1 | cut -d':' -f2)
+
+  echo ${the_host}:${the_port} | \
+    sed \
+    -e 's/8080/ece/g' \
+    -e 's/8081/eae/g' \
+    -e 's/3306/mysql/g' \
+    -e 's/22/ssh/g' \
+    -e 's/11211/memcached/g'
+}
+
+function create_block_diag_for_instance() {
+  local file=/var/cache/escenic/${instance}.blockdiag
+  cat > ${file} <<EOF
+blockdiag {
+  ${instance} [ color = "red" ];
+EOF
+  netstat -nap 2>/dev/null | \
+    grep ${type_pid} | \
+    grep -v LISTEN | \
+    awk '{print $5}' | \
+    uniq -c | while read f; do
+    read count to <<< $f
+    cat >> $file <<EOF
+  "$(visualise_known_ports $to)";
+  ${instance} -> "$(visualise_known_ports $to)" [ label = "${count} conns" ];
+EOF
+  done
+
+  echo "}" >> $file
+  
+  print "Architecture diagram:"
+  print "|-> $file"
+}

From 7b114ce81b5fe1ebc2d5b5c16b994ebd2fe02e3f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 6 Jul 2012 16:54:01 +0200
Subject: [PATCH 0931/2585] - only TCP connections are interesting (for now)

---
 usr/share/escenic/ece-scripts/ece.d/info.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/info.sh b/usr/share/escenic/ece-scripts/ece.d/info.sh
index e0a845b5..42891e58 100644
--- a/usr/share/escenic/ece-scripts/ece.d/info.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/info.sh
@@ -157,7 +157,7 @@ function create_block_diag_for_instance() {
 blockdiag {
   ${instance} [ color = "red" ];
 EOF
-  netstat -nap 2>/dev/null | \
+  netstat -nap --tcp 2>/dev/null | \
     grep ${type_pid} | \
     grep -v LISTEN | \
     awk '{print $5}' | \

From 4aedc4b3beed74d8177621ebe623a32a841d6416 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 9 Jul 2012 16:33:41 +0200
Subject: [PATCH 0932/2585] - added new setting to ece.conf:

  enable_memcached_support=0 (default is 1)

  making it possible to turn off memcached support if a user really,
  really wants it.
---
 usr/share/escenic/ece-scripts/ece.d/deploy.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/deploy.sh b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
index 91e6ef8c..e880cdaa 100644
--- a/usr/share/escenic/ece-scripts/ece.d/deploy.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
@@ -152,8 +152,11 @@ function deploy() {
           jar xf $war \
             1>>$log \
             2>>$log)
-        add_memcached_support $tomcat_base/webapps/$name
         exit_on_error "extracting $war to $tomcat_base/webapps/"
+        
+        if [ ${enable_memcached_support-1} -eq 1 ]; then
+          add_memcached_support $tomcat_base/webapps/$name
+        fi
       done
       ;;
     

From 55ad69a8905027f2568f0ad7be242239cdb74e98 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 9 Jul 2012 16:54:47 +0200
Subject: [PATCH 0933/2585] - added documentation on how to use the new
 turn-off-memcached feature

---
 etc/escenic/ece.conf | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/etc/escenic/ece.conf b/etc/escenic/ece.conf
index e3f1da58..f56a52eb 100644
--- a/etc/escenic/ece.conf
+++ b/etc/escenic/ece.conf
@@ -85,6 +85,13 @@ tmp_dir=/tmp
 # 
 # deploy_webapp_white_list="escenic-admin pbe"
 
+########################################################################
+# Memcached support.  'ece -i <intance> deploy' will per default add
+# support for using memcached with your publication. If you wish to
+# turn this off, you can set this value to 0.
+########################################################################
+# enable_memcached_support=1
+
 ########################################################################
 # Where to find the various application servers
 ########################################################################

From a2e7b856e26b029a0a4bf1596e2ac1b5db66819c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@cochise.vizrt.internal>
Date: Tue, 10 Jul 2012 11:06:17 +0200
Subject: [PATCH 0934/2585]     # Debian testing has started to report just
 testing instead of a     # relase number. Assessed 2012-07-05 10:34

---
 .../escenic/ece-scripts/ece-install.d/content-engine.sh   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 32f8e779..f8c397e5 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -510,8 +510,12 @@ function install_ece_third_party_packages
       local version_needs_local_java_deb=610
       local version=$(lsb_release -s -r | sed "s#\.##g")
     fi
-    
-    if [ $version -ge $version_needs_local_java_deb -a \
+
+    # Debian testing has started to report just testing instead of a
+    # relase number. Assessed 2012-07-05 10:34
+    if [[ $version == "testing" ]]; then
+      create_java_deb_packages_and_repo
+    elif [ $version -ge $version_needs_local_java_deb -a \
       $(has_sun_java_installed) -eq 0 ]; then
       create_java_deb_packages_and_repo
     fi

From daa5ccc86f50a6311865a000c831ddef8c015760 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 11 Jul 2012 16:50:13 +0200
Subject: [PATCH 0935/2585] - added ece -V && ece --version. Right now, the
 version outputted is a   hard coded value in the script (since git doesn't
 have keyword   expansion).

  TODO will add some magic to the build script to insert the version
  string used for creating the DEB/RPM packages.
---
 usr/bin/ece | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/usr/bin/ece b/usr/bin/ece
index 339f2d64..8e0aa3bb 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -19,6 +19,7 @@ escenic_conf_dir=/etc/escenic
 # Dear user, don't touch anyting in this script, especially below this
 # line :-)
 ######################################################################
+ece_script_version="github-2012-07-11 16:37"
 type=engine
 instance=default
 command=""
@@ -654,6 +655,9 @@ function set_type_command_and_instance() {
         elif [ "$el" == "--exclude-state" ]; then
             backup_exclude_state=1
             continue
+        elif [ "$el" == "--version" -o "$el" == "-V" ]; then
+             echo "$(basename $0) version:" $ece_script_version
+             exit 0
         fi
         
         # the only thing left at this point, is the command

From 6fc8a5744fd2523d2845869decb3a84b2a6b5fff Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 13 Jul 2012 09:53:57 +0200
Subject: [PATCH 0936/2585] - the init.d script will now only (create if it
 doesn't exist) and   change the ownership of the root of the escenic related 
  directories.

  This should address both the performance hit of running the
  recursive chowns, as well as ensure that the directories, especially
  /var/run, are writeable for the user running the /usr/bin/ece
  script. This is needed also for "read-only" commands, like "ece
  status".
---
 etc/init.d/ece | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/etc/init.d/ece b/etc/init.d/ece
index a9bc2d5d..0c358b76 100755
--- a/etc/init.d/ece
+++ b/etc/init.d/ece
@@ -78,12 +78,9 @@ function ensure_dirs_are_ok()
             mkdir -p $el
         fi
         
-        # TODO make this configurable through /etc/default/ece For
-        # now, leave it out as it becomes real performance killer when
-        # run in production.
-        #
-        # chown --changes -R $ece_unix_user:$ece_unix_group $el
+        chown --changes $ece_unix_user:$ece_unix_group $el
     done
+
 }
 
 function ensure_ece_script_is_ok()

From c6327bf88d6efae2f2176e10389c402b41f3797f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Fri, 13 Jul 2012 13:43:31 +0200
Subject: [PATCH 0937/2585] build.sh now accepts svn_path with and without a
 trailing '/'

---
 usr/share/escenic/build-scripts/build.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/usr/share/escenic/build-scripts/build.sh b/usr/share/escenic/build-scripts/build.sh
index e55c4244..cac535e0 100755
--- a/usr/share/escenic/build-scripts/build.sh
+++ b/usr/share/escenic/build-scripts/build.sh
@@ -77,6 +77,8 @@ function get_user_options
 function verify_configuration {
   ensure_variable_is_set customer
   ensure_variable_is_set svn_base
+  # append a / if not present
+  [[ $svn_base != */ ]] && $svn_base="$svn_base"/
   ensure_variable_is_set svn_user
   ensure_variable_is_set svn_password
 }

From 07e2d586fd5875845a7c9435e7a151627714cddf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Fri, 13 Jul 2012 13:46:02 +0200
Subject: [PATCH 0938/2585] removed duplicate build start message

---
 usr/share/escenic/build-scripts/build.sh | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/usr/share/escenic/build-scripts/build.sh b/usr/share/escenic/build-scripts/build.sh
index cac535e0..ad62a182 100755
--- a/usr/share/escenic/build-scripts/build.sh
+++ b/usr/share/escenic/build-scripts/build.sh
@@ -225,20 +225,17 @@ function symlink_target {
 ##
 function release 
 {
-  print_and_log "Starting build @ $(date) ..."
-  
   home_preparation
-
+  
   run svn_checkout
-
+  
   revision=`svn info $svn_src_dir | grep -i Revision | awk '{print $2}'`
   
   if [ -z "$revision" ]; then
     print_and_log "Failed to fetch current revision number, exiting! :-("
     remove_pid_and_exit_in_error
   fi
-
-
+  
   symlink_ece_components
 
   run cd $svn_src_dir

From d851fe5e7393a239dc43d7cc573651a9dcec580f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Fri, 13 Jul 2012 13:49:59 +0200
Subject: [PATCH 0939/2585] build.sh is now more robust to missing folders in
 assemblytool_home

---
 usr/share/escenic/build-scripts/build.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/usr/share/escenic/build-scripts/build.sh b/usr/share/escenic/build-scripts/build.sh
index ad62a182..db1a8a83 100755
--- a/usr/share/escenic/build-scripts/build.sh
+++ b/usr/share/escenic/build-scripts/build.sh
@@ -89,6 +89,14 @@ function verify_vosa {
     print_and_log "$assemblytool_root_dir is required, but it doesn't exist!"
     remove_pid_and_exit_in_error
   fi
+  if [ ! -d $assemblytool_pub_dir ]; then
+    print_and_log "$assemblytool_pub_dir did not exist so it has been created."
+    make_dir $assemblytool_pub_dir
+  fi
+  if [ ! -d $assemblytool_lib_dir ]; then
+    print_and_log "$assemblytool_lib_dir did not exist so it has been created."
+    make_dir $assemblytool_lib_dir
+  fi
   if [ ! -d $release_dir ]; then
     print_and_log "$release_dir did not exist so it has been created."
     make_dir $release_dir

From 5d2c31e6f58d372251b9a5856ddf1c338470e95d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Fri, 13 Jul 2012 14:05:55 +0200
Subject: [PATCH 0940/2585] build.sh - fixed error in appending / to svn_path

---
 usr/share/escenic/build-scripts/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/build.sh b/usr/share/escenic/build-scripts/build.sh
index db1a8a83..16892057 100755
--- a/usr/share/escenic/build-scripts/build.sh
+++ b/usr/share/escenic/build-scripts/build.sh
@@ -78,7 +78,7 @@ function verify_configuration {
   ensure_variable_is_set customer
   ensure_variable_is_set svn_base
   # append a / if not present
-  [[ $svn_base != */ ]] && $svn_base="$svn_base"/
+  [[ $svn_base != */ ]] && svn_base="$svn_base"/
   ensure_variable_is_set svn_user
   ensure_variable_is_set svn_password
 }

From fa166625b18cf79afbae3b6abf7b95c997ef462b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Fri, 13 Jul 2012 14:50:33 +0200
Subject: [PATCH 0941/2585] builder.sh - added new script for managing builder

---
 usr/share/escenic/build-scripts/builder.sh | 247 ++++++++++++++++++---
 1 file changed, 213 insertions(+), 34 deletions(-)

diff --git a/usr/share/escenic/build-scripts/builder.sh b/usr/share/escenic/build-scripts/builder.sh
index ad20c98d..01f26517 100755
--- a/usr/share/escenic/build-scripts/builder.sh
+++ b/usr/share/escenic/build-scripts/builder.sh
@@ -11,30 +11,91 @@ log=~/builder.log
 pid_file=~/builder.pid
 root_dir=~/
 
-##
-function fetch_configuration
-{
-  conf_file=~/builder.conf
-  source $conf_file
-}
+# Commands
+add_user=0
+add_artifact=0
+add_artifact_list=0
+
+# Command variables
+list_path=
+artifact_path=
+user_name=
+user_svn_path=
+user_svn_username=
+user_maven_username=
+user_svn_password="CHANGE_ME"
+user_maven_password="CHANGE_ME"
 
 ##
 function init
 {
-  source $ece_scripts_home/common-bashing.sh
-  source $ece_scripts_home/common-io.sh
+  init_failed=0
+  error_message=""
+  if [ ! -d $ece_scripts_home ]; then
+    init_failed=1
+    error_message="The directory for ece-scripts $ece_scripts_home does not exist, exiting!"
+  elif [ ! -e $ece_scripts_home/common-bashing.sh ]; then
+    init_failed=1
+    error_message="The script $ece_scripts_home/common-bashing.sh does not exist, exiting!"
+  elif [ ! -e $ece_scripts_home/common-io.sh ]; then
+    init_failed=1
+    error_message="The script $ece_scripts_home/common-io.sh does not exist, exiting!"
+  fi
+  if [ $init_failed -eq 0 ]; then
+    source $ece_scripts_home/common-bashing.sh
+    source $ece_scripts_home/common-io.sh
+  else
+    echo "$error_message"
+    exit 1
+  fi
 }
 
-## TODO - doc
-function set_pid {
+##
+function set_pid 
+{
   if [ -e $pid_file ]; then
-    print "Instance of $(basename $0) already running!"
+    print_and_log "Instance of $(basename $0) already running!"
     exit 1
   else
     echo $BASHPID > $pid_file
   fi
 }
 
+##
+function verify_root_privilege
+{
+  if [ "$(id -u)" != "0" ]; then
+    print_and_log "This script must be run as root"
+    remove_pid_and_exit_in_error
+  fi
+}
+
+##
+function enforce_variable
+{
+  if [ ! -n "$(eval echo $`echo $1`)" ]; then
+    print_and_log "$2"
+    remove_pid_and_exit_in_error
+  fi
+}
+
+function ensure_no_user_conflict
+{
+  if [ ! -z "$(getent passwd $user_name)" ]; then
+    print_and_log "User $user_name already exist!"
+    remove_pid_and_exit_in_error
+  fi
+  if [ -d /home/$user_name ]; then
+    print_and_log "User $user_name does not exist, but has a home folder!"
+    remove_pid_and_exit_in_error
+  fi
+  if [ -d /var/www/$user_name ]; then
+    print_and_log "User $user_name does not exist, but has a web root under /var/www/$user_name !"
+    remove_pid_and_exit_in_error
+  fi
+}
+
+##
 function common_post_action {
   run rm $pid_file
 }
@@ -42,28 +103,50 @@ function common_post_action {
 ##
 function get_user_options
 {
-  while getopts ":a:l:u:" opt; do
+  while getopts ":a:l:u:c:s:m:p:" opt; do
     case $opt in
       a)
-        echo "Add artifact ${OPTARG}!"
-	add_artifact ${OPTARG}
+        print_and_log "Adding artifact ${OPTARG}..."
+	add_artifact=1
+        artifact_path=${OPTARG}
         ;;
       l)
-        echo "Add list of artifacts ${OPTARG}!"
-        for f in $(cat ${OPTARG}); 
-        do
-          add_artifact $f
-        done
+        print_and_log "Adding list of artifacts ${OPTARG}..."
+        add_artifact_list=1
+        list_path=${OPTARG}
         ;;
       u)
-        echo "Add user ${OPTARG}!"
-	;;
+        print_and_log "Adding user ${OPTARG}..."
+        add_user=1          
+        user_name=${OPTARG}
+	ensure_no_user_conflict
+        ;;
+      c)
+        print_and_log "Using svn path: ${OPTARG}."
+        user_svn_path=${OPTARG}
+        ;;
+      s)
+        print_and_log "Using svn username: ${OPTARG}!"
+        user_svn_username=${OPTARG}
+        ;;
+      m)
+        print_and_log "Using maven username: ${OPTARG}!"
+        user_maven_username=${OPTARG}
+        ;;
+      p)
+        print_and_log "Using password file: ${OPTARG}!"
+        user_password_file=${OPTARG}
+        if [ ! -e $user_password_file ]; then
+          print_and_log "Provided password file does not exist, exiting!" >&2
+          remove_pid_and_exit_in_error
+        fi
+        ;;
       \?)
-        print "Invalid option: -$OPTARG" >&2
+        print_and_log "Invalid option: -$OPTARG" >&2
         remove_pid_and_exit_in_error
         ;;
       :)
-        print "Option -$OPTARG requires an argument." >&2
+        print_and_log "Option -$OPTARG requires an argument." >&2
         remove_pid_and_exit_in_error
         ;;
     esac
@@ -71,6 +154,77 @@ function get_user_options
 
 }
 
+##
+function execute
+{
+  if [ $add_user -eq 1 ]; then
+    verify_add_user
+    add_user
+  elif [ $add_artifact -eq 1 ]; then
+    verify_add_artifact
+    add_artifact
+  elif [ $add_artifact_list -eq 1 ]; then
+    verify_add_artifact_list
+    add_artifact_list
+  else
+    print_and_log "No valid action chosen, exiting!" >&2
+    remove_pid_and_exit_in_error
+  fi
+}
+
+##
+function verify_add_user 
+{
+  enforce_variable user_name "You need to provide your username using the -u flag."
+  ensure_no_user_conflict
+  enforce_variable user_svn_path "You need to provide your svn path using the -c flag."
+  enforce_variable user_svn_username "You need to provide your svn username using the -s flag."
+  enforce_variable user_maven_username "You need to provide your maven username using the -m flag."
+  if [ -e "$user_password_file" ]; then
+    source $user_password_file
+    enforce_variable svn_password "The variable svn_password needs to be present in $user_password_file."
+    enforce_variable maven_password "The variable maven_password needs to be present in $user_password_file."
+    user_svn_password=$svn_password
+    user_maven_password=$maven_password
+  fi
+}
+
+##
+function add_user
+{
+  run useradd -m -s /bin/bash $user_name
+  run ln -s /usr/share/escenic/build-scripts/build.sh /home/$user_name/build.sh
+  echo "customer=$user_name
+svn_base=$user_svn_path
+svn_user=$user_svn_username
+svn_password=$user_svn_password
+ece_scripts_home=/usr/share/escenic/ece-scripts" > /home/$user_name/build.conf
+  run chown $user_name:$user_name /home/$user_name/build.conf
+  run rsync -av /home/vosa/skel/ /home/$user_name
+  run sed -i "s/maven.username/$user_maven_username/" /home/$user_name/.m2/settings.xml
+  run sed -i "s/maven.password/$user_maven_password/" /home/$user_name/.m2/settings.xml
+  run chown -R $user_name:$user_name /home/$user_name
+  if [ ! -d /var/www/$user_name ]; then
+    make_dir /var/www/$user_name
+    run chown www-data:www-data /var/www/$user_name  
+  else
+    print_and_log "Failed to add web root /var/www/$user_name !"
+    remove_pid_and_exit_in_error
+  fi
+  if [ ! -h /var/www/$user_name/releases ]; then
+    run ln -s /home/$user_name/releases /var/www/$user_name/releases
+  else
+    print_and_log "Failed to add symlink for /var/www/$user_name/releases !"
+    remove_pid_and_exit_in_error
+  fi
+}
+
+##
+function verify_add_artifact
+{
+  enforce_variable artifact_path "You need to provide a valid artifact URL using the -a flag."
+}
+
 ##
 function add_artifact 
 {
@@ -82,21 +236,21 @@ function add_artifact
     make_dir $root_dir/downloads
     make_dir $root_dir/downloads/unpack
   fi
-  if [[ "$1" == *\/engine-* ]]; then
+  if [[ "$artifact_path" == *\/engine-* ]]; then
     engine_found=1
     print ""
   fi
   for f in $escenic_plugin_indentifiers; do
-    if [[ "$1" == *$f* ]]; then
+    if [[ "$artifact_path" == *$f* ]]; then
       plugin_found=1
       plugin_pattern=$f
     fi
   done  
   if [ $engine_found -eq 1 ] && [ $plugin_found -eq 1 ]; then
-    print "The requested resource $1 has been identified as both an engine and a plugin. Exiting!" >&2
+    print_and_log "The requested resource $artifact_path has been identified as both an engine and a plugin. Exiting!" >&2
     remove_pid_and_exit_in_error
   elif [ $engine_found -eq 1 ]; then
-    run wget --http-user=$technet_user --http-password=$technet_password $1 -O $root_dir/downloads/unpack/resource.zip
+    run wget --http-user=$technet_user --http-password=$technet_password $artifact_path -O $root_dir/downloads/unpack/resource.zip
     run cd $root_dir/downloads/unpack
     run unzip $root_dir/downloads/unpack/resource.zip
     for f in $(ls -d $root_dir/downloads/unpack/*);
@@ -113,7 +267,7 @@ function add_artifact
         fi
     done
   elif [ $plugin_found -eq 1 ]; then
-    run wget --http-user=$technet_user --http-password=$technet_password $1 -O $root_dir/downloads/unpack/resource.zip
+    run wget --http-user=$technet_user --http-password=$technet_password $artifact_path -O $root_dir/downloads/unpack/resource.zip
     run cd $root_dir/downloads/unpack
     run unzip $root_dir/downloads/unpack/resource.zip
     run rm -f $root_dir/downloads/unpack/resource.zip
@@ -129,22 +283,47 @@ function add_artifact
             print_and_log "$root_dir/plugins/$filename already exists and will be ignored!"
           fi
         else
-          test=`echo $1 | sed "s/.*-\(.*\)\.[a-zA-Z0-9]\{3\}$/\1/"`     
+          test=`echo $artifact_path | sed "s/.*-\(.*\)\.[a-zA-Z0-9]\{3\}$/\1/"`     
           echo "$plugin_pattern-$test"
-          print_and_log "Resource $1 identified as a $plugin_pattern plugin, but failed the naming convention test after being unpacked, trying to recover..."
+          print_and_log "Resource $artifact_path identified as a $plugin_pattern plugin, but failed the naming convention test after being unpacked, trying to recover..."
           if [ ! -d $root_dir/plugins/$plugin_pattern-$test ]; then
             run mv $f $root_dir/plugins/$plugin_pattern-$test
           fi
         fi
     done
   else
-    print_and_log "No valid resource identified using $1, exiting!"
+    print_and_log "No valid resource identified using $artifact_path, exiting!"
   fi
 }
 
-set_pid
-fetch_configuration
+##
+function verify_add_artifact_list
+{
+  enforce_variable list_path "You need to provide a valid path to your artifact list file using the -l flag."
+  if [ ! -e $list_path ]; then
+    print_and_log "The file $list_path does not exist!, exiting!" >&2
+    remove_pid_and_exit_in_error
+  fi
+}
+
+##
+function add_artifact_list
+{
+  for f in $(cat $list_path);
+  do
+    add_artifact $f
+  done
+}
+
+#####################################################
+# Run commands
+#####################################################
 init
-print_and_log "Starting building @ $(date)"
+set_pid
+verify_root_privilege
+print_and_log "Starting process @ $(date)"
+print_and_log "Additional output can be found in $log_file"
 get_user_options $@
+execute
 common_post_action
+print_and_log "Done! @ $(date)"

From 8eb92b90d6ea3fee5ab819d43c937372fd43f47a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Fri, 13 Jul 2012 15:37:10 +0200
Subject: [PATCH 0942/2585] builder.sh - Add feature for setting up a new
 builder

---
 usr/share/escenic/build-scripts/builder.sh | 109 ++++++++++++++++++++-
 1 file changed, 105 insertions(+), 4 deletions(-)

diff --git a/usr/share/escenic/build-scripts/builder.sh b/usr/share/escenic/build-scripts/builder.sh
index 01f26517..0f951598 100755
--- a/usr/share/escenic/build-scripts/builder.sh
+++ b/usr/share/escenic/build-scripts/builder.sh
@@ -15,10 +15,13 @@ root_dir=~/
 add_user=0
 add_artifact=0
 add_artifact_list=0
+setup_builder=0
 
-# Command variables
+# Add artifact variables
 list_path=
 artifact_path=
+
+# Add user variables
 user_name=
 user_svn_path=
 user_svn_username=
@@ -26,6 +29,13 @@ user_maven_username=
 user_svn_password="CHANGE_ME"
 user_maven_password="CHANGE_ME"
 
+# Initialize builder variables
+builder_user_name=builder
+skel_dir=/home/$builder_user_name/skel
+subversion_dir=$skel_dir/.subversion
+assemblytool_home=$skel_dir/assemblytool
+m2_home=$skel_dir/.m2
+
 ##
 function init
 {
@@ -103,7 +113,7 @@ function common_post_action {
 ##
 function get_user_options
 {
-  while getopts ":a:l:u:c:s:m:p:" opt; do
+  while getopts ":a:l:u:c:s:m:p:i" opt; do
     case $opt in
       a)
         print_and_log "Adding artifact ${OPTARG}..."
@@ -141,6 +151,10 @@ function get_user_options
           remove_pid_and_exit_in_error
         fi
         ;;
+      i)
+        print_and_log "Setting up a new builder under /home/$builder_user_name"
+        setup_builder=1
+        ;;
       \?)
         print_and_log "Invalid option: -$OPTARG" >&2
         remove_pid_and_exit_in_error
@@ -157,7 +171,9 @@ function get_user_options
 ##
 function execute
 {
-  if [ $add_user -eq 1 ]; then
+  if [ $setup_builder -eq 1 ]; then
+    setup_builder
+  elif [ $add_user -eq 1 ]; then
     verify_add_user
     add_user
   elif [ $add_artifact -eq 1 ]; then
@@ -172,6 +188,91 @@ function execute
   fi
 }
 
+function setup_builder
+{
+  if [ ! -z "$(getent passwd $builder_user_name)" ]; then
+    print_and_log "The user $builder_user_name already exist!"
+    remove_pid_and_exit_in_error
+  fi
+  if [ -d /home/$builder_user_name ]; then
+    print_and_log "The user $builder_user_name does not exist, but has a home folder!"
+    remove_pid_and_exit_in_error
+  fi
+  run useradd -m -s /bin/bash $builder_user_name
+  run ln -s /usr/share/escenic/build-scripts/builder.sh /home/$builder_user_name/builder.sh
+
+  if [ ! -d "$skel_dir" ]; then
+    mkdir $skel_dir
+  fi
+
+  if [ ! -d "$assemblytool_home" ]; then
+    mkdir $assemblytool_home
+    run wget --http-user=download --http-password=download http://technet.escenic.com/downloads/assemblytool-2.0.2.zip -O $assemblytool_home/assemblytool.zip
+    run cd $assemblytool_home
+    run unzip assemblytool.zip
+    run rm -f assemblytool.zip
+    run ant -q initialize
+    echo "engine.root = ../engine/
+plugins = ../plugins" >> $assemblytool_home/assemble.properties
+  fi
+
+  if [ ! -d "$m2_home" ]; then
+    mkdir $m2_home
+    echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+<settings xmlns=\"http://maven.apache.org/settings/1.0.0\"
+          xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"
+          xsi:schemaLocation=\"http://maven.apache.org/SETTINGS/1.0.0
+                              http://maven.apache.org/xsd/settings-1.0.0.xsd\">
+  <servers>
+    <server>
+      <id>vizrt-repo</id>
+      <username>maven.username</username>
+      <password>maven.password</password>
+    </server>
+  </servers>
+
+  <profiles>
+    <profile>
+      <id>escenic-profile</id>
+      <repositories>
+        <repository>
+          <id>vizrt-repo</id>
+          <name>Vizrt Maven Repository</name>
+          <url>http://maven.vizrt.com</url>
+          <layout>default</layout>
+        </repository>
+      </repositories>
+    </profile>
+  </profiles>
+
+  <activeProfiles>
+    <activeProfile>escenic-profile</activeProfile>
+    <activeProfile>vosa</activeProfile>
+  </activeProfiles>
+</settings>" > $m2_home/settings.xml
+  fi
+
+  if [ ! -d "$subversion_dir" ]; then
+    mkdir $subversion_dir
+    echo="[groups]
+
+[global]
+# Password / passphrase caching parameters:
+store-passwords = yes
+store-plaintext-passwords = yes" > $subversion_dir/servers
+  fi
+
+  if [ ! -e "$skel_dir/.vimrc" ]; then
+    echo "set background=dark
+syntax on
+set nocompatible
+set backspace=2" > $skel_dir/.vimrc
+  fi
+
+  run chown -R $builder_user_name:$builder_user_name /home/$builder_user_name
+
+}
+
 ##
 function verify_add_user 
 {
@@ -325,5 +426,5 @@ print_and_log "Starting process @ $(date)"
 print_and_log "Additional output can be found in $log_file"
 get_user_options $@
 execute
-common_post_action
 print_and_log "Done! @ $(date)"
+common_post_action

From 9763628cfbfff1b31983554add6445a5bd0b1708 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Fri, 13 Jul 2012 15:59:22 +0200
Subject: [PATCH 0943/2585] builder.sh - fixed minor bug with echo command in
 builder setup

---
 usr/share/escenic/build-scripts/builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/builder.sh b/usr/share/escenic/build-scripts/builder.sh
index 0f951598..8ea50e90 100755
--- a/usr/share/escenic/build-scripts/builder.sh
+++ b/usr/share/escenic/build-scripts/builder.sh
@@ -254,7 +254,7 @@ plugins = ../plugins" >> $assemblytool_home/assemble.properties
 
   if [ ! -d "$subversion_dir" ]; then
     mkdir $subversion_dir
-    echo="[groups]
+    echo "[groups]
 
 [global]
 # Password / passphrase caching parameters:

From 40895b8641c085441a25cda172da2484ae8ef24e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Fri, 13 Jul 2012 16:04:58 +0200
Subject: [PATCH 0944/2585] create-packages - added builder.sh to
 escenic-build-scripts

---
 usr/share/escenic/package-scripts/create-packages | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 67536e7e..18c12538 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -88,6 +88,7 @@ function set_up_escenic-content-engine-installer() {
 function set_up_escenic-build-scripts() {
   mkdir -p $target_dir/usr/share/escenic/build-scripts
   cp ../build-scripts/build.sh $target_dir/usr/share/escenic/build-scripts/
+  cp ../build-scripts/builder.sh $target_dir/usr/share/escenic/build-scripts/
 }
 
 function set_up_escenic-content-engine-scripts() {

From 704e138d8f3d29db6e3a4240d8d305b01e5c67e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Mon, 16 Jul 2012 10:08:44 +0200
Subject: [PATCH 0945/2585] builder.sh - modifying script to be location
 independant

---
 usr/share/escenic/build-scripts/builder.sh | 23 +++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/usr/share/escenic/build-scripts/builder.sh b/usr/share/escenic/build-scripts/builder.sh
index 8ea50e90..ebc5fbea 100755
--- a/usr/share/escenic/build-scripts/builder.sh
+++ b/usr/share/escenic/build-scripts/builder.sh
@@ -7,9 +7,8 @@
 
 # Common variables
 ece_scripts_home=/usr/share/escenic/ece-scripts
-log=~/builder.log
-pid_file=~/builder.pid
-root_dir=~/
+log=/var/log/builder.log
+pid_file=/var/run/ece-builder.pid
 
 # Commands
 add_user=0
@@ -31,7 +30,8 @@ user_maven_password="CHANGE_ME"
 
 # Initialize builder variables
 builder_user_name=builder
-skel_dir=/home/$builder_user_name/skel
+root_dir=/home/$builder_user_name
+skel_dir=$root_dir/skel
 subversion_dir=$skel_dir/.subversion
 assemblytool_home=$skel_dir/assemblytool
 m2_home=$skel_dir/.m2
@@ -105,6 +105,15 @@ function ensure_no_user_conflict
   fi
 }
 
+##
+function verify_builder_exist 
+{
+  if [ ! -d $root_dir ]; then
+    print_and_log "Builder has not been initialized, please run this script with the -i flag!"
+    remove_pid_and_exit_in_error
+  fi
+}
+
 ##
 function common_post_action {
   run rm $pid_file
@@ -174,12 +183,15 @@ function execute
   if [ $setup_builder -eq 1 ]; then
     setup_builder
   elif [ $add_user -eq 1 ]; then
+    verify_builder_exist
     verify_add_user
     add_user
   elif [ $add_artifact -eq 1 ]; then
+    verify_builder_exist
     verify_add_artifact
     add_artifact
   elif [ $add_artifact_list -eq 1 ]; then
+    verify_builder_exist
     verify_add_artifact_list
     add_artifact_list
   else
@@ -276,6 +288,7 @@ set backspace=2" > $skel_dir/.vimrc
 ##
 function verify_add_user 
 {
+  
   enforce_variable user_name "You need to provide your username using the -u flag."
   ensure_no_user_conflict
   enforce_variable user_svn_path "You need to provide your svn path using the -c flag."
@@ -423,7 +436,7 @@ init
 set_pid
 verify_root_privilege
 print_and_log "Starting process @ $(date)"
-print_and_log "Additional output can be found in $log_file"
+print_and_log "Additional output can be found in $log"
 get_user_options $@
 execute
 print_and_log "Done! @ $(date)"

From 81ed8caee1e629f47ae95e1dbceae6751f2c6a71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Mon, 16 Jul 2012 15:40:00 +0200
Subject: [PATCH 0946/2585] builder.sh - script now fully supports setup, add
 artifact and add artifact list. it also detects already existing versions and
 unsupported plugins.

---
 usr/share/escenic/build-scripts/builder.sh | 100 ++++++++++++++++++---
 1 file changed, 89 insertions(+), 11 deletions(-)

diff --git a/usr/share/escenic/build-scripts/builder.sh b/usr/share/escenic/build-scripts/builder.sh
index ebc5fbea..96923ddb 100755
--- a/usr/share/escenic/build-scripts/builder.sh
+++ b/usr/share/escenic/build-scripts/builder.sh
@@ -31,6 +31,8 @@ user_maven_password="CHANGE_ME"
 # Initialize builder variables
 builder_user_name=builder
 root_dir=/home/$builder_user_name
+builder_conf_dir=$root_dir/.builder
+builder_conf_file=$builder_conf_dir/builder.conf
 skel_dir=$root_dir/skel
 subversion_dir=$skel_dir/.subversion
 assemblytool_home=$skel_dir/assemblytool
@@ -122,7 +124,7 @@ function common_post_action {
 ##
 function get_user_options
 {
-  while getopts ":a:l:u:c:s:m:p:i" opt; do
+  while getopts ":a:l:u:c:s:m:p:i:" opt; do
     case $opt in
       a)
         print_and_log "Adding artifact ${OPTARG}..."
@@ -163,6 +165,7 @@ function get_user_options
       i)
         print_and_log "Setting up a new builder under /home/$builder_user_name"
         setup_builder=1
+        provided_conf_file=${OPTARG}
         ;;
       \?)
         print_and_log "Invalid option: -$OPTARG" >&2
@@ -184,22 +187,38 @@ function execute
     setup_builder
   elif [ $add_user -eq 1 ]; then
     verify_builder_exist
+    read_builder_configuration
     verify_add_user
     add_user
   elif [ $add_artifact -eq 1 ]; then
     verify_builder_exist
+    read_builder_configuration
     verify_add_artifact
     add_artifact
   elif [ $add_artifact_list -eq 1 ]; then
     verify_builder_exist
+    read_builder_configuration
     verify_add_artifact_list
     add_artifact_list
   else
+    verify_builder_exist
     print_and_log "No valid action chosen, exiting!" >&2
     remove_pid_and_exit_in_error
   fi
 }
 
+##
+function read_builder_configuration
+{
+  if [ -e $builder_conf_file ]; then
+    run source $builder_conf_file
+  else
+    print_and_log "The configuration file $builder_conf_file has been removed, exiting!" >&2
+    remove_pid_and_exit_in_error
+  fi
+}
+
+##
 function setup_builder
 {
   if [ ! -z "$(getent passwd $builder_user_name)" ]; then
@@ -210,8 +229,14 @@ function setup_builder
     print_and_log "The user $builder_user_name does not exist, but has a home folder!"
     remove_pid_and_exit_in_error
   fi
+  if [ ! -e $provided_conf_file ]; then
+    print_and_log "The provided configuration file does not exist, exiting!" >&2
+    remove_pid_and_exit_in_error
+  else
+    run source $provided_conf_file
+  fi
+
   run useradd -m -s /bin/bash $builder_user_name
-  run ln -s /usr/share/escenic/build-scripts/builder.sh /home/$builder_user_name/builder.sh
 
   if [ ! -d "$skel_dir" ]; then
     mkdir $skel_dir
@@ -219,7 +244,7 @@ function setup_builder
 
   if [ ! -d "$assemblytool_home" ]; then
     mkdir $assemblytool_home
-    run wget --http-user=download --http-password=download http://technet.escenic.com/downloads/assemblytool-2.0.2.zip -O $assemblytool_home/assemblytool.zip
+    run wget --http-user=$technet_user --http-password=$technet_password http://technet.escenic.com/downloads/assemblytool-2.0.2.zip -O $assemblytool_home/assemblytool.zip
     run cd $assemblytool_home
     run unzip assemblytool.zip
     run rm -f assemblytool.zip
@@ -265,7 +290,7 @@ plugins = ../plugins" >> $assemblytool_home/assemble.properties
   fi
 
   if [ ! -d "$subversion_dir" ]; then
-    mkdir $subversion_dir
+    run mkdir $subversion_dir
     echo "[groups]
 
 [global]
@@ -281,6 +306,11 @@ set nocompatible
 set backspace=2" > $skel_dir/.vimrc
   fi
 
+  if [ ! -d $builder_conf_dir ]; then
+    run mkdir $builder_conf_dir
+  fi
+  cat $provided_conf_file > $builder_conf_file
+
   run chown -R $builder_user_name:$builder_user_name /home/$builder_user_name
 
 }
@@ -339,31 +369,73 @@ function verify_add_artifact
   enforce_variable artifact_path "You need to provide a valid artifact URL using the -a flag."
 }
 
+##
+function detect_duplicate_artifact
+{
+  if [ $engine_found -eq 1 ]; then
+    if [ -d $root_dir/engine/engine-$resource_version ]; then
+      duplicate_resource=1
+    fi
+  elif [ $plugin_found -eq 1 ]; then
+    if [ -d $root_dir/plugins/$plugin_pattern-$resource_version ]; then
+      duplicate_resource=1
+    fi
+  fi
+}
+
 ##
 function add_artifact 
 {
   engine_found=0
   plugin_found=0
+  unsupported_plugin_found=0
   plugin_pattern=""
-  if [ -e "$root_dir/downloads" ]; then
+  resource_version=`echo $artifact_path | sed "s/.*-\(.*\)\.[a-zA-Z0-9]\{3\}$/\1/"`
+  duplicate_resource=0  
+
+  if [ ! -d $root_dir/engine ]; then
+    run mkdir $root_dir/engine
+    print_and_log "The directory $root_dir/engine did not exist so it has been created."
+  fi
+
+  if [ ! -d $root_dir/plugins ]; then
+    run mkdir $root_dir/plugins
+    print_and_log "The directory $root_dir/plugins did not exist so it has been created."
+  fi
+
+  if [ -d "$root_dir/downloads" ]; then
     run rm -rf $root_dir/downloads
+  fi
+
+  if [ ! -d $root_dir/downloads ]; then
     make_dir $root_dir/downloads
     make_dir $root_dir/downloads/unpack
   fi
+
   if [[ "$artifact_path" == *\/engine-* ]]; then
     engine_found=1
-    print ""
   fi
+
   for f in $escenic_plugin_indentifiers; do
     if [[ "$artifact_path" == *$f* ]]; then
       plugin_found=1
       plugin_pattern=$f
     fi
+  done
+
+  for f in $unsupported_plugin_indentifiers; do
+    if [[ "$artifact_path" == *$f* ]]; then
+      unsupported_plugin_found=1
+      plugin_pattern=$f
+    fi
   done  
+
+  detect_duplicate_artifact
+
   if [ $engine_found -eq 1 ] && [ $plugin_found -eq 1 ]; then
     print_and_log "The requested resource $artifact_path has been identified as both an engine and a plugin. Exiting!" >&2
     remove_pid_and_exit_in_error
-  elif [ $engine_found -eq 1 ]; then
+  elif [ $engine_found -eq 1 ] && [ $duplicate_resource -eq 0 ]; then
     run wget --http-user=$technet_user --http-password=$technet_password $artifact_path -O $root_dir/downloads/unpack/resource.zip
     run cd $root_dir/downloads/unpack
     run unzip $root_dir/downloads/unpack/resource.zip
@@ -372,7 +444,7 @@ function add_artifact
         filename=$(basename "$f")
         echo "$filename" | grep '[0-9]' | grep -q 'engine'
         if [ $? = 0 ]; then
-          echo "Directory contains numbers and \"engine\" so it is most likely valid!"
+          print_and_log "Directory contains numbers and \"engine\" so it is most likely valid!"
           if [ ! -d "$root_dir/engine/$filename" ]; then
             run mv $f $root_dir/engine/.
           else
@@ -380,7 +452,7 @@ function add_artifact
           fi 
         fi
     done
-  elif [ $plugin_found -eq 1 ]; then
+  elif [ $plugin_found -eq 1 ] && [ $duplicate_resource -eq 0 ]; then
     run wget --http-user=$technet_user --http-password=$technet_password $artifact_path -O $root_dir/downloads/unpack/resource.zip
     run cd $root_dir/downloads/unpack
     run unzip $root_dir/downloads/unpack/resource.zip
@@ -390,7 +462,7 @@ function add_artifact
         filename=$(basename "$f")
         echo "$filename" | grep '[0-9]' | grep -q "$plugin_pattern"
         if [ $? = 0 ]; then
-          echo "Directory contains numbers and \"$plugin_pattern\" so it is most likely valid!"
+          print_and_log "Directory contains numbers and \"$plugin_pattern\" so it is most likely valid!"
           if [ ! -d "$root_dir/plugins/$filename" ]; then
             run mv $f $root_dir/plugins/.
           else
@@ -405,6 +477,10 @@ function add_artifact
           fi
         fi
     done
+  elif [ $duplicate_resource -eq 1 ]; then
+    print_and_log "The requested resource $artifact_path already exists and will be ignored."
+  elif [ $unsupported_plugin_found -eq 1 ]; then
+    print_and_log "The requested resource $artifact_path is a plugin, but currently unsupported by the plattform."
   else
     print_and_log "No valid resource identified using $artifact_path, exiting!"
   fi
@@ -425,7 +501,9 @@ function add_artifact_list
 {
   for f in $(cat $list_path);
   do
-    add_artifact $f
+    artifact_path=$f
+    add_artifact
+    artifact_path=
   done
 }
 

From ffaccec20e5be1fa93a82482ebe0c6b7d2d2703e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Mon, 16 Jul 2012 16:52:10 +0200
Subject: [PATCH 0947/2585] builder.sh - added workaround for assemblytool
 folder creation problem

---
 usr/share/escenic/build-scripts/builder.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/usr/share/escenic/build-scripts/builder.sh b/usr/share/escenic/build-scripts/builder.sh
index 96923ddb..2952e76a 100755
--- a/usr/share/escenic/build-scripts/builder.sh
+++ b/usr/share/escenic/build-scripts/builder.sh
@@ -447,6 +447,8 @@ function add_artifact
           print_and_log "Directory contains numbers and \"engine\" so it is most likely valid!"
           if [ ! -d "$root_dir/engine/$filename" ]; then
             run mv $f $root_dir/engine/.
+            # workaround for assemblytool writing into the engine directory
+            run mkdir $root_dir/engine/patches
           else
             print_and_log "$root_dir/engine/$filename already exists and will be ignored!"
           fi 

From 880b7436680ef42edfb9e2d374b4575a4586b446 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 18 Jul 2012 10:21:25 +0200
Subject: [PATCH 0948/2585] - ece assemble -v (verbose) would tell users which
 JARs were   duplicated among the plugins and/or ECE. Now, these messages are 
  printed and logged as well.

  This should simplify error hunting when assembling ECE & plugins.
---
 usr/share/escenic/ece-scripts/ece.d/assemble.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/assemble.sh b/usr/share/escenic/ece-scripts/ece.d/assemble.sh
index 93ba49cc..ce3eb4eb 100644
--- a/usr/share/escenic/ece-scripts/ece.d/assemble.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/assemble.sh
@@ -46,7 +46,7 @@ function assemble() {
       uniq | \
       wc -l) -gt 1 ]; then
       duplicates_found=1
-      debug "More than one version of $(echo $jar | sed 's/-$//g')"
+      print_and_log "More than one version of $(echo $jar | sed 's/-$//g')"
     fi
   done
 

From d4558a8ff8030de98a802cf90409b24b07376d92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Wed, 18 Jul 2012 11:24:38 +0200
Subject: [PATCH 0949/2585] builder.sh - fix error in placement of patches
 directory

---
 usr/share/escenic/build-scripts/builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/builder.sh b/usr/share/escenic/build-scripts/builder.sh
index 2952e76a..006ab14a 100755
--- a/usr/share/escenic/build-scripts/builder.sh
+++ b/usr/share/escenic/build-scripts/builder.sh
@@ -448,7 +448,7 @@ function add_artifact
           if [ ! -d "$root_dir/engine/$filename" ]; then
             run mv $f $root_dir/engine/.
             # workaround for assemblytool writing into the engine directory
-            run mkdir $root_dir/engine/patches
+            run mkdir $root_dir/engine/$f/patches
           else
             print_and_log "$root_dir/engine/$filename already exists and will be ignored!"
           fi 

From b35bceb6e9901fc4f1c7a46632fdff7db24949f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Wed, 18 Jul 2012 11:26:58 +0200
Subject: [PATCH 0950/2585] create-packages - changed builder.sh into command
 ece-builder

---
 usr/share/escenic/package-scripts/create-packages | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 18c12538..6fc96188 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -88,7 +88,7 @@ function set_up_escenic-content-engine-installer() {
 function set_up_escenic-build-scripts() {
   mkdir -p $target_dir/usr/share/escenic/build-scripts
   cp ../build-scripts/build.sh $target_dir/usr/share/escenic/build-scripts/
-  cp ../build-scripts/builder.sh $target_dir/usr/share/escenic/build-scripts/
+  cp ../build-scripts/builder.sh $target_dir/usr/bin/ece-builder
 }
 
 function set_up_escenic-content-engine-scripts() {

From 621492d5bf73745d13b8ff32989c0d8e33d31e51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Wed, 18 Jul 2012 11:31:44 +0200
Subject: [PATCH 0951/2585] create-packages - added missing directory /usr/bin

---
 usr/share/escenic/package-scripts/create-packages | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 6fc96188..f2c4d2f6 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -88,6 +88,7 @@ function set_up_escenic-content-engine-installer() {
 function set_up_escenic-build-scripts() {
   mkdir -p $target_dir/usr/share/escenic/build-scripts
   cp ../build-scripts/build.sh $target_dir/usr/share/escenic/build-scripts/
+  mkdir -p $target_dir/usr/bin
   cp ../build-scripts/builder.sh $target_dir/usr/bin/ece-builder
 }
 

From f6a56d26a809e44b246d5808af04edd083478f93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Wed, 18 Jul 2012 11:44:03 +0200
Subject: [PATCH 0952/2585] builder.sh - changed list of escenic releases into
 a variable requirement

---
 usr/share/escenic/build-scripts/builder.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/builder.sh b/usr/share/escenic/build-scripts/builder.sh
index 006ab14a..a617baa6 100755
--- a/usr/share/escenic/build-scripts/builder.sh
+++ b/usr/share/escenic/build-scripts/builder.sh
@@ -496,12 +496,14 @@ function verify_add_artifact_list
     print_and_log "The file $list_path does not exist!, exiting!" >&2
     remove_pid_and_exit_in_error
   fi
+  run source $list_path
+  enforce_variable escenic_releases "You need to specify your releases with full URLs in a escenic_release variable!"
 }
 
 ##
 function add_artifact_list
 {
-  for f in $(cat $list_path);
+  for f in $escenic_releases;
   do
     artifact_path=$f
     add_artifact

From a4ab8bf39edb6bbe24db4994ff1e1f9afea22550 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Wed, 18 Jul 2012 11:54:21 +0200
Subject: [PATCH 0953/2585] builder.sh - fixed another error in placement of
 patches directory

---
 usr/share/escenic/build-scripts/builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/builder.sh b/usr/share/escenic/build-scripts/builder.sh
index a617baa6..ff211d26 100755
--- a/usr/share/escenic/build-scripts/builder.sh
+++ b/usr/share/escenic/build-scripts/builder.sh
@@ -448,7 +448,7 @@ function add_artifact
           if [ ! -d "$root_dir/engine/$filename" ]; then
             run mv $f $root_dir/engine/.
             # workaround for assemblytool writing into the engine directory
-            run mkdir $root_dir/engine/$f/patches
+            run mkdir $root_dir/engine/$filename/patches
           else
             print_and_log "$root_dir/engine/$filename already exists and will be ignored!"
           fi 

From 33c11aa11ff03823460b457265e9d7af8c8ccc1b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 18 Jul 2012 13:22:38 +0200
Subject: [PATCH 0954/2585] - on RedHat, the NFS server (services) are not
 added to the default   run levels (per default, unlike under Debian). Hence,
 we need to   update the run level configuration manually for NFS servers on  
 RedHat.

---
 .../escenic/ece-scripts/ece-install.d/network-file-system.sh     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh b/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
index e7903dab..9c480474 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
@@ -55,6 +55,7 @@ EOF
   elif [ $on_redhat_or_derivative -eq 1 ]; then
     run service rpcbind start
     run service nfs start
+    run chkconfig --level 35 nfs on
   fi
   
   add_next_step "An NFS server has been installed on ${HOSTNAME},"

From 69426cf8563c67e3d4caa6c868587988d98b55f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Wed, 18 Jul 2012 13:27:05 +0200
Subject: [PATCH 0955/2585] builder.sh - spellchecking

---
 usr/share/escenic/build-scripts/builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/builder.sh b/usr/share/escenic/build-scripts/builder.sh
index ff211d26..354d20f9 100755
--- a/usr/share/escenic/build-scripts/builder.sh
+++ b/usr/share/escenic/build-scripts/builder.sh
@@ -482,7 +482,7 @@ function add_artifact
   elif [ $duplicate_resource -eq 1 ]; then
     print_and_log "The requested resource $artifact_path already exists and will be ignored."
   elif [ $unsupported_plugin_found -eq 1 ]; then
-    print_and_log "The requested resource $artifact_path is a plugin, but currently unsupported by the plattform."
+    print_and_log "The requested resource $artifact_path is a plugin, but currently unsupported by the platform."
   else
     print_and_log "No valid resource identified using $artifact_path, exiting!"
   fi

From c492c2607ea801a5de3bf2405043eb7f4989a5cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Wed, 18 Jul 2012 13:57:22 +0200
Subject: [PATCH 0956/2585] builder.sh - keyword vosa replaced

---
 usr/share/escenic/build-scripts/builder.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/build-scripts/builder.sh b/usr/share/escenic/build-scripts/builder.sh
index 354d20f9..2e50fcc4 100755
--- a/usr/share/escenic/build-scripts/builder.sh
+++ b/usr/share/escenic/build-scripts/builder.sh
@@ -284,7 +284,7 @@ plugins = ../plugins" >> $assemblytool_home/assemble.properties
 
   <activeProfiles>
     <activeProfile>escenic-profile</activeProfile>
-    <activeProfile>vosa</activeProfile>
+    <activeProfile>builder</activeProfile>
   </activeProfiles>
 </settings>" > $m2_home/settings.xml
   fi
@@ -344,7 +344,7 @@ svn_user=$user_svn_username
 svn_password=$user_svn_password
 ece_scripts_home=/usr/share/escenic/ece-scripts" > /home/$user_name/build.conf
   run chown $user_name:$user_name /home/$user_name/build.conf
-  run rsync -av /home/vosa/skel/ /home/$user_name
+  run rsync -av $skel_dir/ /home/$user_name
   run sed -i "s/maven.username/$user_maven_username/" /home/$user_name/.m2/settings.xml
   run sed -i "s/maven.password/$user_maven_password/" /home/$user_name/.m2/settings.xml
   run chown -R $user_name:$user_name /home/$user_name

From 5797d167cd59505b8d8a24719a2e6b626e3e6717 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Wed, 18 Jul 2012 13:57:35 +0200
Subject: [PATCH 0957/2585] build.sh - keyword vosa replaced

---
 usr/share/escenic/build-scripts/build.sh | 89 ++++++++++++++++--------
 1 file changed, 61 insertions(+), 28 deletions(-)

diff --git a/usr/share/escenic/build-scripts/build.sh b/usr/share/escenic/build-scripts/build.sh
index 16892057..d157abf7 100755
--- a/usr/share/escenic/build-scripts/build.sh
+++ b/usr/share/escenic/build-scripts/build.sh
@@ -2,7 +2,7 @@
 
 ################################################################################
 #
-# VOSA - build server script - customer x
+# BUILDER - build server script
 #
 ################################################################################
 
@@ -10,7 +10,7 @@
 log=~/build.log
 pid_file=~/build.pid
 build_date=`date +%F_%H%M`
-vosa_root_dir=/opt/vosa
+builder_root_dir=/home/builder
 assemblytool_root_dir=~/assemblytool
 assemblytool_pub_dir=$assemblytool_root_dir/publications
 assemblytool_lib_dir=$assemblytool_root_dir/lib
@@ -84,7 +84,7 @@ function verify_configuration {
 }
 
 ##
-function verify_vosa {
+function verify_builder {
   if [ ! -d $assemblytool_root_dir ]; then
     print_and_log "$assemblytool_root_dir is required, but it doesn't exist!"
     remove_pid_and_exit_in_error
@@ -132,11 +132,11 @@ function home_preparation
 }
 
 ## TODO: make a place where everything common to all ears go.
-function add_vosa_libs
+function add_global_libs
 {
   
   ln -s /opt/escenic/assemblytool/lib/java_memcached-release_2.0.1.jar $assemblytool_lib_dir/
-  ln -s $vosa_root_dir/lib/engine-backport-1.0-SNAPSHOT.jar $assemblytool_lib_dir/
+  ln -s $builder_root_dir/lib/engine-backport-1.0-SNAPSHOT.jar $assemblytool_lib_dir/
 }
 
 
@@ -159,72 +159,103 @@ function parse_version {
   run export $1=`sed "/<$2>/!d;s/ *<\/\?$2> *//g" $svn_src_dir/pom.xml | tr -d $'\r' `
 }
 
-# symlink component from /opt/vosa/.
+# symlink component from $builder_root_dir/.
 function symlink_distribution {
-  run ln -s $vosa_root_dir/$1 ~/$2
+  run ln -s $builder_root_dir/$1 ~/$2
 }
 
 function symlink_ece_components {
 
   # Version - Escenic Content Engine
-  parse_version ENGINE_VERSION vosa.engine.version
-  symlink_distribution engine/engine-$ENGINE_VERSION engine
+  parse_version ENGINE_VERSION escenic.engine.version
+  if [ ! -z $ENGINE_VERSION ]; then
+    symlink_distribution engine/engine-$ENGINE_VERSION engine
+  fi
 
   # Version - Geo Code
-  parse_version GEOCODE_VERSION vosa.geocode.version
+  parse_version GEOCODE_VERSION escenic.geocode.version
   symlink_distribution plugins/geocode-$GEOCODE_VERSION plugins/geocode
 
   # Version - Poll
-  parse_version POLL_VERSION vosa.poll.version
+  parse_version POLL_VERSION escenic.poll.version
   symlink_distribution plugins/poll-$POLL_VERSION plugins/poll
 
   # Version - Menu Editor
-  parse_version MENU_EDITOR_VERSION vosa.menu-editor.version
+  parse_version MENU_EDITOR_VERSION escenic.menu-editor.version
   symlink_distribution plugins/menu-editor-$MENU_EDITOR_VERSION plugins/menu-editor
 
   # Version - XML Editor
-  parse_version XML_EDITOR_VERSION vosa.xml-editor.version
+  parse_version XML_EDITOR_VERSION escenic.xml-editor.version
   symlink_distribution plugins/xml-editor-$XML_EDITOR_VERSION plugins/xml-editor
 
   # Version - Analysis Engine
-  parse_version ANALYSIS_ENGINE_VERSION vosa.analysis-engine.version
+  parse_version ANALYSIS_ENGINE_VERSION escenic.analysis-engine.version
   symlink_distribution plugins/analysis-engine-$ANALYSIS_ENGINE_VERSION plugins/analysis-engine
 
   # Version - Forum
-  parse_version FORUM_VERSION vosa.forum.version
+  parse_version FORUM_VERSION escenic.forum.version
   symlink_distribution plugins/forum-$FORUM_VERSION plugins/forum
 
   # Version - Dashboard
-  parse_version DASHBOARD_VERSION vosa.dashboard.version
+  parse_version DASHBOARD_VERSION escenic.dashboard.version
   symlink_distribution plugins/dashboard-$DASHBOARD_VERSION plugins/dashboard
 
   # Version - Lucy
-  parse_version LUCY_VERSION vosa.lucy.version
+  parse_version LUCY_VERSION escenic.lucy.version
   symlink_distribution plugins/lucy-$LUCY_VERSION plugins/lucy
   
   # Version - Widget Framework Common
-  parse_version WIDGET_FRAMEWORK_COMMON_VERSION vosa.widget-framework-common.version
-  symlink_distribution plugins/widget-framework-common-$WIDGET_FRAMEWORK_COMMON_VERSION plugins/widget-framework-common
+  parse_version WIDGET_FRAMEWORK_COMMON_VERSION escenic.widget-framework-common.version
+  if [ ! -z $FRAMEWORK_COMMON_VERSION ]; then
+    symlink_distribution plugins/widget-framework-common-$WIDGET_FRAMEWORK_COMMON_VERSION plugins/widget-framework-common
+  fi
 
   # Version - Widget Framework
-  parse_version WIDGET_FRAMEWORK_VERSION vosa.widget-framework.version
+  parse_version WIDGET_FRAMEWORK_VERSION escenic.widget-framework.version
   symlink_distribution plugins/widget-framework-core-$WIDGET_FRAMEWORK_VERSION plugins/widget-framework
 
 }
 
+##
+function verify_requested_versions 
+{
+  verification_failed=0
+  
+  if [ ! -d $engine_root_dir ]; then
+    broken_link=`readlink $engine_root_dir` 
+    print_and_log "The requested engine $broken_link does not exist on the plattform and must be added!"
+    verification_failed=1
+  fi
+  
+  for f in $(ls -d $plugin_dir/*);
+  do
+    if [ ! -d $f ]; then
+      broken_link=`readlink $f`
+      print_and_log "The requested plugin $broken_link does not exist on the plattform and must be added!"
+      verification_failed=1
+    fi
+  done
+  
+  if [ $verification_failed -eq 1 ]; then
+    print_and_log "You have broken symlinks indicating that some requested version(s) of engine and/or plugins are missing!"
+    print_and_log "Build failed!"
+    remove_pid_and_exit_in_error    
+  fi
+}
+
 # symlink .war files from target/
 function symlink_target {
 
   # global classpath
-  if [ -e "$svn_src_dir/vosa-assembly/target/lib" ]; then
-    for f in $(ls -d $svn_src_dir/vosa-assembly/target/lib/*);
+  if [ -e "$svn_src_dir/project-assembly/target/lib" ]; then
+    for f in $(ls -d $svn_src_dir/project-assembly/target/lib/*);
       do run ln -s $f $assemblytool_lib_dir;
     done
   fi
 
   # publications
-  if [ -e "$svn_src_dir/vosa-assembly/target/wars" ]; then
-    for f in $(ls -d $svn_src_dir/vosa-assembly/target/wars/*);
+  if [ -e "$svn_src_dir/project-assembly/target/wars" ]; then
+    for f in $(ls -d $svn_src_dir/project-assembly/target/wars/*);
       do ln -s $f $assemblytool_pub_dir;
     done
   fi
@@ -246,15 +277,17 @@ function release
   
   symlink_ece_components
 
+  verify_requested_versions
+
   run cd $svn_src_dir
   run mvn clean install
 
-  run cd $svn_src_dir/vosa-assembly/target
-  run unzip vosa-assembly.zip
+  run cd $svn_src_dir/project-assembly/target
+  run unzip project-assembly.zip
 
   symlink_target
 
-  add_vosa_libs
+  add_global_libs
 
   add_dashboard_descriptor
 
@@ -297,7 +330,7 @@ print_and_log "Starting building @ $(date)"
 get_user_options $@
 verify_configuration
 home_preparation
-verify_vosa
+verify_builder
 release
 print_result
 common_post_build

From 9f13b1cdfa48c7e9e2181fec05e269804abe1a38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Wed, 18 Jul 2012 14:00:07 +0200
Subject: [PATCH 0958/2585] create-packages - build.sh is now a general command
 'ece-build'

---
 usr/share/escenic/package-scripts/create-packages | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index f2c4d2f6..e5013149 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -86,9 +86,8 @@ function set_up_escenic-content-engine-installer() {
 }
 
 function set_up_escenic-build-scripts() {
-  mkdir -p $target_dir/usr/share/escenic/build-scripts
-  cp ../build-scripts/build.sh $target_dir/usr/share/escenic/build-scripts/
   mkdir -p $target_dir/usr/bin
+  cp ../build-scripts/build.sh $target_dir/usr/bin/ece-build
   cp ../build-scripts/builder.sh $target_dir/usr/bin/ece-builder
 }
 

From e9c7a3b7b4a38f72641a608f5da60a1bd133c048 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Wed, 18 Jul 2012 14:31:49 +0200
Subject: [PATCH 0959/2585] builder.sh - ece_scripts_home no longer in conf
 file

---
 usr/share/escenic/build-scripts/builder.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/usr/share/escenic/build-scripts/builder.sh b/usr/share/escenic/build-scripts/builder.sh
index 2e50fcc4..1dabde1f 100755
--- a/usr/share/escenic/build-scripts/builder.sh
+++ b/usr/share/escenic/build-scripts/builder.sh
@@ -341,8 +341,7 @@ function add_user
   echo "customer=$user_name
 svn_base=$user_svn_path
 svn_user=$user_svn_username
-svn_password=$user_svn_password
-ece_scripts_home=/usr/share/escenic/ece-scripts" > /home/$user_name/build.conf
+svn_password=$user_svn_password" > /home/$user_name/build.conf
   run chown $user_name:$user_name /home/$user_name/build.conf
   run rsync -av $skel_dir/ /home/$user_name
   run sed -i "s/maven.username/$user_maven_username/" /home/$user_name/.m2/settings.xml

From 1a1bee50edde0d47cddcda646a91f59751501a65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Wed, 18 Jul 2012 14:31:57 +0200
Subject: [PATCH 0960/2585] build.sh - ece_scripts_home no longer in conf file

---
 usr/share/escenic/build-scripts/build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/build-scripts/build.sh b/usr/share/escenic/build-scripts/build.sh
index d157abf7..e1a80a0b 100755
--- a/usr/share/escenic/build-scripts/build.sh
+++ b/usr/share/escenic/build-scripts/build.sh
@@ -18,6 +18,7 @@ svn_src_dir=~/src
 release_dir=~/releases
 plugin_dir=~/plugins
 engine_root_dir=~/engine
+ece_scripts_home=/usr/share/escenic/ece-scripts
 
 ##
 function fetch_configuration

From 9e8fac3ae29037dc6e6a2e5bd30cb33d3f651d11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Wed, 18 Jul 2012 15:05:07 +0200
Subject: [PATCH 0961/2585] build(er).sh - adjusted messaging and fixed bug in
 initial user creation

---
 usr/share/escenic/build-scripts/builder.sh | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/usr/share/escenic/build-scripts/builder.sh b/usr/share/escenic/build-scripts/builder.sh
index 1dabde1f..9c3a0db4 100755
--- a/usr/share/escenic/build-scripts/builder.sh
+++ b/usr/share/escenic/build-scripts/builder.sh
@@ -77,7 +77,7 @@ function set_pid
 function verify_root_privilege
 {
   if [ "$(id -u)" != "0" ]; then
-    print_and_log "This script must be run as root"
+    print_and_log "This script must be run as root!"
     remove_pid_and_exit_in_error
   fi
 }
@@ -102,7 +102,7 @@ function ensure_no_user_conflict
     remove_pid_and_exit_in_error
   fi
   if [ -d /var/www/$user_name ]; then
-    print_and_log "User $user_name does not exist, but has a web root under /var/www/$user_name !"
+    print_and_log "User $user_name does not exist, but has a web root under /var/www/$user_name"
     remove_pid_and_exit_in_error
   fi
 }
@@ -143,19 +143,19 @@ function get_user_options
 	ensure_no_user_conflict
         ;;
       c)
-        print_and_log "Using svn path: ${OPTARG}."
+        print_and_log "Using svn path: ${OPTARG}"
         user_svn_path=${OPTARG}
         ;;
       s)
-        print_and_log "Using svn username: ${OPTARG}!"
+        print_and_log "Using svn username: ${OPTARG}"
         user_svn_username=${OPTARG}
         ;;
       m)
-        print_and_log "Using maven username: ${OPTARG}!"
+        print_and_log "Using maven username: ${OPTARG}"
         user_maven_username=${OPTARG}
         ;;
       p)
-        print_and_log "Using password file: ${OPTARG}!"
+        print_and_log "Using password file: ${OPTARG}"
         user_password_file=${OPTARG}
         if [ ! -e $user_password_file ]; then
           print_and_log "Provided password file does not exist, exiting!" >&2
@@ -351,13 +351,13 @@ svn_password=$user_svn_password" > /home/$user_name/build.conf
     make_dir /var/www/$user_name
     run chown www-data:www-data /var/www/$user_name  
   else
-    print_and_log "Failed to add web root /var/www/$user_name !"
+    print_and_log "Failed to add web root /var/www/$user_name"
     remove_pid_and_exit_in_error
   fi
   if [ ! -h /var/www/$user_name/releases ]; then
     run ln -s /home/$user_name/releases /var/www/$user_name/releases
   else
-    print_and_log "Failed to add symlink for /var/www/$user_name/releases !"
+    print_and_log "Failed to add symlink for /var/www/$user_name/releases"
     remove_pid_and_exit_in_error
   fi
 }
@@ -443,7 +443,7 @@ function add_artifact
         filename=$(basename "$f")
         echo "$filename" | grep '[0-9]' | grep -q 'engine'
         if [ $? = 0 ]; then
-          print_and_log "Directory contains numbers and \"engine\" so it is most likely valid!"
+          print_and_log "Directory contains numbers and \"engine\" so it is most likely valid."
           if [ ! -d "$root_dir/engine/$filename" ]; then
             run mv $f $root_dir/engine/.
             # workaround for assemblytool writing into the engine directory
@@ -463,7 +463,7 @@ function add_artifact
         filename=$(basename "$f")
         echo "$filename" | grep '[0-9]' | grep -q "$plugin_pattern"
         if [ $? = 0 ]; then
-          print_and_log "Directory contains numbers and \"$plugin_pattern\" so it is most likely valid!"
+          print_and_log "Directory contains numbers and \"$plugin_pattern\" so it is most likely valid."
           if [ ! -d "$root_dir/plugins/$filename" ]; then
             run mv $f $root_dir/plugins/.
           else
@@ -483,7 +483,7 @@ function add_artifact
   elif [ $unsupported_plugin_found -eq 1 ]; then
     print_and_log "The requested resource $artifact_path is a plugin, but currently unsupported by the platform."
   else
-    print_and_log "No valid resource identified using $artifact_path, exiting!"
+    print_and_log "No valid resource identified using $artifact_path!"
   fi
 }
 

From 20b21d764ba4b4fa1ef939779be430647686f9a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Wed, 18 Jul 2012 15:05:15 +0200
Subject: [PATCH 0962/2585] build(er).sh - adjusted messaging and fixed bug in
 initial user creation

---
 usr/share/escenic/build-scripts/build.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/build-scripts/build.sh b/usr/share/escenic/build-scripts/build.sh
index e1a80a0b..585764ff 100755
--- a/usr/share/escenic/build-scripts/build.sh
+++ b/usr/share/escenic/build-scripts/build.sh
@@ -107,9 +107,12 @@ function verify_builder {
 # clean up customer home
 function home_preparation
 {
-  if [ -e "$plugin_dir" ]; then
+  if [ -d "$plugin_dir" ]; then
     run rm -rf $plugin_dir
-    make_dir $plugin_dir
+  fi
+
+  if [ ! -d $plugin_dir ]; then
+    run mkdir $plugin_dir
   fi
 
   if [ -h "$engine_root_dir" ]; then

From f9157fe18c677dbfe556d0dab355daf8d574c780 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Wed, 18 Jul 2012 15:09:15 +0200
Subject: [PATCH 0963/2585] builder.sh - build.sh link no longer needed

---
 usr/share/escenic/build-scripts/builder.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/builder.sh b/usr/share/escenic/build-scripts/builder.sh
index 9c3a0db4..5e00adb0 100755
--- a/usr/share/escenic/build-scripts/builder.sh
+++ b/usr/share/escenic/build-scripts/builder.sh
@@ -337,7 +337,6 @@ function verify_add_user
 function add_user
 {
   run useradd -m -s /bin/bash $user_name
-  run ln -s /usr/share/escenic/build-scripts/build.sh /home/$user_name/build.sh
   echo "customer=$user_name
 svn_base=$user_svn_path
 svn_user=$user_svn_username

From e345b7772624abb7eb1d704c3458a52482cf49ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Wed, 18 Jul 2012 15:13:17 +0200
Subject: [PATCH 0964/2585] builder.sh - configuration file build.conf is now
 hidden

---
 usr/share/escenic/build-scripts/builder.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/build-scripts/builder.sh b/usr/share/escenic/build-scripts/builder.sh
index 5e00adb0..e3f51538 100755
--- a/usr/share/escenic/build-scripts/builder.sh
+++ b/usr/share/escenic/build-scripts/builder.sh
@@ -336,12 +336,13 @@ function verify_add_user
 ##
 function add_user
 {
+  run mkdir /home/$user_name/.build
   run useradd -m -s /bin/bash $user_name
   echo "customer=$user_name
 svn_base=$user_svn_path
 svn_user=$user_svn_username
-svn_password=$user_svn_password" > /home/$user_name/build.conf
-  run chown $user_name:$user_name /home/$user_name/build.conf
+svn_password=$user_svn_password" > /home/$user_name/.build/build.conf
+  run chown $user_name:$user_name /home/$user_name/.build/build.conf
   run rsync -av $skel_dir/ /home/$user_name
   run sed -i "s/maven.username/$user_maven_username/" /home/$user_name/.m2/settings.xml
   run sed -i "s/maven.password/$user_maven_password/" /home/$user_name/.m2/settings.xml

From 7bf052013465a97e31e2614e714318de8e59c7a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Wed, 18 Jul 2012 15:14:06 +0200
Subject: [PATCH 0965/2585] build.sh - configuration file build.conf is now
 hidden

---
 usr/share/escenic/build-scripts/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/build.sh b/usr/share/escenic/build-scripts/build.sh
index 585764ff..5d376d8f 100755
--- a/usr/share/escenic/build-scripts/build.sh
+++ b/usr/share/escenic/build-scripts/build.sh
@@ -23,7 +23,7 @@ ece_scripts_home=/usr/share/escenic/ece-scripts
 ##
 function fetch_configuration
 {
-  conf_file=~/build.conf
+  conf_file=~/.build/build.conf
   source $conf_file
 }
 

From 97a0ed7b96cf15f040301531071a321f1defb1cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Wed, 18 Jul 2012 15:36:12 +0200
Subject: [PATCH 0966/2585] builder.sh - configuration file build.conf is now
 hidden

---
 usr/share/escenic/build-scripts/builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/builder.sh b/usr/share/escenic/build-scripts/builder.sh
index e3f51538..30a3096d 100755
--- a/usr/share/escenic/build-scripts/builder.sh
+++ b/usr/share/escenic/build-scripts/builder.sh
@@ -336,8 +336,8 @@ function verify_add_user
 ##
 function add_user
 {
-  run mkdir /home/$user_name/.build
   run useradd -m -s /bin/bash $user_name
+  run mkdir /home/$user_name/.build
   echo "customer=$user_name
 svn_base=$user_svn_path
 svn_user=$user_svn_username

From 648ebd7fce0c083bd2f39747a0286a2cb838306b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Fri, 20 Jul 2012 14:22:07 +0200
Subject: [PATCH 0967/2585] builder.sh - downloads directory is now hidden and
 a config file has been added to preserve download url

---
 usr/share/escenic/build-scripts/builder.sh | 42 ++++++++++++++--------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/usr/share/escenic/build-scripts/builder.sh b/usr/share/escenic/build-scripts/builder.sh
index 30a3096d..26c639dc 100755
--- a/usr/share/escenic/build-scripts/builder.sh
+++ b/usr/share/escenic/build-scripts/builder.sh
@@ -31,8 +31,11 @@ user_maven_password="CHANGE_ME"
 # Initialize builder variables
 builder_user_name=builder
 root_dir=/home/$builder_user_name
+download_dir=$root_dir/.downloads
 builder_conf_dir=$root_dir/.builder
 builder_conf_file=$builder_conf_dir/builder.conf
+artifact_conf_dir=.builder
+artifact_conf_file=artifact.conf
 skel_dir=$root_dir/skel
 subversion_dir=$skel_dir/.subversion
 assemblytool_home=$skel_dir/assemblytool
@@ -402,13 +405,12 @@ function add_artifact
     print_and_log "The directory $root_dir/plugins did not exist so it has been created."
   fi
 
-  if [ -d "$root_dir/downloads" ]; then
-    run rm -rf $root_dir/downloads
+  if [ -d $download_dir ]; then
+    run rm -rf $download_dir
   fi
 
-  if [ ! -d $root_dir/downloads ]; then
-    make_dir $root_dir/downloads
-    make_dir $root_dir/downloads/unpack
+  if [ ! -d $download_dir ]; then
+    run mkdir -p $download_dir/unpack
   fi
 
   if [[ "$artifact_path" == *\/engine-* ]]; then
@@ -435,10 +437,10 @@ function add_artifact
     print_and_log "The requested resource $artifact_path has been identified as both an engine and a plugin. Exiting!" >&2
     remove_pid_and_exit_in_error
   elif [ $engine_found -eq 1 ] && [ $duplicate_resource -eq 0 ]; then
-    run wget --http-user=$technet_user --http-password=$technet_password $artifact_path -O $root_dir/downloads/unpack/resource.zip
-    run cd $root_dir/downloads/unpack
-    run unzip $root_dir/downloads/unpack/resource.zip
-    for f in $(ls -d $root_dir/downloads/unpack/*);
+    run wget --http-user=$technet_user --http-password=$technet_password $artifact_path -O $download_dir/unpack/resource.zip
+    run cd $download_dir/unpack
+    run unzip $download_dir/unpack/resource.zip
+    for f in $(ls -d $download_dir/unpack/*);
       do
         filename=$(basename "$f")
         echo "$filename" | grep '[0-9]' | grep -q 'engine'
@@ -446,6 +448,10 @@ function add_artifact
           print_and_log "Directory contains numbers and \"engine\" so it is most likely valid."
           if [ ! -d "$root_dir/engine/$filename" ]; then
             run mv $f $root_dir/engine/.
+            if [ ! -d $root_dir/engine/$filename/$artifact_conf_dir ]; then
+              run mkdir $root_dir/engine/$filename/$artifact_conf_dir
+            fi
+            echo "artifact_uri=$artifact_path" > $root_dir/engine/$filename/$artifact_conf_dir/$artifact_conf_file
             # workaround for assemblytool writing into the engine directory
             run mkdir $root_dir/engine/$filename/patches
           else
@@ -454,11 +460,11 @@ function add_artifact
         fi
     done
   elif [ $plugin_found -eq 1 ] && [ $duplicate_resource -eq 0 ]; then
-    run wget --http-user=$technet_user --http-password=$technet_password $artifact_path -O $root_dir/downloads/unpack/resource.zip
-    run cd $root_dir/downloads/unpack
-    run unzip $root_dir/downloads/unpack/resource.zip
-    run rm -f $root_dir/downloads/unpack/resource.zip
-    for f in $(ls -d $root_dir/downloads/unpack/*);
+    run wget --http-user=$technet_user --http-password=$technet_password $artifact_path -O $download_dir/unpack/resource.zip
+    run cd $download_dir/unpack
+    run unzip $download_dir/unpack/resource.zip
+    run rm -f $download_dir/unpack/resource.zip
+    for f in $(ls -d $download_dir/unpack/*);
       do
         filename=$(basename "$f")
         echo "$filename" | grep '[0-9]' | grep -q "$plugin_pattern"
@@ -466,6 +472,10 @@ function add_artifact
           print_and_log "Directory contains numbers and \"$plugin_pattern\" so it is most likely valid."
           if [ ! -d "$root_dir/plugins/$filename" ]; then
             run mv $f $root_dir/plugins/.
+            if [ ! -d $root_dir/plugins/$filename/$artifact_conf_dir ]; then
+              run mkdir $root_dir/plugins/$filename/$artifact_conf_dir
+            fi 
+            echo "artifact_uri=$artifact_path" > $root_dir/plugins/$filename/$artifact_conf_dir/$artifact_conf_file
           else
             print_and_log "$root_dir/plugins/$filename already exists and will be ignored!"
           fi
@@ -475,6 +485,10 @@ function add_artifact
           print_and_log "Resource $artifact_path identified as a $plugin_pattern plugin, but failed the naming convention test after being unpacked, trying to recover..."
           if [ ! -d $root_dir/plugins/$plugin_pattern-$test ]; then
             run mv $f $root_dir/plugins/$plugin_pattern-$test
+            if [ ! -d $root_dir/plugins/$plugin_pattern-$test/$artifact_conf_dir ]; then
+              run mkdir $root_dir/plugins/$plugin_pattern-$test/$artifact_conf_dir
+            fi
+            echo "artifact_uri=$artifact_path" > $root_dir/plugins/$plugin_pattern-$test/$artifact_conf_dir/$artifact_conf_file
           fi
         fi
     done

From ee19b000de7a0b22f1a72c63cec836ce17cdaee8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Fri, 20 Jul 2012 14:54:06 +0200
Subject: [PATCH 0968/2585] builder.sh - skel dir is now hidden and a type has
 been fixed

---
 usr/share/escenic/build-scripts/builder.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/build-scripts/builder.sh b/usr/share/escenic/build-scripts/builder.sh
index 26c639dc..91121fcb 100755
--- a/usr/share/escenic/build-scripts/builder.sh
+++ b/usr/share/escenic/build-scripts/builder.sh
@@ -36,7 +36,7 @@ builder_conf_dir=$root_dir/.builder
 builder_conf_file=$builder_conf_dir/builder.conf
 artifact_conf_dir=.builder
 artifact_conf_file=artifact.conf
-skel_dir=$root_dir/skel
+skel_dir=$root_dir/.skel
 subversion_dir=$skel_dir/.subversion
 assemblytool_home=$skel_dir/assemblytool
 m2_home=$skel_dir/.m2
@@ -510,7 +510,7 @@ function verify_add_artifact_list
     remove_pid_and_exit_in_error
   fi
   run source $list_path
-  enforce_variable escenic_releases "You need to specify your releases with full URLs in a escenic_release variable!"
+  enforce_variable escenic_releases "You need to specify your releases with full URLs in a escenic_releases variable!"
 }
 
 ##

From 99b99c4e93aeaf1235c2ebbdcddd60102fe2e574 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Fri, 20 Jul 2012 15:08:32 +0200
Subject: [PATCH 0969/2585] builder.sh - fixed a problem with malformed
 artifact recovery

---
 usr/share/escenic/build-scripts/builder.sh | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/usr/share/escenic/build-scripts/builder.sh b/usr/share/escenic/build-scripts/builder.sh
index 91121fcb..95f9d52c 100755
--- a/usr/share/escenic/build-scripts/builder.sh
+++ b/usr/share/escenic/build-scripts/builder.sh
@@ -480,15 +480,18 @@ function add_artifact
             print_and_log "$root_dir/plugins/$filename already exists and will be ignored!"
           fi
         else
-          test=`echo $artifact_path | sed "s/.*-\(.*\)\.[a-zA-Z0-9]\{3\}$/\1/"`     
-          echo "$plugin_pattern-$test"
-          print_and_log "Resource $artifact_path identified as a $plugin_pattern plugin, but failed the naming convention test after being unpacked, trying to recover..."
-          if [ ! -d $root_dir/plugins/$plugin_pattern-$test ]; then
-            run mv $f $root_dir/plugins/$plugin_pattern-$test
-            if [ ! -d $root_dir/plugins/$plugin_pattern-$test/$artifact_conf_dir ]; then
-              run mkdir $root_dir/plugins/$plugin_pattern-$test/$artifact_conf_dir
+          echo "$filename" | grep -q "$plugin_pattern"
+          if [ $? = 0 ]; then
+            test=`echo $artifact_path | sed "s/.*-\(.*\)\.[a-zA-Z0-9]\{3\}$/\1/"`     
+            print_and_log "Resource $artifact_path was identified as a $plugin_pattern plugin, but failed the naming convention test after being unpacked, trying to recover..."
+            if [ ! -d $root_dir/plugins/$plugin_pattern-$test ]; then
+              run mv $f $root_dir/plugins/$plugin_pattern-$test
+              if [ ! -d $root_dir/plugins/$plugin_pattern-$test/$artifact_conf_dir ]; then
+                run mkdir $root_dir/plugins/$plugin_pattern-$test/$artifact_conf_dir
+              fi
+              echo "artifact_uri=$artifact_path" > $root_dir/plugins/$plugin_pattern-$test/$artifact_conf_dir/$artifact_conf_file
+              print_and_log "Resource $artifact_path was recovered as a $plugin_pattern and added as $plugin_pattern-$test"
             fi
-            echo "artifact_uri=$artifact_path" > $root_dir/plugins/$plugin_pattern-$test/$artifact_conf_dir/$artifact_conf_file
           fi
         fi
     done

From ce0a697d40360a1a41e544187a5baf2d916b6676 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Fri, 20 Jul 2012 16:03:15 +0200
Subject: [PATCH 0970/2585] build.sh - fixed bug in wf 1.10 support

---
 usr/share/escenic/build-scripts/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/build.sh b/usr/share/escenic/build-scripts/build.sh
index 5d376d8f..90e58a06 100755
--- a/usr/share/escenic/build-scripts/build.sh
+++ b/usr/share/escenic/build-scripts/build.sh
@@ -210,7 +210,7 @@ function symlink_ece_components {
   
   # Version - Widget Framework Common
   parse_version WIDGET_FRAMEWORK_COMMON_VERSION escenic.widget-framework-common.version
-  if [ ! -z $FRAMEWORK_COMMON_VERSION ]; then
+  if [ ! -z $WIDGET_FRAMEWORK_COMMON_VERSION ]; then
     symlink_distribution plugins/widget-framework-common-$WIDGET_FRAMEWORK_COMMON_VERSION plugins/widget-framework-common
   fi
 

From 3b8af082eef249ecff19755e51b4a6b73a95a368 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Fri, 20 Jul 2012 16:13:06 +0200
Subject: [PATCH 0971/2585] build.sh - fixed bug in wf 1.10 support

---
 usr/share/escenic/build-scripts/build.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/build-scripts/build.sh b/usr/share/escenic/build-scripts/build.sh
index 90e58a06..3c69a491 100755
--- a/usr/share/escenic/build-scripts/build.sh
+++ b/usr/share/escenic/build-scripts/build.sh
@@ -216,8 +216,9 @@ function symlink_ece_components {
 
   # Version - Widget Framework
   parse_version WIDGET_FRAMEWORK_VERSION escenic.widget-framework.version
-  symlink_distribution plugins/widget-framework-core-$WIDGET_FRAMEWORK_VERSION plugins/widget-framework
-
+  if [ ! -z $WIDGET_FRAMEWORK_VERSION ]; then
+    symlink_distribution plugins/widget-framework-core-$WIDGET_FRAMEWORK_VERSION plugins/widget-framework
+  fi
 }
 
 ##

From 9ec4166d6fd0768bab77b2ac87e3b5a26531c882 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <ola@local.test>
Date: Sun, 22 Jul 2012 15:48:04 +0200
Subject: [PATCH 0972/2585] README - test commit

---
 usr/share/escenic/build-scripts/README | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/build-scripts/README b/usr/share/escenic/build-scripts/README
index 31a93565..37b219bb 100644
--- a/usr/share/escenic/build-scripts/README
+++ b/usr/share/escenic/build-scripts/README
@@ -1,2 +1,3 @@
 This is the home of build descriptors and build scripts, related to
 Escenic Content Engine projects.
+

From a80516cfa57b1d32d23a20720a9e8c7e35d8b5ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Sun, 22 Jul 2012 16:26:37 +0200
Subject: [PATCH 0973/2585] README - test

---
 usr/share/escenic/build-scripts/README | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/build-scripts/README b/usr/share/escenic/build-scripts/README
index 31a93565..37b219bb 100644
--- a/usr/share/escenic/build-scripts/README
+++ b/usr/share/escenic/build-scripts/README
@@ -1,2 +1,3 @@
 This is the home of build descriptors and build scripts, related to
 Escenic Content Engine projects.
+

From 7ae6a90ac2cbc94ff427bda138736d85c523fa0b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 23 Jul 2012 13:39:50 +0200
Subject: [PATCH 0974/2585] - added new command: 'ece remove-old-log-files'
 which will remove log   files that are three days old. The command takes into
 account the   app server for which the ece command relates to by the way of
 the -i   <instance> parameter.

  For systems with only one ECE instance, the following is enough to
  remove old log files:

  $ ece -i cohen remove-old-log-files
  [ece#engine-cohen] Deleting 19 old log files in /var/log/escenic ...
  [ece#engine-cohen] Deleting 40 old log files in /opt/tomcat-cohen/logs ...
  $
---
 .../ece-scripts/ece.d/remove-old-log-files.sh | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 usr/share/escenic/ece-scripts/ece.d/remove-old-log-files.sh

diff --git a/usr/share/escenic/ece-scripts/ece.d/remove-old-log-files.sh b/usr/share/escenic/ece-scripts/ece.d/remove-old-log-files.sh
new file mode 100644
index 00000000..b6a8e1cf
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece.d/remove-old-log-files.sh
@@ -0,0 +1,38 @@
+#! /usr/bin/env bash
+
+# removes log files older than three days
+max_days_old=3
+
+function get_log_file_dir_list() {
+  local dir_list="${log_dir}"
+
+  local dir=${tomcat_base}/logs
+  if [ -d $dir ]; then
+    dir_list="${dir_list} ${dir}"
+  fi
+
+  echo $dir_list
+}
+
+function remove_old_logs_if_exist() {
+  debug "Looking for old log files in $1 ..."
+  
+  local old_log_files="$(
+    find -L $1 -mtime +${max_days_old} -type f
+  )"
+
+  if [ -z $old_log_files ]; then
+    return
+  fi
+
+  print "Deleting" $(echo "$old_log_files" | wc -l) "old log files in $1 ..."
+  run rm $old_log_files
+}
+
+function remove_old_log_files() {
+  local dir_list=$(get_log_file_dir_list)
+
+  for el in $dir_list; do
+    remove_old_logs_if_exist $el
+  done
+}

From 8e40af73be88eac074107e1ff36628344737fc78 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 23 Jul 2012 13:46:08 +0200
Subject: [PATCH 0975/2585] - now, the ece remove-old-log-files command
 includes information about   how old the deleted log files were:

  [ece#engine-ece54] Deleting 12 log files in /var/log/escenic older than 3 days
---
 usr/share/escenic/ece-scripts/ece.d/remove-old-log-files.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/remove-old-log-files.sh b/usr/share/escenic/ece-scripts/ece.d/remove-old-log-files.sh
index b6a8e1cf..76b593bd 100644
--- a/usr/share/escenic/ece-scripts/ece.d/remove-old-log-files.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/remove-old-log-files.sh
@@ -25,7 +25,9 @@ function remove_old_logs_if_exist() {
     return
   fi
 
-  print "Deleting" $(echo "$old_log_files" | wc -l) "old log files in $1 ..."
+  print "Deleting" $(echo "$old_log_files" | wc -l) \
+    "log files in $1" \
+    "older than ${max_days_old} days"
   run rm $old_log_files
 }
 

From 3c53aefd0237c8780892bccbc923f4673dc2acd2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 23 Jul 2012 13:53:27 +0200
Subject: [PATCH 0976/2585] - added remove-old-log-files

---
 usr/bin/ece | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/usr/bin/ece b/usr/bin/ece
index 8e0aa3bb..4548c9ce 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -799,6 +799,9 @@ for el in $command; do
         list-instances)
             print $(get_instance_list)
             ;;
+        remove-old-log-files)
+            remove_old_log_files
+            ;;
         update)
             update_publication_resources
             ;;

From af3a17c13b9195bcafdb396fbe27f83c70217830 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 23 Jul 2012 13:55:30 +0200
Subject: [PATCH 0977/2585] - added the remove-old-log-files to the TAB
 completion.

---
 etc/bash_completion.d/ece | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/etc/bash_completion.d/ece b/etc/bash_completion.d/ece
index 1585c05e..2570c15d 100644
--- a/etc/bash_completion.d/ece
+++ b/etc/bash_completion.d/ece
@@ -5,10 +5,31 @@ _ece_commands()
     local cur=${COMP_WORDS[COMP_CWORD]}
     local prev=${COMP_WORDS[COMP_CWORD-1]}
 
-    commands="applog assemble backup clean deploy edit help info kill log list-logs
-              flush outlog package restart start status stop threaddump update versions
-              list-instances
+    commands="
+      applog
+      assemble
+      backup
+      clean
+      deploy
+      edit
+      flush
+      help
+      info
+      kill
+      list-instances
+      list-logs
+      log
+      outlog
+      package
+      remove-old-log-files
+      restart start
+      status
+      stop
+      threaddump
+      update
+      versions
     "
+    
     options="-i --instance -p --publication -r --publication-resource
              -t --type -u --user -w --password"
     resources="content-type feature layout layout-group image-version menu

From 711184166e5fd37fd6536bc68d7c75149201352b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 23 Jul 2012 13:56:34 +0200
Subject: [PATCH 0978/2585] - the visualise_known_ports was a tad too smart

---
 usr/share/escenic/ece-scripts/ece.d/info.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/info.sh b/usr/share/escenic/ece-scripts/ece.d/info.sh
index 42891e58..1568a1e0 100644
--- a/usr/share/escenic/ece-scripts/ece.d/info.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/info.sh
@@ -142,13 +142,14 @@ function visualise_known_ports() {
   local the_host=$(echo $1 | cut -d':' -f1)
   local the_port=$(echo $1 | cut -d':' -f2)
 
-  echo ${the_host}:${the_port} | \
+  local nice_port=$(echo ${the_port} | \
     sed \
     -e 's/8080/ece/g' \
     -e 's/8081/eae/g' \
     -e 's/3306/mysql/g' \
     -e 's/22/ssh/g' \
-    -e 's/11211/memcached/g'
+    -e 's/11211/memcached/g')
+  echo ${the_host}:${nice_port}
 }
 
 function create_block_diag_for_instance() {

From b3f7bd645809704127fa1cd30ede531368bb5680 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 23 Jul 2012 14:22:33 +0200
Subject: [PATCH 0979/2585] - argh, class mistake of string checking.

---
 usr/share/escenic/ece-scripts/ece.d/remove-old-log-files.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/remove-old-log-files.sh b/usr/share/escenic/ece-scripts/ece.d/remove-old-log-files.sh
index 76b593bd..4c521d52 100644
--- a/usr/share/escenic/ece-scripts/ece.d/remove-old-log-files.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/remove-old-log-files.sh
@@ -21,7 +21,7 @@ function remove_old_logs_if_exist() {
     find -L $1 -mtime +${max_days_old} -type f
   )"
 
-  if [ -z $old_log_files ]; then
+  if [ -z "${old_log_files}" ]; then
     return
   fi
 

From 6dc96fd18f8f0e2d2852e7746f0a8da43f1b3140 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 23 Jul 2012 16:52:02 +0200
Subject: [PATCH 0980/2585] - added cron.daily script for removing old log
 files. Per default, it   will not run. It reads its configuration from
 /etc/default/ece - added remove_old_escenic_log_files parameter to
 /etc/default/ece. If   it doesn't exist in the defaults file, typically if
 the user has an   old defaults file, the removal script is simply not run.

---
 etc/cron.daily/remove-old-escenic-log-files | 12 ++++++++++++
 etc/default/ece                             |  2 ++
 2 files changed, 14 insertions(+)
 create mode 100755 etc/cron.daily/remove-old-escenic-log-files

diff --git a/etc/cron.daily/remove-old-escenic-log-files b/etc/cron.daily/remove-old-escenic-log-files
new file mode 100755
index 00000000..433fe1f7
--- /dev/null
+++ b/etc/cron.daily/remove-old-escenic-log-files
@@ -0,0 +1,12 @@
+#! /usr/bin/env bash
+
+file=/etc/default/ece
+if [ ! -r $file ]; then
+  return
+else
+  source $file
+fi
+
+if [ ${remove_old_escenic_log_files-0} -eq 1 ]; then
+  /etc/init.d/ece remove-old-log-files
+fi
diff --git a/etc/default/ece b/etc/default/ece
index d021aaa4..c80e79aa 100644
--- a/etc/default/ece
+++ b/etc/default/ece
@@ -20,3 +20,5 @@ ece_script=/usr/bin/ece
 ece_unix_group=escenic
 ece_unix_user=escenic
 
+# Set this to 1 for automatic removal of old log files.
+remove_old_escenic_log_files=0

From 80858026526e54351811bfb3d1870ef26ab40105 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 23 Jul 2012 17:04:11 +0200
Subject: [PATCH 0981/2585] - the default HKP (GNU PGP HTTP server) is 11371.
 As this sometimes is   blocked in the outgoing firewall rules, ece-install
 now uses port 80   when accessing keys.gnupg.net.

  Thanks to @gomezchr for raising the #86 issue.
---
 usr/share/escenic/ece-scripts/ece-install.d/database.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 0d7c4fb2..6cc310e4 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -44,7 +44,7 @@ function install_database_server()
       print_and_log "Installing the Percona database ..."
 
       if [ $(apt-key list| grep CD2EFD2A | wc -l) -lt 1 ]; then
-        gpg --keyserver hkp://keys.gnupg.net \
+        gpg --keyserver hkp://keys.gnupg.net:80 \
           --recv-keys 1C4CBDCDCD2EFD2A \
           1>>$log 2>>$log
         

From 45d793e415c1a438639c78184bca664e16d4a9fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=F6n?= <oschoen@vizrt.com>
Date: Tue, 24 Jul 2012 09:02:51 +0200
Subject: [PATCH 0982/2585] build.sh - script refactored for quality

---
 usr/share/escenic/build-scripts/build.sh | 487 ++++++++++++++---------
 1 file changed, 304 insertions(+), 183 deletions(-)

diff --git a/usr/share/escenic/build-scripts/build.sh b/usr/share/escenic/build-scripts/build.sh
index 3c69a491..aad7d225 100755
--- a/usr/share/escenic/build-scripts/build.sh
+++ b/usr/share/escenic/build-scripts/build.sh
@@ -7,45 +7,125 @@
 ################################################################################
 
 # Common variables
-log=~/build.log
-pid_file=~/build.pid
+log=~/ece-build.log
+pid_file=~/ece-build.pid
 build_date=`date +%F_%H%M`
 builder_root_dir=/home/builder
+builder_engine_dir=$builder_root_dir/engine
+builder_plugins_dir=$builder_root_dir/plugins
 assemblytool_root_dir=~/assemblytool
 assemblytool_pub_dir=$assemblytool_root_dir/publications
 assemblytool_lib_dir=$assemblytool_root_dir/lib
 svn_src_dir=~/src
+maven_conf_file=~/.m2/settings.xml
+project_assembly_dir=$svn_src_dir/project-assembly
+project_assembly_target_dir=$project_assembly_dir/target
+escenic_indentifiers="engine
+forum
+geocode
+analysis-engine
+xml-editor
+menu-editor
+dashboard
+poll
+lucy
+widget-framework-core
+widget-framework-common"
 release_dir=~/releases
 plugin_dir=~/plugins
 engine_root_dir=~/engine
 ece_scripts_home=/usr/share/escenic/ece-scripts
+conf_file=~/.build/build.conf
+dependencies="ant
+svn
+mvn
+unzip
+wget"
 
 ##
-function fetch_configuration
-{
-  conf_file=~/.build/build.conf
-  source $conf_file
+function set_pid {
+  if [ -e $pid_file ]; then
+    print "Instance of $(basename $0) already running!"
+    exit 1
+  else
+    echo $BASHPID > $pid_file
+  fi
 }
 
 ##
 function init
 {
-  source $ece_scripts_home/common-bashing.sh
-  source $ece_scripts_home/common-io.sh
+  init_failed=0
+  if [ ! -d $ece_scripts_home ]; then
+    init_failed=1
+    error_message="The directory for ece-scripts $ece_scripts_home does not exist, exiting!"
+  elif [ ! -e $ece_scripts_home/common-bashing.sh ]; then
+    init_failed=1
+    error_message="The script $ece_scripts_home/common-bashing.sh does not exist, exiting!"
+  elif [ ! -e $ece_scripts_home/common-io.sh ]; then
+    init_failed=1
+    error_message="The script $ece_scripts_home/common-io.sh does not exist, exiting!"
+  fi
+  if [ $init_failed -eq 0 ]; then
+    source $ece_scripts_home/common-bashing.sh
+    source $ece_scripts_home/common-io.sh
+  else
+    echo "$error_message"
+    exit 1
+  fi
 }
 
-## TODO - doc
-function set_pid {
-  if [ -e $pid_file ]; then
-    print "Instance of $(basename $0) already running!"
-    exit 1
-  else
-    echo $BASHPID > $pid_file
+##
+function enforce_variable
+{
+  if [ ! -n "$(eval echo $`echo $1`)" ]; then
+    print_and_log "$2"
+    remove_pid_and_exit_in_error
   fi
 }
 
-function common_post_build {
-  run rm $pid_file
+##
+function verify_command {
+  command -v $1 >/dev/null 2>&1 || { print >&2 "I require $1 but it's not installed, exiting!"; remove_pid_and_exit_in_error; }
+}
+
+##
+function verify_java 
+{
+  if !dpkg-query -W sun-java6-jdk > /dev/null 2>&1; then
+    print_and_log "Required package sun-java6-jdk is not installed, exiting!"
+    remove_pid_and_exit_in_error
+  fi
+}
+
+##
+function verify_dependencies
+{
+  for f in $dependencies
+  do
+    verify_command $f
+  done
+}
+
+##
+function fetch_configuration
+{
+  if [ -e $conf_file ]; then
+    source $conf_file
+  else
+    print_and_log "Your user is missing the $conf_file, exiting!"
+    remove_pid_and_exit_in_error
+  fi 
+}
+
+##
+function verify_configuration {
+  enforce_variable customer "Your $conf_file is missing the variable 'customer', exiting!"
+  enforce_variable svn_base "Your $conf_file is missing the variable 'svn_base', exiting!"
+  enforce_variable svn_user "Your $conf_file is missing the variable 'svn_base', exiting!"
+  enforce_variable svn_password "Your $conf_file is missing the variable 'svn_password', exiting!"
+  # append a / to svn_base if not present
+  [[ $svn_base != */ ]] && svn_base="$svn_base"/
 }
 
 ##
@@ -75,163 +155,125 @@ function get_user_options
 }
 
 ##
-function verify_configuration {
-  ensure_variable_is_set customer
-  ensure_variable_is_set svn_base
-  # append a / if not present
-  [[ $svn_base != */ ]] && svn_base="$svn_base"/
-  ensure_variable_is_set svn_user
-  ensure_variable_is_set svn_password
-}
-
-##
-function verify_builder {
+function verify_assemblytool
+{
   if [ ! -d $assemblytool_root_dir ]; then
     print_and_log "$assemblytool_root_dir is required, but it doesn't exist!"
     remove_pid_and_exit_in_error
   fi
   if [ ! -d $assemblytool_pub_dir ]; then
-    print_and_log "$assemblytool_pub_dir did not exist so it has been created."
     make_dir $assemblytool_pub_dir
+    print_and_log "$assemblytool_pub_dir did not exist so it has been created."
   fi
   if [ ! -d $assemblytool_lib_dir ]; then
-    print_and_log "$assemblytool_lib_dir did not exist so it has been created."
     make_dir $assemblytool_lib_dir
+    print_and_log "$assemblytool_lib_dir did not exist so it has been created."
   fi
   if [ ! -d $release_dir ]; then
-    print_and_log "$release_dir did not exist so it has been created."
     make_dir $release_dir
+    print_and_log "$release_dir did not exist so it has been created."
   fi
 }
 
-# clean up customer home
-function home_preparation
+## 
+function clean_customer_home
 {
   if [ -d "$plugin_dir" ]; then
-    run rm -rf $plugin_dir
+    run rm -f $plugin_dir/*
   fi
-
   if [ ! -d $plugin_dir ]; then
-    run mkdir $plugin_dir
+    make_dir $plugin_dir
   fi
-
   if [ -h "$engine_root_dir" ]; then
-    run rm $engine_root_dir
+    run rm -f $engine_root_dir
   fi
-
   if [ -e "$assemblytool_pub_dir" ]; then
-    run rm -rf $assemblytool_pub_dir
+    run rm -f $assemblytool_pub_dir/*
+  fi
+  if [ ! -d $assemblytool_pub_dir ]; then
     make_dir $assemblytool_pub_dir
   fi
-
   if [ -e "$assemblytool_lib_dir" ]; then
-    run rm -rf $assemblytool_lib_dir
+    run rm -f $assemblytool_lib_dir/*
+  fi
+  if [ ! -d $assemblytool_lib_dir ]; then
     make_dir $assemblytool_lib_dir
   fi
-
   if [ -e "$svn_src_dir" ]; then
     run rm -rf $svn_src_dir
+  fi
+  if [ ! -d $svn_src_dir ]; then
     make_dir $svn_src_dir
   fi
 }
 
-## TODO: make a place where everything common to all ears go.
+##
 function add_global_libs
 {
-  
-  ln -s /opt/escenic/assemblytool/lib/java_memcached-release_2.0.1.jar $assemblytool_lib_dir/
-  ln -s $builder_root_dir/lib/engine-backport-1.0-SNAPSHOT.jar $assemblytool_lib_dir/
+  if [ -e $builder_root_dir/lib/java_memcached-release_2.0.1.jar ]; then
+    run ln -s $builder_root_dir/lib/java_memcached-release_2.0.1.jar $assemblytool_lib_dir/
+  else
+    print_and_log "The global library $builder_root_dir/lib/java_memcached-release_2.0.1.jar is missing, exiting!"
+    remove_pid_and_exit_in_error
+  fi
+  if [ -e $builder_root_dir/lib/engine-backport-1.0-SNAPSHOT.jar ]; then
+    run ln -s $builder_root_dir/lib/engine-backport-1.0-SNAPSHOT.jar $assemblytool_lib_dir/
+  else
+    print_and_log "The global library $builder_root_dir/lib/engine-backport-1.0-SNAPSHOT.jar is missing, exiting!"
+    remove_pid_and_exit_in_error
+  fi
 }
 
-
-## Checkout customer project
-function svn_checkout {
-
+##
+function svn_fail_early
+{
   if [ -z "$svn_path" ]; then
     svn_path=trunk
     release_label=$svn_path
-    print_and_log "No svn path chosen! Will use 'trunk'!"
+    log "No svn path chosen, will use 'trunk'."
   fi
-  print_and_log "Initiating svn checkout of $svn_path ..."
-  #TODO run?
-  svn checkout --username=$svn_user --password=$svn_password $svn_base$svn_path $svn_src_dir/.
-
+  run svn checkout --non-interactive --depth empty --username $svn_user  --password $svn_password $svn_base$svn_path $svn_src_dir/.
 }
 
-# parse version based on property from src/pom.xml
-function parse_version {
-  run export $1=`sed "/<$2>/!d;s/ *<\/\?$2> *//g" $svn_src_dir/pom.xml | tr -d $'\r' `
-}
-
-# symlink component from $builder_root_dir/.
-function symlink_distribution {
-  run ln -s $builder_root_dir/$1 ~/$2
-}
-
-function symlink_ece_components {
-
-  # Version - Escenic Content Engine
-  parse_version ENGINE_VERSION escenic.engine.version
-  if [ ! -z $ENGINE_VERSION ]; then
-    symlink_distribution engine/engine-$ENGINE_VERSION engine
-  fi
-
-  # Version - Geo Code
-  parse_version GEOCODE_VERSION escenic.geocode.version
-  symlink_distribution plugins/geocode-$GEOCODE_VERSION plugins/geocode
-
-  # Version - Poll
-  parse_version POLL_VERSION escenic.poll.version
-  symlink_distribution plugins/poll-$POLL_VERSION plugins/poll
-
-  # Version - Menu Editor
-  parse_version MENU_EDITOR_VERSION escenic.menu-editor.version
-  symlink_distribution plugins/menu-editor-$MENU_EDITOR_VERSION plugins/menu-editor
-
-  # Version - XML Editor
-  parse_version XML_EDITOR_VERSION escenic.xml-editor.version
-  symlink_distribution plugins/xml-editor-$XML_EDITOR_VERSION plugins/xml-editor
-
-  # Version - Analysis Engine
-  parse_version ANALYSIS_ENGINE_VERSION escenic.analysis-engine.version
-  symlink_distribution plugins/analysis-engine-$ANALYSIS_ENGINE_VERSION plugins/analysis-engine
-
-  # Version - Forum
-  parse_version FORUM_VERSION escenic.forum.version
-  symlink_distribution plugins/forum-$FORUM_VERSION plugins/forum
-
-  # Version - Dashboard
-  parse_version DASHBOARD_VERSION escenic.dashboard.version
-  symlink_distribution plugins/dashboard-$DASHBOARD_VERSION plugins/dashboard
-
-  # Version - Lucy
-  parse_version LUCY_VERSION escenic.lucy.version
-  symlink_distribution plugins/lucy-$LUCY_VERSION plugins/lucy
-  
-  # Version - Widget Framework Common
-  parse_version WIDGET_FRAMEWORK_COMMON_VERSION escenic.widget-framework-common.version
-  if [ ! -z $WIDGET_FRAMEWORK_COMMON_VERSION ]; then
-    symlink_distribution plugins/widget-framework-common-$WIDGET_FRAMEWORK_COMMON_VERSION plugins/widget-framework-common
+##
+function svn_verify_assembly
+{
+  run svn update --non-interactive --set-depth infinity $svn_src_dir/pom.xml $svn_src_dir/project-assembly 
+  if [ ! -d $project_assembly_dir ]; then
+    print_and_log "Your project does not contain the project-assembly module and is thereby not certified to use the ece-builder, exiting!"
+    remove_pid_and_exit_in_error
+  elif [ ! -e $project_assembly_dir/src/main/assembly/assembly.xml ]; then
+    print_and_log "Your project does not have a $project_assembly_dir/src/main/assembly/assembly.xml and is thereby not certified to use the ece-builder, exiting!"
+    remove_pid_and_exit_in_error
   fi
+}
 
-  # Version - Widget Framework
-  parse_version WIDGET_FRAMEWORK_VERSION escenic.widget-framework.version
-  if [ ! -z $WIDGET_FRAMEWORK_VERSION ]; then
-    symlink_distribution plugins/widget-framework-core-$WIDGET_FRAMEWORK_VERSION plugins/widget-framework
-  fi
+##
+function symlink_ece_components
+{
+  for f in $escenic_indentifiers
+  do
+    version=`sed "/<escenic.$f.version>/!d;s/ *<\/\?escenic.$f.version> *//g" $svn_src_dir/pom.xml | tr -d $'\r' `
+    echo "Version:$version:"
+    if [[ ! $version = "" ]]; then
+      if [[ "$f" = "engine" ]]; then
+        run ln -s $builder_engine_dir/$f-$version $engine_root_dir 
+      else
+        run ln -s $builder_plugins_dir/$f-$version $plugin_dir/$f 
+      fi
+    fi
+  done
 }
 
 ##
-function verify_requested_versions 
+function verify_requested_versions
 {
   verification_failed=0
-  
   if [ ! -d $engine_root_dir ]; then
-    broken_link=`readlink $engine_root_dir` 
+    broken_link=`readlink $engine_root_dir`
     print_and_log "The requested engine $broken_link does not exist on the plattform and must be added!"
     verification_failed=1
   fi
-  
   for f in $(ls -d $plugin_dir/*);
   do
     if [ ! -d $f ]; then
@@ -240,102 +282,181 @@ function verify_requested_versions
       verification_failed=1
     fi
   done
-  
   if [ $verification_failed -eq 1 ]; then
     print_and_log "You have broken symlinks indicating that some requested version(s) of engine and/or plugins are missing!"
-    print_and_log "Build failed!"
-    remove_pid_and_exit_in_error    
+    print_and_log "BUILD FAILED!"
+    remove_pid_and_exit_in_error
   fi
 }
 
-# symlink .war files from target/
-function symlink_target {
-
-  # global classpath
-  if [ -e "$svn_src_dir/project-assembly/target/lib" ]; then
-    for f in $(ls -d $svn_src_dir/project-assembly/target/lib/*);
-      do run ln -s $f $assemblytool_lib_dir;
-    done
-  fi
-
-  # publications
-  if [ -e "$svn_src_dir/project-assembly/target/wars" ]; then
-    for f in $(ls -d $svn_src_dir/project-assembly/target/wars/*);
-      do ln -s $f $assemblytool_pub_dir;
-    done
+##
+function verify_maven_proxy
+{
+  if [ -e $maven_conf_file ];
+    maven_user=`sed "/<username>/!d;s/ *<\/\?username> *//g" $maven_conf_file | tr -d $'\r' `
+    maven_password=`sed "/<password>/!d;s/ *<\/\?password> *//g" $maven_conf_file | tr -d $'\r' `
+    if [[ $maven_user = "" ]] || [[ $maven_password = "" ]]; then
+      print_and_log "Your $maven_conf_file is missing the username and/or the password for the maven proxy, exiting!"
+      remove_pid_and_exit_in_error
+    else
+      run wget --http-user $maven_user --http-password $maven_password http://maven.vizrt.com -O /dev/null
+    fi
+  else
+    print_and_log "Your user does not have a ~/.m2/settings.xml, exiting!"
+    remove_pid_and_exit_in_error
   fi
+ run wget 
 }
 
-##
-function release 
+## 
+function svn_checkout
 {
-  home_preparation
-  
-  run svn_checkout
-  
+  run svn update --non-interactive --set-depth infinity $svn_src_dir
   revision=`svn info $svn_src_dir | grep -i Revision | awk '{print $2}'`
-  
-  if [ -z "$revision" ]; then
-    print_and_log "Failed to fetch current revision number, exiting! :-("
+  if [[ $revision = "" ]]; then    
+    print_and_log "Failed to fetch current revision number, exiting!"
     remove_pid_and_exit_in_error
   fi
-  
-  symlink_ece_components
-
-  verify_requested_versions
+}
 
+##
+function maven_build
+{
   run cd $svn_src_dir
   run mvn clean install
+}
 
-  run cd $svn_src_dir/project-assembly/target
+##
+function symlink_project_assembly
+{
+  run cd $project_assembly_target_dir
   run unzip project-assembly.zip
+  # global classpath
+  if [ -e "$project_assembly_target_dir/lib" ]; then
+    for f in $(ls -d $project_assembly_target_dir/lib/* | grep .jar);
+    do 
+      run ln -s $f $assemblytool_lib_dir;
+    done
+  fi
+  # publications
+  if [ -e "$project_assembly_target_dir/wars" ]; then
+    for f in $(ls -d $project_assembly_target_dir/wars/* | grep .war);
+    do
+      ln -s $f $assemblytool_pub_dir;
+    done
+  fi
+}
 
-  symlink_target
-
-  add_global_libs
-
-  add_dashboard_descriptor
+##
+function generate_publication_properties
+{
+  for f in $(ls $assemblytool_pub_dir | grep .war)
+  do
+    echo "source-war:$f
+context-root:/${f%.war}" > $assemblytool_pub_dir/${f%.war}.properties
+  done
+  if [ -d ${plugins/dashboard} ]; then
+    print_and_log "Adding an assembly descriptor for Dashboard ..."
+    echo "source-war: ../../plugins/dashboard/wars/dashboard-webapp.war
+context-root: /dashboard" > $assemblytool_pub_dir/dashboard.properties
+  fi
+}
 
+##
+function ant_build
+{
   run cd $assemblytool_root_dir
   run ant -q clean ear -DskipRedundancyCheck=true
+}
 
+##
+function publish_ear 
+{
   resulting_ear=$customer-$release_label-rev$revision-$build_date.ear
-  run cp $assemblytool_root_dir/dist/engine.ear $release_dir/$resulting_ear
-  
-  if [ ! -e "$release_dir/$resulting_ear" ]; then
-    print_and_log "I'm done, but the .ear is still missing, exiting! :-("
+  if [ -e $assemblytool_root_dir/dist/engine.ear ]; then 
+    run cp $assemblytool_root_dir/dist/engine.ear $release_dir/$resulting_ear
+  else
+    print_and_log "I'm done, but the .ear is still missing, exiting!"
     remove_pid_and_exit_in_error
   fi
+}
+
+##
+function print_result
+{
+  print_and_log "BUILD SUCCESSFUL! @ $(date)"
+  print_and_log "You'll find the release here: http://builder.vizrtsaas.com/$customer/releases/$resulting_ear"
+}
 
+##
+function common_post_build {
+  run rm $pid_file
 }
 
-function add_dashboard_descriptor() {
-  if [ -d ${plugins/dashboard} ]; then
-    print_and_log "Adding an assembly descriptor for Dashboard ..." 
-    cat >> $assemblytool_root_dir/publications/dashboard.properties <<EOF
-source-war: ../../plugins/dashboard/wars/dashboard-webapp.war
-context-root: /dashboard
-EOF
-  else
-    print_and_log "The Dashboard plugin is not available, not making descriptor for it."
-  fi
+##
+function phase_startup {
+  set_pid
+  init
 }
 
 ##
-function print_result
+function phase_verify_plattform
 {
-  print_and_log "Build SUCCESSFUL! @ $(date)"
-  print_and_log "You'll find the release here: http://builder.vizrtsaas.com/$customer/releases/$resulting_ear"
+  verify_dependencies
+  verify_java
+}
+
+##
+function phase_verify_user
+{
+  verify_maven_proxy
+  fetch_configuration
+  verify_configuration
+  verify_assemblytool
+}
+
+##
+function phase_clean_up
+{
+  clean_customer_home
+}
+
+##
+function phase_verify_project
+{
+  svn_fail_early
+  add_global_libs
+  svn_verify_assembly
+  symlink_ece_components
+  verify_requested_versions
+  
+}
+
+##
+function phase_release
+{
+  svn_checkout
+  maven_build
+  generate_publication_properties
+  ant_build
+  publish_ear
+  print_result
+}
+
+##
+function phase_shutdown
+{
+  phase_clean_up
 }
 
-set_pid
-fetch_configuration
-init
-print_and_log "Starting building @ $(date)"
+## ece-build execution
+phase_startup
+print_and_log "Starting release creation! @ $(date)"
+print_and_log "Additional output can be found in $log"
+phase_verify_plattform
+phase_verify_user
+phase_clean_up
 get_user_options $@
-verify_configuration
-home_preparation
-verify_builder
-release
-print_result
-common_post_build
+phase_verify_project
+phase_release
+phase_shutdown

From a25590754646b0b30d0b91a1476c9f37edd8e64d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 24 Jul 2012 10:36:46 +0200
Subject: [PATCH 0983/2585] - fixed bug in install_web_server for profile=all
 (no nginx   configuration would be created).

---
 usr/share/escenic/ece-scripts/ece-install.d/web-server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/web-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/web-server.sh
index c42de569..d29fc1be 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/web-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/web-server.sh
@@ -50,7 +50,7 @@ server {
   }
 }
 EOF
-  elif [ $1 -eq 3 ]; then
+  elif [ $1 -eq 2 ]; then
     port=81
     cat > $file <<EOF
 server {

From f692a3e3bb03ea9858c41dea8e09ab2dd23b1f35 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 24 Jul 2012 10:41:03 +0200
Subject: [PATCH 0984/2585] - removed LDAP settings as ece-install now is only
 maintained for ECE   5.3 and up.

  For 5.2 systems (if the script still works there, no guarantees!),
  you may try to re-add these settings:

  # These two LDAP settings can be ignored on systems with ECE >= 5.3
  ldapProductName=OpenLdap
  ldapProductVersion=2.2.26
---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index f8c397e5..ee247cc8 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -371,10 +371,6 @@ function set_up_basic_nursery_configuration() {
 databaseProductName=MySQL
 filePublicationRoot=$escenic_data_dir/engine/
 webPublicationRoot=http://${public_host_name}/
-
-# These two LDAP settings can be ignored on systems with ECE >= 5.3
-ldapProductName=OpenLdap
-ldapProductVersion=2.2.26
 EOF
   cat > $common_nursery_dir/neo/io/managers/ContentManager.properties <<EOF
 readConnector=/connector/ReadConnector

From 565663973df444270f0f0f749e3e63cfa249a287 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 24 Jul 2012 13:42:54 +0200
Subject: [PATCH 0985/2585] - added support for EAR and conf archive when using
 the   profile=all. New configuration options:

  fai_all_ear
  fai_all_conf_archive
---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index ee247cc8..dbe83d83 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -576,6 +576,9 @@ function set_archive_files_depending_on_profile()
   elif [ $install_profile_number -eq $PROFILE_SEARCH_SERVER ]; then
     ece_instance_ear_file=$fai_search_ear
     ece_instance_conf_archive=$fai_search_conf_archive
+  elif [ $install_profile_number -eq $PROFILE_ALL_IN_ONE ]; then
+    ece_instance_ear_file=$fai_all_ear
+    ece_instance_conf_archive=$fai_all_conf_archive
   fi
 }
 

From dd304a32d17ff7e2bb468dfcfca16dd01a55e95e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 24 Jul 2012 16:36:42 +0200
Subject: [PATCH 0986/2585] - common-bashing: added new method  
 is_unauthorized_to_access_url. Method will return 1 if the user/pass   is
 unauthorized to access the ## URL in question. Hence, a 0 means   that the
 user CAN access the URL.

- added checking in common_pre_install, run before any
  profile (configuration) is even read, which checks that Technet &
  WF (if the wf_user/password are set in the ece-install.conf)
  credentials are valid.

  If these are invalid, ece-install will now fail fast:

  [ece-install-1] Verifying that Technet credentials are OK ...
  [ece-install-1] Verifying that Widget Framework credentials are OK ...
  [ece-install-1] The wf_user & wf_password in /root/ece-install.conf
  [ece-install-1] are insufficient to access http://repo.escenic.com :-(

  These changes were a part of issue #82
---
 usr/sbin/ece-install                          | 48 ++++++++++++++++++-
 .../escenic/ece-scripts/common-bashing.sh     | 12 +++++
 2 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 2479a6e0..155656c0 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -197,18 +197,20 @@ function install_packages_if_missing() {
 function install_common_os_packages()
 {
   print_and_log "Installing common OS packages ..."
+  local packages="curl $git_package wget unzip bc ca-certificates"
   git_package=git
+  
   if [ $on_debian_or_derivative -eq 1 ]; then
         # Ubuntu doesn't have git (!) but only git-core.
     if [ $on_ubuntu -eq 1 ]; then
       git_package=git-core
     fi
+    packages="${packages} bind9-host"
   fi
   
-  local packages="curl $git_package wget unzip bc ca-certificates"
   install_packages_if_missing $packages
   
-  for el in lsb_release curl wget git unzip; do
+  for el in lsb_release curl host wget git unzip; do
     assert_pre_requisite $el
   done
 
@@ -552,6 +554,45 @@ EOF
     fi
 }
 
+## checks the Technet and WF credentials.
+function check_software_credentials() {
+  install_packages_if_missing curl
+
+  print_and_log "Verifying that Technet credentials are OK ..." 
+  local url=http://technet.escenic.com
+  local notok=$(
+    is_unauthorized_to_access_url \
+      ${technet_user} \
+      ${technet_password} \
+      $url
+  )
+  if [ $notok -eq 1 ]; then
+    print_and_log "The technet_user & technet_password in $conf_file"
+    print_and_log "are insufficient to access ${url} :-("
+    remove_pid_and_exit_in_error
+  fi
+
+  # this method is called so early, so we don't yet know which
+  # installation profile is being used. Hence, we just test for if the
+  # wf_user & password has been set and are able to access the Escenic
+  # Maven repository.
+  if [ -n "${wf_user}" -a -n "${wf_password}" ]; then
+    print_and_log "Verifying that Widget Framework credentials are OK ..." 
+    local url=http://repo.escenic.com
+    local notok=$(
+      is_unauthorized_to_access_url \
+        ${wf_user} \
+        ${wf_password} \
+        $url
+    )
+    if [ $notok -eq 1 ]; then
+      print_and_log "The wf_user & wf_password in $conf_file"
+      print_and_log "are insufficient to access ${url} :-("
+      remove_pid_and_exit_in_error
+    fi
+  fi
+}
+
 function common_pre_install()
 {
     print "I'm logging to $log"
@@ -587,6 +628,9 @@ function common_pre_install()
         remove_pid_and_exit_in_error
     fi
 
+    # TODO enable when the function is implemented
+    check_software_credentials
+
     if [ -e /etc/debian_version -a -x /usr/bin/dpkg ]; then
         on_debian_or_derivative=1
         export DEBIAN_FRONTEND=noninteractive
diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index 2e7aca77..4501fe77 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -265,3 +265,15 @@ function print_next_step_list() {
     print "  - " ${next_steps[$i]}
   done
 }
+
+## Method will return 1 if the user/pass is unauthorized to access the
+## URL in question. Hence, a 0 means that the user CAN access the URL.
+## $1 user
+## $2 pass
+## $3 URL
+function is_unauthorized_to_access_url() {
+  curl -s  -I  -u ${1}:${2} ${3} | \
+    head -1 | \
+    grep "401 Unauthorized" | \
+    wc -l
+}

From b1dae82512c45a93b35efe7aa0461a3eb3ef4d9a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 24 Jul 2012 16:59:13 +0200
Subject: [PATCH 0987/2585] - added more fail fast checking to ece-install; it
 will not fail   report missing WF credentials instantly, if the (FAI) profile
 given   expects these to be set.

  Furthermore, if the wf_user & wf_password are set in the
  ece-install.conf, ece-install will check to see if they're valid (as
  before).

- removed the WF credential checking (or indeed just that these are
  set) from the widget-framework.sh module (as this now is done in
  check_software_credentials()).

  This closes issue #82
---
 usr/sbin/ece-install                                | 13 +++++++++++--
 .../ece-scripts/ece-install.d/widget-framework.sh   |  6 ------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 155656c0..672a637a 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -558,7 +558,8 @@ EOF
 function check_software_credentials() {
   install_packages_if_missing curl
 
-  print_and_log "Verifying that Technet credentials are OK ..." 
+  print_and_log "Verifying that Technet credentials are OK ..."
+  
   local url=http://technet.escenic.com
   local notok=$(
     is_unauthorized_to_access_url \
@@ -576,6 +577,8 @@ function check_software_credentials() {
   # installation profile is being used. Hence, we just test for if the
   # wf_user & password has been set and are able to access the Escenic
   # Maven repository.
+
+  # if the WF credentials are set, we check to see if they're OK
   if [ -n "${wf_user}" -a -n "${wf_password}" ]; then
     print_and_log "Verifying that Widget Framework credentials are OK ..." 
     local url=http://repo.escenic.com
@@ -590,6 +593,13 @@ function check_software_credentials() {
       print_and_log "are insufficient to access ${url} :-("
       remove_pid_and_exit_in_error
     fi
+  elif [ ${fai_enabled-0} -eq 1 ]; then
+    if [[ ${fai_wf_install-0} -eq 1 || ${fai_all_install-0} -eq 1 ]]; then
+      print_and_log "You must have a valid wf_user & wf_password"
+      print_and_log "in your ${conf_file}. If you don't have these,"
+      print_and_log "please contact support@escenic.com"
+      remove_pid_and_exit_in_error
+    fi
   fi
 }
 
@@ -628,7 +638,6 @@ function common_pre_install()
         remove_pid_and_exit_in_error
     fi
 
-    # TODO enable when the function is implemented
     check_software_credentials
 
     if [ -e /etc/debian_version -a -x /usr/bin/dpkg ]; then
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh b/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
index 00ed8075..7d9bf903 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
@@ -7,12 +7,6 @@ function install_widget_framework()
   local wf_user=$(get_conf_value wf_user)
   local wf_password=$(get_conf_value wf_password)
 
-  if [ -z "$wf_user" -o -z "$wf_password" ]; then
-    print_and_log "Missing wf_user and wf_password in ${conf_file}. If you"
-    print_and_log "don't have these, please contact support@escenic.com"
-    remove_pid_and_exit_in_error
-  fi
-
   print_and_log "Creating a Maven settings file: $HOME/.m2/settings.xml ..."
   make_dir $HOME/.m2
   cat > $HOME/.m2/settings.xml <<EOF

From e88a3d3fa9122ae6e62ec837019d4607fd5f232f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=F6n?= <oschoen@vizrt.com>
Date: Wed, 25 Jul 2012 09:11:30 +0200
Subject: [PATCH 0988/2585] build.sh - Added additional fail early functions

---
 usr/share/escenic/build-scripts/build.sh | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/usr/share/escenic/build-scripts/build.sh b/usr/share/escenic/build-scripts/build.sh
index aad7d225..8c482ab1 100755
--- a/usr/share/escenic/build-scripts/build.sh
+++ b/usr/share/escenic/build-scripts/build.sh
@@ -36,7 +36,9 @@ plugin_dir=~/plugins
 engine_root_dir=~/engine
 ece_scripts_home=/usr/share/escenic/ece-scripts
 conf_file=~/.build/build.conf
-dependencies="ant
+dependencies="tar
+sed
+ant
 svn
 mvn
 unzip
@@ -254,7 +256,6 @@ function symlink_ece_components
   for f in $escenic_indentifiers
   do
     version=`sed "/<escenic.$f.version>/!d;s/ *<\/\?escenic.$f.version> *//g" $svn_src_dir/pom.xml | tr -d $'\r' `
-    echo "Version:$version:"
     if [[ ! $version = "" ]]; then
       if [[ "$f" = "engine" ]]; then
         run ln -s $builder_engine_dir/$f-$version $engine_root_dir 
@@ -292,20 +293,24 @@ function verify_requested_versions
 ##
 function verify_maven_proxy
 {
-  if [ -e $maven_conf_file ];
+  if [ -e $maven_conf_file ]; then
     maven_user=`sed "/<username>/!d;s/ *<\/\?username> *//g" $maven_conf_file | tr -d $'\r' `
     maven_password=`sed "/<password>/!d;s/ *<\/\?password> *//g" $maven_conf_file | tr -d $'\r' `
     if [[ $maven_user = "" ]] || [[ $maven_password = "" ]]; then
       print_and_log "Your $maven_conf_file is missing the username and/or the password for the maven proxy, exiting!"
       remove_pid_and_exit_in_error
     else
-      run wget --http-user $maven_user --http-password $maven_password http://maven.vizrt.com -O /dev/null
+      wget --http-user $maven_user --http-password $maven_password http://maven.vizrt.com -qO /dev/null
+      RETVAL=$?
+      if [ $RETVAL -ne 0 ]; then
+        print_and_log "Your user can't reach http://maven.vizrt.com, exiting!"
+        remove_pid_and_exit_in_error
+      fi
     fi
   else
     print_and_log "Your user does not have a ~/.m2/settings.xml, exiting!"
     remove_pid_and_exit_in_error
   fi
- run wget 
 }
 
 ## 
@@ -446,7 +451,7 @@ function phase_release
 ##
 function phase_shutdown
 {
-  phase_clean_up
+  common_post_build
 }
 
 ## ece-build execution

From 1396ba4a42f03245629894c018b742cba9076f13 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 25 Jul 2012 10:40:26 +0200
Subject: [PATCH 0989/2585] - made the configuration of the cron job easier,
 simply uncomment the   changes to make them active.

  The reason for this, is that I don't want the /etc/default/ece,
  which is the configuration file for the init.d script, to configure
  the behaviour of a cron job.

  Besides, the simple comment/uncomment feature should suffice in most
  cases.
---
 etc/cron.daily/remove-old-escenic-log-files | 12 +++---------
 etc/default/ece                             |  3 ---
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/etc/cron.daily/remove-old-escenic-log-files b/etc/cron.daily/remove-old-escenic-log-files
index 433fe1f7..b77ad64f 100755
--- a/etc/cron.daily/remove-old-escenic-log-files
+++ b/etc/cron.daily/remove-old-escenic-log-files
@@ -1,12 +1,6 @@
 #! /usr/bin/env bash
 
-file=/etc/default/ece
-if [ ! -r $file ]; then
-  return
-else
-  source $file
-fi
+## Uncomment the following line to have daily removal of old log
+## files.
+# /etc/init.d/ece remove-old-log-files
 
-if [ ${remove_old_escenic_log_files-0} -eq 1 ]; then
-  /etc/init.d/ece remove-old-log-files
-fi
diff --git a/etc/default/ece b/etc/default/ece
index c80e79aa..ef5aaccf 100644
--- a/etc/default/ece
+++ b/etc/default/ece
@@ -19,6 +19,3 @@ ece_script=/usr/bin/ece
 # for both of these.
 ece_unix_group=escenic
 ece_unix_user=escenic
-
-# Set this to 1 for automatic removal of old log files.
-remove_old_escenic_log_files=0

From 7f52fb80f2556542ec2fed3079238f41c271b9aa Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 25 Jul 2012 11:13:50 +0200
Subject: [PATCH 0990/2585] - made the cron script more advanced in that it now
 can be installed   on any server, also the ones that don't have  
 ECE/EAE/changelogd/search currently installed.

- added documentation.
---
 etc/cron.daily/remove-old-escenic-log-files | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/etc/cron.daily/remove-old-escenic-log-files b/etc/cron.daily/remove-old-escenic-log-files
index b77ad64f..4c2e4514 100755
--- a/etc/cron.daily/remove-old-escenic-log-files
+++ b/etc/cron.daily/remove-old-escenic-log-files
@@ -1,6 +1,18 @@
 #! /usr/bin/env bash
 
+# cron script to remove old escenic related log files. It's safe to
+# install this cron script on all servers, also the ones that don't
+# have Escenic Content Engine or Escenic Analysis Engine installed.
+
+function remove_old_escenic_log_files() {
+  if [ ! -e /etc/init.d/ece ]; then
+    return
+  fi
+
+  /etc/init.d/ece remove-old-log-files
+}
+
 ## Uncomment the following line to have daily removal of old log
 ## files.
-# /etc/init.d/ece remove-old-log-files
+# remove_old_escenic_log_files
 

From b50a1185ea6195ef74f4fa5afc0e648172da4416 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 25 Jul 2012 11:19:30 +0200
Subject: [PATCH 0991/2585] - added documentation for the fai_all_conf_archive
 and fai_all_ear

---
 usr/share/doc/escenic/ece-install-guide.org | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 0c729ddf..9e776909 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -673,6 +673,8 @@ $HOME/ece-install.conf file of the root user:
 |-------------------------------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------|
 | Parameter                           | Default                                           | Description                                                                                                                           |
 |-------------------------------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------|
+| fai_all_conf_archive                | ""                                                | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
+| fai_all_ear                         | ""                                                | EAR to use instead of the Escenic binaries                                                                                            |
 | fai_all_install                     | 0                                                 | Install all components on your server.                                                                                                |
 | fai_analysis_db_host                | localhost                                         | For the EAE DB (different from ECE's)                                                                                                 |
 | fai_analysis_db_install             | 0                                                 | Install db profile                                                                                                                    |

From e06acf2a1a9d94e51bb53ebc2fe8c8e0f72ffddd Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 25 Jul 2012 11:59:57 +0200
Subject: [PATCH 0992/2585] - now, it's also logged (not just system out) when
 ece removes old log   files. - increased the default max_days_old from 3 to
 5.

---
 usr/share/escenic/ece-scripts/ece.d/remove-old-log-files.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/remove-old-log-files.sh b/usr/share/escenic/ece-scripts/ece.d/remove-old-log-files.sh
index 4c521d52..20d675ab 100644
--- a/usr/share/escenic/ece-scripts/ece.d/remove-old-log-files.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/remove-old-log-files.sh
@@ -1,7 +1,7 @@
 #! /usr/bin/env bash
 
-# removes log files older than three days
-max_days_old=3
+# removes log files older than <numbber> days
+max_days_old=5
 
 function get_log_file_dir_list() {
   local dir_list="${log_dir}"
@@ -25,7 +25,7 @@ function remove_old_logs_if_exist() {
     return
   fi
 
-  print "Deleting" $(echo "$old_log_files" | wc -l) \
+  print_and_log "Deleting" $(echo "$old_log_files" | wc -l) \
     "log files in $1" \
     "older than ${max_days_old} days"
   run rm $old_log_files

From 68f6d66e9f0d86d2c5dd7da9a46c35ab626b4e6c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 25 Jul 2012 12:04:14 +0200
Subject: [PATCH 0993/2585] - added the remove-old-log-files cron job to the
 package   escenic-content-engine-scripts.

---
 usr/share/escenic/package-scripts/create-packages | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index e5013149..5243fc00 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -92,12 +92,13 @@ function set_up_escenic-build-scripts() {
 }
 
 function set_up_escenic-content-engine-scripts() {
-  mkdir -p $target_dir/{etc,usr,/etc/default}
-  mkdir -p $target_dir/usr/{bin,sbin,share/doc}
+  mkdir -p $target_dir/etc/bash_completion.d
+  mkdir -p $target_dir/etc/cron.daily/
   mkdir -p $target_dir/etc/init.d
   mkdir -p $target_dir/usr/share/doc/escenic
   mkdir -p $target_dir/usr/share/escenic/ece-scripts
-  mkdir -p $target_dir/etc/bash_completion.d
+  mkdir -p $target_dir/usr/{bin,sbin,share/doc}
+  mkdir -p $target_dir/{etc,usr,/etc/default}
 
   # bin
   cp -r ../../../bin/ece $target_dir/usr/bin/
@@ -114,6 +115,10 @@ function set_up_escenic-content-engine-scripts() {
   # doc
   cp -r ../../doc/escenic/ece-guide.{org,html} \
     $target_dir/usr/share/doc/escenic
+
+  # cron
+  cp -r ../../../../etc/cron.daily/remove-old-escenic-log-files \
+    $target_dir/etc/cron.daily/
 }
 
 function set_up_vosa() {

From fa6cd5ef652cab776b99e6546dc89897f0a4bafc Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 25 Jul 2012 12:06:25 +0200
Subject: [PATCH 0994/2585] - it's now possible to configure the number of days
 back in time you   want to keep when removing old log files.

- the ece[-<instance>].conf can now override the default max age by
  setting:

      old_log_file_max_age_in_days=5

  Documented this properly in the default ece.conf

- set default to 5
---
 etc/escenic/ece.conf                                        | 5 +++++
 usr/share/escenic/ece-scripts/ece.d/remove-old-log-files.sh | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/etc/escenic/ece.conf b/etc/escenic/ece.conf
index f56a52eb..85b1d75c 100644
--- a/etc/escenic/ece.conf
+++ b/etc/escenic/ece.conf
@@ -180,3 +180,8 @@ heap_dump_dir=/var/crash/escenic
 # backups. Default is /var/backups/escenic.
 #####################################################################
 backup_dir=/var/backups/escenic
+
+#####################################################################
+# When removing old log files, how old should the oldest file be?
+#####################################################################
+old_log_file_max_age_in_days=5
diff --git a/usr/share/escenic/ece-scripts/ece.d/remove-old-log-files.sh b/usr/share/escenic/ece-scripts/ece.d/remove-old-log-files.sh
index 20d675ab..65cf6e96 100644
--- a/usr/share/escenic/ece-scripts/ece.d/remove-old-log-files.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/remove-old-log-files.sh
@@ -1,7 +1,7 @@
 #! /usr/bin/env bash
 
 # removes log files older than <numbber> days
-max_days_old=5
+old_log_file_max_age_in_days=5
 
 function get_log_file_dir_list() {
   local dir_list="${log_dir}"
@@ -18,7 +18,7 @@ function remove_old_logs_if_exist() {
   debug "Looking for old log files in $1 ..."
   
   local old_log_files="$(
-    find -L $1 -mtime +${max_days_old} -type f
+    find -L $1 -mtime +${old_log_file_max_age_in_days} -type f
   )"
 
   if [ -z "${old_log_files}" ]; then
@@ -27,7 +27,7 @@ function remove_old_logs_if_exist() {
 
   print_and_log "Deleting" $(echo "$old_log_files" | wc -l) \
     "log files in $1" \
-    "older than ${max_days_old} days"
+    "older than ${old_log_file_max_age_in_days} days"
   run rm $old_log_files
 }
 

From acb3a1d1fc1de8f611f9a20b21deefa9fb068254 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 25 Jul 2012 13:26:48 +0200
Subject: [PATCH 0995/2585] added /etc/cron.daily/remove-old-escenic-log-files
 to conffiles

---
 .../debian/escenic-content-engine-scripts/conffiles              | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/conffiles b/usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/conffiles
index e3c5657d..fcdd2799 100644
--- a/usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/conffiles
+++ b/usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/conffiles
@@ -1,2 +1,3 @@
 /etc/default/ece
 /etc/escenic/ece.conf
+/etc/cron.daily/remove-old-escenic-log-files

From 88e5cb87d794769f2bebdb7c5f17e15dfc4d22a0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 25 Jul 2012 15:09:12 +0200
Subject: [PATCH 0996/2585] - added the feature to diff of pushable files with
 what's current on   the actual server.

  For instance, to diff the local rc.local in the vosa push file tree
  with what's current on the target machine, you can do:

    # vosa-cat -f etc/rc.d/rc.local -i chnepmlsta001 -r

  Where:
  -f is the relative path to the file under the vosa tree, either
     common or instance specific should work.
  -i instance or machine in question
  -r no options, this indicates you want to do a remote diff.

  vosa-cat uses ssh in a subshell/stream for this, so you need to be
  root (or your user must have direct password-less login on the
  instance/machine for this to work).
---
 usr/bin/vosa-cat | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/usr/bin/vosa-cat b/usr/bin/vosa-cat
index 3dfe6a25..c02f66bd 100644
--- a/usr/bin/vosa-cat
+++ b/usr/bin/vosa-cat
@@ -4,9 +4,14 @@
 
 vosa_dir=/var/lib/vizrt/vosa/files
 
+remote_diff=0
+
 function get_user_options() {
-  while getopts ":i:f:s:" opt; do
+  while getopts ":i:f:s:r" opt; do
     case $opt in
+      r)
+        remote_diff=1
+        ;;
       i)
         instance=${OPTARG}
         ;;
@@ -72,9 +77,17 @@ function diff_vosa_file() {
   diff $vosa_file $scm_dir/$vosa_input_file
 }
 
-if [ -z "${scm_dir}" ]; then
-  cat_vosa_file
+function remote_vosa_diff() {
+  diff -w $(get_vosa_file) <(ssh chnepmledt001 cat /${vosa_input_file})
+}
+
+if [ ${remote_diff} -eq 1 ]; then
+  remote_vosa_diff
 else
-  diff_vosa_file
+  if [ -z "${scm_dir}" ]; then
+    cat_vosa_file
+  else
+    diff_vosa_file
+  fi
 fi
 

From 11c39a49cc38eb001e8f569849054417e3b9967c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 25 Jul 2012 15:09:31 +0200
Subject: [PATCH 0997/2585] - removed dead code

---
 usr/bin/vosa-cat | 2 --
 1 file changed, 2 deletions(-)

diff --git a/usr/bin/vosa-cat b/usr/bin/vosa-cat
index c02f66bd..3f2348a3 100644
--- a/usr/bin/vosa-cat
+++ b/usr/bin/vosa-cat
@@ -1,7 +1,5 @@
 #! /usr/bin/env bash
 
-# source ../share/vizrt/vosa/commands/diff.sh
-
 vosa_dir=/var/lib/vizrt/vosa/files
 
 remote_diff=0

From 2d00a6f4260feafd829dc2706328a7fdf21d2693 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 25 Jul 2012 15:24:27 +0200
Subject: [PATCH 0998/2585] - vosa-cat is now smarter when diff local files in
 the user's SCM   copy. It will try to find the file in question by first
 testing:

  Given the call:

    $ vosa-cat -s ~/src/nie/server-admin -f etc/fstab -i pres1

  It will locate the file in this order:

    1)  ~/src/nie/server-admin/etc/fstab
    2)  ~/src/nie/server-admin/common/etc/fstab
    3)  ~/src/nie/server-admin/pres1/etc/fstab
---
 usr/bin/vosa-cat | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/usr/bin/vosa-cat b/usr/bin/vosa-cat
index 3f2348a3..2d5b1a1a 100644
--- a/usr/bin/vosa-cat
+++ b/usr/bin/vosa-cat
@@ -70,9 +70,23 @@ function cat_vosa_file() {
   fi
 }
 
+function get_scm_file() {
+  local file=$scm_dir/$vosa_input_file
+  if [ -e $file ]; then
+    echo $file
+  elif [ -e $scm_dir/$instance/$vosa_input_file ]; then
+    echo $scm_dir/$instance/$vosa_input_file
+  elif [ -e $scm_dir/common/$vosa_input_file ]; then
+    echo $scm_dir/common/$vosa_input_file
+  else
+    echo $vosa_input_file "couldn't be found under $scm_dir"
+    exit 1
+  fi
+}
+
 function diff_vosa_file() {
   local vosa_file=$(get_vosa_file)
-  diff $vosa_file $scm_dir/$vosa_input_file
+  diff $vosa_file $(get_scm_file)
 }
 
 function remote_vosa_diff() {

From 6d57a52ab915fe6fb3b856bc2cc0a30d98929b87 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 25 Jul 2012 16:48:45 +0200
Subject: [PATCH 0999/2585] - fixed regression in common_pre_install where the
 git package   wouldn't be installed.

---
 usr/sbin/ece-install | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 672a637a..6a9aa77c 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -197,18 +197,18 @@ function install_packages_if_missing() {
 function install_common_os_packages()
 {
   print_and_log "Installing common OS packages ..."
-  local packages="curl $git_package wget unzip bc ca-certificates"
-  git_package=git
+  local packages="curl wget unzip bc ca-certificates"
+  local git_package=git
   
   if [ $on_debian_or_derivative -eq 1 ]; then
-        # Ubuntu doesn't have git (!) but only git-core.
+    # Ubuntu doesn't have git (!) but only git-core.
     if [ $on_ubuntu -eq 1 ]; then
       git_package=git-core
     fi
     packages="${packages} bind9-host"
   fi
   
-  install_packages_if_missing $packages
+  install_packages_if_missing $packages $git_package
   
   for el in lsb_release curl host wget git unzip; do
     assert_pre_requisite $el

From adecd32cc49a44bcdce0ed57b550176a991607f3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 25 Jul 2012 17:07:50 +0200
Subject: [PATCH 1000/2585] - removed un_install_ece method - wrote a proper
 section on un installing the doings of ece-install.

---
 usr/sbin/ece-install                        | 43 ---------------------
 usr/share/doc/escenic/ece-install-guide.org | 37 ++++++++++++++++--
 2 files changed, 34 insertions(+), 46 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 6a9aa77c..8dccb20d 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -407,49 +407,6 @@ EOF
   fi
 }
 
-# So far, I've used this method for copy/past-ing it into the shell
-# before running ece-insatll anew. It might be useful for its own
-# command later, though.
-function un_install_ece()
-{
-    print_and_log "Uninstalling ECE ..."
-     # TODO safety, warnings++
-    rm -rf $escenic_conf_dir/ \
-        ${appserver_parent_dir}/*tomcat* \
-        $escenic_root_dir \
-        $escenic_data_dir \
-        $escenic_run_dir/ \
-        $escenic_conf_dir/ \
-        /usr/bin/ece \
-        $escenic_log_dir/ \
-        /etc/apt/sources.list.d/escenic.list \
-        /var/run/ece-install.pid
-#        $HOME/.m2 \
-
-    # remove the Varnish key
-    apt-key remove C4DEFFEB
-    # remove the Percona key
-    apt-key remove CD2EFD2A
-
-    for el in \
-        ant \
-        ant-contrib \
-        ant-optional \
-        libmysql-java \
-        maven2 \
-        memcached \
-        munin* \
-        nginx \
-        percona* \
-        varnish \
-        sun-java6-jdk \
-        ; do
-        apt-get --yes --purge remove $el
-    done
-
-    apt-get clean
-}
-
 ## Returns the privileged hosts. This will include both the IP(s) the
 ## logged in user conduction the ece-install is coming from, as well
 ## as any IPs defined in fai_privileged_hosts.
diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 9e776909..c6051f5d 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -962,9 +962,40 @@ host. However, this may be useful if you're installing a clean
 environment and want to e.g. undo your previous install to install a
 different profile.
 
-Open the ece-install script and look for the "un_install_ece"
-function, it has copy and pastable commands for undoing most/all
-things set up by the script.
+** Uninstall (most of) the packages installed by ece-install
+#+BEGIN_SRC sh
+# apt-get --yes --purge remove \
+        ant \
+        ant-contrib \
+        ant-optional \
+        curl \
+        escenic-* \
+        libmysql-java \
+        maven2 \
+        memcached \
+        munin* \
+        nginx \
+        percona* \
+        sun-java6-jdk \
+        varnish \
+        wget 
+#+END_SRC
+
+
+** Remove the directories created by ece-install
+#+BEGIN_SRC sh
+# rm -rf \
+    /var/{lib,cache,crash,log,run}/escenic \
+    /{etc,opt}/escenic \
+    /opt/*tomcat*
+#+END_SRC
+
+** Remove the GPG keys added by ece-install
+#+BEGIN_SRC sh
+# apt-key remove C4DEFFEB
+# apt-key remove CD2EFD2A
+#+END_SRC
+   
 
 
 * Example Output FAI

From fabe75919ad9459555ac7f239b3f23b1bc3c5bfd Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 25 Jul 2012 17:09:24 +0200
Subject: [PATCH 1001/2585] - removed generated HTML, they need to be
 automatically generated   somewhere, somehow.

---
 usr/share/doc/escenic/ece-guide.html         |  794 -------
 usr/share/doc/escenic/ece-install-guide.html | 2026 ------------------
 usr/share/doc/escenic/system-info-guide.html |  334 ---
 3 files changed, 3154 deletions(-)
 delete mode 100644 usr/share/doc/escenic/ece-guide.html
 delete mode 100644 usr/share/doc/escenic/ece-install-guide.html
 delete mode 100644 usr/share/doc/escenic/system-info-guide.html

diff --git a/usr/share/doc/escenic/ece-guide.html b/usr/share/doc/escenic/ece-guide.html
deleted file mode 100644
index 4546c90e..00000000
--- a/usr/share/doc/escenic/ece-guide.html
+++ /dev/null
@@ -1,794 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-               "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-lang="en" xml:lang="en">
-<head>
-<title>Guide for the /usr/bin/ece Script</title>
-<meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
-<meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2011-11-09 08:31:08 CST"/>
-<meta name="author" content="Torstein Krause Johansen"/>
-<meta name="description" content=""/>
-<meta name="keywords" content=""/>
-<style type="text/css">
- <!--/*--><![CDATA[/*><!--*/
-  html { font-family: Times, serif; font-size: 12pt; }
-  .title  { text-align: center; }
-  .todo   { color: red; }
-  .done   { color: green; }
-  .tag    { background-color: #add8e6; font-weight:normal }
-  .target { }
-  .timestamp { color: #bebebe; }
-  .timestamp-kwd { color: #5f9ea0; }
-  .right  {margin-left:auto; margin-right:0px;  text-align:right;}
-  .left   {margin-left:0px;  margin-right:auto; text-align:left;}
-  .center {margin-left:auto; margin-right:auto; text-align:center;}
-  p.verse { margin-left: 3% }
-  pre {
-	border: 1pt solid #AEBDCC;
-	background-color: #F3F5F7;
-	padding: 5pt;
-	font-family: courier, monospace;
-        font-size: 90%;
-        overflow:auto;
-  }
-  table { border-collapse: collapse; }
-  td, th { vertical-align: top;  }
-  th.right  { text-align:center;  }
-  th.left   { text-align:center;   }
-  th.center { text-align:center; }
-  td.right  { text-align:right;  }
-  td.left   { text-align:left;   }
-  td.center { text-align:center; }
-  dt { font-weight: bold; }
-  div.figure { padding: 0.5em; }
-  div.figure p { text-align: center; }
-  div.inlinetask {
-    padding:10px;
-    border:2px solid gray;
-    margin:10px;
-    background: #ffffcc;
-  }
-  textarea { overflow-x: auto; }
-  .linenr { font-size:smaller }
-  .code-highlighted {background-color:#ffff00;}
-  .org-info-js_info-navigation { border-style:none; }
-  #org-info-js_console-label { font-size:10px; font-weight:bold;
-                               white-space:nowrap; }
-  .org-info-js_search-highlight {background-color:#ffff00; color:#000000;
-                                 font-weight:bold; }
-  /*]]>*/-->
-</style><style type="text/css">
-body {
-  font-family: Arial, Helvetica, sans-serif;
-  font-size: small;
-  #width : 600;
-  margin: 70px 70px 0px 50px;
-}
-
-h1, h2 {
-  color: #e88424;
-}
-
-h1 {
-  font-size: 150%;
-}
-
-h2 {
-  font-size: 120%;
-  margin-top: 3em;
-  margin-bottom: 0em;
-}
-
-h3, h4, h5, h6 {
-  font-weight: bold;
-  margin-top: 2em;
-  margin-bottom: 0.2em;
-}
-
-h3, h4, h5 {
-  font-size: 110%;
-}
-
-h6 {
-  font-size: 80%;
-}
-
-a {
-  color: #333;
-  font-weight: bold;
-  text-decoration: none;
-}
-
-a:hover {
-  text-decoration: underline;
-}
-
-p, dl {
-  font-size: 95%;
-}
-
-p {
-  margin-top: 0em;
-  margin-bottom: 0.6em;
-}
-
-pre.programlisting {
-  margin-top: 0em;
-  background-color: #ffddaa;
-  padding-top: 0.5em;
-  padding-bottom: 0.5em;
-  padding-left: 0.5em;
-  padding-right: 0.5em;
-}
-
-em {
-  font-weight: bold;
-  font-style: normal;
-}
-
-em.replaceable {
-  font-weight: normal;
-  font-style: italic;
-}
-
-div.note {
-  background-color: #ffddaa;
-  padding-top: 0.5em;
-  padding-bottom: 0.5em;
-  padding-left: 0.5em;
-  padding-right: 0.5em;
-}
-</style>
-
-<script type="text/javascript">
-<!--/*--><![CDATA[/*><!--*/
- function CodeHighlightOn(elem, id)
- {
-   var target = document.getElementById(id);
-   if(null != target) {
-     elem.cacheClassElem = elem.className;
-     elem.cacheClassTarget = target.className;
-     target.className = "code-highlighted";
-     elem.className   = "code-highlighted";
-   }
- }
- function CodeHighlightOff(elem, id)
- {
-   var target = document.getElementById(id);
-   if(elem.cacheClassElem)
-     elem.className = elem.cacheClassElem;
-   if(elem.cacheClassTarget)
-     target.className = elem.cacheClassTarget;
- }
-/*]]>*///-->
-</script>
-
-</head>
-<body>
-
-<div id="preamble">
-<svg
-        id="vizrt-logo"
-        version="1.1"
-        width="138"
-        height="84"
-        > 
-  <g
-          id="g12"
-          transform="matrix(1.25,0,0,-1.25,-451.34003,425.24315)"> 
-    <g
-            id="g14"
-            transform="matrix(0.0246257,0,0,0.02458666,313.76213,231.21317)"> 
-      <path
-              d="m 3060.56,3437.2 -209.9,-593.4 -207.05,593.4 -215.82,0 326.08,-866.38 184.92,0 332.24,866.38 -210.47,0"
-              style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
-              id="path16"/> 
-      <path
-              d="m 3473.3,2569.82 193.547,0 0,866.531 -193.547,0 0,-866.531 z"
-              style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
-              id="path18"/> 
-      <path
-              d="m 3916.16,3436.36 -0.14,-177.24 364.23,0 -372.91,-554.74 0,-133.56 616.08,0 0,175.25 -374.66,0 366.68,550.78 0,139.51 -599.28,0"
-              style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
-              id="path20"/> 
-      <path
-              d="m 4961.8,3436.66 c -56.15,0 -99.9,-9.02 -144.01,-53.04 -42.13,-42.13 -63.55,-93.63 -63.55,-153.7 l 0,-658.85 193.26,0 0,629.18 c 0,16.39 5.76,30.04 17.53,41.82 9.79,9.87 32.16,17.44 52.18,17.44 l 161.49,0 0,177.15 -216.9,0"
-              style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
-              id="path22"/> 
-      <path
-              d="m 5367.91,3699.54 0,-915.91 c 0,-58.68 20.75,-109.43 62.13,-150.8 43.31,-43.47 85.57,-62.01 141.03,-62.01 l 212.69,0 0,174.7 -158.78,0 c -15.96,0 -28.96,5.5 -40.72,16.87 -11.19,11.53 -16.76,24.5 -16.76,40.65 l 0,456.42 216.26,0 0,176.39 -216.26,0 0,263.69 -199.59,0"
-              style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
-              id="path24"/> 
-      <path
-              d="m 1921.16,3066.86 c -0.39,-514.15 173.24,-988.49 465.56,-1367.51 l 69.26,204.63 c -205.49,300.61 -333.44,658.06 -355.3,1043.68 l -179.52,119.2"
-              style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
-              id="path26"/> 
-      <path
-              d="m 6404.28,3065.28 c 0.49,513.97 -173.17,988.55 -465.37,1367.26 l -69.46,-204.34 c 205.52,-300.7 333.61,-658.34 355.24,-1043.68 l 179.59,-119.24"
-              style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
-              id="path28"/> 
- 
-    </g> 
-  </g> 
-</svg>
-
-</div>
-
-<div id="content">
-<h1 class="title">Guide for the /usr/bin/ece Script</h1>
-
-
-<div id="table-of-contents">
-<h2>Table of Contents</h2>
-<div id="text-table-of-contents">
-<ul>
-<li><a href="#sec-1">1 TAB completion </a>
-<ul>
-<li><a href="#sec-1-1">1.1 Completing ece commands </a></li>
-<li><a href="#sec-1-2">1.2 Completing types of servers the ece scripts can operate on </a></li>
-<li><a href="#sec-1-3">1.3 Completing the publication resources available </a></li>
-</ul>
-</li>
-<li><a href="#sec-2">2 Getting an overview of all available options </a></li>
-<li><a href="#sec-3">3 Tailing log files </a>
-<ul>
-<li><a href="#sec-3-1">3.1 Getting an overview of the log files </a></li>
-<li><a href="#sec-3-2">3.2 Commands for tailing the log files </a></li>
-<li><a href="#sec-3-3">3.3 Piping the log files to another command </a></li>
-</ul>
-</li>
-<li><a href="#sec-4">4 Assembling a new EAR </a></li>
-<li><a href="#sec-5">5 Installation </a>
-<ul>
-<li><a href="#sec-5-1">5.1 Overview of File Paths Used by the ece script </a></li>
-</ul>
-</li>
-<li><a href="#sec-6">6 Running the ece script </a>
-<ul>
-<li><a href="#sec-6-1">6.1 You must run it as a non-privileged user </a></li>
-<li><a href="#sec-6-2">6.2 Specifying instance </a>
-<ul>
-<li><a href="#sec-6-2-1">6.2.1 Specifying the instance </a></li>
-</ul>
-</li>
-<li><a href="#sec-6-3">6.3 TAB completion </a></li>
-</ul>
-</li>
-<li><a href="#sec-7">7 Backup </a></li>
-</ul>
-</div>
-</div>
-
-<div id="outline-container-1" class="outline-2">
-<h2 id="sec-1"><span class="section-number-2">1</span> TAB completion </h2>
-<div class="outline-text-2" id="text-1">
-
-<p>The ece script offers TAB completion, given that your version of BASH
-supports this and that you have enabled it (some distributions hasn't
-turned on BASH completion per default).
-</p>
-
-</div>
-
-<div id="outline-container-1-1" class="outline-3">
-<h3 id="sec-1-1"><span class="section-number-3">1.1</span> Completing ece commands </h3>
-<div class="outline-text-3" id="text-1-1">
-
-<p>You will find yourself using this regularly, both for speed, but also
-to remember all the different options and their correct wording:
-</p>
-
-
-<pre class="src src-sh">$ ece TAB TAB
-applog      deploy      log         start       threaddump  
-assemble    help        outlog      status      update      
-clean       kill        restart     stop        versions 
-</pre>
-
-<p>
-The commands are all described in detail in "ece help"
-</p>
-</div>
-
-</div>
-
-<div id="outline-container-1-2" class="outline-3">
-<h3 id="sec-1-2"><span class="section-number-3">1.2</span> Completing types of servers the ece scripts can operate on </h3>
-<div class="outline-text-3" id="text-1-2">
-
-
-
-
-<pre class="src src-sh">$ ece -t TAB TAB
-analysis  engine    rmi-hub   search 
-</pre>
-
-
-</div>
-
-</div>
-
-<div id="outline-container-1-3" class="outline-3">
-<h3 id="sec-1-3"><span class="section-number-3">1.3</span> Completing the publication resources available </h3>
-<div class="outline-text-3" id="text-1-3">
-
-<p>The ece script can update the publication resources for a given
-publication.
-</p>
-<p>
-To help selecting the correct publication resource, you can make ece
-list and complete the available resource names:
-</p>
-
-
-<pre class="src src-sh">$ ece -p mypub -r TAB TAB
-content-type   image-version  layout-group   
-feature        layout         menu
-</pre>
-
-</div>
-</div>
-
-</div>
-
-<div id="outline-container-2" class="outline-2">
-<h2 id="sec-2"><span class="section-number-2">2</span> Getting an overview of all available options </h2>
-<div class="outline-text-2" id="text-2">
-
-
-
-
-<pre class="src src-sh">$ ece help
-Usage: /home/torstein/bin/ece [-t &lt;type&gt;] [-i &lt;instance&gt;] &lt;command&gt;
-
-DESCRIPTION
- -t --type &lt;type&gt;
-      The following types are available:
-      engine  -  The Escenic Content Engine, this is the default
-                 and is the assumed type if none is specified.
-      search  -  A standalone search indexer and solr instance
-      rmi-hub -  The RMI hub responsible for the internal 
-                 communication between the ECE instances.
-      analysis - The Escenic Analysis Engine also knows as <span style="color: #8b2252;">'Stats'</span>
-
- -i --instance &lt;instance&gt;
-      The type instance, such as editor1, web1 or search1
-
- -p --publication &lt;publication&gt;
-      Needed only for updating publication resources
-
- -r --resource &lt;resource&gt;
-      Used for updating publication resources.
-      Must be one of: content-type, feature, layout, layout-group
-                      image-version, menu
-
- -v --verbose
-      Prints out debug statements, useful for debugging.
-
-The following commands are available:
-   applog     the type<span style="color: #8b2252;">'s app server log</span>
-<span style="color: #8b2252;">   assemble   runs the Assembly Tool *)</span>
-<span style="color: #8b2252;">   clean      removes temporary files created by /home/torstein/bin/ece *)</span>
-<span style="color: #8b2252;">   deploy     deploys the assembled EAR *)</span>
-<span style="color: #8b2252;">   help       prints this help screen</span>
-<span style="color: #8b2252;">   kill       uses force to stop the type</span>
-<span style="color: #8b2252;">   log        the type'</span>s Log4J log
-   outlog     the [ece#engine] script log (system out log)
-   restart    restarts the type
-   start      starts the type
-   status     checks if the type is running
-   stop       stops the type
-   threaddump write a thread dump to standard out (system out log)
-   update     update publication resources
-   versions   lists the ECE component versions
-
-*) only applicable if type is <span style="color: #8b2252;">'engine'</span>
-</pre>
-
-
-</div>
-
-</div>
-
-<div id="outline-container-3" class="outline-2">
-<h2 id="sec-3"><span class="section-number-2">3</span> Tailing log files </h2>
-<div class="outline-text-2" id="text-3">
-
-<p>The script has a number of options to let you keep track of what's
-going on on your system.
-</p>
-
-</div>
-
-<div id="outline-container-3-1" class="outline-3">
-<h3 id="sec-3-1"><span class="section-number-3">3.1</span> Getting an overview of the log files </h3>
-<div class="outline-text-3" id="text-3-1">
-
-<p>The ece script will be more than happy to tell you about the log files
-on your system that are of interest to your instance:
-</p>
-
-
-<pre class="src src-sh">$ ece -i dev1 loglist
-[ece#engine-dev1] System out log: /var/log/escenic/engine-dev1.out
-[ece#engine-dev1] App server log: /opt/tomcat-dev1/logs/localhost.2011-09-20.log
-[ece#engine-dev1] log4j log: /var/log/escenic/messages
-</pre>
-
-
-</div>
-
-</div>
-
-<div id="outline-container-3-2" class="outline-3">
-<h3 id="sec-3-2"><span class="section-number-3">3.2</span> Commands for tailing the log files </h3>
-<div class="outline-text-3" id="text-3-2">
-
-<p>There are three different logs, which ece will let you tail. When
-tailing the log file, ece will also first print out where the file is
-located on the file system so you can open it later for further
-inspection. 
-</p>
-
-
-
-<pre class="src src-sh">$ ece -i dev1 outlog
-[ece#engine-dev1] Tailing the system out log /var/log/escenic/engine-dev1.out
-</pre>
-
-
-<p>
-The available log file commands are:
-</p><dl>
-<dt>outlog</dt><dd>the system out log
-</dd>
-<dt>applog</dt><dd>the app server log 
-</dd>
-<dt>log</dt><dd>the log4j log
-</dd>
-</dl>
-
-
-</div>
-
-</div>
-
-<div id="outline-container-3-3" class="outline-3">
-<h3 id="sec-3-3"><span class="section-number-3">3.3</span> Piping the log files to another command </h3>
-<div class="outline-text-3" id="text-3-3">
-
-<p>If you wish to pass the log files onto another pipe, for instance to
-grep all the log files for a certain exception or error message, you
-will find the -q parameter useful:
-</p>
-
-
-<pre class="src src-sh">$ ece -i dev1 -q loglist | xargs grep IllegalArgumentException
-</pre>
-
-
-<p>
-This approach is also useful if you wish to tail all the log files at
-once: 
-</p>
-
-
-<pre class="src src-sh">$ ece -i dev1 -q loglist | xargs tail -f
-</pre>
-
-
-</div>
-</div>
-
-</div>
-
-<div id="outline-container-4" class="outline-2">
-<h2 id="sec-4"><span class="section-number-2">4</span> Assembling a new EAR </h2>
-<div class="outline-text-2" id="text-4">
-
-<p>The script will quite happily assemble your EAR file. Please note that
-you need to run 
-</p>
-
-
-<pre class="src src-sh">$ ece -i clean assemble
-</pre>
-
-<p>
-whenever you've upgraded either ECE or one of its plugins. The script
-will try to take care of you though and warn you of such duplication:
-</p>
-
-
-<pre class="src src-sh">[ece#engine] Multiple versions of ECE and/or 3rd party libraries found.
-[ece#engine] Remember, you need to run <span style="color: #8b2252;">'ece clean assemble'</span> when
-[ece#engine] upgrading either ECE or one of the plugins.
-[ece#engine] I will now clean it up for you and re-run the assembly.
-[ece#engine] Cleaning up generated files<span style="color: #a020f0;"> in</span> /opt/escenic/assemblytool ...
-[ece#engine] Assembling your EAR file ...
-</pre>
-
-
-<p>
-If you're just re-running the assembly after just adding a new plugin
-or want to re-build your publications after template changes, you can
-omit the clean command and just run:
-</p>
-
-
-<pre class="src src-sh">$ ece assembly
-</pre>
-
-
-<p>
-The EAR produced is now ready to be deployed with
-</p>
-
-
-<pre class="src src-sh">$ ece [-i &lt;instance&gt;] deploy
-</pre>
-
-</div>
-
-</div>
-
-<div id="outline-container-5" class="outline-2">
-<h2 id="sec-5"><span class="section-number-2">5</span> Installation </h2>
-<div class="outline-text-2" id="text-5">
-
-<p>The ece script and ece.conf may be used on any Unix like system that
-has a fairly recent version of BASH installed.
-</p>
-
-</div>
-
-<div id="outline-container-5-1" class="outline-3">
-<h3 id="sec-5-1"><span class="section-number-3">5.1</span> Overview of File Paths Used by the ece script </h3>
-<div class="outline-text-3" id="text-5-1">
-
-<p>These are recommended files and locations for using the ece script:
-</p>
-<table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
-<caption></caption>
-<colgroup><col class="left" /><col class="left" />
-</colgroup>
-<thead>
-<tr><th scope="col" class="left">Path</th><th scope="col" class="left">Explanation</th></tr>
-</thead>
-<tbody>
-<tr><td class="left">/usr/bin/ece</td><td class="left">The script itself</td></tr>
-<tr><td class="left">/etc/escenic/ece.conf</td><td class="left">The main configuration file</td></tr>
-<tr><td class="left">/etc/escenic/ece-&lt;instance&gt;.conf</td><td class="left">Instance specific settings</td></tr>
-<tr><td class="left">/var/cache/escenic</td><td class="left">Directory of assembled EAR files</td></tr>
-<tr><td class="left">/tmp</td><td class="left">Directory for temporary files</td></tr>
-</tbody>
-</table>
-
-
-<p>
-As you can see in ece.conf, there are a number of default locations
-dealing with log files, pid files, crash files as well as application
-server files. The defaults all follow the File Hierarchy Standard, but
-you may of course change these to your liking.
-</p>
-<p>
-If you wish to put the .conf files in other places, you may like to know
-that the ece script has preset list of locations where it looks for
-the .conf files mentioned above, namely:
-</p>
-<ul>
-<li>current working directory
-</li>
-<li>/etc/escenic/&lt;type&gt;/instance/&lt;instance name&gt;
-</li>
-<li>/etc/escenic/&lt;type&gt;/host/&lt;hostname&gt;
-</li>
-<li>/etc/escenic/&lt;type&gt;/common
-</li>
-<li>/etc/escenic/&lt;type&gt;
-</li>
-<li><i>etc/escenic - &lt;current working direcotry&gt;</i>../etc
-</li>
-</ul>
-
-
-<p>
-You may override this list of locations by setting the
-this environment variable in your .bashrc or similar:
-</p>
-
-
-<pre class="src src-sh">ECE_CONF_LOCATIONS 
-</pre>
-
-
-<p>
-The reason for having so many options is because various Escenic
-consultants, partners and customers have requested these locations to
-fit their systems. As you can see, fitting everyone's fancy adds up
-over time :-)
-</p>
-</div>
-</div>
-
-</div>
-
-<div id="outline-container-6" class="outline-2">
-<h2 id="sec-6"><span class="section-number-2">6</span> Running the ece script </h2>
-<div class="outline-text-2" id="text-6">
-
-
-</div>
-
-<div id="outline-container-6-1" class="outline-3">
-<h3 id="sec-6-1"><span class="section-number-3">6.1</span> You must run it as a non-privileged user </h3>
-<div class="outline-text-3" id="text-6-1">
-
-<p>You must be normal user to run the ece script, otherwise it will
-complain:
-</p>
-
-
-<pre class="src src-sh">[ece#engine] Sorry, you cannot be root when running ece
-[ece#engine] The root user can only use /etc/init.d/ece
-</pre>
-
-
-<p>
-As it mentions, the root user may use the init.d script and the
-accompanying /etc/default/ece to command the different ECE, EAE and
-RMI hub instances on your system.
-</p></div>
-
-</div>
-
-<div id="outline-container-6-2" class="outline-3">
-<h3 id="sec-6-2"><span class="section-number-3">6.2</span> Specifying instance </h3>
-<div class="outline-text-3" id="text-6-2">
-
-
-
-</div>
-
-<div id="outline-container-6-2-1" class="outline-4">
-<h4 id="sec-6-2-1"><span class="section-number-4">6.2.1</span> Specifying the instance </h4>
-<div class="outline-text-4" id="text-6-2-1">
-
-<p>The script is made for being easy to use with multiple instances on
-the same host. You specify the instance you want to operate on using the
--i parameter. E.g. to assemble and deploy the editor1 instance, you'd
-do:
-</p>
-
-
-<pre class="src src-sh">$ ece -i editor1 assemble deploy restart
-</pre>
-
-
-<p>
-The script's TAB completion will also help you with completing the
-available instances on your system, so you can just type:
-</p>
-
-
-<pre class="src src-sh">$ ece -i TAB TAB
-mypub myotherpub
-</pre>
-
-
-<p>
-For this to work, the script assumes that you have installed the
-instance specific configuration in /etc/escenic/engine/instance, as is
-described in the Escenic Content Engine Installation Guide.
-</p>
-
-</div>
-</div>
-
-</div>
-
-<div id="outline-container-6-3" class="outline-3">
-<h3 id="sec-6-3"><span class="section-number-3">6.3</span> TAB completion </h3>
-<div class="outline-text-3" id="text-6-3">
-
-<p>The ece script offers TAB completion of all commands, options and
-option values. For this to work, you need the completion file loaded
-from your .bashrc. 
-</p>
-<p>
-This can either be done by enabling all BASH completions on your
-system (some systems have this set up per default), refer to your OS
-documentation for this.
-</p>
-<p>
-Alternatively, to just enable the ece completion, simply add the
-following line to your .bashrc:
-</p>
-
-
-<pre class="src src-sh"><span style="color: #7a378b;">.</span> /etc/bash_completion.d/ece
-</pre>
-
-<p>
-Naturally, the bash<sub>comletion</sub>.d needs to be in the above location :-)
-</p></div>
-</div>
-
-</div>
-
-<div id="outline-container-7" class="outline-2">
-<h2 id="sec-7"><span class="section-number-2">7</span> Backup </h2>
-<div class="outline-text-2" id="text-7">
-
-<p>One of the many features of the ece script, is that you can take a
-snapshot of your current running system, which can then be restored
-using the /usr/sbin/ece-install script. 
-</p>
-<p>
-The backup will include the database, the Nursery configuration, the
-DB configuration, the Varnish configuration, the nginx congiguration,
-all the Escenic software binaries, your publication and your
-application servers.
-</p>
-<p>
-To create the backup, you'll simply do:
-</p>
-
-
-<pre class="src src-sh">$ ece -i editor1 backup
-</pre>
-
-
-<p>
-It will then create tarball with everything and put it in 
-</p>
-
-
-<pre class="src src-sh">/var/backups/escenic
-</pre>
-
-
-<p>
-Sometimes, you only want to take a backup of the data files and are
-not so concerned with the Escenic and application server binaries as
-these are easily installed from elsewhere. If so, you may do the
-following:
-</p>
-
-
-<pre class="src src-sh">$ ece -i editor1 backup --exclude-binaries
-</pre>
-
-
-<p>
-When running in a production environment, it's advised to first stop
-the search instance which runs the Solr indexer, so that the Solr
-index isn't corrupted:
-</p>
-
-
-<pre class="src src-sh">$ ece -i search1 stop
-$ ece -i editor1 backup
-</pre>
-
-
-
-
-
-
-
-</div>
-</div>
-</div>
-
-<div id="postamble">
-<hr/>
-<p class="author">
-  Author: Torstein Krause Johansen (<a href="mailto:tkj@vizrt.com">tkj@vizrt.com</a>)
-  Date: 2011-11-09 08:31:08 CST
-</p>
-</div>
-</body>
-</html>
diff --git a/usr/share/doc/escenic/ece-install-guide.html b/usr/share/doc/escenic/ece-install-guide.html
deleted file mode 100644
index 35f99d71..00000000
--- a/usr/share/doc/escenic/ece-install-guide.html
+++ /dev/null
@@ -1,2026 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-               "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-<title>Welcome to the /usr/sbin/ece-install Guide</title>
-<meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
-<meta name="title" content="Welcome to the /usr/sbin/ece-install Guide"/>
-<meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2012-03-14 18:08:27 CST"/>
-<meta name="author" content="Torstein Krause Johansen"/>
-<meta name="description" content=""/>
-<meta name="keywords" content=""/>
-<style type="text/css">
- <!--/*--><![CDATA[/*><!--*/
-  html { font-family: Times, serif; font-size: 12pt; }
-  .title  { text-align: center; }
-  .todo   { color: red; }
-  .done   { color: green; }
-  .tag    { background-color: #add8e6; font-weight:normal }
-  .target { }
-  .timestamp { color: #bebebe; }
-  .timestamp-kwd { color: #5f9ea0; }
-  .right  {margin-left:auto; margin-right:0px;  text-align:right;}
-  .left   {margin-left:0px;  margin-right:auto; text-align:left;}
-  .center {margin-left:auto; margin-right:auto; text-align:center;}
-  p.verse { margin-left: 3% }
-  pre {
-	border: 1pt solid #AEBDCC;
-	background-color: #F3F5F7;
-	padding: 5pt;
-	font-family: courier, monospace;
-        font-size: 90%;
-        overflow:auto;
-  }
-  table { border-collapse: collapse; }
-  td, th { vertical-align: top;  }
-  th.right  { text-align:center;  }
-  th.left   { text-align:center;   }
-  th.center { text-align:center; }
-  td.right  { text-align:right;  }
-  td.left   { text-align:left;   }
-  td.center { text-align:center; }
-  dt { font-weight: bold; }
-  div.figure { padding: 0.5em; }
-  div.figure p { text-align: center; }
-  div.inlinetask {
-    padding:10px;
-    border:2px solid gray;
-    margin:10px;
-    background: #ffffcc;
-  }
-  textarea { overflow-x: auto; }
-  .linenr { font-size:smaller }
-  .code-highlighted {background-color:#ffff00;}
-  .org-info-js_info-navigation { border-style:none; }
-  #org-info-js_console-label { font-size:10px; font-weight:bold;
-                               white-space:nowrap; }
-  .org-info-js_search-highlight {background-color:#ffff00; color:#000000;
-                                 font-weight:bold; }
-  /*]]>*/-->
-</style><style type="text/css">
-body {
-  font-family: Arial, Helvetica, sans-serif;
-  font-size: small;
-  #width : 600;
-  margin: 70px 70px 0px 50px;
-}
-
-pre {
-  background-color: grey;
-}
-
-h1, h2 {
-  color: #e88424;
-}
-
-h1 {
-  font-size: 150%;
-}
-
-h2 {
-  font-size: 120%;
-  margin-top: 3em;
-  margin-bottom: 0em;
-}
-
-h3, h4, h5, h6 {
-  font-weight: bold;
-  margin-top: 2em;
-  margin-bottom: 0.2em;
-}
-
-h3, h4, h5 {
-  font-size: 110%;
-}
-
-h6 {
-  font-size: 80%;
-}
-
-a {
-  color: #333;
-  font-weight: bold;
-  text-decoration: none;
-}
-
-a:hover {
-  text-decoration: underline;
-}
-
-p, dl {
-  font-size: 95%;
-}
-
-p {
-  margin-top: 0em;
-  margin-bottom: 0.6em;
-}
-
-pre.programlisting {
-  margin-top: 0em;
-  background-color: #ffddaa;
-  padding-top: 0.5em;
-  padding-bottom: 0.5em;
-  padding-left: 0.5em;
-  padding-right: 0.5em;
-}
-
-em {
-  font-weight: bold;
-  font-style: normal;
-}
-
-em.replaceable {
-  font-weight: normal;
-  font-style: italic;
-}
-
-div.note {
-  background-color: #ffddaa;
-  padding-top: 0.5em;
-  padding-bottom: 0.5em;
-  padding-left: 0.5em;
-  padding-right: 0.5em;
-}
-</style>
-
-<script type="text/javascript">
-<!--/*--><![CDATA[/*><!--*/
- function CodeHighlightOn(elem, id)
- {
-   var target = document.getElementById(id);
-   if(null != target) {
-     elem.cacheClassElem = elem.className;
-     elem.cacheClassTarget = target.className;
-     target.className = "code-highlighted";
-     elem.className   = "code-highlighted";
-   }
- }
- function CodeHighlightOff(elem, id)
- {
-   var target = document.getElementById(id);
-   if(elem.cacheClassElem)
-     elem.className = elem.cacheClassElem;
-   if(elem.cacheClassTarget)
-     target.className = elem.cacheClassTarget;
- }
-/*]]>*///-->
-</script>
-
-</head>
-<body>
-
-<div id="preamble">
-<svg
-        id="vizrt-logo"
-        version="1.1"
-        width="138"
-        height="84"
-        > 
-  <g
-          id="g12"
-          transform="matrix(1.25,0,0,-1.25,-451.34003,425.24315)"> 
-    <g
-            id="g14"
-            transform="matrix(0.0246257,0,0,0.02458666,313.76213,231.21317)"> 
-      <path
-              d="m 3060.56,3437.2 -209.9,-593.4 -207.05,593.4 -215.82,0 326.08,-866.38 184.92,0 332.24,866.38 -210.47,0"
-              style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
-              id="path16"/> 
-      <path
-              d="m 3473.3,2569.82 193.547,0 0,866.531 -193.547,0 0,-866.531 z"
-              style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
-              id="path18"/> 
-      <path
-              d="m 3916.16,3436.36 -0.14,-177.24 364.23,0 -372.91,-554.74 0,-133.56 616.08,0 0,175.25 -374.66,0 366.68,550.78 0,139.51 -599.28,0"
-              style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
-              id="path20"/> 
-      <path
-              d="m 4961.8,3436.66 c -56.15,0 -99.9,-9.02 -144.01,-53.04 -42.13,-42.13 -63.55,-93.63 -63.55,-153.7 l 0,-658.85 193.26,0 0,629.18 c 0,16.39 5.76,30.04 17.53,41.82 9.79,9.87 32.16,17.44 52.18,17.44 l 161.49,0 0,177.15 -216.9,0"
-              style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
-              id="path22"/> 
-      <path
-              d="m 5367.91,3699.54 0,-915.91 c 0,-58.68 20.75,-109.43 62.13,-150.8 43.31,-43.47 85.57,-62.01 141.03,-62.01 l 212.69,0 0,174.7 -158.78,0 c -15.96,0 -28.96,5.5 -40.72,16.87 -11.19,11.53 -16.76,24.5 -16.76,40.65 l 0,456.42 216.26,0 0,176.39 -216.26,0 0,263.69 -199.59,0"
-              style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
-              id="path24"/> 
-      <path
-              d="m 1921.16,3066.86 c -0.39,-514.15 173.24,-988.49 465.56,-1367.51 l 69.26,204.63 c -205.49,300.61 -333.44,658.06 -355.3,1043.68 l -179.52,119.2"
-              style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
-              id="path26"/> 
-      <path
-              d="m 6404.28,3065.28 c 0.49,513.97 -173.17,988.55 -465.37,1367.26 l -69.46,-204.34 c 205.52,-300.7 333.61,-658.34 355.24,-1043.68 l 179.59,-119.24"
-              style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
-              id="path28"/> 
- 
-    </g> 
-  </g> 
-</svg>
-
-</div>
-
-<div id="content">
-<h1 class="title">Welcome to the /usr/sbin/ece-install Guide</h1>
-
-
-<div id="table-of-contents">
-<h2>Table of Contents</h2>
-<div id="text-table-of-contents">
-<ul>
-<li><a href="#sec-1">1 Supported Operating Systems</a>
-<ul>
-<li><a href="#sec-1-1">1.1 Debian based operating systems</a></li>
-<li><a href="#sec-1-2">1.2 RedHat based operating systems</a></li>
-<li><a href="#sec-1-3">1.3 Other GNU/Linux and Unix systems</a></li>
-<li><a href="#sec-1-4">1.4 Tested Operating Systems</a></li>
-</ul>
-</li>
-<li><a href="#sec-2">2 A Note on Running ece-install On Non-GNU/Linux Systems</a></li>
-<li><a href="#sec-3">3 Downloading the ece-install Script</a></li>
-<li><a href="#sec-4">4 Running the ece-install Script</a></li>
-<li><a href="#sec-5">5 Available Server Profiles</a>
-<ul>
-<li><a href="#sec-5-1">5.1 Common for All Server Profiles</a></li>
-<li><a href="#sec-5-2">5.2 Common for Editorial, Presentation and Search Instances</a>
-<ul>
-<li><a href="#sec-5-2-1">5.2.1 Sun Java 6</a></li>
-<li><a href="#sec-5-2-2">5.2.2 Apache Tomcat application server</a></li>
-<li><a href="#sec-5-2-3">5.2.3 Basic Escenic Nursery configuration</a></li>
-<li><a href="#sec-5-2-4">5.2.4 APR, native library for optimal Tomcat I/O performance</a></li>
-<li><a href="#sec-5-2-5">5.2.5 Escenic Assembly environment</a></li>
-<li><a href="#sec-5-2-6">5.2.6 Database driver</a></li>
-<li><a href="#sec-5-2-7">5.2.7 Compression of content</a></li>
-</ul>
-</li>
-<li><a href="#sec-5-3">5.3 Profile :: Full Stack on One Host</a></li>
-<li><a href="#sec-5-4">5.4 Profile :: Editorial Server (Publication Server)</a></li>
-<li><a href="#sec-5-5">5.5 Profile :: Presentation Server</a></li>
-<li><a href="#sec-5-6">5.6 Profile :: Database Server</a>
-<ul>
-<li><a href="#sec-5-6-1">5.6.1 Master &amp; slave setup</a></li>
-</ul>
-</li>
-<li><a href="#sec-5-7">5.7 Profile :: Cache Server</a></li>
-<li><a href="#sec-5-8">5.8 Profile :: Install Widget Framework</a></li>
-<li><a href="#sec-5-9">5.9 Profile :: Create Publication</a></li>
-<li><a href="#sec-5-10">5.10 Profile :: Monitoring Server</a></li>
-<li><a href="#sec-5-11">5.11 Profile :: Restoring from backup</a></li>
-<li><a href="#sec-5-12">5.12 Profile :: Analysis Server</a></li>
-<li><a href="#sec-5-13">5.13 Profile :: NFS server</a></li>
-<li><a href="#sec-5-14">5.14 Profile :: NFS client</a></li>
-<li><a href="#sec-5-15">5.15 Profile :: VIP provider</a></li>
-<li><a href="#sec-5-16">5.16 Running interactively</a>
-<ul>
-<li><a href="#sec-5-16-1">5.16.1 Start ece-install and choose the Option, "Restore from backup"</a></li>
-<li><a href="#sec-5-16-2">5.16.2 Select Which Backup to Restore</a></li>
-<li><a href="#sec-5-16-3">5.16.3 Choose What to Restore</a></li>
-<li><a href="#sec-5-16-4">5.16.4 Sit Back and Watch ece-install Restore the Data for You</a></li>
-</ul>
-</li>
-<li><a href="#sec-5-17">5.17 Running in FAI mode</a></li>
-<li><a href="#sec-5-18">5.18 Data security</a></li>
-</ul>
-</li>
-<li><a href="#sec-6">6 Full Automatic Install (FAI)</a>
-<ul>
-<li><a href="#sec-6-1">6.1 Installing from EARs instead of Binaries</a></li>
-<li><a href="#sec-6-2">6.2 Setting up virtual hosts</a></li>
-<li><a href="#sec-6-3">6.3 Overview of All FAI Parameters</a></li>
-<li><a href="#sec-6-4">6.4 Examples</a>
-<ul>
-<li><a href="#sec-6-4-1">6.4.1 Installing an Editorial Server &amp; Create a Publication</a></li>
-<li><a href="#sec-6-4-2">6.4.2 Installing Two Presentation Servers On a Single Host</a></li>
-</ul>
-</li>
-<li><a href="#sec-6-5">6.5 Verifying That the Script Is Running In FAI Mode</a></li>
-</ul>
-</li>
-<li><a href="#sec-7">7 Running More Than One Installation Process</a></li>
-<li><a href="#sec-8">8 Re-running ece-install (and How To Speed It Up)</a></li>
-<li><a href="#sec-9">9 Using a Custom Configuration File for ece-install</a></li>
-<li><a href="#sec-10">10 Overview of File Paths Used by the ece-install script</a></li>
-<li><a href="#sec-11">11 Overriding the Escenic directories</a></li>
-<li><a href="#sec-12">12 Extending ece-install by Writing Hooks</a>
-<ul>
-<li><a href="#sec-12-1">12.1 Accessing ece-install variables</a></li>
-<li><a href="#sec-12-2">12.2 Example hook</a></li>
-<li><a href="#sec-12-3">12.3 Available hooks</a></li>
-</ul>
-</li>
-<li><a href="#sec-13">13 Assumptions</a>
-<ul>
-<li><a href="#sec-13-1">13.1 The machine on which ece-install has enough RAM</a></li>
-</ul>
-</li>
-<li><a href="#sec-14">14 Uninstalling Everything That the ece-install Set Up</a></li>
-<li><a href="#sec-15">15 Example Output FAI</a></li>
-</ul>
-</div>
-</div>
-
-<div id="outline-container-1" class="outline-2">
-<h2 id="sec-1"><span class="section-number-2">1</span> Supported Operating Systems</h2>
-<div class="outline-text-2" id="text-1">
-
-<p>For the best experience, run this script on Debian Squeeze (or newer),
-the latest Ubuntu LTS or most other Debian based operating systems,
-but it should work without any problems on any Unix like system that
-has BASH version 4.2 or newer.
-</p>
-
-</div>
-
-<div id="outline-container-1-1" class="outline-3">
-<h3 id="sec-1-1"><span class="section-number-3">1.1</span> Debian based operating systems</h3>
-<div class="outline-text-3" id="text-1-1">
-
-<p>If running on a Debian based operating system, ece-install will take
-care of installing all required third party software, such as database
-&amp; caching server.
-</p>
-</div>
-
-</div>
-
-<div id="outline-container-1-2" class="outline-3">
-<h3 id="sec-1-2"><span class="section-number-3">1.2</span> RedHat based operating systems</h3>
-<div class="outline-text-3" id="text-1-2">
-
-<p>ece-install constantly gets better support for automatic installation
-on RedHat based operating systems. However, since the public RedHat
-repositories are significantly smaller than the Debian ones, there
-will often be the case that you'll have to do some manually
-installation of 3rd party dependencies prior to running
-ece-install. Don't despair though, ece-install will tell you what you
-need to do. 
-</p>
-</div>
-
-</div>
-
-<div id="outline-container-1-3" class="outline-3">
-<h3 id="sec-1-3"><span class="section-number-3">1.3</span> Other GNU/Linux and Unix systems</h3>
-<div class="outline-text-3" id="text-1-3">
-
-<p>If you're installing on another Linux or Unix system, you must first
-make sure that these 3rd party components are installed. ece-install
-will tell you which ones it cannot find and tell you to install these,
-so you can simply run it to find out which ones you need.
-</p>
-<p>
-You may also look inside the ece-install script for all calls to the
-'assert<sub>pre</sub><sub>prequesite'</sub> method and you'll get a list of the binaries
-ece-install assumes are present.
-</p>
-</div>
-
-</div>
-
-<div id="outline-container-1-4" class="outline-3">
-<h3 id="sec-1-4"><span class="section-number-3">1.4</span> Tested Operating Systems</h3>
-<div class="outline-text-3" id="text-1-4">
-
-<table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
-<caption></caption>
-<colgroup><col class="left" /><col class="left" /><col class="left" />
-</colgroup>
-<thead>
-<tr><th scope="col" class="left">Operating system</th><th scope="col" class="left">Status</th><th scope="col" class="left">Date updated</th></tr>
-</thead>
-<tbody>
-<tr><td class="left">Debian 6.0 (squeeze)</td><td class="left">Everything is 100% automatic</td><td class="left">2012-02-27 13:18</td></tr>
-<tr><td class="left">Ubuntu LTS 10.04</td><td class="left">Everything except Tomcat/APR wrappers are automatic</td><td class="left">2012-02-27 13:19</td></tr>
-<tr><td class="left">Ubuntu 11.10</td><td class="left">Everything except Tomcat/APR wrappers are automatic</td><td class="left">2012-02-27 13:19</td></tr>
-<tr><td class="left">CentOS 6.2</td><td class="left">HA, APR &amp; monitoring are not automatic</td><td class="left">2012-03-07 13:42</td></tr>
-</tbody>
-</table>
-
-
-</div>
-</div>
-
-</div>
-
-<div id="outline-container-2" class="outline-2">
-<h2 id="sec-2"><span class="section-number-2">2</span> A Note on Running ece-install On Non-GNU/Linux Systems</h2>
-<div class="outline-text-2" id="text-2">
-
-<p>Please note, it's assumed that the OS uses GNU's tools, i.e. find, cp
-&amp; tar. If you're running a system which has a different set of core
-tools, such as any of the BSDs (including Mac OS X) or Solaris, make
-sure that GNU's tools take precedence in the command PATH offered to
-ece-install.
-</p>
-</div>
-
-</div>
-
-<div id="outline-container-3" class="outline-2">
-<h2 id="sec-3"><span class="section-number-2">3</span> Downloading the ece-install Script</h2>
-<div class="outline-text-2" id="text-3">
-
-<p>The ece-install script can be downloaded from:
-<a href="https://raw.github.com/skybert/ece-scripts/master/usr/sbin/ece-install">https://raw.github.com/skybert/ece-scripts/master/usr/sbin/ece-install</a>
-or be downloaded together with the other ece-scripts using git:
-</p>
-
-
-<pre class="src src-conf"><span style="color: #f0dfaf;">$ git clone https</span>://github.com/skybert/ece-scripts.git
-</pre>
-
-
-</div>
-
-</div>
-
-<div id="outline-container-4" class="outline-2">
-<h2 id="sec-4"><span class="section-number-2">4</span> Running the ece-install Script</h2>
-<div class="outline-text-2" id="text-4">
-
-<p>You must run the script as the root user.  If you start the script as
-a regular user, it will complain:
-</p>
-
-
-<pre class="src src-conf">[<span style="color: #98fb98;">ece-install</span>] You must be root when running ece-install
-</pre>
-
-<p>
-To become root on Ubuntu based systems and Mac OS X, do:
-</p>
-
-
-<pre class="src src-conf"><span style="color: #f0dfaf;">$</span> sudo su
-</pre>
-
-<p>
-Please note that just doing "sudo ece-install" may not work.
-</p>
-<p>
-On all other Unix like system, do:
-</p>
-
-
-<pre class="src src-conf"><span style="color: #f0dfaf;">$</span> su -
-</pre>
-
-
-<p>
-You will need access to <a href="http://technet.escenic.com">http://technet.escenic.com</a> and put these
-credentials in the root user's $HOME/ece-install.conf, normally this
-means /root/ece-install.conf, the script will also tell you this if
-you forget to provide such a configuration file:
-</p>
-
-
-<pre class="src src-conf">[<span style="color: #98fb98;">ece-install</span>] /root/ece-install.conf doesn<span style="color: #ffa07a;">'t exist, I cannot live without it :-(</span>
-</pre>
-
-
-<p>
-As for the technet credentials, the script will also tell you if it
-cannot find what it's looking for:
-</p>
-
-
-<pre class="src src-conf">[<span style="color: #98fb98;">ece-install</span>] Be sure to set technet_user and technet_password
-[<span style="color: #98fb98;">ece-install</span>] in /root/ece-install.conf
-</pre>
-
-
-<p>
-The minimum ece-install.conf file is thus:
-</p>
-
-
-<pre class="src src-conf"><span style="color: #f0dfaf;">technet_user</span>=&lt;user&gt;
-<span style="color: #f0dfaf;">technet_password</span>=&lt;password&gt;
-</pre>
-
-
-<p>
-If you're installing WF as well, you'll need additional credentials
-for this, see the Widget Framwork section below, and if you want to
-runn a fully automatic install without any user interaction, you'll
-need to specify some FAI specific parameters, see the FAI section
-below. 
-</p>
-<p>
-With the configuration file in place, you're now ready to run it:
-</p>
-
-
-<pre class="src src-conf"><span style="color: #7f9f7f; font-style: italic;"># </span><span style="color: #7f9f7f; font-style: italic;">bash ece-install [-v|--verbose|&lt;-f|--file&gt; &lt;conf-file&gt;]</span>
-</pre>
-
-
-<p>
-It will output everything from internal and external commands to its
-log file located at /var/log/ece-install.log.
-</p>
-<p>
-ece-install will try to "fail fast", exiting as soon as it detects an
-error during its execution:
-</p>
-
-
-<pre class="src src-conf">[<span style="color: #98fb98;">ece-install-1] The command [cd /does/not/exist</span>] FAILED, exiting :-(
-[<span style="color: #98fb98;">ece-install-1</span>] See /var/log/ece-install.log for further details.
-</pre>
-
-
-<p>
-As a last resort, if something goes astray with the script, and the
-log file cannot give you enough clues, the ultimate way of debugging
-this is to run the BASH interpreter with the -x flag:
-</p>
-
-
-<pre class="src src-conf"><span style="color: #7f9f7f; font-style: italic;"># </span><span style="color: #7f9f7f; font-style: italic;">bash -x ece-install</span>
-</pre>
-
-
-<p>
-Here you can see everything that BASH does when running the script,
-how the wildcard variables expand and so on. Normally, having a tail
-on /var/log/ece-install.log should be sufficient, though.
-</p>
-</div>
-
-</div>
-
-<div id="outline-container-5" class="outline-2">
-<h2 id="sec-5"><span class="section-number-2">5</span> Available Server Profiles</h2>
-<div class="outline-text-2" id="text-5">
-
-<p>When starting the script, it will ask you which server profile you
-want to install:
-</p>
-
-
-<pre class="src src-conf"><span style="color: #f0dfaf;">Hi,</span> which server profile do you wish to install?
-
-   <span style="color: #f0dfaf;">1</span> - All in one, full stack on one host, suitable for dev &amp; test environments
-   <span style="color: #f0dfaf;">2</span> - Editorial (publication) server
-   <span style="color: #f0dfaf;">3</span> - Presentation server (ECE + memcached).
-   <span style="color: #f0dfaf;">4</span> - Database server
-   <span style="color: #f0dfaf;">5</span> - Cache server (cache and web server)
-   <span style="color: #f0dfaf;">6</span> - RMI hub
-   <span style="color: #f0dfaf;">7</span> - Search server (Solr + indexer-webapp)
-   <span style="color: #f0dfaf;">8</span> - Install Widget Framework.
-   <span style="color: #f0dfaf;">9</span> - Create a new publication based on WF if available, ECE/clean-demo if not
-   <span style="color: #f0dfaf;">10</span> - A monitoring server (web server + Munin gatherer)
-   <span style="color: #f0dfaf;">11</span> - Restore from backup (DB, data files, binaries, conf &amp; publications)
-
-<span style="color: #f0dfaf;">Select</span> 1-11 and press ENTER
-<span style="color: #f0dfaf;">Your</span> choice [1]&gt; 
-</pre>
-
-
-</div>
-
-<div id="outline-container-5-1" class="outline-3">
-<h3 id="sec-5-1"><span class="section-number-3">5.1</span> Common for All Server Profiles</h3>
-<div class="outline-text-3" id="text-5-1">
-
-<p>The script will install a Munin node on the host. It will also
-install the Escenic specific Munin plugins on hosts where there are
-any Escenic server components.
-</p>
-</div>
-
-</div>
-
-<div id="outline-container-5-2" class="outline-3">
-<h3 id="sec-5-2"><span class="section-number-3">5.2</span> Common for Editorial, Presentation and Search Instances</h3>
-<div class="outline-text-3" id="text-5-2">
-
-
-</div>
-
-<div id="outline-container-5-2-1" class="outline-4">
-<h4 id="sec-5-2-1"><span class="section-number-4">5.2.1</span> Sun Java 6</h4>
-<div class="outline-text-4" id="text-5-2-1">
-
-</div>
-
-</div>
-
-<div id="outline-container-5-2-2" class="outline-4">
-<h4 id="sec-5-2-2"><span class="section-number-4">5.2.2</span> Apache Tomcat application server</h4>
-<div class="outline-text-4" id="text-5-2-2">
-
-<ul>
-<li>Compression of textual content (previously, this was typically set
-  up with Apache and its mod<sub>deflate</sub> module).
-</li>
-<li>pooling set up tweaked for high read/write performance.
-</li>
-<li>proper logging configuration directing solr messages to its own log.
-</li>
-<li>routing information in the cookies
-</li>
-<li>application server access log
-</li>
-</ul>
-
-</div>
-
-</div>
-
-<div id="outline-container-5-2-3" class="outline-4">
-<h4 id="sec-5-2-3"><span class="section-number-4">5.2.3</span> Basic Escenic Nursery configuration</h4>
-<div class="outline-text-4" id="text-5-2-3">
-
-<p>The basic Nursery configuration is taken care of for you, including RMI,
-  database, search and application server/URIs. 
-</p></div>
-
-</div>
-
-<div id="outline-container-5-2-4" class="outline-4">
-<h4 id="sec-5-2-4"><span class="section-number-4">5.2.4</span> APR, native library for optimal Tomcat I/O performance</h4>
-<div class="outline-text-4" id="text-5-2-4">
-
-</div>
-
-</div>
-
-<div id="outline-container-5-2-5" class="outline-4">
-<h4 id="sec-5-2-5"><span class="section-number-4">5.2.5</span> Escenic Assembly environment</h4>
-<div class="outline-text-4" id="text-5-2-5">
-
-<p>The reason why ece-install sets this up on each host, is to make the
-installation process as smooth as possible. The assembly environment
-may be removed after the installation if you want to.
-</p>
-</div>
-
-</div>
-
-<div id="outline-container-5-2-6" class="outline-4">
-<h4 id="sec-5-2-6"><span class="section-number-4">5.2.6</span> Database driver</h4>
-<div class="outline-text-4" id="text-5-2-6">
-
-
-</div>
-
-</div>
-
-<div id="outline-container-5-2-7" class="outline-4">
-<h4 id="sec-5-2-7"><span class="section-number-4">5.2.7</span> Compression of content</h4>
-<div class="outline-text-4" id="text-5-2-7">
-
-<p>This was was previously accomplished by having a web server in fron t
-of the application server (or cache server if you used ESI). A typical
-system architecture would contain Apache with mod<sub>deflate</sub>. However,
-this is no longer necessary as Varnish can handles ESI parsing of
-compressed content (and many other things that we before needed Apache
-for). Thus, we'll let the application server do the compression for us
-now.
-</p>
-</div>
-</div>
-
-</div>
-
-<div id="outline-container-5-3" class="outline-3">
-<h3 id="sec-5-3"><span class="section-number-3">5.3</span> Profile :: Full Stack on One Host</h3>
-<div class="outline-text-3" id="text-5-3">
-
-<p>This profile is suitable for developers and admins wanting to set up a
-test environment. It will install the full stack including caching
-server, application server, ECE, assembly host, database, Widget
-Framework, as well as creating a publication for you.
-</p>
-<p>
-For further details on each of the different server components, see
-the different profile descriptions bellow.
-</p>
-
-</div>
-
-</div>
-
-<div id="outline-container-5-4" class="outline-3">
-<h3 id="sec-5-4"><span class="section-number-3">5.4</span> Profile :: Editorial Server (Publication Server)</h3>
-<div class="outline-text-3" id="text-5-4">
-
-<p>Will set up a typical editorial server (often referred to as the
-publication server in Escenic literature).
-</p>
-</div>
-
-</div>
-
-<div id="outline-container-5-5" class="outline-3">
-<h3 id="sec-5-5"><span class="section-number-3">5.5</span> Profile :: Presentation Server</h3>
-<div class="outline-text-3" id="text-5-5">
-
-<p>This will set up a typical presentation server:
-</p><ul>
-<li>Memcached, distributed memory cache
-</li>
-<li>Deployment setup to only deploy escenic-admin and the
-  publication(s).
-</li>
-</ul>
-
-
-</div>
-
-</div>
-
-<div id="outline-container-5-6" class="outline-3">
-<h3 id="sec-5-6"><span class="section-number-3">5.6</span> Profile :: Database Server</h3>
-<div class="outline-text-3" id="text-5-6">
-
-<p>If ece-install is run on a support version of Debian or Ubuntu, this
-will install the excellent Percona distribution of MySQL with their
-set of high performance patches.
-</p>
-<p>
-If not, MySQL or Percona must be installed in advance.
-</p>
-<p>
-Given that the mysqld is install, this profile will download all the
-Escenic components and install the ECE database schema based from the
-SQL files contained inside the distribution bundles. To accomplish
-this, the script will make a call to drop-and-create-ecedb in the same
-directory as the ece-intall script itself.
-</p>
-<p>
-The script will fail by itself if the DB already exists:
-</p>
-
-
-<pre class="src src-conf">[<span style="color: #98fb98;">ece-install</span>] Setting up the ECE database schema ...
-<span style="color: #f0dfaf;">ERROR 1007 (HY000) at line 1</span>: Can<span style="color: #ffa07a;">'t create database '</span>ece5db<span style="color: #ffa07a;">'; database exists</span>
-<span style="color: #ffa07a;">ERROR 1050 (42S01) at line 2: Table '</span>DBChangeLog<span style="color: #ffa07a;">' already exists</span>
-<span style="color: #ffa07a;">[ece-install] running tables FAILED, exiting :-(</span>
-</pre>
-
-<p>
-If you for some reason wish to make ece-install drop the DB fro you
-before creating a new one, you can set
-</p>
-
-
-<pre class="src src-sh"><span style="color: #f0dfaf;">fai_db_drop_old_db_first</span>=1
-</pre>
-
-
-
-</div>
-
-<div id="outline-container-5-6-1" class="outline-4">
-<h4 id="sec-5-6-1"><span class="section-number-4">5.6.1</span> Master &amp; slave setup</h4>
-<div class="outline-text-4" id="text-5-6-1">
-
-<p>It's easy to set up master and slave DBs, here's how you'd configure
-ece-install to install these:
-</p>
-<p>
-On the master, create an ece-install.conf with:
-</p>
-
-
-<pre class="src src-sh"><span style="color: #f0dfaf;">fai_enabled</span>=1
-<span style="color: #f0dfaf;">fai_db_install</span>=1
-<span style="color: #f0dfaf;">fai_db_master</span>=1
-<span style="color: #f0dfaf;">fai_db_replication</span>=1
-</pre>
-
-
-<p>
-The script will itself output some replication log settings you need
-for the slave:
-</p>
-
-
-<pre class="src src-sh">[ece-install-35] - DB is now set up on localhost:3306
-[ece-install-35] - ece-install.conf for slave: <span style="color: #f0dfaf;">fai_db_master_log_file</span>=mysql-bin.000013
-[ece-install-35] - ece-install.conf for slave: <span style="color: #f0dfaf;">fai_db_master_log_position</span>=106
-</pre>
-
-
-<p>
-Once this is done, create and use an ece-install.conf on the slave
-with this configuration:
-</p>
-
-
-<pre class="src src-sh"><span style="color: #f0dfaf;">fai_enabled</span>=1
-<span style="color: #f0dfaf;">fai_db_install</span>=1
-<span style="color: #f0dfaf;">fai_db_replication</span>=1
-<span style="color: #f0dfaf;">fai_db_master</span>=0
-<span style="color: #f0dfaf;">fai_db_master_host</span>=my-db-master
-<span style="color: #f0dfaf;">fai_db_master_log_file</span>=mysql-bin.000013
-<span style="color: #f0dfaf;">fai_db_master_log_position</span>=106
-</pre>
-
-
-<p>
-The script will set up and use the replication user &amp; credentials with
-default values, if you wish to override these, have a look in the FAI
-parameter overview.
-</p>
-</div>
-</div>
-
-</div>
-
-<div id="outline-container-5-7" class="outline-3">
-<h3 id="sec-5-7"><span class="section-number-3">5.7</span> Profile :: Cache Server</h3>
-<div class="outline-text-3" id="text-5-7">
-
-<p>If ece-install is run on a support version of Debian or Ubuntu, it
-will install the latest Varnish 3.0 caching server from the Varnish
-APT repository.
-</p>
-<p>
-If ece-install is run on a different platform, the admin must install
-Varnish 3.x prior to running ece-install.
-</p>
-<p>
-The script will configure Varnish for a typical Escenic site:
-</p><ul>
-<li>it will set up the cache server on port 80
-</li>
-<li>will set up an access control lists of IPs which may access the
-  privileged web applications such as /escenic-admin, /escenic and
-  /webservice.
-
-<p>
-  ece-install will also add the host from which you connect, making
-  sure that if you've SSH-ed into the server to conduct the install,
-  you'll automatically be included in the "staff" ACL and can access
-  all the web applications without editing these ACLs (or disabling
-  security as many does).
-</p>
-</li>
-<li>will set up sticky sessions/session binding
-</li>
-<li>will set up a backend cluster and allow the user to enter the
-  different backend servers that will serve the web site.
-</li>
-<li>will set up configuration to strip away cookies from static
-  resources, such as CSS, JS and pictures.
-</li>
-<li>will install the nginx web server for serving static content and
-  will configure Varnish accordingly. This will be very useful for
-  Adactus servers wanting to pull content from your ECEs.
-</li>
-</ul>
-
-
-<p>
-TBD:
-</p><ul>
-<li>If run on a Linux platform, the script will tweak the kernel
-  parameters for optimal TCP handling for a web facing server.
-</li>
-<li>let the /munin run through on port 80, requiring the connecting IPs
-  to be in the staff network ACL, defined in the Varnish
-  configuration. 
-</li>
-</ul>
-
-
-</div>
-
-</div>
-
-<div id="outline-container-5-8" class="outline-3">
-<h3 id="sec-5-8"><span class="section-number-3">5.8</span> Profile :: Install Widget Framework</h3>
-<div class="outline-text-3" id="text-5-8">
-
-<p>You'll need a user name and password for accessing the
-repo.escenic.com Maven repository. You should get these credentials
-when you bought Widget Framework. If you for some reason do not have
-these, please contact support@escenic.com. 
-</p>
-<p>
-If you don't have these ready in your ece-install.conf, ece-install will
-complain:
-</p>
-
-
-<pre class="src src-conf">[<span style="color: #98fb98;">ece-install</span>] Be sure to set wf_user and wf_password in /root/ece-install.conf
-[<span style="color: #98fb98;">ece-install</span>] If you don<span style="color: #ffa07a;">'t have these, please contact support@escenic.com</span>
-</pre>
-
-</div>
-
-</div>
-
-<div id="outline-container-5-9" class="outline-3">
-<h3 id="sec-5-9"><span class="section-number-3">5.9</span> Profile :: Create Publication</h3>
-<div class="outline-text-3" id="text-5-9">
-
-<p>This profile will create a publication for you, only asking you the
-name of the publication and which ECE instance to use for its
-creation.
-</p>
-<p>
-This installation profile will base the publication on the Widget
-Framework if its present on the system, if not, ECE's clean demo WAR
-is used as a basis.  
-</p></div>
-
-</div>
-
-<div id="outline-container-5-10" class="outline-3">
-<h3 id="sec-5-10"><span class="section-number-3">5.10</span> Profile :: Monitoring Server</h3>
-<div class="outline-text-3" id="text-5-10">
-
-<p>This will install a Munin gatherer and web server. The latter for
-accessing the reports generated by the former.
-</p>
-<p>
-TBD: This profile will also install the Nagios interface for
-monitoring the different nodes. 
-</p>
-</div>
-
-</div>
-
-<div id="outline-container-5-11" class="outline-3">
-<h3 id="sec-5-11"><span class="section-number-3">5.11</span> Profile :: Restoring from backup</h3>
-<div class="outline-text-3" id="text-5-11">
-
-<p>ece-install can restore from a backup made by the ece script:
-</p>
-
-
-<pre class="src src-conf"><span style="color: #f0dfaf;">$</span> ece -i &lt;instance&gt; backup
-</pre>
-
-
-<p>
-As stated in the ece guide, this backup may contain (depending on
-what's available on the host where it's run):
-</p><ul>
-<li>database dump of the instance
-</li>
-<li>data files (pictures, video files and so on). This is often referred
-  to as the "multimedia archive" in Escenic literature.
-</li>
-<li>ECE, cache and web server configuration
-</li>
-<li>Escenic software
-</li>
-</ul>
-
-
-</div>
-
-</div>
-
-<div id="outline-container-5-12" class="outline-3">
-<h3 id="sec-5-12"><span class="section-number-3">5.12</span> Profile :: Analysis Server</h3>
-<div class="outline-text-3" id="text-5-12">
-
-<p>This profile will install the Escenic Analysis Engine and configure it
-for production use with sane defaults. Be sure to use a different DB
-than you use for ECE.
-</p>
-</div>
-
-</div>
-
-<div id="outline-container-5-13" class="outline-3">
-<h3 id="sec-5-13"><span class="section-number-3">5.13</span> Profile :: NFS server</h3>
-<div class="outline-text-3" id="text-5-13">
-
-<p>Will install an NFS server.
-</p>
-</div>
-
-</div>
-
-<div id="outline-container-5-14" class="outline-3">
-<h3 id="sec-5-14"><span class="section-number-3">5.14</span> Profile :: NFS client</h3>
-<div class="outline-text-3" id="text-5-14">
-
-<p>Will install an NFS client, create all the mountpoints and mount these
-on the host.
-</p>
-<p>
-Configuration example for setting up an NFS client mounting the
-multimedia archive on the NFS server:
-</p>
-
-
-<pre class="src src-sh"><span style="color: #f0dfaf;">fai_enabled</span>=1
-<span style="color: #f0dfaf;">fai_nfs_client_install</span>=1
-<span style="color: #f0dfaf;">fai_nfs_server_address</span>=192.168.1.200
-<span style="color: #f0dfaf;">fai_nfs_export_list</span>=<span style="color: #ffa07a;">"/var/exports/multimedia"</span>  
-</pre>
-
-
-</div>
-
-</div>
-
-<div id="outline-container-5-15" class="outline-3">
-<h3 id="sec-5-15"><span class="section-number-3">5.15</span> Profile :: VIP provider</h3>
-<div class="outline-text-3" id="text-5-15">
-
-<p><img src="images/db-vip.png"  alt="images/db-vip.png" />
-</p>
-<p>
-This profile will make the host capable of serving a certain virtual
-IP (VIP) for one or more services. This is a useful thing for all
-<a href="http://en.wikipedia.org/wiki/Single_point_of_failure">SPOFs</a> in your architecture, such as the file server or database.
-</p>
-<p>
-You will typically install another profile at the same time as the VIP
-provider. For instance, you will install both an NFS server and a VIP
-provider for that NFS server (and perhaps other services too running
-on the same host).
-</p>
-<p>
-The following ece-install.conf configuration will install an NFS
-server and make it a VIP provider exposing its NFS service. The two
-VIP providers have have the IP addresses 192.168.1.111 and
-192.168.1.112 and both provide the VIP 192.168.1.200
-</p>
-
-
-
-<pre class="src src-sh"><span style="color: #7f9f7f; font-style: italic;"># </span><span style="color: #7f9f7f; font-style: italic;">install the NFS server</span>
-<span style="color: #f0dfaf;">fai_enabled</span>=1
-<span style="color: #f0dfaf;">fai_nfs_server_install</span>=1
-<span style="color: #f0dfaf;">fai_nfs_export_list</span>=<span style="color: #ffa07a;">"/var/exports/multimedia"</span>
-<span style="color: #f0dfaf;">fai_nfs_allowed_client_network</span>=<span style="color: #ffa07a;">"192.168.1.0/255.255.255.0"</span>
-
-<span style="color: #7f9f7f; font-style: italic;"># </span><span style="color: #7f9f7f; font-style: italic;">install the VIP provider, primary node</span>
-<span style="color: #f0dfaf;">fai_vip_install</span>=1
-<span style="color: #f0dfaf;">fai_vip_service_list</span>=<span style="color: #ffa07a;">"nfs-kernel-server"</span>
-<span style="color: #f0dfaf;">fai_vip_primary_node_name</span>=ubiquitous
-<span style="color: #f0dfaf;">fai_vip_primary_node_ip</span>=192.168.1.112
-<span style="color: #f0dfaf;">fai_vip_primary_node_auth_key</span>=d41d8cd98f00b204e9800998ecf8427e
-<span style="color: #f0dfaf;">fai_vip_secondary_node_name</span>=ubiquitous-lts
-<span style="color: #f0dfaf;">fai_vip_secondary_node_ip</span>=192.168.1.111
-<span style="color: #f0dfaf;">fai_vip_address</span>=192.168.1.200
-<span style="color: #f0dfaf;">fai_vip_sibling_ip</span>=$<span style="color: #f0dfaf;">fai_vip_secondary_node_ip</span>
-</pre>
-
-
-<p>
-The secondary node, also an NFS VIP provider can have the exact same
-configuration except for having a different sibling:
-</p>
-
-
-
-<pre class="src src-sh"><span style="color: #f0dfaf;">fai_vip_sibling_ip</span>=$<span style="color: #f0dfaf;">fai_vip_primary_node_ip</span>
-</pre>
-
-
-<p>
-Note that the fai<sub>vip</sub><sub>primary</sub><sub>node</sub><sub>auth</sub><sub>key</sub> is optional. If not set,
-ece-install will generate it for you. However, you will then have to
-add this to ece-install.conf when installing the secondary
-node. Generate this key, do:
-</p>
-
-
-
-<pre class="src src-sh">$ dd <span style="color: #f0dfaf;">if</span>=/dev/urandom <span style="color: #f0dfaf;">bs</span>=512 <span style="color: #f0dfaf;">count</span>=1 | <span style="color: #ffa07a;">\</span>
-    openssl md5 | <span style="color: #ffa07a;">\</span>
-    cut -d<span style="color: #ffa07a;">' '</span> -f2   
-</pre>
-
-
-</div>
-
-</div>
-
-<div id="outline-container-5-16" class="outline-3">
-<h3 id="sec-5-16"><span class="section-number-3">5.16</span> Running interactively</h3>
-<div class="outline-text-3" id="text-5-16">
-
-
-</div>
-
-<div id="outline-container-5-16-1" class="outline-4">
-<h4 id="sec-5-16-1"><span class="section-number-4">5.16.1</span> Start ece-install and choose the Option, "Restore from backup"</h4>
-<div class="outline-text-4" id="text-5-16-1">
-
-
-
-
-<pre class="src src-text"># ece-install
-</pre>
-
-
-</div>
-
-</div>
-
-<div id="outline-container-5-16-2" class="outline-4">
-<h4 id="sec-5-16-2"><span class="section-number-4">5.16.2</span> Select Which Backup to Restore</h4>
-<div class="outline-text-4" id="text-5-16-2">
-
-
-
-
-
-<pre class="src src-text">[ece-install-5] From which dataset do you wish to backup?
-    1 - engine-dev1-backup-2011-10-10.tar.gz
-    2 - engine-dev1-backup-2011-10-11.tar.gz
-[ece-install-5] Enter the number next to the tarball, from 1 to 2
-Your choice [1]&gt;
-</pre>
-
-
-<p>
-The ece script mentioned above will create backups in
-</p>
-
-
-<pre class="src src-conf"><span style="color: #f0dfaf;">/var/backups/escenic</span>
-</pre>
-
-<p>
-and the ece-install script will hence expect to find them here.
-</p>
-</div>
-
-</div>
-
-<div id="outline-container-5-16-3" class="outline-4">
-<h4 id="sec-5-16-3"><span class="section-number-4">5.16.3</span> Choose What to Restore</h4>
-<div class="outline-text-4" id="text-5-16-3">
-
-
-
-
-<pre class="src src-text">[ece-install-12] Which part of the system do you wish to restore?
-    1 - The database
-    2 - The Solr and ECE data files (multimedia archive)
-    3 - The ECE configuration files
-    4 - The Escenic and Tomcat software binaries + publication templates
-Your choice [1]&gt; 2
-</pre>
-
-
-</div>
-
-</div>
-
-<div id="outline-container-5-16-4" class="outline-4">
-<h4 id="sec-5-16-4"><span class="section-number-4">5.16.4</span> Sit Back and Watch ece-install Restore the Data for You</h4>
-<div class="outline-text-4" id="text-5-16-4">
-
-
-
-
-<pre class="src src-text">[ece-install-13] Restoring the Solr &amp; ECE data files on ubiquitous ...
-[ece-install-21] - The installation is now complete! It took 0d 0h 0m 20s
-[ece-install] Successfully restored Solr &amp; ECE data files
-[ece-install] from backup:  engine-dev1-backup-2011-10-12.tar.gz
-[ece-install] Check /var/lib/escenic to verify they're all there
-</pre>
-
-
-</div>
-</div>
-
-</div>
-
-<div id="outline-container-5-17" class="outline-3">
-<h3 id="sec-5-17"><span class="section-number-3">5.17</span> Running in FAI mode</h3>
-<div class="outline-text-3" id="text-5-17">
-
-<p>If you're running in FAI mode, you can choose between these settings
-to decide what to restore and where to find the backup file to
-restore from:
-</p>
-<table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
-<caption></caption>
-<colgroup><col class="left" /><col class="right" /><col class="left" />
-</colgroup>
-<thead>
-<tr><th scope="col" class="left">Parameter</th><th scope="col" class="right">Default</th><th scope="col" class="left">Description</th></tr>
-</thead>
-<tbody>
-<tr><td class="left">fai<sub>restore</sub><sub>all</sub></td><td class="right">0</td><td class="left">Restore everything found in the backup file</td></tr>
-<tr><td class="left">fai<sub>restore</sub><sub>db</sub></td><td class="right">0</td><td class="left">Install the DB server &amp; restore its contents</td></tr>
-<tr><td class="left">fai<sub>restore</sub><sub>data</sub><sub>files</sub></td><td class="right">0</td><td class="left">Restore the Solr &amp; ECE data files</td></tr>
-<tr><td class="left">fai<sub>restore</sub><sub>configuration</sub></td><td class="right">0</td><td class="left">Restore the Solr &amp; ECE configuration files</td></tr>
-<tr><td class="left">fai<sub>restore</sub><sub>software</sub><sub>binaries</sub></td><td class="right">0</td><td class="left">Restore the Escenic and Apache Tomcat software</td></tr>
-<tr><td class="left">fai<sub>restore</sub><sub>from</sub><sub>file</sub></td><td class="right">""</td><td class="left">The .tar.gz produced by "ece -i &lt;instance&gt; backup"</td></tr>
-</tbody>
-</table>
-
-
-<p>
-For example, to restore everything possible from a given tarball, you
-need this in your ece-install.conf:
-</p>
-
-
-<pre class="src src-conf"><span style="color: #f0dfaf;">fai_enabled</span>=1
-
-<span style="color: #f0dfaf;">fai_restore_from_backup</span>=1
-<span style="color: #f0dfaf;">fai_restore_all</span>=1
-<span style="color: #f0dfaf;">fai_restore_from_file</span>=/var/backups/escenic/engine-dev1-backup-2011-10-10.tar.gz
-</pre>
-
-
-</div>
-
-</div>
-
-<div id="outline-container-5-18" class="outline-3">
-<h3 id="sec-5-18"><span class="section-number-3">5.18</span> Data security</h3>
-<div class="outline-text-3" id="text-5-18">
-
-<p>You should take heed when running restore, so that you're not
-restoring a system which you didn't want to change (yes, this mishap
-does happen).
-</p>
-<p>
-The ece-install script will help you a bit on the way, but the final
-responsibility always lies with you as the user. 
-</p>
-<p>
-If you're trying to restore the DB and the ECE schema already exists,
-the restore will fail:
-</p>
-
-
-<pre class="src src-text">[ece-install-8] Restoring the database contents on ubiquitous ...
-[ece-install-24] Selecting the most recent database dump ece5db-2011-10-10.sql.gz
-ERROR 1007 (HY000) at line 1: Can't create database 'ece5db'; database exists
-ERROR 1050 (42S01) at line 25: Table '`ece5db`.`AccessControlList`' already exists
-[ece-install-24] The command [restoring from var/backups/escenic/ece5db-2011-10-10.sql.gz] FAILED, exiting :-(
-[ece-install-24] See /var/log/ece-install.log for further details.
-</pre>
-
-</div>
-</div>
-
-</div>
-
-<div id="outline-container-6" class="outline-2">
-<h2 id="sec-6"><span class="section-number-2">6</span> Full Automatic Install (FAI)</h2>
-<div class="outline-text-2" id="text-6">
-
-<p>The ece-install script has support for doing a full automatic install
-(FAI). You can only install one profile at a time. The profiles are
-the parameters with "install" in their name, such as:
-</p>
-
-
-<pre class="src src-conf"><span style="color: #f0dfaf;">fai_editor_install</span>
-</pre>
-
-
-<p>
-When running in FAI mode, you probably want to redirect standard
-output to a log file for easy reading later on:
-</p>
-
-
-<pre class="src src-conf"><span style="color: #7f9f7f; font-style: italic;"># </span><span style="color: #7f9f7f; font-style: italic;">bash ece-install &gt; ece-install.out &amp;</span>
-</pre>
-
-
-<p>
-Alternatively, you may do:
-</p>
-
-
-<pre class="src src-conf"><span style="color: #7f9f7f; font-style: italic;"># </span><span style="color: #7f9f7f; font-style: italic;">nohup bash ece-install &gt; ece-install.out &amp;</span>
-</pre>
-
-<p>
-The "nohup" at the beginning and the ampersand at the end lets you log
-out of the SSH/X session to your Linux/Unix box while the script keeps
-running in the background.
-</p>
-
-</div>
-
-<div id="outline-container-6-1" class="outline-3">
-<h3 id="sec-6-1"><span class="section-number-3">6.1</span> Installing from EARs instead of Binaries</h3>
-<div class="outline-text-3" id="text-6-1">
-
-<p>It is possible to get ece-install to use a supplied EAR and
-configuration archive instead of using the files provided with the
-Escenic Content Engine &amp; plugins.
-</p>
-<p>
-The EAR to provide is the one you generate with:
-</p>
-
-
-<pre class="src src-conf"><span style="color: #f0dfaf;">$</span> ece -i &lt;instance&gt; assemble 
-</pre>
-
-<p>
-Normally, the EAR will then be available in:
-</p>
-
-
-<pre class="src src-conf"><span style="color: #f0dfaf;">/var/cache/escenic/engine.ear</span>
-</pre>
-
-
-<p>
-The configuration bundle must contain:
-</p>
-
-
-<pre class="src src-conf"><span style="color: #f0dfaf;">engine/security</span>
-<span style="color: #f0dfaf;">engine/siteconfig/bootstrap-skeleton</span>
-<span style="color: #f0dfaf;">engine/siteconfig/config-skeleton</span>
-<span style="color: #f0dfaf;">assemblytool/plugins/&lt;plugin&gt;/siteconfig</span>
-</pre>
-
-
-<p>
-and optionally also:
-</p>
-
-
-<pre class="src src-sh">engine/solr/conf
-</pre>
-
-
-<p>
-A simple way to create this bundle, is to use a server which has the
-assembly environment set up and then do:
-</p>
-
-
-
-<pre class="src src-conf"><span style="color: #f0dfaf;">$</span> cd /opt/escenic
-<span style="color: #f0dfaf;">$</span> tar czf /tmp/nursery-skeleton-solr-and-security.tar.gz \
-  <span style="color: #f0dfaf;">engine/security</span> \
-  <span style="color: #f0dfaf;">engine/siteconfig/config-skeleton/</span> \
-  <span style="color: #f0dfaf;">engine/solr/conf</span> \
-  <span style="color: #f0dfaf;">engine/siteconfig/bootstrap-skeleton/`</span>
-</pre>
-
-
-<p>
-/tmp/nursery-skeleton-solr-and-security.tar.gz should now have everything
-you need. You can now configure your FAI installation to use these by,
-e.g.:
-</p>
-
-
-
-<pre class="src src-conf"><span style="color: #f0dfaf;">fai_presentation_ear</span>=/tmp/engine.ear
-<span style="color: #f0dfaf;">fai_presentation_conf_archive</span>=/tmp/nursery-skeleton-solr-and-security.tar.gz
-</pre>
-
-
-<p>
-Corresponding configuration options are available for the other server
-profiles, see the table below.
-</p>
-<p>
-The inclusion of the engine/solr directory makes it easy for users to
-provide their own, optimised Solr configuration. In this context, also
-note that a post install hook, set<sub>up</sub><sub>solr</sub>.postinst, is available.
-</p>
-<p>
-If you wish to provide Nursery configuration for the plugins, you
-simply put them in engine/siteconfig/config-skeleton inside your
-tarball, together with the other Nursery configuration files.
-</p>
-</div>
-
-</div>
-
-<div id="outline-container-6-2" class="outline-3">
-<h3 id="sec-6-2"><span class="section-number-3">6.2</span> Setting up virtual hosts</h3>
-<div class="outline-text-3" id="text-6-2">
-
-<p>Setting up virtual host definitions in the application server makes a
-some things easier, such as ECE plugins which set cookies based on
-information they get from the app server.
-</p>
-<p>
-ece-install can set up the virtual hosts configuration for Tomcat
-application servers if the profile is editorial, all presentation.
-</p>
-<p>
-To use this feature, you must define one domain for each publication
-in the following FAI parameter:
-</p>
-
-
-<pre class="src src-sh"><span style="color: #f0dfaf;">fai_publication_domain_mapping_list</span>=<span style="color: #ffa07a;">"</span>
-<span style="color: #ffa07a;">firepub#fire.escenic.com</span>
-<span style="color: #ffa07a;">ildpub#ild.escenic.com</span>
-<span style="color: #ffa07a;">"</span>
-</pre>
-
-
-<p>
-This will produce the following stanzas in server.xml:
-</p>
-
-
-
-<pre class="src src-nxml">&lt;<span style="color: #8cd0d3;">Host</span> <span style="color: #f0dfaf;">name</span>=<span style="color: #ffa07a;">"</span><span style="color: #ffa07a;">fire.escenic.com</span><span style="color: #ffa07a;">"</span> <span style="color: #f0dfaf;">appBase</span>=<span style="color: #ffa07a;">"</span><span style="color: #ffa07a;">webapps</span><span style="color: #ffa07a;">"</span> <span style="color: #f0dfaf;">autoDeploy</span>=<span style="color: #ffa07a;">"</span><span style="color: #ffa07a;">false</span><span style="color: #ffa07a;">"</span>&gt;
-  &lt;<span style="color: #8cd0d3;">Context</span> <span style="color: #f0dfaf;">displayName</span>=<span style="color: #ffa07a;">"</span><span style="color: #ffa07a;">fire.escenic.com</span><span style="color: #ffa07a;">"</span>
-           <span style="color: #f0dfaf;">docBase</span>=<span style="color: #ffa07a;">"</span><span style="color: #ffa07a;">firepub</span><span style="color: #ffa07a;">"</span>
-           <span style="color: #f0dfaf;">path</span>=<span style="color: #ffa07a;">"</span><span style="color: #ffa07a;">/</span><span style="color: #ffa07a;">"</span>
-  /&gt;
-&lt;/<span style="color: #8cd0d3;">Host</span>&gt;
-&lt;<span style="color: #8cd0d3;">Host</span> <span style="color: #f0dfaf;">name</span>=<span style="color: #ffa07a;">"</span><span style="color: #ffa07a;">ild.escenic.com</span><span style="color: #ffa07a;">"</span> <span style="color: #f0dfaf;">appBase</span>=<span style="color: #ffa07a;">"</span><span style="color: #ffa07a;">webapps</span><span style="color: #ffa07a;">"</span> <span style="color: #f0dfaf;">autoDeploy</span>=<span style="color: #ffa07a;">"</span><span style="color: #ffa07a;">false</span><span style="color: #ffa07a;">"</span>&gt;
-  &lt;<span style="color: #8cd0d3;">Context</span> <span style="color: #f0dfaf;">displayName</span>=<span style="color: #ffa07a;">"</span><span style="color: #ffa07a;">ild.escenic.com</span><span style="color: #ffa07a;">"</span>
-           <span style="color: #f0dfaf;">docBase</span>=<span style="color: #ffa07a;">"</span><span style="color: #ffa07a;">ildpub</span><span style="color: #ffa07a;">"</span>
-           <span style="color: #f0dfaf;">path</span>=<span style="color: #ffa07a;">"</span><span style="color: #ffa07a;">/</span><span style="color: #ffa07a;">"</span>
-  /&gt;
-&lt;/<span style="color: #8cd0d3;">Host</span>&gt;
-</pre>
-
-
-<p>
-Furthermore, if these host names are  not resolvable to your local
-host (neither localhost or the IP of your $HOSTNAME), ece-install will
-add entries for these domains in the machine's /etc/hosts:
-</p>
-
-
-<pre class="src src-sh"><span style="color: #7f9f7f; font-style: italic;"># </span><span style="color: #7f9f7f; font-style: italic;">added by ece-install @ Wed Feb  8 19:21:49 CST 2012</span>
-127.0.1.1 fire.escenic.com
-
-<span style="color: #7f9f7f; font-style: italic;"># </span><span style="color: #7f9f7f; font-style: italic;">added by ece-install @ Wed Feb  8 19:21:51 CST 2012</span>
-127.0.1.1 ild.escenic.com
-</pre>
-
-
-<p>
-If you do not want ece-install to touch your /etc/hosts, you can set
-fai<sub>keep</sub><sub>off</sub><sub>etc</sub><sub>hosts</sub>=1 in your ece-install.conf
-</p>
-</div>
-
-</div>
-
-<div id="outline-container-6-3" class="outline-3">
-<h3 id="sec-6-3"><span class="section-number-3">6.3</span> Overview of All FAI Parameters</h3>
-<div class="outline-text-3" id="text-6-3">
-
-<p>The ece-install script understands for the following settings in the
-$HOME/ece-install.conf file of the root user:
-</p>
-<table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
-<caption></caption>
-<colgroup><col class="left" /><col class="left" /><col class="left" />
-</colgroup>
-<thead>
-<tr><th scope="col" class="left">Parameter</th><th scope="col" class="left">Default</th><th scope="col" class="left">Description</th></tr>
-</thead>
-<tbody>
-<tr><td class="left">fai<sub>all</sub><sub>install</sub></td><td class="left">0</td><td class="left">Install all components on your server.</td></tr>
-<tr><td class="left">fai<sub>analysis</sub><sub>db</sub><sub>host</sub></td><td class="left">localhost</td><td class="left">For the EAE DB (different from ECE's)</td></tr>
-<tr><td class="left">fai<sub>analysis</sub><sub>db</sub><sub>install</sub></td><td class="left">0</td><td class="left">Install db profile</td></tr>
-<tr><td class="left">fai<sub>analysis</sub><sub>db</sub><sub>password</sub></td><td class="left">read-the-source-luke</td><td class="left">For the EAE DB (different from ECE's)</td></tr>
-<tr><td class="left">fai<sub>analysis</sub><sub>db</sub><sub>port</sub></td><td class="left">3306</td><td class="left">For the EAE DB (different from ECE's)</td></tr>
-<tr><td class="left">fai<sub>analysis</sub><sub>db</sub><sub>schema</sub></td><td class="left">ece5db</td><td class="left">For the EAE DB (different from ECE's)</td></tr>
-<tr><td class="left">fai<sub>analysis</sub><sub>db</sub><sub>user</sub></td><td class="left">ece5user</td><td class="left">For the EAE DB (different from ECE's)</td></tr>
-<tr><td class="left">fai<sub>analysis</sub><sub>name</sub></td><td class="left">analysis1</td><td class="left">EAE instance name</td></tr>
-<tr><td class="left">fai<sub>analysis</sub><sub>port</sub></td><td class="left">8080</td><td class="left">Port of the EAE</td></tr>
-<tr><td class="left">fai<sub>analysis</sub><sub>shutdown</sub></td><td class="left">8005</td><td class="left">Shutdown port for the EAE app server</td></tr>
-<tr><td class="left">fai<sub>cache</sub><sub>backends</sub></td><td class="left">${HOSTNAME}:8080</td><td class="left">Space separated, e.g. "app1:8080 app2:8080"</td></tr>
-<tr><td class="left">fai<sub>cache</sub><sub>install</sub></td><td class="left">0</td><td class="left">Install cache server profile</td></tr>
-<tr><td class="left">fai<sub>db</sub><sub>drop</sub><sub>old</sub><sub>db</sub><sub>first</sub></td><td class="left">0</td><td class="left">Warning: this will drop the old database before installing a new one</td></tr>
-<tr><td class="left">fai<sub>db</sub><sub>host</sub></td><td class="left">$HOSTNAME</td><td class="left">Useful for editor &amp; presentation profiles</td></tr>
-<tr><td class="left">fai<sub>db</sub><sub>install</sub></td><td class="left">0</td><td class="left">Install db profile</td></tr>
-<tr><td class="left">fai<sub>db</sub><sub>password</sub></td><td class="left">read-the-source-luke</td><td class="left">Useful for DB installation profile</td></tr>
-<tr><td class="left">fai<sub>db</sub><sub>port</sub></td><td class="left">3306</td><td class="left">Useful for editor &amp; presentation profiles</td></tr>
-<tr><td class="left">fai<sub>db</sub><sub>schema</sub></td><td class="left">ece5db</td><td class="left">Useful for DB installation profile</td></tr>
-<tr><td class="left">fai<sub>db</sub><sub>user</sub></td><td class="left">ece5user</td><td class="left">Useful for DB installation profile</td></tr>
-<tr><td class="left">fai<sub>editor</sub><sub>conf</sub><sub>archive</sub></td><td class="left">""</td><td class="left">conf.tar.gz to use for Nursery &amp; JAAS configuration</td></tr>
-<tr><td class="left">fai<sub>editor</sub><sub>ear</sub></td><td class="left">""</td><td class="left">EAR to use instead of the Escenic binaries</td></tr>
-<tr><td class="left">fai<sub>editor</sub><sub>install</sub></td><td class="left">0</td><td class="left">Install the editorial profile</td></tr>
-<tr><td class="left">fai<sub>editor</sub><sub>name</sub></td><td class="left">editor1</td><td class="left">Name of the editor instance</td></tr>
-<tr><td class="left">fai<sub>editor</sub><sub>port</sub></td><td class="left">8080</td><td class="left">HTTP port of the editor instance</td></tr>
-<tr><td class="left">fai<sub>editor</sub><sub>shutdown</sub></td><td class="left">8005</td><td class="left">Shutdown port of the editor instance</td></tr>
-<tr><td class="left">fai<sub>enabled</sub></td><td class="left">0</td><td class="left">Whether or not to run ece-install in FAI mode</td></tr>
-<tr><td class="left">fai<sub>keep</sub><sub>off</sub><sub>etc</sub><sub>hosts</sub></td><td class="left">0</td><td class="left">Set this to 1 if you don't want ece-install adding entries to /etc/hosts</td></tr>
-<tr><td class="left">fai<sub>monitoring</sub><sub>server</sub><sub>install</sub></td><td class="left">0</td><td class="left">Install the monitoring server profile.</td></tr>
-<tr><td class="left">fai<sub>monitoring</sub><sub>server</sub><sub>ip</sub></td><td class="left">127.0.0.1</td><td class="left">The IP of the monitoring server.</td></tr>
-<tr><td class="left">fai<sub>nfs</sub><sub>allowed</sub><sub>client</sub><sub>network</sub></td><td class="left">""</td><td class="left">IP/netmwask of allowed NFS clients, example: 192.168.1.0/255.255.255.0</td></tr>
-<tr><td class="left">fai<sub>nfs</sub><sub>client</sub><sub>install</sub></td><td class="left">0</td><td class="left">Installs an NFS client</td></tr>
-<tr><td class="left">fai<sub>nfs</sub><sub>client</sub><sub>mount</sub><sub>point</sub><sub>parent</sub></td><td class="left">/mnt</td><td class="left">Mount point parent directory</td></tr>
-<tr><td class="left">fai<sub>nfs</sub><sub>export</sub><sub>list</sub></td><td class="left">""</td><td class="left">Space separated list of NFS export directories, full paths as seen on the NFS server. E.g.: /var/exports/multimedia</td></tr>
-<tr><td class="left">fai<sub>nfs</sub><sub>server</sub><sub>address</sub></td><td class="left">""</td><td class="left">Address of the NFS server, useful for the NFS client profile</td></tr>
-<tr><td class="left">fai<sub>nfs</sub><sub>server</sub><sub>install</sub></td><td class="left">0</td><td class="left">Install an NFS server</td></tr>
-<tr><td class="left">fai<sub>presentation</sub><sub>conf</sub><sub>archive</sub></td><td class="left">""</td><td class="left">conf.tar.gz to use for Nursery &amp; JAAS configuration</td></tr>
-<tr><td class="left">fai<sub>presentation</sub><sub>ear</sub></td><td class="left">""</td><td class="left">EAR to use instead of the Escenic binaries</td></tr>
-<tr><td class="left">fai<sub>presentation</sub><sub>install</sub></td><td class="left">0</td><td class="left">Install the presentation server profile</td></tr>
-<tr><td class="left">fai<sub>presentation</sub><sub>name</sub></td><td class="left">web1</td><td class="left">Name of the presentation server instance</td></tr>
-<tr><td class="left">fai<sub>presentation</sub><sub>port</sub></td><td class="left">8080</td><td class="left">HTTP port of the presentation server instance</td></tr>
-<tr><td class="left">fai<sub>presentation</sub><sub>shutdown</sub></td><td class="left">8005</td><td class="left">Shutdown port of the presentation instance</td></tr>
-<tr><td class="left">fai<sub>public</sub><sub>host</sub><sub>name</sub></td><td class="left">${HOSTNAME}:8080</td><td class="left">The public address for your website</td></tr>
-<tr><td class="left">fai<sub>publication</sub><sub>create</sub></td><td class="left">0</td><td class="left">Create a new publication</td></tr>
-<tr><td class="left">fai<sub>publication</sub><sub>domain</sub><sub>mapping</sub><sub>list</sub></td><td class="left">""</td><td class="left">Mapping between publication names and their corresponding domains on the form: "one#one.com other#other.com"</td></tr>
-<tr><td class="left">fai<sub>publication</sub><sub>name</sub></td><td class="left">mypub</td><td class="left">Name of the publication</td></tr>
-<tr><td class="left">fai<sub>publication</sub><sub>use</sub><sub>instance</sub></td><td class="left">dev1</td><td class="left">Name of local instance to use for creation</td></tr>
-<tr><td class="left">fai<sub>publication</sub><sub>war</sub></td><td class="left">"WF or ECE demo WAR"</td><td class="left">WAR to base the new publication on</td></tr>
-<tr><td class="left">fai<sub>publication</sub><sub>war</sub><sub>uri</sub><sub>list</sub></td><td class="left">""</td><td class="left">Publication WARs used for setting up Assembly tool. Supported: http[s]://tmp.com/mypub.war, <a href="file:////tmp/mypub.war">///tmp/mypub.war</a> and /tmp/mypub.war.</td></tr>
-<tr><td class="left">fai<sub>rmi</sub><sub>install</sub></td><td class="left">0</td><td class="left">Install RMI hub profile</td></tr>
-<tr><td class="left">fai<sub>search</sub><sub>conf</sub><sub>archive</sub></td><td class="left">""</td><td class="left">conf.tar.gz to use for Nursery &amp; JAAS configuration</td></tr>
-<tr><td class="left">fai<sub>search</sub><sub>ear</sub></td><td class="left">""</td><td class="left">EAR to use instead of the Escenic binaries</td></tr>
-<tr><td class="left">fai<sub>search</sub><sub>for</sub><sub>editor</sub></td><td class="left">0</td><td class="left">If 1 (true), will configure Solr for use with an editorial server, if not conf for presentation servers will be chosen.</td></tr>
-<tr><td class="left">fai<sub>search</sub><sub>indexer</sub><sub>ws</sub><sub>uri</sub></td><td class="left"><a href="http://${HOSTNAME}:8080/indexer-webservice/index/">http://${HOSTNAME}:8080/indexer-webservice/index/</a></td><td class="left">URI of the indexer-webservice that the search instance shall use for knowing what to index.</td></tr>
-<tr><td class="left">fai<sub>search</sub><sub>install</sub></td><td class="left">0</td><td class="left">Install the search server profile (Solr + indexer)</td></tr>
-<tr><td class="left">fai<sub>search</sub><sub>name</sub></td><td class="left">search1</td><td class="left">Name of the search instance</td></tr>
-<tr><td class="left">fai<sub>search</sub><sub>port</sub></td><td class="left">8080</td><td class="left">HTTP port of the search instance</td></tr>
-<tr><td class="left">fai<sub>search</sub><sub>shutdown</sub></td><td class="left">8005</td><td class="left">Shutdown port of the search instance</td></tr>
-<tr><td class="left">fai<sub>vip</sub><sub>address</sub></td><td class="left">""</td><td class="left">The virtual IP the provider will claim</td></tr>
-<tr><td class="left">fai<sub>vip</sub><sub>install</sub></td><td class="left">0</td><td class="left">Install a VIP provider</td></tr>
-<tr><td class="left">fai<sub>vip</sub><sub>primary</sub><sub>node</sub><sub>auth</sub><sub>key</sub></td><td class="left">""</td><td class="left">Optional, but useful to set to make conf files consistent. Will be generated if not set</td></tr>
-<tr><td class="left">fai<sub>vip</sub><sub>primary</sub><sub>node</sub><sub>ip</sub></td><td class="left">""</td><td class="left">Primary node IP</td></tr>
-<tr><td class="left">fai<sub>vip</sub><sub>primary</sub><sub>node</sub><sub>name</sub></td><td class="left">""</td><td class="left">Primary node name, must be what $(uname -n) returns</td></tr>
-<tr><td class="left">fai<sub>vip</sub><sub>secondary</sub><sub>node</sub><sub>ip</sub></td><td class="left">""</td><td class="left">Secondary node IP</td></tr>
-<tr><td class="left">fai<sub>vip</sub><sub>secondary</sub><sub>node</sub><sub>name</sub></td><td class="left">""</td><td class="left">Secondary node name, must be what $(uname -n) returns</td></tr>
-<tr><td class="left">fai<sub>vip</sub><sub>service</sub><sub>list</sub></td><td class="left">""</td><td class="left">List of init.d scripts to invoke when the VIP is acclaimed/revoked, script must support start &amp; stop</td></tr>
-<tr><td class="left">fai<sub>vip</sub><sub>sibling</sub><sub>ip</sub></td><td class="left">""</td><td class="left">The IP of the other node offering the VIP</td></tr>
-<tr><td class="left">fai<sub>wf</sub><sub>install</sub></td><td class="left">0</td><td class="left">Install Widget Framework profile</td></tr>
-</tbody>
-</table>
-
-
-<p>
-As you've probably have guessed, 0 means "false" and 1 means "true" :-)
-</p>
-</div>
-
-</div>
-
-<div id="outline-container-6-4" class="outline-3">
-<h3 id="sec-6-4"><span class="section-number-3">6.4</span> Examples</h3>
-<div class="outline-text-3" id="text-6-4">
-
-
-</div>
-
-<div id="outline-container-6-4-1" class="outline-4">
-<h4 id="sec-6-4-1"><span class="section-number-4">6.4.1</span> Installing an Editorial Server &amp; Create a Publication</h4>
-<div class="outline-text-4" id="text-6-4-1">
-
-<p>To automatically install an editorial server and create a publication
-called "jollygood", the minimal configuration in ece-install.conf
-would be:
-</p>
-
-
-
-<pre class="src src-conf"><span style="color: #f0dfaf;">fai_enabled</span>=1
-<span style="color: #f0dfaf;">fai_editor_install</span>=1
-<span style="color: #f0dfaf;">fai_publication_create</span>=1
-<span style="color: #f0dfaf;">fai_publication_name</span>=jollygood
-</pre>
-
-
-</div>
-
-</div>
-
-<div id="outline-container-6-4-2" class="outline-4">
-<h4 id="sec-6-4-2"><span class="section-number-4">6.4.2</span> Installing Two Presentation Servers On a Single Host</h4>
-<div class="outline-text-4" id="text-6-4-2">
-
-<p>If you wish to only install two presentation servers called "web1" and
-"web2" on your host, you will first run ece-install with:
-</p>
-
-
-<pre class="src src-conf"><span style="color: #f0dfaf;">fai_enabled</span>=1
-<span style="color: #f0dfaf;">fai_presentation_install</span>=1
-<span style="color: #f0dfaf;">fai_presentation_name</span>=web1
-</pre>
-
-
-<p>
-And then re-issue ece-install with the following configuration:
-</p>
-
-
-<pre class="src src-conf"><span style="color: #f0dfaf;">fai_enabled</span>=1
-<span style="color: #f0dfaf;">fai_presentation_install</span>=1
-<span style="color: #f0dfaf;">fai_presentation_name</span>=web2
-<span style="color: #f0dfaf;">fai_presentation_port</span>=8081
-<span style="color: #f0dfaf;">fai_presentation_shutdown</span>=8105
-</pre>
-
-<p>
-Notice that this configuration has some extra options since the
-previous run of ece-install could run with the default settings,
-whereas the second one needs to override these.
-</p>
-
-</div>
-</div>
-
-</div>
-
-<div id="outline-container-6-5" class="outline-3">
-<h3 id="sec-6-5"><span class="section-number-3">6.5</span> Verifying That the Script Is Running In FAI Mode</h3>
-<div class="outline-text-3" id="text-6-5">
-
-<p>When FAI is enabled, ece-install will report:
-</p>
-
-
-<pre class="src src-conf">[<span style="color: #98fb98;">ece-install</span>] Full Automatic Install (FAI) enabled.
-[<span style="color: #98fb98;">ece-install</span>] All user input will be read from /root/ece-install.conf
-</pre>
-
-
-</div>
-</div>
-
-</div>
-
-<div id="outline-container-7" class="outline-2">
-<h2 id="sec-7"><span class="section-number-2">7</span> Running More Than One Installation Process</h2>
-<div class="outline-text-2" id="text-7">
-
-<p>If the script believes there's already an ece-intall process running,
-it will abort:
-</p>
-
-
-<pre class="src src-conf">[<span style="color: #98fb98;">ece-install</span>] There<span style="color: #ffa07a;">'s already one ece-install process running. If you believe</span>
-<span style="color: #ffa07a;">[ece-install] this is wrong, e.g. if a previous run of ece-install was aborted</span>
-<span style="color: #ffa07a;">[ece-install] before it completed, you may delete /var/run/ece-install.pid and</span>
-<span style="color: #ffa07a;">[ece-install] run ece-install again.</span>
-</pre>
-
-
-</div>
-
-</div>
-
-<div id="outline-container-8" class="outline-2">
-<h2 id="sec-8"><span class="section-number-2">8</span> Re-running ece-install (and How To Speed It Up)</h2>
-<div class="outline-text-2" id="text-8">
-
-<p>Although the initial thought behind ece-install, is to run it on a
-clean system to get up and running as soon as possible. However, you
-may want to re-run ece-install on the same host, for instance to add
-another instance of ECE, set up Widget Framework or create another
-publication.
-</p>
-<p>
-ece-install has a number of features which will try to minimise the
-time it takes to run it on consecutive runs. If running on Debian
-based systems, it will check if you already have installed
-pre-requisite 3rd party libraries and only if any are missing will it
-ask the package manager to fetch it.
-</p>
-<p>
-Likewise, ece-install will see if the Escenic artifacts or application
-server that you need are already present in the /tmp/ece-downloads
-folder, and only download the missing ones (if any).
-</p>
-<p>
-To get a list of the artifacts it'll pull from
-<a href="http://technet.escenic.com">http://technet.escenic.com</a> and <a href="http://tomcat.apache.org">http://tomcat.apache.org</a> search for the
-following variables:
-</p><ul>
-<li>technet<sub>download</sub><sub>list</sub>
-</li>
-<li>wf<sub>download</sub><sub>list</sub>
-</li>
-<li>tomcat<sub>download</sub>
-</li>
-</ul>
-
-
-<p>
-Two other ways of speeding up the installation is (of course) to use
-the backup/restore feature or install from a EAR and configuration
-bundle, see the FAI section.
-</p>
-</div>
-
-</div>
-
-<div id="outline-container-9" class="outline-2">
-<h2 id="sec-9"><span class="section-number-2">9</span> Using a Custom Configuration File for ece-install</h2>
-<div class="outline-text-2" id="text-9">
-
-<p>You can specify a different configuration by using the -f parameter: 
-</p>
-
-
-<pre class="src src-conf"><span style="color: #f0dfaf;">$</span> ece-install -f ece-install-presentation-server.conf
-</pre>
-
-
-</div>
-
-</div>
-
-<div id="outline-container-10" class="outline-2">
-<h2 id="sec-10"><span class="section-number-2">10</span> Overview of File Paths Used by the ece-install script</h2>
-<div class="outline-text-2" id="text-10">
-
-<p>There are of course other paths involved when setting up your system,
-but these should be the most interesting ones.
-</p>
-<table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
-<caption></caption>
-<colgroup><col class="left" /><col class="left" />
-</colgroup>
-<thead>
-<tr><th scope="col" class="left">Path</th><th scope="col" class="left">Explanation</th></tr>
-</thead>
-<tbody>
-<tr><td class="left">/etc/apt/sources.list.d/escenic.list</td><td class="left">3rd party APT repositories added by ece-install *)</td></tr>
-<tr><td class="left">/etc/default/ece</td><td class="left">The configuration file for the ece init.d script</td></tr>
-<tr><td class="left">/etc/escenic/ece-&lt;instance&gt;.conf</td><td class="left">Instance specific settings for /usr/bin/ece</td></tr>
-<tr><td class="left">/etc/escenic/ece.conf</td><td class="left">Common ece.conf file for /usr/bin/ece</td></tr>
-<tr><td class="left">/etc/escenic/engine/common</td><td class="left">Common Nursery configuration layer</td></tr>
-<tr><td class="left">/etc/escenic/engine/common/security</td><td class="left">Common security configuration for all ECE instances.</td></tr>
-<tr><td class="left">/etc/escenic/engine/common/trace.properties</td><td class="left">Log4j configuration, produces instance specific log files.</td></tr>
-<tr><td class="left">/etc/escenic/engine/instance/&lt;instance&gt;</td><td class="left">Instance specific Nursery configuration</td></tr>
-<tr><td class="left">/etc/escenic/solr</td><td class="left">ECE specific Solr configuration</td></tr>
-<tr><td class="left">/etc/init.d/mysql[d]</td><td class="left">For starting and stopping MySQL/Percona</td></tr>
-<tr><td class="left">/etc/init.d/varnish</td><td class="left">For starting and stopping Varnish</td></tr>
-<tr><td class="left">/etc/intit.d/ece</td><td class="left">The init.d script managing <span style="text-decoration:underline;">all</span> the ECE instances on your host.</td></tr>
-<tr><td class="left">/etc/varnish/default.vcl</td><td class="left">The Varnish configuration</td></tr>
-<tr><td class="left">/opt/escenic</td><td class="left">All ECE components can be found here</td></tr>
-<tr><td class="left">/opt/escenic/assemblytool</td><td class="left">The assembly tool</td></tr>
-<tr><td class="left">/opt/escenic/assemblytool/plugins</td><td class="left">Contains symlinks to all plugins in /opt/escenic</td></tr>
-<tr><td class="left">/opt/escenic/engine</td><td class="left">Symlink pointing to the current ECE</td></tr>
-<tr><td class="left">/opt/tomcat</td><td class="left">Symlink pointing to the install Apache Tomcat (catalina<sub>home</sub>)</td></tr>
-<tr><td class="left">/opt/tomcat-&lt;instance&gt;</td><td class="left">Instance specific Tomcat files (catalina<sub>base</sub>)</td></tr>
-<tr><td class="left">/usr/bin/ece</td><td class="left">Script for operating all ECE instances + RMI hub and EAE</td></tr>
-<tr><td class="left">/usr/sbin/drop-and-create-ecedb</td><td class="left">DB script used by the ece-install script</td></tr>
-<tr><td class="left">/usr/sbin/ece-install</td><td class="left">The installation script described in this guide</td></tr>
-<tr><td class="left">/var/log/escenic/&lt;type&gt;-&lt;instance&gt;.log</td><td class="left">The instance's log4j  log</td></tr>
-<tr><td class="left">/var/log/escenic/&lt;type&gt;-&lt;instance&gt;.out</td><td class="left">The instance system out log</td></tr>
-<tr><td class="left">/var/log/escenic/solr.&lt;date&gt;.log</td><td class="left">The Solr log (not in standard out!)</td></tr>
-<tr><td class="left">/var/run/escenic/&lt;type&gt;-&lt;instance&gt;.pid</td><td class="left">The instance's  PID file</td></tr>
-</tbody>
-</table>
-
-
-<p>
-*) Applies only to Debian based systems.
-</p>
-</div>
-
-</div>
-
-<div id="outline-container-11" class="outline-2">
-<h2 id="sec-11"><span class="section-number-2">11</span> Overriding the Escenic directories</h2>
-<div class="outline-text-2" id="text-11">
-
-<p>All of the Escenic specific directories may be overwritten in
-ece-install.conf. Here's an example of changing all the paths possible
-with the same suffix.
-</p>
-
-
-
-<pre class="src src-conf"><span style="color: #f0dfaf;">dir_suffix</span>=escenic-parallel
-<span style="color: #f0dfaf;">escenic_root_dir</span>=/opt/${dir_suffix}
-<span style="color: #f0dfaf;">escenic_conf_dir</span>=/etc/${dir_suffix}
-<span style="color: #f0dfaf;">escenic_log_dir</span>=/var/log/${dir_suffix}
-<span style="color: #f0dfaf;">escenic_data_dir</span>=/var/lib/${dir_suffix}
-<span style="color: #f0dfaf;">escenic_run_dir</span>=/var/run/${dir_suffix}
-<span style="color: #f0dfaf;">escenic_backups_dir</span>=/var/backups/${dir_suffix}
-<span style="color: #f0dfaf;">escenic_spool_dir</span>=/var/spool/${dir_suffix}
-<span style="color: #f0dfaf;">escenic_cache_dir</span>=/var/cache/${dir_suffix}
-<span style="color: #f0dfaf;">escenic_crash_dir</span>=/var/crash/${dir_suffix}
-<span style="color: #f0dfaf;">appserver_parent_dir</span>=/opt
-</pre>
-
-
-<p>
-Note, this is only needed if you are running two completely separate
-environments on the same host. A use case is if you're setting up a
-test environment and want to separate stacks of Escenic Content Engine
-and plugins.
-</p>
-</div>
-
-</div>
-
-<div id="outline-container-12" class="outline-2">
-<h2 id="sec-12"><span class="section-number-2">12</span> Extending ece-install by Writing Hooks</h2>
-<div class="outline-text-2" id="text-12">
-
-<p>ece-install  has a number of hooks on which you can hook on your own
-scripts. The scripts are to reside in $HOME/ece-conf.d/ and have names
-inspired by Debian's package scripts:
-</p>
-
-
-
-<pre class="src src-conf"><span style="color: #f0dfaf;">&lt;hook</span> name&gt;.&lt;phase&gt;
-</pre>
-
-
-<p>
-e.g.:
-</p>
-
-
-
-<pre class="src src-conf"><span style="color: #f0dfaf;">install_analysis_server.preinst</span>
-</pre>
-
-
-<p>
-Will be run before the body of the hook, just the corresponding
-.postinst hook will be run after.
-</p>
-
-</div>
-
-<div id="outline-container-12-1" class="outline-3">
-<h3 id="sec-12-1"><span class="section-number-3">12.1</span> Accessing ece-install variables</h3>
-<div class="outline-text-3" id="text-12-1">
-
-<p>Before running the hook, ece-install will make all its local variables
-available in /var/run/escenic/ece-install.env, which can then be used
-by the hook scripts.
-</p>
-</div>
-
-</div>
-
-<div id="outline-container-12-2" class="outline-3">
-<h3 id="sec-12-2"><span class="section-number-3">12.2</span> Example hook</h3>
-<div class="outline-text-3" id="text-12-2">
-
-<p>Here is an example hook which will be run after the EAE is installed.
-</p>
-
-
-
-<pre class="src src-sh"><span style="color: #7f9f7f; font-style: italic;"># </span><span style="color: #7f9f7f; font-style: italic;">Put this in is $HOME/ece-install.d/install_analysis_server.postinst</span>
-
-<span style="color: #7f9f7f; font-style: italic;"># </span><span style="color: #7f9f7f; font-style: italic;">read ece-install's current variables</span>
-<span style="color: #b0c4de;">source</span> /var/run/escenic/ece-install.env
-
-<span style="color: #7f9f7f; font-style: italic;"># </span><span style="color: #7f9f7f; font-style: italic;">do something useful</span>
-<span style="color: #b0c4de;">echo</span> <span style="color: #ffa07a;">"Hello from $0, EAE is installed in ${tomcat_base}"</span> &gt; /tmp/hello.txt
-</pre>
-
-
-</div>
-
-</div>
-
-<div id="outline-container-12-3" class="outline-3">
-<h3 id="sec-12-3"><span class="section-number-3">12.3</span> Available hooks</h3>
-<div class="outline-text-3" id="text-12-3">
-
-<p>Currently, the following hooks are available:
-</p>
-
-
-
-<pre class="src src-sh">install_analysis_server.preinst
-install_analysis_server.postinst
-set_up_solr.preinst
-set_up_solr.postinst
-</pre>
-
-
-</div>
-</div>
-
-</div>
-
-<div id="outline-container-13" class="outline-2">
-<h2 id="sec-13"><span class="section-number-2">13</span> Assumptions</h2>
-<div class="outline-text-2" id="text-13">
-
-
-</div>
-
-<div id="outline-container-13-1" class="outline-3">
-<h3 id="sec-13-1"><span class="section-number-3">13.1</span> The machine on which ece-install has enough RAM</h3>
-<div class="outline-text-3" id="text-13-1">
-
-<p>It is assumed that the machine on which ece-install has enough RAM to
-install the profiles the user asks for.
-</p>
-<p>
-A common error by users, is to run ece-install in a (virtual) machine
-that has e.g. only 1GB RAM. For happy running, we recommend having a
-machine with at least 3GB when installing a full ECE stack on it.
-</p>
-</div>
-</div>
-
-</div>
-
-<div id="outline-container-14" class="outline-2">
-<h2 id="sec-14"><span class="section-number-2">14</span> Uninstalling Everything That the ece-install Set Up</h2>
-<div class="outline-text-2" id="text-14">
-
-<p>WARNING: this is potentially dangerous as some of these components may
-be used by other pieces of software you have running on your
-host. However, this may be useful if you're installing a clean
-environment and want to e.g. undo your previous install to install a
-different profile.
-</p>
-<p>
-Open the ece-install script and look for the "un<sub>install</sub><sub>ece</sub>"
-function, it has copy and pastable commands for undoing most/all
-things set up by the script.
-</p>
-
-</div>
-
-</div>
-
-<div id="outline-container-15" class="outline-2">
-<h2 id="sec-15"><span class="section-number-2">15</span> Example Output FAI</h2>
-<div class="outline-text-2" id="text-15">
-
-<p>The ece-install will often be run in FAI mode where all the settings
-are read from ~/ece-install.conf. Given the following entries in this
-file: 
-</p>
-
-
-<pre class="src src-conf"><span style="color: #f0dfaf;">technet_user</span>=apples
-<span style="color: #f0dfaf;">technet_password</span>=andoranges
-<span style="color: #f0dfaf;">wf_user</span>=foo
-<span style="color: #f0dfaf;">wf_password</span>=bar
-
-<span style="color: #f0dfaf;">fai_enabled</span>=1
-<span style="color: #f0dfaf;">fai_all_install</span>=1
-</pre>
-
-
-<p>
-All the different components described in this guide are installed on
-the host that runs the install script.
-</p>
-<p>
-The following output is produced from ece-install:
-</p>
-
-
-<pre class="src src-text">[ece-install-0] Full Automatic Install (FAI) enabled.
-[ece-install-0] All user input will be read from /root/ece-install.conf
-[ece-install-0] I'm logging to /var/log/ece-install.log
-[ece-install-1] Stopping conflicting processes ...
-[ece-install-1] Installing 3rd party packages needed by ece-install ...
-[ece-install-1] Setting up the ece UNIX scripts ...
-[ece-install-2] Setting up the torstein user's UNIX environment ...
-[ece-install-2] Installing a presentation server on quanah ...
-[ece-install-2] Installing 3rd party packages needed by ECE ...
-[ece-install-4] Setting up the basic Nursery configuration ...
-[ece-install-4] Using the supplied Nursery &amp; JAAS configuration
-[ece-install-4] from the bundle: /tmp/nursery-skeleton-and-security.tar.gz
-[ece-install-4] Setting up the application server ...
-[ece-install-5] Setting up proper log4j &amp; Java logging configuration ...
-[ece-install-5] Setting correct permissions on ECE related directories ...
-[ece-install-6] Assembling, deploying &amp; starting pres1 ...
-[ece-install-7] I'm using the supplied EAR instead of running an assembly.
-[ece-install-24] Adding the ece init.d script to the default run levels ...
-[ece-install-24] Installing a Munin node on quanah ...
-[ece-install-30] The installation is now complete! It took 0d 0h 0m 30s
-[ece-install-30] - New ECE instance pres1 installed.
-[ece-install-30] - Admin interface: http://quanah:9980/escenic-admin/
-[ece-install-30] - View installed versions with: ece -i pres1 versions
-[ece-install-30] - Type 'ece help' to see all the options of this script
-[ece-install-30] - Read its guide: /usr/share/doc/escenic/ece-guide.txt
-[ece-install-30] - /etc/default/ece lists all instances started at boot time
-[ece-install-30] - A Munin node has been installed on quanah
-[ece-install-30] - Install info: /usr/share/doc/escenic/ece-install-guide.txt
-[ece-install-30] - Guide books: http://documentation.vizrt.com/ece-5.3.html
-[ece-install-30] Enjoy your time with Escenic Content Engine!
-[ece-install-30] -Vizrt Online
-
-</pre>
-
-
-</div>
-</div>
-</div>
-
-<div id="postamble">
-<hr/>
-<p class="author">
-  Author: Torstein Krause Johansen (<a href="mailto:tkj@vizrt.com">tkj@vizrt.com</a>)
-  Date: 2012-03-14 18:08:27 CST
-</p>
-</div>
-</body>
-</html>
diff --git a/usr/share/doc/escenic/system-info-guide.html b/usr/share/doc/escenic/system-info-guide.html
deleted file mode 100644
index d458d9e0..00000000
--- a/usr/share/doc/escenic/system-info-guide.html
+++ /dev/null
@@ -1,334 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-               "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-lang="en" xml:lang="en">
-<head>
-<title>Welcome to the /usr/bin/system-info Guide</title>
-<meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
-<meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2011-11-11 12:07:19 CST"/>
-<meta name="author" content="Torstein Krause Johansen"/>
-<meta name="description" content=""/>
-<meta name="keywords" content=""/>
-<style type="text/css">
- <!--/*--><![CDATA[/*><!--*/
-  html { font-family: Times, serif; font-size: 12pt; }
-  .title  { text-align: center; }
-  .todo   { color: red; }
-  .done   { color: green; }
-  .tag    { background-color: #add8e6; font-weight:normal }
-  .target { }
-  .timestamp { color: #bebebe; }
-  .timestamp-kwd { color: #5f9ea0; }
-  .right  {margin-left:auto; margin-right:0px;  text-align:right;}
-  .left   {margin-left:0px;  margin-right:auto; text-align:left;}
-  .center {margin-left:auto; margin-right:auto; text-align:center;}
-  p.verse { margin-left: 3% }
-  pre {
-	border: 1pt solid #AEBDCC;
-	background-color: #F3F5F7;
-	padding: 5pt;
-	font-family: courier, monospace;
-        font-size: 90%;
-        overflow:auto;
-  }
-  table { border-collapse: collapse; }
-  td, th { vertical-align: top;  }
-  th.right  { text-align:center;  }
-  th.left   { text-align:center;   }
-  th.center { text-align:center; }
-  td.right  { text-align:right;  }
-  td.left   { text-align:left;   }
-  td.center { text-align:center; }
-  dt { font-weight: bold; }
-  div.figure { padding: 0.5em; }
-  div.figure p { text-align: center; }
-  div.inlinetask {
-    padding:10px;
-    border:2px solid gray;
-    margin:10px;
-    background: #ffffcc;
-  }
-  textarea { overflow-x: auto; }
-  .linenr { font-size:smaller }
-  .code-highlighted {background-color:#ffff00;}
-  .org-info-js_info-navigation { border-style:none; }
-  #org-info-js_console-label { font-size:10px; font-weight:bold;
-                               white-space:nowrap; }
-  .org-info-js_search-highlight {background-color:#ffff00; color:#000000;
-                                 font-weight:bold; }
-  /*]]>*/-->
-</style><style type="text/css">
-body {
-  font-family: Arial, Helvetica, sans-serif;
-  font-size: small;
-  #width : 600;
-  margin: 70px 70px 0px 50px;
-}
-
-h1, h2 {
-  color: #e88424;
-}
-
-h1 {
-  font-size: 150%;
-}
-
-h2 {
-  font-size: 120%;
-  margin-top: 3em;
-  margin-bottom: 0em;
-}
-
-h3, h4, h5, h6 {
-  font-weight: bold;
-  margin-top: 2em;
-  margin-bottom: 0.2em;
-}
-
-h3, h4, h5 {
-  font-size: 110%;
-}
-
-h6 {
-  font-size: 80%;
-}
-
-a {
-  color: #333;
-  font-weight: bold;
-  text-decoration: none;
-}
-
-a:hover {
-  text-decoration: underline;
-}
-
-p, dl {
-  font-size: 95%;
-}
-
-p {
-  margin-top: 0em;
-  margin-bottom: 0.6em;
-}
-
-pre.programlisting {
-  margin-top: 0em;
-  background-color: #ffddaa;
-  padding-top: 0.5em;
-  padding-bottom: 0.5em;
-  padding-left: 0.5em;
-  padding-right: 0.5em;
-}
-
-em {
-  font-weight: bold;
-  font-style: normal;
-}
-
-em.replaceable {
-  font-weight: normal;
-  font-style: italic;
-}
-
-div.note {
-  background-color: #ffddaa;
-  padding-top: 0.5em;
-  padding-bottom: 0.5em;
-  padding-left: 0.5em;
-  padding-right: 0.5em;
-}
-</style>
-
-<script type="text/javascript">
-<!--/*--><![CDATA[/*><!--*/
- function CodeHighlightOn(elem, id)
- {
-   var target = document.getElementById(id);
-   if(null != target) {
-     elem.cacheClassElem = elem.className;
-     elem.cacheClassTarget = target.className;
-     target.className = "code-highlighted";
-     elem.className   = "code-highlighted";
-   }
- }
- function CodeHighlightOff(elem, id)
- {
-   var target = document.getElementById(id);
-   if(elem.cacheClassElem)
-     elem.className = elem.cacheClassElem;
-   if(elem.cacheClassTarget)
-     target.className = elem.cacheClassTarget;
- }
-/*]]>*///-->
-</script>
-
-</head>
-<body>
-
-<div id="preamble">
-<svg
-        id="vizrt-logo"
-        version="1.1"
-        width="138"
-        height="84"
-        > 
-  <g
-          id="g12"
-          transform="matrix(1.25,0,0,-1.25,-451.34003,425.24315)"> 
-    <g
-            id="g14"
-            transform="matrix(0.0246257,0,0,0.02458666,313.76213,231.21317)"> 
-      <path
-              d="m 3060.56,3437.2 -209.9,-593.4 -207.05,593.4 -215.82,0 326.08,-866.38 184.92,0 332.24,866.38 -210.47,0"
-              style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
-              id="path16"/> 
-      <path
-              d="m 3473.3,2569.82 193.547,0 0,866.531 -193.547,0 0,-866.531 z"
-              style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
-              id="path18"/> 
-      <path
-              d="m 3916.16,3436.36 -0.14,-177.24 364.23,0 -372.91,-554.74 0,-133.56 616.08,0 0,175.25 -374.66,0 366.68,550.78 0,139.51 -599.28,0"
-              style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
-              id="path20"/> 
-      <path
-              d="m 4961.8,3436.66 c -56.15,0 -99.9,-9.02 -144.01,-53.04 -42.13,-42.13 -63.55,-93.63 -63.55,-153.7 l 0,-658.85 193.26,0 0,629.18 c 0,16.39 5.76,30.04 17.53,41.82 9.79,9.87 32.16,17.44 52.18,17.44 l 161.49,0 0,177.15 -216.9,0"
-              style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
-              id="path22"/> 
-      <path
-              d="m 5367.91,3699.54 0,-915.91 c 0,-58.68 20.75,-109.43 62.13,-150.8 43.31,-43.47 85.57,-62.01 141.03,-62.01 l 212.69,0 0,174.7 -158.78,0 c -15.96,0 -28.96,5.5 -40.72,16.87 -11.19,11.53 -16.76,24.5 -16.76,40.65 l 0,456.42 216.26,0 0,176.39 -216.26,0 0,263.69 -199.59,0"
-              style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
-              id="path24"/> 
-      <path
-              d="m 1921.16,3066.86 c -0.39,-514.15 173.24,-988.49 465.56,-1367.51 l 69.26,204.63 c -205.49,300.61 -333.44,658.06 -355.3,1043.68 l -179.52,119.2"
-              style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
-              id="path26"/> 
-      <path
-              d="m 6404.28,3065.28 c 0.49,513.97 -173.17,988.55 -465.37,1367.26 l -69.46,-204.34 c 205.52,-300.7 333.61,-658.34 355.24,-1043.68 l 179.59,-119.24"
-              style="fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none"
-              id="path28"/> 
- 
-    </g> 
-  </g> 
-</svg>
-
-</div>
-
-<div id="content">
-<h1 class="title">Welcome to the /usr/bin/system-info Guide</h1>
-
-<p>This wee script gives a overview of your system, especially useful
-when contacting Vizrt Online/Escenic Support.
-</p>
-
-
-
-<pre class="src src-sh">$ system-info
-</pre>
-
-
-<p>
-The script will default wise produce a plain text report, but if you
-pass -c or &ndash;confluence to it, it will generate Confluence Wiki markup
-instead.
-</p>
-
-<div id="table-of-contents">
-<h2>Table of Contents</h2>
-<div id="text-table-of-contents">
-<ul>
-<li><a href="#sec-1">1 Example </a></li>
-</ul>
-</div>
-</div>
-
-<div id="outline-container-1" class="outline-2">
-<h2 id="sec-1"><span class="section-number-2">1</span> Example </h2>
-<div class="outline-text-2" id="text-1">
-
-<p>Here you can see an example of the output generated from system-info:
-</p>
-
-
-
-<pre class="src src-text">#########################################################################
-System details for quanah
-#########################################################################
-
-#########################################################################
-Kernel version
-#########################################################################
-Linux quanah 3.0.0-1-amd64 #1 SMP Sat Aug 27 16:21:11 UTC 2011 x86_64 GNU/Linux
-
-#########################################################################
-Distribution information
-#########################################################################
-Debian or derivate, version wheezy/sid
-
-#########################################################################
-Database details
-#########################################################################
-/usr/sbin/mysqld  Ver 5.1.58-1 for debian-linux-gnu on x86_64 ((Debian))
-
-#########################################################################
-Java version
-#########################################################################
-java version "1.6.0_26"
-Java(TM) SE Runtime Environment (build 1.6.0_26-b03)
-Java HotSpot(TM) 64-Bit Server VM (build 20.1-b02, mixed mode)
-
-#########################################################################
-Important packages
-#########################################################################
-ant                                      1.8.2-4                              Java based build tool like make
-libapr1                                  1.4.5-1                              Apache Portable Runtime Library
-libmysql-java                            5.1.16-2                             Java database (JDBC) driver for MySQL
-libtcnative-1                            1.1.22-1                             Tomcat native library using the apache portable runtime
-maven2                                   2.2.1-10                             Java software project management and comprehension tool
-mysql-server                             5.1.58-1                             MySQL database server (metapackage depending on the latest version)
-nginx                                    1.1.4-2                              small, but very powerful and efficient web server and mail proxy
-sun-java6-jdk                            6.26-3                               Sun Java(TM) Development Kit (JDK) 6
-sun-java6-jre                            6.26-3                               Sun Java(TM) Runtime Environment (JRE) 6 (architecture independent files)
-tomcat6-user                             6.0.32-6                             Servlet and JSP engine -- tools to create user instances
-varnish                                  3.0.1-1~squeeze1                     state of the art, high-performance web accelerator
-
-#########################################################################
-Processors
-#########################################################################
-Processor type:  Intel(R) Core(TM)2 Duo CPU P8600 @ 2.40GHz
-Number of processors/cores: 1
-
-#########################################################################
-Memory
-#########################################################################
-Total memory:  3792504 kB
-Free memory:  339096 kB
-
-#########################################################################
-Disk Storage
-#########################################################################
-Filesystem     Type     Size  Used Avail Use% Mounted on
-/dev/sda3      ext3     141G  127G  7.2G  95% /
-tmpfs          tmpfs    5.0M  8.0K  5.0M   1% /lib/init/rw
-tmpfs          tmpfs    371M  812K  370M   1% /run
-udev           tmpfs    1.9G     0  1.9G   0% /dev
-tmpfs          tmpfs    741M  420K  741M   1% /run/shm
-shmfs          tmpfs    1.9G   12K  1.9G   1% /lib/init/rw/splashy
-/dev/sda2      hfsplus   96G   89G  6.3G  94% /mnt/mac
-</pre>
-
-</div>
-</div>
-</div>
-
-<div id="postamble">
-<hr/>
-<p class="author">
-  Author: Torstein Krause Johansen (<a href="mailto:tkj@vizrt.com">tkj@vizrt.com</a>)
-  Date: 2011-11-11 12:07:19 CST
-</p>
-</div>
-</body>
-</html>

From 389add8aa559f8520f56259054a6db34f61527c6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 25 Jul 2012 17:11:06 +0200
Subject: [PATCH 1002/2585] - added title and author

---
 usr/share/doc/escenic/ece-install-guide.org | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index c6051f5d..16f19174 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -1,4 +1,5 @@
-Welcome to the /usr/sbin/ece-install Guide
+#+TITLE: Welcome to the /usr/sbin/ece-install Guide
+#+AUTHOR: Torstein Krause Johansen
 
 * Supported Operating Systems
 For the best experience, run this script on Debian Squeeze (or newer),

From 6bb26ae44e35dc9842d7bcd00b99c14245e24fcf Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 25 Jul 2012 17:13:57 +0200
Subject: [PATCH 1003/2585] - minor tweaks to the ORG formatting

---
 usr/share/doc/escenic/ece-install-guide.org | 31 +++++++++++----------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 16f19174..d4e2298e 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -956,7 +956,7 @@ A common error by users, is to run ece-install in a (virtual) machine
 that has e.g. only 1GB RAM. For happy running, we recommend having a
 machine with at least 3GB when installing a full ECE stack on it.
 
-* Uninstalling Everything That the ece-install Set Up
+* Uninstalling Everything that the ece-install Set Up
 WARNING: this is potentially dangerous as some of these components may
 be used by other pieces of software you have running on your
 host. However, this may be useful if you're installing a clean
@@ -966,20 +966,20 @@ different profile.
 ** Uninstall (most of) the packages installed by ece-install
 #+BEGIN_SRC sh
 # apt-get --yes --purge remove \
-        ant \
-        ant-contrib \
-        ant-optional \
-        curl \
-        escenic-* \
-        libmysql-java \
-        maven2 \
-        memcached \
-        munin* \
-        nginx \
-        percona* \
-        sun-java6-jdk \
-        varnish \
-        wget 
+    ant \
+    ant-contrib \
+    ant-optional \
+    curl \
+    escenic-* \
+    libmysql-java \
+    maven2 \
+    memcached \
+    munin* \
+    nginx \
+    percona* \
+    sun-java6-jdk \
+    varnish \
+    wget 
 #+END_SRC
 
 
@@ -991,6 +991,7 @@ different profile.
     /opt/*tomcat*
 #+END_SRC
 
+
 ** Remove the GPG keys added by ece-install
 #+BEGIN_SRC sh
 # apt-key remove C4DEFFEB

From 8a1a8db3259d13b75a2d00687dcb7ca593cae273 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 25 Jul 2012 17:15:03 +0200
Subject: [PATCH 1004/2585] - removed exceptions section gibberish

---
 usr/share/doc/escenic/ece-install-guide.org | 41 ---------------------
 1 file changed, 41 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index d4e2298e..a62ec7af 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -1021,44 +1021,3 @@ The following output is produced from ece-install:
 #+INCLUDE: "~/tmp/ece-install.out" src text
 
 
-* Exceptions
-** Easily 500
-{~} what now... while true; do curl -s  -I
-"http://newindianexpress.com//cities/chennai/article555367.ece%C2%^C";
-done
-
-
-** 2012-07-02 16:24
-2012-07-02 17:30:15,589 ERROR [http-8080-34]
-(com.escenic.framework.search.solr.SolrSearchEngine) solr search
-failed
-org.apache.solr.client.solrj.SolrServerException: Error executing
-query
-
-␐[..]
-
-Caused by: org.apache.solr.common.SolrException: Bad Request
-
-Bad Request
-
-request: http://localhost:8081/solr/select?sort=score
-desc&fl=*&start=0&q=(smoking OR scenes:censor OR board OR damages OR
-people`s OR health)+section:(3)+contenttype:
-(news)+publication:(nie)+(state:(published)+expiredate:[2012-07-02T12:00:15Z
-TO *]+activatedate:[* TO
-2012-07-02T12:00:15Z])+publishdate:[1970-01-01T00:00:00Z TO
-2012-07-02T12:00:15Z]&rows=15&wt=javabin&version=1
-        at
-        org.apache.solr.client.solrj.impl.CommonsHttpSolrServer.request(CommonsHttpSolrServer.java:424)
-        at
-        org.apache.solr.client.solrj.impl.CommonsHttpSolrServer.request(CommonsHttpSolrServer.java:243)
-        at
-        org.apache.solr.client.solrj.request.QueryRequest.process(QueryRequest.java:89)
-        ... 108 more
-2012-07-02 17:30:15,593 ERROR [http-8080-34]
-(com.escenic.framework.search.solr.action.SearchAction) Error while
-executing search
-java.lang.NullPointerException
-        at
-        com.escenic.framework.search.solr.action.SearchAction.execute(SearchAction.java:56)
-

From 65a45b495a3f6bd89bf32fc33e2c5fedbaef0e56 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 25 Jul 2012 17:30:08 +0200
Subject: [PATCH 1005/2585] - moved check_software_credentials further down in
 common_pre_install   as it requires the distribution detection to have taken
 place (in   order to install its curl pre-requisite).

- added fail fast test for curl inside check_software_credentials
---
 usr/sbin/ece-install | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 8dccb20d..ae8fd783 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -514,6 +514,7 @@ EOF
 ## checks the Technet and WF credentials.
 function check_software_credentials() {
   install_packages_if_missing curl
+  assert_pre_requisite curl
 
   print_and_log "Verifying that Technet credentials are OK ..."
   
@@ -595,8 +596,6 @@ function common_pre_install()
         remove_pid_and_exit_in_error
     fi
 
-    check_software_credentials
-
     if [ -e /etc/debian_version -a -x /usr/bin/dpkg ]; then
         on_debian_or_derivative=1
         export DEBIAN_FRONTEND=noninteractive
@@ -618,6 +617,7 @@ function common_pre_install()
       fi
     fi
 
+    check_software_credentials
     assert_pre_requisite lsb_release
     
     if [ $(lsb_release -i | grep Ubuntu | wc -l) -gt 0 ]; then

From 88e52ce7e19ea5449f9ca2b292bae4033e332f8f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 25 Jul 2012 17:34:56 +0200
Subject: [PATCH 1006/2585] - remove an important slash in the virtual host app
 server configuration

---
 usr/share/doc/escenic/ece-install-guide.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index a62ec7af..bc168d36 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -648,7 +648,7 @@ This will produce the following stanzas in server.xml:
 <Host name="ild.escenic.com" appBase="webapps" autoDeploy="false">
   <Context displayName="ild.escenic.com"
            docBase="ildpub"
-           path="/"
+           path=""
   />
 </Host>
 #+END_SRC

From 8f2f429ffe1bacc2406028f9003d70fc0da746cd Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 26 Jul 2012 09:19:06 +0200
Subject: [PATCH 1007/2585] - added documentation for fai_analysis_install.

---
 usr/share/doc/escenic/ece-install-guide.org | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index bc168d36..c3c55270 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -683,6 +683,7 @@ $HOME/ece-install.conf file of the root user:
 | fai_analysis_db_port                | 3306                                              | For the EAE DB (different from ECE's)                                                                                                 |
 | fai_analysis_db_schema              | ece5db                                            | For the EAE DB (different from ECE's)                                                                                                 |
 | fai_analysis_db_user                | ece5user                                          | For the EAE DB (different from ECE's)                                                                                                 |
+| fai_analysis_install                | 0                                                 | Will install the Escenic Analysis Engine, aka Stats, EAE.                                                                             |
 | fai_analysis_name                   | analysis1                                         | EAE instance name                                                                                                                     |
 | fai_analysis_port                   | 8080                                              | Port of the EAE                                                                                                                       |
 | fai_analysis_shutdown               | 8005                                              | Shutdown port for the EAE app server                                                                                                  |

From c4808c9576c2bd2a207a3b81d68dbb02f66c89f7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 26 Jul 2012 09:45:53 +0200
Subject: [PATCH 1008/2585] - the download tomcat message is now the same in
 standard out and log

---
 usr/share/escenic/ece-scripts/common-os.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index 79242d8f..fd3b91e5 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -135,8 +135,7 @@ function get_tomcat_download_url() {
 function download_tomcat() {
   local url=$(get_tomcat_download_url)
   
-  print "Downloading Tomcat ..."
-  log "Downloading Tomcat from $url ..."
+  print_and_log "Downloading Tomcat from $url ..."
   run cd $1
   run wget $wget_opts $url
 }

From d9a4dc8b58d0e99da4bfbe31d92c600cf92c15ea Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 26 Jul 2012 10:12:45 +0200
Subject: [PATCH 1009/2585] - added support for non engine types in
 system-info. Previously, the   ece commands would all be called without the
 type parameter, meaning   that some of the commands would fail (such as
 status), since the ece   script defaults to type=engine.

  Now, the system-info overview for EAE instances displays correctly.

- added common-bashing::ltrim
---
 usr/bin/system-info                           |  3 +-
 .../escenic/ece-scripts/common-bashing.sh     |  5 +++
 .../ece-install.d/analysis-engine.sh          |  6 ++--
 .../system-info.d/11-list-ece-overview.sh     | 32 ++++++++++++++++---
 4 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/usr/bin/system-info b/usr/bin/system-info
index a4c59a08..cefc4c2c 100755
--- a/usr/bin/system-info
+++ b/usr/bin/system-info
@@ -32,6 +32,7 @@ function init() {
   fi
 
   source $ece_scripts_dir/common-ece.sh
+  source $ece_scripts_dir/common-bashing.sh
 }
 
 ## Runs extra system-info modules
@@ -283,7 +284,7 @@ function print_section_end {
   fi
 }
 
-function print_h1_header() {
+ function print_h1_header() {
   if [ $format == "org" ]; then
     echo "* $@"
   elif [ $format == "html" ]; then
diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index 4501fe77..f6a30e5b 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -277,3 +277,8 @@ function is_unauthorized_to_access_url() {
     grep "401 Unauthorized" | \
     wc -l
 }
+
+## $1 the string to which you want to remove any leading white spaces.
+function ltrim() {
+  echo $1 | sed 's/^[ ]*//g'
+}
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh
index 29987dd2..1a8f61cc 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh
@@ -29,11 +29,11 @@ function install_analysis_server()
   su - $ece_user -c "$ece_command" 1>>$log 2>>$log
   exit_on_error "su - $ece_user -c \"$ece_command\""
 
-  local seconds=5
+  local seconds=15
   print_and_log "Waiting ${seconds} seconds for EAE to come up ..."
-  sleep 10
+  sleep $seconds
   
-    # EAE cannot handle .cfg files with quotes values (!)
+  # EAE cannot handle .cfg files with quotes values (!)
   dont_quote_conf_values=1
   
   print_and_log "Configuring EAE Reports ..."
diff --git a/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh b/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
index 629ba660..6f79f403 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
@@ -2,25 +2,47 @@
 
 # by tkj@vizrt.com
 
-## $1 is instance
+
+
+function get_instance_type() {
+  local type="engine"
+
+  if [ -e /etc/default/ece ]; then
+    source /etc/default/ece
+
+    for el in "$analysis_instance_list"; do
+      echo "[$el] == [$1] ?" >> /tmp/t
+      
+      if [[ "$(ltrim $el)" == "$1" ]]; then
+        echo yes >> /tmp/t
+        type=analysis
+      fi
+    done
+  fi
+  
+  echo $type
+}
+
+## $1 is the instance name
 function create_ece_overview() {
+  local type=$(get_instance_type $1)
   
   if [ $(whoami) == "root" ]; then
     if [ -n "$ece_user" ]; then
-      local command="ece -q -i $1 info"
+      local command="ece -q -i $1 info -t $type"
       local data="$(su - $ece_user -c " $command ")"$'\n'
       
       command="ece -q -i $1 status"
       if [ "UP" == "$(su - $ece_user -c "$command" | cut -d' ' -f1)" ]; then
-        command="ece -q -i $1 versions"
+        command="ece -q -i $1 -t $type versions"
         data="$data $(su - $ece_user -c" $command " | cut -d'*' -f2-)"
       fi
     fi
   else
     local data="$(ece -q -i $1 info)"$'\n'
     
-    if [ "UP" == "$(ece -q -i $1 status | cut -d' ' -f1)" ]; then
-      data="$data $(ece -q -i $1 versions | cut -d'*' -f2-)"
+    if [ "UP" == "$(ece -q -i $1 status -t $type | cut -d' ' -f1)" ]; then
+      data="$data $(ece -q -i $1 versions -t $type | cut -d'*' -f2-)"
     fi
   fi
   

From 1cbdc2c92555b6237b27e84c1729e6e668bf4d68 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 26 Jul 2012 10:40:51 +0200
Subject: [PATCH 1010/2585] - remove the old /usr/sbin/drop-and-create-ecedb,
 very handy, very   dangerous script.

  Users of this command can still source the database.sh and call its
  functions as before.

- Moved the script contents into ece-install.d/database.sh, so now all
  DB handling is done in one place. This should simplify debugging and
  maintenance of this module.
---
 usr/sbin/drop-and-create-ecedb                | 178 ------------------
 .../ece-scripts/ece-install.d/database.sh     | 139 +++++++++++++-
 2 files changed, 137 insertions(+), 180 deletions(-)
 delete mode 100644 usr/sbin/drop-and-create-ecedb

diff --git a/usr/sbin/drop-and-create-ecedb b/usr/sbin/drop-and-create-ecedb
deleted file mode 100644
index 923973d9..00000000
--- a/usr/sbin/drop-and-create-ecedb
+++ /dev/null
@@ -1,178 +0,0 @@
-#! /usr/bin/env bash
-
-# Script that will drop and re-create an ECE database, running
-# all ECE and ECE plugins SQL scripts in the correct order.
-#
-# Currently, the script supports the following DBs:
-#   * Oracle (when prompted by SQLPlus for io_owner, enter your $user,
-#     for io_tablespace enter your $tablespace_data and for index
-#     table space your $tablespace_index).
-#   * MySQL
-#
-# Enjoy!
-#
-# -torstein@escenic.com
-
-drop_db_first=0
-db_user=ece5user
-db_password=ece5password
-db_schema=ece5db
-db_host=localhost
-ece_home=/opt/escenic/engine
-db_product=mysql
-my_id="[`basename $0`]"
-
-# oracle specific settings
-create_oracle_user=0
-tablespace_data=ece5_data
-tablespace_index=ece5_index
-oracle_data_dir=/home/oracle/app/oracle/oradata/orcl
-
-debug=0
-
-function debug()
-{
-  if [ $debug -eq 1 ]; then
-    echo $my_id $1
-  fi
-  
-}
-
-function exit_on_the_first_error()
-{
-  if [ $? -eq 1 ]; then
-    echo $my_id $@ "FAILED, exiting :-("
-    exit 1
-  fi
-}
-
-function create_oracle_ece_user() {
-  sqlplus /nolog << EOF
-      connect /as sysdba;
-      create user $db_user
-        identified by $db_password
-        default tablespace $tablespace_data
-        quota unlimited on $tablespace_data;
-      grant connect to $db_user;
-      grant resource to $db_user;
-      grant create any view to $db_user;
-      grant execute on ctx_ddl to $db_user;
-EOF
-}
-
-function run_db_script_file() {
-  if [ $db_product = "oracle" ]; then
-    sqlplus $db_user/$db_password @$file
-  else
-    mysql -u $db_user -p$db_password -h $db_host $db_schema < $file
-  fi
-}
-
-function run_db_scripts() {
-  for el in $db_fn_list; do
-    file=$1/$el.sql
-    if [ -e $1/$el.sql ]; then
-      debug "running $file ..."
-      run_db_script_file $file
-    fi
-    exit_on_the_first_error "running $el"
-  done
-}
-
-function pre_install_new_ecedb()
-{
-  set_ecedb_conf
-  
-  if [ $create_oracle_user -eq 1 ]; then
-    create_oracle_ece_user
-  fi
-
-  if [ $drop_db_first -eq 1 ]; then
-    debug "dropping and re-creating $db_schema on $db_host ..."
-    if [ $db_product = "mysql" ]; then
-      mysql -h $db_host << EOF
-drop database $db_schema;
-EOF
-    else
-      sqlplus /nolog << EOF
-connect /as sysdba;
-drop tablespace $tablespace_data including contents;
-drop tablespace $tablespace_index including contents;
-EOF
-    fi
-  fi
-}
-
-function create_schema()
-{
-    # we first create the DB (or, if drop_db_first is 1, we've just
-    # dropped it above) before running the SQL scripts.
-  if [ $db_product = "mysql" ]; then
-    mysql -h $db_host << EOF
-create database $db_schema character set utf8 collate utf8_general_ci;
-grant all on $db_schema.* to $db_user@'%' identified by '$db_password';
-grant all on $db_schema.* to $db_user@'localhost' identified by '$db_password';
-EOF
-    exit_on_the_first_error "create db"
-  else
-    sqlplus /nolog << EOF
-connect /as sysdba;
-  
-create tablespace $tablespace_data 
-datafile '$oracle_data_dir/${tablespace_data}01.dbf'
-size 200M reuse
-autoextend on next 50M maxsize 2047M
-extent management local autoallocate;
-
-create tablespace $tablespace_index
-datafile '$oracle_data_dir/${tablespace_index}01.dbf'
-size 100M reuse
-autoextend on next 50M maxsize 2047M
-extent management local autoallocate;          
-EOF
-  fi
-}
-
-db_fn_list="
-tables
-tables-stats
-views
-constants
-constants-stats
-constraints
-indexes
-history
-"
-
-function create_ecedb()
-{
-  if [ ${fai_db_sql_only-0} -eq 0 ]; then
-    create_schema
-  fi
-
-  if [ ${fai_db_schema_only-0} -eq 1 ]; then
-    print_and_log "Not running the ECE & plugin SQL files as you requested."
-    return
-  fi
-  
-  run_db_scripts $ece_home/database/$db_product
-
-  if [ -e $ece_home/plugins ]; then
-    for el in `find -L $ece_home/plugins -name $db_product`; do
-      run_db_scripts $el
-    done
-    # EAE, if there's more than one version of EAE plugin, the latest
-    # one will be used.
-    for el in $(find $escenic_root_dir -name eae-${db_product}.sql | \
-      grep -v upgrade | \
-      sort -r | \
-      head -1); do
-      run_db_script_file $el
-    done
-  fi
-
-  debug "${id} ${db_product}://${db_host}/${db_schema} is now ready for ${db_user}/${db_password}"
-}
-
-# pre_install_new_ecedb
-# create_ecedb
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 6cc310e4..075f0f0f 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -340,8 +340,6 @@ EOF
   fi
 }
 
-
-
 function set_slave_to_replicate_master() {
   print_and_log "Setting slave to replicate master DB @ $db_master_host ..."
   mysql ${db_schema} <<EOF
@@ -361,4 +359,141 @@ EOF
   add_next_step "DB on $HOSTNAME replicates master DB @ ${db_master_host}"
 }
 
+drop_db_first=0
+db_user=ece5user
+db_password=ece5password
+db_schema=ece5db
+db_host=localhost
+ece_home=/opt/escenic/engine
+db_product=mysql
+
+# oracle specific settings
+create_oracle_user=0
+tablespace_data=ece5_data
+tablespace_index=ece5_index
+oracle_data_dir=/home/oracle/app/oracle/oradata/orcl
+
+function create_oracle_ece_user() {
+  sqlplus /nolog << EOF
+      connect /as sysdba;
+      create user $db_user
+        identified by $db_password
+        default tablespace $tablespace_data
+        quota unlimited on $tablespace_data;
+      grant connect to $db_user;
+      grant resource to $db_user;
+      grant create any view to $db_user;
+      grant execute on ctx_ddl to $db_user;
+EOF
+}
+
+function run_db_script_file() {
+  if [ $db_product = "oracle" ]; then
+    sqlplus $db_user/$db_password @$file
+  else
+    mysql -u $db_user -p$db_password -h $db_host $db_schema < $file
+  fi
+}
+
+function run_db_scripts() {
+  for el in $db_fn_list; do
+    file=$1/$el.sql
+    if [ -e $1/$el.sql ]; then
+      log "running $file ..."
+      run_db_script_file $file
+    fi
+    exit_on_error "running $el"
+  done
+}
+
+function pre_install_new_ecedb() {
+  set_ecedb_conf
   
+  if [ $create_oracle_user -eq 1 ]; then
+    create_oracle_ece_user
+  fi
+
+  if [ $drop_db_first -eq 1 ]; then
+    log "dropping and re-creating $db_schema on $db_host ..."
+    if [ $db_product = "mysql" ]; then
+      mysql -h $db_host << EOF
+drop database $db_schema;
+EOF
+    else
+      sqlplus /nolog << EOF
+connect /as sysdba;
+drop tablespace $tablespace_data including contents;
+drop tablespace $tablespace_index including contents;
+EOF
+    fi
+  fi
+}
+
+function create_schema() {
+    # we first create the DB (or, if drop_db_first is 1, we've just
+    # dropped it above) before running the SQL scripts.
+  if [ $db_product = "mysql" ]; then
+    mysql -h $db_host << EOF
+create database $db_schema character set utf8 collate utf8_general_ci;
+grant all on $db_schema.* to $db_user@'%' identified by '$db_password';
+grant all on $db_schema.* to $db_user@'localhost' identified by '$db_password';
+EOF
+    exit_on_error "create db"
+  else
+    sqlplus /nolog << EOF
+connect /as sysdba;
+  
+create tablespace $tablespace_data 
+datafile '$oracle_data_dir/${tablespace_data}01.dbf'
+size 200M reuse
+autoextend on next 50M maxsize 2047M
+extent management local autoallocate;
+
+create tablespace $tablespace_index
+datafile '$oracle_data_dir/${tablespace_index}01.dbf'
+size 100M reuse
+autoextend on next 50M maxsize 2047M
+extent management local autoallocate;          
+EOF
+  fi
+}
+
+db_fn_list="
+tables
+tables-stats
+views
+constants
+constants-stats
+constraints
+indexes
+history
+"
+
+function create_ecedb() {
+  if [ ${fai_db_sql_only-0} -eq 0 ]; then
+    create_schema
+  fi
+
+  if [ ${fai_db_schema_only-0} -eq 1 ]; then
+    print_and_log "Not running the ECE & plugin SQL files as you requested."
+    return
+  fi
+  
+  run_db_scripts $ece_home/database/$db_product
+
+  if [ -e $ece_home/plugins ]; then
+    for el in `find -L $ece_home/plugins -name $db_product`; do
+      run_db_scripts $el
+    done
+    # EAE, if there's more than one version of EAE plugin, the latest
+    # one will be used.
+    for el in $(find $escenic_root_dir -name eae-${db_product}.sql | \
+      grep -v upgrade | \
+      sort -r | \
+      head -1); do
+      run_db_script_file $el
+    done
+  fi
+
+  log "${id} ${db_product}://${db_host}/${db_schema} is now ready for ${db_user}/${db_password}"
+}

From 6ca183dcbe707115dd92f099da907e81daa8ffdc Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 26 Jul 2012 10:47:12 +0200
Subject: [PATCH 1011/2585] - removed traces of drop-and-create-ecedb - changed
 documentation/comments wherever approperiate

---
 usr/share/doc/escenic/ece-install-guide.org                  | 5 +----
 usr/share/escenic/ece-scripts/ece-install.d/database.sh      | 4 ----
 .../escenic/ece-scripts/ece-install.d/restore-from-backup.sh | 5 ++---
 usr/share/escenic/package-scripts/create-packages            | 2 +-
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index c3c55270..fea587ae 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -240,9 +240,7 @@ If not, MySQL or Percona must be installed in advance.
 
 Given that the mysqld is install, this profile will download all the
 Escenic components and install the ECE database schema based from the
-SQL files contained inside the distribution bundles. To accomplish
-this, the script will make a call to drop-and-create-ecedb in the same
-directory as the ece-intall script itself.
+SQL files contained inside the distribution bundles. 
 
 The script will fail by itself if the DB already exists:
 #+BEGIN_SRC conf
@@ -868,7 +866,6 @@ but these should be the most interesting ones.
 | /opt/tomcat                                 | Symlink pointing to the install Apache Tomcat (catalina_home)   |
 | /opt/tomcat-<instance>                      | Instance specific Tomcat files (catalina_base)                  |
 | /usr/bin/ece                                | Script for operating all ECE instances + RMI hub and EAE         |
-| /usr/sbin/drop-and-create-ecedb             | DB script used by the ece-install script                         |
 | /usr/sbin/ece-install                       | The installation script described in this guide                  |
 | /var/log/escenic/<type>-<instance>.log      | The instance's log4j  log                                        |
 | /var/log/escenic/<type>-<instance>.out      | The instance system out log                                      |
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 075f0f0f..b6c7a214 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -21,8 +21,6 @@ function install_database_server()
 {
   print_and_log "Installing database server on $HOSTNAME ..."
 
-  source $(dirname $0)/drop-and-create-ecedb
-
   if [ $on_debian_or_derivative -eq 1 -a ${fai_db_sql_only-0} -eq 0 ]; then
 
     code_name=$(lsb_release -s -c)
@@ -132,8 +130,6 @@ function set_ecedb_conf() {
   # the user may override standard DB settings in ece-install.conf
   set_db_settings_from_fai_conf
   set_db_defaults_if_not_set
-
-  # the methods in drop-and-create-ecedb needs ece_home to be set
   ece_home=${escenic_root_dir}/engine
 }
 
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/restore-from-backup.sh b/usr/share/escenic/ece-scripts/ece-install.d/restore-from-backup.sh
index 128a071e..5f970eb6 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/restore-from-backup.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/restore-from-backup.sh
@@ -141,12 +141,11 @@ function restore_from_backup()
     sql_file=$(ls -tra var/backups/escenic/*.sql.gz | tail -1)
     print_and_log "Selecting database dump: $(basename $sql_file)"
 
-    # methods in drop-and-create-ecedb to set up the database
-    # schema & user
+    # methods in database.sh to set up the database schema & user
     pre_install_new_ecedb
     create_schema
 
-    # db_schema is defined in drop-and-create-ecedb
+    # db_schema is defined in database.sh
     gunzip < $sql_file | mysql $db_schema
     exit_on_error "restoring from $sql_file"
     
diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 5243fc00..e4d13cd7 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -78,7 +78,7 @@ function set_up_escenic-content-engine-installer() {
   mkdir -p $target_dir/usr/share/doc/escenic
   mkdir -p $target_dir/usr/share/escenic/ece-scripts
   
-  cp -r ../../../sbin/{ece-install,drop-and-create-ecedb} $target_dir/usr/sbin/
+  cp -r ../../../sbin/ece-install $target_dir/usr/sbin/
   cp -r ../../escenic/ece-scripts/ece-install.d/ \
     $target_dir/usr/share/escenic/ece-scripts/
   cp -r ../../doc/escenic/ece-install-guide.{org,html} \

From 4a87e7c2d2b485121faaff9f2afa42c04d910df1 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 26 Jul 2012 10:49:48 +0200
Subject: [PATCH 1012/2585] - some bug fixing in ECE-ism when running the EAE
 scripts, issue #68

---
 usr/share/escenic/ece-scripts/ece-install.d/database.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index b6c7a214..d489b8ae 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -383,7 +383,9 @@ function create_oracle_ece_user() {
 EOF
 }
 
+## $1 is the file
 function run_db_script_file() {
+  local file=$1
   if [ $db_product = "oracle" ]; then
     sqlplus $db_user/$db_password @$file
   else
@@ -393,8 +395,8 @@ function run_db_script_file() {
 
 function run_db_scripts() {
   for el in $db_fn_list; do
-    file=$1/$el.sql
-    if [ -e $1/$el.sql ]; then
+    local file=$1/$el.sql
+    if [ -e $file ]; then
       log "running $file ..."
       run_db_script_file $file
     fi

From 110b3c56035ed822d6a9a7bd9d2d3667ef9753ac Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 26 Jul 2012 10:56:35 +0200
Subject: [PATCH 1013/2585] - fixed regression in the execution of SQL scripts
 inside   database::create_ecedb where EAE scripts would not be run if ECE  
 wasn't installed on the same host.

  Issue #68
---
 .../ece-scripts/ece-install.d/database.sh       | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index d489b8ae..e8ca6a53 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -483,15 +483,16 @@ function create_ecedb() {
     for el in `find -L $ece_home/plugins -name $db_product`; do
       run_db_scripts $el
     done
-    # EAE, if there's more than one version of EAE plugin, the latest
-    # one will be used.
-    for el in $(find $escenic_root_dir -name eae-${db_product}.sql | \
-      grep -v upgrade | \
-      sort -r | \
-      head -1); do
-      run_db_script_file $el
-    done
   fi
 
+  # EAE, if there's more than one version of EAE plugin, the latest
+  # one will be used.
+  for el in $(find $escenic_root_dir -name eae-${db_product}.sql | \
+    grep -v upgrade | \
+    sort -r | \
+    head -1); do
+    run_db_script_file $el
+  done
+    
   log "${id} ${db_product}://${db_host}/${db_schema} is now ready for ${db_user}/${db_password}"
 }

From dd0680dc76573180df4bb61f266da5890ba5a051 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 26 Jul 2012 10:59:40 +0200
Subject: [PATCH 1014/2585] - added more logging to database.sh

---
 usr/share/escenic/ece-scripts/ece-install.d/database.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index e8ca6a53..96316437 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -385,6 +385,7 @@ EOF
 
 ## $1 is the file
 function run_db_script_file() {
+  log "Running $1 ..."
   local file=$1
   if [ $db_product = "oracle" ]; then
     sqlplus $db_user/$db_password @$file

From fbbf99d187e380ed18d9a6d51c9da77226bd6809 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 26 Jul 2012 11:27:32 +0200
Subject: [PATCH 1015/2585] - added workaround for EAE bug:
 https://jira.vizrt.com/browse/STATS-76

---
 .../ece-scripts/ece-install.d/database.sh     | 88 +++++++++++--------
 1 file changed, 51 insertions(+), 37 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 96316437..1b8c7c65 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -16,7 +16,7 @@ function get_percona_supported_list() {
 }
 
 ## $1: optional parameter, binaries_only. If passed, $1=binaries_only,
-##     the ECE DB schema is not set up. 
+##     the ECE DB schema is not set up.
 function install_database_server()
 {
   print_and_log "Installing database server on $HOSTNAME ..."
@@ -24,7 +24,7 @@ function install_database_server()
   if [ $on_debian_or_derivative -eq 1 -a ${fai_db_sql_only-0} -eq 0 ]; then
 
     code_name=$(lsb_release -s -c)
-    
+
     supported_code_name=0
     supported_list=$(get_percona_supported_list)
     for el in $supported_list; do
@@ -32,12 +32,12 @@ function install_database_server()
         supported_code_name=1
       fi
     done
-    
+
     # some how, this is to install Percona 5.5
     if [ -e /var/lib/mysql/debian-*.flag ]; then
       run rm /var/lib/mysql/debian-*.flag
     fi
-    
+
     if [ $supported_code_name -eq 1 ]; then
       print_and_log "Installing the Percona database ..."
 
@@ -45,7 +45,7 @@ function install_database_server()
         gpg --keyserver hkp://keys.gnupg.net:80 \
           --recv-keys 1C4CBDCDCD2EFD2A \
           1>>$log 2>>$log
-        
+
         # There has been three times now, during six months, that the
         # key cannot be retrieved from keys.gnupg.net. Therefore,
         # we're checking if it failed and if yes, force the package
@@ -66,11 +66,11 @@ function install_database_server()
 
         run apt-get update
       fi
-      
+
       add_apt_source "deb http://repo.percona.com/apt ${code_name} main"
       packages="percona-server-server percona-server-client libmysqlclient16"
     else
-      print_and_log "The Percona APT repsository doesn't have packages" 
+      print_and_log "The Percona APT repsository doesn't have packages"
       print_and_log "for your Debian (or derivative) version with code"
       print_and_log "name $code_name. "
       print_and_log "I will use vanilla MySQL instead."
@@ -79,11 +79,11 @@ function install_database_server()
     fi
   elif [ $on_redhat_or_derivative -eq 1 ]; then
     print_and_log "Installing the Percona database ..."
-    
+
     if [ $(rpm -qa | grep $percona_rpm_release_package_name | wc -l) -lt 1 ]; then
       run rpm -Uhv $percona_rpm_release_url
     fi
-    
+
     packages="
       Percona-Server-shared-compat
       Percona-Server-server-55
@@ -105,7 +105,7 @@ function install_database_server()
     # RDS, we need the mysql-client.
     install_packages_if_missing "mysql-client"
   fi
-  
+
   assert_pre_requisite mysql
 
   if [ -z "$1" ]; then
@@ -139,14 +139,14 @@ function set_up_ecedb()
 
   make_dir $escenic_root_dir/engine/plugins
   run cd $escenic_root_dir/engine/plugins
-  
+
   find ../../ -maxdepth 1 -type d | \
     grep -v assemblytool | \
     while read directory; do
     if [ $directory = "../../" ]; then
       continue
     fi
-    
+
           # nuisance to get the community engine, but not the engine
     if [ $(echo $directory | grep engine | wc -l) -gt 0 ]; then
       if [ $(echo $directory | grep community | wc -l) -lt 1 ]; then
@@ -162,7 +162,7 @@ function set_up_ecedb()
   set_ecedb_conf
   pre_install_new_ecedb
   create_ecedb
-  
+
   cd ~/
   run rm -rf $escenic_root_dir/engine/plugins
 
@@ -197,7 +197,7 @@ function set_db_settings_from_fai_conf()
     db_password=${fai_db_password-${default_db_password}}
     db_schema=${fai_db_schema-${default_db_schema}}
   fi
-  
+
   if [ -n "${fai_db_drop_old_db_first}" ]; then
     drop_db_first=${fai_db_drop_old_db_first}
     if [ $fai_db_drop_old_db_first -eq 1 ]; then
@@ -205,12 +205,12 @@ function set_db_settings_from_fai_conf()
       print_and_log "$(yellow WARNING): fai_db_drop_old_db_first is 1 (true)"
     fi
   fi
-  
+
   # replication is only available in FAI mode
   db_replication=${fai_db_replication-0}
   db_replication_user=${fai_db_replication_user-replicationuser}
   db_replication_password=${fai_db_replication_password-replicationpassword}
-  
+
   db_master=${fai_db_master-0}
   db_master_host=${fai_db_master_host}
   db_master_log_file=${fai_db_master_log_file}
@@ -231,19 +231,19 @@ function set_db_defaults_if_not_set()
   if [ -z "$db_host" ]; then
     db_host=${default_db_host}
   fi
-  
+
   if [ -z "$db_port" ]; then
     db_port=${default_db_port}
   fi
-  
+
   if [ -z "$db_user" ]; then
     db_user=${default_db_user}
   fi
-  
+
   if [ -z "$db_password" ]; then
     db_password=${default_db_password}
   fi
-  
+
   if [ -z "$db_schema" ]; then
     db_schema=${default_db_schema}
   fi
@@ -260,7 +260,7 @@ EOF
 
 function configure_mysql_for_replication() {
   print_and_log "Configuring DB for replication ..."
-  
+
   local file=/etc/mysql/my.cnf
   if [ $on_redhat_or_derivative -eq 1 ]; then
     file=/etc/my.cnf
@@ -278,19 +278,19 @@ EOF
   if [ $db_master -eq 1 ]; then
     local old="#server-id.*=.*1"
     local new="server-id=1"
-    
+
     if [ $(grep ^"$old" $file | wc -l) -gt 0 ]; then
       sed -i "s~^$old~$new~g" $file
     elif [ $(grep ^"$new" $file | wc -l) -lt 1 ]; then
       echo "$new" >> $file
     fi
-  
+
     old="bind-address.*= 127.0.0.1"
     new="# bind-address = 127.0.0.1"
     if [ $(grep ^"${old}" $file | wc -l) -gt 0 ]; then
       sed -i "s~^${old}~$new~g" $file
     fi
-    
+
     old="#log_bin.*= /var/log/mysql/mysql-bin.log"
     new="log_bin = /var/log/mysql/mysql-bin.log"
     if [ $(grep ^"$old" $file | wc -l) -gt 0 ]; then
@@ -298,7 +298,7 @@ EOF
     elif [ $(grep ^"$new" $file | wc -l) -lt 1 ]; then
       echo "$new" >> $file
     fi
-      
+
     old="#binlog_do_db.*=.*"
     new="binlog_do_db = ${db_schema}"
 
@@ -307,7 +307,7 @@ EOF
     elif [ $(grep ^"$new" $file | wc -l) -lt 1 ]; then
       echo "$new" >> $file
     fi
-    
+
     run /etc/init.d/mysql restart
 
     # report the needed settings for a slave
@@ -325,13 +325,13 @@ EOF
   else
     local old="#server-id.*= 1"
     local new="server-id=2"
-    
+
     if [ $(grep ^"$old" $file | wc -l) -gt 0 ]; then
       sed -i "s~^$old~$new~g" $file
     elif [ $(grep ^"$new" $file | wc -l) -lt 1 ]; then
       echo "$new" >> $file
     fi
-    
+
     run /etc/init.d/mysql restart
   fi
 }
@@ -407,7 +407,7 @@ function run_db_scripts() {
 
 function pre_install_new_ecedb() {
   set_ecedb_conf
-  
+
   if [ $create_oracle_user -eq 1 ]; then
     create_oracle_ece_user
   fi
@@ -441,8 +441,8 @@ EOF
   else
     sqlplus /nolog << EOF
 connect /as sysdba;
-  
-create tablespace $tablespace_data 
+
+create tablespace $tablespace_data
 datafile '$oracle_data_dir/${tablespace_data}01.dbf'
 size 200M reuse
 autoextend on next 50M maxsize 2047M
@@ -452,7 +452,7 @@ create tablespace $tablespace_index
 datafile '$oracle_data_dir/${tablespace_index}01.dbf'
 size 100M reuse
 autoextend on next 50M maxsize 2047M
-extent management local autoallocate;          
+extent management local autoallocate;
 EOF
   fi
 }
@@ -477,7 +477,7 @@ function create_ecedb() {
     print_and_log "Not running the ECE & plugin SQL files as you requested."
     return
   fi
-  
+
   run_db_scripts $ece_home/database/$db_product
 
   if [ -e $ece_home/plugins ]; then
@@ -486,14 +486,28 @@ function create_ecedb() {
     done
   fi
 
-  # EAE, if there's more than one version of EAE plugin, the latest
-  # one will be used.
+  run_eae_scripts_if_available
+
+  log "${id} ${db_product}://${db_host}/${db_schema} is now ready for ${db_user}/${db_password}"
+}
+
+## will run the EAE scripts if they are availabe.
+function run_eae_scripts_if_available() {
+      
   for el in $(find $escenic_root_dir -name eae-${db_product}.sql | \
     grep -v upgrade | \
     sort -r | \
     head -1); do
+    work_around_eae_bug_stats-76 $el
     run_db_script_file $el
   done
-    
-  log "${id} ${db_product}://${db_host}/${db_schema} is now ready for ${db_user}/${db_password}"
+}
+
+## Workaround for: https://jira.vizrt.com/browse/STATS-76
+## 
+## $1 is the SQL file
+function work_around_eae_bug_stats-76() {
+  print_and_log "Fixing $1 ..."
+  grep -i -v ^'drop index' $1 > $1.tmp
+  mv $1.tmp $1
 }

From 392b53572d6bca7698fcc34aae0406f662866ca0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 26 Jul 2012 11:29:15 +0200
Subject: [PATCH 1016/2585] - added support for re-running ece-install on a
 system that currently   is already running a (previous) version of EAE.

---
 usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh
index 1a8f61cc..f4ab4ba2 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh
@@ -25,7 +25,7 @@ function install_analysis_server()
 
   set_correct_permissions
   
-  local ece_command="ece -i ${instance_name} -t ${type} start"
+  local ece_command="ece -i ${instance_name} -t ${type} restart"
   su - $ece_user -c "$ece_command" 1>>$log 2>>$log
   exit_on_error "su - $ece_user -c \"$ece_command\""
 

From 0c4d52bd496c282caeab238f36ebf5066e809297 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 26 Jul 2012 13:08:58 +0200
Subject: [PATCH 1017/2585] when installing WF, the IndexerPlugin is now
 configured as described in https://github.com/escenic/ece-scripts/issues/1

---
 .../ece-scripts/ece-install.d/widget-framework.sh      | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh b/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
index 7d9bf903..37ebdbc5 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
@@ -73,8 +73,16 @@ EOF
     ln -s $wf_dist_dir
   fi
 
-  cp -r $wf_dist_dir/misc/siteconfig/* $common_nursery_dir/
+  set_up_wf_nursery_config
 
   add_next_step "Widget Framework has been installed into your " \
     " Maven repo"
 }
+
+function set_up_wf_nursery_config() {
+  cp -r $wf_dist_dir/misc/siteconfig/* $common_nursery_dir/
+  local file=$common_nursery_dir/com/escenic/classification/IndexerPlugin.properties
+  run mkdir -p $(dirname $file)
+  echo "enableFacets=true" > $file
+}
+

From 220ba8a1d3e2e9daa5edc1df2e90c91f574685c0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 26 Jul 2012 13:11:20 +0200
Subject: [PATCH 1018/2585] - improved message when setting up Nursery and JAAS
 configuration

---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index dbe83d83..08c0af56 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -341,7 +341,7 @@ function set_up_basic_nursery_configuration() {
     run cp -r engine/siteconfig/config-skeleton/* $common_nursery_dir/
   else
     print_and_log "I'm using Nursery & JAAS configuration (skeleton) " \
-      "from $escenic_root_dir"
+      "from $escenic_root_dir/engine"
     run cp -r $escenic_root_dir/engine/siteconfig/config-skeleton/* \
       $common_nursery_dir/
     run cp -r $escenic_root_dir/engine/security/ $common_nursery_dir/

From 8543ca06702dbe7fdabb0af913b7b5df3590c0e4 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 26 Jul 2012 08:11:46 -0400
Subject: [PATCH 1019/2585] - ece-install will now only extract the plugins
 defined in the   technet_download_list, as well as the archives defined in  
 wf_download_list.

  This means it now should be possible to have several versions of the
  plugins in the dowlnoad directory without these all being extracted
  and assemble with ece-assemble/assembly-tool.

- ece-install will now download both the regular ECE archives and the
  WF archives in the same go (when the user has wf_download_list
  defined).

- improved logging
---
 usr/sbin/ece-install                            |  6 +++---
 .../ece-scripts/ece-install.d/content-engine.sh | 17 ++++++-----------
 .../ece-install.d/widget-framework.sh           | 11 -----------
 3 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index ae8fd783..37cfc7a3 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -133,10 +133,10 @@ function download_escenic_components()
         return
     fi
 
-    print "Downloading software from technet.escenic.com ..."
-    
+    print_and_log "Downloading software from technet.escenic.com ..."
     run cd $download_dir
-    for el in $technet_download_list; do
+    
+    for el in $technet_download_list $wf_download_list; do
       if [ -e $(basename $el) ]; then
         continue
       fi
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 08c0af56..6128551c 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -119,9 +119,8 @@ function set_up_engine_and_plugins() {
   fi
   
   print_and_log "Setting up the Escenic Content Engine & its plugins ..."
-
   make_dir $escenic_root_dir
-  cd $escenic_root_dir/
+  run cd $escenic_root_dir/
 
   for el in $technet_download_list; do
     if [ $(basename $el | \
@@ -145,17 +144,13 @@ function set_up_engine_and_plugins() {
 
   # we now extract all the plugins. We extract them in $escenic_root_dir
   # as we want to re-use them between minor updates of ECE.
-  cd $escenic_root_dir/
-  for el in $download_dir/*.zip; do
-    if [ $(basename $el | grep ^engine-.*.zip | wc -l) -gt 0 ]; then
-      continue
-    elif [ $(basename $el | grep ^assemblytool-.*.zip | wc -l) -gt 0 ]; then
-      continue
-    elif [ $(basename $el | grep ^jdk-.*.zip | wc -l) -gt 0 ]; then
+  run cd $escenic_root_dir/
+  for el in $technet_download_list $wf_download_list; do
+    local file=$(basename $el)
+    if [ $el == engine-* ]; then
       continue
     fi
-    
-    run unzip -q -u $el
+    run unzip -q -u -o $download_dir/$file
   done
 
   ece_software_setup_completed=1
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh b/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
index 37ebdbc5..4d31ec5f 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
@@ -43,17 +43,6 @@ function install_widget_framework()
 </settings>
 EOF
 
-  print_and_log "Downloading Widget Framework from technet.escenic.com ..."
-  for el in $wf_download_list; do
-    cd $download_dir
-    run wget $wget_opts \
-      --http-user $technet_user \
-      --http-password $technet_password \
-      $el
-    run cd $escenic_root_dir/
-    run unzip -q -u $download_dir/$(basename $el)
-  done
-
   install_packages_if_missing "maven2"
   assert_pre_requisite mvn
 

From 07efa596314de9bfdf0ab4ec893d37f3dba9a43b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 26 Jul 2012 08:13:30 -0400
Subject: [PATCH 1020/2585] - added more overwrite options to unzip

---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 6128551c..0aeef7a9 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -132,7 +132,7 @@ function set_up_engine_and_plugins() {
   done
   
   if [ -n "$engine_dir" -a ! -d "${engine_dir}" ]; then
-    run unzip -q -u $download_dir/${engine_file}
+    run unzip -q -u -o $download_dir/${engine_file}
     if [ -h engine ]; then
       run rm engine
     fi
@@ -163,7 +163,7 @@ function set_up_assembly_tool() {
   cd $escenic_root_dir/assemblytool/
   
   if [ -e $download_dir/assemblytool*zip ]; then
-    run unzip -q -u $download_dir/assemblytool*zip
+    run unzip -q -u -o $download_dir/assemblytool*zip
   fi
 
   # adding an instance layer to the Nursery configuration

From 89faf8391e37c579dc6acb17f6f1fb3c0060a148 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 26 Jul 2012 08:50:57 -0400
Subject: [PATCH 1021/2585] - removed duplicate log message

---
 usr/share/escenic/ece-scripts/ece-install.d/database.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 1b8c7c65..8723a902 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -398,7 +398,6 @@ function run_db_scripts() {
   for el in $db_fn_list; do
     local file=$1/$el.sql
     if [ -e $file ]; then
-      log "running $file ..."
       run_db_script_file $file
     fi
     exit_on_error "running $el"

From 5c06bc62cf7e7694b3617bf18698161247150fc6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 26 Jul 2012 09:06:01 -0400
Subject: [PATCH 1022/2585] - IMPORTANT change for Munin plugin authors (and
 others peeking at the   PID files):

  Before, ece would write a PID file $type-$instance.pid for normal
  cases and in case of the instance was "default", it would write
  $type.pid.

  Now, ece will write $instance.pid in both cases. This should make it
  a lot easier writing Munin plugins, where the instance is the only
  that's needed to find the correct PID file, not having to figure out
  the other, non-engine types, such as analysis and search.
---
 usr/bin/ece | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 4548c9ce..c6094564 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -190,13 +190,8 @@ function set_common_settings() {
     # instance specific ones.
     read_conf_file `basename $0`.conf
 
-    if [ "$instance" == "default" ]; then
-        log=$log_dir/$type.out
-        pid_file=$pid_dir/$type.pid
-    else
-        log=$log_dir/$type-$instance.out
-        pid_file=$pid_dir/$type-$instance.pid
-    fi
+    log=$log_dir/$instance.out
+    pid_file=$pid_dir/$instance.pid
     
     gc_log=${log_dir}/${type}-${instance}-gc.log
 

From cde6047cca0960724c30658a33da10d0a76d7d7a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 26 Jul 2012 10:23:12 -0400
Subject: [PATCH 1023/2585] - ece-info will give so much more information from
 its app server   configuration xml-twig-tools. Hence, if we're installing ECE
 on a   Debian based system, we install this package.

---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 0aeef7a9..a93baa81 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -533,6 +533,7 @@ function install_ece_third_party_packages
       libtcnative-1
       libmysql-java
       memcached
+      xml-twig-tools
       wget
     "
   elif [ $on_redhat_or_derivative -eq 1 ]; then

From c7a411b47788fc864a1704907b8082a09b4bb3b7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 26 Jul 2012 10:27:59 -0400
Subject: [PATCH 1024/2585] - minor layout issue

---
 usr/share/doc/escenic/ece-install-guide.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index fea587ae..8f9ff424 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -252,7 +252,7 @@ ERROR 1050 (42S01) at line 2: Table 'DBChangeLog' already exists
 If you for some reason wish to make ece-install drop the DB fro you
 before creating a new one, you can set
 #+BEGIN_SRC sh
-  fai_db_drop_old_db_first=1
+fai_db_drop_old_db_first=1
 #+END_SRC
 
 *** Master & slave setup

From f793bded75d11a1ff5970b6a59a1a22034118995 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 26 Jul 2012 10:28:56 -0400
Subject: [PATCH 1025/2585] - added basic support for WF 2.0! #88

---
 .../ece-install.d/create-publication.sh       | 15 +++--
 .../ece-install.d/widget-framework.sh         | 57 ++++++++++++-------
 2 files changed, 49 insertions(+), 23 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
index 368e1799..39af8bc0 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
@@ -144,10 +144,17 @@ EOF
     run cp ${fai_publication_war} ${publication_war}
   elif [ -d $escenic_root_dir/widget-framework-core-* ]; then
     print_and_log "Basing ${publication_name}.war on Widget Framework Demo ..."
-    run cd $escenic_root_dir/widget-framework-core-*/publications/demo-core
-    assert_pre_requisite mvn
-    run mvn $maven_opts package
-    run cp target/demo-core-*.war ${publication_war}
+    # WF 1.x
+    if [ -d $escenic_root_dir/widget-framework-core-*/publications/demo-core ]; then
+      run cd $escenic_root_dir/widget-framework-core-*/publications/demo-core
+      assert_pre_requisite mvn
+      run mvn $maven_opts package
+      run cp target/demo-core-*.war ${publication_war}
+    # WF 2.x
+    elif [ -e $escenic_root_dir/widget-framework-core-*/wars/wf-core-war-2*.war ]; then
+      run cp $escenic_root_dir/widget-framework-core-*/wars/wf-core-war-2*.war \
+        ${publication_war}
+    fi
   else
     print_and_log "Basing your ${publication_name}.war on ECE/demo-clean ..."
     run cp $escenic_root_dir/engine/contrib/wars/demo-clean.war ${publication_war}
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh b/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
index 4d31ec5f..851f8738 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
@@ -43,25 +43,9 @@ function install_widget_framework()
 </settings>
 EOF
 
-  install_packages_if_missing "maven2"
-  assert_pre_requisite mvn
-
-  export JAVA_HOME=$java_home
-  wf_maven_dir=$(echo $escenic_root_dir/widget-framework-core-*/maven)
-  run cd $wf_maven_dir
-
-  print_and_log "Installing Widget Framework into your Maven repository ..."
-  log "JAVA_HOME=$JAVA_HOME"
-
-  run mvn $maven_opts install
-
-    # installing the widget-framework-common as a ECE plugin
-  wf_dist_dir=$(echo $wf_maven_dir/widget-framework-common/target/widget-framework-common-*-dist/widget-framework-common-*)
-  cd $escenic_root_dir/assemblytool/plugins
-  if [ ! -h $(basename $wf_dist_dir) ]; then
-    ln -s $wf_dist_dir
-  fi
-
+  install_wf_1_if_present
+  install_wf_2_if_present
+  
   set_up_wf_nursery_config
 
   add_next_step "Widget Framework has been installed into your " \
@@ -75,3 +59,38 @@ function set_up_wf_nursery_config() {
   echo "enableFacets=true" > $file
 }
 
+function install_wf_1_if_present() {
+  for el in $wf_download_list; do
+    local wf_dist_dir=$(basename $el .zip)
+    
+    if [[ $wf_dist_dir != "widget-framework-[a-z]*-1.1*" ]]; then
+      return
+    fi
+    
+    install_packages_if_missing "maven2"
+    assert_pre_requisite mvn
+    export JAVA_HOME=$java_home
+    
+    print_and_log "Installing Widget Framework into your Maven repository ..."
+    local wf_maven_dir=$escenic_root_dir/$wf_dist_dir/maven
+    run cd $wf_maven_dir
+    run mvn $maven_opts install
+  done
+}
+
+function install_wf_2_if_present() {
+  for el in $wf_download_list; do
+    local wf_dist_dir=$(basename $el .zip)
+    
+    if [[ $wf_dist_dir == "widget-framework-[a-z]*-1.1*" ]]; then
+      return
+    fi
+    
+    run cd $escenic_root_dir/assemblytool/plugins
+    
+    if [ ! -h $wf_dist_dir ]; then
+      ln -s $escenic_root_dir/$wf_dist_dir
+    fi
+  done
+}
+

From eb1630d08c5b85ff5d73adbd0710988ce3840680 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 26 Jul 2012 10:29:45 -0400
Subject: [PATCH 1026/2585] - ece-assemble now tries to list the JARs which are
 duplicates.

---
 .../escenic/ece-scripts/ece.d/assemble.sh     | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/assemble.sh b/usr/share/escenic/ece-scripts/ece.d/assemble.sh
index ce3eb4eb..fb0e7836 100644
--- a/usr/share/escenic/ece-scripts/ece.d/assemble.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/assemble.sh
@@ -14,24 +14,18 @@ function assemble() {
     exit 1
   fi
 
-  message="Assembling your EAR file"
-  print $message "..."
-  log $message "..." >> $log
-
-  cd $assemblytool_home && \
-    ant -q ear -DskipRedundancyCheck=true \
-    1>>$log \
-    2>>$log
-  exit_on_error "$message"
+  print_and_log "Assembling your EAR file..."
+  run cd $assemblytool_home 
+  run ant -q ear -DskipRedundancyCheck=true
 
   # test to see if the new versions of ECE & plugins are upgrades of
   # the previous ones
   duplicates_found=0
   known_unharmful_duplicates="activation- $'\n' ehcache-$'\n' stax-api-$'\n'"
   
-  cd $assemblytool_home/dist/.work/ear/lib
+  run cd $assemblytool_home/dist/.work/ear/lib
   for el in *.jar; do
-    jar=$(basename $(echo $el | sed  -e  's/[0-9]//g') .jar | sed 's/\.//g')
+    jar=$(basename $(echo $el | sed -e 's/[0-9]//g') .jar | sed 's/\.//g')
     if [ $(echo $known_unharmful_duplicates | grep $jar | wc -l) -gt 0 ]; then
       continue
     fi
@@ -46,7 +40,11 @@ function assemble() {
       uniq | \
       wc -l) -gt 1 ]; then
       duplicates_found=1
-      print_and_log "More than one version of $(echo $jar | sed 's/-$//g')"
+      print_and_log "More than one version of $(echo $jar | sed 's/-$//g'):"
+      find -L $assemblytool_home/plugins -name "${jar}" | \
+        grep -v "-tests"
+      find -L $ece_home/plugins -name "${jar}" | \
+        grep -v "-tests"
     fi
   done
 

From e4cab527d8c9a55e3a3331827d0b5248e1386c91 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 26 Jul 2012 10:46:28 -0400
Subject: [PATCH 1027/2585] - updated technet_download_list and
 wf_download_list for 5.3 - added technet_download_list and wf_download_list
 for 5.4 (commented out)

---
 usr/sbin/ece-install | 39 +++++++++++++++++++++++++++++++++------
 1 file changed, 33 insertions(+), 6 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 37cfc7a3..c1bc72ce 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -75,26 +75,53 @@ force_packages=0
 # ECE software components.
 ece_software_setup_completed=0
 
+############################################################################
+# For ECE 5.3
+############################################################################
 technet_download_list="
 http://technet.escenic.com/downloads/assemblytool-2.0.2.zip
 http://technet.escenic.com/downloads/release/53/analysis-engine-2.3.7.0.zip
-http://technet.escenic.com/downloads/release/53/community-engine-3.6.1.0.zip
-http://technet.escenic.com/downloads/release/53/dashboard-1.1.0.2.zip
-http://technet.escenic.com/downloads/release/53/engine-5.3.5.121857.zip
-http://technet.escenic.com/downloads/release/53/forum-3.0.0.0.zip
+http://technet.escenic.com/downloads/release/53/community-engine-3.6.2.124119.zip
+http://technet.escenic.com/downloads/release/53/dashboard-1.1.1.124124.zip
+http://technet.escenic.com/downloads/release/53/engine-5.3.7.126916.zip
+http://technet.escenic.com/downloads/release/53/forum-3.0.1.124096.zip
 http://technet.escenic.com/downloads/release/53/geocode-dist-2.3.1.0.zip
 http://technet.escenic.com/downloads/release/53/inpage-2.0.0.0.zip
 http://technet.escenic.com/downloads/release/53/lucy-dist-4.1.6.0.zip
 http://technet.escenic.com/downloads/release/53/menu-editor-dist-2.0.6.0.zip
-http://technet.escenic.com/downloads/release/53/mobile-expansion-3.0.0.0.zip
 http://technet.escenic.com/downloads/release/53/poll-2.1.3.0.zip
-http://technet.escenic.com/downloads/release/53/revision-history-dist-1.0.0.1.zip
 http://technet.escenic.com/downloads/release/53/section-feed-dist-2.0.4.0.zip
 http://technet.escenic.com/downloads/release/53/xml-editor-dist-2.1.0.0.zip
 "
 wf_download_list="
 http://technet.escenic.com/downloads/widget-framework/widget-framework-core-1.10.0.0.zip
+http://technet.escenic.com/downloads/widget-framework/widget-framework-community-1.10.0.0.zip
 "
+############################################################################
+
+############################################################################
+# For ECE 5.4
+############################################################################
+# technet_download_list="
+# http://technet.escenic.com/downloads/community-engine/community-engine-3.7.0.123608.zip
+# http://technet.escenic.com/downloads/release/54/analysis-engine-2.4.0.127591.zip
+# http://technet.escenic.com/downloads/release/54/dashboard-1.3.0.123618.zip
+# http://technet.escenic.com/downloads/release/54/engine-5.4.1.126472.zip
+# http://technet.escenic.com/downloads/release/54/forum-3.1.0.123741.zip
+# http://technet.escenic.com/downloads/release/54/geocode-dist-2.4.0.123726.zip
+# http://technet.escenic.com/downloads/release/54/inpage-2.1.1.126618.zip
+# http://technet.escenic.com/downloads/release/54/lucy-dist-4.2.0.0.zip
+# http://technet.escenic.com/downloads/release/54/menu-editor-dist-2.1.0.123205.zip
+# http://technet.escenic.com/downloads/release/54/poll-2.2.0.123043.zip
+# http://technet.escenic.com/downloads/release/54/section-feed-dist-2.1.0.122795.zip
+# http://technet.escenic.com/downloads/release/54/xml-editor-dist-2.2.0.0.zip
+# "
+
+# wf_download_list="
+# http://download.escenic.com/release/release/54/widget-framework-core-2.0.1.126521.zip
+# http://download.escenic.com/release/release/54/widget-framework-community-2.0.1.126521.zip
+# "
+############################################################################
 
 ## Bootstrapping, load files from /usr/share/escenic/ece-scripts The
 ## method will first try to be smart, in case the user has copied the

From d2fdb87c1aa310d453048f7266f7278d80edc74e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 26 Jul 2012 11:14:32 -0400
Subject: [PATCH 1028/2585] - added fail fast behaviour if jar cannot be found.
 This corner case   can occur if you pre-seed the machine with JRE instead of
 a JDK.

  This closes #85
---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index a93baa81..dba604af 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -553,7 +553,7 @@ function install_ece_third_party_packages
   
   install_packages_if_missing $packages
   
-  for el in ant java; do
+  for el in ant java jar; do
     assert_pre_requisite $el
   done
 }

From f54d1197ee64eeb3989ba721ad11b26ad4214987 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 26 Jul 2012 11:47:01 -0400
Subject: [PATCH 1029/2585] - downgraded the community archive from
 3.6.2.124119 to 3.6.1.0 as the   former has comes with conflicting JARs with
 that of ECE, see   ECOME-1002.

---
 usr/sbin/ece-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index c1bc72ce..e6b49c87 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -81,7 +81,7 @@ ece_software_setup_completed=0
 technet_download_list="
 http://technet.escenic.com/downloads/assemblytool-2.0.2.zip
 http://technet.escenic.com/downloads/release/53/analysis-engine-2.3.7.0.zip
-http://technet.escenic.com/downloads/release/53/community-engine-3.6.2.124119.zip
+http://technet.escenic.com/downloads/release/53/community-engine-3.6.1.0.zip
 http://technet.escenic.com/downloads/release/53/dashboard-1.1.1.124124.zip
 http://technet.escenic.com/downloads/release/53/engine-5.3.7.126916.zip
 http://technet.escenic.com/downloads/release/53/forum-3.0.1.124096.zip

From 1c5210fefc2a372324dd10270bcfdfa2c6042161 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 27 Jul 2012 03:29:42 -0400
Subject: [PATCH 1030/2585] - added section on common requirements for all
 operating systems to   emphasise the need of outgoing connections to :80 and
 :443. See   issue #86

- updated the list of tested OSs
---
 usr/share/doc/escenic/ece-install-guide.org | 25 ++++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 8f9ff424..aa9bcd7a 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -1,4 +1,4 @@
-#+TITLE: Welcome to the /usr/sbin/ece-install Guide
+#+TITLE: Welcome to the ece-install Guide
 #+AUTHOR: Torstein Krause Johansen
 
 * Supported Operating Systems
@@ -7,12 +7,12 @@ the latest Ubuntu LTS or most other Debian based operating systems,
 but it should work without any problems on any Unix like system that
 has BASH version 4.2 or newer.
 
-** Debian based operating systems
+** Debian Based Operating Systems
 If running on a Debian based operating system, ece-install will take
 care of installing all required third party software, such as database
 & caching server.
 
-** RedHat based operating systems
+** RedHat Based Operating Systems
 ece-install constantly gets better support for automatic installation
 on RedHat based operating systems. However, since the public RedHat
 repositories are significantly smaller than the Debian ones, there
@@ -31,13 +31,26 @@ You may also look inside the ece-install script for all calls to the
 'assert_pre_prequesite' method and you'll get a list of the binaries
 ece-install assumes are present.
 
+** Common Requirements for All Operating Systems
+*** Internet Connection
+The installer needs an internet connection, preferably a fast one as
+several hundreds of megabytes are downloaded.
+
+*** Firewall Rules
+ece-install must be able to make outgoing connections from the machine
+on which it is running to the following ports:
+
+- 80 (standard HTTP)
+- 443 (HTTPS)
+
 ** Tested Operating Systems
 | Operating system     | Status                                              | Date updated     |
 |----------------------+-----------------------------------------------------+------------------|
+| CentOS 6.2           | HA, APR & monitoring are not automatic              | 2012-03-07 13:42 |
 | Debian 6.0 (squeeze) | Everything is 100% automatic                        | 2012-02-27 13:18 |
-| Ubuntu LTS 10.04     | Everything except Tomcat/APR wrappers are automatic | 2012-02-27 13:19 |
 | Ubuntu 11.10         | Everything except Tomcat/APR wrappers are automatic | 2012-02-27 13:19 |
-| CentOS 6.2           | HA, APR & monitoring are not automatic              | 2012-03-07 13:42 |
+| Ubuntu LTS 10.04     | Everything except Tomcat/APR wrappers are automatic | 2012-02-27 13:19 |
+| Ubuntu LTS 12.04     | Everything except Tomcat/APR wrappers are automatic | 2012-07-27 03:27 |
 
 * A Note on Running ece-install On Non-GNU/Linux Systems
 Please note, it's assumed that the OS uses GNU's tools, i.e. find, cp
@@ -67,7 +80,7 @@ After getting the latest version of ece-scripts, you run it with:
 # bash ece-scripts/usr/sbin/ece-install  
 #+END_SRC
 
-** Requires super user privileges
+** Requires Super User Privileges
 You must run the script as the root user.  If you start the script as
 a regular user, it will complain:
 #+BEGIN_SRC conf

From 83c94c1ab8c691f05a680970efdcf609249d1734 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 27 Jul 2012 03:32:57 -0400
Subject: [PATCH 1031/2585] - fixed find path in ece-assemble reporting module
 - fixed grep statement in the same module

---
 usr/share/escenic/ece-scripts/ece.d/assemble.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/assemble.sh b/usr/share/escenic/ece-scripts/ece.d/assemble.sh
index fb0e7836..a5a73f68 100644
--- a/usr/share/escenic/ece-scripts/ece.d/assemble.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/assemble.sh
@@ -42,9 +42,9 @@ function assemble() {
       duplicates_found=1
       print_and_log "More than one version of $(echo $jar | sed 's/-$//g'):"
       find -L $assemblytool_home/plugins -name "${jar}" | \
-        grep -v "-tests"
-      find -L $ece_home/plugins -name "${jar}" | \
-        grep -v "-tests"
+        grep -v "tests"
+      find -L $assemblytool_home/plugins -name "${jar}" | \
+        grep -v "tests"
     fi
   done
 

From b59850ba854117a899d2bce9dc74cd2d3508df47 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 27 Jul 2012 13:12:02 +0200
Subject: [PATCH 1032/2585] - ece-assemble now gives a nice list of the JARs
 which are duplicates:

  $ ece assemble
  [..]
  [ece#engine-dev1] Duplicates found of library commons-beanutils:
  [ece#engine-dev1] - /opt/escenic/assemblytool/plugins/community-engine-3.6.2.124119/lib/commons-beanutils-1.8.3.jar
  [ece#engine-dev1] - /opt/escenic/engine/lib/commons-beanutils-1.8.0.jar
  [ece#engine-dev1] Duplicates found of library commons-codec:
  [ece#engine-dev1] - /opt/escenic/assemblytool/plugins/community-engine-3.6.2.124119/lib/commons-codec-1.5.jar
  [ece#engine-dev1] - /opt/escenic/engine/lib/commons-codec-1.4.jar
  [ece#engine-dev1] Duplicates found of library commons-collections:
  [ece#engine-dev1] - /opt/escenic/assemblytool/plugins/community-engine-3.6.2.124119/lib/commons-collections-3.2.1.jar
  [ece#engine-dev1] - /opt/escenic/engine/lib/commons-collections-3.2.jar
  [ece#engine-dev1] Duplicates found of library commons-dbcp:
  [ece#engine-dev1] - /opt/escenic/assemblytool/plugins/community-engine-3.6.2.124119/lib/commons-dbcp-1.4.jar
  [ece#engine-dev1] - /opt/escenic/engine/lib/commons-dbcp-1.2.2.jar
  [ece#engine-dev1] Duplicates found of library commons-digester:
  [ece#engine-dev1] - /opt/escenic/assemblytool/plugins/community-engine-3.6.2.124119/lib/commons-digester-2.1.jar
  [ece#engine-dev1] - /opt/escenic/engine/lib/commons-digester-1.6.jar
  [ece#engine-dev1] Duplicates found of library commons-io:
  [ece#engine-dev1] - /opt/escenic/assemblytool/plugins/community-engine-3.6.2.124119/lib/commons-io-2.1.jar
  [ece#engine-dev1] - /opt/escenic/engine/lib/commons-io-1.4.jar
  [ece#engine-dev1] Duplicates found of library commons-lang:
  [ece#engine-dev1] - /opt/escenic/assemblytool/plugins/section-feed/escenic/webapp/plugin/sectionFeed/lib/commons-lang-2.3.jar
  [ece#engine-dev1] - /opt/escenic/assemblytool/plugins/community-engine-3.6.2.124119/lib/commons-lang-2.6.jar
  [ece#engine-dev1] - /opt/escenic/engine/lib/commons-lang-2.3.jar
---
 .../escenic/ece-scripts/ece.d/assemble.sh     | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/assemble.sh b/usr/share/escenic/ece-scripts/ece.d/assemble.sh
index a5a73f68..34353de6 100644
--- a/usr/share/escenic/ece-scripts/ece.d/assemble.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/assemble.sh
@@ -24,6 +24,8 @@ function assemble() {
   known_unharmful_duplicates="activation- $'\n' ehcache-$'\n' stax-api-$'\n'"
   
   run cd $assemblytool_home/dist/.work/ear/lib
+  local duplicate_jar_list=""
+  
   for el in *.jar; do
     jar=$(basename $(echo $el | sed -e 's/[0-9]//g') .jar | sed 's/\.//g')
     if [ $(echo $known_unharmful_duplicates | grep $jar | wc -l) -gt 0 ]; then
@@ -40,14 +42,22 @@ function assemble() {
       uniq | \
       wc -l) -gt 1 ]; then
       duplicates_found=1
-      print_and_log "More than one version of $(echo $jar | sed 's/-$//g'):"
-      find -L $assemblytool_home/plugins -name "${jar}" | \
-        grep -v "tests"
-      find -L $assemblytool_home/plugins -name "${jar}" | \
-        grep -v "tests"
+      duplicate_jar_list="${jar}\n${duplicate_jar_list}"
     fi
   done
 
+  # now, list the duplicate JARs 
+  for el in $(echo -e "$duplicate_jar_list" | sort | uniq); do
+    print_and_log "Duplicates found of library" $(echo $el | sed 's/-$//g')":"
+    for ele in $(find -L \
+      $assemblytool_home/plugins \
+      $ece_home/lib \
+      -name "${el}*.jar" | \
+      egrep -v "tests|WEB-INF"); do
+      print_and_log "-" $ele
+    done
+  done
+  
   if [ "$duplicates_found" -eq 1 ]; then
     print "Multiple versions of ECE and/or 3rd party libraries found."
     print "Remember, you need to run '$(basename $0) clean assemble' when "
@@ -60,7 +70,7 @@ function assemble() {
   mkdir -p $ear_cache_dir/
   exit_on_error "creating $ear_cache_dir"
 
-  cp $assemblytool_home/dist/engine.ear $cache_dir
+  run cp $assemblytool_home/dist/engine.ear $cache_dir
   exit_on_error "copying ear to $ear_cache_dir"
 
   debug $assemblytool_home/dist/engine.ear "is now ready"

From 24a1295f6f4b49edb6bdfc48cacc24e1c04242e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=F6n?= <oschoen@vizrt.com>
Date: Fri, 27 Jul 2012 14:34:55 +0200
Subject: [PATCH 1033/2585] build.sh - fixed problem when failing on existing
 pid file

---
 usr/share/escenic/build-scripts/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/build.sh b/usr/share/escenic/build-scripts/build.sh
index 8c482ab1..15cfc863 100755
--- a/usr/share/escenic/build-scripts/build.sh
+++ b/usr/share/escenic/build-scripts/build.sh
@@ -47,7 +47,7 @@ wget"
 ##
 function set_pid {
   if [ -e $pid_file ]; then
-    print "Instance of $(basename $0) already running!"
+    echo "Instance of $(basename $0) already running!"
     exit 1
   else
     echo $BASHPID > $pid_file

From cd4a27ba712210ebc2a1159a0ab33367127c72d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=F6n?= <oschoen@vizrt.com>
Date: Fri, 27 Jul 2012 14:36:04 +0200
Subject: [PATCH 1034/2585] builder.sh - script has been refactored for
 stability and simplicity

---
 usr/share/escenic/build-scripts/builder.sh | 413 +++++++++++----------
 1 file changed, 220 insertions(+), 193 deletions(-)

diff --git a/usr/share/escenic/build-scripts/builder.sh b/usr/share/escenic/build-scripts/builder.sh
index 95f9d52c..c774f25c 100755
--- a/usr/share/escenic/build-scripts/builder.sh
+++ b/usr/share/escenic/build-scripts/builder.sh
@@ -7,14 +7,14 @@
 
 # Common variables
 ece_scripts_home=/usr/share/escenic/ece-scripts
-log=/var/log/builder.log
+log=/var/log/ece-builder.log
 pid_file=/var/run/ece-builder.pid
 
-# Commands
+# available commands
+setup_builder=0
 add_user=0
 add_artifact=0
 add_artifact_list=0
-setup_builder=0
 
 # Add artifact variables
 list_path=
@@ -32,6 +32,8 @@ user_maven_password="CHANGE_ME"
 builder_user_name=builder
 root_dir=/home/$builder_user_name
 download_dir=$root_dir/.downloads
+builder_engine_dir=$root_dir/engine
+builder_plugins_dir=$root_dir/plugins
 builder_conf_dir=$root_dir/.builder
 builder_conf_file=$builder_conf_dir/builder.conf
 artifact_conf_dir=.builder
@@ -41,11 +43,30 @@ subversion_dir=$skel_dir/.subversion
 assemblytool_home=$skel_dir/assemblytool
 m2_home=$skel_dir/.m2
 
+##
+function verify_root_privilege
+{
+  if [ "$(id -u)" != "0" ]; then
+    echo "This script must be run as root!"
+    exit 1
+  fi
+}
+
+##
+function set_pid 
+{
+  if [ -e $pid_file ]; then
+    echo "Instance of $(basename $0) already running!"
+    exit 1
+  else
+    echo $BASHPID > $pid_file
+  fi
+}
+
 ##
 function init
 {
   init_failed=0
-  error_message=""
   if [ ! -d $ece_scripts_home ]; then
     init_failed=1
     error_message="The directory for ece-scripts $ece_scripts_home does not exist, exiting!"
@@ -65,26 +86,6 @@ function init
   fi
 }
 
-##
-function set_pid 
-{
-  if [ -e $pid_file ]; then
-    print_and_log "Instance of $(basename $0) already running!"
-    exit 1
-  else
-    echo $BASHPID > $pid_file
-  fi
-}
-
-##
-function verify_root_privilege
-{
-  if [ "$(id -u)" != "0" ]; then
-    print_and_log "This script must be run as root!"
-    remove_pid_and_exit_in_error
-  fi
-}
-
 ##
 function enforce_variable
 {
@@ -94,56 +95,30 @@ function enforce_variable
   fi
 }
 
-function ensure_no_user_conflict
-{
-  if [ ! -z "$(getent passwd $user_name)" ]; then
-    print_and_log "User $user_name already exist!"
-    remove_pid_and_exit_in_error
-  fi
-  if [ -d /home/$user_name ]; then
-    print_and_log "User $user_name does not exist, but has a home folder!"
-    remove_pid_and_exit_in_error
-  fi
-  if [ -d /var/www/$user_name ]; then
-    print_and_log "User $user_name does not exist, but has a web root under /var/www/$user_name"
-    remove_pid_and_exit_in_error
-  fi
-}
-
-##
-function verify_builder_exist 
-{
-  if [ ! -d $root_dir ]; then
-    print_and_log "Builder has not been initialized, please run this script with the -i flag!"
-    remove_pid_and_exit_in_error
-  fi
-}
-
-##
-function common_post_action {
-  run rm $pid_file
-}
-
 ##
 function get_user_options
 {
-  while getopts ":a:l:u:c:s:m:p:i:" opt; do
+  while getopts ":i:u:a:l:c:s:m:p:" opt; do
     case $opt in
+      i)
+        print_and_log "Setting up a new builder under /home/$builder_user_name ..."
+        provided_conf_file=${OPTARG}
+        setup_builder=1
+        ;;
+      u)
+        print_and_log "Adding user ${OPTARG} ..."
+        user_name=${OPTARG}
+        add_user=1
+        ;;
       a)
-        print_and_log "Adding artifact ${OPTARG}..."
-	add_artifact=1
+        print_and_log "Adding artifact ${OPTARG} ..."
         artifact_path=${OPTARG}
+        add_artifact=1
         ;;
       l)
-        print_and_log "Adding list of artifacts ${OPTARG}..."
-        add_artifact_list=1
+        print_and_log "Adding list of artifacts ${OPTARG} ..."
         list_path=${OPTARG}
-        ;;
-      u)
-        print_and_log "Adding user ${OPTARG}..."
-        add_user=1          
-        user_name=${OPTARG}
-	ensure_no_user_conflict
+        add_artifact_list=1
         ;;
       c)
         print_and_log "Using svn path: ${OPTARG}"
@@ -165,11 +140,6 @@ function get_user_options
           remove_pid_and_exit_in_error
         fi
         ;;
-      i)
-        print_and_log "Setting up a new builder under /home/$builder_user_name"
-        setup_builder=1
-        provided_conf_file=${OPTARG}
-        ;;
       \?)
         print_and_log "Invalid option: -$OPTARG" >&2
         remove_pid_and_exit_in_error
@@ -180,49 +150,36 @@ function get_user_options
         ;;
     esac
   done
-
 }
 
 ##
 function execute
 {
   if [ $setup_builder -eq 1 ]; then
+    verify_setup_builder
     setup_builder
-  elif [ $add_user -eq 1 ]; then
-    verify_builder_exist
-    read_builder_configuration
-    verify_add_user
-    add_user
-  elif [ $add_artifact -eq 1 ]; then
-    verify_builder_exist
-    read_builder_configuration
-    verify_add_artifact
-    add_artifact
-  elif [ $add_artifact_list -eq 1 ]; then
-    verify_builder_exist
-    read_builder_configuration
-    verify_add_artifact_list
-    add_artifact_list
   else
     verify_builder_exist
-    print_and_log "No valid action chosen, exiting!" >&2
-    remove_pid_and_exit_in_error
-  fi
-}
-
-##
-function read_builder_configuration
-{
-  if [ -e $builder_conf_file ]; then
-    run source $builder_conf_file
-  else
-    print_and_log "The configuration file $builder_conf_file has been removed, exiting!" >&2
-    remove_pid_and_exit_in_error
+    read_builder_configuration
+    if [ $add_user -eq 1 ]; then
+      ensure_no_user_conflict
+      verify_add_user
+      add_user
+    elif [ $add_artifact -eq 1 ]; then
+      verify_add_artifact
+      add_artifact
+    elif [ $add_artifact_list -eq 1 ]; then
+      verify_add_artifact_list
+      add_artifact_list
+    else
+      print_and_log "No valid action chosen, exiting!" >&2
+      remove_pid_and_exit_in_error
+    fi
   fi
 }
 
 ##
-function setup_builder
+function verify_setup_builder
 {
   if [ ! -z "$(getent passwd $builder_user_name)" ]; then
     print_and_log "The user $builder_user_name already exist!"
@@ -236,15 +193,23 @@ function setup_builder
     print_and_log "The provided configuration file does not exist, exiting!" >&2
     remove_pid_and_exit_in_error
   else
+    provided_conf_file=$(readlink -f $provided_conf_file)
     run source $provided_conf_file
   fi
+}
 
+##
+function setup_builder
+{
+  # create the builder user
   run useradd -m -s /bin/bash $builder_user_name
 
+  # create skel dir for user creation
   if [ ! -d "$skel_dir" ]; then
     mkdir $skel_dir
   fi
 
+  # setup assemblytool skel
   if [ ! -d "$assemblytool_home" ]; then
     mkdir $assemblytool_home
     run wget --http-user=$technet_user --http-password=$technet_password http://technet.escenic.com/downloads/assemblytool-2.0.2.zip -O $assemblytool_home/assemblytool.zip
@@ -256,6 +221,7 @@ function setup_builder
 plugins = ../plugins" >> $assemblytool_home/assemble.properties
   fi
 
+  # setup maven settings.xml skel
   if [ ! -d "$m2_home" ]; then
     mkdir $m2_home
     echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
@@ -292,6 +258,7 @@ plugins = ../plugins" >> $assemblytool_home/assemble.properties
 </settings>" > $m2_home/settings.xml
   fi
 
+  # setup subversion config skel
   if [ ! -d "$subversion_dir" ]; then
     run mkdir $subversion_dir
     echo "[groups]
@@ -302,6 +269,7 @@ store-passwords = yes
 store-plaintext-passwords = yes" > $subversion_dir/servers
   fi
 
+  # setup .vim.rc skel 
   if [ ! -e "$skel_dir/.vimrc" ]; then
     echo "set background=dark
 syntax on
@@ -309,21 +277,57 @@ set nocompatible
 set backspace=2" > $skel_dir/.vimrc
   fi
 
+  # setup .builder conf directory
   if [ ! -d $builder_conf_dir ]; then
     run mkdir $builder_conf_dir
   fi
   cat $provided_conf_file > $builder_conf_file
 
+  # change owner to build user - TODO: root may be ok here
   run chown -R $builder_user_name:$builder_user_name /home/$builder_user_name
+}
+
+##
+function verify_builder_exist 
+{
+  if [ ! -d $root_dir ]; then
+    print_and_log "Builder has not been initialized, please run this script with the -i flag and provide a valid config file!"
+    remove_pid_and_exit_in_error
+  fi
+}
 
+##
+function read_builder_configuration
+{
+  if [ -e $builder_conf_file ]; then
+    run source $builder_conf_file
+  else
+    print_and_log "The configuration file $builder_conf_file is missing, exiting!" >&2
+    remove_pid_and_exit_in_error
+  fi
 }
 
 ##
-function verify_add_user 
+function ensure_no_user_conflict
 {
-  
+  if [ ! -z "$(getent passwd $user_name)" ]; then
+    print_and_log "User $user_name already exist!"
+    remove_pid_and_exit_in_error
+  fi
+  if [ -d /home/$user_name ]; then
+    print_and_log "User $user_name does not exist, but has a home folder!"
+    remove_pid_and_exit_in_error
+  fi
+  if [ -d /var/www/$user_name ]; then
+    print_and_log "User $user_name does not exist, but has a web root under /var/www/$user_name"
+    remove_pid_and_exit_in_error
+  fi
+}
+
+##
+function verify_add_user 
+{  
   enforce_variable user_name "You need to provide your username using the -u flag."
-  ensure_no_user_conflict
   enforce_variable user_svn_path "You need to provide your svn path using the -c flag."
   enforce_variable user_svn_username "You need to provide your svn username using the -s flag."
   enforce_variable user_maven_username "You need to provide your maven username using the -m flag."
@@ -333,6 +337,9 @@ function verify_add_user
     enforce_variable maven_password "The variable maven_password needs to be present in $user_password_file."
     user_svn_password=$svn_password
     user_maven_password=$maven_password
+  else
+    print_and_log "You must provide a password file using the -p flag."
+    remove_pid_and_exit_in_error
   fi
 }
 
@@ -374,49 +381,47 @@ function verify_add_artifact
 ##
 function detect_duplicate_artifact
 {
-  if [ $engine_found -eq 1 ]; then
-    if [ -d $root_dir/engine/engine-$resource_version ]; then
-      duplicate_resource=1
-    fi
-  elif [ $plugin_found -eq 1 ]; then
-    if [ -d $root_dir/plugins/$plugin_pattern-$resource_version ]; then
-      duplicate_resource=1
-    fi
+  if [ $engine_found -eq 1 ] && [ -d $builder_engine_dir/engine-$artifact_version ]; then
+    duplicate_found=1
+  elif [ $plugin_found -eq 1 ] && [ -d $builder_plugins_dir/$plugin_pattern-$artifact_version ]; then
+    duplicate_found=1
   fi
 }
 
 ##
 function add_artifact 
 {
+  # action flags
   engine_found=0
   plugin_found=0
   unsupported_plugin_found=0
-  plugin_pattern=""
-  resource_version=`echo $artifact_path | sed "s/.*-\(.*\)\.[a-zA-Z0-9]\{3\}$/\1/"`
-  duplicate_resource=0  
+  artifact_version=`echo $artifact_path | sed "s/.*-\(.*\)\.[a-zA-Z0-9]\{3\}$/\1/"`
+  duplicate_found=0  
 
-  if [ ! -d $root_dir/engine ]; then
-    run mkdir $root_dir/engine
-    print_and_log "The directory $root_dir/engine did not exist so it has been created."
+  if [ ! -d $builder_engine_dir ]; then
+    run mkdir $builder_engine_dir
+    print_and_log "NOTE - The directory $builder_engine_dir did not exist so it has been created."
   fi
 
-  if [ ! -d $root_dir/plugins ]; then
-    run mkdir $root_dir/plugins
-    print_and_log "The directory $root_dir/plugins did not exist so it has been created."
+  if [ ! -d $builder_plugins_dir ]; then
+    run mkdir $builder_plugins_dir
+    print_and_log "NOTE - The directory $builder_plugins_dir did not exist so it has been created."
   fi
 
+  # clean up download directory
   if [ -d $download_dir ]; then
     run rm -rf $download_dir
   fi
 
-  if [ ! -d $download_dir ]; then
-    run mkdir -p $download_dir/unpack
-  fi
+  # create download directory structure
+  run mkdir -p $download_dir/unpack
 
+  # is request artifact an engine?
   if [[ "$artifact_path" == *\/engine-* ]]; then
     engine_found=1
   fi
 
+  # is requested artifact a plugin?
   for f in $escenic_plugin_indentifiers; do
     if [[ "$artifact_path" == *$f* ]]; then
       plugin_found=1
@@ -424,6 +429,7 @@ function add_artifact
     fi
   done
 
+  # is requested artifact a plugin, but unsupported?
   for f in $unsupported_plugin_indentifiers; do
     if [[ "$artifact_path" == *$f* ]]; then
       unsupported_plugin_found=1
@@ -431,77 +437,76 @@ function add_artifact
     fi
   done  
 
+  # fail early on duplicate
   detect_duplicate_artifact
 
   if [ $engine_found -eq 1 ] && [ $plugin_found -eq 1 ]; then
-    print_and_log "The requested resource $artifact_path has been identified as both an engine and a plugin. Exiting!" >&2
+    print_and_log "ERROR - The requested resource $artifact_path has been identified as both an engine and a plugin, exiting!" >&2
     remove_pid_and_exit_in_error
-  elif [ $engine_found -eq 1 ] && [ $duplicate_resource -eq 0 ]; then
-    run wget --http-user=$technet_user --http-password=$technet_password $artifact_path -O $download_dir/unpack/resource.zip
-    run cd $download_dir/unpack
-    run unzip $download_dir/unpack/resource.zip
-    for f in $(ls -d $download_dir/unpack/*);
-      do
-        filename=$(basename "$f")
-        echo "$filename" | grep '[0-9]' | grep -q 'engine'
-        if [ $? = 0 ]; then
-          print_and_log "Directory contains numbers and \"engine\" so it is most likely valid."
-          if [ ! -d "$root_dir/engine/$filename" ]; then
-            run mv $f $root_dir/engine/.
-            if [ ! -d $root_dir/engine/$filename/$artifact_conf_dir ]; then
-              run mkdir $root_dir/engine/$filename/$artifact_conf_dir
-            fi
-            echo "artifact_uri=$artifact_path" > $root_dir/engine/$filename/$artifact_conf_dir/$artifact_conf_file
-            # workaround for assemblytool writing into the engine directory
-            run mkdir $root_dir/engine/$filename/patches
-          else
-            print_and_log "$root_dir/engine/$filename already exists and will be ignored!"
-          fi 
-        fi
-    done
-  elif [ $plugin_found -eq 1 ] && [ $duplicate_resource -eq 0 ]; then
-    run wget --http-user=$technet_user --http-password=$technet_password $artifact_path -O $download_dir/unpack/resource.zip
-    run cd $download_dir/unpack
-    run unzip $download_dir/unpack/resource.zip
-    run rm -f $download_dir/unpack/resource.zip
-    for f in $(ls -d $download_dir/unpack/*);
-      do
-        filename=$(basename "$f")
-        echo "$filename" | grep '[0-9]' | grep -q "$plugin_pattern"
-        if [ $? = 0 ]; then
-          print_and_log "Directory contains numbers and \"$plugin_pattern\" so it is most likely valid."
-          if [ ! -d "$root_dir/plugins/$filename" ]; then
-            run mv $f $root_dir/plugins/.
-            if [ ! -d $root_dir/plugins/$filename/$artifact_conf_dir ]; then
-              run mkdir $root_dir/plugins/$filename/$artifact_conf_dir
-            fi 
-            echo "artifact_uri=$artifact_path" > $root_dir/plugins/$filename/$artifact_conf_dir/$artifact_conf_file
-          else
-            print_and_log "$root_dir/plugins/$filename already exists and will be ignored!"
-          fi
-        else
-          echo "$filename" | grep -q "$plugin_pattern"
-          if [ $? = 0 ]; then
-            test=`echo $artifact_path | sed "s/.*-\(.*\)\.[a-zA-Z0-9]\{3\}$/\1/"`     
-            print_and_log "Resource $artifact_path was identified as a $plugin_pattern plugin, but failed the naming convention test after being unpacked, trying to recover..."
-            if [ ! -d $root_dir/plugins/$plugin_pattern-$test ]; then
-              run mv $f $root_dir/plugins/$plugin_pattern-$test
-              if [ ! -d $root_dir/plugins/$plugin_pattern-$test/$artifact_conf_dir ]; then
-                run mkdir $root_dir/plugins/$plugin_pattern-$test/$artifact_conf_dir
-              fi
-              echo "artifact_uri=$artifact_path" > $root_dir/plugins/$plugin_pattern-$test/$artifact_conf_dir/$artifact_conf_file
-              print_and_log "Resource $artifact_path was recovered as a $plugin_pattern and added as $plugin_pattern-$test"
-            fi
-          fi
-        fi
-    done
-  elif [ $duplicate_resource -eq 1 ]; then
-    print_and_log "The requested resource $artifact_path already exists and will be ignored."
+  elif [ $duplicate_found -eq 1 ]; then
+    print_and_log "SKIPPED - The requested resource $artifact_path already exists." 
+  elif [ $engine_found -eq 1 ] || [ $plugin_found -eq 1 ]; then
+    process_artifact
   elif [ $unsupported_plugin_found -eq 1 ]; then
-    print_and_log "The requested resource $artifact_path is a plugin, but currently unsupported by the platform."
+    print_and_log "UNSUPPORTED - The requested resource $artifact_path is a plugin, but currently unsupported by the platform."
   else
-    print_and_log "No valid resource identified using $artifact_path!"
+    print_and_log "SKIPPED - No valid resource identified using $artifact_path!"
+  fi   
+}
+
+##
+function process_artifact
+{
+  # identify type
+  if [ $engine_found -eq 1 ]; then
+    artifact_pattern=engine
+    target_path=$builder_engine_dir
+  elif [ $plugin_found -eq 1 ]; then
+    artifact_pattern=$plugin_pattern
+    target_path=$builder_plugins_dir
   fi
+
+  # fetch and unpack resource
+  run wget --http-user $technet_user --http-password $technet_password $artifact_path -O $download_dir/unpack/artifact.zip
+  run cd $download_dir/unpack
+  run unzip $download_dir/unpack/artifact.zip
+  
+  # analyze unpacked resource
+  for f in $(ls -d $download_dir/unpack/*);
+  do
+    skip_artifact=0
+    artifact_filename=$(basename "$f")
+    echo "$artifact_filename" | grep '[0-9]' | grep -q "$artifact_pattern"
+    if [ $? = 0 ]; then
+      log "The resulting directory contains numbers and \"$artifact_pattern\" so it is most likely valid."
+    else
+      echo "$artifact_filename" | grep -q "$artifact_pattern"
+      if [ $? = 0 ]; then
+        log "$artifact_path was identified as $artifact_pattern, but failed the naming convention test after being unpacked, trying to recover..."
+        if [ ! -d $target_path/$artifact_pattern-$artifact_version ]; then
+          log "$artifact_path was recovered as a $artifact_pattern and will be added as $artifact_pattern-$artifact_version"
+        else
+          log "$artifact_path was identified as $artifact_pattern, but $artifact_pattern-$artifact_version already exists so it will not be added."
+          skip_artifact=1
+        fi
+      else
+        log "$f is not a valid artifact, ignoring."
+        skip_artifact=1
+      fi
+    fi
+    if [ $skip_artifact -eq 0 ]; then
+      run mv $f $target_path/$artifact_pattern-$artifact_version
+      if [ ! -d $target_path/$artifact_pattern-$artifact_version/$artifact_conf_dir ]; then
+        run mkdir $target_path/$artifact_pattern-$artifact_version/$artifact_conf_dir
+      fi
+      # workaround for assemblytool writing into the engine directory
+      if [ $engine_found -eq 1 ] && [ ! -d $target_path/$artifact_pattern-$artifact_version/patches ]; then
+        run mkdir $target_path/$artifact_pattern-$artifact_version/patches
+      fi
+      echo "artifact_uri=$artifact_path" > $target_path/$artifact_pattern-$artifact_version/$artifact_conf_dir/$artifact_conf_file
+      print_and_log "ADDED - $artifact_pattern-$artifact_version sucessfully added."
+    fi
+  done
 }
 
 ##
@@ -527,15 +532,37 @@ function add_artifact_list
   done
 }
 
+##
+function common_post_build {
+  run rm $pid_file
+}
+
+##
+function phase_startup {
+  verify_root_privilege
+  set_pid
+  init
+}
+
+##
+function phase_execute
+{
+  execute
+}
+
+##
+function phase_shutdown
+{
+  common_post_build
+}
+
 #####################################################
 # Run commands
 #####################################################
-init
-set_pid
-verify_root_privilege
+phase_startup
 print_and_log "Starting process @ $(date)"
 print_and_log "Additional output can be found in $log"
 get_user_options $@
-execute
-print_and_log "Done! @ $(date)"
-common_post_action
+phase_execute
+print_and_log "Success! @ $(date)"
+phase_shutdown

From f86c1d84f5c86477f7b3476cb82de7ed2e5564d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=F6n?= <oschoen@vizrt.com>
Date: Fri, 27 Jul 2012 15:01:31 +0200
Subject: [PATCH 1035/2585] builder.sh - added more fail early checks

---
 usr/share/escenic/build-scripts/builder.sh | 38 ++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/usr/share/escenic/build-scripts/builder.sh b/usr/share/escenic/build-scripts/builder.sh
index c774f25c..55ba8ace 100755
--- a/usr/share/escenic/build-scripts/builder.sh
+++ b/usr/share/escenic/build-scripts/builder.sh
@@ -10,6 +10,13 @@ ece_scripts_home=/usr/share/escenic/ece-scripts
 log=/var/log/ece-builder.log
 pid_file=/var/run/ece-builder.pid
 
+# script dependencies
+dependencies="tar
+ant
+sed
+unzip
+wget"
+
 # available commands
 setup_builder=0
 add_user=0
@@ -95,6 +102,20 @@ function enforce_variable
   fi
 }
 
+##
+function verify_command {
+  command -v $1 >/dev/null 2>&1 || { print >&2 "I require $1 but it's not installed, exiting!"; remove_pid_and_exit_in_error; }
+}
+
+##
+function verify_dependencies
+{
+  for f in $dependencies
+  do
+    verify_command $f
+  done
+}
+
 ##
 function get_user_options
 {
@@ -157,10 +178,12 @@ function execute
 {
   if [ $setup_builder -eq 1 ]; then
     verify_setup_builder
+    verify_builder_conf
     setup_builder
   else
     verify_builder_exist
     read_builder_configuration
+    verify_builder_conf
     if [ $add_user -eq 1 ]; then
       ensure_no_user_conflict
       verify_add_user
@@ -178,6 +201,20 @@ function execute
   fi
 }
 
+##
+function verify_builder_conf
+{
+  enforce_variable technet_user "Your builder configuration file is missing the variable technet_user, exiting!"
+  enforce_variable technet_user "Your builder configuration file is missing the variable technet_password, exiting!"
+  wget --http-user $technet_user --http-password $technet_password http://technet.escenic.com/ -qO /dev/null
+  if [ $? -ne 0 ]; then
+    print_and_log "Your user can't reach http://technet.escenic.com/, exiting!"
+    remove_pid_and_exit_in_error
+  fi
+  enforce_variable escenic_plugin_indentifiers "You need to configure a list of supported plugins in you builder configuration file using the variable escenic_plugin_indentifiers, exiting!"
+  enforce_variable unsupported_plugin_indentifiers "You need to configure a list of unsupported plugins in you builder configuration file using the variable unsupported_plugin_indentifiers, exiting!" 
+}
+
 ##
 function verify_setup_builder
 {
@@ -542,6 +579,7 @@ function phase_startup {
   verify_root_privilege
   set_pid
   init
+  verify_dependencies
 }
 
 ##

From 3bff0e27b22e6f15bbedaa2a892006e9f8fa7b4e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 27 Jul 2012 16:43:12 +0200
Subject: [PATCH 1036/2585] - ece-assemble now displays a super-duper summary
 of duplicate JARs.

  When plugins are built with other 3rd party JAR versions than that
  of ECE, we get duplication in the common app server class loader,
  leading to anything from increased memory consumption to undesired
  runtime behaviour of our components.

  ece assemble has long reported about duplicated JARs (also if you
  have more than one version of the plugin in the plugins folder), but
  it has now the added feature of listing which JARs are actually
  causing the JAR chaos:

  [ece#engine-dev1] Assembling your EAR file...
  [ece#engine-dev1] WARNING These JARs contain (at least some) of the same files:
  [ece#engine-dev1] - /opt/escenic/engine/lib/activation-1.1.1.jar
  [ece#engine-dev1] - /opt/escenic/assemblytool/plugins/community-engine-3.6.2.124119/lib/activation-1.1.jar
  [ece#engine-dev1] WARNING These JARs contain (at least some) of the same files:
  [ece#engine-dev1] - /opt/escenic/assemblytool/plugins/lucy/lib/stax-api-1.0.1.jar
  [ece#engine-dev1] - /opt/escenic/assemblytool/plugins/community-engine-3.6.2.124119/lib/stax-api-1.0-2.jar
  [ece#engine-dev1] WARNING These JARs contain (at least some) of the same files:
  [ece#engine-dev1] - /opt/escenic/engine/lib/commons-codec-1.4.jar
  [ece#engine-dev1] - /opt/escenic/assemblytool/plugins/community-engine-3.6.2.124119/lib/commons-codec-1.5.jar
  [ece#engine-dev1] WARNING These JARs contain (at least some) of the same files:
  [ece#engine-dev1] - /opt/escenic/assemblytool/plugins/community-engine-3.6.2.124119/lib/commons-collections-3.2.1.jar
  [ece#engine-dev1] - /opt/escenic/engine/lib/commons-collections-3.2.jar
  [ece#engine-dev1] WARNING These JARs contain (at least some) of the same files:
  [ece#engine-dev1] - /opt/escenic/assemblytool/plugins/community-engine-3.6.2.124119/lib/commons-collections-3.2.1.jar
  [ece#engine-dev1] - /opt/escenic/engine/lib/commons-collections-3.2.jar
  [ece#engine-dev1] WARNING These JARs contain (at least some) of the same files:
  [ece#engine-dev1] - /opt/escenic/engine/lib/commons-digester-1.6.jar
  [ece#engine-dev1] - /opt/escenic/assemblytool/plugins/community-engine-3.6.2.124119/lib/commons-digester-2.1.jar
  [ece#engine-dev1] WARNING These JARs contain (at least some) of the same files:
  [ece#engine-dev1] - /opt/escenic/engine/lib/commons-io-1.4.jar
  [ece#engine-dev1] - /opt/escenic/assemblytool/plugins/community-engine-3.6.2.124119/lib/commons-io-2.1.jar
  [ece#engine-dev1] WARNING These JARs contain (at least some) of the same files:
  [ece#engine-dev1] - /opt/escenic/engine/lib/commons-dbcp-1.2.2.jar
  [ece#engine-dev1] - /opt/escenic/assemblytool/plugins/community-engine-3.6.2.124119/lib/commons-dbcp-1.4.jar
  [ece#engine-dev1] WARNING These JARs contain (at least some) of the same files:
  [ece#engine-dev1] - /opt/escenic/assemblytool/plugins/section-feed/escenic/webapp/plugin/sectionFeed/lib/commons-lang-2.3.jar
  [ece#engine-dev1] - /opt/escenic/engine/lib/commons-lang-2.3.jar
  [ece#engine-dev1] - /opt/escenic/assemblytool/plugins/community-engine-3.6.2.124119/lib/commons-lang-2.6.jar
  [ece#engine-dev1] WARNING These JARs contain (at least some) of the same files:
  [ece#engine-dev1] - /opt/escenic/engine/lib/commons-pool-1.3.jar
  [ece#engine-dev1] - /opt/escenic/assemblytool/plugins/community-engine-3.6.2.124119/lib/commons-pool-1.5.6.jar
  [ece#engine-dev1] WARNING These JARs contain (at least some) of the same files:
  [ece#engine-dev1] - /opt/escenic/engine/lib/isorelax-20030108.jar
  [ece#engine-dev1] - /opt/escenic/assemblytool/plugins/community-engine-3.6.2.124119/lib/isorelax-20041111.jar

  The warning message itself is printed in a nice yellow colour :-)

   A wee side note: It does this by looking inside the JARs themselves
   (using unzip instead of jar as it's much much faster). In the
   process, I noticed a number of 3rd party JARs which are shipping
   with the same class files. The XML libraries are the worst
   offenders, but also commons-collection and commons-beanutils doe
   this. Oh well, ece assemble as a white list of JARs with the
   libraries I know about in this respect so the user shouldn't get
   overwhelmed by suspicious warnings, which in fact are harmless.
---
 .../escenic/ece-scripts/ece.d/assemble.sh     | 107 ++++++++----------
 1 file changed, 48 insertions(+), 59 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/assemble.sh b/usr/share/escenic/ece-scripts/ece.d/assemble.sh
index 34353de6..6ec59fd3 100644
--- a/usr/share/escenic/ece-scripts/ece.d/assemble.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/assemble.sh
@@ -1,71 +1,60 @@
-assemble_attempts=0
+function run_assembly_tool() {
+  run cd $assemblytool_home 
+  run ant -q ear -DskipRedundancyCheck=true
+}
+
+# the JARs are known to share code between them (!)
+jar_white_list="xmlParserAPIs|commons-beanutils|jaxen|xom|xml-apis|relaxngDatatype"
+
+function warn_about_duplicate_jars() {
+  local a_class_list=""
+  for el in $assemblytool_home/dist/.work/ear/lib/*.jar; do
+    local a_class=$(unzip -t $el | \
+      grep class | \
+      grep -v "No errors" | \
+      cut -d':' -f2 | \
+      sed 's/^[ ]//g' | \
+      cut -d' ' -f1 | \
+      sort -r | \
+      head -1)
+    a_class_list="${a_class}\n${a_class_list}"
+  done
+
+  for el in $(echo -e "$a_class_list" | sort | uniq); do
+    local a_class_count=$(
+      grep $el $assemblytool_home/dist/.work/ear/lib/*.jar | \
+        egrep -v "$jar_white_list" | \
+        wc -l
+    )
+    
+    if [ $a_class_count -gt 1 ]; then
+      print_and_log $(yellow WARNING) "These JARs contain (at least some) of the same files:"
+      grep $el $assemblytool_home/dist/.work/ear/lib/*.jar | \
+        egrep -v "$jar_white_list" | \
+        cut -d' ' -f3 | while read f; do
+        local file=$(basename $f)
+        for ele in $(find -L \
+          $assemblytool_home/plugins \
+          $ece_home/lib \
+          -name $file | \
+          egrep -v "WEB-INF|test"); do
+          print_and_log "-" $ele
+        done
+      done
+    fi
+  done
+}
 
 function assemble() {
-  if [ "$assemble_attempts" -gt 1 ]; then
-    print "I've tried to assemble twice now and FAILED :-("
-    print "You probably have multiple versions of one or more plugins"
-    print "Check your plugins directory, sort it out and try again."
-    exit 1
-  fi
-  assemble_attempts=$(( $assemble_attempts + 1 ))
-  
   if [[ "$type" != "engine" && "$type" != "search" ]]; then
     print "You cannot assemble instances of type $type"
     exit 1
   fi
 
   print_and_log "Assembling your EAR file..."
-  run cd $assemblytool_home 
-  run ant -q ear -DskipRedundancyCheck=true
-
-  # test to see if the new versions of ECE & plugins are upgrades of
-  # the previous ones
-  duplicates_found=0
-  known_unharmful_duplicates="activation- $'\n' ehcache-$'\n' stax-api-$'\n'"
-  
-  run cd $assemblytool_home/dist/.work/ear/lib
-  local duplicate_jar_list=""
-  
-  for el in *.jar; do
-    jar=$(basename $(echo $el | sed -e 's/[0-9]//g') .jar | sed 's/\.//g')
-    if [ $(echo $known_unharmful_duplicates | grep $jar | wc -l) -gt 0 ]; then
-      continue
-    fi
+  run_assembly_tool
 
-    # we check for duplicate JARs like plugin-1.2.3.jar and
-    # plugin-1.2.4.jar. We remove plugin-1.2.3-tests.jar out the
-    # equations (if it happens to be there).
-    if [ $(\ls *.jar | \
-      sed -e 's/\.jar//' -e 's/-tests$//g' | \
-      grep "^${jar}[0-9]" | \
-      sort | \
-      uniq | \
-      wc -l) -gt 1 ]; then
-      duplicates_found=1
-      duplicate_jar_list="${jar}\n${duplicate_jar_list}"
-    fi
-  done
-
-  # now, list the duplicate JARs 
-  for el in $(echo -e "$duplicate_jar_list" | sort | uniq); do
-    print_and_log "Duplicates found of library" $(echo $el | sed 's/-$//g')":"
-    for ele in $(find -L \
-      $assemblytool_home/plugins \
-      $ece_home/lib \
-      -name "${el}*.jar" | \
-      egrep -v "tests|WEB-INF"); do
-      print_and_log "-" $ele
-    done
-  done
-  
-  if [ "$duplicates_found" -eq 1 ]; then
-    print "Multiple versions of ECE and/or 3rd party libraries found."
-    print "Remember, you need to run '$(basename $0) clean assemble' when "
-    print "upgrading either ECE or one of the plugins."
-    print "I will now clean it up for you and re-run the assembly."
-    clean_up
-    assemble
-  fi
+  warn_about_duplicate_jars
   
   mkdir -p $ear_cache_dir/
   exit_on_error "creating $ear_cache_dir"

From 32e0d024668122ba60ca291dfb012124c70fe4df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=F6n?= <oschoen@vizrt.com>
Date: Sun, 29 Jul 2012 00:46:43 +0200
Subject: [PATCH 1037/2585] builder.sh - Small test change in logging

---
 usr/share/escenic/build-scripts/builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/builder.sh b/usr/share/escenic/build-scripts/builder.sh
index 55ba8ace..42aa43e0 100755
--- a/usr/share/escenic/build-scripts/builder.sh
+++ b/usr/share/escenic/build-scripts/builder.sh
@@ -602,5 +602,5 @@ print_and_log "Starting process @ $(date)"
 print_and_log "Additional output can be found in $log"
 get_user_options $@
 phase_execute
-print_and_log "Success! @ $(date)"
+print_and_log "SUCCESS! @ $(date)"
 phase_shutdown

From ee1d0823dd1c5e97fa6050a6691659d668444874 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 30 Jul 2012 09:26:25 +0200
Subject: [PATCH 1038/2585] - added

---
 .../escenic/examples/ece-install-all-in-one.conf | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 usr/share/doc/escenic/examples/ece-install-all-in-one.conf

diff --git a/usr/share/doc/escenic/examples/ece-install-all-in-one.conf b/usr/share/doc/escenic/examples/ece-install-all-in-one.conf
new file mode 100644
index 00000000..8e9d4801
--- /dev/null
+++ b/usr/share/doc/escenic/examples/ece-install-all-in-one.conf
@@ -0,0 +1,16 @@
+# example ece-install.conf for installing an all in one environment,
+# for instance for a developer's PC or a test server.
+
+technet_user=
+technet_password=
+wf_user=
+wf_password=
+
+fai_enabled=1
+fai_all_install=1
+
+## This setting is useful if you're constantly re-running ece-install
+## to wipe out an environment where the data are not
+## important. Developers and QA personell will find this setting
+## useful.
+# fai_db_drop_old_db_first=1

From 50ea0a7961ba314d78c368277daf7bbe987350ee Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 30 Jul 2012 09:30:23 +0200
Subject: [PATCH 1039/2585] - added ece-install.conf for EAE - added more
 comments to the all in one .conf

---
 .../examples/ece-install-all-in-one.conf      |  2 ++
 .../examples/ece-install-analysis-engine.conf | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 usr/share/doc/escenic/examples/ece-install-analysis-engine.conf

diff --git a/usr/share/doc/escenic/examples/ece-install-all-in-one.conf b/usr/share/doc/escenic/examples/ece-install-all-in-one.conf
index 8e9d4801..a9a17023 100644
--- a/usr/share/doc/escenic/examples/ece-install-all-in-one.conf
+++ b/usr/share/doc/escenic/examples/ece-install-all-in-one.conf
@@ -1,6 +1,8 @@
 # example ece-install.conf for installing an all in one environment,
 # for instance for a developer's PC or a test server.
 
+## Your credentials for accessing the Escenic downloads & WF Maven
+## repository.
 technet_user=
 technet_password=
 wf_user=
diff --git a/usr/share/doc/escenic/examples/ece-install-analysis-engine.conf b/usr/share/doc/escenic/examples/ece-install-analysis-engine.conf
new file mode 100644
index 00000000..1d6b0f04
--- /dev/null
+++ b/usr/share/doc/escenic/examples/ece-install-analysis-engine.conf
@@ -0,0 +1,19 @@
+# Example ece-install.conf for installing the Escenic Analysis Engine
+
+## Your credentials for accessing the Escenic downloads & WF Maven
+## repository.
+technet_user=
+technet_password=
+wf_user=
+wf_password=
+
+fai_enabled=1
+fai_analysis_install=1
+fai_analysis_db_install=1
+fai_analysis_db_schema=analysisdb
+
+## EAE only needs on download (ece-install will per default download a
+## full stack of ECE & plugins):
+technet_download_list="
+http://technet.escenic.com/downloads/release/54/analysis-engine-2.4.0.127591.zip
+"

From a53ff24c002fa83d62fe573ea320455d7e543806 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 30 Jul 2012 09:44:28 +0200
Subject: [PATCH 1040/2585] - added more example configurations for
 ece-install:

  * cache & ECE presentation server
  * stand alone cache
  * DB master
  * DB slave
  * NFS server
  * NFS client
---
 .../ece-install-cache-and-content-engine.conf | 18 ++++++++++++++++++
 .../escenic/examples/ece-install-cache.conf   | 16 ++++++++++++++++
 .../examples/ece-install-db-master.conf       | 16 ++++++++++++++++
 .../examples/ece-install-db-slave.conf        | 19 +++++++++++++++++++
 .../examples/ece-install-nfs-client.conf      | 18 ++++++++++++++++++
 .../examples/ece-install-nfs-master.conf      | 16 ++++++++++++++++
 6 files changed, 103 insertions(+)
 create mode 100644 usr/share/doc/escenic/examples/ece-install-cache-and-content-engine.conf
 create mode 100644 usr/share/doc/escenic/examples/ece-install-cache.conf
 create mode 100644 usr/share/doc/escenic/examples/ece-install-db-master.conf
 create mode 100644 usr/share/doc/escenic/examples/ece-install-db-slave.conf
 create mode 100644 usr/share/doc/escenic/examples/ece-install-nfs-client.conf
 create mode 100644 usr/share/doc/escenic/examples/ece-install-nfs-master.conf

diff --git a/usr/share/doc/escenic/examples/ece-install-cache-and-content-engine.conf b/usr/share/doc/escenic/examples/ece-install-cache-and-content-engine.conf
new file mode 100644
index 00000000..cc0860b2
--- /dev/null
+++ b/usr/share/doc/escenic/examples/ece-install-cache-and-content-engine.conf
@@ -0,0 +1,18 @@
+## Example ece-install.conf for installing the Escenic Content Engine
+## and a caching server on the same host.
+##
+## This will set up: varnish:80 -> tomcat:8080 on the same host.
+## 
+## See the installation guide for further explanation of the
+## parameters.
+
+## Your credentials for accessing the Escenic downloads & WF Maven
+## repository.
+technet_user=
+technet_password=
+wf_user=
+wf_password=
+
+fai_enabled=1
+fai_cache_install=1
+fai_presentation_install=1
diff --git a/usr/share/doc/escenic/examples/ece-install-cache.conf b/usr/share/doc/escenic/examples/ece-install-cache.conf
new file mode 100644
index 00000000..82f4a93f
--- /dev/null
+++ b/usr/share/doc/escenic/examples/ece-install-cache.conf
@@ -0,0 +1,16 @@
+## Example ece-install.conf for installing a stand alone cache server
+## with the ECE backends on other machines.
+##
+## See the installation guide for further explanation of the
+## parameters.
+
+## Your credentials for accessing the Escenic downloads & WF Maven
+## repository.
+technet_user=
+technet_password=
+wf_user=
+wf_password=
+
+fai_enabled=1
+fai_cache_install=1
+fai_cache_backends="app1:8080 app2:8080 app3:8080"
diff --git a/usr/share/doc/escenic/examples/ece-install-db-master.conf b/usr/share/doc/escenic/examples/ece-install-db-master.conf
new file mode 100644
index 00000000..670878c0
--- /dev/null
+++ b/usr/share/doc/escenic/examples/ece-install-db-master.conf
@@ -0,0 +1,16 @@
+## Example ece-install.conf for installing the Escenic Analysis Engine
+## See the installation guide for further explanation of the
+## parameters.
+
+## Your credentials for accessing the Escenic downloads & WF Maven
+## repository.
+technet_user=
+technet_password=
+wf_user=
+wf_password=
+
+fai_enabled=1
+fai_db_install=1
+fai_db_master=1
+fai_db_replication=1
+
diff --git a/usr/share/doc/escenic/examples/ece-install-db-slave.conf b/usr/share/doc/escenic/examples/ece-install-db-slave.conf
new file mode 100644
index 00000000..fb589d49
--- /dev/null
+++ b/usr/share/doc/escenic/examples/ece-install-db-slave.conf
@@ -0,0 +1,19 @@
+## Example ece-install.conf for installing the Escenic Analysis Engine
+## See the installation guide for further explanation of the
+## parameters.
+
+## Your credentials for accessing the Escenic downloads & WF Maven
+## repository.
+technet_user=
+technet_password=
+wf_user=
+wf_password=
+
+fai_enabled=1
+fai_db_install=1
+fai_db_master=0
+fai_db_replication=1
+fai_db_master_host=my-db-master
+fai_db_master_log_file=mysql-bin.000013
+fai_db_master_log_position=106
+
diff --git a/usr/share/doc/escenic/examples/ece-install-nfs-client.conf b/usr/share/doc/escenic/examples/ece-install-nfs-client.conf
new file mode 100644
index 00000000..ee3f6b8a
--- /dev/null
+++ b/usr/share/doc/escenic/examples/ece-install-nfs-client.conf
@@ -0,0 +1,18 @@
+## Example ece-install.conf for installing an NFS client on a given
+## machine. All the ECE hosts, e.g., will typically have this
+## ece-isntall profile as a part of their installation procedure.
+##
+## See the installation guide for further explanation of the
+## parameters.
+
+## Your credentials for accessing the Escenic downloads & WF Maven
+## repository.
+technet_user=
+technet_password=
+wf_user=
+wf_password=
+
+fai_enabled=1
+fai_nfs_client_install=1
+fai_nfs_server_address=192.168.1.200
+fai_nfs_export_list="/var/exports/multimedia"  
diff --git a/usr/share/doc/escenic/examples/ece-install-nfs-master.conf b/usr/share/doc/escenic/examples/ece-install-nfs-master.conf
new file mode 100644
index 00000000..881bc10f
--- /dev/null
+++ b/usr/share/doc/escenic/examples/ece-install-nfs-master.conf
@@ -0,0 +1,16 @@
+## Example ece-install.conf for installing an NFS server.
+##
+## See the installation guide for further explanation of the
+## parameters.
+
+## Your credentials for accessing the Escenic downloads & WF Maven
+## repository.
+technet_user=
+technet_password=
+wf_user=
+wf_password=
+
+fai_enabled=1
+fai_nfs_server_install=1
+fai_nfs_export_list="/var/exports/multimedia"
+fai_nfs_allowed_client_network="192.168.1.0/255.255.255.0"

From c11208bbdf7f409c5fb31e1c32b92dd907f0844a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 30 Jul 2012 09:45:11 +0200
Subject: [PATCH 1041/2585] - renamed NFS master to NFS server, those are two
 different things.

---
 .../{ece-install-nfs-master.conf => ece-install-nfs-server.conf}  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename usr/share/doc/escenic/examples/{ece-install-nfs-master.conf => ece-install-nfs-server.conf} (100%)

diff --git a/usr/share/doc/escenic/examples/ece-install-nfs-master.conf b/usr/share/doc/escenic/examples/ece-install-nfs-server.conf
similarity index 100%
rename from usr/share/doc/escenic/examples/ece-install-nfs-master.conf
rename to usr/share/doc/escenic/examples/ece-install-nfs-server.conf

From e103306c38772b14ca23428b56b2dc367bf95334 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 30 Jul 2012 11:08:47 +0200
Subject: [PATCH 1042/2585] - regression: fixed undefined wf_dist_dir in  
 widget-framework::set_up_wf_nursery_config

---
 .../escenic/ece-scripts/ece-install.d/widget-framework.sh     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh b/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
index 851f8738..fbd6ad8c 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
@@ -53,6 +53,10 @@ EOF
 }
 
 function set_up_wf_nursery_config() {
+  for el in $wf_download_list; do
+    local wf_dist_dir=$(basename $el .zip)
+  done
+  
   cp -r $wf_dist_dir/misc/siteconfig/* $common_nursery_dir/
   local file=$common_nursery_dir/com/escenic/classification/IndexerPlugin.properties
   run mkdir -p $(dirname $file)

From bed5323b408bf7222c7ac2c41cd0136a92396c86 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 30 Jul 2012 14:05:22 +0200
Subject: [PATCH 1043/2585] - moved ECE 5.4 download list from (commented out
 in)   /usr/sbin/ece-install itself, to the example configuration file  
 usr/share/doc/escenic/examples/ece-install-all-in-one.conf

---
 usr/sbin/ece-install                          | 24 -----------------
 .../examples/ece-install-all-in-one.conf      | 26 +++++++++++++++++++
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index e6b49c87..8059e218 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -99,30 +99,6 @@ http://technet.escenic.com/downloads/widget-framework/widget-framework-community
 "
 ############################################################################
 
-############################################################################
-# For ECE 5.4
-############################################################################
-# technet_download_list="
-# http://technet.escenic.com/downloads/community-engine/community-engine-3.7.0.123608.zip
-# http://technet.escenic.com/downloads/release/54/analysis-engine-2.4.0.127591.zip
-# http://technet.escenic.com/downloads/release/54/dashboard-1.3.0.123618.zip
-# http://technet.escenic.com/downloads/release/54/engine-5.4.1.126472.zip
-# http://technet.escenic.com/downloads/release/54/forum-3.1.0.123741.zip
-# http://technet.escenic.com/downloads/release/54/geocode-dist-2.4.0.123726.zip
-# http://technet.escenic.com/downloads/release/54/inpage-2.1.1.126618.zip
-# http://technet.escenic.com/downloads/release/54/lucy-dist-4.2.0.0.zip
-# http://technet.escenic.com/downloads/release/54/menu-editor-dist-2.1.0.123205.zip
-# http://technet.escenic.com/downloads/release/54/poll-2.2.0.123043.zip
-# http://technet.escenic.com/downloads/release/54/section-feed-dist-2.1.0.122795.zip
-# http://technet.escenic.com/downloads/release/54/xml-editor-dist-2.2.0.0.zip
-# "
-
-# wf_download_list="
-# http://download.escenic.com/release/release/54/widget-framework-core-2.0.1.126521.zip
-# http://download.escenic.com/release/release/54/widget-framework-community-2.0.1.126521.zip
-# "
-############################################################################
-
 ## Bootstrapping, load files from /usr/share/escenic/ece-scripts The
 ## method will first try to be smart, in case the user has copied the
 ## ece-scripts somewhere else., e.g.: moved everything to ~/ece-scrpts
diff --git a/usr/share/doc/escenic/examples/ece-install-all-in-one.conf b/usr/share/doc/escenic/examples/ece-install-all-in-one.conf
index a9a17023..f45c27e5 100644
--- a/usr/share/doc/escenic/examples/ece-install-all-in-one.conf
+++ b/usr/share/doc/escenic/examples/ece-install-all-in-one.conf
@@ -16,3 +16,29 @@ fai_all_install=1
 ## important. Developers and QA personell will find this setting
 ## useful.
 # fai_db_drop_old_db_first=1
+
+
+## If you want to use ECE 5.4 instead of ECE 5.3, uncomment these
+## download lists (ece-install has built-in download lists which
+## currently default to ECE 5.3 archives):
+# technet_download_list="
+# http://technet.escenic.com/downloads/assemblytool-2.0.2.zip
+# http://technet.escenic.com/downloads/community-engine/community-engine-3.7.0.123608.zip
+# http://technet.escenic.com/downloads/release/54/analysis-engine-2.4.0.127591.zip
+# http://technet.escenic.com/downloads/release/54/dashboard-1.3.0.123618.zip
+# http://technet.escenic.com/downloads/release/54/engine-5.4.1.126472.zip
+# http://technet.escenic.com/downloads/release/54/forum-3.1.0.123741.zip
+# http://technet.escenic.com/downloads/release/54/geocode-dist-2.4.0.123726.zip
+# http://technet.escenic.com/downloads/release/54/inpage-2.1.1.126618.zip
+# http://technet.escenic.com/downloads/release/54/lucy-dist-4.2.0.0.zip
+# http://technet.escenic.com/downloads/release/54/menu-editor-dist-2.1.0.123205.zip
+# http://technet.escenic.com/downloads/release/54/poll-2.2.0.123043.zip
+# http://technet.escenic.com/downloads/release/54/section-feed-dist-2.1.0.122795.zip
+# http://technet.escenic.com/downloads/release/54/xml-editor-dist-2.2.0.0.zip
+# "
+
+# wf_download_list="
+# http://download.escenic.com/release/release/54/widget-framework-core-2.0.1.126521.zip
+# http://download.escenic.com/release/release/54/widget-framework-community-2.0.1.126521.zip
+# "
+

From 1e5ded31e06f8a5751b1c5976de94acf953dac82 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 30 Jul 2012 15:22:07 +0200
Subject: [PATCH 1044/2585] - added
 hang_around_to_see_that_forceful_kill_succeeded, called from   ece:stop:

  Sometimes, kill -9 *might* take some time before it
  returns. Hence, we hang around for a couple of seconds.
---
 usr/share/escenic/ece-scripts/ece.d/stop.sh | 25 ++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/stop.sh b/usr/share/escenic/ece-scripts/ece.d/stop.sh
index 073d1a17..67347221 100644
--- a/usr/share/escenic/ece-scripts/ece.d/stop.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/stop.sh
@@ -38,8 +38,9 @@ function stop_type() {
       print_and_log "I will now use force."
       run kill -9 $type_pid
     fi
-    
 
+    hang_around_to_see_that_forceful_kill_succeeded
+    
     if [ -e $pid_file ]; then
       run rm $pid_file
     fi
@@ -49,3 +50,25 @@ function stop_type() {
   
   exit_on_error $message
 }
+
+function hang_around_to_see_that_forceful_kill_succeeded() {
+  # sometimes, kill -9 *might* take some time before it
+  # returns. Hence, we hang around for a couple of seconds.
+  for i in {0..5}; do
+    set_type_pid
+    
+    if [ -n "$type_pid" ]; then
+      sleep 1
+    else
+      debug "Previous forceful kill attempt of $instance succeeded."
+      break
+    fi
+  done
+  
+  set_type_pid
+  if [ -n "$type_pid" ]; then
+    print_and_log "I was not able to forcefully kill PID $type_pid"
+    print_and_log "something is very wrong here :-("
+    return
+  fi
+}  

From 24bc5b1d154eae8f7a2e6e34456a733feef82a6e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 30 Jul 2012 16:38:34 +0200
Subject: [PATCH 1045/2585] - added installation of maven to  
 create-publication::create_publication_definition_and_war, needed in   some
 cases not previously tested.

---
 .../escenic/ece-scripts/ece-install.d/create-publication.sh      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
index 39af8bc0..999394aa 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
@@ -147,6 +147,7 @@ EOF
     # WF 1.x
     if [ -d $escenic_root_dir/widget-framework-core-*/publications/demo-core ]; then
       run cd $escenic_root_dir/widget-framework-core-*/publications/demo-core
+      install_packages_if_missing "maven2"
       assert_pre_requisite mvn
       run mvn $maven_opts package
       run cp target/demo-core-*.war ${publication_war}

From d918651b9c2586b33f1efe1b306ddd0a006aae61 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 30 Jul 2012 16:41:04 +0200
Subject: [PATCH 1046/2585] - added vosa:set_etc_hosts, will create aggregate
 of files found in:

  /var/lib/vizrt/vosa/files/common/etc/hosts.d
  /var/lib/vizrt/vosa/files/<instance>/etc/hosts.d

  and also include typical entries, generated, such as 127.0.0.1 and
  127.0.1.1 and entries needed for IPv6.

  The method isn't called from anywhere yet.
---
 usr/share/vizrt/vosa/commands/push.sh | 31 +++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/usr/share/vizrt/vosa/commands/push.sh b/usr/share/vizrt/vosa/commands/push.sh
index 50318bac..8c825077 100644
--- a/usr/share/vizrt/vosa/commands/push.sh
+++ b/usr/share/vizrt/vosa/commands/push.sh
@@ -66,6 +66,37 @@ function post_push_changes() {
   fi
 }
 
+function set_etc_hosts() {
+  if [ ! -d $files_dir/common/etc/hosts.d ]; then
+    return
+  fi
+
+  local tmp_file=$(mktemp)
+  cat > $tmp_file <<EOF
+###################################################################
+## Generated default /etc/hosts header by $(basename $0) @ $(date)
+###################################################################
+127.0.0.1	localhost
+127.0.1.1	${instance}
+
+# The following lines are desirable for IPv6 capable hosts
+::1     ip6-localhost ip6-loopback
+fe00::0 ip6-localnet
+ff00::0 ip6-mcastprefix
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters
+###################################################################
+
+EOF
+
+  cat $tmp_file \
+    ${files_dir}/common/etc/hosts.d/* \
+    ${files_dir}/${instance}/etc/hosts.d/* | \
+    ssh ${rsync_ssh_opts} ${instance} "cat > /etc/hosts"
+  
+  rm $tmp_file
+}
+
 # the callee needs to to do:
 #
 # pre_push_changes

From b63dac26fcd0ffa43e6ffc0cf3dbd01c9dcf2a81 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 30 Jul 2012 16:41:34 +0200
Subject: [PATCH 1047/2585] - added some hardening to
 widget-framework::set_up_wf_nursery_config

---
 .../escenic/ece-scripts/ece-install.d/widget-framework.sh  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh b/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
index fbd6ad8c..ebc1d98a 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
@@ -56,8 +56,11 @@ function set_up_wf_nursery_config() {
   for el in $wf_download_list; do
     local wf_dist_dir=$(basename $el .zip)
   done
-  
-  cp -r $wf_dist_dir/misc/siteconfig/* $common_nursery_dir/
+
+  local wf_dist_conf_dir=$wf_dist_dir/misc/siteconfig
+  if [ -d $wf_dist_conf_dir  ]; then
+    run cp -r $wf_dist_conf_dir/* $common_nursery_dir/
+  fi
   local file=$common_nursery_dir/com/escenic/classification/IndexerPlugin.properties
   run mkdir -p $(dirname $file)
   echo "enableFacets=true" > $file

From dec2258bc93df5c64ed1434be56f585e63a5dcd3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 30 Jul 2012 17:00:47 +0200
Subject: [PATCH 1048/2585] - ece-install now leaves a trail of what it has
 done. For instance,   the ece-install.conf settings:

  fai_db_install=1
  fai_cache_install=1
  fai_editor_install=1

  Currently leaves the following trail:

  $ cat  /var/lib/ece-install/1343660280-ece-install.trail
  trail_db_port=3306
  trail_cache_port=80
  trail_editor_port=8080
  trail_editor_shutdown=8005
---
 usr/sbin/ece-install                          |  8 +++++++
 .../ece-scripts/ece-install.d/cache-server.sh |  7 +++++-
 .../ece-install.d/content-engine.sh           | 23 ++++++++++++++++++-
 .../ece-scripts/ece-install.d/database.sh     |  6 +++++
 4 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 8059e218..0dfa1584 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -846,6 +846,14 @@ function common_post_install() {
   run rm $pid_file
 }
 
+ece_install_trail_file=/var/lib/ece-install/$(date +%s)-$(basename $0).trail
+## $@ add this trail
+function leave_trail() {
+  local dir=$(dirname $ece_install_trail_file)
+  run mkdir -p $dir
+  echo "$@" >> $ece_install_trail_file
+}
+
 for el in $@; do
     if [ $el = "-v" -o $el = "--verbose" ]; then
         debug=1
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
index b98d0e45..c250e634 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
@@ -58,7 +58,8 @@ function install_cache_server()
   fi
 
   set_up_varnish $backend_servers
-
+  leave_cache_trails
+  
   add_next_step "Cache server is up and running at http://${HOSTNAME}:80/"
 }
 
@@ -211,3 +212,7 @@ EOF
 EOF
   run /etc/init.d/varnish start
 }
+
+function leave_cache_trails() {
+  leave_trail "trail_cache_port=80"
+}
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index dba604af..709334b5 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -82,7 +82,7 @@ function install_ece_instance() {
   set_up_app_server
   set_up_proper_logging_configuration
 
-    # We set a WAR white list for all profiles except all in one
+  # We set a WAR white list for all profiles except all in one
   if [ $install_profile_number -ne $PROFILE_ALL_IN_ONE -a \
     $install_profile_number -ne $PROFILE_ANALYSIS_SERVER ]; then
     local file=$escenic_conf_dir/ece-${instance_name}.conf
@@ -103,6 +103,8 @@ function install_ece_instance() {
   set_conf_file_value ece_unix_user $ece_user /etc/default/ece
   set_conf_file_value ece_unix_group $ece_group /etc/default/ece
 
+  leave_content_engine_trails
+
   admin_uri=http://$HOSTNAME:${appserver_port}/escenic-admin/
   add_next_step "New ECE instance $instance_name installed."
   add_next_step "Admin interface: $admin_uri"
@@ -635,3 +637,22 @@ function set_up_engine_directories() {
     make_dir $el
   done
 }
+
+function leave_content_engine_trails() {
+  if [ ${fai_editor_install-0} -eq 1 ]; then
+    leave_trail "trail_editor_port=${fai_editor_port-8080}"
+    leave_trail "trail_editor_shutdown=${fai_editor_shutdown-8005}"
+  fi
+  if [ ${fai_presentation_install-0} -eq 1 ]; then
+    leave_trail "trail_presentation_port=${fai_presentation_port-8080}"
+    leave_trail "trail_presentation_shutdown=${fai_presentation_shutdown-8005}"
+  fi
+  if [ ${fai_analysis_install-0} -eq 1 ]; then
+    leave_trail "trail_analysis_port=${fai_analysis_port-8080}"
+    leave_trail "trail_analysis_shutdown=${fai_analysis_shutdown-8005}"
+  fi
+  if [ ${fai_all_install-0} -eq 1 ]; then
+    leave_trail "trail_all_port=8080"
+    leave_trail "trail_all_shutdown=8005"
+  fi
+}
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 8723a902..8101223b 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -124,6 +124,8 @@ function install_database_server()
       set_slave_to_replicate_master
     fi
   fi
+
+  leave_db_trails
 }
 
 function set_ecedb_conf() {
@@ -510,3 +512,7 @@ function work_around_eae_bug_stats-76() {
   grep -i -v ^'drop index' $1 > $1.tmp
   mv $1.tmp $1
 }
+
+function leave_db_trails() {
+  leave_trail "trail_db_port=${db_port-3306}"
+}

From c0b4bf67e09cb57c6e0c5ed57be84d1febb2d312 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 31 Jul 2012 09:35:03 +0200
Subject: [PATCH 1049/2585] - added smarter sourcing of push library so that
 vosa-push can be   called outside of PATH, e.g.:

  $ bash ece-scripts/usr/bin/vosa-push

  will work just as well as the normal:

  $ /usr/bin/vosa-push
---
 usr/bin/vosa-push | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/bin/vosa-push b/usr/bin/vosa-push
index 987c9298..1ca61b19 100644
--- a/usr/bin/vosa-push
+++ b/usr/bin/vosa-push
@@ -3,7 +3,7 @@
 # wrapper around the vosa::push module. Can be removed once vosa -i
 # <instance> push has been implemented.
 
-source ../share/vizrt/vosa/commands/push.sh
+source $(dirname $0)/../share/vizrt/vosa/commands/push.sh
 outgoing=0
 instance=""
 

From 54f23da6a556e198fd56748e8651a2d64e9c36fe Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 31 Jul 2012 10:04:57 +0200
Subject: [PATCH 1050/2585] - vosa-push -i <instance> now also generates the
 /etc/hosts file of   that instance. It generates /etc/hosts from the files
 in:

   common/etc/hosts.d

   typically, you have one file in this directory per host entry, but
   you may of course have more than one in each file, perhaps grouped
   logically.

   vosa-push also supports instance specific entries (optional):

   <instance>/etc/hosts.d

   vosa-push will then generate the standard IPv4 & IPv6 entries for
   the given instance, including adding an extra line 127.0.1.1
   <instance> needed for the escenic-admin status change (among other things).

   vosa-push will list where the merged entries come from, here's an
   example for an instance/host called "myhost" with two hosts files
   in common/etc/hosts.d:

   ########################################################################
   ## /etc/hosts generated by vosa-push
   ########################################################################
   127.0.0.1	localhost
   127.0.1.1	ubuntu

   ## The following lines are desirable for IPv6 capable hosts
   ::1     ip6-localhost ip6-loopback
   fe00::0 ip6-localnet
   ff00::0 ip6-mcastprefix
   ff02::1 ip6-allnodes
   ff02::2 ip6-allrouters
   ########################################################################
   ## From cochise:/var/lib/vizrt/vosa/files/common/etc/hosts.d/google
   173.194.32.32 google

   ## From cochise:/var/lib/vizrt/vosa/files/common/etc/hosts.d/escenic
   79.125.106.24 escenic.com

- vosa-push makes sure that files with no trailing new line also
  works.
---
 usr/bin/vosa-push                     |  1 +
 usr/share/vizrt/vosa/commands/push.sh | 31 +++++++++++++++------------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/usr/bin/vosa-push b/usr/bin/vosa-push
index 1ca61b19..c41cfc78 100644
--- a/usr/bin/vosa-push
+++ b/usr/bin/vosa-push
@@ -39,5 +39,6 @@ if [ -z "${instance}" ]; then
 fi
 
 pre_push_changes
+set_etc_hosts
 push_changes
 post_push_changes
diff --git a/usr/share/vizrt/vosa/commands/push.sh b/usr/share/vizrt/vosa/commands/push.sh
index 8c825077..415f4e20 100644
--- a/usr/share/vizrt/vosa/commands/push.sh
+++ b/usr/share/vizrt/vosa/commands/push.sh
@@ -71,30 +71,33 @@ function set_etc_hosts() {
     return
   fi
 
-  local tmp_file=$(mktemp)
-  cat > $tmp_file <<EOF
-###################################################################
-## Generated default /etc/hosts header by $(basename $0) @ $(date)
-###################################################################
+  local file=${files_dir}/${instance}/etc/hosts
+  mkdir -p $(dirname $file)
+  cat > $file <<EOF
+########################################################################
+## /etc/hosts generated by $(basename $0)
+########################################################################
 127.0.0.1	localhost
 127.0.1.1	${instance}
 
-# The following lines are desirable for IPv6 capable hosts
+## The following lines are desirable for IPv6 capable hosts
 ::1     ip6-localhost ip6-loopback
 fe00::0 ip6-localnet
 ff00::0 ip6-mcastprefix
 ff02::1 ip6-allnodes
 ff02::2 ip6-allrouters
-###################################################################
-
+########################################################################
 EOF
 
-  cat $tmp_file \
-    ${files_dir}/common/etc/hosts.d/* \
-    ${files_dir}/${instance}/etc/hosts.d/* | \
-    ssh ${rsync_ssh_opts} ${instance} "cat > /etc/hosts"
-  
-  rm $tmp_file
+  find ${files_dir}/common/etc/hosts.d/ \
+    ${files_dir}/${instance}/etc/hosts.d \
+    -type f | while read f; do
+    cat >> $file <<EOF
+## From ${HOSTNAME}:${f}
+$(cat $f)
+
+EOF
+  done
 }
 
 # the callee needs to to do:

From f9dc02ef3dd5b0cb45fc8b844ed8dd547a1a5640 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 31 Jul 2012 10:35:10 +0200
Subject: [PATCH 1051/2585] - fai_search_install=1 will now leave a trail, just
 like what was   introduced in dec2258bc93df5c64ed1434be56f585e63a5dcd3:

     fai_search_install=1

  will leave the trail:

    trail_search_port=8080
    trail_search_shutdown=8005
---
 .../escenic/ece-scripts/ece-install.d/search-server.sh    | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
index 104bf96a..5bda9ada 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
@@ -29,6 +29,7 @@ function install_search_server()
 
   set_up_solr
   assemble_deploy_and_restart_type
+  leave_search_server_trail
 }
 
 function set_up_solr()
@@ -74,3 +75,10 @@ function set_up_solr()
 
   run_hook set_up_solr.postinst
 }
+
+function leave_search_server_trail() {
+  if [ ${fai_search_install-0} -eq 1 ]; then
+    leave_trail "trail_search_port=${fai_search_port-8080}"
+    leave_trail "trail_search_shutdown=${fai_search_shutdown-8005}"
+  fi
+}

From 2732dc69da4f02eca93de7afda6b04db51660da0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 31 Jul 2012 10:43:06 +0200
Subject: [PATCH 1052/2585] - will now only list the top 50 errors from the log
 file. This is to   cater for the case where there's a variable in the main  
 error message, producing different entries in the log file.

---
 .../escenic/ece-scripts/system-info.d/11-list-ece-overview.sh  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh b/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
index 6f79f403..559bbc38 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
@@ -74,7 +74,8 @@ function list_error_overview_for_instance() {
   fi
 
   print_h4_header "Overview of ${1}'s errors"
-  local errors="$(grep ERROR ${file} | cut -d' ' -f6- | sort | uniq -c | sort -n -r | sed 's/^[ ]*//g')"
+  # listing the top 50 errors with indiviual count
+  local errors="$(grep ERROR ${file} | cut -d' ' -f6- | sort | uniq -c | sort -n -r | sed 's/^[ ]*//g' | head -n 50)"
   if [ $(echo "$errors" | wc -c) -lt 5 ]; then
       print_pre_text "There are no errors in today's log ($file)"
   else

From c1c5ebdfb4b72ec42b43b9f2ef79a141f8769cfb Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 31 Jul 2012 12:42:50 +0200
Subject: [PATCH 1053/2585] - fixed a wee bug in  ece-info where you'd get grep
 errors in standard   out if the instance in question wasn't running and
 ece-info tried to   create the diagram for it.

---
 usr/share/escenic/ece-scripts/ece.d/info.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/info.sh b/usr/share/escenic/ece-scripts/ece.d/info.sh
index 1568a1e0..56c03c43 100644
--- a/usr/share/escenic/ece-scripts/ece.d/info.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/info.sh
@@ -55,7 +55,7 @@ function get_info_for_type() {
   create_block_diag_for_instance
 }
 
-print_deployment_state() {
+function print_deployment_state() {
   local file=$data_dir/$instance.state
   if [ ! -r $file ]; then
     return
@@ -153,6 +153,10 @@ function visualise_known_ports() {
 }
 
 function create_block_diag_for_instance() {
+  if [ -z $type_pid ]; then
+    return
+  fi
+  
   local file=/var/cache/escenic/${instance}.blockdiag
   cat > ${file} <<EOF
 blockdiag {

From 9ab558386a0e3c6638366616d8b27f6ab08d6ef0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 31 Jul 2012 13:07:53 +0200
Subject: [PATCH 1054/2585] -included vosa-push in the vosa package

---
 usr/share/escenic/package-scripts/create-packages | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index e4d13cd7..5763da7b 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -128,6 +128,7 @@ function set_up_vosa() {
   mkdir -p $target_dir/etc/bash_completion.d
   
   cp -r ../../../bin/vosa $target_dir/usr/bin/
+  cp -r ../../../bin/vosa-push $target_dir/usr/bin/
   cp -r ../../vizrt/ $target_dir/usr/share/
   cp -r ../../doc/vizrt/*.org $target_dir/usr/share/doc/vosa/
   cp -r ../../../../etc/bash_completion.d/vosa \

From b960aa0f9aa5a70ad2f18eb063a02fb3de8d8490 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 31 Jul 2012 13:47:01 +0200
Subject: [PATCH 1055/2585] - when installing ECEs a trail of the public host
 name, i.e. the web   site address will be given:

    trail_public_host_name=http://mysite.com/
---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 709334b5..f29ecb69 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -655,4 +655,6 @@ function leave_content_engine_trails() {
     leave_trail "trail_all_port=8080"
     leave_trail "trail_all_shutdown=8005"
   fi
+  
+  leave_trail "trail_public_host_name=${public_host_name}"
 }

From 087705961030b8b62681180767e371416628f57c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 31 Jul 2012 14:13:18 +0200
Subject: [PATCH 1056/2585] - set the execution bit

---
 usr/bin/vosa-push | 1 +
 1 file changed, 1 insertion(+)
 mode change 100644 => 100755 usr/bin/vosa-push

diff --git a/usr/bin/vosa-push b/usr/bin/vosa-push
old mode 100644
new mode 100755
index c41cfc78..399922ad
--- a/usr/bin/vosa-push
+++ b/usr/bin/vosa-push
@@ -42,3 +42,4 @@ pre_push_changes
 set_etc_hosts
 push_changes
 post_push_changes
+

From 9100d8cdd3a69ec5b72913189f224740da8ee0d2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 31 Jul 2012 14:33:43 +0200
Subject: [PATCH 1057/2585] - if the fai_publication_domain_mapping_list is
 set:

    fai_publication_domain_mapping_list="orange#orange.com pear#pear.com"

  the following trails are left:

    trail_virtual_host_orange=orange.com:8080
    trail_virtual_host_pear=pear.com:8080
---
 usr/share/escenic/ece-scripts/ece-install.d/app-server.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index cf09232e..04105468 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -294,8 +294,8 @@ EOF
 
     for el in ${fai_publication_domain_mapping_list}; do
       local old_ifs=$IFS
-            # the entries in the fai_publication_domain_mapping_list
-            # are on the form: <publication>#<domain>
+      # the entries in the fai_publication_domain_mapping_list are on
+      # the form: <publication>#<domain>
       IFS='#'
       read publication domain <<< "$el"
       IFS=$old_ifs
@@ -310,6 +310,7 @@ EOF
         />
       </Host>
 EOF
+      leave_trail "trail_virtual_host_${publication}=${domain}:${appserver_port}"
     done
   fi
   

From e731cd8a6e51db5cec3b7e02648ba1234571b118 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 31 Jul 2012 14:49:25 +0200
Subject: [PATCH 1058/2585] - added skeleton for the new
 escenic-check-mk-plugins package

---
 usr/share/escenic/package-scripts/create-packages         | 4 ++++
 .../debian/escenic-check-mk-plugins/control               | 8 ++++++++
 .../debian/escenic-check-mk-plugins/postinst              | 4 ++++
 3 files changed, 16 insertions(+)
 create mode 100644 usr/share/escenic/package-scripts/debian/escenic-check-mk-plugins/control
 create mode 100755 usr/share/escenic/package-scripts/debian/escenic-check-mk-plugins/postinst

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 5763da7b..275af3c5 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -160,6 +160,10 @@ function set_up_escenic-common-scripts() {
     $target_dir/usr/share/escenic/ece-scripts/
 }
 
+function set_up_escenic-check-mk-plugins() {
+  mkdir -p $target_dir/usr/lib/check_mk_agent/local
+}
+
 function set_up_escenic-munin-plugins() {
   mkdir -p $target_dir/usr/share/munin/plugins
   local doc_dir=$target_dir/usr/share/doc/escenic/escenic-munin-plugin
diff --git a/usr/share/escenic/package-scripts/debian/escenic-check-mk-plugins/control b/usr/share/escenic/package-scripts/debian/escenic-check-mk-plugins/control
new file mode 100644
index 00000000..c48b6f02
--- /dev/null
+++ b/usr/share/escenic/package-scripts/debian/escenic-check-mk-plugins/control
@@ -0,0 +1,8 @@
+Package: escenic-check-mk-plugins
+Version: VERSION
+Recommends: check-mk-agent
+Section: base
+Priority: optional
+Architecture: all
+Maintainer: MAINTAINER_NAME <MAINTAINER_EMAIL>
+Description: check-mk plugins for the Escenic Content Engine.
diff --git a/usr/share/escenic/package-scripts/debian/escenic-check-mk-plugins/postinst b/usr/share/escenic/package-scripts/debian/escenic-check-mk-plugins/postinst
new file mode 100755
index 00000000..e15ca1c2
--- /dev/null
+++ b/usr/share/escenic/package-scripts/debian/escenic-check-mk-plugins/postinst
@@ -0,0 +1,4 @@
+#! /usr/bin/env bash
+
+exit 0
+

From 298a310bb5221465bc684bb4c037449183d5d38a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 31 Jul 2012 14:56:37 +0200
Subject: [PATCH 1059/2585] - changed the GC log name to instance-gc.log,
 omitting the <type>-   prefix. This gets the file in line with the .out &
 .pid files.

---
 usr/bin/ece | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index c6094564..86963e0e 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -193,7 +193,7 @@ function set_common_settings() {
     log=$log_dir/$instance.out
     pid_file=$pid_dir/$instance.pid
     
-    gc_log=${log_dir}/${type}-${instance}-gc.log
+    gc_log=${log_dir}/${instance}-gc.log
 
     log4j_file_list="
       $log_dir/${HOSTNAME}-${instance}-messages

From a6734fc0823efbdea0219e5782fb3fcc5297ab53 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Tue, 31 Jul 2012 15:14:40 +0200
Subject: [PATCH 1060/2585] - Added some little check_mk plug-ins :-)

---
 usr/lib/check_mk_agent/local/ece              | 41 +++++++++++
 .../check_mk_agent/local/ece-install-trail    | 71 +++++++++++++++++++
 usr/lib/check_mk_agent/local/varnish          | 67 +++++++++++++++++
 3 files changed, 179 insertions(+)
 create mode 100755 usr/lib/check_mk_agent/local/ece
 create mode 100755 usr/lib/check_mk_agent/local/ece-install-trail
 create mode 100755 usr/lib/check_mk_agent/local/varnish

diff --git a/usr/lib/check_mk_agent/local/ece b/usr/lib/check_mk_agent/local/ece
new file mode 100755
index 00000000..6382511c
--- /dev/null
+++ b/usr/lib/check_mk_agent/local/ece
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+engine_instance_list=""
+search_instance_list=""
+
+if [ ! -r /etc/default/ece ] ; then
+  exit 0
+fi
+
+function determine_health() {
+  local type=$1
+  shift
+  for i in $* ; do
+    basename="ece_$i"
+    pidfile=/var/run/escenic/$i.pid
+  
+    if [ ! -r $pidfile ] ; then
+      echo "2 ${basename}_up - The $pidfile is missing"
+      continue;
+    fi
+
+    local pid=$(<$pidfile)
+    if [ -z "$pid" ] ; then
+      echo "2 ${basename}_up - The $pidfile is empty"
+      continue;
+    fi
+
+    if [ ! -d /proc/$pid ] ; then
+      echo "2 ${basename}_up - The process in $pidfile is not running"
+      continue;
+    fi
+
+    echo "0 ${basename}_up - OK process $pid"
+
+  done
+}
+
+. /etc/default/ece
+determine_health engine $engine_instance_list 
+determine_health search $search_instance_list 
+
diff --git a/usr/lib/check_mk_agent/local/ece-install-trail b/usr/lib/check_mk_agent/local/ece-install-trail
new file mode 100755
index 00000000..a3413c7b
--- /dev/null
+++ b/usr/lib/check_mk_agent/local/ece-install-trail
@@ -0,0 +1,71 @@
+#!/bin/bash
+
+# check_mk checks for the trail files left by ece-install.
+
+# Trail files contain interesting things which might be useful to monitor,
+# including virtual hosts, port numbers and so on that "have been installed"
+# on this host (and therefore should be useful to monitor.
+#
+# trail_virtual_host_something=www.mypublication.com:8080
+# trail_virtual_host_somethingelse=www.somethingelse.com:8081
+# trail_presentation_port=1234
+# trail_editorial_port=1235
+
+critical=150
+warning=100
+
+function check_trail() {
+  for el in /var/lib/ece-install/*.trail ; do
+    vars=$(diff <(set -a; unset _; env) <(set -a; unset _;source $el; env) | grep '^>' | sed -e s/^..// -e s/=.*//)
+    source $el
+    for var in $vars ; do
+      if [[ $var =~ ^.*_port$ ]] ; then
+        name=${var#trail_}
+        name=${name%_port}
+        check_port_listening $name ${!var}
+        check_port_status $name ${!var}
+      fi
+      unset $var
+    done
+  done
+}
+
+function check_port_listening() { # foo 4040
+  name=$1
+  port=$2
+  listening=$(sudo -n lsof -s TCP:LISTEN -i 4:$port -n | tail -n +2 | wc -l)
+  if [ $listening -eq 0 ] ; then
+    echo "2 port_${name}_${port}_listen - CRITICAL: not listening on $name port $port"
+    return;
+  fi
+
+  echo "0 port_${name}_${port}_listen - OK: listening on $name port $port."
+}
+
+function check_port_status() { # foo 4040
+  name=$1
+  port=$2
+  established=$(sudo -n lsof -s TCP:ESTABLISHED -i 4:$port -n | tail -n +2 | wc -l)
+  if [ $established -gt $critical ] ; then
+    echo "2 port_${name}_${port}_established - CRITICAL: $established established connections to on $name port $port"
+    return;
+  fi
+
+  if [ $established -gt $warning ] ; then
+    echo "1 port_${name}_${port}_established - WARNING: $established established connections to on $name port $port"
+    return;
+  fi
+
+  echo "0 port_${name}_${port}_established - OK: $established established connections to on $name port $port"
+}
+
+# TODO: make thresholds different based on the type of port (e.g. editorial
+#  port vs presentation port vs caching port).
+
+# TODO: monitor the number of SYN_RECV and verify that it's a low number,
+# an early warning of slowness in the system.
+
+# TODO: monitor virtual hosts are accessible using the host names and port
+# numbers provided in the .trail files
+
+check_trail
diff --git a/usr/lib/check_mk_agent/local/varnish b/usr/lib/check_mk_agent/local/varnish
new file mode 100755
index 00000000..6e5317f0
--- /dev/null
+++ b/usr/lib/check_mk_agent/local/varnish
@@ -0,0 +1,67 @@
+#!/bin/bash
+
+# Monitors the varnish access log to see if the number of 404s or other
+# errors exceed various thresholds.
+
+# Checks are only made if varnish has START=yes in its /etc/default/varnish.
+
+# This check_mk plug-in results in checks called
+# varnish_health-404  -  Monitors the number of 404 responses from the site
+# varnish_health-other - Monitors the number of non-404 error responses
+#                        from the site, e.g. 503 etc.
+#
+# The hardcoded thresholds are:
+#  >5% 404 -> warning
+#  >30% 404 -> critical
+#  >1% other errors -> warning
+#  >10% other errors -> critical
+
+
+warning404=50   # 404 requests per 1000 (5%)
+critical404=300 # 404 requests per 1000 (30%)
+warningerr=10   # failed requests per 1000 (1%)
+criticalerr=100 # requests per 1000 (10%)
+name="varnish_health"
+
+function determine_health() {
+  state=0
+  results=( $(varnishncsa -d -F %s | awk 'BEGIN { err404=0; err = 0; ok=0; } { if ($1 == 404) err404 = err404 +1 ; else if ($1 >= 400) err = err + 1; else ok = ok + 1 } END { factor404=int(err404*1000/(ok+err+err404+1)); factorerr=int(err*1000/(ok+err+err404+1)); print factor404 "\t" factorerr "\t"  ok "\t" err404 "\t" err } ') )
+  if [ ${PIPESTATUS[0]} != 0 ] ; then
+    echo "3 ${name}-404 - varnishncsa executed with ${PIPESTATUS[0]}"
+    echo "3 ${name}-other - varnishncsa executed with ${PIPESTATUS[0]}"
+    exit
+  fi
+
+  #     type   factor         ok            failed          warn       crit
+  check "404" ${results[0]} $((${results[2]} + ${results[4]})) ${results[3]} $warning404 $critical404
+  check "other" ${results[1]} $((${results[2]} + ${results[3]})) ${results[4]} $warningerr $criticalerr
+}
+
+function check() {
+  if [ $2 -gt $6 ] ; then
+    state=2
+  elif [ $2 -gt $5 ] ; then
+    state=1
+  fi
+
+  if [ $state -gt 0 ] ; then
+    message="$4 of the last $(( $3 + $4 )) requests responded with HTTP $1"
+  else
+    message="Fewer than $5 of 1000 requests ($4/$(($3+$4))) responded with HTTP $1"
+  fi
+  echo "$state $name-$1 factor=$2|ok=$3|err=$4 $message"
+}
+
+if [ -r /etc/default/varnish ] ; then
+  (
+    . /etc/default/varnish
+    export START
+  )
+  if [ $START=yes ] ; then
+    varnishncsa=$(which varnishncsa)
+    if [ ! -z $varnishncsa ] ; then
+      determine_health
+    fi
+  fi
+fi
+

From 9e76ccf2e2cd5f0f8dc852fdcec40eb3921365da Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 31 Jul 2012 15:24:52 +0200
Subject: [PATCH 1061/2585] - improved the service listing in system-info. Now,
 it only includes   the information which is interesting in a system-info
 context.

  The output is also numerical sorted on port number:

  22     629/sshd
  80     30163/varnishd
  81     30192/nginx
  3306   901/mysqld
  5666   11717/nrpe
  5678   11856/lighttpd
  6082   30094/varnishd
  8005   25239/java
  8080   25239/java
  11211  1608/memcached
---
 usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh b/usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh
index a0c52bd8..c7975523 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh
@@ -1,6 +1,6 @@
 
 print_h2_header "Overview of all server services on $HOSTNAME"
-print_pre_text "$(netstat -ntlp 2>/dev/null | sed -r 's,[0-9]+/([-\.a-z0-9]*).*,\1,' )"
+print_pre_text "$(netstat -ntlp 2>/dev/null | awk '{print $4, $7}' | cut -d':' -f2 | grep ^[0-9] | sort -n | uniq | column -t)"
 
 if [ $(whoami) != "root" ]; then
   print_p_text "Run $(basename $0) as  root to get more details in this listing"

From cca9c53b3d468d3b9f81e2680815ec69a26c62e0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 31 Jul 2012 16:08:04 +0200
Subject: [PATCH 1062/2585] - removed  debug

---
 .../escenic/ece-scripts/system-info.d/11-list-ece-overview.sh  | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh b/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
index 559bbc38..f6ff2b43 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
@@ -11,10 +11,7 @@ function get_instance_type() {
     source /etc/default/ece
 
     for el in "$analysis_instance_list"; do
-      echo "[$el] == [$1] ?" >> /tmp/t
-      
       if [[ "$(ltrim $el)" == "$1" ]]; then
-        echo yes >> /tmp/t
         type=analysis
       fi
     done

From 8e8583737a4c23d138c9ca88316f5df8d0c421f8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 31 Jul 2012 16:27:06 +0200
Subject: [PATCH 1063/2585] - system-info now produces a compact overview of
 the running services   and their ports:

  Overview of all server services on ubuntu:
     |
      Port	PID/program
      22     629/sshd
      80     30163/varnishd
      81     30192/nginx
      3306   901/mysqld
      4949   10037/munin-node
      5666   10327/nrpe
      5678   10466/lighttpd
      6082   30094/varnishd
      8005   5946/java
      8080   5946/java
      11211  1608/memcached

- added function print_listening_services to
  system-info::55-list-services.sh since it was getting so complex.
---
 .../ece-scripts/system-info.d/55-list-services.sh    | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh b/usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh
index c7975523..272942fe 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh
@@ -1,6 +1,16 @@
+function print_listening_services() {
+  echo -e "Port	PID/program";
+  netstat -ntlp 2>/dev/null | \
+    grep ^tcp | \
+    sed -e 's/127.0.0.1://g' -e 's/0.0.0.0://g' -e  's/::://g' | \
+    awk '{print $4, $7}' | \
+    sort -n | \
+    uniq | \
+    column -t
+}
 
 print_h2_header "Overview of all server services on $HOSTNAME"
-print_pre_text "$(netstat -ntlp 2>/dev/null | awk '{print $4, $7}' | cut -d':' -f2 | grep ^[0-9] | sort -n | uniq | column -t)"
+print_pre_text "$(print_listening_services)"
 
 if [ $(whoami) != "root" ]; then
   print_p_text "Run $(basename $0) as  root to get more details in this listing"

From b6e088fe8f37870a2565fe6a6ac752d132ec5a9a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 31 Jul 2012 16:30:27 +0200
Subject: [PATCH 1064/2585] - when running ece-deploy for type=search, (ece -t
 search -i search1   deploy), the engine-config.jar is removed. This removes
 hundreds   (not to say thousands) of error messages in the logs where the  
 search instance tries to bootstrap ECE and fails when it cannot find   the
 DB.

  Albeit not a fatal error, this behaviour is exhaustive and makes
  the log files grow uncontrollably.

- added hardening to ece-deploy, more run wrappers. This also
  simplified the error handling
---
 usr/share/escenic/ece-scripts/ece.d/deploy.sh | 48 ++++++++++++-------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/deploy.sh b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
index e880cdaa..336cc2fc 100644
--- a/usr/share/escenic/ece-scripts/ece.d/deploy.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
@@ -1,3 +1,5 @@
+# Module for the 'ece deploy' command.
+
 wget_opts="--continue --inet4-only --quiet"
 
 function get_state_file() {
@@ -68,8 +70,11 @@ function deploy() {
   
   # extract EAR to a temporary area
   local dir=$(mktemp -d)
-  (mkdir -p $dir && cd $dir && jar xf $ear)
-  exit_on_error "extracting $ear to $dir"
+  (
+    run mkdir -p $dir
+    run cd $dir
+    run jar xf $ear
+  )
 
   print "Deploying $ear on $appserver ..."
   
@@ -81,10 +86,10 @@ function deploy() {
       # i.e wrong versions of certain libraries.
       if [ -d $tomcat_base/escenic/lib ]; then
         if [ `ls $tomcat_base/escenic/lib | grep .jar | wc -l` -gt 0 ]; then
-          rm $tomcat_base/escenic/lib/*.jar
-          exit_on_error "removing previous deployed libraries"
+          run rm $tomcat_base/escenic/lib/*.jar
         fi
         run cp $dir/lib/*.jar $tomcat_base/escenic/lib
+        remove_unwanted_libraries $tomcat_base/escenic/lib
       else
         print "Could not find $tomcat_base/escenic/lib. Exiting."
         print "Also make sure that you have defined this directory in"
@@ -94,26 +99,16 @@ function deploy() {
         exit 1
       fi
       
-      exit_on_error "copying lib files to app server classpath"
-
-      rm -rf $tomcat_base/work/* \
-        1>>$log \
-        2>>$log
-      
-      exit_on_error "removing work files from tomcat"
+      run rm -rf $tomcat_base/work/*
 
       for war in $dir/*.war ; do
         if [ -d $tomcat_base/webapps/`basename $war .war` ] ; then
-          rm -rf $tomcat_base/webapps/`basename $war .war` \
-            1>>$log \
-            2>>$log
-          exit_on_error "removing already deployed escenic wars in $tomcat_base/webapps/"
+          run rm -rf $tomcat_base/webapps/`basename $war .war`
         fi
       done
 
-            # this scenario is likely when running many minimal
-            # instances of tomcat and some of these are not properly
-            # initialised.
+      # this scenario is likely when running many minimal instances of
+      # tomcat and some of these are not properly initialised.
       if [ ! -d $tomcat_base/webapps ]; then
         print $tomcat_base/webapps "doesn't exist, exiting."
         exit 1
@@ -214,3 +209,20 @@ function add_memcached_support() {
 
   exit_on_error "sed on $file"
 }
+
+## Removes unwanted JARs. e.g. if type=search, we remove the
+## engine-config.jar
+##
+## $1 :: the directory to check
+function remove_unwanted_libraries() {
+  if [ ! $1 ]; then
+    return
+  elif [ ! -d $1 ]; then
+    return
+  elif [ $type != "search" ]; then
+    return
+  fi
+  
+  log "Removing $1/engine-config-*.jar since this is a search instance"
+  run rm $1/engine-config-*.jar
+}

From d00d6e5c2f9a5192b3ddc133928b444840d16494 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 31 Jul 2012 16:53:11 +0200
Subject: [PATCH 1065/2585] - added common-io::get_file_age_in_seconds

---
 usr/share/escenic/ece-scripts/common-io.sh | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/common-io.sh b/usr/share/escenic/ece-scripts/common-io.sh
index f07fcae1..06d9b673 100644
--- a/usr/share/escenic/ece-scripts/common-io.sh
+++ b/usr/share/escenic/ece-scripts/common-io.sh
@@ -160,3 +160,18 @@ function verify_that_directory_and_file_are_writeable() {
     fi
   fi
 }
+
+## Returns the number of seconds since the file was changed.
+## $1 the file
+function get_file_age_in_seconds() {
+  if [ ! $1 ]; then
+    return
+  elif [ ! -e $1 ]; then
+    return
+  fi
+
+  local changed=$(stat -c %Y "$1")
+  local now=$(date +%s)
+  
+  echo $(( now - changed ))
+}

From 64a1d3d6309616fce112d4dc08edce05c275e2ce Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 31 Jul 2012 17:07:31 +0200
Subject: [PATCH 1066/2585] - system-info now uses a cache file for storing the
 ifconfig.me   results (the host's IP to the outside world). This should both
 make   system-info faster while allowing for more accurate operation since  
 the ifconfig.me call, when executed, can be allowed a higher   timeout.

  If the cache file is more than 10 minutes old, it's updated.

- system-info uses common-io::get_file_age_in_seconds

- ifconfig.me GET timeout set to 30 seconds
---
 .../ece-scripts/system-info.d/55-list-ips.sh  | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/55-list-ips.sh b/usr/share/escenic/ece-scripts/system-info.d/55-list-ips.sh
index 923b0f0f..c42eba9c 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/55-list-ips.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/55-list-ips.sh
@@ -1,3 +1,20 @@
+function print_my_ip_to_the_world() {
+  local file=$HOME/.vizrt/system-info/myip.cache
+  mkdir -p $(dirname $file)
+
+  # we only query ifconfig.me every ten minutes
+  local max_age=600
+
+  if [[ ! -e $file || $(get_file_age_in_seconds $file) -gt $max_age ]]; then
+    curl --silent \
+      --connect-timeout 30 \
+      ifconfig.me \
+      2>/dev/null \
+      > $file
+  fi
+
+  cat $file
+}
 
 print_h2_header "Overview of IPs on $HOSTNAME"
 
@@ -5,6 +22,6 @@ print_h3_header "Interfaces and their IPs"
 print_pre_text "$(/sbin/ifconfig | grep -v inet6 | egrep -v "127.0" | grep inet -B 1 | sed 's/--//g')"
 
 print_h3_header "${HOSTNAME}'s IP when accessing the world"
-print_pre_text "$(curl --silent --connect-timeout 5 ifconfig.me 2>/dev/null)"
+print_pre_text "$(print_my_ip_to_the_world)"
 
 print_section_end

From 31f31bbbde8c7d905b8aced68b7613434fae922e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 1 Aug 2012 09:58:47 +0200
Subject: [PATCH 1067/2585] - solr is logging typical debug statements on INFO,
 e.g. whenever   we're updating solr. Hence I changed the logging level from
 INFO to   WARNING.

  We're seeing daily solr files in production ~300MB, this fix should
  hopefully remedy this.
---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index f29ecb69..4655f06f 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -456,7 +456,7 @@ java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
 6localhost.org.apache.juli.FileHandler.directory = $escenic_log_dir
 6localhost.org.apache.juli.FileHandler.prefix = solr.
 
-org.apache.solr.level=INFO
+org.apache.solr.level=WARNING
 org.apache.solr.handlers=6localhost.org.apache.juli.FileHandler
 
 org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO

From d9044fb882af3ea165e63844f2d1bdf3ec4748ed Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 1 Aug 2012 10:34:40 +0200
Subject: [PATCH 1068/2585] - the ece-install.conf examples are now included in
 the   escenic-content-engine-installer package.

- the .html version of the guides are no longer included in the
  package.
---
 usr/share/escenic/package-scripts/create-packages | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 275af3c5..5009d063 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -75,14 +75,16 @@ function create_target_directory() {
 function set_up_escenic-content-engine-installer() {
   mkdir -p $target_dir/{etc,usr,/etc/default}
   mkdir -p $target_dir/usr/{bin,sbin,share/doc}
-  mkdir -p $target_dir/usr/share/doc/escenic
+  mkdir -p $target_dir/usr/share/doc/escenic/examples
   mkdir -p $target_dir/usr/share/escenic/ece-scripts
   
   cp -r ../../../sbin/ece-install $target_dir/usr/sbin/
   cp -r ../../escenic/ece-scripts/ece-install.d/ \
     $target_dir/usr/share/escenic/ece-scripts/
-  cp -r ../../doc/escenic/ece-install-guide.{org,html} \
+  cp -r ../../doc/escenic/ece-install-guide.org \
     $target_dir/usr/share/doc/escenic
+  cp -r ../../doc/escenic/examples/ece-install-*.conf \
+    $target_dir/usr/share/doc/escenic/examples/
 }
 
 function set_up_escenic-build-scripts() {

From 056796e5419f2c889f0077adf4d0cf870a2b8e6b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 1 Aug 2012 10:42:26 +0200
Subject: [PATCH 1069/2585] - only include the <instance>/etc/hosts.d in the
 search if it exists.

---
 usr/share/vizrt/vosa/commands/push.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/usr/share/vizrt/vosa/commands/push.sh b/usr/share/vizrt/vosa/commands/push.sh
index 415f4e20..6a623556 100644
--- a/usr/share/vizrt/vosa/commands/push.sh
+++ b/usr/share/vizrt/vosa/commands/push.sh
@@ -89,8 +89,13 @@ ff02::2 ip6-allrouters
 ########################################################################
 EOF
 
-  find ${files_dir}/common/etc/hosts.d/ \
-    ${files_dir}/${instance}/etc/hosts.d \
+  local find_dirs=${files_dir}/common/etc/hosts.d
+  if [ -d ${files_dir}/${instance}/etc/hosts.d ]; then
+    find_dirs="$find_dirs ${files_dir}/${instance}/etc/hosts.d"
+  fi
+  
+  find  \
+    $find_dirs \
     -type f | while read f; do
     cat >> $file <<EOF
 ## From ${HOSTNAME}:${f}

From 4e8f4e3d22580bb3bdadec2c68a87113e6c5aba5 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 1 Aug 2012 07:20:51 -0400
Subject: [PATCH 1070/2585] - added dependency on commons-io

---
 usr/bin/system-info | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/bin/system-info b/usr/bin/system-info
index cefc4c2c..d33f9a51 100755
--- a/usr/bin/system-info
+++ b/usr/bin/system-info
@@ -33,6 +33,7 @@ function init() {
 
   source $ece_scripts_dir/common-ece.sh
   source $ece_scripts_dir/common-bashing.sh
+  source $ece_scripts_dir/common-io.sh
 }
 
 ## Runs extra system-info modules

From 34d616cd010d073d5332e610f29c739d04096d76 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 1 Aug 2012 08:02:30 -0400
Subject: [PATCH 1071/2585] - the escenic-check-mk-plugins now contain mogsie's
 check_mk plugins!

---
 usr/share/escenic/package-scripts/create-packages | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 5009d063..a265836d 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -65,6 +65,8 @@ function create_target_directory() {
     set_up_escenic-common-scripts
   elif [[ $package_name == "escenic-munin-plugins" ]]; then
     set_up_escenic-munin-plugins
+  elif [[ $package_name == "escenic-check-mk-plugins" ]]; then
+    set_up_escenic-check-mk-plugins
   fi
 
   debian_dir=$target_dir/DEBIAN
@@ -164,6 +166,8 @@ function set_up_escenic-common-scripts() {
 
 function set_up_escenic-check-mk-plugins() {
   mkdir -p $target_dir/usr/lib/check_mk_agent/local
+  cp -r ../../../lib/check_mk_agent/local/* \
+    $target_dir/usr/lib/check_mk_agent/local/
 }
 
 function set_up_escenic-munin-plugins() {

From 25ccb8fded438bdb6368ad2cd16fbfd19ba7a979 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=F6n?= <oschoen@vizrt.com>
Date: Wed, 1 Aug 2012 14:15:30 +0200
Subject: [PATCH 1072/2585] build.sh added missing action in release stage

---
 usr/share/escenic/build-scripts/build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/build-scripts/build.sh b/usr/share/escenic/build-scripts/build.sh
index 15cfc863..617a4608 100755
--- a/usr/share/escenic/build-scripts/build.sh
+++ b/usr/share/escenic/build-scripts/build.sh
@@ -442,6 +442,7 @@ function phase_release
 {
   svn_checkout
   maven_build
+  symlink_project_assembly
   generate_publication_properties
   ant_build
   publish_ear

From d759949262f87d25e97181189afe21a68d325b20 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 1 Aug 2012 08:19:39 -0400
Subject: [PATCH 1073/2585] - system-info now lists ports and programs without
 their corresponding   PID. The reason for this omission, is that the same
 services can   change PIDs during their life time and the PID isn't
 interesting in   the context of system-info (normally).

---
 .../escenic/ece-scripts/system-info.d/55-list-services.sh    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh b/usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh
index 272942fe..4fd04c2a 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh
@@ -1,12 +1,13 @@
 function print_listening_services() {
-  echo -e "Port	PID/program";
+  echo -e "Port\tProgram";
   netstat -ntlp 2>/dev/null | \
     grep ^tcp | \
     sed -e 's/127.0.0.1://g' -e 's/0.0.0.0://g' -e  's/::://g' | \
     awk '{print $4, $7}' | \
     sort -n | \
     uniq | \
-    column -t
+    column -t | \
+    sed 's#[0-9]*/##'
 }
 
 print_h2_header "Overview of all server services on $HOSTNAME"

From 310430a722d4dd11463175452b31bd77c8f41661 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 1 Aug 2012 16:07:45 +0200
Subject: [PATCH 1074/2585] - when listening services, system-info now also
 filters out IPv6   prefix for (or the equivalent of) IPv4 0.0.0.0

---
 usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh b/usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh
index 4fd04c2a..78cc82f5 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/55-list-services.sh
@@ -2,7 +2,7 @@ function print_listening_services() {
   echo -e "Port\tProgram";
   netstat -ntlp 2>/dev/null | \
     grep ^tcp | \
-    sed -e 's/127.0.0.1://g' -e 's/0.0.0.0://g' -e  's/::://g' | \
+    sed -e 's/127.0.0.1://g' -e 's/0.0.0.0://g' -e 's/::://g' -e 's/::1://g' | \
     awk '{print $4, $7}' | \
     sort -n | \
     uniq | \

From 5295c651e5cc216aa0ca99679a6f7404ed92d4ce Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@geronimo>
Date: Thu, 2 Aug 2012 07:49:26 +0200
Subject: [PATCH 1075/2585] - improved the client side NFS handling to avoid
 endless hanging   client requests while NFS servers are done, whilst at the
 same time   limit the chance of data corruption.

  Recommended sources:
  man nfs
  http://tldp.org/HOWTO/NFS-HOWTO/client.html
---
 .../ece-scripts/ece-install.d/network-file-system.sh      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh b/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
index 9c480474..7db15a47 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
@@ -76,8 +76,14 @@ function install_nfs_client() {
   local mount_point_list=""
   local file=/etc/fstab
   
+  # We set up NFS with the read write access, hard mounts to avoid
+  # data corruption and intr to allow hanging NFS operations to be
+  # interrupted. intr is much better than 'soft' as the latter often
+  # can lead to data corruption.
+  local nfs_fstab_options="rw,hard,intr"
+  
   for el in $nfs_export_list; do
-    local entry="${nfs_server_address}:$el ${nfs_client_mount_point_parent}/$(basename $0) nfs defaults 0 0"
+    local entry="${nfs_server_address}:$el ${nfs_client_mount_point_parent}/$(basename $0) nfs ${nfs_fstab_options} 0 0"
     if [ $(grep "$entry" $file | wc -l) -lt 1 ]; then
       cat >> $file <<EOF
 # added by $(basename $0) @ $(date)

From e8a5aade98982be1141c22bb05d7e40f6b83db31 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 2 Aug 2012 11:20:50 +0200
Subject: [PATCH 1076/2585] Added some comments to a check_mk plug-in

---
 usr/lib/check_mk_agent/local/ece | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/usr/lib/check_mk_agent/local/ece b/usr/lib/check_mk_agent/local/ece
index 6382511c..37bb04fa 100755
--- a/usr/lib/check_mk_agent/local/ece
+++ b/usr/lib/check_mk_agent/local/ece
@@ -1,5 +1,10 @@
 #!/bin/bash
 
+# check_mk plug-in to verify that the Escenic Content Engine instances are
+# actually running.  If there's something wrong with the pidfile (missing,
+# empty) or if the pid is not up (e.g. dead) then it goes critical.
+#
+
 engine_instance_list=""
 search_instance_list=""
 

From 1b4e3098ad2fd120567309775ee8e6b525eff482 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 2 Aug 2012 11:34:35 +0200
Subject: [PATCH 1077/2585] - added the first chapter of the new VOSA Handbook

---
 .../doc/vizrt/vosa-handbook/vosa-handbook.org | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org

diff --git a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
new file mode 100644
index 00000000..ca9fca0a
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
@@ -0,0 +1,46 @@
+#+TITLE: Welcome to the VOSA Handbook
+#+AUTHOR: Torstein Krause Johansen
+#+AUTHOR: Erik Mogensen
+
+* Operating System Maintenance
+
+Before proceeding, please note that this is serious stuff. To update
+the OS packages, you should feel comfortable resolving typical RPM or
+DEB conflicts and set aside enough time to deal with any package
+breakage which might occur. 
+
+All servers, both the Ubunut and RedHat ones, are running stable
+branches of their OS, so normally, there will be no breakage, and
+upgrades should be safe to be carried out on a regular (bi-weekly for
+instance) basis. However, you should always be fully alert when making
+these updates and be sure to have enough time on your hands to resolve
+any issues before going ahead with the upgrades below.
+
+** Debian based operating systems
+This applies to OSs like Debian, Ubuntu and Mint.
+
+To update the OS packages, including security patches and the escenic
+and VOSA packages from http://apt.vizrt.com, do:
+
+In the example below, we update the Ubuntu servers called pres1,
+pres2, edit1, edit2, mon and analysis:
+#+BEGIN_SRC sh
+control$ for el in pres{1,2} edit{1,2}, mon analysis; do \
+           echo "Now upgrading $el"; \
+           sudo ssh root@$el 'apt-get -qq update && apt-get -q upgrade' ; \
+         done
+#+END_SRC
+
+
+** RedHat based operating systems
+This applies to OSs like CentOS, RedHat and Fedora:
+
+In the example below, we update the Ubuntu servers called pres1,
+pres2, edit1, edit2, mon and analysis:
+
+#+BEGIN_SRC sh
+control$ for el in pres{1,2} edit{1,2}, mon analysis; do \
+           echo "Now upgrading $el";
+           ssh $(basename $el) yum update; 
+         done
+#+END_SRC

From ff6e5cdd158bcc920997526dde231337f769a31e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 2 Aug 2012 11:35:58 +0200
Subject: [PATCH 1078/2585] - removed redundant paragraph

---
 usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
index ca9fca0a..9b7c6df0 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
+++ b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
@@ -19,9 +19,6 @@ any issues before going ahead with the upgrades below.
 ** Debian based operating systems
 This applies to OSs like Debian, Ubuntu and Mint.
 
-To update the OS packages, including security patches and the escenic
-and VOSA packages from http://apt.vizrt.com, do:
-
 In the example below, we update the Ubuntu servers called pres1,
 pres2, edit1, edit2, mon and analysis:
 #+BEGIN_SRC sh

From 6c451ee2b38e100ce8f4f36013abe18471485f8b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 2 Aug 2012 11:38:16 +0200
Subject: [PATCH 1079/2585] - moved the OS maintenance chapter into its own
 file - include this from the main file

---
 .../operating-system-maintenance.org          | 39 ++++++++++++++++++
 .../doc/vizrt/vosa-handbook/vosa-handbook.org | 40 +------------------
 2 files changed, 40 insertions(+), 39 deletions(-)
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/operating-system-maintenance.org

diff --git a/usr/share/doc/vizrt/vosa-handbook/operating-system-maintenance.org b/usr/share/doc/vizrt/vosa-handbook/operating-system-maintenance.org
new file mode 100644
index 00000000..a24341c2
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/operating-system-maintenance.org
@@ -0,0 +1,39 @@
+* Operating System Maintenance
+
+Before proceeding, please note that this is serious stuff. To update
+the OS packages, you should feel comfortable resolving typical RPM or
+DEB conflicts and set aside enough time to deal with any package
+breakage which might occur. 
+
+All servers, both the Ubunut and RedHat ones, are running stable
+branches of their OS, so normally, there will be no breakage, and
+upgrades should be safe to be carried out on a regular (bi-weekly for
+instance) basis. However, you should always be fully alert when making
+these updates and be sure to have enough time on your hands to resolve
+any issues before going ahead with the upgrades below.
+
+** Debian based operating systems
+This applies to OSs like Debian, Ubuntu and Mint.
+
+In the example below, we update the Ubuntu servers called pres1,
+pres2, edit1, edit2, mon and analysis:
+#+BEGIN_SRC sh
+control$ for el in pres{1,2} edit{1,2}, mon analysis; do \
+           echo "Now upgrading $el"; \
+           sudo ssh root@$el 'apt-get -qq update && apt-get -q upgrade' ; \
+         done
+#+END_SRC
+
+
+** RedHat based operating systems
+This applies to OSs like CentOS, RedHat and Fedora:
+
+In the example below, we update the Ubuntu servers called pres1,
+pres2, edit1, edit2, mon and analysis:
+
+#+BEGIN_SRC sh
+control$ for el in pres{1,2} edit{1,2}, mon analysis; do \
+           echo "Now upgrading $el";
+           ssh $(basename $el) yum update; 
+         done
+#+END_SRC
diff --git a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
index 9b7c6df0..761178d3 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
+++ b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
@@ -2,42 +2,4 @@
 #+AUTHOR: Torstein Krause Johansen
 #+AUTHOR: Erik Mogensen
 
-* Operating System Maintenance
-
-Before proceeding, please note that this is serious stuff. To update
-the OS packages, you should feel comfortable resolving typical RPM or
-DEB conflicts and set aside enough time to deal with any package
-breakage which might occur. 
-
-All servers, both the Ubunut and RedHat ones, are running stable
-branches of their OS, so normally, there will be no breakage, and
-upgrades should be safe to be carried out on a regular (bi-weekly for
-instance) basis. However, you should always be fully alert when making
-these updates and be sure to have enough time on your hands to resolve
-any issues before going ahead with the upgrades below.
-
-** Debian based operating systems
-This applies to OSs like Debian, Ubuntu and Mint.
-
-In the example below, we update the Ubuntu servers called pres1,
-pres2, edit1, edit2, mon and analysis:
-#+BEGIN_SRC sh
-control$ for el in pres{1,2} edit{1,2}, mon analysis; do \
-           echo "Now upgrading $el"; \
-           sudo ssh root@$el 'apt-get -qq update && apt-get -q upgrade' ; \
-         done
-#+END_SRC
-
-
-** RedHat based operating systems
-This applies to OSs like CentOS, RedHat and Fedora:
-
-In the example below, we update the Ubuntu servers called pres1,
-pres2, edit1, edit2, mon and analysis:
-
-#+BEGIN_SRC sh
-control$ for el in pres{1,2} edit{1,2}, mon analysis; do \
-           echo "Now upgrading $el";
-           ssh $(basename $el) yum update; 
-         done
-#+END_SRC
+#+INCLUDE: "operating-system-maintenance.org" 

From 1e4b322999d6d5605c1d00cf06855bcd33807b49 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 2 Aug 2012 11:41:15 +0200
Subject: [PATCH 1080/2585] - removed basename de-refence

---
 .../doc/vizrt/vosa-handbook/operating-system-maintenance.org    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/operating-system-maintenance.org b/usr/share/doc/vizrt/vosa-handbook/operating-system-maintenance.org
index a24341c2..25815948 100644
--- a/usr/share/doc/vizrt/vosa-handbook/operating-system-maintenance.org
+++ b/usr/share/doc/vizrt/vosa-handbook/operating-system-maintenance.org
@@ -34,6 +34,6 @@ pres2, edit1, edit2, mon and analysis:
 #+BEGIN_SRC sh
 control$ for el in pres{1,2} edit{1,2}, mon analysis; do \
            echo "Now upgrading $el";
-           ssh $(basename $el) yum update; 
+           ssh yum update; 
          done
 #+END_SRC

From 79d8b882b0f9f4fe7f41fc7e38b0db1c635521b6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 2 Aug 2012 11:52:43 +0200
Subject: [PATCH 1081/2585] - added two new chapters on deployment

---
 .../vosa-handbook/deploying-a-new-ear.org     | 37 +++++++++++++++++++
 .../updating-publication-resources.org        |  2 +
 .../doc/vizrt/vosa-handbook/vosa-handbook.org |  4 ++
 3 files changed, 43 insertions(+)
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/deploying-a-new-ear.org
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/updating-publication-resources.org

diff --git a/usr/share/doc/vizrt/vosa-handbook/deploying-a-new-ear.org b/usr/share/doc/vizrt/vosa-handbook/deploying-a-new-ear.org
new file mode 100644
index 00000000..0a89f64f
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/deploying-a-new-ear.org
@@ -0,0 +1,37 @@
+** Deploying a new EAR file
+In the examples here, we have a build server on builder.example.com
+where we build EARs for the the tomato website.
+
+*** Deploying a new EAR file for an ECE instance
+#+BEGIN_SRC sh
+torstein@control:~$ sudo ssh escenic@pres1 \
+  ece \
+    -i engine1 \
+    --uri http://builder.example.com/tomato/releases/tomato-trunk-rev4121-2012-07-05_1524.ear \
+    deploy
+[ece#engine-engine1] Deploying http://builder.example.com/tomato/releases/tomato-trunk-rev4121-2012-07-05_1524.ear on engine1 ...
+[ece#engine-engine1] Deploying /var/cache/escenic/tomato-trunk-rev4121-2012-07-05_1524.ear on tomcat ...
+[ece#engine-engine1] Deployment white list active, only deploying: eb escenic-admin indexer-webservice
+[ece#engine-engine1] Deployment state file updated: /var/lib/escenic/engine1.state
+#+END_SRC
+
+
+*** Deploying a new EAR file for a search instance
+The search instance is special in that you have to specify the type
+parameter. Apart from this, the command is identical. You'll see that
+the search instance has a different deployment white list than that of
+the ECE instance above.
+
+#+BEGIN_SRC sh
+torstein@control:~$ sudo ssh escenic@pres1 \
+  ece \
+    -i search1 \
+    -t search \
+    --uri http://builder.example.com/tomato/releases/tomato-trunk-rev4121-2012-07-05_1524.ear \
+    deploy
+[ece#search-search1] Deploying http://builder.example.com/tomato/releases/tomato-trunk-rev4121-2012-07-05_1524.ear on search1 ...
+[ece#search-search1] Deploying /var/cache/escenic/tomato-trunk-rev4121-2012-07-05_1524.ear on tomcat ...
+[ece#search-search1] Deployment white list active, only deploying: escenic-admin solr indexer-webapp
+[ece#search-search1] Deployment state file updated: /var/lib/escenic/search1.state  
+#+END_SRC
+
diff --git a/usr/share/doc/vizrt/vosa-handbook/updating-publication-resources.org b/usr/share/doc/vizrt/vosa-handbook/updating-publication-resources.org
new file mode 100644
index 00000000..ba7892cf
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/updating-publication-resources.org
@@ -0,0 +1,2 @@
+** Updating Publication Resources
+
diff --git a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
index 761178d3..da479845 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
+++ b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
@@ -3,3 +3,7 @@
 #+AUTHOR: Erik Mogensen
 
 #+INCLUDE: "operating-system-maintenance.org" 
+
+* Deployment
+#+INCLUDE: "deploying-a-new-ear.org"
+#+INCLUDE: "updating-publication-resources.org"

From f22b697f1bb4744ec3069358e8bfc2d89c1ed305 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 2 Aug 2012 11:53:56 +0200
Subject: [PATCH 1082/2585] - changes because of github rendering bug

---
 .../doc/vizrt/vosa-handbook/deploying-a-new-ear.org | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/deploying-a-new-ear.org b/usr/share/doc/vizrt/vosa-handbook/deploying-a-new-ear.org
index 0a89f64f..09da3e9b 100644
--- a/usr/share/doc/vizrt/vosa-handbook/deploying-a-new-ear.org
+++ b/usr/share/doc/vizrt/vosa-handbook/deploying-a-new-ear.org
@@ -4,11 +4,7 @@ where we build EARs for the the tomato website.
 
 *** Deploying a new EAR file for an ECE instance
 #+BEGIN_SRC sh
-torstein@control:~$ sudo ssh escenic@pres1 \
-  ece \
-    -i engine1 \
-    --uri http://builder.example.com/tomato/releases/tomato-trunk-rev4121-2012-07-05_1524.ear \
-    deploy
+torstein@control:~$ sudo ssh escenic@pres1 ece -i engine1 --uri http://builder.example.com/tomato/releases/tomato-trunk-rev4121-2012-07-05_1524.ear  deploy
 [ece#engine-engine1] Deploying http://builder.example.com/tomato/releases/tomato-trunk-rev4121-2012-07-05_1524.ear on engine1 ...
 [ece#engine-engine1] Deploying /var/cache/escenic/tomato-trunk-rev4121-2012-07-05_1524.ear on tomcat ...
 [ece#engine-engine1] Deployment white list active, only deploying: eb escenic-admin indexer-webservice
@@ -23,12 +19,7 @@ the search instance has a different deployment white list than that of
 the ECE instance above.
 
 #+BEGIN_SRC sh
-torstein@control:~$ sudo ssh escenic@pres1 \
-  ece \
-    -i search1 \
-    -t search \
-    --uri http://builder.example.com/tomato/releases/tomato-trunk-rev4121-2012-07-05_1524.ear \
-    deploy
+torstein@control:~$ sudo ssh escenic@pres1 ece -i search1 -t search --uri http://builder.example.com/tomato/releases/tomato-trunk-rev4121-2012-07-05_1524.ear deploy
 [ece#search-search1] Deploying http://builder.example.com/tomato/releases/tomato-trunk-rev4121-2012-07-05_1524.ear on search1 ...
 [ece#search-search1] Deploying /var/cache/escenic/tomato-trunk-rev4121-2012-07-05_1524.ear on tomcat ...
 [ece#search-search1] Deployment white list active, only deploying: escenic-admin solr indexer-webapp

From 2b08c6ff60daea2076ae711e374791ba5c29c100 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 2 Aug 2012 11:59:16 +0200
Subject: [PATCH 1083/2585] - added more deployment documentation

---
 .../vizrt/vosa-handbook/deploying-a-new-ear.org | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/usr/share/doc/vizrt/vosa-handbook/deploying-a-new-ear.org b/usr/share/doc/vizrt/vosa-handbook/deploying-a-new-ear.org
index 09da3e9b..12c8e75b 100644
--- a/usr/share/doc/vizrt/vosa-handbook/deploying-a-new-ear.org
+++ b/usr/share/doc/vizrt/vosa-handbook/deploying-a-new-ear.org
@@ -11,6 +11,23 @@ torstein@control:~$ sudo ssh escenic@pres1 ece -i engine1 --uri http://builder.e
 [ece#engine-engine1] Deployment state file updated: /var/lib/escenic/engine1.state
 #+END_SRC
 
+We can now restart the ECE:
+
+#+BEGIN_SRC sh
+torstein@control$ sudo ssh root@pres1 /etc/init.d/ece restart 
+[ece#engine-engine1] Stopping the engine1 instance of engine on pres1 ...
+[ece#engine-engine1] Starting the engine1 instance of engine on pres1 ...
+[ece#search-search1] Stopping the search1 instance of search on pres1 ...
+[ece#search-search1] Starting the search1 instance of search on pres1 ...
+#+END_SRC
+
+To confirm see that the ECE instance came up again, do:
+
+#+BEGIN_SRC sh
+torstein@control:~$ sudo ssh root@pres1 /etc/init.d/ece status
+[ece#engine-engine1] UP 0d 0h 11m 45s
+[ece#search-search1] UP 0d 0h 11m 42s
+#+END_SRC
 
 *** Deploying a new EAR file for a search instance
 The search instance is special in that you have to specify the type

From 300787db355df655c9b936bbd95116d68470c210 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 2 Aug 2012 12:00:40 +0200
Subject: [PATCH 1084/2585] - fixed author

---
 usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
index da479845..f0d95be4 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
+++ b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
@@ -1,9 +1,7 @@
 #+TITLE: Welcome to the VOSA Handbook
-#+AUTHOR: Torstein Krause Johansen
-#+AUTHOR: Erik Mogensen
+#+AUTHOR: Erik Mogensen & Torstein Krause Johansen
 
 #+INCLUDE: "operating-system-maintenance.org" 
-
 * Deployment
 #+INCLUDE: "deploying-a-new-ear.org"
 #+INCLUDE: "updating-publication-resources.org"

From 99fe99afc8d0f25ff8ba8a3f6e4e2cecdd2de422 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 2 Aug 2012 13:00:45 +0200
Subject: [PATCH 1085/2585] - added

---
 .../updating-the-search-server.org            | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/updating-the-search-server.org

diff --git a/usr/share/doc/vizrt/vosa-handbook/updating-the-search-server.org b/usr/share/doc/vizrt/vosa-handbook/updating-the-search-server.org
new file mode 100644
index 00000000..478c8b2a
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/updating-the-search-server.org
@@ -0,0 +1,23 @@
+** Updating the Search Server
+
+When updating the search server, you might want to reconfigure the
+ECE instance(s) that use the search server you're updating. To do
+this, you can use the Component Browser in the escenic-admin
+interface.
+
+For instance, let's say you're upgrading the search server for edit1
+and want it to temporarily use edit2's search instance.
+
+First, go to:
+http://edit1:8080/escenic-admin/browser/Global/com/escenic/webservice/search/DelegatingSearchEngine?property=solrURI
+
+Then, change the value from:
+#+BEGIN_SRC sh
+http://localhost:8081/solr/select	  
+#+END_SRC
+
+to
+
+#+BEGIN_SRC sh
+http://edit2:8081/solr/select	  
+#+END_SRC

From cc78f7882d85400c2fe35b5aa12b6e38b99bee6a Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 2 Aug 2012 13:38:26 +0200
Subject: [PATCH 1086/2585] Monitoring profile updates

- monitoring agent includes check-mk-agent and xinetd
- monitoring agent includes escenic check-mk plug-ins
- monitoring server includes check-mk server components
- check-mk -I and -O are used to populate the nagios
  configuration
- /var/lib/icinga/rw have the correct permissions
  as per the README.Debian
- /usr/lib/nagios/plugins/check_icmp is setuid root as
  suggested by MK

common-bashing:
- run now supports parameters with spaces in them
---
 .../escenic/ece-scripts/common-bashing.sh     |   2 +-
 .../ece-scripts/ece-install.d/monitoring.sh   | 102 ++++++++++++------
 2 files changed, 68 insertions(+), 36 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index f6a30e5b..ee475da5 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -99,7 +99,7 @@ function exit_on_error() {
 }
 
 function run() {
-  $@ 1>>$log 2>>$log
+  "${@}" 1>>$log 2>>$log
   exit_on_error $@
 }
 
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index b32a39ab..25223437 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -12,11 +12,24 @@ function install_nagios_monitoring_server()
   
   if [ $on_debian_or_derivative -eq 1 ]; then
     if [[ $monitoring_vendor == $MONITORING_VENDOR_NAGIOS ]]; then
-      install_packages_if_missing apache2 nagios3 nagios-nrpe-plugin
+      install_packages_if_missing \
+	check-mk-server check-mk-config-nagios \
+        apache2 nagios3 nagios-nrpe-plugin
     else
       install_packages_if_missing \
+	check-mk-server check-mk-config-icinga \
         apache2 icinga nagios-nrpe-plugin icinga-doc
     fi
+
+    # TODO: make it work if check_icmp is in another location?
+    if [ -e /usr/lib/nagios/plugins/check_icmp ] ; then
+      # setuid root for icmp_check to make check_mk's host checks to work...???
+      # see http://lists.mathias-kettner.de/pipermail/checkmk-en/2009-November/000808.html
+      run chmod u+s /usr/lib/nagios/plugins/check_icmp
+    else
+      print_and_log "Unable to setuid root on check_icmp, needed by check_mk's host checks."
+    fi
+
   fi
 
   if [[ $monitoring_vendor == $MONITORING_VENDOR_ICINGA ]]; then
@@ -37,9 +50,15 @@ function install_nagios_monitoring_server()
   set_conf_file_value check_external_commands 1 $file
   dont_quote_conf_values=0
 
-  for el in $fai_monitoring_host_list; do
-    set_up_monitoring_host_def $monitoring_vendor $el
-  done
+  if [ $on_debian_or_derivative -eq 1 ]; then
+    if [[ $monitoring_vendor == $MONITORING_VENDOR_ICINGA ]]; then
+      # see /usr/share/doc/icinga-common/README.Debian
+      dpkg-statoverride --update --add nagios www-data 2710 /var/lib/icinga/rw
+      dpkg-statoverride --update --add nagios nagios 751 /var/lib/icinga
+    fi
+  fi
+
+  set_up_monitoring_host_def $monitoring_vendor $fai_monitoring_host_list; 
 
   if [[ $monitoring_vendor == $MONITORING_VENDOR_NAGIOS ]]; then
     file=/etc/nagios3/conf.d/hostgroups_nagios2.cfg
@@ -61,7 +80,7 @@ function install_nagios_monitoring_server()
 
   if [[ $monitoring_vendor == $MONITORING_VENDOR_NAGIOS ]]; then
     run /etc/init.d/nagios3 restart
-    add_next_step "Icinga monitoring interface: http://${HOSTNAME}/nagios3"
+    add_next_step "Nagios monitoring interface: http://${HOSTNAME}/nagios3"
   else
     run /etc/init.d/icinga restart
     add_next_step "Icinga monitoring interface: http://${HOSTNAME}/icinga"
@@ -75,39 +94,33 @@ function install_nagios_monitoring_server()
 ##
 ## $1 nagios flavour/vendor
 ## $2 <host name>#<ip>, e.g.: fire#192.168.1.100
+## (the trailing #<ip> is ignored for reasons of backward compatibility)
 function set_up_monitoring_host_def()
 {
-  local old_ifs=$IFS
-  IFS='#'
-  read host_name ip <<< "$2"
-  IFS=$old_ifs
-  
-  local file=/etc/icinga/objects/${host_name}_icinga.cfg
-  if [[ $1 == $MONITORING_VENDOR_NAGIOS ]]; then
-    file=/etc/nagios3/conf.d/${host_name}_nagios2.cfg
-  fi
-  
-  if [ $(grep "host_name $host_name" $file 2>/dev/null | wc -l) -gt 0 ]; then
-    print "$1 host" $host_name "already defined, skipping it."
-    return
-  fi
+  local monitoring_vendor=$1
+  shift;
+  local hosts=
+  local el=
 
-  # TODO add more services based on what kind of host it is.
-  cat >> $file <<EOF
-define host {
-  use generic-host
-  host_name $host_name
-  alias $host_name
-  address $ip
-}
+  for el in "${@}" ; do
+    hosts="$hosts '${el%#*}',"
+  done
+  # remove last ","
+  hosts="${hosts%,}"
+
+  make_dir /etc/check_mk
+  cat > /etc/check_mk/main.mk <<EOF
+# Generated by ece-install on $(date)
+all_hosts = [ $hosts ]
 
-define service {
-  use generic-service
-  host_name $host_name
-  service_description CPU load
-  check_command check_nrpe_1arg!check_load
+filesystem_default_levels = {
+   "levels"         : (90, 95), # levels in percent
+   "trend_timeleft" : (150, 48)  # run time left in hours until full
 }
+
 EOF
+  run check_mk -I
+  run check_mk -O
 
 }
 
@@ -115,7 +128,24 @@ function install_nagios_node()
 {
   print "Installing a Nagios client on $HOSTNAME ..."
   if [ $on_debian_or_derivative -eq 1 ]; then
-    install_packages_if_missing nagios-nrpe-server nagios-plugins
+    install_packages_if_missing \
+      xinetd \
+      check-mk-agent \
+      escenic-check-mk-plugins \
+      nagios-nrpe-server nagios-plugins
+    if [ -r /etc/xinetd.d/check_mk ] ; then
+      # enable check_mk in xinetd
+      run sed -i 's/\(\s*\)disable\s*=.*/\1disable = no/' /etc/xinetd.d/check_mk
+
+      if [ ! -z "${fai_monitoring_server_ip}" ] ; then
+        # Allow the monitorin gserver IP to access check_mk
+        run sed -i '/^\s*only_from\s*=.*/s/^/#/' /etc/xinetd.d/check_mk
+        run sed -i "/^}$/ i \\\tonly_from = ${fai_monitoring_server_ip}" /etc/xinetd.d/check_mk
+      fi
+      run /etc/init.d/xinetd reload
+    else
+      print_and_log "check_mk might not start automatically, as xinetd.d/check_mk is missing"
+    fi
   else
     print_and_log "Nagios node installation not supported on your system"
     print_and_log "You will have to install it manually."
@@ -130,12 +160,14 @@ function install_nagios_node()
     $file
   dont_quote_conf_values=0
 
+
   # bug in nagios-nrpe-server, restart fails (sometimes) if the PID
   # isn't there (!)
   run touch /var/run/nagios/nrpe.pid
-  /etc/init.d/nagios-nrpe-server restart 1>>$log 2>>$log
+  run /etc/init.d/nagios-nrpe-server restart
   
-  add_next_step "A Nagios NRPE node has been installed on ${HOSTNAME}"
+  add_next_step "A Nagios NRPE node and check_mk has been installed"
+  add_next_step "on ${HOSTNAME}"
 }
 
 function install_munin_node()

From d5db60e5bcc64f99e9b490b0b8c7fe86ec4b567b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 2 Aug 2012 13:43:50 +0200
Subject: [PATCH 1087/2585] - fixed typo

---
 usr/share/vizrt/vosa/commands/boot.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/vizrt/vosa/commands/boot.sh b/usr/share/vizrt/vosa/commands/boot.sh
index bff9e0e4..910d97b1 100755
--- a/usr/share/vizrt/vosa/commands/boot.sh
+++ b/usr/share/vizrt/vosa/commands/boot.sh
@@ -230,7 +230,7 @@ function boot_kvm() {
   }
 
   # actually execute kvm
-  echo "Command to star this KVM:"
+  echo "Command to start this KVM:"
   echo "${startupcmd[@]}"
   "${startupcmd[@]}"; 
   local rc

From 715e8d1f1a48bea7ccf80fc0bc8b5661cd511141 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 2 Aug 2012 13:58:36 +0200
Subject: [PATCH 1088/2585] - fixed the same typo in two files, what a laugh!

---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 2 +-
 usr/share/vizrt/vosa/post-install-hooks/install-engine.sh     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 4655f06f..3da25fe8 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -478,7 +478,7 @@ function install_ece_third_party_packages
   if [ $on_debian_or_derivative -eq 1 ]; then
     if [ $on_ubuntu -eq 1 ]; then
       # Sun Java was removed in Ubuntu in 11.10 and later also from
-      # LTS 10.04, hence Hardy is the last one with these packges now
+      # LTS 10.04, hence Hardy is the last one with these package now
       # (2012-02-20 11:22)
       local version_needs_local_java_deb=1004
       local version=$(lsb_release -s -r | sed "s#\.##g")
diff --git a/usr/share/vizrt/vosa/post-install-hooks/install-engine.sh b/usr/share/vizrt/vosa/post-install-hooks/install-engine.sh
index ed9cb3bc..e2cf584a 100755
--- a/usr/share/vizrt/vosa/post-install-hooks/install-engine.sh
+++ b/usr/share/vizrt/vosa/post-install-hooks/install-engine.sh
@@ -31,7 +31,7 @@ fi
 
 if [ -z "$ECE_INSTALLER" ] ; then
   ssh -F $2/ssh.conf root@guest apt-cache show escenic-content-engine-installer > /dev/null &&
-  echo "Attempting to install escenic-content-engine-installer packge" &&
+  echo "Attempting to install escenic-content-engine-installer package" &&
   ssh -F $2/ssh.conf root@guest apt-get install -y -o DPkg::Options::=--force-confold \
       escenic-content-engine-installer
   if [ $? == 0 ] ; then

From 4aff40cdabbd6b4159892a826ad74c637f115ea3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 2 Aug 2012 13:59:09 +0200
Subject: [PATCH 1089/2585] - updated the VOSA handbook

---
 usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
index f0d95be4..ae7235fb 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
+++ b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
@@ -5,3 +5,4 @@
 * Deployment
 #+INCLUDE: "deploying-a-new-ear.org"
 #+INCLUDE: "updating-publication-resources.org"
+#+INCLUDE: "updating-the-search-server.org"

From 7641af92adf9f5053a70e181fa463add7d479ddd Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 2 Aug 2012 14:26:07 +0200
Subject: [PATCH 1090/2585] - added vosa post install hook which adds the Vizrt
 APT repository to   the client so that it can use the DEB packages straight
 away.

---
 .../vosa/post-install-hooks/add-vizrt-apt-repo.sh    | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 usr/share/vizrt/vosa/post-install-hooks/add-vizrt-apt-repo.sh

diff --git a/usr/share/vizrt/vosa/post-install-hooks/add-vizrt-apt-repo.sh b/usr/share/vizrt/vosa/post-install-hooks/add-vizrt-apt-repo.sh
new file mode 100644
index 00000000..4c4492c6
--- /dev/null
+++ b/usr/share/vizrt/vosa/post-install-hooks/add-vizrt-apt-repo.sh
@@ -0,0 +1,12 @@
+#! /usr/bin/env bash
+
+## Adds the Vizrt APT repository
+echo deb http://apt.vizrt.com unstable main | \
+  ssh -F $2/ssh.conf guest sudo tee /etc/apt/sources.list.d/apt-vizrt-com.list \
+  > /dev/null
+
+curl -s http://apt.vizrt.com/archive.key | \
+  ssh -F $2/ssh.conf guest sudo apt-key add - \
+  > /dev/null
+
+ssh -F $2/ssh.conf guest sudo apt-get -qq update

From d6ffe470cc21a449455dc7f71bd668208a1d279e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 2 Aug 2012 16:48:04 +0200
Subject: [PATCH 1091/2585] - We now set up mysql listening to the external
 servers and binary   logs on both the master and slave since we want to be
 able easily   fail over to the slave as master (and back again).

  See http://dev.mysql.com/doc/refman/5.5/en/replication-solutions-switch.html
---
 .../ece-scripts/ece-install.d/database.sh     | 68 +++++++++++--------
 1 file changed, 38 insertions(+), 30 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 8101223b..9ac22c87 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -276,10 +276,12 @@ function configure_mysql_for_replication() {
 EOF
   fi
 
+  set_common_replication_settings $file
+  
   # replication log configuration of the master
   if [ $db_master -eq 1 ]; then
-    local old="#server-id.*=.*1"
-    local new="server-id=1"
+    old="#server-id.*=.*1"
+    new="server-id=1"
 
     if [ $(grep ^"$old" $file | wc -l) -gt 0 ]; then
       sed -i "s~^$old~$new~g" $file
@@ -287,31 +289,6 @@ EOF
       echo "$new" >> $file
     fi
 
-    old="bind-address.*= 127.0.0.1"
-    new="# bind-address = 127.0.0.1"
-    if [ $(grep ^"${old}" $file | wc -l) -gt 0 ]; then
-      sed -i "s~^${old}~$new~g" $file
-    fi
-
-    old="#log_bin.*= /var/log/mysql/mysql-bin.log"
-    new="log_bin = /var/log/mysql/mysql-bin.log"
-    if [ $(grep ^"$old" $file | wc -l) -gt 0 ]; then
-      sed -i "s~^${old}~${new}~g" $file
-    elif [ $(grep ^"$new" $file | wc -l) -lt 1 ]; then
-      echo "$new" >> $file
-    fi
-
-    old="#binlog_do_db.*=.*"
-    new="binlog_do_db = ${db_schema}"
-
-    if [ $(grep ^"$old" $file | wc -l) -gt 0 ]; then
-      sed -i "s~^${old}~${new}~g" $file
-    elif [ $(grep ^"$new" $file | wc -l) -lt 1 ]; then
-      echo "$new" >> $file
-    fi
-
-    run /etc/init.d/mysql restart
-
     # report the needed settings for a slave
     local master_status=$(mysql $db_schema -e "show master status" | tail -1)
     local file=$(echo $master_status | cut -d' ' -f1)
@@ -325,8 +302,8 @@ EOF
     log $message
     add_next_step $message
   else
-    local old="#server-id.*= 1"
-    local new="server-id=2"
+    old="#server-id.*= 1"
+    new="server-id=2"
 
     if [ $(grep ^"$old" $file | wc -l) -gt 0 ]; then
       sed -i "s~^$old~$new~g" $file
@@ -334,10 +311,41 @@ EOF
       echo "$new" >> $file
     fi
 
-    run /etc/init.d/mysql restart
   fi
+  
+  run /etc/init.d/mysql restart
 }
 
+## We set up mysql listening to the external servers and binary logs
+## on both the master and slave since we want to be able easily fail
+## over to the slave as master (and back again).
+function set_common_replication_settings() {
+  local file=$1
+  
+  local old="bind-address.*= 127.0.0.1"
+  local new="# bind-address = 127.0.0.1"
+  if [ $(grep ^"${old}" $file | wc -l) -gt 0 ]; then
+    sed -i "s~^${old}~$new~g" $file
+  fi
+
+  old="#log_bin.*= /var/log/mysql/mysql-bin.log"
+  new="log_bin = /var/log/mysql/mysql-bin.log"
+  if [ $(grep ^"$old" $file | wc -l) -gt 0 ]; then
+    sed -i "s~^${old}~${new}~g" $file
+  elif [ $(grep ^"$new" $file | wc -l) -lt 1 ]; then
+    echo "$new" >> $file
+  fi
+
+  old="#binlog_do_db.*=.*"
+  new="binlog_do_db = ${db_schema}"
+
+  if [ $(grep ^"$old" $file | wc -l) -gt 0 ]; then
+    sed -i "s~^${old}~${new}~g" $file
+  elif [ $(grep ^"$new" $file | wc -l) -lt 1 ]; then
+    echo "$new" >> $file
+  fi
+}  
+
 function set_slave_to_replicate_master() {
   print_and_log "Setting slave to replicate master DB @ $db_master_host ..."
   mysql ${db_schema} <<EOF

From 580130495c8083e51d38b9a7dc051d79c016d180 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 2 Aug 2012 18:48:15 +0200
Subject: [PATCH 1092/2585] Added /etc/init.d/vosa to packages

---
 usr/share/escenic/package-scripts/create-packages | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index a265836d..fed7b1dc 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -130,6 +130,7 @@ function set_up_vosa() {
   mkdir -p $target_dir/usr/{bin,sbin,share/doc}
   mkdir -p $target_dir/usr/share/doc/vosa
   mkdir -p $target_dir/etc/bash_completion.d
+  mkdir -p $target_dir/etc/init.d
   
   cp -r ../../../bin/vosa $target_dir/usr/bin/
   cp -r ../../../bin/vosa-push $target_dir/usr/bin/
@@ -137,6 +138,7 @@ function set_up_vosa() {
   cp -r ../../doc/vizrt/*.org $target_dir/usr/share/doc/vosa/
   cp -r ../../../../etc/bash_completion.d/vosa \
     $target_dir/etc/bash_completion.d/
+  cp -r ../../../../etc/init.d/vosa $target_dir/etc/init.d/
 }
 
 function set_up_escenic-common-scripts() {

From d5b6f4cbb0ed1ca44c11d5e27631509448df1bd0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 3 Aug 2012 09:55:38 +0200
Subject: [PATCH 1093/2585] - added the feature to set up daily backups of the
 DB. To turn it on,   use:

    fai_db_daily_backup=1

  This can be run on any host, but for people not using something like
  Amazon RDS (where you cannot log on to the DB itself), you'll
  probably set this up on one of the DB servers.
---
 usr/sbin/ece-install                          |  9 ++++++++
 .../ece-scripts/ece-install.d/constants.sh    |  1 +
 .../ece-scripts/ece-install.d/database.sh     | 22 +++++++++++++++++++
 3 files changed, 32 insertions(+)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 0dfa1584..4b289400 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -980,6 +980,12 @@ if [ $fai_enabled -eq 1 ]; then
       no_fai_profile=0
     fi
     
+    if [ ${fai_db_daily_backup-0} -eq 1 ]; then
+      install_profile_number=$PROFILE_DB_BACKUP_SERVER
+      install_db_backup_server
+      no_fai_profile=0
+    fi
+    
     if [ $no_fai_profile -eq 1 ]; then
         print_and_log "No install profile selected, be sure to have one of the "
         print_and_log "fai_<profile>_install=1 in your $conf_file"
@@ -1030,6 +1036,9 @@ else
         $PROFILE_VIP_PROVIDER)
             install_vip_provider
             ;;
+        $PROFILE_DB_BACKUP_SERVER)
+            set_up_db_backup
+            ;;
         *)
             print "Invalid profile number $install_profile_number, must be 1-11"
             remove_pid_and_exit_in_error
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/constants.sh b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
index 0000d70a..7a09a04f 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
@@ -16,6 +16,7 @@ PROFILE_ANALYSIS_SERVER=12
 PROFILE_VIP_PROVIDER=13
 PROFILE_NFS_SERVER=14
 PROFILE_NFS_CLIENT=15
+PROFILE_DB_BACKUP_SERVER=16
 
 # database constants
 default_db_port=3306
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 9ac22c87..df98dc40 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -524,3 +524,25 @@ function work_around_eae_bug_stats-76() {
 function leave_db_trails() {
   leave_trail "trail_db_port=${db_port-3306}"
 }
+
+## Yes, calling the method name is a bit over the top, but it's
+## because it's an own installation profile (and everything that
+## *sounds* grand *is* grand, right?)
+function install_db_backup_server() {
+  install_packages_if_missing mysql-client
+  assert_pre_requisite mysqldump
+
+  local backup_file=${escenic_backups_dir}/${date}-${db_schema}.sql.gz
+  local file=/etc/cron.daily/${db_schema}-backup
+  cat > $file <<EOF  
+mysqldump -u $db_user | \
+  -p$db_password | \
+  -h $db_host | \
+  $db_schema | \
+  gzip -9 - \
+  > ${backup_file}
+EOF
+
+  run chmod +x $file
+  print_and_log "Daily backup of $db_schema is provided by $file"
+}

From 8f64899fa96858a58bccd22bee98c7547687343b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 6 Aug 2012 10:26:04 +0200
Subject: [PATCH 1094/2585] - simplified gpg call to use the run wrapper

---
 usr/share/escenic/ece-scripts/ece-install.d/database.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index df98dc40..5c3d323a 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -42,9 +42,8 @@ function install_database_server()
       print_and_log "Installing the Percona database ..."
 
       if [ $(apt-key list| grep CD2EFD2A | wc -l) -lt 1 ]; then
-        gpg --keyserver hkp://keys.gnupg.net:80 \
-          --recv-keys 1C4CBDCDCD2EFD2A \
-          1>>$log 2>>$log
+        run gpg --keyserver hkp://keys.gnupg.net:80 \
+          --recv-keys 1C4CBDCDCD2EFD2A
 
         # There has been three times now, during six months, that the
         # key cannot be retrieved from keys.gnupg.net. Therefore,

From aa5d94641780f9c599389079795d1fbc6cc55672 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 6 Aug 2012 12:15:11 +0200
Subject: [PATCH 1095/2585] - fixed problem in install_db_backup_server where
 it would fail to   install (a vanilla) mysql-client if the machine already
 had the   Percona mysql-server fork.

- re-factored the set up of the percona database. New method:
  set_up_percona_repository_if_possible. This method will set up both
  the percona repository, if possible, and sets the package selection
  used by the various methods which installs DB features.
---
 .../ece-scripts/ece-install.d/database.sh     | 109 +++++++++++-------
 1 file changed, 69 insertions(+), 40 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 5c3d323a..c30c6d14 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -15,20 +15,14 @@ function get_percona_supported_list() {
     grep -v apt
 }
 
-## $1: optional parameter, binaries_only. If passed, $1=binaries_only,
-##     the ECE DB schema is not set up.
-function install_database_server()
-{
-  print_and_log "Installing database server on $HOSTNAME ..."
-
+function set_up_percona_repository_if_possible() {
   if [ $on_debian_or_derivative -eq 1 -a ${fai_db_sql_only-0} -eq 0 ]; then
-
-    code_name=$(lsb_release -s -c)
-
-    supported_code_name=0
-    supported_list=$(get_percona_supported_list)
+    local code_name=$(lsb_release -s -c)
+    local supported_code_name=0
+    local supported_list=$(get_percona_supported_list)
+    
     for el in $supported_list; do
-      if [ $code_name = $el ]; then
+      if [[ $code_name == $el ]]; then
         supported_code_name=1
       fi
     done
@@ -39,7 +33,7 @@ function install_database_server()
     fi
 
     if [ $supported_code_name -eq 1 ]; then
-      print_and_log "Installing the Percona database ..."
+      print_and_log "Setting Up the Percona repository ..."
 
       if [ $(apt-key list| grep CD2EFD2A | wc -l) -lt 1 ]; then
         run gpg --keyserver hkp://keys.gnupg.net:80 \
@@ -50,10 +44,8 @@ function install_database_server()
         # we're checking if it failed and if yes, force the package
         # installation.
         if [ $? -gt 0 ]; then
-          s="Failed retrieving the Percona key from keys.gnupg.net"
-          print_and_log $s
-          s="Will install the Percona packages without the GPG key"
-          print_and_log $s
+          print_and_log "Failed retrieving the Percona key from keys.gnupg.net"
+          print_and_log "Will install the Percona packages without the GPG key"
           force_packages=1
         else
           gpg --armor \
@@ -67,30 +59,34 @@ function install_database_server()
       fi
 
       add_apt_source "deb http://repo.percona.com/apt ${code_name} main"
-      packages="percona-server-server percona-server-client libmysqlclient16"
+      mysql_server_packages="percona-server-server"
+      mysql_client_packages="percona-server-client"
     else
       print_and_log "The Percona APT repsository doesn't have packages"
       print_and_log "for your Debian (or derivative) version with code"
       print_and_log "name $code_name. "
       print_and_log "I will use vanilla MySQL instead."
 
-      packages="mysql-server mysql-client"
+      mysql_server_packages="mysql-server libmysqlclient16"
+      mysql_client_packages="mysql-client libmysqlclient16"
     fi
   elif [ $on_redhat_or_derivative -eq 1 ]; then
-    print_and_log "Installing the Percona database ..."
+    print_and_log "Settnig up the Percona repository ..."
 
     if [ $(rpm -qa | grep $percona_rpm_release_package_name | wc -l) -lt 1 ]; then
       run rpm -Uhv $percona_rpm_release_url
     fi
 
-    packages="
-      Percona-Server-shared-compat
-      Percona-Server-server-55
-      Percona-Server-client-55"
+    mysql_server_packages="Percona-Server-server-55 Percona-Server-shared-compat"
+    mysql_client_packages="Percona-Server-client-55 Percona-Server-shared-compat"
   fi
+}
+
+function install_mysql_server_software() {
+  set_up_percona_repository_if_possible
 
   if [ ${fai_db_sql_only-0} -eq 0 ]; then
-    install_packages_if_missing $packages
+    install_packages_if_missing $mysql_server_packages
     force_packages=0
 
     if [ $on_redhat_or_derivative -eq 1 ]; then
@@ -102,8 +98,37 @@ function install_database_server()
   else
     # when only running the SQL scripts, typically when using Amazon
     # RDS, we need the mysql-client.
-    install_packages_if_missing "mysql-client"
-  fi
+    install_packages_if_missing $mysql_client_packages
+  fi  
+}
+
+function install_mysql_client_software() {
+  set_up_percona_repository_if_possible
+  install_packages_if_missing $mysql_client_packages
+  assert_pre_requisite mysql
+}
+
+## $1: optional parameter, binaries_only. If passed, $1=binaries_only,
+##     the ECE DB schema is not set up.
+function install_database_server() {
+  print_and_log "Installing database server on $HOSTNAME ..."
+
+  if [ ${fai_db_sql_only-0} -eq 0 ]; then
+    install_mysql_server_software
+    install_mysql_client_software
+    force_packages=0
+
+    if [ $on_redhat_or_derivative -eq 1 ]; then
+      run chkconfig --level 35 mysql on
+      run /etc/init.d/mysql restart
+    fi
+
+    assert_pre_requisite mysqld
+  else
+    # when only running the SQL scripts, typically when using Amazon
+    # RDS, we need the mysql-client.
+    install_mysql_client_software
+   fi
 
   assert_pre_requisite mysql
 
@@ -164,7 +189,7 @@ function set_up_ecedb()
   pre_install_new_ecedb
   create_ecedb
 
-  cd ~/
+  run cd ~/
   run rm -rf $escenic_root_dir/engine/plugins
 
   add_next_step "DB is now set up on ${db_host}:${db_port}"
@@ -528,20 +553,24 @@ function leave_db_trails() {
 ## because it's an own installation profile (and everything that
 ## *sounds* grand *is* grand, right?)
 function install_db_backup_server() {
-  install_packages_if_missing mysql-client
+  install_mysql_client_software
   assert_pre_requisite mysqldump
-
-  local backup_file=${escenic_backups_dir}/${date}-${db_schema}.sql.gz
+  make_dir ${escenic_backups_dir}
   local file=/etc/cron.daily/${db_schema}-backup
-  cat > $file <<EOF  
-mysqldump -u $db_user | \
-  -p$db_password | \
-  -h $db_host | \
-  $db_schema | \
-  gzip -9 - \
-  > ${backup_file}
+  cat > $file <<EOF
+#! /usr/bin/env bash
+
+## Backup of the $db_schema DB
+## Set up by $(basename $0) @ $(date)
+
+mysqldump -u $db_user \\
+  -p$db_password \\
+  -h $db_host \\
+  $db_schema | \\
+  gzip -9 - \\
+  > ${escenic_backups_dir}/\$(date --iso)-${db_schema}.sql.gz
 EOF
 
-  run chmod +x $file
-  print_and_log "Daily backup of $db_schema is provided by $file"
+  run chmod 700 $file
+  add_next_step "Daily backup of the $db_schema DB is provided by $file"
 }

From ee7a88d9685b3c48d173f61d54e44b3d2bedf62c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 6 Aug 2012 12:17:01 +0200
Subject: [PATCH 1096/2585] - changed the mode of the source listing ->
 different syntax   highlighting in the markup

---
 .../doc/vizrt/vosa-handbook/updating-the-search-server.org    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/updating-the-search-server.org b/usr/share/doc/vizrt/vosa-handbook/updating-the-search-server.org
index 478c8b2a..82d218ef 100644
--- a/usr/share/doc/vizrt/vosa-handbook/updating-the-search-server.org
+++ b/usr/share/doc/vizrt/vosa-handbook/updating-the-search-server.org
@@ -12,12 +12,12 @@ First, go to:
 http://edit1:8080/escenic-admin/browser/Global/com/escenic/webservice/search/DelegatingSearchEngine?property=solrURI
 
 Then, change the value from:
-#+BEGIN_SRC sh
+#+BEGIN_SRC conf
 http://localhost:8081/solr/select	  
 #+END_SRC
 
 to
 
-#+BEGIN_SRC sh
+#+BEGIN_SRC conf
 http://edit2:8081/solr/select	  
 #+END_SRC

From 7155722eaa1625627c3da040380276bbdb90e16a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 6 Aug 2012 12:17:54 +0200
Subject: [PATCH 1097/2585] - speling

---
 .../doc/vizrt/vosa-handbook/operating-system-maintenance.org    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/operating-system-maintenance.org b/usr/share/doc/vizrt/vosa-handbook/operating-system-maintenance.org
index 25815948..de7b6fe0 100644
--- a/usr/share/doc/vizrt/vosa-handbook/operating-system-maintenance.org
+++ b/usr/share/doc/vizrt/vosa-handbook/operating-system-maintenance.org
@@ -5,7 +5,7 @@ the OS packages, you should feel comfortable resolving typical RPM or
 DEB conflicts and set aside enough time to deal with any package
 breakage which might occur. 
 
-All servers, both the Ubunut and RedHat ones, are running stable
+All servers, both the Ubuntu and RedHat ones, are running stable
 branches of their OS, so normally, there will be no breakage, and
 upgrades should be safe to be carried out on a regular (bi-weekly for
 instance) basis. However, you should always be fully alert when making

From 66363a7064781bc7796b706b7dc6d0e1d6610de0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 6 Aug 2012 12:55:50 +0200
Subject: [PATCH 1098/2585] - added documentation for fai_db_daily_backup

---
 usr/share/doc/escenic/ece-install-guide.org | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index aa9bcd7a..6f8e39f6 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -702,6 +702,7 @@ $HOME/ece-install.conf file of the root user:
 | fai_cache_backends                  | ${HOSTNAME}:8080                                  | Space separated, e.g. "app1:8080 app2:8080"                                                                                           |
 | fai_cache_install                   | 0                                                 | Install cache server profile                                                                                                          |
 | fai_db_drop_old_db_first            | 0                                                 | Warning: this will drop the old database before installing a new one                                                                  |
+| fai_db_daily_backup                 | 0                                                 | Sets up daily backup of the DB.                                                                                                       |
 | fai_db_host                         | $HOSTNAME                                         | Useful for editor & presentation profiles                                                                                             |
 | fai_db_install                      | 0                                                 | Install db profile                                                                                                                    |
 | fai_db_password                     | read-the-source-luke                              | Useful for DB installation profile                                                                                                    |

From b45ca43b9f5e1dfba5efe022a09c5551a98cafb2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 6 Aug 2012 13:46:37 +0200
Subject: [PATCH 1099/2585] - added lots of documentation on how to update
 publication resources

---
 .../updating-publication-resources.org        | 65 +++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/usr/share/doc/vizrt/vosa-handbook/updating-publication-resources.org b/usr/share/doc/vizrt/vosa-handbook/updating-publication-resources.org
index ba7892cf..1e49a691 100644
--- a/usr/share/doc/vizrt/vosa-handbook/updating-publication-resources.org
+++ b/usr/share/doc/vizrt/vosa-handbook/updating-publication-resources.org
@@ -1,2 +1,67 @@
 ** Updating Publication Resources
+This document describes how you update publication resources. Here, we
+use content-type as an example.
+
+The content type publication resource is special because it's merged
+by WF and you thus must take it from the EAR the build server built
+for you. Other publication resources could be taken directly from the
+SCM, but for consistency, you can just follow the guide below for
+these as well (layout, layout-group, menu, community/security and so
+on).
+
+*** Extract the publication resources.
+Make sure you have already done the deployment in the pres1 server
+
+*** Login to one of the presentation servers
+#+BEGIN_SRC sh
+control$ sudo ssh root@pres1  
+#+END_SRC
+
+*** Change to the escenic user
+#+BEGIN_SRC sh
+pres1# su - escenic
+#+END_SRC
+
+*** Download current content-type
+#+BEGIN_SRC sh
+pres1$ wget -O ~/backup/content-type-$(date --iso)-before-deployment \
+       http://localhost:8080/escenic-admin/publication-resources/mypub/escenic/content-type
+#+END_SRC
+
+*** Locate the new content-type definition
+Go to the new new content-type from your latest deployment 
+
+#+BEGIN_SRC sh
+pres1$ cd /opt/tomcat-engine1/webapps/eb/META-INF/escenic/publication-resources/escenic/
+#+END_SRC
+
+*** Confirm the changes with diff
+#+BEGIN_SRC sh
+pres$ diff -w ~/backup/content-type-$(date --iso)-before-deployment content-type  
+#+END_SRC
+
+
+*** Now upload the new content-type to ECE
+The command below assumes that there is a file called the same as the
+publication resource in the current directory. Since we changed into
+that directory in step 5), we can therefore now do:
+
+#+BEGIN_SRC sh
+pres1$ ece -i engine1 -p mypub -r content-type update
+#+END_SRC
+
+
+*** Download the resource again to check if its in place
+#+BEGIN_SRC sh
+pres1$ wget -O ~/backup/content-type-$(date --iso)-after-deployment \
+               http://localhost:8080/escenic-admin/publication-resources/mypub/escenic/content-type
+#+END_SRC
+
+
+*** Do check with diff again
+#+BEGIN_SRC sh
+pres$ diff -w ~/backup/content-type-$(date --iso)-before-deployment \
+              ~/backup/content-type-$(date --iso)-after-deployment
+#+END_SRC
+
 

From 6bf98b3f44553d0c09a5def2d45cb27b229dc7b3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 6 Aug 2012 13:47:49 +0200
Subject: [PATCH 1100/2585] - merged deployment related documents - added new
 backups chapter

---
 usr/share/doc/vizrt/vosa-handbook/backups.org | 20 ++++++
 ...deploying-a-new-ear.org => deployment.org} |  0
 .../updating-publication-resources.org        | 67 -------------------
 3 files changed, 20 insertions(+), 67 deletions(-)
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/backups.org
 rename usr/share/doc/vizrt/vosa-handbook/{deploying-a-new-ear.org => deployment.org} (100%)
 delete mode 100644 usr/share/doc/vizrt/vosa-handbook/updating-publication-resources.org

diff --git a/usr/share/doc/vizrt/vosa-handbook/backups.org b/usr/share/doc/vizrt/vosa-handbook/backups.org
new file mode 100644
index 00000000..11cb3ae7
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/backups.org
@@ -0,0 +1,20 @@
+* Backups
+
+** DB backups
+If you've told ece-install to set up daily backups
+(fai_db_daily_backup=1 in your ece-install.conf), there will be a cron
+scripts set up which create backups.
+
+Part of the name of the cron script is the name of your DB schema, so
+the default location of the cron script is:
+#+BEGIN_SRC sh
+/etc/cron.daily/ece5db-backup  
+#+END_SRC
+
+And it'll put its backups in
+#+BEGIN_SRC sh
+/var/backups/escenic  
+#+END_SRC
+
+All these are overridable, see the ece-install guide for further
+details.
diff --git a/usr/share/doc/vizrt/vosa-handbook/deploying-a-new-ear.org b/usr/share/doc/vizrt/vosa-handbook/deployment.org
similarity index 100%
rename from usr/share/doc/vizrt/vosa-handbook/deploying-a-new-ear.org
rename to usr/share/doc/vizrt/vosa-handbook/deployment.org
diff --git a/usr/share/doc/vizrt/vosa-handbook/updating-publication-resources.org b/usr/share/doc/vizrt/vosa-handbook/updating-publication-resources.org
deleted file mode 100644
index 1e49a691..00000000
--- a/usr/share/doc/vizrt/vosa-handbook/updating-publication-resources.org
+++ /dev/null
@@ -1,67 +0,0 @@
-** Updating Publication Resources
-This document describes how you update publication resources. Here, we
-use content-type as an example.
-
-The content type publication resource is special because it's merged
-by WF and you thus must take it from the EAR the build server built
-for you. Other publication resources could be taken directly from the
-SCM, but for consistency, you can just follow the guide below for
-these as well (layout, layout-group, menu, community/security and so
-on).
-
-*** Extract the publication resources.
-Make sure you have already done the deployment in the pres1 server
-
-*** Login to one of the presentation servers
-#+BEGIN_SRC sh
-control$ sudo ssh root@pres1  
-#+END_SRC
-
-*** Change to the escenic user
-#+BEGIN_SRC sh
-pres1# su - escenic
-#+END_SRC
-
-*** Download current content-type
-#+BEGIN_SRC sh
-pres1$ wget -O ~/backup/content-type-$(date --iso)-before-deployment \
-       http://localhost:8080/escenic-admin/publication-resources/mypub/escenic/content-type
-#+END_SRC
-
-*** Locate the new content-type definition
-Go to the new new content-type from your latest deployment 
-
-#+BEGIN_SRC sh
-pres1$ cd /opt/tomcat-engine1/webapps/eb/META-INF/escenic/publication-resources/escenic/
-#+END_SRC
-
-*** Confirm the changes with diff
-#+BEGIN_SRC sh
-pres$ diff -w ~/backup/content-type-$(date --iso)-before-deployment content-type  
-#+END_SRC
-
-
-*** Now upload the new content-type to ECE
-The command below assumes that there is a file called the same as the
-publication resource in the current directory. Since we changed into
-that directory in step 5), we can therefore now do:
-
-#+BEGIN_SRC sh
-pres1$ ece -i engine1 -p mypub -r content-type update
-#+END_SRC
-
-
-*** Download the resource again to check if its in place
-#+BEGIN_SRC sh
-pres1$ wget -O ~/backup/content-type-$(date --iso)-after-deployment \
-               http://localhost:8080/escenic-admin/publication-resources/mypub/escenic/content-type
-#+END_SRC
-
-
-*** Do check with diff again
-#+BEGIN_SRC sh
-pres$ diff -w ~/backup/content-type-$(date --iso)-before-deployment \
-              ~/backup/content-type-$(date --iso)-after-deployment
-#+END_SRC
-
-

From 36a59d874ce01424cfdc9ba3fbfa8373bc7b8901 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 6 Aug 2012 13:48:02 +0200
Subject: [PATCH 1101/2585] - simplified text

---
 usr/share/doc/vizrt/vosa-handbook/backups.org | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/backups.org b/usr/share/doc/vizrt/vosa-handbook/backups.org
index 11cb3ae7..2c889537 100644
--- a/usr/share/doc/vizrt/vosa-handbook/backups.org
+++ b/usr/share/doc/vizrt/vosa-handbook/backups.org
@@ -1,9 +1,8 @@
 * Backups
 
 ** DB backups
-If you've told ece-install to set up daily backups
-(fai_db_daily_backup=1 in your ece-install.conf), there will be a cron
-scripts set up which create backups.
+If you've told ece-install to set up daily backups, there will be a
+cron scripts set up which create backups.
 
 Part of the name of the cron script is the name of your DB schema, so
 the default location of the cron script is:

From 8220cb2cdc0f5ade7ae29cde99cb37b9d404048a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 6 Aug 2012 13:48:23 +0200
Subject: [PATCH 1102/2585] - changed to h1

---
 .../doc/vizrt/vosa-handbook/updating-the-search-server.org      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/updating-the-search-server.org b/usr/share/doc/vizrt/vosa-handbook/updating-the-search-server.org
index 82d218ef..ea9909c5 100644
--- a/usr/share/doc/vizrt/vosa-handbook/updating-the-search-server.org
+++ b/usr/share/doc/vizrt/vosa-handbook/updating-the-search-server.org
@@ -1,4 +1,4 @@
-** Updating the Search Server
+* Updating the Search Server
 
 When updating the search server, you might want to reconfigure the
 ECE instance(s) that use the search server you're updating. To do

From 133c409aa048109cbc48cafe332824dea358fd97 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 6 Aug 2012 13:48:45 +0200
Subject: [PATCH 1103/2585] - merged content with updating publication
 resources

---
 .../doc/vizrt/vosa-handbook/deployment.org    | 68 +++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/usr/share/doc/vizrt/vosa-handbook/deployment.org b/usr/share/doc/vizrt/vosa-handbook/deployment.org
index 12c8e75b..f6718325 100644
--- a/usr/share/doc/vizrt/vosa-handbook/deployment.org
+++ b/usr/share/doc/vizrt/vosa-handbook/deployment.org
@@ -1,3 +1,4 @@
+* Deployment
 ** Deploying a new EAR file
 In the examples here, we have a build server on builder.example.com
 where we build EARs for the the tomato website.
@@ -43,3 +44,70 @@ torstein@control:~$ sudo ssh escenic@pres1 ece -i search1 -t search --uri http:/
 [ece#search-search1] Deployment state file updated: /var/lib/escenic/search1.state  
 #+END_SRC
 
+** Updating Publication Resources
+This document describes how you update publication resources. Here, we
+use content-type as an example.
+
+The content type publication resource is special because it's merged
+by WF and you thus must take it from the EAR the build server built
+for you. Other publication resources could be taken directly from the
+SCM, but for consistency, you can just follow the guide below for
+these as well (layout, layout-group, menu, community/security and so
+on).
+
+*** Extract the publication resources.
+Make sure you have already done the deployment in the pres1 server
+
+*** Login to one of the presentation servers
+#+BEGIN_SRC sh
+control$ sudo ssh root@pres1  
+#+END_SRC
+
+*** Change to the escenic user
+#+BEGIN_SRC sh
+pres1# su - escenic
+#+END_SRC
+
+*** Download current content-type
+#+BEGIN_SRC sh
+pres1$ wget -O ~/backup/content-type-$(date --iso)-before-deployment \
+       http://localhost:8080/escenic-admin/publication-resources/mypub/escenic/content-type
+#+END_SRC
+
+*** Locate the new content-type definition
+Go to the new new content-type from your latest deployment 
+
+#+BEGIN_SRC sh
+pres1$ cd /opt/tomcat-engine1/webapps/eb/META-INF/escenic/publication-resources/escenic/
+#+END_SRC
+
+*** Confirm the changes with diff
+#+BEGIN_SRC sh
+pres$ diff -w ~/backup/content-type-$(date --iso)-before-deployment content-type  
+#+END_SRC
+
+
+*** Now upload the new content-type to ECE
+The command below assumes that there is a file called the same as the
+publication resource in the current directory. Since we changed into
+that directory in step 5), we can therefore now do:
+
+#+BEGIN_SRC sh
+pres1$ ece -i engine1 -p mypub -r content-type update
+#+END_SRC
+
+
+*** Download the resource again to check if its in place
+#+BEGIN_SRC sh
+pres1$ wget -O ~/backup/content-type-$(date --iso)-after-deployment \
+               http://localhost:8080/escenic-admin/publication-resources/mypub/escenic/content-type
+#+END_SRC
+
+
+*** Do check with diff again
+#+BEGIN_SRC sh
+pres$ diff -w ~/backup/content-type-$(date --iso)-before-deployment \
+              ~/backup/content-type-$(date --iso)-after-deployment
+#+END_SRC
+
+

From 6b4eb6b10a62acac765cda2b9d148ee76e1041b5 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 6 Aug 2012 13:49:04 +0200
Subject: [PATCH 1104/2585] - merged the deployment related chapters

---
 usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
index ae7235fb..2df3f017 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
+++ b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
@@ -2,7 +2,6 @@
 #+AUTHOR: Erik Mogensen & Torstein Krause Johansen
 
 #+INCLUDE: "operating-system-maintenance.org" 
-* Deployment
-#+INCLUDE: "deploying-a-new-ear.org"
-#+INCLUDE: "updating-publication-resources.org"
+#+INCLUDE: "deployment.org"
 #+INCLUDE: "updating-the-search-server.org"
+#+INCLUDE: "backups.org"

From 9774bfe03331cfe4d405cb95ebcc8cca38f1f57a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 6 Aug 2012 14:29:59 +0200
Subject: [PATCH 1105/2585] - changed the vosa commands:

  vosa install   => vosa create
  vosa postinst  => vosa install
  vosa uninstall => vosa destroy
---
 usr/bin/vosa | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 6deff27d..8d041121 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -797,7 +797,7 @@ function do_disable() {
 ## that _should_ be running (i.e. if a .pid file exists).
 ##
 ## Please be careful with uninstall.
-function do_uninstall() {
+function do_destroy() {
   requires_instance_dir && {
     # check if the instance is available
     # check if the instance isn't enabled already
@@ -859,7 +859,7 @@ commands="$(readlink -f "$(dirname $0)")/../share/vizrt/vosa/commands"
 ##
 ## It is not possible to install an instance that has already been
 ## installed.
-function do_install() {
+function do_create() {
   requires_instance_dir && {
     local status=( $(really_do_status $instance_dir) )
     if [ "${status[2]}" == "installed" ] ; then
@@ -915,7 +915,7 @@ function do_install() {
 ## It is possible to postinst an instance that has already been
 ## postinst'ed.  It is only possible to postinst an instance
 ## that is running.
-function do_postinst() {
+function do_install() {
   requires_instance_dir && {
     local status=( $(really_do_status $instance_dir) )
     if [ "${status[2]}" != "installed" ] ; then

From d1b8c91724c2d76964f96e942eeb33216601c0f3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 6 Aug 2012 14:36:03 +0200
Subject: [PATCH 1106/2585] - added script to automatically generate the
 documentation

---
 .../vizrt/vosa-handbook/create-handbook.sh    | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/create-handbook.sh

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
new file mode 100644
index 00000000..2fd0a9d4
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -0,0 +1,35 @@
+#! /usr/bin/env bash
+
+# by tkj@vizrt.com
+
+handbook_org=vosa-handbook.org
+
+$(which blockdiag >/dev/null) || {
+  cat <<EOF
+You must have blockdiag installed. On Debian & Ubuntu the package is
+called python-blockdiag
+EOF
+  exit 1
+}
+
+# generate the diagram
+for el in graphics/*.blockdiag; do
+  echo "Generating PNG of $el ..."
+  blockdiag $el
+done
+
+# use emacs to generate HTML from the ORG files
+echo "Generating new handbook HTML from ORG ..." 
+emacs --batch --visit $handbook_org \
+  --funcall org-export-as-html-batch 2>/dev/null || {
+  cat <<EOF
+You must have Emacs 24 + org mode from git to use this export
+function.
+EOF
+  exit 1
+}
+
+echo "$(basename $handbook_org .org).html is now ready"
+
+
+

From 56800e5159bc741e490be9c1fa3dee0487d44d21 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 7 Aug 2012 09:32:54 +0200
Subject: [PATCH 1107/2585] - added org for monitoring

---
 .../doc/vizrt/vosa-handbook/monitoring.org    | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/monitoring.org

diff --git a/usr/share/doc/vizrt/vosa-handbook/monitoring.org b/usr/share/doc/vizrt/vosa-handbook/monitoring.org
new file mode 100644
index 00000000..f906f5d8
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/monitoring.org
@@ -0,0 +1,35 @@
+* Monitoring
+
+On a VOSA system you have several tools to aid you in getting an
+overview of how your system is doing, how it is configured and how it
+has been behaving from its inception till the present.
+
+** system-info
+
+*** On the Command Line
+On any VOSA host, you can execute the command system-info. If you
+execute this command as root, you better pass a parameter to tell it
+the user under which ECE, EAE and the Search instance are running as
+(typically "escenic"):
+
+#+BEGIN_SRC sh
+# system-info -u escenic  
+#+END_SRC
+
+*** In the Web Browser
+All VOSA hosts also has a (maximum) one minute old HTML report from
+system-info running on port 5678. So for instance, if your host is
+called pres1, you can access the system-info report on
+http://pres1:5678/
+
+Here's a screenshot of the system-info report running on http://pres1:5678/:
+[[[[graphics/pres1-system-info.png]]
+
+** Hugin
+
+** Munin
+
+** Icinga (enhanced Nagios)
+
+** Check MK
+

From 807e056deb62ecaf6eb87ae3eae8f74dafc898db Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 7 Aug 2012 09:39:41 +0200
Subject: [PATCH 1108/2585] - added

---
 usr/share/doc/vizrt/vosa-handbook/glossary.org | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/glossary.org

diff --git a/usr/share/doc/vizrt/vosa-handbook/glossary.org b/usr/share/doc/vizrt/vosa-handbook/glossary.org
new file mode 100644
index 00000000..248c0026
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/glossary.org
@@ -0,0 +1,15 @@
+* Glossary
+
+# Tip 1: if you use Emacs to edit this file, you can hit C-c C-c to
+# re-format/structure the table.
+# 
+# Tip 2: if you use Emacs to edit this file, you can get alphabetical
+# sorting of the entries in this table if you mark the entries and
+# then do: M-x sort-lines
+
+|----------+--------------------------------------------------------------------------|
+| Term     | Explanation                                                              |
+|----------+--------------------------------------------------------------------------|
+| Habitat  | A collection of machines which makes up a web site.                      |
+| Trending | Seeing the behavioural statistics of a server over longer amount of time |
+|----------+--------------------------------------------------------------------------|

From be1b4c24a6410b7c8337361b356c2ff417ab15c2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 7 Aug 2012 10:50:42 +0200
Subject: [PATCH 1109/2585] - added org elisp to automatically generate
 documentation with Vizrt branding.

---
 .../vosa-handbook/vizrt-branding-org-mode.el  | 170 ++++++++++++++++++
 1 file changed, 170 insertions(+)
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el

diff --git a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
new file mode 100644
index 00000000..42b80fa3
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
@@ -0,0 +1,170 @@
+;; load all locally installed packages
+(let ((default-directory "/usr/local/src/emacs"))
+  (normal-top-level-add-subdirs-to-load-path))
+
+(require 'org-export)
+
+;; don't create a footer
+(setq org-export-html-postamble nil)
+
+;; These two settings make exported HTML look like our Vizrt branded
+; release notes.
+(setq org-export-html-preamble "<svg
+        id=\"vizrt-logo\"
+        version=\"1.1\"
+        width=\"138\"
+        height=\"84\"
+        > 
+  <g
+          id=\"g12\"
+          transform=\"matrix(1.25,0,0,-1.25,-451.34003,425.24315)\"> 
+    <g
+            id=\"g14\"
+            transform=\"matrix(0.0246257,0,0,0.02458666,313.76213,231.21317)\"> 
+      <path
+              d=\"m 3060.56,3437.2 -209.9,-593.4 -207.05,593.4 -215.82,0 326.08,-866.38 184.92,0 332.24,866.38 -210.47,0\"
+              style=\"fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none\"
+              id=\"path16\"/> 
+      <path
+              d=\"m 3473.3,2569.82 193.547,0 0,866.531 -193.547,0 0,-866.531 z\"
+              style=\"fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none\"
+              id=\"path18\"/> 
+      <path
+              d=\"m 3916.16,3436.36 -0.14,-177.24 364.23,0 -372.91,-554.74 0,-133.56 616.08,0 0,175.25 -374.66,0 366.68,550.78 0,139.51 -599.28,0\"
+              style=\"fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none\"
+              id=\"path20\"/> 
+      <path
+              d=\"m 4961.8,3436.66 c -56.15,0 -99.9,-9.02 -144.01,-53.04 -42.13,-42.13 -63.55,-93.63 -63.55,-153.7 l 0,-658.85 193.26,0 0,629.18 c 0,16.39 5.76,30.04 17.53,41.82 9.79,9.87 32.16,17.44 52.18,17.44 l 161.49,0 0,177.15 -216.9,0\"
+              style=\"fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none\"
+              id=\"path22\"/> 
+      <path
+              d=\"m 5367.91,3699.54 0,-915.91 c 0,-58.68 20.75,-109.43 62.13,-150.8 43.31,-43.47 85.57,-62.01 141.03,-62.01 l 212.69,0 0,174.7 -158.78,0 c -15.96,0 -28.96,5.5 -40.72,16.87 -11.19,11.53 -16.76,24.5 -16.76,40.65 l 0,456.42 216.26,0 0,176.39 -216.26,0 0,263.69 -199.59,0\"
+              style=\"fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none\"
+              id=\"path24\"/> 
+      <path
+              d=\"m 1921.16,3066.86 c -0.39,-514.15 173.24,-988.49 465.56,-1367.51 l 69.26,204.63 c -205.49,300.61 -333.44,658.06 -355.3,1043.68 l -179.52,119.2\"
+              style=\"fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none\"
+              id=\"path26\"/> 
+      <path
+              d=\"m 6404.28,3065.28 c 0.49,513.97 -173.17,988.55 -465.37,1367.26 l -69.46,-204.34 c 205.52,-300.7 333.61,-658.34 355.24,-1043.68 l 179.59,-119.24\"
+              style=\"fill:#f57615;fill-opacity:1;fill-rule:evenodd;stroke:none\"
+              id=\"path28\"/> 
+ 
+    </g> 
+  </g> 
+</svg>
+"
+
+      org-export-html-postamble t
+      org-export-html-postamble-format (quote (("en" "<hr/>
+<p class=\"author\">
+  Author: %a (%e)
+  Date: %d
+</p>")))
+      org-export-html-style "<style type=\"text/css\">
+body {
+  background-color: #FFFFFF;
+  border: 1px solid #818A71;
+  font-family: Lucida Sans Unicode, sans-serif;
+  line-height: 1.3em;
+  margin: 0 auto;
+  margin: 15px 15px;
+  padding: 60px;
+  width: 760px;
+}
+
+.toc {
+  margin-top: 50px;
+}
+
+h1, h2 {
+  color: #E98300;
+  font-family: Georgia, serif;
+}
+
+h1 {
+  margin: 40px 0 20px 0;
+}
+
+h2 {
+  margin: 30px 0 10px 0;
+}
+
+h3, h4, h5, h6 {
+  font-weight: bold;
+  margin: 20px 0 5px 0;
+}
+
+h3, h4, h5 {
+}
+
+h6 {
+}
+
+a {
+  color: #666;
+  text-decoration: none;
+}
+
+a:hover {
+  text-decoration: underline;
+}
+
+dl {
+  margin: 0;
+  padding: 0;
+}
+dt {
+  font-weight: bold;
+  margin: 15px 0 10px 0;
+  padding: 0;
+}
+
+dd {
+  margin: 0 0 0 30px;
+  padding: 0;
+}
+
+p {
+  margin-top: 0.2em;
+  margin-bottom: 0.6em;
+}
+
+pre.programlisting {
+  font-family: courier, monospace;
+  margin-top: 0;
+  background-color: #ffddaa;
+  padding-top: 0.5em;
+  padding-bottom: 0.5em;
+  padding-left: 0.5em;
+  padding-right: 0.5em;
+  display: block;
+  overflow: auto;
+}
+
+.literal {
+  font-family: courier, monospace;
+}
+
+em {
+  font-weight: bold;
+  font-style: normal;
+}
+
+em.replaceable {
+  font-weight: normal;
+  font-style: italic;
+}
+
+div.note {
+  background-color: #ffddaa;
+  padding-top: 0.5em;
+  padding-bottom: 0.5em;
+  padding-left: 0.5em;
+  padding-right: 0.5em;
+  display: block;
+  overflow: auto;
+}
+</style>
+"
+      )

From 94a8120b476cf1ba8e36b7e51b5358a5892884e7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 7 Aug 2012 11:28:49 +0200
Subject: [PATCH 1110/2585] - added .conf support to the handbook, using the
 ece-install trails to   make the documentation customer specific. Given that
 the   create-handbook.cons contains the appropriate trails, all the HTTP  
 links in the generated documentation should be instantly clickable   and the
 SSH commands should be copy and pastable (and so on).

  Here's an example of the create-handbook.conf, where the trails are
  picked up from the various .trail files generated by ece-install:

  trail_analysis_host=analysis.hosting.provider.com
  trail_builder_host=builder.vizrtsaas.com
  trail_builder_user=tomato
  trail_control_host=control.hosting.provider.com
  trail_website_name=tomato
  trail_monitoring_host=mon.hosting.provider.com
  trail_editor_host=edit1.hosting.provider.com
  trail_import_host=edit2.hosting.provider.com
  trail_nfs_server_host=nfs1.hosting.provider.com
  trail_presentation_host=pres1.hosting.provider.com
  trail_presentation_host_list="$trail_presentation_host pres2.hosting.provider.com"
  trail_db_schema=tomatodb
  trail_escenic_backup_dir=/var/backups/escenic
  trail_webapp_name=tomato

- added ECE architecture diagram
---
 usr/share/doc/vizrt/vosa-handbook/backups.org | 17 ++++-
 .../vizrt/vosa-handbook/create-handbook.sh    | 70 ++++++++++++++++---
 .../doc/vizrt/vosa-handbook/deployment.org    | 67 +++++++++++-------
 .../typical-ece-architecture.blockdiag        | 31 ++++++++
 .../doc/vizrt/vosa-handbook/monitoring.org    | 12 +++-
 .../operating-system-maintenance.org          | 29 ++++----
 .../updating-the-search-server.org            |  9 +--
 .../doc/vizrt/vosa-handbook/vosa-handbook.org |  4 ++
 8 files changed, 182 insertions(+), 57 deletions(-)
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/graphics/typical-ece-architecture.blockdiag

diff --git a/usr/share/doc/vizrt/vosa-handbook/backups.org b/usr/share/doc/vizrt/vosa-handbook/backups.org
index 2c889537..8044f4bb 100644
--- a/usr/share/doc/vizrt/vosa-handbook/backups.org
+++ b/usr/share/doc/vizrt/vosa-handbook/backups.org
@@ -7,7 +7,7 @@ cron scripts set up which create backups.
 Part of the name of the cron script is the name of your DB schema, so
 the default location of the cron script is:
 #+BEGIN_SRC sh
-/etc/cron.daily/ece5db-backup  
+/etc/cron.daily/my-db-backup  
 #+END_SRC
 
 And it'll put its backups in
@@ -17,3 +17,18 @@ And it'll put its backups in
 
 All these are overridable, see the ece-install guide for further
 details.
+
+** Multimedia archive
+The other place were you've got actual content, is in the multimedia
+archive. This, typically live on a host called nfs1 (with a mirror on
+nfs2) and a backup of the exports directory  should suffice. This is
+the directory in which all the NFS exported directories reside.
+
+#+BEGIN_SRC sh
+my-nfs-server:/var/exports  
+#+END_SRC
+
+It's recommended that the backup isn't done using the NFS mount on one
+of the other hosts using this NFS server, but instead target the
+nfs1's /var/exports directory directly as the backup tools would
+access any server directory.
diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 2fd0a9d4..50d487aa 100644
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -3,6 +3,7 @@
 # by tkj@vizrt.com
 
 handbook_org=vosa-handbook.org
+target_dir=target
 
 $(which blockdiag >/dev/null) || {
   cat <<EOF
@@ -12,24 +13,71 @@ EOF
   exit 1
 }
 
-# generate the diagram
-for el in graphics/*.blockdiag; do
-  echo "Generating PNG of $el ..."
-  blockdiag $el
-done
+function generate_png_from_blockdiag() {
+  cp -r graphics $target_dir
+  
+  for el in $target_dir/graphics/*.blockdiag; do
+    echo "Generating PNG of $el ..."
+    blockdiag $el
+  done
+}
+
+function set_customer_specific_variables() {
+  local conf_file=$(basename $0 .sh).conf
+  if [ -r $conf_file  ]; then
+    source $conf_file
+  else
+    return
+  fi
+
+  customer_filter_map="
+    my-build-server~${trail_builder_host}
+    my-build-user~${trail_builder_user}
+    my-control-server~${trail_control_host}
+    my-db~${trail_db_schema}
+    my-editorial-server~${trail_editor_host}
+    my-import-server~${trail_import_host}
+    my-import-server~${trail_import_host}
+    my-monitoring-server~${trail_monitoring_host}
+    my-nfs-server~${trail_nfs_server_host}
+    my-presentation-server~${trail_presentation_host}
+    my-stats-server~${trail_analysis_host}
+    my-webapp~${trail_website_name}
+    my-website~${trail_website_name}
+  "
+
+  for el in $customer_filter_map; do
+    local old_ifs=$IFS
+    IFS='~'
+    read from to <<< "$el"
+    IFS=$old_ifs
+    find $target_dir -name "*.org" | while read f; do
+      sed -i "s~${from}~${to}~g" ${f}
+    done
+  done
+}
+
+function set_up_build_directory() {
+  mkdir -p $target_dir
+  cp *.org $target_dir
+}
+
+set_up_build_directory
+generate_png_from_blockdiag
+set_customer_specific_variables
 
 # use emacs to generate HTML from the ORG files
 echo "Generating new handbook HTML from ORG ..." 
-emacs --batch --visit $handbook_org \
-  --funcall org-export-as-html-batch 2>/dev/null || {
+emacs \
+  --load vizrt-branding-org-mode.el \
+  --batch --visit $target_dir/$handbook_org \
+  --funcall org-export-as-html-batch 2> /dev/null || {
   cat <<EOF
-You must have Emacs 24 + org mode from git to use this export
-function.
+Failed running the org export through Emacs.
 EOF
-  exit 1
 }
 
-echo "$(basename $handbook_org .org).html is now ready"
+echo "$target_dir/$(basename $handbook_org .org).html is now ready"
 
 
 
diff --git a/usr/share/doc/vizrt/vosa-handbook/deployment.org b/usr/share/doc/vizrt/vosa-handbook/deployment.org
index f6718325..83b4d7d3 100644
--- a/usr/share/doc/vizrt/vosa-handbook/deployment.org
+++ b/usr/share/doc/vizrt/vosa-handbook/deployment.org
@@ -1,31 +1,45 @@
 * Deployment
+** Building a new EAR file
+Log on to the build server as the user for the given habitat and run
+the build script:
+
+#+BEGIN_SRC sh
+$ ssh my-build-user@my-build-server
+$ ./build.sh release
+#+END_SRC
+
+Once the build is done, the URI of the finished EAR file is printed in
+the shell. This is the URI you use for the 'ece deploy' command below.
+
 ** Deploying a new EAR file
-In the examples here, we have a build server on builder.example.com
-where we build EARs for the the tomato website.
+In the examples here, we have a build server on my-build-server
+where we build EARs for the the my-website website.
 
 *** Deploying a new EAR file for an ECE instance
+On my-control-server, do:
+
 #+BEGIN_SRC sh
-torstein@control:~$ sudo ssh escenic@pres1 ece -i engine1 --uri http://builder.example.com/tomato/releases/tomato-trunk-rev4121-2012-07-05_1524.ear  deploy
-[ece#engine-engine1] Deploying http://builder.example.com/tomato/releases/tomato-trunk-rev4121-2012-07-05_1524.ear on engine1 ...
-[ece#engine-engine1] Deploying /var/cache/escenic/tomato-trunk-rev4121-2012-07-05_1524.ear on tomcat ...
-[ece#engine-engine1] Deployment white list active, only deploying: eb escenic-admin indexer-webservice
+$ sudo ssh escenic@my-presentation-server ece -i engine1 --uri http://my-build-server/tomato/releases/tomato-trunk-rev4121-2012-07-05_1524.ear  deploy
+[ece#engine-engine1] Deploying http://my-build-server/my-build-user/releases/my-website-trunk-rev4121-2012-07-05_1524.ear on engine1 ...
+[ece#engine-engine1] Deploying /var/cache/escenic/my-website-trunk-rev4121-2012-07-05_1524.ear on tomcat ...
+[ece#engine-engine1] Deployment white list active, only deploying: my-webapp escenic-admin indexer-webservice
 [ece#engine-engine1] Deployment state file updated: /var/lib/escenic/engine1.state
 #+END_SRC
 
 We can now restart the ECE:
 
 #+BEGIN_SRC sh
-torstein@control$ sudo ssh root@pres1 /etc/init.d/ece restart 
-[ece#engine-engine1] Stopping the engine1 instance of engine on pres1 ...
-[ece#engine-engine1] Starting the engine1 instance of engine on pres1 ...
-[ece#search-search1] Stopping the search1 instance of search on pres1 ...
-[ece#search-search1] Starting the search1 instance of search on pres1 ...
+torstein@control$ sudo ssh root@my-presentation-server /etc/init.d/ece restart 
+[ece#engine-engine1] Stopping the engine1 instance of engine on my-presentation-server ...
+[ece#engine-engine1] Starting the engine1 instance of engine on my-presentation-server ...
+[ece#search-search1] Stopping the search1 instance of search on my-presentation-server ...
+[ece#search-search1] Starting the search1 instance of search on my-presentation-server ...
 #+END_SRC
 
 To confirm see that the ECE instance came up again, do:
 
 #+BEGIN_SRC sh
-torstein@control:~$ sudo ssh root@pres1 /etc/init.d/ece status
+torstein@control:~$ sudo ssh root@my-presentation-server /etc/init.d/ece status
 [ece#engine-engine1] UP 0d 0h 11m 45s
 [ece#search-search1] UP 0d 0h 11m 42s
 #+END_SRC
@@ -37,8 +51,8 @@ the search instance has a different deployment white list than that of
 the ECE instance above.
 
 #+BEGIN_SRC sh
-torstein@control:~$ sudo ssh escenic@pres1 ece -i search1 -t search --uri http://builder.example.com/tomato/releases/tomato-trunk-rev4121-2012-07-05_1524.ear deploy
-[ece#search-search1] Deploying http://builder.example.com/tomato/releases/tomato-trunk-rev4121-2012-07-05_1524.ear on search1 ...
+torstein@control:~$ sudo ssh escenic@my-presentation-server ece -i search1 -t search --uri http://my-build-server/tomato/releases/tomato-trunk-rev4121-2012-07-05_1524.ear deploy
+[ece#search-search1] Deploying http://my-build-server/tomato/releases/tomato-trunk-rev4121-2012-07-05_1524.ear on search1 ...
 [ece#search-search1] Deploying /var/cache/escenic/tomato-trunk-rev4121-2012-07-05_1524.ear on tomcat ...
 [ece#search-search1] Deployment white list active, only deploying: escenic-admin solr indexer-webapp
 [ece#search-search1] Deployment state file updated: /var/lib/escenic/search1.state  
@@ -55,22 +69,23 @@ SCM, but for consistency, you can just follow the guide below for
 these as well (layout, layout-group, menu, community/security and so
 on).
 
-*** Extract the publication resources.
-Make sure you have already done the deployment in the pres1 server
+1) First, extract the publication resources.  Make sure you have already
+done the deployment in the my-presentation-server server
 
-*** Login to one of the presentation servers
+2) Login to one of the presentation servers
+From my-control-server, do:
 #+BEGIN_SRC sh
-control$ sudo ssh root@pres1  
+$ sudo ssh root@my-presentation-server  
 #+END_SRC
 
 *** Change to the escenic user
 #+BEGIN_SRC sh
-pres1# su - escenic
+# su - escenic
 #+END_SRC
 
 *** Download current content-type
 #+BEGIN_SRC sh
-pres1$ wget -O ~/backup/content-type-$(date --iso)-before-deployment \
+$ wget -O ~/backup/content-type-$(date --iso)-before-deployment \
        http://localhost:8080/escenic-admin/publication-resources/mypub/escenic/content-type
 #+END_SRC
 
@@ -78,12 +93,12 @@ pres1$ wget -O ~/backup/content-type-$(date --iso)-before-deployment \
 Go to the new new content-type from your latest deployment 
 
 #+BEGIN_SRC sh
-pres1$ cd /opt/tomcat-engine1/webapps/eb/META-INF/escenic/publication-resources/escenic/
+$ cd /opt/tomcat-engine1/webapps/eb/META-INF/escenic/publication-resources/escenic/
 #+END_SRC
 
 *** Confirm the changes with diff
 #+BEGIN_SRC sh
-pres$ diff -w ~/backup/content-type-$(date --iso)-before-deployment content-type  
+$ diff -w ~/backup/content-type-$(date --iso)-before-deployment content-type  
 #+END_SRC
 
 
@@ -93,21 +108,21 @@ publication resource in the current directory. Since we changed into
 that directory in step 5), we can therefore now do:
 
 #+BEGIN_SRC sh
-pres1$ ece -i engine1 -p mypub -r content-type update
+$ ece -i engine1 -p mypub -r content-type update
 #+END_SRC
 
 
 *** Download the resource again to check if its in place
 #+BEGIN_SRC sh
-pres1$ wget -O ~/backup/content-type-$(date --iso)-after-deployment \
+$ wget -O ~/backup/content-type-$(date --iso)-after-deployment \
                http://localhost:8080/escenic-admin/publication-resources/mypub/escenic/content-type
 #+END_SRC
 
 
 *** Do check with diff again
 #+BEGIN_SRC sh
-pres$ diff -w ~/backup/content-type-$(date --iso)-before-deployment \
-              ~/backup/content-type-$(date --iso)-after-deployment
+$ diff -w ~/backup/content-type-$(date --iso)-before-deployment \
+          ~/backup/content-type-$(date --iso)-after-deployment
 #+END_SRC
 
 
diff --git a/usr/share/doc/vizrt/vosa-handbook/graphics/typical-ece-architecture.blockdiag b/usr/share/doc/vizrt/vosa-handbook/graphics/typical-ece-architecture.blockdiag
new file mode 100644
index 00000000..49a6af8f
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/graphics/typical-ece-architecture.blockdiag
@@ -0,0 +1,31 @@
+# a typical ECE production environment
+blockdiag {
+    orientation = portrait;
+
+    internet [ shape = "cloud" ];
+    pres1 [ color = "orange" ];
+    pres2 [ color = "orange" ];
+    db1 [ shape = "flowchart.database" ];
+    db2 [ shape = "flowchart.database" ];
+    edit1 [ color = "orange" ];
+    edit2 [ color = "orange" ];
+    journalist [ shape = "actor" ];
+
+    group {
+        pres1;
+        pres2;
+        edit1;
+        edit2;
+        color = "white";
+    };
+    
+    internet -> lb -> pres1, pres2;
+    pres1 -> db-vip, nfs-vip;
+    pres2 -> db-vip, nfs-vip;
+    journalist -> edit1 -> db-vip, nfs-vip;
+    import -> edit2 -> db-vip, nfs-vip;
+    
+    db-vip -> db1, db2;
+    db1 <-> db2;
+    nfs-vip -> nfs1, nfs2;
+}
diff --git a/usr/share/doc/vizrt/vosa-handbook/monitoring.org b/usr/share/doc/vizrt/vosa-handbook/monitoring.org
index f906f5d8..bce1c0cf 100644
--- a/usr/share/doc/vizrt/vosa-handbook/monitoring.org
+++ b/usr/share/doc/vizrt/vosa-handbook/monitoring.org
@@ -19,15 +19,21 @@ the user under which ECE, EAE and the Search instance are running as
 *** In the Web Browser
 All VOSA hosts also has a (maximum) one minute old HTML report from
 system-info running on port 5678. So for instance, if your host is
-called pres1, you can access the system-info report on
-http://pres1:5678/
+called my-presentation-server, you can access the system-info report on
+http://my-presentation-server:5678/
 
-Here's a screenshot of the system-info report running on http://pres1:5678/:
+Here's a screenshot of the system-info report running on http://my-presentation-server:5678/:
 [[[[graphics/pres1-system-info.png]]
 
 ** Hugin
 
 ** Munin
+Each VOSA habitat has its own Munin installation where you can see the
+trending of your site. I.e. how it has been behaving the last days,
+weeks and months.
+
+If we assume your monitoring server is called "my-monitoring-server",
+the address to your munin is: http://my-monitoring-server/munin/
 
 ** Icinga (enhanced Nagios)
 
diff --git a/usr/share/doc/vizrt/vosa-handbook/operating-system-maintenance.org b/usr/share/doc/vizrt/vosa-handbook/operating-system-maintenance.org
index de7b6fe0..a03e1ba7 100644
--- a/usr/share/doc/vizrt/vosa-handbook/operating-system-maintenance.org
+++ b/usr/share/doc/vizrt/vosa-handbook/operating-system-maintenance.org
@@ -15,25 +15,30 @@ any issues before going ahead with the upgrades below.
 ** Debian based operating systems
 This applies to OSs like Debian, Ubuntu and Mint.
 
-In the example below, we update the Ubuntu servers called pres1,
-pres2, edit1, edit2, mon and analysis:
+In the example below, we update the Ubuntu servers called
+my-presentation-server my-editorial-server my-import-server
+my-monitoring-server my-stats-server from the comfort of
+my-control-server.
+
 #+BEGIN_SRC sh
-control$ for el in pres{1,2} edit{1,2}, mon analysis; do \
-           echo "Now upgrading $el"; \
-           sudo ssh root@$el 'apt-get -qq update && apt-get -q upgrade' ; \
-         done
+$ for el in my-presentation-server my-editorial-server my-import-server my-monitoring-server my-stats-server; do \
+      echo "Now upgrading $el"; \
+      sudo ssh root@$el 'apt-get -qq update && apt-get -q upgrade' ; \
+  done
 #+END_SRC
 
 
 ** RedHat based operating systems
 This applies to OSs like CentOS, RedHat and Fedora:
 
-In the example below, we update the Ubuntu servers called pres1,
-pres2, edit1, edit2, mon and analysis:
+In the example below, we update the RedHat servers called
+my-presentation-server my-editorial-server my-import-server
+my-monitoring-server my-stats-server from the comfort of
+my-control-server.
 
 #+BEGIN_SRC sh
-control$ for el in pres{1,2} edit{1,2}, mon analysis; do \
-           echo "Now upgrading $el";
-           ssh yum update; 
-         done
+$ for el in my-presentation-server my-editorial-server my-import-server my-monitoring-server my-stats-server; do \
+      echo "Now upgrading $el";
+      ssh yum update; 
+  done
 #+END_SRC
diff --git a/usr/share/doc/vizrt/vosa-handbook/updating-the-search-server.org b/usr/share/doc/vizrt/vosa-handbook/updating-the-search-server.org
index ea9909c5..89acb0b2 100644
--- a/usr/share/doc/vizrt/vosa-handbook/updating-the-search-server.org
+++ b/usr/share/doc/vizrt/vosa-handbook/updating-the-search-server.org
@@ -5,11 +5,12 @@ ECE instance(s) that use the search server you're updating. To do
 this, you can use the Component Browser in the escenic-admin
 interface.
 
-For instance, let's say you're upgrading the search server for edit1
-and want it to temporarily use edit2's search instance.
+For instance, let's say you're upgrading the search server for
+my-editorial-server and want it to temporarily use my-import-server's
+search instance.
 
 First, go to:
-http://edit1:8080/escenic-admin/browser/Global/com/escenic/webservice/search/DelegatingSearchEngine?property=solrURI
+http://my-editorial-server:8080/escenic-admin/browser/Global/com/escenic/webservice/search/DelegatingSearchEngine?property=solrURI
 
 Then, change the value from:
 #+BEGIN_SRC conf
@@ -19,5 +20,5 @@ http://localhost:8081/solr/select
 to
 
 #+BEGIN_SRC conf
-http://edit2:8081/solr/select	  
+http://my-import-server:8081/solr/select	  
 #+END_SRC
diff --git a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
index 2df3f017..64f15557 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
+++ b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
@@ -1,7 +1,11 @@
 #+TITLE: Welcome to the VOSA Handbook
 #+AUTHOR: Erik Mogensen & Torstein Krause Johansen
+#+OPTIONS: toc:2 
 
+#+INCLUDE: "overview.org"
 #+INCLUDE: "operating-system-maintenance.org" 
 #+INCLUDE: "deployment.org"
 #+INCLUDE: "updating-the-search-server.org"
 #+INCLUDE: "backups.org"
+#+INCLUDE: "monitoring.org"
+#+INCLUDE: "glossary.org"

From c97df7fd0cba438d97051a53deef270888ebe315 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 7 Aug 2012 12:51:54 +0200
Subject: [PATCH 1111/2585] - added the overview architecture

---
 usr/share/doc/vizrt/vosa-handbook/overview.org | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/overview.org

diff --git a/usr/share/doc/vizrt/vosa-handbook/overview.org b/usr/share/doc/vizrt/vosa-handbook/overview.org
new file mode 100644
index 00000000..c1a0f4bf
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/overview.org
@@ -0,0 +1,4 @@
+* Getting the Overview
+
+#+ATTR_HTML: alt="Typical ECE architecture"
+[[[[graphics/typical-ece-architecture.png]]

From f5f2a3007147d98cb67493826a49813248d52acb Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 7 Aug 2012 13:43:59 +0200
Subject: [PATCH 1112/2585] - removed

---
 .../typical-ece-architecture.blockdiag        | 31 -------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 usr/share/doc/vizrt/vosa-handbook/graphics/typical-ece-architecture.blockdiag

diff --git a/usr/share/doc/vizrt/vosa-handbook/graphics/typical-ece-architecture.blockdiag b/usr/share/doc/vizrt/vosa-handbook/graphics/typical-ece-architecture.blockdiag
deleted file mode 100644
index 49a6af8f..00000000
--- a/usr/share/doc/vizrt/vosa-handbook/graphics/typical-ece-architecture.blockdiag
+++ /dev/null
@@ -1,31 +0,0 @@
-# a typical ECE production environment
-blockdiag {
-    orientation = portrait;
-
-    internet [ shape = "cloud" ];
-    pres1 [ color = "orange" ];
-    pres2 [ color = "orange" ];
-    db1 [ shape = "flowchart.database" ];
-    db2 [ shape = "flowchart.database" ];
-    edit1 [ color = "orange" ];
-    edit2 [ color = "orange" ];
-    journalist [ shape = "actor" ];
-
-    group {
-        pres1;
-        pres2;
-        edit1;
-        edit2;
-        color = "white";
-    };
-    
-    internet -> lb -> pres1, pres2;
-    pres1 -> db-vip, nfs-vip;
-    pres2 -> db-vip, nfs-vip;
-    journalist -> edit1 -> db-vip, nfs-vip;
-    import -> edit2 -> db-vip, nfs-vip;
-    
-    db-vip -> db1, db2;
-    db1 <-> db2;
-    nfs-vip -> nfs1, nfs2;
-}

From 059201074f29390579b7a1f5689414600c8e10aa Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 7 Aug 2012 14:06:29 +0200
Subject: [PATCH 1113/2585] - added automatically generation of the system
 architecture diagram   based on these ece-install trails.

  trail_analysis_host=analysis.hosting.partner.com
  trail_builder_host=builder.vizrtsaas.com
  trail_builder_user=nie
  trail_control_host=control.hosting.partner.com
  trail_website_name=nie
  trail_monitoring_host=mon.hosting.partner.com
  trail_editor_host=edit1.hosting.partner.com
  trail_import_host=edit2.hosting.partner.com
  trail_nfs_master_host=nfs1.hosting.partner.com
  trail_nfs_slave_host=nfs2.hosting.partner.com
  trail_nfs_vip_host=nfs.hosting.partner.com
  trail_presentation_host=pres1.hosting.partner.com
  trail_presentation_host_list="$trail_presentation_host pres2.hosting.partner.com pres3.hosting.partner.com pres4.hosting.partner.com"
  trail_db_master_host=db1.hosting.partner.com
  trail_db_slave_host=db2.hosting.partner.com
  trail_db_vip_host=db.hosting.partner.com
  trail_db_schema=niedb
  trail_escenic_backup_dir=/var/backups/escenic
  trail_webapp_name=nie
---
 .../vizrt/vosa-handbook/create-handbook.sh    | 166 +++++++++++++++---
 1 file changed, 141 insertions(+), 25 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 50d487aa..3a5193c6 100644
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -31,19 +31,19 @@ function set_customer_specific_variables() {
   fi
 
   customer_filter_map="
-    my-build-server~${trail_builder_host}
-    my-build-user~${trail_builder_user}
-    my-control-server~${trail_control_host}
-    my-db~${trail_db_schema}
-    my-editorial-server~${trail_editor_host}
-    my-import-server~${trail_import_host}
-    my-import-server~${trail_import_host}
-    my-monitoring-server~${trail_monitoring_host}
-    my-nfs-server~${trail_nfs_server_host}
-    my-presentation-server~${trail_presentation_host}
-    my-stats-server~${trail_analysis_host}
-    my-webapp~${trail_website_name}
-    my-website~${trail_website_name}
+    my-build-server~${trail_builder_host-builder}
+    my-build-user~${trail_builder_user-buildy}
+    my-control-server~${trail_control_host-control}
+    my-db-server~${trail_db_server-db1}
+    my-db~${trail_db_schema-mydb}
+    my-editorial-server~${trail_editor_host-edit1}
+    my-import-server~${trail_import_host-edit2}
+    my-monitoring-server~${trail_monitoring_host-mon}
+    my-nfs-server~${trail_nfs_server_host-nfs1}
+    my-presentation-server~${trail_presentation_host-pres1}
+    my-stats-server~${trail_analysis_host-analysis}
+    my-webapp~${trail_website_name-mywebapp}
+    my-website~${trail_website_name-mywebsite}
   "
 
   for el in $customer_filter_map; do
@@ -62,22 +62,138 @@ function set_up_build_directory() {
   cp *.org $target_dir
 }
 
-set_up_build_directory
-generate_png_from_blockdiag
-set_customer_specific_variables
+function get_blockdiag_defs() {
+  if [ -n "$trail_db_master_host" ]; then
+    echo " " $trail_db_master_host '[shape = "flowchart.database" ];'
+  fi
+  if [ -n "$trail_db_slave_host" ]; then
+    echo " " $trail_db_slave_host '[shape = "flowchart.database" ];'
+  fi
+  if [ -n "$trail_presentation_host_list" ]; then
+    for el in $trail_presentation_host_list; do
+      echo " " $el '[color = "orange" ];'
+    done
+  fi
+  if [ -n "$trail_editor_host" ]; then
+    echo " " $trail_editor_host '[color = "orange" ];'
+  fi
+  if [ -n "$trail_import_host" ]; then
+    echo " " $trail_import_host '[color = "orange" ];'
+  fi
+}
 
-# use emacs to generate HTML from the ORG files
-echo "Generating new handbook HTML from ORG ..." 
-emacs \
-  --load vizrt-branding-org-mode.el \
-  --batch --visit $target_dir/$handbook_org \
-  --funcall org-export-as-html-batch 2> /dev/null || {
-  cat <<EOF
-Failed running the org export through Emacs.
+function get_blockdiag_groups() {
+  echo "  group {"
+  
+  if [ -n "$trail_editor_host" ]; then
+    echo "    $trail_editor_host;"
+  fi
+  if [ -n "$trail_import_host" ]; then
+    echo "    $trail_import_host;"
+  fi
+  if [ -n "$trail_presentation_host_list" ]; then
+    for el in $trail_presentation_host_list; do
+      echo "    $el;"
+    done
+  fi
+  echo '    color = "white";'
+  echo "  }"
+}
+
+function get_blockdiag_call_flow() {
+
+  # from the internet and to the ECEs
+  local lb_call_flow="internet ->"
+  if [ -n "$trail_lb_host" ]; then
+    lb_call_flow="$lb_call_flow $trail_lb_host ->"
+  fi
+  for el in $trail_presentation_host_list; do
+    lb_call_flow="$lb_call_flow ${el},"
+  done
+  echo " " ${lb_call_flow} | sed 's/,$/;/g'
+  
+  if [ -n "$trail_editor_host" ]; then
+    echo "  journalist -> $trail_editor_host;"
+  fi
+  if [ -n "$trail_import_host" ]; then
+    echo "  import-feeds -> $trail_import_host;"
+  fi
+  
+  # ECEs
+  for el in \
+    $trail_presentation_host_list \
+    $trail_editor_host \
+    $trail_import_host; do
+    local one_flow="$el ->"
+    for ele in $trail_db_vip_host $trail_nfs_vip_host; do
+      one_flow="${one_flow} ${ele},"
+    done
+    echo " " ${one_flow} | sed 's/,$/;/g'
+  done
+  
+  # DB
+  if [ -n "$trail_db_vip_host" -a \
+    -n "$trail_db_master_host" -a \
+    -n "$trail_db_slave_host" ]; then
+    echo " " $trail_db_vip_host "->" \
+      $trail_db_master_host"," \
+      $trail_db_slave_host";"
+  fi
+  if [ -n "$trail_db_master_host" -a \
+    -n "$trail_db_slave_host" ]; then
+    echo " " $trail_db_master_host "<->" $trail_db_slave_host";"
+  fi
+
+  # NFS
+  if [ -n "$trail_nfs_vip_host" -a \
+    -n "$trail_nfs_master_host" -a \
+    -n "$trail_nfs_slave_host" ]; then
+    echo " " $trail_nfs_vip_host "->" \
+      $trail_nfs_master_host"," \
+      $trail_nfs_slave_host";"
+  fi
+  if [ -n "$trail_nfs_master_host" -a \
+    -n "$trail_nfs_slave_host" ]; then
+    echo " " $trail_nfs_master_host "<->" $trail_nfs_slave_host";"
+  fi
+}
+
+function generate_architecture_diagram() {
+  local file=$target_dir/graphics/architecture.blockdiag
+  cat > $file <<EOF
+# generated by $(basename $0) @ $(date)
+blockdiag {
+ orientation = portrait;
+ journalist [ shape = "actor" ];
+
+  internet [ shape = "cloud" ];
+$(get_blockdiag_defs)
+
+
+
+$(get_blockdiag_call_flow)
+}
 EOF
 }
 
-echo "$target_dir/$(basename $handbook_org .org).html is now ready"
+function generate_html_from_org() {
+# use emacs to generate HTML from the ORG files
+  echo "Generating new handbook HTML from ORG ..." 
+  emacs \
+    --load vizrt-branding-org-mode.el \
+    --batch --visit $target_dir/$handbook_org \
+    --funcall org-export-as-html-batch 2> /dev/null || {
+    cat <<EOF
+Failed running the org export through Emacs.
+EOF
+  }
 
+  echo "$target_dir/$(basename $handbook_org .org).html is now ready"
+}
 
 
+set_up_build_directory
+set_customer_specific_variables
+generate_architecture_diagram
+generate_png_from_blockdiag
+generate_html_from_org

From 65154d2294d8cbb6e2abc29fa9e4ac8821483aa8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 7 Aug 2012 14:22:27 +0200
Subject: [PATCH 1114/2585] - added

---
 .../graphics/pres1-system-info.png              | Bin 0 -> 48014 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/graphics/pres1-system-info.png

diff --git a/usr/share/doc/vizrt/vosa-handbook/graphics/pres1-system-info.png b/usr/share/doc/vizrt/vosa-handbook/graphics/pres1-system-info.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f04f03cbe2b900a2694b28d71b0f5c0371e5ef0
GIT binary patch
literal 48014
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

literal 0
HcmV?d00001


From 7cac1fedfb3e06eb87102faa6dbf30de27f9adb5 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <erik@mogensoft.net>
Date: Tue, 7 Aug 2012 15:46:26 +0300
Subject: [PATCH 1115/2585] Leave behind pidfile after stop

This should avoid stuff like issue #89
---
 usr/bin/vosa | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 8d041121..35ae410c 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -995,13 +995,13 @@ function do_stop() {
       shutdown "${status[0]}"
       # should now be "dead" if we asked it.
     fi
-    if [ $aws -eq 0 ] ; then
+    #if [ $aws -eq 0 ] ; then
       # regardless of this, we _want_ it to die. remove pidfile.
       # TODO: continue trying to kill it more forcibly, and
       # remove the pidfile when it's done.
-      local pidfile=$(echo_rundir_of ${status[0]})/${status[0]}.pid
-      rm -f $pidfile
-    fi
+      #local pidfile=$(echo_rundir_of ${status[0]})/${status[0]}.pid
+      #rm -f $pidfile
+    #fi
   }
 }
 

From 935b956d77386153efa518b032452ffd8d079db8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 7 Aug 2012 14:49:48 +0200
Subject: [PATCH 1116/2585] - added run wrapper - made use of this to fail fast

---
 .../vizrt/vosa-handbook/create-handbook.sh    | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 3a5193c6..1b33366f 100644
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -13,12 +13,20 @@ EOF
   exit 1
 }
 
+function run() {
+  "$@"
+  if [ $? -ne 0 ]; then
+    echo "Command [ $@ ] FAILED :-("
+    exit 1
+  fi
+}
+
 function generate_png_from_blockdiag() {
-  cp -r graphics $target_dir
+  run cp -r graphics $target_dir
   
   for el in $target_dir/graphics/*.blockdiag; do
     echo "Generating PNG of $el ..."
-    blockdiag $el
+    run blockdiag $el
   done
 }
 
@@ -52,14 +60,14 @@ function set_customer_specific_variables() {
     read from to <<< "$el"
     IFS=$old_ifs
     find $target_dir -name "*.org" | while read f; do
-      sed -i "s~${from}~${to}~g" ${f}
+      run sed -i "s~${from}~${to}~g" ${f}
     done
   done
 }
 
 function set_up_build_directory() {
-  mkdir -p $target_dir
-  cp *.org $target_dir
+  run mkdir -p $target_dir
+  run cp *.org $target_dir
 }
 
 function get_blockdiag_defs() {
@@ -179,15 +187,10 @@ EOF
 function generate_html_from_org() {
 # use emacs to generate HTML from the ORG files
   echo "Generating new handbook HTML from ORG ..." 
-  emacs \
+  run emacs \
     --load vizrt-branding-org-mode.el \
     --batch --visit $target_dir/$handbook_org \
-    --funcall org-export-as-html-batch 2> /dev/null || {
-    cat <<EOF
-Failed running the org export through Emacs.
-EOF
-  }
-
+    --funcall org-export-as-html-batch 2> /dev/null
   echo "$target_dir/$(basename $handbook_org .org).html is now ready"
 }
 

From 58418cc76c099166c2a3fa874b96d1745bf2dbb8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 7 Aug 2012 14:50:02 +0200
Subject: [PATCH 1117/2585] - more expansion variables

---
 usr/share/doc/vizrt/vosa-handbook/deployment.org | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/deployment.org b/usr/share/doc/vizrt/vosa-handbook/deployment.org
index 83b4d7d3..bd79a322 100644
--- a/usr/share/doc/vizrt/vosa-handbook/deployment.org
+++ b/usr/share/doc/vizrt/vosa-handbook/deployment.org
@@ -19,7 +19,7 @@ where we build EARs for the the my-website website.
 On my-control-server, do:
 
 #+BEGIN_SRC sh
-$ sudo ssh escenic@my-presentation-server ece -i engine1 --uri http://my-build-server/tomato/releases/tomato-trunk-rev4121-2012-07-05_1524.ear  deploy
+$ sudo ssh escenic@my-presentation-server ece -i engine1 --uri http://my-build-server/my-builder-user/releases/my-website-trunk-rev4121-2012-07-05_1524.ear  deploy
 [ece#engine-engine1] Deploying http://my-build-server/my-build-user/releases/my-website-trunk-rev4121-2012-07-05_1524.ear on engine1 ...
 [ece#engine-engine1] Deploying /var/cache/escenic/my-website-trunk-rev4121-2012-07-05_1524.ear on tomcat ...
 [ece#engine-engine1] Deployment white list active, only deploying: my-webapp escenic-admin indexer-webservice
@@ -51,9 +51,9 @@ the search instance has a different deployment white list than that of
 the ECE instance above.
 
 #+BEGIN_SRC sh
-torstein@control:~$ sudo ssh escenic@my-presentation-server ece -i search1 -t search --uri http://my-build-server/tomato/releases/tomato-trunk-rev4121-2012-07-05_1524.ear deploy
-[ece#search-search1] Deploying http://my-build-server/tomato/releases/tomato-trunk-rev4121-2012-07-05_1524.ear on search1 ...
-[ece#search-search1] Deploying /var/cache/escenic/tomato-trunk-rev4121-2012-07-05_1524.ear on tomcat ...
+torstein@control:~$ sudo ssh escenic@my-presentation-server ece -i search1 -t search --uri http://my-build-server/my-builder-user/releases/my-website-trunk-rev4121-2012-07-05_1524.ear deploy
+[ece#search-search1] Deploying http://my-build-server/my-builder-user/releases/my-website-trunk-rev4121-2012-07-05_1524.ear on search1 ...
+[ece#search-search1] Deploying /var/cache/escenic/my-website-trunk-rev4121-2012-07-05_1524.ear on tomcat ...
 [ece#search-search1] Deployment white list active, only deploying: escenic-admin solr indexer-webapp
 [ece#search-search1] Deployment state file updated: /var/lib/escenic/search1.state  
 #+END_SRC

From 10f2d7f8404103d77361a653640652789ff132c4 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 7 Aug 2012 14:50:19 +0200
Subject: [PATCH 1118/2585] - links to all variable hosts

---
 usr/share/doc/vizrt/vosa-handbook/monitoring.org | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/monitoring.org b/usr/share/doc/vizrt/vosa-handbook/monitoring.org
index bce1c0cf..6895ab70 100644
--- a/usr/share/doc/vizrt/vosa-handbook/monitoring.org
+++ b/usr/share/doc/vizrt/vosa-handbook/monitoring.org
@@ -18,9 +18,14 @@ the user under which ECE, EAE and the Search instance are running as
 
 *** In the Web Browser
 All VOSA hosts also has a (maximum) one minute old HTML report from
-system-info running on port 5678. So for instance, if your host is
-called my-presentation-server, you can access the system-info report on
-http://my-presentation-server:5678/
+system-info running on port 5678. So for any VOSA habitat, you can
+access these reports like this:
+- http://my-presentation-server:5678/
+- http://my-editorial-server:5678/
+- http://my-import-server:5678/
+- http://my-nfs-server:5678/
+- http://my-db-server:5678/
+- http://my-stats-server:5678/
 
 Here's a screenshot of the system-info report running on http://my-presentation-server:5678/:
 [[[[graphics/pres1-system-info.png]]

From 6a4f65952d5c436a499936fbce9b41cc037ffd17 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 7 Aug 2012 14:50:36 +0200
Subject: [PATCH 1119/2585] - changed the name of the now automatically
 generated diagram

---
 usr/share/doc/vizrt/vosa-handbook/overview.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/overview.org b/usr/share/doc/vizrt/vosa-handbook/overview.org
index c1a0f4bf..b31a1dcd 100644
--- a/usr/share/doc/vizrt/vosa-handbook/overview.org
+++ b/usr/share/doc/vizrt/vosa-handbook/overview.org
@@ -1,4 +1,4 @@
 * Getting the Overview
 
 #+ATTR_HTML: alt="Typical ECE architecture"
-[[[[graphics/typical-ece-architecture.png]]
+[[[[graphics/architecture.png]]

From 5fc73f5a1362596a98cf0fac3b83cc1cf405bb8c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 7 Aug 2012 15:03:41 +0200
Subject: [PATCH 1120/2585] - will now make up a really, really simple
 architecture if none is given

---
 .../vizrt/vosa-handbook/create-handbook.sh    | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 1b33366f..b714f991 100644
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -3,7 +3,7 @@
 # by tkj@vizrt.com
 
 handbook_org=vosa-handbook.org
-target_dir=target
+target_dir=/tmp/$(basename $0 .sh)-$(date --iso)
 
 $(which blockdiag >/dev/null) || {
   cat <<EOF
@@ -35,7 +35,11 @@ function set_customer_specific_variables() {
   if [ -r $conf_file  ]; then
     source $conf_file
   else
-    return
+    echo "No ${conf_file} found, I'm making something up ..."
+    trail_presentation_host=pres1
+    trail_presentation_host_list=$trail_presentation_host
+    trail_db_master_host=db1
+    trail_nfs_master_host=nfs1
   fi
 
   customer_filter_map="
@@ -66,7 +70,7 @@ function set_customer_specific_variables() {
 }
 
 function set_up_build_directory() {
-  run mkdir -p $target_dir
+  run mkdir -p $target_dir/graphics
   run cp *.org $target_dir
 }
 
@@ -133,9 +137,18 @@ function get_blockdiag_call_flow() {
     $trail_editor_host \
     $trail_import_host; do
     local one_flow="$el ->"
-    for ele in $trail_db_vip_host $trail_nfs_vip_host; do
-      one_flow="${one_flow} ${ele},"
-    done
+
+    if [ -n "$trail_db_vip_host" ]; then
+      one_flow="${one_flow} $trail_db_vip_host,"
+    elif [ -n "$trail_db_master_host" ]; then
+      one_flow="${one_flow} $trail_db_master_host,"
+    fi
+    if [ -n "$trail_nfs_vip_host" ]; then
+      one_flow="${one_flow} $trail_nfs_vip_host,"
+    elif [ -n "$trail_nfs_master_host" ]; then
+      one_flow="${one_flow} $trail_nfs_master_host,"
+    fi
+    
     echo " " ${one_flow} | sed 's/,$/;/g'
   done
   

From e0144110ebb38139155050e561779b89ab58ec64 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 7 Aug 2012 15:45:55 +0200
Subject: [PATCH 1121/2585] - fix & support for db master & slave hosts - added
 grouping based on presentation:

  internet, lb, presentation ECEs and EAE are in the same block diag
  group.

- added EAE
---
 .../vizrt/vosa-handbook/create-handbook.sh    | 41 ++++++++++++++-----
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index b714f991..37fe27d3 100644
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -46,12 +46,12 @@ function set_customer_specific_variables() {
     my-build-server~${trail_builder_host-builder}
     my-build-user~${trail_builder_user-buildy}
     my-control-server~${trail_control_host-control}
-    my-db-server~${trail_db_server-db1}
+    my-db-server~${trail_db_master_host-db1}
     my-db~${trail_db_schema-mydb}
     my-editorial-server~${trail_editor_host-edit1}
     my-import-server~${trail_import_host-edit2}
     my-monitoring-server~${trail_monitoring_host-mon}
-    my-nfs-server~${trail_nfs_server_host-nfs1}
+    my-nfs-server~${trail_nfs_master_host-nfs1}
     my-presentation-server~${trail_presentation_host-pres1}
     my-stats-server~${trail_analysis_host-analysis}
     my-webapp~${trail_website_name-mywebapp}
@@ -92,22 +92,35 @@ function get_blockdiag_defs() {
   if [ -n "$trail_import_host" ]; then
     echo " " $trail_import_host '[color = "orange" ];'
   fi
+  if [ -n "$trail_analysis_host" ]; then
+    echo " " $trail_analysis_host '[color = "yellow" ];'
+  fi
+  if [ -n "$trail_db_vip_host" ]; then
+    echo " " $trail_db_vip_host '[shape = roundedbox];'
+  fi
+  if [ -n "$trail_nfs_vip_host" ]; then
+    echo " " $trail_nfs_vip_host '[shape = roundedbox];'
+  fi
+  if [ -n "$trail_lb_host" ]; then
+    echo " " $trail_lb_host '[shape = roundedbox];'
+  fi
 }
 
 function get_blockdiag_groups() {
+  # serving presentation
   echo "  group {"
-  
-  if [ -n "$trail_editor_host" ]; then
-    echo "    $trail_editor_host;"
-  fi
-  if [ -n "$trail_import_host" ]; then
-    echo "    $trail_import_host;"
+  echo "    internet;"
+  if [ -n "$trail_lb_host" ]; then
+    echo "    $trail_lb_host;"
   fi
   if [ -n "$trail_presentation_host_list" ]; then
     for el in $trail_presentation_host_list; do
       echo "    $el;"
     done
   fi
+  if [ -n "$trail_analysis_host" ]; then
+    echo "    $trail_analysis_host;"
+  fi
   echo '    color = "white";'
   echo "  }"
 }
@@ -148,9 +161,17 @@ function get_blockdiag_call_flow() {
     elif [ -n "$trail_nfs_master_host" ]; then
       one_flow="${one_flow} $trail_nfs_master_host,"
     fi
-    
     echo " " ${one_flow} | sed 's/,$/;/g'
   done
+
+  for el in $trail_presentation_host_list; do
+    local one_flow="$el ->"
+    if [ -n "$trail_analysis_host" ]; then
+      one_flow="${one_flow} $trail_analysis_host;"
+    fi
+    echo " " $one_flow;
+  done
+
   
   # DB
   if [ -n "$trail_db_vip_host" -a \
@@ -190,7 +211,7 @@ blockdiag {
   internet [ shape = "cloud" ];
 $(get_blockdiag_defs)
 
-
+$(get_blockdiag_groups)
 
 $(get_blockdiag_call_flow)
 }

From 08afea4eada43fc043c4af7725b2c32bf1dcb12e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 7 Aug 2012 15:48:00 +0200
Subject: [PATCH 1122/2585] - fix for non-exist ant/empty .conf file

---
 usr/share/doc/vizrt/vosa-handbook/create-handbook.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 37fe27d3..805308f0 100644
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -165,13 +165,10 @@ function get_blockdiag_call_flow() {
   done
 
   for el in $trail_presentation_host_list; do
-    local one_flow="$el ->"
     if [ -n "$trail_analysis_host" ]; then
-      one_flow="${one_flow} $trail_analysis_host;"
+      echo "  $el -> ${one_flow} $trail_analysis_host;"
     fi
-    echo " " $one_flow;
   done
-
   
   # DB
   if [ -n "$trail_db_vip_host" -a \

From 5e5f714c8fcfff556d885a2c8f246c5576da6b94 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 7 Aug 2012 15:49:29 +0200
Subject: [PATCH 1123/2585] - added executable bit

---
 usr/share/doc/vizrt/vosa-handbook/create-handbook.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 usr/share/doc/vizrt/vosa-handbook/create-handbook.sh

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
old mode 100644
new mode 100755
index 805308f0..2502a8fb
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -225,9 +225,9 @@ function generate_html_from_org() {
   echo "$target_dir/$(basename $handbook_org .org).html is now ready"
 }
 
-
 set_up_build_directory
 set_customer_specific_variables
 generate_architecture_diagram
 generate_png_from_blockdiag
 generate_html_from_org
+

From bfaf1591e377e291e4ac24423091d071a0e009cf Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 7 Aug 2012 15:54:11 +0200
Subject: [PATCH 1124/2585] - fixed bug introduced when adding support for EAE

---
 usr/share/doc/vizrt/vosa-handbook/create-handbook.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 2502a8fb..001391d6 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -166,7 +166,7 @@ function get_blockdiag_call_flow() {
 
   for el in $trail_presentation_host_list; do
     if [ -n "$trail_analysis_host" ]; then
-      echo "  $el -> ${one_flow} $trail_analysis_host;"
+      echo "  $el -> $trail_analysis_host;"
     fi
   done
   

From 4195e4899cd85635fa3cb0c5814d9913ab49b792 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 7 Aug 2012 15:59:24 +0200
Subject: [PATCH 1125/2585] - added labels to DB & NFS sync operations

---
 usr/share/doc/vizrt/vosa-handbook/create-handbook.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 001391d6..daee4eeb 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -180,7 +180,8 @@ function get_blockdiag_call_flow() {
   fi
   if [ -n "$trail_db_master_host" -a \
     -n "$trail_db_slave_host" ]; then
-    echo " " $trail_db_master_host "<->" $trail_db_slave_host";"
+    echo " " $trail_db_master_host "<->" $trail_db_slave_host \
+      '[ label = "syncs" ];'
   fi
 
   # NFS
@@ -193,7 +194,8 @@ function get_blockdiag_call_flow() {
   fi
   if [ -n "$trail_nfs_master_host" -a \
     -n "$trail_nfs_slave_host" ]; then
-    echo " " $trail_nfs_master_host "<->" $trail_nfs_slave_host";"
+    echo " " $trail_nfs_master_host "<->" $trail_nfs_slave_host \
+      '[ label = "syncs" ];'
   fi
 }
 

From 74dea5cdcd5410ccf72b6669b9cbf7df7e3393aa Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 8 Aug 2012 09:31:41 +0200
Subject: [PATCH 1126/2585] - added generation of a quick link table for all
 the servers & their   most important services.

---
 .../vizrt/vosa-handbook/create-handbook.sh    | 73 +++++++++++++++++++
 1 file changed, 73 insertions(+)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index daee4eeb..ecb030d2 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -227,9 +227,82 @@ function generate_html_from_org() {
   echo "$target_dir/$(basename $handbook_org .org).html is now ready"
 }
 
+
+function get_generated_overview() {
+  cat <<EOF
+|-------------------------------------------|
+| Machine     | Service quick links         |
+|-------------------------------------------|
+EOF
+  if [ -n "${trail_monitoring_host}" ]; then
+    cat <<EOF 
+| ${trail_monitoring_host} | \
+  [[http://${trail_monitoring_host}/munin/][munin]] \
+  [[http://${trail_monitoring_host}/icinga/][icinga]] \
+|
+EOF
+  fi
+  
+  if [ -n "${trail_control_host}" ]; then
+    cat <<EOF 
+| ${trail_control_host} | \
+  [[http://${trail_control_host}:5679][hugin]] \
+|
+EOF
+  fi
+
+  for el in nop $trail_editor_host $trail_import_host; do
+    if [[ $el == "nop" ]]; then
+      continue
+    fi
+    cat <<EOF 
+| ${el} | \
+  [[http://${el}:5678/][system-info]] \
+  [[http://${el}/escenic-admin/][escenic-admin]] \
+  [[http://${el}/escenic/][escenic]] \
+  [[http://${el}/webservice/][webservice]] \
+|
+EOF
+  done
+  for el in nop $trail_presentation_host_list; do
+    if [[ $el == "nop" ]]; then
+      continue
+    fi
+    cat <<EOF 
+| ${el} | \
+  [[http://${el}:5678/][system-info]] \
+  [[http://${el}:8080/escenic-admin/][escenic-admin]] \
+  [[http://${el}:8081/solr/admin/][solr]] \
+|
+EOF
+  done
+  
+  if [ -n "${trail_analysis_host}" ]; then
+    cat <<EOF 
+| ${trail_analysis_host} | \
+  [[http://${trail_analysis_host}:8080/analysis-reports/][analysis-reports]] \
+  [[http://${trail_analysis_host}:8080/analysis-logger/admin][analysis-logger]] \
+  [[http://${trail_analysis_host}:8080/analysis-qs/admin][analysis-qs]] \
+|
+EOF
+  fi
+  cat <<EOF
+|-------------------------------------------|
+EOF
+}
+
+## included from overview.org
+function generate_overview_org() {
+  local file=$target_dir/generated-overview.org
+  cat > $file <<EOF
+$(get_generated_overview)
+EOF
+}
+
 set_up_build_directory
 set_customer_specific_variables
 generate_architecture_diagram
 generate_png_from_blockdiag
+generate_overview_org
 generate_html_from_org
 

From 88db5420134637a4c801ac00ab0e842f8d2bba7e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 8 Aug 2012 09:36:36 +0200
Subject: [PATCH 1127/2585] - added chapter on hugin

---
 .../doc/vizrt/vosa-handbook/monitoring.org      | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/monitoring.org b/usr/share/doc/vizrt/vosa-handbook/monitoring.org
index 6895ab70..85b58e7c 100644
--- a/usr/share/doc/vizrt/vosa-handbook/monitoring.org
+++ b/usr/share/doc/vizrt/vosa-handbook/monitoring.org
@@ -31,7 +31,17 @@ Here's a screenshot of the system-info report running on http://my-presentation-
 [[[[graphics/pres1-system-info.png]]
 
 ** Hugin
-
+Hugin is an automatic, frequent aggregation of the system-info data of
+all the hosts in your habitat. It does this by asking the hossts to
+produce a system-info report in YAML and check the files into a
+version repository.
+
+When browsing the Hugin web interface at
+http://my-control-server:5679/ you can quickly see all changes on the
+various servers. A change could be a new service which is all of a
+sudden listening on a new port or that the version of a installed
+package has changed. Nothing escapes Hugin's watchful eyes! 
+ 
 ** Munin
 Each VOSA habitat has its own Munin installation where you can see the
 trending of your site. I.e. how it has been behaving the last days,
@@ -41,6 +51,11 @@ If we assume your monitoring server is called "my-monitoring-server",
 the address to your munin is: http://my-monitoring-server/munin/
 
 ** Icinga (enhanced Nagios)
+Icinga gives a good overview of the current health of the
+habitat. Head over to http://my-monitoring-server/icinga/ to get
+updates on host & service uptimes and disk fill rates. This is also
+the place were you'll schedule any maintenance work you do to prevent
+unnecessary alerts filling up your mobile phone and email inboxes.
 
 ** Check MK
 

From 07061a4a1d18d309b373ed7c67a05cf9f3ca2c63 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 8 Aug 2012 09:36:57 +0200
Subject: [PATCH 1128/2585] - tidied up deployment chapter

---
 .../doc/vizrt/vosa-handbook/deployment.org    | 47 +++++++++----------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/deployment.org b/usr/share/doc/vizrt/vosa-handbook/deployment.org
index bd79a322..cae800c6 100644
--- a/usr/share/doc/vizrt/vosa-handbook/deployment.org
+++ b/usr/share/doc/vizrt/vosa-handbook/deployment.org
@@ -16,7 +16,9 @@ In the examples here, we have a build server on my-build-server
 where we build EARs for the the my-website website.
 
 *** Deploying a new EAR file for an ECE instance
-On my-control-server, do:
+All the commands in this section is written to be executed on
+my-control-server (but you could of course also first log on to each
+of the servers and run the commands locally there).
 
 #+BEGIN_SRC sh
 $ sudo ssh escenic@my-presentation-server ece -i engine1 --uri http://my-build-server/my-builder-user/releases/my-website-trunk-rev4121-2012-07-05_1524.ear  deploy
@@ -29,7 +31,7 @@ $ sudo ssh escenic@my-presentation-server ece -i engine1 --uri http://my-build-s
 We can now restart the ECE:
 
 #+BEGIN_SRC sh
-torstein@control$ sudo ssh root@my-presentation-server /etc/init.d/ece restart 
+$ sudo ssh root@my-presentation-server /etc/init.d/ece restart 
 [ece#engine-engine1] Stopping the engine1 instance of engine on my-presentation-server ...
 [ece#engine-engine1] Starting the engine1 instance of engine on my-presentation-server ...
 [ece#search-search1] Stopping the search1 instance of search on my-presentation-server ...
@@ -39,7 +41,7 @@ torstein@control$ sudo ssh root@my-presentation-server /etc/init.d/ece restart
 To confirm see that the ECE instance came up again, do:
 
 #+BEGIN_SRC sh
-torstein@control:~$ sudo ssh root@my-presentation-server /etc/init.d/ece status
+$ sudo ssh root@my-presentation-server /etc/init.d/ece status
 [ece#engine-engine1] UP 0d 0h 11m 45s
 [ece#search-search1] UP 0d 0h 11m 42s
 #+END_SRC
@@ -69,57 +71,54 @@ SCM, but for consistency, you can just follow the guide below for
 these as well (layout, layout-group, menu, community/security and so
 on).
 
-1) First, extract the publication resources.  Make sure you have already
-done the deployment in the my-presentation-server server
-
-2) Login to one of the presentation servers
-From my-control-server, do:
+First, make sure you have already done the deployment on the
+my-presentation-server server. Login to one of the presentation
+servers. From my-control-server, do:
 #+BEGIN_SRC sh
 $ sudo ssh root@my-presentation-server  
 #+END_SRC
 
-*** Change to the escenic user
+Then, change to the user running the ECE user
 #+BEGIN_SRC sh
 # su - escenic
 #+END_SRC
 
-*** Download current content-type
+After this, download current content-type so that we can keep a backup
+of it.
 #+BEGIN_SRC sh
+$ mkdir ~/backup
 $ wget -O ~/backup/content-type-$(date --iso)-before-deployment \
        http://localhost:8080/escenic-admin/publication-resources/mypub/escenic/content-type
 #+END_SRC
 
-*** Locate the new content-type definition
-Go to the new new content-type from your latest deployment 
+The next step is to locate the new content-type definition.  Go to the
+new new content-type from your latest deployment
 
 #+BEGIN_SRC sh
-$ cd /opt/tomcat-engine1/webapps/eb/META-INF/escenic/publication-resources/escenic/
+$ cd /opt/tomcat-engine1/webapps/my-webapp/META-INF/escenic/publication-resources/escenic/
 #+END_SRC
 
-*** Confirm the changes with diff
+Then, confirm the changes using diff:
 #+BEGIN_SRC sh
 $ diff -w ~/backup/content-type-$(date --iso)-before-deployment content-type  
 #+END_SRC
 
-
-*** Now upload the new content-type to ECE
-The command below assumes that there is a file called the same as the
-publication resource in the current directory. Since we changed into
-that directory in step 5), we can therefore now do:
-
+Now, upload the new content-type to ECE.  The command below assumes
+that there is a file called the same as the publication resource in
+the current directory. 
 #+BEGIN_SRC sh
 $ ece -i engine1 -p mypub -r content-type update
 #+END_SRC
 
-
-*** Download the resource again to check if its in place
+To confirm our changes, we now download the resource again to check if
+all the changes are the way we want them:
 #+BEGIN_SRC sh
 $ wget -O ~/backup/content-type-$(date --iso)-after-deployment \
-               http://localhost:8080/escenic-admin/publication-resources/mypub/escenic/content-type
+       http://localhost:8080/escenic-admin/publication-resources/mypub/escenic/content-type
 #+END_SRC
 
 
-*** Do check with diff again
+Finally, run diff again to see that the changes are correct:
 #+BEGIN_SRC sh
 $ diff -w ~/backup/content-type-$(date --iso)-before-deployment \
           ~/backup/content-type-$(date --iso)-after-deployment

From def62d56684511b592862bd238c30c240c7ce1c7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 8 Aug 2012 09:37:24 +0200
Subject: [PATCH 1129/2585] - changed the handbook to use generated SVGs
 instead of PNGs

---
 usr/share/doc/vizrt/vosa-handbook/create-handbook.sh | 8 ++++----
 usr/share/doc/vizrt/vosa-handbook/overview.org       | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index ecb030d2..24266cbf 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -21,12 +21,12 @@ function run() {
   fi
 }
 
-function generate_png_from_blockdiag() {
+function generate_svg_from_blockdiag() {
   run cp -r graphics $target_dir
   
   for el in $target_dir/graphics/*.blockdiag; do
-    echo "Generating PNG of $el ..."
-    run blockdiag $el
+    echo "Generating SVG of $el ..."
+    run blockdiag -T SVG $el
   done
 }
 
@@ -302,7 +302,7 @@ EOF
 set_up_build_directory
 set_customer_specific_variables
 generate_architecture_diagram
-generate_png_from_blockdiag
+generate_svg_from_blockdiag
 generate_overview_org
 generate_html_from_org
 
diff --git a/usr/share/doc/vizrt/vosa-handbook/overview.org b/usr/share/doc/vizrt/vosa-handbook/overview.org
index b31a1dcd..fab6a3dd 100644
--- a/usr/share/doc/vizrt/vosa-handbook/overview.org
+++ b/usr/share/doc/vizrt/vosa-handbook/overview.org
@@ -1,4 +1,5 @@
 * Getting the Overview
 
 #+ATTR_HTML: alt="Typical ECE architecture"
-[[[[graphics/architecture.png]]
+[[[[graphics/architecture.svg]]
+#+INCLUDE: "generated-overview.org"

From 1fe23922d1b2a671e5af6c03f93abe1d73e85c63 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 8 Aug 2012 10:19:58 +0200
Subject: [PATCH 1130/2585] - fixed the port of escenic-admin for editorial and
 import hosts

---
 usr/share/doc/vizrt/vosa-handbook/create-handbook.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 24266cbf..7d786733 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -258,7 +258,7 @@ EOF
     cat <<EOF 
 | ${el} | \
   [[http://${el}:5678/][system-info]] \
-  [[http://${el}/escenic-admin/][escenic-admin]] \
+  [[http://${el}:8080/escenic-admin/][escenic-admin]] \
   [[http://${el}/escenic/][escenic]] \
   [[http://${el}/webservice/][webservice]] \
 |

From b1a1e6e82f93dcd09df8d04c431c58218144f7a6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 8 Aug 2012 10:25:43 +0200
Subject: [PATCH 1131/2585] - added support for trail_analysis_port and
 trail_monitoring_port in   the overview chapter.

---
 .../doc/vizrt/vosa-handbook/create-handbook.sh     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 7d786733..421e3bad 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -237,8 +237,8 @@ EOF
   if [ -n "${trail_monitoring_host}" ]; then
     cat <<EOF 
 | ${trail_monitoring_host} | \
-  [[http://${trail_monitoring_host}/munin/][munin]] \
-  [[http://${trail_monitoring_host}/icinga/][icinga]] \
+  [[http://${trail_monitoring_host}:${trail_monitoring_port-80}/munin/][munin]] \
+  [[http://${trail_monitoring_host}:${trail_monitoring_port-80}/icinga/][icinga]] \
 |
 EOF
   fi
@@ -259,8 +259,8 @@ EOF
 | ${el} | \
   [[http://${el}:5678/][system-info]] \
   [[http://${el}:8080/escenic-admin/][escenic-admin]] \
-  [[http://${el}/escenic/][escenic]] \
-  [[http://${el}/webservice/][webservice]] \
+  [[http://${el}:8080/escenic/][escenic]] \
+  [[http://${el}:8080/webservice/][webservice]] \
 |
 EOF
   done
@@ -280,9 +280,9 @@ EOF
   if [ -n "${trail_analysis_host}" ]; then
     cat <<EOF 
 | ${trail_analysis_host} | \
-  [[http://${trail_analysis_host}:8080/analysis-reports/][analysis-reports]] \
-  [[http://${trail_analysis_host}:8080/analysis-logger/admin][analysis-logger]] \
-  [[http://${trail_analysis_host}:8080/analysis-qs/admin][analysis-qs]] \
+  [[http://${trail_analysis_host}:${trail_analysis_port-8080}/analysis-reports/][analysis-reports]] \
+  [[http://${trail_analysis_host}:${trail_analysis_port-8080}/analysis-logger/admin][analysis-logger]] \
+  [[http://${trail_analysis_host}:${trail_analysis_port-8080}/analysis-qs/admin][analysis-qs]] \
 |
 EOF
   fi

From 8bbf6fe73c533c6c018fd001a18a1e8b1a4ff44b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 8 Aug 2012 11:08:28 +0200
Subject: [PATCH 1132/2585] - added script for creating DEB and RPM packages of
 the various   machine instances as found in a directory called "server-admin"
   inside the project dir.

  create-conf-packages \
   -s <projet dir> \
   -c <customer> \
   -h <habitat> \
   -r <version> \
   -e <email of package maintainer> \
   -n <name of package maintainer>

  Example usage:
  create-conf-packages \
    -s ~/src/my-project \
    -c my-customer \
    -h staging \
    -r 2.4 \
    -e my@email.com \
    -n "Joe Doe"

  Example output:

  The following packages are now available:
  /tmp/create-conf-packages-2012-08-08/analysis/mycustomer-prod-analysis-conf-12312-1.noarch.rpm
  /tmp/create-conf-packages-2012-08-08/analysis/mycustomer-prod-analysis-conf-12312.deb
  /tmp/create-conf-packages-2012-08-08/pres1/mycustomer-prod-pres1-conf-12312-1.noarch.rpm
  /tmp/create-conf-packages-2012-08-08/pres1/mycustomer-prod-pres1-conf-12312.deb
  /tmp/create-conf-packages-2012-08-08/db1/mycustomer-prod-db1-conf-12312-1.noarch.rpm
  /tmp/create-conf-packages-2012-08-08/db1/mycustomer-prod-db1-conf-12312.deb
  /tmp/create-conf-packages-2012-08-08/edit1/mycustomer-prod-edit1-conf-12312-1.noarch.rpm
  /tmp/create-conf-packages-2012-08-08/edit1/mycustomer-prod-edit1-conf-12312.deb
---
 .../package-scripts/create-conf-packages      | 175 ++++++++++++++++++
 1 file changed, 175 insertions(+)
 create mode 100755 usr/share/escenic/package-scripts/create-conf-packages

diff --git a/usr/share/escenic/package-scripts/create-conf-packages b/usr/share/escenic/package-scripts/create-conf-packages
new file mode 100755
index 00000000..a636013d
--- /dev/null
+++ b/usr/share/escenic/package-scripts/create-conf-packages
@@ -0,0 +1,175 @@
+#! /usr/bin/env bash
+
+# script for creating DEB and RPM packages of the various machine
+# instances as found in a directory called "server-admin" inside the
+# project dir.
+#
+# create-conf-packages \
+#  -s <projet dir> \
+#  -c <customer> \
+#  -h <habitat> \
+#  -r <version> \
+#  -e <email of package maintainer> \
+#  -n <name of package maintainer>
+#
+# Example usage:
+# create-conf-packages \
+#   -s ~/src/my-project \
+#   -c my-customer \
+#   -h staging \
+#   -r 2.4 \
+#   -e my@email.com \
+#   -n "Joe Doe"
+
+build_dir=/tmp/$(basename $0)-$(date --iso)
+package_name=escenic-content-engine-installer
+package_version=$(date +%Y-%m-%d.%H%M%S)
+default_maintainer_name="Torstein Krause Johansen"
+default_maintainer_email=tkj@vizrt.com
+server_admin_dir=~/src/nie/server-admin
+customer=nie
+habitat=prod
+
+function clean_up() {
+  rm -rf $build_dir
+}
+
+function list_packages_that_can_be_built() {
+  declare -F | grep set_up | cut -d'_' -f3-
+}
+
+function get_user_options() {
+  while getopts ":c:h:r:e:s:n:" opt; do
+    case $opt in
+      s)
+        server_admin_dir=${OPTARG}/server-admin
+        ;;
+      h)
+        habitat=${OPTARG}
+        ;;
+      c)
+        customer=${OPTARG}
+        ;;
+      e)
+        maintainer_email=${OPTARG}
+        ;;
+      n)
+        maintainer_name=${OPTARG}
+        ;;
+      r)
+        package_version=${OPTARG}
+        ;;
+      p)
+        package_name=${OPTARG}
+        ;;
+      \?)
+        echo "Invalid option: -$OPTARG" >&2
+        exit 1
+        ;;
+      :)
+        echo "Option -$OPTARG requires an argument." >&2
+        exit 1
+        ;;
+    esac
+  done
+}
+
+
+## $1 the instance name
+function create_conf_package() {
+  local conf_package_build_dir=$build_dir/$1
+  rm -rf $conf_package_build_dir
+  local debian_dir=$conf_package_build_dir/DEBIAN
+  mkdir -p $debian_dir
+
+  # first the common files, when/if we get machine roles, we can do
+  # this here as well.
+  for el in \
+    $server_admin_dir/common \
+    $server_admin_dir/$1 \
+    ; do
+    (
+      cd $el
+      cp -r * $conf_package_build_dir/ 2>/dev/null
+    )
+
+  done
+  
+  find $conf_package_build_dir -type d -name ".svn" | xargs rm -rf
+
+  # create package descriptor
+  local package_name=${customer}-${habitat}-${1}-conf
+  local file=$conf_package_build_dir/DEBIAN/control
+  cat > $file <<EOF
+Package: ${package_name}
+Version: ${package_version}
+Section: base
+Priority: optional
+Architecture: all
+Maintainer: $(get_name) <$(get_name)>
+Description: Server Configuration for ${1}
+EOF
+
+  # create the package
+  if [ ! -x /usr/bin/dpkg-deb ]; then
+    echo "You must have dpkg-deb installed :-("
+    exit 1
+  fi
+
+  dpkg-deb --build $conf_package_build_dir 2>&1 > /dev/null
+  mv ${conf_package_build_dir}.deb \
+    $conf_package_build_dir/${package_name}-${package_version}.deb
+  
+  if [[ -x /usr/bin/alien && -x /usr/bin/fakeroot ]]; then
+    (
+      cd $conf_package_build_dir
+      fakeroot alien --keep-version --to-rpm --scripts \
+        ${package_name}-${package_version}.deb \
+        2>&1 > /dev/null
+    )
+  else
+    echo "You must have 'alien' and 'fakeroot' installed to create RPMs"
+    exit 1
+  fi
+}
+
+function get_name() {
+  echo ${maintainer_name-$default_maintainer_name}
+}
+
+function get_email() {
+  echo ${maintainer_email-$default_maintainer_email}
+}
+
+function create_conf_packages() {
+  if [ ! -d $server_admin_dir ]; then
+    echo "The server-admin:" $server_admin_dir " doesn't exist"
+    exit 1
+  fi
+
+  local black_list=".svn common $(basename $server_admin_dir)"
+  
+  for el in $(find $server_admin_dir -maxdepth 1 -type d); do
+    local dir=$(basename $el)
+    local skip=0
+    for ele in $black_list; do
+      if [[ $dir == $ele ]]; then
+        skip=1
+      fi
+    done
+    if [ $skip -eq 1 ]; then
+      skip=0
+      continue
+    fi
+    create_conf_package $dir
+  done
+}
+
+function print_report() {
+  echo "The following packages are now available:"
+  find $build_dir -type f | egrep "rpm$|deb$"
+}
+
+get_user_options "$@"
+create_conf_packages
+print_report

From a15761a891731759cd46d13e7badd3aa161642ef Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 8 Aug 2012 13:44:02 +0200
Subject: [PATCH 1133/2585] - un_install_everything is back because of popular
 demand!

- it can now be triggered in FAI mode by setting:

  fai_un_install_everything=1

  ece-install will then prompt the user to type a confirmation
  sentence. Once the un-installation is done, a summary is printed to
  the user.

  ece-install will then continue with the other tasks and installation
  profiles if so defined. The fai_un_install_everything=1 is processed
  before any other FAI profile, hence, on a system where you want to
  wipe the slate clean before starting over, you can for instance do:

    fai_un_install_everything=1
    fai_presentation_install=1

  The output will be similar to:
  [ece-install-5] You have set fai_un_install_everything=1 in your /root/ece-install.conf
  [ece-install-5] This will uninstall everything on ubuntu
  [ece-install-5] If you're absolutely sure about this, type:
  [ece-install-5] I know what I'm doing, please do as I say.
  I know what I'm doing, please do as I say.
  [ece-install-37] OK, I'll do as you wish:
  [ece-install-37] I will uninstall everything set up by ece-install
  [ece-install-37] Everything (well, most) set up by ece-install should now
  [ece-install-37] have been removed from ubuntu. Here's a summary:
  [ece-install-37] Packages removed : ant ant-contrib ant-optional escenic-content-engine-scripts escenic-munin-plugins escenic-munin-plugins libmysql-java maven2 memcached munin munin-node munin-plugins-extra munin-java-extra nginx percona-server-client percona-server-client-5.5 percona-server-common-5.5 percona-server-server percona-server-server-5.5 varnish sun-java6-jdk
  [ece-install-38] Files & directories removed: /etc/escenic /opt/*tomcat* /opt/escenic /var/lib/escenic /var/run/escenic /etc/escenic /var/log/escenic /etc/apt/sources.list.d/escenic.list
  [ece-install-38] APT keys removed : C4DEFFEB CD2EFD2A
---
 usr/sbin/ece-install | 90 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 90 insertions(+)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 4b289400..ddec705e 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -99,6 +99,9 @@ http://technet.escenic.com/downloads/widget-framework/widget-framework-community
 "
 ############################################################################
 
+# sources.list used by ece-install
+escenic_sources=/etc/apt/sources.list.d/escenic.list
+
 ## Bootstrapping, load files from /usr/share/escenic/ece-scripts The
 ## method will first try to be smart, in case the user has copied the
 ## ece-scripts somewhere else., e.g.: moved everything to ~/ece-scrpts
@@ -846,6 +849,87 @@ function common_post_install() {
   run rm $pid_file
 }
 
+function un_install_everything() {
+  local pretty_please="I know what I'm doing, please do as I say."
+
+  print "You have set fai_un_install_everything=1 in your ${conf_file}"
+  print "This will $(red uninstall everything on $HOSTNAME)"
+  print "If you're absolutely sure about this, type:"
+  print "$pretty_please"
+  read answer
+
+  if [[ "$answer" != "$pretty_please" ]]; then
+    print_and_log "You didn't type the confirmation string correctly."
+    print_and_log "You typed: [ ${answer} ]. I will not Uninstall anything"
+    return
+  else
+    print_and_log "OK, I'll do as you wish:"
+    print_and_log "I will uninstall everything set up by $(basename $0)"
+  fi
+
+  local file_to_remove_list="
+    $escenic_conf_dir
+    ${appserver_parent_dir}/*tomcat*
+    $escenic_root_dir
+    $escenic_data_dir
+    $escenic_run_dir
+    $escenic_conf_dir
+    $escenic_log_dir
+    $escenic_sources
+  " 
+  for el in $file_to_remove_list; do
+    run rm -rf $el
+  done
+
+  local key_to_remove_list="
+    C4DEFFEB
+    CD2EFD2A
+  "
+  for el in $key_to_remove_list; do
+    if [ $(apt-key list | grep $el | wc -l) -gt 0 ]; then
+      run apt-key remove $el
+    fi
+  done
+  
+  local package_to_remove_list="
+    ant
+    ant-contrib
+    ant-optional
+    escenic-content-engine-scripts
+    escenic-munin-plugins
+    escenic-munin-plugins
+    libmysql-java
+    maven2
+    memcached
+    munin
+    munin-node
+    munin-plugins-extra
+    munin-java-extra
+    nginx
+    percona-server-client                
+    percona-server-client-5.5            
+    percona-server-common-5.5            
+    percona-server-server                
+    percona-server-server-5.5
+    varnish
+    sun-java6-jdk
+  "
+  
+  for el in $remove_package_list; do
+    if [ $(dpkg -l $el | grep ^ii | wc -l) -gt 0 ]; then
+      run apt-get --yes --purge remove $el
+    fi
+  done
+
+  run apt-get clean
+
+  print_and_log "Everything (well, most) set up by $(basename $0) should now"
+  print_and_log "have been removed from ${HOSTNAME}. Here's a summary:"
+  print_and_log "Packages removed           :" $package_to_remove_list
+  print_and_log "Files & directories removed:" $file_to_remove_list
+  print_and_log "APT keys removed           :" $key_to_remove_list
+}
+
 ece_install_trail_file=/var/lib/ece-install/$(date +%s)-$(basename $0).trail
 ## $@ add this trail
 function leave_trail() {
@@ -884,6 +968,12 @@ if [ $fai_enabled -eq 1 ]; then
     common_pre_install
 
     no_fai_profile=1
+
+    if [ ${fai_un_install_everything-0} -eq 1 ]; then
+      install_profile_number=$PROFILE_UN_INSTALL
+      un_install_everything
+      no_fai_profile=0
+    fi
     
     if [ $(get_boolean_conf_value fai_all_install) -eq 1 ]; then
         install_profile_number=$PROFILE_ALL_IN_ONE

From e81059dc009f207bafda0f51b3b452132db59455 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=F6n?= <oschoen@vizrt.com>
Date: Wed, 8 Aug 2012 14:00:55 +0200
Subject: [PATCH 1134/2585] builder.sh - add user now uses only a config file

---
 usr/share/escenic/build-scripts/builder.sh | 46 +++++++---------------
 1 file changed, 14 insertions(+), 32 deletions(-)

diff --git a/usr/share/escenic/build-scripts/builder.sh b/usr/share/escenic/build-scripts/builder.sh
index 42aa43e0..bbe23dfc 100755
--- a/usr/share/escenic/build-scripts/builder.sh
+++ b/usr/share/escenic/build-scripts/builder.sh
@@ -141,25 +141,9 @@ function get_user_options
         list_path=${OPTARG}
         add_artifact_list=1
         ;;
-      c)
-        print_and_log "Using svn path: ${OPTARG}"
-        user_svn_path=${OPTARG}
-        ;;
-      s)
-        print_and_log "Using svn username: ${OPTARG}"
-        user_svn_username=${OPTARG}
-        ;;
-      m)
-        print_and_log "Using maven username: ${OPTARG}"
-        user_maven_username=${OPTARG}
-        ;;
-      p)
-        print_and_log "Using password file: ${OPTARG}"
-        user_password_file=${OPTARG}
-        if [ ! -e $user_password_file ]; then
-          print_and_log "Provided password file does not exist, exiting!" >&2
-          remove_pid_and_exit_in_error
-        fi
+      f)
+        print_and_log "Using config file ${OPTARG} ..."
+        user_config_file=${OPTARG}
         ;;
       \?)
         print_and_log "Invalid option: -$OPTARG" >&2
@@ -363,20 +347,18 @@ function ensure_no_user_conflict
 
 ##
 function verify_add_user 
-{  
-  enforce_variable user_name "You need to provide your username using the -u flag."
-  enforce_variable user_svn_path "You need to provide your svn path using the -c flag."
-  enforce_variable user_svn_username "You need to provide your svn username using the -s flag."
-  enforce_variable user_maven_username "You need to provide your maven username using the -m flag."
-  if [ -e "$user_password_file" ]; then
-    source $user_password_file
-    enforce_variable svn_password "The variable svn_password needs to be present in $user_password_file."
-    enforce_variable maven_password "The variable maven_password needs to be present in $user_password_file."
-    user_svn_password=$svn_password
-    user_maven_password=$maven_password
-  else
-    print_and_log "You must provide a password file using the -p flag."
+{
+  if [ ! -e $user_config_file ]; then
+    print_and_log "You must provide a config file for the user using the -f flag."
     remove_pid_and_exit_in_error
+  else
+    run source $user_config_file
+    enforce_variable user_name "You $user_config_file needs to specify user_name!"
+    enforce_variable user_svn_path "You $user_config_file needs to specify user_svn_path!"
+    enforce_variable user_svn_username "You $user_config_file needs to specify user_svn_username!"
+    enforce_variable user_maven_username "You $user_config_file needs to specify user_maven_username!"
+    enforce_variable svn_password "You $user_config_file needs to specify svn_password!"
+    enforce_variable maven_password "You $user_config_file needs to specify maven_password!"
   fi
 }
 

From a138b5636fbb9476a7b7002c0068f56036ac2373 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=F6n?= <oschoen@vizrt.com>
Date: Wed, 8 Aug 2012 14:31:53 +0200
Subject: [PATCH 1135/2585] builder.sh - add user now uses only a config file

---
 usr/share/escenic/build-scripts/builder.sh | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/usr/share/escenic/build-scripts/builder.sh b/usr/share/escenic/build-scripts/builder.sh
index bbe23dfc..a6fb5046 100755
--- a/usr/share/escenic/build-scripts/builder.sh
+++ b/usr/share/escenic/build-scripts/builder.sh
@@ -128,7 +128,7 @@ function get_user_options
         ;;
       u)
         print_and_log "Adding user ${OPTARG} ..."
-        user_name=${OPTARG}
+        user_config_file=${OPTARG}
         add_user=1
         ;;
       a)
@@ -141,10 +141,6 @@ function get_user_options
         list_path=${OPTARG}
         add_artifact_list=1
         ;;
-      f)
-        print_and_log "Using config file ${OPTARG} ..."
-        user_config_file=${OPTARG}
-        ;;
       \?)
         print_and_log "Invalid option: -$OPTARG" >&2
         remove_pid_and_exit_in_error
@@ -169,8 +165,8 @@ function execute
     read_builder_configuration
     verify_builder_conf
     if [ $add_user -eq 1 ]; then
-      ensure_no_user_conflict
       verify_add_user
+      ensure_no_user_conflict
       add_user
     elif [ $add_artifact -eq 1 ]; then
       verify_add_artifact
@@ -349,7 +345,7 @@ function ensure_no_user_conflict
 function verify_add_user 
 {
   if [ ! -e $user_config_file ]; then
-    print_and_log "You must provide a config file for the user using the -f flag."
+    print_and_log "You must provide a config file for the user."
     remove_pid_and_exit_in_error
   else
     run source $user_config_file

From 080f711b15bee2f2bd9093dd3ed3a3d7f339309f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 8 Aug 2012 14:37:33 +0200
Subject: [PATCH 1136/2585] - fai_un_install_everything=1 now prints what it
 intends to do before   prompting the user for confirmation.

---
 usr/sbin/ece-install | 88 ++++++++++++++++++++++----------------------
 1 file changed, 43 insertions(+), 45 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index ddec705e..14319ca9 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -851,46 +851,6 @@ function common_post_install() {
 
 function un_install_everything() {
   local pretty_please="I know what I'm doing, please do as I say."
-
-  print "You have set fai_un_install_everything=1 in your ${conf_file}"
-  print "This will $(red uninstall everything on $HOSTNAME)"
-  print "If you're absolutely sure about this, type:"
-  print "$pretty_please"
-  read answer
-
-  if [[ "$answer" != "$pretty_please" ]]; then
-    print_and_log "You didn't type the confirmation string correctly."
-    print_and_log "You typed: [ ${answer} ]. I will not Uninstall anything"
-    return
-  else
-    print_and_log "OK, I'll do as you wish:"
-    print_and_log "I will uninstall everything set up by $(basename $0)"
-  fi
-
-  local file_to_remove_list="
-    $escenic_conf_dir
-    ${appserver_parent_dir}/*tomcat*
-    $escenic_root_dir
-    $escenic_data_dir
-    $escenic_run_dir
-    $escenic_conf_dir
-    $escenic_log_dir
-    $escenic_sources
-  " 
-  for el in $file_to_remove_list; do
-    run rm -rf $el
-  done
-
-  local key_to_remove_list="
-    C4DEFFEB
-    CD2EFD2A
-  "
-  for el in $key_to_remove_list; do
-    if [ $(apt-key list | grep $el | wc -l) -gt 0 ]; then
-      run apt-key remove $el
-    fi
-  done
-  
   local package_to_remove_list="
     ant
     ant-contrib
@@ -914,6 +874,47 @@ function un_install_everything() {
     varnish
     sun-java6-jdk
   "
+  local file_to_remove_list="
+    $escenic_conf_dir
+    ${appserver_parent_dir}/*tomcat*
+    $escenic_root_dir
+    $escenic_data_dir
+    $escenic_run_dir
+    $escenic_conf_dir
+    $escenic_log_dir
+    $escenic_sources
+  "
+  local key_to_remove_list="
+    C4DEFFEB
+    CD2EFD2A
+  "
+  print_and_log "You have set fai_un_install_everything=1 in your ${conf_file}"
+  print_and_log "This will $(red uninstall the following on $HOSTNAME):"
+  print_and_log "Packages to be removed:" $(echo $package_to_remove_list)
+  print_and_log "Files & directories to be removed:" $file_to_remove_list
+  print_and_log "APT keys to be removed:" $key_to_remove_list
+  print "If you're absolutely sure about this, type:"
+  print "$pretty_please"
+  read answer
+
+  if [[ "$answer" != "$pretty_please" ]]; then
+    print_and_log "You didn't type the confirmation string correctly."
+    print_and_log "You typed: [ ${answer} ]. I will not Uninstall anything"
+    return
+  else
+    print_and_log "OK, I'll do as you wish:"
+    print_and_log "I will uninstall everything set up by $(basename $0)"
+  fi
+
+  for el in $file_to_remove_list; do
+    run rm -rf $el
+  done
+
+  for el in $key_to_remove_list; do
+    if [ $(apt-key list | grep $el | wc -l) -gt 0 ]; then
+      run apt-key remove $el
+    fi
+  done
   
   for el in $remove_package_list; do
     if [ $(dpkg -l $el | grep ^ii | wc -l) -gt 0 ]; then
@@ -923,11 +924,8 @@ function un_install_everything() {
 
   run apt-get clean
 
-  print_and_log "Everything (well, most) set up by $(basename $0) should now"
-  print_and_log "have been removed from ${HOSTNAME}. Here's a summary:"
-  print_and_log "Packages removed           :" $package_to_remove_list
-  print_and_log "Files & directories removed:" $file_to_remove_list
-  print_and_log "APT keys removed           :" $key_to_remove_list
+  print_and_log "Everything set up by $(basename $0) should now"
+  print_and_log "have been removed from ${HOSTNAME}."
 }
 
 ece_install_trail_file=/var/lib/ece-install/$(date +%s)-$(basename $0).trail

From 42f2f2013ff09c34144a14594d5c1c9389ea3b11 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 8 Aug 2012 14:41:09 +0200
Subject: [PATCH 1137/2585] - updated documentation on
 fai_un_install_everything

---
 usr/share/doc/escenic/ece-install-guide.org | 330 +++++++++-----------
 1 file changed, 154 insertions(+), 176 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 6f8e39f6..cc00f3b9 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -1,5 +1,6 @@
 #+TITLE: Welcome to the ece-install Guide
 #+AUTHOR: Torstein Krause Johansen
+#+OPTIONS: toc:2 
 
 * Supported Operating Systems
 For the best experience, run this script on Debian Squeeze (or newer),
@@ -62,7 +63,7 @@ ece-install.
 * Downloading the ece-install Script
 The easiest way of getting ece-install is to use git. Type this in
 your shell:
-#+BEGIN_SRC conf
+#+BEGIN_SRC fundamental
 $ git clone https://github.com/skybert/ece-scripts.git
 #+END_SRC
 
@@ -83,18 +84,18 @@ After getting the latest version of ece-scripts, you run it with:
 ** Requires Super User Privileges
 You must run the script as the root user.  If you start the script as
 a regular user, it will complain:
-#+BEGIN_SRC conf
+#+BEGIN_SRC fundamental
 [ece-install] You must be root when running ece-install
 #+END_SRC
 To become root on Ubuntu based systems and Mac OS X, do:
-#+BEGIN_SRC conf
-   $ sudo su
+#+BEGIN_SRC fundamental
+$ sudo su
 #+END_SRC
 Please note that just doing "sudo ece-install" may not work.
 
 On all other Unix like system, do:
-#+BEGIN_SRC conf
-   $ su -
+#+BEGIN_SRC fundamental
+$ su -
 #+END_SRC
 
 ** Technet & WF credentials
@@ -102,13 +103,13 @@ You will need access to http://technet.escenic.com and put these
 credentials in the root user's $HOME/ece-install.conf, normally this
 means /root/ece-install.conf, the script will also tell you this if
 you forget to provide such a configuration file:
-#+BEGIN_SRC conf
+#+BEGIN_SRC fundamental
 [ece-install] /root/ece-install.conf doesn't exist, I cannot live without it :-(
 #+END_SRC
 
 As for the technet credentials, the script will also tell you if it
 cannot find what it's looking for:
-#+BEGIN_SRC conf
+#+BEGIN_SRC fundamental
 [ece-install] Be sure to set technet_user and technet_password
 [ece-install] in /root/ece-install.conf
 #+END_SRC
@@ -136,7 +137,7 @@ log file located at /var/log/ece-install.log.
 
 ece-install will try to "fail fast", exiting as soon as it detects an
 error during its execution:
-#+BEGIN_SRC conf
+#+BEGIN_SRC fundamental
 [ece-install-1] The command [cd /does/not/exist] FAILED, exiting :-(
 [ece-install-1] See /var/log/ece-install.log for further details.
 #+END_SRC
@@ -158,13 +159,13 @@ ece-install has support for a lock file. This is useful for systems
 were you want to ensure that no one incidentally triggers ece-install
 without wanting to. The location of this lock file is:
 
-#+BEGIN_SRC sh
+#+BEGIN_SRC fundamental
 /var/lock/ece-install.lock
 #+END_SRC
     
 If this lock file is in place, ece-install will fail fast:
 
-#+BEGIN_SRC sh
+#+BEGIN_SRC fundamental
 The lock file is present: /var/lock/ece-install.lock and ece-install
 will therefore refuse to run.
 #+END_SRC
@@ -256,7 +257,7 @@ Escenic components and install the ECE database schema based from the
 SQL files contained inside the distribution bundles. 
 
 The script will fail by itself if the DB already exists:
-#+BEGIN_SRC conf
+#+BEGIN_SRC fundamental
 [ece-install] Setting up the ECE database schema ...
 ERROR 1007 (HY000) at line 1: Can't create database 'ece5db'; database exists
 ERROR 1050 (42S01) at line 2: Table 'DBChangeLog' already exists
@@ -264,7 +265,7 @@ ERROR 1050 (42S01) at line 2: Table 'DBChangeLog' already exists
 #+END_SRC
 If you for some reason wish to make ece-install drop the DB fro you
 before creating a new one, you can set
-#+BEGIN_SRC sh
+#+BEGIN_SRC conf
 fai_db_drop_old_db_first=1
 #+END_SRC
 
@@ -273,7 +274,7 @@ It's easy to set up master and slave DBs, here's how you'd configure
 ece-install to install these:
 
 On the master, create an ece-install.conf with:
-#+BEGIN_SRC sh
+#+BEGIN_SRC conf
 fai_enabled=1
 fai_db_install=1
 fai_db_master=1
@@ -282,7 +283,7 @@ fai_db_replication=1
 
 The script will itself output some replication log settings you need
 for the slave:
-#+BEGIN_SRC sh
+#+BEGIN_SRC fundamental
 [ece-install-35] - DB is now set up on localhost:3306
 [ece-install-35] - ece-install.conf for slave: fai_db_master_log_file=mysql-bin.000013
 [ece-install-35] - ece-install.conf for slave: fai_db_master_log_position=106
@@ -290,7 +291,7 @@ for the slave:
 
 Once this is done, create and use an ece-install.conf on the slave
 with this configuration:
-#+BEGIN_SRC sh
+#+BEGIN_SRC conf
 fai_enabled=1
 fai_db_install=1
 fai_db_replication=1
@@ -395,7 +396,7 @@ on the host.
 
 Configuration example for setting up an NFS client mounting the
 multimedia archive on the NFS server:
-#+BEGIN_SRC sh
+#+BEGIN_SRC conf
 fai_enabled=1
 fai_nfs_client_install=1
 fai_nfs_server_address=192.168.1.200
@@ -419,7 +420,7 @@ server and make it a VIP provider exposing its NFS service. The two
 VIP providers have have the IP addresses 192.168.1.111 and
 192.168.1.112 and both provide the VIP 192.168.1.200
 
-#+BEGIN_SRC sh
+#+BEGIN_SRC conf
 # install the NFS server
 fai_enabled=1
 fai_nfs_server_install=1
@@ -441,7 +442,7 @@ fai_vip_sibling_ip=$fai_vip_secondary_node_ip
 The secondary node, also an NFS VIP provider can have the exact same
 configuration except for having a different sibling:
 
-#+BEGIN_SRC sh
+#+BEGIN_SRC conf
 fai_vip_sibling_ip=$fai_vip_primary_node_ip
 #+END_SRC
 
@@ -502,16 +503,16 @@ If you're running in FAI mode, you can choose between these settings
 to decide what to restore and where to find the backup file to
 restore from:
 
-|----------------------------------+---------+------------------------------------------------|
-| Parameter                        | Default | Description                                    |
-|----------------------------------+---------+------------------------------------------------|
-| fai_restore_all                |       0 | Restore everything found in the backup file    |
-| fai_restore_db                 |       0 | Install the DB server & restore its contents   |
-| fai_restore_data_files        |       0 | Restore the Solr & ECE data files              |
-| fai_restore_configuration      |       0 | Restore the Solr & ECE configuration files     |
-| fai_restore_software_binaries |       0 | Restore the Escenic and Apache Tomcat software |
-| fai_restore_from_file         |      "" | The .tar.gz produced by "ece -i <instance> backup" |
-|----------------------------------+---------+------------------------------------------------|
+|---------------------------------+---------+----------------------------------------------------|
+| Parameter                       | Default | Description                                        |
+|---------------------------------+---------+----------------------------------------------------|
+| ~fai_restore_all~               |       0 | Restore everything found in the backup file        |
+| ~fai_restore_db~                |       0 | Install the DB server & restore its contents       |
+| ~fai_restore_data_files~        |       0 | Restore the Solr & ECE data files                  |
+| ~fai_restore_configuration~     |       0 | Restore the Solr & ECE configuration files         |
+| ~fai_restore_software_binaries~ |       0 | Restore the Escenic and Apache Tomcat software     |
+| ~fai_restore_from_file~         |      "" | The .tar.gz produced by "ece -i <instance> backup" |
+|---------------------------------+---------+----------------------------------------------------|
 
 For example, to restore everything possible from a given tarball, you
 need this in your ece-install.conf:
@@ -578,7 +579,7 @@ Normally, the EAR will then be available in:
 #+END_SRC
 
 The configuration bundle must contain:
-#+BEGIN_SRC conf
+#+BEGIN_SRC fundamental
 engine/security
 engine/siteconfig/bootstrap-skeleton
 engine/siteconfig/config-skeleton
@@ -586,7 +587,7 @@ assemblytool/plugins/<plugin>/siteconfig
 #+END_SRC
 
 and optionally also:
-#+BEGIN_SRC sh
+#+BEGIN_SRC fundamental
 engine/solr/conf
 #+END_SRC
 
@@ -625,10 +626,10 @@ tarball, together with the other Nursery configuration files.
 The fai_presentation_conf_archive and fai_presentation_ear variables
 both accept the following types of value (here using the value of
 fai_presentation_ear as an example):
-- http://build.server/stable/engine-mysite.com-1.2.3.ear
-- https://build.server/stable/engine-mysite.com-1.2.3.ear
-- file:///var/lib/build/stable/engine-mysite.com-1.2.3.ear
-- /var/lib/build/stable/engine-mysite.com-1.2.3.ear
+- ~http://build.server/stable/engine-mysite.com-1.2.3.ear~
+- ~https://build.server/stable/engine-mysite.com-1.2.3.ear~
+- ~file:///var/lib/build/stable/engine-mysite.com-1.2.3.ear~
+- ~/var/lib/build/stable/engine-mysite.com-1.2.3.ear~
 
 ** Setting up virtual hosts
 Setting up virtual host definitions in the application server makes a
@@ -640,10 +641,10 @@ application servers if the profile is editorial, all presentation.
 
 To use this feature, you must define one domain for each publication
 in the following FAI parameter:
-#+BEGIN_SRC sh
+#+BEGIN_SRC conf
 fai_publication_domain_mapping_list="
-firepub#fire.escenic.com
-ildpub#ild.escenic.com
+  firepub#fire.escenic.com
+  ildpub#ild.escenic.com
 "
 #+END_SRC
 
@@ -667,7 +668,7 @@ This will produce the following stanzas in server.xml:
 Furthermore, if these host names are  not resolvable to your local
 host (neither localhost or the IP of your $HOSTNAME), ece-install will
 add entries for these domains in the machine's /etc/hosts:
-#+BEGIN_SRC sh
+#+BEGIN_SRC conf
 # added by ece-install @ Wed Feb  8 19:21:49 CST 2012
 127.0.1.1 fire.escenic.com
 
@@ -682,88 +683,87 @@ fai_keep_off_etc_hosts=1 in your ece-install.conf
 The ece-install script understands for the following settings in the
 $HOME/ece-install.conf file of the root user:
 
-|-------------------------------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------|
-| Parameter                           | Default                                           | Description                                                                                                                           |
-|-------------------------------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------|
-| fai_all_conf_archive                | ""                                                | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
-| fai_all_ear                         | ""                                                | EAR to use instead of the Escenic binaries                                                                                            |
-| fai_all_install                     | 0                                                 | Install all components on your server.                                                                                                |
-| fai_analysis_db_host                | localhost                                         | For the EAE DB (different from ECE's)                                                                                                 |
-| fai_analysis_db_install             | 0                                                 | Install db profile                                                                                                                    |
-| fai_analysis_db_password            | read-the-source-luke                              | For the EAE DB (different from ECE's)                                                                                                 |
-| fai_analysis_db_port                | 3306                                              | For the EAE DB (different from ECE's)                                                                                                 |
-| fai_analysis_db_schema              | ece5db                                            | For the EAE DB (different from ECE's)                                                                                                 |
-| fai_analysis_db_user                | ece5user                                          | For the EAE DB (different from ECE's)                                                                                                 |
-| fai_analysis_install                | 0                                                 | Will install the Escenic Analysis Engine, aka Stats, EAE.                                                                             |
-| fai_analysis_name                   | analysis1                                         | EAE instance name                                                                                                                     |
-| fai_analysis_port                   | 8080                                              | Port of the EAE                                                                                                                       |
-| fai_analysis_shutdown               | 8005                                              | Shutdown port for the EAE app server                                                                                                  |
-| fai_apt_vizrt_pool                  | stable                                            | Which package pool in the Vizrt APT to install package from.                                                                          |
-| fai_cache_backends                  | ${HOSTNAME}:8080                                  | Space separated, e.g. "app1:8080 app2:8080"                                                                                           |
-| fai_cache_install                   | 0                                                 | Install cache server profile                                                                                                          |
-| fai_db_drop_old_db_first            | 0                                                 | Warning: this will drop the old database before installing a new one                                                                  |
-| fai_db_daily_backup                 | 0                                                 | Sets up daily backup of the DB.                                                                                                       |
-| fai_db_host                         | $HOSTNAME                                         | Useful for editor & presentation profiles                                                                                             |
-| fai_db_install                      | 0                                                 | Install db profile                                                                                                                    |
-| fai_db_password                     | read-the-source-luke                              | Useful for DB installation profile                                                                                                    |
-| fai_db_port                         | 3306                                              | Useful for editor & presentation profiles                                                                                             |
-| fai_db_schema                       | ece5db                                            | Useful for DB installation profile                                                                                                    |
-| fai_db_user                         | ece5user                                          | Useful for DB installation profile                                                                                                    |
-| fai_editor_conf_archive             | ""                                                | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
-| fai_editor_ear                      | ""                                                | EAR to use instead of the Escenic binaries                                                                                            |
-| fai_editor_install                  | 0                                                 | Install the editorial profile                                                                                                         |
-| fai_editor_name                     | editor1                                           | Name of the editor instance                                                                                                           |
-| fai_editor_port                     | 8080                                              | HTTP port of the editor instance                                                                                                      |
-| fai_editor_shutdown                 | 8005                                              | Shutdown port of the editor instance                                                                                                  |
-| fai_enabled                         | 0                                                 | Whether or not to run ece-install in FAI mode                                                                                         |
-| fai_keep_off_etc_hosts              | 0                                                 | Set this to 1 if you don't want ece-install adding entries to /etc/hosts                                                              |
-| fai_monitoring_admin_password       | No telling you here ;-)                           | The admin password of the web interface(s). Currenlty only set for Icinga.                                                            |
-| fai_monitoring_ece_host_list        | ""                                                | Hosts running one or more ECE instance                                                                                                |
-| fai_monitoring_host_list            | ""                                                | Quoted, space separated list of <host>#<ip> pairs, e.g.: "pres1#10.72.227.250 pres2#10.72.227.251"                                    |
-| fai_monitoring_install              | 0                                                 | Install the monitoring server profile.                                                                                                |
-| fai_monitoring_munin_node_list      | ""                                                | Set this to a whitespace separated list of nodes that munin should monitor                                                            |
-| fai_monitoring_nagios_flavour       | icinga                                            | Flavour of Nagios, possible options: icigina & nagios                                                                                 |
-| fai_monitoring_search_host_list     | ""                                                | Hosts running search instance(s) (Solr + indexer)                                                                                     |
-| fai_monitoring_server_ip            | 127.0.0.1                                         | The IP of the monitoring server.                                                                                                      |
-| fai_nfs_allowed_client_network      | ""                                                | IP/netmwask of allowed NFS clients, example: 192.168.1.0/255.255.255.0                                                                |
-| fai_nfs_client_install              | 0                                                 | Installs an NFS client                                                                                                                |
-| fai_nfs_client_mount_point_parent   | /mnt                                              | Mount point parent directory                                                                                                          |
-| fai_nfs_export_list                 | ""                                                | Space separated list of NFS export directories, full paths as seen on the NFS server. E.g.: /var/exports/multimedia                   |
-| fai_nfs_server_address              | ""                                                | Address of the NFS server, useful for the NFS client profile                                                                          |
-| fai_nfs_server_install              | 0                                                 | Install an NFS server                                                                                                                 |
-| fai_presentation_conf_archive       | ""                                                | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
-| fai_presentation_ear                | ""                                                | EAR to use instead of the Escenic binaries                                                                                            |
-| fai_presentation_install            | 0                                                 | Install the presentation server profile                                                                                               |
-| fai_presentation_name               | web1                                              | Name of the presentation server instance                                                                                              |
-| fai_presentation_port               | 8080                                              | HTTP port of the presentation server instance                                                                                         |
-| fai_presentation_shutdown           | 8005                                              | Shutdown port of the presentation instance                                                                                            |
-| fai_public_host_name                | ${HOSTNAME}:8080                                  | The public address for your website                                                                                                   |
-| fai_publication_create              | 0                                                 | Create a new publication                                                                                                              |
-| fai_publication_domain_mapping_list | ""                                                | Mapping between publication names and their corresponding domains on the form: "one#one.com other#other.com"                          |
-| fai_publication_name                | mypub                                             | Name of the publication                                                                                                               |
-| fai_publication_use_instance        | dev1                                              | Name of local instance to use for creation                                                                                            |
-| fai_publication_war                 | "WF or ECE demo WAR"                              | WAR to base the new publication on                                                                                                    |
-| fai_publication_war_uri_list        | ""                                                | Publication WARs used for setting up Assembly tool. Supported: http[s]://tmp.com/mypub.war, file:///tmp/mypub.war and /tmp/mypub.war. |
-| fai_rmi_install                     | 0                                                 | Install RMI hub profile                                                                                                               |
-| fai_search_conf_archive             | ""                                                | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
-| fai_search_ear                      | ""                                                | EAR to use instead of the Escenic binaries                                                                                            |
-| fai_search_for_editor               | 0                                                 | If 1 (true), will configure Solr for use with an editorial server, if not conf for presentation servers will be chosen.               |
-| fai_search_indexer_ws_uri           | http://${HOSTNAME}:8080/indexer-webservice/index/ | URI of the indexer-webservice that the search instance shall use for knowing what to index.                                           |
-| fai_search_install                  | 0                                                 | Install the search server profile (Solr + indexer)                                                                                    |
-| fai_search_name                     | search1                                           | Name of the search instance                                                                                                           |
-| fai_search_port                     | 8080                                              | HTTP port of the search instance                                                                                                      |
-| fai_search_shutdown                 | 8005                                              | Shutdown port of the search instance                                                                                                  |
-| fai_vip_address                     | ""                                                | The virtual IP the provider will claim                                                                                                |
-| fai_vip_install                     | 0                                                 | Install a VIP provider                                                                                                                |
-| fai_vip_primary_node_auth_key       | ""                                                | Optional, but useful to set to make conf files consistent. Will be generated if not set                                               |
-| fai_vip_primary_node_ip             | ""                                                | Primary node IP                                                                                                                       |
-| fai_vip_primary_node_name           | ""                                                | Primary node name, must be what $(uname -n) returns                                                                                   |
-| fai_vip_secondary_node_ip           | ""                                                | Secondary node IP                                                                                                                     |
-| fai_vip_secondary_node_name         | ""                                                | Secondary node name, must be what $(uname -n) returns                                                                                 |
-| fai_vip_service_list                | ""                                                | List of init.d scripts to invoke when the VIP is acclaimed/revoked, script must support start & stop                                  |
-| fai_vip_sibling_ip                  | ""                                                | The IP of the other node offering the VIP                                                                                             |
-| fai_wf_install                      | 0                                                 | Install Widget Framework profile                                                                                                      |
-|-------------------------------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------|
+|---------------------------------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------|
+| Parameter                             | Default                                           | Description                                                                                                                           |
+|---------------------------------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------|
+| ~fai_all_conf_archive~                | ""                                                | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
+| ~fai_all_ear~                         | ""                                                | EAR to use instead of the Escenic binaries                                                                                            |
+| ~fai_all_install~                     | 0                                                 | Install all components on your server.                                                                                                |
+| ~fai_analysis_db_host~                | localhost                                         | For the EAE DB (different from ECE's)                                                                                                 |
+| ~fai_analysis_db_install~             | 0                                                 | Install db profile                                                                                                                    |
+| ~fai_analysis_db_password~            | read-the-source-luke                              | For the EAE DB (different from ECE's)                                                                                                 |
+| ~fai_analysis_db_port~                | 3306                                              | For the EAE DB (different from ECE's)                                                                                                 |
+| ~fai_analysis_db_schema~              | ece5db                                            | For the EAE DB (different from ECE's)                                                                                                 |
+| ~fai_analysis_db_user~                | ece5user                                          | For the EAE DB (different from ECE's)                                                                                                 |
+| ~fai_analysis_install~                | 0                                                 | Will install the Escenic Analysis Engine, aka Stats, EAE.                                                                             |
+| ~fai_analysis_name~                   | analysis1                                         | EAE instance name                                                                                                                     |
+| ~fai_analysis_port~                   | 8080                                              | Port of the EAE                                                                                                                       |
+| ~fai_analysis_shutdown~               | 8005                                              | Shutdown port for the EAE app server                                                                                                  |
+| ~fai_apt_vizrt_pool~                  | stable                                            | Which package pool in the Vizrt APT to install package from.                                                                          |
+| ~fai_cache_backends~                  | ${HOSTNAME}:8080                                  | Space separated, e.g. "app1:8080 app2:8080"                                                                                           |
+| ~fai_cache_install~                   | 0                                                 | Install cache server profile                                                                                                          |
+| ~fai_db_drop_old_db_first~            | 0                                                 | Warning: this will drop the old database before installing a new one                                                                  |
+| ~fai_db_daily_backup~                 | 0                                                 | Sets up daily backup of the DB.                                                                                                       |
+| ~fai_db_host~                         | $HOSTNAME                                         | Useful for editor & presentation profiles                                                                                             |
+| ~fai_db_install~                      | 0                                                 | Install db profile                                                                                                                    |
+| ~fai_db_password~                     | read-the-source-luke                              | Useful for DB installation profile                                                                                                    |
+| ~fai_db_port~                         | 3306                                              | Useful for editor & presentation profiles                                                                                             |
+| ~fai_db_schema~                       | ece5db                                            | Useful for DB installation profile                                                                                                    |
+| ~fai_db_user~                         | ece5user                                          | Useful for DB installation profile                                                                                                    |
+| ~fai_editor_conf_archive~             | ""                                                | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
+| ~fai_editor_ear~                      | ""                                                | EAR to use instead of the Escenic binaries                                                                                            |
+| ~fai_editor_install~                  | 0                                                 | Install the editorial profile                                                                                                         |
+| ~fai_editor_name~                     | editor1                                           | Name of the editor instance                                                                                                           |
+| ~fai_editor_port~                     | 8080                                              | HTTP port of the editor instance                                                                                                      |
+| ~fai_editor_shutdown~                 | 8005                                              | Shutdown port of the editor instance                                                                                                  |
+| ~fai_enabled~                         | 0                                                 | Whether or not to run ece-install in FAI mode                                                                                         |
+| ~fai_keep_off_etc_hosts~              | 0                                                 | Set this to 1 if you don't want ece-install adding entries to /etc/hosts                                                              |
+| ~fai_monitoring_admin_password~       | No telling you here ;-)                           | The admin password of the web interface(s). Currenlty only set for Icinga.                                                            |
+| ~fai_monitoring_ece_host_list~        | ""                                                | Hosts running one or more ECE instance                                                                                                |
+| ~fai_monitoring_host_list~            | ""                                                | Quoted, space separated list of <host>#<ip> pairs, e.g.: "pres1#10.72.227.250 pres2#10.72.227.251"                                    |
+| ~fai_monitoring_install~              | 0                                                 | Install the monitoring server profile.                                                                                                |
+| ~fai_monitoring_munin_node_list~      | ""                                                | Set this to a whitespace separated list of nodes that munin should monitor                                                            |
+| ~fai_monitoring_search_host_list~     | ""                                                | Hosts running search instance(s) (Solr + indexer)                                                                                     |
+| ~fai_monitoring_server_ip~            | 127.0.0.1                                         | The IP of the monitoring server.                                                                                                      |
+| ~fai_nfs_allowed_client_network~      | ""                                                | IP/netmwask of allowed NFS clients, example: 192.168.1.0/255.255.255.0                                                                |
+| ~fai_nfs_client_install~              | 0                                                 | Installs an NFS client                                                                                                                |
+| ~fai_nfs_client_mount_point_parent~   | /mnt                                              | Mount point parent directory                                                                                                          |
+| ~fai_nfs_export_list~                 | ""                                                | Space separated list of NFS export directories, full paths as seen on the NFS server. E.g.: /var/exports/multimedia                   |
+| ~fai_nfs_server_address~              | ""                                                | Address of the NFS server, useful for the NFS client profile                                                                          |
+| ~fai_nfs_server_install~              | 0                                                 | Install an NFS server                                                                                                                 |
+| ~fai_presentation_conf_archive~       | ""                                                | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
+| ~fai_presentation_ear~                | ""                                                | EAR to use instead of the Escenic binaries                                                                                            |
+| ~fai_presentation_install~            | 0                                                 | Install the presentation server profile                                                                                               |
+| ~fai_presentation_name~               | web1                                              | Name of the presentation server instance                                                                                              |
+| ~fai_presentation_port~               | 8080                                              | HTTP port of the presentation server instance                                                                                         |
+| ~fai_presentation_shutdown~           | 8005                                              | Shutdown port of the presentation instance                                                                                            |
+| ~fai_public_host_name~                | ${HOSTNAME}:8080                                  | The public address for your website                                                                                                   |
+| ~fai_publication_create~              | 0                                                 | Create a new publication                                                                                                              |
+| ~fai_publication_domain_mapping_list~ | ""                                                | Mapping between publication names and their corresponding domains on the form: "one#one.com other#other.com"                          |
+| ~fai_publication_name~                | mypub                                             | Name of the publication                                                                                                               |
+| ~fai_publication_use_instance~        | dev1                                              | Name of local instance to use for creation                                                                                            |
+| ~fai_publication_war~                 | "WF or ECE demo WAR"                              | WAR to base the new publication on                                                                                                    |
+| ~fai_publication_war_uri_list~        | ""                                                | Publication WARs used for setting up Assembly tool. Supported: http[s]://tmp.com/mypub.war, file:///tmp/mypub.war and /tmp/mypub.war. |
+| ~fai_rmi_install~                     | 0                                                 | Install RMI hub profile                                                                                                               |
+| ~fai_search_conf_archive~             | ""                                                | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
+| ~fai_search_ear~                      | ""                                                | EAR to use instead of the Escenic binaries                                                                                            |
+| ~fai_search_for_editor~               | 0                                                 | If 1 (true), will configure Solr for use with an editorial server, if not conf for presentation servers will be chosen.               |
+| ~fai_search_indexer_ws_uri~           | http://${HOSTNAME}:8080/indexer-webservice/index/ | URI of the indexer-webservice that the search instance shall use for knowing what to index.                                           |
+| ~fai_search_install~                  | 0                                                 | Install the search server profile (Solr + indexer)                                                                                    |
+| ~fai_search_name~                     | search1                                           | Name of the search instance                                                                                                           |
+| ~fai_search_port~                     | 8080                                              | HTTP port of the search instance                                                                                                      |
+| ~fai_search_shutdown~                 | 8005                                              | Shutdown port of the search instance                                                                                                  |
+| ~fai_vip_address~                     | ""                                                | The virtual IP the provider will claim                                                                                                |
+| ~fai_vip_install~                     | 0                                                 | Install a VIP provider                                                                                                                |
+| ~fai_vip_primary_node_auth_key~       | ""                                                | Optional, but useful to set to make conf files consistent. Will be generated if not set                                               |
+| ~fai_vip_primary_node_ip~             | ""                                                | Primary node IP                                                                                                                       |
+| ~fai_vip_primary_node_name~           | ""                                                | Primary node name, must be what $(uname -n) returns                                                                                   |
+| ~fai_vip_secondary_node_ip~           | ""                                                | Secondary node IP                                                                                                                     |
+| ~fai_vip_secondary_node_name~         | ""                                                | Secondary node name, must be what $(uname -n) returns                                                                                 |
+| ~fai_vip_service_list~                | ""                                                | List of init.d scripts to invoke when the VIP is acclaimed/revoked, script must support start & stop                                  |
+| ~fai_vip_sibling_ip~                  | ""                                                | The IP of the other node offering the VIP                                                                                             |
+| ~fai_wf_install~                      | 0                                                 | Install Widget Framework profile                                                                                                      |
+|---------------------------------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------|
 
 As you've probably have guessed, 0 means "false" and 1 means "true" :-)
 
@@ -812,7 +812,7 @@ When FAI is enabled, ece-install will report:
 * Running More Than One Installation Process
 If the script believes there's already an ece-intall process running,
 it will abort:
-#+BEGIN_SRC conf
+#+BEGIN_SRC fundamental
 [ece-install] There's already one ece-install process running. If you believe
 [ece-install] this is wrong, e.g. if a previous run of ece-install was aborted
 [ece-install] before it completed, you may delete /var/run/ece-install.pid and
@@ -839,9 +839,9 @@ folder, and only download the missing ones (if any).
 To get a list of the artifacts it'll pull from
 http://technet.escenic.com and http://tomcat.apache.org search for the
 following variables:
-- technet_download_list
-- wf_download_list
-- tomcat_download
+- ~technet_download_list~
+- ~wf_download_list~
+- ~tomcat_download~
 
 Two other ways of speeding up the installation is (of course) to use
 the backup/restore feature or install from a EAR and configuration
@@ -952,7 +952,7 @@ echo "Hello from $0, EAE is installed in ${tomcat_base}" > /tmp/hello.txt
 ** Available hooks
 Currently, the following hooks are available:
 
-#+BEGIN_SRC sh
+#+BEGIN_SRC fundamental
 install_analysis_server.preinst
 install_analysis_server.postinst
 set_up_solr.preinst
@@ -975,61 +975,39 @@ host. However, this may be useful if you're installing a clean
 environment and want to e.g. undo your previous install to install a
 different profile.
 
-** Uninstall (most of) the packages installed by ece-install
-#+BEGIN_SRC sh
-# apt-get --yes --purge remove \
-    ant \
-    ant-contrib \
-    ant-optional \
-    curl \
-    escenic-* \
-    libmysql-java \
-    maven2 \
-    memcached \
-    munin* \
-    nginx \
-    percona* \
-    sun-java6-jdk \
-    varnish \
-    wget 
-#+END_SRC
-
-
-** Remove the directories created by ece-install
-#+BEGIN_SRC sh
-# rm -rf \
-    /var/{lib,cache,crash,log,run}/escenic \
-    /{etc,opt}/escenic \
-    /opt/*tomcat*
+You trigger this by setting the following in your ece-install.conf
+#+BEGIN_SRC conf
+fai_un_install_everything=1
 #+END_SRC
 
+    
+ece-install will then prompt the user to type a confirmation
+sentence. Once the un-installation is done, a summary is printed to
+the user.
 
-** Remove the GPG keys added by ece-install
-#+BEGIN_SRC sh
-# apt-key remove C4DEFFEB
-# apt-key remove CD2EFD2A
-#+END_SRC
-   
-
+ece-install will then continue with the other tasks and installation
+profiles if so defined. The fai_un_install_everything=1 is processed
+before any other FAI profile, hence, on a system where you want to
+wipe the slate clean before starting over, you can for instance do:
 
-* Example Output FAI
-The ece-install will often be run in FAI mode where all the settings
-are read from ~/ece-install.conf. Given the following entries in this
-file: 
 #+BEGIN_SRC conf
-technet_user=apples
-technet_password=andoranges
-wf_user=foo
-wf_password=bar
-
-fai_enabled=1
-fai_all_install=1
+fai_un_install_everything=1
+fai_presentation_install=1
 #+END_SRC
 
-All the different components described in this guide are installed on
-the host that runs the install script.
-
-The following output is produced from ece-install:
-#+INCLUDE: "~/tmp/ece-install.out" src text
-
+The output will be similar to:
+#+BEGIN_SRC fundamental
+[ece-install-5] You have set fai_un_install_everything=1 in your /root/ece-install.conf
+[ece-install-5] This will uninstall the following on raven:
+[ece-install-5] Packages to be removed: ant ant-contrib ant-optional escenic-content-engine-scripts escenic-munin-plugins escenic-munin-plugins libmysql-java maven2 memcached munin munin-node munin-plugins-extra munin-java-extra nginx percona-server-client percona-server-client-5.5 percona-server-common-5.5 percona-server-server percona-server-server-5.5 varnish sun-java6-jdk
+[ece-install-5] Files & directories to be removed: /etc/escenic /opt/*tomcat* /opt/escenic /var/lib/escenic /var/run/escenic /etc/escenic /var/log/escenic /etc/apt/sources.list.d/escenic.list
+[ece-install-5] APT keys to be removed: C4DEFFEB CD2EFD2A
+[ece-install-5] If you're absolutely sure about this, type:
+[ece-install-5] I know what I'm doing, please do as I say.
+I know what I'm doing, please do as I say.
+[ece-install-11] OK, I'll do as you wish:
+[ece-install-11] I will uninstall everything set up by ece-install
+[ece-install-11] Everything (well, most) set up by ece-install should now
+[ece-install-11] have been removed from raven.
+#+END_SRC
 

From 64a0164337512466076a38ca454c2a7c12798def Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 8 Aug 2012 14:54:39 +0200
Subject: [PATCH 1138/2585] - removed the listing of the :5678 links as this
 now is given in the   overview chapter

---
 usr/share/doc/vizrt/vosa-handbook/monitoring.org | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/monitoring.org b/usr/share/doc/vizrt/vosa-handbook/monitoring.org
index 85b58e7c..6a9360e3 100644
--- a/usr/share/doc/vizrt/vosa-handbook/monitoring.org
+++ b/usr/share/doc/vizrt/vosa-handbook/monitoring.org
@@ -18,14 +18,7 @@ the user under which ECE, EAE and the Search instance are running as
 
 *** In the Web Browser
 All VOSA hosts also has a (maximum) one minute old HTML report from
-system-info running on port 5678. So for any VOSA habitat, you can
-access these reports like this:
-- http://my-presentation-server:5678/
-- http://my-editorial-server:5678/
-- http://my-import-server:5678/
-- http://my-nfs-server:5678/
-- http://my-db-server:5678/
-- http://my-stats-server:5678/
+system-info running on port 5678. 
 
 Here's a screenshot of the system-info report running on http://my-presentation-server:5678/:
 [[[[graphics/pres1-system-info.png]]

From a59cf94c77ffd3d3085afcf23088cdb6fee7eca8 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Wed, 8 Aug 2012 14:59:23 +0200
Subject: [PATCH 1139/2585] Fixed bug causing start() to not work

---
 usr/bin/vosa | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 35ae410c..479e3428 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -968,7 +968,7 @@ function do_start() {
       # The word INSTANCE is replaced with the instance.
       ${commands}/ec2-determine-ip.sh \
         "$instance_dir" \
-        "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" \
+        "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name"
     else
       ${commands}/boot.sh "$instance_dir" "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" || exit $?
     fi

From 46d6f1abe95a601060236865637951eb12e69dac Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Wed, 8 Aug 2012 15:01:11 +0200
Subject: [PATCH 1140/2585] Updated print_my_ip_to_the_world to avoid relying
 on the file, to avoid race conditions and other problems.

---
 .../ece-scripts/system-info.d/55-list-ips.sh  | 49 ++++++++++++++++---
 1 file changed, 42 insertions(+), 7 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/55-list-ips.sh b/usr/share/escenic/ece-scripts/system-info.d/55-list-ips.sh
index c42eba9c..fd696985 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/55-list-ips.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/55-list-ips.sh
@@ -4,16 +4,51 @@ function print_my_ip_to_the_world() {
 
   # we only query ifconfig.me every ten minutes
   local max_age=600
+  local restore=0
+  local update=0
 
-  if [[ ! -e $file || $(get_file_age_in_seconds $file) -gt $max_age ]]; then
-    curl --silent \
-      --connect-timeout 30 \
-      ifconfig.me \
-      2>/dev/null \
-      > $file
+  if [[ -a $file ]] ; then
+    # determine if file is legal and has a useful value
+    local age=$(get_file_age_in_seconds $file) 
+    if [[ $age -gt $max_age ]] ; then
+      local update=1
+    fi
+    local old_value=$(cat $file)
+  else
+    local update=1
   fi
 
-  cat $file
+
+  if [[ $update -eq 1 ]]; then
+    new_value="$( curl --silent \
+        --connect-timeout 30 \
+        ifconfig.me 2>/dev/null )"
+  fi
+
+
+  local value=$old_value
+  if [[ $update -eq 1 ]] ; then
+    local value=$new_value
+    if [ ! -z "$old_value" ] ; then
+      # Restore old value if it failed (keep it for 10 minutes)
+      local restore=0
+      if [ -z "$new_value" ] ; then
+        local restore=1
+      elif [[ ! ( $new_value =~ ^[0-9] ) ]] ; then
+        local restore=1
+      fi
+      if [[ $restore -eq 1 ]] ; then
+        local tmpfile=$(mktemp ${file}.XXXXXXX)
+        echo $old_value > $tmpfile
+        value=$old_value
+        mv $tmpfile $file
+      fi
+    fi
+    # touch the file to indicate that it's now up-to-date.
+    touch $file
+  fi
+
+  echo $value
 }
 
 print_h2_header "Overview of IPs on $HOSTNAME"

From f36a612f1f7e52b21db04540602b098ff6159447 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 8 Aug 2012 15:13:34 +0200
Subject: [PATCH 1141/2585] - ece-install::database now leaves the following
 trails:

  trail_db_host
  trail_db_port
  trail_db_master_host
  trail_db_master_port
  trail_db_slave_host
  trail_db_slave_port
---
 .../escenic/ece-scripts/ece-install.d/database.sh  | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index c30c6d14..c9b17005 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -546,7 +546,19 @@ function work_around_eae_bug_stats-76() {
 }
 
 function leave_db_trails() {
-  leave_trail "trail_db_port=${db_port-3306}"
+  leave_trail "trail_db_host=${HOSTNAME}"
+  leave_trail "trail_db_port=${db_port-${default_db_port}}"
+
+  if [ ${db_master-0} -eq 1 ]; then
+    leave_trail "trail_db_master_host=${fai_db_master_host-${default_db_host}}"
+    leave_trail "trail_db_master_port=${fai_db_master_port-${default_db_port}}"
+  elif [ ${fai_db_replication-0} -eq 1 ]; then
+    leave_trail "trail_db_slave_host=${fai_db_host-${default_db_host}}"
+    leave_trail "trail_db_slave_port=${fai_db_port-${default_db_port}}"
+  else
+    leave_trail "trail_db_master_host=${fai_db_host-${default_db_host}}"
+    leave_trail "trail_db_master_port=${fai_db_master_port-${default_db_port}}"
+  fi
 }
 
 ## Yes, calling the method name is a bit over the top, but it's

From 44712158f29c46454cad187fcf6819f1e595932e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 8 Aug 2012 15:21:08 +0200
Subject: [PATCH 1142/2585] - ece-install::app-server now leaves the following
 trails:   trail_editor_host   trail_editor_port   trail_presentation_host  
 trail_presentation_port   trail_search_host   trail_search_port  
 trail_analysis_host   trail_analysis_port

- added constants for the app server port defaults
---
 .../ece-scripts/ece-install.d/app-server.sh   | 54 +++++++++++--------
 1 file changed, 33 insertions(+), 21 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 04105468..7f3bf0a8 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -1,3 +1,7 @@
+default_app_server_port=8080
+default_app_server_shutdown=8005
+default_app_server_redirect=8443
+
 function set_up_app_server()
 {
   print_and_log "Setting up the application server ..."
@@ -6,7 +10,7 @@ function set_up_app_server()
     print "On which ports do you wish to run the app server on?"
     print "Press ENTER to accept the default ports"
     print "or enter: <port> <shutdown port> <redirect port>:"
-    echo -n "Your choice [8080 8005 8443]> "
+    echo -n "Your choice [${default_app_server_port} ${default_app_server_shutdown} ${default_app_server_redirect}]> "
     read user_ports
     
     if [ -n "$user_ports" ]; then
@@ -14,32 +18,40 @@ function set_up_app_server()
     fi
   else
     if [ $install_profile_number -eq $PROFILE_EDITORIAL_SERVER ]; then
-      appserver_port=${fai_editor_port-8080}
-      shutdown_port=${fai_editor_shutdown-8005}
-      redirect_port=${fai_editor_redirect-8443}
+      appserver_port=${fai_editor_port-${default_app_server_port}}
+      shutdown_port=${fai_editor_shutdown-${default_app_server_shutdown}}
+      redirect_port=${fai_editor_redirect-${default_app_server_redirect}}
+      leave_trail "trail_editor_host=${HOSTNAME}"
+      leave_trail "trail_editor_port=${fai_editor_port-${default_app_server_port}}"
     elif [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ]; then
-      appserver_port=${fai_presentation_port-8080}
-      shutdown_port=${fai_presentation_shutdown-8005}
-      redirect_port=${fai_presentation_redirect-8443}
+      appserver_port=${fai_presentation_port-${default_app_server_port}}
+      shutdown_port=${fai_presentation_shutdown-${default_app_server_shutdown}}
+      redirect_port=${fai_presentation_redirect-${default_app_server_redirect}}
+      leave_trail "trail_presentation_host=${HOSTNAME}"
+      leave_trail "trail_presentation_port=${fai_presentation_port-${default_app_server_port}}"
     elif [ $install_profile_number -eq $PROFILE_SEARCH_SERVER ]; then
-      appserver_port=${fai_search_port-8080}
-      shutdown_port=${fai_search_shutdown-8005}
-      redirect_port=${fai_search_redirect-8443}
+      appserver_port=${fai_search_port-${default_app_server_port}}
+      shutdown_port=${fai_search_shutdown-${default_app_server_shutdown}}
+      redirect_port=${fai_search_redirect-${default_app_server_redirect}}
+      leave_trail "trail_search_host=${HOSTNAME}"
+      leave_trail "trail_search_port=${fai_search_port-${default_app_server_port}}"
     elif [ $install_profile_number -eq $PROFILE_ANALYSIS_SERVER ]; then
-      appserver_port=${fai_analysis_port-8080}
-      shutdown_port=${fai_analysis_shutdown-8005}
-      redirect_port=${fai_analysis_redirect-8443}
+      appserver_port=${fai_analysis_port-${default_app_server_port}}
+      shutdown_port=${fai_analysis_shutdown-${default_app_server_shutdown}}
+      redirect_port=${fai_analysis_redirect-${default_app_server_redirect}}
+      leave_trail "trail_analysis_host=${HOSTNAME}"
+      leave_trail "trail_analysis_port=${fai_analysis_port-${default_app_server_port}}"
     fi
   fi
 
   if [ -z "$appserver_port" ]; then
-    appserver_port=8080
+    appserver_port=${default_app_server_port}
   fi
   if [ -z "$shutdown_port" ]; then
-    shutdown_port=8005
+    shutdown_port=${default_app_server_shutdown}
   fi
   if [ -z "$redirect_port" ]; then
-    redirect_port=8443
+    redirect_port=${default_app_server_redirect}
   fi
   
   if [ $fai_enabled -eq 0 ]; then
@@ -63,7 +75,7 @@ function set_up_app_server()
     print "Awfully sorry to bug you with so many questions, but:"
     print "What's the URI to the indexer-webservice? (this is typically"
     print "something like http://editor1/indexer-webservice/index/)"
-    echo -n "Your choice [http://${HOSTNAME}:8080/indexer-webservice/index/]> "
+    echo -n "Your choice [http://${HOSTNAME}:${default_app_server_port}/indexer-webservice/index/]> "
     read user_indexer_ws_uri
   else
     user_indexer_ws_uri=${fai_search_indexer_ws_uri}
@@ -78,10 +90,10 @@ function set_up_app_server()
   
   if [ $fai_enabled -eq 0 ]; then
     print "Last question, I promise!: Where does the search instance run?"
-    print "Press ENTER to accept the default ($HOSTNAME:8080)"
-    print "or enter: <host>:<port>, e.g.: 'search1:8080'"
+    print "Press ENTER to accept the default ($HOSTNAME:${default_app_server_port})"
+    print "or enter: <host>:<port>, e.g.: 'search1:${default_app_server_port}'"
     print "If you're in doubt, just press ENTER :-)"
-    echo -n "Your choice [$HOSTNAME:8080]> "
+    echo -n "Your choice [$HOSTNAME:${default_app_server_port}]> "
     read user_search
   else
     user_search=$(get_conf_value fai_search_host)
@@ -92,7 +104,7 @@ function set_up_app_server()
 
   if [ -z "$user_search" ]; then
     search_host=$HOSTNAME
-    search_port=8080
+    search_port=${default_app_server_port}
   else
     search_host=$(echo $user_search | cut -d':' -f1)
     search_port=$(echo $user_search | cut -d':' -f2)

From 28da0fa5ffe8f36ee068416996af11eeffee4332 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 8 Aug 2012 15:24:36 +0200
Subject: [PATCH 1143/2585] - ece-install::app-server now leaves the trail:
 trail_indexer_ws_uri

---
 usr/share/escenic/ece-scripts/ece-install.d/app-server.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 7f3bf0a8..1bd273d3 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -87,6 +87,7 @@ function set_up_app_server()
     indexer_ws_uri=http://${HOSTNAME}:${appserver_port}/indexer-webservice/index/
   fi
   
+  leave_trail "trail_indexer_ws_uri=${indexer_ws_uri}"
   
   if [ $fai_enabled -eq 0 ]; then
     print "Last question, I promise!: Where does the search instance run?"

From 1d6da0578068e8c93372a6eb82276f5576019f20 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 8 Aug 2012 15:30:02 +0200
Subject: [PATCH 1144/2585] - changed the target build dir to /tmp/$(basename
 $0)-$(date --iso)   instead of creating a target sub directory inside the
 source   directory.

---
 usr/share/escenic/package-scripts/create-packages | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index fed7b1dc..51019438 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -5,7 +5,7 @@
 
 # by tkj@vizrt.com
 
-target_dir=${PWD}/target
+target_dir=/tmp/$(basename $0)-$(date --iso)
 package_name=escenic-content-engine-installer
 package_version=$(date +%Y-%m-%d.%H%M%S)
 default_maintainer_name="Torstein Krause Johansen"

From 92cd624e872bf3bdac41c3e4f2b27748642edfb1 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 8 Aug 2012 15:31:21 +0200
Subject: [PATCH 1145/2585] - ece-install now leaves the trail
 trail_escenic_backups_dir for all profiles.

---
 usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh b/usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh
index 7809dc33..07b8cf31 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh
@@ -66,4 +66,6 @@ function set_up_ece_scripts()
   file=/etc/bash_completion.d/ece
   run sed -i "s#/etc/escenic#${escenic_conf_dir}#g" $file
   run sed -i "s#/opt/escenic#${escenic_root_dir}#g" $file
+
+  leave_trail "trail_escenic_backups_dir=${escenic_backups_dir}"
 }

From f346fb528a680344a2bbf3068e5aed5c91cb33e4 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 8 Aug 2012 15:32:00 +0200
Subject: [PATCH 1146/2585] - smarter creation of the trail file

---
 usr/sbin/ece-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 14319ca9..15c1d960 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -928,7 +928,7 @@ function un_install_everything() {
   print_and_log "have been removed from ${HOSTNAME}."
 }
 
-ece_install_trail_file=/var/lib/ece-install/$(date +%s)-$(basename $0).trail
+ece_install_trail_file=/var/lib/$(basename $0)/$(date +%s)-$(basename $0).trail
 ## $@ add this trail
 function leave_trail() {
   local dir=$(dirname $ece_install_trail_file)

From 14a118775f469e17226f3b5c4791bddd9f09485d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 8 Aug 2012 15:32:29 +0200
Subject: [PATCH 1147/2585] - now uses the global escenic_sources variable

---
 usr/share/escenic/ece-scripts/common-os.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index fd3b91e5..abc6fe88 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -165,7 +165,6 @@ function get_total_memory_in_mega_bytes() {
 }
 
 function add_apt_source() {
-  local escenic_sources=/etc/apt/sources.list.d/escenic.list
   if [[ ! -e $escenic_sources &&
         $(grep "$@" /etc/apt/sources.list | wc -l) -lt 1 ]]; then
     echo "$@" >> $escenic_sources

From ec151c99687118b7310b2b50934e786f8e1434b0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 8 Aug 2012 15:32:43 +0200
Subject: [PATCH 1148/2585] - added the un_install profile

---
 usr/share/escenic/ece-scripts/ece-install.d/constants.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/constants.sh b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
index 7a09a04f..8d6374e9 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
@@ -17,6 +17,7 @@ PROFILE_VIP_PROVIDER=13
 PROFILE_NFS_SERVER=14
 PROFILE_NFS_CLIENT=15
 PROFILE_DB_BACKUP_SERVER=16
+PROFILE_UN_INSTALL=17
 
 # database constants
 default_db_port=3306

From c73462b01fef700fcf6e63c14a24817f5cb1c5f2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 8 Aug 2012 15:34:11 +0200
Subject: [PATCH 1149/2585] - moved the app server constants to
 ece-install::constants where the   DB and profile constants already are.

---
 usr/share/escenic/ece-scripts/ece-install.d/app-server.sh | 4 ----
 usr/share/escenic/ece-scripts/ece-install.d/constants.sh  | 5 +++++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 1bd273d3..821323e8 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -1,7 +1,3 @@
-default_app_server_port=8080
-default_app_server_shutdown=8005
-default_app_server_redirect=8443
-
 function set_up_app_server()
 {
   print_and_log "Setting up the application server ..."
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/constants.sh b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
index 8d6374e9..376c4265 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
@@ -26,3 +26,8 @@ default_db_user=ece5user
 default_db_password=ece5password
 default_db_schema=ece5db
 
+# app server constants
+default_app_server_port=8080
+default_app_server_shutdown=8005
+default_app_server_redirect=8443
+

From 317d406f9901a18b3a0ec94f983ca939632f223c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=F6n?= <oschoen@vizrt.com>
Date: Wed, 8 Aug 2012 15:42:50 +0200
Subject: [PATCH 1150/2585] builder.sh - fixed problem with naming of user
 password variables

---
 usr/share/escenic/build-scripts/builder.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/build-scripts/builder.sh b/usr/share/escenic/build-scripts/builder.sh
index a6fb5046..c3a4faf4 100755
--- a/usr/share/escenic/build-scripts/builder.sh
+++ b/usr/share/escenic/build-scripts/builder.sh
@@ -353,8 +353,8 @@ function verify_add_user
     enforce_variable user_svn_path "You $user_config_file needs to specify user_svn_path!"
     enforce_variable user_svn_username "You $user_config_file needs to specify user_svn_username!"
     enforce_variable user_maven_username "You $user_config_file needs to specify user_maven_username!"
-    enforce_variable svn_password "You $user_config_file needs to specify svn_password!"
-    enforce_variable maven_password "You $user_config_file needs to specify maven_password!"
+    enforce_variable user_svn_password "You $user_config_file needs to specify user_svn_password!"
+    enforce_variable user_maven_password "You $user_config_file needs to specify user_maven_password!"
   fi
 }
 

From a227b15720516b9a06fd5d6ce81bd6924a19c894 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 8 Aug 2012 16:31:31 +0200
Subject: [PATCH 1151/2585] -
 ece-install::monitoring::install_monitoring_server now leaves the trails:

  trail_monitoring_host
  trail_monitoring_port

- replaced some TABs with spaces (where did they come from! ;-)

- removed some trailing whitespace.
---
 .../ece-scripts/ece-install.d/monitoring.sh   | 83 ++++++++++---------
 1 file changed, 43 insertions(+), 40 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index 25223437..2d5a4703 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -9,15 +9,15 @@ function install_nagios_monitoring_server()
 {
   print "Installing an $1 server on $HOSTNAME ..."
   local monitoring_vendor=$1
-  
+
   if [ $on_debian_or_derivative -eq 1 ]; then
     if [[ $monitoring_vendor == $MONITORING_VENDOR_NAGIOS ]]; then
       install_packages_if_missing \
-	check-mk-server check-mk-config-nagios \
+        check-mk-server check-mk-config-nagios \
         apache2 nagios3 nagios-nrpe-plugin
     else
       install_packages_if_missing \
-	check-mk-server check-mk-config-icinga \
+        check-mk-server check-mk-config-icinga \
         apache2 icinga nagios-nrpe-plugin icinga-doc
     fi
 
@@ -38,14 +38,14 @@ function install_nagios_monitoring_server()
     run htpasswd -b -c $file icingaadmin \
       ${fai_monitoring_admin_password-admin}
   fi
-  
+
   # enable remote commands
   if [[ $monitoring_vendor == $MONITORING_VENDOR_NAGIOS ]]; then
     local file=/etc/nagios3/nagios.cfg
   else
     local file=/etc/icinga/icinga.cfg
   fi
-  
+
   dont_quote_conf_values=1
   set_conf_file_value check_external_commands 1 $file
   dont_quote_conf_values=0
@@ -58,14 +58,14 @@ function install_nagios_monitoring_server()
     fi
   fi
 
-  set_up_monitoring_host_def $monitoring_vendor $fai_monitoring_host_list; 
+  set_up_monitoring_host_def $monitoring_vendor $fai_monitoring_host_list;
 
   if [[ $monitoring_vendor == $MONITORING_VENDOR_NAGIOS ]]; then
     file=/etc/nagios3/conf.d/hostgroups_nagios2.cfg
   else
     file=/etc/icinga/objects/hostgroups_icinga.cfg
   fi
-  
+
   set_up_monitoring_host_group \
     $file \
     "ece-hosts" \
@@ -85,7 +85,7 @@ function install_nagios_monitoring_server()
     run /etc/init.d/icinga restart
     add_next_step "Icinga monitoring interface: http://${HOSTNAME}/icinga"
   fi
-  
+
   run /etc/init.d/apache2 reload
 
 }
@@ -151,7 +151,7 @@ function install_nagios_node()
     print_and_log "You will have to install it manually."
     return
   fi
-  
+
   local file=/etc/nagios/nrpe.cfg
   dont_quote_conf_values=1
   set_conf_file_value \
@@ -165,7 +165,7 @@ function install_nagios_node()
   # isn't there (!)
   run touch /var/run/nagios/nrpe.pid
   run /etc/init.d/nagios-nrpe-server restart
-  
+
   add_next_step "A Nagios NRPE node and check_mk has been installed"
   add_next_step "on ${HOSTNAME}"
 }
@@ -194,7 +194,7 @@ function install_munin_node()
   if [ -z "$monitoring_server_ip" ]; then
     monitoring_server_ip=$default_ip
   fi
-  
+
   if [ $on_debian_or_derivative -eq 1 ]; then
     packages="munin-node munin-plugins-extra"
     install_packages_if_missing $packages
@@ -213,10 +213,10 @@ function install_munin_node()
 allow ${escaped_munin_gather_ip}
 EOF
   fi
-  
+
   # install the escenic_jstat munin plugin
   install_escenic_munin_plugins
-  
+
   if [ $on_debian_or_derivative -eq 1 ]; then
     run service munin-node restart
   fi
@@ -227,9 +227,9 @@ EOF
 function install_escenic_munin_plugins() {
   if [ $on_debian_or_derivative -eq 1 ]; then
     install_packages_if_missing escenic-munin-plugins
-    return 
+    return
   fi
-  
+
   local file=/usr/share/munin/plugins/escenic_jstat_
   run wget $wget_opts \
     https://github.com/mogsie/escenic-munin/raw/master/escenic_jstat_ \
@@ -239,7 +239,7 @@ function install_escenic_munin_plugins() {
   local instance_list=$(get_instance_list)
   if [ -z "${instance_list}" ]; then
     print_and_log "No ECE instances found on $HOSTNAME, so I'm not adding"
-    print_and_log "additional Munin configuration"  
+    print_and_log "additional Munin configuration"
 
     if [ $on_debian_or_derivative -eq 1 ]; then
       run service munin-node restart
@@ -248,7 +248,7 @@ function install_escenic_munin_plugins() {
     add_next_step "A Munin node has been installed on $HOSTNAME"
     return
   fi
-  
+
   local escenic_jstat_modules="_gc _gcoverhead _heap _uptime"
   for current_instance in $instance_list; do
     for module in $escenic_jstat_modules; do
@@ -281,7 +281,7 @@ user $ece_user
 
 EOF
   fi
-  
+
 }
 
 function install_munin_gatherer()
@@ -302,14 +302,14 @@ function install_munin_gatherer()
     print "Separate your hosts with a space, e.g.: 'editor01 db01 web01'"
     echo -n "Your choice> "
     read user_munin_nodes
-    
+
     if [ -n "$user_munin_nodes" ]; then
       node_list=$user_munin_nodes
     fi
   else
     node_list=${fai_monitoring_munin_node_list}
   fi
-  
+
   if [ -z "$node_list" ]; then
     return
   fi
@@ -320,7 +320,7 @@ function install_munin_gatherer()
       print_and_log "${el} already exists on the ${HOSTNAME} Munin gatherer ..."
       continue
     fi
-    
+
     print_and_log "Adding ${el} to the Munin gatherer on ${HOSTNAME} ..."
     cat >> $file <<EOF
 [${el}]
@@ -329,8 +329,8 @@ use_node_name yes
 EOF
   done
 
-    # TODO add the priveleged network to the Allowed stanza (i.e. the
-    # network wich will do the monitoring of the servers.
+  # TODO add the priveleged network to the allowed stanza (i.e. the
+  # network wich will do the monitoring of the servers.
   local file=/etc/apache2/conf.d/munin
   if [ -n "$(get_privileged_hosts)" ]; then
     local privileged_hosts=$(
@@ -352,7 +352,7 @@ function create_monitoring_server_overview()
 {
   local file=/var/www/index.html
   local title="Welcome to the mighty monitoring server @ ${HOSTNAME}"
-  
+
 cat > $file <<EOF
 <html>
   <head>
@@ -385,17 +385,20 @@ EOF
 function install_monitoring_server()
 {
   local nagios_flavour=${fai_monitoring_nagios_flavour-$MONITORING_VENDOR_ICINGA}
-  
+
   if [ "$(lsb_release -s -c 2>/dev/null)" = "lucid" ]; then
     log "Version $(lsb_release -s -c 2>/dev/null) of" \
       $(lsb_release -s -c 2>/dev/null) \
       "doesn't support Icinga, will use vanilla Nagios instead."
     nagios_flavour=$MONITORING_VENDOR_NAGIOS
   fi
-  
+
   install_nagios_monitoring_server $nagios_flavour
   install_munin_gatherer
   create_monitoring_server_overview $nagios_flavour
+
+  leave_trail "trail_monitoring_host=$HOSTNAME"
+  leave_trail "trail_monitoring_port=80"
 }
 
 ## $1 configuration file name
@@ -423,7 +426,7 @@ function set_up_monitoring_host_group()
       "already defined, skipping it."
     return
   fi
-  
+
   cat >> $file <<EOF
 define hostgroup {
   hostgroup_name $host_group_name
@@ -445,16 +448,16 @@ function install_system_info() {
   if [ $on_redhat_or_derivative -eq 1 ]; then
     return
   fi
-  
+
   print_and_log "Setting up a self-reporting module on $HOSTNAME ..."
-  
+
   install_packages_if_missing lighttpd escenic-common-scripts
   assert_pre_requisite lighttpd
 
   local port=${fai_reporting_port-5678}
   local dir=${fai_reporting_dir-/var/www/system-info}
   make_dir $dir
-  
+
   # configure the web server
   local file=/etc/lighttpd/lighttpd.conf
 
@@ -465,23 +468,23 @@ function install_system_info() {
   else
     run sed -i "s~^${property}.*=.*$~${property}=\"${port}\"~g" $file
   fi
-  
+
   # set the document root
   property=server.document-root
   run sed -i "s~^${property}.*=.*\"/var/www\"$~${property}=\"$dir\"~g" $file
-  
+
   # make the web server start
   run /etc/init.d/lighttpd restart
-  
+
   # set system-info to be run every minute on the host
   local command="system-info -f html -u $ece_user > $dir/index.html"
   if [ $(grep -v ^# /etc/crontab | grep "$command" | wc -l) -lt 1 ]; then
     echo '* *     * * *   root    '$command >> /etc/crontab
   fi
-  
+
   # doing a first run of system-info since cron will take a minute to start
   eval $command
-  
+
   # creating symlinks like:
   # /var/www/system-info/var/log/escenic -> /var/log/escenic
   # /var/www/system-info/etc/escenic -> /etc/escenic
@@ -496,30 +499,30 @@ function install_system_info() {
   if [ ! -h $target ]; then
     run ln -s ${escenic_conf_dir} $target
   fi
-  
+
   make_dir ${dir}/$tomcat_base
   target=${dir}/$tomcat_base/logs
   if [ ! -h $target ]; then
     run ln -s $tomcat_base/logs $target
   fi
-  
+
   # thttpd doesn't serve files if they've got the execution bit set
   # (it then think it's a misnamed CGI script). Hence, we must ensure
   # the execute bit is set.
   if [ -d $escenic_log_dir ]; then
     find $escenic_log_dir -type f | egrep ".log$|.out$" | xargs chmod 644
   fi
-  
+
   if [ -d $escenic_conf_dir ]; then
     find $escenic_conf_dir -type f | \
       egrep ".conf$|.properties$" | \
       xargs chmod 644
   fi
-  
+
   if [ -d  $tomcat_base/logs ]; then
     find $tomcat_base/logs -type f | egrep ".log$" | xargs chmod 644
   fi
-  
+
   add_next_step "Always up to date system info: http://$HOSTNAME:$port/"
   add_next_step "you can also see system-info in the shell, type: system-info"
 }

From e197b7295d6013ea46791ab122c23783d7102637 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 8 Aug 2012 16:35:25 +0200
Subject: [PATCH 1152/2585] - added new FAI parameter: fai_cache_port

- ece-install::cache-server now leaves the trails:

    trail_cache_host
    trail_cache_port

- added local variable scoping
---
 .../ece-scripts/ece-install.d/cache-server.sh | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
index c250e634..77b3714b 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
@@ -40,7 +40,7 @@ function install_cache_server()
 
   install_packages_if_missing varnish
   assert_pre_requisite varnishd
-
+  
   if [ $fai_enabled -eq 0 ]; then
     print "You must now list your backend servers."
     print "These must be host names (not IPs) and must all be resolvable"
@@ -49,8 +49,10 @@ function install_cache_server()
     print "Press ENTER to accept the default: ${HOSTNAME}:${appserver_port}"
     echo -n "Your choice [${HOSTNAME}:${appserver_port}]> "
     read backend_servers
+    cache_port=$default_cache_port
   else
     backend_servers=${fai_cache_backends}
+    cache_port=${fai_cache_port-$default_cache_port}
   fi
 
   if [ -z "$backend_servers" ]; then
@@ -60,7 +62,7 @@ function install_cache_server()
   set_up_varnish $backend_servers
   leave_cache_trails
   
-  add_next_step "Cache server is up and running at http://${HOSTNAME}:80/"
+  add_next_step "Cache server is up and running at http://${HOSTNAME}:${cache_port}/"
 }
 
 function set_up_varnish()
@@ -68,17 +70,17 @@ function set_up_varnish()
   print_and_log "Setting up Varnish to match your environment ..."
   run /etc/init.d/varnish stop
 
-    # we need to swap standard err and standard out here as varnishd
-    # -V for some reason writes to standard error.
-  using_varnish_3=$(varnishd -V 3>&1 1>&2 2>&3 | grep varnish-3 | wc -l)
+  # we need to swap standard err and standard out here as varnishd -V
+  # for some reason writes to standard error.
+  local using_varnish_3=$(varnishd -V 3>&1 1>&2 2>&3 | grep varnish-3 | wc -l)
   
   local file=/etc/default/varnish
   if [ $on_redhat_or_derivative -eq 1 ]; then
     file=/etc/sysconfig/varnish
   fi
   
-  sed -i -e 's/6081/80/g' -e 's/^START=no$/START=yes/' $file
-  exit_on_error "sed on $file"
+  run sed -i -e "s/6081/${cache_port}/g" \
+    -e 's/^START=no$/START=yes/' $file
 
   cat > /etc/varnish/default.vcl <<EOF
 /* Varnish configuration for Escenic Content Engine              -*- java -*- */
@@ -214,5 +216,6 @@ EOF
 }
 
 function leave_cache_trails() {
-  leave_trail "trail_cache_port=80"
+  leave_trail "trail_cache_host=${HOSTNAME}"
+  leave_trail "trail_cache_port=${cache_port}"
 }

From f8b7338b967f933efed81a221d850beb542a4886 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 8 Aug 2012 16:36:26 +0200
Subject: [PATCH 1153/2585] - added default cache port

---
 usr/share/escenic/ece-scripts/ece-install.d/constants.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/constants.sh b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
index 376c4265..e35a5287 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
@@ -31,3 +31,5 @@ default_app_server_port=8080
 default_app_server_shutdown=8005
 default_app_server_redirect=8443
 
+# cache server constants
+default_cache_port=80

From 71af5c736b8a24c5e837c16862a34b00d70f88c9 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 8 Aug 2012 16:39:47 +0200
Subject: [PATCH 1154/2585] - ece-install::vip-provider will, for NFS services,
 leave the trails:

    trail_nfs_master_host
    trail_nfs_slave_host
---
 .../ece-scripts/ece-install.d/vip-provier.sh        | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/vip-provier.sh b/usr/share/escenic/ece-scripts/ece-install.d/vip-provier.sh
index 51b453e5..212430c1 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/vip-provier.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/vip-provier.sh
@@ -1,6 +1,4 @@
 function get_vip_configuration() {
-  # TODO add interactive mode if it's needed/requested
-
   # dependant on the running ece-install process/host
   vip_address=${fai_vip_address}
   vip_interface=${fai_vip_interface-eth0}
@@ -68,6 +66,17 @@ EOF
   
   add_next_step "Heartbeat installed on $HOSTNAME to provide VIP ${vip_address},"
   add_next_step "be sure that $vip_sibling_ip gets similar setup as $HOSTNAME."
+
+  leave_vip_trails
+}
+
+function leave_vip_trails() {
+  for el in $vip_service_list; do
+    if [[ "$el" == "nfs-kernel-server" || "$el" == "nfs" ]]; then
+      leave_trail "trail_nfs_master_host=${vip_primary_node_name}"
+      leave_trail "trail_nfs_slave_host=${vip_secondary_node_name}"
+    fi
+  done
 }
 
 function set_kernel_vip_parameters() {

From af738f630062f41df10eb512d925171f0e46d810 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 8 Aug 2012 16:52:15 +0200
Subject: [PATCH 1155/2585] - updated habitat definition

---
 usr/share/doc/vizrt/vosa-handbook/glossary.org | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/glossary.org b/usr/share/doc/vizrt/vosa-handbook/glossary.org
index 248c0026..a3d61cd6 100644
--- a/usr/share/doc/vizrt/vosa-handbook/glossary.org
+++ b/usr/share/doc/vizrt/vosa-handbook/glossary.org
@@ -7,9 +7,9 @@
 # sorting of the entries in this table if you mark the entries and
 # then do: M-x sort-lines
 
-|----------+--------------------------------------------------------------------------|
-| Term     | Explanation                                                              |
-|----------+--------------------------------------------------------------------------|
-| Habitat  | A collection of machines which makes up a web site.                      |
-| Trending | Seeing the behavioural statistics of a server over longer amount of time |
-|----------+--------------------------------------------------------------------------|
+|----------+----------------------------------------------------------------------------------------------|
+| Term     | Explanation                                                                                  |
+|----------+----------------------------------------------------------------------------------------------|
+| Habitat  | Collection of machines which makes up an environment, such as testing, staging & production. |
+| Trending | Seeing the behavioural statistics of a server over longer amount of time                     |
+|----------+----------------------------------------------------------------------------------------------|

From 3ffced124501d5b9dff8b3cc95f72560c1b8ddda Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 8 Aug 2012 17:25:10 +0200
Subject: [PATCH 1156/2585] - now support for network_name properly, works if
 it's not set too!

---
 .../vizrt/vosa-handbook/create-handbook.sh    | 98 +++++++++++++++----
 .../doc/vizrt/vosa-handbook/deployment.org    | 18 ++--
 .../doc/vizrt/vosa-handbook/monitoring.org    |  6 +-
 3 files changed, 89 insertions(+), 33 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 421e3bad..1e3fd463 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -42,7 +42,31 @@ function set_customer_specific_variables() {
     trail_nfs_master_host=nfs1
   fi
 
+  local virtual_host_key_prefix="trail_virtual_host_"
+  local first_virtual_host=$(
+    set | grep ^${virtual_host_key_prefix} | head -1
+  )
+
+  if [ -n $first_virtual_host ]; then
+    first_publication=$(
+      echo  $first_virtual_host | \
+        sed "s#${virtual_host_key_prefix}##" | \
+        cut -d'=' -f1
+    )
+    first_website=$(
+      echo  $first_virtual_host | \
+        cut -d'=' -f2 | \
+        cut -d':' -f1
+    )
+  fi
+
+  if [ -n "$trail_network_name" ]; then
+    network_name="."${trail_network_name}
+  fi
+  
   customer_filter_map="
+    my-backup-dir~${trail_escenic_backups_dir}
+    my-network~${network_name}
     my-build-server~${trail_builder_host-builder}
     my-build-user~${trail_builder_user-buildy}
     my-control-server~${trail_control_host-control}
@@ -54,10 +78,10 @@ function set_customer_specific_variables() {
     my-nfs-server~${trail_nfs_master_host-nfs1}
     my-presentation-server~${trail_presentation_host-pres1}
     my-stats-server~${trail_analysis_host-analysis}
-    my-webapp~${trail_website_name-mywebapp}
-    my-website~${trail_website_name-mywebsite}
+    my-publication~${first_publication}
+    my-webapp~${first_publication}
+    my-website~${first_website}
   "
-
   for el in $customer_filter_map; do
     local old_ifs=$IFS
     IFS='~'
@@ -227,6 +251,23 @@ function generate_html_from_org() {
   echo "$target_dir/$(basename $handbook_org .org).html is now ready"
 }
 
+function get_network_name() {
+  if [ -n $trail_network_name ]; then
+    echo ".${trail_network_name}"
+  else
+    echo ""
+  fi
+}
+
+## $1 :; the host (not FQDN)
+function get_fqdn() {
+  echo "${1}$(get_network_name)"
+}
+
+## $1 :; the host (not FQDN)
+function get_link() {
+  echo "http://$(get_fqdn $1)"
+}
 
 function get_generated_overview() {
   cat <<EOF
@@ -236,17 +277,17 @@ function get_generated_overview() {
 EOF
   if [ -n "${trail_monitoring_host}" ]; then
     cat <<EOF 
-| ${trail_monitoring_host} | \
-  [[http://${trail_monitoring_host}:${trail_monitoring_port-80}/munin/][munin]] \
-  [[http://${trail_monitoring_host}:${trail_monitoring_port-80}/icinga/][icinga]] \
+| $(get_fqdn $trail_monitoring_host) | \
+  [[$(get_link ${trail_monitoring_host}):${trail_monitoring_port-80}/munin/][munin]] \
+  [[$(get_link ${trail_monitoring_host}):${trail_monitoring_port-80}/icinga/][icinga]] \
 |
 EOF
   fi
   
   if [ -n "${trail_control_host}" ]; then
     cat <<EOF 
-| ${trail_control_host} | \
-  [[http://${trail_control_host}:5679][hugin]] \
+| $(get_fqdn $trail_control_host) | \
+  [[http://$(get_link $trail_control_host):5679][hugin]] \
 |
 EOF
   fi
@@ -256,11 +297,11 @@ EOF
       continue
     fi
     cat <<EOF 
-| ${el} | \
-  [[http://${el}:5678/][system-info]] \
-  [[http://${el}:8080/escenic-admin/][escenic-admin]] \
-  [[http://${el}:8080/escenic/][escenic]] \
-  [[http://${el}:8080/webservice/][webservice]] \
+| $(get_fqdn ${el}) | \
+  [[$(get_link ${el}):5678/][system-info]] \
+  [[$(get_link ${el}):8080/escenic-admin/][escenic-admin]] \
+  [[$(get_link ${el}):8080/escenic/][escenic]] \
+  [[$(get_link ${el}):8080/webservice/][webservice]] \
 |
 EOF
   done
@@ -269,23 +310,38 @@ EOF
       continue
     fi
     cat <<EOF 
-| ${el} | \
-  [[http://${el}:5678/][system-info]] \
-  [[http://${el}:8080/escenic-admin/][escenic-admin]] \
-  [[http://${el}:8081/solr/admin/][solr]] \
+| $(get_fqdn ${el}) | \
+  [[$(get_link ${el}):5678/][system-info]] \
+  [[$(get_link ${el}):8080/escenic-admin/][escenic-admin]] \
+  [[$(get_link ${el}):8081/solr/admin/][solr]] \
 |
 EOF
   done
   
   if [ -n "${trail_analysis_host}" ]; then
     cat <<EOF 
-| ${trail_analysis_host} | \
-  [[http://${trail_analysis_host}:${trail_analysis_port-8080}/analysis-reports/][analysis-reports]] \
-  [[http://${trail_analysis_host}:${trail_analysis_port-8080}/analysis-logger/admin][analysis-logger]] \
-  [[http://${trail_analysis_host}:${trail_analysis_port-8080}/analysis-qs/admin][analysis-qs]] \
+| $(get_fqdn ${trail_analysis_host}) | \
+  [[$(get_link ${trail_analysis_host}):5678/][system-info]] \
+  [[$(get_link ${trail_analysis_host}):${trail_analysis_port-8080}/analysis-reports/][analysis-reports]] \
+  [[$(get_link ${trail_analysis_host}):${trail_analysis_port-8080}/analysis-logger/admin][analysis-logger]] \
+  [[$(get_link ${trail_analysis_host}):${trail_analysis_port-8080}/analysis-qs/admin][analysis-qs]] \
 |
 EOF
   fi
+  
+  for el in nop $trail_nfs_master_host \
+    $trail_nfs_slave_host \
+    $trail_db_master_host \
+    $trail_db_slave_host; do
+    if [[ $el == "nop" ]]; then
+      continue
+    fi
+    cat <<EOF 
+| $(get_fqdn ${el}) | \
+  [[$(get_link ${el}):5678/][system-info]] \
+|
+EOF
+  done
   cat <<EOF
 |-------------------------------------------|
 EOF
diff --git a/usr/share/doc/vizrt/vosa-handbook/deployment.org b/usr/share/doc/vizrt/vosa-handbook/deployment.org
index cae800c6..577a7c82 100644
--- a/usr/share/doc/vizrt/vosa-handbook/deployment.org
+++ b/usr/share/doc/vizrt/vosa-handbook/deployment.org
@@ -21,9 +21,9 @@ my-control-server (but you could of course also first log on to each
 of the servers and run the commands locally there).
 
 #+BEGIN_SRC sh
-$ sudo ssh escenic@my-presentation-server ece -i engine1 --uri http://my-build-server/my-builder-user/releases/my-website-trunk-rev4121-2012-07-05_1524.ear  deploy
-[ece#engine-engine1] Deploying http://my-build-server/my-build-user/releases/my-website-trunk-rev4121-2012-07-05_1524.ear on engine1 ...
-[ece#engine-engine1] Deploying /var/cache/escenic/my-website-trunk-rev4121-2012-07-05_1524.ear on tomcat ...
+$ sudo ssh escenic@my-presentation-server ece -i engine1 --uri http://my-build-server/my-build-user/releases/my-build-user-trunk-rev4121-2012-07-05_1524.ear  deploy
+[ece#engine-engine1] Deploying http://my-build-server/my-build-user/releases/my-build-user-trunk-rev4121-2012-07-05_1524.ear on engine1 ...
+[ece#engine-engine1] Deploying /var/cache/escenic/my-build-user-trunk-rev4121-2012-07-05_1524.ear on tomcat ...
 [ece#engine-engine1] Deployment white list active, only deploying: my-webapp escenic-admin indexer-webservice
 [ece#engine-engine1] Deployment state file updated: /var/lib/escenic/engine1.state
 #+END_SRC
@@ -53,9 +53,9 @@ the search instance has a different deployment white list than that of
 the ECE instance above.
 
 #+BEGIN_SRC sh
-torstein@control:~$ sudo ssh escenic@my-presentation-server ece -i search1 -t search --uri http://my-build-server/my-builder-user/releases/my-website-trunk-rev4121-2012-07-05_1524.ear deploy
-[ece#search-search1] Deploying http://my-build-server/my-builder-user/releases/my-website-trunk-rev4121-2012-07-05_1524.ear on search1 ...
-[ece#search-search1] Deploying /var/cache/escenic/my-website-trunk-rev4121-2012-07-05_1524.ear on tomcat ...
+torstein@control:~$ sudo ssh escenic@my-presentation-server ece -i search1 -t search --uri http://my-build-server/my-build-user/releases/my-builder-user-trunk-rev4121-2012-07-05_1524.ear deploy
+[ece#search-search1] Deploying http://my-build-server/my-build-user/releases/my-build-user-trunk-rev4121-2012-07-05_1524.ear on search1 ...
+[ece#search-search1] Deploying /var/cache/escenic/my-build-user-trunk-rev4121-2012-07-05_1524.ear on tomcat ...
 [ece#search-search1] Deployment white list active, only deploying: escenic-admin solr indexer-webapp
 [ece#search-search1] Deployment state file updated: /var/lib/escenic/search1.state  
 #+END_SRC
@@ -88,7 +88,7 @@ of it.
 #+BEGIN_SRC sh
 $ mkdir ~/backup
 $ wget -O ~/backup/content-type-$(date --iso)-before-deployment \
-       http://localhost:8080/escenic-admin/publication-resources/mypub/escenic/content-type
+       http://localhost:8080/escenic-admin/publication-resources/my-publication/escenic/content-type
 #+END_SRC
 
 The next step is to locate the new content-type definition.  Go to the
@@ -107,14 +107,14 @@ Now, upload the new content-type to ECE.  The command below assumes
 that there is a file called the same as the publication resource in
 the current directory. 
 #+BEGIN_SRC sh
-$ ece -i engine1 -p mypub -r content-type update
+$ ece -i engine1 -p my-publication -r content-type update
 #+END_SRC
 
 To confirm our changes, we now download the resource again to check if
 all the changes are the way we want them:
 #+BEGIN_SRC sh
 $ wget -O ~/backup/content-type-$(date --iso)-after-deployment \
-       http://localhost:8080/escenic-admin/publication-resources/mypub/escenic/content-type
+       http://localhost:8080/escenic-admin/publication-resources/my-publication/escenic/content-type
 #+END_SRC
 
 
diff --git a/usr/share/doc/vizrt/vosa-handbook/monitoring.org b/usr/share/doc/vizrt/vosa-handbook/monitoring.org
index 6a9360e3..46c7b77d 100644
--- a/usr/share/doc/vizrt/vosa-handbook/monitoring.org
+++ b/usr/share/doc/vizrt/vosa-handbook/monitoring.org
@@ -30,7 +30,7 @@ produce a system-info report in YAML and check the files into a
 version repository.
 
 When browsing the Hugin web interface at
-http://my-control-server:5679/ you can quickly see all changes on the
+http://my-control-servermy-network:5679/ you can quickly see all changes on the
 various servers. A change could be a new service which is all of a
 sudden listening on a new port or that the version of a installed
 package has changed. Nothing escapes Hugin's watchful eyes! 
@@ -41,11 +41,11 @@ trending of your site. I.e. how it has been behaving the last days,
 weeks and months.
 
 If we assume your monitoring server is called "my-monitoring-server",
-the address to your munin is: http://my-monitoring-server/munin/
+the address to your munin is: http://my-monitoring-servermy-network/munin/
 
 ** Icinga (enhanced Nagios)
 Icinga gives a good overview of the current health of the
-habitat. Head over to http://my-monitoring-server/icinga/ to get
+habitat. Head over to http://my-monitoring-servermy-network/icinga/ to get
 updates on host & service uptimes and disk fill rates. This is also
 the place were you'll schedule any maintenance work you do to prevent
 unnecessary alerts filling up your mobile phone and email inboxes.

From 69b515e48e713156eb6d719b78033c006ccec7f3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 9 Aug 2012 09:10:16 +0200
Subject: [PATCH 1157/2585] - not including any HTML version of any of the
 guides anymore.

---
 usr/share/escenic/package-scripts/create-packages | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 51019438..2a53ec51 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -117,7 +117,7 @@ function set_up_escenic-content-engine-scripts() {
   cp -r ../../../../etc/init.d/ece $target_dir/etc/init.d/
 
   # doc
-  cp -r ../../doc/escenic/ece-guide.{org,html} \
+  cp -r ../../doc/escenic/ece-guide.org \
     $target_dir/usr/share/doc/escenic
 
   # cron
@@ -153,7 +153,7 @@ function set_up_escenic-common-scripts() {
   cp -r ../../escenic/ece-scripts/system-info.d \
     $target_dir/usr/share/escenic/ece-scripts/
   cp ../../../../etc/default/system-info $target_dir/etc/default/
-  cp -r ../../doc/escenic/system-info-guide.{org,html} \
+  cp -r ../../doc/escenic/system-info-guide.org \
     $target_dir/usr/share/doc/escenic
   
   # both the installer and ece-scripts use the common scripts and

From 2dab129c57c047f804497d1c02912bc952a2cfd7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 9 Aug 2012 10:04:17 +0200
Subject: [PATCH 1158/2585] - added solr & content studio links to editor and
 import trails

---
 .../vizrt/vosa-handbook/create-handbook.sh    | 35 +++++++++++++------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 1e3fd463..e47c3ec1 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -292,19 +292,32 @@ EOF
 EOF
   fi
 
-  for el in nop $trail_editor_host $trail_import_host; do
-    if [[ $el == "nop" ]]; then
-      continue
-    fi
-    cat <<EOF 
-| $(get_fqdn ${el}) | \
-  [[$(get_link ${el}):5678/][system-info]] \
-  [[$(get_link ${el}):8080/escenic-admin/][escenic-admin]] \
-  [[$(get_link ${el}):8080/escenic/][escenic]] \
-  [[$(get_link ${el}):8080/webservice/][webservice]] \
+  if [ -n "${trail_editor_host}" ]; then
+  cat <<EOF 
+| $(get_fqdn ${trail_editor_host}) | \
+  [[$(get_link ${trail_editor_host}):5678/][system-info]] \
+  [[$(get_link ${trail_editor_host}):8080/escenic-admin/][escenic-admin]] \
+  [[$(get_link ${trail_editor_host}):8081/solr/admin/][solr]] \
+  [[$(get_link ${trail_editor_host}):8080/studio/][studio]] \
+  [[$(get_link ${trail_editor_host}):8080/escenic/][escenic]] \
+  [[$(get_link ${trail_editor_host}):8080/webservice/][webservice]] \
 |
 EOF
-  done
+  fi
+  
+  if [ -n "${trail_import_host}" ]; then
+  cat <<EOF 
+| $(get_fqdn ${trail_import_host}) | \
+  [[$(get_link ${trail_import_host}):5678/][system-info]] \
+  [[$(get_link ${trail_import_host}):8080/escenic-admin/][escenic-admin]] \
+  [[$(get_link ${trail_import_host}):8081/solr/admin/][solr]] \
+  [[$(get_link ${trail_import_host}):8080/studio/][studio]] \
+  [[$(get_link ${trail_import_host}):8080/escenic/][escenic]] \
+  [[$(get_link ${trail_import_host}):8080/webservice/][webservice]] \
+|
+EOF
+  fi
+  
   for el in nop $trail_presentation_host_list; do
     if [[ $el == "nop" ]]; then
       continue

From 23556cce538b4e74bc3cf5a09478bb2f51aaf471 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 9 Aug 2012 10:09:27 +0200
Subject: [PATCH 1159/2585] - fixed the get_network_name method, if
 trail_network_name isn't set.

---
 usr/share/doc/vizrt/vosa-handbook/create-handbook.sh | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index e47c3ec1..575452e0 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -60,13 +60,9 @@ function set_customer_specific_variables() {
     )
   fi
 
-  if [ -n "$trail_network_name" ]; then
-    network_name="."${trail_network_name}
-  fi
-  
   customer_filter_map="
     my-backup-dir~${trail_escenic_backups_dir}
-    my-network~${network_name}
+    my-network~$(get_network_name)
     my-build-server~${trail_builder_host-builder}
     my-build-user~${trail_builder_user-buildy}
     my-control-server~${trail_control_host-control}
@@ -252,7 +248,7 @@ function generate_html_from_org() {
 }
 
 function get_network_name() {
-  if [ -n $trail_network_name ]; then
+  if [ -n "$trail_network_name" ]; then
     echo ".${trail_network_name}"
   else
     echo ""

From fefaae43f88eab2864cb8632f40388106b3912e5 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 9 Aug 2012 10:16:13 +0200
Subject: [PATCH 1160/2585] - added support for trail_editor_port and
 trail_import_port

---
 .../vizrt/vosa-handbook/create-handbook.sh    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 575452e0..2056a6d1 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -292,11 +292,11 @@ EOF
   cat <<EOF 
 | $(get_fqdn ${trail_editor_host}) | \
   [[$(get_link ${trail_editor_host}):5678/][system-info]] \
-  [[$(get_link ${trail_editor_host}):8080/escenic-admin/][escenic-admin]] \
-  [[$(get_link ${trail_editor_host}):8081/solr/admin/][solr]] \
-  [[$(get_link ${trail_editor_host}):8080/studio/][studio]] \
-  [[$(get_link ${trail_editor_host}):8080/escenic/][escenic]] \
-  [[$(get_link ${trail_editor_host}):8080/webservice/][webservice]] \
+  [[$(get_link ${trail_editor_host}):${trail_editor_port-8080}/escenic-admin/][escenic-admin]] \
+  [[$(get_link ${trail_editor_host}):${trail_editor_port-8080}/solr/admin/][solr]] \
+  [[$(get_link ${trail_editor_host}):${trail_editor_port-8080}/studio/][studio]] \
+  [[$(get_link ${trail_editor_host}):${trail_editor_port-8080}/escenic/][escenic]] \
+  [[$(get_link ${trail_editor_host}):${trail_editor_port-8080}/webservice/][webservice]] \
 |
 EOF
   fi
@@ -305,11 +305,11 @@ EOF
   cat <<EOF 
 | $(get_fqdn ${trail_import_host}) | \
   [[$(get_link ${trail_import_host}):5678/][system-info]] \
-  [[$(get_link ${trail_import_host}):8080/escenic-admin/][escenic-admin]] \
-  [[$(get_link ${trail_import_host}):8081/solr/admin/][solr]] \
-  [[$(get_link ${trail_import_host}):8080/studio/][studio]] \
-  [[$(get_link ${trail_import_host}):8080/escenic/][escenic]] \
-  [[$(get_link ${trail_import_host}):8080/webservice/][webservice]] \
+  [[$(get_link ${trail_import_host}):${trail_import_port}/escenic-admin/][escenic-admin]] \
+  [[$(get_link ${trail_import_host}):${trail_import_port}/solr/admin/][solr]] \
+  [[$(get_link ${trail_import_host}):${trail_import_port}/studio/][studio]] \
+  [[$(get_link ${trail_import_host}):${trail_import_port}/escenic/][escenic]] \
+  [[$(get_link ${trail_import_host}):${trail_import_port}/webservice/][webservice]] \
 |
 EOF
   fi

From 2c1255f3c6ed4568bdefa850079f983870454856 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 9 Aug 2012 10:37:27 +0200
Subject: [PATCH 1161/2585] - removed syntax highlighting for all shell blocks
 - added monotype to all paths and variables printed in the   documentation.

---
 usr/share/doc/escenic/ece-install-guide.org | 126 ++++++++++----------
 1 file changed, 62 insertions(+), 64 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index cc00f3b9..8af39d22 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -63,7 +63,7 @@ ece-install.
 * Downloading the ece-install Script
 The easiest way of getting ece-install is to use git. Type this in
 your shell:
-#+BEGIN_SRC fundamental
+#+BEGIN_SRC text
 $ git clone https://github.com/skybert/ece-scripts.git
 #+END_SRC
 
@@ -77,24 +77,24 @@ archive here: https://github.com/skybert/ece-scripts/zipball/master
 
 * Running the ece-install Script
 After getting the latest version of ece-scripts, you run it with:
-#+BEGIN_SRC sh
+#+BEGIN_SRC text
 # bash ece-scripts/usr/sbin/ece-install  
 #+END_SRC
 
 ** Requires Super User Privileges
 You must run the script as the root user.  If you start the script as
 a regular user, it will complain:
-#+BEGIN_SRC fundamental
+#+BEGIN_SRC text
 [ece-install] You must be root when running ece-install
 #+END_SRC
 To become root on Ubuntu based systems and Mac OS X, do:
-#+BEGIN_SRC fundamental
+#+BEGIN_SRC text
 $ sudo su
 #+END_SRC
 Please note that just doing "sudo ece-install" may not work.
 
 On all other Unix like system, do:
-#+BEGIN_SRC fundamental
+#+BEGIN_SRC text
 $ su -
 #+END_SRC
 
@@ -103,13 +103,13 @@ You will need access to http://technet.escenic.com and put these
 credentials in the root user's $HOME/ece-install.conf, normally this
 means /root/ece-install.conf, the script will also tell you this if
 you forget to provide such a configuration file:
-#+BEGIN_SRC fundamental
+#+BEGIN_SRC text
 [ece-install] /root/ece-install.conf doesn't exist, I cannot live without it :-(
 #+END_SRC
 
 As for the technet credentials, the script will also tell you if it
 cannot find what it's looking for:
-#+BEGIN_SRC fundamental
+#+BEGIN_SRC text
 [ece-install] Be sure to set technet_user and technet_password
 [ece-install] in /root/ece-install.conf
 #+END_SRC
@@ -128,7 +128,7 @@ below.
 
 ** Basic invocation & how to debug errors
 With the configuration file in place, you're now ready to run it:
-#+BEGIN_SRC conf
+#+BEGIN_SRC text
 # bash ece-install [-v|--verbose|<-f|--file> <conf-file>]
 #+END_SRC
 
@@ -137,7 +137,7 @@ log file located at /var/log/ece-install.log.
 
 ece-install will try to "fail fast", exiting as soon as it detects an
 error during its execution:
-#+BEGIN_SRC fundamental
+#+BEGIN_SRC text
 [ece-install-1] The command [cd /does/not/exist] FAILED, exiting :-(
 [ece-install-1] See /var/log/ece-install.log for further details.
 #+END_SRC
@@ -145,7 +145,7 @@ error during its execution:
 As a last resort, if something goes astray with the script, and the
 log file cannot give you enough clues, the ultimate way of debugging
 this is to run the BASH interpreter with the -x flag:
-#+BEGIN_SRC conf
+#+BEGIN_SRC text
 # bash -x ece-install
 #+END_SRC
 
@@ -159,13 +159,13 @@ ece-install has support for a lock file. This is useful for systems
 were you want to ensure that no one incidentally triggers ece-install
 without wanting to. The location of this lock file is:
 
-#+BEGIN_SRC fundamental
+#+BEGIN_SRC text
 /var/lock/ece-install.lock
 #+END_SRC
     
 If this lock file is in place, ece-install will fail fast:
 
-#+BEGIN_SRC fundamental
+#+BEGIN_SRC text
 The lock file is present: /var/lock/ece-install.lock and ece-install
 will therefore refuse to run.
 #+END_SRC
@@ -173,7 +173,7 @@ will therefore refuse to run.
 * Available Server Profiles
 When starting the script, it will ask you which server profile you
 want to install:
-#+BEGIN_SRC conf
+#+BEGIN_SRC text
 Hi, which server profile do you wish to install?
 
    1 - All in one, full stack on one host, suitable for dev & test environments
@@ -257,7 +257,7 @@ Escenic components and install the ECE database schema based from the
 SQL files contained inside the distribution bundles. 
 
 The script will fail by itself if the DB already exists:
-#+BEGIN_SRC fundamental
+#+BEGIN_SRC text
 [ece-install] Setting up the ECE database schema ...
 ERROR 1007 (HY000) at line 1: Can't create database 'ece5db'; database exists
 ERROR 1050 (42S01) at line 2: Table 'DBChangeLog' already exists
@@ -283,7 +283,7 @@ fai_db_replication=1
 
 The script will itself output some replication log settings you need
 for the slave:
-#+BEGIN_SRC fundamental
+#+BEGIN_SRC text
 [ece-install-35] - DB is now set up on localhost:3306
 [ece-install-35] - ece-install.conf for slave: fai_db_master_log_file=mysql-bin.000013
 [ece-install-35] - ece-install.conf for slave: fai_db_master_log_position=106
@@ -349,7 +349,7 @@ these, please contact support@escenic.com.
 
 If you don't have these ready in your ece-install.conf, ece-install will
 complain:
-#+BEGIN_SRC conf
+#+BEGIN_SRC text
 [ece-install] Be sure to set wf_user and wf_password in /root/ece-install.conf
 [ece-install] If you don't have these, please contact support@escenic.com
 #+END_SRC
@@ -370,7 +370,7 @@ monitoring the different nodes.
 
 ** Profile :: Restoring from backup
 ece-install can restore from a backup made by the ece script:
-#+BEGIN_SRC conf
+#+BEGIN_SRC text
 $ ece -i <instance> backup
 #+END_SRC
 
@@ -474,10 +474,8 @@ Your choice [1]>
 #+END_SRC
 
 The ece script mentioned above will create backups in
-#+BEGIN_SRC conf
-/var/backups/escenic
-#+END_SRC
-and the ece-install script will hence expect to find them here.
+~/var/backups/escenic~ and the ece-install script will hence expect to
+find them here.
 
 *** Choose What to Restore
 #+BEGIN_SRC text
@@ -511,7 +509,7 @@ restore from:
 | ~fai_restore_data_files~        |       0 | Restore the Solr & ECE data files                  |
 | ~fai_restore_configuration~     |       0 | Restore the Solr & ECE configuration files         |
 | ~fai_restore_software_binaries~ |       0 | Restore the Escenic and Apache Tomcat software     |
-| ~fai_restore_from_file~         |      "" | The .tar.gz produced by "ece -i <instance> backup" |
+| ~fai_restore_from_file~         |      "" | The .tar.gz produced by ~ece -i <instance> backup~ |
 |---------------------------------+---------+----------------------------------------------------|
 
 For example, to restore everything possible from a given tarball, you
@@ -552,12 +550,12 @@ fai_editor_install
 
 When running in FAI mode, you probably want to redirect standard
 output to a log file for easy reading later on:
-#+BEGIN_SRC conf
+#+BEGIN_SRC text
 # bash ece-install > ece-install.out &
 #+END_SRC
 
 Alternatively, you may do:
-#+BEGIN_SRC conf
+#+BEGIN_SRC text
 # nohup bash ece-install > ece-install.out &
 #+END_SRC
 The "nohup" at the beginning and the ampersand at the end lets you log
@@ -570,7 +568,7 @@ configuration archive instead of using the files provided with the
 Escenic Content Engine & plugins.
 
 The EAR to provide is the one you generate with:
-#+BEGIN_SRC conf
+#+BEGIN_SRC text
 $ ece -i <instance> assemble 
 #+END_SRC
 Normally, the EAR will then be available in:
@@ -579,7 +577,7 @@ Normally, the EAR will then be available in:
 #+END_SRC
 
 The configuration bundle must contain:
-#+BEGIN_SRC fundamental
+#+BEGIN_SRC text
 engine/security
 engine/siteconfig/bootstrap-skeleton
 engine/siteconfig/config-skeleton
@@ -587,14 +585,14 @@ assemblytool/plugins/<plugin>/siteconfig
 #+END_SRC
 
 and optionally also:
-#+BEGIN_SRC fundamental
+#+BEGIN_SRC text
 engine/solr/conf
 #+END_SRC
 
 A simple way to create this bundle, is to use a server which has the
 assembly environment set up and then do:
 
-#+BEGIN_SRC conf
+#+BEGIN_SRC text
 $ cd /opt/escenic
 $ tar czf /tmp/nursery-skeleton-solr-and-security.tar.gz \
   engine/security \
@@ -804,7 +802,7 @@ whereas the second one needs to override these.
 
 ** Verifying That the Script Is Running In FAI Mode
 When FAI is enabled, ece-install will report:
-#+BEGIN_SRC conf
+#+BEGIN_SRC text
 [ece-install] Full Automatic Install (FAI) enabled.
 [ece-install] All user input will be read from /root/ece-install.conf
 #+END_SRC
@@ -812,7 +810,7 @@ When FAI is enabled, ece-install will report:
 * Running More Than One Installation Process
 If the script believes there's already an ece-intall process running,
 it will abort:
-#+BEGIN_SRC fundamental
+#+BEGIN_SRC text
 [ece-install] There's already one ece-install process running. If you believe
 [ece-install] this is wrong, e.g. if a previous run of ece-install was aborted
 [ece-install] before it completed, you may delete /var/run/ece-install.pid and
@@ -849,7 +847,7 @@ bundle, see the FAI section.
 
 * Using a Custom Configuration File for ece-install
 You can specify a different configuration by using the -f parameter: 
-#+BEGIN_SRC conf
+#+BEGIN_SRC text
 $ ece-install -f ece-install-presentation-server.conf
 #+END_SRC
 
@@ -857,35 +855,35 @@ $ ece-install -f ece-install-presentation-server.conf
 There are of course other paths involved when setting up your system,
 but these should be the most interesting ones.
 
-|---------------------------------------------+------------------------------------------------------------------|
-| Path                                        | Explanation                                                      |
-|---------------------------------------------+------------------------------------------------------------------|
-| /etc/apt/sources.list.d/escenic.list        | 3rd party APT repositories added by ece-install *)               |
-| /etc/default/ece                            | The configuration file for the ece init.d script                 |
-| /etc/escenic/ece-<instance>.conf            | Instance specific settings for /usr/bin/ece                      |
-| /etc/escenic/ece.conf                       | Common ece.conf file for /usr/bin/ece                            |
-| /etc/escenic/engine/common                  | Common Nursery configuration layer                               |
-| /etc/escenic/engine/common/security         | Common security configuration for all ECE instances.             |
-| /etc/escenic/engine/common/trace.properties | Log4j configuration, produces instance specific log files.       |
-| /etc/escenic/engine/instance/<instance>     | Instance specific Nursery configuration                          |
-| /etc/escenic/solr                           | ECE specific Solr configuration                                  |
-| /etc/init.d/mysql[d]                        | For starting and stopping MySQL/Percona                          |
-| /etc/init.d/varnish                         | For starting and stopping Varnish                                |
-| /etc/intit.d/ece                            | The init.d script managing _all_ the ECE instances on your host. |
-| /etc/varnish/default.vcl                    | The Varnish configuration                                        |
-| /opt/escenic                                | All ECE components can be found here                             |
-| /opt/escenic/assemblytool                   | The assembly tool                                                |
-| /opt/escenic/assemblytool/plugins           | Contains symlinks to all plugins in /opt/escenic                 |
-| /opt/escenic/engine                         | Symlink pointing to the current ECE                              |
-| /opt/tomcat                                 | Symlink pointing to the install Apache Tomcat (catalina_home)   |
-| /opt/tomcat-<instance>                      | Instance specific Tomcat files (catalina_base)                  |
-| /usr/bin/ece                                | Script for operating all ECE instances + RMI hub and EAE         |
-| /usr/sbin/ece-install                       | The installation script described in this guide                  |
-| /var/log/escenic/<type>-<instance>.log      | The instance's log4j  log                                        |
-| /var/log/escenic/<type>-<instance>.out      | The instance system out log                                      |
-| /var/log/escenic/solr.<date>.log            | The Solr log (not in standard out!)                              |
-| /var/run/escenic/<type>-<instance>.pid      | The instance's  PID file                                         |
-|---------------------------------------------+------------------------------------------------------------------|
+|-----------------------------------------------+------------------------------------------------------------------|
+| Path                                          | Explanation                                                      |
+|-----------------------------------------------+------------------------------------------------------------------|
+| ~/etc/apt/sources.list.d/escenic.list~        | 3rd party APT repositories added by ece-install *)               |
+| ~/etc/default/ece~                            | The configuration file for the ece init.d script                 |
+| ~/etc/escenic/ece-<instance>.conf~            | Instance specific settings for ~/usr/bin/ece~                    |
+| ~/etc/escenic/ece.conf~                       | Common ece.conf file for ~/usr/bin/ece~                          |
+| ~/etc/escenic/engine/common~                  | Common Nursery configuration layer                               |
+| ~/etc/escenic/engine/common/security~         | Common security configuration for all ECE instances.             |
+| ~/etc/escenic/engine/common/trace.properties~ | Log4j configuration, produces instance specific log files.       |
+| ~/etc/escenic/engine/instance/<instance>~     | Instance specific Nursery configuration                          |
+| ~/etc/escenic/solr~                           | ECE specific Solr configuration                                  |
+| ~/etc/init.d/mysql[d]~                        | For starting and stopping MySQL/Percona                          |
+| ~/etc/init.d/varnish~                         | For starting and stopping Varnish                                |
+| ~/etc/intit.d/ece~                            | The init.d script managing _all_ the ECE instances on your host. |
+| ~/etc/varnish/default.vcl~                    | The Varnish configuration                                        |
+| ~/opt/escenic~                                | All ECE components can be found here                             |
+| ~/opt/escenic/assemblytool~                   | The assembly tool                                                |
+| ~/opt/escenic/assemblytool/plugins~           | Contains symlinks to all plugins in ~/opt/escenic~               |
+| ~/opt/escenic/engine~                         | Symlink pointing to the current ECE                              |
+| ~/opt/tomcat~                                 | Symlink pointing to the install Apache Tomcat (~catalina_home~)  |
+| ~/opt/tomcat-<instance>~                      | Instance specific Tomcat files (~catalina_base~)                 |
+| ~/usr/bin/ece~                                | Script for operating all ECE instances + RMI hub and EAE         |
+| ~/usr/sbin/ece-install~                       | The installation script described in this guide                  |
+| ~/var/log/escenic/<type>-<instance>.log~      | The instance's log4j log                                         |
+| ~/var/log/escenic/<type>-<instance>.out~      | The instance system out log                                      |
+| ~/var/log/escenic/solr.<date>.log~            | The Solr log (not in standard out!)                              |
+| ~/var/run/escenic/<type>-<instance>.pid~      | The instance's  PID file                                         |
+|-----------------------------------------------+------------------------------------------------------------------|
 
 *) Applies only to Debian based systems.
 
@@ -918,13 +916,13 @@ ece-install  has a number of hooks on which you can hook on your own
 scripts. The scripts are to reside in $HOME/ece-conf.d/ and have names
 inspired by Debian's package scripts:
 
-#+BEGIN_SRC conf
+#+BEGIN_SRC text
 <hook name>.<phase>
 #+END_SRC
 
 e.g.:
 
-#+BEGIN_SRC conf
+#+BEGIN_SRC text
 install_analysis_server.preinst
 #+END_SRC
 
@@ -952,7 +950,7 @@ echo "Hello from $0, EAE is installed in ${tomcat_base}" > /tmp/hello.txt
 ** Available hooks
 Currently, the following hooks are available:
 
-#+BEGIN_SRC fundamental
+#+BEGIN_SRC text
 install_analysis_server.preinst
 install_analysis_server.postinst
 set_up_solr.preinst
@@ -996,7 +994,7 @@ fai_presentation_install=1
 #+END_SRC
 
 The output will be similar to:
-#+BEGIN_SRC fundamental
+#+BEGIN_SRC text
 [ece-install-5] You have set fai_un_install_everything=1 in your /root/ece-install.conf
 [ece-install-5] This will uninstall the following on raven:
 [ece-install-5] Packages to be removed: ant ant-contrib ant-optional escenic-content-engine-scripts escenic-munin-plugins escenic-munin-plugins libmysql-java maven2 memcached munin munin-node munin-plugins-extra munin-java-extra nginx percona-server-client percona-server-client-5.5 percona-server-common-5.5 percona-server-server percona-server-server-5.5 varnish sun-java6-jdk

From 8e909c0b044c0aca11cf27261b4b4c42a7e024a0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 9 Aug 2012 10:48:35 +0200
Subject: [PATCH 1162/2585] - changed colouring from sh to text for all shell
 in and output boxes,   it just looks better.

---
 usr/share/doc/escenic/ece-guide.org | 96 ++++++++++++++---------------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/usr/share/doc/escenic/ece-guide.org b/usr/share/doc/escenic/ece-guide.org
index fc31f761..8a97aa4c 100644
--- a/usr/share/doc/escenic/ece-guide.org
+++ b/usr/share/doc/escenic/ece-guide.org
@@ -8,7 +8,7 @@ turned on BASH completion per default).
 ** Completing ece commands
 You will find yourself using this regularly, both for speed, but also
 to remember all the different options and their correct wording:
-#+BEGIN_SRC sh
+#+BEGIN_SRC text
 $ ece TAB TAB
 applog      deploy      log         start       threaddump  
 assemble    help        outlog      status      update      
@@ -17,7 +17,7 @@ clean       kill        restart     stop        versions
 The commands are all described in detail in "ece help"
 
 ** Completing types of servers the ece scripts can operate on
-#+BEGIN_SRC sh
+#+BEGIN_SRC text
 $ ece -t TAB TAB
 analysis  engine    rmi-hub   search 
 #+END_SRC
@@ -28,13 +28,13 @@ publication.
 
 To help selecting the correct publication resource, you can make ece
 list and complete the available resource names:
-#+BEGIN_SRC sh
+#+BEGIN_SRC text
 $ ece -p mypub -r TAB TAB
 content-type   image-version  layout-group   
 feature        layout         menu
 #+END_SRC
 * Getting an overview of all available options
-#+BEGIN_SRC sh
+#+BEGIN_SRC text
 $ ece help
 Usage: /home/torstein/bin/ece [-t <type>] [-i <instance>] <command>
 
@@ -89,7 +89,7 @@ going on on your system.
 ** Getting an overview of the log files
 The ece script will be more than happy to tell you about the log files
 on your system that are of interest to your instance:
-#+BEGIN_SRC sh
+#+BEGIN_SRC text
 $ ece -i dev1 loglist
 [ece#engine-dev1] System out log: /var/log/escenic/engine-dev1.out
 [ece#engine-dev1] App server log: /opt/tomcat-dev1/logs/localhost.2011-09-20.log
@@ -102,7 +102,7 @@ tailing the log file, ece will also first print out where the file is
 located on the file system so you can open it later for further
 inspection. 
 
-#+BEGIN_SRC sh
+#+BEGIN_SRC text
 $ ece -i dev1 outlog
 [ece#engine-dev1] Tailing the system out log /var/log/escenic/engine-dev1.out
 #+END_SRC
@@ -116,25 +116,25 @@ The available log file commands are:
 If you wish to pass the log files onto another pipe, for instance to
 grep all the log files for a certain exception or error message, you
 will find the -q parameter useful:
-#+BEGIN_SRC sh
+#+BEGIN_SRC text
 $ ece -i dev1 -q loglist | xargs grep IllegalArgumentException
 #+END_SRC
 
 This approach is also useful if you wish to tail all the log files at
 once: 
-#+BEGIN_SRC sh
+#+BEGIN_SRC text
 $ ece -i dev1 -q loglist | xargs tail -f
 #+END_SRC
 
 * Assembling a new EAR
 The script will quite happily assemble your EAR file. Please note that
 you need to run 
-#+BEGIN_SRC sh
+#+BEGIN_SRC text
 $ ece -i clean assemble
 #+END_SRC
 whenever you've upgraded either ECE or one of its plugins. The script
 will try to take care of you though and warn you of such duplication:
-#+BEGIN_SRC sh
+#+BEGIN_SRC text
 [ece#engine] Multiple versions of ECE and/or 3rd party libraries found.
 [ece#engine] Remember, you need to run 'ece clean assemble' when
 [ece#engine] upgrading either ECE or one of the plugins.
@@ -146,12 +146,12 @@ will try to take care of you though and warn you of such duplication:
 If you're just re-running the assembly after just adding a new plugin
 or want to re-build your publications after template changes, you can
 omit the clean command and just run:
-#+BEGIN_SRC sh
+#+BEGIN_SRC text
 $ ece assembly
 #+END_SRC
 
 The EAR produced is now ready to be deployed with
-#+BEGIN_SRC sh
+#+BEGIN_SRC text
 $ ece [-i <instance>] deploy
 #+END_SRC
 
@@ -159,14 +159,14 @@ $ ece [-i <instance>] deploy
 ece will default wise attempt to deploy the EAR which "ece assemble"
 produces and resides in:
 
-#+BEGIN_SRC sh
+#+BEGIN_SRC text
 /var/cache/escenic/engine.ear
 #+END_SRC
 
 It is also possible to deploy an EAR directly from a local or remote
 URI. This is especially useful where you have a build server and you
 want the ECEs deploy this EAR directly, you can then do:
-#+BEGIN_SRC sh
+#+BEGIN_SRC text
 $ ece -i myinstance deploy --uri http://my.build.server.com/engine-mysite.com-2.314.ear
 #+END_SRC
 
@@ -177,14 +177,14 @@ The following URIs are supported:
 
 It is also possible to deploy a local file without the URI protocol
 prefix using the -f (file) parameter:
-#+BEGIN_SRC sh
+#+BEGIN_SRC text
 $ ece -i myinstance deploy -f /tmp/engine-mysite.com-2.314.ear
 #+END_SRC
 
 The URI of the EAR file is completely up to you, but if use the
 pattern
-#+BEGIN_SRC sh
-  engine-<a string>-<a number>.ear
+#+BEGIN_SRC text
+engine-<a string>-<a number>.ear
 #+END_SRC
 ece will understand this as version: mysite.com-2.314 and write this
 to its deployment state file: /var/lib/escenic/<instance>.state, which
@@ -194,7 +194,7 @@ again will be reported by the "ece info" command.
 It's easy to update the publication resources using the ece script. If
 you have all these publication resources in your current directory,
 you can update them just by:
-#+BEGIN_SRC sh
+#+BEGIN_SRC text
 $ for el in layout* feature teaser-type content-type ; do 
   ece -i myinstance -p mypub -r $el update; 
 done  
@@ -202,14 +202,14 @@ done
 
 In this connection, it might be of your interest to also flush all the
 ECE caches on all the instances, this you can easily do with:
-#+BEGIN_SRC sh
+#+BEGIN_SRC text
 $ ece -i myinstance flush
 #+END_SRC
 
 * Getting information about the ECE instance
 The "ece info" command will give you a lot of useful information about
 the current instance:
-#+BEGIN_SRC sh
+#+BEGIN_SRC text
 $ ece -i web1 info
 [ece#engine-web1] Current instance: web1
 [ece#engine-web1] Instances available on myhost: web1
@@ -253,15 +253,15 @@ has a fairly recent version of BASH installed.
 ** Overview of File Paths Used by the ece script
 These are recommended files and locations for using the ece script:
 
-|----------------------------------+----------------------------------|
-| Path                             | Explanation                      |
-|----------------------------------+----------------------------------|
-| /usr/bin/ece                     | The script itself                |
-| /etc/escenic/ece.conf            | The main configuration file      |
-| /etc/escenic/ece-<instance>.conf | Instance specific settings       |
-| /var/cache/escenic               | Directory of assembled EAR files |
-| /tmp                             | Directory for temporary files    |
-|----------------------------------+----------------------------------|
+|------------------------------------+----------------------------------|
+| Path                               | Explanation                      |
+|------------------------------------+----------------------------------|
+| ~/usr/bin/ece~                     | The script itself                |
+| ~/etc/escenic/ece.conf~            | The main configuration file      |
+| ~/etc/escenic/ece-<instance>.conf~ | Instance specific settings       |
+| ~/var/cache/escenic~               | Directory of assembled EAR files |
+| ~/tmp~                             | Directory for temporary files    |
+|------------------------------------+----------------------------------|
 
 As you can see in ece.conf, there are a number of default locations
 dealing with log files, pid files, crash files as well as application
@@ -273,16 +273,16 @@ that the ece script has preset list of locations where it looks for
 the .conf files mentioned above, namely:
 
 - current working directory
-- /etc/escenic/<type>/instance/<instance name>
-- /etc/escenic/<type>/host/<hostname>
-- /etc/escenic/<type>/common
-- /etc/escenic/<type>
-- /etc/escenic
-- <current working direcotry>/../etc
+- ~/etc/escenic/<type>/instance/<instance name>~
+- ~/etc/escenic/<type>/host/<hostname>~
+- ~/etc/escenic/<type>/common~
+- ~/etc/escenic/<type>~
+- ~/etc/escenic~
+- ~<current working direcotry>/../etc~
 
 You may override this list of locations by setting the
-this environment variable in your .bashrc or similar:
-#+BEGIN_SRC sh
+this environment variable in your ~.bashrc~ or similar:
+#+BEGIN_SRC text
 ECE_CONF_LOCATIONS 
 #+END_SRC
 
@@ -295,7 +295,7 @@ over time :-)
 ** You must run it as a non-privileged user
 You must be normal user to run the ece script, otherwise it will
 complain:
-#+BEGIN_SRC sh
+#+BEGIN_SRC text
 [ece#engine] Sorry, you cannot be root when running ece
 [ece#engine] The root user can only use /etc/init.d/ece
 #+END_SRC
@@ -308,13 +308,13 @@ The script is made for being easy to use with multiple instances on
 the same host. You specify the instance you want to operate on using
 the -i parameter. E.g. to assemble and deploy the editor1 instance, you'd
 do:
-#+BEGIN_SRC sh
+#+BEGIN_SRC text
 $ ece -i editor1 assemble deploy restart
 #+END_SRC
 
 The script's TAB completion will also help you with completing the
 available instances on your system, so you can just type:
-#+BEGIN_SRC sh
+#+BEGIN_SRC text
 $ ece -i TAB TAB
 mypub myotherpub
 #+END_SRC
@@ -333,18 +333,18 @@ only one instance was installed.
 ** TAB completion
 The ece script offers TAB completion of all commands, options and
 option values. For this to work, you need the completion file loaded
-from your .bashrc. 
+from your ~.bashrc~. 
 
 This can either be done by enabling all BASH completions on your
 system (some systems have this set up per default), refer to your OS
 documentation for this.
 
 Alternatively, to just enable the ece completion, simply add the
-following line to your .bashrc:
-#+BEGIN_SRC sh
+following line to your ~.bashrc~:
+#+BEGIN_SRC text
 . /etc/bash_completion.d/ece
 #+END_SRC
-Naturally, the bash_comletion.d needs to be in the above location :-)
+Naturally, the ~bash_comletion.d~ needs to be in the above location :-)
 * Backup
 One of the many features of the ece script, is that you can take a
 snapshot of your current running system, which can then be restored
@@ -356,12 +356,12 @@ all the Escenic software binaries, your publication and your
 application servers.
 
 To create the backup, you'll simply do:
-#+BEGIN_SRC sh
+#+BEGIN_SRC text
 $ ece -i editor1 backup
 #+END_SRC
 
 It will then create tarball with everything and put it in 
-#+BEGIN_SRC sh
+#+BEGIN_SRC text
 /var/backups/escenic
 #+END_SRC
 
@@ -369,14 +369,14 @@ Sometimes, you only want to take a backup of the data files and are
 not so concerned with the Escenic and application server binaries as
 these are easily installed from elsewhere. If so, you may do the
 following:
-#+BEGIN_SRC sh
+#+BEGIN_SRC text
 $ ece -i editor1 backup --exclude-binaries
 #+END_SRC
 
 When running in a production environment, it's advised to first stop
 the search instance which runs the Solr indexer, so that the Solr
 index isn't corrupted:
-#+BEGIN_SRC sh
+#+BEGIN_SRC text
 $ ece -i search1 stop
 $ ece -i editor1 backup
 #+END_SRC

From 0cbcc151d51ddd107a43e26c9e81cfde4c2cdcf8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 9 Aug 2012 11:02:21 +0200
Subject: [PATCH 1163/2585] - added verbs to the import & journalist actions

---
 usr/share/doc/vizrt/vosa-handbook/create-handbook.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 2056a6d1..aa315b90 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -158,10 +158,12 @@ function get_blockdiag_call_flow() {
   echo " " ${lb_call_flow} | sed 's/,$/;/g'
   
   if [ -n "$trail_editor_host" ]; then
-    echo "  journalist -> $trail_editor_host;"
+    echo "  journalist -> $trail_editor_host" \
+      '[ label = "writes" ];'
   fi
   if [ -n "$trail_import_host" ]; then
-    echo "  import-feeds -> $trail_import_host;"
+    echo "  xml-feeds -> $trail_import_host" \
+      '[ label = "imports" ];'
   fi
   
   # ECEs

From 8459792d22bdd84b33f56584619af023023375e9 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 9 Aug 2012 11:26:26 +0200
Subject: [PATCH 1164/2585] - hosts on amazonaws.com will not get the
 trail_network_name   appended. The primary use case for this, is RDS.

- the user can specify other hosts (or partial hosts, this is all sub
  string matching) which are outside the network and thus shouldn't
  get the network name appended with:

    trail_host_name_list_outside_network="
      pres1.rackspace.com
      pres2.linode.com
    "
---
 .../doc/vizrt/vosa-handbook/create-handbook.sh   | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index aa315b90..4dc1860c 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -34,6 +34,10 @@ function set_customer_specific_variables() {
   local conf_file=$(basename $0 .sh).conf
   if [ -r $conf_file  ]; then
     source $conf_file
+    host_name_list_outside_network="
+      $host_name_list_outside_network
+      ${trail_host_name_list_outside_network}
+    "
   else
     echo "No ${conf_file} found, I'm making something up ..."
     trail_presentation_host=pres1
@@ -257,8 +261,20 @@ function get_network_name() {
   fi
 }
 
+host_name_list_outside_network="
+  amazonaws.com
+"
+
 ## $1 :; the host (not FQDN)
 function get_fqdn() {
+  for el in $host_name_list_outside_network; do
+    echo "el=$el" >> /tmp/t
+    if [ $(echo $1 | grep $el | wc -l) -gt 0 ]; then
+      echo "$1"
+      return
+    fi
+  done
+  
   echo "${1}$(get_network_name)"
 }
 

From 0a2cf66b20c645d65257e5168a5f61eb077bae63 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 9 Aug 2012 11:56:27 +0200
Subject: [PATCH 1165/2585] - removing the grouping of nodes solves more
 problems that what it   fixes/fixed.

---
 usr/share/doc/vizrt/vosa-handbook/create-handbook.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 4dc1860c..c0889e3c 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -236,8 +236,6 @@ blockdiag {
   internet [ shape = "cloud" ];
 $(get_blockdiag_defs)
 
-$(get_blockdiag_groups)
-
 $(get_blockdiag_call_flow)
 }
 EOF

From b62a3dc5d9cc9ed3704ff42667180874a1eba097 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 9 Aug 2012 13:01:58 +0200
Subject: [PATCH 1166/2585] - added trail_backend_servers

---
 usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
index 77b3714b..298c201e 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
@@ -218,4 +218,5 @@ EOF
 function leave_cache_trails() {
   leave_trail "trail_cache_host=${HOSTNAME}"
   leave_trail "trail_cache_port=${cache_port}"
+  leave_trail "trail_backend_servers=$backend_servers"
 }

From 901b63e127a37fcdab97972f2094bce478ecc62f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 9 Aug 2012 13:03:39 +0200
Subject: [PATCH 1167/2585] - added cache-server chapter - added automatic
 generation of parts of the cache server - added automatic generation of cache
 server architecture diagram

  to test, you can use these trails:

  trail_cache_host=pres1
  trail_cache_port=80
  trail_cache_backend_servers="pres7:8080 pres8:8080 pres9:7766"

  just using trail_cache_host gives a good default diagram.
---
 .../doc/vizrt/vosa-handbook/cache-server.org  | 42 +++++++++++++++
 .../vizrt/vosa-handbook/create-handbook.sh    | 51 +++++++++++++++++--
 .../doc/vizrt/vosa-handbook/vosa-handbook.org |  1 +
 3 files changed, 91 insertions(+), 3 deletions(-)
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/cache-server.org

diff --git a/usr/share/doc/vizrt/vosa-handbook/cache-server.org b/usr/share/doc/vizrt/vosa-handbook/cache-server.org
new file mode 100644
index 00000000..d6b5c666
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/cache-server.org
@@ -0,0 +1,42 @@
+* Cache server
+
+The habitat uses Varnish caching servers. Caching servers are
+sometimes referred to as reverse proxies (as opposed to normal proxies
+such as Squid, which cache an office's web site traffic Squid) 
+
+The Varnish caches are set up to do several tasks to make your web
+site really fast and secure.
+
+** Caching
+This is the obvious task of any caching server and per default, the
+Varnish caches will cache static content like pictures, flash, CSS and
+JS for you.
+
+** Security
+The Varnish caches are set up to protect the following services in
+your habitat:
+
+|----------------+------------------------------------|
+| URI            | What                               |
+|----------------+------------------------------------|
+| /escenic       | Web Studio                         |
+| /escenic-admin | Escenic Admin                      |
+| /studio        | Content Studio                     |
+| /webservice    | Escenic Content Engine Web service |
+| /munin         | The Munin overview                 |
+| /binary        | The Adactus access point           |
+|----------------+------------------------------------|
+
+** Useful features for debugging
+Varnish in your habitat will add the following HTTP headers to add you
+in your debugging of the web site:
+
+|------------------------+--------------------------------------------------------------------------------------|
+| Example                | Explanation                                                                          |
+|------------------------+--------------------------------------------------------------------------------------|
+| X-Cache-Backend: pres2 | Which backend the cache used                                                         |
+| X-Cache: HIT #68/80s   | If the requested URI's content was found in cache, and how old it has been in cache. |
+|------------------------+--------------------------------------------------------------------------------------|
+
+
+#+INCLUDE: "generated-cache-server.org"
diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index c0889e3c..eab4d065 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -230,10 +230,10 @@ function generate_architecture_diagram() {
   cat > $file <<EOF
 # generated by $(basename $0) @ $(date)
 blockdiag {
- orientation = portrait;
- journalist [ shape = "actor" ];
-
+  orientation = "portrait";
+  journalist [ shape = "actor" ];
   internet [ shape = "cloud" ];
+
 $(get_blockdiag_defs)
 
 $(get_blockdiag_call_flow)
@@ -380,10 +380,55 @@ $(get_generated_overview)
 EOF
 }
 
+function generate_cache_server_diagram() {
+  # first the graphics
+  local file=$target_dir/graphics/${trail_cache_host}-cache.blockdiag
+  if [ -z "$trail_cache_host" ]; then
+    return
+  fi
+  
+  cat > $file <<EOF
+# Cache server on $trail_cache_host generated by $(basename $0) @ $(date)
+blockdiag {
+EOF
+
+  if [ -n "$trail_cache_backend_servers" ]; then
+    for el in $trail_cache_backend_servers; do
+      local appserver_host=$(echo $el | cut -d':' -f1)
+      local appserver_port=$(echo $el | cut -d':' -f2)
+      cat >> $file <<EOF
+  varnish -> "${appserver_host}:${appserver_port}";
+EOF
+    done
+  else
+    cat >> $file <<EOF
+  varnish -> "tomcat:8080";
+EOF
+  fi
+  echo "}" >> $file
+
+}
+
+## included from cache-server.org
+function generate_cache_server_org() {
+  generate_cache_server_diagram
+  local file=$target_dir/generated-cache-server.org
+  cat > $file <<EOF
+** Cache server on $trail_cache_host
+
+The cache server on $trail_cache_host is available on
+$(get_link ${trail_cache_host}):${trail_cache_port-80}
+
+#+ATTR_HTML: alt="Cache server on $trail_cache_host"
+[[[[graphics/${trail_cache_host}-cache.svg]]
+EOF
+}
+
 set_up_build_directory
 set_customer_specific_variables
 generate_architecture_diagram
 generate_svg_from_blockdiag
 generate_overview_org
+generate_cache_server_org
 generate_html_from_org
 
diff --git a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
index 64f15557..6028bd78 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
+++ b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
@@ -6,6 +6,7 @@
 #+INCLUDE: "operating-system-maintenance.org" 
 #+INCLUDE: "deployment.org"
 #+INCLUDE: "updating-the-search-server.org"
+#+INCLUDE: "cache-server.org"
 #+INCLUDE: "backups.org"
 #+INCLUDE: "monitoring.org"
 #+INCLUDE: "glossary.org"

From 58081408344001ead95e4b38522d535ef07fd1e0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 9 Aug 2012 13:11:42 +0200
Subject: [PATCH 1168/2585] - now generate the SVGs at the end

---
 usr/share/doc/vizrt/vosa-handbook/create-handbook.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index eab4d065..d5e844e4 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -427,8 +427,8 @@ EOF
 set_up_build_directory
 set_customer_specific_variables
 generate_architecture_diagram
-generate_svg_from_blockdiag
 generate_overview_org
 generate_cache_server_org
 generate_html_from_org
+generate_svg_from_blockdiag
 

From cc4fb6882492ad8e7f851394f62e88ce46ef01ca Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 9 Aug 2012 14:21:59 +0200
Subject: [PATCH 1169/2585] - added trail_db_daily_backup_host

---
 usr/share/escenic/ece-scripts/ece-install.d/database.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index c9b17005..81d60158 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -585,4 +585,6 @@ EOF
 
   run chmod 700 $file
   add_next_step "Daily backup of the $db_schema DB is provided by $file"
+
+  leave_trail "trail_db_daily_backup_host=${HOSTNAME}"
 }

From e62c89234f8607ddb54b69196636af130c256283 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 9 Aug 2012 14:42:14 +0200
Subject: [PATCH 1170/2585] - fixed a wee doc bug in the RedHat upgrade section

---
 .../doc/vizrt/vosa-handbook/operating-system-maintenance.org    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/operating-system-maintenance.org b/usr/share/doc/vizrt/vosa-handbook/operating-system-maintenance.org
index a03e1ba7..4b9b00c2 100644
--- a/usr/share/doc/vizrt/vosa-handbook/operating-system-maintenance.org
+++ b/usr/share/doc/vizrt/vosa-handbook/operating-system-maintenance.org
@@ -39,6 +39,6 @@ my-control-server.
 #+BEGIN_SRC sh
 $ for el in my-presentation-server my-editorial-server my-import-server my-monitoring-server my-stats-server; do \
       echo "Now upgrading $el";
-      ssh yum update; 
+      ssh $el yum update; 
   done
 #+END_SRC

From b938531df19c23c9752b5670406f34ea1eeba2ed Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 9 Aug 2012 15:07:38 +0200
Subject: [PATCH 1171/2585] - changed to use JSP & Ruby style variable
 substition

---
 usr/share/doc/vizrt/vosa-handbook/backups.org |  8 +--
 .../vizrt/vosa-handbook/create-handbook.sh    | 17 +++++--
 .../doc/vizrt/vosa-handbook/database.org      |  4 ++
 .../doc/vizrt/vosa-handbook/deployment.org    | 50 +++++++++----------
 .../doc/vizrt/vosa-handbook/monitoring.org    | 28 ++++++-----
 .../operating-system-maintenance.org          | 28 ++++++++---
 .../updating-the-search-server.org            |  8 +--
 .../doc/vizrt/vosa-handbook/vosa-handbook.org |  2 +-
 .../ece-scripts/ece-install.d/database.sh     |  4 ++
 9 files changed, 92 insertions(+), 57 deletions(-)
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/database.org

diff --git a/usr/share/doc/vizrt/vosa-handbook/backups.org b/usr/share/doc/vizrt/vosa-handbook/backups.org
index 8044f4bb..1d9e73f8 100644
--- a/usr/share/doc/vizrt/vosa-handbook/backups.org
+++ b/usr/share/doc/vizrt/vosa-handbook/backups.org
@@ -2,12 +2,12 @@
 
 ** DB backups
 If you've told ece-install to set up daily backups, there will be a
-cron scripts set up which create backups.
+cron scripts set up which create backups. 
 
 Part of the name of the cron script is the name of your DB schema, so
-the default location of the cron script is:
+the default location of the cron script on <%= my-db-backup-host %> is:
 #+BEGIN_SRC sh
-/etc/cron.daily/my-db-backup  
+/etc/cron.daily/<%= my-db %>-backup  
 #+END_SRC
 
 And it'll put its backups in
@@ -25,7 +25,7 @@ nfs2) and a backup of the exports directory  should suffice. This is
 the directory in which all the NFS exported directories reside.
 
 #+BEGIN_SRC sh
-my-nfs-server:/var/exports  
+<%= my-nfs-server %>:/var/exports  
 #+END_SRC
 
 It's recommended that the backup isn't done using the NFS mount on one
diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index d5e844e4..630bece5 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -66,19 +66,21 @@ function set_customer_specific_variables() {
 
   customer_filter_map="
     my-backup-dir~${trail_escenic_backups_dir}
-    my-network~$(get_network_name)
+    my-db-vendor~${trail_db_vendor-mysql}
     my-build-server~${trail_builder_host-builder}
     my-build-user~${trail_builder_user-buildy}
     my-control-server~${trail_control_host-control}
+    my-db-backup-host~${trail_db_daily_backup_host}
     my-db-server~${trail_db_master_host-db1}
     my-db~${trail_db_schema-mydb}
     my-editorial-server~${trail_editor_host-edit1}
     my-import-server~${trail_import_host-edit2}
     my-monitoring-server~${trail_monitoring_host-mon}
+    my-network~$(get_network_name)
     my-nfs-server~${trail_nfs_master_host-nfs1}
     my-presentation-server~${trail_presentation_host-pres1}
-    my-stats-server~${trail_analysis_host-analysis}
     my-publication~${first_publication}
+    my-stats-server~${trail_analysis_host-analysis}
     my-webapp~${first_publication}
     my-website~${first_website}
   "
@@ -87,8 +89,11 @@ function set_customer_specific_variables() {
     IFS='~'
     read from to <<< "$el"
     IFS=$old_ifs
+    if [ -z "$to" ]; then
+      continue
+    fi
     find $target_dir -name "*.org" | while read f; do
-      run sed -i "s~${from}~${to}~g" ${f}
+      run sed -i "s~<%=[ ]*${from}[ ]*%>~${to}~g" ${f}
     done
   done
 }
@@ -411,6 +416,12 @@ EOF
 
 ## included from cache-server.org
 function generate_cache_server_org() {
+  # if the trail_cache_host is not set, we assume the cache is running
+  # on (at least one o) the presentation servers.
+  if [ -z "$trail_cache_host" ]; then
+    trail_cache_host=$trail_presentation_host
+  fi
+
   generate_cache_server_diagram
   local file=$target_dir/generated-cache-server.org
   cat > $file <<EOF
diff --git a/usr/share/doc/vizrt/vosa-handbook/database.org b/usr/share/doc/vizrt/vosa-handbook/database.org
new file mode 100644
index 00000000..18e01d47
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/database.org
@@ -0,0 +1,4 @@
+* Database
+
+A <%= my-db-vendor %> DB has been installed in your habitat.
+
diff --git a/usr/share/doc/vizrt/vosa-handbook/deployment.org b/usr/share/doc/vizrt/vosa-handbook/deployment.org
index 577a7c82..cd29f17d 100644
--- a/usr/share/doc/vizrt/vosa-handbook/deployment.org
+++ b/usr/share/doc/vizrt/vosa-handbook/deployment.org
@@ -4,7 +4,7 @@ Log on to the build server as the user for the given habitat and run
 the build script:
 
 #+BEGIN_SRC sh
-$ ssh my-build-user@my-build-server
+$ ssh <%= my-build-user %>@<%= my-build-server %>
 $ ./build.sh release
 #+END_SRC
 
@@ -12,36 +12,36 @@ Once the build is done, the URI of the finished EAR file is printed in
 the shell. This is the URI you use for the 'ece deploy' command below.
 
 ** Deploying a new EAR file
-In the examples here, we have a build server on my-build-server
-where we build EARs for the the my-website website.
+In the examples here, we have a build server on <%= my-build-server %>
+where we build EARs for the the <%= my-website %> website.
 
 *** Deploying a new EAR file for an ECE instance
 All the commands in this section is written to be executed on
-my-control-server (but you could of course also first log on to each
+<%= my-control-server %> (but you could of course also first log on to each
 of the servers and run the commands locally there).
 
 #+BEGIN_SRC sh
-$ sudo ssh escenic@my-presentation-server ece -i engine1 --uri http://my-build-server/my-build-user/releases/my-build-user-trunk-rev4121-2012-07-05_1524.ear  deploy
-[ece#engine-engine1] Deploying http://my-build-server/my-build-user/releases/my-build-user-trunk-rev4121-2012-07-05_1524.ear on engine1 ...
-[ece#engine-engine1] Deploying /var/cache/escenic/my-build-user-trunk-rev4121-2012-07-05_1524.ear on tomcat ...
-[ece#engine-engine1] Deployment white list active, only deploying: my-webapp escenic-admin indexer-webservice
+$ sudo ssh escenic@<%= my-presentation-server %> ece -i engine1 --uri http://<%= my-build-server %>/<%= my-build-user %>/releases/<%= my-build-user %>-trunk-rev4121-2012-07-05_1524.ear deploy
+[ece#engine-engine1] Deploying http://<%= my-build-server %>/<%= my-build-user %>/releases/<%= my-build-user %>-trunk-rev4121-2012-07-05_1524.ear on engine1 ...
+[ece#engine-engine1] Deploying /var/cache/escenic/<%= my-build-user %>-trunk-rev4121-2012-07-05_1524.ear on tomcat ...
+[ece#engine-engine1] Deployment white list active, only deploying: <%= my-webapp %> escenic-admin indexer-webservice
 [ece#engine-engine1] Deployment state file updated: /var/lib/escenic/engine1.state
 #+END_SRC
 
 We can now restart the ECE:
 
 #+BEGIN_SRC sh
-$ sudo ssh root@my-presentation-server /etc/init.d/ece restart 
-[ece#engine-engine1] Stopping the engine1 instance of engine on my-presentation-server ...
-[ece#engine-engine1] Starting the engine1 instance of engine on my-presentation-server ...
-[ece#search-search1] Stopping the search1 instance of search on my-presentation-server ...
-[ece#search-search1] Starting the search1 instance of search on my-presentation-server ...
+$ sudo ssh root@<%= my-presentation-server %> /etc/init.d/ece restart 
+[ece#engine-engine1] Stopping the engine1 instance of engine on <%= my-presentation-server %>...
+[ece#engine-engine1] Starting the engine1 instance of engine on <%= my-presentation-server %>...
+[ece#search-search1] Stopping the search1 instance of search on <%= my-presentation-server %>...
+[ece#search-search1] Starting the search1 instance of search on <%= my-presentation-server %>...
 #+END_SRC
 
 To confirm see that the ECE instance came up again, do:
 
 #+BEGIN_SRC sh
-$ sudo ssh root@my-presentation-server /etc/init.d/ece status
+$ sudo ssh root@<%= my-presentation-server %> /etc/init.d/ece status
 [ece#engine-engine1] UP 0d 0h 11m 45s
 [ece#search-search1] UP 0d 0h 11m 42s
 #+END_SRC
@@ -53,9 +53,10 @@ the search instance has a different deployment white list than that of
 the ECE instance above.
 
 #+BEGIN_SRC sh
-torstein@control:~$ sudo ssh escenic@my-presentation-server ece -i search1 -t search --uri http://my-build-server/my-build-user/releases/my-builder-user-trunk-rev4121-2012-07-05_1524.ear deploy
-[ece#search-search1] Deploying http://my-build-server/my-build-user/releases/my-build-user-trunk-rev4121-2012-07-05_1524.ear on search1 ...
-[ece#search-search1] Deploying /var/cache/escenic/my-build-user-trunk-rev4121-2012-07-05_1524.ear on tomcat ...
+torstein@control:~$ sudo ssh escenic@<%= my-presentation-server %> ece
+-i search1 -t search --uri http://<%= my-build-server %>/<%= my-build-user %>/releases/<%= my-build-user %>-trunk-rev4121-2012-07-05_1524.ear deploy
+[ece#search-search1] Deploying http://<%= my-build-server %>/<%= my-build-user %>/releases/<%= my-build-user %>-trunk-rev4121-2012-07-05_1524.ear on search1 ...
+[ece#search-search1] Deploying /var/cache/escenic/<%= my-build-user %>-trunk-rev4121-2012-07-05_1524.ear on tomcat ...
 [ece#search-search1] Deployment white list active, only deploying: escenic-admin solr indexer-webapp
 [ece#search-search1] Deployment state file updated: /var/lib/escenic/search1.state  
 #+END_SRC
@@ -72,10 +73,10 @@ these as well (layout, layout-group, menu, community/security and so
 on).
 
 First, make sure you have already done the deployment on the
-my-presentation-server server. Login to one of the presentation
-servers. From my-control-server, do:
+<%= my-presentation-server %> server. Login to one of the presentation
+servers. From <%= my-control-server %>, do:
 #+BEGIN_SRC sh
-$ sudo ssh root@my-presentation-server  
+$ sudo ssh root@<%= my-presentation-server %>
 #+END_SRC
 
 Then, change to the user running the ECE user
@@ -88,14 +89,14 @@ of it.
 #+BEGIN_SRC sh
 $ mkdir ~/backup
 $ wget -O ~/backup/content-type-$(date --iso)-before-deployment \
-       http://localhost:8080/escenic-admin/publication-resources/my-publication/escenic/content-type
+       http://localhost:8080/escenic-admin/publication-resources/<%= my-publication %>/escenic/content-type
 #+END_SRC
 
 The next step is to locate the new content-type definition.  Go to the
 new new content-type from your latest deployment
 
 #+BEGIN_SRC sh
-$ cd /opt/tomcat-engine1/webapps/my-webapp/META-INF/escenic/publication-resources/escenic/
+$ cd /opt/tomcat-engine1/webapps/<%= my-webapp %>/META-INF/escenic/publication-resources/escenic/
 #+END_SRC
 
 Then, confirm the changes using diff:
@@ -107,17 +108,16 @@ Now, upload the new content-type to ECE.  The command below assumes
 that there is a file called the same as the publication resource in
 the current directory. 
 #+BEGIN_SRC sh
-$ ece -i engine1 -p my-publication -r content-type update
+$ ece -i engine1 -p <%= my-publication %> -r content-type update
 #+END_SRC
 
 To confirm our changes, we now download the resource again to check if
 all the changes are the way we want them:
 #+BEGIN_SRC sh
 $ wget -O ~/backup/content-type-$(date --iso)-after-deployment \
-       http://localhost:8080/escenic-admin/publication-resources/my-publication/escenic/content-type
+       http://localhost:8080/escenic-admin/publication-resources/<%= my-publication %>/escenic/content-type
 #+END_SRC
 
-
 Finally, run diff again to see that the changes are correct:
 #+BEGIN_SRC sh
 $ diff -w ~/backup/content-type-$(date --iso)-before-deployment \
diff --git a/usr/share/doc/vizrt/vosa-handbook/monitoring.org b/usr/share/doc/vizrt/vosa-handbook/monitoring.org
index 46c7b77d..eb8c0126 100644
--- a/usr/share/doc/vizrt/vosa-handbook/monitoring.org
+++ b/usr/share/doc/vizrt/vosa-handbook/monitoring.org
@@ -12,7 +12,7 @@ execute this command as root, you better pass a parameter to tell it
 the user under which ECE, EAE and the Search instance are running as
 (typically "escenic"):
 
-#+BEGIN_SRC sh
+#+BEGIN_SRC text
 # system-info -u escenic  
 #+END_SRC
 
@@ -20,7 +20,8 @@ the user under which ECE, EAE and the Search instance are running as
 All VOSA hosts also has a (maximum) one minute old HTML report from
 system-info running on port 5678. 
 
-Here's a screenshot of the system-info report running on http://my-presentation-server:5678/:
+Here's a screenshot of the system-info report running on
+http://<%= my-presentation-server %>:5678/:
 [[[[graphics/pres1-system-info.png]]
 
 ** Hugin
@@ -30,25 +31,28 @@ produce a system-info report in YAML and check the files into a
 version repository.
 
 When browsing the Hugin web interface at
-http://my-control-servermy-network:5679/ you can quickly see all changes on the
-various servers. A change could be a new service which is all of a
-sudden listening on a new port or that the version of a installed
-package has changed. Nothing escapes Hugin's watchful eyes! 
+http://<%= my-control-server %><%= my-network %>:5679/ you can quickly 
+see all changes on the various servers. A change could be a new
+service which is all of a sudden listening on a new port or that the
+version of a installed package has changed. Nothing escapes Hugin's
+watchful eyes!
  
 ** Munin
 Each VOSA habitat has its own Munin installation where you can see the
 trending of your site. I.e. how it has been behaving the last days,
 weeks and months.
 
-If we assume your monitoring server is called "my-monitoring-server",
-the address to your munin is: http://my-monitoring-servermy-network/munin/
+The address to your Munin instance is is:
+ http://<%= my-monitoring-server %><%= my-network %>/munin/
 
 ** Icinga (enhanced Nagios)
 Icinga gives a good overview of the current health of the
-habitat. Head over to http://my-monitoring-servermy-network/icinga/ to get
-updates on host & service uptimes and disk fill rates. This is also
-the place were you'll schedule any maintenance work you do to prevent
-unnecessary alerts filling up your mobile phone and email inboxes.
+habitat. Head over to
+ http://<%= my-monitoring-server %><%= my-network %>/icinga/ 
+to get updates on host & service uptimes and disk fill rates. This is
+also the place were you'll schedule any maintenance work you do to
+prevent unnecessary alerts filling up your mobile phone and email
+inboxes.
 
 ** Check MK
 
diff --git a/usr/share/doc/vizrt/vosa-handbook/operating-system-maintenance.org b/usr/share/doc/vizrt/vosa-handbook/operating-system-maintenance.org
index 4b9b00c2..e3518ac2 100644
--- a/usr/share/doc/vizrt/vosa-handbook/operating-system-maintenance.org
+++ b/usr/share/doc/vizrt/vosa-handbook/operating-system-maintenance.org
@@ -16,12 +16,18 @@ any issues before going ahead with the upgrades below.
 This applies to OSs like Debian, Ubuntu and Mint.
 
 In the example below, we update the Ubuntu servers called
-my-presentation-server my-editorial-server my-import-server
-my-monitoring-server my-stats-server from the comfort of
-my-control-server.
+<%= my-presentation-server%> <%= my-editorial-server %> <%= my-import-server %>
+<%= my-monitoring-server %> <%= my-stats-server %> from the comfort of
+<%= my-control-server %>.
 
 #+BEGIN_SRC sh
-$ for el in my-presentation-server my-editorial-server my-import-server my-monitoring-server my-stats-server; do \
+$ for el in \
+   <%= my-presentation-server %> \
+   <%= my-editorial-server %> \
+   <%= my-import-server %> \
+   <%= my-monitoring-server %> \
+   <%= my-stats-server %> \
+  ; do \
       echo "Now upgrading $el"; \
       sudo ssh root@$el 'apt-get -qq update && apt-get -q upgrade' ; \
   done
@@ -32,12 +38,18 @@ $ for el in my-presentation-server my-editorial-server my-import-server my-monit
 This applies to OSs like CentOS, RedHat and Fedora:
 
 In the example below, we update the RedHat servers called
-my-presentation-server my-editorial-server my-import-server
-my-monitoring-server my-stats-server from the comfort of
-my-control-server.
+<%= my-presentation-server%> <%= my-editorial-server %> <%= my-import-server %>
+<%= my-monitoring-server %> <%= my-stats-server %> from the comfort of
+<%= my-control-server %>:
 
 #+BEGIN_SRC sh
-$ for el in my-presentation-server my-editorial-server my-import-server my-monitoring-server my-stats-server; do \
+$ for el in \
+   <%= my-presentation-server %> \
+   <%= my-editorial-server %> \
+   <%= my-import-server %> \
+   <%= my-monitoring-server %> \
+   <%= my-stats-server %> \
+  ; do \
       echo "Now upgrading $el";
       ssh $el yum update; 
   done
diff --git a/usr/share/doc/vizrt/vosa-handbook/updating-the-search-server.org b/usr/share/doc/vizrt/vosa-handbook/updating-the-search-server.org
index 89acb0b2..b2d6adfb 100644
--- a/usr/share/doc/vizrt/vosa-handbook/updating-the-search-server.org
+++ b/usr/share/doc/vizrt/vosa-handbook/updating-the-search-server.org
@@ -6,11 +6,11 @@ this, you can use the Component Browser in the escenic-admin
 interface.
 
 For instance, let's say you're upgrading the search server for
-my-editorial-server and want it to temporarily use my-import-server's
-search instance.
+<%= my-editorial-server %> and want it to temporarily use
+<%= my-import-server %>'s search instance.
 
 First, go to:
-http://my-editorial-server:8080/escenic-admin/browser/Global/com/escenic/webservice/search/DelegatingSearchEngine?property=solrURI
+http://<%= my-editorial-server %>:8080/escenic-admin/browser/Global/com/escenic/webservice/search/DelegatingSearchEngine?property=solrURI
 
 Then, change the value from:
 #+BEGIN_SRC conf
@@ -20,5 +20,5 @@ http://localhost:8081/solr/select
 to
 
 #+BEGIN_SRC conf
-http://my-import-server:8081/solr/select	  
+http://<%= my-import-server %>:8081/solr/select	  
 #+END_SRC
diff --git a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
index 6028bd78..882063b0 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
+++ b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
@@ -1,11 +1,11 @@
 #+TITLE: Welcome to the VOSA Handbook
-#+AUTHOR: Erik Mogensen & Torstein Krause Johansen
 #+OPTIONS: toc:2 
 
 #+INCLUDE: "overview.org"
 #+INCLUDE: "operating-system-maintenance.org" 
 #+INCLUDE: "deployment.org"
 #+INCLUDE: "updating-the-search-server.org"
+#+INCLUDE: "database.org"
 #+INCLUDE: "cache-server.org"
 #+INCLUDE: "backups.org"
 #+INCLUDE: "monitoring.org"
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 81d60158..429d91a0 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -61,6 +61,8 @@ function set_up_percona_repository_if_possible() {
       add_apt_source "deb http://repo.percona.com/apt ${code_name} main"
       mysql_server_packages="percona-server-server"
       mysql_client_packages="percona-server-client"
+      
+      leave_trail "trail_db_vendor=percona"
     else
       print_and_log "The Percona APT repsository doesn't have packages"
       print_and_log "for your Debian (or derivative) version with code"
@@ -69,6 +71,8 @@ function set_up_percona_repository_if_possible() {
 
       mysql_server_packages="mysql-server libmysqlclient16"
       mysql_client_packages="mysql-client libmysqlclient16"
+      
+      leave_trail "trail_db_vendor=mysql"
     fi
   elif [ $on_redhat_or_derivative -eq 1 ]; then
     print_and_log "Settnig up the Percona repository ..."

From d284ce7bbea32ee7afe043739d2f7c6ee53e65f4 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 9 Aug 2012 17:11:01 +0200
Subject: [PATCH 1172/2585] - added new section on changing the DB master to
 the slave - added new section on changing the DB virtual IP - added support
 for tons of new trails

---
 .../vizrt/vosa-handbook/create-handbook.sh    | 56 ++++++++++-
 .../database-changing-master.org              | 92 +++++++++++++++++++
 .../vosa-handbook/database-changing-vip.org   | 33 +++++++
 .../doc/vizrt/vosa-handbook/database.org      |  5 +
 4 files changed, 183 insertions(+), 3 deletions(-)
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/database-changing-master.org
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/database-changing-vip.org

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 630bece5..022be476 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -66,12 +66,18 @@ function set_customer_specific_variables() {
 
   customer_filter_map="
     my-backup-dir~${trail_escenic_backups_dir}
-    my-db-vendor~${trail_db_vendor-mysql}
     my-build-server~${trail_builder_host-builder}
     my-build-user~${trail_builder_user-buildy}
     my-control-server~${trail_control_host-control}
     my-db-backup-host~${trail_db_daily_backup_host}
+    my-db-master~${trail_db_master_host-db1}
     my-db-server~${trail_db_master_host-db1}
+    my-db-slave~${trail_db_slave_host-db2}
+    my-db-vendor~${trail_db_vendor-mysql}
+    my-db-vip-interface~${trail_db_vip_interface}
+    my-db-vip-ip~${trail_db_vip_ip}
+    my-db-vip-netmask~${trail_db_vip_netmask-255.255.255.0}
+    my-db-vip~${trail_db_vip_host-db-vip}
     my-db~${trail_db_schema-mydb}
     my-editorial-server~${trail_editor_host-edit1}
     my-import-server~${trail_import_host-edit2}
@@ -82,6 +88,7 @@ function set_customer_specific_variables() {
     my-publication~${first_publication}
     my-stats-server~${trail_analysis_host-analysis}
     my-webapp~${first_publication}
+    my-webapp~${first_publication}
     my-website~${first_website}
   "
   for el in $customer_filter_map; do
@@ -386,12 +393,11 @@ EOF
 }
 
 function generate_cache_server_diagram() {
-  # first the graphics
-  local file=$target_dir/graphics/${trail_cache_host}-cache.blockdiag
   if [ -z "$trail_cache_host" ]; then
     return
   fi
   
+  local file=$target_dir/graphics/${trail_cache_host}-cache.blockdiag
   cat > $file <<EOF
 # Cache server on $trail_cache_host generated by $(basename $0) @ $(date)
 blockdiag {
@@ -435,11 +441,55 @@ $(get_link ${trail_cache_host}):${trail_cache_port-80}
 EOF
 }
 
+function generate_db_diagram() {
+  local file=$target_dir/graphics/db.blockdiag
+  cat > $file <<EOF
+# generated by $(basename $0) @ $(date)
+blockdiag {
+  "content-engine" [ color = "orange" ];
+  "content-engine" -> "${trail_db_vip_host-${trail_db_master_host-${trail_db_host-mydb}}}";
+EOF
+  if [ -n "$trail_db_master_host" ]; then
+    cat >> $file <<EOF
+  "${trail_db_master_host}" [shape = "flowchart.database" ];
+EOF
+  fi
+  if [ -n "$trail_db_slave_host" ]; then
+    cat >> $file <<EOF
+  "${trail_db_slave_host}" [shape = "flowchart.database" ];
+  "${trail_db_master_host}" <-> "${trail_db_slave_host}" [ label = "syncs" ];
+EOF
+  fi
+  
+  if [ -n "$trail_db_vip_host" ]; then
+    cat >> $file <<EOF
+  "${trail_db_vip_host}";
+  "$trail_db_vip_host" -> "${trail_db_master_host-${trail_db_host}}";
+EOF
+  fi
+  
+  echo "}" >> $file
+}
+
+function generate_db_org() {
+  generate_db_diagram
+
+  if [[ -n "${trail_db_master_host}" && -n "${trail_db_slave_host}" ]]; then
+    run cat $target_dir/database-changing-master.org >> $target_dir/database.org
+  fi
+  if [[ -n "${trail_db_vip_host}" && \
+        -n "${trail_db_master_host}" && \
+        -n "${trail_db_slave_host}" ]]; then
+    run cat $target_dir/database-changing-vip.org >> $target_dir/database.org
+  fi
+}
+
 set_up_build_directory
 set_customer_specific_variables
 generate_architecture_diagram
 generate_overview_org
 generate_cache_server_org
+generate_db_org
 generate_html_from_org
 generate_svg_from_blockdiag
 
diff --git a/usr/share/doc/vizrt/vosa-handbook/database-changing-master.org b/usr/share/doc/vizrt/vosa-handbook/database-changing-master.org
new file mode 100644
index 00000000..e9b9bd88
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/database-changing-master.org
@@ -0,0 +1,92 @@
+
+** Changing the Master DB
+At install time, <%= my-db-master %> was the master DB and
+<%= my-db-slave %> was the slave.
+
+If you for some reason need to change the master to the slave, for
+instance if you need to take down the server for maintenance, you must
+do following steps described in this section.
+
+*** Prepare <%= my-db-slave %> to become the new master
+#+BEGIN_SRC text
+$ ssh root@<%= my-db-slave %> 
+# mysql <%= my-db %> 
+#+END_SRC
+
+You must then stop the IO thread of the slave:
+#+BEGIN_SRC text
+mysql> stop slave io_thread;
+#+END_SRC
+
+Next, you must wait for <%= my-db-slave %> to chew through everything
+that <%= my-db-master %> has sent it. This information is stored in
+<%= my-db-slave %>'s process list. To see how it's doing, do:
+#+BEGIN_SRC text
+mysql> show processlist;
+#+END_SRC
+
+What you're looking for, is for the slave to say: ~Slave has read all
+relay log~. When ~show processlist~ says that, <%= my-db-slave %> is
+ready to become master. 
+
+If there's no mention of the relay at all, it could mean that
+<%= my-db-slave %> has been replicating <%= my-db-master %> at all, or
+that it's slave status have been turned off some while ago. As the
+administrator, you must be the judge of that.
+
+*** Promote <%= my-db-slave %> to master
+Still in <%= my-db-slave %>'s mysql shell, do:
+#+BEGIN_SRC text
+mysql> stop slave;
+mysql> reset master;
+#+END_SRC
+
+*** Make sure the replication user is available on <%= my-db-slave %>
+This is the user the slave uses to replicate the master. Since
+<%= my-db-slave %> hasn't done any replication before, you might want
+to ensure that the replication user is there. The user and password
+of the replication user is typically different than that of the user
+ECE uses to access the DB.  
+
+#+BEGIN_SRC text
+grant replication slave on *.* 
+  to 'replicationuser'@'%' 
+  identified by 'replicationpassword';
+flush privileges;
+#+END_SRC
+
+*** Set <%= my-db-master %> as slave of <%= my-db-slave %>
+The steps are as follows: get the binary log position from
+<%= my-db-slave %> and
+set <%= my-db-master %> to be slave of <%= my-db-slave %>.
+
+First, get the binary log & position from <%= my-db-slave %>:
+#+BEGIN_SRC text
+$ ssh root@<%= my-db-slave %>
+# mysql <%= my-db %>
+mysql> show master status;
+#+END_SRC
+
+The log file and the position are pretty much all that's outputted
+from the mysql command above, so there shouldn't be anything to
+confuse you.
+
+Next, log on to <%= my-db-master %> and make it be a slave of
+<%= my-db-slave %>:
+#+BEGIN_SRC sql
+reset master;
+slave stop;
+
+change master to
+  master_host='<%= my-db-slave %>',
+  master_user='replicationuser',
+  master_password='replicationpassword',
+  master_log_file='<%= my-db-slave %>-bin-file',
+  master_log_pos=<position>
+;
+
+slave start;
+#+END_SRC
+
+
+
diff --git a/usr/share/doc/vizrt/vosa-handbook/database-changing-vip.org b/usr/share/doc/vizrt/vosa-handbook/database-changing-vip.org
new file mode 100644
index 00000000..5b698a4e
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/database-changing-vip.org
@@ -0,0 +1,33 @@
+** Changing the DB Virtual IP
+
+In your habitat, DB clients, such as the ECEs, use the database using
+the <%= my-db-vip %> virtual IP (VIP). Whenever you change the master,
+as described in [[Changing the Master DB]], you must also change the VIP
+that the clients of the DB use.
+
+We have deliberately _not_ set this up as an automatic failover using
+[[http://linux-ha.org][Heartbeat]] as we want DB failover to be a conscious matter.
+
+*** Take down the existing VIP
+If <%= my-db-master %> is still up, log on to it and take down the
+VIP:
+#+BEGIN_SRC text
+$ ssh root@<%= my-db-master %>
+# ifdown <%= my-db-vip-interface %>
+#+END_SRC
+
+*** Set up the VIP interface on <%= my-db-slave %>
+You're now ready to set up the VIP on <%= my-db-slave %>. You may want
+to ensure that there's no one acclaiming the IP, do:
+#+BEGIN_SRC text
+$ ping <%= my-db-vip %>
+#+END_SRC
+
+If no one answers, you can go ahead and set it up:
+#+BEGIN_SRC text
+$ ssh root@<%= my-db-slave %>
+# ifconfig eth0:0 <%= my-db-vip-ip %> <%= my-db-vip-netmask %> up
+#+END_SRC
+
+
+
diff --git a/usr/share/doc/vizrt/vosa-handbook/database.org b/usr/share/doc/vizrt/vosa-handbook/database.org
index 18e01d47..ab8c197b 100644
--- a/usr/share/doc/vizrt/vosa-handbook/database.org
+++ b/usr/share/doc/vizrt/vosa-handbook/database.org
@@ -2,3 +2,8 @@
 
 A <%= my-db-vendor %> DB has been installed in your habitat.
 
+[[./graphics/db.svg]]
+
+
+
+

From 573832a4d3295c7db01b0d0f0aa0710a38601f18 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 9 Aug 2012 17:22:13 +0200
Subject: [PATCH 1173/2585] - added section on how to verify the success of the
 VIP failover (TODO:   test!)

  trails to test with:

  trail_analysis_host=analysis
  trail_analysis_port=80
  trail_builder_host=builder.example.com
  trail_builder_user=nie
  trail_cache_backend_servers="pres7:8080 pres8:8080 pres9:7766"
  trail_control_host=control
  trail_db_daily_backup_host=$trail_db_slave_host
  trail_db_master_host=db1
  trail_db_schema=niedb
  trail_db_slave_host=db2
  trail_db_vendor=percona
  trail_db_vip_host=db
  trail_db_vip_interface=eth1:0
  trail_db_vip_ip=192.168.1.200
  trail_db_vip_netmask=255.255.255.0
  trail_editor_host=edit1
  trail_escenic_backups_dir=/var/backups/escenic
  trail_import_host=edit2
  trail_lb_host=load-balancer
  trail_monitoring_host=mon
  trail_monitoring_port=80
  trail_network_name=my.hosting.partner.com
  trail_nfs_master_host=nfs1
  trail_nfs_slave_host=nfs2
  trail_nfs_vip_host=nfs
  trail_presentation_host=pres1
  trail_presentation_host_list="$trail_presentation_host pres2"
  trail_virtual_host_nie=mysite.com:8080
---
 .../doc/vizrt/vosa-handbook/database-changing-vip.org    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/database-changing-vip.org b/usr/share/doc/vizrt/vosa-handbook/database-changing-vip.org
index 5b698a4e..a1ad6d18 100644
--- a/usr/share/doc/vizrt/vosa-handbook/database-changing-vip.org
+++ b/usr/share/doc/vizrt/vosa-handbook/database-changing-vip.org
@@ -9,7 +9,7 @@ We have deliberately _not_ set this up as an automatic failover using
 [[http://linux-ha.org][Heartbeat]] as we want DB failover to be a conscious matter.
 
 *** Take down the existing VIP
-If <%= my-db-master %> is still up, log on to it and take down the
+If <%= my-db-master %> is still up, log on to it and take down its
 VIP:
 #+BEGIN_SRC text
 $ ssh root@<%= my-db-master %>
@@ -29,5 +29,12 @@ $ ssh root@<%= my-db-slave %>
 # ifconfig eth0:0 <%= my-db-vip-ip %> <%= my-db-vip-netmask %> up
 #+END_SRC
 
+Pinging <%= my-db-vip %> should now yield <%= my-db-vip-ip %> again,
+and the answer should come frmo <%= my-db-slave %>:
+#+BEGIN_SRC text
+$ ping <%= my-db-vip %>
+PING <%= my-db-vip %> (<%= my-db-vip-ip %>) 56(84) bytes of data.
+64 bytes from <%= my-db-slave %> (192.168.1.23): icmp_req=1 ttl=249 time=1.18 ms
+#+END_SRC
 
 

From f722476b0a6cab22813d5b5f1d3fc41a794c4007 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 9 Aug 2012 17:22:31 +0200
Subject: [PATCH 1174/2585] - added default VIP interface

---
 usr/share/doc/vizrt/vosa-handbook/create-handbook.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 022be476..9f1d06d6 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -74,7 +74,7 @@ function set_customer_specific_variables() {
     my-db-server~${trail_db_master_host-db1}
     my-db-slave~${trail_db_slave_host-db2}
     my-db-vendor~${trail_db_vendor-mysql}
-    my-db-vip-interface~${trail_db_vip_interface}
+    my-db-vip-interface~${trail_db_vip_interface-eth0:0}
     my-db-vip-ip~${trail_db_vip_ip}
     my-db-vip-netmask~${trail_db_vip_netmask-255.255.255.0}
     my-db-vip~${trail_db_vip_host-db-vip}

From 21a5b67e1fec774ff2f1afae58d1d3c24da431c1 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 10 Aug 2012 14:01:18 +0200
Subject: [PATCH 1175/2585] - getting the Percona key cannot be run in the run
 wrapper since it   often fails

---
 usr/share/escenic/ece-scripts/ece-install.d/database.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 429d91a0..4c793673 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -36,8 +36,11 @@ function set_up_percona_repository_if_possible() {
       print_and_log "Setting Up the Percona repository ..."
 
       if [ $(apt-key list| grep CD2EFD2A | wc -l) -lt 1 ]; then
-        run gpg --keyserver hkp://keys.gnupg.net:80 \
-          --recv-keys 1C4CBDCDCD2EFD2A
+        # this CANNOT be run in the run wrapper since it often fails,
+        # see comment below.
+        gpg --keyserver hkp://keys.gnupg.net:80 \
+          --recv-keys 1C4CBDCDCD2EFD2A \
+          1>> /dev/null 2>> /dev/null
 
         # There has been three times now, during six months, that the
         # key cannot be retrieved from keys.gnupg.net. Therefore,

From cfbcf33c3670b718637ed3d5ee95d2e89c91cedd Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 10 Aug 2012 14:05:05 +0200
Subject: [PATCH 1176/2585] - pipe output of gpg to the log file instead of
 /dev/null

---
 usr/share/escenic/ece-scripts/ece-install.d/database.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 4c793673..9fe816fe 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -40,7 +40,7 @@ function set_up_percona_repository_if_possible() {
         # see comment below.
         gpg --keyserver hkp://keys.gnupg.net:80 \
           --recv-keys 1C4CBDCDCD2EFD2A \
-          1>> /dev/null 2>> /dev/null
+          1>>$log 2>>$log
 
         # There has been three times now, during six months, that the
         # key cannot be retrieved from keys.gnupg.net. Therefore,

From 62a0480d23b7c6057dad997de5fbb6e06855aeb1 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 10 Aug 2012 14:20:38 +0200
Subject: [PATCH 1177/2585] - added the NFS fstab options in the actual fstab
 roll out, this   should have been a part of
 5295c651e5cc216aa0ca99679a6f7404ed92d4ce

---
 .../escenic/ece-scripts/ece-install.d/network-file-system.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh b/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
index 7db15a47..af642563 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
@@ -15,6 +15,9 @@ function get_nfs_configuration() {
   elif [ $install_profile_number -eq $PROFILE_NFS_CLIENT ]; then
     ensure_variable_is_set fai_nfs_server_address
   fi
+
+  leave_trail "trail_nfs_export_list=$nfs_export_list"
+  leave_trail "trail_nfs_client_mount_point_parent=$nfs_client_mount_point_parent"
 }
 
 function install_nfs_server() {
@@ -87,7 +90,7 @@ function install_nfs_client() {
     if [ $(grep "$entry" $file | wc -l) -lt 1 ]; then
       cat >> $file <<EOF
 # added by $(basename $0) @ $(date)
-${nfs_server_address}:$el ${nfs_client_mount_point_parent}/$(basename $el) nfs defaults 0 0
+${nfs_server_address}:$el ${nfs_client_mount_point_parent}/$(basename $el) nfs ${nfs_fstab_options} 0 0
 EOF
     fi
 

From a056b4e9acc08ce340689c780937c22bb1fe66a8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 10 Aug 2012 15:06:38 +0200
Subject: [PATCH 1178/2585] - the .org files now use the trail_ variable names
 directly - the trail_ variables from the .conf are now dynamically  
 expanded. This means that if you add trail_foo, you can instanly use   this
 variable in your documentation. There's no longer an internal  
 variable-expansion mapping table in create-handbook.sh - added chapter on
 network file systems - added chapter on content engine instances, describing
 presentation   and publication servers. - renamed the "updating search
 server" chapter to just "search server"

---
 usr/share/doc/vizrt/vosa-handbook/backups.org |  6 +-
 .../vizrt/vosa-handbook/content-engine.org    | 22 +++++
 .../vizrt/vosa-handbook/create-handbook.sh    | 91 ++++++++++++-------
 .../database-changing-master.org              | 48 +++++-----
 .../vosa-handbook/database-changing-vip.org   | 28 +++---
 .../doc/vizrt/vosa-handbook/database.org      |  2 +-
 .../doc/vizrt/vosa-handbook/deployment.org    | 50 +++++-----
 .../doc/vizrt/vosa-handbook/monitoring.org    |  8 +-
 .../network-file-system-sync.org              |  4 +
 .../operating-system-maintenance.org          | 32 +++----
 .../doc/vizrt/vosa-handbook/search-server.org | 31 +++++++
 .../updating-the-search-server.org            | 24 -----
 .../doc/vizrt/vosa-handbook/vosa-handbook.org |  4 +-
 13 files changed, 205 insertions(+), 145 deletions(-)
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/content-engine.org
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/network-file-system-sync.org
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/search-server.org
 delete mode 100644 usr/share/doc/vizrt/vosa-handbook/updating-the-search-server.org

diff --git a/usr/share/doc/vizrt/vosa-handbook/backups.org b/usr/share/doc/vizrt/vosa-handbook/backups.org
index 1d9e73f8..fc3580b9 100644
--- a/usr/share/doc/vizrt/vosa-handbook/backups.org
+++ b/usr/share/doc/vizrt/vosa-handbook/backups.org
@@ -5,9 +5,9 @@ If you've told ece-install to set up daily backups, there will be a
 cron scripts set up which create backups. 
 
 Part of the name of the cron script is the name of your DB schema, so
-the default location of the cron script on <%= my-db-backup-host %> is:
+the default location of the cron script on <%= trail_db_daily_backup_host %> is:
 #+BEGIN_SRC sh
-/etc/cron.daily/<%= my-db %>-backup  
+/etc/cron.daily/<%= trail_db_schema %>-backup  
 #+END_SRC
 
 And it'll put its backups in
@@ -25,7 +25,7 @@ nfs2) and a backup of the exports directory  should suffice. This is
 the directory in which all the NFS exported directories reside.
 
 #+BEGIN_SRC sh
-<%= my-nfs-server %>:/var/exports  
+<%= trail_nfs_master_host %>:/var/exports  
 #+END_SRC
 
 It's recommended that the backup isn't done using the NFS mount on one
diff --git a/usr/share/doc/vizrt/vosa-handbook/content-engine.org b/usr/share/doc/vizrt/vosa-handbook/content-engine.org
new file mode 100644
index 00000000..88e1f8ca
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/content-engine.org
@@ -0,0 +1,22 @@
+* Content Engine
+We different Escenic Content Engines that are presentation servers
+and the ones that are publication servers.
+
+Architecturally, these look the same (strictly speaking, the
+publication servers don't need the memory cache, but for simplicity of
+uniformity, we install memcached on the publication servers too):
+
+[[./graphics/content-engine.svg]]
+
+** Presentation Server
+The presentation is an ECE which has the publication(s) templates and
+typically doesn't have the Content Studio and Web Studio web
+applications (~studio~ and ~escenic~ respectively).
+
+** Publication Server
+A publication is an ECE which doesn't have the publication(s)
+templates and serves the Content Studio and Web Studio web
+applications to the editorial staff. 
+
+The publication server is often referred to as "the editorial server"
+and sometimes "the studio server".
diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 9f1d06d6..712c264e 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -62,45 +62,32 @@ function set_customer_specific_variables() {
         cut -d'=' -f2 | \
         cut -d':' -f1
     )
+    trail_publication_name=$first_publication
+    trail_webapp_name=$first_publication
+    trail_website_name=$first_website
   fi
 
-  customer_filter_map="
-    my-backup-dir~${trail_escenic_backups_dir}
-    my-build-server~${trail_builder_host-builder}
-    my-build-user~${trail_builder_user-buildy}
-    my-control-server~${trail_control_host-control}
-    my-db-backup-host~${trail_db_daily_backup_host}
-    my-db-master~${trail_db_master_host-db1}
-    my-db-server~${trail_db_master_host-db1}
-    my-db-slave~${trail_db_slave_host-db2}
-    my-db-vendor~${trail_db_vendor-mysql}
-    my-db-vip-interface~${trail_db_vip_interface-eth0:0}
-    my-db-vip-ip~${trail_db_vip_ip}
-    my-db-vip-netmask~${trail_db_vip_netmask-255.255.255.0}
-    my-db-vip~${trail_db_vip_host-db-vip}
-    my-db~${trail_db_schema-mydb}
-    my-editorial-server~${trail_editor_host-edit1}
-    my-import-server~${trail_import_host-edit2}
-    my-monitoring-server~${trail_monitoring_host-mon}
-    my-network~$(get_network_name)
-    my-nfs-server~${trail_nfs_master_host-nfs1}
-    my-presentation-server~${trail_presentation_host-pres1}
-    my-publication~${first_publication}
-    my-stats-server~${trail_analysis_host-analysis}
-    my-webapp~${first_publication}
-    my-webapp~${first_publication}
-    my-website~${first_website}
-  "
-  for el in $customer_filter_map; do
+  expand_all_variables_in_org_files
+}
+
+function expand_all_variables_in_org_files() {
+  # add crucial defaults if the trails aren't set
+  trail_db_vip_ip=${trail_db_vip_ip-192.168.1.200}
+  trail_db_vip_interface=${trail_db_vip_interface-eth0:0}
+  trail_nfs_export_list=${trail_nfs_export_list-/var/exports/multimedia}
+  trail_nfs_client_mount_point_parent=${trail_nfs_client_mount_point_parent-/mnt}
+  
+  # replace
+  declare | grep ^trail_ | while read el; do
     local old_ifs=$IFS
-    IFS='~'
-    read from to <<< "$el"
+    IFS='='
+    read key value <<< "$el"
     IFS=$old_ifs
-    if [ -z "$to" ]; then
+    if [ -z "$value" ]; then
       continue
     fi
     find $target_dir -name "*.org" | while read f; do
-      run sed -i "s~<%=[ ]*${from}[ ]*%>~${to}~g" ${f}
+      sed -i "s~<%=[ ]*${key}[ ]*%>~${value}~g" ${f}
     done
   done
 }
@@ -437,7 +424,7 @@ The cache server on $trail_cache_host is available on
 $(get_link ${trail_cache_host}):${trail_cache_port-80}
 
 #+ATTR_HTML: alt="Cache server on $trail_cache_host"
-[[[[graphics/${trail_cache_host}-cache.svg]]
+[[./graphics/${trail_cache_host}-cache.svg]]
 EOF
 }
 
@@ -484,12 +471,50 @@ function generate_db_org() {
   fi
 }
 
+function generate_nfs_org() {
+  if [[ -n "${trail_nfs_master_host}" && -n "${trail_nfs_slave_host}" ]]; then
+    run cat $target_dir/network-file-system-sync.org >> \
+      $target_dir/network-file-system.org
+  fi
+}
+
+function generate_content_engine_diagram() {
+  local file=$target_dir/graphics/content-engine.blockdiag
+  local the_db="${trail_db_vendor-mysql}:${trail_db_master_port-${trail_db_port-3306}}"
+  
+  cat > $file <<EOF
+blockdiag {
+
+  "content-engine" [ color = "orange" ];
+  "${the_db}" [shape = "flowchart.database" ];
+  "content-engine" -> "memcached:11211";
+  "content-engine" -> "${the_db}";
+  "content-engine" -> "${trail_nfs_vip_host-${trail_nfs_master_host-${trail_nfs_host}}}:2049";
+EOF
+
+  if [ -n "${trail_analysis_host}" ]; then
+    cat >> $file <<EOF
+  "content-engine" -> "${trail_analysis_host}:${trail_analysis_port-8080}";
+EOF
+  fi
+  
+  cat >> $file <<EOF
+}
+EOF
+}
+
+function generate_content_engine_org() {
+  generate_content_engine_diagram
+}
+
 set_up_build_directory
 set_customer_specific_variables
 generate_architecture_diagram
 generate_overview_org
+generate_content_engine_org
 generate_cache_server_org
 generate_db_org
+generate_nfs_org
 generate_html_from_org
 generate_svg_from_blockdiag
 
diff --git a/usr/share/doc/vizrt/vosa-handbook/database-changing-master.org b/usr/share/doc/vizrt/vosa-handbook/database-changing-master.org
index e9b9bd88..9c17bdce 100644
--- a/usr/share/doc/vizrt/vosa-handbook/database-changing-master.org
+++ b/usr/share/doc/vizrt/vosa-handbook/database-changing-master.org
@@ -1,16 +1,16 @@
 
 ** Changing the Master DB
-At install time, <%= my-db-master %> was the master DB and
-<%= my-db-slave %> was the slave.
+At install time, <%= trail_db_master_host %> was the master DB and
+<%= trail_db_slave_host %> was the slave.
 
 If you for some reason need to change the master to the slave, for
 instance if you need to take down the server for maintenance, you must
 do following steps described in this section.
 
-*** Prepare <%= my-db-slave %> to become the new master
+*** Prepare <%= trail_db_slave_host %> to become the new master
 #+BEGIN_SRC text
-$ ssh root@<%= my-db-slave %> 
-# mysql <%= my-db %> 
+$ ssh root@<%= trail_db_slave_host %> 
+# mysql <%= trail_db_schema %> 
 #+END_SRC
 
 You must then stop the IO thread of the slave:
@@ -18,32 +18,32 @@ You must then stop the IO thread of the slave:
 mysql> stop slave io_thread;
 #+END_SRC
 
-Next, you must wait for <%= my-db-slave %> to chew through everything
-that <%= my-db-master %> has sent it. This information is stored in
-<%= my-db-slave %>'s process list. To see how it's doing, do:
+Next, you must wait for <%= trail_db_slave_host %> to chew through everything
+that <%= trail_db_master_host %> has sent it. This information is stored in
+<%= trail_db_slave_host %>'s process list. To see how it's doing, do:
 #+BEGIN_SRC text
 mysql> show processlist;
 #+END_SRC
 
 What you're looking for, is for the slave to say: ~Slave has read all
-relay log~. When ~show processlist~ says that, <%= my-db-slave %> is
+relay log~. When ~show processlist~ says that, <%= trail_db_slave_host %> is
 ready to become master. 
 
 If there's no mention of the relay at all, it could mean that
-<%= my-db-slave %> has been replicating <%= my-db-master %> at all, or
+<%= trail_db_slave_host %> has been replicating <%= trail_db_master_host %> at all, or
 that it's slave status have been turned off some while ago. As the
 administrator, you must be the judge of that.
 
-*** Promote <%= my-db-slave %> to master
-Still in <%= my-db-slave %>'s mysql shell, do:
+*** Promote <%= trail_db_slave_host %> to master
+Still in <%= trail_db_slave_host %>'s mysql shell, do:
 #+BEGIN_SRC text
 mysql> stop slave;
 mysql> reset master;
 #+END_SRC
 
-*** Make sure the replication user is available on <%= my-db-slave %>
+*** Make sure the replication user is available on <%= trail_db_slave_host %>
 This is the user the slave uses to replicate the master. Since
-<%= my-db-slave %> hasn't done any replication before, you might want
+<%= trail_db_slave_host %> hasn't done any replication before, you might want
 to ensure that the replication user is there. The user and password
 of the replication user is typically different than that of the user
 ECE uses to access the DB.  
@@ -55,15 +55,15 @@ grant replication slave on *.*
 flush privileges;
 #+END_SRC
 
-*** Set <%= my-db-master %> as slave of <%= my-db-slave %>
+*** Set <%= trail_db_master_host %> as slave of <%= trail_db_slave_host %>
 The steps are as follows: get the binary log position from
-<%= my-db-slave %> and
-set <%= my-db-master %> to be slave of <%= my-db-slave %>.
+<%= trail_db_slave_host %> and
+set <%= trail_db_master_host %> to be slave of <%= trail_db_slave_host %>.
 
-First, get the binary log & position from <%= my-db-slave %>:
+First, get the binary log & position from <%= trail_db_slave_host %>:
 #+BEGIN_SRC text
-$ ssh root@<%= my-db-slave %>
-# mysql <%= my-db %>
+$ ssh root@<%= trail_db_slave_host %>
+# mysql <%= trail_db_schema %>
 mysql> show master status;
 #+END_SRC
 
@@ -71,17 +71,17 @@ The log file and the position are pretty much all that's outputted
 from the mysql command above, so there shouldn't be anything to
 confuse you.
 
-Next, log on to <%= my-db-master %> and make it be a slave of
-<%= my-db-slave %>:
+Next, log on to <%= trail_db_master_host %> and make it be a slave of
+<%= trail_db_slave_host %>:
 #+BEGIN_SRC sql
 reset master;
 slave stop;
 
 change master to
-  master_host='<%= my-db-slave %>',
+  master_host='<%= trail_db_slave_host %>',
   master_user='replicationuser',
   master_password='replicationpassword',
-  master_log_file='<%= my-db-slave %>-bin-file',
+  master_log_file='<%= trail_db_slave_host %>-bin-file',
   master_log_pos=<position>
 ;
 
diff --git a/usr/share/doc/vizrt/vosa-handbook/database-changing-vip.org b/usr/share/doc/vizrt/vosa-handbook/database-changing-vip.org
index a1ad6d18..92b5a807 100644
--- a/usr/share/doc/vizrt/vosa-handbook/database-changing-vip.org
+++ b/usr/share/doc/vizrt/vosa-handbook/database-changing-vip.org
@@ -1,7 +1,7 @@
 ** Changing the DB Virtual IP
 
 In your habitat, DB clients, such as the ECEs, use the database using
-the <%= my-db-vip %> virtual IP (VIP). Whenever you change the master,
+the <%= trail_db_vip_host %> virtual IP (VIP). Whenever you change the master,
 as described in [[Changing the Master DB]], you must also change the VIP
 that the clients of the DB use.
 
@@ -9,32 +9,32 @@ We have deliberately _not_ set this up as an automatic failover using
 [[http://linux-ha.org][Heartbeat]] as we want DB failover to be a conscious matter.
 
 *** Take down the existing VIP
-If <%= my-db-master %> is still up, log on to it and take down its
+If <%= trail_db_master_host %> is still up, log on to it and take down its
 VIP:
 #+BEGIN_SRC text
-$ ssh root@<%= my-db-master %>
-# ifdown <%= my-db-vip-interface %>
+$ ssh root@<%= trail_db_master_host %>
+# ifconfig <%= trail_db_vip_interface %> down
 #+END_SRC
 
-*** Set up the VIP interface on <%= my-db-slave %>
-You're now ready to set up the VIP on <%= my-db-slave %>. You may want
+*** Set up the VIP interface on <%= trail_db_slave_host %>
+You're now ready to set up the VIP on <%= trail_db_slave_host %>. You may want
 to ensure that there's no one acclaiming the IP, do:
 #+BEGIN_SRC text
-$ ping <%= my-db-vip %>
+$ ping <%= trail_db_vip_host %>
 #+END_SRC
 
 If no one answers, you can go ahead and set it up:
 #+BEGIN_SRC text
-$ ssh root@<%= my-db-slave %>
-# ifconfig eth0:0 <%= my-db-vip-ip %> <%= my-db-vip-netmask %> up
+$ ssh root@<%= trail_db_slave_host %>
+# ifconfig eth0:0 <%= trail_db_vip_ip %> up
 #+END_SRC
 
-Pinging <%= my-db-vip %> should now yield <%= my-db-vip-ip %> again,
-and the answer should come frmo <%= my-db-slave %>:
+Pinging <%= trail_db_vip_host %> should now yield <%= trail_db_vip_ip %> again,
+and the answer should come frmo <%= trail_db_slave_host %>:
 #+BEGIN_SRC text
-$ ping <%= my-db-vip %>
-PING <%= my-db-vip %> (<%= my-db-vip-ip %>) 56(84) bytes of data.
-64 bytes from <%= my-db-slave %> (192.168.1.23): icmp_req=1 ttl=249 time=1.18 ms
+$ ping <%= trail_db_vip_host %>
+PING <%= trail_db_vip_host %> (<%= trail_db_vip_ip %>) 56(84) bytes of data.
+64 bytes from <%= trail_db_vip_ip %>: icmp_req=1 ttl=249 time=1.18 ms
 #+END_SRC
 
 
diff --git a/usr/share/doc/vizrt/vosa-handbook/database.org b/usr/share/doc/vizrt/vosa-handbook/database.org
index ab8c197b..1ed668d7 100644
--- a/usr/share/doc/vizrt/vosa-handbook/database.org
+++ b/usr/share/doc/vizrt/vosa-handbook/database.org
@@ -1,6 +1,6 @@
 * Database
 
-A <%= my-db-vendor %> DB has been installed in your habitat.
+A <%= trail_db_vendor %> DB has been installed in your habitat.
 
 [[./graphics/db.svg]]
 
diff --git a/usr/share/doc/vizrt/vosa-handbook/deployment.org b/usr/share/doc/vizrt/vosa-handbook/deployment.org
index cd29f17d..8155a62c 100644
--- a/usr/share/doc/vizrt/vosa-handbook/deployment.org
+++ b/usr/share/doc/vizrt/vosa-handbook/deployment.org
@@ -4,7 +4,7 @@ Log on to the build server as the user for the given habitat and run
 the build script:
 
 #+BEGIN_SRC sh
-$ ssh <%= my-build-user %>@<%= my-build-server %>
+$ ssh <%= trail_builder_user %>@<%= trail_builder_host %>
 $ ./build.sh release
 #+END_SRC
 
@@ -12,36 +12,36 @@ Once the build is done, the URI of the finished EAR file is printed in
 the shell. This is the URI you use for the 'ece deploy' command below.
 
 ** Deploying a new EAR file
-In the examples here, we have a build server on <%= my-build-server %>
-where we build EARs for the the <%= my-website %> website.
+In the examples here, we have a build server on <%= trail_builder_host %>
+where we build EARs for the the <%= trail_builder_user %> website.
 
 *** Deploying a new EAR file for an ECE instance
 All the commands in this section is written to be executed on
-<%= my-control-server %> (but you could of course also first log on to each
+<%= trail_control_host %> (but you could of course also first log on to each
 of the servers and run the commands locally there).
 
 #+BEGIN_SRC sh
-$ sudo ssh escenic@<%= my-presentation-server %> ece -i engine1 --uri http://<%= my-build-server %>/<%= my-build-user %>/releases/<%= my-build-user %>-trunk-rev4121-2012-07-05_1524.ear deploy
-[ece#engine-engine1] Deploying http://<%= my-build-server %>/<%= my-build-user %>/releases/<%= my-build-user %>-trunk-rev4121-2012-07-05_1524.ear on engine1 ...
-[ece#engine-engine1] Deploying /var/cache/escenic/<%= my-build-user %>-trunk-rev4121-2012-07-05_1524.ear on tomcat ...
-[ece#engine-engine1] Deployment white list active, only deploying: <%= my-webapp %> escenic-admin indexer-webservice
+$ sudo ssh escenic@<%= trail_presentation_host %> ece -i engine1 --uri http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev4121-2012-07-05_1524.ear deploy
+[ece#engine-engine1] Deploying http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev4121-2012-07-05_1524.ear on engine1 ...
+[ece#engine-engine1] Deploying /var/cache/escenic/<%= trail_builder_user %>-trunk-rev4121-2012-07-05_1524.ear on tomcat ...
+[ece#engine-engine1] Deployment white list active, only deploying: <%= trail_webapp_name %> escenic-admin indexer-webservice
 [ece#engine-engine1] Deployment state file updated: /var/lib/escenic/engine1.state
 #+END_SRC
 
 We can now restart the ECE:
 
 #+BEGIN_SRC sh
-$ sudo ssh root@<%= my-presentation-server %> /etc/init.d/ece restart 
-[ece#engine-engine1] Stopping the engine1 instance of engine on <%= my-presentation-server %>...
-[ece#engine-engine1] Starting the engine1 instance of engine on <%= my-presentation-server %>...
-[ece#search-search1] Stopping the search1 instance of search on <%= my-presentation-server %>...
-[ece#search-search1] Starting the search1 instance of search on <%= my-presentation-server %>...
+$ sudo ssh root@<%= trail_presentation_host %> /etc/init.d/ece restart 
+[ece#engine-engine1] Stopping the engine1 instance of engine on <%= trail_presentation_host %>...
+[ece#engine-engine1] Starting the engine1 instance of engine on <%= trail_presentation_host %>...
+[ece#search-search1] Stopping the search1 instance of search on <%= trail_presentation_host %>...
+[ece#search-search1] Starting the search1 instance of search on <%= trail_presentation_host %>...
 #+END_SRC
 
 To confirm see that the ECE instance came up again, do:
 
 #+BEGIN_SRC sh
-$ sudo ssh root@<%= my-presentation-server %> /etc/init.d/ece status
+$ sudo ssh root@<%= trail_presentation_host %> /etc/init.d/ece status
 [ece#engine-engine1] UP 0d 0h 11m 45s
 [ece#search-search1] UP 0d 0h 11m 42s
 #+END_SRC
@@ -53,10 +53,10 @@ the search instance has a different deployment white list than that of
 the ECE instance above.
 
 #+BEGIN_SRC sh
-torstein@control:~$ sudo ssh escenic@<%= my-presentation-server %> ece
--i search1 -t search --uri http://<%= my-build-server %>/<%= my-build-user %>/releases/<%= my-build-user %>-trunk-rev4121-2012-07-05_1524.ear deploy
-[ece#search-search1] Deploying http://<%= my-build-server %>/<%= my-build-user %>/releases/<%= my-build-user %>-trunk-rev4121-2012-07-05_1524.ear on search1 ...
-[ece#search-search1] Deploying /var/cache/escenic/<%= my-build-user %>-trunk-rev4121-2012-07-05_1524.ear on tomcat ...
+torstein@control:~$ sudo ssh escenic@<%= trail_presentation_host %> ece
+-i search1 -t search --uri http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev4121-2012-07-05_1524.ear deploy
+[ece#search-search1] Deploying http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev4121-2012-07-05_1524.ear on search1 ...
+[ece#search-search1] Deploying /var/cache/escenic/<%= trail_builder_user %>-trunk-rev4121-2012-07-05_1524.ear on tomcat ...
 [ece#search-search1] Deployment white list active, only deploying: escenic-admin solr indexer-webapp
 [ece#search-search1] Deployment state file updated: /var/lib/escenic/search1.state  
 #+END_SRC
@@ -73,10 +73,10 @@ these as well (layout, layout-group, menu, community/security and so
 on).
 
 First, make sure you have already done the deployment on the
-<%= my-presentation-server %> server. Login to one of the presentation
-servers. From <%= my-control-server %>, do:
+<%= trail_presentation_host %> server. Login to one of the presentation
+servers. From <%= trail_control_host %>, do:
 #+BEGIN_SRC sh
-$ sudo ssh root@<%= my-presentation-server %>
+$ sudo ssh root@<%= trail_presentation_host %>
 #+END_SRC
 
 Then, change to the user running the ECE user
@@ -89,14 +89,14 @@ of it.
 #+BEGIN_SRC sh
 $ mkdir ~/backup
 $ wget -O ~/backup/content-type-$(date --iso)-before-deployment \
-       http://localhost:8080/escenic-admin/publication-resources/<%= my-publication %>/escenic/content-type
+       http://localhost:8080/escenic-admin/publication-resources/<%= trail_publication_name %>/escenic/content-type
 #+END_SRC
 
 The next step is to locate the new content-type definition.  Go to the
 new new content-type from your latest deployment
 
 #+BEGIN_SRC sh
-$ cd /opt/tomcat-engine1/webapps/<%= my-webapp %>/META-INF/escenic/publication-resources/escenic/
+$ cd /opt/tomcat-engine1/webapps/<%= trail_webapp_name %>/META-INF/escenic/publication-resources/escenic/
 #+END_SRC
 
 Then, confirm the changes using diff:
@@ -108,14 +108,14 @@ Now, upload the new content-type to ECE.  The command below assumes
 that there is a file called the same as the publication resource in
 the current directory. 
 #+BEGIN_SRC sh
-$ ece -i engine1 -p <%= my-publication %> -r content-type update
+$ ece -i engine1 -p <%= trail_publication_name %> -r content-type update
 #+END_SRC
 
 To confirm our changes, we now download the resource again to check if
 all the changes are the way we want them:
 #+BEGIN_SRC sh
 $ wget -O ~/backup/content-type-$(date --iso)-after-deployment \
-       http://localhost:8080/escenic-admin/publication-resources/<%= my-publication %>/escenic/content-type
+       http://localhost:8080/escenic-admin/publication-resources/<%= trail_publication_name %>/escenic/content-type
 #+END_SRC
 
 Finally, run diff again to see that the changes are correct:
diff --git a/usr/share/doc/vizrt/vosa-handbook/monitoring.org b/usr/share/doc/vizrt/vosa-handbook/monitoring.org
index eb8c0126..17c1ee39 100644
--- a/usr/share/doc/vizrt/vosa-handbook/monitoring.org
+++ b/usr/share/doc/vizrt/vosa-handbook/monitoring.org
@@ -21,7 +21,7 @@ All VOSA hosts also has a (maximum) one minute old HTML report from
 system-info running on port 5678. 
 
 Here's a screenshot of the system-info report running on
-http://<%= my-presentation-server %>:5678/:
+http://<%= trail_presentation_host %>:5678/:
 [[[[graphics/pres1-system-info.png]]
 
 ** Hugin
@@ -31,7 +31,7 @@ produce a system-info report in YAML and check the files into a
 version repository.
 
 When browsing the Hugin web interface at
-http://<%= my-control-server %><%= my-network %>:5679/ you can quickly 
+http://<%= trail_control_host %><%= trail_network_name %>:5679/ you can quickly 
 see all changes on the various servers. A change could be a new
 service which is all of a sudden listening on a new port or that the
 version of a installed package has changed. Nothing escapes Hugin's
@@ -43,12 +43,12 @@ trending of your site. I.e. how it has been behaving the last days,
 weeks and months.
 
 The address to your Munin instance is is:
- http://<%= my-monitoring-server %><%= my-network %>/munin/
+ http://<%= trail_monitoring_host %><%= trail_network_name %>/munin/
 
 ** Icinga (enhanced Nagios)
 Icinga gives a good overview of the current health of the
 habitat. Head over to
- http://<%= my-monitoring-server %><%= my-network %>/icinga/ 
+ http://<%= trail_monitoring_host %><%= trail_network_name %>/icinga/ 
 to get updates on host & service uptimes and disk fill rates. This is
 also the place were you'll schedule any maintenance work you do to
 prevent unnecessary alerts filling up your mobile phone and email
diff --git a/usr/share/doc/vizrt/vosa-handbook/network-file-system-sync.org b/usr/share/doc/vizrt/vosa-handbook/network-file-system-sync.org
new file mode 100644
index 00000000..71829289
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/network-file-system-sync.org
@@ -0,0 +1,4 @@
+** Syncing the Master & Slave NFS
+
+The NFS slave on <%= trail_nfs_slave_host %> replicates the master NFS
+on <%= trail_nfs_master_host %> using an ourly cron job.
diff --git a/usr/share/doc/vizrt/vosa-handbook/operating-system-maintenance.org b/usr/share/doc/vizrt/vosa-handbook/operating-system-maintenance.org
index e3518ac2..267c0107 100644
--- a/usr/share/doc/vizrt/vosa-handbook/operating-system-maintenance.org
+++ b/usr/share/doc/vizrt/vosa-handbook/operating-system-maintenance.org
@@ -16,17 +16,17 @@ any issues before going ahead with the upgrades below.
 This applies to OSs like Debian, Ubuntu and Mint.
 
 In the example below, we update the Ubuntu servers called
-<%= my-presentation-server%> <%= my-editorial-server %> <%= my-import-server %>
-<%= my-monitoring-server %> <%= my-stats-server %> from the comfort of
-<%= my-control-server %>.
+<%= trail_presentation_host%> <%= trail_editor_host %> <%= trail_import_host %>
+<%= trail_monitoring_host %> <%= trail_analysis_host %> from the comfort of
+<%= trail_control_host %>.
 
 #+BEGIN_SRC sh
 $ for el in \
-   <%= my-presentation-server %> \
-   <%= my-editorial-server %> \
-   <%= my-import-server %> \
-   <%= my-monitoring-server %> \
-   <%= my-stats-server %> \
+   <%= trail_presentation_host %> \
+   <%= trail_editor_host %> \
+   <%= trail_import_host %> \
+   <%= trail_monitoring_host %> \
+   <%= trail_analysis_host %> \
   ; do \
       echo "Now upgrading $el"; \
       sudo ssh root@$el 'apt-get -qq update && apt-get -q upgrade' ; \
@@ -38,17 +38,17 @@ $ for el in \
 This applies to OSs like CentOS, RedHat and Fedora:
 
 In the example below, we update the RedHat servers called
-<%= my-presentation-server%> <%= my-editorial-server %> <%= my-import-server %>
-<%= my-monitoring-server %> <%= my-stats-server %> from the comfort of
-<%= my-control-server %>:
+<%= trail_presentation_host%> <%= trail_editor_host %> <%= trail_import_host %>
+<%= trail_monitoring_host %> <%= trail_analysis_host %> from the comfort of
+<%= trail_control_host %>:
 
 #+BEGIN_SRC sh
 $ for el in \
-   <%= my-presentation-server %> \
-   <%= my-editorial-server %> \
-   <%= my-import-server %> \
-   <%= my-monitoring-server %> \
-   <%= my-stats-server %> \
+   <%= trail_presentation_host %> \
+   <%= trail_editor_host %> \
+   <%= trail_import_host %> \
+   <%= trail_monitoring_host %> \
+   <%= trail_analysis_host %> \
   ; do \
       echo "Now upgrading $el";
       ssh $el yum update; 
diff --git a/usr/share/doc/vizrt/vosa-handbook/search-server.org b/usr/share/doc/vizrt/vosa-handbook/search-server.org
new file mode 100644
index 00000000..e8519b0e
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/search-server.org
@@ -0,0 +1,31 @@
+* Search Server
+A search server is an application server only running the ~solr~ and
+~indexer-webapp~ web applications. It's highly recommendable to run
+these web applications on a dedicated JVM as their behaviour with
+regards to object creation, connections and garbage collection is
+highly different from that of a publication or presentation server.
+
+** Updating the Search Server
+
+When updating the search server, you might want to reconfigure the
+ECE instance(s) that use the search server you're updating. To do
+this, you can use the Component Browser in the escenic-admin
+interface.
+
+For instance, let's say you're upgrading the search server for
+<%= trail_editor_host %> and want it to temporarily use
+<%= trail_import_host %>'s search instance.
+
+First, go to:
+http://<%= trail_editor_host %>:<%= trail_editor_port %>/escenic-admin/browser/Global/com/escenic/webservice/search/DelegatingSearchEngine?property=solrURI
+
+Then, change the value from:
+#+BEGIN_SRC conf
+http://localhost:8081/solr/select	  
+#+END_SRC
+
+to
+
+#+BEGIN_SRC conf
+http://<%= trail_import_host %>:8081/solr/select	  
+#+END_SRC
diff --git a/usr/share/doc/vizrt/vosa-handbook/updating-the-search-server.org b/usr/share/doc/vizrt/vosa-handbook/updating-the-search-server.org
deleted file mode 100644
index b2d6adfb..00000000
--- a/usr/share/doc/vizrt/vosa-handbook/updating-the-search-server.org
+++ /dev/null
@@ -1,24 +0,0 @@
-* Updating the Search Server
-
-When updating the search server, you might want to reconfigure the
-ECE instance(s) that use the search server you're updating. To do
-this, you can use the Component Browser in the escenic-admin
-interface.
-
-For instance, let's say you're upgrading the search server for
-<%= my-editorial-server %> and want it to temporarily use
-<%= my-import-server %>'s search instance.
-
-First, go to:
-http://<%= my-editorial-server %>:8080/escenic-admin/browser/Global/com/escenic/webservice/search/DelegatingSearchEngine?property=solrURI
-
-Then, change the value from:
-#+BEGIN_SRC conf
-http://localhost:8081/solr/select	  
-#+END_SRC
-
-to
-
-#+BEGIN_SRC conf
-http://<%= my-import-server %>:8081/solr/select	  
-#+END_SRC
diff --git a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
index 882063b0..f8f9f377 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
+++ b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
@@ -4,9 +4,11 @@
 #+INCLUDE: "overview.org"
 #+INCLUDE: "operating-system-maintenance.org" 
 #+INCLUDE: "deployment.org"
-#+INCLUDE: "updating-the-search-server.org"
+#+INCLUDE: "content-engine.org"
+#+INCLUDE: "search-server.org"
 #+INCLUDE: "database.org"
 #+INCLUDE: "cache-server.org"
+#+INCLUDE: "network-file-system.org"
 #+INCLUDE: "backups.org"
 #+INCLUDE: "monitoring.org"
 #+INCLUDE: "glossary.org"

From bd5b43990f4588adab3aa7972f6e672cbc56004d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 10 Aug 2012 15:23:43 +0200
Subject: [PATCH 1179/2585] - added link to AuthenticationFilterCache where
 it's easy to see who   has logged in since the ECE was started. Flushing the
 cache will   then give you the currently logged in users.

---
 .../doc/vizrt/vosa-handbook/create-handbook.sh    | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 712c264e..f9b3ca8a 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -304,14 +304,17 @@ EOF
   fi
 
   if [ -n "${trail_editor_host}" ]; then
-  cat <<EOF 
+    local ece_url="$(get_link ${trail_editor_host}):${trail_editor_port-8080}"
+    cat <<EOF 
 | $(get_fqdn ${trail_editor_host}) | \
   [[$(get_link ${trail_editor_host}):5678/][system-info]] \
-  [[$(get_link ${trail_editor_host}):${trail_editor_port-8080}/escenic-admin/][escenic-admin]] \
-  [[$(get_link ${trail_editor_host}):${trail_editor_port-8080}/solr/admin/][solr]] \
-  [[$(get_link ${trail_editor_host}):${trail_editor_port-8080}/studio/][studio]] \
-  [[$(get_link ${trail_editor_host}):${trail_editor_port-8080}/escenic/][escenic]] \
-  [[$(get_link ${trail_editor_host}):${trail_editor_port-8080}/webservice/][webservice]] \
+  [[${ece_url}/escenic-admin/][escenic-admin]] \
+  [[${ece_url}/solr/admin/][solr]] \
+  [[${ece_url}/studio/][studio]] \
+  [[${ece_url}/escenic/][escenic]] \
+  [[${ece_url}/webservice/][webservice]] \
+  [[${ece_url}/escenic-admin/browser/Webapp%20ECE%20Webservice%20Webapp/com/escenic/servlet/filter/cache/AuthenticationFilterCache][logged in users]] \
+
 |
 EOF
   fi

From 57ca05f240277435d3559b593a5d20a1ebe8f4a3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 10 Aug 2012 15:50:31 +0200
Subject: [PATCH 1180/2585] - added network-file-system chapter

---
 .../vizrt/vosa-handbook/network-file-system.org   | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/network-file-system.org

diff --git a/usr/share/doc/vizrt/vosa-handbook/network-file-system.org b/usr/share/doc/vizrt/vosa-handbook/network-file-system.org
new file mode 100644
index 00000000..e367a71f
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/network-file-system.org
@@ -0,0 +1,15 @@
+* Network File System
+
+** NFS server
+<%= trail_nfs_master_host %>  has these network file shares: ~<%=
+trail_nfs_export_list %>~ These file share(s) are made available using
+NFS.
+
+** NFS clients
+All of the hosts running an presentation or publication server will
+have these shares mounted. The most important one is the one holding
+the multimedia archive of Escenic Content Engine. Typically, this
+share is called ~multimedia~. 
+
+In your habitat, all the shares from <%= trail_nfs_export_list %> are
+mounted on <%= trail_nfs_client_mount_point_parent %>.

From 6ef90edd99c03b181f8884a0dbbbb516d7688fe0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 10 Aug 2012 15:51:12 +0200
Subject: [PATCH 1181/2585] - fixed the search ports of the editor and import
 hosts

---
 .../doc/vizrt/vosa-handbook/create-handbook.sh   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index f9b3ca8a..0c9ee436 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -304,16 +304,16 @@ EOF
   fi
 
   if [ -n "${trail_editor_host}" ]; then
-    local ece_url="$(get_link ${trail_editor_host}):${trail_editor_port-8080}"
+    local ece_url="$(get_link ${trail_editor_host})"
     cat <<EOF 
 | $(get_fqdn ${trail_editor_host}) | \
   [[$(get_link ${trail_editor_host}):5678/][system-info]] \
-  [[${ece_url}/escenic-admin/][escenic-admin]] \
-  [[${ece_url}/solr/admin/][solr]] \
-  [[${ece_url}/studio/][studio]] \
-  [[${ece_url}/escenic/][escenic]] \
-  [[${ece_url}/webservice/][webservice]] \
-  [[${ece_url}/escenic-admin/browser/Webapp%20ECE%20Webservice%20Webapp/com/escenic/servlet/filter/cache/AuthenticationFilterCache][logged in users]] \
+  [[${ece_url}:${trail_editor_port-8080}/escenic-admin/][escenic-admin]] \
+  [[${ece_url}:${trail_search_port-8081}/solr/admin/][solr]] \
+  [[${ece_url}:${trail_editor_port-8080}/studio/][studio]] \
+  [[${ece_url}:${trail_editor_port-8080}/escenic/][escenic]] \
+  [[${ece_url}:${trail_editor_port-8080}/webservice/][webservice]] \
+  [[${ece_url}:${trail_editor_port-8080}/escenic-admin/browser/Webapp%20ECE%20Webservice%20Webapp/com/escenic/servlet/filter/cache/AuthenticationFilterCache][logged in users]] \
 
 |
 EOF
@@ -324,7 +324,7 @@ EOF
 | $(get_fqdn ${trail_import_host}) | \
   [[$(get_link ${trail_import_host}):5678/][system-info]] \
   [[$(get_link ${trail_import_host}):${trail_import_port}/escenic-admin/][escenic-admin]] \
-  [[$(get_link ${trail_import_host}):${trail_import_port}/solr/admin/][solr]] \
+  [[$(get_link ${trail_import_host}):${trail_search_port-8081}/solr/admin/][solr]] \
   [[$(get_link ${trail_import_host}):${trail_import_port}/studio/][studio]] \
   [[$(get_link ${trail_import_host}):${trail_import_port}/escenic/][escenic]] \
   [[$(get_link ${trail_import_host}):${trail_import_port}/webservice/][webservice]] \

From fd03a1e19952115e13512600438fedd6726826c6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 10 Aug 2012 16:13:15 +0200
Subject: [PATCH 1182/2585] - if you don't have trail_db_daily_backup_host set,
 the backup chapter   will not include the DB backup

---
 .../vizrt/vosa-handbook/create-handbook.sh    | 62 ++++++++++++-------
 1 file changed, 40 insertions(+), 22 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 0c9ee436..fffb2c99 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -4,7 +4,9 @@
 
 handbook_org=vosa-handbook.org
 target_dir=/tmp/$(basename $0 .sh)-$(date --iso)
-
+host_name_list_outside_network="
+  amazonaws.com
+"
 $(which blockdiag >/dev/null) || {
   cat <<EOF
 You must have blockdiag installed. On Debian & Ubuntu the package is
@@ -38,12 +40,6 @@ function set_customer_specific_variables() {
       $host_name_list_outside_network
       ${trail_host_name_list_outside_network}
     "
-  else
-    echo "No ${conf_file} found, I'm making something up ..."
-    trail_presentation_host=pres1
-    trail_presentation_host_list=$trail_presentation_host
-    trail_db_master_host=db1
-    trail_nfs_master_host=nfs1
   fi
 
   local virtual_host_key_prefix="trail_virtual_host_"
@@ -70,14 +66,33 @@ function set_customer_specific_variables() {
   expand_all_variables_in_org_files
 }
 
-function expand_all_variables_in_org_files() {
-  # add crucial defaults if the trails aren't set
-  trail_db_vip_ip=${trail_db_vip_ip-192.168.1.200}
+function set_defaults_if_the_trails_are_not_set() {
+  trail_analysis_host=${trail_analysis_host-analysis1}
+  trail_builder_host=${trail_builder_host-builder1}
+  trail_builder_user=${trail_builder_user-buildy}
+  trail_control_host=${trail_control_host-control}
+  trail_db_master_host=${trail_db_master_host-db1}
+  trail_db_schema=${trail_db_schema-ecedb}
+  trail_db_vendor=${trail_db_vendor-mysql}
   trail_db_vip_interface=${trail_db_vip_interface-eth0:0}
-  trail_nfs_export_list=${trail_nfs_export_list-/var/exports/multimedia}
+  trail_db_vip_ip=${trail_db_vip_ip-192.168.1.200}
+  trail_editor_host=${trail_editor_host-edit1}
+  trail_editor_port=${trail_editor_port-8080}
+  trail_import_host=${trail_import_host-edit2}
+  trail_import_port=${trail_import_port-8080}
+  trail_searh_port=${trail_search_port-8081}
+  trail_monitoring_host=${trail_monitoring_host-mon}
+  trail_network_name=$(get_network_name)
   trail_nfs_client_mount_point_parent=${trail_nfs_client_mount_point_parent-/mnt}
-  
-  # replace
+  trail_nfs_export_list=${trail_nfs_export_list-/var/exports/multimedia}
+  trail_nfs_master_host=${trail_nfs_master_host-nfs1}
+  trail_presentation_host=${trail_presentation_host-pres1}
+  trail_presentation_host_list=${trail_presentation_host-pres1}
+}
+
+function expand_all_variables_in_org_files() {
+  set_defaults_if_the_trails_are_not_set
+
   declare | grep ^trail_ | while read el; do
     local old_ifs=$IFS
     IFS='='
@@ -149,16 +164,14 @@ function get_blockdiag_groups() {
 }
 
 function get_blockdiag_call_flow() {
-
   # from the internet and to the ECEs
   local lb_call_flow="internet ->"
   if [ -n "$trail_lb_host" ]; then
     lb_call_flow="$lb_call_flow $trail_lb_host ->"
   fi
-  for el in $trail_presentation_host_list; do
+  for el in "$trail_presentation_host_list"; do
     lb_call_flow="$lb_call_flow ${el},"
   done
-  echo " " ${lb_call_flow} | sed 's/,$/;/g'
   
   if [ -n "$trail_editor_host" ]; then
     echo "  journalist -> $trail_editor_host" \
@@ -258,10 +271,6 @@ function get_network_name() {
   fi
 }
 
-host_name_list_outside_network="
-  amazonaws.com
-"
-
 ## $1 :; the host (not FQDN)
 function get_fqdn() {
   for el in $host_name_list_outside_network; do
@@ -398,12 +407,14 @@ EOF
       local appserver_host=$(echo $el | cut -d':' -f1)
       local appserver_port=$(echo $el | cut -d':' -f2)
       cat >> $file <<EOF
-  varnish -> "${appserver_host}:${appserver_port}";
+  "${appserver_host}:${appserver_port}" [ color = "orange" ];
+  "varnish:${trail_cache_port-80} -> "${appserver_host}:${appserver_port}";
 EOF
     done
   else
     cat >> $file <<EOF
-  varnish -> "tomcat:8080";
+  "tomcat:8080" [ color = "orange" ];
+  "varnish:${trail_cache_port-80}" -> "tomcat:8080";
 EOF
   fi
   echo "}" >> $file
@@ -510,6 +521,12 @@ function generate_content_engine_org() {
   generate_content_engine_diagram
 }
 
+function generate_backup_org() {
+  if [ -n "${trail_db_daily_backup_host}" ]; then
+    run cat $target_dir/backups-db.org >> $target_dir/backups.org
+  fi
+}
+
 set_up_build_directory
 set_customer_specific_variables
 generate_architecture_diagram
@@ -518,6 +535,7 @@ generate_content_engine_org
 generate_cache_server_org
 generate_db_org
 generate_nfs_org
+generate_backup_org
 generate_html_from_org
 generate_svg_from_blockdiag
 

From c3ebbc63560cb47be571d6fefb3f8f21966d1e7b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 10 Aug 2012 16:33:28 +0200
Subject: [PATCH 1183/2585] - added support for custom(er) specific chapters.
 This is useful for   including chapters on VPN configuration and SSH hop
 servers, which   always will be different from customer to customer.

  To use this feature,  create a directory called "customer" where the
  regular .org files are. Files you put in "customer" will overrides
  any of the existing .org chapters, whereas new chapters put in
  customer/extra-chapters will be included at the end of the VOSA
  handbook.

  For instance, to add a chapter on VPN setup and override the cache
  chapter, you'd have:

    customer/extra-chapters/connecting-to-example-dot-com-vpn.org
    customer/extra-chapters/cache-server.org

  Re-running create-handbook.sh would then include these in the right
  places.

  All the trail_ variables are available to you when you write your
  own chapters. Have a look at the standard .org files for a clue on
  this.
---
 .../vizrt/vosa-handbook/create-handbook.sh    | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index fffb2c99..48e545dd 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -98,9 +98,6 @@ function expand_all_variables_in_org_files() {
     IFS='='
     read key value <<< "$el"
     IFS=$old_ifs
-    if [ -z "$value" ]; then
-      continue
-    fi
     find $target_dir -name "*.org" | while read f; do
       sed -i "s~<%=[ ]*${key}[ ]*%>~${value}~g" ${f}
     done
@@ -110,6 +107,10 @@ function expand_all_variables_in_org_files() {
 function set_up_build_directory() {
   run mkdir -p $target_dir/graphics
   run cp *.org $target_dir
+  if [ -d $(pwd)/customer ]; then
+    echo "Copying customer specific files & overrides"
+    cp -r $(pwd)/customer $target_dir 
+  fi
 }
 
 function get_blockdiag_defs() {
@@ -527,6 +528,19 @@ function generate_backup_org() {
   fi
 }
 
+function add_customer_chapters() {
+  if [ -e $target_dir/customer/extra-chapters/*.org ]; then
+    (
+      cd $target_dir
+      for el in customer/extra-chapters/*.org; do
+        cat >> vosa-handbook.org <<EOF
+#+INCLUDE "$el"
+EOF
+      done
+    )
+  fi
+}
+
 set_up_build_directory
 set_customer_specific_variables
 generate_architecture_diagram
@@ -536,6 +550,7 @@ generate_cache_server_org
 generate_db_org
 generate_nfs_org
 generate_backup_org
+add_customer_chapters
 generate_html_from_org
 generate_svg_from_blockdiag
 

From 1a858cc489c4f918a0fd62084126446ec2b8375d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 13 Aug 2012 09:49:10 +0200
Subject: [PATCH 1184/2585] - added DB specific chapter

---
 .../doc/vizrt/vosa-handbook/backups-db.org     | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/backups-db.org

diff --git a/usr/share/doc/vizrt/vosa-handbook/backups-db.org b/usr/share/doc/vizrt/vosa-handbook/backups-db.org
new file mode 100644
index 00000000..74bba8ce
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/backups-db.org
@@ -0,0 +1,18 @@
+** DB backups
+If you've told ece-install to set up daily backups, there will be a
+cron scripts set up which create backups. 
+
+Part of the name of the cron script is the name of your DB schema, so
+the default location of the cron script on <%= trail_db_daily_backup_host %> is:
+#+BEGIN_SRC text
+/etc/cron.daily/<%= trail_db_schema %>-backup  
+#+END_SRC
+
+And it'll put its backups in
+#+BEGIN_SRC text
+/var/backups/escenic  
+#+END_SRC
+
+All these are overridable, see the ece-install guide for further
+details.
+

From 48af0801b898f33d33f7629f87768c141fd93552 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 13 Aug 2012 11:31:08 +0200
Subject: [PATCH 1185/2585] - tons of work of making the documentation
 brilliant

---
 usr/share/doc/vizrt/vosa-handbook/backups.org | 18 ------------
 .../vizrt/vosa-handbook/create-handbook.sh    | 29 ++++++++++++++++---
 .../doc/vizrt/vosa-handbook/monitoring.org    | 15 +++++-----
 .../vosa-handbook/network-file-system.org     |  8 ++---
 .../doc/vizrt/vosa-handbook/search-server.org |  2 +-
 5 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/backups.org b/usr/share/doc/vizrt/vosa-handbook/backups.org
index fc3580b9..2f84e351 100644
--- a/usr/share/doc/vizrt/vosa-handbook/backups.org
+++ b/usr/share/doc/vizrt/vosa-handbook/backups.org
@@ -1,23 +1,5 @@
 * Backups
 
-** DB backups
-If you've told ece-install to set up daily backups, there will be a
-cron scripts set up which create backups. 
-
-Part of the name of the cron script is the name of your DB schema, so
-the default location of the cron script on <%= trail_db_daily_backup_host %> is:
-#+BEGIN_SRC sh
-/etc/cron.daily/<%= trail_db_schema %>-backup  
-#+END_SRC
-
-And it'll put its backups in
-#+BEGIN_SRC sh
-/var/backups/escenic  
-#+END_SRC
-
-All these are overridable, see the ece-install guide for further
-details.
-
 ** Multimedia archive
 The other place were you've got actual content, is in the multimedia
 archive. This, typically live on a host called nfs1 (with a mirror on
diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 48e545dd..f2250d3b 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -82,7 +82,8 @@ function set_defaults_if_the_trails_are_not_set() {
   trail_import_port=${trail_import_port-8080}
   trail_searh_port=${trail_search_port-8081}
   trail_monitoring_host=${trail_monitoring_host-mon}
-  trail_network_name=$(get_network_name)
+  trail_network_name=${trail_network_name}
+  trail_dot_network_name=$(get_network_name)
   trail_nfs_client_mount_point_parent=${trail_nfs_client_mount_point_parent-/mnt}
   trail_nfs_export_list=${trail_nfs_export_list-/var/exports/multimedia}
   trail_nfs_master_host=${trail_nfs_master_host-nfs1}
@@ -409,7 +410,7 @@ EOF
       local appserver_port=$(echo $el | cut -d':' -f2)
       cat >> $file <<EOF
   "${appserver_host}:${appserver_port}" [ color = "orange" ];
-  "varnish:${trail_cache_port-80} -> "${appserver_host}:${appserver_port}";
+  "varnish:${trail_cache_port-80}" -> "${appserver_host}:${appserver_port}";
 EOF
     done
   else
@@ -488,7 +489,19 @@ function generate_db_org() {
 
 function generate_nfs_org() {
   if [[ -n "${trail_nfs_master_host}" && -n "${trail_nfs_slave_host}" ]]; then
-    run cat $target_dir/network-file-system-sync.org >> \
+    local blockdiag_file=$target_dir/graphics/network-file-system-sync.blockdiag
+    cat > $blockdiag_file <<EOF
+blockdiag {
+  "${trail_nfs_master_host}";
+  "${trail_nfs_slave_host}";
+  "${trail_nfs_slave_host}" -> "${trail_nfs_master_host}" [label = "reads"];
+}
+EOF
+    local file=$target_dir/network-file-system-sync.org
+    cat >> $file <<EOF
+[[./graphics/$(basename $blockdiag_file .blockdiag).svg]]
+EOF
+    run cat $file >> \
       $target_dir/network-file-system.org
   fi
 }
@@ -529,7 +542,7 @@ function generate_backup_org() {
 }
 
 function add_customer_chapters() {
-  if [ -e $target_dir/customer/extra-chapters/*.org ]; then
+  if [ $(ls $target_dir/customer/extra-chapters/ | grep .org$ | wc -l) -gt 0 ]; then
     (
       cd $target_dir
       for el in customer/extra-chapters/*.org; do
@@ -541,10 +554,18 @@ EOF
   fi
 }
 
+function generate_ssh_access_org() {
+  if [[ -n "${trail_gk_host}" && -n "${trail_control_host}" ]]; then
+    run cat $target_dir/ssh-access.org >> $target_dir/vosa-handbook.org
+  fi
+  
+}
+
 set_up_build_directory
 set_customer_specific_variables
 generate_architecture_diagram
 generate_overview_org
+generate_ssh_access_org
 generate_content_engine_org
 generate_cache_server_org
 generate_db_org
diff --git a/usr/share/doc/vizrt/vosa-handbook/monitoring.org b/usr/share/doc/vizrt/vosa-handbook/monitoring.org
index 17c1ee39..54f00441 100644
--- a/usr/share/doc/vizrt/vosa-handbook/monitoring.org
+++ b/usr/share/doc/vizrt/vosa-handbook/monitoring.org
@@ -18,11 +18,12 @@ the user under which ECE, EAE and the Search instance are running as
 
 *** In the Web Browser
 All VOSA hosts also has a (maximum) one minute old HTML report from
-system-info running on port 5678. 
+system-info running on port ~5678~. 
 
-Here's a screenshot of the system-info report running on
-http://<%= trail_presentation_host %>:5678/:
-[[[[graphics/pres1-system-info.png]]
+Here's a screenshot of the system-info report running on a
+presentation server:
+
+[[./graphics/pres1-system-info.png]]
 
 ** Hugin
 Hugin is an automatic, frequent aggregation of the system-info data of
@@ -31,7 +32,7 @@ produce a system-info report in YAML and check the files into a
 version repository.
 
 When browsing the Hugin web interface at
-http://<%= trail_control_host %><%= trail_network_name %>:5679/ you can quickly 
+http://<%= trail_control_host %><%= trail_dot_network_name %>:5679/ you can quickly 
 see all changes on the various servers. A change could be a new
 service which is all of a sudden listening on a new port or that the
 version of a installed package has changed. Nothing escapes Hugin's
@@ -43,12 +44,12 @@ trending of your site. I.e. how it has been behaving the last days,
 weeks and months.
 
 The address to your Munin instance is is:
- http://<%= trail_monitoring_host %><%= trail_network_name %>/munin/
+ http://<%= trail_monitoring_host %><%= trail_dot_network_name %>/munin/
 
 ** Icinga (enhanced Nagios)
 Icinga gives a good overview of the current health of the
 habitat. Head over to
- http://<%= trail_monitoring_host %><%= trail_network_name %>/icinga/ 
+ http://<%= trail_monitoring_host %><%= trail_dot_network_name %>/icinga/ 
 to get updates on host & service uptimes and disk fill rates. This is
 also the place were you'll schedule any maintenance work you do to
 prevent unnecessary alerts filling up your mobile phone and email
diff --git a/usr/share/doc/vizrt/vosa-handbook/network-file-system.org b/usr/share/doc/vizrt/vosa-handbook/network-file-system.org
index e367a71f..c781981a 100644
--- a/usr/share/doc/vizrt/vosa-handbook/network-file-system.org
+++ b/usr/share/doc/vizrt/vosa-handbook/network-file-system.org
@@ -1,8 +1,8 @@
 * Network File System
 
 ** NFS server
-<%= trail_nfs_master_host %>  has these network file shares: ~<%=
-trail_nfs_export_list %>~ These file share(s) are made available using
+<%= trail_nfs_master_host %>  has these network file shares: 
+~<%= trail_nfs_export_list %>~ These file share(s) are made available using
 NFS.
 
 ** NFS clients
@@ -11,5 +11,5 @@ have these shares mounted. The most important one is the one holding
 the multimedia archive of Escenic Content Engine. Typically, this
 share is called ~multimedia~. 
 
-In your habitat, all the shares from <%= trail_nfs_export_list %> are
-mounted on <%= trail_nfs_client_mount_point_parent %>.
+In your habitat, all the shares from ~<%= trail_nfs_export_list %>~ are
+mounted on ~<%= trail_nfs_client_mount_point_parent %>~.
diff --git a/usr/share/doc/vizrt/vosa-handbook/search-server.org b/usr/share/doc/vizrt/vosa-handbook/search-server.org
index e8519b0e..6609eb5a 100644
--- a/usr/share/doc/vizrt/vosa-handbook/search-server.org
+++ b/usr/share/doc/vizrt/vosa-handbook/search-server.org
@@ -17,7 +17,7 @@ For instance, let's say you're upgrading the search server for
 <%= trail_import_host %>'s search instance.
 
 First, go to:
-http://<%= trail_editor_host %>:<%= trail_editor_port %>/escenic-admin/browser/Global/com/escenic/webservice/search/DelegatingSearchEngine?property=solrURI
+http://<%= trail_editor_host %><%= trail_dot_network_name %>:<%= trail_editor_port %>/escenic-admin/browser/Global/com/escenic/webservice/search/DelegatingSearchEngine?property=solrURI
 
 Then, change the value from:
 #+BEGIN_SRC conf

From 5dd648944463037ecca52af37299e6392c2d494e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 13 Aug 2012 11:31:17 +0200
Subject: [PATCH 1186/2585] - added

---
 .../doc/vizrt/vosa-handbook/ssh-access.org    | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/ssh-access.org

diff --git a/usr/share/doc/vizrt/vosa-handbook/ssh-access.org b/usr/share/doc/vizrt/vosa-handbook/ssh-access.org
new file mode 100644
index 00000000..12f4b4c1
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/ssh-access.org
@@ -0,0 +1,47 @@
+* SSH Access
+
+This chapter describes how you can access the <%= trail_network_name %>
+network using SSH and assumes that you have your [[http://en.wikipedia.org/wiki/Secure_Shell#Key_management][SSH key]] on the
+<%= trail_gk_host %> and all over the <%= trail_network_name %>.
+
+It also assumes that the gateway IP of your office/network has been
+added to the access control list of hosts/networks which are allowed
+to access the gatekeeper.
+
+** Add your SSH key to your key agent
+On your local machine, load your SSH key into your key agent. On Linux
+and Mac OS X, this should only be a matter of:
+#+BEGIN_SRC text
+$ ssh-add  
+#+END_SRC
+Asking the SSH key agent for all keys should now list your key. Note
+that if you have multiple keys, or have called your one key something
+different that what's default, you must pass the key name to the
+~ssh-add~ command above.
+
+Once you're done adding your key(s), confirm their presence in the key
+ring with:
+#+BEGIN_SRC text
+$ ssh-add -l
+2048 33:49:02:c5:30:8d:2e:9g:28:82:3a:89:5c:b3:5d:a3 /home/myuser/.ssh/id_rsa (RSA)
+#+END_SRC
+
+** Log on to the gatekeeper
+On your local machine, do:
+#+BEGIN_SRC text
+$ ssh <%= trail_control_host %>
+#+END_SRC
+
+** Log on to the control server
+Once you're on <%= trail_gk_host %> should be able to log on to the
+control server:
+#+BEGIN_SRC text
+$ ssh <%= trail_control_host %>
+#+END_SRC
+
+From the control server, you can access any of the machines in the
+<%= trail_network_name %>, e.g.:
+#+BEGIN_SRC text
+$ ssh <%= trail_presentation_host %>
+#+END_SRC
+

From f43e59f85813ab396d1d46bbc611020db506d9ac Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 14 Aug 2012 10:26:38 +0200
Subject: [PATCH 1187/2585] - fixed the default APT mirror

---
 usr/bin/vosa | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 479e3428..2e59d7b1 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -138,7 +138,7 @@ netmask 255.255.0.0
 gateway 172.24.1.1
 
 # address of mirror and/or proxy to use (defaults to mirror://mirrors.ubuntu.com/mirrors.txt)
-# mirror http://no.archive.ubuntu.com/
+# mirror http://no.archive.ubuntu.com/ubuntu
 # proxy http://my-local-proxy:3142/
 user_data /etc/vizrt/vosa/user-data/puppet-client.txt
 
@@ -373,7 +373,7 @@ timezone: Europe/Oslo
 
 apt_update: true
 apt_upgrade: true
-apt_mirror: http://no.archive.ubuntu.com/
+apt_mirror: http://no.archive.ubuntu.com/ubuntu
 
 # ACPID installed before puppet, because it ensures clean shutdowns, even if something goes wrong.
 packages:

From da44f46ff4420e91ac836faf3e7c84aa19465977 Mon Sep 17 00:00:00 2001
From: Kevin Flynn <kevin@kevin-Precision-M4500.(none)>
Date: Wed, 15 Aug 2012 09:42:16 +0200
Subject: [PATCH 1188/2585] added an empty line!

---
 usr/share/doc/escenic/ece-install-guide.org | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 8af39d22..e841e306 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -63,6 +63,7 @@ ece-install.
 * Downloading the ece-install Script
 The easiest way of getting ece-install is to use git. Type this in
 your shell:
+
 #+BEGIN_SRC text
 $ git clone https://github.com/skybert/ece-scripts.git
 #+END_SRC

From 56ac11673154345614692277bc36ab84a9713e3d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 15 Aug 2012 10:34:08 +0200
Subject: [PATCH 1189/2585] - escenic-admin is no longer included in search
 instances   (profile=search) - the publication WARs are no longer deploy for
 editorial instances   (profile=editor)

---
 .../ece-scripts/ece-install.d/content-engine.sh       | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 3da25fe8..27afbbae 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -8,18 +8,17 @@ function get_deploy_white_list() {
     return
   fi
   
-  local white_list="escenic-admin"
+  local white_list=""
   
   if [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER \
     -a -n "${publication_name}" ]; then
-    white_list="${white_list} ${publication_name} "
+    white_list="escenic-admin ${publication_name} "
   elif [ $install_profile_number -eq $PROFILE_SEARCH_SERVER ]; then 
-    white_list="${white_list} solr indexer-webapp"
+    white_list="solr indexer-webapp"
   elif [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ]; then
-    white_list="${white_list} "$(get_publication_short_name_list)
+    white_list="escenic-admin "$(get_publication_short_name_list)
   elif [ $install_profile_number -eq $PROFILE_EDITORIAL_SERVER ]; then
-    white_list="${white_list} escenic studio indexer-webservice webservice"
-    white_list="${white_list} "$(get_publication_short_name_list)
+    white_list="escenic-admin escenic studio indexer-webservice webservice"
   fi
 
   echo ${white_list}

From a02cb002a3fa6f2f87f310aae9a768055d70dabf Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 15 Aug 2012 11:16:14 +0200
Subject: [PATCH 1190/2585] - Currently (2012-08-15), ECS insists on JRE = 1.6.
 ece-install now   sets this correctly up in the StudioConfig Nursery
 configuration.

---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 27afbbae..313349fa 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -388,6 +388,8 @@ EOF
 
   file=$common_nursery_dir/com/escenic/webstart/StudioConfig.properties
   cat >> $file <<EOF
+# Currently (2012-08-15), ECS insists on JRE = 1.6.
+jreRequirement=1.6
 
 # We set this to get around a missing feature in Varnish, see:
 # https://www.varnish-cache.org/trac/wiki/Future_Feature#Chunkedencodingclientrequests

From f4f8b55e104c40538426b79d3ff6c1fbea184627 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 15 Aug 2012 11:18:57 +0200
Subject: [PATCH 1191/2585] - ece-install now sets up a proper default font:
 This font have been  tested and works with (at least): English, Norwegian &
 Tamil.

---
 .../escenic/ece-scripts/ece-install.d/content-engine.sh   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 313349fa..e97dbd38 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -395,6 +395,14 @@ jreRequirement=1.6
 # https://www.varnish-cache.org/trac/wiki/Future_Feature#Chunkedencodingclientrequests
 # For Escenic-ites, see: VF-3480
 property.com.escenic.client.chunked=false
+
+# This font have been tested and works with (at least): English,
+# Norwegian & Tamil.
+property.com.escenic.studio.font.macosx=Arial Unicode MS
+property.com.escenic.studio.font.linux=Arial Unicode MS
+property.com.escenic.studio.font.windows7=Arial Unicode MS
+property.com.escenic.studio.font.windowsxp=Arial Unicode MS
+property.com.escenic.studio.font.windowsvista=Arial Unicode MS
 EOF
 }
 

From 731344b4f3e70aea191615806313d04491a4c5e5 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 15 Aug 2012 12:00:18 +0200
Subject: [PATCH 1192/2585] - added comment about which OSs bundle the Arial
 Unicode MS font.

---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index e97dbd38..33ea54aa 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -397,7 +397,8 @@ jreRequirement=1.6
 property.com.escenic.client.chunked=false
 
 # This font have been tested and works with (at least): English,
-# Norwegian & Tamil.
+# Norwegian & Tamil. The font comes with (at least) MS Office and OS X
+# 10.5 and up.
 property.com.escenic.studio.font.macosx=Arial Unicode MS
 property.com.escenic.studio.font.linux=Arial Unicode MS
 property.com.escenic.studio.font.windows7=Arial Unicode MS

From 90d7639932b0371c300201382aeb3ce1e332e99a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 15 Aug 2012 12:21:20 +0200
Subject: [PATCH 1193/2585] - added chapter on DB failover

---
 .../doc/vizrt/vosa-handbook/database-failover.org      | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/database-failover.org

diff --git a/usr/share/doc/vizrt/vosa-handbook/database-failover.org b/usr/share/doc/vizrt/vosa-handbook/database-failover.org
new file mode 100644
index 00000000..5e741bcc
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/database-failover.org
@@ -0,0 +1,10 @@
+** Failing over the master DB
+If <%= trail_db_master_host %> goes down and you don't get it up again, you
+must change <%= trail_db_slave_host %> to become the master DB.
+
+*** Changes to the DB on <%= trail_db_slave_host %>
+
+*** Changing the VIP
+
+*** Changing the master back to <%= trail_db_master_host %>
+ 

From e70aec91e68ba582e497c4f75f3aadd263981667 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 15 Aug 2012 12:24:00 +0200
Subject: [PATCH 1194/2585] - added section on the virtualization host and
 guests to the overview   chapter. It uses the following parameter:

  trail_virtualization_map="
  donaldsta001#12.23.227.11#edit2,mon,analysis
  donaldedt001#12.23.227.8#edit1
  donaldpre001#12.23.227.9#pres1,staging
  donaldpre002#12.23.227.10#pres2,control
  "
---
 .../vizrt/vosa-handbook/create-handbook.sh    | 44 +++++++++++++++++--
 1 file changed, 41 insertions(+), 3 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index f2250d3b..4e38a026 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -276,9 +276,8 @@ function get_network_name() {
 ## $1 :; the host (not FQDN)
 function get_fqdn() {
   for el in $host_name_list_outside_network; do
-    echo "el=$el" >> /tmp/t
     if [ $(echo $1 | grep $el | wc -l) -gt 0 ]; then
-      echo "$1"
+      echo "network outside: $el" "$1"
       return
     fi
   done
@@ -293,6 +292,7 @@ function get_link() {
 
 function get_generated_overview() {
   cat <<EOF
+** The machines and their services
 |-------------------------------------------|
 | Machine     | Service quick links         |
 |-------------------------------------------|
@@ -558,7 +558,44 @@ function generate_ssh_access_org() {
   if [[ -n "${trail_gk_host}" && -n "${trail_control_host}" ]]; then
     run cat $target_dir/ssh-access.org >> $target_dir/vosa-handbook.org
   fi
-  
+}
+
+function generate_virtualization_overview_org() {
+  if [ -z "$trail_virtualization_map" ]; then
+    return
+  fi
+
+  local file=$target_dir/virtualization-overview-generated.org
+  cat > $file <<EOF
+** Virtualization Overview
+Here's an overview of your virtualization hosts & their guests:
+
+|-------------------------------------------|
+| Virtualization host | IP | Virtualization guests |
+|-------------------------------------------|
+EOF
+  for el in $trail_virtualization_map; do
+    local old_ifs=$IFS
+    IFS='#'
+    read host ip guests <<< "$el"
+    IFS=$old_ifs
+    echo -n "| $(get_fqdn $host) | $ip | " >> $file
+    for ele in $(echo "$guests" | sed 's/,/ /g'); do
+      echo -n " [[$(get_link $ele):5678][$(get_fqdn $ele)]] " >> $file
+    done
+    echo "|" >> $file
+  done
+
+  cat >> $file <<EOF
+|-------------------------------------------|
+
+For more background and documentation on virtualization hosts &
+guests, see the
+[[http://docs.redhat.com/docs/en-US/Red_Hat_Enterprise_Linux/6/html-single/Virtualization_Host_Configuration_and_Guest_Installation_Guide][Virtualization Host Configuration and Guest Installation Guide]]
+from RedHat.
+EOF
+
+  cat $file >> $target_dir/generated-overview.org
 }
 
 set_up_build_directory
@@ -571,6 +608,7 @@ generate_cache_server_org
 generate_db_org
 generate_nfs_org
 generate_backup_org
+generate_virtualization_overview_org
 add_customer_chapters
 generate_html_from_org
 generate_svg_from_blockdiag

From dece2d184961c08ebeb8938219de3b2a654980a9 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 15 Aug 2012 12:47:24 +0200
Subject: [PATCH 1195/2585] - added common-bashing::split_string <delimiter>
 <string>

  $ split_string ',' Hello, you there, with some commands!
  Hello you there with some commands!
---
 .../escenic/ece-scripts/common-bashing.sh     | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index ee475da5..bdb75e36 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -282,3 +282,22 @@ function is_unauthorized_to_access_url() {
 function ltrim() {
   echo $1 | sed 's/^[ ]*//g'
 }
+
+## $1    : the character on to wich to split it
+## $@[1] : the rest of the arguments is the string(s) you want to have
+##         splitted.
+function split_string() {
+  if [[ -z $1 || -z $2 ]]; then
+    return
+  fi
+  
+  local delimeter=$1
+  shift;
+  
+  local old_ifs=$IFS
+  IFS=$delimeter
+  read splitted_string <<< $@
+  IFS=$old_ifs
+
+  echo $splitted_string
+}

From 1378abf51eb0b97aae5f048128afe6587c5b9b73 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 15 Aug 2012 13:46:57 +0200
Subject: [PATCH 1196/2585] - added a third, optional option to the  
 fai_publication_domain_mapping_list, where a comma separated list of   host
 alias to be added to the publication in question.

    fai_publication_domain_mapping_list="
      ildpub#ild.escenic.com#feuer.escenic.com,fuego.escenic.com
    "

  Will produce:

    <Host name="ild.escenic.com" appBase="webapps" autoDeploy="false">
      <Alias>feuer.escenic.com</Alias>
      <Alias>fuego.escenic.com</Alias>
      <Context displayName="ild.escenic.com"
               docBase="ildpub"
               path=""
      />
    </Host>
---
 usr/share/doc/escenic/ece-install-guide.org   | 11 ++++++++--
 .../ece-scripts/ece-install.d/app-server.sh   | 20 +++++++++++++++----
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index e841e306..be9eef3d 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -643,7 +643,7 @@ in the following FAI parameter:
 #+BEGIN_SRC conf
 fai_publication_domain_mapping_list="
   firepub#fire.escenic.com
-  ildpub#ild.escenic.com
+  ildpub#ild.escenic.com#feuer.escenic.com,fuego.escenic.com
 "
 #+END_SRC
 
@@ -657,6 +657,8 @@ This will produce the following stanzas in server.xml:
   />
 </Host>
 <Host name="ild.escenic.com" appBase="webapps" autoDeploy="false">
+  <Alias>feuer.escenic.com</Alias>
+  <Alias>fuego.escenic.com</Alias>
   <Context displayName="ild.escenic.com"
            docBase="ildpub"
            path=""
@@ -664,6 +666,11 @@ This will produce the following stanzas in server.xml:
 </Host>
 #+END_SRC
 
+As you can see, there's a third optional option to the
+~fai_publication_domain_mapping_list~ which can be specified as a
+comma separated list of host aliases to be added to the app server host
+configuration. 
+
 Furthermore, if these host names are  not resolvable to your local
 host (neither localhost or the IP of your $HOSTNAME), ece-install will
 add entries for these domains in the machine's /etc/hosts:
@@ -738,7 +745,7 @@ $HOME/ece-install.conf file of the root user:
 | ~fai_presentation_shutdown~           | 8005                                              | Shutdown port of the presentation instance                                                                                            |
 | ~fai_public_host_name~                | ${HOSTNAME}:8080                                  | The public address for your website                                                                                                   |
 | ~fai_publication_create~              | 0                                                 | Create a new publication                                                                                                              |
-| ~fai_publication_domain_mapping_list~ | ""                                                | Mapping between publication names and their corresponding domains on the form: "one#one.com other#other.com"                          |
+| ~fai_publication_domain_mapping_list~ | ""                                                | Mapping between publication names and their corresponding domains on the form: "one#one.com other#other.com[#<alias1>[,<alias2>]]"    |
 | ~fai_publication_name~                | mypub                                             | Name of the publication                                                                                                               |
 | ~fai_publication_use_instance~        | dev1                                              | Name of local instance to use for creation                                                                                            |
 | ~fai_publication_war~                 | "WF or ECE demo WAR"                              | WAR to base the new publication on                                                                                                    |
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 821323e8..a0fde7b7 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -143,7 +143,7 @@ function set_up_app_server()
   # it's important to append (and not pre-pend) the ECE libraries so
   # that things put it in the standard loader behaves as expected,
   # such as log4j configuration put in ${tomcat.base}/lib.
-  file=$tomcat_base/conf/catalina.properties
+  local file=$tomcat_base/conf/catalina.properties
   common_loader=$(grep ^common.loader $file)
   escaped_common_loader=$(get_escaped_bash_string ${common_loader})
   escenic_loader=",$\{catalina.base\}/escenic/lib/*.jar"
@@ -304,15 +304,27 @@ EOF
     for el in ${fai_publication_domain_mapping_list}; do
       local old_ifs=$IFS
       # the entries in the fai_publication_domain_mapping_list are on
-      # the form: <publication>#<domain>
+      # the form: <publication>#<domain>#[<alias1>[,<alias2>]]
       IFS='#'
-      read publication domain <<< "$el"
+      read publication domain aliases <<< "$el"
       IFS=$old_ifs
 
       ensure_domain_is_known_to_local_host ${domain}
+
+      local file=$tomcat_base/conf/server.xml
       
-      cat >> $tomcat_base/conf/server.xml <<EOF
+      cat >> $file <<EOF
       <Host name="${domain}" appBase="webapps" autoDeploy="false">
+EOF
+
+      # add the host aliases (if available)
+      for ele in $(split_string ',' $aliases); do
+        cat >> $file <<EOF
+        <Alias>$ele</Alias>
+EOF
+      done
+      
+      cat >> $file <<EOF
         <Context displayName="${domain}"
                  docBase="${publication}"
                  path=""

From 71a4f988009752de17df5ac84d8b42494641a300 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 15 Aug 2012 14:59:23 +0200
Subject: [PATCH 1197/2585] - all generated .org are named -generated.org

---
 usr/share/doc/vizrt/vosa-handbook/overview.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/overview.org b/usr/share/doc/vizrt/vosa-handbook/overview.org
index fab6a3dd..30f97c21 100644
--- a/usr/share/doc/vizrt/vosa-handbook/overview.org
+++ b/usr/share/doc/vizrt/vosa-handbook/overview.org
@@ -2,4 +2,4 @@
 
 #+ATTR_HTML: alt="Typical ECE architecture"
 [[[[graphics/architecture.svg]]
-#+INCLUDE: "generated-overview.org"
+#+INCLUDE: "overview-generated.org"

From eedc53fbccc97822bc5917d49a2bf69d22d3a994 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 15 Aug 2012 14:59:53 +0200
Subject: [PATCH 1198/2585] - the KVM overview is now included again - included
 links to the escenic-admin/top for all ECEs

---
 .../doc/vizrt/vosa-handbook/create-handbook.sh      | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 4e38a026..78089c1e 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -88,7 +88,7 @@ function set_defaults_if_the_trails_are_not_set() {
   trail_nfs_export_list=${trail_nfs_export_list-/var/exports/multimedia}
   trail_nfs_master_host=${trail_nfs_master_host-nfs1}
   trail_presentation_host=${trail_presentation_host-pres1}
-  trail_presentation_host_list=${trail_presentation_host-pres1}
+  trail_presentation_host_list=${trail_presentation_host_list-${trail_presentation_host}}
 }
 
 function expand_all_variables_in_org_files() {
@@ -320,6 +320,7 @@ EOF
 | $(get_fqdn ${trail_editor_host}) | \
   [[$(get_link ${trail_editor_host}):5678/][system-info]] \
   [[${ece_url}:${trail_editor_port-8080}/escenic-admin/][escenic-admin]] \
+  [[${ece_url}:${trail_editor_port-8080}/escenic-admin/top][top]] \
   [[${ece_url}:${trail_search_port-8081}/solr/admin/][solr]] \
   [[${ece_url}:${trail_editor_port-8080}/studio/][studio]] \
   [[${ece_url}:${trail_editor_port-8080}/escenic/][escenic]] \
@@ -335,6 +336,7 @@ EOF
 | $(get_fqdn ${trail_import_host}) | \
   [[$(get_link ${trail_import_host}):5678/][system-info]] \
   [[$(get_link ${trail_import_host}):${trail_import_port}/escenic-admin/][escenic-admin]] \
+  [[$(get_link ${trail_import_host}):${trail_import_port}/escenic-admin/top][top]] \
   [[$(get_link ${trail_import_host}):${trail_search_port-8081}/solr/admin/][solr]] \
   [[$(get_link ${trail_import_host}):${trail_import_port}/studio/][studio]] \
   [[$(get_link ${trail_import_host}):${trail_import_port}/escenic/][escenic]] \
@@ -351,6 +353,7 @@ EOF
 | $(get_fqdn ${el}) | \
   [[$(get_link ${el}):5678/][system-info]] \
   [[$(get_link ${el}):8080/escenic-admin/][escenic-admin]] \
+  [[$(get_link ${el}):8080/escenic-admin/top][top]] \
   [[$(get_link ${el}):8081/solr/admin/][solr]] \
 |
 EOF
@@ -387,7 +390,7 @@ EOF
 
 ## included from overview.org
 function generate_overview_org() {
-  local file=$target_dir/generated-overview.org
+  local file=$target_dir/overview-generated.org
   cat > $file <<EOF
 $(get_generated_overview)
 EOF
@@ -542,7 +545,9 @@ function generate_backup_org() {
 }
 
 function add_customer_chapters() {
-  if [ $(ls $target_dir/customer/extra-chapters/ | grep .org$ | wc -l) -gt 0 ]; then
+  if [ $(ls $target_dir/customer/extra-chapters/ 2>/dev/null | \
+    grep .org$ | \
+    wc -l) -gt 0 ]; then
     (
       cd $target_dir
       for el in customer/extra-chapters/*.org; do
@@ -595,7 +600,7 @@ guests, see the
 from RedHat.
 EOF
 
-  cat $file >> $target_dir/generated-overview.org
+  cat $file >> $target_dir/overview-generated.org
 }
 
 set_up_build_directory

From 9f41921466537677225f13ced75f08e34bdc3a47 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 16 Aug 2012 13:01:17 +0200
Subject: [PATCH 1199/2585] - the sub chapters of the profile:restore were in
 the wrong place (!)

---
 usr/share/doc/escenic/ece-install-guide.org | 131 ++++++++++----------
 1 file changed, 66 insertions(+), 65 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index be9eef3d..5efffdf2 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -383,6 +383,72 @@ what's available on the host where it's run):
 - ECE, cache and web server configuration
 - Escenic software
 
+** Running interactively
+*** Start ece-install and choose the Option, "Restore from backup"
+#+BEGIN_SRC text
+# ece-install
+#+END_SRC
+
+*** Select Which Backup to Restore
+
+#+BEGIN_SRC text
+[ece-install-5] From which dataset do you wish to backup?
+    1 - engine-dev1-backup-2011-10-10.tar.gz
+    2 - engine-dev1-backup-2011-10-11.tar.gz
+[ece-install-5] Enter the number next to the tarball, from 1 to 2
+Your choice [1]>
+#+END_SRC
+
+The ece script mentioned above will create backups in
+~/var/backups/escenic~ and the ece-install script will hence expect to
+find them here.
+
+*** Choose What to Restore
+#+BEGIN_SRC text
+[ece-install-12] Which part of the system do you wish to restore?
+    1 - The database
+    2 - The Solr and ECE data files (multimedia archive)
+    3 - The ECE configuration files
+    4 - The Escenic and Tomcat software binaries + publication templates
+Your choice [1]> 2
+#+END_SRC
+
+*** Sit Back and Watch ece-install Restore the Data for You
+#+BEGIN_SRC text
+[ece-install-13] Restoring the Solr & ECE data files on ubiquitous ...
+[ece-install-21] - The installation is now complete! It took 0d 0h 0m 20s
+[ece-install] Successfully restored Solr & ECE data files
+[ece-install] from backup:  engine-dev1-backup-2011-10-12.tar.gz
+[ece-install] Check /var/lib/escenic to verify they're all there
+#+END_SRC
+
+** Running in FAI mode
+If you're running in FAI mode, you can choose between these settings
+to decide what to restore and where to find the backup file to
+restore from:
+
+|---------------------------------+---------+----------------------------------------------------|
+| Parameter                       | Default | Description                                        |
+|---------------------------------+---------+----------------------------------------------------|
+| ~fai_restore_all~               |       0 | Restore everything found in the backup file        |
+| ~fai_restore_db~                |       0 | Install the DB server & restore its contents       |
+| ~fai_restore_data_files~        |       0 | Restore the Solr & ECE data files                  |
+| ~fai_restore_configuration~     |       0 | Restore the Solr & ECE configuration files         |
+| ~fai_restore_software_binaries~ |       0 | Restore the Escenic and Apache Tomcat software     |
+| ~fai_restore_from_file~         |      "" | The .tar.gz produced by ~ece -i <instance> backup~ |
+|---------------------------------+---------+----------------------------------------------------|
+
+For example, to restore everything possible from a given tarball, you
+need this in your ece-install.conf:
+#+BEGIN_SRC conf
+fai_enabled=1
+
+fai_restore_from_backup=1
+fai_restore_all=1
+fai_restore_from_file=/var/backups/escenic/engine-dev1-backup-2011-10-10.tar.gz
+#+END_SRC
+
+
 ** Profile :: Analysis Server
 This profile will install the Escenic Analysis Engine and configure it
 for production use with sane defaults. Be sure to use a different DB
@@ -458,71 +524,6 @@ $ dd if=/dev/urandom bs=512 count=1 | \
     cut -d' ' -f2   
 #+END_SRC
 
-** Running interactively
-*** Start ece-install and choose the Option, "Restore from backup"
-#+BEGIN_SRC text
-# ece-install
-#+END_SRC
-
-*** Select Which Backup to Restore
-
-#+BEGIN_SRC text
-[ece-install-5] From which dataset do you wish to backup?
-    1 - engine-dev1-backup-2011-10-10.tar.gz
-    2 - engine-dev1-backup-2011-10-11.tar.gz
-[ece-install-5] Enter the number next to the tarball, from 1 to 2
-Your choice [1]>
-#+END_SRC
-
-The ece script mentioned above will create backups in
-~/var/backups/escenic~ and the ece-install script will hence expect to
-find them here.
-
-*** Choose What to Restore
-#+BEGIN_SRC text
-[ece-install-12] Which part of the system do you wish to restore?
-    1 - The database
-    2 - The Solr and ECE data files (multimedia archive)
-    3 - The ECE configuration files
-    4 - The Escenic and Tomcat software binaries + publication templates
-Your choice [1]> 2
-#+END_SRC
-
-*** Sit Back and Watch ece-install Restore the Data for You
-#+BEGIN_SRC text
-[ece-install-13] Restoring the Solr & ECE data files on ubiquitous ...
-[ece-install-21] - The installation is now complete! It took 0d 0h 0m 20s
-[ece-install] Successfully restored Solr & ECE data files
-[ece-install] from backup:  engine-dev1-backup-2011-10-12.tar.gz
-[ece-install] Check /var/lib/escenic to verify they're all there
-#+END_SRC
-
-** Running in FAI mode
-If you're running in FAI mode, you can choose between these settings
-to decide what to restore and where to find the backup file to
-restore from:
-
-|---------------------------------+---------+----------------------------------------------------|
-| Parameter                       | Default | Description                                        |
-|---------------------------------+---------+----------------------------------------------------|
-| ~fai_restore_all~               |       0 | Restore everything found in the backup file        |
-| ~fai_restore_db~                |       0 | Install the DB server & restore its contents       |
-| ~fai_restore_data_files~        |       0 | Restore the Solr & ECE data files                  |
-| ~fai_restore_configuration~     |       0 | Restore the Solr & ECE configuration files         |
-| ~fai_restore_software_binaries~ |       0 | Restore the Escenic and Apache Tomcat software     |
-| ~fai_restore_from_file~         |      "" | The .tar.gz produced by ~ece -i <instance> backup~ |
-|---------------------------------+---------+----------------------------------------------------|
-
-For example, to restore everything possible from a given tarball, you
-need this in your ece-install.conf:
-#+BEGIN_SRC conf
-fai_enabled=1
-
-fai_restore_from_backup=1
-fai_restore_all=1
-fai_restore_from_file=/var/backups/escenic/engine-dev1-backup-2011-10-10.tar.gz
-#+END_SRC
-
 ** Data security
 You should take heed when running restore, so that you're not
 restoring a system which you didn't want to change (yes, this mishap

From 38f5ed360227099092db0aea39ecd1fffdcdc38d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 16 Aug 2012 16:20:34 +0200
Subject: [PATCH 1200/2585] - added support for --doc-dir <dir> where the
 customer can specify the   path to their own vosa-handbook chapters and
 overrides.

- added support for --conf-file where the customer can specify the
  configuration file for creating the handbook. This is the fail with
  all the trail_ parameters left by ece-install.

- added support for trail_staging_editor_host, will now generate an
  own staging overview.

- improved support for customer specific chapters. The customer can
  now specify the order of the extra chapters by creating an
  <dir>/extra-chapters/overview.org with contents like:

  #+INCLUDE: "./customer/extra-chapters/vpn-client.org"
  #+INCLUDE: "./customer/extra-chapters/very-special.org"

  The paths will first make sense when this overview.org is included
  by the create-handbook.sh so don't worry that these don't match up
  with whatever directory structure you have when writing the extra
  chapters. The important thing with the extra chapters is that you
  have:

  <dir>/<overrides>                   <-- if you want to override some chapter(s)
  <dir>/extra-chapters/some-other.org <-- your extra chapter
  <dir>/extra-chapters/overview.org   <-- optional, only to dictate order
---
 .../vizrt/vosa-handbook/create-handbook.sh    | 207 +++++++++++++-----
 1 file changed, 152 insertions(+), 55 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 78089c1e..0cd1ca61 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -33,13 +33,15 @@ function generate_svg_from_blockdiag() {
 }
 
 function set_customer_specific_variables() {
-  local conf_file=$(basename $0 .sh).conf
   if [ -r $conf_file  ]; then
     source $conf_file
     host_name_list_outside_network="
       $host_name_list_outside_network
       ${trail_host_name_list_outside_network}
     "
+  else
+    echo $conf_file " doesn't exist :-("
+    exit 1
   fi
 
   local virtual_host_key_prefix="trail_virtual_host_"
@@ -106,11 +108,25 @@ function expand_all_variables_in_org_files() {
 }
 
 function set_up_build_directory() {
+  if [[ -n "$target_dir" && -d $target_dir ]]; then
+    rm -rf $target_dir
+  fi
   run mkdir -p $target_dir/graphics
   run cp *.org $target_dir
-  if [ -d $(pwd)/customer ]; then
-    echo "Copying customer specific files & overrides"
-    cp -r $(pwd)/customer $target_dir 
+
+  # customer chapters & overrides
+  if [[ -n $customer_doc_dir && -d $customer_doc_dir ]]; then
+    run mkdir -p $target_dir/customer
+    
+    if [ $(ls $customer_doc_dir/*.org 2>/dev/null | wc -l) -gt 0 ]; then
+      echo "Copying chapter overides from $customer_doc_dir ..."
+      run cp $customer_doc_dir/*.org $target_dir/customer/
+    fi
+    local dir=$customer_doc_dir/extra-chapters
+    if [ -d $dir ]; then
+      echo "Copying extra customer chapters from $dir"
+      run cp -r $dir $target_dir/customer/extra-chapters/
+    fi
   fi
 }
 
@@ -292,11 +308,9 @@ function get_link() {
 
 function get_generated_overview() {
   cat <<EOF
-** The machines and their services
-|-------------------------------------------|
-| Machine     | Service quick links         |
-|-------------------------------------------|
+** Production Habitat :: Machines & Their Services
 EOF
+  get_machine_matrix_header
   if [ -n "${trail_monitoring_host}" ]; then
     cat <<EOF 
 | $(get_fqdn $trail_monitoring_host) | \
@@ -315,48 +329,30 @@ EOF
   fi
 
   if [ -n "${trail_editor_host}" ]; then
-    local ece_url="$(get_link ${trail_editor_host})"
-    cat <<EOF 
-| $(get_fqdn ${trail_editor_host}) | \
-  [[$(get_link ${trail_editor_host}):5678/][system-info]] \
-  [[${ece_url}:${trail_editor_port-8080}/escenic-admin/][escenic-admin]] \
-  [[${ece_url}:${trail_editor_port-8080}/escenic-admin/top][top]] \
-  [[${ece_url}:${trail_search_port-8081}/solr/admin/][solr]] \
-  [[${ece_url}:${trail_editor_port-8080}/studio/][studio]] \
-  [[${ece_url}:${trail_editor_port-8080}/escenic/][escenic]] \
-  [[${ece_url}:${trail_editor_port-8080}/webservice/][webservice]] \
-  [[${ece_url}:${trail_editor_port-8080}/escenic-admin/browser/Webapp%20ECE%20Webservice%20Webapp/com/escenic/servlet/filter/cache/AuthenticationFilterCache][logged in users]] \
-
-|
-EOF
+    echo $(
+      get_editor_host_overview \
+        $trail_editor_host \
+        $trail_editor_port
+    )
   fi
   
   if [ -n "${trail_import_host}" ]; then
-  cat <<EOF 
-| $(get_fqdn ${trail_import_host}) | \
-  [[$(get_link ${trail_import_host}):5678/][system-info]] \
-  [[$(get_link ${trail_import_host}):${trail_import_port}/escenic-admin/][escenic-admin]] \
-  [[$(get_link ${trail_import_host}):${trail_import_port}/escenic-admin/top][top]] \
-  [[$(get_link ${trail_import_host}):${trail_search_port-8081}/solr/admin/][solr]] \
-  [[$(get_link ${trail_import_host}):${trail_import_port}/studio/][studio]] \
-  [[$(get_link ${trail_import_host}):${trail_import_port}/escenic/][escenic]] \
-  [[$(get_link ${trail_import_host}):${trail_import_port}/webservice/][webservice]] \
-|
-EOF
+    echo $(
+      get_editor_host_overview \
+        $trail_import_host \
+        $trail_import_port
+    )
   fi
   
   for el in nop $trail_presentation_host_list; do
     if [[ $el == "nop" ]]; then
       continue
     fi
-    cat <<EOF 
-| $(get_fqdn ${el}) | \
-  [[$(get_link ${el}):5678/][system-info]] \
-  [[$(get_link ${el}):8080/escenic-admin/][escenic-admin]] \
-  [[$(get_link ${el}):8080/escenic-admin/top][top]] \
-  [[$(get_link ${el}):8081/solr/admin/][solr]] \
-|
-EOF
+    echo $(
+      get_presentation_host_overview \
+        $el \
+        8080
+    )
   done
   
   if [ -n "${trail_analysis_host}" ]; then
@@ -377,14 +373,74 @@ EOF
     if [[ $el == "nop" ]]; then
       continue
     fi
+    echo $(
+      get_simple_host_overview $el
+    )
+  done
+  get_machine_matrix_footer
+
+  if [ -n "$trail_staging_editor_host" ]; then
     cat <<EOF 
-| $(get_fqdn ${el}) | \
-  [[$(get_link ${el}):5678/][system-info]] \
-|
+** Staging Habitat :: Machines & Their Services
 EOF
-  done
+    get_machine_matrix_header
+    echo $(get_editor_host_overview \
+      $trail_staging_editor_host \
+      $trail_staging_editor_port
+    )
+    get_machine_matrix_footer
+  fi
+}
+
+function get_machine_matrix_header() {
   cat <<EOF
 |-------------------------------------------|
+| Machine     | Service quick links         |
+|-------------------------------------------|
+EOF
+}
+
+function get_machine_matrix_footer() {
+  cat <<EOF
+|-------------------------------------------|
+EOF
+}
+
+## $1 :: host
+## $2 :: port
+function get_editor_host_overview() {
+  local ece_url="$(get_link ${1})"
+  cat <<EOF
+| $(get_fqdn ${1}) | \
+  [[$(get_link ${1}):5678/][system-info]] \
+  [[${ece_url}:${2-8080}/escenic-admin/][escenic-admin]] \
+  [[${ece_url}:${2-8080}/escenic-admin/top][top]] \
+  [[${ece_url}:${2-8081}/solr/admin/][solr]] \
+  [[${ece_url}:${2-8080}/studio/][studio]] \
+  [[${ece_url}:${2-8080}/escenic/][escenic]] \
+  [[${ece_url}:${2-8080}/webservice/][webservice]] \
+  [[${ece_url}:${2-8080}/escenic-admin/browser/Webapp%20ECE%20Webservice%20Webapp/com/escenic/servlet/filter/cache/AuthenticationFilterCache][logged in users]]
+|
+EOF
+}
+
+function get_presentation_host_overview() {
+  cat <<EOF 
+| $(get_fqdn ${1}) | \
+  [[$(get_link ${1}):5678/][system-info]] \
+  [[$(get_link ${1}):${2-8080}/escenic-admin/][escenic-admin]] \
+  [[$(get_link ${1}):${2-8080}/escenic-admin/top][top]] \
+  [[$(get_link ${1}):8081/solr/admin/][solr]] \
+|
+EOF
+}
+
+## $1 :: host
+function get_simple_host_overview() {
+  cat <<EOF 
+| $(get_fqdn ${1}) | \
+  [[$(get_link ${1}):5678/][system-info]] \
+|
 EOF
 }
 
@@ -545,23 +601,43 @@ function generate_backup_org() {
 }
 
 function add_customer_chapters() {
+  if [ $(ls $target_dir/customer 2>/dev/null | \
+    grep .org$ | \
+    wc -l) -gt 0 ]; then
+    echo "Applying customer overrides ..."
+    cp $target_dir/customer/*.org $target_dir
+  fi
+
   if [ $(ls $target_dir/customer/extra-chapters/ 2>/dev/null | \
     grep .org$ | \
     wc -l) -gt 0 ]; then
     (
       cd $target_dir
-      for el in customer/extra-chapters/*.org; do
-        cat >> vosa-handbook.org <<EOF
-#+INCLUDE "$el"
+      local file=vosa-handbook.org
+      local title="Customer specific chapters"
+      if [ -n "$trail_network_name" ]; then
+        title="Special chapters for the $trail_network_name network"
+      fi
+      cat >> $file <<EOF
+* ${title}
 EOF
+      for el in customer/extra-chapters/*.org; do
+        echo "Preparing extra chapter $(basename $el .org) ..."
+        sed -i 's/^*/**/' $el
       done
-    )
-  fi
-}
 
-function generate_ssh_access_org() {
-  if [[ -n "${trail_gk_host}" && -n "${trail_control_host}" ]]; then
-    run cat $target_dir/ssh-access.org >> $target_dir/vosa-handbook.org
+      if [ -e customer/extra-chapters/overview.org ]; then
+        echo "Including extra chapters according to customer's overview.org"
+        cat >> $file <<EOF
+#+INCLUDE "customer/extra-chapters/overview.org"
+EOF
+      else
+        for el in customer/extra-chapters/*.org; do
+          echo "Appending chapter $el ..."
+          cat $el >> $file
+        done
+      fi
+    )
   fi
 }
 
@@ -603,11 +679,32 @@ EOF
   cat $file >> $target_dir/overview-generated.org
 }
 
+function get_user_input() {
+  local customer_doc_dir_is_next=0
+  local customer_conf_is_next=0
+  conf_file=$(basename $0 .sh).conf
+
+  for el in $@; do
+    # -s as in input
+    if [[ "$el" == "--doc-dir" || "$el" == "-i" ]]; then
+      customer_doc_dir_is_next=1
+    elif [[ "$el" == "--conf-file" || "$el" == "-f" ]]; then
+      customer_conf_is_next=1
+    elif [ $customer_conf_is_next -eq 1 ]; then
+      conf_file=$el
+      customer_conf_is_next=0
+    elif [ $customer_doc_dir_is_next -eq 1 ]; then
+      customer_doc_dir=$el
+      customer_doc_dir_is_next=0
+    fi
+  done
+}
+
+get_user_input $@
 set_up_build_directory
 set_customer_specific_variables
 generate_architecture_diagram
 generate_overview_org
-generate_ssh_access_org
 generate_content_engine_org
 generate_cache_server_org
 generate_db_org

From 00b2199087eb246fce74238e157714ea34c8377b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 16 Aug 2012 16:33:49 +0200
Subject: [PATCH 1201/2585] - removed the glossary

---
 usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
index f8f9f377..c279415e 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
+++ b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
@@ -11,4 +11,5 @@
 #+INCLUDE: "network-file-system.org"
 #+INCLUDE: "backups.org"
 #+INCLUDE: "monitoring.org"
-#+INCLUDE: "glossary.org"
+#+INCLUDE: "ssh-access.org"
+

From 52eb39b8be80638417abd51ce2e5db98d53854c1 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 16 Aug 2012 16:35:41 +0200
Subject: [PATCH 1202/2585] - added a big section on explaining what SSH keys
 are and how to   change the password of keys

---
 .../doc/vizrt/vosa-handbook/ssh-access.org    | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/usr/share/doc/vizrt/vosa-handbook/ssh-access.org b/usr/share/doc/vizrt/vosa-handbook/ssh-access.org
index 12f4b4c1..c10e1aa6 100644
--- a/usr/share/doc/vizrt/vosa-handbook/ssh-access.org
+++ b/usr/share/doc/vizrt/vosa-handbook/ssh-access.org
@@ -8,6 +8,37 @@ It also assumes that the gateway IP of your office/network has been
 added to the access control list of hosts/networks which are allowed
 to access the gatekeeper.
 
+** Generate your SSH key
+You only need to do this if you don't already have an SSH key. The
+keys are normally stored in ~$HOME/.ssh~ so have a look here to see if
+you have any:
+#+BEGIN_SRC text
+$ ls ~/.ssh 
+authorized_keys  id_rsa  id_rsa.pub  known_hosts
+#+END_SRC
+If you see the ~id_rsa~ and ~id_dsa.pub~, you already have one. They
+can also be called something with ~dsa~ or indeed anything (the
+~id_rsa[.pub]~ are just the default).
+
+To generate a new key, you can do:
+#+BEGIN_SRC text
+$ ssh-keygen -t rsa
+#+END_SRC
+
+Just hit enter when you're prompted for the name of the file. When
+asked for a key password, be sure to set one. This is important, all
+your SSH keys should have a password set. If not, anyone can copy your
+keys and log on to all the servers where you've previously been
+granted access.
+
+If you wish to set the password on an old key, or set a new password,
+you can do this by
+#+BEGIN_SRC text
+$ ssh-keygen -f id_rsa -p
+#+END_SRC
+
+The ~id_rsa~ above corresponds to the ~$HOME/.ssh/id_rsa~ file.
+
 ** Add your SSH key to your key agent
 On your local machine, load your SSH key into your key agent. On Linux
 and Mac OS X, this should only be a matter of:

From 2bd85649166a64f1bab389126b62e8b74da7d95b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 17 Aug 2012 07:36:58 +0200
Subject: [PATCH 1203/2585] - added the search host to the presentation ECE
 diagram

---
 .../doc/vizrt/vosa-handbook/create-handbook.sh      | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 0cd1ca61..e2c1318b 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -82,7 +82,8 @@ function set_defaults_if_the_trails_are_not_set() {
   trail_editor_port=${trail_editor_port-8080}
   trail_import_host=${trail_import_host-edit2}
   trail_import_port=${trail_import_port-8080}
-  trail_searh_port=${trail_search_port-8081}
+  trail_search_host=${trail_search_host-localhost}
+  trail_search_port=${trail_search_port-8081}
   trail_monitoring_host=${trail_monitoring_host-mon}
   trail_network_name=${trail_network_name}
   trail_dot_network_name=$(get_network_name)
@@ -529,7 +530,7 @@ EOF
   "$trail_db_vip_host" -> "${trail_db_master_host-${trail_db_host}}";
 EOF
   fi
-  
+
   echo "}" >> $file
 }
 
@@ -584,6 +585,14 @@ EOF
   "content-engine" -> "${trail_analysis_host}:${trail_analysis_port-8080}";
 EOF
   fi
+
+  if [ -n "$trail_search_host" ]; then
+    cat >> $file <<EOF
+  "content-engine" -> "${trail_search_host}:${trail_search_port}/solr";
+EOF
+  fi
+  
+  
   
   cat >> $file <<EOF
 }

From d8b7416f043477d318e59aafa587908cec2ca302 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 17 Aug 2012 08:22:11 +0200
Subject: [PATCH 1204/2585] - added an overview of the FAI options to make
 restore wipe various   files prior to restoring from a backup.

---
 usr/share/doc/escenic/ece-install-guide.org | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 5efffdf2..f4ef398d 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -448,6 +448,18 @@ fai_restore_all=1
 fai_restore_from_file=/var/backups/escenic/engine-dev1-backup-2011-10-10.tar.gz
 #+END_SRC
 
+ece-install can also remove files  prior to restoring from the
+backup:
+
+|------------------------------+---------+-----------------------------------|
+| Parameter                    | Default | Description                       |
+|------------------------------+---------+-----------------------------------|
+| ~fai_restore_pre_wipe_all~   |       0 | Remove all data/state & log files |
+| ~fai_restore_pre_wipe_cache~ |       0 | Remove the cache files            |
+| ~fai_restore_pre_wipe_crash~ |       0 | Remove the crash files            |
+| ~fai_restore_pre_wipe_logs~  |       0 | Remove all log files              |
+| ~fai_restore_pre_wipe_solr~  |       0 | Remove the solr data/state files  |
+|------------------------------+---------+-----------------------------------|
 
 ** Profile :: Analysis Server
 This profile will install the Escenic Analysis Engine and configure it

From 23e0ac33d5ebb079a2ff983a92d24fdad8a72cdd Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 17 Aug 2012 08:25:20 +0200
Subject: [PATCH 1205/2585] - added example output of the 'ece backup' command.

---
 usr/share/doc/escenic/ece-guide.org | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/usr/share/doc/escenic/ece-guide.org b/usr/share/doc/escenic/ece-guide.org
index 8a97aa4c..f8d6fe57 100644
--- a/usr/share/doc/escenic/ece-guide.org
+++ b/usr/share/doc/escenic/ece-guide.org
@@ -378,7 +378,24 @@ the search instance which runs the Solr indexer, so that the Solr
 index isn't corrupted:
 #+BEGIN_SRC text
 $ ece -i search1 stop
-$ ece -i editor1 backup
+$ ece -i web1 backup
+[ece#engine-web1] Backing up the web1 instance of engine on raven ...
+[ece#engine-web1] Cleaning up generated files in /opt/escenic/assemblytool ...
+[ece#engine-web1] Cleaning up web1's work directory in /opt/tomcat-web1/work ...
+[ece#engine-web1] Cleaning up web1's temp directory in /opt/tomcat-web1/temp ...
+[ece#engine-web1] Database dumped: /var/backups/escenic/ece5db-2012-08-17.sql.gz
+[ece#engine-web1] Creating snapshot ... (this may take a while)
+[ece#engine-web1] Backup ready: /var/backups/escenic/engine-web1-backup-2012-08-17.tar size: 62M
+[ece#engine-web1] The backup arhcive includes:
+[ece#engine-web1] - Database snapshot
+[ece#engine-web1] - All Solr in /var/lib/escenic/solr
+[ece#engine-web1] - All Escenic data files in /var/lib/escenic/engine
+[ece#engine-web1] - All app servers in /opt
+[ece#engine-web1] - All Escenic software binaries in /opt/escenic/engine
+[ece#engine-web1] - All configuration in /etc/escenic and /etc/default/ece
+[ece#engine-web1] - All bootstrap scripts from /etc/init.d
+[ece#engine-web1] - All state files in /var/lib/escenic
+[ece#engine-web1] Enjoy!
 #+END_SRC
 
 

From 89238866251497a4fb0f77ed6e2bf3a11808716c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 17 Aug 2012 09:05:02 +0200
Subject: [PATCH 1206/2585] - fix in the ece-install::set_correct_permissions
 called in the   ece-install::common_post_install method for all installation 
  profiles.

  The problem was that when fixing the permissions of the tomcat home
  directory, it only fixed the permissions of the link to tomcat home
  and not the target itself.

  Now, both the link and the link target is set to
  root:<escenic-user>.
---
 usr/sbin/ece-install | 59 ++++++++++++++++++++++++--------------------
 1 file changed, 32 insertions(+), 27 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 15c1d960..9c7fc9c7 100644
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -294,38 +294,43 @@ EOF
 # last, give the control back to the ECE user & group 
 function set_correct_permissions()
 {
-    log "Setting correct permissions on ECE related directories ..."
+  log "Setting correct permissions on ECE related directories ..."
 
-    for el in $engine_dir_list; do
-        if [ ! -d $el ]; then
-            continue
-        fi
-        
-        if [ ${el} = ${escenic_data_dir} ]; then
-            local correct_permission=$(find ${el} \
-                -maxdepth 0 \
-                -user ${ece_user} | \
-                wc -l)
-            if [ $correct_permission -gt 0 ]; then
-                log "Data directory root, $el,"
-                log "has correct permissions, skiping sub directories."
-                continue
-            fi
-        fi
+  for el in $engine_dir_list; do
+    if [ ! -d $el ]; then
+      continue
+    fi
+    
+    if [ ${el} = ${escenic_data_dir} ]; then
+      local correct_permission=$(find ${el} \
+        -maxdepth 0 \
+        -user ${ece_user} | \
+        wc -l)
+      if [ $correct_permission -gt 0 ]; then
+        log "Data directory root, $el,"
+        log "has correct permissions, skiping sub directories."
+        continue
+      fi
+    fi
 
-        run chown -R ${ece_user}:${ece_group} $el
-    done
+    run chown -R ${ece_user}:${ece_group} $el
+  done
 
-    if [ -d "$tomcat_base" ]; then
-        run chown -R ${ece_user}:${ece_group} $tomcat_base
-    fi
+  if [ -d "$tomcat_base" ]; then
+    run chown -R ${ece_user}:${ece_group} $tomcat_base
+  fi
 
-    # it's important that the ECE user has access to read the
-    # tomcat_home files, e.g. when creating a backup of it.
-    if [ -d "$tomcat_home" ]; then
-        run chgrp -R ${ece_group} $tomcat_home
-        run chmod -R g+rx $tomcat_home
+  # it's important that the ECE user has access to read the
+  # tomcat_home files, e.g. when creating a backup of it.
+  if [ -d "$tomcat_home" ]; then
+    run chgrp -R ${ece_group} $tomcat_home
+    run chmod -R g+rx $tomcat_home
+    if [ -h "$tomcat_home" ]; then
+      local file=$(dirname $tomcat_home)/$(readlink $tomcat_home)
+      run chgrp -R ${ece_group} ${file}
+      run chmod -R g+rx $tomcat_home ${file}
     fi
+  fi
 }
 
 function print_status_and_next_steps()

From d279fac19feabdec87515cdf05bd6be6d500181f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 17 Aug 2012 09:05:45 +0200
Subject: [PATCH 1207/2585] - added feedback when entering FAI restore

---
 .../escenic/ece-scripts/ece-install.d/restore-from-backup.sh    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/restore-from-backup.sh b/usr/share/escenic/ece-scripts/ece-install.d/restore-from-backup.sh
index 5f970eb6..72831df1 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/restore-from-backup.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/restore-from-backup.sh
@@ -44,6 +44,8 @@ function restore_from_backup()
   
   if [ $(get_boolean_conf_value fai_enabled) -eq 1 -a \
     $(get_boolean_conf_value fai_restore_from_backup) -eq 1 ]; then
+    print_and_log "Restoring from backup on $HOSTNAME ..."
+    
     backup_file=${fai_restore_from_file}
 
     if [ -z "$backup_file" ]; then

From 3f54945612dc491ffb9346739bc325ff38e4dc2a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 17 Aug 2012 09:06:24 +0200
Subject: [PATCH 1208/2585] - wee improvements to the restore from backup
 chapter

---
 usr/share/doc/escenic/ece-install-guide.org | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index f4ef398d..ce0d56bd 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -370,13 +370,13 @@ TBD: This profile will also install the Nagios interface for
 monitoring the different nodes. 
 
 ** Profile :: Restoring from backup
-ece-install can restore from a backup made by the ece script:
+~ece-install~ can restore from a backup made by the ~ece~ script:
 #+BEGIN_SRC text
 $ ece -i <instance> backup
 #+END_SRC
 
-As stated in the ece guide, this backup may contain (depending on
-what's available on the host where it's run):
+As stated in the guide for the ece script, this backup may contain
+(depending on what's available on the host where it's run):
 - database dump of the instance
 - data files (pictures, video files and so on). This is often referred
   to as the "multimedia archive" in Escenic literature.
@@ -430,6 +430,7 @@ restore from:
 |---------------------------------+---------+----------------------------------------------------|
 | Parameter                       | Default | Description                                        |
 |---------------------------------+---------+----------------------------------------------------|
+| ~fai_restore_from_backup~       |       0 | Enable restoring from backup                       |
 | ~fai_restore_all~               |       0 | Restore everything found in the backup file        |
 | ~fai_restore_db~                |       0 | Install the DB server & restore its contents       |
 | ~fai_restore_data_files~        |       0 | Restore the Solr & ECE data files                  |

From ec5365fe6ecaf445c446635118a007ae5a1f23d6 Mon Sep 17 00:00:00 2001
From: Kevin Flynn <kevin@kevin-Precision-M4500.(none)>
Date: Fri, 17 Aug 2012 09:51:22 +0200
Subject: [PATCH 1209/2585] Edited and reorganized first few sections, created
 Introduction

---
 usr/share/doc/escenic/ece-install-guide.org | 143 ++++++++++++--------
 1 file changed, 90 insertions(+), 53 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index e841e306..5413b77d 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -1,50 +1,92 @@
-#+TITLE: Welcome to the ece-install Guide
+#+TITLE: Escenic Installer User Guide
 #+AUTHOR: Torstein Krause Johansen
 #+OPTIONS: toc:2 
 
-* Supported Operating Systems
-For the best experience, run this script on Debian Squeeze (or newer),
-the latest Ubuntu LTS or most other Debian based operating systems,
-but it should work without any problems on any Unix like system that
-has BASH version 4.2 or newer.
-
-** Debian Based Operating Systems
-If running on a Debian based operating system, ece-install will take
-care of installing all required third party software, such as database
-& caching server.
-
-** RedHat Based Operating Systems
-ece-install constantly gets better support for automatic installation
-on RedHat based operating systems. However, since the public RedHat
-repositories are significantly smaller than the Debian ones, there
-will often be the case that you'll have to do some manually
-installation of 3rd party dependencies prior to running
-ece-install. Don't despair though, ece-install will tell you what you
-need to do. 
-
-** Other GNU/Linux and Unix systems 
-If you're installing on another Linux or Unix system, you must first
-make sure that these 3rd party components are installed. ece-install
-will tell you which ones it cannot find and tell you to install these,
-so you can simply run it to find out which ones you need.
-
-You may also look inside the ece-install script for all calls to the
-'assert_pre_prequesite' method and you'll get a list of the binaries
-ece-install assumes are present.
-
-** Common Requirements for All Operating Systems
-*** Internet Connection
-The installer needs an internet connection, preferably a fast one as
-several hundreds of megabytes are downloaded.
-
-*** Firewall Rules
-ece-install must be able to make outgoing connections from the machine
-on which it is running to the following ports:
-
-- 80 (standard HTTP)
-- 443 (HTTPS)
-
-** Tested Operating Systems
+* Introduction
+The Escenic Content Engine Installer, =ece-install=  is a command line
+utility for installing the Escenic Content Engine. In addition to
+installing the Content Engine itself, =ece-install= also automates the
+installation and configuration of other commonly-used components of
+Escenic-based sites, such as:
+
+ - Java
+ - Tomcat application server
+ - MySQL/Percona database server
+ - Varnish cache server
+ - Munin monitoring server
+ - NFS server and clients
+ - Memcached distributed memory cache
+
+You can use =ece-install= to install The Content Engine and related
+components on a wide range of GNU Linux distributions and Unix or
+Unix-like operating systems, but the level of support varies between
+platforms. On a fully-supported operating system (for example Debian 6.0),
+=ece-install= can both install and configure all required
+components, so that the entire process is reduced to a simple sequence
+of =ece-install= commands. 
+
+On less well-supported platforms, =ece-install= may not be able to
+automatically install some third-party components. You will then need to
+manually install some components. However, the process is very
+straightforward, since =ece-install= tells you which components you
+need to install manually, and it still handles the configuration of
+these components for you.
+
+** Supported Operating Systems
+=ece-install= works best on Debian 6.0 (Squeeze) or later. It should, however, work on any Unix-like system that provides a BASH
+command shell (version 4.2 or later). 
+
+Here is an overview of the situation on some of the most popular
+platforms:
+
+ - Debian-based operating systems :: On Debian 6.0 or later,
+     installation is fully automated. =ece-install= installs and
+     configures all required components. This may also be the case on
+     some Debian-based distributions. On recent Ubuntu distributions,
+     however, you will need to manually install some components. For
+      details, see Tested Operating Systems.
+
+ - RedHat-based operating systems :: =ece-install= support for
+      RedHat-based operating systems is constantly improving. However,
+      since the public RedHat software repositories are significantly smaller
+      than the Debian ones, it may often be necessary to manually
+      install some components. For
+      details, see Tested Operating Systems.
+
+ - Other GNU/Linux and Unix systems :: =ece-install= does not currently support
+      automated installation of third-party components on these
+      platforms, so you will need to install them manually. It will,
+      of course, tell you which components you need to install, and
+      configure them for you.
+
+** ece-install Requirements
+Whichever operating system(s) you will be installing on, you must ensure
+that the following requirements are met:
+
+ - Internet connection :: =ece-install= needs an Internet
+      connection. Ideally it should be a fast connection, since it
+      will need to download several hundred megabytes of data.
+
+ - Firewall rules :: Your firewall settings must allow  =ece-install=
+                     to make outgoing connections from the machine on
+                     which it is running to the following ports:
+    - 80 (standard HTTP)
+    - 443 (HTTPS)
+
+=ece-install= relies on the GNU versions of various tools such as =find=, =cp=
+and =tar=. If you use =ece-install= on any system which provides different
+versions of these tools by default, then you must make sure that:
+
+ - The GNU tools are installed on the system
+ - That the GNU tools take precedence in the command PATH offered to
+   =ece-install=.
+
+Platforms on which you will need to do this include:
+
+ - Any BSD-based system (including Mac OS X)
+ - Solaris
+
+** <<<Tested Operating Systems>>>
 | Operating system     | Status                                              | Date updated     |
 |----------------------+-----------------------------------------------------+------------------|
 | CentOS 6.2           | HA, APR & monitoring are not automatic              | 2012-03-07 13:42 |
@@ -53,12 +95,7 @@ on which it is running to the following ports:
 | Ubuntu LTS 10.04     | Everything except Tomcat/APR wrappers are automatic | 2012-02-27 13:19 |
 | Ubuntu LTS 12.04     | Everything except Tomcat/APR wrappers are automatic | 2012-07-27 03:27 |
 
-* A Note on Running ece-install On Non-GNU/Linux Systems
-Please note, it's assumed that the OS uses GNU's tools, i.e. find, cp
-& tar. If you're running a system which has a different set of core
-tools, such as any of the BSDs (including Mac OS X) or Solaris, make
-sure that GNU's tools take precedence in the command PATH offered to
-ece-install.
+
 
 * Downloading the ece-install Script
 The easiest way of getting ece-install is to use git. Type this in
@@ -459,7 +496,7 @@ $ dd if=/dev/urandom bs=512 count=1 | \
 #+END_SRC
 
 ** Running interactively
-*** Start ece-install and choose the Option, "Restore from backup"
+*** Start ece-install and choose the Option Restore from backup
 #+BEGIN_SRC text
 # ece-install
 #+END_SRC
@@ -622,9 +659,9 @@ If you wish to provide Nursery configuration for the plugins, you
 simply put them in engine/siteconfig/config-skeleton inside your
 tarball, together with the other Nursery configuration files.
 
-The fai_presentation_conf_archive and fai_presentation_ear variables
+The =fai_presentation_conf_archive= and =fai_presentation_ear= variables
 both accept the following types of value (here using the value of
-fai_presentation_ear as an example):
+=fai_presentation_ear= as an example):
 - ~http://build.server/stable/engine-mysite.com-1.2.3.ear~
 - ~https://build.server/stable/engine-mysite.com-1.2.3.ear~
 - ~file:///var/lib/build/stable/engine-mysite.com-1.2.3.ear~

From d41ac054cb942edbb7870a080e964a7e9f2b47e3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 17 Aug 2012 09:51:45 +0200
Subject: [PATCH 1210/2585] - all diagram graphics are now clickable. Getting a
 bigger version of   the diagram is hence just a click away (instead of
 opening the image   explicitly through right click -> left click).

- the internet and front end load balancer are now included correctly
  in the architecture diagram.
---
 usr/share/doc/vizrt/vosa-handbook/content-engine.org | 2 +-
 usr/share/doc/vizrt/vosa-handbook/create-handbook.sh | 9 ++++++---
 usr/share/doc/vizrt/vosa-handbook/database.org       | 2 +-
 usr/share/doc/vizrt/vosa-handbook/overview.org       | 5 +++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/content-engine.org b/usr/share/doc/vizrt/vosa-handbook/content-engine.org
index 88e1f8ca..85b25a5d 100644
--- a/usr/share/doc/vizrt/vosa-handbook/content-engine.org
+++ b/usr/share/doc/vizrt/vosa-handbook/content-engine.org
@@ -6,7 +6,7 @@ Architecturally, these look the same (strictly speaking, the
 publication servers don't need the memory cache, but for simplicity of
 uniformity, we install memcached on the publication servers too):
 
-[[./graphics/content-engine.svg]]
+[[file:./graphics/content-engine.svg][./graphics/content-engine.svg]]
 
 ** Presentation Server
 The presentation is an ECE which has the publication(s) templates and
diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index e2c1318b..3db25f6a 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -188,9 +188,10 @@ function get_blockdiag_call_flow() {
   if [ -n "$trail_lb_host" ]; then
     lb_call_flow="$lb_call_flow $trail_lb_host ->"
   fi
-  for el in "$trail_presentation_host_list"; do
+  for el in $trail_presentation_host_list; do
     lb_call_flow="$lb_call_flow ${el},"
   done
+  echo " " "$(echo ${lb_call_flow} | sed 's/,$//g');"
   
   if [ -n "$trail_editor_host" ]; then
     echo "  journalist -> $trail_editor_host" \
@@ -493,6 +494,7 @@ function generate_cache_server_org() {
 
   generate_cache_server_diagram
   local file=$target_dir/generated-cache-server.org
+  local svg_file=./graphics/${trail_cache_host}-cache.svg
   cat > $file <<EOF
 ** Cache server on $trail_cache_host
 
@@ -500,7 +502,7 @@ The cache server on $trail_cache_host is available on
 $(get_link ${trail_cache_host}):${trail_cache_port-80}
 
 #+ATTR_HTML: alt="Cache server on $trail_cache_host"
-[[./graphics/${trail_cache_host}-cache.svg]]
+[[file:${svg_file}][${svg_file}]]
 EOF
 }
 
@@ -558,8 +560,9 @@ blockdiag {
 }
 EOF
     local file=$target_dir/network-file-system-sync.org
+    local svg_file=./graphics/$(basename $blockdiag_file .blockdiag).svg
     cat >> $file <<EOF
-[[./graphics/$(basename $blockdiag_file .blockdiag).svg]]
+[[file:${svg_file}][${svg_file}]]
 EOF
     run cat $file >> \
       $target_dir/network-file-system.org
diff --git a/usr/share/doc/vizrt/vosa-handbook/database.org b/usr/share/doc/vizrt/vosa-handbook/database.org
index 1ed668d7..80846ed1 100644
--- a/usr/share/doc/vizrt/vosa-handbook/database.org
+++ b/usr/share/doc/vizrt/vosa-handbook/database.org
@@ -2,7 +2,7 @@
 
 A <%= trail_db_vendor %> DB has been installed in your habitat.
 
-[[./graphics/db.svg]]
+[[file:./graphics/db.svg][./graphics/db.svg]]
 
 
 
diff --git a/usr/share/doc/vizrt/vosa-handbook/overview.org b/usr/share/doc/vizrt/vosa-handbook/overview.org
index 30f97c21..b8a56b9b 100644
--- a/usr/share/doc/vizrt/vosa-handbook/overview.org
+++ b/usr/share/doc/vizrt/vosa-handbook/overview.org
@@ -1,5 +1,6 @@
 * Getting the Overview
 
-#+ATTR_HTML: alt="Typical ECE architecture"
-[[[[graphics/architecture.svg]]
+#+ATTR_HTML: alt="ECE architecture"
+[[file:./graphics/architecture.svg][./graphics/architecture.svg]]
+
 #+INCLUDE: "overview-generated.org"

From e7a1b78da0dbfb7b59698d37a70dc99e8bc3160f Mon Sep 17 00:00:00 2001
From: Kevin Flynn <kevin@kevin-Precision-M4500.(none)>
Date: Fri, 17 Aug 2012 10:51:13 +0200
Subject: [PATCH 1211/2585] Added options H:6 num:5; ****** <title> can now be
 used as unnumbered heading

---
 usr/share/doc/escenic/ece-install-guide.org | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 9c11e75d..d39bdf5e 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -1,6 +1,7 @@
 #+TITLE: Escenic Installer User Guide
 #+AUTHOR: Torstein Krause Johansen
-#+OPTIONS: toc:2 
+#+OPTIONS: H:6 num:5 toc:2 
+
 
 * Introduction
 The Escenic Content Engine Installer, =ece-install=  is a command line
@@ -73,6 +74,7 @@ that the following requirements are met:
     - 80 (standard HTTP)
     - 443 (HTTPS)
 
+****** On non-GNU/Linux systems
 =ece-install= relies on the GNU versions of various tools such as =find=, =cp=
 and =tar=. If you use =ece-install= on any system which provides different
 versions of these tools by default, then you must make sure that:
@@ -96,7 +98,6 @@ Platforms on which you will need to do this include:
 | Ubuntu LTS 12.04     | Everything except Tomcat/APR wrappers are automatic | 2012-07-27 03:27 |
 
 
-
 * Downloading the ece-install Script
 The easiest way of getting ece-install is to use git. Type this in
 your shell:

From bb012a8161d878dae01f58d86471d476bd72ef70 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 17 Aug 2012 12:53:38 +0200
Subject: [PATCH 1212/2585] - added
 content-engine::set_up_publication_nursery_conf which will add   a Nursery
 component for each publication defined in the  
 fai_publication_domain_mapping_list

  Given:

    fai_publication_domain_mapping_list="
      fire#fire.escenic.com#feuer.escenic.com,ild.escenic.com
      wind#wind.escenic.com#vind.escenic.com
    "

  these Nursery components will be created:

    /etc/escenic/engine/environment/production/neo/publications/Pub-fire.properties
    /etc/escenic/engine/environment/production/neo/publications/Pub-wind.properties

  The kind of environments can be set with the parameter
  fai_publication_environment.

- added support for specifying the kind of environments being
  installed:

  fai_publication_environment="staging"

- added documentation for fai_publication_environment
---
 usr/share/doc/escenic/ece-install-guide.org   |  6 ++--
 .../ece-install.d/content-engine.sh           | 33 +++++++++++++++++++
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index d39bdf5e..da5b726f 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -1,8 +1,7 @@
 #+TITLE: Escenic Installer User Guide
-#+AUTHOR: Torstein Krause Johansen
+#+AUTHOR: Vizrt Online / The SaaS Team
 #+OPTIONS: H:6 num:5 toc:2 
 
-
 * Introduction
 The Escenic Content Engine Installer, =ece-install=  is a command line
 utility for installing the Escenic Content Engine. In addition to
@@ -798,10 +797,11 @@ $HOME/ece-install.conf file of the root user:
 | ~fai_public_host_name~                | ${HOSTNAME}:8080                                  | The public address for your website                                                                                                   |
 | ~fai_publication_create~              | 0                                                 | Create a new publication                                                                                                              |
 | ~fai_publication_domain_mapping_list~ | ""                                                | Mapping between publication names and their corresponding domains on the form: "one#one.com other#other.com[#<alias1>[,<alias2>]]"    |
+| ~fai_publication_environment~         | "production"                                      | The kind of environment/habitat being installed. Typical values are: production, staging, testing, development.                       |
 | ~fai_publication_name~                | mypub                                             | Name of the publication                                                                                                               |
 | ~fai_publication_use_instance~        | dev1                                              | Name of local instance to use for creation                                                                                            |
-| ~fai_publication_war~                 | "WF or ECE demo WAR"                              | WAR to base the new publication on                                                                                                    |
 | ~fai_publication_war_uri_list~        | ""                                                | Publication WARs used for setting up Assembly tool. Supported: http[s]://tmp.com/mypub.war, file:///tmp/mypub.war and /tmp/mypub.war. |
+| ~fai_publication_war~                 | "WF or ECE demo WAR"                              | WAR to base the new publication on                                                                                                    |
 | ~fai_rmi_install~                     | 0                                                 | Install RMI hub profile                                                                                                               |
 | ~fai_search_conf_archive~             | ""                                                | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
 | ~fai_search_ear~                      | ""                                                | EAR to use instead of the Escenic binaries                                                                                            |
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 33ea54aa..3cfd95d5 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -405,6 +405,39 @@ property.com.escenic.studio.font.windows7=Arial Unicode MS
 property.com.escenic.studio.font.windowsxp=Arial Unicode MS
 property.com.escenic.studio.font.windowsvista=Arial Unicode MS
 EOF
+
+  set_up_publication_nursery_conf
+}
+
+## Set publication specific configuration, set here and not in
+## set_up_instance_specific_nursery_configuration as this
+## configuration will be the same on two instaces running on the same
+## host.
+function set_up_publication_nursery_conf() {
+  if [ -n "$fai_publication_domain_mapping_list" ]; then
+    local publication_name=""
+    local publication_domain=""
+    local publication_aliases=""
+
+    for el in $fai_publication_domain_mapping_list; do
+      local old_ifs=$IFS
+      IFS='#'
+      read publication_name publication_domain publication_aliases <<< "$el"
+      IFS=$old_ifs
+      
+      local file=$escenic_conf_dir/engine/environment/${fai_publication_environment-production}/neo/publications/Pub-${publication_name}.properties
+      
+      print_and_log "Creating Nursery component" \
+        $(basename $file .properties) \
+        "for publication $publication_name"
+      make_dir $(dirname $file)
+      cat > $file <<EOF
+# Created by $(basename $0) @ $(date)
+\$class=neo.xredsys.config.SimplePublicationSupport
+url=http://${publication_domain}/
+EOF
+    done
+  fi
 }
 
 function set_up_instance_specific_nursery_configuration() {

From 2079a1d9743d02bd4d49bc36e670914cd05cfd89 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 17 Aug 2012 12:55:51 +0200
Subject: [PATCH 1213/2585] - added section on installing OpenSSH under Cygwin
 to cater for   Windows users having problems getting up and running with key
 based   SSH authorisation

- added screenshot on installing OpenSSH under Cygwin
---
 .../vosa-handbook/graphics/cygwin-openssh.png | Bin 0 -> 17565 bytes
 .../graphics/pres1-system-info.png            | Bin 48014 -> 0 bytes
 .../doc/vizrt/vosa-handbook/ssh-access.org    |  24 ++++++++++++++++--
 3 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/graphics/cygwin-openssh.png
 delete mode 100644 usr/share/doc/vizrt/vosa-handbook/graphics/pres1-system-info.png

diff --git a/usr/share/doc/vizrt/vosa-handbook/graphics/cygwin-openssh.png b/usr/share/doc/vizrt/vosa-handbook/graphics/cygwin-openssh.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ef96a0c7f7fb47d846868b384b3e0144167c836
GIT binary patch
literal 17565
zcmc)xbySpJ^goKv3`2u-BO!u<l(ck6h;;V=N~eN^)F7p#D2NOV(lH?2BM2&uq#&sv
z(%o^Nnep@ceZSxLy8qmD*SfmaF!Ma;>~qdOd%t#^eO~Eksge>g5`jP<(g$ky^*|s9
z90US?C4c}=bT#@`fIna_Jyk_e#Q^hP;0M$}K~n()s!AX}x4{K|vprJN(*%K@bAdqc
za1iJecmxMJJre|hR;@uG$@d@-oo9NJt~3aApXtGU1p_~;jf|r!xrc^x?dObncM<pF
zx<B8KrdEJb>m2J)E9gYyLUDQFNe?~f_yhm89?e$4)vDRP(||Q?W2*|79zMSeOY@h?
z+WL8t>Ez(!;Opa%mG#B*B=AUB%4=Y+ug_&*v+XFTynU~qtW|L9kJ*IKpR7xVORvk2
z<%#x-eiq5Av8$Qu@BUcob35*|q&#f39N8$YS7RNIeCT80GnHSU$dPww<*uG#Bb!#1
zI6?k!$V;|6NAj2-FQx0(<0!AAbKgG?W(8SWTo*mkTD_lt5)28ysS+W=`*1KqWO;fi
zk~21zWTwUD^5p>8OmFPlUmG7o|E~DoPSy8W?!G1E)no32OkL{ZuAgki-9XejWq#%J
zt)rMvUFxm47!qhc?9^J4Bs*&^-1XFNJ8!C!UhG94y+ld~7zcLMTkIUUHeS-e{4Z29
zdq}mGw&vz_3!irCpOi4ko|d|M^T2|55>8e<WRgRyd*U?x%eb$GlG5JqHiSIxssFKi
zjBNbte=?OOyWrA((Gob*pSk@^JRq0v>Ug<8`dbpRJ%UeLY>BC@^WB~H1u5kDt-7DP
zJsvGf`UAb?nY-E^2c!Cp2gT>r=CEfxbI-=aGkQka{x)kbWu-l3($947X%}3oE3i1X
z*B@~8@2=HsoGG^W<1^SYurb*C%;TzTZFZr>Vk>^IY4&=STTgvp0^i`>rPDc=UN2-w
z;h)+07U`|XIp5-+C;sA1dwYYumYG-OzW$$z1FwkP19=2mb}Y4*xC(c3(|&FkwDl*k
z3NCet*Dm2}`hTlWdwQhb_+tk4ygDE~C2j7Pop}2n|HiIXE1#Hv)}KjRf=f{v{t?`B
zC!KXI-;>NQU-BWF#uBV}j)KR^w=P!qo@N<`OaxhZ@yHz_wq%nhGJAqx0craFGj5wl
zP1Bhv6LW`OU?KLs+V6KGr&FI^={H_n%=z(<NhC{2&ujYn&HFe0!kG*Fk|mwIb$6*y
z!#{?5?rfy4Wh_bRB9_nNtPQ_$_fSgiSkM3K^w#cc-^twzIhP(O?WLTpmbK!RwF<I;
ziJ5`k=B>kR-zzv@g5Z*joMSJ|R^u7XmP|6R*)l9AUWL0w`i+0`f-f@@WRn9@cj@(m
zKP9mWEmakq=W@%POPJ3daTG|;zB{^Fp{n3M3SJcW@igmJ>TamM|1N&;x<T-dq%$k0
zUi_`IB(mA9mcW%@?Tev=>8E2+!HXqiSv@0KOPAVbUyG$L3|O}J6J+NXi>0>>f|o)E
zC6cp5mQoAOOSt9ida5-}YO}<ae$<_x4od%NkzTpS8ZhKF*c+C0RE00MCGP6~bx-r8
zfm`kjVjet_6xBBLPFs3kIm_=opTOnkPT2Xkz1=t3vWuKqlF2EVJv0Ir`^7EmBMH*U
zgVMW8g}b-)t!#Q6H2rJ1ks?c833rza>(0j?Y5E@&OK*;~Uo=dlr+jH&-b)DC@b~Xn
zlf4R`xQOT04s7Lv2`)YGs9cKCe*TLtE6}RVdnt`SSv=$~x5wqo-tN1(pjGqWErZ$9
z0OO3F_Lfz*!rdDE6JzawvtsF)B;WVDNP($cE&bpthJuzggUpkPki9<NtQ3dVGqTKs
z%)Q<9qsvd#b7vl!{_)&$4n3@h-Je<YOLM8aEwIX^gv_g$l%BK872K_}UwgZka={B{
zSHBH{|7u%#^MpL-VLcw9%j(H$Jx;k==lruY2;2Q67gEdz?A}~^UlPFlUb%BtttF1a
z-ROk#FUEoUEiJowSAUb+pYkAumW(w|1`AqFCtObi3R;#Y+)j|li}!azcADlI3}i3q
zkXOec)k~!9PCc;9o?Dl@afQ3a9_PPdt$$n257J~0COqnvMhedR&0SCW=2{MfuPzK^
z19&{n)~_Uz2Qzx6<&Na$F3k&fujvO*Ctca~NNJw5a9>R)`Ci2HUHzFU2>kT!>MT<r
zGvz4w@0DAN1^H^4-f65F2Z~_35fAtjgv5e8G~mdJlY3H9rNzOu#U7%;Q>H0|l|qBG
zwy_{|69)AEZ82eMj<}HHGuTj444r@(c-%njnQPE36xBeJ3Osq$rGy<d!mlvR_ok72
zW{0w-HuT|;#fxRi{kL;pIaib{UR2N+=*k(W+^Sh4^jxK^`PytggHzY<ya^`8(K~{>
z)kXl{n1F9CxRc{#Ti}?@l1(rN%6FMX@Ce?BANU~vwMJYy<|@a2m~i~@`XD?x!S2Uc
z%P&qx7x*%J*%EZJuFRjHv>Y@YRq2{`8dXVd4SgR~=|`}pLuS)YXU(3EAel6_$oawp
zZrk1`rmJZ4T+pY}YX50u<x@v=oyIy~NEX*Eq+VMgrlnsR;+F8fFndE_nZofb#veL$
zX)9#?<eeYU)TJo3^%d_Kbxp`;X<WA}r>qxs?P;pn%CNbj0HUc(8luWML=e#wOI1qt
zMSD|W_C?q-x8qfoc*BUOw!-wU9MIXpjQ-H2!X81*MPVxxGvL|Sde{)q4E$LZcZ1bi
zTj31fp9oQyjrpkGqpmT{DA^onIvtJ~40cXyhi+tTGG$ZFkNgRXJ7pyG;Us_5ydF(5
z$wCcrC7ViM|1nnzoeU=Vmbnr_^5Ay(iQt<?s2drAj3X8OE(6s3aOlv_0KVby+7-9|
z%j<B`!$)d|*%$P0E@tSg13m{+e!FxRnY>&KA^FDg!1BewW7OgOy}LKhVy^Dq4ERh?
zdBJ&3|3=0gI(ca;7x_3u9O4>M#j5nNJq;ia(;Bqdp%&3r*h7DKY;mvfLtG_Ek;*Zu
z^-oi>3kfSv$SW-qHxe$GD=%6bL1|>*v!GO9QfFV%2rB2Y{RkdT&O;~VScodGCI}(x
zTE0i{2nGglo#@3NIL2!avTp1HtaA6BwJd($ANUFLc7ZIu>v;Y*2=nY0OKzOZK*A;?
zc-ME2O9rbKT6U<*7ztOY8#q1!i<KdkH*gMNpKSst7%BrOqAp4Su7p%!zRQ@Tf#+7f
z$4IRIJyd2s^lb%ApDrub_yesh--6G8&JI6V`4zkf5onoa`9<lyx`~v@Y=p`ju~aVK
z<87W-VeR-B^3<c_;}tbSWiyf6T)5rZq`1wGxfvO2sKhfeKLjY|;n2H7W^i2=jtbnL
ziq@lJQPadcfa;xTN_xD#tp0E4*ce&XW7<@2b@(4y-0NnhXLoP1qlTj@mx(Jkx-KRI
zP|KT033r(C-)mFGy3vxttQ}9w8-Z_!!eln7h(p7qOK#v}Q%x7%UwT_P0sTN>Ny%iH
z8u%#SO3C)8;Y8;CHcT=PrdeVJ)9Mvb&!5w5?JAj^q&%gDeSY#F=-1YZx{#Uq=InBt
z7UC%x+>KdWw{P40j<dM^&Ds8R`}q?JTg#S1Z6KEqRdvB>;x>QVX`K+Dv*Jmy_E<2O
z7S=r<6)W&)zL&nwScnaP7#7^gn;AW<XFTe5c25YOcbEn;;LJsSu4mtIQwwCGoQo7$
zuV-h_wA}w<kE*qttX}k(9Fh)QTJ;X3qJ^ohuyic05u8XWw#5$xbFjlyzfMq0dEESY
z>`QS2704<$hu?Pu-U~v(n%->TET6#x0{yq`1Y(VX%~GAo;UFj*2u#p-6AmhEyY-aI
zPAdxgga8779toI09t0s@kq3b{K^bmrn6|(V6*xQ433zp#fDLs$yLu}O+X+~VAhu05
z4j9^i<9!(PZv-ekI1<~&n+*=~g%7lmK`^i20Cr;AgkFP^&tDt*aijnY3Cs&XCVFg}
zp-_1yaNGRFZ*kE&+qZEEbAM~>3p2((`!R;1X@-VTIc7(+#nNz=o3O{Ku2Mf~vFXKU
zrD`Ap=4kB-vAKLF`SEsCH^ic*Hb>(IN_olvyX-8u)$>2F$9!*KM)1yuBQ{OUW5bT3
z3mPi$yp+$v-PCS^mNC{Qk9M!q{M83zreee)s2Y?<DLAr=2T7k`hZR|9UZs?Toy2K;
z?cjFVm-IJ~?c^^om13XBVt9yUWhhDLUEIlg>FS<J?6LMoy2E<2I0KH=IyyGxPI3ry
zDdIgy`rvLV35E%kxRAZE`bIi8q4`*lYAqk~WwAaNbAmkzKt#s$Z^;|4PQ;Wmmce-n
zn2mWaZ;b$Huc(En<ACFNjAUJSFAej&5Pc?Igpzg|J&}ZNtG^U9F-=Wg$Q!^@R@CO~
zalk%`G(5JKyRMgn1qMbuyAwsFJ@^H?=J;2XHQU2K-uWu9;yEj#HvyFk%{`K#+o+oK
zV*>O02<zcyRxolSjv-(I=5P??=Yl0nv)f1{-~GE#99mG|C?e=CByeGsxT4HDcH;$!
zA2Q&@SR}!9^p?`Y;Z|^Csz?7L3ZXlM)B*};O-vW9C;U(_OUR@stB42zde3~J(U8C<
zu64_o16Q-3gZ`HuY^WXj7_#&GzO<KxZxF6B(Q##Sj~u@TGPx4(O>-~iLeTQSM|GRX
z^X`S)rsWlhN#LybQjV44zUZEad9CnVp6#e`0U!g<(J~M(509$6!BDC9Cuxk)KH!w4
zFm5Jtg9A09h%yBh^Mqgp*H4sdx(6Oq-$|$Yqdjt>v=gEDI&iasSW~J(wcoU2#Gv;^
zQJq;2ce_hUS9B@v;=ZH)V^nEBr{oI|v`!=2kMMcWuQOs#b^V}zFMl_`R>_c?CD}RT
z(Jepd$_<_}5Sj0&HSpa=(5WL=IP;K<0^_Wn`)D3y69Wpgoo)G^qDf>p<%V1r39eAc
z&8Y}-Yq{jug7OZY#PU;{Yn(=|ytz}XGl4G)Ix?cZ!YStY-==G^gF@XX32-HnVdeH$
zTtf3LT!j8H%g9TGIMCYOa_oTJ?y_JoL#du+!{MITvHgehRoMX}rXg=AFfN-q8xN{0
zET&^!0HynEnBc+A8;_zjh6lZBAG1X0y!17tdMu0{mBX_a>Q?-6pP*%H`lin4lx@Uv
z@By9m9pTN~3Z&=dr|s`gN($68E)FAPUj=uDsOayFnko|uJ3UE~m&Kv|+%X&E#)ac9
z>*YueA)mY+n)`Y6j>t|B73AmVw;CL4Uk4>ydHbUe(J&LME{{ZZAvDR^QPozcW&Gj?
z(vDD!HooJ~F&Ni~ST?$@2v5`hrxTL`;8qfWRSt;s9ULnWF_CM)qCgNFDtS1CHAWNQ
z^7s$}Py7`ej}=c+44tI^4Ql|o1~)zRx-W`pP5&MQ_<l-QNRlL%hfB$``YA=ZVAM4m
zfX)8{zLL{8N-zM1Lj8y8DT+zb0t=O#;QtY7FaZ`3D}FNTVyA=0^&hJEvqKAv7-YRo
z_#cp6T7HQIazVk+7a-Vge9WQ%Jy3@j!-AeYS<@l69)ZeXQ5H-vO8Nc{s%x(pi{OBm
zLm>gJ_!j<mt$(jxM#N8%nz>z6S635;#p(kz+$f7I!OIg4q&un|@wk)FH>^|-*-^dy
zUez%+ySz~;@7OD4!Tmu!kw#UK1n<vi=TD}qTI=B;af|DYL=aUDIOr(ucmaCc5kVY4
zXE_%PZP+@`@g-PC0BjZyB-n0Sq6cqEg{)kMGy}^%B85Eyi=E_OI4v2La0dt|aAe+C
zk}<<uzp<#M6@Tr>!z|8OQ|i(y3~}l*{^O%tWaqp7X@ncWHiGKbdTFX2qTnJqXqQJ|
zOZQd{;6$V)1mf}LT3_9}Cql3-=`~g{e2Eizs8({sxola2B&>@tM=c4CBOD5q_G;Ky
zt;^loY~KEHrFf<e?__bPU>T<zC+GI;BKUiU_pbU^_?~HSGH6;y>l)QtRXIAY3GeS~
zUuL48JSk6SHqEc~a!tE;C_?N0qvfQ|i9n-BpV^?IpDVAlA+oHF6@hYorT-4V5%W&c
z0twrzzXe6dh12<`Zh%9Yxj4>ym37!4wP-wI@oCmC;~vC<hRz51P@}!Fe>DF(h2!1!
z<@M72V9mPnjT@Oler^8GscS{WUCe>7fzsG$7s4wd%Xy+%2dSm7C<=ZE_EArbw%GZo
z;%9rin>Ji7JEK6dytah<!$itLTyM#2%Qr}RmgOPxhE><hn&P8<iT-7evJWDYSsYYi
zZN($Fhu`XykBCl4>!)MZl(Oa$9fl$-9~-fAmU0dea=AxFPCLrf^i^nSgveP9yjfXf
z9^c<6rkqdWAn-h43hyA~%3VrG)9BNaq!<u~)trkMpKo62BfZkf@2SEq335Lv!b@pC
zawXr2v2b=-Lr&>hKC!2xtG!o8nD}zw$aBzGgxliB%)s;keUQP8t!H=!$qy=0PF57d
z92TFFj@zS(gY$^4YehRjnB%iNzwJ^euf^z}AGn#Bq-mUVGk7{@hd0l!e9tyjU4OOk
zp0;Q8@)am1lv0bms?kSDKRk@2;agI#h>(B&HQ$Gqn?1@Fu8oTMreEt;2x`QL-|9U=
zs##f3GAY6Htjs6$yy^(l4Zh0ZW+YCpnCz~p8oD7s#HQaGSg-x<OLUZ~1v!j+aHED#
zq~p}QSxz+#EnmdXGR?Z`ncKYwFKM&i&G^i$rkT(uvKK`Mk@osXqn*WpQVi={5(v53
zWDz;6O{#VGT4$V}H!;hG2y>jW`$GKBp0H{kg#QAM!3S#5XZ9wY8@;qpiKb#RHF%ya
z>kLZsZJLwK7)h^f#yiM56~$gZ<$huQBSwDa;H9D>x<6@h7w7)B3+$3d-Kw8j!Mo^d
z&o6$ICd53lV%9TwuVlSEBAJ?RS}nH3m*r$$)KmOJ#!VsJBXcNNTq@U~G*^1A&U2Tx
z-hz>MkD+qq#?Qo;2RBKoDs2?;(i!R(B!)?L1ra0NX?Px0T93f|hZ7}=!TPBb4`B)Q
z#l?n3G`I~kp3nyNZyNgc*3<2$ov7=tGH<^l>&NRYU%r%WSeXx;4v(H(GGB*uDz`hn
zFBkkIJqH(5A~>+$RhRiBrpkqQ-O#FN2vvGB0+nEF81?Dds!@k`1>a_kw_O_Dw0WwL
z+$jVrPX)y+P->NMEjOu<&##PdUV1yTQ1C0%U+*j)w|HzBv8_h+kc(HQ^oLmgC%&}$
za5t(Ow^6jXer9ZX4m1<wA!ASD!tq6$`wXu4tK^hVq>dv9x1DL5XDW6LlMD%$HhGvB
zQv*<LVS4G(Zp~7DE;e|~xIzwTqW&jVpX%-n&wcb)pBAa|;hxbjLbRE28n{%jBNobw
zh4DRhETDeAh=9~j1fEY`qCLj17Vf501K%Ocn%Tlqv7$i<X~Q!wobVa~ct*5X|MDh+
znS^>T-j`nE$mygbU`|Jk^DD6OF$eU+k231(>Sp82u1GJ5FM?|rUbK^=4be~Wh5(xR
zwow2r0o(>$<oPy*`|w`m*g6yYbF|}LNe<>f_0Cj9*Y&ya$|e1C;pelVv`xCn9zHq!
zpIOqB;bf9KhY}`L3}_;1|Fu$TQWAk!$Jz<HOtjr2zWw(a)}&NYK!jO2JlIf{?!QL3
z|9Scx;I{|vits#v4@+#=N7e$+5`K>9L47x6c&Wymy`7ilBd&h8Q_(kudEG^guzsd>
z+34=QA}Ku*0>ayKdMj4WGWtSO7B4n0GblAxD1}=HyOo(3L{<7PoM-2AZN@}oGgTRp
z#nnRK{OlX3jVvqsNTl@mEpKt>Sj5>_%O}E5&H+7sEVWBYE}B3@vXN}aKyTkbY4FAQ
zf5xNto<8tnd8Qf-9)38)$lLr4egGRPdJ-@!naaRlQI+uITafO1V$sZmL?+jYBaIIo
zJ;XoCoWzj)R2t=Oo@YvC45vJ*B|I*RY8kCm^gK95tK%vK3Qr<k-W{|iw8u>&f8L}~
zO@if^_~UYwpFb@S^YFwaIN?uXNmbbgk4>y^%HowNu~AzKZ+BE2C4%pKssA|j9V`z|
z;gW6-TH>(~%`M>>^ktuV@m(NjtDkAqw^c{8RrM6U>can<y5BtxPHru{x}H$!H3#A4
zFa8l?MwVwxk$2F=eL3Je)xtC2*{&+bM0+Tu`dPr7$vL2=kUsBrAd`fgM%&hi%0u(#
z>h1d(<6<iuJ%g&Pq;4*&GT(W*QXfd#5IV1Mmp{8XPh6=#rxSL>hiZGCA3jn}P~5Zm
zS%<EWueggLb4!h$*>Ei$$0fER#+W<2C-VE9?(UkL@67faeABt$T2hs&WBleYy+~PS
zhv2&p8Vg`Aq8G9|tOz8)w18LVHwRfie4pc(e@Wf5aSCDHxa(ZGWqg$EBA^6&<nZKe
z(l>Y~G37L&rj<Y!i#J!1<00#qS%|BzLq19C_JFp765VH?{<znprkBA3$h=ns&wLb6
zgMhd#Ra&i^z&ndGAJ7UXHxpED)Hn)4T819$S9IKvFV?7NE|O56rkJNLjewMR7%`l#
z*mL&TUCfvS`~6N~YrPo#i5t3;^}>kAQ^Fxhl?z$Y!;nciU&Ny=W=|LPEQsUa?)S3F
zwdt(Ys&QoQ60k^4XMNkUeKl@W$6Vj<vEQIBPaPWpXe6a|ia_*3nax#AiOo)8so@@F
znsjoH3lcgnp?&@)A`QV;`cUvvocyPdEe20-y<;g7Us1JGy+TIbf!cT+Jvo_+6=Lnq
zkVt(|oKG<1=dvxe$O<M(dQCV}?(pNc2uZ4suOqF7MwuZ!4{N=eR-U?hwIjqQabxEG
z(n=$$TfFgKf*B#h4#-@5G9X>B;4Xsu<TBEmSlB}Ne!PXlD81-Wsejmvs--}}{zDz#
z`}Bfu<u{Cp(>9YBy!7hq&0JaWm>xZvbcq}!`IMu@iq$#mBO9?y)tN+FIGgpD!4(YJ
zup}-n*jX>ft{SI{89&H1_K&Xb2YPbKp;9EwOXxux*)b!bL!>r~N@<3~KeZfFOkZ`B
zPH5ujf<F<mzS1IW|K~>^Drc{r?nMgCuP`Y|prakYy`H29<sqHzk(uWYoS7|oxaCcR
zdCoymq&KJOfJ(hXRt!(oKbQLv5*=3YB1GEoOJ>EyUk#}a`=I_rm0N9S8uV%M$#@>(
zIO7BkR%1dCX0eLD{78f$0x`!ND<i*yMlsZDXvwJW8iS{ZqJKWg-jrjIF5lZ_mFiWV
zPNC#dk$|r|(fVjlS>=XK{-<A$Q8rqsJwjcac2CO9-x^L!4*TeZP^PqHxH)dCd6B^Y
z2bqHknBeuts2oXWA+y34MqEmowf(2Lx8n&~Nv=$joeO#L+Eg=3kAXNORyA8a4F4Nk
zDZ=YJla<mn0f`ukaaOA0heIbBp(_wDiw9zX0u7-G+3G>Qufb7ZAUCILN-8`*iu=bv
z2thF~Sam48Wk9<LqrZh?4?%O2{uQv~gx6qI0ii;nc^wXYRXt}jgCBikPQE$QDGP~s
ztQgKn@P_gn%sj{A{Wvxnu}BEv75b&Y#mF`8?n)StE1o>_DQW)=l+~wVQ3A>)$b#Mp
zcf1xwYoYpJ<CP44bc#sc`X<D1wfQfJ--n`kVhqqThXP}>O5(_NIHFWBn`jaxpM3fT
zjHIG|j<q04<VD}Dh31uF3Dd(dxte@JgJJ=O?e7cOL6{yA<iKEDII=@uQHEF&@fZ>U
zbOdIYj8SMO1%|}x&Zokt(!?j22p@+WVET*$s@T{rf0k~84DN)?CV~kwTsKHPa)>xM
zc(>xhVqNs>1~ARgexUz+kOQj6L#LAcsX&<bl}3ctTv>s=m1wC*vbdUudz}qAy5U2#
zWQ3DQB*RsxG=nb9T#atd<+i;ZJ8v#H$fE;~SLbq}n;j4uIBi!6S*PJgF?b%=5)BLZ
zZF{W%PW9hAR~y#`{1SVRavdua7>lV0uuMt~kJ;H~nZ@%q%El~RQl{l)#`g{byt1v{
zxjV<-@5Bq^W7#VOEfG2PWT+$;KGVLsRpL1uXneEmlHe<WX94m&OR=|Jc)1cA_X5*=
zO(GHdoD0WiA}enqcLt`MR!lrloYssWG1*Vnj^BV?TnUY1a&*=%XtFOEDtn(RHTK`J
zxLwZ(zLq?;CEi3vZr?yWL$E#0#dL^P9#8D@O@0?p@e@nQXmQ)EPCZo*y1>grY(U32
zYlE%$FB$uTge`>`FcZ$ELyL(o-cQ^oD!-a1l?pKdCXm4bq~wgmkN9&HHfP3W4KNHi
z8|lQuIuS!~%m$0IX;EQ%fWSi5-DueWWGtHuEHp3s^DhmyDWHNsaqLm(*#Roa2y8lR
z6a2q)+yo2bVfuj}K?JYCM++5yYme~~DqmbKr7+?Y;e@tQy&Om!EnRAoDh+v*(PmFo
zxIg3e`=EZftGdB@b;dw%OvD5|hS8fW^YY`&UPoNbmOp0QC*V-ss;wEMXZ-Jk8pf%&
zjeoUy$9av0B&2c@>mX%!*|MHBv^&#kX!<g`pGq38x*(L{2d;$^qc=YeSADz$AvS-@
zJH$r^-E7zEs0>edJ8h6zL~+kf|HM=xha%4Hv>16;zS<1IB1&9PAl16lgD_-_1>Gqg
zDB%)wS<c%0Qk%xAZ97NjX7lb9zO3oz4%HbuNIg+kQLw43GI;z8KW@*Ka%{Ax${E!?
zN%Np;<(EpZ`)A{Cl1SSwf<=9eBtFD!hVvgIZcW;|#+YsDgx`ujRd&>U)1@rh#HPwY
zKb0jkJ6@&-^CE)$bZ&fDN2Rru6j)$zPm*ab%=HNpZ#CPw{72$k-YI7i8&B5rg997{
zrJ{mR6At;GrVy1uQYjksx2d}bxroiezFuCAOYY&3POq3c<zH_+q<Q>`!!Ez`9Ny6F
zcpj$2XiMKvP$EJPwhB~^>v8t>ypLZ)|FKxq_KA4+hP6Qs<E#Me)y&pOD$Vt-%aROd
zecm}+DjjNrVb`i)U3#H3cpo08<W1<?+oY|an2|i`h(KqkM76F?_l>C+<m-YxCp+^A
zk^%0?r>6(~uSR;f|7Pm*TebN4_=v6UW)f9e!IL?x4d8c<lPO9FOHYXK?ljYXN3H~m
z800w?B<sPdM2ug-g1=o$BXYa#EU%KK7ozSq5(7!!wG=@4f9-&ui{;WIb@YWhIhy`H
zh<j@wrCeFdsDW2z(a&WRGr*ryyuf@d%E^9tWdiX^Ha6HS+D+oep|Y)Xdq++Mb+5+!
zF5hT0Y(rYp|98E<i_-gd5vn4JixY$!+^eRe>p%$GeH-yEe9hS&MNRm4eK3|mXr7P%
z%}GS(+!xbN*L;0!iB6i@l%srIMv9tK@1E~QwZ0DT>#<^vU2uImBIr79NIN2SI@qUv
zT{9zyaCn+r^n0xU$+c&k7GCH2xso?u6N%@Ms#K3v=8@12m)Rwo3g-F8OWkQ-jbtJ0
z%r$V!Km#wo)}R=T-bcyugS+D+PHh6u$BV304_t;n$^T*p<LLz(7!)Is<8M8FJtZ@d
z((b%K9QI|ij93dvY5{o8MNU99L>R}skc7eTj@SQV2GX$@&O#;$=q-Smzp!TD7YT`U
z1m*!Q)(pHz%yz<>0Y<DDnA%3cux20}OM()I5!>StCB_Uqx<=W8wF}(<UZs#U+`S0&
z>KX*o!Paf3{!pPxyJH7@)UqXp1GCP>WyZ8B9D_8sh9$fHW`!(_o`zCx4zinyw26sy
z;fc}|JTuGx^caPZ7b(&Yq%x}MsG%4_{d^>Tm*-ITf(UnvW%$@U{e5aNc^%TJTw=sB
zqNszgT|~CP;=PyqOXFW>HP7q{GDalF$k^L2cn&ymGN};JUVBucRDa_+kR7cHB>)5%
zv@a9%G5`3wr*R>gEFNX`0V+|uP?Ygf_={3^ODZ3+>QtSPvXkP3As|;4H1V&JyKahK
zdCOIFo!3yOEjkiY#Yvqz-Jq3SB^>dPl2AQ(sBJ<eYyRazT=H(`$(jdZgPZ$=<f^6!
z6m=)e!%E`jXUBvJgG)wEGvay(_Zvpx&pdRNOt>4PY;<>@?et{14^oov|LPxfbP4%m
zIb@iAhes7ZNMg`(y>r_o-hlr8STEsAr!C}HcgC&6A4S33k0{0(TQuys%)AY#$8Ot|
z1fQP0C>h?(CAM9gzY;#Z1^X6$gD4>I{t4%uF)dwqo|2hUojnaHsZRV2xuM6X9)>2p
zTF;Nlg|LPclKMxf-zwh-bNC3C=)|q2*psYI^tZT%OH~>?7vXb@o-!TH(GiXKFji8g
zA`tUzAF{s16WGD{W$!%sjO>f5$s4kI`+37+q|<94f-4zWyDwg82;uDxm+KMU^K9z+
zA|=dWAf_j!EK~wRc&_9bQP20~GSlD$P1y9>s>BqCFd_}us$!|TY8!}N{j@G%VEB^v
zBIBEeUT)?K)&m3K-xh#AsK84njf~@oJVg#qzA;;BP|UCTeb!Q|B0ZASY%(uT)V**f
z78F1|k31dLOWH`Xe_ZqVZfbELBWKLG(+yNzq9;C;B+K_}_0)!Gu?9;e8%b5|fCWAM
ziQ_JX6ma1a{&4<Wt2}1p+r$CxhOE^{?Vg)JxXQtuF4z_l$Yn57m(bEEPQ<@Y(|y=s
zm40}C$<(#>g8%;6LJv73>&A^GzvcZ(7g(fn7~qCV@^l~;vtDr7t_l>6mn<f(5S68`
zqot_qgJiv#y_Ke;S$ms?<N4RZSRx;T_IPQdytXZwq2dd5r2ND#fc`@BhMkNvhg#Ly
zJ|-G#5!Ha222o6I^{_o1(V%QGyI=6B4DGs&<vviw*l9r_z=h<*Ve!8`&xEnoWg37x
z`wea!e{BYv@qUldNWVS>xG|>3Pz2x~z6JZfqR7A=Cplsp)NKDE!%*<P30U~YsOucc
z6WAfHVTQ00-3ByT6{f<Wk$yN_V|ejFn4pH^_4BYd0n>?oNBSGk2d$zHekrV$Q=BB!
zAl|ve?Z<sfXR@@3E>*wm*I~Townl*e2U_H4Lf{qbSR(SCq=7z9j3(NnBiiV_Fyqu@
z&{rdst~P=8=pG8gk7lefRKmhIyS=_v+_$vL463_uKO4T}Nr#)p=r$@3`DF-sEO&FR
zOV);br)MaC#E4<tx1u$z(e-LXLZl>B@dm~F>Qh&S-z*nB#2@VKmpHx~!ILFLZjm#B
zee4~LXf!iQbY;FY>)8E)s<EC*-_1W8A4LPE(Z>u!%~<yOT7md-&k^T@`{wWM7DKgt
z1o?2XPWtjc2#nr6SMR@0R~DPbc<HW~Uy$rJ2g~j%qoxsh=r7@>-yQW!aNWSKa6(sC
z-^;e=DFyCT*09{kYuxXi<$He~InV4ZL<wHZ)8@-Oe?H1nb^rJZm^-ZeMC@k2Ylhw}
znhDR@XoUOcmnQ-$-z$`DiH64i+)t?+eLB>%hda&GiS*o#T6^l9Z}f%+!uwm8GoX#-
zWsv!P*6_X3)QJ<x9K1WmG%%e`+?ydc^PErRxaq`oH6L);MQ-2WsPIzMNAGNpzhtYK
zfl;UbqA#0|$wHQ1>38otWP!`{iZpnhB<*@<y-8}n9gL#in0yRs)hM4z4XS*fS=^n+
zLmwRl<J0(+OC?UkS0aAWqT{NXYn~Nr<h1|M<O{yusB%aZ=|wrEb*RkGyWtDMswJZn
zHLpMdrP9Us3h1ntX8ldYBi&^<3~EbH3MAqdCZJ%W5(8O}f%PYO>hIo&$3@!tOcn>J
z1b@(^wI<#0jA0Ax+y2%}wP~==P-)Mq!-+a+HS>=BaafA>U3~gui9EUdE_2CeBBLIO
zh&sG`=9)d8r%2=O=lf@eJ~%&IP?REC@%G|My}rd~eKpZM&JjQFw|wtj*wX3hbcGEo
zbLGn{yyMJbakLnizyL+;q072Pgpyz}dP5rVTjn99Kf5Js`8N?kmaw7CU!pRr?)L4$
z5vDOF8eL@%2z{J+iNWy$3d8mWzbvIv8yPOS*ZF^Ds9ul76B#p8>nmJnek&yF+}N&>
z-=wxflBiM~2}vibznWN7dpSk^{pH7}O>0u_gXL(APQG6t!C10Bx%J#^Y56o+6<4YR
zwwCbv(P6{U&f6)ZNP;~&h7<pj<s#T5mtp^D_D`n>@*Xiz2cT%(P8_e+kK4+5UV^5?
z|0@+ZY(&R~B7oQb5Kr3dcn5p>B#E`w@rk)E7;{dK4Ga^g{G_pg;U*B40D2kFB8YYF
zRoHa$+a9Ah!kJmI;SdL=fggu%Ckckar1(E<m_%d493zK@#bTICsb01)K_44=8^ME?
z55+z&CQmOz4#xAXwq9SY7rV7PI(RqU=BF60m-;K?Y^C3DFUn`Q?#6cw;@Us<tHwZ7
z;(52sjfZ+JoTgkyig#-A`7s(8eA{>5I<~zW-z8k5D{M@j%~hl`#xZ6u@l>35x!9$H
z-}@7JMnan9)H^65RhW_dL(vc&($<(5XC-G9rFsr9u#Oo$?cjvu+0He?7|!%x7%-1|
z-DDrEK7r+t7C;-4Uk)$}Gwj*d@!pUsuXS=*LfW7sB+n<2Vnu9RjnfdiTOkc)lN`ge
zjP%dHaxrV%MMgXIbUVfUF-`{EnJ^O1(Hl`G!MV!1d`yBLW(5~z+80cV?Sbok=&V{0
z5bgLfnw9$_(0TM^ynwc<5;j~*#?HA>k?8r1^cN@3S-0vhD~qa9z<2VC;}nq`?@|z#
z>@13T^#@6J5;w`%MmiiN_wBmd6VHVB_&+IWqQza}B(S@lig3%IyTf`{8gXx1P76j2
zK9t*vekHc@e(=gCNw45s@9n)i(J~gr_iF>gPUORbBSK%+v1U-Gnr4}L=(AU#rDc&M
z!<;>xzPR{CcY2zKt(nT7Zx#R;T>2?;`q=Bnar1n}Q@zh~MgFDKqL<jyK4(xvDGrQ~
zOub&GcbwPC%Z|z^7RH_Adox@<_!wL<Wqs1YyZ*o}2T*;H7a)P=fn%G!KN=17q=rU~
z$kD;yc9t`4YYgClD5qa634e?Y;9bWF6=$hxG`J?!<7dy3_H<48YKL5)5@TJ5xF(Nm
zL^g}%!}D&Gtg(;vd8#h}ssi=<VJO0b8h(%rv&fBcvJY!1Gk#Q?X=~n`<Pq277yK7j
zBH!F5b{A6SU?OF<3$fU*xs6Ia6y2rWycBle*2mR#Lon1O4mBtFoF2r;0HKTW?6q>V
z5w&va?<1j0JdUnPX1v>0f&AThx9OWe%$c2FEX@6PvkAdO?)Q8k$+;0DmiMrd%6jQ1
z?-YaCV$Dsj3J>$1H`{(I)-^HI>3x5PSHjCWEEMUBKP5Zgtd>*TAk0-yH%-3)8=>L%
z4qr(Z*ud_K;F?qN#2o_`n)RaKa>1M3Yqncq?9NxGTFL=fN8pyR_d}`v7YC}-B2s{+
zt8&d3KDiOH`qHkwR5fz}5o~vg(f4?&&<d=+Gh_8#Ykmitl4zpBc;}lt9U!c}1F0bZ
zL=woK24W+CIBWzEcb`-ktKV~2UtsQ2_j9a%Q)424S%Y;!Y@*;$9ms+K?ggpWr59?E
zBdkMc$>F7NmX`UR($iAgj2Y8ooBlvvd*22<9I4$q2hO-Vk~fL9T1L3`dOjq}-)S1|
zYg;KANnbf)<tz{swBl@9566#4tQFH1^Vof*Ozak6TU!K1J518|UOu}OZO9>QTAWer
z%n)G|?VBNoGd7@I?ex}@*w1Gn<*8>A?(lfRVn($i|8;?j+XxPOuYrD~TE)_e<apg&
z{-YdSqo9`01(lcyzpVXP9o2k1O5tFk+ma_5;ZdvP%qhaO!d2_(;jb`ZJ)H<M42W=C
zDpGX3U9PVxceecUN4i%sw*pJ>6K?Y;pQ;pFiD(+3QWv!IL>D%e{X$2leog!O;C<r{
zkW+4BsSk_|t#7$Xe2%1c{(f}J;&S=BHbDs~W8HR_mAoKVbscyd5*W9W&>(r~E}<`H
zXXUM;Dn(?jR*rXqduu6C#U(E~P4aHj&yzmBPQi?qc(*NXCW9#jm4|TS&S4kFQ*))G
z6G#uObR&KZss4;-JBwXFIY8T9$ndQ2h?L~i=i7a;aL;`Q+Upn3Yi`Gpim|A$)1;6x
zX5DpC4K|FMZrPq}UsY|6)T`0DT~S<X?&vjJr*mKbdW5?@)T9W}o##1CVHtDoY+D|q
z?qpyWk)Zo#^FAr6h(7A@!#kZ2YA2JEXK35tx1%h|oK$RMCM63Taf>}a<#c*-gK3Se
z)-}RU+}`g~`t_4BBY0_KlOB8~ofKD=hebDaIJQV*)MBFJ{bEz%8}bl#qP64BJJANe
z{6@v*E~&NKcSr((djV1m_)1&hAiBIQGa#e%NE*_zp38WxcC<}M_@}7L{U`3m<?6kP
zKTOu1w=fB}D8hw5R^b-vg$cKBs(uMvahg@o+}9`e4#r=1@wA%d8Vp)6Q*YUmrEMio
zdj%v5(jtpo7&Ez_B{1qUeMX;m3#WJP0P0Av{c%m(0G|BlcCCMUU84$IKQUhGpzj>!
z^SQ<)NHtiLZa&FA+`F)RCbjx=v_<p5H%FzaVkbztvsjbUZI(U(cSKwCnt5_?^SDqz
zwt<M~cr-fo<f;Up=JWgeZkMB*&g{<QuuSps+qZ{(ho&cmqU5d(37&|P^P}b`KN4Y#
zOD{K7JC|gu2kd>UyS{N2n5##9-WjzRSSO2yxDFnW(vC=<mr7A0QmO>UbZaga^*Bfd
zwqv_RY6T->9MnaFd~=DPPDYU3vXdvMR1c$=PfoJwXnI}c+FnvgxruP!6+DW0UKsog
ze|83r_*7aVm8r^8A7D^|2{n|Ge$<aoeTpsNd^gvB%&mAF(AhTb%CkkSbo(tilA(a+
z^v3udc^^x(A>2mf<OpD4<Q)b^$fT}$l3;Rx<F_yo!y5ie7Az3SV}WR%0L6*vv7(F#
zN&+HY1!EiB#x^ime}aXTQ><sw_9@pFI|Me-Kt}oOCl;yrut>!hPQrvmsv|5?9qn{u
zP9(@DfhYy=-e<Mu|K($SfItX9Dqm(N4NUc9XgM}zT^>OefF+TFC6RKs+YvM9Bo~&1
zJ$V%oW?eoiSQ50Beb{sd9~Mygq9~`aB*d{K#GiEOU`fbgNd(JR0VPzx)P3Z!B*=9&
zu&MS|>_S?@X{4~M7{QVlsroE|C4tW10t+$rtfIw`5W_;QIHPhOP`(BPgfduW$wbnp
zVM%ylNqFsavSCRGU`cpnS21Hr+{es9ocf*y*3oOlE~GVz=?qJP3QL0OZYKeT1brAL
zN=%^eZozKA0H#5MSIr6wh9u@F25=1{Sb*~ubds0};|Xrk-jc*-f_4ZnQsajMO29V2
z!8RagZ^Cjy7n6bBF6soeW0`4)5sDUP*A=W-b#r0F>Jb@U3#L9RG?@T%Orfru!-Scn
z1O&5A+5c}+TtNuztbns7v?IkqMiYn?G<z(o7<?Hq`vt}@LJ;TwHq-tPqZ|xkm}nam
ziihnEeuBVo9t`Br|Br;a7V=+H9#Y_n!T(11DOtn+zoRGF`@8790i5|2B{)d~neTIq
z9Ajp51ZNQZUq=i;k-i*(Vln{o@BmaSwjW%c74jGr)G%@f`v#b5BYqzoBSl~W5p;Y2
z<Wc0)xiDJ@6hq+Hll(gwI3;Jp+3d`)!Uz}$V#wGhV~t1hj|><Ph9wqHoJA2ZcA$9{
z!AIDjgKa1Z#Nf%gxsN?-MC%K1q+tDT08+FJ9Ko5$3kfj`1Ip9j3^@N5A`ATrKl3a!
z#=Ze0*o*8v7zaCmBU%$1@qfZ4H2+Po0l$y_AB*?d<?((-Nws1!A|P~-6M!P2|3?M~
zkjq|~dA!d~5RB-vp=ADFI~)0bw3VpGsMDuDKHZ!vvQKici=~f+(-`y*cE!+9Sd-pf
z{kOs%=sp7<#G>E<DRwFFHy}tER2f@D373Belw3YU)Zk(nq(dnWPtGpF`^T;aC^~De
z6!G&XgTR?;1E=p47JR~}$br)^YvM1?f{?)NoEK*p)(^dr_amHgszkN{6j%O-;>%ea
zF-G1|I<S4wzX_R9s>y^eRY;>Lx??GV2^yHiN2gYLxdFj?|38Aof%@_qk@JE5-@G${
zc{?a$i>Bf7!jQwiJWFJ-?x9#IQf!v%6Cu53`RTAjU$Mu%mh7w3&hu8sASs_;@&G|D
zs%_u7!zzkPVlY8CbYI^UA^3ykR*F5O?5E@jSpv6q4p7B8PgVK$<rsjtU#TjY^!pR2
z3e31?UV~gTJP!8j3ItZ=t<@m5lvPB)@vbuGfB-JR_C9a$S7q8lw%0f0@nUD?<(1?^
z5_~kkZJr8Ni(EJ=#%zLbK@5UNE$lkVsQw0>H|tq=)YiXvfTFYFC2wFNU*V!Z$eyv0
z+oN<18Fk?0Sp<To;Lv5@dFe-1Zvsd#UOHXD)Q_gFsLJ%y8>rfa53<l`;H@q-fg`~O
z;8;0KwHd03XJMgI3<`AuUVMWCL(Q8oR35y0I5hIkc;JP6CWxVu>n!IQG(LcA(y7u!
z-H(XzStv>a&}qXTWRg&@98UZ|+c3XE;X8V$-|}MbUqES9blI}mfoUn*lvrBT9g`b%
z<3k(7P@_@umqKssIdcJO8rcnzufcm<yae*{%5ak7uVyc{o<s0^;K_42D`JeNr=tMI
zL&0sN588?J_r5~+AAX5%CoNu;qAmumFZA8={B1}x$DYluBh?#iT+&H&u?5x^L;$6&
z7~u=JHDn6cJUag;H1Q9t2Urw?&4<(LB<Qdj2m%AOx+Vudi{EgK{p+OupSuy3jrVe~
z^|>S(|G6GP){@hS)dL-L=`G?Yw(tBy(swFsoiJdy?`MaC{>+Kln%u{o3^cDy_;#Vs
zEdH#6L%D4&T~CAqX7eIZIN-N8MnD1QLkyCBa{jCw6y?Z8VA!e8C6XVz`IPStX*PBS
z-Zv|=K}?}LunF#T4LcNp=a*r5Y<jhlF*F}Kxw0k#K13={t8{SaCdQBN+sz`ak*+cN
zuGPa@c_B~j8}vIig;WFEI|_v2h>0`$OGz0eu?l$tMG#gdo1gunzL5n!YvLSLTX{D|
z4|^LpD4LwS;eaR+ViOS<`xs&o@@|^^__3a5KPzVqme2i!HPqInpW05f8lY~5H+hVQ
z?+Y8=GgwP{aVirT0D(0g;2o!WuOwz^$GnW@Phx&OyG#{^hsJYW&Fm@=@qybN6gMq!
zH%*&C7;&A)bYJmF5khfmk4t&acuDI<)?EP^3rAMWj+s$7a-nQCT?AB_lx_u*JU|xL
zHYI<n+(XxAj!&|x2aK5xnDx`<jCtl<$FS5<IXfR@PD;!A0KtVavizCwkYOWn=)^#i
z-DyECkLULDowfU<1e#-$tcLrs6AZ$7CT4MzQ&{h28OliPc^o>Q1QI{`@F=Xfx5G`-
ztT3fcYy`U*9|%Oq=WqPnrmV^OqdfA(HZ85BGF{{v$U#4`0|WZg?1IK{;VsneRn7IN
zDr_*#1{|V$;rbEFTH|1C7;qti+`26u>*uizg`!K;PdDqF=&=`c`u|fCzP~(un-S~#
z%uxKN^1XSwz(x>5S>)D#O3l+e^3XN;fVJ{b{f{Vbxu->b!oqO+f9m2r+TwB*utIwM
zKjrOh&2Ef%nDQTaFNhtu?JM>K0MNT+XhqxUYKwge?xe`4|KHPEp!Cpl??W0!2GH7h
z+W{r`&&iR`z6VC%TKuPu*h@&_b1K7Zm_@C}|7U7*Gh(D+81Dex_5ZkwG#kjI9EMp`
zrPO~kJIHrhgaqqmF8`-g^7)<{H7WLJV-u)5L|=ZYw1m`dwapo$OX!L7u6`>&f$fyk
zj(-;4l7+O)<U9B_-y?|xSkNWl?K1nznG}JntA<!Kmu=;@9aP*#m4ac79854M{VTwI
zI#i!$gS31UD;vs~wqipu08koW`QGTgqBl5n6Da=NWPfiDf@t8yHUM)t1Ip*MN7^?X
z*nt~mZ7G?X`UE&^Lm7am$UsL(&@zC&P6cF9fjgifrw!_lqRD8v&G%S4^fKR+aA`Q(
zEijjkQ_p|P;gyt#x(R97$}g0VC<28p5c2Y%;;qIc%?<BSW!FL0&GYMZVAVb!%DGT6
z?y}3<3Yd!()^kuZLeGXbTKc?sN?x>fu<kl;RDY}aDffyIp6W*Why;eDPw#^ubRE<y
zkZQ_s5~z7CH8>c!j>)kgFj84hGY<rm*KJz1CTiBe+;ahTsFNbXkb|mBa$D@49co&)
zfePQeUyM@<uq_%{*dZ*fzGsIE)?(N???I(5CrOnygJLf3H$?QHxOaz93h<-WeMei3
z>jbfy)&(F3es)^n`J^G0>TW_^M}Aa}>v0;1+|k(09WOuxr(>*Avb*r^2-I&*sVtXG
zk)tp50vqZ95ymz7P<hG7NMpSul;LF5t|7pV8n0|=qrFpeP!R*t?se~!`I2r)fL@`h
z+}mQpP+h`4Aev9tAh%AW8Z^yFX@G7NKG{6lRxi6MEFu=Z__%S@1ifxm@A&M4Pc*P$
z*l{$W5+$D&ZSw>SHnkUf9;=Tzr`WUW?gdf5;Xb4tP7+V%6xW>-#hv85SR9uJE)R#;
z(q9OU*XpXEmpR&<c1lj4fC_vv#rrlgC0l&umovjQUeJ-aiT~cQ5Z--8VE6e$BcPMo
z3HRHYr(Vpe!}Ho|)F0m(kq7K~eRG)x%Xm6Ls1k*V8oVA=nGEvylrn?|Fdlu|FEj|a
zKvQ3gR4xUs<@wD$)W#GzcLEQ68PS{buZ_e@P+HgXmMlQ{7t2=`e)TGuoLRwrny$KB
z2}IbfX;*fVzWG1q>^b)xWsL(RTn7XleJ}7(-P*wJX>fj~4a>5hRcK^_0HkFizwiM>
zfdi|TnvlS2^!^w%1pm7))7IZgZ-n*85dTrkQ-l=nDb{GY0lwz{ar0;TXN(OE1}e%P
z{0HKYjh(sJ<ijM_f1u)j8<hXOZ^qs~mmiMm!Ma6QbBBc_r2nh1HVjBvr$H~}p8oF1
V<FxT)0|EaYC~MuXP_%yWe*x^ln#}+J

literal 0
HcmV?d00001

diff --git a/usr/share/doc/vizrt/vosa-handbook/graphics/pres1-system-info.png b/usr/share/doc/vizrt/vosa-handbook/graphics/pres1-system-info.png
deleted file mode 100644
index 7f04f03cbe2b900a2694b28d71b0f5c0371e5ef0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/usr/share/doc/vizrt/vosa-handbook/ssh-access.org b/usr/share/doc/vizrt/vosa-handbook/ssh-access.org
index c10e1aa6..a40d08b8 100644
--- a/usr/share/doc/vizrt/vosa-handbook/ssh-access.org
+++ b/usr/share/doc/vizrt/vosa-handbook/ssh-access.org
@@ -8,7 +8,8 @@ It also assumes that the gateway IP of your office/network has been
 added to the access control list of hosts/networks which are allowed
 to access the gatekeeper.
 
-** Generate your SSH key
+** Generate an SSH key on Linux or Mac OS X
+*** Check to see if you already have a key you can use
 You only need to do this if you don't already have an SSH key. The
 keys are normally stored in ~$HOME/.ssh~ so have a look here to see if
 you have any:
@@ -20,6 +21,7 @@ If you see the ~id_rsa~ and ~id_dsa.pub~, you already have one. They
 can also be called something with ~dsa~ or indeed anything (the
 ~id_rsa[.pub]~ are just the default).
 
+*** Generate a new SSH key
 To generate a new key, you can do:
 #+BEGIN_SRC text
 $ ssh-keygen -t rsa
@@ -39,7 +41,7 @@ $ ssh-keygen -f id_rsa -p
 
 The ~id_rsa~ above corresponds to the ~$HOME/.ssh/id_rsa~ file.
 
-** Add your SSH key to your key agent
+*** Add your SSH key to your key agent
 On your local machine, load your SSH key into your key agent. On Linux
 and Mac OS X, this should only be a matter of:
 #+BEGIN_SRC text
@@ -57,6 +59,24 @@ $ ssh-add -l
 2048 33:49:02:c5:30:8d:2e:9g:28:82:3a:89:5c:b3:5d:a3 /home/myuser/.ssh/id_rsa (RSA)
 #+END_SRC
 
+
+** Generate an SSH key on Windows
+Install [[http://cygwin.com][Cygwin]] and be sure to check for the =openssh-client= package
+when running =setup.exe=:
+
+[[./graphics/cygwin-openssh.png]]
+
+Once the installation is done, you should have a =cygwin= icon to
+click on:
+[[http://x.cygwin.com/cygwin-icon.gif]] This will open a Unix like shell
+on your Windows computer, in which you can use many of the standard
+Unix commands, such as =ls=, =cd=, =cp=, =rsync= & =grep=.
+
+In the Cygwin shell, you now run the same =ssh= command that you'd
+have on Linux. This command is what you can see being used and
+you can use the instructions above in the [[Generate an SSH key on Linux
+or Mac OS X]] section to generate and use your SSH key.
+
 ** Log on to the gatekeeper
 On your local machine, do:
 #+BEGIN_SRC text

From 74968e5e8fb965c005501ed55862e2d0c2a76e54 Mon Sep 17 00:00:00 2001
From: Kevin Flynn <kevin@kevin-Precision-M4500.(none)>
Date: Fri, 17 Aug 2012 14:47:52 +0200
Subject: [PATCH 1214/2585] reorganized sections on how to download/run

---
 usr/share/doc/escenic/ece-install-guide.org | 113 ++++++++++++--------
 1 file changed, 71 insertions(+), 42 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index d39bdf5e..dfaf4134 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -64,6 +64,13 @@ platforms:
 Whichever operating system(s) you will be installing on, you must ensure
 that the following requirements are met:
 
+ - Sufficient memory :: The precise amount of memory required by
+      =ece-install= depends on what components are to be installed. To
+      successfully install a complete software stack on one machine,
+      you need at least 3GB of RAM. If you are installing on a
+      virtual machine it is important to remember this requirement
+      when creating the virtual machine.
+
  - Internet connection :: =ece-install= needs an Internet
       connection. Ideally it should be a fast connection, since it
       will need to download several hundred megabytes of data.
@@ -97,9 +104,36 @@ Platforms on which you will need to do this include:
 | Ubuntu LTS 10.04     | Everything except Tomcat/APR wrappers are automatic | 2012-02-27 13:19 |
 | Ubuntu LTS 12.04     | Everything except Tomcat/APR wrappers are automatic | 2012-07-27 03:27 |
 
-
-* Downloading the ece-install Script
-The easiest way of getting ece-install is to use git. Type this in
+* Using ece-install
+The various software components required to run an Escenic-powered web
+site are usually installed on a cluster of servers, with different
+components installed on each server according to the
+function it will perform. The set of components installed on a
+particular server is called its *profile*.
+
+The overall procedure for installing Escenic on a cluster of machines
+is as follows: 
+
+ 1. Determine the profile of each server in the cluster. For
+    descriptions of all pre-defined profiles, see ??.
+ 1. For each server:
+    1. Log on to the server.
+    1. Install the =ece-install= script (see Get ece-install).
+    1. Become the root user (see Become Root).
+    1. Create an =ece-install= configuration file (see Create a
+       Configuration File).
+    1. Run the =ece-install= script, specifying the appropriate
+       profile (see Run ece-install).
+
+=ece-install= can be run in two ways:
+
+ - Interactive mode :: In this mode, =ece-install= prompts you to
+      enter the parameters it needs in order to perform the installation.
+ - Full automatic install (FAI) mode :: In this mode =ece-install=
+      reads all required parameters from a configuration file.
+
+** <<<Get ece-install>>>
+Use =git= to get the ece-install script. Type this in
 your shell:
 
 #+BEGIN_SRC text
@@ -114,58 +148,62 @@ ece-scripts directory.
 If you have problems installing git, you can also download a ZIP
 archive here: https://github.com/skybert/ece-scripts/zipball/master
 
-* Running the ece-install Script
-After getting the latest version of ece-scripts, you run it with:
-#+BEGIN_SRC text
-# bash ece-scripts/usr/sbin/ece-install  
-#+END_SRC
-
-** Requires Super User Privileges
-You must run the script as the root user.  If you start the script as
-a regular user, it will complain:
+** <<<Become Root>>>
+You must be the root user to run =ece-install=. If you try to run it as
+an ordinary user, it will complain:
 #+BEGIN_SRC text
 [ece-install] You must be root when running ece-install
 #+END_SRC
-To become root on Ubuntu based systems and Mac OS X, do:
+
+To become root on Ubuntu-based systems and Mac OS X, enter:
 #+BEGIN_SRC text
 $ sudo su
 #+END_SRC
-Please note that just doing "sudo ece-install" may not work.
 
-On all other Unix like system, do:
+On all other Unix-like system, enter:
 #+BEGIN_SRC text
 $ su -
 #+END_SRC
 
-** Technet & WF credentials
-You will need access to http://technet.escenic.com and put these
-credentials in the root user's $HOME/ece-install.conf, normally this
-means /root/ece-install.conf, the script will also tell you this if
-you forget to provide such a configuration file:
+#+BEGIN_QUOTE
+Note that using =sudo= to run =ece-install= (that is, entering  "=sudo
+ece-install=") may not work. You should actually become the root user.
+#+END_QUOTE
+
+** <<<Create a Configuration File>>>
+=ece-install= expects to find a configuration file called
+=ece-install.conf= in the root user's home directory, which is usually
+=/root=.
+
+If you forget to provide such a file before running =ece-install=,
+then =ece-install= will complain:
 #+BEGIN_SRC text
 [ece-install] /root/ece-install.conf doesn't exist, I cannot live without it :-(
 #+END_SRC
 
-As for the technet credentials, the script will also tell you if it
-cannot find what it's looking for:
+=/root/ece-install.conf=. may contain a large number of configuration
+parameters, but the minimum requirement is that it contains a user
+name and password for downloading software from Escenic Technet:
+#+BEGIN_SRC conf
+technet_user=<user>
+technet_password=<password>
+#+END_SRC
+
+If the configuration file does not contain these settings then
+=ece-install= will complain:
 #+BEGIN_SRC text
 [ece-install] Be sure to set technet_user and technet_password
 [ece-install] in /root/ece-install.conf
 #+END_SRC
 
-The minimum ece-install.conf file is thus:
-#+BEGIN_SRC conf
-technet_user=<user>
-technet_password=<password>
-#+END_SRC
+Depending on what components you are installing on the server, you may
+need to include other configuration parameters in the file. If you are
+installing the Widget Framework, for example, you will need to specify
+additional download credentials (see ??). If you want to run in FAI
+mode then you may need to include many more parameters.
 
-If you're installing WF as well, you'll need additional credentials
-for this, see the Widget Framwork section below, and if you want to
-runn a fully automatic install without any user interaction, you'll
-need to specify some FAI specific parameters, see the FAI section
-below. 
 
-** Basic invocation & how to debug errors
+** <<<Run ece-install>>>
 With the configuration file in place, you're now ready to run it:
 #+BEGIN_SRC text
 # bash ece-install [-v|--verbose|<-f|--file> <conf-file>]
@@ -1017,15 +1055,6 @@ set_up_solr.preinst
 set_up_solr.postinst
 #+END_SRC
 
-* Assumptions
-** The machine on which ece-install has enough RAM
-It is assumed that the machine on which ece-install has enough RAM to
-install the profiles the user asks for.
-
-A common error by users, is to run ece-install in a (virtual) machine
-that has e.g. only 1GB RAM. For happy running, we recommend having a
-machine with at least 3GB when installing a full ECE stack on it.
-
 * Uninstalling Everything that the ece-install Set Up
 WARNING: this is potentially dangerous as some of these components may
 be used by other pieces of software you have running on your

From d6fa12bdd68c75c3073924f8d1531c3929b7d4a4 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 17 Aug 2012 14:56:55 +0200
Subject: [PATCH 1215/2585] - added information to the profile=db profile about
 how the user can   influence the versions of the ECE and plugins.

---
 usr/share/doc/escenic/ece-install-guide.org | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index ce0d56bd..c23bd549 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -253,9 +253,13 @@ set of high performance patches.
 
 If not, MySQL or Percona must be installed in advance.
 
-Given that the mysqld is install, this profile will download all the
+Given that the mysqld is installed, this profile will download all the
 Escenic components and install the ECE database schema based from the
-SQL files contained inside the distribution bundles. 
+SQL files contained inside the distribution bundles specified with in
+the =technet_download_list= and =wf_dowload_list= variables. The
+defaults are inside the =ece-install= script itself, but you can
+overrides these in your =ece-install.conf= if you wish different minor
+versions of the ECE and plugins.
 
 The script will fail by itself if the DB already exists:
 #+BEGIN_SRC text

From 3a5dbbba065ba4dacceb569e19c54737eb4b4b0c Mon Sep 17 00:00:00 2001
From: Kevin Flynn <kevin@kevin-Precision-M4500.(none)>
Date: Mon, 20 Aug 2012 08:40:59 +0200
Subject: [PATCH 1216/2585] minor edits

---
 usr/share/doc/escenic/ece-install-guide.org | 60 ++++++++++++---------
 1 file changed, 34 insertions(+), 26 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 24321e28..fed2bab8 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -33,8 +33,10 @@ need to install manually, and it still handles the configuration of
 these components for you.
 
 ** Supported Operating Systems
-=ece-install= works best on Debian 6.0 (Squeeze) or later. It should, however, work on any Unix-like system that provides a BASH
-command shell (version 4.2 or later). 
+=ece-install= works best on Debian 6.0 (Squeeze) or later. It should,
+however, work on any Unix-like system that provides a BASH command
+shell (version 4.2 or later). 
+
 
 Here is an overview of the situation on some of the most popular
 platforms:
@@ -114,7 +116,7 @@ The overall procedure for installing Escenic on a cluster of machines
 is as follows: 
 
  1. Determine the profile of each server in the cluster. For
-    descriptions of all pre-defined profiles, see ??.
+    descriptions of all available profiles, see Server Profiles.
  1. For each server:
     1. Log on to the server.
     1. Install the =ece-install= script (see Get ece-install).
@@ -201,54 +203,60 @@ installing the Widget Framework, for example, you will need to specify
 additional download credentials (see ??). If you want to run in FAI
 mode then you may need to include many more parameters.
 
-
 ** <<<Run ece-install>>>
-With the configuration file in place, you're now ready to run it:
+To run =ece-install=, enter:
 #+BEGIN_SRC text
-# bash ece-install [-v|--verbose|<-f|--file> <conf-file>]
+# bash ece-install <options>
 #+END_SRC
 
-It will output everything from internal and external commands to its
-log file located at /var/log/ece-install.log.
+The following options may be specified with the command:
+
+ - =[-v|--verbose]= :: Requests verbose output from =ece-install=.
+
+ - =[-f|--file] <conf-file-path>= :: Instructs =ece-install= to read
+      configuration data from the specified file.
+
+=ece-install= writes a log file located at
+=/var/log/ece-install.log=. All output generated by all the commands
+it executes is written to this file. You can use =tail= to keep an eye
+on what is being written to the log.
 
-ece-install will try to "fail fast", exiting as soon as it detects an
-error during its execution:
+=ece-install= tries to "fail fast", exiting as soon as it detects an
+error and reporting the failure. For example:
 #+BEGIN_SRC text
 [ece-install-1] The command [cd /does/not/exist] FAILED, exiting :-(
 [ece-install-1] See /var/log/ece-install.log for further details.
 #+END_SRC
 
-As a last resort, if something goes astray with the script, and the
-log file cannot give you enough clues, the ultimate way of debugging
-this is to run the BASH interpreter with the -x flag:
+If you run into problems and the log file does not provide enough
+clues about what is going wrong, the best debugging method is to run
+the BASH interpreter with the -x flag:
 #+BEGIN_SRC text
 # bash -x ece-install
 #+END_SRC
 
-Here you can see everything that BASH does when running the script,
-how the wildcard variables expand and so on. Normally, having a tail
-on /var/log/ece-install.log should be sufficient, though.
+Doing this lets you see everything that BASH does while executing the
+script - how wild card variables are  expanded and so on.
 
 ** Preventing accidental execution of ece-install 
-
-ece-install has support for a lock file. This is useful for systems
-were you want to ensure that no one incidentally triggers ece-install
-without wanting to. The location of this lock file is:
-
+You can ensure that =ece-install= is not executed accidentally by
+creating a *lock file*. Simply create a file with this path:
 #+BEGIN_SRC text
 /var/lock/ece-install.lock
 #+END_SRC
     
-If this lock file is in place, ece-install will fail fast:
-
+If this file is present then =ece-install= will fail fast as follows:
 #+BEGIN_SRC text
 The lock file is present: /var/lock/ece-install.lock and ece-install
 will therefore refuse to run.
 #+END_SRC
 
-* Available Server Profiles
-When starting the script, it will ask you which server profile you
-want to install:
+The lock file does not need to contain anything, it just needs to exist.
+
+* <<<Server Profiles>>>
+
+When you run =ece-install= in interactive mode, it displays a prompt
+asking which *profile* you want to install:
 #+BEGIN_SRC text
 Hi, which server profile do you wish to install?
 

From 9cc62673a5bbc824b6a00386dddd1ef13a58e768 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 20 Aug 2012 09:18:38 +0200
Subject: [PATCH 1217/2585] - clarified documentation for fai_restore_all.
 Thanks to @oschoen for   reporting this.

   This closes #91
---
 usr/share/doc/escenic/ece-install-guide.org | 31 +++++++++++----------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index fed2bab8..e23e2f81 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -510,20 +510,21 @@ If you're running in FAI mode, you can choose between these settings
 to decide what to restore and where to find the backup file to
 restore from:
 
-|---------------------------------+---------+----------------------------------------------------|
-| Parameter                       | Default | Description                                        |
-|---------------------------------+---------+----------------------------------------------------|
-| ~fai_restore_from_backup~       |       0 | Enable restoring from backup                       |
-| ~fai_restore_all~               |       0 | Restore everything found in the backup file        |
-| ~fai_restore_db~                |       0 | Install the DB server & restore its contents       |
-| ~fai_restore_data_files~        |       0 | Restore the Solr & ECE data files                  |
-| ~fai_restore_configuration~     |       0 | Restore the Solr & ECE configuration files         |
-| ~fai_restore_software_binaries~ |       0 | Restore the Escenic and Apache Tomcat software     |
-| ~fai_restore_from_file~         |      "" | The .tar.gz produced by ~ece -i <instance> backup~ |
-|---------------------------------+---------+----------------------------------------------------|
-
-For example, to restore everything possible from a given tarball, you
-need this in your ece-install.conf:
+|---------------------------------+---------+-----------------------------------------------------------|
+| Parameter                       | Default | Description                                               |
+|---------------------------------+---------+-----------------------------------------------------------|
+| ~fai_restore_from_backup~       |       0 | Enable restoring from backup                              |
+| ~fai_restore_all~               |       0 | Restore all backup items. Requires a full backup tarball. |
+| ~fai_restore_db~                |       0 | Install the DB server & restore its contents              |
+| ~fai_restore_data_files~        |       0 | Restore the Solr & ECE data files                         |
+| ~fai_restore_configuration~     |       0 | Restore the Solr & ECE configuration files                |
+| ~fai_restore_software_binaries~ |       0 | Restore the Escenic and Apache Tomcat software            |
+| ~fai_restore_from_file~         |      "" | The .tar.gz produced by ~ece -i <instance> backup~        |
+|---------------------------------+---------+-----------------------------------------------------------|
+
+For example, to restore the DB, dta files, configuration & software
+binaries from a given tarball, you need this in your
+=ece-install.conf=:
 #+BEGIN_SRC conf
 fai_enabled=1
 
@@ -532,7 +533,7 @@ fai_restore_all=1
 fai_restore_from_file=/var/backups/escenic/engine-dev1-backup-2011-10-10.tar.gz
 #+END_SRC
 
-ece-install can also remove files  prior to restoring from the
+=ece-install= can also remove files prior to restoring from the
 backup:
 
 |------------------------------+---------+-----------------------------------|

From 5157081f42ff7f81a7cabd67a044a44f4144c522 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 20 Aug 2012 09:45:56 +0200
Subject: [PATCH 1218/2585] - 'ece backup' will now fail fast if the DB user
 credentials from the   app server configuration is wrong:

  [ece#engine-web1] The DB credentials in /opt/tomcat-web1/conf seem to be wrong :-(
  [ece#engine-web1] See /var/log/escenic/web1.out for further details. I will exit now.

  This closes #90
---
 usr/share/escenic/ece-scripts/ece.d/backup.sh | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/backup.sh b/usr/share/escenic/ece-scripts/ece.d/backup.sh
index c800f2ab..4b60f747 100644
--- a/usr/share/escenic/ece-scripts/ece.d/backup.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/backup.sh
@@ -189,11 +189,26 @@ function backup_db() {
       cut -d'"' -f2)
 
     db_backup_file=$backup_dir/${db}-$(date --iso).sql.gz
+    
+    # check DB credentials first.
+    mysqldump -u ${db_user} \
+      -p${db_password} \
+      -h ${db_host} \
+      -P ${db_port} ${db} \
+      -e 'select 1;' \
+      1>> $log 2>> $log
+    if [ $? -gt 0 ]; then
+      print "The DB credentials in $tomcat_base/conf seem to be wrong :-("
+      print "See $log for further details. I will exit now."
+      remove_pid_and_exit_in_error
+    fi
+
+    # then, go ahead with the dump, piping the output to gzip -9
     mysqldump -u ${db_user} \
       -p${db_password} \
       -h ${db_host} \
       -P ${db_port} ${db} | \
-      gzip - \
+      gzip -9 \
       > $db_backup_file
 
     print "Database dumped: $db_backup_file"

From 6b7ba3a7be533df4ec09821ed1dcd6d005c36613 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 20 Aug 2012 10:40:13 +0200
Subject: [PATCH 1219/2585] - go the module code in line with the others'
 style.

---
 .../ece-scripts/ece-install.d/analysis-engine.sh    | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh
index f4ab4ba2..6a74a770 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh
@@ -1,7 +1,6 @@
 # ece-install module for installing EAE
 
-function install_analysis_server()
-{
+function install_analysis_server() {
   run_hook install_analysis_server.preinst
   
   print_and_log "Installing an analysis server on $HOSTNAME ..."
@@ -19,7 +18,7 @@ function install_analysis_server()
     appserver_port=${fai_analysis_port}
   fi
   
-    # deploy the EAE WARs
+  # deploy the EAE WARs
   run cp ${escenic_root_dir}/analysis-engine-*/wars/*.war \
     ${tomcat_base}/webapps
 
@@ -56,12 +55,12 @@ function install_analysis_server()
   set_conf_file_value pageview.aggr.hour.older.than.hours 2 $file
   set_conf_file_value pageview.maintenance.older.than.days 0 $file
 
-    # important to turn this off here, it's only for the EAE .cfg
-    # files, see above.
+  # important to turn this off here, it's only for the EAE .cfg
+  # files, see above.
   dont_quote_conf_values=0
 
-    # touching web.xml to trigger a re-deploy of the EAE Reports
-    # application.
+  # touching web.xml to trigger a re-deploy of the EAE Reports
+  # application.
   run touch ${tomcat_base}/webapps/analysis-reports/WEB-INF/web.xml
   run_hook install_analysis_server.postinst
 }

From cdf357e170296a1b12b224092ccddccfbb9470bb Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 20 Aug 2012 11:25:19 +0200
Subject: [PATCH 1220/2585] - added new parameters to make ece-install stop the
 installed   instance, clear its generated files and remove its log files
 before   finishing the installation.

  The following new parameters are now available:

   fai_analysis_stop_and_clear
   fai_editor_stop_and_clear
   fai_presentation_stop_and_clear
   fai_all_stop_and_clear

   This closes #73

- added documentation for the new variables.
---
 usr/share/doc/escenic/ece-install-guide.org   |  6 +++-
 .../ece-install.d/content-engine.sh           | 36 +++++++++++++++++++
 .../ece-scripts/ece-install.d/monitoring.sh   | 13 ++++---
 3 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index e23e2f81..392412b6 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -793,6 +793,7 @@ $HOME/ece-install.conf file of the root user:
 | ~fai_all_conf_archive~                | ""                                                | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
 | ~fai_all_ear~                         | ""                                                | EAR to use instead of the Escenic binaries                                                                                            |
 | ~fai_all_install~                     | 0                                                 | Install all components on your server.                                                                                                |
+| ~fai_all_stop_and_clear~              | 0                                                 | After installation, stop the instances and clear its work & log files.                                                                |
 | ~fai_analysis_db_host~                | localhost                                         | For the EAE DB (different from ECE's)                                                                                                 |
 | ~fai_analysis_db_install~             | 0                                                 | Install db profile                                                                                                                    |
 | ~fai_analysis_db_password~            | read-the-source-luke                              | For the EAE DB (different from ECE's)                                                                                                 |
@@ -803,11 +804,12 @@ $HOME/ece-install.conf file of the root user:
 | ~fai_analysis_name~                   | analysis1                                         | EAE instance name                                                                                                                     |
 | ~fai_analysis_port~                   | 8080                                              | Port of the EAE                                                                                                                       |
 | ~fai_analysis_shutdown~               | 8005                                              | Shutdown port for the EAE app server                                                                                                  |
+| ~fai_analysis_stop_and_clear~         | 0                                                 | After installation, stop the instances and clear its work & log files                                                                 |
 | ~fai_apt_vizrt_pool~                  | stable                                            | Which package pool in the Vizrt APT to install package from.                                                                          |
 | ~fai_cache_backends~                  | ${HOSTNAME}:8080                                  | Space separated, e.g. "app1:8080 app2:8080"                                                                                           |
 | ~fai_cache_install~                   | 0                                                 | Install cache server profile                                                                                                          |
-| ~fai_db_drop_old_db_first~            | 0                                                 | Warning: this will drop the old database before installing a new one                                                                  |
 | ~fai_db_daily_backup~                 | 0                                                 | Sets up daily backup of the DB.                                                                                                       |
+| ~fai_db_drop_old_db_first~            | 0                                                 | Warning: this will drop the old database before installing a new one                                                                  |
 | ~fai_db_host~                         | $HOSTNAME                                         | Useful for editor & presentation profiles                                                                                             |
 | ~fai_db_install~                      | 0                                                 | Install db profile                                                                                                                    |
 | ~fai_db_password~                     | read-the-source-luke                              | Useful for DB installation profile                                                                                                    |
@@ -820,6 +822,7 @@ $HOME/ece-install.conf file of the root user:
 | ~fai_editor_name~                     | editor1                                           | Name of the editor instance                                                                                                           |
 | ~fai_editor_port~                     | 8080                                              | HTTP port of the editor instance                                                                                                      |
 | ~fai_editor_shutdown~                 | 8005                                              | Shutdown port of the editor instance                                                                                                  |
+| ~fai_editor_stop_and_clear~           | 0                                                 | After installation, stop the instances and clear its work & log files                                                                 |
 | ~fai_enabled~                         | 0                                                 | Whether or not to run ece-install in FAI mode                                                                                         |
 | ~fai_keep_off_etc_hosts~              | 0                                                 | Set this to 1 if you don't want ece-install adding entries to /etc/hosts                                                              |
 | ~fai_monitoring_admin_password~       | No telling you here ;-)                           | The admin password of the web interface(s). Currenlty only set for Icinga.                                                            |
@@ -841,6 +844,7 @@ $HOME/ece-install.conf file of the root user:
 | ~fai_presentation_name~               | web1                                              | Name of the presentation server instance                                                                                              |
 | ~fai_presentation_port~               | 8080                                              | HTTP port of the presentation server instance                                                                                         |
 | ~fai_presentation_shutdown~           | 8005                                              | Shutdown port of the presentation instance                                                                                            |
+| ~fai_presentation_stop_and_clear~     | 0                                                 | After installation, stop the instances and clear its work & log files                                                                 |
 | ~fai_public_host_name~                | ${HOSTNAME}:8080                                  | The public address for your website                                                                                                   |
 | ~fai_publication_create~              | 0                                                 | Create a new publication                                                                                                              |
 | ~fai_publication_domain_mapping_list~ | ""                                                | Mapping between publication names and their corresponding domains on the form: "one#one.com other#other.com[#<alias1>[,<alias2>]]"    |
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 3cfd95d5..fbfb5069 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -102,6 +102,7 @@ function install_ece_instance() {
   set_conf_file_value ece_unix_user $ece_user /etc/default/ece
   set_conf_file_value ece_unix_group $ece_group /etc/default/ece
 
+  stop_and_clear_instance_if_requested
   leave_content_engine_trails
 
   admin_uri=http://$HOSTNAME:${appserver_port}/escenic-admin/
@@ -701,3 +702,38 @@ function leave_content_engine_trails() {
   
   leave_trail "trail_public_host_name=${public_host_name}"
 }
+
+## stop the ECE or EAE being installed and clear its logs, if so
+function stop_and_clear_instance_if_requested() {
+  local go_ahead=0
+
+  if [ $install_profile_number -eq $PROFILE_ANALYSIS_SERVER ]; then
+    go_ahead=${fai_analysis_stop_and_clear-0}
+  elif [ $install_profile_number -eq $PROFILE_EDITORIAL_SERVER ]; then
+    go_ahead=${fai_editor_stop_and_clear-0}
+  elif [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ]; then
+    go_ahead=${fai_presentation_stop_and_clear-0}
+  elif [ $install_profile_number -eq $PROFILE_ALL_IN_ONE ]; then
+    go_ahead=${fai_all_stop_and_clear-0}
+  fi
+
+  if [ $go_ahead -eq 1 ]; then
+    print_and_log "Stopping and clearing ${instance_name}'s work & log files:"
+    local ece_command="ece -i ${instance_name} -t ${type} clean stop"
+    run su - ${ece_user} -c "$ece_command"
+    local dir_list="
+      ${escenic_log_dir}
+      ${escenic_cache_dir}
+      ${escenic_crash_dir}
+      ${tomcat_base}/logs
+    "
+    for el in $dir_list; do
+      if [ ! -d "$el" ]; then
+        continue
+      fi
+      log "Removing all files in $el ..."
+      run rm -rf $el/*
+    done
+
+  fi
+}
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index 2d5a4703..3e991d4d 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -510,17 +510,22 @@ function install_system_info() {
   # (it then think it's a misnamed CGI script). Hence, we must ensure
   # the execute bit is set.
   if [ -d $escenic_log_dir ]; then
-    find $escenic_log_dir -type f | egrep ".log$|.out$" | xargs chmod 644
+    find $escenic_log_dir -type f | egrep ".log$|.out$" | while read f; do
+      run chmod 644 $f
+    done
   fi
 
   if [ -d $escenic_conf_dir ]; then
     find $escenic_conf_dir -type f | \
-      egrep ".conf$|.properties$" | \
-      xargs chmod 644
+      egrep ".conf$|.properties$" | while read f; do
+      run chmod 644 $f
+    done
   fi
 
   if [ -d  $tomcat_base/logs ]; then
-    find $tomcat_base/logs -type f | egrep ".log$" | xargs chmod 644
+    find $tomcat_base/logs -type f | egrep ".log$" | while read f; do
+      run chmod 644 $f
+    done
   fi
 
   add_next_step "Always up to date system info: http://$HOSTNAME:$port/"

From 6e2e6e22e4fc9e0bc0dd752c046e8d5a0624036a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 20 Aug 2012 14:35:40 +0200
Subject: [PATCH 1221/2585] - changed the build directory so that it works with
 multiple users on   the same system. This is needed to move the documentation
 creation   ot the build server.

---
 usr/share/doc/vizrt/vosa-handbook/create-handbook.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 3db25f6a..4b008212 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -3,7 +3,7 @@
 # by tkj@vizrt.com
 
 handbook_org=vosa-handbook.org
-target_dir=/tmp/$(basename $0 .sh)-$(date --iso)
+target_dir=$HOME/tmp/$(basename $0 .sh)-$(date --iso)
 host_name_list_outside_network="
   amazonaws.com
 "
@@ -278,7 +278,8 @@ function generate_html_from_org() {
   echo "Generating new handbook HTML from ORG ..." 
   run emacs \
     --load vizrt-branding-org-mode.el \
-    --batch --visit $target_dir/$handbook_org \
+    --batch \
+    --visit $target_dir/$handbook_org \
     --funcall org-export-as-html-batch 2> /dev/null
   echo "$target_dir/$(basename $handbook_org .org).html is now ready"
 }

From 2e4220f9c48af0cbfc151307c38d3e63aa7b7b60 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 20 Aug 2012 14:42:03 +0200
Subject: [PATCH 1222/2585] - added Vizrt Online as the author

---
 usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
index c279415e..840c559b 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
+++ b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
@@ -1,4 +1,5 @@
 #+TITLE: Welcome to the VOSA Handbook
+#+AUTHOR: Vizrt Online / The SaaS Team
 #+OPTIONS: toc:2 
 
 #+INCLUDE: "overview.org"

From 4515df80adb9fbf57966442c4958f00dd4875ef9 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 20 Aug 2012 14:53:18 +0200
Subject: [PATCH 1223/2585] - removed the screenshot, it was a bit confusing

---
 usr/share/doc/vizrt/vosa-handbook/monitoring.org | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/monitoring.org b/usr/share/doc/vizrt/vosa-handbook/monitoring.org
index 54f00441..d700ac6a 100644
--- a/usr/share/doc/vizrt/vosa-handbook/monitoring.org
+++ b/usr/share/doc/vizrt/vosa-handbook/monitoring.org
@@ -20,11 +20,6 @@ the user under which ECE, EAE and the Search instance are running as
 All VOSA hosts also has a (maximum) one minute old HTML report from
 system-info running on port ~5678~. 
 
-Here's a screenshot of the system-info report running on a
-presentation server:
-
-[[./graphics/pres1-system-info.png]]
-
 ** Hugin
 Hugin is an automatic, frequent aggregation of the system-info data of
 all the hosts in your habitat. It does this by asking the hossts to

From d51ec2861c53f34bdc8516872eb1e6f792ca56f5 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 21 Aug 2012 09:20:29 +0200
Subject: [PATCH 1224/2585] - fai_un_install_everything now also removes
 escenic-check-mk-plugins   escenic-common-scripts

---
 usr/sbin/ece-install | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 usr/sbin/ece-install

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
old mode 100644
new mode 100755
index 9c7fc9c7..6729ef2c
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -860,9 +860,10 @@ function un_install_everything() {
     ant
     ant-contrib
     ant-optional
+    escenic-check-mk-plugins
+    escenic-common-scripts
     escenic-content-engine-scripts
     escenic-munin-plugins
-    escenic-munin-plugins
     libmysql-java
     maven2
     memcached

From b03e25443a444780b6963c89692009c7e744c3ef Mon Sep 17 00:00:00 2001
From: Kevin Flynn <kevin@kevin-Precision-M4500.(none)>
Date: Tue, 21 Aug 2012 09:54:39 +0200
Subject: [PATCH 1225/2585] general editing and reorganization

---
 usr/share/doc/escenic/ece-install-guide.org | 106 ++++++++++++++++----
 1 file changed, 88 insertions(+), 18 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index fed2bab8..95c53150 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -128,10 +128,10 @@ is as follows:
 
 =ece-install= can be run in two ways:
 
- - Interactive mode :: In this mode, =ece-install= prompts you to
-      enter the parameters it needs in order to perform the installation.
- - Full automatic install (FAI) mode :: In this mode =ece-install=
-      reads all required parameters from a configuration file.
+ - *Interactive mode*
+ - *Full automatic install (FAI) mode*
+
+For more about this, see ece-install Execution Modes.
 
 ** <<<Get ece-install>>>
 Use =git= to get the ece-install script. Type this in
@@ -238,6 +238,70 @@ the BASH interpreter with the -x flag:
 Doing this lets you see everything that BASH does while executing the
 script - how wild card variables are  expanded and so on.
 
+** <<<ece-install Execution Modes>>>
+=ece-install= can be run in two main ways:
+
+ * In *interactive mode*, in which case it prompts you for input.
+ * In *fully automatic install (FAI)* mode, in which case it reads all
+   parameters from the configuration file =ece-install.conf=. If it
+   cannot find all the parameters it needs in the configuration file,
+   then it will fail.
+
+Which mode =ece-install= runs in depends on a parameter in the
+configuration file, =fai_enabled=. If =fai_enabled= is not set or set
+to =0=, then =ece-install= runs in interactive mode. If =fai_enabled=
+is set to =1= then =ece-install= runs in FAI mode.
+
+*** Interactive Mode
+When you run =ece-install= in interactive mode, it displays a prompt
+asking what you want to install. You can either install one of a
+number of predefined *profiles*, or you can restore a previously
+installed profile from a backup copy:
+#+BEGIN_SRC text
+Hi, which server profile do you wish to install?
+
+   1 - All in one, full stack on one host, suitable for dev & test environments
+   2 - Editorial (publication) server
+   3 - Presentation server (ECE + memcached).
+   4 - Database server
+   5 - Cache server (cache and web server)
+   6 - RMI hub
+   7 - Search server (Solr + indexer-webapp)
+   8 - Install Widget Framework.
+   9 - Create a new publication based on WF if available, ECE/clean-demo if not
+   10 - A monitoring server (web server + Munin gatherer)
+   11 - Restore from backup (DB, data files, binaries, conf & publications)
+
+Select 1-11 and press ENTER
+Your choice [1]> 
+#+END_SRC
+
+A *profile* is a pre-defined set of software components that enables a
+computer to perform a particular function. For descriptions of all
+available profiles, see ??. For a description of the =Restore from
+backup= option, see ??.
+
+Depending on what choice you make, more prompts may be displayed
+requesting further information. When you have supplied all the
+information =ece-install= needs, the installation process begins.
+
+THEN WHAT??
+
+*** FAI Mode
+To run =ece-install= in FAI mode you must first add the following settings
+to =ece-install.conf=:
+ 
+ * =fai_enabled=1= To switch FAI mode on.
+ * One =fai_???_install=1= setting to choose the profile you want to
+   install (or what about restoring a backup?).
+ * Optionally, additional settings related to the profile you have selected.
+
+Then when you run =ece-install= it will output:
+#+BEGIN_SRC
+[ece-install] Full Automatic Install (FAI) enabled.
+[ece-install] All user input will be read from /root/ece-install.conf
+#+END_SRC
+
 ** Preventing accidental execution of ece-install 
 You can ensure that =ece-install= is not executed accidentally by
 creating a *lock file*. Simply create a file with this path:
@@ -256,7 +320,9 @@ The lock file does not need to contain anything, it just needs to exist.
 * <<<Server Profiles>>>
 
 When you run =ece-install= in interactive mode, it displays a prompt
-asking which *profile* you want to install:
+asking what you want to install. You can either install one of a
+number of predefined *profiles*, or you can restore a previously
+installed profile from a backup copy:
 #+BEGIN_SRC text
 Hi, which server profile do you wish to install?
 
@@ -275,6 +341,10 @@ Hi, which server profile do you wish to install?
 Select 1-11 and press ENTER
 Your choice [1]> 
 #+END_SRC
+
+A *profile* is a pre-defined set of software components that enables a
+computer to perform a particular function.
+
 ** Common for All Server Profiles
 The script will install a Munin node on the host. It will also
 install the Escenic specific Munin plugins on hosts where there are
@@ -323,13 +393,13 @@ the different profile descriptions bellow.
 Will set up a typical editorial server (often referred to as the
 publication server in Escenic literature).
 
-** Profile :: Presentation Server
+** Presentation Server
 This will set up a typical presentation server:
 - Memcached, distributed memory cache
 - Deployment setup to only deploy escenic-admin and the
   publication(s).
 
-** Profile :: Database Server
+** Database Server
 If ece-install is run on a support version of Debian or Ubuntu, this
 will install the excellent Percona distribution of MySQL with their
 set of high performance patches.
@@ -389,7 +459,7 @@ The script will set up and use the replication user & credentials with
 default values, if you wish to override these, have a look in the FAI
 parameter overview.
 
-** Profile :: Cache Server
+** Cache Server
 If ece-install is run on a support version of Debian or Ubuntu, it
 will install the latest Varnish 3.0 caching server from the Varnish
 APT repository.
@@ -425,7 +495,7 @@ TBD:
   to be in the staff network ACL, defined in the Varnish
   configuration. 
 
-** Profile :: Install Widget Framework
+** Install Widget Framework
 You'll need a user name and password for accessing the
 repo.escenic.com Maven repository. You should get these credentials
 when you bought Widget Framework. If you for some reason do not have
@@ -437,7 +507,7 @@ complain:
 [ece-install] Be sure to set wf_user and wf_password in /root/ece-install.conf
 [ece-install] If you don't have these, please contact support@escenic.com
 #+END_SRC
-** Profile :: Create Publication
+** Create Publication
 This profile will create a publication for you, only asking you the
 name of the publication and which ECE instance to use for its
 creation.
@@ -445,14 +515,14 @@ creation.
 This installation profile will base the publication on the Widget
 Framework if its present on the system, if not, ECE's clean demo WAR
 is used as a basis.  
-** Profile :: Monitoring Server
+** Monitoring Server
 This will install a Munin gatherer and web server. The latter for
 accessing the reports generated by the former.
 
 TBD: This profile will also install the Nagios interface for
 monitoring the different nodes. 
 
-** Profile :: Restoring from backup
+** Restoring from backup
 ~ece-install~ can restore from a backup made by the ~ece~ script:
 #+BEGIN_SRC text
 $ ece -i <instance> backup
@@ -467,7 +537,7 @@ As stated in the guide for the ece script, this backup may contain
 - Escenic software
 
 *** Running interactively
-**** Start ece-install and choose the Option, "Restore from backup"
+**** Start ece-install and choose the Option Restore from backup
 #+BEGIN_SRC text
 # ece-install
 #+END_SRC
@@ -545,15 +615,15 @@ backup:
 | ~fai_restore_pre_wipe_solr~  |       0 | Remove the solr data/state files  |
 |------------------------------+---------+-----------------------------------|
 
-** Profile :: Analysis Server
+** Analysis Server
 This profile will install the Escenic Analysis Engine and configure it
 for production use with sane defaults. Be sure to use a different DB
-than you use for ECE.
+thank you use for ECE.
 
-** Profile :: NFS server
+** NFS server
 Will install an NFS server.
 
-** Profile :: NFS client
+** NFS client
 Will install an NFS client, create all the mountpoints and mount these
 on the host.
 
@@ -566,7 +636,7 @@ fai_nfs_server_address=192.168.1.200
 fai_nfs_export_list="/var/exports/multimedia"  
 #+END_SRC
 
-** Profile :: VIP provider
+** VIP provider
 [[file:images/nfs-vip.png]]
 
 This profile will make the host capable of serving a certain virtual

From 4d29130aee3636ea75a485ee658902a05aae2dfc Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 21 Aug 2012 10:29:54 +0200
Subject: [PATCH 1226/2585] - fixed regression in the search port & host
 setting in the app server   module. This should fix cases were you install
 the search instance   from the same ece-install.conf as a different app
 server.

- moved the configuration of the search specific Nursery configuration
  from the search module (!) to the profile=presentation & editorial.

- tested the latest changes with the following scenario: installing
  all in one of go; EAE & search instance on the same app server
  instance + a presentation server.

  This is the ece-install.conf I used for this:

    fai_enabled=1

    # search instance
    fai_search_install=1
    fai_search_ear=http://builder.mycompany.com/mysite/releases/mysite-trunk-rev3951-2012-06-21_1528.ear
    fai_search_conf_archive=http://builder.mycompany.com/nursery-skeleton.tar.gz
    fai_search_port=8180
    fai_search_shutdown=8105
    fai_search_redirect=8143
    fai_search_for_editor=1
    fai_search_name=search1

    # EAE runs on the same app server as the search instance above
    fai_analysis_install=1
    fai_analysis_port=$fai_search_port
    fai_analysis_shutdown=$fai_search_shutdown
    fai_analysis_redirect=$fai_search_redirect
    fai_analysis_name=$fai_search_name

    fai_presentation_install=1
    fai_presentation_stop_and_clear=1
    fai_publication_environment=testing
    fai_publication_domain_mapping_list="
      mysite#myindian.com#mysite.staging..com,staging.mysite.com
      dn#myothersite.com#staging.othersite.com#othersite.staging.com,staging.othersite.com
    "

    technet_download_list="
    http://technet.escenic.com/downloads/assemblytool-2.0.2.zip
    http://technet.escenic.com/downloads/release/53/analysis-engine-2.3.7.0.zip
    http://technet.escenic.com/downloads/release/54/engine-5.4.1.126472.zip
    "
---
 .../ece-scripts/ece-install.d/app-server.sh   | 20 +++++------
 .../ece-install.d/content-engine.sh           | 35 +++++++++++++++++--
 .../ece-install.d/search-server.sh            | 27 ++------------
 3 files changed, 43 insertions(+), 39 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index a0fde7b7..b420e2b7 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -92,19 +92,17 @@ function set_up_app_server()
     print "If you're in doubt, just press ENTER :-)"
     echo -n "Your choice [$HOSTNAME:${default_app_server_port}]> "
     read user_search
-  else
-    user_search=$(get_conf_value fai_search_host)
-    if [ -n "${user_search}" ]; then
-      user_search=${user_search}":"$(get_conf_value fai_search_port)
+    
+    if [ -z "$user_search" ]; then
+      search_host=$HOSTNAME
+      search_port=${default_app_server_port}
+    else
+      search_host=$(echo $user_search | cut -d':' -f1)
+      search_port=$(echo $user_search | cut -d':' -f2)
     fi
-  fi
-
-  if [ -z "$user_search" ]; then
-    search_host=$HOSTNAME
-    search_port=${default_app_server_port}
   else
-    search_host=$(echo $user_search | cut -d':' -f1)
-    search_port=$(echo $user_search | cut -d':' -f2)
+    search_host=${fai_search_host-$HOSTNAME}
+    search_port=${fai_search_port-$default_app_server_port}
   fi
 
   download_tomcat $download_dir
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index fbfb5069..9ef35daf 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -73,14 +73,14 @@ function install_ece_instance() {
       $ece_instance_conf_archive
   fi
 
+  set_up_app_server
+  set_up_proper_logging_configuration
+
   if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER ]; then
     set_up_basic_nursery_configuration
     set_up_instance_specific_nursery_configuration
   fi
   
-  set_up_app_server
-  set_up_proper_logging_configuration
-
   # We set a WAR white list for all profiles except all in one
   if [ $install_profile_number -ne $PROFILE_ALL_IN_ONE -a \
     $install_profile_number -ne $PROFILE_ANALYSIS_SERVER ]; then
@@ -408,6 +408,7 @@ property.com.escenic.studio.font.windowsvista=Arial Unicode MS
 EOF
 
   set_up_publication_nursery_conf
+  set_up_search_client_nursery_conf
 }
 
 ## Set publication specific configuration, set here and not in
@@ -621,6 +622,10 @@ function set_archive_files_depending_on_profile()
   elif [ $install_profile_number -eq $PROFILE_ALL_IN_ONE ]; then
     ece_instance_ear_file=$fai_all_ear
     ece_instance_conf_archive=$fai_all_conf_archive
+  else
+    # All other profiles don't have EAR support.
+    ece_instance_ear_file=""
+    ece_instance_conf_archive=""
   fi
 }
 
@@ -737,3 +742,27 @@ function stop_and_clear_instance_if_requested() {
 
   fi
 }
+
+## called for presentation & editorial profiles
+function set_up_search_client_nursery_conf() {
+  local dir=$common_nursery_dir/com/escenic/framework/search/solr
+  make_dir $dir
+  echo "solrServerURI=http://${search_host}:${search_port}/solr" \
+    >>  $dir/SolrSearchEngine.properties
+  
+  dir=$common_nursery_dir/com/escenic/webservice/search
+  make_dir $dir
+  echo "solrURI=http://${search_host}:${search_port}/solr/select" \
+    >> $dir/DelegatingSearchEngine.properties
+
+  dir=$common_nursery_dir/com/escenic/lucy
+  make_dir $dir
+  echo "solrURI=http://${search_host}:${search_port}/solr" \
+    >> $dir/LucySearchEngine.properties
+
+  dir=$common_nursery_dir/com/escenic/forum/search/lucy
+  make_dir $dir
+  echo "solrURI=http://${search_host}:${search_port}/solr" \
+    >> $dir/SearchEngine.properties
+}  
+
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
index 5bda9ada..9d82cd5b 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
@@ -1,39 +1,16 @@
 # ece-install module for installing the search server
 
-function install_search_server()
-{
+function install_search_server() {
   print_and_log "Installing a search server on $HOSTNAME ..."
   type=search
   install_ece_instance "search1" 0
   
-  # TODO update instead of append
-  local dir=$common_nursery_dir/com/escenic/framework/search/solr
-  make_dir $dir
-  echo "solrServerURI=http://${search_host}:${search_port}/solr" \
-    >>  $dir/SolrSearchEngine.properties
-  
-  dir=$common_nursery_dir/com/escenic/webservice/search
-  make_dir $dir
-  echo "solrURI=http://${search_host}:${search_port}/solr/select" \
-    >> $dir/DelegatingSearchEngine.properties
-
-  dir=$common_nursery_dir/com/escenic/lucy
-  make_dir $dir
-  echo "solrURI=http://${search_host}:${search_port}/solr" \
-    >> $dir/LucySearchEngine.properties
-
-  dir=$common_nursery_dir/com/escenic/forum/search/lucy
-  make_dir $dir
-  echo "solrURI=http://${search_host}:${search_port}/solr" \
-    >> $dir/SearchEngine.properties
-
   set_up_solr
   assemble_deploy_and_restart_type
   leave_search_server_trail
 }
 
-function set_up_solr()
-{
+function set_up_solr() {
   run_hook set_up_solr.preinst
   
   print_and_log "Setting up Solr ..."

From 9ae821a61541c0b2b4a3045df16a89544d426be2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 21 Aug 2012 10:31:09 +0200
Subject: [PATCH 1227/2585] - fixed some wee typos here and there

---
 usr/share/doc/escenic/ece-install-guide.org | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 70fcf3f2..09ff4615 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -526,7 +526,7 @@ restore from:
 | ~fai_restore_from_file~         |      "" | The .tar.gz produced by ~ece -i <instance> backup~        |
 |---------------------------------+---------+-----------------------------------------------------------|
 
-For example, to restore the DB, dta files, configuration & software
+For example, to restore the DB, data files, configuration & software
 binaries from a given tarball, you need this in your
 =ece-install.conf=:
 #+BEGIN_SRC conf
@@ -797,9 +797,9 @@ $HOME/ece-install.conf file of the root user:
 | ~fai_all_conf_archive~                | ""                                                | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
 | ~fai_all_ear~                         | ""                                                | EAR to use instead of the Escenic binaries                                                                                            |
 | ~fai_all_install~                     | 0                                                 | Install all components on your server.                                                                                                |
-| ~fai_all_stop_and_clear~              | 0                                                 | After installation, stop the instances and clear its work & log files.                                                                |
+| ~fai_all_stop_and_clear~              | 0                                                 | After installation, stop the instance and clear its work & log files.                                                                 |
 | ~fai_analysis_db_host~                | localhost                                         | For the EAE DB (different from ECE's)                                                                                                 |
-| ~fai_analysis_db_install~             | 0                                                 | Install db profile                                                                                                                    |
+| ~fai_analysis_db_install~             | 0                                                 | Install DB profile                                                                                                                    |
 | ~fai_analysis_db_password~            | read-the-source-luke                              | For the EAE DB (different from ECE's)                                                                                                 |
 | ~fai_analysis_db_port~                | 3306                                              | For the EAE DB (different from ECE's)                                                                                                 |
 | ~fai_analysis_db_schema~              | ece5db                                            | For the EAE DB (different from ECE's)                                                                                                 |

From 7d8f6ff4c5c96f829f96dda548ea133a2002d722 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 21 Aug 2012 10:38:21 +0200
Subject: [PATCH 1228/2585] - changed 'ece flush' to run wget in a wrapper, and
 use the common wget_opts.

---
 usr/share/escenic/ece-scripts/ece.d/flush.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/flush.sh b/usr/share/escenic/ece-scripts/ece.d/flush.sh
index f6282436..3b394be4 100644
--- a/usr/share/escenic/ece-scripts/ece.d/flush.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/flush.sh
@@ -6,9 +6,8 @@ function flush_caches() {
   
   print "Flushing all of ${instance}'s caches on $HOSTNAME"
   local url=$(get_escenic_admin_url)/do/publication/clearallcaches
-  wget $wget_auth \
+  run wget $wget_opts $wget_auth \
     -O - \
     --post-data='confirm=Confirm' \
-    $url \
-    1>>$log 2>>$log
+    $url
 }

From 59468dfb7912bd17399beb9a432571eb71ee6e82 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 21 Aug 2012 10:39:08 +0200
Subject: [PATCH 1229/2585] - made 'ece versions' use the global wget_opts as
 well

---
 usr/share/escenic/ece-scripts/ece.d/versions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/versions.sh b/usr/share/escenic/ece-scripts/ece.d/versions.sh
index 2c52edde..fed6ddab 100644
--- a/usr/share/escenic/ece-scripts/ece.d/versions.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/versions.sh
@@ -11,7 +11,7 @@ function list_versions() {
   url=$(get_escenic_admin_url)/$version_manager
   
   print "Installed on the ${instance} instance running on port ${port}:"
-  wget --timeout 30 $wget_auth -O - $url  2>/dev/null | \
+  wget --timeout 30 $wget_opts $wget_auth -O - $url  2>/dev/null | \
     grep "\[\[" | \
     sed 's/\[//g' | \
     sed 's/\]//g' | \

From afae1166184f23882eb30fbbf5c827aed66f1263 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 21 Aug 2012 10:40:52 +0200
Subject: [PATCH 1230/2585] - added auth support to
 common-io::download_uri_target_to_dir, now it   respects the general
 wget_auth used by 'ece' in other places

---
 usr/share/escenic/ece-scripts/common-io.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/common-io.sh b/usr/share/escenic/ece-scripts/common-io.sh
index 06d9b673..f8cfc19d 100644
--- a/usr/share/escenic/ece-scripts/common-io.sh
+++ b/usr/share/escenic/ece-scripts/common-io.sh
@@ -103,7 +103,7 @@ function download_uri_target_to_dir() {
   
   if [[ $uri == "http://"* || $uri == "https://"* ]]; then
     run cd $target_dir
-    run wget $wget_opts $uri -O $(basename $uri)
+    run wget $wget_opts $wget_auth $uri -O $(basename $uri)
     file=$target_dir/$(basename $uri)
   elif [[ $uri == "file://"* ]]; then
       # length of file:// is 7

From ed7e53056c409106fbdd10457a5eab906df9c98f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 21 Aug 2012 14:07:09 +0200
Subject: [PATCH 1231/2585] - introduced the following HTTP authentication
 based settings (one of   which is a rename of the old http_user/pass:

  - appserver_http_user
  - appserver_http_password
  - builder_http_user
  - builder_http_password

  The first is HTTP authentication for the app server (default is no
  HTTP auth).

  The second is HTTP authentication for the build server (default is
  no HTTP auth), this only used for when you use 'ece deploy' with a
  URI for an EAR a the build server.
---
 etc/escenic/ece.conf                               | 14 ++++++++++++++
 usr/bin/ece                                        | 13 ++++++-------
 .../ece-scripts/ece-install.d/content-engine.sh    |  8 +++++++-
 .../ece-scripts/ece-install.d/search-server.sh     |  5 +++++
 usr/share/escenic/ece-scripts/ece.d/deploy.sh      |  3 +--
 usr/share/escenic/ece-scripts/ece.d/flush.sh       |  2 +-
 .../ece-scripts/ece.d/publication-resources.sh     |  8 +++++---
 usr/share/escenic/ece-scripts/ece.d/versions.sh    |  6 +++---
 8 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/etc/escenic/ece.conf b/etc/escenic/ece.conf
index 85b1d75c..a2a0851b 100644
--- a/etc/escenic/ece.conf
+++ b/etc/escenic/ece.conf
@@ -185,3 +185,17 @@ backup_dir=/var/backups/escenic
 # When removing old log files, how old should the oldest file be?
 #####################################################################
 old_log_file_max_age_in_days=5
+
+#####################################################################
+# HTTP authentication for the app server (default is no HTTP auth)
+#####################################################################
+# appserver_http_user=
+# appserver_http_password=
+
+#####################################################################
+# HTTP authentication for the build server (default is no HTTP auth),
+# this only used for when you use 'ece deploy' with a URI for an EAR
+# a the build server.
+#####################################################################
+# builder_http_user=
+# builder_http_password=
diff --git a/usr/bin/ece b/usr/bin/ece
index 86963e0e..ba80d938 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -30,10 +30,8 @@ backup_exclude_init=0
 backup_exclude_multimedia=0
 backup_exclude_solr=0
 backup_exclude_state=0
-http_user=""
-http_password=""
-wget_auth=""
-curl_auth=""
+wget_appserver_auth=""
+curl_appserver_auth=""
 log=""
 
 type_list="
@@ -201,9 +199,10 @@ function set_common_settings() {
       $log_dir/Escenic-error.log
     "
 
-    if [[ -n "$http_user" && -n "$http_password" ]]; then
-        wget_auth="--http-user $http_user --http-password $http_password"
-        curl_auth="-u ${http_user}:${http_password}"
+    if [[ -n "$appserver_http_user" && -n "$appserver_http_password" ]]; then
+      wget_appserver_auth="--http-user $appserver_http_user --http-password $appserver_http_password"
+      curl_appserver_auth="-u ${appserver_http_user}:${appserver_http_password}"
+      wget_builder_auth="--http-user $builder_http_user --http-password $builder_http_password"
     fi
 }
 
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 9ef35daf..60ec4360 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -274,10 +274,11 @@ EOF
 
   make_dir $escenic_root_dir/assemblytool/publications
 
-    # set up user publication definitions
+  # set up user publication definitions
   if [ -n "${fai_publication_war_uri_list}" ]; then
     run cd $escenic_root_dir/assemblytool/publications
     
+    wget_auth=$wget_builder_auth
     for el in ${fai_publication_war_uri_list}; do
       local download_file=$(
         download_uri_target_to_dir \
@@ -318,6 +319,11 @@ function set_up_basic_nursery_configuration() {
   if [ $(is_using_conf_archive) -eq 1 ]; then
     print_and_log "Using the supplied Nursery & JAAS configuration from" 
     print_and_log "bundle: $ece_instance_conf_archive"
+
+    # the conf archive typically resides on the build server, hence we
+    # set its authentication credentials here.
+    wget_auth=$wget_builder_auth
+    
     local a_tmp_dir=$(mktemp -d)
     local file=$(
       download_uri_target_to_dir \
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
index 9d82cd5b..c98d8a2e 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
@@ -18,6 +18,11 @@ function set_up_solr() {
     if [ $(is_using_conf_archive) -eq 1 ]; then
       print_and_log "Using the supplied Solr configuration from" 
       print_and_log "bundle: $ece_instance_conf_archive"
+      
+      # the conf archive typically resides on the build server, hence
+      # we set its authentication credentials here.
+      wget_auth=$wget_builder_auth
+    
       local a_tmp_dir=$(mktemp -d)
       local file=$(
         download_uri_target_to_dir \
diff --git a/usr/share/escenic/ece-scripts/ece.d/deploy.sh b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
index 336cc2fc..b462f008 100644
--- a/usr/share/escenic/ece-scripts/ece.d/deploy.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
@@ -1,7 +1,5 @@
 # Module for the 'ece deploy' command.
 
-wget_opts="--continue --inet4-only --quiet"
-
 function get_state_file() {
   echo $data_dir/${instance}.state
 }
@@ -48,6 +46,7 @@ function deploy() {
 
   if [ -n "$file" ]; then
     print_and_log "Deploying $file on $instance ..."
+    wget_auth=$wget_builder_auth
     ear=$(download_uri_target_to_dir $file $cache_dir)
     
     if [ ! -e "$ear" ]; then
diff --git a/usr/share/escenic/ece-scripts/ece.d/flush.sh b/usr/share/escenic/ece-scripts/ece.d/flush.sh
index 3b394be4..644ad7b9 100644
--- a/usr/share/escenic/ece-scripts/ece.d/flush.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/flush.sh
@@ -6,7 +6,7 @@ function flush_caches() {
   
   print "Flushing all of ${instance}'s caches on $HOSTNAME"
   local url=$(get_escenic_admin_url)/do/publication/clearallcaches
-  run wget $wget_opts $wget_auth \
+  run wget $wget_opts $wget_appserver_auth \
     -O - \
     --post-data='confirm=Confirm' \
     $url
diff --git a/usr/share/escenic/ece-scripts/ece.d/publication-resources.sh b/usr/share/escenic/ece-scripts/ece.d/publication-resources.sh
index 1636ce04..bc8e1cb2 100644
--- a/usr/share/escenic/ece-scripts/ece.d/publication-resources.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/publication-resources.sh
@@ -55,7 +55,9 @@ function update_publication_resources() {
     fi
     
     run cd $tmp_dir;
-    run wget $wget_auth $url -O ${resource}
+
+    # adding auth credentials for the appserver (if set)
+    run wget $wget_appserver_auth $url -O ${resource}
     md5sum ${resource} > ${resource}.md5sum
     exit_on_error "md5sum ${resource}"
 
@@ -75,11 +77,11 @@ function update_publication_resources() {
   debug POSTing $resource to $url
   if [[ -n "$do_put" && "$do_put" == "true" ]]; then
     curl -T ${resource} \
-      ${curl_auth} \
+      ${curl_appserver_auth} \
       ${url} \
       1>>$log 2>>$log
   else
-    wget $wget_auth \
+    wget $wget_appserver_auth \
       -O - \
       --post-file ${resource} \
       $url \
diff --git a/usr/share/escenic/ece-scripts/ece.d/versions.sh b/usr/share/escenic/ece-scripts/ece.d/versions.sh
index fed6ddab..579bfd3d 100644
--- a/usr/share/escenic/ece-scripts/ece.d/versions.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/versions.sh
@@ -7,11 +7,11 @@ function list_versions() {
   
   set_type_port
   
-  version_manager=browser/Global/neo/io/managers/VersionManager
-  url=$(get_escenic_admin_url)/$version_manager
+  local version_manager=browser/Global/neo/io/managers/VersionManager
+  local url=$(get_escenic_admin_url)/$version_manager
   
   print "Installed on the ${instance} instance running on port ${port}:"
-  wget --timeout 30 $wget_opts $wget_auth -O - $url  2>/dev/null | \
+  wget --timeout 30 $wget_opts $wget_appserver_auth -O - $url  2>/dev/null | \
     grep "\[\[" | \
     sed 's/\[//g' | \
     sed 's/\]//g' | \

From 63344e27c307c637a6d0c74fe1412562573ab04e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 21 Aug 2012 14:55:54 +0200
Subject: [PATCH 1232/2585] - added profile specific deployment white lists:

    fai_presentation_deploy_white_list
    fai_editor_deploy_white_list
    fai_search_deploy_white_list

- added documentation for these
---
 usr/share/doc/escenic/ece-install-guide.org   | 175 +++++++++---------
 .../ece-install.d/content-engine.sh           |  33 ++--
 2 files changed, 105 insertions(+), 103 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 23949861..7a856698 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -861,92 +861,95 @@ fai_keep_off_etc_hosts=1 in your ece-install.conf
 The ece-install script understands for the following settings in the
 $HOME/ece-install.conf file of the root user:
 
-|---------------------------------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------|
-| Parameter                             | Default                                           | Description                                                                                                                           |
-|---------------------------------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------|
-| ~fai_all_conf_archive~                | ""                                                | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
-| ~fai_all_ear~                         | ""                                                | EAR to use instead of the Escenic binaries                                                                                            |
-| ~fai_all_install~                     | 0                                                 | Install all components on your server.                                                                                                |
-| ~fai_all_stop_and_clear~              | 0                                                 | After installation, stop the instance and clear its work & log files.                                                                 |
-| ~fai_analysis_db_host~                | localhost                                         | For the EAE DB (different from ECE's)                                                                                                 |
-| ~fai_analysis_db_install~             | 0                                                 | Install DB profile                                                                                                                    |
-| ~fai_analysis_db_password~            | read-the-source-luke                              | For the EAE DB (different from ECE's)                                                                                                 |
-| ~fai_analysis_db_port~                | 3306                                              | For the EAE DB (different from ECE's)                                                                                                 |
-| ~fai_analysis_db_schema~              | ece5db                                            | For the EAE DB (different from ECE's)                                                                                                 |
-| ~fai_analysis_db_user~                | ece5user                                          | For the EAE DB (different from ECE's)                                                                                                 |
-| ~fai_analysis_install~                | 0                                                 | Will install the Escenic Analysis Engine, aka Stats, EAE.                                                                             |
-| ~fai_analysis_name~                   | analysis1                                         | EAE instance name                                                                                                                     |
-| ~fai_analysis_port~                   | 8080                                              | Port of the EAE                                                                                                                       |
-| ~fai_analysis_shutdown~               | 8005                                              | Shutdown port for the EAE app server                                                                                                  |
-| ~fai_analysis_stop_and_clear~         | 0                                                 | After installation, stop the instances and clear its work & log files                                                                 |
-| ~fai_apt_vizrt_pool~                  | stable                                            | Which package pool in the Vizrt APT to install package from.                                                                          |
-| ~fai_cache_backends~                  | ${HOSTNAME}:8080                                  | Space separated, e.g. "app1:8080 app2:8080"                                                                                           |
-| ~fai_cache_install~                   | 0                                                 | Install cache server profile                                                                                                          |
-| ~fai_db_daily_backup~                 | 0                                                 | Sets up daily backup of the DB.                                                                                                       |
-| ~fai_db_drop_old_db_first~            | 0                                                 | Warning: this will drop the old database before installing a new one                                                                  |
-| ~fai_db_host~                         | $HOSTNAME                                         | Useful for editor & presentation profiles                                                                                             |
-| ~fai_db_install~                      | 0                                                 | Install db profile                                                                                                                    |
-| ~fai_db_password~                     | read-the-source-luke                              | Useful for DB installation profile                                                                                                    |
-| ~fai_db_port~                         | 3306                                              | Useful for editor & presentation profiles                                                                                             |
-| ~fai_db_schema~                       | ece5db                                            | Useful for DB installation profile                                                                                                    |
-| ~fai_db_user~                         | ece5user                                          | Useful for DB installation profile                                                                                                    |
-| ~fai_editor_conf_archive~             | ""                                                | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
-| ~fai_editor_ear~                      | ""                                                | EAR to use instead of the Escenic binaries                                                                                            |
-| ~fai_editor_install~                  | 0                                                 | Install the editorial profile                                                                                                         |
-| ~fai_editor_name~                     | editor1                                           | Name of the editor instance                                                                                                           |
-| ~fai_editor_port~                     | 8080                                              | HTTP port of the editor instance                                                                                                      |
-| ~fai_editor_shutdown~                 | 8005                                              | Shutdown port of the editor instance                                                                                                  |
-| ~fai_editor_stop_and_clear~           | 0                                                 | After installation, stop the instances and clear its work & log files                                                                 |
-| ~fai_enabled~                         | 0                                                 | Whether or not to run ece-install in FAI mode                                                                                         |
-| ~fai_keep_off_etc_hosts~              | 0                                                 | Set this to 1 if you don't want ece-install adding entries to /etc/hosts                                                              |
-| ~fai_monitoring_admin_password~       | No telling you here ;-)                           | The admin password of the web interface(s). Currenlty only set for Icinga.                                                            |
-| ~fai_monitoring_ece_host_list~        | ""                                                | Hosts running one or more ECE instance                                                                                                |
-| ~fai_monitoring_host_list~            | ""                                                | Quoted, space separated list of <host>#<ip> pairs, e.g.: "pres1#10.72.227.250 pres2#10.72.227.251"                                    |
-| ~fai_monitoring_install~              | 0                                                 | Install the monitoring server profile.                                                                                                |
-| ~fai_monitoring_munin_node_list~      | ""                                                | Set this to a whitespace separated list of nodes that munin should monitor                                                            |
-| ~fai_monitoring_search_host_list~     | ""                                                | Hosts running search instance(s) (Solr + indexer)                                                                                     |
-| ~fai_monitoring_server_ip~            | 127.0.0.1                                         | The IP of the monitoring server.                                                                                                      |
-| ~fai_nfs_allowed_client_network~      | ""                                                | IP/netmwask of allowed NFS clients, example: 192.168.1.0/255.255.255.0                                                                |
-| ~fai_nfs_client_install~              | 0                                                 | Installs an NFS client                                                                                                                |
-| ~fai_nfs_client_mount_point_parent~   | /mnt                                              | Mount point parent directory                                                                                                          |
-| ~fai_nfs_export_list~                 | ""                                                | Space separated list of NFS export directories, full paths as seen on the NFS server. E.g.: /var/exports/multimedia                   |
-| ~fai_nfs_server_address~              | ""                                                | Address of the NFS server, useful for the NFS client profile                                                                          |
-| ~fai_nfs_server_install~              | 0                                                 | Install an NFS server                                                                                                                 |
-| ~fai_presentation_conf_archive~       | ""                                                | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
-| ~fai_presentation_ear~                | ""                                                | EAR to use instead of the Escenic binaries                                                                                            |
-| ~fai_presentation_install~            | 0                                                 | Install the presentation server profile                                                                                               |
-| ~fai_presentation_name~               | web1                                              | Name of the presentation server instance                                                                                              |
-| ~fai_presentation_port~               | 8080                                              | HTTP port of the presentation server instance                                                                                         |
-| ~fai_presentation_shutdown~           | 8005                                              | Shutdown port of the presentation instance                                                                                            |
-| ~fai_presentation_stop_and_clear~     | 0                                                 | After installation, stop the instances and clear its work & log files                                                                 |
-| ~fai_public_host_name~                | ${HOSTNAME}:8080                                  | The public address for your website                                                                                                   |
-| ~fai_publication_create~              | 0                                                 | Create a new publication                                                                                                              |
-| ~fai_publication_domain_mapping_list~ | ""                                                | Mapping between publication names and their corresponding domains on the form: "one#one.com other#other.com[#<alias1>[,<alias2>]]"    |
-| ~fai_publication_environment~         | "production"                                      | The kind of environment/habitat being installed. Typical values are: production, staging, testing, development.                       |
-| ~fai_publication_name~                | mypub                                             | Name of the publication                                                                                                               |
-| ~fai_publication_use_instance~        | dev1                                              | Name of local instance to use for creation                                                                                            |
-| ~fai_publication_war_uri_list~        | ""                                                | Publication WARs used for setting up Assembly tool. Supported: http[s]://tmp.com/mypub.war, file:///tmp/mypub.war and /tmp/mypub.war. |
-| ~fai_publication_war~                 | "WF or ECE demo WAR"                              | WAR to base the new publication on                                                                                                    |
-| ~fai_rmi_install~                     | 0                                                 | Install RMI hub profile                                                                                                               |
-| ~fai_search_conf_archive~             | ""                                                | conf.tar.gz to use for Nursery & JAAS configuration                                                                                   |
-| ~fai_search_ear~                      | ""                                                | EAR to use instead of the Escenic binaries                                                                                            |
-| ~fai_search_for_editor~               | 0                                                 | If 1 (true), will configure Solr for use with an editorial server, if not conf for presentation servers will be chosen.               |
-| ~fai_search_indexer_ws_uri~           | http://${HOSTNAME}:8080/indexer-webservice/index/ | URI of the indexer-webservice that the search instance shall use for knowing what to index.                                           |
-| ~fai_search_install~                  | 0                                                 | Install the search server profile (Solr + indexer)                                                                                    |
-| ~fai_search_name~                     | search1                                           | Name of the search instance                                                                                                           |
-| ~fai_search_port~                     | 8080                                              | HTTP port of the search instance                                                                                                      |
-| ~fai_search_shutdown~                 | 8005                                              | Shutdown port of the search instance                                                                                                  |
-| ~fai_vip_address~                     | ""                                                | The virtual IP the provider will claim                                                                                                |
-| ~fai_vip_install~                     | 0                                                 | Install a VIP provider                                                                                                                |
-| ~fai_vip_primary_node_auth_key~       | ""                                                | Optional, but useful to set to make conf files consistent. Will be generated if not set                                               |
-| ~fai_vip_primary_node_ip~             | ""                                                | Primary node IP                                                                                                                       |
-| ~fai_vip_primary_node_name~           | ""                                                | Primary node name, must be what $(uname -n) returns                                                                                   |
-| ~fai_vip_secondary_node_ip~           | ""                                                | Secondary node IP                                                                                                                     |
-| ~fai_vip_secondary_node_name~         | ""                                                | Secondary node name, must be what $(uname -n) returns                                                                                 |
-| ~fai_vip_service_list~                | ""                                                | List of init.d scripts to invoke when the VIP is acclaimed/revoked, script must support start & stop                                  |
-| ~fai_vip_sibling_ip~                  | ""                                                | The IP of the other node offering the VIP                                                                                             |
-| ~fai_wf_install~                      | 0                                                 | Install Widget Framework profile                                                                                                      |
-|---------------------------------------+---------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------|
+|---------------------------------------+--------------------------------------------------------------+----------------------------------------------------------------------------------------------------------|
+| Parameter                             | Default                                                      | Description                                                                                              |
+|---------------------------------------+--------------------------------------------------------------+----------------------------------------------------------------------------------------------------------|
+| ~fai_all_conf_archive~                | ""                                                           | conf.tar.gz to use for Nursery & JAAS configuration                                                      |
+| ~fai_all_ear~                         | ""                                                           | EAR to use instead of the Escenic binaries                                                               |
+| ~fai_all_install~                     | 0                                                            | Install all components on your server.                                                                   |
+| ~fai_all_stop_and_clear~              | 0                                                            | After installation, stop the instance and clear its work & log files.                                    |
+| ~fai_analysis_db_host~                | localhost                                                    | For the EAE DB (different from ECE's)                                                                    |
+| ~fai_analysis_db_install~             | 0                                                            | Install DB profile                                                                                       |
+| ~fai_analysis_db_password~            | read-the-source-luke                                         | For the EAE DB (different from ECE's)                                                                    |
+| ~fai_analysis_db_port~                | 3306                                                         | For the EAE DB (different from ECE's)                                                                    |
+| ~fai_analysis_db_schema~              | ece5db                                                       | For the EAE DB (different from ECE's)                                                                    |
+| ~fai_analysis_db_user~                | ece5user                                                     | For the EAE DB (different from ECE's)                                                                    |
+| ~fai_analysis_install~                | 0                                                            | Will install the Escenic Analysis Engine, aka Stats, EAE.                                                |
+| ~fai_analysis_name~                   | analysis1                                                    | EAE instance name                                                                                        |
+| ~fai_analysis_port~                   | 8080                                                         | Port of the EAE                                                                                          |
+| ~fai_analysis_shutdown~               | 8005                                                         | Shutdown port for the EAE app server                                                                     |
+| ~fai_analysis_stop_and_clear~         | 0                                                            | After installation, stop the instances and clear its work & log files                                    |
+| ~fai_apt_vizrt_pool~                  | stable                                                       | Which package pool in the Vizrt APT to install package from.                                             |
+| ~fai_cache_backends~                  | ${HOSTNAME}:8080                                             | Space separated, e.g. "app1:8080 app2:8080"                                                              |
+| ~fai_cache_install~                   | 0                                                            | Install cache server profile                                                                             |
+| ~fai_db_daily_backup~                 | 0                                                            | Sets up daily backup of the DB.                                                                          |
+| ~fai_db_drop_old_db_first~            | 0                                                            | Warning: this will drop the old database before installing a new one                                     |
+| ~fai_db_host~                         | $HOSTNAME                                                    | Useful for editor & presentation profiles                                                                |
+| ~fai_db_install~                      | 0                                                            | Install db profile                                                                                       |
+| ~fai_db_password~                     | read-the-source-luke                                         | Useful for DB installation profile                                                                       |
+| ~fai_db_port~                         | 3306                                                         | Useful for editor & presentation profiles                                                                |
+| ~fai_db_schema~                       | ece5db                                                       | Useful for DB installation profile                                                                       |
+| ~fai_db_user~                         | ece5user                                                     | Useful for DB installation profile                                                                       |
+| ~fai_editor_conf_archive~             | ""                                                           | conf.tar.gz to use for Nursery & JAAS configuration                                                      |
+| ~fai_editor_deploy_white_list~        | "escenic-admin escenic studio indexer-webservice webservice" | The list of WARs to be deployed on this instance.                                                        |
+| ~fai_editor_ear~                      | ""                                                           | EAR to use instead of the Escenic binaries                                                               |
+| ~fai_editor_install~                  | 0                                                            | Install the editorial profile                                                                            |
+| ~fai_editor_name~                     | editor1                                                      | Name of the editor instance                                                                              |
+| ~fai_editor_port~                     | 8080                                                         | HTTP port of the editor instance                                                                         |
+| ~fai_editor_shutdown~                 | 8005                                                         | Shutdown port of the editor instance                                                                     |
+| ~fai_editor_stop_and_clear~           | 0                                                            | After installation, stop the instances and clear its work & log files                                    |
+| ~fai_enabled~                         | 0                                                            | Whether or not to run ece-install in FAI mode                                                            |
+| ~fai_keep_off_etc_hosts~              | 0                                                            | Set this to 1 if you don't want ece-install adding entries to /etc/hosts                                 |
+| ~fai_monitoring_admin_password~       | No telling you here ;-)                                      | The admin password of the web interface(s). Currenlty only set for Icinga.                               |
+| ~fai_monitoring_ece_host_list~        | ""                                                           | Hosts running one or more ECE instance                                                                   |
+| ~fai_monitoring_host_list~            | ""                                                           | Quoted, space separated list of <host>#<ip> pairs, e.g.: "pres1#10.72.227.250 pres2#10.72.227.251"       |
+| ~fai_monitoring_install~              | 0                                                            | Install the monitoring server profile.                                                                   |
+| ~fai_monitoring_munin_node_list~      | ""                                                           | Set this to a whitespace separated list of nodes that munin should monitor                               |
+| ~fai_monitoring_search_host_list~     | ""                                                           | Hosts running search instance(s) (Solr + indexer)                                                        |
+| ~fai_monitoring_server_ip~            | 127.0.0.1                                                    | The IP of the monitoring server.                                                                         |
+| ~fai_nfs_allowed_client_network~      | ""                                                           | IP/netmwask of allowed NFS clients, example: 192.168.1.0/255.255.255.0                                   |
+| ~fai_nfs_client_install~              | 0                                                            | Installs an NFS client                                                                                   |
+| ~fai_nfs_client_mount_point_parent~   | /mnt                                                         | Mount point parent directory                                                                             |
+| ~fai_nfs_export_list~                 | ""                                                           | Space separated list of NFS export directories, full paths as seen on the NFS server.                    |
+| ~fai_nfs_server_address~              | ""                                                           | Address of the NFS server, useful for the NFS client profile                                             |
+| ~fai_nfs_server_install~              | 0                                                            | Install an NFS server                                                                                    |
+| ~fai_presentation_conf_archive~       | ""                                                           | conf.tar.gz to use for Nursery & JAAS configuration                                                      |
+| ~fai_presentation_ear~                | ""                                                           | EAR to use instead of the Escenic binaries                                                               |
+| ~fai_presentation_install~            | 0                                                            | Install the presentation server profile                                                                  |
+| ~fai_presentation_name~               | web1                                                         | Name of the presentation server instance                                                                 |
+| ~fai_presentation_port~               | 8080                                                         | HTTP port of the presentation server instance                                                            |
+| ~fai_presentation_deploy_white_list~  | "escenic-admin <assemblytool/publications/*>"                | The list of WARs to be deployed on this instance.                                                        |
+| ~fai_presentation_shutdown~           | 8005                                                         | Shutdown port of the presentation instance                                                               |
+| ~fai_presentation_stop_and_clear~     | 0                                                            | After installation, stop the instances and clear its work & log files                                    |
+| ~fai_public_host_name~                | ${HOSTNAME}:8080                                             | The public address for your website                                                                      |
+| ~fai_publication_create~              | 0                                                            | Create a new publication                                                                                 |
+| ~fai_publication_domain_mapping_list~ | ""                                                           | Mapping between publication names and their domains: "one#one.com other#other.com[#<alias1>[,<alias2>]]" |
+| ~fai_publication_environment~         | "production"                                                 | The kind of environment/habitat. Typical values are: production, staging, testing, development.          |
+| ~fai_publication_name~                | mypub                                                        | Name of the publication                                                                                  |
+| ~fai_publication_use_instance~        | dev1                                                         | Name of local instance to use for creation                                                               |
+| ~fai_publication_war_uri_list~        | ""                                                           | Publication WARs used for setting up Assembly tool.                                                      |
+| ~fai_publication_war~                 | "WF or ECE demo WAR"                                         | WAR to base the new publication on                                                                       |
+| ~fai_rmi_install~                     | 0                                                            | Install RMI hub profile                                                                                  |
+| ~fai_search_conf_archive~             | ""                                                           | conf.tar.gz to use for Nursery & JAAS configuration                                                      |
+| ~fai_search_deploy_white_list~        | "solr indexer-webapp"                                        | The list of WARs to be deployed on this instance.                                                        |
+| ~fai_search_ear~                      | ""                                                           | EAR to use instead of the Escenic binaries                                                               |
+| ~fai_search_for_editor~               | 0                                                            | If 1 (true), will configure Solr for use with an editorial server, if not for presentation servers.      |
+| ~fai_search_indexer_ws_uri~           | http://${HOSTNAME}:8080/indexer-webservice/index/            | URI of the indexer-webservice that the search instance shall use for knowing what to index.              |
+| ~fai_search_install~                  | 0                                                            | Install the search server profile (Solr + indexer)                                                       |
+| ~fai_search_name~                     | search1                                                      | Name of the search instance                                                                              |
+| ~fai_search_port~                     | 8080                                                         | HTTP port of the search instance                                                                         |
+| ~fai_search_shutdown~                 | 8005                                                         | Shutdown port of the search instance                                                                     |
+| ~fai_vip_address~                     | ""                                                           | The virtual IP the provider will claim                                                                   |
+| ~fai_vip_install~                     | 0                                                            | Install a VIP provider                                                                                   |
+| ~fai_vip_primary_node_auth_key~       | ""                                                           | Optional, but useful to set to make conf files consistent. Will be generated if not set                  |
+| ~fai_vip_primary_node_ip~             | ""                                                           | Primary node IP                                                                                          |
+| ~fai_vip_primary_node_name~           | ""                                                           | Primary node name, must be what $(uname -n) returns                                                      |
+| ~fai_vip_secondary_node_ip~           | ""                                                           | Secondary node IP                                                                                        |
+| ~fai_vip_secondary_node_name~         | ""                                                           | Secondary node name, must be what $(uname -n) returns                                                    |
+| ~fai_vip_service_list~                | ""                                                           | List of init.d scripts to invoke when the VIP is acclaimed/revoked, script must support start & stop     |
+| ~fai_vip_sibling_ip~                  | ""                                                           | The IP of the other node offering the VIP                                                                |
+| ~fai_wf_install~                      | 0                                                            | Install Widget Framework profile                                                                         |
+|---------------------------------------+--------------------------------------------------------------+----------------------------------------------------------------------------------------------------------|
 
 As you've probably have guessed, 0 means "false" and 1 means "true" :-)
 
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 60ec4360..103342ff 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -2,26 +2,25 @@
 
 function get_deploy_white_list() {
   
-  # user's deploy white list, if present, takes precedence.
-  if [ $fai_enabled -eq 1 -a -n "${fai_publication_deploy_white_list}" ]; then
-    echo $fai_publication_deploy_white_list
-    return
-  fi
+  local deploy_white_list=""
+  local presentation_deploy_white_list="escenic-admin $(get_publication_short_name_list)"
+  local editor_deploy_white_list="escenic-admin escenic studio indexer-webservice webservice"
+  local search_deploy_white_list="solr indexer-webapp"
   
-  local white_list=""
-  
-  if [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER \
-    -a -n "${publication_name}" ]; then
-    white_list="escenic-admin ${publication_name} "
-  elif [ $install_profile_number -eq $PROFILE_SEARCH_SERVER ]; then 
-    white_list="solr indexer-webapp"
-  elif [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ]; then
-    white_list="escenic-admin "$(get_publication_short_name_list)
-  elif [ $install_profile_number -eq $PROFILE_EDITORIAL_SERVER ]; then
-    white_list="escenic-admin escenic studio indexer-webservice webservice"
+  # user's deploy white list, if present, takes precedence.
+  if [ $fai_enabled -eq 1 ]; then
+    if [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ]; then
+      deploy_white_list=${fai_presentation_deploy_white_list-$presentation_deploy_white_list}
+    elif [ $install_profile_number -eq $PROFILE_EDITORIAL_SERVER ]; then
+      deploy_white_list=${fai_editor_deploy_white_list-$editor_deploy_white_list}
+    elif [ $install_profile_number -eq $PROFILE_SEARCH_SERVER ]; then
+      deploy_white_list=${fai_search_deploy_white_list-$search_deploy_white_list}
+    else
+      deploy_white_list=${fai_publication_deploy_white_list-""}
+    fi
   fi
 
-  echo ${white_list}
+  echo ${deploy_white_list}
 }
 
 function get_publication_short_name_list() {

From dfdbd3789072babcac76a5f7e07144dc16db5c7e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 22 Aug 2012 10:59:32 +0200
Subject: [PATCH 1233/2585] - the HTTP auth wasn't set in the correct place (it
 was set in   set_common_settings and should be in the set_instance_settings).

- added a documentation string for future ece developers in
  ece::deploy.sh as to why we're setting the wget_auth.
---
 usr/bin/ece                                   | 14 +++++++++-----
 usr/share/escenic/ece-scripts/ece.d/deploy.sh |  2 ++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index ba80d938..57a1030c 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -199,11 +199,6 @@ function set_common_settings() {
       $log_dir/Escenic-error.log
     "
 
-    if [[ -n "$appserver_http_user" && -n "$appserver_http_password" ]]; then
-      wget_appserver_auth="--http-user $appserver_http_user --http-password $appserver_http_password"
-      curl_appserver_auth="-u ${appserver_http_user}:${appserver_http_password}"
-      wget_builder_auth="--http-user $builder_http_user --http-password $builder_http_password"
-    fi
 }
 
 function set_type_settings() {
@@ -385,6 +380,15 @@ function set_instance_settings() {
         ece_args=$ece_args" -Djava.net.preferIPv4Stack=true"
     fi
     
+    if [[ -n "$appserver_http_user" && -n "$appserver_http_password" ]]; then
+      wget_appserver_auth="--http-user $appserver_http_user --http-password $appserver_http_password"
+      curl_appserver_auth="-u ${appserver_http_user}:${appserver_http_password}"
+    fi
+    
+    if [[ -n "$builder_http_user" && -n "$builder_http_password" ]]; then
+      wget_builder_auth="--http-user $builder_http_user --http-password $builder_http_password"
+    fi
+    
     # Resin needs some more arguments as its XML parser is not
     # compatible with ECE.
     if [ "$appserver" == "resin" ]; then
diff --git a/usr/share/escenic/ece-scripts/ece.d/deploy.sh b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
index b462f008..34bd75bf 100644
--- a/usr/share/escenic/ece-scripts/ece.d/deploy.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
@@ -46,6 +46,8 @@ function deploy() {
 
   if [ -n "$file" ]; then
     print_and_log "Deploying $file on $instance ..."
+
+    # wget_auth is needed for download_uri_target_to_dir
     wget_auth=$wget_builder_auth
     ear=$(download_uri_target_to_dir $file $cache_dir)
     

From 1125eedc7b186b812e51fcf02c51cf45ff7e8d2f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 22 Aug 2012 11:01:00 +0200
Subject: [PATCH 1234/2585] - ece-install will now set up builder & app server
 HTTP authentication   credentials in ece-<instance>.conf if any of these fai_
 variable   pairs are defined:

  fai_builder_http_user
  fai_builder_http_password

  fai_appserver_http_user
  fai_appserver_http_password

  If only the _user or _password is defined for any of these pairs, no
  wget or curl auth options are set.
---
 .../escenic/ece-scripts/ece-install.d/app-server.sh | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index b420e2b7..6e027952 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -134,6 +134,7 @@ function set_up_app_server()
   set_ece_instance_conf tomcat_home $tomcat_home
   set_ece_instance_conf appserver_port $appserver_port
   set_appropriate_jvm_heap_sizes
+  set_http_auth_credentials_if_needed
   
   run cd $tomcat_base/lib
   make_ln $jdbc_driver
@@ -441,3 +442,15 @@ function set_appropriate_jvm_heap_sizes() {
   set_ece_instance_conf min_heap_size "${heap_size}m"
   set_ece_instance_conf max_heap_size "${heap_size}m"
 }
+
+function set_http_auth_credentials_if_needed() {
+  if [[ -n "$fai_builder_http_user" && -n "$fai_builder_http_password" ]]; then
+    set_ece_instance_conf builder_http_user "$fai_builder_http_user"
+    set_ece_instance_conf builder_http_password "$fai_builder_http_password"
+  fi
+  
+  if [[ -n "$fai_appserver_http_user" && -n "$fai_appserver_http_password" ]]; then
+    set_ece_instance_conf appserver_http_user "$fai_appserver_http_user"
+    set_ece_instance_conf appserver_http_password "$fai_appserver_http_user"
+  fi
+}

From 88f25d646a6b17505392b90ed15b92f98e2f31bf Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 22 Aug 2012 11:12:15 +0200
Subject: [PATCH 1235/2585] - fixed 'ece clean' where it assumed
 $assemblytool_home signified a   proper AT installation. However, it can be
 that $assemblytool_home   exists without AT being properly installed.

  Under surch circumstances, 'ece clean' would fail. This has now been
  fixed.
---
 usr/share/escenic/ece-scripts/ece.d/clean.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/clean.sh b/usr/share/escenic/ece-scripts/ece.d/clean.sh
index 61e87c2a..b6ebd75d 100644
--- a/usr/share/escenic/ece-scripts/ece.d/clean.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/clean.sh
@@ -1,5 +1,5 @@
 function clean_up() {
-  if [[ "$type" == "engine" && -d $assemblytool_home ]]; then
+  if [[ "$type" == "engine" && -e "$assemblytool_home/build.xml" ]]; then
     print "Cleaning up generated files in $assemblytool_home ..." 
     run cd $assemblytool_home
     run ant clean

From 23ea04039e2beb90924ec1156b9f09b1f9433a98 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Wed, 22 Aug 2012 12:07:53 +0200
Subject: [PATCH 1236/2585] Monitoring profile changes - Added "internet
 connectivity" checks out-of-the box. - Removed trend range from check-mk. -
 Changed to admins contact groups for all hosts and services. - Better
 out-of-the-box values based on feedback.

---
 .../ece-scripts/ece-install.d/monitoring.sh   | 42 ++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index 3e991d4d..4fb10257 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -115,10 +115,50 @@ all_hosts = [ $hosts ]
 
 filesystem_default_levels = {
    "levels"         : (90, 95), # levels in percent
-   "trend_timeleft" : (150, 48)  # run time left in hours until full
+   "magic"          : 0.8,      # Make bigger disks grow to more than 90/95%
+   "trend_range"    : None,     # disable check_mk's trending
 }
 
+service_contactgroups = [
+  ( "admins", ALL_HOSTS, ALL_SERVICES ),
+]
+
+host_contactgroups = [
+  ( "admins", ALL_HOSTS ),
+]
+
+
+extra_service_conf["max_check_attempts"] = [
+ # NTP checks can fail for 2 days before they trigger an alert.
+ ( "2880", ALL_HOSTS, [ "NTP Time" ]),
+
+ # Disk must fill at sustained rate for 45 minutes before issuing a warning
+ ( "45", ALL_HOSTS, [ "disk_fill_rate" ]),
+
+ # External HTTP, TCP and DNS must fail for 10 minutes
+ ( "10", ALL_HOSTS, [ "external_HTTP", "external_TCP", "external_DNS", "external_PING" ]),
+
+ # All others get 4 minutes.
+ ( "4", ALL_HOSTS, ALL_SERVICES ),
+]
+
+EOF
+
+# specific local checks 
+# Note that these checks are run from the monitoring server itself, which is
+# assumed to have the same connectivity as the other server.
+  cat > /etc/check_mk/mrpe.cfg <<EOF
+# Check that we can access the Internet
+# PING google's DNS server.
+external_PING    /usr/lib/nagios/plugins/check_ping -H 8.8.8.8 -w 20,2% -c 30,2% -p 1 -t 0.5
+
+# Do a nameserver lookup
+external_DNS    /usr/lib/nagios/plugins/check_dns -H www.google.com -s 8.8.8.8 -w 0.3 -c 2 -t 2
+
+# Make a request to Google (this might use a proxy, don't know)
+external_HTTP   /usr/lib/nagios/plugins/check_http -H www.google.com -w 0.8 -c 2 -t 2
 EOF
+
   run check_mk -I
   run check_mk -O
 

From 082a9ab55fdbec5b40c34b75c509bb027c5984d6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 22 Aug 2012 12:53:02 +0200
Subject: [PATCH 1237/2585] - 'ece clean' now respects the cache_dir set in  
 ece[-<instance>].conf. Until now, it's been using the default  
 /var/cache/escenic only

---
 usr/share/escenic/ece-scripts/ece.d/clean.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/clean.sh b/usr/share/escenic/ece-scripts/ece.d/clean.sh
index b6ebd75d..194fb2c1 100644
--- a/usr/share/escenic/ece-scripts/ece.d/clean.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/clean.sh
@@ -5,15 +5,15 @@ function clean_up() {
     run ant clean
   fi
 
-  if [ -d /var/cache/escenic ]; then
-    print "Cleaning up ear, deb and rpm files in /var/cache/escenic ..." 
-    run rm -rf /var/cache/escenic/*.{rpm,deb,ear}
+  if [ -d "${cache_dir}" ]; then
+    print "Cleaning up ear, deb and rpm files in ${cache_dir} ..." 
+    run rm -rf ${cache_dir}/*.{rpm,deb,ear}
   fi
 
   if [[ $appserver == "tomcat" ]]; then
     local dir_list="
-    $tomcat_base/work
-    $tomcat_base/temp
+      $tomcat_base/work
+      $tomcat_base/temp
     "
     for el in $dir_list; do
       if [ -d $el ]; then

From 9c4f0de66ef778aef4f915ed5b3c513e72a36cf3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 22 Aug 2012 12:54:37 +0200
Subject: [PATCH 1238/2585] - 'ece info' and 'ece package' now heed the
 cache_dir set in   ece[-<instance>].conf

---
 usr/share/escenic/ece-scripts/ece.d/info.sh    | 2 +-
 usr/share/escenic/ece-scripts/ece.d/package.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/info.sh b/usr/share/escenic/ece-scripts/ece.d/info.sh
index 56c03c43..a21a3dd1 100644
--- a/usr/share/escenic/ece-scripts/ece.d/info.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/info.sh
@@ -157,7 +157,7 @@ function create_block_diag_for_instance() {
     return
   fi
   
-  local file=/var/cache/escenic/${instance}.blockdiag
+  local file=${cache_dir}/${instance}.blockdiag
   cat > ${file} <<EOF
 blockdiag {
   ${instance} [ color = "red" ];
diff --git a/usr/share/escenic/ece-scripts/ece.d/package.sh b/usr/share/escenic/ece-scripts/ece.d/package.sh
index 1d491573..ef8f4f87 100644
--- a/usr/share/escenic/ece-scripts/ece.d/package.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/package.sh
@@ -105,13 +105,13 @@ EOF
         run mv *.rpm ${cache_dir}
         print "RPM package of your $instance $type instance with build"
         print "version $version is now available:"
-        print $(echo /var/cache/escenic/${package_name}-${version}*.rpm)
+        print $(echo ${cache_dir}/${package_name}-${version}*.rpm)
       fi
       
       mv *.deb ${cache_dir}
       print "DEB package of your $instance $type instance with with build"
       print "version $version is now available:"
-      print /var/cache/escenic/${deb_package}
+      print ${cache_dir}/${deb_package}
       ;;
     *)
       print "Package creation is only supported on Tomcat so far."

From 2510afb0bc10e2ab8d8014dcc3f3ec7f8ca9a7cf Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 23 Aug 2012 08:57:01 +0200
Subject: [PATCH 1239/2585] - made the support for HTTP user/pass for the app
 server to be more   specific: first of all, set it per ECE instance, hence
 the rename of

     fai_appserver_http_user
     fai_appserver_http_password

  =>

     fai_editor_escenic_admin_http_user
     fai_editor_escenic_admin_http_password

     and

     fai_presentation_escenic_admin_http_user
     fai_presentation_escenic_admin_http_password

   Secondly, as you can see, the name of the variables are more
   specific to what they're actually used for. They are not general
   app server HTTP credentials, but for the escenic-admin webapp (if
   protected) specifically.

- added common-bashing:is_authorized_to_access_url (normally need that
  one instead of is_unauthorized_to_access_url)
---
 etc/escenic/ece.conf                          | 97 ++++++++++---------
 usr/bin/ece                                   | 14 ++-
 .../escenic/ece-scripts/common-bashing.sh     | 12 +++
 .../ece-scripts/ece-install.d/app-server.sh   | 17 +++-
 4 files changed, 85 insertions(+), 55 deletions(-)

diff --git a/etc/escenic/ece.conf b/etc/escenic/ece.conf
index a2a0851b..e1bd9dfa 100644
--- a/etc/escenic/ece.conf
+++ b/etc/escenic/ece.conf
@@ -4,57 +4,57 @@
 #           author: torstein@escenic.com
 #   last update by: $Author: shud $
 
-########################################################################
+#########################################################################
 # Section I: Variables you probably want to change or at least verify
 # make sense.
-########################################################################
+#########################################################################
 
 
-########################################################################
+#########################################################################
 # Where the escenic content engine itself is installed
-########################################################################
+#########################################################################
 ece_home=/opt/escenic/engine
 
-########################################################################
+#########################################################################
 # Set this one if you're running more than one ECE instance on your
 # host. Usually, you'll set it to the instance name. If you're running
 # one ECE instance on your system, you may omit this one.
-########################################################################
+#########################################################################
 # ece_server=rolling
 # ece_server_hostname=quanah.escenic.com
 
-########################################################################
+#########################################################################
 # Set this one if you wish to have a Nursery configuration layer
 # special to the kind of enviornment you're running. An enviornment in
 # this context is: development, test, staging and prodution.
-########################################################################
+#########################################################################
 # ece_environment=production
 
-########################################################################
+#########################################################################
 # Setting the java home, yes lowercase is correct ;-)
-########################################################################
+#########################################################################
 java_home=/usr/lib/jvm/java-6-sun
 
-########################################################################
+#########################################################################
 # Possible options are: tomcat, jboss, resin & oc4j
-########################################################################
+#########################################################################
 appserver=tomcat
 
-########################################################################
+#########################################################################
 # App server port. If this variable is unset, ece will try to figure
 # out the port number by itself. ece-<instance>.conf should override
 # this when there's more than one ECE instance on the same host.
-########################################################################
+#########################################################################
 appserver_port=8080
 
-########################################################################
+#########################################################################
 # Section II: Variables that are sensible defaults but may be changed
 # to accommodate the conventions or tastes of your OS or company.
-########################################################################
+#########################################################################
 
-########################################################################
+#########################################################################
 # Related to the ece script/ECE/hub/search
-########################################################################
+#########################################################################
 assemblytool_home=/opt/escenic/assemblytool
 cache_dir=/var/cache/escenic
 # The root of all Escenic configuration files (not only ECE)
@@ -68,7 +68,7 @@ rmi_hub_home=$ece_home/contrib/rmi-hub
 solr_home=/var/lib/escenic/solr
 tmp_dir=/tmp
 
-########################################################################
+#########################################################################
 # When making a deployment, ece will default wise, deploy the EAR
 # generated with "ece assemble" on the application server.  The
 # webapps included in the EAR can be filtered with the
@@ -85,16 +85,16 @@ tmp_dir=/tmp
 # 
 # deploy_webapp_white_list="escenic-admin pbe"
 
-########################################################################
+#########################################################################
 # Memcached support.  'ece -i <intance> deploy' will per default add
 # support for using memcached with your publication. If you wish to
 # turn this off, you can set this value to 0.
-########################################################################
+#########################################################################
 # enable_memcached_support=1
 
-########################################################################
+#########################################################################
 # Where to find the various application servers
-########################################################################
+#########################################################################
 jboss_home=/opt/jboss
 oc4j_home=/opt/oc4j
 resin_home=/opt/resin
@@ -105,29 +105,29 @@ tomcat_home=/usr/share/tomcat6
 # binaries, just with different data.
 # tomcat_base=/opt/tomcat-editor1
 
-#####################################################################
+######################################################################
 # If you've compiled or installed APR support (native Tomcat
 # libraries, using the Apache APR library), you specify the install
 # directory here, if not comment it out.
-#####################################################################
+######################################################################
 apr_lib_dir=/usr/lib
 
-########################################################################
+#########################################################################
 # JVM related (the Java Virtual Machine)
-########################################################################
+#########################################################################
 
-########################################################################
+#########################################################################
 # The minimum and maximum heap sizes for the Java process
-########################################################################
+#########################################################################
 min_heap_size=256m
 max_heap_size=256m
 
-########################################################################
+#########################################################################
 # The permgen size is the amount of memory the JVM sets aside to class
 # defintions. If you are experiencing constant OutOfMemory
 # exceptions/errors and are using EAR deployment, you may want to
 # increase these.
-########################################################################
+#########################################################################
 min_permgen_size=64m
 max_permgen_size=256m
 
@@ -137,12 +137,12 @@ remote_debugging_port=5005
 enable_remote_monitoring=0
 remote_monitoring_port=5792
 
-########################################################################
+#########################################################################
 # Settings related to the JVM garbage collection, don't touch these if
 # you're not sure of what you're doing and have tested your changes
 # properly. Note that ece takes care of the GC logging, so you don't
 # have to cater for that here.
-########################################################################
+#########################################################################
 jvm_gc_settings="
 -XX:+CMSClassUnloadingEnabled
 -XX:+CMSIncrementalPacing
@@ -159,43 +159,44 @@ jvm_gc_settings="
 -XX:SurvivorRatio=1
 "
 
-#####################################################################
+######################################################################
 # Java will use IPv6 if it's available on the OS. This however, can
 # cause problems with applications that insists on using IPv4
 # sockets.
 #
 # If e.g. Tomcat cannot create a socket on a given port (which is not
 # taken), you may need to set this one to '1'. Default is '0'.
-#####################################################################
+######################################################################
 force_ipv4=0
 
-#####################################################################
+######################################################################
 # Ask the JVM to create a heap dump when/if it crashes. 
-#####################################################################
+######################################################################
 enable_heap_dump=1
 heap_dump_dir=/var/crash/escenic
 
-#####################################################################
+######################################################################
 # Where 'ece -i <instance> backup' will put its snapshot
 # backups. Default is /var/backups/escenic.
-#####################################################################
+######################################################################
 backup_dir=/var/backups/escenic
 
-#####################################################################
+######################################################################
 # When removing old log files, how old should the oldest file be?
-#####################################################################
+######################################################################
 old_log_file_max_age_in_days=5
 
-#####################################################################
-# HTTP authentication for the app server (default is no HTTP auth)
-#####################################################################
-# appserver_http_user=
-# appserver_http_password=
+######################################################################
+# HTTP authentication for the escenic-admin webapp (default is no HTTP
+# auth)
+######################################################################
+# escenic_admin_http_user=
+# escenic_admin_http_password=
 
-#####################################################################
+######################################################################
 # HTTP authentication for the build server (default is no HTTP auth),
 # this only used for when you use 'ece deploy' with a URI for an EAR
 # a the build server.
-#####################################################################
+######################################################################
 # builder_http_user=
 # builder_http_password=
diff --git a/usr/bin/ece b/usr/bin/ece
index 57a1030c..ab4bfeef 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -380,13 +380,19 @@ function set_instance_settings() {
         ece_args=$ece_args" -Djava.net.preferIPv4Stack=true"
     fi
     
-    if [[ -n "$appserver_http_user" && -n "$appserver_http_password" ]]; then
-      wget_appserver_auth="--http-user $appserver_http_user --http-password $appserver_http_password"
-      curl_appserver_auth="-u ${appserver_http_user}:${appserver_http_password}"
+    if [[ -n "$escenic_admin_http_user" && -n "$escenic_admin_http_password" ]]; then
+      wget_appserver_auth="
+        --http-user $escenic_admin_http_user
+        --http-password $escenic_admin_http_password
+      "
+      curl_appserver_auth="-u ${escenic_admin_http_user}:${escenic_admin_http_password}"
     fi
     
     if [[ -n "$builder_http_user" && -n "$builder_http_password" ]]; then
-      wget_builder_auth="--http-user $builder_http_user --http-password $builder_http_password"
+      wget_builder_auth="
+        --http-user $builder_http_user
+        --http-password $builder_http_password
+      "
     fi
     
     # Resin needs some more arguments as its XML parser is not
diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index bdb75e36..30f50696 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -278,6 +278,18 @@ function is_unauthorized_to_access_url() {
     wc -l
 }
 
+## Will return 1 if the user can access the URL.
+## $1 user
+## $2 pass
+## $3 URL
+function is_authorized_to_access_url() {
+  curl -s  -I  -u ${1}:${2} ${3} | \
+    head -1 | \
+    grep "200 OK" | \
+    wc -l
+}
+
+
 ## $1 the string to which you want to remove any leading white spaces.
 function ltrim() {
   echo $1 | sed 's/^[ ]*//g'
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 6e027952..965fded7 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -448,9 +448,20 @@ function set_http_auth_credentials_if_needed() {
     set_ece_instance_conf builder_http_user "$fai_builder_http_user"
     set_ece_instance_conf builder_http_password "$fai_builder_http_password"
   fi
+
+  local http_user=""
+  local http_password=""
+
+  if [ $install_profile_number -eq $PROFILE_EDITORIAL_SERVER ]; then
+    http_user=${fai_editor_escenic_admin_http_user}
+    http_password=${fai_editor_escenic_admin_http_password}
+  elif [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ]; then
+    http_user=${fai_presentation_escenic_admin_http_user}
+    http_password=${fai_presentation_escenic_admin_http_password}
+  fi
   
-  if [[ -n "$fai_appserver_http_user" && -n "$fai_appserver_http_password" ]]; then
-    set_ece_instance_conf appserver_http_user "$fai_appserver_http_user"
-    set_ece_instance_conf appserver_http_password "$fai_appserver_http_user"
+  if [[ -n "$http_user" && -n "$http_password" ]]; then
+    set_ece_instance_conf escenic_admin_http_user "$http_user"
+    set_ece_instance_conf escenic_admin_http_password "$http_password"
   fi
 }

From 1db85419347ffd717103958987da1390f33d0b50 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 23 Aug 2012 12:19:18 +0200
Subject: [PATCH 1240/2585] - made it possible to invoke the create-handbook.sh
 from anywhere

---
 .../vizrt/vosa-handbook/create-handbook.sh    | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 4b008212..729c8e41 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -24,7 +24,7 @@ function run() {
 }
 
 function generate_svg_from_blockdiag() {
-  run cp -r graphics $target_dir
+  run cp -r $(dirname $0)/graphics $target_dir
   
   for el in $target_dir/graphics/*.blockdiag; do
     echo "Generating SVG of $el ..."
@@ -113,7 +113,7 @@ function set_up_build_directory() {
     rm -rf $target_dir
   fi
   run mkdir -p $target_dir/graphics
-  run cp *.org $target_dir
+  run cp $(dirname $0)/*.{org,el} $target_dir
 
   # customer chapters & overrides
   if [[ -n $customer_doc_dir && -d $customer_doc_dir ]]; then
@@ -277,7 +277,7 @@ function generate_html_from_org() {
 # use emacs to generate HTML from the ORG files
   echo "Generating new handbook HTML from ORG ..." 
   run emacs \
-    --load vizrt-branding-org-mode.el \
+    --load $target_dir/vizrt-branding-org-mode.el \
     --batch \
     --visit $target_dir/$handbook_org \
     --funcall org-export-as-html-batch 2> /dev/null
@@ -495,7 +495,7 @@ function generate_cache_server_org() {
 
   generate_cache_server_diagram
   local file=$target_dir/generated-cache-server.org
-  local svg_file=./graphics/${trail_cache_host}-cache.svg
+  local svg_file=$target_dir/graphics/${trail_cache_host}-cache.svg
   cat > $file <<EOF
 ** Cache server on $trail_cache_host
 
@@ -561,12 +561,11 @@ blockdiag {
 }
 EOF
     local file=$target_dir/network-file-system-sync.org
-    local svg_file=./graphics/$(basename $blockdiag_file .blockdiag).svg
+    local svg_file=$target_dir/graphics/$(basename $blockdiag_file .blockdiag).svg
     cat >> $file <<EOF
 [[file:${svg_file}][${svg_file}]]
 EOF
-    run cat $file >> \
-      $target_dir/network-file-system.org
+    run cat $file >> $target_dir/network-file-system.org
   fi
 }
 
@@ -618,15 +617,14 @@ function add_customer_chapters() {
     grep .org$ | \
     wc -l) -gt 0 ]; then
     echo "Applying customer overrides ..."
-    cp $target_dir/customer/*.org $target_dir
+#    cp $target_dir/customer/*.org $target_dir
   fi
 
   if [ $(ls $target_dir/customer/extra-chapters/ 2>/dev/null | \
     grep .org$ | \
     wc -l) -gt 0 ]; then
     (
-      cd $target_dir
-      local file=vosa-handbook.org
+      local file=$target_dir/vosa-handbook.org
       local title="Customer specific chapters"
       if [ -n "$trail_network_name" ]; then
         title="Special chapters for the $trail_network_name network"
@@ -634,18 +632,18 @@ function add_customer_chapters() {
       cat >> $file <<EOF
 * ${title}
 EOF
-      for el in customer/extra-chapters/*.org; do
+      for el in $target_dir/customer/extra-chapters/*.org; do
         echo "Preparing extra chapter $(basename $el .org) ..."
         sed -i 's/^*/**/' $el
       done
 
-      if [ -e customer/extra-chapters/overview.org ]; then
+      if [ -e $target_dir/customer/extra-chapters/overview.org ]; then
         echo "Including extra chapters according to customer's overview.org"
         cat >> $file <<EOF
 #+INCLUDE "customer/extra-chapters/overview.org"
 EOF
       else
-        for el in customer/extra-chapters/*.org; do
+        for el in $target_dir/customer/extra-chapters/*.org; do
           echo "Appending chapter $el ..."
           cat $el >> $file
         done

From 0fff770c4603b7eba1a53e5d3f0b3672e620e00a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 23 Aug 2012 13:28:36 +0200
Subject: [PATCH 1241/2585] - added section on how to roll back a deployment

---
 .../doc/vizrt/vosa-handbook/deployment.org      | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/usr/share/doc/vizrt/vosa-handbook/deployment.org b/usr/share/doc/vizrt/vosa-handbook/deployment.org
index 8155a62c..1bfd1cf3 100644
--- a/usr/share/doc/vizrt/vosa-handbook/deployment.org
+++ b/usr/share/doc/vizrt/vosa-handbook/deployment.org
@@ -15,6 +15,22 @@ the shell. This is the URI you use for the 'ece deploy' command below.
 In the examples here, we have a build server on <%= trail_builder_host %>
 where we build EARs for the the <%= trail_builder_user %> website.
 
+** Make sure you can roll back
+Before deploying a new EAR, take note of the previously deployed EAR
+so that you can easily roll back:
+
+#+BEGIN_SRC sh
+$ sudo ssh escenic@<%= trail_presentation_host %> ece -i engine1 info
+[ece#engine-engine1] Deployment state:
+[ece#engine-engine1] |-> Version: <%= trail_builder_user %>-trunk-rev4331-2012-07-25_1225
+[ece#engine-engine1] |-> EAR used: http://<% trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev4331-2012-07-25_1225.ear
+[ece#engine-engine1] |-> MD5 sum: 58638b16efc7f4cebd8d0acb4eecfb40
+#+END_SRC
+
+If anything goes wrong in [[Deploying a new EAR file for an ECE
+instance]], you can just repeat the deployment steps with the URL of the
+previous EAR.
+
 *** Deploying a new EAR file for an ECE instance
 All the commands in this section is written to be executed on
 <%= trail_control_host %> (but you could of course also first log on to each
@@ -61,6 +77,7 @@ torstein@control:~$ sudo ssh escenic@<%= trail_presentation_host %> ece
 [ece#search-search1] Deployment state file updated: /var/lib/escenic/search1.state  
 #+END_SRC
 
+
 ** Updating Publication Resources
 This document describes how you update publication resources. Here, we
 use content-type as an example.

From 30af249f0726b1ca61ca8008fbddd18de1df098d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 23 Aug 2012 13:35:42 +0200
Subject: [PATCH 1242/2585] - added trail_db_backup_dir, default is
 /var/backups/escenic

---
 usr/share/doc/vizrt/vosa-handbook/backups-db.org     | 2 +-
 usr/share/doc/vizrt/vosa-handbook/create-handbook.sh | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/backups-db.org b/usr/share/doc/vizrt/vosa-handbook/backups-db.org
index 74bba8ce..dd346400 100644
--- a/usr/share/doc/vizrt/vosa-handbook/backups-db.org
+++ b/usr/share/doc/vizrt/vosa-handbook/backups-db.org
@@ -10,7 +10,7 @@ the default location of the cron script on <%= trail_db_daily_backup_host %> is:
 
 And it'll put its backups in
 #+BEGIN_SRC text
-/var/backups/escenic  
+<%= trail_db_backup_dir %>
 #+END_SRC
 
 All these are overridable, see the ece-install guide for further
diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 729c8e41..5fe6b735 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -75,6 +75,7 @@ function set_defaults_if_the_trails_are_not_set() {
   trail_control_host=${trail_control_host-control}
   trail_db_master_host=${trail_db_master_host-db1}
   trail_db_schema=${trail_db_schema-ecedb}
+  trail_db_backup_dir=${trail_db_backup_dir-/var/backups/escenic}
   trail_db_vendor=${trail_db_vendor-mysql}
   trail_db_vip_interface=${trail_db_vip_interface-eth0:0}
   trail_db_vip_ip=${trail_db_vip_ip-192.168.1.200}

From 8675e59573f1c2f69f281b492c6987efe07a2658 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 23 Aug 2012 13:41:05 +0200
Subject: [PATCH 1243/2585] - the NFS and cache server SVGs need to be relative
 for the generated   HTML markup to be correct.

---
 usr/share/doc/vizrt/vosa-handbook/create-handbook.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 5fe6b735..bfd6f261 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -496,7 +496,7 @@ function generate_cache_server_org() {
 
   generate_cache_server_diagram
   local file=$target_dir/generated-cache-server.org
-  local svg_file=$target_dir/graphics/${trail_cache_host}-cache.svg
+  local svg_file=./graphics/${trail_cache_host}-cache.svg
   cat > $file <<EOF
 ** Cache server on $trail_cache_host
 
@@ -562,7 +562,7 @@ blockdiag {
 }
 EOF
     local file=$target_dir/network-file-system-sync.org
-    local svg_file=$target_dir/graphics/$(basename $blockdiag_file .blockdiag).svg
+    local svg_file=./graphics/$(basename $blockdiag_file .blockdiag).svg
     cat >> $file <<EOF
 [[file:${svg_file}][${svg_file}]]
 EOF

From 416ee116a53b350bfb955777bf97b6092d965226 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 23 Aug 2012 14:28:02 +0200
Subject: [PATCH 1244/2585] - added hostname to the daily DB backup. This is
 very useful when   backing up to a shared file system or copy the backup to a
 different   host.

---
 usr/share/escenic/ece-scripts/ece-install.d/database.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 9fe816fe..4a5b9183 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -587,7 +587,7 @@ mysqldump -u $db_user \\
   -h $db_host \\
   $db_schema | \\
   gzip -9 - \\
-  > ${escenic_backups_dir}/\$(date --iso)-${db_schema}.sql.gz
+  > ${escenic_backups_dir}/\$(date --iso)-\${HOSTNAME}-${db_schema}.sql.gz
 EOF
 
   run chmod 700 $file

From a3b457d20f746c89577ffaf0d13641903fefd2d9 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 23 Aug 2012 15:19:09 +0200
Subject: [PATCH 1245/2585] - now using trail_today_date for always updated
 example output :)

---
 usr/share/doc/vizrt/vosa-handbook/deployment.org | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/deployment.org b/usr/share/doc/vizrt/vosa-handbook/deployment.org
index 1bfd1cf3..418d8d86 100644
--- a/usr/share/doc/vizrt/vosa-handbook/deployment.org
+++ b/usr/share/doc/vizrt/vosa-handbook/deployment.org
@@ -22,8 +22,8 @@ so that you can easily roll back:
 #+BEGIN_SRC sh
 $ sudo ssh escenic@<%= trail_presentation_host %> ece -i engine1 info
 [ece#engine-engine1] Deployment state:
-[ece#engine-engine1] |-> Version: <%= trail_builder_user %>-trunk-rev4331-2012-07-25_1225
-[ece#engine-engine1] |-> EAR used: http://<% trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev4331-2012-07-25_1225.ear
+[ece#engine-engine1] |-> Version: <%= trail_builder_user %>-trunk-rev4331-<%= trail_today_date %>_1225
+[ece#engine-engine1] |-> EAR used: http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev4331-<%= trail_today_date %>_1225.ear
 [ece#engine-engine1] |-> MD5 sum: 58638b16efc7f4cebd8d0acb4eecfb40
 #+END_SRC
 
@@ -37,9 +37,9 @@ All the commands in this section is written to be executed on
 of the servers and run the commands locally there).
 
 #+BEGIN_SRC sh
-$ sudo ssh escenic@<%= trail_presentation_host %> ece -i engine1 --uri http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev4121-2012-07-05_1524.ear deploy
-[ece#engine-engine1] Deploying http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev4121-2012-07-05_1524.ear on engine1 ...
-[ece#engine-engine1] Deploying /var/cache/escenic/<%= trail_builder_user %>-trunk-rev4121-2012-07-05_1524.ear on tomcat ...
+$ sudo ssh escenic@<%= trail_presentation_host %> ece -i engine1 --uri http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev4121-<%= trail_today_date %>_1524.ear deploy
+[ece#engine-engine1] Deploying http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev4121-<%= trail_today_date %>_1524.ear on engine1 ...
+[ece#engine-engine1] Deploying /var/cache/escenic/<%= trail_builder_user %>-trunk-rev4121-<%= trail_today_date %>_1524.ear on tomcat ...
 [ece#engine-engine1] Deployment white list active, only deploying: <%= trail_webapp_name %> escenic-admin indexer-webservice
 [ece#engine-engine1] Deployment state file updated: /var/lib/escenic/engine1.state
 #+END_SRC
@@ -70,9 +70,9 @@ the ECE instance above.
 
 #+BEGIN_SRC sh
 torstein@control:~$ sudo ssh escenic@<%= trail_presentation_host %> ece
--i search1 -t search --uri http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev4121-2012-07-05_1524.ear deploy
-[ece#search-search1] Deploying http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev4121-2012-07-05_1524.ear on search1 ...
-[ece#search-search1] Deploying /var/cache/escenic/<%= trail_builder_user %>-trunk-rev4121-2012-07-05_1524.ear on tomcat ...
+-i search1 -t search --uri http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev4121-<%= trail_today_date %>_1524.ear deploy
+[ece#search-search1] Deploying http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev4121-<%= trail_today_date %>_1524.ear on search1 ...
+[ece#search-search1] Deploying /var/cache/escenic/<%= trail_builder_user %>-trunk-rev4121-<%= trail_today_date %>_1524.ear on tomcat ...
 [ece#search-search1] Deployment white list active, only deploying: escenic-admin solr indexer-webapp
 [ece#search-search1] Deployment state file updated: /var/lib/escenic/search1.state  
 #+END_SRC

From cfe7a66328e21363922005c0bb77144760df1b0b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 23 Aug 2012 15:21:58 +0200
Subject: [PATCH 1246/2585] - now sets trail_today_date

---
 usr/share/doc/vizrt/vosa-handbook/create-handbook.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index bfd6f261..7af361a1 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -93,6 +93,7 @@ function set_defaults_if_the_trails_are_not_set() {
   trail_nfs_master_host=${trail_nfs_master_host-nfs1}
   trail_presentation_host=${trail_presentation_host-pres1}
   trail_presentation_host_list=${trail_presentation_host_list-${trail_presentation_host}}
+  trail_today_date=${trail_today_date-$(date --iso)}
 }
 
 function expand_all_variables_in_org_files() {

From bebeebf95be681d8026e7d7f841890571d6e5a4e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@geronimo>
Date: Fri, 24 Aug 2012 08:59:43 +0200
Subject: [PATCH 1247/2585] - fai_db_daily_backup=1 will now maintain a symlink
 to the latest   backup: <escenic-backup-dir>/<db schema>-latest-backup.tar.gz

  This is useful for monitoring software and operators with weary eyes
  after looking at the terminal for too long ;-)
---
 .../escenic/ece-scripts/ece-install.d/database.sh    | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 4a5b9183..788d8457 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -582,12 +582,22 @@ function install_db_backup_server() {
 ## Backup of the $db_schema DB
 ## Set up by $(basename $0) @ $(date)
 
+fn=\$(date --iso)-\${HOSTNAME}-${db_schema}.sql.gz
+
 mysqldump -u $db_user \\
   -p$db_password \\
   -h $db_host \\
   $db_schema | \\
   gzip -9 - \\
-  > ${escenic_backups_dir}/\$(date --iso)-\${HOSTNAME}-${db_schema}.sql.gz
+  > ${escenic_backups_dir}/${fn}
+
+# make a symlink to the latest backup to make it easy for monitoring &
+# operators to know what's the latest backup without using any brain
+# power.
+(
+  cd \${escenic_backups_dir}
+  ln -sf \${fn} latest-\${db_schema}-backup.sql.gz
+)
 EOF
 
   run chmod 700 $file

From eb9e9811ee80f67e21114529f63b7ecda6d322ed Mon Sep 17 00:00:00 2001
From: Kevin Flynn <kevin@kevin-Precision-M4500.(none)>
Date: Fri, 24 Aug 2012 09:08:57 +0200
Subject: [PATCH 1248/2585] reorganizing profiles section

---
 usr/share/doc/escenic/ece-install-guide.org | 140 ++++++++++----------
 1 file changed, 68 insertions(+), 72 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 7a856698..f2eac3ca 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -292,16 +292,22 @@ To run =ece-install= in FAI mode you must first add the following settings
 to =ece-install.conf=:
  
  * =fai_enabled=1= To switch FAI mode on.
- * One =fai_???_install=1= setting to choose the profile you want to
-   install (or what about restoring a backup?).
- * Optionally, additional settings related to the profile you have selected.
+ * One =fai_<profile>_install=1= setting to choose the profile you want to
+   install or =fai_restore_from_backup=1= to restore a previously
+   installed profile.
+ * Additional settings related to the profile installation
+   or restore operation you have selected. There are defaults for most
+   of these additional parameters, so in many cases you do not need to
+   specify anything else.
 
 Then when you run =ece-install= it will output:
-#+BEGIN_SRC
+#+BEGIN_SRC text
 [ece-install] Full Automatic Install (FAI) enabled.
 [ece-install] All user input will be read from /root/ece-install.conf
 #+END_SRC
 
+For more information see ??.
+
 ** Preventing accidental execution of ece-install 
 You can ensure that =ece-install= is not executed accidentally by
 creating a *lock file*. Simply create a file with this path:
@@ -319,79 +325,69 @@ The lock file does not need to contain anything, it just needs to exist.
 
 * <<<Server Profiles>>>
 
-When you run =ece-install= in interactive mode, it displays a prompt
-asking what you want to install. You can either install one of a
-number of predefined *profiles*, or you can restore a previously
-installed profile from a backup copy:
+A *profile* is a pre-defined set of software components that enables a
+computer to perform a particular function. The profiles that
+=ece-install= can currently install are described in the following sections.
+
+
+** Common Components
+=ece-install= always installs a Munin node on the host, irrespective
+of which profile you choose. It also installs the
+Escenic-specific Munin plugins if the profile you choose includes any
+Escenic server components.
+
+The following components are included in the Editorial Server,
+Presentation Server, Search Server and All In One profiles:
+
+ * Sun Java 6 :: This is required to run Tomcat and all the Escenic
+                 components.
+ * Apache Tomcat application server :: This is installed and
+      configured to provide:
+   - Compression of textual content (previously, this was typically
+     done using Apache's =mod_deflate= module)
+   - Pooling, tweaked for high read/write performance
+   - Proper logging, with Solr messages directed to a separate log
+   - Routing information in the cookies
+   - Application server access log
+ * Basic Escenic configuration :: Basic Escenic configuration layers
+      are installed, including RMI, database, search and application server/URIs. 
+ * APR :: native library for optimal Tomcat I/O performance
+ * Escenic assembly environment :: This is installed on every host in
+      order to make the installation process as smooth as
+      possible. You can remove it after installation if you wish.
+ * Database driver :: ??
+
+** <<<All In One>>>
+This profile is primarily intended for use by developers and system
+administrators as a test environment. It is *not* considered suitable
+for production purposes. A complete stack including caching
+server, application server, Escenic Content Engine, assembly host,
+database and Widget Framework is installed. In addition, a publication
+is created.
+
+To install this profile in interactive mode, select the
 #+BEGIN_SRC text
-Hi, which server profile do you wish to install?
-
    1 - All in one, full stack on one host, suitable for dev & test environments
-   2 - Editorial (publication) server
-   3 - Presentation server (ECE + memcached).
-   4 - Database server
-   5 - Cache server (cache and web server)
-   6 - RMI hub
-   7 - Search server (Solr + indexer-webapp)
-   8 - Install Widget Framework.
-   9 - Create a new publication based on WF if available, ECE/clean-demo if not
-   10 - A monitoring server (web server + Munin gatherer)
-   11 - Restore from backup (DB, data files, binaries, conf & publications)
+#+END_SRC
+option.
 
-Select 1-11 and press ENTER
-Your choice [1]> 
+To install it in FAI mode, add =fai_all_install=1= to your
+=ece-install.conf= file.
+
+** Editorial Server
+This profile contains all the components that need to be installed on an
+Escenic *editorial server*. An editorial server (sometimes also called
+a publication server) hosts a Content Engine used for editorial
+purposes (primarily Content Studio sessions).
+
+To install this profile in interactive mode, select the
+#+BEGIN_SRC text
+   2 - Editorial (publication) server
 #+END_SRC
+option.
 
-A *profile* is a pre-defined set of software components that enables a
-computer to perform a particular function.
-
-** Common for All Server Profiles
-The script will install a Munin node on the host. It will also
-install the Escenic specific Munin plugins on hosts where there are
-any Escenic server components.
-
-** Common for Editorial, Presentation and Search Instances
-*** Sun Java 6
-*** Apache Tomcat application server
-- Compression of textual content (previously, this was typically set
-  up with Apache and its mod_deflate module).
-- pooling set up tweaked for high read/write performance.
-- proper logging configuration directing solr messages to its own log.
-- routing information in the cookies
-- application server access log
-*** Basic Escenic Nursery configuration
-The basic Nursery configuration is taken care of for you, including RMI,
-  database, search and application server/URIs. 
-*** APR, native library for optimal Tomcat I/O performance
-*** Escenic Assembly environment
-The reason why ece-install sets this up on each host, is to make the
-installation process as smooth as possible. The assembly environment
-may be removed after the installation if you want to.
-
-*** Database driver
-
-*** Compression of content 
-This was was previously accomplished by having a web server in fron t
-of the application server (or cache server if you used ESI). A typical
-system architecture would contain Apache with mod_deflate. However,
-this is no longer necessary as Varnish can handles ESI parsing of
-compressed content (and many other things that we before needed Apache
-for). Thus, we'll let the application server do the compression for us
-now.
-
-** Profile :: Full Stack on One Host
-This profile is suitable for developers and admins wanting to set up a
-test environment. It will install the full stack including caching
-server, application server, ECE, assembly host, database, Widget
-Framework, as well as creating a publication for you.
-
-For further details on each of the different server components, see
-the different profile descriptions bellow.
-
-
-** Profile :: Editorial Server (Publication Server)
-Will set up a typical editorial server (often referred to as the
-publication server in Escenic literature).
+To install it in FAI mode, add =fai_editor_install=1= to your
+=ece-install.conf= file.
 
 ** Presentation Server
 This will set up a typical presentation server:

From d81968920323cb551d175feaa1ad123092e30865 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@geronimo>
Date: Fri, 24 Aug 2012 10:54:43 +0200
Subject: [PATCH 1249/2585] - added fix in
 widget-framework::install_wf_2_if_present, when running   the all in one
 profile and using EAR and conf archive.

---
 .../escenic/ece-scripts/ece-install.d/widget-framework.sh   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh b/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
index ebc1d98a..6892e1e0 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
@@ -92,7 +92,11 @@ function install_wf_2_if_present() {
     if [[ $wf_dist_dir == "widget-framework-[a-z]*-1.1*" ]]; then
       return
     fi
-    
+
+    if [ ! -d $escenic_root_dir/assemblytool/plugins ]; then
+      return
+    fi
+        
     run cd $escenic_root_dir/assemblytool/plugins
     
     if [ ! -h $wf_dist_dir ]; then

From 4ef073a081285fd19c9e37c17310b8074416268e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@geronimo>
Date: Fri, 24 Aug 2012 11:23:05 +0200
Subject: [PATCH 1250/2585] - added pipestatus checking to the database backup
 routine so that it   reports when one of the commands failed. The job doesn't
 update the   latest DB backup link if the current backup fails.

- added backup cron job log file
---
 .../ece-scripts/ece-install.d/database.sh     | 30 +++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 788d8457..4b7ff375 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -583,17 +583,37 @@ function install_db_backup_server() {
 ## Set up by $(basename $0) @ $(date)
 
 fn=\$(date --iso)-\${HOSTNAME}-${db_schema}.sql.gz
+log=/var/log/\$(basename \$0).log
 
-mysqldump -u $db_user \\
-  -p$db_password \\
+# (1) make backup
+
+# we must run as the root user here, hence not using user and regular
+# password:
+#  -u $db_user \\
+#  -p$db_password \\
+
+mysqldump \\
+  --master-data \\
+  --single-transaction \\
   -h $db_host \\
   $db_schema | \\
   gzip -9 - \\
   > ${escenic_backups_dir}/${fn}
 
-# make a symlink to the latest backup to make it easy for monitoring &
-# operators to know what's the latest backup without using any brain
-# power.
+# (2) make sure the backup went OK 
+# copy of pipe status since it's volatile
+pipe_status=(\${PIPESTATUS[@]})
+
+for (( i = 0; i < \${#pipe_status[@]}; i++ )); do
+  if [ \${pipe_status[\$i]} -ne 0 ]; then
+    echo "Command #\$(( \${i} + 1 )) in \$0 had exit code \${pipe_status[\$i]} :-(" >> \$log
+    exit 1
+  fi
+done
+
+# (3) make a symlink to the latest backup to make it easy for
+# monitoring & operators to know what's the latest backup without
+# using any brain power.
 (
   cd \${escenic_backups_dir}
   ln -sf \${fn} latest-\${db_schema}-backup.sql.gz

From 3a4648d06eb1ff0d1e98337a52a3d97b69d7bb20 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@geronimo>
Date: Fri, 24 Aug 2012 11:31:44 +0200
Subject: [PATCH 1251/2585] - installation on Debian stable (squeeze) would
 fail when setting up   self reporting (all profiles) or monitoring server
 because Debian   stable doesn't have check-mk (newly added to ece-install).

  Fixed this by adding the backports repository when the distribution
  codename is squeeze.
---
 .../escenic/ece-scripts/ece-install.d/monitoring.sh   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index 4fb10257..a01543fa 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -10,6 +10,11 @@ function install_nagios_monitoring_server()
   print "Installing an $1 server on $HOSTNAME ..."
   local monitoring_vendor=$1
 
+  if [[ $(lsb_release -c -s) == "squeeze" ]]; then
+    # needed for check-mk
+    add_apt_source "deb http://backports.debian.org/debian-backports squeeze-backports main"
+  fi
+  
   if [ $on_debian_or_derivative -eq 1 ]; then
     if [[ $monitoring_vendor == $MONITORING_VENDOR_NAGIOS ]]; then
       install_packages_if_missing \
@@ -167,6 +172,12 @@ EOF
 function install_nagios_node()
 {
   print "Installing a Nagios client on $HOSTNAME ..."
+  
+  if [[ $(lsb_release -c -s) == "squeeze" ]]; then
+    # needed for check-mk
+    add_apt_source "deb http://backports.debian.org/debian-backports squeeze-backports main"
+  fi
+  
   if [ $on_debian_or_derivative -eq 1 ]; then
     install_packages_if_missing \
       xinetd \

From fab963543e58b09433095310073939c455ec517c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@geronimo>
Date: Fri, 24 Aug 2012 12:08:06 +0200
Subject: [PATCH 1252/2585] - the if test engine-* could expand sometimes,
 added [[ ]] to avoid   this.

---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 103342ff..d1ea4c47 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -148,7 +148,7 @@ function set_up_engine_and_plugins() {
   run cd $escenic_root_dir/
   for el in $technet_download_list $wf_download_list; do
     local file=$(basename $el)
-    if [ $el == engine-* ]; then
+    if [[ "$el" == engine-* ]]; then
       continue
     fi
     run unzip -q -u -o $download_dir/$file

From 7d0aa3dcf9759fc4c66fe2964b0c0d4c0e6802e4 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@geronimo>
Date: Fri, 24 Aug 2012 13:04:51 +0200
Subject: [PATCH 1253/2585] - some profiles, like DB slave might need the NFS
 client, hence we   install it pretty far up, so that it's possible to
 dependent   profiles from the same ece-install.conf, e.g.:

  # installing a DB slave from master backup
  fai_nfs_client_install=1
  fai_db_install=1
  fai_db_master=0
  fai_db_master_backup=/mnt/backups/ece5db-backup.sql.gz
---
 usr/sbin/ece-install | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 6729ef2c..841635a4 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -978,7 +978,15 @@ if [ $fai_enabled -eq 1 ]; then
       un_install_everything
       no_fai_profile=0
     fi
-    
+
+    # some profiles, like DB slave might need the NFS client, hence we
+    # install it pretty far up.
+    if [ $(get_boolean_conf_value fai_nfs_client_install) -eq 1 ]; then
+      install_profile_number=$PROFILE_NFS_CLIENT
+      install_nfs_client
+      no_fai_profile=0
+    fi
+
     if [ $(get_boolean_conf_value fai_all_install) -eq 1 ]; then
         install_profile_number=$PROFILE_ALL_IN_ONE
         install_all_in_one_environment
@@ -1059,12 +1067,6 @@ if [ $fai_enabled -eq 1 ]; then
       no_fai_profile=0
     fi
     
-    if [ $(get_boolean_conf_value fai_nfs_client_install) -eq 1 ]; then
-      install_profile_number=$PROFILE_NFS_CLIENT
-      install_nfs_client
-      no_fai_profile=0
-    fi
-
     # checking for VIP profile last so that ece-install can (if so
     # configured in the ece-install.con) install all dependent
     # services first.

From 6a9a4e220fa10b694ec9f50345278cf83ffc3809 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@geronimo>
Date: Fri, 24 Aug 2012 13:09:47 +0200
Subject: [PATCH 1254/2585] - added support for installing DB slaves from a
 master cron backup:

    fai_db_install=1
    fai_db_master=0
    fai_db_replication=1
    fai_db_master_host=my-db-master
    fai_db_master_backup=/tmp/mydb-backup.sql.gz

- fixed daily backup, some double expansion going astray because of
  cat/EOF
---
 .../ece-scripts/ece-install.d/database.sh     | 41 ++++++++++++++++---
 1 file changed, 35 insertions(+), 6 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 4b7ff375..7489d62b 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -250,10 +250,13 @@ function set_db_settings_from_fai_conf()
   db_master_log_position=${fai_db_master_log_position}
 
   if [ $db_master -eq 0 -a $db_replication -eq 1 ]; then
-    ensure_variable_is_set \
-      fai_db_master_host \
-      fai_db_master_log_file \
-      fai_db_master_log_position
+    ensure_variable_is_set fai_db_master_host
+
+    if [ -z $fai_db_master_backup ]; then
+      ensure_variable_is_set \
+        fai_db_master_log_file \
+        fai_db_master_log_position
+    fi
   fi
 }
 
@@ -379,6 +382,9 @@ function set_common_replication_settings() {
 
 function set_slave_to_replicate_master() {
   print_and_log "Setting slave to replicate master DB @ $db_master_host ..."
+
+  # basing the replication off a fresh master, no backup
+  if [ -z ${fai_db_master_backup} ]; then
   mysql ${db_schema} <<EOF
 stop slave;
 
@@ -392,7 +398,29 @@ change master to
 
 start slave;
 EOF
+  else
+    if [ ! -r ${fai_db_master_backup} ]; then
+      print_and_log "Cannot set up slave" \
+        $fai_db_master_backup \
+        "doesn't exist"
+      remove_pid_and_exit_in_error
+    fi
+    
+    print_and_log "Setting up slave based on master backup"
+    gunzip --force ${fai_db_master_backup} | mysql ${db_schema}
+    mysql ${db_schema} <<EOF
+stop slave;
+
+change master to
+  master_host='${db_master_host}',
+  master_user='${db_replication_user}',
+  master_password='${db_replication_password}'
+;
 
+start slave;
+EOF
+  fi
+  
   add_next_step "DB on $HOSTNAME replicates master DB @ ${db_master_host}"
 }
 
@@ -472,6 +500,7 @@ function create_schema() {
     # we first create the DB (or, if drop_db_first is 1, we've just
     # dropped it above) before running the SQL scripts.
   if [ $db_product = "mysql" ]; then
+    print_and_log "Creating DB $db_schema on $HOSTNAME ..."
     mysql -h $db_host << EOF
 create database $db_schema character set utf8 collate utf8_general_ci;
 grant all on $db_schema.* to $db_user@'%' identified by '$db_password';
@@ -598,7 +627,7 @@ mysqldump \\
   -h $db_host \\
   $db_schema | \\
   gzip -9 - \\
-  > ${escenic_backups_dir}/${fn}
+  > ${escenic_backups_dir}/\${fn}
 
 # (2) make sure the backup went OK 
 # copy of pipe status since it's volatile
@@ -615,7 +644,7 @@ done
 # monitoring & operators to know what's the latest backup without
 # using any brain power.
 (
-  cd \${escenic_backups_dir}
+  cd ${escenic_backups_dir}
   ln -sf \${fn} latest-\${db_schema}-backup.sql.gz
 )
 EOF

From 8ab6dcb794226bf05dd821f506f6f0d49cd6b9dc Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@geronimo>
Date: Fri, 24 Aug 2012 13:45:45 +0200
Subject: [PATCH 1255/2585] - replaced gunzip with zcat

---
 usr/share/escenic/ece-scripts/ece-install.d/database.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 7489d62b..20b78b84 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -407,7 +407,7 @@ EOF
     fi
     
     print_and_log "Setting up slave based on master backup"
-    gunzip --force ${fai_db_master_backup} | mysql ${db_schema}
+    zcat ${fai_db_master_backup} | mysql ${db_schema} -
     mysql ${db_schema} <<EOF
 stop slave;
 

From 07d261916b01c33a48800ff49838a41ffde051c1 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@geronimo>
Date: Fri, 24 Aug 2012 14:05:21 +0200
Subject: [PATCH 1256/2585] - fixed zcat statement

---
 usr/share/escenic/ece-scripts/ece-install.d/database.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 20b78b84..546eae54 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -407,7 +407,7 @@ EOF
     fi
     
     print_and_log "Setting up slave based on master backup"
-    zcat ${fai_db_master_backup} | mysql ${db_schema} -
+    zcat ${fai_db_master_backup} | mysql ${db_schema}
     mysql ${db_schema} <<EOF
 stop slave;
 

From 3e2baaa2df11bd6c127e77e93569a119135f8a99 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@geronimo>
Date: Fri, 24 Aug 2012 14:16:21 +0200
Subject: [PATCH 1257/2585] - the trail_nfs_export_list must be quoted

---
 .../escenic/ece-scripts/ece-install.d/network-file-system.sh    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh b/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
index af642563..9f04ff04 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/network-file-system.sh
@@ -16,7 +16,7 @@ function get_nfs_configuration() {
     ensure_variable_is_set fai_nfs_server_address
   fi
 
-  leave_trail "trail_nfs_export_list=$nfs_export_list"
+  leave_trail "trail_nfs_export_list=\"$nfs_export_list\""
   leave_trail "trail_nfs_client_mount_point_parent=$nfs_client_mount_point_parent"
 }
 

From 73c52001964887fc6302d6018c42058ff1090040 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 27 Aug 2012 10:04:08 +0200
Subject: [PATCH 1258/2585] - when restoring a slave from a master backup, the
 log file and its position   are from the backup file is now set on the slave
 before it sets its   master back to the master server.

---
 .../escenic/ece-scripts/ece-install.d/database.sh | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 546eae54..a0a96af8 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -408,17 +408,28 @@ EOF
     
     print_and_log "Setting up slave based on master backup"
     zcat ${fai_db_master_backup} | mysql ${db_schema}
+    
+    local file_and_pos=$(
+      zcat ${fai_db_master_backup} | \
+        head -n 30 | \
+        grep ^CHANGE | \
+        cut -d' ' -f4- | \
+        sed 's/\;$//g'
+    )
+
+    print_and_log "Setting master back to $db_master_host ..."
     mysql ${db_schema} <<EOF
 stop slave;
 
 change master to
   master_host='${db_master_host}',
   master_user='${db_replication_user}',
-  master_password='${db_replication_password}'
+  master_password='${db_replication_password}',
+  ${file_and_pos}
 ;
-
 start slave;
 EOF
+
   fi
   
   add_next_step "DB on $HOSTNAME replicates master DB @ ${db_master_host}"

From a1d9848844c92132e177bbc35958a968a06b9a2c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 27 Aug 2012 13:51:10 +0200
Subject: [PATCH 1259/2585] - added support for HTTP proxies in the Maven
 configuration.   If the environment property http_proxy or https_proxy is
 set,   ece-install will set up corresponding Maven configuration.

---
 .../ece-install.d/widget-framework.sh         | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh b/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
index 6892e1e0..96b717cc 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
@@ -40,6 +40,8 @@ function install_widget_framework()
   <activeProfiles>
     <activeProfile>escenic-profile</activeProfile>
   </activeProfiles>
+
+  $(get_proxy_conf_if_set)
 </settings>
 EOF
 
@@ -52,6 +54,33 @@ EOF
     " Maven repo"
 }
 
+function get_proxy_conf_if_set() {
+  if [ -n "$http_proxy" ]; then
+    cat <<EOF
+  <proxies>
+    <proxy>
+      <active>true</active>
+      <protocol>http</protocol>
+      <host>$(echo $http_proxy | cut -d':' -f1)</host>
+      <port>$(echo $http_proxy | cut -d':' -f2)</port>
+    </proxy>
+  </proxies>
+EOF
+  elif [ -n "$https_proxy" ]; then
+    cat <<EOF
+  <proxies>
+    <proxy>
+      <active>true</active>
+      <protocol>https</protocol>
+      <host>$(echo $https_proxy | cut -d':' -f1)</host>
+      <port>$(echo $https_proxy | cut -d':' -f2)</port>
+    </proxy>
+  </proxies>
+EOF
+  fi
+}
+
+
 function set_up_wf_nursery_config() {
   for el in $wf_download_list; do
     local wf_dist_dir=$(basename $el .zip)

From dc8a84af50c80445cc8cdef54ed635d379d387bb Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 27 Aug 2012 13:52:21 +0200
Subject: [PATCH 1260/2585] - added documentation to get_proxy_conf_if_set

---
 usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh b/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
index 96b717cc..34bf4fa1 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
@@ -54,6 +54,8 @@ EOF
     " Maven repo"
 }
 
+## Will add Maven HTTP(s) proxy configuration if either of the
+## http_proxy or https_proxy environment variables are set.
 function get_proxy_conf_if_set() {
   if [ -n "$http_proxy" ]; then
     cat <<EOF

From f90766f36b053064494cb635524e5b9b1084d6e4 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 27 Aug 2012 13:53:10 +0200
Subject: [PATCH 1261/2585] - fixed indentation

---
 usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh b/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
index 34bf4fa1..26b70329 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
@@ -41,7 +41,7 @@ function install_widget_framework()
     <activeProfile>escenic-profile</activeProfile>
   </activeProfiles>
 
-  $(get_proxy_conf_if_set)
+$(get_proxy_conf_if_set)
 </settings>
 EOF
 

From 7e0ee8836e4e82ebbc9514a59fcde67dee1bb64c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 27 Aug 2012 14:18:05 +0200
Subject: [PATCH 1262/2585] - added example .conf file for installing a
 development environment   (without a caching server) using an EAR file for
 deployment and ECE   5.4 artefacts for the DB table generation.

---
 .../ece-install-dev-environment-from-ear.conf | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 usr/share/doc/escenic/examples/ece-install-dev-environment-from-ear.conf

diff --git a/usr/share/doc/escenic/examples/ece-install-dev-environment-from-ear.conf b/usr/share/doc/escenic/examples/ece-install-dev-environment-from-ear.conf
new file mode 100644
index 00000000..4cfd8e0e
--- /dev/null
+++ b/usr/share/doc/escenic/examples/ece-install-dev-environment-from-ear.conf
@@ -0,0 +1,51 @@
+# credentials
+technet_user=
+technet_password=
+wf_user=
+wf_password=
+
+# Download list, as a minimum, you need assemblytool and engine.
+technet_download_list="
+  http://technet.escenic.com/downloads/assemblytool-2.0.2.zip
+  http://technet.escenic.com/downloads/community-engine/community-engine-3.7.0.123608.zip
+  http://technet.escenic.com/downloads/release/54/analysis-engine-2.4.0.127591.zip
+  http://technet.escenic.com/downloads/release/54/dashboard-1.3.0.123618.zip
+  http://technet.escenic.com/downloads/release/54/engine-5.4.1.126472.zip
+  http://technet.escenic.com/downloads/release/54/forum-3.1.0.123741.zip
+  http://technet.escenic.com/downloads/release/54/geocode-dist-2.4.0.123726.zip
+  http://technet.escenic.com/downloads/release/54/inpage-2.1.1.126618.zip
+  http://technet.escenic.com/downloads/release/54/lucy-dist-4.2.0.0.zip
+  http://technet.escenic.com/downloads/release/54/menu-editor-dist-2.1.0.123205.zip
+  http://technet.escenic.com/downloads/release/54/poll-2.2.0.123043.zip
+  http://technet.escenic.com/downloads/release/54/section-feed-dist-2.1.0.122795.zip
+  http://technet.escenic.com/downloads/release/54/xml-editor-dist-2.2.0.0.zip
+"
+
+# if you don't need WF, you can set wf_download_list to an empty
+# string.
+wf_download_list="
+  http://download.escenic.com/release/release/54/widget-framework-core-2.0.1.126521.zip
+  http://download.escenic.com/release/release/54/widget-framework-community-2.0.1.126521.zip
+"
+
+# FAI enabled
+fai_enabled=1
+
+# Install a seperate search instance making us look cool, just like a
+# production environment.
+fai_search_install=1
+fai_search_port=8081
+fai_search_shutdown=8105
+fai_search_name=search1
+
+# Install the database
+fai_db_install=1
+
+# Presentation server
+fai_presentation_install=1
+fai_presentation_ear=http://my.buildserver.com/mypub-trunk-rev3568-2012-05-28_1213.ear
+fai_presentation_name=engine1
+
+# Publication
+fai_publication_domain_mapping_list="mypub#example.com"
+fai_publication_deploy_white_list='mypub escenic-admin indexer-webservice webservice escenic studio'

From 61d25a06c27688ca1f82c4ca78391a6d944268ee Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 27 Aug 2012 14:18:24 +0200
Subject: [PATCH 1263/2585] - updated the backup related chapter.;

---
 usr/share/doc/vizrt/vosa-handbook/backups-db.org | 15 ++++-----------
 usr/share/doc/vizrt/vosa-handbook/backups.org    | 13 +++++++------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/backups-db.org b/usr/share/doc/vizrt/vosa-handbook/backups-db.org
index dd346400..684a0894 100644
--- a/usr/share/doc/vizrt/vosa-handbook/backups-db.org
+++ b/usr/share/doc/vizrt/vosa-handbook/backups-db.org
@@ -1,18 +1,11 @@
 ** DB backups
-If you've told ece-install to set up daily backups, there will be a
-cron scripts set up which create backups. 
-
-Part of the name of the cron script is the name of your DB schema, so
-the default location of the cron script on <%= trail_db_daily_backup_host %> is:
+Daily backups of the DB is made on <%= trail_db_daily_backup_host %>
+by the way of the cron script:
 #+BEGIN_SRC text
 /etc/cron.daily/<%= trail_db_schema %>-backup  
 #+END_SRC
 
-And it'll put its backups in
+All of these DB backups on <%= trail_db_daily_backup_host %> are put in
 #+BEGIN_SRC text
-<%= trail_db_backup_dir %>
+<%= trail_db_daily_backup_host %>:<%= trail_db_backup_dir %>
 #+END_SRC
-
-All these are overridable, see the ece-install guide for further
-details.
-
diff --git a/usr/share/doc/vizrt/vosa-handbook/backups.org b/usr/share/doc/vizrt/vosa-handbook/backups.org
index 2f84e351..9e39b1ff 100644
--- a/usr/share/doc/vizrt/vosa-handbook/backups.org
+++ b/usr/share/doc/vizrt/vosa-handbook/backups.org
@@ -1,10 +1,11 @@
 * Backups
 
 ** Multimedia archive
-The other place were you've got actual content, is in the multimedia
-archive. This, typically live on a host called nfs1 (with a mirror on
-nfs2) and a backup of the exports directory  should suffice. This is
-the directory in which all the NFS exported directories reside.
+The mutlimedia archive lives on <%= trail_nfs_master_host %> (with a
+mirror on <%= trail_nfs_slave_host %> ) from which it exports its
+shares to the various hosts on the network through an NFS interface. A
+backup of the =/var/exports= directory on this server should suffice
+as all NFS shares reside in this directory:
 
 #+BEGIN_SRC sh
 <%= trail_nfs_master_host %>:/var/exports  
@@ -12,5 +13,5 @@ the directory in which all the NFS exported directories reside.
 
 It's recommended that the backup isn't done using the NFS mount on one
 of the other hosts using this NFS server, but instead target the
-nfs1's /var/exports directory directly as the backup tools would
-access any server directory.
+<%= trail_nfs_master_host %> =/var/exports= directory directly as the
+backup tools would access any server directory.

From 0642ef2788b623528e5b9c126f20ff671ddcc920 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 27 Aug 2012 14:24:42 +0200
Subject: [PATCH 1264/2585] - simplified text. NIE-687

---
 usr/share/doc/vizrt/vosa-handbook/backups-db.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/backups-db.org b/usr/share/doc/vizrt/vosa-handbook/backups-db.org
index 684a0894..81f58ca6 100644
--- a/usr/share/doc/vizrt/vosa-handbook/backups-db.org
+++ b/usr/share/doc/vizrt/vosa-handbook/backups-db.org
@@ -5,7 +5,7 @@ by the way of the cron script:
 /etc/cron.daily/<%= trail_db_schema %>-backup  
 #+END_SRC
 
-All of these DB backups on <%= trail_db_daily_backup_host %> are put in
+All the DB backups are put in:
 #+BEGIN_SRC text
 <%= trail_db_daily_backup_host %>:<%= trail_db_backup_dir %>
 #+END_SRC

From e38a365f273a9cb1372cf1c3cfd522817a56727d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 27 Aug 2012 16:25:38 +0200
Subject: [PATCH 1265/2585] - now supporting both HTTP and HTTPs proxies, at
 the same time. - fixed parsing of port and host

---
 .../ece-install.d/widget-framework.sh         | 36 ++++++++++++++-----
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh b/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
index 26b70329..53a10d84 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
@@ -40,7 +40,6 @@ function install_widget_framework()
   <activeProfiles>
     <activeProfile>escenic-profile</activeProfile>
   </activeProfiles>
-
 $(get_proxy_conf_if_set)
 </settings>
 EOF
@@ -57,27 +56,46 @@ EOF
 ## Will add Maven HTTP(s) proxy configuration if either of the
 ## http_proxy or https_proxy environment variables are set.
 function get_proxy_conf_if_set() {
-  if [ -n "$http_proxy" ]; then
+
+  ## We support setting either http or https proxy, or both, hence the
+  ## extra complexity.
+  if [[ -n "$http_proxy" || -n "$https_proxy" ]]; then
     cat <<EOF
+
   <proxies>
+EOF
+  fi
+  
+  if [ -n "$http_proxy" ]; then
+    local proxy_host=$(echo $http_proxy | sed 's#http://##g' | cut -d':' -f1)
+    local proxy_port=$(echo $http_proxy | sed 's#http://##g' | cut -d':' -f2)
+    cat <<EOF
     <proxy>
       <active>true</active>
       <protocol>http</protocol>
-      <host>$(echo $http_proxy | cut -d':' -f1)</host>
-      <port>$(echo $http_proxy | cut -d':' -f2)</port>
+      <host>$proxy_host</host>
+      <port>$proxy_port</port>
     </proxy>
-  </proxies>
 EOF
-  elif [ -n "$https_proxy" ]; then
+  fi
+  
+  if [ -n "$https_proxy" ]; then
+    local proxy_host=$(echo $https_proxy | sed 's#https://##g' | cut -d':' -f1)
+    local proxy_port=$(echo $https_proxy | sed 's#https://##g' | cut -d':' -f2)
     cat <<EOF
-  <proxies>
     <proxy>
       <active>true</active>
       <protocol>https</protocol>
-      <host>$(echo $https_proxy | cut -d':' -f1)</host>
-      <port>$(echo $https_proxy | cut -d':' -f2)</port>
+      <host>$proxy_host</host>
+      <port>$proxy_port</port>
     </proxy>
+EOF
+  fi
+  
+  if [[ -n "$http_proxy" || -n "$https_proxy" ]]; then
+    cat <<EOF
   </proxies>
+
 EOF
   fi
 }

From bfb53a608a207067e48a7b725c2fc7d8e3c08cbe Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 28 Aug 2012 11:08:15 +0200
Subject: [PATCH 1266/2585] - fixed the hugin link

---
 usr/share/doc/vizrt/vosa-handbook/create-handbook.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 7af361a1..6665a7f5 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -328,7 +328,7 @@ EOF
   if [ -n "${trail_control_host}" ]; then
     cat <<EOF 
 | $(get_fqdn $trail_control_host) | \
-  [[http://$(get_link $trail_control_host):5679][hugin]] \
+  [[$(get_link $trail_control_host):5679][hugin]] \
 |
 EOF
   fi

From d0e7cbb465995fedc066044926db866240c89cfa Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 28 Aug 2012 13:26:12 +0200
Subject: [PATCH 1267/2585] - yaml doesn't need 'message' tag in p[aragraph]
 text output

---
 usr/bin/system-info | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/bin/system-info b/usr/bin/system-info
index d33f9a51..0b816867 100755
--- a/usr/bin/system-info
+++ b/usr/bin/system-info
@@ -312,7 +312,7 @@ EOF
   elif [ $format == "json" ]; then
     echo "    \"message\": \"$@\","
   elif [ $format == "yaml" ]; then
-    echo "$(get_indent)message: $@"
+    echo "$(get_indent): $@"
   fi
 }
 

From 3157f387d20778b487cc6c69948c7dabe9daf70d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 28 Aug 2012 13:27:46 +0200
Subject: [PATCH 1268/2585] - no colon either

---
 usr/bin/system-info | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/bin/system-info b/usr/bin/system-info
index 0b816867..e2c4003c 100755
--- a/usr/bin/system-info
+++ b/usr/bin/system-info
@@ -312,7 +312,7 @@ EOF
   elif [ $format == "json" ]; then
     echo "    \"message\": \"$@\","
   elif [ $format == "yaml" ]; then
-    echo "$(get_indent): $@"
+    echo "$(get_indent)$@"
   fi
 }
 

From ac8f52b57df90936193e6f291f38ccaff234458e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 29 Aug 2012 09:55:07 +0200
Subject: [PATCH 1269/2585] - added -t to include the import overview - added
 line wrapping to print_p_text for format=yaml

---
 usr/bin/system-info | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/usr/bin/system-info b/usr/bin/system-info
index e2c4003c..cfaa004b 100755
--- a/usr/bin/system-info
+++ b/usr/bin/system-info
@@ -300,7 +300,7 @@ function print_section_end {
 
 function print_p_text() {
   if [ $format == "org" ]; then
-    echo "$@"
+    echo -e "$@"
   elif [ $format == "html" ]; then
     cat <<EOF
 <p>
@@ -308,16 +308,35 @@ function print_p_text() {
 </p>
 EOF
   elif [ $format == "confluence" ]; then
-    echo "$@"
+    echo -e "$@"
   elif [ $format == "json" ]; then
-    echo "    \"message\": \"$@\","
+    echo "    \"message\": \"$text\","
   elif [ $format == "yaml" ]; then
-    echo "$(get_indent)$@"
+    local LINE_WRAP=72
+    local line=""
+    text=""
+    
+    for el in "$@"; do
+      line="${line}${el} "
+      
+      # wrap the line when it becomes too long
+      if [ ${#line} -gt $LINE_WRAP ]; then
+        line="$(get_indent)${line}\n"
+        text="${text}${line}"
+        line=""
+      fi
+    done
+
+    # adding the last line line here. For one liners, text will be
+    # empty here, so the indent is straght on. For multi line input,
+    # the text variable already contains a new line at this point.
+    text="${text}$(get_indent)${line}"
+    echo -e "$text"
   fi
 }
 
 function get_user_options() {
-  while getopts ":d:o:i:f:u:mvs" opt; do
+  while getopts ":d:o:i:f:u:mvst" opt; do
     case $opt in
       i)
         instance=${OPTARG}
@@ -344,6 +363,9 @@ function get_user_options() {
       m)
         generate_output_file_per_module=1
         ;;
+      t)
+        generate_import_job_overview=1
+        ;;
       \?)
         echo "Invalid option: -$OPTARG" >&2
         exit 1

From 9d1279ec1f32754c650f4693790570ccad037ec7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 29 Aug 2012 10:06:23 +0200
Subject: [PATCH 1270/2585] - added documentation for fai_db_sql_only.

---
 usr/share/doc/escenic/ece-install-guide.org | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index f2eac3ca..2fa5e24d 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -885,6 +885,7 @@ $HOME/ece-install.conf file of the root user:
 | ~fai_db_password~                     | read-the-source-luke                                         | Useful for DB installation profile                                                                       |
 | ~fai_db_port~                         | 3306                                                         | Useful for editor & presentation profiles                                                                |
 | ~fai_db_schema~                       | ece5db                                                       | Useful for DB installation profile                                                                       |
+| ~fai_db_sql_only~                     | 0                                                            | Only run the SQL, but don't install the DB software. Useful for setting up remote DBs, like Amazon RDS   |
 | ~fai_db_user~                         | ece5user                                                     | Useful for DB installation profile                                                                       |
 | ~fai_editor_conf_archive~             | ""                                                           | conf.tar.gz to use for Nursery & JAAS configuration                                                      |
 | ~fai_editor_deploy_white_list~        | "escenic-admin escenic studio indexer-webservice webservice" | The list of WARs to be deployed on this instance.                                                        |

From 2ada23d762fcf5924310298be91ddad0fb41265d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 29 Aug 2012 10:21:06 +0200
Subject: [PATCH 1271/2585] - improved the readability of the log analysis, now
 printing more as   normal text so that it can be wrapped nicely, and only
 monotyping   commands and listings that really need it.

---
 .../system-info.d/11-list-ece-overview.sh     | 79 ++++++++++++++++++-
 1 file changed, 76 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh b/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
index f6ff2b43..36b3f71f 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
@@ -1,9 +1,6 @@
 #! /usr/bin/env bash
 
 # by tkj@vizrt.com
-
-
-
 function get_instance_type() {
   local type="engine"
 
@@ -60,6 +57,7 @@ function create_ece_overview() {
 
   if [ ${temporaries-1} -eq 1 ]; then
     list_error_overview_for_instance $1
+    list_import_overview_for_instance $1
   fi
 }
 
@@ -97,5 +95,80 @@ function get_overview_of_all_instances() {
   print_section_end
 }
 
+function check_picture_file() {
+  local dir=$(dirname "$1")
+  local file_name=$(basename "$1")
+
+  if [ ! -d $dir ]; then
+    print_p_text "Directory doesn't exist: $dir" \
+      "It's referenced via the image: $1"
+    return 
+  fi
+  
+  local alternative=$(find $dir -maxdepth 1 | grep -i "$file_name")
+
+  # first check if the image is size=0
+  if [ $(find $dir -name $file_name -maxdepth 1 -type f -size 0 | wc -l) -gt 0 ]; then
+    print_pre_text "The file $1 is empty (size = 0 bytes)"
+    return
+  fi
+
+  if [[ -n "$alternative" && $(echo $alternative | wc -l) -gt 0 ]]; then
+    if [[ "$1" == "$alternative" ]]; then
+      print_p_text "The XML refered to ${1}" \
+        "which exists. This means either that the file wasn't there before when" \
+        "the import failed or that the file itself is unusable."
+      return
+    fi
+
+    print_p_text "The file $1" \
+      "was missing from your import data set It was referred to from one of" \
+      "your XML files, perhaps you meant this one?" \
+      $alternative \
+      "Suggested command to fix this:"
+    print_pre_text "mv \"$alternative\" \"$1\""
+  fi
+}
+
+## $1 is thefile
+function list_sax_errors() {
+  local file=/var/log/escenic/${HOSTNAME}-${1}-messages
+  local result="$(grep ^'Caused by: org.xml.sax.SAXParseException:' $file | sort | uniq)"
+  
+  if [ -z $result ]; then
+    return
+  fi
+  
+  print_p_text "There are illegal elements, attributes" \
+    "and/or contents in the XML:"
+  print_pre_text "$result"
+}  
+
+function list_import_overview_for_instance() {
+  if [ ${generate_import_job_overview-0} -eq 0 ]; then
+    return
+  fi
+  
+  local file=/var/log/escenic/${HOSTNAME}-${1}-messages
+  
+  if [ ! -e $file ]; then
+    return
+  fi
+  
+  print_h4_header "Overview of ${1}'s import jobs"
+  
+  grep "Invalid image file" $file | \
+    grep ^java.io.IOException | \
+    cut -d' ' -f5 | \
+    sed 's/\.$//g' | \
+    sort | \
+    uniq | \
+    while read picture_path; do
+    check_picture_file "$picture_path"
+  done
+  
+  list_sax_errors "$1"
+}
+
 get_overview_of_all_instances
 

From cc8a2ea4a306309e82a49c3a5dff79e38a3cb2c5 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 29 Aug 2012 15:06:01 +0200
Subject: [PATCH 1272/2585] - added exit code to exit_on_error. This means that
 whenever something   fails when run inside the run() wrapper, it will also
 log the error   code returned from the failing command.

---
 usr/share/escenic/ece-scripts/common-bashing.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index 30f50696..e4cbc8b2 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -92,7 +92,7 @@ function remove_pid_and_exit_in_error() {
 
 function exit_on_error() {
   if [ $? -gt 0 ]; then
-    print_and_log "The command ["$@"] $(red FAILED), exiting :-("
+    print_and_log "The command [${@}] $(red FAILED) (exit code=$?), exiting :-("
     print "See $log for further details."
     remove_pid_and_exit_in_error
   fi

From 67f0a1f931f89f31f642eb60f24555d61111d2dd Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 30 Aug 2012 10:14:26 +0200
Subject: [PATCH 1273/2585] Added support for specifying elastic IPs to amazon
 instances

---
 usr/bin/vosa                                  | 31 ++++++++++++++++++-
 .../vizrt/vosa/commands/amazon_config_parser  |  6 ++++
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 2e59d7b1..a984d42f 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -313,6 +313,14 @@ image ami-81c5fdf5
 # subnet subnet-43890
 
 
+# Elastic IP.  If you want to assign an elastic IP to an instance, type
+# the IP address here, and it will be assigned to the instance after
+# it has been started.  If it's not specified, no elastic IP will be
+# assigned.
+
+# ip_address 12.23.34.45
+
+
 # USER DATA ---------------------------------------------------
 # Specify a user data file that will be specified on installation.
 # The file should be in the form of a user-data file supported by
@@ -886,7 +894,16 @@ function do_create() {
         ${amazon_config_user_data/#/--user-data-file } \
         ${amazon_config_subnet/#/--subnet }
 
-
+      if [ ! -z "${amazon_config_ip_address}" ] ; then
+        echo "Associating IP $amazon_config_ip_address..."
+        ${commands}/ec2-cmd.sh \
+          "$instance_dir" \
+          "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" \
+          associate-address \
+          ${amazon_config_ip_address} \
+          --instance INSTANCE
+      fi
+      
       ${commands}/ec2-determine-ip.sh \
         "$instance_dir" \
         "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" \
@@ -961,10 +978,22 @@ function do_start() {
       exit 1
     fi
     if [ $aws -eq 1 ] ; then
+      read_amazon_config $instance_dir/amazon.conf
       ${commands}/ec2-cmd.sh \
         "$instance_dir" \
         "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" \
         "start-instances" INSTANCE
+
+      if [ ! -z "${amazon_config_ip_address}" ] ; then
+        echo "Associating IP $amazon_config_ip_address..."
+        ${commands}/ec2-cmd.sh \
+          "$instance_dir" \
+          "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" \
+          associate-address \
+          ${amazon_config_ip_address} \
+          --instance INSTANCE
+      fi
+
       # The word INSTANCE is replaced with the instance.
       ${commands}/ec2-determine-ip.sh \
         "$instance_dir" \
diff --git a/usr/share/vizrt/vosa/commands/amazon_config_parser b/usr/share/vizrt/vosa/commands/amazon_config_parser
index 5f9e8960..af74f84a 100644
--- a/usr/share/vizrt/vosa/commands/amazon_config_parser
+++ b/usr/share/vizrt/vosa/commands/amazon_config_parser
@@ -9,6 +9,7 @@ unset amazon_config_region
 unset amazon_config_availability_zone
 unset amazon_config_ssh_keypair
 unset amazon_config_ssh_access
+unset amazon_config_ip_address
 unset amazon_config_ssh_private_key
 unset amazon_config_image
 unset amazon_config_type
@@ -43,6 +44,10 @@ function amazon_config_ssh_access() {
   amazon_config_ssh_access=$1
 }
 
+function amazon_config_ip_address() {
+  amazon_config_ip_address=$1
+}
+
 function amazon_config_ssh_private_key() {
   amazon_config_ssh_private_key=$1
 }
@@ -71,3 +76,4 @@ function amazon_config_postinstall() {
 function amazon_config_group() {
   amazon_config_group=( "${amazon_config_group[@]}" "$1" )
 }
+

From 75a4f5fe7fafa6ab98c1a7090cb43cf0de4649b4 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 30 Aug 2012 11:17:52 +0200
Subject: [PATCH 1274/2585] - 'ece info' now prints virtual hosts served by
 this app server   instance.

- 'ece info' removed  instance architecture diagram generation and
  output, this is better served by the create-handbook.sh

- changed print_tomcat_resources to use an argument instead of a
  global variable for getting tomcat_base.
---
 usr/share/escenic/ece-scripts/ece.d/info.sh | 79 ++++++++-------------
 1 file changed, 30 insertions(+), 49 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/info.sh b/usr/share/escenic/ece-scripts/ece.d/info.sh
index a21a3dd1..e12837e3 100644
--- a/usr/share/escenic/ece-scripts/ece.d/info.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/info.sh
@@ -38,7 +38,7 @@ function get_info_for_type() {
         if [ -n "${tomcat_home}" ]; then
           print "|-> Tomcat home:" $tomcat_home
           print "|-> Tomcat base:" $tomcat_base
-          print_tomcat_resources
+          print_tomcat_resources $tomcat_base
           print_deployed_webapps $tomcat_base
         fi
         ;;
@@ -52,7 +52,6 @@ function get_info_for_type() {
   fi
 
   print_deployment_state
-  create_block_diag_for_instance
 }
 
 function print_deployment_state() {
@@ -90,10 +89,9 @@ function print_tomcat_resources() {
     return
   fi
 
-  print "Application server resources:"
-
-  local file=$tomcat_base/conf/context.xml
+  local file=$1/conf/context.xml
   if [ -r $file ]; then
+    print "Application server resources:"
     xml_grep  --nowrap --cond Context/Environment \
       $file | \
       sed 's/^[ \t]//g' | \
@@ -105,13 +103,9 @@ function print_tomcat_resources() {
       local value=$(echo $line | cut -d'"' -f2)
       print "|->" ${key}: ${value}
     done
-  else
-    print "|-> user $USER cannot read $file"
-  fi
-  
-  print "Database:"
-  file=$tomcat_base/conf/server.xml
-  if [ -r $file ]; then
+
+    print "Database:"
+    file=$tomcat_base/conf/server.xml
     xml_grep \
       --nowrap \
       --cond 'Server/GlobalNamingResources/Resource[@type="javax.sql.DataSource"]' \
@@ -119,19 +113,33 @@ function print_tomcat_resources() {
       sed 's/^[ \t]//g' | \
       sed "s#><#>\n<#g" | \
       while read line ; do
-      for el in $(echo $line | cut -d' ' -f1- ); do
-        if [[ $el == "name"* || $el == "url"* || $el == "username"* ]]; then
-          local key=$(echo $el | cut -d'"' -f1 | cut -d'=' -f1)
-          local value=$(echo $el | cut -d'"' -f2)
-          if [[ $value == "jdbc:mysql"* ]]; then
-            value=${value:5}
+        for el in $(echo $line | cut -d' ' -f1- ); do
+          if [[ $el == "name"* || $el == "url"* || $el == "username"* ]]; then
+            local key=$(echo $el | cut -d'"' -f1 | cut -d'=' -f1)
+            local value=$(echo $el | cut -d'"' -f2)
+            if [[ $value == "jdbc:mysql"* ]]; then
+              value=${value:5}
+            fi
+
+            print "|->" ${key}: ${value}
           fi
-          
-          print "|->" ${key}: ${value}
-        fi
-
+        done
       done
+
+    print "Virtual hosts:"
+    file=$tomcat_base/conf/server.xml
+    local virtual_hosts="$(
+      xml_grep \
+      --nowrap \
+      --cond 'Server/Service/Engine/Host/Alias' \
+      $file
+    )"
+    echo "$virtual_hosts" | \
+      sed 's#><#>\n<#g' | \
+      sed 's#<Alias>\(.*\)</Alias>#\1#g' | while read line; do
+      print "|-> http://${line}"
     done
+    
   else
     print "|-> user $USER cannot read $file"
   fi
@@ -152,30 +160,3 @@ function visualise_known_ports() {
   echo ${the_host}:${nice_port}
 }
 
-function create_block_diag_for_instance() {
-  if [ -z $type_pid ]; then
-    return
-  fi
-  
-  local file=${cache_dir}/${instance}.blockdiag
-  cat > ${file} <<EOF
-blockdiag {
-  ${instance} [ color = "red" ];
-EOF
-  netstat -nap --tcp 2>/dev/null | \
-    grep ${type_pid} | \
-    grep -v LISTEN | \
-    awk '{print $5}' | \
-    uniq -c | while read f; do
-    read count to <<< $f
-    cat >> $file <<EOF
-  "$(visualise_known_ports $to)";
-  ${instance} -> "$(visualise_known_ports $to)" [ label = "${count} conns" ];
-EOF
-  done
-
-  echo "}" >> $file
-  
-  print "Architecture diagram:"
-  print "|-> $file"
-}

From 242615d942376f06ed2f1aa48a610ce9382c4878 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 30 Aug 2012 11:53:55 +0200
Subject: [PATCH 1275/2585] Added support for community engine, widget
 framework community, section feed, mobile expansion and mobile widget
 framework in the ece-build command.

---
 usr/share/escenic/build-scripts/build.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/build.sh b/usr/share/escenic/build-scripts/build.sh
index 617a4608..c5d20d91 100755
--- a/usr/share/escenic/build-scripts/build.sh
+++ b/usr/share/escenic/build-scripts/build.sh
@@ -21,16 +21,22 @@ maven_conf_file=~/.m2/settings.xml
 project_assembly_dir=$svn_src_dir/project-assembly
 project_assembly_target_dir=$project_assembly_dir/target
 escenic_indentifiers="engine
+community-engine
 forum
 geocode
 analysis-engine
 xml-editor
 menu-editor
+section-feed
 dashboard
 poll
 lucy
 widget-framework-core
-widget-framework-common"
+widget-framework-common
+widget-framework-mobile
+widget-framework-community
+mobile-expansion
+"
 release_dir=~/releases
 plugin_dir=~/plugins
 engine_root_dir=~/engine

From 219c6b24fe1679f824946a0c45ff4190fa7f5afa Mon Sep 17 00:00:00 2001
From: Kevin Flynn <kevin@kevin-Precision-M4500.(none)>
Date: Fri, 31 Aug 2012 09:18:07 +0200
Subject: [PATCH 1276/2585] restructuring profiles section

---
 usr/share/doc/escenic/ece-install-guide.org | 770 ++++++++++----------
 1 file changed, 376 insertions(+), 394 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index f2eac3ca..80b8018a 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -126,13 +126,6 @@ is as follows:
     1. Run the =ece-install= script, specifying the appropriate
        profile (see Run ece-install).
 
-=ece-install= can be run in two ways:
-
- - *Interactive mode*
- - *Full automatic install (FAI) mode*
-
-For more about this, see ece-install Execution Modes.
-
 ** <<<Get ece-install>>>
 Use =git= to get the ece-install script. Type this in
 your shell:
@@ -183,15 +176,25 @@ then =ece-install= will complain:
 #+END_SRC
 
 =/root/ece-install.conf=. may contain a large number of configuration
-parameters, but the minimum requirement is that it contains a user
-name and password for downloading software from Escenic Technet:
+parameters, but the minimum requirement is that it contains:
+
+ * A user name and password for downloading software from Escenic
+   Technet.
+ * The parameter =fai_enabled=1=.
+ * A parameter of the form =fai_<profile>_install=1= where =<profile>=
+   is the name of the *profile* you want to install (see Server
+   Profiles for information about profiles).
+
+For example:
 #+BEGIN_SRC conf
 technet_user=<user>
 technet_password=<password>
+fai_enabled=1
+fai_<profile>_install=1
 #+END_SRC
 
 If the configuration file does not contain these settings then
-=ece-install= will complain:
+=ece-install= will complain. For example:
 #+BEGIN_SRC text
 [ece-install] Be sure to set technet_user and technet_password
 [ece-install] in /root/ece-install.conf
@@ -200,8 +203,26 @@ If the configuration file does not contain these settings then
 Depending on what components you are installing on the server, you may
 need to include other configuration parameters in the file. If you are
 installing the Widget Framework, for example, you will need to specify
-additional download credentials (see ??). If you want to run in FAI
-mode then you may need to include many more parameters.
+additional download credentials (see ??). In most cases, however,
+parameters have default settings that enable =ece-install= to complete
+installation with very few settings.
+
+****** Interactive Mode
+The setting =fai_enabled=1= tells =ece-install= to run in *fully
+automated install (FAI)* mode. In this mode =ece-install= reads
+parameters from =ece-install.conf=. If it cannot find all the
+parameters it needs in the configuration file, then it fails. This is
+the recommended way to use =ece-install=.
+
+If you omit this parameter then =ece-install= will not read any
+=fai_???= parameters from =ece-install.conf= and will prompt for them
+interactively instead. You are, however, *strongly advised* not to run
+=ece-install= in interactive mode:
+
+ * Interactive mode is much less flexible than FAI mode.
+ * Interactive mode is not actively maintained and may therefore be
+   unreliable.
+ * Use of interactive mode is therefore not supported.
 
 ** <<<Run ece-install>>>
 To run =ece-install=, enter:
@@ -238,75 +259,24 @@ the BASH interpreter with the -x flag:
 Doing this lets you see everything that BASH does while executing the
 script - how wild card variables are  expanded and so on.
 
-** <<<ece-install Execution Modes>>>
-=ece-install= can be run in two main ways:
-
- * In *interactive mode*, in which case it prompts you for input.
- * In *fully automatic install (FAI)* mode, in which case it reads all
-   parameters from the configuration file =ece-install.conf=. If it
-   cannot find all the parameters it needs in the configuration file,
-   then it will fail.
-
-Which mode =ece-install= runs in depends on a parameter in the
-configuration file, =fai_enabled=. If =fai_enabled= is not set or set
-to =0=, then =ece-install= runs in interactive mode. If =fai_enabled=
-is set to =1= then =ece-install= runs in FAI mode.
-
-*** Interactive Mode
-When you run =ece-install= in interactive mode, it displays a prompt
-asking what you want to install. You can either install one of a
-number of predefined *profiles*, or you can restore a previously
-installed profile from a backup copy:
-#+BEGIN_SRC text
-Hi, which server profile do you wish to install?
-
-   1 - All in one, full stack on one host, suitable for dev & test environments
-   2 - Editorial (publication) server
-   3 - Presentation server (ECE + memcached).
-   4 - Database server
-   5 - Cache server (cache and web server)
-   6 - RMI hub
-   7 - Search server (Solr + indexer-webapp)
-   8 - Install Widget Framework.
-   9 - Create a new publication based on WF if available, ECE/clean-demo if not
-   10 - A monitoring server (web server + Munin gatherer)
-   11 - Restore from backup (DB, data files, binaries, conf & publications)
-
-Select 1-11 and press ENTER
-Your choice [1]> 
-#+END_SRC
+=ece-install= displays a series of progress messages during the
+installation process.
+
+****** After Installing
+When installation is completed an information message is
+displayed. This contains important information about what you
+should do next, plus references to where you can find useful
+information, so you should read it carefully.
+
+You should now set a password for the user =escenic= (which has been
+created for you by =ece-install=). To do this enter:
 
-A *profile* is a pre-defined set of software components that enables a
-computer to perform a particular function. For descriptions of all
-available profiles, see ??. For a description of the =Restore from
-backup= option, see ??.
-
-Depending on what choice you make, more prompts may be displayed
-requesting further information. When you have supplied all the
-information =ece-install= needs, the installation process begins.
-
-THEN WHAT??
-
-*** FAI Mode
-To run =ece-install= in FAI mode you must first add the following settings
-to =ece-install.conf=:
- 
- * =fai_enabled=1= To switch FAI mode on.
- * One =fai_<profile>_install=1= setting to choose the profile you want to
-   install or =fai_restore_from_backup=1= to restore a previously
-   installed profile.
- * Additional settings related to the profile installation
-   or restore operation you have selected. There are defaults for most
-   of these additional parameters, so in many cases you do not need to
-   specify anything else.
-
-Then when you run =ece-install= it will output:
 #+BEGIN_SRC text
-[ece-install] Full Automatic Install (FAI) enabled.
-[ece-install] All user input will be read from /root/ece-install.conf
+# passwd escenic
 #+END_SRC
 
-For more information see ??.
+The =escenic= user is the user you will need to use for most
+escenic-related purposes.
 
 ** Preventing accidental execution of ece-install 
 You can ensure that =ece-install= is not executed accidentally by
@@ -325,109 +295,118 @@ The lock file does not need to contain anything, it just needs to exist.
 
 * <<<Server Profiles>>>
 
-A *profile* is a pre-defined set of software components that enables a
-computer to perform a particular function. The profiles that
-=ece-install= can currently install are described in the following sections.
-
-
-** Common Components
-=ece-install= always installs a Munin node on the host, irrespective
-of which profile you choose. It also installs the
-Escenic-specific Munin plugins if the profile you choose includes any
-Escenic server components.
-
-The following components are included in the Editorial Server,
-Presentation Server, Search Server and All In One profiles:
-
- * Sun Java 6 :: This is required to run Tomcat and all the Escenic
-                 components.
- * Apache Tomcat application server :: This is installed and
-      configured to provide:
-   - Compression of textual content (previously, this was typically
-     done using Apache's =mod_deflate= module)
-   - Pooling, tweaked for high read/write performance
-   - Proper logging, with Solr messages directed to a separate log
-   - Routing information in the cookies
-   - Application server access log
- * Basic Escenic configuration :: Basic Escenic configuration layers
-      are installed, including RMI, database, search and application server/URIs. 
- * APR :: native library for optimal Tomcat I/O performance
- * Escenic assembly environment :: This is installed on every host in
-      order to make the installation process as smooth as
-      possible. You can remove it after installation if you wish.
- * Database driver :: ??
-
-** <<<All In One>>>
-This profile is primarily intended for use by developers and system
-administrators as a test environment. It is *not* considered suitable
-for production purposes. A complete stack including caching
-server, application server, Escenic Content Engine, assembly host,
-database and Widget Framework is installed. In addition, a publication
-is created.
+=ece-install= installs *profiles*. A profile is a pre-defined set of
+software components that enables a host computer to play a specific
+role in an Escenic installation.
+
+The profile to be installed by =ece-install= is determined by setting
+one of the following parameters in =ece-install.conf=:
+
+ - =fai_editor_install=1= :: Installs all the components that need to
+      be installed to create an Escenic *editorial server*.
+ - =fai_presentation_install=1= :: Installs all the components that
+      need to be installed to create an Escenic *presentation server*.
+ - =fai_wf_install=1= :: Installs the Widget Framework on an editorial
+      or presentation server.
+ - =fai_db_install=1= :: Installs a Database Server.
+ - =fai_cache_install=1= :: Installs a Cache Server.
+ - =fai_search_install=1= :: Installs a Search Server.
+ - =fai_rmi_install=1= :: Installs an RMI Hub.
+ - =fai_monitoring_install=1= :: Installs a Monitoring Server.
+ - =fai_all_install=1= :: Installs all of the above on one host
+      machine.
+ - =fai_restore_from_backup=1= :: Restores a backup created with =ece=.
+
+There are a number of common components that are included in all or
+most of the profiles. These are described below.
+
+** <<<fai_editor_install>>>
+To use this profile add =fai_editor_install=1= to your
+=ece-install.conf= file.
 
-To install this profile in interactive mode, select the
-#+BEGIN_SRC text
-   1 - All in one, full stack on one host, suitable for dev & test environments
-#+END_SRC
-option.
+This profile contains all the components that need to be installed to
+create an Escenic *editorial server*. An editorial server (sometimes
+also called a publication server) hosts a Content Engine used for editorial
+purposes (primarily Content Studio sessions).
 
-To install it in FAI mode, add =fai_all_install=1= to your
+** <<<fai_presentation_install>>>
+To use this profile, add =fai_presentation_install=1= to your
 =ece-install.conf= file.
 
-** Editorial Server
-This profile contains all the components that need to be installed on an
-Escenic *editorial server*. An editorial server (sometimes also called
-a publication server) hosts a Content Engine used for editorial
-purposes (primarily Content Studio sessions).
+This profile contains all the components that need to be installed to
+create an Escenic *presentation server*. A presentation server hosts a
+Content Engine used for serving publications to web site
+users. Differences between this and an editorial server include:
 
-To install this profile in interactive mode, select the
+ * Only the Escenic administration web-app =escenic-admin= and publications are
+   deployed. Other editorial web-apps such as Web Studio are not
+   required.
+ * Memcached, the distributed memory cache is installed.
+
+** <<<fai_wf_install>>>
+To use this profile, add the following settings:
 #+BEGIN_SRC text
-   2 - Editorial (publication) server
+fai_wf_install=1
+wf_user=<user-name>
+wf_password=<password>
 #+END_SRC
-option.
 
-To install it in FAI mode, add =fai_editor_install=1= to your
-=ece-install.conf= file.
+to your =ece-install.conf= file.
 
-** Presentation Server
-This will set up a typical presentation server:
-- Memcached, distributed memory cache
-- Deployment setup to only deploy escenic-admin and the
-  publication(s).
+=wf_user= and =wf_password= must contain your Widget Framework Maven
+repository credentials (supplied when you purchased the Widget
+Framework). If you do not have these credentials, please contact
+support@escenic.com.
 
-** Database Server
-If ece-install is run on a support version of Debian or Ubuntu, this
-will install the excellent Percona distribution of MySQL with their
-set of high performance patches.
+This profile installs the Escenic Widget Framework. It should be
+installed on a machine where you have already installed either an
+editorial or presentation profile. Exactly which machines you install
+the Widget Framework on depends on your deployment strategy.
 
-If not, MySQL or Percona must be installed in advance.
+** <<<fai_db_install>>>
+To use this profile, add =fai_db_install=1= to your
+=ece-install.conf= file.
 
-Given that the mysqld is installed, this profile will download all the
-Escenic components and install the ECE database schema based from the
-SQL files contained inside the distribution bundles specified with in
-the =technet_download_list= and =wf_dowload_list= variables. The
-defaults are inside the =ece-install= script itself, but you can
-overrides these in your =ece-install.conf= if you wish different minor
-versions of the ECE and plugins.
+When this profile is used on a supported version of Debian or Ubuntu,
+=ece-install= installs all the components needed to create an Escenic
+database, based on the Percona distribution of MySQL. On any other
+platform you must install either Percona or a standard MySQL
+distribution yourself before running =ece-install=.
+
+Otherwise, this profile contains all the Escenic components needed on
+a database server plus the correct database schema for the Content
+Engine version and plug-in versions you are installing.
+
+If an Escenic database has already been installed on the machine, then
+=ece-install= will fail and display an information message:
 
-The script will fail by itself if the DB already exists:
 #+BEGIN_SRC text
 [ece-install] Setting up the ECE database schema ...
 ERROR 1007 (HY000) at line 1: Can't create database 'ece5db'; database exists
 ERROR 1050 (42S01) at line 2: Table 'DBChangeLog' already exists
 [ece-install] running tables FAILED, exiting :-(
 #+END_SRC
-If you for some reason wish to make ece-install drop the DB fro you
-before creating a new one, you can set
+
+If you actually want to re-install the database you can do so by
+adding this setting to =ece-install.conf= before you run =ece-install=:
+
 #+BEGIN_SRC conf
 fai_db_drop_old_db_first=1
 #+END_SRC
 
+Given that the mysqld is installed, this profile will download all the
+Escenic components and install the ECE database schema based from the
+SQL files contained inside the distribution bundles specified with in
+the =technet_download_list= and =wf_dowload_list= variables. The
+defaults are inside the =ece-install= script itself, but you can
+overrides these in your =ece-install.conf= if you wish different minor
+versions of the ECE and plugins.
+
 *** Master & slave setup
-It's easy to set up master and slave DBs, here's how you'd configure
-ece-install to install these:
+You can easily use =ece-install= to set up master and slave databases
+on different hosts.
 
-On the master, create an ece-install.conf with:
+First create the master database using these =ece-install.conf= settings:
 #+BEGIN_SRC conf
 fai_enabled=1
 fai_db_install=1
@@ -435,16 +414,16 @@ fai_db_master=1
 fai_db_replication=1
 #+END_SRC
 
-The script will itself output some replication log settings you need
-for the slave:
+When you run =ece-install= with these settings, the output log
+messages will include information that you need for creating the slave database:
 #+BEGIN_SRC text
 [ece-install-35] - DB is now set up on localhost:3306
 [ece-install-35] - ece-install.conf for slave: fai_db_master_log_file=mysql-bin.000013
 [ece-install-35] - ece-install.conf for slave: fai_db_master_log_position=106
 #+END_SRC
 
-Once this is done, create and use an ece-install.conf on the slave
-with this configuration:
+On the slave database host you can then use these values in your
+=ece-install.conf= file as follows:
 #+BEGIN_SRC conf
 fai_enabled=1
 fai_db_install=1
@@ -455,38 +434,37 @@ fai_db_master_log_file=mysql-bin.000013
 fai_db_master_log_position=106
 #+END_SRC
 
-The script will set up and use the replication user & credentials with
-default values, if you wish to override these, have a look in the FAI
-parameter overview.
-
-** Cache Server
-If ece-install is run on a support version of Debian or Ubuntu, it
-will install the latest Varnish 3.0 caching server from the Varnish
-APT repository.
-
-If ece-install is run on a different platform, the admin must install
-Varnish 3.x prior to running ece-install.
-
-The script will configure Varnish for a typical Escenic site:
-- it will set up the cache server on port 80
-- will set up an access control lists of IPs which may access the
-  privileged web applications such as /escenic-admin, /escenic and
-  /webservice.
-
-  ece-install will also add the host from which you connect, making
-  sure that if you've SSH-ed into the server to conduct the install,
-  you'll automatically be included in the "staff" ACL and can access
-  all the web applications without editing these ACLs (or disabling
-  security as many does).
-
-- will set up sticky sessions/session binding
-- will set up a backend cluster and allow the user to enter the
-  different backend servers that will serve the web site.
-- will set up configuration to strip away cookies from static
-  resources, such as CSS, JS and pictures.
-- will install the nginx web server for serving static content and
-  will configure Varnish accordingly. This will be very useful for
-  Adactus servers wanting to pull content from your ECEs.
+=ece-install= uses internal defaults to create a replication user and
+credentials. You can override these defaults by setting additional
+parameters in =ece-install.conf=. For details, see ??.
+
+** <<<fai_cache_install>>>
+To use this profile, add =fai_cache_install=1= to your
+=ece-install.conf= file.
+
+When this profile is used on a supported version of Debian or Ubuntu,
+=ece-install= installs the latest Varnish 3.x caching server from the
+Varnish APT repository. On any other platform you must install Varnish 3.x
+yourself before running =ece-install=.
+
+Once Varnish is installed, =ece-install= configures it to suit the
+typical requirements of an Escenic site:
+
+ * Sets up the cache server on port 80
+ * Creates an access control list (ACL) of IP addresses allowed to access
+   privileged web applications such as =/escenic-admin=, =/escenic= and
+   =/webservice=. If you are running =ece-install= in an SSH session,
+   then it includes the IP address from which you connected in the ACL
+   so that you can access these applications without needing to
+   manually edit the ACL or disable security.
+ * Sets up sticky sessions/session binding
+ * Sets up a back-end cluster and allows the user?? to enter the
+   various backend servers that will serve the web site.
+ * Sets up a configuration that strips cookies from static  resources,
+   such as CSS files, JS files and images.
+ * Installs the =nginx= web server for serving static content and
+   configures Varnish accordingly. This is particularly useful for
+   installations where VME Online servers need to access content.
 
 TBD:
 - If run on a Linux platform, the script will tweak the kernel
@@ -495,125 +473,120 @@ TBD:
   to be in the staff network ACL, defined in the Varnish
   configuration. 
 
-** Install Widget Framework
-You'll need a user name and password for accessing the
-repo.escenic.com Maven repository. You should get these credentials
-when you bought Widget Framework. If you for some reason do not have
-these, please contact support@escenic.com. 
+** <<<fai_search_install>>>
+To use this profile, add =fai_search_install=1= to your
+=ece-install.conf= file.
 
-If you don't have these ready in your ece-install.conf, ece-install will
-complain:
-#+BEGIN_SRC text
-[ece-install] Be sure to set wf_user and wf_password in /root/ece-install.conf
-[ece-install] If you don't have these, please contact support@escenic.com
-#+END_SRC
-** Create Publication
-This profile will create a publication for you, only asking you the
-name of the publication and which ECE instance to use for its
-creation.
-
-This installation profile will base the publication on the Widget
-Framework if its present on the system, if not, ECE's clean demo WAR
-is used as a basis.  
-** Monitoring Server
-This will install a Munin gatherer and web server. The latter for
-accessing the reports generated by the former.
+This profile installs search components (Apache Solr plus the Escenic
+=indexer= web app.
+
+** <<<fai_rmi_install>>>
+To use this profile, add =fai_rmi_install=1= to your
+=ece-install.conf= file.
+
+This profile installs an RMI hub.
+
+** <<<fai_monitoring_install>>>
+To use this profile, add =fai_monitoring_install=1= to your
+=ece-install.conf= file.
+
+This profile installs a Munin gatherer plus a web server for providing
+access to the reports Munin generates.
 
 TBD: This profile will also install the Nagios interface for
 monitoring the different nodes. 
 
-** Restoring from backup
-~ece-install~ can restore from a backup made by the ~ece~ script:
+** <<<fai_publication_create>>>
+To use this profile, add =fai_publication_create=1= to your
+=ece-install.conf= file.
+
+This profile creates a publication for you. It should be used on a
+machine where you have already installed either an editorial or
+presentation profile.
+
+If the Widget Framework is installed on the machine, then the
+create publication is based on the Widget Framework. Otherwise the
+publication is based on the clean demo WAR supplied with the Content Engine.
+
+** <<<fai_all_install>>>
+To use this profile, add =fai_all_install=1= to your
+=ece-install.conf= file.
+
+This profile is primarily intended for use by developers and system
+administrators as a test environment. It is *not* considered suitable
+for production purposes. A complete stack including caching
+server, application server, Escenic Content Engine, assembly host,
+database and Widget Framework is installed. In addition, a publication
+is created.
+
+** <<<fai_restore_from_backup>>>
+To use this profile, add =fai_restore_from_backup=1= to your
+=ece-install.conf= file.
+
+Unlike all the other profiles, this profile does not install anything
+or create anything new. Instead, it restores a backup you have
+previously created using the =ece= script - like this, for example:
 #+BEGIN_SRC text
 $ ece -i <instance> backup
 #+END_SRC
 
-As stated in the guide for the ece script, this backup may contain
-(depending on what's available on the host where it's run):
-- database dump of the instance
-- data files (pictures, video files and so on). This is often referred
-  to as the "multimedia archive" in Escenic literature.
-- ECE, cache and web server configuration
-- Escenic software
+Exactly what such a backup contains depends on:
 
-*** Running interactively
-**** Start ece-install and choose the Option Restore from backup
-#+BEGIN_SRC text
-# ece-install
-#+END_SRC
+ * What was present on the host machine where the backup was created
+ * What options were specified when the backup was created.
 
-**** Select Which Backup to Restore
+It may, however, contain:
 
-#+BEGIN_SRC text
-[ece-install-5] From which dataset do you wish to backup?
-    1 - engine-dev1-backup-2011-10-10.tar.gz
-    2 - engine-dev1-backup-2011-10-11.tar.gz
-[ece-install-5] Enter the number next to the tarball, from 1 to 2
-Your choice [1]>
-#+END_SRC
+ * The Escenic software components (Content Engine etc.) installed on the host.
+ * Content Engine, cache and web server configuration data.
+ * A database dump.
+ * An Escenic multimedia archive (images, video files and so on).
 
-The ece script mentioned above will create backups in
-~/var/backups/escenic~ and the ece-install script will hence expect to
-find them here.
+You can use this profile in two ways:
 
-**** Choose What to Restore
-#+BEGIN_SRC text
-[ece-install-12] Which part of the system do you wish to restore?
-    1 - The database
-    2 - The Solr and ECE data files (multimedia archive)
-    3 - The ECE configuration files
-    4 - The Escenic and Tomcat software binaries + publication templates
-Your choice [1]> 2
-#+END_SRC
+ * To restore a host to an earlier state.
+ * To install a copy of some other installation on a "clean" host.
 
-**** Sit Back and Watch ece-install Restore the Data for You
-#+BEGIN_SRC text
-[ece-install-13] Restoring the Solr & ECE data files on ubiquitous ...
-[ece-install-21] - The installation is now complete! It took 0d 0h 0m 20s
-[ece-install] Successfully restored Solr & ECE data files
-[ece-install] from backup:  engine-dev1-backup-2011-10-12.tar.gz
-[ece-install] Check /var/lib/escenic to verify they're all there
-#+END_SRC
+In order to use this profile you have to set some additional
+parameters in =ece-install.conf= in order to specify the location of
+the backup file you want to restore and the specific items you want to
+restore from the file.
 
-*** Running in FAI mode
-If you're running in FAI mode, you can choose between these settings
-to decide what to restore and where to find the backup file to
-restore from:
+The parameters you can use together with  =fai_restore_from_backup= to
+specify what you want to restore are:
 
 |---------------------------------+---------+-----------------------------------------------------------|
 | Parameter                       | Default | Description                                               |
 |---------------------------------+---------+-----------------------------------------------------------|
-| ~fai_restore_from_backup~       |       0 | Enable restoring from backup                              |
 | ~fai_restore_all~               |       0 | Restore all backup items. Requires a full backup tarball. |
-| ~fai_restore_db~                |       0 | Install the DB server & restore its contents              |
-| ~fai_restore_data_files~        |       0 | Restore the Solr & ECE data files                         |
-| ~fai_restore_configuration~     |       0 | Restore the Solr & ECE configuration files                |
-| ~fai_restore_software_binaries~ |       0 | Restore the Escenic and Apache Tomcat software            |
-| ~fai_restore_from_file~         |      "" | The .tar.gz produced by ~ece -i <instance> backup~        |
+| =fai_restore_db=                |       0 | Install the database server and restore its contents      |
+| =fai_restore_data_files=        |       0 | Restore the Solr and Content Engine data files            |
+| =fai_restore_configuration=     |       0 | Restore the Solr and content Engine configuration files   |
+| =fai_restore_software_binaries= |       0 | Restore the Escenic and Apache Tomcat software            |
+| =fai_restore_from_file=         |      "" | The .tar.gz produced by =ece -i <instance> backup=        |
 |---------------------------------+---------+-----------------------------------------------------------|
 
-For example, to restore the DB, data files, configuration & software
-binaries from a given tarball, you need this in your
-=ece-install.conf=:
+So to restore everything in a specified backup file, you would need
+something like this in your =ece-install.conf= file:
 #+BEGIN_SRC conf
 fai_enabled=1
-
 fai_restore_from_backup=1
 fai_restore_all=1
 fai_restore_from_file=/var/backups/escenic/engine-dev1-backup-2011-10-10.tar.gz
 #+END_SRC
 
-=ece-install= can also remove files prior to restoring from the
-backup:
+=ece-install= can also remove unwanted files from an existing
+installation prior to restoring from a backup. You can specify the
+files you would like to remove using the following parameters:
 
 |------------------------------+---------+-----------------------------------|
 | Parameter                    | Default | Description                       |
 |------------------------------+---------+-----------------------------------|
-| ~fai_restore_pre_wipe_all~   |       0 | Remove all data/state & log files |
-| ~fai_restore_pre_wipe_cache~ |       0 | Remove the cache files            |
-| ~fai_restore_pre_wipe_crash~ |       0 | Remove the crash files            |
-| ~fai_restore_pre_wipe_logs~  |       0 | Remove all log files              |
-| ~fai_restore_pre_wipe_solr~  |       0 | Remove the solr data/state files  |
+| =fai_restore_pre_wipe_all=   |       0 | Remove all data/state & log files |
+| =fai_restore_pre_wipe_cache= |       0 | Remove the cache files            |
+| =fai_restore_pre_wipe_crash= |       0 | Remove the crash files            |
+| =fai_restore_pre_wipe_logs=  |       0 | Remove all log files              |
+| =fai_restore_pre_wipe_solr=  |       0 | Remove the solr data/state files  |
 |------------------------------+---------+-----------------------------------|
 
 ** Analysis Server
@@ -793,10 +766,10 @@ tarball, together with the other Nursery configuration files.
 The =fai_presentation_conf_archive= and =fai_presentation_ear= variables
 both accept the following types of value (here using the value of
 =fai_presentation_ear= as an example):
-- ~http://build.server/stable/engine-mysite.com-1.2.3.ear~
-- ~https://build.server/stable/engine-mysite.com-1.2.3.ear~
-- ~file:///var/lib/build/stable/engine-mysite.com-1.2.3.ear~
-- ~/var/lib/build/stable/engine-mysite.com-1.2.3.ear~
+- =http://build.server/stable/engine-mysite.com-1.2.3.ear=
+- =https://build.server/stable/engine-mysite.com-1.2.3.ear=
+- =file:///var/lib/build/stable/engine-mysite.com-1.2.3.ear=
+- =/var/lib/build/stable/engine-mysite.com-1.2.3.ear=
 
 ** Setting up virtual hosts
 Setting up virtual host definitions in the application server makes a
@@ -835,7 +808,7 @@ This will produce the following stanzas in server.xml:
 #+END_SRC
 
 As you can see, there's a third optional option to the
-~fai_publication_domain_mapping_list~ which can be specified as a
+=fai_publication_domain_mapping_list= which can be specified as a
 comma separated list of host aliases to be added to the app server host
 configuration. 
 
@@ -860,91 +833,91 @@ $HOME/ece-install.conf file of the root user:
 |---------------------------------------+--------------------------------------------------------------+----------------------------------------------------------------------------------------------------------|
 | Parameter                             | Default                                                      | Description                                                                                              |
 |---------------------------------------+--------------------------------------------------------------+----------------------------------------------------------------------------------------------------------|
-| ~fai_all_conf_archive~                | ""                                                           | conf.tar.gz to use for Nursery & JAAS configuration                                                      |
-| ~fai_all_ear~                         | ""                                                           | EAR to use instead of the Escenic binaries                                                               |
-| ~fai_all_install~                     | 0                                                            | Install all components on your server.                                                                   |
-| ~fai_all_stop_and_clear~              | 0                                                            | After installation, stop the instance and clear its work & log files.                                    |
-| ~fai_analysis_db_host~                | localhost                                                    | For the EAE DB (different from ECE's)                                                                    |
-| ~fai_analysis_db_install~             | 0                                                            | Install DB profile                                                                                       |
-| ~fai_analysis_db_password~            | read-the-source-luke                                         | For the EAE DB (different from ECE's)                                                                    |
-| ~fai_analysis_db_port~                | 3306                                                         | For the EAE DB (different from ECE's)                                                                    |
-| ~fai_analysis_db_schema~              | ece5db                                                       | For the EAE DB (different from ECE's)                                                                    |
-| ~fai_analysis_db_user~                | ece5user                                                     | For the EAE DB (different from ECE's)                                                                    |
-| ~fai_analysis_install~                | 0                                                            | Will install the Escenic Analysis Engine, aka Stats, EAE.                                                |
-| ~fai_analysis_name~                   | analysis1                                                    | EAE instance name                                                                                        |
-| ~fai_analysis_port~                   | 8080                                                         | Port of the EAE                                                                                          |
-| ~fai_analysis_shutdown~               | 8005                                                         | Shutdown port for the EAE app server                                                                     |
-| ~fai_analysis_stop_and_clear~         | 0                                                            | After installation, stop the instances and clear its work & log files                                    |
-| ~fai_apt_vizrt_pool~                  | stable                                                       | Which package pool in the Vizrt APT to install package from.                                             |
-| ~fai_cache_backends~                  | ${HOSTNAME}:8080                                             | Space separated, e.g. "app1:8080 app2:8080"                                                              |
-| ~fai_cache_install~                   | 0                                                            | Install cache server profile                                                                             |
-| ~fai_db_daily_backup~                 | 0                                                            | Sets up daily backup of the DB.                                                                          |
-| ~fai_db_drop_old_db_first~            | 0                                                            | Warning: this will drop the old database before installing a new one                                     |
-| ~fai_db_host~                         | $HOSTNAME                                                    | Useful for editor & presentation profiles                                                                |
-| ~fai_db_install~                      | 0                                                            | Install db profile                                                                                       |
-| ~fai_db_password~                     | read-the-source-luke                                         | Useful for DB installation profile                                                                       |
-| ~fai_db_port~                         | 3306                                                         | Useful for editor & presentation profiles                                                                |
-| ~fai_db_schema~                       | ece5db                                                       | Useful for DB installation profile                                                                       |
-| ~fai_db_user~                         | ece5user                                                     | Useful for DB installation profile                                                                       |
-| ~fai_editor_conf_archive~             | ""                                                           | conf.tar.gz to use for Nursery & JAAS configuration                                                      |
-| ~fai_editor_deploy_white_list~        | "escenic-admin escenic studio indexer-webservice webservice" | The list of WARs to be deployed on this instance.                                                        |
-| ~fai_editor_ear~                      | ""                                                           | EAR to use instead of the Escenic binaries                                                               |
-| ~fai_editor_install~                  | 0                                                            | Install the editorial profile                                                                            |
-| ~fai_editor_name~                     | editor1                                                      | Name of the editor instance                                                                              |
-| ~fai_editor_port~                     | 8080                                                         | HTTP port of the editor instance                                                                         |
-| ~fai_editor_shutdown~                 | 8005                                                         | Shutdown port of the editor instance                                                                     |
-| ~fai_editor_stop_and_clear~           | 0                                                            | After installation, stop the instances and clear its work & log files                                    |
-| ~fai_enabled~                         | 0                                                            | Whether or not to run ece-install in FAI mode                                                            |
-| ~fai_keep_off_etc_hosts~              | 0                                                            | Set this to 1 if you don't want ece-install adding entries to /etc/hosts                                 |
-| ~fai_monitoring_admin_password~       | No telling you here ;-)                                      | The admin password of the web interface(s). Currenlty only set for Icinga.                               |
-| ~fai_monitoring_ece_host_list~        | ""                                                           | Hosts running one or more ECE instance                                                                   |
-| ~fai_monitoring_host_list~            | ""                                                           | Quoted, space separated list of <host>#<ip> pairs, e.g.: "pres1#10.72.227.250 pres2#10.72.227.251"       |
-| ~fai_monitoring_install~              | 0                                                            | Install the monitoring server profile.                                                                   |
-| ~fai_monitoring_munin_node_list~      | ""                                                           | Set this to a whitespace separated list of nodes that munin should monitor                               |
-| ~fai_monitoring_search_host_list~     | ""                                                           | Hosts running search instance(s) (Solr + indexer)                                                        |
-| ~fai_monitoring_server_ip~            | 127.0.0.1                                                    | The IP of the monitoring server.                                                                         |
-| ~fai_nfs_allowed_client_network~      | ""                                                           | IP/netmwask of allowed NFS clients, example: 192.168.1.0/255.255.255.0                                   |
-| ~fai_nfs_client_install~              | 0                                                            | Installs an NFS client                                                                                   |
-| ~fai_nfs_client_mount_point_parent~   | /mnt                                                         | Mount point parent directory                                                                             |
-| ~fai_nfs_export_list~                 | ""                                                           | Space separated list of NFS export directories, full paths as seen on the NFS server.                    |
-| ~fai_nfs_server_address~              | ""                                                           | Address of the NFS server, useful for the NFS client profile                                             |
-| ~fai_nfs_server_install~              | 0                                                            | Install an NFS server                                                                                    |
-| ~fai_presentation_conf_archive~       | ""                                                           | conf.tar.gz to use for Nursery & JAAS configuration                                                      |
-| ~fai_presentation_ear~                | ""                                                           | EAR to use instead of the Escenic binaries                                                               |
-| ~fai_presentation_install~            | 0                                                            | Install the presentation server profile                                                                  |
-| ~fai_presentation_name~               | web1                                                         | Name of the presentation server instance                                                                 |
-| ~fai_presentation_port~               | 8080                                                         | HTTP port of the presentation server instance                                                            |
-| ~fai_presentation_deploy_white_list~  | "escenic-admin <assemblytool/publications/*>"                | The list of WARs to be deployed on this instance.                                                        |
-| ~fai_presentation_shutdown~           | 8005                                                         | Shutdown port of the presentation instance                                                               |
-| ~fai_presentation_stop_and_clear~     | 0                                                            | After installation, stop the instances and clear its work & log files                                    |
-| ~fai_public_host_name~                | ${HOSTNAME}:8080                                             | The public address for your website                                                                      |
-| ~fai_publication_create~              | 0                                                            | Create a new publication                                                                                 |
-| ~fai_publication_domain_mapping_list~ | ""                                                           | Mapping between publication names and their domains: "one#one.com other#other.com[#<alias1>[,<alias2>]]" |
-| ~fai_publication_environment~         | "production"                                                 | The kind of environment/habitat. Typical values are: production, staging, testing, development.          |
-| ~fai_publication_name~                | mypub                                                        | Name of the publication                                                                                  |
-| ~fai_publication_use_instance~        | dev1                                                         | Name of local instance to use for creation                                                               |
-| ~fai_publication_war_uri_list~        | ""                                                           | Publication WARs used for setting up Assembly tool.                                                      |
-| ~fai_publication_war~                 | "WF or ECE demo WAR"                                         | WAR to base the new publication on                                                                       |
-| ~fai_rmi_install~                     | 0                                                            | Install RMI hub profile                                                                                  |
-| ~fai_search_conf_archive~             | ""                                                           | conf.tar.gz to use for Nursery & JAAS configuration                                                      |
-| ~fai_search_deploy_white_list~        | "solr indexer-webapp"                                        | The list of WARs to be deployed on this instance.                                                        |
-| ~fai_search_ear~                      | ""                                                           | EAR to use instead of the Escenic binaries                                                               |
-| ~fai_search_for_editor~               | 0                                                            | If 1 (true), will configure Solr for use with an editorial server, if not for presentation servers.      |
-| ~fai_search_indexer_ws_uri~           | http://${HOSTNAME}:8080/indexer-webservice/index/            | URI of the indexer-webservice that the search instance shall use for knowing what to index.              |
-| ~fai_search_install~                  | 0                                                            | Install the search server profile (Solr + indexer)                                                       |
-| ~fai_search_name~                     | search1                                                      | Name of the search instance                                                                              |
-| ~fai_search_port~                     | 8080                                                         | HTTP port of the search instance                                                                         |
-| ~fai_search_shutdown~                 | 8005                                                         | Shutdown port of the search instance                                                                     |
-| ~fai_vip_address~                     | ""                                                           | The virtual IP the provider will claim                                                                   |
-| ~fai_vip_install~                     | 0                                                            | Install a VIP provider                                                                                   |
-| ~fai_vip_primary_node_auth_key~       | ""                                                           | Optional, but useful to set to make conf files consistent. Will be generated if not set                  |
-| ~fai_vip_primary_node_ip~             | ""                                                           | Primary node IP                                                                                          |
-| ~fai_vip_primary_node_name~           | ""                                                           | Primary node name, must be what $(uname -n) returns                                                      |
-| ~fai_vip_secondary_node_ip~           | ""                                                           | Secondary node IP                                                                                        |
-| ~fai_vip_secondary_node_name~         | ""                                                           | Secondary node name, must be what $(uname -n) returns                                                    |
-| ~fai_vip_service_list~                | ""                                                           | List of init.d scripts to invoke when the VIP is acclaimed/revoked, script must support start & stop     |
-| ~fai_vip_sibling_ip~                  | ""                                                           | The IP of the other node offering the VIP                                                                |
-| ~fai_wf_install~                      | 0                                                            | Install Widget Framework profile                                                                         |
+| =fai_all_conf_archive=                | ""                                                           | conf.tar.gz to use for Nursery & JAAS configuration                                                      |
+| =fai_all_ear=                         | ""                                                           | EAR to use instead of the Escenic binaries                                                               |
+| =fai_all_install=                     | 0                                                            | Install all components on your server.                                                                   |
+| =fai_all_stop_and_clear=              | 0                                                            | After installation, stop the instance and clear its work & log files.                                    |
+| =fai_analysis_db_host=                | localhost                                                    | For the EAE DB (different from ECE's)                                                                    |
+| =fai_analysis_db_install=             | 0                                                            | Install DB profile                                                                                       |
+| =fai_analysis_db_password=            | read-the-source-luke                                         | For the EAE DB (different from ECE's)                                                                    |
+| =fai_analysis_db_port=                | 3306                                                         | For the EAE DB (different from ECE's)                                                                    |
+| =fai_analysis_db_schema=              | ece5db                                                       | For the EAE DB (different from ECE's)                                                                    |
+| =fai_analysis_db_user=                | ece5user                                                     | For the EAE DB (different from ECE's)                                                                    |
+| =fai_analysis_install=                | 0                                                            | Will install the Escenic Analysis Engine, aka Stats, EAE.                                                |
+| =fai_analysis_name=                   | analysis1                                                    | EAE instance name                                                                                        |
+| =fai_analysis_port=                   | 8080                                                         | Port of the EAE                                                                                          |
+| =fai_analysis_shutdown=               | 8005                                                         | Shutdown port for the EAE app server                                                                     |
+| =fai_analysis_stop_and_clear=         | 0                                                            | After installation, stop the instances and clear its work & log files                                    |
+| =fai_apt_vizrt_pool=                  | stable                                                       | Which package pool in the Vizrt APT to install package from.                                             |
+| =fai_cache_backends=                  | ${HOSTNAME}:8080                                             | Space separated, e.g. "app1:8080 app2:8080"                                                              |
+| =fai_cache_install=                   | 0                                                            | Install cache server profile                                                                             |
+| =fai_db_daily_backup=                 | 0                                                            | Sets up daily backup of the DB.                                                                          |
+| =fai_db_drop_old_db_first=            | 0                                                            | Warning: this will drop the old database before installing a new one                                     |
+| =fai_db_host=                         | $HOSTNAME                                                    | Useful for editor & presentation profiles                                                                |
+| =fai_db_install=                      | 0                                                            | Install db profile                                                                                       |
+| =fai_db_password=                     | read-the-source-luke                                         | Useful for DB installation profile                                                                       |
+| =fai_db_port=                         | 3306                                                         | Useful for editor & presentation profiles                                                                |
+| =fai_db_schema=                       | ece5db                                                       | Useful for DB installation profile                                                                       |
+| =fai_db_user=                         | ece5user                                                     | Useful for DB installation profile                                                                       |
+| =fai_editor_conf_archive=             | ""                                                           | conf.tar.gz to use for Nursery & JAAS configuration                                                      |
+| =fai_editor_deploy_white_list=        | "escenic-admin escenic studio indexer-webservice webservice" | The list of WARs to be deployed on this instance.                                                        |
+| =fai_editor_ear=                      | ""                                                           | EAR to use instead of the Escenic binaries                                                               |
+| =fai_editor_install=                  | 0                                                            | Install the editorial profile                                                                            |
+| =fai_editor_name=                     | editor1                                                      | Name of the editor instance                                                                              |
+| =fai_editor_port=                     | 8080                                                         | HTTP port of the editor instance                                                                         |
+| =fai_editor_shutdown=                 | 8005                                                         | Shutdown port of the editor instance                                                                     |
+| =fai_editor_stop_and_clear=           | 0                                                            | After installation, stop the instances and clear its work & log files                                    |
+| =fai_enabled=                         | 0                                                            | Whether or not to run ece-install in FAI mode                                                            |
+| =fai_keep_off_etc_hosts=              | 0                                                            | Set this to 1 if you don't want ece-install adding entries to /etc/hosts                                 |
+| =fai_monitoring_admin_password=       | No telling you here ;-)                                      | The admin password of the web interface(s). Currenlty only set for Icinga.                               |
+| =fai_monitoring_ece_host_list=        | ""                                                           | Hosts running one or more ECE instance                                                                   |
+| =fai_monitoring_host_list=            | ""                                                           | Quoted, space separated list of <host>#<ip> pairs, e.g.: "pres1#10.72.227.250 pres2#10.72.227.251"       |
+| =fai_monitoring_install=              | 0                                                            | Install the monitoring server profile.                                                                   |
+| =fai_monitoring_munin_node_list=      | ""                                                           | Set this to a whitespace separated list of nodes that munin should monitor                               |
+| =fai_monitoring_search_host_list=     | ""                                                           | Hosts running search instance(s) (Solr + indexer)                                                        |
+| =fai_monitoring_server_ip=            | 127.0.0.1                                                    | The IP of the monitoring server.                                                                         |
+| =fai_nfs_allowed_client_network=      | ""                                                           | IP/netmwask of allowed NFS clients, example: 192.168.1.0/255.255.255.0                                   |
+| =fai_nfs_client_install=              | 0                                                            | Installs an NFS client                                                                                   |
+| =fai_nfs_client_mount_point_parent=   | /mnt                                                         | Mount point parent directory                                                                             |
+| =fai_nfs_export_list=                 | ""                                                           | Space separated list of NFS export directories, full paths as seen on the NFS server.                    |
+| =fai_nfs_server_address=              | ""                                                           | Address of the NFS server, useful for the NFS client profile                                             |
+| =fai_nfs_server_install=              | 0                                                            | Install an NFS server                                                                                    |
+| =fai_presentation_conf_archive=       | ""                                                           | conf.tar.gz to use for Nursery & JAAS configuration                                                      |
+| =fai_presentation_ear=                | ""                                                           | EAR to use instead of the Escenic binaries                                                               |
+| =fai_presentation_install=            | 0                                                            | Install the presentation server profile                                                                  |
+| =fai_presentation_name=               | web1                                                         | Name of the presentation server instance                                                                 |
+| =fai_presentation_port=               | 8080                                                         | HTTP port of the presentation server instance                                                            |
+| =fai_presentation_deploy_white_list=  | "escenic-admin <assemblytool/publications/*>"                | The list of WARs to be deployed on this instance.                                                        |
+| =fai_presentation_shutdown=           | 8005                                                         | Shutdown port of the presentation instance                                                               |
+| =fai_presentation_stop_and_clear=     | 0                                                            | After installation, stop the instances and clear its work & log files                                    |
+| =fai_public_host_name=                | ${HOSTNAME}:8080                                             | The public address for your website                                                                      |
+| =fai_publication_create=              | 0                                                            | Create a new publication                                                                                 |
+| =fai_publication_domain_mapping_list= | ""                                                           | Mapping between publication names and their domains: "one#one.com other#other.com[#<alias1>[,<alias2>]]" |
+| =fai_publication_environment=         | "production"                                                 | The kind of environment/habitat. Typical values are: production, staging, testing, development.          |
+| =fai_publication_name=                | mypub                                                        | Name of the publication                                                                                  |
+| =fai_publication_use_instance=        | dev1                                                         | Name of local instance to use for creation                                                               |
+| =fai_publication_war_uri_list=        | ""                                                           | Publication WARs used for setting up Assembly tool.                                                      |
+| =fai_publication_war=                 | "WF or ECE demo WAR"                                         | WAR to base the new publication on                                                                       |
+| =fai_rmi_install=                     | 0                                                            | Install RMI hub profile                                                                                  |
+| =fai_search_conf_archive=             | ""                                                           | conf.tar.gz to use for Nursery & JAAS configuration                                                      |
+| =fai_search_deploy_white_list=        | "solr indexer-webapp"                                        | The list of WARs to be deployed on this instance.                                                        |
+| =fai_search_ear=                      | ""                                                           | EAR to use instead of the Escenic binaries                                                               |
+| =fai_search_for_editor=               | 0                                                            | If 1 (true), will configure Solr for use with an editorial server, if not for presentation servers.      |
+| =fai_search_indexer_ws_uri=           | http://${HOSTNAME}:8080/indexer-webservice/index/            | URI of the indexer-webservice that the search instance shall use for knowing what to index.              |
+| =fai_search_install=                  | 0                                                            | Install the search server profile (Solr + indexer)                                                       |
+| =fai_search_name=                     | search1                                                      | Name of the search instance                                                                              |
+| =fai_search_port=                     | 8080                                                         | HTTP port of the search instance                                                                         |
+| =fai_search_shutdown=                 | 8005                                                         | Shutdown port of the search instance                                                                     |
+| =fai_vip_address=                     | ""                                                           | The virtual IP the provider will claim                                                                   |
+| =fai_vip_install=                     | 0                                                            | Install a VIP provider                                                                                   |
+| =fai_vip_primary_node_auth_key=       | ""                                                           | Optional, but useful to set to make conf files consistent. Will be generated if not set                  |
+| =fai_vip_primary_node_ip=             | ""                                                           | Primary node IP                                                                                          |
+| =fai_vip_primary_node_name=           | ""                                                           | Primary node name, must be what $(uname -n) returns                                                      |
+| =fai_vip_secondary_node_ip=           | ""                                                           | Secondary node IP                                                                                        |
+| =fai_vip_secondary_node_name=         | ""                                                           | Secondary node name, must be what $(uname -n) returns                                                    |
+| =fai_vip_service_list=                | ""                                                           | List of init.d scripts to invoke when the VIP is acclaimed/revoked, script must support start & stop     |
+| =fai_vip_sibling_ip=                  | ""                                                           | The IP of the other node offering the VIP                                                                |
+| =fai_wf_install=                      | 0                                                            | Install Widget Framework profile                                                                         |
 |---------------------------------------+--------------------------------------------------------------+----------------------------------------------------------------------------------------------------------|
 
 As you've probably have guessed, 0 means "false" and 1 means "true" :-)
@@ -1021,14 +994,23 @@ folder, and only download the missing ones (if any).
 To get a list of the artifacts it'll pull from
 http://technet.escenic.com and http://tomcat.apache.org search for the
 following variables:
-- ~technet_download_list~
-- ~wf_download_list~
-- ~tomcat_download~
+- =technet_download_list=
+- =wf_download_list=
+- =tomcat_download=
 
 Two other ways of speeding up the installation is (of course) to use
 the backup/restore feature or install from a EAR and configuration
 bundle, see the FAI section.
 
+* Modifying installed versions
+Given that the mysqld is installed, this profile will download all the
+Escenic components and install the ECE database schema based from the
+SQL files contained inside the distribution bundles specified with in
+the =technet_download_list= and =wf_dowload_list= variables. The
+defaults are inside the =ece-install= script itself, but you can
+overrides these in your =ece-install.conf= if you wish different minor
+versions of the ECE and plugins.
+
 * Using a Custom Configuration File for ece-install
 You can specify a different configuration by using the -f parameter: 
 #+BEGIN_SRC text
@@ -1042,31 +1024,31 @@ but these should be the most interesting ones.
 |-----------------------------------------------+------------------------------------------------------------------|
 | Path                                          | Explanation                                                      |
 |-----------------------------------------------+------------------------------------------------------------------|
-| ~/etc/apt/sources.list.d/escenic.list~        | 3rd party APT repositories added by ece-install *)               |
-| ~/etc/default/ece~                            | The configuration file for the ece init.d script                 |
-| ~/etc/escenic/ece-<instance>.conf~            | Instance specific settings for ~/usr/bin/ece~                    |
-| ~/etc/escenic/ece.conf~                       | Common ece.conf file for ~/usr/bin/ece~                          |
-| ~/etc/escenic/engine/common~                  | Common Nursery configuration layer                               |
-| ~/etc/escenic/engine/common/security~         | Common security configuration for all ECE instances.             |
-| ~/etc/escenic/engine/common/trace.properties~ | Log4j configuration, produces instance specific log files.       |
-| ~/etc/escenic/engine/instance/<instance>~     | Instance specific Nursery configuration                          |
-| ~/etc/escenic/solr~                           | ECE specific Solr configuration                                  |
-| ~/etc/init.d/mysql[d]~                        | For starting and stopping MySQL/Percona                          |
-| ~/etc/init.d/varnish~                         | For starting and stopping Varnish                                |
-| ~/etc/intit.d/ece~                            | The init.d script managing _all_ the ECE instances on your host. |
-| ~/etc/varnish/default.vcl~                    | The Varnish configuration                                        |
-| ~/opt/escenic~                                | All ECE components can be found here                             |
-| ~/opt/escenic/assemblytool~                   | The assembly tool                                                |
-| ~/opt/escenic/assemblytool/plugins~           | Contains symlinks to all plugins in ~/opt/escenic~               |
-| ~/opt/escenic/engine~                         | Symlink pointing to the current ECE                              |
-| ~/opt/tomcat~                                 | Symlink pointing to the install Apache Tomcat (~catalina_home~)  |
-| ~/opt/tomcat-<instance>~                      | Instance specific Tomcat files (~catalina_base~)                 |
-| ~/usr/bin/ece~                                | Script for operating all ECE instances + RMI hub and EAE         |
-| ~/usr/sbin/ece-install~                       | The installation script described in this guide                  |
-| ~/var/log/escenic/<type>-<instance>.log~      | The instance's log4j log                                         |
-| ~/var/log/escenic/<type>-<instance>.out~      | The instance system out log                                      |
-| ~/var/log/escenic/solr.<date>.log~            | The Solr log (not in standard out!)                              |
-| ~/var/run/escenic/<type>-<instance>.pid~      | The instance's  PID file                                         |
+| =/etc/apt/sources.list.d/escenic.list=        | 3rd party APT repositories added by ece-install *)               |
+| =/etc/default/ece=                            | The configuration file for the ece init.d script                 |
+| =/etc/escenic/ece-<instance>.conf=            | Instance specific settings for =/usr/bin/ece=                    |
+| =/etc/escenic/ece.conf=                       | Common ece.conf file for =/usr/bin/ece=                          |
+| =/etc/escenic/engine/common=                  | Common Nursery configuration layer                               |
+| =/etc/escenic/engine/common/security=         | Common security configuration for all ECE instances.             |
+| =/etc/escenic/engine/common/trace.properties= | Log4j configuration, produces instance specific log files.       |
+| =/etc/escenic/engine/instance/<instance>=     | Instance specific Nursery configuration                          |
+| =/etc/escenic/solr=                           | ECE specific Solr configuration                                  |
+| =/etc/init.d/mysql[d]=                        | For starting and stopping MySQL/Percona                          |
+| =/etc/init.d/varnish=                         | For starting and stopping Varnish                                |
+| =/etc/intit.d/ece=                            | The init.d script managing _all_ the ECE instances on your host. |
+| =/etc/varnish/default.vcl=                    | The Varnish configuration                                        |
+| =/opt/escenic=                                | All ECE components can be found here                             |
+| =/opt/escenic/assemblytool=                   | The assembly tool                                                |
+| =/opt/escenic/assemblytool/plugins=           | Contains symlinks to all plugins in =/opt/escenic=               |
+| =/opt/escenic/engine=                         | Symlink pointing to the current ECE                              |
+| =/opt/tomcat=                                 | Symlink pointing to the install Apache Tomcat (=catalina_home=)  |
+| =/opt/tomcat-<instance>=                      | Instance specific Tomcat files (=catalina_base=)                 |
+| =/usr/bin/ece=                                | Script for operating all ECE instances + RMI hub and EAE         |
+| =/usr/sbin/ece-install=                       | The installation script described in this guide                  |
+| =/var/log/escenic/<type>-<instance>.log=      | The instance's log4j log                                         |
+| =/var/log/escenic/<type>-<instance>.out=      | The instance system out log                                      |
+| =/var/log/escenic/solr.<date>.log=            | The Solr log (not in standard out!)                              |
+| =/var/run/escenic/<type>-<instance>.pid=      | The instance's  PID file                                         |
 |-----------------------------------------------+------------------------------------------------------------------|
 
 *) Applies only to Debian based systems.

From 8e339dde330c33a383d9d7b903dfbd4159600aab Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 31 Aug 2012 09:46:55 +0200
Subject: [PATCH 1277/2585] - added widget-framework-syndication, it's an odd
 cookie as it's a   plugin which is distributed inside another plugin, hence,
 preparing   it for build.sh, involved:

    $ unzip widget-framework-core-<version>
    $ unzip widget-framework-core-<version>/wfSyndication.zip
    $ mv wfSyndication widget-framework-syndication-<version>

- fixed typo: escenic_indentifiers -> escenic_identifiers
---
 usr/share/escenic/build-scripts/build.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/build-scripts/build.sh b/usr/share/escenic/build-scripts/build.sh
index c5d20d91..d746edd3 100755
--- a/usr/share/escenic/build-scripts/build.sh
+++ b/usr/share/escenic/build-scripts/build.sh
@@ -20,7 +20,7 @@ svn_src_dir=~/src
 maven_conf_file=~/.m2/settings.xml
 project_assembly_dir=$svn_src_dir/project-assembly
 project_assembly_target_dir=$project_assembly_dir/target
-escenic_indentifiers="engine
+escenic_identifiers="engine
 community-engine
 forum
 geocode
@@ -35,6 +35,7 @@ widget-framework-core
 widget-framework-common
 widget-framework-mobile
 widget-framework-community
+widget-framework-syndication
 mobile-expansion
 "
 release_dir=~/releases
@@ -259,7 +260,7 @@ function svn_verify_assembly
 ##
 function symlink_ece_components
 {
-  for f in $escenic_indentifiers
+  for f in $escenic_identifiers
   do
     version=`sed "/<escenic.$f.version>/!d;s/ *<\/\?escenic.$f.version> *//g" $svn_src_dir/pom.xml | tr -d $'\r' `
     if [[ ! $version = "" ]]; then

From 1692779ce4b01e2cb704d40d825f2a711b62aa13 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 31 Aug 2012 12:19:17 +0200
Subject: [PATCH 1278/2585] -  Analysis Engine, fai_analysis_install=1, can now
 be installed with    only   
 technet_download_list="http://technet.escenic.com/downloads/release/53/analysis-engine-2.3.7.0.zip"
    Before, ECE & assemblytool were needed for the EAE profile too.

---
 usr/sbin/ece-install | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 841635a4..20b3c039 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -373,6 +373,10 @@ function check_for_required_downloads()
   
   print_and_log "Asserting that required downloads succeeded ..."
   local required_escenic_packages="engine assemblytool"
+  if [ $install_profile_number -eq $PROFILE_ANALYSIS_SERVER ]; then
+    required_escenic_packages="analysis-engine"
+  fi
+  
   local some_is_missing=0
   
   for el in $required_escenic_packages; do

From ab5808e509129d835bd43a6b9b16061d5681dcd0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 31 Aug 2012 12:26:28 +0200
Subject: [PATCH 1279/2585] - wf_user and wf_password are not needed for
 installing EAE

---
 .../doc/escenic/examples/ece-install-analysis-engine.conf     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/usr/share/doc/escenic/examples/ece-install-analysis-engine.conf b/usr/share/doc/escenic/examples/ece-install-analysis-engine.conf
index 1d6b0f04..e58c96fa 100644
--- a/usr/share/doc/escenic/examples/ece-install-analysis-engine.conf
+++ b/usr/share/doc/escenic/examples/ece-install-analysis-engine.conf
@@ -4,8 +4,6 @@
 ## repository.
 technet_user=
 technet_password=
-wf_user=
-wf_password=
 
 fai_enabled=1
 fai_analysis_install=1
@@ -15,5 +13,5 @@ fai_analysis_db_schema=analysisdb
 ## EAE only needs on download (ece-install will per default download a
 ## full stack of ECE & plugins):
 technet_download_list="
-http://technet.escenic.com/downloads/release/54/analysis-engine-2.4.0.127591.zip
+  http://technet.escenic.com/downloads/release/54/analysis-engine-2.4.0.127591.zip
 "

From cdefef1280c61da83976467955dead4d6e86a2d5 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 31 Aug 2012 14:07:11 +0200
Subject: [PATCH 1280/2585] - when installing EAE, ece-install will also
 configure the EAE plugin   for ECE correctly so that ECE finds the newly
 installed EAE. The   requirement for this is of course to the ECEs can see
 the same file   tree under /etc/escenic/engine/common that EAE has. If not,
 the EAE   Nursery configuration files, like EeaPluginConfig.properties, must 
  be made available to the ECEs.

  This fix will at the very least make the EAE instantly available on
  a one server system, like a test server or development PC.
---
 .../ece-scripts/ece-install.d/analysis-engine.sh  | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh
index 6a74a770..a12448d4 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh
@@ -62,5 +62,20 @@ function install_analysis_server() {
   # touching web.xml to trigger a re-deploy of the EAE Reports
   # application.
   run touch ${tomcat_base}/webapps/analysis-reports/WEB-INF/web.xml
+
+  set_up_analysis_plugin_nursery_conf
+  
   run_hook install_analysis_server.postinst
 }
+
+function set_up_analysis_plugin_nursery_conf() {
+  local file=$common_nursery_dir/com/escenic/analysis/EaePluginConfig.properties
+  cat > $file <<EOF
+eaeQsUrl=http://${appserver_host}:${appserver_port}/analysis-qs/QueryService
+earUrl=http://${appserver_host}:${appserver_port}/analysis-reports
+cacheSize=1000
+cacheElementTimeout=2
+distinctMetaCountEnabled=false
+EOF
+}
+

From c9eca1ed647c7b9b863c5099075ea431c81fcf17 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 31 Aug 2012 14:09:49 +0200
Subject: [PATCH 1281/2585] - now creates the mother directory of the
 EaePluginConfig..property - now gives user feedback on the location of the
 configured EAE   Nursery component.

---
 usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh
index a12448d4..9fbf0cdf 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh
@@ -70,6 +70,7 @@ function install_analysis_server() {
 
 function set_up_analysis_plugin_nursery_conf() {
   local file=$common_nursery_dir/com/escenic/analysis/EaePluginConfig.properties
+  make_dir $(dirname $file)
   cat > $file <<EOF
 eaeQsUrl=http://${appserver_host}:${appserver_port}/analysis-qs/QueryService
 earUrl=http://${appserver_host}:${appserver_port}/analysis-reports
@@ -77,5 +78,7 @@ cacheSize=1000
 cacheElementTimeout=2
 distinctMetaCountEnabled=false
 EOF
+
+  print_and_log "EAE Nursery component configured in $file"
 }
 

From 004140d05c332372386276d9fa64abb2eca87bcd Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 31 Aug 2012 14:10:06 +0200
Subject: [PATCH 1282/2585] - updated comment to reflect the code

---
 .../doc/escenic/examples/ece-install-analysis-engine.conf      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/usr/share/doc/escenic/examples/ece-install-analysis-engine.conf b/usr/share/doc/escenic/examples/ece-install-analysis-engine.conf
index e58c96fa..b0c563f4 100644
--- a/usr/share/doc/escenic/examples/ece-install-analysis-engine.conf
+++ b/usr/share/doc/escenic/examples/ece-install-analysis-engine.conf
@@ -1,7 +1,6 @@
 # Example ece-install.conf for installing the Escenic Analysis Engine
 
-## Your credentials for accessing the Escenic downloads & WF Maven
-## repository.
+## Your credentials for accessing the Escenic downloads.
 technet_user=
 technet_password=
 

From 0a96244f600b9d64c044423ccf04c6d999eee2b6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 31 Aug 2012 14:26:52 +0200
Subject: [PATCH 1283/2585] - added comments to the order of the EAE
 installation profiles.

---
 usr/sbin/ece-install | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 20b3c039..07f05648 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -1059,6 +1059,11 @@ if [ $fai_enabled -eq 1 ]; then
         no_fai_profile=0
     fi
 
+    # Important that the EAE is installed after all, editor and
+    # presentation in case it's running on the same host as any of
+    # them. This because it configures the EAE ECE plugin, which the
+    # ECE profiles also will copy out if EAE is listed in the
+    # technet_download_list.
     if [ $(get_boolean_conf_value fai_analysis_install) -eq 1 ]; then
         install_profile_number=$PROFILE_ANALYSIS_SERVER
         install_analysis_server

From f372bd7905db701336651dd3a601fe287417853c Mon Sep 17 00:00:00 2001
From: Kevin Flynn <kevin@kevin-Precision-M4500.(none)>
Date: Fri, 31 Aug 2012 14:33:50 +0200
Subject: [PATCH 1284/2585] finished restructuring profiles section

---
 usr/share/doc/escenic/ece-install-guide.org | 230 +++++++++++---------
 1 file changed, 124 insertions(+), 106 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 1a9a15a4..8e9bae24 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -262,6 +262,19 @@ script - how wild card variables are  expanded and so on.
 =ece-install= displays a series of progress messages during the
 installation process.
 
+You can redirect standard output to a log file for easy reading later
+on as follows:
+#+BEGIN_SRC text
+# bash ece-install > ece-install.out
+#+END_SRC
+
+If you are logged into the host via SSH, you can make it possible to
+log out and leave =ece-install= running in the background by adding
+=nohup= at the start of the command and an ampersand at the end, as follows:
+#+BEGIN_SRC text
+# nohup bash ece-install > ece-install.out &
+#+END_SRC
+
 ****** After Installing
 When installation is completed an information message is
 displayed. This contains important information about what you
@@ -313,14 +326,19 @@ one of the following parameters in =ece-install.conf=:
  - =fai_search_install=1= :: Installs a Search Server.
  - =fai_rmi_install=1= :: Installs an RMI Hub.
  - =fai_monitoring_install=1= :: Installs a Monitoring Server.
+ - =fai_publication_create=1= :: Creates an Escenic publication.
  - =fai_all_install=1= :: Installs all of the above on one host
       machine.
  - =fai_restore_from_backup=1= :: Restores a backup created with =ece=.
+ - =fai_analysis_install=1= :: Installs and configures an Escenic Analysis Engine.
+ - =fai_nfs_server_install=1= :: Installs an NFS server.
+ - =fai_nfs_client_install=1= :: Installs an NFS client.
+ - =fai_vip_install=1= :: Installs virtual IP (VIP) providers.
 
 There are a number of common components that are included in all or
 most of the profiles. These are described below.
 
-** <<<fai_editor_install>>>
+** <<<=fai_editor_install=>>>
 To use this profile add =fai_editor_install=1= to your
 =ece-install.conf= file.
 
@@ -329,7 +347,7 @@ create an Escenic *editorial server*. An editorial server (sometimes
 also called a publication server) hosts a Content Engine used for editorial
 purposes (primarily Content Studio sessions).
 
-** <<<fai_presentation_install>>>
+** <<<=fai_presentation_install=>>>
 To use this profile, add =fai_presentation_install=1= to your
 =ece-install.conf= file.
 
@@ -343,7 +361,7 @@ users. Differences between this and an editorial server include:
    required.
  * Memcached, the distributed memory cache is installed.
 
-** <<<fai_wf_install>>>
+** <<<=fai_wf_install=>>>
 To use this profile, add the following settings:
 #+BEGIN_SRC text
 fai_wf_install=1
@@ -363,7 +381,7 @@ installed on a machine where you have already installed either an
 editorial or presentation profile. Exactly which machines you install
 the Widget Framework on depends on your deployment strategy.
 
-** <<<fai_db_install>>>
+** <<<=fai_db_install=>>>
 To use this profile, add =fai_db_install=1= to your
 =ece-install.conf= file.
 
@@ -438,7 +456,7 @@ fai_db_master_log_position=106
 credentials. You can override these defaults by setting additional
 parameters in =ece-install.conf=. For details, see ??.
 
-** <<<fai_cache_install>>>
+** <<<=fai_cache_install=>>>
 To use this profile, add =fai_cache_install=1= to your
 =ece-install.conf= file.
 
@@ -473,20 +491,20 @@ TBD:
   to be in the staff network ACL, defined in the Varnish
   configuration. 
 
-** <<<fai_search_install>>>
+** <<<=fai_search_install=>>>
 To use this profile, add =fai_search_install=1= to your
 =ece-install.conf= file.
 
 This profile installs search components (Apache Solr plus the Escenic
 =indexer= web app.
 
-** <<<fai_rmi_install>>>
+** <<<=fai_rmi_install=>>>
 To use this profile, add =fai_rmi_install=1= to your
 =ece-install.conf= file.
 
 This profile installs an RMI hub.
 
-** <<<fai_monitoring_install>>>
+** <<<=fai_monitoring_install=>>>
 To use this profile, add =fai_monitoring_install=1= to your
 =ece-install.conf= file.
 
@@ -496,7 +514,7 @@ access to the reports Munin generates.
 TBD: This profile will also install the Nagios interface for
 monitoring the different nodes. 
 
-** <<<fai_publication_create>>>
+** <<<=fai_publication_create=>>>
 To use this profile, add =fai_publication_create=1= to your
 =ece-install.conf= file.
 
@@ -508,7 +526,7 @@ If the Widget Framework is installed on the machine, then the
 create publication is based on the Widget Framework. Otherwise the
 publication is based on the clean demo WAR supplied with the Content Engine.
 
-** <<<fai_all_install>>>
+** <<<=fai_all_install=>>>
 To use this profile, add =fai_all_install=1= to your
 =ece-install.conf= file.
 
@@ -519,7 +537,7 @@ server, application server, Escenic Content Engine, assembly host,
 database and Widget Framework is installed. In addition, a publication
 is created.
 
-** <<<fai_restore_from_backup>>>
+** <<<=fai_restore_from_backup=>>>
 To use this profile, add =fai_restore_from_backup=1= to your
 =ece-install.conf= file.
 
@@ -589,20 +607,49 @@ files you would like to remove using the following parameters:
 | =fai_restore_pre_wipe_solr=  |       0 | Remove the solr data/state files  |
 |------------------------------+---------+-----------------------------------|
 
-** <<<ai_analysis_install>>>
-This profile will install the Escenic Analysis Engine and configure it
-for production use with sane defaults. Be sure to use a different DB
-thank you use for ECE.
+*** Data security
+You must be careful when restoring backups that you don't
+inadvertently restore the backup over a system that actually contains
+valuable data. =ece-install= incorporates some safeguards, but
+ultimately cannot prevent you from making such mistakes.
+
+If you try to restore the DB and the ECE schema already exists, the
+restore will fail as follows:
+#+BEGIN_SRC text
+[ece-install-8] Restoring the database contents on ubiquitous ...
+[ece-install-24] Selecting the most recent database dump ece5db-2011-10-10.sql.gz
+ERROR 1007 (HY000) at line 1: Can't create database 'ece5db'; database exists
+ERROR 1050 (42S01) at line 25: Table '`ece5db`.`AccessControlList`' already exists
+[ece-install-24] The command [restoring from var/backups/escenic/ece5db-2011-10-10.sql.gz] FAILED, exiting :-(
+[ece-install-24] See /var/log/ece-install.log for further details.
+#+END_SRC
+
+** <<<=fai_analysis_install=>>>
+To use this profile, add =fai_analysis_install=1= to your
+=ece-install.conf= file.
+
+This profile installs the Escenic Analysis Engine, and configures it
+for production use with a sensible set of defaults.
+
+The Analysis Engine uses a database to store statistics. You must not
+use the same database as is used by the Content Engine for storing
+publication contents.
+
+** <<<=fai_nfs_server_install=>>>
+To use this profile, add =fai_nfs_server_install=1= to your
+=ece-install.conf= file.
+
+This profile installs an NFS server.
 
-** <<<fai_nfs_server_install>>>
-Will install an NFS server.
+** <<<=fai_nfs_client_install=>>>
+To use this profile, add =fai_nfs_client_install=1= to your
+=ece-install.conf= file.
 
-** <<<fai_nfs_client_install>>>
-Will install an NFS client, create all the mountpoints and mount these
-on the host.
+This profile installs an NFS client, creates the client mount points
+and mounts them on the host.
 
-Configuration example for setting up an NFS client mounting the
-multimedia archive on the NFS server:
+The following example shows the ece-install.conf settings required to 
+mount the Escenic multimedia archive on the NFS server:
 #+BEGIN_SRC conf
 fai_enabled=1
 fai_nfs_client_install=1
@@ -610,22 +657,37 @@ fai_nfs_server_address=192.168.1.200
 fai_nfs_export_list="/var/exports/multimedia"  
 #+END_SRC
 
-** <<<fai_vip_install>>>
+** <<<=fai_vip_install=>>>
 [[file:images/nfs-vip.png]]
 
-This profile will make the host capable of serving a certain virtual
-IP (VIP) for one or more services. This is a useful thing for all
-[[http://en.wikipedia.org/wiki/Single_point_of_failure][SPOFs]] in your architecture, such as the file server or database.
+To use this profile, add =fai_vip_install=1= to your
+=ece-install.conf= file.
+
+This profile is usually used in combination with one of the other
+=ece-install= profiles. It makes a host capable of providing the
+services it offers on specified virtual IP addresses (VIPs). This
+makes it possible to provide fail-over for for all single points of failure ([[http://en.wikipedia.org/wiki/Single_point_of_failure][SPOFs)]] in
+your installation, such as the file server or database.
+
+You might, for example, in order to provide a robust file
+server, install both an NFS server and a VIP provider on two hosts:
+
+ *  The primary NFS server that provides the normal service on one host
+ *  The secondary NFS server that takes over if the primary one fails
+    on the other.
 
-You will typically install another profile at the same time as the VIP
-provider. For instance, you will install both an NFS server and a VIP
-provider for that NFS server (and perhaps other services too running
-on the same host).
+Installing VIP providers with the =fai_vip_install= profile
+allows both servers to be accessed via the same virtual IP address, so
+that a fail-over is invisible to users of the service.
 
-The following ece-install.conf configuration will install an NFS
-server and make it a VIP provider exposing its NFS service. The two
-VIP providers have have the IP addresses 192.168.1.111 and
-192.168.1.112 and both provide the VIP 192.168.1.200
+The following =ece-install.conf= settings installs an NFS server and
+configures two VIP providers:
+
+ * The primary node (this host) at 192.168.1.112
+ * The secondary node at 192.168.1.111
+
+Both providers are configured to expose the NFS service on the VIP
+192.168.1.200.
 
 #+BEGIN_SRC conf
 # install the NFS server
@@ -639,75 +701,38 @@ fai_vip_install=1
 fai_vip_service_list="nfs-kernel-server"
 fai_vip_primary_node_name=ubiquitous
 fai_vip_primary_node_ip=192.168.1.112
-fai_vip_primary_node_auth_key=d41d8cd98f00b204e9800998ecf8427e
-fai_vip_secondary_node_name=ubiquitous-lts
+fai_vip_primary_node_auth_key=d41d8cd98f00b204e9800998ecf8427efai_vip_secondary_node_name=ubiquitous-lts
 fai_vip_secondary_node_ip=192.168.1.111
 fai_vip_address=192.168.1.200
 fai_vip_sibling_ip=$fai_vip_secondary_node_ip
 #+END_SRC
 
-The secondary node, also an NFS VIP provider can have the exact same
-configuration except for having a different sibling:
+The setting =fai_vip_sibling_ip=$fai_vip_secondary_node_ip= says that
+the secondary node is this node's sibling, and therefore implicitly
+defines this node as the primary node.
 
+The secondary node can therefore be defined using an almost identical
+configuration - only =fai_vip_sibling_ip= needs to be set differently:
 #+BEGIN_SRC conf
 fai_vip_sibling_ip=$fai_vip_primary_node_ip
 #+END_SRC
 
-Note that the fai_vip_primary_node_auth_key is optional. If not set,
-ece-install will generate it for you. However, you will then have to
-add this to ece-install.conf when installing the secondary
-node. Generate this key, do:
+The =fai_vip_primary_node_auth_key= setting is optional. If you do not
+set it, ece-install will generate it for you. However, you will then have to
+add the generated key to =ece-install.conf= when installing the secondary
+node.
 
+You can generate the key as follows:
 #+BEGIN_SRC sh
 $ dd if=/dev/urandom bs=512 count=1 | \
     openssl md5 | \
     cut -d' ' -f2   
 #+END_SRC
 
-** Data security
-You should take heed when running restore, so that you're not
-restoring a system which you didn't want to change (yes, this mishap
-does happen).
-
-The ece-install script will help you a bit on the way, but the final
-responsibility always lies with you as the user. 
-
-If you're trying to restore the DB and the ECE schema already exists,
-the restore will fail:
-#+BEGIN_SRC text
-[ece-install-8] Restoring the database contents on ubiquitous ...
-[ece-install-24] Selecting the most recent database dump ece5db-2011-10-10.sql.gz
-ERROR 1007 (HY000) at line 1: Can't create database 'ece5db'; database exists
-ERROR 1050 (42S01) at line 25: Table '`ece5db`.`AccessControlList`' already exists
-[ece-install-24] The command [restoring from var/backups/escenic/ece5db-2011-10-10.sql.gz] FAILED, exiting :-(
-[ece-install-24] See /var/log/ece-install.log for further details.
-#+END_SRC
-* Full Automatic Install (FAI)
-The ece-install script has support for doing a full automatic install
-(FAI). You can only install one profile at a time. The profiles are
-the parameters with "install" in their name, such as:
-#+BEGIN_SRC conf
-fai_editor_install
-#+END_SRC
-
-When running in FAI mode, you probably want to redirect standard
-output to a log file for easy reading later on:
-#+BEGIN_SRC text
-# bash ece-install > ece-install.out &
-#+END_SRC
-
-Alternatively, you may do:
-#+BEGIN_SRC text
-# nohup bash ece-install > ece-install.out &
-#+END_SRC
-The "nohup" at the beginning and the ampersand at the end lets you log
-out of the SSH/X session to your Linux/Unix box while the script keeps
-running in the background.
-
 ** Installing from EARs instead of Binaries
-It is possible to get ece-install to use a supplied EAR and
+It is possible to get =ece-install= to use a supplied EAR and
 configuration archive instead of using the files provided with the
-Escenic Content Engine & plugins.
+Escenic Content Engine and plugins.
 
 The EAR to provide is the one you generate with:
 #+BEGIN_SRC text
@@ -743,7 +768,7 @@ $ tar czf /tmp/nursery-skeleton-solr-and-security.tar.gz \
   engine/siteconfig/bootstrap-skeleton/
 #+END_SRC
 
-/tmp/nursery-skeleton-solr-and-security.tar.gz should now have everything
+=/tmp/nursery-skeleton-solr-and-security.tar.gz= should now have everything
 you need. You can now configure your FAI installation to use these by,
 e.g.:
 
@@ -827,7 +852,7 @@ If you do not want ece-install to touch your /etc/hosts, you can set
 fai_keep_off_etc_hosts=1 in your ece-install.conf
 
 ** Overview of All FAI Parameters
-The ece-install script understands for the following settings in the
+The ece-install script understands the following settings in the
 $HOME/ece-install.conf file of the root user:
 
 |---------------------------------------+--------------------------------------------------------------+----------------------------------------------------------------------------------------------------------|
@@ -920,13 +945,14 @@ $HOME/ece-install.conf file of the root user:
 | =fai_wf_install=                      | 0                                                            | Install Widget Framework profile                                                                         |
 |---------------------------------------+--------------------------------------------------------------+----------------------------------------------------------------------------------------------------------|
 
-As you've probably have guessed, 0 means "false" and 1 means "true" :-)
+0 means "false" and 1 means "true".
+
+** Example Configurations
+Here are a few simple example configurations:
 
-** Examples
-*** Installing an Editorial Server & Create a Publication
+****** Install an Editorial Server and Create a Publication
 To automatically install an editorial server and create a publication
-called "jollygood", the minimal configuration in ece-install.conf
-would be:
+called "jollygood", run =ece-install= with the following settings:
 
 #+BEGIN_SRC conf
 fai_enabled=1
@@ -935,16 +961,16 @@ fai_publication_create=1
 fai_publication_name=jollygood
 #+END_SRC
 
-*** Installing Two Presentation Servers On a Single Host
-If you wish to only install two presentation servers called "web1" and
-"web2" on your host, you will first run ece-install with:
+****** Install Two Presentation Servers On a Single Host
+To install two presentation servers called =web1= and
+=web2= on the same host,  first run =ece-install= with the following settings:
 #+BEGIN_SRC conf
 fai_enabled=1
 fai_presentation_install=1
 fai_presentation_name=web1
 #+END_SRC 
 
-And then re-issue ece-install with the following configuration:
+Then run it a second time with the following settings:
 #+BEGIN_SRC conf
 fai_enabled=1
 fai_presentation_install=1
@@ -952,17 +978,9 @@ fai_presentation_name=web2
 fai_presentation_port=8081
 fai_presentation_shutdown=8105
 #+END_SRC
-Notice that this configuration has some extra options since the
-previous run of ece-install could run with the default settings,
-whereas the second one needs to override these.
-
-
-** Verifying That the Script Is Running In FAI Mode
-When FAI is enabled, ece-install will report:
-#+BEGIN_SRC text
-[ece-install] Full Automatic Install (FAI) enabled.
-[ece-install] All user input will be read from /root/ece-install.conf
-#+END_SRC
+More parameters are required the second time. On the first run,
+defaults could be used, but the second time you need to override the
+defaults to ensure that the second server gets different values.
 
 * Running More Than One Installation Process
 If the script believes there's already an ece-intall process running,

From 906dfbae01daf38403d573d8c78036644e91cb57 Mon Sep 17 00:00:00 2001
From: Kevin Flynn <kevin@kevin-Precision-M4500.(none)>
Date: Fri, 31 Aug 2012 14:48:40 +0200
Subject: [PATCH 1285/2585] removed = from headings

---
 usr/share/doc/escenic/ece-install-guide.org | 30 ++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 8e9bae24..a3fc0a88 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -338,7 +338,7 @@ one of the following parameters in =ece-install.conf=:
 There are a number of common components that are included in all or
 most of the profiles. These are described below.
 
-** <<<=fai_editor_install=>>>
+** <<<fai_editor_install>>>
 To use this profile add =fai_editor_install=1= to your
 =ece-install.conf= file.
 
@@ -347,7 +347,7 @@ create an Escenic *editorial server*. An editorial server (sometimes
 also called a publication server) hosts a Content Engine used for editorial
 purposes (primarily Content Studio sessions).
 
-** <<<=fai_presentation_install=>>>
+** <<<fai_presentation_install>>>
 To use this profile, add =fai_presentation_install=1= to your
 =ece-install.conf= file.
 
@@ -361,7 +361,7 @@ users. Differences between this and an editorial server include:
    required.
  * Memcached, the distributed memory cache is installed.
 
-** <<<=fai_wf_install=>>>
+** <<<fai_wf_install>>>
 To use this profile, add the following settings:
 #+BEGIN_SRC text
 fai_wf_install=1
@@ -381,7 +381,7 @@ installed on a machine where you have already installed either an
 editorial or presentation profile. Exactly which machines you install
 the Widget Framework on depends on your deployment strategy.
 
-** <<<=fai_db_install=>>>
+** <<<fai_db_install>>>
 To use this profile, add =fai_db_install=1= to your
 =ece-install.conf= file.
 
@@ -456,7 +456,7 @@ fai_db_master_log_position=106
 credentials. You can override these defaults by setting additional
 parameters in =ece-install.conf=. For details, see ??.
 
-** <<<=fai_cache_install=>>>
+** <<<fai_cache_install>>>
 To use this profile, add =fai_cache_install=1= to your
 =ece-install.conf= file.
 
@@ -491,20 +491,20 @@ TBD:
   to be in the staff network ACL, defined in the Varnish
   configuration. 
 
-** <<<=fai_search_install=>>>
+** <<<fai_search_install>>>
 To use this profile, add =fai_search_install=1= to your
 =ece-install.conf= file.
 
 This profile installs search components (Apache Solr plus the Escenic
 =indexer= web app.
 
-** <<<=fai_rmi_install=>>>
+** <<<fai_rmi_install>>>
 To use this profile, add =fai_rmi_install=1= to your
 =ece-install.conf= file.
 
 This profile installs an RMI hub.
 
-** <<<=fai_monitoring_install=>>>
+** <<<fai_monitoring_install>>>
 To use this profile, add =fai_monitoring_install=1= to your
 =ece-install.conf= file.
 
@@ -514,7 +514,7 @@ access to the reports Munin generates.
 TBD: This profile will also install the Nagios interface for
 monitoring the different nodes. 
 
-** <<<=fai_publication_create=>>>
+** <<<fai_publication_create>>>
 To use this profile, add =fai_publication_create=1= to your
 =ece-install.conf= file.
 
@@ -526,7 +526,7 @@ If the Widget Framework is installed on the machine, then the
 create publication is based on the Widget Framework. Otherwise the
 publication is based on the clean demo WAR supplied with the Content Engine.
 
-** <<<=fai_all_install=>>>
+** <<<fai_all_install>>>
 To use this profile, add =fai_all_install=1= to your
 =ece-install.conf= file.
 
@@ -537,7 +537,7 @@ server, application server, Escenic Content Engine, assembly host,
 database and Widget Framework is installed. In addition, a publication
 is created.
 
-** <<<=fai_restore_from_backup=>>>
+** <<<fai_restore_from_backup>>
 To use this profile, add =fai_restore_from_backup=1= to your
 =ece-install.conf= file.
 
@@ -624,7 +624,7 @@ ERROR 1050 (42S01) at line 25: Table '`ece5db`.`AccessControlList`' already exis
 [ece-install-24] See /var/log/ece-install.log for further details.
 #+END_SRC
 
-** <<<=fai_analysis_install=>>>
+** <<<fai_analysis_install>>>
 To use this profile, add =fai_analysis_install=1= to your
 =ece-install.conf= file.
 
@@ -635,13 +635,13 @@ The Analysis Engine uses a database to store statistics. You must not
 use the same database as is used by the Content Engine for storing
 publication contents.
 
-** <<<=fai_nfs_server_install=>>>
+** <<<fai_nfs_server_install>>>
 To use this profile, add =fai_nfs_server_install=1= to your
 =ece-install.conf= file.
 
 This profile installs an NFS server.
 
-** <<<=fai_nfs_client_install=>>>
+** <<<fai_nfs_client_install>>>
 To use this profile, add =fai_nfs_client_install=1= to your
 =ece-install.conf= file.
 
@@ -657,7 +657,7 @@ fai_nfs_server_address=192.168.1.200
 fai_nfs_export_list="/var/exports/multimedia"  
 #+END_SRC
 
-** <<<=fai_vip_install=>>>
+** <<<fai_vip_install>>>
 [[file:images/nfs-vip.png]]
 
 To use this profile, add =fai_vip_install=1= to your

From 5306e49852b4514806c4e91ce134214ce1ab4f9a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 3 Sep 2012 12:53:21 +0200
Subject: [PATCH 1286/2585] - ece-install::analysis-engine :: must also set the
 EAE config class.

---
 usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh
index 9fbf0cdf..1e51c30a 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh
@@ -72,6 +72,7 @@ function set_up_analysis_plugin_nursery_conf() {
   local file=$common_nursery_dir/com/escenic/analysis/EaePluginConfig.properties
   make_dir $(dirname $file)
   cat > $file <<EOF
+\$class=com.escenic.ece.plugin.eae.EaePluginConfig
 eaeQsUrl=http://${appserver_host}:${appserver_port}/analysis-qs/QueryService
 earUrl=http://${appserver_host}:${appserver_port}/analysis-reports
 cacheSize=1000

From 676b94f5bebc114041e36f1dedbf87abb0c1116d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 3 Sep 2012 13:14:29 +0200
Subject: [PATCH 1287/2585] - changed the download directory from
 /tmp/ece-downloads to   /var/cache/ece-install. The new directory is both FHS
 compliant and   ensures that the downloads survive a system restart.

---
 usr/sbin/ece-install                        | 2 +-
 usr/share/doc/escenic/ece-install-guide.org | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 07f05648..a4502f9d 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -48,7 +48,7 @@ java_home=/usr/lib/jvm/java-6-sun
 
 pid_file=/var/run/$(basename $0).pid
 lock_file=/var/lock/$(basename $0).lock
-download_dir=/tmp/ece-downloads
+download_dir=/var/cache/$(basename $0)
 log=/var/log/$(basename $0).log
 conf_file=$HOME/ece-install.conf
 ece_scripts_git_source=https://github.com/skybert/ece-scripts.git
diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index a3fc0a88..31b44ae4 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -1006,8 +1006,9 @@ pre-requisite 3rd party libraries and only if any are missing will it
 ask the package manager to fetch it.
 
 Likewise, ece-install will see if the Escenic artifacts or application
-server that you need are already present in the /tmp/ece-downloads
-folder, and only download the missing ones (if any).
+server that you need are already present in the
+=/var/cache/ece-install= folder, and only download the missing ones
+(if any).
 
 To get a list of the artifacts it'll pull from
 http://technet.escenic.com and http://tomcat.apache.org search for the

From 904144ef46720c13b1f5fd0662727b8926d34eb0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 3 Sep 2012 16:26:04 +0200
Subject: [PATCH 1288/2585] - ./build.sh <release> now also builds
 configuration packages for all   machines defined in <project>/server-admin.
 If this configuration   directory is not available, no packages are crated:

  $ ./build.sh release
  [..]
  [build.sh-409] Configuration packages available here:
            http://builder.vizrtsaas.com/nie/releases/vosa-conf-staging-1-nie-trunk-r4821.deb
  [build.sh-409] Replace 'staging' with any of: [ analysis
            chnepmldbs001 chnepmldbs002 chnepmledt001 chnepmlpre001
            chnepmlpre002 chnepmlsta001 dev1 edit1 edit2 mon pres1
            pres2 staging ] for the other machines' conf packages.

  Both RPMs and DEBs are created.

  build.sh does this after creating the EAR, so it doesn't slow down
  the time a developer waits for a build of his/her templates.
---
 usr/share/escenic/build-scripts/build.sh | 144 +++++++++++++++++++++++
 1 file changed, 144 insertions(+)

diff --git a/usr/share/escenic/build-scripts/build.sh b/usr/share/escenic/build-scripts/build.sh
index d746edd3..4fc715cd 100755
--- a/usr/share/escenic/build-scripts/build.sh
+++ b/usr/share/escenic/build-scripts/build.sh
@@ -444,6 +444,149 @@ function phase_verify_project
   
 }
 
+## creates DEB and RPM packages with the server configuration for all
+## of the machines available in <project>/server-admin/<machine
+## instance>
+##
+## Common files are taken from <project>/server-admin/common.
+##
+## If <project>/server-admin doesn't exist, the method simply returns.
+function create_machine_conf_packages() {
+  local conf_dir=$svn_src_dir/server-admin
+  
+  if [ ! -d $conf_dir ]; then
+    return
+  fi
+
+  local machine_list=$(
+    find $conf_dir -maxdepth 1 -type d | \
+      egrep -v "common|.svn" | \
+      sed -e "s#$conf_dir##g" -e "s#^/##g" | \
+      sort | \
+      grep [a-z]
+  )
+
+  for machine in $machine_list; do
+    # work dir
+    local target_dir=$(mktemp -d)
+
+    # /etc/hosts
+    mkdir -p $target_dir/etc
+    echo "$(get_etc_hosts_for_machine ${machine} $conf_dir)" > $target_dir/etc/hosts
+
+    # common files
+    run cp -r $conf_dir/common/* $target_dir/
+    find $conf_dir -name .svn -type d | xargs rm -rf
+
+    # machine specific files
+    run cp -r $conf_dir/${machine}/* $target_dir/
+    find $target_dir -name .svn -type d | xargs rm -rf
+
+    # mark all files as conf files
+    local conffiles_file=$target_dir/DEBIAN/conffiles
+    run mkdir -p $(dirname $conffiles_file)
+    find $target_dir -type f | \
+      egrep -v DEBIAN | \
+      sed "s#$target_dir##" \
+      > $conffiles_file
+    
+    # debian control file
+    local control_file=$target_dir/DEBIAN/control
+    local package_name=vosa-conf-${machine}
+    local package_version=1-${customer}-${release_label}-r${revision}
+    cat > $control_file <<EOF
+Package: $package_name
+Version: $package_version
+Section: base
+Priority: optional
+Architecture: all
+Maintainer: ${package_maintainer_name-VizrtOnline} <${package_maintainer_email-vizrt.online@vizrt.com}>
+Description: Server configuration for ${machine}
+  This package is generated by the Vizrt SaaS script, $(basename $0) based
+  on the contents of $(basename $conf_dir) in ${USER}'s
+  Version Control System.
+EOF
+
+    if [ ! -x /usr/bin/dpkg-deb ]; then
+      print_and_log "You must have dpkg-deb installed :-("
+      remove_pid_and_exit_in_error
+    fi
+    
+    run dpkg-deb --build $target_dir
+    mv ${target_dir}.deb $target_dir/${package_name}-${package_version}.deb
+    
+    if [[ -x /usr/bin/alien && -x /usr/bin/fakeroot ]]; then
+      (
+        run cd $target_dir
+        run fakeroot alien --keep-version --to-rpm --scripts \
+          ${package_name}-${package_version}.deb
+      )
+    else
+      print_and_log "You must have 'alien' and 'fakeroot' installed to create RPMs"
+    fi
+
+    # move the machine's DEB and RPM packges to the release directory
+    run mv $target_dir/*.{deb,rpm} $release_dir/
+    
+    # remove work directory
+    run rm -rf $target_dir
+  done
+
+  print_and_log "Configuration packages available here: " \
+    "http://builder.vizrtsaas.com/$customer/releases/${package_name}-${package_version}.deb"
+  print_and_log "Replace '$machine' with any of: [" \
+    $machine_list "] for the other machines' conf packages."
+}
+
+## Generates the /etc/hosts file for the given machine.
+## 
+## $1 :: the machine name
+## $2 :: the server-admin directory
+function get_etc_hosts_for_machine() {
+  if [ -z "$1" -o -z "$2" ]; then
+    return
+  fi
+  
+  local instance=$1
+  local files_dir=$2
+  
+  if [ ! -d $files_dir/common/etc/hosts.d ]; then
+    return
+  fi
+
+  cat <<EOF
+########################################################################
+## /etc/hosts generated by $(basename $0) on ${HOSTNAME}
+########################################################################
+127.0.0.1	localhost
+127.0.1.1	${instance}
+
+## The following lines are desirable for IPv6 capable hosts
+::1     ip6-localhost ip6-loopback
+fe00::0 ip6-localnet
+ff00::0 ip6-mcastprefix
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters
+########################################################################
+EOF
+
+  local find_dirs=${files_dir}/common/etc/hosts.d
+  if [ -d ${files_dir}/${instance}/etc/hosts.d ]; then
+    find_dirs="$find_dirs ${files_dir}/${instance}/etc/hosts.d"
+  fi
+  
+  find  \
+    $find_dirs \
+    -maxdepth 1 \
+    -type f | while read f; do
+    cat <<EOF
+## From ${HOSTNAME}:${f}
+$(cat $f)
+
+EOF
+  done
+}
+
 ##
 function phase_release
 {
@@ -453,6 +596,7 @@ function phase_release
   generate_publication_properties
   ant_build
   publish_ear
+  create_machine_conf_packages
   print_result
 }
 

From f3a31711e31ba8625ab8305c45c6ef2b27a8c901 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 3 Sep 2012 16:29:38 +0200
Subject: [PATCH 1289/2585] - don't exit in error if dpkg-deb isn't installed,
 just log an error message.

---
 usr/share/escenic/build-scripts/build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/build-scripts/build.sh b/usr/share/escenic/build-scripts/build.sh
index 4fc715cd..4ec4f388 100755
--- a/usr/share/escenic/build-scripts/build.sh
+++ b/usr/share/escenic/build-scripts/build.sh
@@ -508,8 +508,8 @@ Description: Server configuration for ${machine}
 EOF
 
     if [ ! -x /usr/bin/dpkg-deb ]; then
-      print_and_log "You must have dpkg-deb installed :-("
-      remove_pid_and_exit_in_error
+      print_and_log "You must have dpkg-deb installed to create packages :-("
+      return
     fi
     
     run dpkg-deb --build $target_dir

From 1300f395ff226ce73c78c65ad164c982abff0d98 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 3 Sep 2012 17:17:50 +0200
Subject: [PATCH 1290/2585] - several times (~once per 2-3 months), the
 oab-java script has failed   because of changes to the download page on
 oracle.com. ece-install   will now provide a helpful message as how to get
 around the problem   of failed downloads:

  [ece-install-29] Creating Oracle/Sun Java packages failed. Probably it was
  [ece-install-29] the downloading of the software binaries that failed.
  [ece-install-29] Download the following files to /var/local/oab/pkg and try again:
  [ece-install-29] - jce_policy-6.zip
  [ece-install-30] - jdk-6u34-linux-i586.bin
  [ece-install-30] - jdk-6u34-linux-x64.bin

  This closes #95
---
 .../escenic/ece-scripts/ece-install.d/java.sh | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/java.sh b/usr/share/escenic/ece-scripts/ece-install.d/java.sh
index b5c1c748..6c341200 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/java.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/java.sh
@@ -4,16 +4,34 @@ if [[ $(uname -m) == "x86_64" ]]; then
 fi
   
 function create_java_deb_packages_and_repo() {
-  print $(lsb_release -i | cut -d':' -f2) \
+  print_and_log $(lsb_release -i | cut -d':' -f2) \
     $(lsb_release -r | cut -d':' -f2) \
-    "doesn't have official Sun/Oracle Java packages,"
-  print "creating packages & local repo for you ..."
+    "doesn't have official Oracle/Sun Java packages,"
+  print_and_log "creating packages & local repo for you ..."
   
   local tmp_dir=$(mktemp -d)
   run cd $tmp_dir
   run git clone https://github.com/flexiondotorg/oab-java6.git
   run cd oab-java6
-  run bash oab-java.sh
+
+  # oab fails regularly, every 2-3 months or so, so we must take extra
+  # heed here.
+  bash oab-java.sh 1>> $log 2>> $log
+  if [ $? -gt 0 ]; then
+    local oab_pkg_dir=/var/local/oab/pkg
+    local oab_pkg_list="
+      jce_policy-6.zip
+      jdk-6u34-linux-i586.bin
+      jdk-6u34-linux-x64.bin"
+    print_and_log "Creating Oracle/Sun Java packages failed. Probably it was"
+    print_and_log "the downloading of the software binaries that failed."
+    print_and_log "Download the following files to $oab_pkg_dir and try"
+    print_and_log "again:"
+    for el in $oab_pkg_list; do
+      print_and_log "  - $el"
+    done
+    remove_pid_and_exit_in_error
+  fi
   run rm -rf $tmp_dir
     
   add_next_step "Local APT repository with Sun/Oracle Java packages"

From 0291f391827c15081396070c94ce799bb964a565 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 4 Sep 2012 07:23:36 +0200
Subject: [PATCH 1291/2585] - updated ece-install-dev-environment-from-ear.conf
 to use   fai_presentation_deploy_white_list instead of  
 fai_publication_deploy_white_list.

  #92
---
 .../escenic/examples/ece-install-dev-environment-from-ear.conf  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/escenic/examples/ece-install-dev-environment-from-ear.conf b/usr/share/doc/escenic/examples/ece-install-dev-environment-from-ear.conf
index 4cfd8e0e..b0466db2 100644
--- a/usr/share/doc/escenic/examples/ece-install-dev-environment-from-ear.conf
+++ b/usr/share/doc/escenic/examples/ece-install-dev-environment-from-ear.conf
@@ -45,7 +45,7 @@ fai_db_install=1
 fai_presentation_install=1
 fai_presentation_ear=http://my.buildserver.com/mypub-trunk-rev3568-2012-05-28_1213.ear
 fai_presentation_name=engine1
+fai_presentation_deploy_white_list='mypub escenic-admin indexer-webservice webservice escenic studio'
 
 # Publication
 fai_publication_domain_mapping_list="mypub#example.com"
-fai_publication_deploy_white_list='mypub escenic-admin indexer-webservice webservice escenic studio'

From 3c12611251e0bcceb96fa0061d8ec1e5e60c06df Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 4 Sep 2012 08:14:14 +0200
Subject: [PATCH 1292/2585] - Get rid of serialization errors to memcached.

---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index d1ea4c47..3c3f2f70 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -477,6 +477,9 @@ log4j.appender.ECELOG=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.ECELOG.File=$escenic_log_dir/\${escenic.server}-messages
 log4j.appender.ECELOG.layout=org.apache.log4j.PatternLayout
 log4j.appender.ECELOG.layout.ConversionPattern=%d %5p [%t] %x (%c) %m%n
+
+# Get rid of serialization errors to memcached.
+log4j.category.com.danga.MemCached.MemCachedClient=FATAL
 EOF
   cd $tomcat_base/lib/
   make_ln $common_nursery_dir/trace.properties

From c0c9d39fd5eb2f7e3d1cf15a095b67214333d3a0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 4 Sep 2012 10:34:23 +0200
Subject: [PATCH 1293/2585] - added the download link to the Java 6 bundles.
 Hopefully, this URL   woun't change...

---
 usr/share/escenic/ece-scripts/ece-install.d/java.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/java.sh b/usr/share/escenic/ece-scripts/ece-install.d/java.sh
index 6c341200..3aa42514 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/java.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/java.sh
@@ -25,7 +25,8 @@ function create_java_deb_packages_and_repo() {
       jdk-6u34-linux-x64.bin"
     print_and_log "Creating Oracle/Sun Java packages failed. Probably it was"
     print_and_log "the downloading of the software binaries that failed."
-    print_and_log "Download the following files to $oab_pkg_dir and try"
+    print_and_log "Go to http://www.oracle.com/technetwork/java/javase/downloads"
+    print_and_log "and download the following files to $oab_pkg_dir and try"
     print_and_log "again:"
     for el in $oab_pkg_list; do
       print_and_log "  - $el"

From b1022af961246cb9a68d8710c60ad551c1f7f5bf Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 4 Sep 2012 11:17:37 +0200
Subject: [PATCH 1294/2585] - Get rid of the browser log which for some reason
 wanders into the   standard log4j log

---
 .../escenic/ece-scripts/ece-install.d/content-engine.sh     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 3c3f2f70..8f0a3528 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -478,6 +478,12 @@ log4j.appender.ECELOG.File=$escenic_log_dir/\${escenic.server}-messages
 log4j.appender.ECELOG.layout=org.apache.log4j.PatternLayout
 log4j.appender.ECELOG.layout.ConversionPattern=%d %5p [%t] %x (%c) %m%n
 
+# Get rid of the browser log which for some reason wanderse into the
+# standard log4j log
+log4j.appender.NOLOGGING=org.apache.log4j.varia.NullAppender
+log4j.additivity.browser=false
+log4j.category.browser=FATAL, NOLOGGING
+
 # Get rid of serialization errors to memcached.
 log4j.category.com.danga.MemCached.MemCachedClient=FATAL
 EOF

From d3c25b8812d6f4fa26468d906e42accc4480a419 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 5 Sep 2012 08:13:12 +0200
Subject: [PATCH 1295/2585] - added support for EAE to the cache server
 profile. If the user has

     fai_analysis_host

  and optionally:

     fai_analysis_port

  set when running the cache server profile:

     fai_cache_install=1

  ece-install will set up Varnish to use the analysis engine backend
  for all requests going to /analysis-logger.

  For security reasons, Varnish will not allow access to /analysis-qs
  and /analysis-reports, these will be called directly on the local
  network by the ECE instances.

  This closes #96
---
 .../ece-scripts/ece-install.d/cache-server.sh | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
index 298c201e..343a4c54 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
@@ -127,6 +127,16 @@ EOF
     i=$(( $i+1 ))
   done
 
+  if [ -n "${fai_analysis_host}" ]; then
+    cat >> /etc/varnish/default.vcl <<EOF
+backend analysis {
+  .host = "${fai_analysis_host}";
+  .port = "${fai_analysis_port-${default_app_server_port}}";
+}
+
+EOF
+  fi
+
   cat >> /etc/varnish/default.vcl <<EOF
 /* The client director gives us session stickiness based on client
  * IP. */
@@ -168,6 +178,16 @@ sub vcl_recv {
     set req.url = regsub(req.url, "^/munin", "/");
     set req.backend = static;
   }
+EOF
+  if [ -n "${fai_analysis_host}" ]; then
+    cat >> /etc/varnish/default.vcl <<EOF
+  else if (req.url ~ "^/analysis-logger/") {
+    set req.backend = analysis;
+  }
+EOF
+  fi
+  
+  cat >> /etc/varnish/default.vcl <<EOF
   else {
     set req.backend = webdirector;
   }

From cc844068cc59ffa7fa98f822b06bf9ea5c3921fe Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 5 Sep 2012 12:49:23 +0200
Subject: [PATCH 1296/2585] - fixed trail_cache_servers so it's called the same
 as the others

---
 usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
index 343a4c54..e817dbf5 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
@@ -238,5 +238,5 @@ EOF
 function leave_cache_trails() {
   leave_trail "trail_cache_host=${HOSTNAME}"
   leave_trail "trail_cache_port=${cache_port}"
-  leave_trail "trail_backend_servers=$backend_servers"
+  leave_trail "trail_cache_backend_servers=$backend_servers"
 }

From 4b9c558cd2e0e72448642ede59eb1d3604f54be6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 5 Sep 2012 12:58:33 +0200
Subject: [PATCH 1297/2585] - content-engine::leave_content_engine_trails now
 uses constants for   the various ports.

---
 .../ece-scripts/ece-install.d/content-engine.sh  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 8f0a3528..3221f3e6 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -703,20 +703,20 @@ function set_up_engine_directories() {
 
 function leave_content_engine_trails() {
   if [ ${fai_editor_install-0} -eq 1 ]; then
-    leave_trail "trail_editor_port=${fai_editor_port-8080}"
-    leave_trail "trail_editor_shutdown=${fai_editor_shutdown-8005}"
+    leave_trail "trail_editor_port=${fai_editor_port-${default_app_server_port}}"
+    leave_trail "trail_editor_shutdown=${fai_editor_shutdown-${default_app_server_shutdown}}"
   fi
   if [ ${fai_presentation_install-0} -eq 1 ]; then
-    leave_trail "trail_presentation_port=${fai_presentation_port-8080}"
-    leave_trail "trail_presentation_shutdown=${fai_presentation_shutdown-8005}"
+    leave_trail "trail_presentation_port=${fai_presentation_port-${default_app_server_port}}"
+    leave_trail "trail_presentation_shutdown=${fai_presentation_shutdown-${default_app_server_shutdown}}"
   fi
   if [ ${fai_analysis_install-0} -eq 1 ]; then
-    leave_trail "trail_analysis_port=${fai_analysis_port-8080}"
-    leave_trail "trail_analysis_shutdown=${fai_analysis_shutdown-8005}"
+    leave_trail "trail_analysis_port=${fai_analysis_port-${default_app_server_port}}"
+    leave_trail "trail_analysis_shutdown=${fai_analysis_shutdown-${default_app_server_shutdown}}"
   fi
   if [ ${fai_all_install-0} -eq 1 ]; then
-    leave_trail "trail_all_port=8080"
-    leave_trail "trail_all_shutdown=8005"
+    leave_trail "trail_all_port=${default_app_server_port}"
+    leave_trail "trail_all_shutdown=${default_app_server_shutdown}"
   fi
   
   leave_trail "trail_public_host_name=${public_host_name}"

From f69370960e4d3d1bf1740147b45c94044340145e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 5 Sep 2012 13:14:15 +0200
Subject: [PATCH 1298/2585] - removed duplicate trails from the content-engine
 module as most were   already defined in the app-server module.

- moved one trail from content-engine to app-server, namely trail_analysis_*
---
 .../ece-scripts/ece-install.d/app-server.sh     |  3 +++
 .../ece-scripts/ece-install.d/content-engine.sh | 17 -----------------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 965fded7..aac7d04d 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -37,6 +37,9 @@ function set_up_app_server()
       redirect_port=${fai_analysis_redirect-${default_app_server_redirect}}
       leave_trail "trail_analysis_host=${HOSTNAME}"
       leave_trail "trail_analysis_port=${fai_analysis_port-${default_app_server_port}}"
+    elif [ $install_profile_number -eq $PROFILE_ALL_IN_ONE ]; then
+      leave_trail "trail_all_port=${default_app_server_port}"
+      leave_trail "trail_all_shutdown=${default_app_server_shutdown}"
     fi
   fi
 
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 3221f3e6..07047b7c 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -702,23 +702,6 @@ function set_up_engine_directories() {
 }
 
 function leave_content_engine_trails() {
-  if [ ${fai_editor_install-0} -eq 1 ]; then
-    leave_trail "trail_editor_port=${fai_editor_port-${default_app_server_port}}"
-    leave_trail "trail_editor_shutdown=${fai_editor_shutdown-${default_app_server_shutdown}}"
-  fi
-  if [ ${fai_presentation_install-0} -eq 1 ]; then
-    leave_trail "trail_presentation_port=${fai_presentation_port-${default_app_server_port}}"
-    leave_trail "trail_presentation_shutdown=${fai_presentation_shutdown-${default_app_server_shutdown}}"
-  fi
-  if [ ${fai_analysis_install-0} -eq 1 ]; then
-    leave_trail "trail_analysis_port=${fai_analysis_port-${default_app_server_port}}"
-    leave_trail "trail_analysis_shutdown=${fai_analysis_shutdown-${default_app_server_shutdown}}"
-  fi
-  if [ ${fai_all_install-0} -eq 1 ]; then
-    leave_trail "trail_all_port=${default_app_server_port}"
-    leave_trail "trail_all_shutdown=${default_app_server_shutdown}"
-  fi
-  
   leave_trail "trail_public_host_name=${public_host_name}"
 }
 

From 0914ed363b8c65d265491d0e19b81a42adb350dc Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 5 Sep 2012 13:17:35 +0200
Subject: [PATCH 1299/2585] - only mark files in /<etc> and /any/<conf>/file as
 conf files (in the   Debian package).

---
 usr/share/escenic/build-scripts/build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/build-scripts/build.sh b/usr/share/escenic/build-scripts/build.sh
index 4ec4f388..46e7c10d 100755
--- a/usr/share/escenic/build-scripts/build.sh
+++ b/usr/share/escenic/build-scripts/build.sh
@@ -486,6 +486,7 @@ function create_machine_conf_packages() {
     local conffiles_file=$target_dir/DEBIAN/conffiles
     run mkdir -p $(dirname $conffiles_file)
     find $target_dir -type f | \
+      egrep "etc|conf" | \"
       egrep -v DEBIAN | \
       sed "s#$target_dir##" \
       > $conffiles_file

From b90b0dcf54042a1d8b02533c42e18d56b0e0d856 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 6 Sep 2012 13:26:27 +0200
Subject: [PATCH 1300/2585] - now uses the java defined in
 /etc/escenic/ece.conf, if it exists,   instead of the java in PATH.

  If ece.conf doesn't exist or isn't readable, the java, if available,
  in PATH is used.
---
 .../ece-scripts/system-info.d/44-java-info.sh     | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/44-java-info.sh b/usr/share/escenic/ece-scripts/system-info.d/44-java-info.sh
index 27fb0087..7b23cb37 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/44-java-info.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/44-java-info.sh
@@ -1,8 +1,19 @@
 #! /usr/bin/env bash
 
-if [ $(which java 2>/dev/null | wc -l) -gt 0 ]; then
+java_bin=$(which java)
+file=/etc/escenic/ece.conf
+
+if [ -r $file ]; then
+  # don't like sourcing ece.conf, so getting it from grep instead.
+  the_java_home=$(grep ^java_home $file | cut -d'=' -f2)
+  if [ -n "$the_java_home" && -d "$the_java_home" ]; then
+    java_bin=$the_java_home/bin/java
+  fi
+fi
+
+if [ $(ls $java_bin 2>/dev/null | wc -l) -gt 0 ]; then
   print_h2_header "Java information"
-  print_pre_text $(java -version 2>&1)
+  print_pre_text $(${java_bin} -version 2>&1)
   print_section_end
 fi
 

From 93d206edbe5e48e8d6aeb0a016ab3997baae485f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@geronimo>
Date: Fri, 7 Sep 2012 09:38:24 +0200
Subject: [PATCH 1301/2585] - improved the text in the generated conf packages
 to make it clear   what is the source of the package contents and where it
 was built.

---
 usr/share/escenic/build-scripts/build.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/build-scripts/build.sh b/usr/share/escenic/build-scripts/build.sh
index 4ec4f388..e1bfd756 100755
--- a/usr/share/escenic/build-scripts/build.sh
+++ b/usr/share/escenic/build-scripts/build.sh
@@ -502,9 +502,9 @@ Priority: optional
 Architecture: all
 Maintainer: ${package_maintainer_name-VizrtOnline} <${package_maintainer_email-vizrt.online@vizrt.com}>
 Description: Server configuration for ${machine}
-  This package is generated by the Vizrt SaaS script, $(basename $0) based
-  on the contents of $(basename $conf_dir) in ${USER}'s
-  Version Control System.
+  This package is generated by the Vizrt SaaS script $(basename $0)
+  on $HOSTNAME based on the contents of the $(basename $conf_dir)
+  directory in the ${USER} user's Version Control System.
 EOF
 
     if [ ! -x /usr/bin/dpkg-deb ]; then

From 197c5a2e8ab4d32d1ee84794d2f8341dbe3cf7bd Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@geronimo>
Date: Fri, 7 Sep 2012 11:42:30 +0200
Subject: [PATCH 1302/2585] - ece-install::appserver now leaves trails for
 builder_http_user and   builder_http_password

---
 usr/share/escenic/ece-scripts/ece-install.d/app-server.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index aac7d04d..78de163c 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -450,6 +450,8 @@ function set_http_auth_credentials_if_needed() {
   if [[ -n "$fai_builder_http_user" && -n "$fai_builder_http_password" ]]; then
     set_ece_instance_conf builder_http_user "$fai_builder_http_user"
     set_ece_instance_conf builder_http_password "$fai_builder_http_password"
+    leave_trail trail_builder_http_user="$fai_builder_http_user"
+    leave_trail trail_builder_http_password="$fai_builder_http_password"
   fi
 
   local http_user=""

From 6e57da50daace7f2c7ce246bcd82ca9cc9a6ba90 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@geronimo>
Date: Fri, 7 Sep 2012 12:25:48 +0200
Subject: [PATCH 1303/2585] - added support for using trail_today_date_full
 which will insert   dates on the format like: Fri Sep  7 12:25:40 CEST 2012
 in the   documentation.

---
 usr/share/doc/vizrt/vosa-handbook/create-handbook.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 6665a7f5..db94ebf5 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -94,6 +94,7 @@ function set_defaults_if_the_trails_are_not_set() {
   trail_presentation_host=${trail_presentation_host-pres1}
   trail_presentation_host_list=${trail_presentation_host_list-${trail_presentation_host}}
   trail_today_date=${trail_today_date-$(date --iso)}
+  trail_today_date_full=${trail_today_full-$(date)}
 }
 
 function expand_all_variables_in_org_files() {

From 16a683d8de8244265c521b49db132f718114b5ca Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@geronimo>
Date: Fri, 7 Sep 2012 12:26:32 +0200
Subject: [PATCH 1304/2585] - added section on how to update the server
 configuration to the   deployment chapter.

---
 .../doc/vizrt/vosa-handbook/deployment.org    | 116 +++++++++++++++++-
 1 file changed, 112 insertions(+), 4 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/deployment.org b/usr/share/doc/vizrt/vosa-handbook/deployment.org
index 418d8d86..2721a710 100644
--- a/usr/share/doc/vizrt/vosa-handbook/deployment.org
+++ b/usr/share/doc/vizrt/vosa-handbook/deployment.org
@@ -47,7 +47,7 @@ $ sudo ssh escenic@<%= trail_presentation_host %> ece -i engine1 --uri http://<%
 We can now restart the ECE:
 
 #+BEGIN_SRC sh
-$ sudo ssh root@<%= trail_presentation_host %> /etc/init.d/ece restart 
+$ sudo ssh root@<%= trail_presentation_host %> /etc/init.d/ece restart
 [ece#engine-engine1] Stopping the engine1 instance of engine on <%= trail_presentation_host %>...
 [ece#engine-engine1] Starting the engine1 instance of engine on <%= trail_presentation_host %>...
 [ece#search-search1] Stopping the search1 instance of search on <%= trail_presentation_host %>...
@@ -74,7 +74,7 @@ torstein@control:~$ sudo ssh escenic@<%= trail_presentation_host %> ece
 [ece#search-search1] Deploying http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev4121-<%= trail_today_date %>_1524.ear on search1 ...
 [ece#search-search1] Deploying /var/cache/escenic/<%= trail_builder_user %>-trunk-rev4121-<%= trail_today_date %>_1524.ear on tomcat ...
 [ece#search-search1] Deployment white list active, only deploying: escenic-admin solr indexer-webapp
-[ece#search-search1] Deployment state file updated: /var/lib/escenic/search1.state  
+[ece#search-search1] Deployment state file updated: /var/lib/escenic/search1.state
 #+END_SRC
 
 
@@ -118,12 +118,12 @@ $ cd /opt/tomcat-engine1/webapps/<%= trail_webapp_name %>/META-INF/escenic/publi
 
 Then, confirm the changes using diff:
 #+BEGIN_SRC sh
-$ diff -w ~/backup/content-type-$(date --iso)-before-deployment content-type  
+$ diff -w ~/backup/content-type-$(date --iso)-before-deployment content-type
 #+END_SRC
 
 Now, upload the new content-type to ECE.  The command below assumes
 that there is a file called the same as the publication resource in
-the current directory. 
+the current directory.
 #+BEGIN_SRC sh
 $ ece -i engine1 -p <%= trail_publication_name %> -r content-type update
 #+END_SRC
@@ -142,3 +142,111 @@ $ diff -w ~/backup/content-type-$(date --iso)-before-deployment \
 #+END_SRC
 
 
+** Updating Server Configuration
+*** Make changes to the =server-admin= tree
+In the <%= trail_builder_user %> source tree, there is a directory
+called =server-admin=. This contains all the files that are hand
+crafted because the file values cannot be generated by simply running
+=ece-install= with the correct parameters.
+
+The structure is as follows: =server-admin/<common|<machine>>/<full
+file path>=. Below are some examples to help illustrate how to use
+this file tree:
+
+#+BEGIN_SRC text
+(1) server-admin/common
+(2) server-admin/common/etc/hosts.d
+(3) server-admin/<%= trail_presentation_host %>/etc/escenic/ece-engine1.conf
+(4) server-admin/<%= trail_db_master_host %>/etc/mysql/my.cnf
+#+END_SRC
+|------+-----------------------------------------------------------------------------------------|
+| Path | Description                                                                             |
+|------+-----------------------------------------------------------------------------------------|
+| (1)  | Common files for all machines.                                                          |
+| (2)  | Files that together generate the =/etc/hosts= when you [[Build New Configuration Packages]] |
+| (3)  | The =/etc/escenic/ece-engine1.conf= specific for <%= trail_presentation_host %>         |
+| (4)  | The =/etc/mysql/my.cnf= specificf for the <%= trail_db_master_host %> machine.          |
+|------+-----------------------------------------------------------------------------------------|
+
+There will always be _some_ files in your =server-admin= tree, but as
+a rule of thumb, try to keep this to a minimum.
+
+=ece-install= (and the OS package of course) should provide sensible
+defaults for most components given that you pass it the appropriate
+settings in the machine's =ece-install.conf=, so ultimately, you'd
+only have to check in the =ece-install.conf= for the
+<%= trail_control_host %> machine so that it's able to install the
+other machines, plus the appropriate file(s) in
+=server-admin/common/etc/hosts.d=.
+
+Let's say we want to change the memory setting in =ece-engine1.conf=
+for the =<%= trail_presentation_host %>= machine only. Go to your
+checked out <%= trail_builder_user %> source code and edit the file
+(or indeed add it if it's not already there, in which case would mean
+that you're running with the defaults set up by =ece-install=):
+
+#+BEGIN_SRC text
+my-machine $ vi ~/src/<%= trail_builder_user %>/server-admin/<%= trail_presentation_host %>/etc/escenic/ece-engine1.conf
+#+END_SRC
+
+Make your changes and then commit them using an appropriate ticked ID
+in the log message, e.g.:
+#+BEGIN_SRC text
+my-machine $ svn ci ~/src/<%= trail_builder_user %>/server-admin/<%= trail_presentation_host %>/etc/escenic/ece-engine1.conf -m "<%= trail_builder_user %>-344: increased the max and min heap sizes to 4GB because we've got so many objects"
+#+END_SRC
+
+That's it, you're now ready to [[Build New Configuration Packages]]!
+
+*** Build New Configuration Packages
+Log on to the build server, just as you did in [[Building a new EAR file]]
+When you've issued a build, you'll see that builder also have created
+packages for all of the machines you've defined in your =server-admin=
+directory tree.
+
+#+BEGIN_SRC text
+<%= trail_builder_user %>@<%= trail_builder_host %>:~$ ./build.sh release
+[build.sh-0] Starting building @ <%= trail_today_date_full %>
+[build.sh-256] Adding an assembly descriptor for Dashboard ...
+[build.sh-374] Build SUCCESSFUL! @ <%= trail_today_date_full %>
+[build.sh-374] You'll find the release here: http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev4121-<%= trail_today_date_full %>_1524.ear
+[build.sh-407] Conf packages available: http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/vosa-conf-<%= trail_presentation_host %>-1-<%= trail_builder_user %>-trunk-r4899.deb
+[build.sh-407] Replace '<%= trail_presentation_host %>' with any of: [ <%= trail_editor_host %> <%= trail_db_master_host %> <%= trail_db_slave_host %> <%= trail_import_host %> <%= trail_analysis_host %> <%= trail_presentation_host_list %> ] for the other machines' conf packages.
+<%= trail_builder_user %>@<%= trail_builder_host %>:~$
+#+END_SRC
+
+*** Deploying the Configuration Packages
+Log on to the different hosts, download their DEB package and install
+it using =dpkg=. Here, we use <%= trail_presentation_host %> as an
+example:
+
+#+BEGIN_SRC text
+<%= trail_control_host %>$ ssh <%= trail_presentation_host %>
+<%= trail_presentation_host %>$ cd /tmp
+<%= trail_presentation_host %>$ wget \
+  --quiet \
+  --http-user <%= trail_builder_http_user %> \
+  --http-password <%= trail_builder_http_password %> \
+  http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/vosa-conf-<%= trail_presentation_host %>-1-<%= trail_builder_user %>-trunk-r4899.deb
+<%= trail_presentation_host %>$ sudo -i vosa-conf-<%= trail_presentation_host %>-1-<%= trail_builder_user %>-trunk-r4899.deb
+#+END_SRC
+
+Because of the mighty =dpkg= and the =DEB= package format, you'll get
+prompted for any abnormalities, like if someone has changed any of the
+conf package files locally since you last updated the package, if
+you've got other, conflicting configuration packages installed on so
+on.
+
+Now, you have full control over your configuration being in sync with your EAR deployment. You can easily confirm that you're running the configuration corresponding to your EAR by these two commands:
+#+BEGIN_SRC text
+<%= trail_presentation_host %>$ -l vosa-conf-<%= trail_presentation_host %> | grep ^ii
+ii   vosa-conf-<%= trail_presentation_host %>   1-<%= trail_builder_user%>-trunk-r4899    Server configuration for <%= trail_presentation_host %>
+#+END_SRC
+#+BEGIN_SRC text
+<%= trail_presentation_host %>$ ece -i engine1 info | grep EAR
+[ece#engine-engine1] |-> EAR used: http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev4899-<%= trail_today_date %>_1524.ear
+#+END_SRC
+
+As you can see, both the EAR and configuration are from revision
+=4899= of =trunk=. We can now roll back and forth between the various
+EAR & configuration builds with confidence that these two always are
+in sync.

From 4371bcd1f82b30f681dcd3baeb84bbba6f52c4a2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@geronimo>
Date: Fri, 7 Sep 2012 12:40:56 +0200
Subject: [PATCH 1305/2585] - fixed sentence

---
 usr/share/doc/vizrt/vosa-handbook/content-engine.org | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/content-engine.org b/usr/share/doc/vizrt/vosa-handbook/content-engine.org
index 85b25a5d..b8c6e450 100644
--- a/usr/share/doc/vizrt/vosa-handbook/content-engine.org
+++ b/usr/share/doc/vizrt/vosa-handbook/content-engine.org
@@ -1,6 +1,6 @@
 * Content Engine
-We different Escenic Content Engines that are presentation servers
-and the ones that are publication servers.
+We differentiate between Escenic Content Engines that are presentation
+servers and the ones that are publication servers.
 
 Architecturally, these look the same (strictly speaking, the
 publication servers don't need the memory cache, but for simplicity of

From 508bf6da7054c288d8a57f12f39831709075c317 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@geronimo>
Date: Fri, 7 Sep 2012 15:05:27 +0200
Subject: [PATCH 1306/2585] - only print virtual hosts header if there are any
 virtual hosts   defined - deleted line trailing white spaces

---
 usr/share/escenic/ece-scripts/ece.d/info.sh | 22 +++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/info.sh b/usr/share/escenic/ece-scripts/ece.d/info.sh
index e12837e3..ad9fbcca 100644
--- a/usr/share/escenic/ece-scripts/ece.d/info.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/info.sh
@@ -2,7 +2,7 @@ function get_info_for_type() {
   print "Current instance:    ${instance}"
   print "Instances available on $HOSTNAME: $(get_instance_list)"
   print "Conf files parsed: ${ece_conf_files_read[@]}"
-  
+
   if [ -n "${ece_home}" ]; then
     print "ECE location: $ece_home"
   fi
@@ -12,13 +12,13 @@ function get_info_for_type() {
   if [ -n "${java_home}" ]; then
     print "Java location: $java_home"
   fi
-  
+
   print "Log files:"
   print "|-> System out log:" $log
   print "|-> App server log:" $(get_app_log)
   print "|-> Log4j log:     " $(get_log4j_log)
   print "|-> GC log:        " $(get_gc_log)
-  
+
   if [ -n "${appserver}" ]; then
     print "Application server:"
     set_type_port
@@ -30,9 +30,9 @@ function get_info_for_type() {
       print "|-> PID:" $type_pid
       print "|-> Memory usage:" $(get_memory_summary_of_pid $type_pid)
     fi
-    
+
     print "|-> Type: " $appserver
-    
+
     case "$appserver" in
       tomcat)
         if [ -n "${tomcat_home}" ]; then
@@ -126,7 +126,6 @@ function print_tomcat_resources() {
         done
       done
 
-    print "Virtual hosts:"
     file=$tomcat_base/conf/server.xml
     local virtual_hosts="$(
       xml_grep \
@@ -134,12 +133,20 @@ function print_tomcat_resources() {
       --cond 'Server/Service/Engine/Host/Alias' \
       $file
     )"
+
+    if [ $(echo "$virtual_hosts" | wc -c) -gt 1 ]; then                                                                                                                        |
+      print "Virtual hosts:"                                                                                                                                                   |
+    fi
+
     echo "$virtual_hosts" | \
       sed 's#><#>\n<#g' | \
       sed 's#<Alias>\(.*\)</Alias>#\1#g' | while read line; do
+      if [ -z "$line" ]; then                                                                                                                                                  |
+        continue                                                                                                                                                               |
+      fi
       print "|-> http://${line}"
     done
-    
+
   else
     print "|-> user $USER cannot read $file"
   fi
@@ -159,4 +166,3 @@ function visualise_known_ports() {
     -e 's/11211/memcached/g')
   echo ${the_host}:${nice_port}
 }
-

From bdfd7f70f072c1c804f0f066a282054490702475 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@geronimo>
Date: Fri, 7 Sep 2012 15:06:10 +0200
Subject: [PATCH 1307/2585] - deleted pipes that came after copy/pasting from a
 screen session

---
 usr/share/escenic/ece-scripts/ece.d/info.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/info.sh b/usr/share/escenic/ece-scripts/ece.d/info.sh
index ad9fbcca..8fdfead2 100644
--- a/usr/share/escenic/ece-scripts/ece.d/info.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/info.sh
@@ -134,15 +134,15 @@ function print_tomcat_resources() {
       $file
     )"
 
-    if [ $(echo "$virtual_hosts" | wc -c) -gt 1 ]; then                                                                                                                        |
-      print "Virtual hosts:"                                                                                                                                                   |
+    if [ $(echo "$virtual_hosts" | wc -c) -gt 1 ]; then
+      print "Virtual hosts:"
     fi
 
     echo "$virtual_hosts" | \
       sed 's#><#>\n<#g' | \
       sed 's#<Alias>\(.*\)</Alias>#\1#g' | while read line; do
-      if [ -z "$line" ]; then                                                                                                                                                  |
-        continue                                                                                                                                                               |
+      if [ -z "$line" ]; then
+        continue
       fi
       print "|-> http://${line}"
     done

From c02745471a9df360c5dbb089906c5c588fb69427 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 10 Sep 2012 13:58:01 +0200
Subject: [PATCH 1308/2585] - added fai_dry_run parameter. When set,
 ece-install will, according   to the FAI profiles selected, only download the
 Escenic archives and   install the OS packages. Nothing will be configured.

- added cache-server::install_varnish_software to make it possible to
  call this code from the dry-run component.

- added dry-run component

- fixed & simplified common-os::add_apt_source (started out because
  this method threw and error if the escenic.list didn't exit.
---
 usr/sbin/ece-install                          |  8 ++++-
 usr/share/doc/escenic/ece-install-guide.org   |  1 +
 usr/share/escenic/ece-scripts/common-os.sh    |  8 ++---
 .../ece-scripts/ece-install.d/cache-server.sh | 13 ++++---
 .../ece-scripts/ece-install.d/dry-run.sh      | 36 +++++++++++++++++++
 5 files changed, 54 insertions(+), 12 deletions(-)
 create mode 100644 usr/share/escenic/ece-scripts/ece-install.d/dry-run.sh

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index a4502f9d..5706f53c 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -102,6 +102,11 @@ http://technet.escenic.com/downloads/widget-framework/widget-framework-community
 # sources.list used by ece-install
 escenic_sources=/etc/apt/sources.list.d/escenic.list
 
+# if set to 1, ece-install will try do as much dry running as
+# possible. I.e. not actually install things, but only download and
+# prepare the pre-requisites.
+dry_run=0
+
 ## Bootstrapping, load files from /usr/share/escenic/ece-scripts The
 ## method will first try to be smart, in case the user has copied the
 ## ece-scripts somewhere else., e.g.: moved everything to ~/ece-scrpts
@@ -974,7 +979,8 @@ if [ $fai_enabled -eq 1 ]; then
     print_and_log "All user input will be read from $conf_file"
     
     common_pre_install
-
+    perform_dry_run_if_applicable
+    
     no_fai_profile=1
 
     if [ ${fai_un_install_everything-0} -eq 1 ]; then
diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 31b44ae4..e11eea47 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -884,6 +884,7 @@ $HOME/ece-install.conf file of the root user:
 | =fai_db_port=                         | 3306                                                         | Useful for editor & presentation profiles                                                                |
 | =fai_db_schema=                       | ece5db                                                       | Useful for DB installation profile                                                                       |
 | =fai_db_user=                         | ece5user                                                     | Useful for DB installation profile                                                                       |
+| =fai_dry_run=                         | 0                                                            | ece-install will download Escenic archives and install OS packages, but will not configure anything.     |
 | =fai_editor_conf_archive=             | ""                                                           | conf.tar.gz to use for Nursery & JAAS configuration                                                      |
 | =fai_editor_deploy_white_list=        | "escenic-admin escenic studio indexer-webservice webservice" | The list of WARs to be deployed on this instance.                                                        |
 | =fai_editor_ear=                      | ""                                                           | EAR to use instead of the Escenic binaries                                                               |
diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index abc6fe88..e51a03c1 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -165,13 +165,9 @@ function get_total_memory_in_mega_bytes() {
 }
 
 function add_apt_source() {
-  if [[ ! -e $escenic_sources &&
-        $(grep "$@" /etc/apt/sources.list | wc -l) -lt 1 ]]; then
+  if [ $(grep -r "$@" /etc/apt/sources.list* | wc -l) -lt 1 ]; then
+    echo "# added by $(basename $0) @ $(date)" >> $escenic_sources
     echo "$@" >> $escenic_sources
-    run apt-get update
-  elif [ $(grep "$@" $escenic_sources | wc -l) -lt 1 ]; then
-    echo "$@" >> $escenic_sources
-    run apt-get update
   fi
 }
 
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
index e817dbf5..48fce1a4 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
@@ -2,10 +2,7 @@
 
 varnish_redhat_rpm_url=http://repo.varnish-cache.org/redhat/varnish-3.0/el5/noarch/varnish-release-3.0-1.noarch.rpm
 
-function install_cache_server()
-{
-  print_and_log "Installing a caching server on $HOSTNAME ..."
-
+function install_varnish_software() {
   if [[ $on_debian_or_derivative -eq 1 &&
         $(apt-key list | grep varnish-software.com | wc -l) -eq 0 ]]; then
     curl ${curl_opts} \
@@ -37,9 +34,15 @@ function install_cache_server()
     print "Installing the Varnish repository RPM"
     run rpm --nosignature -i $varnish_redhat_rpm_url
   fi
-
+  
   install_packages_if_missing varnish
   assert_pre_requisite varnishd
+}
+
+function install_cache_server() {
+  print_and_log "Installing a caching server on $HOSTNAME ..."
+
+  install_varnish_software
   
   if [ $fai_enabled -eq 0 ]; then
     print "You must now list your backend servers."
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/dry-run.sh b/usr/share/escenic/ece-scripts/ece-install.d/dry-run.sh
new file mode 100644
index 00000000..da38ff46
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece-install.d/dry-run.sh
@@ -0,0 +1,36 @@
+# code to do the dry run.
+
+function perform_dry_run_if_applicable() {
+  if [ ${fai_dry_run-0} -eq 0 ]; then
+    return
+  fi
+
+  print_and_log "Performing a dry-run as you requested."
+  download_escenic_components
+
+  if [[ ${fai_editor_install-0} -eq 1 || \
+    ${fai_presentation_install-0} -eq 1 || \
+    ${fai_analysis_install-0} -eq 1 || \
+    ${fai_search_install-0} -eq 1 || \
+    ${fai_all_install-0} -eq 1 ]]; then
+    download_tomcat
+  fi
+  
+  if [[ ${fai_db_install-0} -eq 1 || \
+    ${fai_all_install-0} -eq 1 ]]; then
+    install_mysql_server_software
+    install_mysql_client_software
+  fi
+  if [[ ${fai_cache_install-0} -eq 1 || \
+    ${fai_all_install-0} -eq 1 ]]; then
+    install_varnish_software
+  fi
+  
+  # if dry run is requested, ece-install will NOT proceed with the
+  # installation profiles, even if they're defined in the
+  # ece-install.conf
+  print_and_log "I've downloaded as much software as I could, I will now exit."
+  run rm $pid_file
+  exit 0
+}
+

From aef1554b59fce69fc3ba3ca4f0fec236aded3b95 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 10 Sep 2012 14:41:33 +0200
Subject: [PATCH 1309/2585] - updated java::create_java_deb_packages_and_repo
 to use ta fork of   oab-java6 which works with the latest changes on the
 Oracle web   site.

  To quote my comment:

  # TODO 2012-09-10 At the moment, this fork fixes a problem that
  # https://github.com/flexiondotorg/oab-java6.git doesn't.
  #
  # Once this issue has been closed,
  # https://github.com/flexiondotorg/oab-java6/issues/55, revert to
  # using the upstream flexiondotorg repository.
---
 usr/share/escenic/ece-scripts/ece-install.d/java.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/java.sh b/usr/share/escenic/ece-scripts/ece-install.d/java.sh
index 3aa42514..98bf52c0 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/java.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/java.sh
@@ -11,7 +11,13 @@ function create_java_deb_packages_and_repo() {
   
   local tmp_dir=$(mktemp -d)
   run cd $tmp_dir
-  run git clone https://github.com/flexiondotorg/oab-java6.git
+  # TODO 2012-09-10 At the moment, this fork fixes a problem that
+  # https://github.com/flexiondotorg/oab-java6.git doesn't.
+  #
+  # Once this issue has been closed,
+  # https://github.com/flexiondotorg/oab-java6/issues/55, revert to
+  # using the upstream flexiondotorg repository.
+  run git clone https://github.com/madkinder/oab-java6.git
   run cd oab-java6
 
   # oab fails regularly, every 2-3 months or so, so we must take extra

From bd359335214039e830f7b75e73791575152f2c9a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 10 Sep 2012 14:50:05 +0200
Subject: [PATCH 1310/2585] - changed the user instructions when oab java
 package creation fails.

---
 .../escenic/ece-scripts/ece-install.d/java.sh | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/java.sh b/usr/share/escenic/ece-scripts/ece-install.d/java.sh
index 98bf52c0..b5e5bf4d 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/java.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/java.sh
@@ -24,19 +24,12 @@ function create_java_deb_packages_and_repo() {
   # heed here.
   bash oab-java.sh 1>> $log 2>> $log
   if [ $? -gt 0 ]; then
-    local oab_pkg_dir=/var/local/oab/pkg
-    local oab_pkg_list="
-      jce_policy-6.zip
-      jdk-6u34-linux-i586.bin
-      jdk-6u34-linux-x64.bin"
-    print_and_log "Creating Oracle/Sun Java packages failed. Probably it was"
-    print_and_log "the downloading of the software binaries that failed."
-    print_and_log "Go to http://www.oracle.com/technetwork/java/javase/downloads"
-    print_and_log "and download the following files to $oab_pkg_dir and try"
-    print_and_log "again:"
-    for el in $oab_pkg_list; do
-      print_and_log "  - $el"
-    done
+    print_and_log "Creating Oracle/Sun Java packages failed. This is probably"
+    print_and_log "because of a 3rd party script, oab-java6, which fails"
+    print_and_log "whenever Oracle changes their website. To continue, please" 
+    print_and_log "go to http://www.oracle.com/technetwork/java/javase/downloads"
+    print_and_log "and download the full Java 6 JDK and be sure to add it first"
+    print_and_log "in PATH. Then re-run $(basename $0)."
     remove_pid_and_exit_in_error
   fi
   run rm -rf $tmp_dir

From cf9698aab3d22d2401a1796338094f4135806614 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 10 Sep 2012 15:19:03 +0200
Subject: [PATCH 1311/2585] - print & log => print_and_log

---
 usr/share/escenic/ece-scripts/ece.d/deploy.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/deploy.sh b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
index 34bd75bf..9fc01905 100644
--- a/usr/share/escenic/ece-scripts/ece.d/deploy.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
@@ -119,8 +119,7 @@ function deploy() {
         deploy_this_war=0
         message="Deployment white list active, only deploying: "
         message=$message"$deploy_webapp_white_list"
-        print $message
-        log $message
+        print_and_log $message
       fi
       
       for war in $dir/*.war ; do

From eb642fffd33acc18c102ad41f45bc39c448a659a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 10 Sep 2012 15:43:17 +0200
Subject: [PATCH 1312/2585] - fixed if-test syntax error when using logical
 AND.

---
 usr/share/escenic/ece-scripts/system-info.d/44-java-info.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/44-java-info.sh b/usr/share/escenic/ece-scripts/system-info.d/44-java-info.sh
index 7b23cb37..0c6b3440 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/44-java-info.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/44-java-info.sh
@@ -6,7 +6,7 @@ file=/etc/escenic/ece.conf
 if [ -r $file ]; then
   # don't like sourcing ece.conf, so getting it from grep instead.
   the_java_home=$(grep ^java_home $file | cut -d'=' -f2)
-  if [ -n "$the_java_home" && -d "$the_java_home" ]; then
+  if [[ -n "$the_java_home" && -d "$the_java_home" ]]; then
     java_bin=$the_java_home/bin/java
   fi
 fi

From 62eab13ea18e8478b41729a3afba4c3664372344 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 11 Sep 2012 13:07:20 +0200
Subject: [PATCH 1313/2585] - added .conf for installing an editorial server. 
 this will install   both an editorial server and a separate search instance
 tailored to   an editorial ECE.

---
 .../examples/ece-install-editorial.conf       | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 usr/share/doc/escenic/examples/ece-install-editorial.conf

diff --git a/usr/share/doc/escenic/examples/ece-install-editorial.conf b/usr/share/doc/escenic/examples/ece-install-editorial.conf
new file mode 100644
index 00000000..71ec0674
--- /dev/null
+++ b/usr/share/doc/escenic/examples/ece-install-editorial.conf
@@ -0,0 +1,28 @@
+# this will install both an editorial server and a separate search
+# instance tailored to an editorial ECE:
+#
+# content-engnine:8080 -> search:8081
+
+# credentials
+technet_user=
+technet_password=
+wf_user=
+wf_password=
+
+# FAI enabled
+fai_enabled=1
+
+# Install a seperate search instance making us look cool, just like a
+# production environment.
+fai_search_install=1
+fai_search_port=8081
+fai_search_shutdown=8105
+fai_search_name=search1
+fai_search_for_editor=1
+fai_search_ear=http://my.buildserver.com/mypub-trunk-rev3568-2012-05-28_1213.ear
+
+# Presentation server
+fai_editor_install=1
+fai_editor_ear=http://my.buildserver.com/mypub-trunk-rev3568-2012-05-28_1213.ear
+fai_editor_name=engine1
+fai_editor_deploy_white_list='escenic-admin indexer-webservice webservice escenic studio'

From 041b58f88d65010f19f9e062ecec1be32a485b82 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 11 Sep 2012 13:15:56 +0200
Subject: [PATCH 1314/2585] - added EAR and deployment white list

---
 .../escenic/examples/ece-install-cache-and-content-engine.conf  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/usr/share/doc/escenic/examples/ece-install-cache-and-content-engine.conf b/usr/share/doc/escenic/examples/ece-install-cache-and-content-engine.conf
index cc0860b2..4be72c05 100644
--- a/usr/share/doc/escenic/examples/ece-install-cache-and-content-engine.conf
+++ b/usr/share/doc/escenic/examples/ece-install-cache-and-content-engine.conf
@@ -16,3 +16,5 @@ wf_password=
 fai_enabled=1
 fai_cache_install=1
 fai_presentation_install=1
+fai_presentation_ear=http://my.buildserver.com/mypub-trunk-rev3568-2012-05-28_1213.ear
+fai_presentation_deploy_white_list='mypub escenic-admin'

From e0e0a1cd1b97fa0de9ed4d922e98bf2d8e892cb6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 11 Sep 2012 13:16:34 +0200
Subject: [PATCH 1315/2585] - reduced feedback for import jobs

---
 .../ece-scripts/system-info.d/11-list-ece-overview.sh      | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh b/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
index 36b3f71f..f5c09ab0 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
@@ -99,9 +99,8 @@ function check_picture_file() {
   local dir=$(dirname "$1")
   local file_name=$(basename "$1")
 
-  if [ ! -d $dir ]; then
-    print_p_text "Directory doesn't exist: $dir" \
-      "It's referenced via the image: $1"
+  if [ ! -e $1 ]; then
+    print_p_text "Picture file doesn't exist: $1"
     return 
   fi
   
@@ -109,7 +108,7 @@ function check_picture_file() {
 
   # first check if the image is size=0
   if [ $(find $dir -name $file_name -maxdepth 1 -type f -size 0 | wc -l) -gt 0 ]; then
-    print_pre_text "The file $1 is empty (size = 0 bytes)"
+    print_p_text "The file $1 is empty (size = 0 bytes)"
     return
   fi
 

From 187c9168ceb6cfc8522d7a16e05251612f38285b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 11 Sep 2012 13:17:20 +0200
Subject: [PATCH 1316/2585] - fixed to line wrapping in print_p_text

---
 usr/bin/system-info | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/usr/bin/system-info b/usr/bin/system-info
index cfaa004b..a75d8b9f 100755
--- a/usr/bin/system-info
+++ b/usr/bin/system-info
@@ -316,21 +316,21 @@ EOF
     local line=""
     text=""
     
-    for el in "$@"; do
-      line="${line}${el} "
-      
+    for el in $@; do
+      local tmp_line="${line} ${el}"
       # wrap the line when it becomes too long
-      if [ ${#line} -gt $LINE_WRAP ]; then
-        line="$(get_indent)${line}\n"
-        text="${text}${line}"
+      if [ ${#tmp_line} -gt $LINE_WRAP ]; then
+        text="${text}\n$(get_indent)${el}"
         line=""
+      else
+        line="${line} ${el}"
       fi
     done
 
     # adding the last line line here. For one liners, text will be
     # empty here, so the indent is straght on. For multi line input,
     # the text variable already contains a new line at this point.
-    text="${text}$(get_indent)${line}"
+    text="${text}\n$(get_indent)${line}"
     echo -e "$text"
   fi
 }

From 6fd1720002cf557ade83aa1e4b3faf8dd164a0c2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 11 Sep 2012 14:54:50 +0200
Subject: [PATCH 1317/2585] - a wee correction to user feedback

---
 usr/share/escenic/ece-scripts/ece-install.d/app-server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 78de163c..fa8b9123 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -437,7 +437,7 @@ function set_appropriate_jvm_heap_sizes() {
     print_and_log "$warning $HOSTNAME only has $total_size MBs of memory, I will"
     print_and_log "$warning use ${percent}% of this for the JVM heap sizes, but you"
     print_and_log "$warning should really consider adding more RAM so that"
-    print_and_log "$warning the $instance_name instance gets 2GBs"
+    print_and_log "$warning the $instance_name instance gets at least 2GBs"
 
     heap_size=$(echo "$total_size * 0.${percent}" | bc | cut -d'.' -f1)
   fi

From 48a3f14456d0944497fdafb95c39e576f7f0010d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 11 Sep 2012 14:57:30 +0200
Subject: [PATCH 1318/2585] - content-engine:set_up_engine_and_plugins now
 calls   verify_that_archive_is_ok. This helps ece-install fail fast when one 
  of the download archives is corrupt.

- added common-io:verify_that_archive_is_ok
---
 usr/share/escenic/ece-scripts/common-io.sh    | 22 +++++++++++++++++++
 .../ece-install.d/content-engine.sh           |  2 ++
 2 files changed, 24 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/common-io.sh b/usr/share/escenic/ece-scripts/common-io.sh
index f8cfc19d..8254aa6b 100644
--- a/usr/share/escenic/ece-scripts/common-io.sh
+++ b/usr/share/escenic/ece-scripts/common-io.sh
@@ -115,6 +115,28 @@ function download_uri_target_to_dir() {
   echo $file
 }
 
+## Will verify that the archive passed to the function is ok. If it's
+## not, the function will terminate the calling script, exiting in
+## error.
+##
+## $1 :: the archive to test, supported archives are: .zip, .tar.gz, .tgz
+function verify_that_archive_is_ok() {
+  if [ -z $1 -o ! -e $1 ]; then
+    return
+  fi
+
+  if [[ $1 == *.zip ]]; then
+    unzip -t $1 > /dev/null 2>&1
+  elif [[ $1 == *.tar.gz || $1 == *.tgz ]]; then
+    tar tzf $1 > /dev/null 2>&1
+  fi
+  
+  if [ $? -gt 0 ]; then
+    print_and_log $1 "is a corrupt archive :-("
+    remove_pid_and_exit_in_error
+  fi
+}
+
 # verifies that the passed file(s) exist and are readable, depends on
 # set_archive_files_depending_on_profile
 function verify_that_files_exist_and_are_readable()
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 07047b7c..2e531e9d 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -124,6 +124,8 @@ function set_up_engine_and_plugins() {
   run cd $escenic_root_dir/
 
   for el in $technet_download_list; do
+    verify_that_archive_is_ok $download_dir/$(basename $el)
+
     if [ $(basename $el | \
       grep -E "^engine-[0-9]|^engine-trunk-SNAPSHOT|^engine-dist" | \
       wc -l) -gt 0 ]; then

From 8bc1e7db1854122e569f6af71791ac11654ad453 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Tue, 11 Sep 2012 15:02:46 +0200
Subject: [PATCH 1319/2585] Guarded "ant clean" with a check if build.xml
 exists. Closes #97

---
 usr/share/escenic/ece-scripts/ece.d/backup.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/backup.sh b/usr/share/escenic/ece-scripts/ece.d/backup.sh
index 4b60f747..fc5ecef2 100644
--- a/usr/share/escenic/ece-scripts/ece.d/backup.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/backup.sh
@@ -1,8 +1,10 @@
 function clear_generated_files() {
   if [ -d ${assemblytool_home} ]; then
-    print "Cleaning up generated files in $assemblytool_home ..." 
-    run cd $assemblytool_home
-    run ant clean
+    if [ -r ${assemblytool_home}/build.xml ] ; then
+      print "Cleaning up generated files in $assemblytool_home ..." 
+      run cd $assemblytool_home
+      run ant clean
+    fi
   fi
 
   if [[ $appserver == "tomcat" ]]; then

From 9e23aa961a693daec5666181a64605a0e691f1b6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 11 Sep 2012 15:09:09 +0200
Subject: [PATCH 1320/2585] - 'ece backup' used its own clear_generated_files
 method instead of   calling clean_up which 'ece clean' uses. The latter
 checks to see if   there's an assembly environment present before attempting
 to run   'ant clean' in it.

  This should close #97
---
 usr/share/escenic/ece-scripts/ece.d/backup.sh | 25 +------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/backup.sh b/usr/share/escenic/ece-scripts/ece.d/backup.sh
index 4b60f747..099e4d93 100644
--- a/usr/share/escenic/ece-scripts/ece.d/backup.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/backup.sh
@@ -1,29 +1,7 @@
-function clear_generated_files() {
-  if [ -d ${assemblytool_home} ]; then
-    print "Cleaning up generated files in $assemblytool_home ..." 
-    run cd $assemblytool_home
-    run ant clean
-  fi
-
-  if [[ $appserver == "tomcat" ]]; then
-    local dir_list="
-    $tomcat_base/work
-    $tomcat_base/temp
-    "
-    for el in $dir_list; do
-      if [ -d $el ]; then
-        print "Cleaning up ${instance}'s $(basename $el) directory in $el ..."
-        run rm -rf $el/*
-      fi
-    done
-  fi
-}
-
 function backup_type() {
   local message="Backing up the $instance instance of $type on $HOSTNAME ..."
   print_and_log $message
-
-  clear_generated_files
+  clean_up
 
   if [ "$type" == "rmi-hub" ]; then
     ensure_that_required_fields_are_set $hub_required_fields
@@ -37,7 +15,6 @@ function backup_type() {
     ensure_that_required_fields_are_set $analysis_required_fields
   fi
   
-   # TODO add support for backup_dir in ece.conf
   if [ -z "$backup_dir" ]; then
     backup_dir=/var/backups/escenic
   fi

From 9bd1a146fa74afd8ad3ee1675876f55915ad637d Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Wed, 12 Sep 2012 11:03:53 +0200
Subject: [PATCH 1321/2585] Downloading escenic even when restoring from EAR
 because it needs the configuration skeleton...

---
 .../escenic/ece-scripts/ece-install.d/content-engine.sh   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 2e531e9d..576a8cc5 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -56,13 +56,13 @@ function install_ece_instance() {
 
   set_archive_files_depending_on_profile
   
+  download_escenic_components
+  check_for_required_downloads
+  set_up_engine_and_plugins
+
   # most likely, the user is _not_ installing from archives (EAR +
   # configuration bundle), hence the false test goes first.
   if [ $(is_installing_from_ear) -eq 0 ]; then
-    download_escenic_components
-    check_for_required_downloads
-    set_up_engine_and_plugins
-
     if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER ]; then
       set_up_assembly_tool
     fi

From 11a9f01d62b612310de55399889844677603d376 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Wed, 12 Sep 2012 11:06:29 +0200
Subject: [PATCH 1322/2585] Run apt-get update after adding percona source, not
 before...

---
 usr/share/escenic/ece-scripts/ece-install.d/database.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index a0a96af8..ee9fb240 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -58,10 +58,10 @@ function set_up_percona_repository_if_possible() {
             1>>$log 2>>$log
         fi
 
-        run apt-get update
       fi
 
       add_apt_source "deb http://repo.percona.com/apt ${code_name} main"
+      run apt-get update
       mysql_server_packages="percona-server-server"
       mysql_client_packages="percona-server-client"
       

From fe1f47ae66aed21ba7e5b35d11cd19770c114e0e Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 13 Sep 2012 14:52:16 +0200
Subject: [PATCH 1323/2585] Made it possible to have relative postinstall
 hooks: - "postinstall foo.sh" will specify a built-in postinstall hook -
 "postinstall /foo.sh" will specify an absolute path - "postinstall ./foo.sh"
 will specify a path relative to the config directory"

---
 usr/share/vizrt/vosa/commands/postinst.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/usr/share/vizrt/vosa/commands/postinst.sh b/usr/share/vizrt/vosa/commands/postinst.sh
index 093874d9..aad48107 100755
--- a/usr/share/vizrt/vosa/commands/postinst.sh
+++ b/usr/share/vizrt/vosa/commands/postinst.sh
@@ -68,7 +68,9 @@ parse_config_file $config/install.conf install_config_
 function postinstall() {
   for o in "${install_config_postinstall[@]}" ; do
     echo "Executing postinstall $o"
-    if [ "${o:0:1}" == "/" ] ; then
+    if [ "${o:0:2}" == "./" ] ; then
+      local cmd="${config}/${o:2}"
+    elif [ "${o:0:1}" == "/" ] ; then
       local cmd=$o
     else
       local cmd="$(dirname $0)/../post-install-hooks/$o"

From 31052e0a62297a6d2887ec647b976d5b7fab1e1c Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 13 Sep 2012 14:55:26 +0200
Subject: [PATCH 1324/2585] Made vosa package depend on gawk

---
 usr/share/escenic/package-scripts/debian/vosa/control | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/package-scripts/debian/vosa/control b/usr/share/escenic/package-scripts/debian/vosa/control
index 5287045b..f2eee057 100644
--- a/usr/share/escenic/package-scripts/debian/vosa/control
+++ b/usr/share/escenic/package-scripts/debian/vosa/control
@@ -1,5 +1,6 @@
 Package: vosa
 Version: VERSION
+Depends: gawk
 Section: base
 Priority: optional
 Architecture: all
@@ -7,4 +8,4 @@ Maintainer: MAINTAINER_NAME <MAINTAINER_EMAIL>
 Description: The Vizrt Online System Administration command line tools.
   See the documentation in /usr/share/doc/vizrt/ for further
   details.
- 
\ No newline at end of file
+ 

From 0eeae240ef13230f1e974e40fc065a2e18887086 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 13 Sep 2012 14:56:04 +0200
Subject: [PATCH 1325/2585] Made vosa package suggest ec2-api-tools

---
 usr/share/escenic/package-scripts/debian/vosa/control | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/package-scripts/debian/vosa/control b/usr/share/escenic/package-scripts/debian/vosa/control
index f2eee057..9b3a5552 100644
--- a/usr/share/escenic/package-scripts/debian/vosa/control
+++ b/usr/share/escenic/package-scripts/debian/vosa/control
@@ -1,6 +1,7 @@
 Package: vosa
 Version: VERSION
 Depends: gawk
+Suggests: ec2-api-tools
 Section: base
 Priority: optional
 Architecture: all

From 1938683aca178e1b14bb2d18ef8382614e809d03 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 18 Sep 2012 14:34:38 +0200
Subject: [PATCH 1326/2585] - added new parameter fai_offline_mode (default is
 0), which allows   for offline installation, if all required downloads are in
 APT's and   ece-install's downloads directories.

  Right now, support for this parameter has been added to:

    * install_common_os_packages
    * check_software_credentials
---
 usr/sbin/ece-install | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 5706f53c..875fa08d 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -230,11 +230,12 @@ function install_common_os_packages()
   # system. If not, we'll just leave it, it'll be made available on
   # ther systems through git.
   if [ $on_debian_or_derivative -eq 1 ]; then
-    curl -s http://apt.vizrt.com/archive.key 2>> $log | \
-      apt-key add - 1>> $log 2>> $log
-    local package_pool=${fai_apt_vizrt_pool-unstable}
-    add_apt_source "deb http://apt.vizrt.com ${package_pool} main"
-
+    if [ ${fai_offline_mode-0} -eq 0 ]; then
+      curl -s http://apt.vizrt.com/archive.key 2>> $log | \
+        apt-key add - 1>> $log 2>> $log
+      local package_pool=${fai_apt_vizrt_pool-unstable}
+      add_apt_source "deb http://apt.vizrt.com ${package_pool} main"
+    fi
     install_packages_if_missing escenic-common-scripts
   fi
   
@@ -536,6 +537,10 @@ function check_software_credentials() {
   install_packages_if_missing curl
   assert_pre_requisite curl
 
+  if [ ${fai_offline_mode-0} -eq 1 ]; then
+    return
+  fi
+  
   print_and_log "Verifying that Technet credentials are OK ..."
   
   local url=http://technet.escenic.com

From 76fba03a28684b53c07f8166cf382bb0964e0135 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 18 Sep 2012 16:06:24 +0200
Subject: [PATCH 1327/2585] - changed common-io::verify_that_archive_is_ok so
 that it reports   properly if the archive doesn't exist (at all) on disk.

---
 usr/share/escenic/ece-scripts/common-io.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/common-io.sh b/usr/share/escenic/ece-scripts/common-io.sh
index 8254aa6b..ff55996d 100644
--- a/usr/share/escenic/ece-scripts/common-io.sh
+++ b/usr/share/escenic/ece-scripts/common-io.sh
@@ -121,10 +121,15 @@ function download_uri_target_to_dir() {
 ##
 ## $1 :: the archive to test, supported archives are: .zip, .tar.gz, .tgz
 function verify_that_archive_is_ok() {
-  if [ -z $1 -o ! -e $1 ]; then
+  if [ -z $1 ]; then
     return
   fi
 
+  if [ ! -e $1 ]; then
+    print_and_log "$1 doesn't exist :-("
+    remove_pid_and_exit_in_error
+  fi
+
   if [[ $1 == *.zip ]]; then
     unzip -t $1 > /dev/null 2>&1
   elif [[ $1 == *.tar.gz || $1 == *.tgz ]]; then

From fa7e8967d0f3e22851656377b477bf1a19f72679 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 19 Sep 2012 10:12:41 +0200
Subject: [PATCH 1328/2585] - now includes the hostname in the DB backup
 symlink:

  latest-<db>-backup.sql.gz -> latest-<hostname>-<db>-backup.sql.gz
---
 usr/share/escenic/ece-scripts/ece-install.d/database.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index ee9fb240..09df9948 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -656,7 +656,7 @@ done
 # using any brain power.
 (
   cd ${escenic_backups_dir}
-  ln -sf \${fn} latest-\${db_schema}-backup.sql.gz
+  ln -sf \${fn} latest-\${HOSTNAME}-\${db_schema}-backup.sql.gz
 )
 EOF
 

From 3c9e9899b1318d97ffdbc4c412e13620ecf7f902 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 19 Sep 2012 10:21:16 +0200
Subject: [PATCH 1329/2585] - update ECOME version

---
 usr/sbin/ece-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 5706f53c..69718bfd 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -81,7 +81,7 @@ ece_software_setup_completed=0
 technet_download_list="
 http://technet.escenic.com/downloads/assemblytool-2.0.2.zip
 http://technet.escenic.com/downloads/release/53/analysis-engine-2.3.7.0.zip
-http://technet.escenic.com/downloads/release/53/community-engine-3.6.1.0.zip
+http://technet.escenic.com/downloads/release/53/community-engine-3.6.2.124119.zip
 http://technet.escenic.com/downloads/release/53/dashboard-1.1.1.124124.zip
 http://technet.escenic.com/downloads/release/53/engine-5.3.7.126916.zip
 http://technet.escenic.com/downloads/release/53/forum-3.0.1.124096.zip

From 999c0ce66aa91c5e732d6f75676942c87aaa11f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Wed, 19 Sep 2012 11:10:47 +0200
Subject: [PATCH 1330/2585] ece-build - Refactored svn checkout process to not
 use svn update due to https timeout

---
 usr/share/escenic/build-scripts/build.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/build.sh b/usr/share/escenic/build-scripts/build.sh
index d0d2e4b8..7333abea 100755
--- a/usr/share/escenic/build-scripts/build.sh
+++ b/usr/share/escenic/build-scripts/build.sh
@@ -323,7 +323,8 @@ function verify_maven_proxy
 ## 
 function svn_checkout
 {
-  run svn update --non-interactive --set-depth infinity $svn_src_dir
+  #run svn update --non-interactive --set-depth infinity $svn_src_dir
+  run svn checkout --non-interactive --depth infinity --username $svn_user  --password $svn_password $svn_base$svn_path $svn_src_dir/.
   revision=`svn info $svn_src_dir | grep -i Revision | awk '{print $2}'`
   if [[ $revision = "" ]]; then    
     print_and_log "Failed to fetch current revision number, exiting!"

From 5ae5ccb4b78a200a8a8ea9d7c65e557f1081aeb9 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 19 Sep 2012 11:34:22 +0200
Subject: [PATCH 1331/2585] - remove wrong quote in pipes (probably copy and
 paste magic in the   editor) inside create_machine_conf_packages

---
 usr/share/escenic/build-scripts/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/build.sh b/usr/share/escenic/build-scripts/build.sh
index 7333abea..6d38db8c 100755
--- a/usr/share/escenic/build-scripts/build.sh
+++ b/usr/share/escenic/build-scripts/build.sh
@@ -487,7 +487,7 @@ function create_machine_conf_packages() {
     local conffiles_file=$target_dir/DEBIAN/conffiles
     run mkdir -p $(dirname $conffiles_file)
     find $target_dir -type f | \
-      egrep "etc|conf" | \"
+      egrep "etc|conf" | \
       egrep -v DEBIAN | \
       sed "s#$target_dir##" \
       > $conffiles_file

From 5c58c8e989e9360bfeb07efaa273c1a8df4fb328 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Wed, 19 Sep 2012 13:50:17 +0200
Subject: [PATCH 1332/2585] ece-build/ece-builder - .sh sources renamed to
 match command naming

---
 usr/share/escenic/build-scripts/{build.sh => ece-build}     | 0
 usr/share/escenic/build-scripts/{builder.sh => ece-builder} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename usr/share/escenic/build-scripts/{build.sh => ece-build} (100%)
 rename usr/share/escenic/build-scripts/{builder.sh => ece-builder} (100%)

diff --git a/usr/share/escenic/build-scripts/build.sh b/usr/share/escenic/build-scripts/ece-build
similarity index 100%
rename from usr/share/escenic/build-scripts/build.sh
rename to usr/share/escenic/build-scripts/ece-build
diff --git a/usr/share/escenic/build-scripts/builder.sh b/usr/share/escenic/build-scripts/ece-builder
similarity index 100%
rename from usr/share/escenic/build-scripts/builder.sh
rename to usr/share/escenic/build-scripts/ece-builder

From ee0034dbf01202007e1196252713f7f61404810d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Wed, 19 Sep 2012 13:51:04 +0200
Subject: [PATCH 1333/2585] package-creation - creation adjusted to use new
 names of ece-build and ece-builder

---
 usr/share/escenic/package-scripts/create-packages | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 2a53ec51..d504e32f 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -91,8 +91,8 @@ function set_up_escenic-content-engine-installer() {
 
 function set_up_escenic-build-scripts() {
   mkdir -p $target_dir/usr/bin
-  cp ../build-scripts/build.sh $target_dir/usr/bin/ece-build
-  cp ../build-scripts/builder.sh $target_dir/usr/bin/ece-builder
+  cp ../build-scripts/ece-build $target_dir/usr/bin/ece-build
+  cp ../build-scripts/ece-builder $target_dir/usr/bin/ece-builder
 }
 
 function set_up_escenic-content-engine-scripts() {

From 79cdae28ad4bb716480008bf998c7b7bba6eac98 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 21 Sep 2012 09:40:15 +0200
Subject: [PATCH 1334/2585] - changed the cron script to not having to be
 changed when   deployed. It now reads its configuration from
 /etc/default/ece. Per   default, it will now be enabled.

---
 etc/cron.daily/remove-old-escenic-log-files | 10 ++++++----
 etc/default/ece                             |  5 +++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/etc/cron.daily/remove-old-escenic-log-files b/etc/cron.daily/remove-old-escenic-log-files
index 4c2e4514..6d38d3b0 100755
--- a/etc/cron.daily/remove-old-escenic-log-files
+++ b/etc/cron.daily/remove-old-escenic-log-files
@@ -12,7 +12,9 @@ function remove_old_escenic_log_files() {
   /etc/init.d/ece remove-old-log-files
 }
 
-## Uncomment the following line to have daily removal of old log
-## files.
-# remove_old_escenic_log_files
-
+if [ -r /etc/default/ece ]; then
+  source /etc/default/ece
+  if [ ${remove_old_log_files-0} -eq 1 ]; then
+    remove_old_escenic_log_files
+  fi
+fi
diff --git a/etc/default/ece b/etc/default/ece
index ef5aaccf..ac916343 100644
--- a/etc/default/ece
+++ b/etc/default/ece
@@ -19,3 +19,8 @@ ece_script=/usr/bin/ece
 # for both of these.
 ece_unix_group=escenic
 ece_unix_user=escenic
+
+# Do you want cron to remove (5 days) old log files every day?
+# (default is yes, i.e. 1. Set 0 to turn this off)
+remove_old_log_files=1
+

From 3cd314cfd983d22536e648725a59fdd40ae401f1 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 21 Sep 2012 13:48:18 +0200
Subject: [PATCH 1335/2585] - enable_heap_dump was defined twice, once with 0
 and once with 1.

---
 etc/escenic/ece.conf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/etc/escenic/ece.conf b/etc/escenic/ece.conf
index e1bd9dfa..1607022e 100644
--- a/etc/escenic/ece.conf
+++ b/etc/escenic/ece.conf
@@ -131,7 +131,6 @@ max_heap_size=256m
 min_permgen_size=64m
 max_permgen_size=256m
 
-enable_heap_dump=0
 enable_remote_debugging=0
 remote_debugging_port=5005
 enable_remote_monitoring=0

From 2762d978ba2f9fcc173582ac4adac2d7157c388c Mon Sep 17 00:00:00 2001
From: Thomas <tvelthoven@vizrt.com>
Date: Fri, 21 Sep 2012 15:48:35 +0300
Subject: [PATCH 1336/2585] Update usr/share/doc/vizrt/vosa-guide.org

test
---
 usr/share/doc/vizrt/vosa-guide.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-guide.org b/usr/share/doc/vizrt/vosa-guide.org
index 6750b745..341008e6 100644
--- a/usr/share/doc/vizrt/vosa-guide.org
+++ b/usr/share/doc/vizrt/vosa-guide.org
@@ -10,7 +10,7 @@ and tools to install puppets that do what that puppet master says.
 
 All of this is possible manually by apt-get'ing and configuring
 manualy; the value of these scripts is that all of this is
-made possible without intervention.
+made possible without intervention..
 
 There are various post-installation hooks available which perform
 various tasks, for simple things like creating an /etc/motd file,

From 404104762375787a2cc9429ff22bae5dbb8e9592 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 21 Sep 2012 12:44:54 +0200
Subject: [PATCH 1337/2585] - 'ece clean' no longer cleans up the cache
 directory.

---
 usr/share/escenic/ece-scripts/ece.d/clean.sh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/clean.sh b/usr/share/escenic/ece-scripts/ece.d/clean.sh
index 194fb2c1..f715a99c 100644
--- a/usr/share/escenic/ece-scripts/ece.d/clean.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/clean.sh
@@ -5,11 +5,6 @@ function clean_up() {
     run ant clean
   fi
 
-  if [ -d "${cache_dir}" ]; then
-    print "Cleaning up ear, deb and rpm files in ${cache_dir} ..." 
-    run rm -rf ${cache_dir}/*.{rpm,deb,ear}
-  fi
-
   if [[ $appserver == "tomcat" ]]; then
     local dir_list="
       $tomcat_base/work

From f4286b54bd7f33ea42c03cb38f771f0832f38388 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 21 Sep 2012 16:39:36 +0200
Subject: [PATCH 1338/2585] - simplified the way ECE & plugin SQL files are
 run. - hardened the fai_db_install profile. Now, only the archives defined  
 in technet_download_list will have their SQL files run. This means   that you
 can have multiple version of the same plugin in   /opt/escenic and
 ece-install still will only run the SQL scripts   defined for the ones you've
 got in technet_download_list.

  This closes #101
---
 .../ece-scripts/ece-install.d/database.sh     | 58 ++++++++-----------
 1 file changed, 25 insertions(+), 33 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 09df9948..42eff206 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -166,39 +166,13 @@ function set_ecedb_conf() {
   ece_home=${escenic_root_dir}/engine
 }
 
-function set_up_ecedb()
-{
+function set_up_ecedb() {
   print_and_log "Setting up the ECE database schema ..."
 
-  make_dir $escenic_root_dir/engine/plugins
-  run cd $escenic_root_dir/engine/plugins
-
-  find ../../ -maxdepth 1 -type d | \
-    grep -v assemblytool | \
-    while read directory; do
-    if [ $directory = "../../" ]; then
-      continue
-    fi
-
-          # nuisance to get the community engine, but not the engine
-    if [ $(echo $directory | grep engine | wc -l) -gt 0 ]; then
-      if [ $(echo $directory | grep community | wc -l) -lt 1 ]; then
-        continue
-      fi
-    fi
-
-    if [ ! -h $(basename $directory) ]; then
-      run ln -s $directory
-    fi
-  done
-
   set_ecedb_conf
   pre_install_new_ecedb
   create_ecedb
 
-  run cd ~/
-  run rm -rf $escenic_root_dir/engine/plugins
-
   add_next_step "DB is now set up on ${db_host}:${db_port}"
 }
 
@@ -558,13 +532,32 @@ function create_ecedb() {
     return
   fi
 
+  # first the ECE SQL ...
   run_db_scripts $ece_home/database/$db_product
+  
+  # ... then, find the plugins and run their SQL scripts
+  for archive in $technet_download_list; do
+    # don't re-run the engine scripts
+    if [[ $(basename ${archive}) == engine* ]]; then
+      continue
+    fi
+    
+    # find the top directory inside the archive
+    local dir=$(
+      unzip -t ${download_dir}/$(basename ${archive}) | \
+        head -2 | \
+        awk '{print $2}' | \
+        tail -1 | \
+        cut -d'/' -f1      
+    )
 
-  if [ -e $ece_home/plugins ]; then
-    for el in `find -L $ece_home/plugins -name $db_product`; do
-      run_db_scripts $el
-    done
-  fi
+    # should always be one
+    local archive_sql_dir=$(find $dir -name $db_product | head -1)
+    if [ -z $archive_sql_dir ]; then
+      continue
+    fi
+    run_db_scripts ${escenic_root_dir}/${archive_sql_dir}
+  done
 
   run_eae_scripts_if_available
 
@@ -573,7 +566,6 @@ function create_ecedb() {
 
 ## will run the EAE scripts if they are availabe.
 function run_eae_scripts_if_available() {
-      
   for el in $(find $escenic_root_dir -name eae-${db_product}.sql | \
     grep -v upgrade | \
     sort -r | \

From 9894b5f7576fef720845e460f70df9b55992ac9f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 24 Sep 2012 14:53:43 +0200
Subject: [PATCH 1339/2585] -add check_mk plugin which checks all FTP servers
 which are set up to  provide a feed of external data to be imported into ECE.

 The script looks in the trail fails left by the ece-install script
 to determine which FTP feeds to check the health of. The trails it
 looks for look like these:

    trail_ftp_feed_list="one two three"

 Which again relates to the cron scripts:

    /etc/cron.hourly/one-import
    /etc/cron.hourly/two-import
    /etc/cron.hourly/three-import

 The plugin will report status=0 if the script can log into the FTP
 server and list the contents of the directory mentioned. If either
 fails, status=2 is returned.

 Example output:

   0 one_import_ftp_source - The one FTP import source is OK
   0 two_import_ftp_source - The two FTP import source is OK
   0 three_import_ftp_source - The three FTP import source is OK
---
 usr/lib/check_mk_agent/local/ftp-feed-sources | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 usr/lib/check_mk_agent/local/ftp-feed-sources

diff --git a/usr/lib/check_mk_agent/local/ftp-feed-sources b/usr/lib/check_mk_agent/local/ftp-feed-sources
new file mode 100644
index 00000000..3ac1cc0c
--- /dev/null
+++ b/usr/lib/check_mk_agent/local/ftp-feed-sources
@@ -0,0 +1,44 @@
+#! /usr/bin/env bash
+
+## check_mk plugin which checks all FTP servers which are set up to
+## provie a feed of external data to be imported into ECE.
+##
+## The script looks in the trail fails left by the ece-install script
+## to determine which FTP feeds to check the health of.
+
+function read_trails() {
+  for el in /var/lib/ece-install/*.trail 2>/dev/null; do
+    source $el
+  done
+}
+
+function exit_if_no_trails() {
+  if [ -z "${trail_ftp_feed_list}" ]; then
+    exit 0
+  fi
+}
+
+function check_ftp_feed_sources() {
+  for el in $trail_ftp_feed_list; do
+    local file=/etc/cron.hourly/${el}-import
+    local user=$(grep ^ftp_user $file | cut -d'=' -f2 | sed 's#"##g')
+    local password=$(grep ^ftp_password $file | cut -d'=' -f2 | sed 's#"##g')
+    local url=$(grep ^ftp_url $file | cut -d'=' -f2 | sed 's#"##g')
+
+    local headers=$(wget -O /dev/null --ftp-user $user --ftp-password $password $url 2>&1 >/dev/null)
+    local login_ok=$(echo "$headers" | grep 'Logged in' | wc -l)
+    local dir_ok=$(echo "$headers" | grep '==> LIST ... done.' | wc -l)
+
+    if [ ${login_ok} -eq 1 -a ${dir_ok} -eq 1 ];  then
+      echo 0 "${el}_import_ftp_source" "-" "The $el FTP import source is OK"
+    elif [ ${login_ok} -eq 1 -a ${dir_ok} -eq 0 ];  then
+      echo 2 "${el}_import_ftp_source" "-" "Could not access the directory on ${url}"
+    elif [ ${login_ok} -eq 0 ]; then
+      echo 2 "${el}_import_ftp_source" "-" "Could not log into ${url}"
+    fi
+  done
+}
+
+read_trails
+exit_if_no_trails
+check_ftp_feed_sources

From faa78579892297e6adc5286f6630c61c87a13281 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 24 Sep 2012 15:06:29 +0200
Subject: [PATCH 1340/2585] - changed the key so that the import job status
 entries are all listed   after one another.

---
 usr/lib/check_mk_agent/local/ftp-feed-sources | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/usr/lib/check_mk_agent/local/ftp-feed-sources b/usr/lib/check_mk_agent/local/ftp-feed-sources
index 3ac1cc0c..0d1e377a 100644
--- a/usr/lib/check_mk_agent/local/ftp-feed-sources
+++ b/usr/lib/check_mk_agent/local/ftp-feed-sources
@@ -28,13 +28,15 @@ function check_ftp_feed_sources() {
     local headers=$(wget -O /dev/null --ftp-user $user --ftp-password $password $url 2>&1 >/dev/null)
     local login_ok=$(echo "$headers" | grep 'Logged in' | wc -l)
     local dir_ok=$(echo "$headers" | grep '==> LIST ... done.' | wc -l)
-
+    
+    local key="import_ftp_source_${el}"
+    
     if [ ${login_ok} -eq 1 -a ${dir_ok} -eq 1 ];  then
-      echo 0 "${el}_import_ftp_source" "-" "The $el FTP import source is OK"
+      echo 0 ${key} "-" "The $el FTP import source is OK"
     elif [ ${login_ok} -eq 1 -a ${dir_ok} -eq 0 ];  then
-      echo 2 "${el}_import_ftp_source" "-" "Could not access the directory on ${url}"
+      echo 2 ${key} "-" "Could not access the directory on ${url}"
     elif [ ${login_ok} -eq 0 ]; then
-      echo 2 "${el}_import_ftp_source" "-" "Could not log into ${url}"
+      echo 2 ${key} "-" "Could not log into ${url}"
     fi
   done
 }

From a8643cf8137003e12dcd45493242fcdf42278c38 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 24 Sep 2012 15:09:59 +0200
Subject: [PATCH 1341/2585] - nicely wrapping the wget statement :)

---
 usr/lib/check_mk_agent/local/ftp-feed-sources | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/usr/lib/check_mk_agent/local/ftp-feed-sources b/usr/lib/check_mk_agent/local/ftp-feed-sources
index 0d1e377a..01178bfd 100644
--- a/usr/lib/check_mk_agent/local/ftp-feed-sources
+++ b/usr/lib/check_mk_agent/local/ftp-feed-sources
@@ -25,7 +25,12 @@ function check_ftp_feed_sources() {
     local password=$(grep ^ftp_password $file | cut -d'=' -f2 | sed 's#"##g')
     local url=$(grep ^ftp_url $file | cut -d'=' -f2 | sed 's#"##g')
 
-    local headers=$(wget -O /dev/null --ftp-user $user --ftp-password $password $url 2>&1 >/dev/null)
+    local headers=$(
+      wget -O /dev/null \
+        --ftp-user $user \
+        --ftp-password $password \
+        $url 2>&1 >/dev/null
+    )
     local login_ok=$(echo "$headers" | grep 'Logged in' | wc -l)
     local dir_ok=$(echo "$headers" | grep '==> LIST ... done.' | wc -l)
     

From d4467913dca79c81dbd7955f96640e5c9df4e8af Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 25 Sep 2012 09:36:33 +0200
Subject: [PATCH 1342/2585] - print (called from print_and_log) now uses fmt to
 wrap all   strings. Also, it will add the $(get_id) at the beginning of each 
  line. This ensures that all lines outputted by print are 66 +   <length of
 ID string>.

  This means that all calls to print_and_log can be as long as you
  want without worrying about breaking text in the console:

  print_and_log "Drop it, Broadhurst; drop it, I say," said Hutton, springing to his feet and pacing up and down the narrow room. "You're trying to make a coward of me! You know the men must have gone up country prospectin' or farmin', maybe. What is it to us where they went? You don't think I have a register of every man in the colony, as Inspector Burton has of the lags."

  becomes:

    [ece-install-20] Drop it, Broadhurst; drop it, I say, said Hutton, springing
    [ece-install-20] to his feet and pacing up and down the narrow room. You're
    [ece-install-20] trying to make a coward of me! You know the men must have
    [ece-install-20] gone up country prospectin' or farmin', maybe. What is it
    [ece-install-20] to us where they went? You don't think I have a register of
    [ece-install-20] every man in the colony, as Inspector Burton has of the lags.

  This doesn't change messages written to the log, these are not
  broken up.
---
 usr/share/escenic/ece-scripts/common-bashing.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index e4cbc8b2..ed4bfbbe 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -44,11 +44,12 @@ function debug() {
 
 function print() {
   if [[ "$quiet" == 1 ]]; then
-    echo $@
+    echo $@ | fmt
     return
   fi
-  
-  echo $(get_id) $@
+
+  # we break the text at 64 characters to have space for the ID.
+  echo $@ | fmt --width 64 | sed "s#^#$(get_id) #g"
 }
 
 function printne() {
@@ -272,7 +273,7 @@ function print_next_step_list() {
 ## $2 pass
 ## $3 URL
 function is_unauthorized_to_access_url() {
-  curl -s  -I  -u ${1}:${2} ${3} | \
+  curl --silent --connect-timeout 20 --head  --user ${1}:${2} ${3} | \
     head -1 | \
     grep "401 Unauthorized" | \
     wc -l
@@ -283,7 +284,7 @@ function is_unauthorized_to_access_url() {
 ## $2 pass
 ## $3 URL
 function is_authorized_to_access_url() {
-  curl -s  -I  -u ${1}:${2} ${3} | \
+  curl --silent --connect-timeout 20 --head --user ${1}:${2} ${3} | \
     head -1 | \
     grep "200 OK" | \
     wc -l

From 66a46fc3d54741be29c0f09636daf900d432e911 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 25 Sep 2012 14:43:37 +0200
Subject: [PATCH 1343/2585] - break at 70 instead

---
 usr/share/escenic/ece-scripts/common-bashing.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index ed4bfbbe..8a8d9341 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -48,8 +48,8 @@ function print() {
     return
   fi
 
-  # we break the text at 64 characters to have space for the ID.
-  echo $@ | fmt --width 64 | sed "s#^#$(get_id) #g"
+  # we break the text early to have space for the ID.
+  echo $@ | fmt --width 70 | sed "s#^#$(get_id) #g"
 }
 
 function printne() {

From d11e4ae1af105c06b581dcff1347fe09884560b4 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 25 Sep 2012 14:57:58 +0200
Subject: [PATCH 1344/2585] - improved common-os::add_apt_source; it will now
 only add APT   repositories if they're reachable and return 200 or 301.

  This makes it possible to successfully run ece-install when one or
  more of the APT repositories are down.

  The pre-requisite for this, of course, is that the packages are
  either pre-installed or available in the local APT cache.
---
 usr/share/escenic/ece-scripts/common-os.sh | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index e51a03c1..2033cefc 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -165,6 +165,28 @@ function get_total_memory_in_mega_bytes() {
 }
 
 function add_apt_source() {
+  # first, check that the base URL in the sources list returns 200,
+  # only allow 20 seconds for this test. If the URL doesn't return
+  # 200, the sources list is not added.
+  local url=$(echo $@ | cut -d' ' -f2)
+  local repo_ok=$(
+    curl \
+      --silent \
+      --head \
+      --connect-timeout 20 \
+      $url | \
+      egrep " 200 OK| 301 Moved Permanently" | \
+      wc -l
+  )
+
+  if [ $repo_ok -eq 0 ]; then
+    print_and_log "$(yellow WARNING)" \
+      "The APT repo $url is not OK, not adding it."
+    return
+  else
+    print_and_log "The APT repo $url is reachable, adding it."
+  fi
+
   if [ $(grep -r "$@" /etc/apt/sources.list* | wc -l) -lt 1 ]; then
     echo "# added by $(basename $0) @ $(date)" >> $escenic_sources
     echo "$@" >> $escenic_sources

From b5330ae080be2a36d95f062a8d18b9f61af9b5ee Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 25 Sep 2012 14:58:23 +0200
Subject: [PATCH 1345/2585] - trying to find the right width ...

---
 usr/share/escenic/ece-scripts/common-bashing.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index 8a8d9341..1bbad567 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -49,7 +49,7 @@ function print() {
   fi
 
   # we break the text early to have space for the ID.
-  echo $@ | fmt --width 70 | sed "s#^#$(get_id) #g"
+  echo $@ | fmt --width 65 | sed "s#^#$(get_id) #g"
 }
 
 function printne() {

From 4e7baacbf4ed3780eafb6c5b30c228400b2d7c8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Wed, 26 Sep 2012 10:11:23 +0200
Subject: [PATCH 1346/2585] ece-build - added maven offline mode with -o flag

---
 usr/share/escenic/build-scripts/ece-build | 27 ++++++++++++++++-------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 6d38db8c..0f7e125a 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -18,6 +18,8 @@ assemblytool_pub_dir=$assemblytool_root_dir/publications
 assemblytool_lib_dir=$assemblytool_root_dir/lib
 svn_src_dir=~/src
 maven_conf_file=~/.m2/settings.xml
+maven_build_offline=0
+maven_opts="clean install"
 project_assembly_dir=$svn_src_dir/project-assembly
 project_assembly_target_dir=$project_assembly_dir/target
 escenic_identifiers="engine
@@ -140,7 +142,7 @@ function verify_configuration {
 ##
 function get_user_options
 {
-  while getopts ":b:t:" opt; do
+  while getopts ":b:t:o" opt; do
     case $opt in
       b)
         svn_path=branches/${OPTARG}
@@ -150,6 +152,11 @@ function get_user_options
         svn_path=tags/${OPTARG}
         release_label=tag-${OPTARG}
         ;;
+      o)
+        maven_build_offline=1
+        maven_opts="-o $maven_opts"
+        print_and_log "Maven offline mode in effect!"
+        ;;
       \?)
         print "Invalid option: -$OPTARG" >&2
         remove_pid_and_exit_in_error
@@ -307,11 +314,15 @@ function verify_maven_proxy
       print_and_log "Your $maven_conf_file is missing the username and/or the password for the maven proxy, exiting!"
       remove_pid_and_exit_in_error
     else
-      wget --http-user $maven_user --http-password $maven_password http://maven.vizrt.com -qO /dev/null
-      RETVAL=$?
-      if [ $RETVAL -ne 0 ]; then
-        print_and_log "Your user can't reach http://maven.vizrt.com, exiting!"
-        remove_pid_and_exit_in_error
+      if [ $maven_build_offline -eq 1 ]; then
+        print_and_log "Skipping maven proxy verification as you've chosen offline mode!"
+      else
+        wget --http-user $maven_user --http-password $maven_password http://maven.vizrt.com -qO /dev/null
+        RETVAL=$?
+        if [ $RETVAL -ne 0 ]; then
+          print_and_log "Your user can't reach http://maven.vizrt.com, exiting!"
+          remove_pid_and_exit_in_error
+        fi
       fi
     fi
   else
@@ -336,7 +347,7 @@ function svn_checkout
 function maven_build
 {
   run cd $svn_src_dir
-  run mvn clean install
+  run mvn $maven_opts
 }
 
 ##
@@ -610,12 +621,12 @@ function phase_shutdown
 
 ## ece-build execution
 phase_startup
+get_user_options $@
 print_and_log "Starting release creation! @ $(date)"
 print_and_log "Additional output can be found in $log"
 phase_verify_plattform
 phase_verify_user
 phase_clean_up
-get_user_options $@
 phase_verify_project
 phase_release
 phase_shutdown

From f9381eb2e73b948781e9328b1394a935092bd418 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Wed, 26 Sep 2012 11:05:54 +0200
Subject: [PATCH 1347/2585] ece-build - added no .ear mode with -s flag

---
 usr/share/escenic/build-scripts/ece-build | 27 +++++++++++++++++------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 0f7e125a..52d5a6eb 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -20,6 +20,7 @@ svn_src_dir=~/src
 maven_conf_file=~/.m2/settings.xml
 maven_build_offline=0
 maven_opts="clean install"
+skip_ear=0
 project_assembly_dir=$svn_src_dir/project-assembly
 project_assembly_target_dir=$project_assembly_dir/target
 escenic_identifiers="engine
@@ -142,7 +143,7 @@ function verify_configuration {
 ##
 function get_user_options
 {
-  while getopts ":b:t:o" opt; do
+  while getopts ":b:t:os" opt; do
     case $opt in
       b)
         svn_path=branches/${OPTARG}
@@ -157,6 +158,10 @@ function get_user_options
         maven_opts="-o $maven_opts"
         print_and_log "Maven offline mode in effect!"
         ;;
+      s)
+        skip_ear=1
+        print_and_log "Skip .ear mode in effect!"
+        ;;
       \?)
         print "Invalid option: -$OPTARG" >&2
         remove_pid_and_exit_in_error
@@ -409,7 +414,11 @@ function publish_ear
 function print_result
 {
   print_and_log "BUILD SUCCESSFUL! @ $(date)"
-  print_and_log "You'll find the release here: http://builder.vizrtsaas.com/$customer/releases/$resulting_ear"
+  if [ $skip_ear -eq 1 ]; then
+    print_and_log "Only configuration packages has been created in this release!"
+  else
+    print_and_log "You'll find the release here: http://builder.vizrtsaas.com/$customer/releases/$resulting_ear"
+  fi
 }
 
 ##
@@ -604,11 +613,15 @@ EOF
 function phase_release
 {
   svn_checkout
-  maven_build
-  symlink_project_assembly
-  generate_publication_properties
-  ant_build
-  publish_ear
+  if [ $skip_ear -eq 0 ]; then
+    maven_build
+    symlink_project_assembly
+    generate_publication_properties
+    ant_build
+    publish_ear
+  else
+    print_and_log "Creation of .ear file skipped as requested!"    
+  fi
   create_machine_conf_packages
   print_result
 }

From 05f323aa1a87f8c1772ebaf76e446788101dc5fd Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 26 Sep 2012 10:25:30 +0200
Subject: [PATCH 1348/2585] - removed debug log message

---
 usr/share/escenic/ece-scripts/common-os.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index 2033cefc..2e7de027 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -183,8 +183,6 @@ function add_apt_source() {
     print_and_log "$(yellow WARNING)" \
       "The APT repo $url is not OK, not adding it."
     return
-  else
-    print_and_log "The APT repo $url is reachable, adding it."
   fi
 
   if [ $(grep -r "$@" /etc/apt/sources.list* | wc -l) -lt 1 ]; then

From 235fe6aa319c6692d3ffe4c2a1a7118f12a82416 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 26 Sep 2012 14:07:46 +0200
Subject: [PATCH 1349/2585] - made fai_analysis_db_install=1 a proper profile.
 - smarter use of line wrapping

---
 usr/sbin/ece-install                          |  7 +++++
 .../escenic/ece-scripts/common-bashing.sh     |  4 ++-
 .../ece-scripts/ece-install.d/constants.sh    |  1 +
 .../ece-scripts/ece-install.d/database.sh     | 30 ++++++++-----------
 .../ece-scripts/ece-install.d/monitoring.sh   | 28 ++++++++---------
 5 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index cae73439..50d8c291 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -1070,6 +1070,13 @@ if [ $fai_enabled -eq 1 ]; then
         no_fai_profile=0
     fi
 
+
+    if [ ${fai_analysis_db_install-0} -eq 1 ]; then
+      install_profile_number=$PROFILE_ANALYSIS_DB_SERVER
+      install_database_server
+      no_fai_profile=0
+    fi
+    
     # Important that the EAE is installed after all, editor and
     # presentation in case it's running on the same host as any of
     # them. This because it configures the EAE ECE plugin, which the
diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index 1bbad567..87c97408 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -49,7 +49,9 @@ function print() {
   fi
 
   # we break the text early to have space for the ID.
-  echo $@ | fmt --width 65 | sed "s#^#$(get_id) #g"
+  local id="$(get_id) "
+  local text_width=$(( 80 - $(echo $id | wc -c) ))
+  echo $@ | fmt --width $text_width | sed "s#^#${id}#g"
 }
 
 function printne() {
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/constants.sh b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
index e35a5287..cb033820 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
@@ -13,6 +13,7 @@ PROFILE_CREATE_PUBLICATION=9
 PROFILE_MONITORING_SERVER=10
 PROFILE_RESTORE_FROM_BACKUP=11
 PROFILE_ANALYSIS_SERVER=12
+PROFILE_ANALYSIS_DB_SERVER=12
 PROFILE_VIP_PROVIDER=13
 PROFILE_NFS_SERVER=14
 PROFILE_NFS_CLIENT=15
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 42eff206..26858646 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -33,7 +33,7 @@ function set_up_percona_repository_if_possible() {
     fi
 
     if [ $supported_code_name -eq 1 ]; then
-      print_and_log "Setting Up the Percona repository ..."
+      print_and_log "Setting Up the Percona Repository ..."
 
       if [ $(apt-key list| grep CD2EFD2A | wc -l) -lt 1 ]; then
         # this CANNOT be run in the run wrapper since it often fails,
@@ -118,7 +118,7 @@ function install_mysql_client_software() {
 ## $1: optional parameter, binaries_only. If passed, $1=binaries_only,
 ##     the ECE DB schema is not set up.
 function install_database_server() {
-  print_and_log "Installing database server on $HOSTNAME ..."
+  print_and_log "Installing a database server on $HOSTNAME ..."
 
   if [ ${fai_db_sql_only-0} -eq 0 ]; then
     install_mysql_server_software
@@ -173,7 +173,7 @@ function set_up_ecedb() {
   pre_install_new_ecedb
   create_ecedb
 
-  add_next_step "DB is now set up on ${db_host}:${db_port}"
+  add_next_step "DB ${db_schema} is now set up on ${db_host}:${db_port}"
 }
 
 function set_db_settings_from_fai_conf()
@@ -181,22 +181,18 @@ function set_db_settings_from_fai_conf()
   # Note: the port isn't fully supported. The user must himself
   # update the mysql configuration to run it on a non standard port.
 
-  # if either the profile=analysis or the profile=db &&
-  # fai_analysis_db_install is set, we try first to use the
-  # fai_analysis_db_* variables.
-  if [[ ( $install_profile_number -eq $PROFILE_DB_SERVER &&
-          $(get_boolean_conf_value fai_analysis_db_install) -eq 1 ) ||
-        $install_profile_number -eq $PROFILE_ANALYSIS_SERVER ]]; then
-
+  # if the analysis or analysis DB profile is selected, these are the
+  # only ones that care about analysis specific DB settings.
+  if [[ $install_profile_number -eq $PROFILE_ANALYSIS_DB_SERVER ||
+        $install_analysis_server -eq $PROFILE_ANALYSIS_SERVER ]]; then
     # order of precedence:
     # 1) fai_analysis_db_*
-    # 2) fai_db_*
-    # 3) default_db_*
-    db_port=${fai_analysis_db_port-${fai_db_port-${default_db_port}}}
-    db_host=${fai_analysis_db_host-${fai_db_host-${default_db_host}}}
-    db_user=${fai_analysis_db_user-${fai_db_user-${default_db_user}}}
-    db_password=${fai_analysis_db_password-${fai_db_password-${default_db_password}}}
-    db_schema=${fai_analysis_db_schema-${fai_db_schema-${default_db_schema}}}
+    # 2) default_db_*
+    db_port=${fai_analysis_db_port-${default_db_port}}
+    db_host=${fai_analysis_db_host-${default_db_host}}
+    db_user=${fai_analysis_db_user-${default_db_user}}
+    db_password=${fai_analysis_db_password-${default_db_password}}
+    db_schema=${fai_analysis_db_schema-${default_db_schema}}
   else
     db_port=${fai_db_port-${default_db_port}}
     db_host=${fai_db_host-${default_db_host}}
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index a01543fa..737d07de 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -198,8 +198,8 @@ function install_nagios_node()
       print_and_log "check_mk might not start automatically, as xinetd.d/check_mk is missing"
     fi
   else
-    print_and_log "Nagios node installation not supported on your system"
-    print_and_log "You will have to install it manually."
+    print_and_log "Nagios node installation not supported on your system," \
+      "you will have to install it manually."
     return
   fi
 
@@ -217,8 +217,8 @@ function install_nagios_node()
   run touch /var/run/nagios/nrpe.pid
   run /etc/init.d/nagios-nrpe-server restart
 
-  add_next_step "A Nagios NRPE node and check_mk has been installed"
-  add_next_step "on ${HOSTNAME}"
+  add_next_step "A Nagios NRPE node and check_mk has been installed" \
+    "on ${HOSTNAME}"
 }
 
 function install_munin_node()
@@ -250,8 +250,8 @@ function install_munin_node()
     packages="munin-node munin-plugins-extra"
     install_packages_if_missing $packages
   else
-    print_and_log "Munin node installation not supported on your system"
-    print_and_log "You will have to install it manually."
+    print_and_log "Munin node installation not supported on your system," \
+      "you will have to install it manually."
     return
   fi
 
@@ -343,14 +343,14 @@ function install_munin_gatherer()
     packages="munin"
     install_packages_if_missing $packages
   else
-    print_and_log "Munin gatherer installation not supported on your"
-    print_and_log "system :-( You will have to install it manually."
+    print_and_log "Munin gatherer installation not supported on your" \
+      "system :-( You will have to install it manually."
     return
   fi
 
   if [ $fai_enabled -eq 0 ]; then
-    print "Which nodes shall this Munin monitor gather from?"
-    print "Separate your hosts with a space, e.g.: 'editor01 db01 web01'"
+    print "Which nodes shall this Munin monitor gather from?" \
+      "Separate your hosts with a space, e.g.: 'editor01 db01 web01'"
     echo -n "Your choice> "
     read user_munin_nodes
 
@@ -394,8 +394,8 @@ EOF
     run /etc/init.d/apache2 reload
   fi
 
-  add_next_step "Munin gatherer admin interface: http://${HOSTNAME}/munin"
-  add_next_step "Make sure all nodes allows its IP to connect to them."
+  add_next_step "Munin gatherer admin interface: http://${HOSTNAME}/munin" \
+    "Make sure all nodes allows its IP to connect to them."
 }
 
 ## $1 nagios vendor
@@ -579,6 +579,6 @@ function install_system_info() {
     done
   fi
 
-  add_next_step "Always up to date system info: http://$HOSTNAME:$port/"
-  add_next_step "you can also see system-info in the shell, type: system-info"
+  add_next_step "Always up to date system info: http://$HOSTNAME:$port/" \
+    "you can also see system-info in the shell, type: system-info"
 }

From 7902496c24fccb263110a0fe8ad387a1744429e7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 26 Sep 2012 14:33:34 +0200
Subject: [PATCH 1350/2585] - fixed database::create_ecedb so that the EAE
 scripts only are run   for the analysis DB profile.

  This closes #100

  Tested configuration:

     fai_enabled=1

     fai_analysis_db_install=1
     fai_analysis_db_schema=analysisdb
     fai_analysis_db_user=analysisuser
     fai_analysis_db_password=foo

     fai_db_install=1

  This creates the EAE database, analysisdb with only the EAE tables in
  it and a standard ECE database without the EAE tables.
---
 usr/share/escenic/ece-scripts/ece-install.d/database.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 26858646..88dde060 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -528,6 +528,11 @@ function create_ecedb() {
     return
   fi
 
+  if [ $install_profile_number -eq $PROFILE_ANALYSIS_DB_SERVER ]; then
+    run_eae_scripts_if_available
+    return
+  fi
+  
   # first the ECE SQL ...
   run_db_scripts $ece_home/database/$db_product
   
@@ -555,8 +560,6 @@ function create_ecedb() {
     run_db_scripts ${escenic_root_dir}/${archive_sql_dir}
   done
 
-  run_eae_scripts_if_available
-
   log "${id} ${db_product}://${db_host}/${db_schema} is now ready for ${db_user}/${db_password}"
 }
 

From f9c7f0dab91d4a63a67a257d4f1c590c91596345 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 27 Sep 2012 07:33:32 +0200
Subject: [PATCH 1351/2585] - ece-install now sets up an HTTPS connector for
 all app servers. The   port of this connector will be the same as whatever is
 set for the   redirect port for the primary connector.

  Hence, if you have:

     fai_presentation_install=1
     fai_presentation_redirect=9443

  You'll get an HTTPS connector set up for port 9443 in addition to
  the normal HTTP port on port 8080. The default redirect port is
  8443.

- made use of the improved print and add_next_step in common.
---
 .../ece-scripts/ece-install.d/app-server.sh   | 60 ++++++++++---------
 1 file changed, 33 insertions(+), 27 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index fa8b9123..d6c80675 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -8,7 +8,7 @@ function set_up_app_server()
     print "or enter: <port> <shutdown port> <redirect port>:"
     echo -n "Your choice [${default_app_server_port} ${default_app_server_shutdown} ${default_app_server_redirect}]> "
     read user_ports
-    
+
     if [ -n "$user_ports" ]; then
       read appserver_port shutdown_port redirect_port <<< $user_ports
     fi
@@ -52,7 +52,7 @@ function set_up_app_server()
   if [ -z "$redirect_port" ]; then
     redirect_port=${default_app_server_redirect}
   fi
-  
+
   if [ $fai_enabled -eq 0 ]; then
     print "Another question: Where does the database run?"
     print "Press ENTER to accept the default " \
@@ -85,9 +85,9 @@ function set_up_app_server()
   else
     indexer_ws_uri=http://${HOSTNAME}:${appserver_port}/indexer-webservice/index/
   fi
-  
+
   leave_trail "trail_indexer_ws_uri=${indexer_ws_uri}"
-  
+
   if [ $fai_enabled -eq 0 ]; then
     print "Last question, I promise!: Where does the search instance run?"
     print "Press ENTER to accept the default ($HOSTNAME:${default_app_server_port})"
@@ -95,7 +95,7 @@ function set_up_app_server()
     print "If you're in doubt, just press ENTER :-)"
     echo -n "Your choice [$HOSTNAME:${default_app_server_port}]> "
     read user_search
-    
+
     if [ -z "$user_search" ]; then
       search_host=$HOSTNAME
       search_port=${default_app_server_port}
@@ -115,7 +115,7 @@ function set_up_app_server()
       tail -1
   )
   tomcat_dir=$(get_base_dir_from_bundle $tomcat_archive)
-  
+
   run cd $appserver_parent_dir
   run tar xzf $download_dir/${tomcat_dir}.tar.gz
 
@@ -123,8 +123,8 @@ function set_up_app_server()
     run rm tomcat
   fi
   run ln -sf ${tomcat_dir} tomcat
-  
-  tomcat_home=${appserver_parent_dir}/tomcat   
+
+  tomcat_home=${appserver_parent_dir}/tomcat
   tomcat_base=${appserver_parent_dir}/tomcat-${instance_name}
   make_dir $tomcat_base
 
@@ -133,12 +133,12 @@ function set_up_app_server()
     make_dir $tomcat_base/$el
   done
 
-  set_ece_instance_conf tomcat_base $tomcat_base   
+  set_ece_instance_conf tomcat_base $tomcat_base
   set_ece_instance_conf tomcat_home $tomcat_home
   set_ece_instance_conf appserver_port $appserver_port
   set_appropriate_jvm_heap_sizes
   set_http_auth_credentials_if_needed
-  
+
   run cd $tomcat_base/lib
   make_ln $jdbc_driver
 
@@ -151,8 +151,8 @@ function set_up_app_server()
   escenic_loader=",$\{catalina.base\}/escenic/lib/*.jar"
   old=$(get_escaped_bash_string ${common_loader})
   new=${escaped_common_loader}$(get_escaped_bash_string ${escenic_loader})
-  run sed -i "s#${old}#${new}#g" $file 
-  
+  run sed -i "s#${old}#${new}#g" $file
+
   cat > $tomcat_base/conf/server.xml <<EOF
 <?xml version='1.0' encoding='utf-8'?>
 <Server port="$shutdown_port" shutdown="SHUTDOWN">
@@ -271,18 +271,25 @@ EOF
     />
 EOF
   fi
-  
+
   cat >> $tomcat_base/conf/server.xml <<EOF
   </GlobalNamingResources>
 
   <Service name="Catalina">
     <Connector port="${appserver_port}"
-               protocol="HTTP/1.1" 
-               connectionTimeout="20000" 
+               protocol="HTTP/1.1"
+               connectionTimeout="20000"
                URIEncoding="UTF-8"
                compression="on"
                redirectPort="${redirect_port}"
     />
+    <Connector port="${redirect_port}"
+               protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               URIEncoding="UTF-8"
+               proxyPort="443"
+               scheme="https"
+    />
     <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
       <Valve className="org.apache.catalina.valves.AccessLogValve"
              prefix="access."
@@ -314,7 +321,7 @@ EOF
       ensure_domain_is_known_to_local_host ${domain}
 
       local file=$tomcat_base/conf/server.xml
-      
+
       cat >> $file <<EOF
       <Host name="${domain}" appBase="webapps" autoDeploy="false">
 EOF
@@ -325,7 +332,7 @@ EOF
         <Alias>$ele</Alias>
 EOF
       done
-      
+
       cat >> $file <<EOF
         <Context displayName="${domain}"
                  docBase="${publication}"
@@ -336,7 +343,7 @@ EOF
       leave_trail "trail_virtual_host_${publication}=${domain}:${appserver_port}"
     done
   fi
-  
+
   cat >> $tomcat_base/conf/server.xml <<EOF
     </Engine>
   </Service>
@@ -419,7 +426,7 @@ EOF
   />
 </Context>
 EOF
-  else 
+  else
     cat >> $tomcat_base/conf/context.xml <<EOF
 </Context>
 EOF
@@ -431,17 +438,16 @@ function set_appropriate_jvm_heap_sizes() {
   local heap_size=2048
   local percent=70
   local total_size=$(get_total_memory_in_mega_bytes)
-  
+
   if [ $total_size -lt $heap_size ]; then
-    local warning="$(yellow WARNING)"
-    print_and_log "$warning $HOSTNAME only has $total_size MBs of memory, I will"
-    print_and_log "$warning use ${percent}% of this for the JVM heap sizes, but you"
-    print_and_log "$warning should really consider adding more RAM so that"
-    print_and_log "$warning the $instance_name instance gets at least 2GBs"
+    print_and_log "$(yellow WARNING) $HOSTNAME only has $total_size MBs of" \
+      "memory, I will use ${percent}% of this for the JVM heap sizes, but you" \
+      "should really consider adding more RAM so that" \
+      "the $instance_name instance gets at least 2GBs"
 
     heap_size=$(echo "$total_size * 0.${percent}" | bc | cut -d'.' -f1)
   fi
-  
+
   set_ece_instance_conf min_heap_size "${heap_size}m"
   set_ece_instance_conf max_heap_size "${heap_size}m"
 }
@@ -464,7 +470,7 @@ function set_http_auth_credentials_if_needed() {
     http_user=${fai_presentation_escenic_admin_http_user}
     http_password=${fai_presentation_escenic_admin_http_password}
   fi
-  
+
   if [[ -n "$http_user" && -n "$http_password" ]]; then
     set_ece_instance_conf escenic_admin_http_user "$http_user"
     set_ece_instance_conf escenic_admin_http_password "$http_password"

From 5dfbf0ec01d7276e098d8176f36c48234a270fb4 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 27 Sep 2012 07:58:06 +0200
Subject: [PATCH 1352/2585] - all modules now use the new line wrapping feature
 in print and   add_next_step.

---
 .../ece-install.d/content-engine.sh           | 20 ++++++++---------
 .../ece-install.d/create-publication.sh       |  4 ++--
 .../ece-scripts/ece-install.d/database.sh     | 16 +++++++-------
 .../escenic/ece-scripts/ece-install.d/java.sh | 22 +++++++++----------
 .../ece-scripts/ece-install.d/monitoring.sh   | 10 +++++----
 .../ece-install.d/restore-from-backup.sh      | 22 +++++++++----------
 .../ece-install.d/search-server.sh            |  4 ++--
 .../escenic/ece-scripts/ece.d/assemble.sh     |  3 ++-
 usr/share/escenic/ece-scripts/ece.d/deploy.sh |  8 +++----
 .../escenic/ece-scripts/ece.d/package.sh      |  4 ++--
 usr/share/escenic/ece-scripts/ece.d/stop.sh   |  8 +++----
 11 files changed, 62 insertions(+), 59 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 576a8cc5..cb971ee1 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -288,8 +288,8 @@ EOF
       )
       
       if [ ! -e $(basename $el) ]; then
-        print_and_log "Failed to get user publication $el."
-        print_and_log "I will skip it and continue to the next one."
+        print_and_log "Failed to get user publication $el." \
+          "I will skip it and continue to the next one."
         continue
       fi
 
@@ -318,8 +318,8 @@ function set_up_basic_nursery_configuration() {
   # Then we see if we're using configuration archives, if yes, use the
   # JAAS and Nursery configuraiton from here.
   if [ $(is_using_conf_archive) -eq 1 ]; then
-    print_and_log "Using the supplied Nursery & JAAS configuration from" 
-    print_and_log "bundle: $ece_instance_conf_archive"
+    print_and_log "Using the supplied Nursery & JAAS configuration from" \
+      "bundle: $ece_instance_conf_archive"
 
     # the conf archive typically resides on the build server, hence we
     # set its authentication credentials here.
@@ -386,11 +386,11 @@ EOF
     sed -i 's/jdbc\/ecome/jdbc\/ECE_UPDATE_DS/g' $file
     exit_on_error "sed on $file"
   elif [ ! -e ${file} ]; then
-    print_and_log "I Could not find an ECOME configuration file,"
-    print_and_log "I assume you have not installed Community Engine."
+    print_and_log "I Could not find an ECOME configuration file," \
+      "I assume you have not installed Community Engine."
   else
-    print_and_log "Could not write to ${file},"
-    print_and_log "Community Engine might not work because of this. "
+    print_and_log "Could not write to ${file}," \
+      "Community Engine might not work because of this. "
     remove_pid_and_exit_in_error
   fi
 
@@ -687,8 +687,8 @@ function assemble_deploy_and_restart_type()
       -t $type \
       deploy --uri $ece_instance_ear_file \
       restart"
-    print_and_log "Deploying the $ece_instance_ear_file on "
-    print_and_log "instance $instance_name and restarting it ..."
+    print_and_log "Deploying the $ece_instance_ear_file on" \
+      "instance $instance_name and restarting it ..."
   else
     print_and_log "Assembling, deploying & starting $instance_name ..."
   fi
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
index 999394aa..785dfb22 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
@@ -1,8 +1,8 @@
 function create_publication() {
   if [ ! -e $escenic_root_dir/engine -o \
     ! -e $escenic_root_dir/assemblytool ]; then
-    print_and_log "Please install ECE and an assembly environment before"
-    print_and_log "running this installation profile again."
+    print_and_log "Please install ECE and an assembly environment before" \
+      "running this installation profile again."
     remove_pid_and_exit_in_error
   fi
 
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 88dde060..2575bdf3 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -47,8 +47,8 @@ function set_up_percona_repository_if_possible() {
         # we're checking if it failed and if yes, force the package
         # installation.
         if [ $? -gt 0 ]; then
-          print_and_log "Failed retrieving the Percona key from keys.gnupg.net"
-          print_and_log "Will install the Percona packages without the GPG key"
+          print_and_log "Failed retrieving the Percona key from keys.gnupg.net" \
+            "Will install the Percona packages without the GPG key"
           force_packages=1
         else
           gpg --armor \
@@ -67,10 +67,10 @@ function set_up_percona_repository_if_possible() {
       
       leave_trail "trail_db_vendor=percona"
     else
-      print_and_log "The Percona APT repsository doesn't have packages"
-      print_and_log "for your Debian (or derivative) version with code"
-      print_and_log "name $code_name. "
-      print_and_log "I will use vanilla MySQL instead."
+      print_and_log "The Percona APT repsository doesn't have packages" \
+        "for your Debian (or derivative) version with code" \
+        "name $code_name. " \
+        "I will use vanilla MySQL instead."
 
       mysql_server_packages="mysql-server libmysqlclient16"
       mysql_client_packages="mysql-client libmysqlclient16"
@@ -204,8 +204,8 @@ function set_db_settings_from_fai_conf()
   if [ -n "${fai_db_drop_old_db_first}" ]; then
     drop_db_first=${fai_db_drop_old_db_first}
     if [ $fai_db_drop_old_db_first -eq 1 ]; then
-      print_and_log "$(yellow WARNING): I hope you know what you're doing!"
-      print_and_log "$(yellow WARNING): fai_db_drop_old_db_first is 1 (true)"
+      print_and_log "$(yellow WARNING): I hope you know what you're doing!" \
+        "fai_db_drop_old_db_first is 1 (true)"
     fi
   fi
 
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/java.sh b/usr/share/escenic/ece-scripts/ece-install.d/java.sh
index b5e5bf4d..89bb98b8 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/java.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/java.sh
@@ -24,19 +24,19 @@ function create_java_deb_packages_and_repo() {
   # heed here.
   bash oab-java.sh 1>> $log 2>> $log
   if [ $? -gt 0 ]; then
-    print_and_log "Creating Oracle/Sun Java packages failed. This is probably"
-    print_and_log "because of a 3rd party script, oab-java6, which fails"
-    print_and_log "whenever Oracle changes their website. To continue, please" 
-    print_and_log "go to http://www.oracle.com/technetwork/java/javase/downloads"
-    print_and_log "and download the full Java 6 JDK and be sure to add it first"
-    print_and_log "in PATH. Then re-run $(basename $0)."
+    print_and_log "Creating Oracle/Sun Java packages failed. This is probably" \
+      "because of a 3rd party script, oab-java6, which fails" \
+      "whenever Oracle changes their website. To continue, please" \
+      "go to http://www.oracle.com/technetwork/java/javase/downloads" \
+      "and download the full Java 6 JDK and be sure to add it first" \
+      "in PATH. Then re-run $(basename $0)."
     remove_pid_and_exit_in_error
   fi
   run rm -rf $tmp_dir
     
-  add_next_step "Local APT repository with Sun/Oracle Java packages"
-  add_next_step "has been installed at /var/local/oab/deb and added"
-  add_next_step "to your APT system with /etc/apt/sources.list.d/oab.list"
+  add_next_step "Local APT repository with Sun/Oracle Java packages" \
+    "has been installed at /var/local/oab/deb and added" \
+    "to your APT system with /etc/apt/sources.list.d/oab.list"
 }
 
 
@@ -90,8 +90,8 @@ function install_sun_java_on_redhat() {
   local version=$(java -version 2>&1 | grep version | cut -d'"' -f2)
   print_and_log "Sun Java $version is now installed in /opt/jdk"
 
-  add_next_step "By using Sun Java, you must accept this license: "
-  add_next_step "http://www.oracle.com/technetwork/java/javase/terms/license/"
+  add_next_step "By using Sun Java, you must accept this license: " \
+    "http://www.oracle.com/technetwork/java/javase/terms/license/"
 }
 
 
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index 737d07de..1e3198bc 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -32,7 +32,8 @@ function install_nagios_monitoring_server()
       # see http://lists.mathias-kettner.de/pipermail/checkmk-en/2009-November/000808.html
       run chmod u+s /usr/lib/nagios/plugins/check_icmp
     else
-      print_and_log "Unable to setuid root on check_icmp, needed by check_mk's host checks."
+      print_and_log "Unable to setuid root on check_icmp, " \
+        "needed by check_mk's host checks."
     fi
 
   fi
@@ -195,7 +196,8 @@ function install_nagios_node()
       fi
       run /etc/init.d/xinetd reload
     else
-      print_and_log "check_mk might not start automatically, as xinetd.d/check_mk is missing"
+      print_and_log "check_mk might not start automatically, " \
+        "as xinetd.d/check_mk is missing"
     fi
   else
     print_and_log "Nagios node installation not supported on your system," \
@@ -289,8 +291,8 @@ function install_escenic_munin_plugins() {
 
   local instance_list=$(get_instance_list)
   if [ -z "${instance_list}" ]; then
-    print_and_log "No ECE instances found on $HOSTNAME, so I'm not adding"
-    print_and_log "additional Munin configuration"
+    print_and_log "No ECE instances found on $HOSTNAME, so I'm not adding" \
+      "additional Munin configuration"
 
     if [ $on_debian_or_derivative -eq 1 ]; then
       run service munin-node restart
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/restore-from-backup.sh b/usr/share/escenic/ece-scripts/ece-install.d/restore-from-backup.sh
index 72831df1..48b0ab16 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/restore-from-backup.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/restore-from-backup.sh
@@ -127,8 +127,8 @@ function restore_from_backup()
   fi
 
   if [ ! -r "$backup_file" ]; then
-    print_and_log "$backup_file either doesn't exist or cannot be read."
-    print_and_log "I cannot restore from it :-("
+    print_and_log "$backup_file either doesn't exist or cannot be read." \
+      "I cannot restore from it :-("
     remove_pid_and_exit_in_error
   fi
   
@@ -158,27 +158,27 @@ function restore_from_backup()
     print_and_log "Restoring the Solr & ECE data files on $HOSTNAME ..."
     run cd $dir
     run tar -C / -xf $backup_file var/lib/escenic
-    add_next_step "$(green Successfully) restored Solr & ECE data files"
-    add_next_step "Backup file used:  $(basename $backup_file)"
-    add_next_step "Check $escenic_data_dir to verify they're all there."
+    add_next_step "$(green Successfully) restored Solr & ECE data files" \
+      "Backup file used:  $(basename $backup_file)" \
+      "Check $escenic_data_dir to verify they're all there."
   fi
   
   if [ $restore_conf -eq 1 -o $restore_all -eq 1 ]; then
     print_and_log "Restoring the ECE configuration files on $HOSTNAME ..."
     run cd $dir
     run tar -C / -xf $backup_file etc
-    add_next_step "$(green Successfully) restored ECE configuration files"
-    add_next_step "Backup file used: $(basename $backup_file)"
-    add_next_step "Check /etc to verify that they're all there."
+    add_next_step "$(green Successfully) restored ECE configuration files" \
+      "Backup file used: $(basename $backup_file)" \
+      "Check /etc to verify that they're all there."
   fi
   
   if [ $restore_binaries -eq 1 -o $restore_all -eq 1 ]; then
     print_and_log "Restoring the Escenic & Tomcat binaries on $HOSTNAME ..."
     run cd $dir
     run tar -C / -xf $backup_file opt
-    add_next_step "$(green Successfully) restored Escenic & Tomcat binaries"
-    add_next_step "Backup file used: $(basename $backup_file)"
-    add_next_step "Check ${appserver_parent_dir} to verify that they're all there".
+    add_next_step "$(green Successfully) restored Escenic & Tomcat binaries" \
+      "Backup file used: $(basename $backup_file)" \
+      "Check ${appserver_parent_dir} to verify that they're all there".
     install_ece_third_party_packages
     set_up_engine_directories
 
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
index c98d8a2e..ebd8e8f1 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
@@ -16,8 +16,8 @@ function set_up_solr() {
   print_and_log "Setting up Solr ..."
   if [ ! -d $escenic_conf_dir/solr ]; then
     if [ $(is_using_conf_archive) -eq 1 ]; then
-      print_and_log "Using the supplied Solr configuration from" 
-      print_and_log "bundle: $ece_instance_conf_archive"
+      print_and_log "Using the supplied Solr configuration from" \
+        "bundle: $ece_instance_conf_archive"
       
       # the conf archive typically resides on the build server, hence
       # we set its authentication credentials here.
diff --git a/usr/share/escenic/ece-scripts/ece.d/assemble.sh b/usr/share/escenic/ece-scripts/ece.d/assemble.sh
index 6ec59fd3..e81409f9 100644
--- a/usr/share/escenic/ece-scripts/ece.d/assemble.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/assemble.sh
@@ -28,7 +28,8 @@ function warn_about_duplicate_jars() {
     )
     
     if [ $a_class_count -gt 1 ]; then
-      print_and_log $(yellow WARNING) "These JARs contain (at least some) of the same files:"
+      print_and_log $(yellow WARNING) \
+        "These JARs contain (at least some) of the same files:"
       grep $el $assemblytool_home/dist/.work/ear/lib/*.jar | \
         egrep -v "$jar_white_list" | \
         cut -d' ' -f3 | while read f; do
diff --git a/usr/share/escenic/ece-scripts/ece.d/deploy.sh b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
index 9fc01905..92aea1e1 100644
--- a/usr/share/escenic/ece-scripts/ece.d/deploy.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
@@ -52,15 +52,15 @@ function deploy() {
     ear=$(download_uri_target_to_dir $file $cache_dir)
     
     if [ ! -e "$ear" ]; then
-      print_and_log "The EAR $ear_uri specified in $file could"
-      print_and_log "not be retrieved. I will exit now. :-("
+      print_and_log "The EAR $ear_uri specified in $file could" \
+        "not be retrieved. I will exit now. :-("
       exit 1
     fi
   fi
   
   if [ ! -e "$ear" ]; then
-    print_and_log "$ear does not exist. "
-    print_and_log "Did you run '"`basename $0`" -i" $instance "assemble'?"
+    print_and_log "$ear does not exist. " \
+      "Did you run '"`basename $0`" -i" $instance "assemble'?"
     exit 1
   fi
 
diff --git a/usr/share/escenic/ece-scripts/ece.d/package.sh b/usr/share/escenic/ece-scripts/ece.d/package.sh
index ef8f4f87..de80e58b 100644
--- a/usr/share/escenic/ece-scripts/ece.d/package.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/package.sh
@@ -3,8 +3,8 @@
 function create_packages() {
   local ear=$cache_dir/engine.ear
   if [ ! -e $ear ]; then
-    print_and_log "$ear does not exist. "
-    print_and_log "Did you run '"`basename $0`" -i" $instance "assemble'?"
+    print_and_log "$ear does not exist." \
+      "Did you run '"`basename $0`" -i" $instance "assemble'?"
     exit 1
   fi
 
diff --git a/usr/share/escenic/ece-scripts/ece.d/stop.sh b/usr/share/escenic/ece-scripts/ece.d/stop.sh
index 67347221..123ec2fa 100644
--- a/usr/share/escenic/ece-scripts/ece.d/stop.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/stop.sh
@@ -34,8 +34,8 @@ function stop_type() {
 
     set_type_pid
     if [ -n "$type_pid" ]; then
-      print_and_log "I could not stop $type instance $instance gracefully,"
-      print_and_log "I will now use force."
+      print_and_log "I could not stop $type instance $instance gracefully," \
+        "I will now use force."
       run kill -9 $type_pid
     fi
 
@@ -67,8 +67,8 @@ function hang_around_to_see_that_forceful_kill_succeeded() {
   
   set_type_pid
   if [ -n "$type_pid" ]; then
-    print_and_log "I was not able to forcefully kill PID $type_pid"
-    print_and_log "something is very wrong here :-("
+    print_and_log "I was not able to forcefully kill PID $type_pid" \
+      "something is very wrong here :-("
     return
   fi
 }  

From ae8e5c7a096d1ec91434e329cd563737843f413a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 27 Sep 2012 11:58:23 +0200
Subject: [PATCH 1353/2585] - cp instead of mv for images missing from your
 import data set It was   referred to from one of your XML files, perhaps you
 meant this one?

---
 usr/share/escenic/import-scripts/import-error-log-analyzer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/import-scripts/import-error-log-analyzer b/usr/share/escenic/import-scripts/import-error-log-analyzer
index 2b312f5f..333ba0c6 100644
--- a/usr/share/escenic/import-scripts/import-error-log-analyzer
+++ b/usr/share/escenic/import-scripts/import-error-log-analyzer
@@ -55,7 +55,7 @@ your XML files, perhaps you meant this one?
 
    $alternative
 Suggested command to fix this:
-   mv "$alternative" \\
+   cp "$alternative" \\
       "$1"
 ====
 EOF

From 4633a4724d79e15838d6261164bdce6e9fcd4c35 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 27 Sep 2012 12:27:13 +0200
Subject: [PATCH 1354/2585] - improved log file analyser, now also reports
 wrong colour space and   gives the user the commands to remedy the situation.

---
 .../import-scripts/import-error-log-analyzer  | 94 ++++++++++---------
 1 file changed, 48 insertions(+), 46 deletions(-)

diff --git a/usr/share/escenic/import-scripts/import-error-log-analyzer b/usr/share/escenic/import-scripts/import-error-log-analyzer
index 333ba0c6..10f8319a 100644
--- a/usr/share/escenic/import-scripts/import-error-log-analyzer
+++ b/usr/share/escenic/import-scripts/import-error-log-analyzer
@@ -8,72 +8,69 @@
 
 ## $1 :: the log4j log (often called Escenic-error.log)
 
+function print() {
+  echo "$@" | fmt | sed "s~^~${id} ~g"
+}
+
+count=0
 function check_picture_file() {
+  count=$(( $count + 1 ))
+  id="[error-#${count}]"
   local dir=$(dirname "$1")
   local file_name=$(basename "$1")
 
   if [ ! -d $dir ]; then
-    cat <<EOF 
-Directory doesn't exist: $dir
-doesn't exist. It's referenced via the image:
-$1
-====
-EOF
-    return 
+    print "The directory $dir doesn't exist." \
+      "The image $1 should reside there."
+    return
   fi
-  
-  
-  local alternative=$(find $dir -maxdepth 1 | grep -i "$file_name")
+
+  local alternative=$(find $dir -maxdepth 1 -iname "$file_name" | \grep -v "$file_name")
 
   # first check if the image is size=0
   if [ $(find $dir -name $file_name -maxdepth 1 -type f -size 0 | wc -l) -gt 0 ]; then
-    cat <<EOF
-The file $1 is empty (size = 0 bytes)
-====
-EOF
+    print "The file $1 has size = 0 bytes."
     return
   fi
 
-  if [[ -n "$alternative" && $(echo $alternative | wc -l) -gt 0 ]]; then
-    if [[ "$1" == "$alternative" ]]; then
-      cat <<EOF
-The XML refered to ${1}
-which exists. This means either that the file wasn't there before when
-the import failed or that the file itself is unusable.
-====
-$(ls -lh "$1")
-$(file -i "$1")
-====
-EOF
-      return
-    fi
-
-    cat <<EOF
-The file $1
-was missing from your import data set It was referred to from one of
-your XML files, perhaps you meant this one?
-
-   $alternative
-Suggested command to fix this:
-   cp "$alternative" \\
-      "$1"
-====
-EOF
+  if [ -n "$alternative" ]; then
+    print The file $1 was missing from your import data set. \
+      Perhaps you meant this one: $alternative \
+      Suggested command to fix this: cp "$alternative" "$1"
+  elif [ ! -e $1 ]; then
+    print The file $1 was missing from your data set.
+  elif [ $(has_wrong_colour_space $1) -eq 1 ]; then
+    file=$(basename "$1")
+    print "Image ${1} has the wrong colour space, it needs to be RGB. To" \
+        "fix it, you can do the following to fix it:"
+    echo "   \$" cd $(dirname "$1") \&\& convert "$file" -colorspace rgb "$file"
+  else
+      print The XML refered to ${1} which exists. This probably means that \
+          "the file wasn't there before when the import failed, but is now there, in" \
+          "which case you can just re-run the import. Another option is that" \
+          " the file is corrupt."
   fi
 }
 
+
 function list_sax_errors() {
-  echo "There are illegal elements, attributes and/or contents in the XML:"
-  grep ^"Caused by: org.xml.sax.SAXParseException:" "$1" | sort | uniq
-  echo "===="
-}  
+  local xml_parse_errors="$(grep ^'Caused by: org.xml.sax.SAXParseException:' $1 | sort | uniq)"
+  if [ -n "$xml_parse_errors" ]; then
+    echo "There are illegal elements, attributes and/or contents in the XML:"
+    echo "$xml_parse_errors" | while read line; do
+      count=$(( $count + 1 ))
+      local id="[SAX error-#${count}]"
+      echo "$id $line"
+    done
+  fi
+}
 
 function analyse_this() {
   if [ ! -e $1 ]; then
     echo $1 "doesn't exist :-("
     exit 1
   fi
-  
+
   grep "Invalid image file" $1 | \
     grep ^java.io.IOException | \
     cut -d' ' -f5 | \
@@ -83,7 +80,7 @@ function analyse_this() {
     while read picture_path; do
     check_picture_file "$picture_path"
   done
-  
+
   list_sax_errors "$1"
 }
 
@@ -100,7 +97,12 @@ function verify_log_file() {
   fi
 }
 
+function has_wrong_colour_space() {
+  identify -verbose "$1" 2>/dev/null | \
+    grep Colorspace | \
+    grep CMYK | wc -l
+}
+
 log_file=$1
 verify_log_file
 analyse_this $log_file
-

From 5f551a0330dcdc85dd7210e6c77c045036a27e55 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 27 Sep 2012 12:52:32 +0200
Subject: [PATCH 1355/2585] - now lists the import files affected by the errors

---
 .../import-scripts/import-error-log-analyzer    | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/import-scripts/import-error-log-analyzer b/usr/share/escenic/import-scripts/import-error-log-analyzer
index 10f8319a..6f166b5e 100644
--- a/usr/share/escenic/import-scripts/import-error-log-analyzer
+++ b/usr/share/escenic/import-scripts/import-error-log-analyzer
@@ -46,12 +46,23 @@ function check_picture_file() {
     echo "   \$" cd $(dirname "$1") \&\& convert "$file" -colorspace rgb "$file"
   else
       print The XML refered to ${1} which exists. This probably means that \
-          "the file wasn't there before when the import failed, but is now there, in" \
-          "which case you can just re-run the import. Another option is that" \
-          " the file is corrupt."
+        "the file wasn't there before when the import failed, but is now " \
+        "there, in which case you can just re-run the import. Another option" \
+        "is that the file is corrupt."
   fi
+
+  print "Because of this error, the following file(s) (probably) failed " \
+    "o import:" 
+  $(print_import_files_affected $1)
 }
 
+function print_import_files_affected() {
+  local last_dir=$(basename $(dirname $1))
+  for dir in $(find /var/spool/escenic/import -type d -name error); do
+    find $dir -type f -name "*.xml" | \
+      xargs grep $last_dir/$(basename $1)
+  done
+}
 
 function list_sax_errors() {
   local xml_parse_errors="$(grep ^'Caused by: org.xml.sax.SAXParseException:' $1 | sort | uniq)"

From cbe55b9de31093092b9c4f97f7717d664e82fcae Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 27 Sep 2012 12:54:17 +0200
Subject: [PATCH 1356/2585] - fix in listing

---
 .../escenic/import-scripts/import-error-log-analyzer   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/usr/share/escenic/import-scripts/import-error-log-analyzer b/usr/share/escenic/import-scripts/import-error-log-analyzer
index 6f166b5e..0070d064 100644
--- a/usr/share/escenic/import-scripts/import-error-log-analyzer
+++ b/usr/share/escenic/import-scripts/import-error-log-analyzer
@@ -52,15 +52,17 @@ function check_picture_file() {
   fi
 
   print "Because of this error, the following file(s) (probably) failed " \
-    "o import:" 
-  $(print_import_files_affected $1)
+    "to import:" 
+  print_import_files_affected $1
 }
 
 function print_import_files_affected() {
   local last_dir=$(basename $(dirname $1))
   for dir in $(find /var/spool/escenic/import -type d -name error); do
-    find $dir -type f -name "*.xml" | \
-      xargs grep $last_dir/$(basename $1)
+    print $(
+      find $dir -type f -name "*.xml" | \
+        xargs grep $last_dir/$(basename $1)
+    )
   done
 }
 

From 0999ce01802e0a650ef14a14b96791c16645f6af Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 27 Sep 2012 12:54:45 +0200
Subject: [PATCH 1357/2585] - only list the file name

---
 usr/share/escenic/import-scripts/import-error-log-analyzer | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/import-scripts/import-error-log-analyzer b/usr/share/escenic/import-scripts/import-error-log-analyzer
index 0070d064..53118fc7 100644
--- a/usr/share/escenic/import-scripts/import-error-log-analyzer
+++ b/usr/share/escenic/import-scripts/import-error-log-analyzer
@@ -61,7 +61,8 @@ function print_import_files_affected() {
   for dir in $(find /var/spool/escenic/import -type d -name error); do
     print $(
       find $dir -type f -name "*.xml" | \
-        xargs grep $last_dir/$(basename $1)
+        xargs grep $last_dir/$(basename $1) | \
+        cut -d':' -f1
     )
   done
 }

From 24276d330bf9ba2611838faf43ff435016c103d9 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 27 Sep 2012 12:58:17 +0200
Subject: [PATCH 1358/2585] - only list files once that are affected by the
 import error

---
 .../import-scripts/import-error-log-analyzer       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/usr/share/escenic/import-scripts/import-error-log-analyzer b/usr/share/escenic/import-scripts/import-error-log-analyzer
index 53118fc7..322073c9 100644
--- a/usr/share/escenic/import-scripts/import-error-log-analyzer
+++ b/usr/share/escenic/import-scripts/import-error-log-analyzer
@@ -53,17 +53,17 @@ function check_picture_file() {
 
   print "Because of this error, the following file(s) (probably) failed " \
     "to import:" 
-  print_import_files_affected $1
+  print $(get_import_files_affected $1)
 }
 
-function print_import_files_affected() {
+function get_import_files_affected() {
   local last_dir=$(basename $(dirname $1))
   for dir in $(find /var/spool/escenic/import -type d -name error); do
-    print $(
-      find $dir -type f -name "*.xml" | \
-        xargs grep $last_dir/$(basename $1) | \
-        cut -d':' -f1
-    )
+    find $dir -type f -name "*.xml" | \
+      xargs grep $last_dir/$(basename $1) | \
+      cut -d':' -f1 | \
+      sort | \
+      uniq
   done
 }
 

From e6052956d1f206a843e8d2e65cea13cdf0f1b0ab Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 28 Sep 2012 10:14:17 +0200
Subject: [PATCH 1359/2585] - fixed the test for java availability so that it
 works correctly on   systems with no java.

---
 usr/share/escenic/ece-scripts/system-info.d/44-java-info.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/44-java-info.sh b/usr/share/escenic/ece-scripts/system-info.d/44-java-info.sh
index 0c6b3440..fffd6dbe 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/44-java-info.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/44-java-info.sh
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-java_bin=$(which java)
+java_bin=$(which java 2>/dev/null)
 file=/etc/escenic/ece.conf
 
 if [ -r $file ]; then
@@ -11,7 +11,7 @@ if [ -r $file ]; then
   fi
 fi
 
-if [ $(ls $java_bin 2>/dev/null | wc -l) -gt 0 ]; then
+if [ $(echo $java_bin | wc -c) -gt 1 ]; then
   print_h2_header "Java information"
   print_pre_text $(${java_bin} -version 2>&1)
   print_section_end

From 11acd58220f0765badd7a3929a0abf4f0456e8d6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 28 Sep 2012 10:16:57 +0200
Subject: [PATCH 1360/2585] - added support for listing RedHat info on RH
 servers that don't have   lsb_release installed.

---
 usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
index 5725a29a..fbb090df 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
@@ -8,7 +8,8 @@ print_h3_header "Kernel"
 print_pre_text $(uname -a)
 
 print_h3_header "Distribution"
-print_pre_text "$(lsb_release  -a 2>/dev/null)"
+print_pre_text "$(lsb_release -a 2>/dev/null)" \
+  $(cat /etc/redhat-release 2>/dev/null)
 
 if [ $verbose -eq 1 ]; then
   print_h3_header "Installed packages"

From 7283e580cfbe75a5a24145baabd2d1539beaa19a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 28 Sep 2012 10:31:39 +0200
Subject: [PATCH 1361/2585] - fixed blockdiag existence test

---
 .../ece-scripts/system-info.d/55-list-outgoing-connections.sh   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/55-list-outgoing-connections.sh b/usr/share/escenic/ece-scripts/system-info.d/55-list-outgoing-connections.sh
index ad99722f..ae2c8304 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/55-list-outgoing-connections.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/55-list-outgoing-connections.sh
@@ -66,7 +66,7 @@ function create_diagram_if_possible() {
     fi
   fi
 
-  which blockdiag 1>/dev/null
+  which blockdiag 2>/dev/null
   if [ $? -eq 0 ]; then
     blockdiag_src=$(create_blockdiag_src "$outbound_connections")
     generate_blockdiag "$blockdiag_src"

From efdf3db2688ba2c358743653e0831323659f2ea6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 28 Sep 2012 10:44:07 +0200
Subject: [PATCH 1362/2585] - fix to blockdiag test-

---
 .../ece-scripts/system-info.d/55-list-outgoing-connections.sh   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/55-list-outgoing-connections.sh b/usr/share/escenic/ece-scripts/system-info.d/55-list-outgoing-connections.sh
index ae2c8304..fb53bbf0 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/55-list-outgoing-connections.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/55-list-outgoing-connections.sh
@@ -66,7 +66,7 @@ function create_diagram_if_possible() {
     fi
   fi
 
-  which blockdiag 2>/dev/null
+  which blockdiag 1>/dev/null 2>/dev/null
   if [ $? -eq 0 ]; then
     blockdiag_src=$(create_blockdiag_src "$outbound_connections")
     generate_blockdiag "$blockdiag_src"

From 4466d53e8299df89537cb703976aa726c99bed3a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 28 Sep 2012 10:44:20 +0200
Subject: [PATCH 1363/2585] - support for RedHat in the timezone listing

---
 .../escenic/ece-scripts/system-info.d/66-list-os-info.sh  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
index fbb090df..c558b2c5 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
@@ -22,7 +22,13 @@ fi
 
 print_h3_header "Timezone"
 print_un_ordered_list_start
-print_list_item "$(cat /etc/timezone) (from /etc/timezone)"
+time_zone_file_list="/etc/timezone /etc/sysconfig/clock"
+for el in $time_zone_file_list; do
+  if [ -r $el ]; then
+    print_list_item "$(cat $el) (from $el)"
+  fi
+done
+
 if [ -n "$TZ" ]; then
   print_list_item "$(echo $TZ) (from ${USER}'s environment variable)"
 fi

From a8a2268edb051cd7f111e581d3460b06fe9f7c47 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 28 Sep 2012 10:52:41 +0200
Subject: [PATCH 1364/2585] - more fixes for time zones on RedHat

---
 .../ece-scripts/system-info.d/66-list-os-info.sh  | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
index c558b2c5..3bba2cc1 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
@@ -22,12 +22,15 @@ fi
 
 print_h3_header "Timezone"
 print_un_ordered_list_start
-time_zone_file_list="/etc/timezone /etc/sysconfig/clock"
-for el in $time_zone_file_list; do
-  if [ -r $el ]; then
-    print_list_item "$(cat $el) (from $el)"
-  fi
-done
+
+file=/etc/timezone
+if [ -r $file ]; then
+  print_list_item "$(cat $file) (from $file)"
+fi
+file=/etc/sysconfig/clock
+if [ -r $file ]; then
+  print_list_item "$(cat $file | cut -d'=' -f2 | sed 's/\"//g') (from $file)"
+fi
 
 if [ -n "$TZ" ]; then
   print_list_item "$(echo $TZ) (from ${USER}'s environment variable)"

From 3df7cff9d61e12540ae5f7a628b57babe100968d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 28 Sep 2012 11:05:32 +0200
Subject: [PATCH 1365/2585] - fixed error on systems with no mysqld, when
 running system-info from   the command line

---
 usr/share/escenic/ece-scripts/system-info.d/44-db-info.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/44-db-info.sh b/usr/share/escenic/ece-scripts/system-info.d/44-db-info.sh
index a5b7543f..8d66bc0b 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/44-db-info.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/44-db-info.sh
@@ -2,7 +2,7 @@
 
 # by tkj@vizrt.com
 
-if [ "$(which mysqld)x" != "x" ]; then
+if [ "$(which mysqld 2>/dev/null)x" != "x" ]; then
   print_h2_header "DB information"
   print_pre_text "$(mysqld -V)"
   print_section_end

From 04900cca0a80f9c0631049dfac4325b3ca6bb20a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 28 Sep 2012 11:19:24 +0200
Subject: [PATCH 1366/2585] - fixed test failing if the lsb_release IS
 installed AND we're on a   RedHat based system.

---
 .../escenic/ece-scripts/system-info.d/66-list-os-info.sh   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
index 3bba2cc1..1b0f9dee 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
@@ -8,8 +8,11 @@ print_h3_header "Kernel"
 print_pre_text $(uname -a)
 
 print_h3_header "Distribution"
-print_pre_text "$(lsb_release -a 2>/dev/null)" \
-  $(cat /etc/redhat-release 2>/dev/null)
+if [[ -n $(which lsb_release 2>/dev/null) ]]; then
+  print_pre_text "$(lsb_release -a)"
+elif [ -e /etc/redhat-release ]; then
+  print_pre_text "$(cat /etc/redhat-release)"
+fi
 
 if [ $verbose -eq 1 ]; then
   print_h3_header "Installed packages"

From a077035425aba1269ce214df3020d47a22f9ffd8 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Fri, 28 Sep 2012 12:44:04 +0200
Subject: [PATCH 1367/2585] Ensured that list-ips actually caches the IP, not
 only uses an existing cached IP... DOH!

---
 .../escenic/ece-scripts/system-info.d/55-list-ips.sh     | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/55-list-ips.sh b/usr/share/escenic/ece-scripts/system-info.d/55-list-ips.sh
index fd696985..b5851805 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/55-list-ips.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/55-list-ips.sh
@@ -38,14 +38,13 @@ function print_my_ip_to_the_world() {
         local restore=1
       fi
       if [[ $restore -eq 1 ]] ; then
-        local tmpfile=$(mktemp ${file}.XXXXXXX)
-        echo $old_value > $tmpfile
         value=$old_value
-        mv $tmpfile $file
       fi
+
     fi
-    # touch the file to indicate that it's now up-to-date.
-    touch $file
+    local tmpfile=$(mktemp ${file}.XXXXXXX)
+    echo $value > $tmpfile
+    mv $tmpfile $file
   fi
 
   echo $value

From 7ec304c2b46de55a74733e260f2977fafd2ee9ed Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 28 Sep 2012 15:25:15 +0200
Subject: [PATCH 1368/2585] - fixed bug in common-bashing::print which made
 e.g. ece deploy fail   like this:

 $ ece -i engine1 -t engine deploy --uri
 http://172.24.241.241/wfn/releases/wfn-branch-5.5-test-rev5018-2012-09-17_1715.ear
 restart
 sed: -e expression #1, char 10: unknown option to `s'
---
 usr/share/escenic/ece-scripts/common-bashing.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index 87c97408..d5168e06 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -51,7 +51,7 @@ function print() {
   # we break the text early to have space for the ID.
   local id="$(get_id) "
   local text_width=$(( 80 - $(echo $id | wc -c) ))
-  echo $@ | fmt --width $text_width | sed "s#^#${id}#g"
+  echo $@ | fmt --width $text_width | sed "s~^~${id}~g"
 }
 
 function printne() {

From 35057995e0190e2dd2c2e5bc2eaf6b0272916949 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 8 Oct 2012 14:00:08 +0200
Subject: [PATCH 1369/2585] - the quick link overview for editorial hosts
 always had the port of   the editorial host. Now, it's using the default
 search port,   hardcoded for now, just like the presentation hosts.

---
 usr/share/doc/vizrt/vosa-handbook/create-handbook.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index db94ebf5..7e1f1124 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -421,7 +421,7 @@ function get_editor_host_overview() {
   [[$(get_link ${1}):5678/][system-info]] \
   [[${ece_url}:${2-8080}/escenic-admin/][escenic-admin]] \
   [[${ece_url}:${2-8080}/escenic-admin/top][top]] \
-  [[${ece_url}:${2-8081}/solr/admin/][solr]] \
+  [[${ece_url}:8081/solr/admin/][solr]] \
   [[${ece_url}:${2-8080}/studio/][studio]] \
   [[${ece_url}:${2-8080}/escenic/][escenic]] \
   [[${ece_url}:${2-8080}/webservice/][webservice]] \

From fa59a3dc84b4f35237c1c3938b09f2f785258de9 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 8 Oct 2012 14:30:33 +0200
Subject: [PATCH 1370/2585] - the search  port used for the quick links
 overview, both for the   presentation and editorial servers are now selected
 after this order   of preference:

  1) trail_search_port
  2) 8081 (if 1) isn't present)
---
 usr/share/doc/vizrt/vosa-handbook/create-handbook.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 7e1f1124..3326ed39 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -421,7 +421,7 @@ function get_editor_host_overview() {
   [[$(get_link ${1}):5678/][system-info]] \
   [[${ece_url}:${2-8080}/escenic-admin/][escenic-admin]] \
   [[${ece_url}:${2-8080}/escenic-admin/top][top]] \
-  [[${ece_url}:8081/solr/admin/][solr]] \
+  [[${ece_url}:${trail_search_port-8081}/solr/admin/][solr]] \
   [[${ece_url}:${2-8080}/studio/][studio]] \
   [[${ece_url}:${2-8080}/escenic/][escenic]] \
   [[${ece_url}:${2-8080}/webservice/][webservice]] \
@@ -436,7 +436,7 @@ function get_presentation_host_overview() {
   [[$(get_link ${1}):5678/][system-info]] \
   [[$(get_link ${1}):${2-8080}/escenic-admin/][escenic-admin]] \
   [[$(get_link ${1}):${2-8080}/escenic-admin/top][top]] \
-  [[$(get_link ${1}):8081/solr/admin/][solr]] \
+  [[$(get_link ${1}):${trail_search_port-8081}/solr/admin/][solr]] \
 |
 EOF
 }

From 0a7985c941460e310be2bd3415d4a30a8b3dc3b6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 9 Oct 2012 08:29:56 +0200
Subject: [PATCH 1371/2585] - now supports any distribution that's available
 from Varnish   themselves:  
 http://repo.varnish-cache.org/{debian,ubuntu}/dists/. Before, the   list of
 supported distributions was hard coded.

- before, ece-install didn't attempt to add the Varnish repository if
  the Varnish GPG was in the key ring. The test for this has been made
  more explicit to avoid the corner case were a system has the key,
  but not the repository.
---
 .../ece-scripts/ece-install.d/cache-server.sh | 52 ++++++++++++-------
 1 file changed, 34 insertions(+), 18 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
index 48fce1a4..686bd376 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
@@ -2,31 +2,47 @@
 
 varnish_redhat_rpm_url=http://repo.varnish-cache.org/redhat/varnish-3.0/el5/noarch/varnish-release-3.0-1.noarch.rpm
 
+function get_supported_varnish_dist_list() {
+  # list taken from http://repo.varnish-cache.org/debian/dists/, which
+  # is the same as http://repo.varnish-cache.org/ubuntu/dists/
+  curl --connect-timeout 5 \
+    --silent http://repo.varnish-cache.org/ubuntu/dists/ | \
+    grep href | \
+    cut -d'"' -f8- | \
+    grep ^[a-z] | \
+    cut -d'/' -f1
+}
+
 function install_varnish_software() {
-  if [[ $on_debian_or_derivative -eq 1 &&
-        $(apt-key list | grep varnish-software.com | wc -l) -eq 0 ]]; then
-    curl ${curl_opts} \
-      http://repo.varnish-cache.org/debian/GPG-key.txt \
-      2>> $log | \
-      apt-key add - \
-      1>>$log 2>>$log
-    run apt-get update
-    
-    code_name=$(lsb_release -s -c)
-    supported_code_name=0
+  if [ $on_debian_or_derivative -eq 1 ]; then
+
+    if [ $(apt-key list | grep varnish-software.com | wc -l) -eq 0 ]; then
+      curl ${curl_opts} \
+        http://repo.varnish-cache.org/debian/GPG-key.txt \
+        2>> $log | \
+        apt-key add - \
+        1>>$log 2>>$log
+      run apt-get update
+    fi
     
-    # list taken from http://repo.varnish-cache.org/debian/dists/
-    supported_list="lenny squeeze hardy lucid"
+    local code_name=$(lsb_release -s -c)
+    local supported_code_name=0
+    local supported_list="$(get_supported_varnish_dist_list)"
     for el in $supported_list; do
       if [ $code_name = $el ]; then
         supported_code_name=1
       fi
     done
-    
-    if [ $supported_code_name -eq 1 -a $on_debian -eq 1 ]; then
-      add_apt_source "deb http://repo.varnish-cache.org/debian/ $(lsb_release -s -c) varnish-3.0"
-    elif [ $supported_code_name -eq 1 -a $on_ubuntu -eq 1 ]; then
-      add_apt_source "deb http://repo.varnish-cache.org/ubuntu/ $(lsb_release -s -c) varnish-3.0"
+
+    local dist_name=$(lsb_release -i -s | tr [A-Z] [a-z])
+    if [ $supported_code_name -eq 1 ]; then
+      add_apt_source "deb http://repo.varnish-cache.org/${dist_name}/ ${code_name} varnish-3.0"
+    elif [ $supported_code_name -eq 1 ]; then
+      add_apt_source "deb http://repo.varnish-cache.org/${dist_name}/ ${code_name} varnish-3.0"
+    else
+      print_and_log "Your distribution ${code_name} isn't supported" \
+        "by the Varnish repositories. I'll use version Varnish from your" \
+        "distribution's repositories instead"
     fi
     
   elif [[ $on_redhat_or_derivative -eq 1 &&

From 8b4b7981d8d612a837e5079fb22ee41e9b1dbeba Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Tue, 9 Oct 2012 11:03:48 +0000
Subject: [PATCH 1372/2585] added some drawers for plantuml and properties

---
 usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
index 840c559b..b9e27237 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
+++ b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
@@ -1,6 +1,7 @@
 #+TITLE: Welcome to the VOSA Handbook
 #+AUTHOR: Vizrt Online / The SaaS Team
 #+OPTIONS: toc:2 
+#+DRAWERS: PLANTUML PROPERTIES
 
 #+INCLUDE: "overview.org"
 #+INCLUDE: "operating-system-maintenance.org" 

From d3b803a6eed9f55412b5da72d4a495954f92d7be Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Tue, 9 Oct 2012 17:01:07 +0000
Subject: [PATCH 1373/2585] changed styling on Hans Olav's instructions

---
 .../vosa-handbook/vizrt-branding-org-mode.el  | 38 ++++++++++++++-----
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
index 42b80fa3..04a8023d 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
+++ b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
@@ -62,18 +62,25 @@
   Date: %d
 </p>")))
       org-export-html-style "<style type=\"text/css\">
+.title  { text-align: left; }
+
 body {
-  background-color: #FFFFFF;
-  border: 1px solid #818A71;
   font-family: Lucida Sans Unicode, sans-serif;
+  font-size: 0.80em;
   line-height: 1.3em;
+  background-color: #D1D4D3;
   margin: 0 auto;
   margin: 15px 15px;
-  padding: 60px;
-  width: 760px;
 }
 
-.toc {
+#content {
+  padding: 60px;
+  margin: 0 auto;
+  max-width: 760px;
+  border: 1px solid #818A71;
+  background-color: white;
+}
+#table-of-contents {
   margin-top: 50px;
 }
 
@@ -110,17 +117,23 @@ a:hover {
   text-decoration: underline;
 }
 
-dl {
+ul {
   margin: 0;
   padding: 0;
+  list-style: none;
 }
-dt {
+
+li {
+  margin: 15px 0 0 0;
   font-weight: bold;
-  margin: 15px 0 10px 0;
-  padding: 0;
+
+}
+
+li ul {
+  margin: 10px 0 0 0;
 }
 
-dd {
+li ul li {
   margin: 0 0 0 30px;
   padding: 0;
 }
@@ -165,6 +178,11 @@ div.note {
   display: block;
   overflow: auto;
 }
+
+#postamble {
+  margin-top: 50px;
+}
+
 </style>
 "
       )

From f5840712dd38fb0128f586527705d7aff5015c37 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Tue, 9 Oct 2012 17:58:33 +0000
Subject: [PATCH 1374/2585] changed bullet style to italic

---
 .../doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
index 04a8023d..9c39900b 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
+++ b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
@@ -125,8 +125,13 @@ ul {
 
 li {
   margin: 15px 0 0 0;
-  font-weight: bold;
+  font-weight: normal;
+  font-style:italic;
+}
 
+ul li p {
+  font-weight: normal;
+  font-style:normal;
 }
 
 li ul {

From d210d14d105829924a476003432f0be5bca83a09 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Tue, 9 Oct 2012 18:15:43 +0000
Subject: [PATCH 1375/2585] removed the funny li css from Hans Olav and
 re-added the great dl dt formatting from Torstein

---
 .../vosa-handbook/vizrt-branding-org-mode.el  | 24 ++++++-------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
index 9c39900b..cf35ce9b 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
+++ b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
@@ -117,32 +117,22 @@ a:hover {
   text-decoration: underline;
 }
 
-ul {
+dl {
   margin: 0;
   padding: 0;
-  list-style: none;
 }
-
-li {
-  margin: 15px 0 0 0;
-  font-weight: normal;
-  font-style:italic;
-}
-
-ul li p {
-  font-weight: normal;
-  font-style:normal;
-}
-
-li ul {
-  margin: 10px 0 0 0;
+dt {
+  font-weight: bold;
+  margin: 15px 0 10px 0;
+  padding: 0;
 }
 
-li ul li {
+dd {
   margin: 0 0 0 30px;
   padding: 0;
 }
 
+
 p {
   margin-top: 0.2em;
   margin-bottom: 0.6em;

From 87328ca1cb7ee56f7899a1eb6235061962bbc5a8 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Wed, 10 Oct 2012 06:53:33 +0000
Subject: [PATCH 1376/2585] added a page div and made moved the content css
 styles to it.

---
 .../doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
index cf35ce9b..362a8fda 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
+++ b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
@@ -9,7 +9,7 @@
 
 ;; These two settings make exported HTML look like our Vizrt branded
 ; release notes.
-(setq org-export-html-preamble "<svg
+(setq org-export-html-preamble "<div id='page'><svg
         id=\"vizrt-logo\"
         version=\"1.1\"
         width=\"138\"
@@ -60,7 +60,8 @@
 <p class=\"author\">
   Author: %a (%e)
   Date: %d
-</p>")))
+</p>
+<!-- close #page from preamble --></div>")))
       org-export-html-style "<style type=\"text/css\">
 .title  { text-align: left; }
 
@@ -73,7 +74,8 @@ body {
   margin: 15px 15px;
 }
 
-#content {
+
+#page {
   padding: 60px;
   margin: 0 auto;
   max-width: 760px;

From d4f77c775f68177fb6473d9fb0e2346985b2eae0 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Wed, 10 Oct 2012 06:58:12 +0000
Subject: [PATCH 1377/2585] tricking emacs export into not closing my #page
 before the postamble

---
 usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
index 362a8fda..06d98545 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
+++ b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
@@ -9,7 +9,7 @@
 
 ;; These two settings make exported HTML look like our Vizrt branded
 ; release notes.
-(setq org-export-html-preamble "<div id='page'><svg
+(setq org-export-html-preamble "<script>document.write('<div id=\'page\'>')</script><svg
         id=\"vizrt-logo\"
         version=\"1.1\"
         width=\"138\"

From 382db10de5bb8d682ec4f8c9202935b5c5559fb4 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Wed, 10 Oct 2012 06:59:53 +0000
Subject: [PATCH 1378/2585] double backslash to pass on a javascript backsalsh

---
 usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
index 06d98545..e9b4fa01 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
+++ b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
@@ -9,7 +9,7 @@
 
 ;; These two settings make exported HTML look like our Vizrt branded
 ; release notes.
-(setq org-export-html-preamble "<script>document.write('<div id=\'page\'>')</script><svg
+(setq org-export-html-preamble "<script>document.write('<div id=\\'page\\'>')</script><svg
         id=\"vizrt-logo\"
         version=\"1.1\"
         width=\"138\"

From 9267aeb4a1e35b586150bfba2d612314ad7c3e83 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Wed, 10 Oct 2012 07:06:44 +0000
Subject: [PATCH 1379/2585] tricking preamble to become the page container so I
 can controll the page css

---
 .../doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
index e9b4fa01..d18eaf81 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
+++ b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
@@ -9,7 +9,7 @@
 
 ;; These two settings make exported HTML look like our Vizrt branded
 ; release notes.
-(setq org-export-html-preamble "<script>document.write('<div id=\\'page\\'>')</script><svg
+(setq org-export-html-preamble "<svg
         id=\"vizrt-logo\"
         version=\"1.1\"
         width=\"138\"
@@ -52,7 +52,7 @@
  
     </g> 
   </g> 
-</svg>
+</svg><div><!-- opening a div to counter the close of #preamble>
 "
 
       org-export-html-postamble t
@@ -61,7 +61,7 @@
   Author: %a (%e)
   Date: %d
 </p>
-<!-- close #page from preamble --></div>")))
+<!-- close #preamble --></div>")))
       org-export-html-style "<style type=\"text/css\">
 .title  { text-align: left; }
 
@@ -75,7 +75,7 @@ body {
 }
 
 
-#page {
+#preamble {
   padding: 60px;
   margin: 0 auto;
   max-width: 760px;

From b75f240e9fbe9a07f26ad3cbf9f5a413abfb89cb Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Wed, 10 Oct 2012 07:08:49 +0000
Subject: [PATCH 1380/2585] closed a comment so the content is not commented
 out anymore :-)

---
 usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
index d18eaf81..ca949a73 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
+++ b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
@@ -52,7 +52,7 @@
  
     </g> 
   </g> 
-</svg><div><!-- opening a div to counter the close of #preamble>
+</svg><div><!-- opening a div to counter the close of #preamble-->
 "
 
       org-export-html-postamble t

From dfe5392464a4380fe086a3e396ef80618411ac6e Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Wed, 10 Oct 2012 07:18:29 +0000
Subject: [PATCH 1381/2585] added special list styles for #table-of-contents

---
 .../vosa-handbook/vizrt-branding-org-mode.el  | 29 +++++++++++++++++--
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
index ca949a73..c69ddad8 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
+++ b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
@@ -75,6 +75,32 @@ body {
 }
 
 
+#text-table-of-contents ul {
+  margin: 0;
+  padding: 0;
+  list-style: none;
+}
+
+#table-of-contents {
+  margin-top: 50px;
+}
+
+#text-table-of-contents li {
+  margin: 15px 0 0 0;
+  font-weight: bold;
+
+}
+
+#text-table-of-contents li ul {
+  margin: 10px 0 0 0;
+}
+
+#text-table-of-contents li ul li {
+  margin: 0 0 0 30px;
+  padding: 0;
+}
+
+
 #preamble {
   padding: 60px;
   margin: 0 auto;
@@ -82,9 +108,6 @@ body {
   border: 1px solid #818A71;
   background-color: white;
 }
-#table-of-contents {
-  margin-top: 50px;
-}
 
 h1, h2 {
   color: #E98300;

From 3056c1d0c4ddcb11e12a52f7571d631aba0047eb Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Wed, 10 Oct 2012 09:24:20 +0000
Subject: [PATCH 1382/2585] added the trail_customer_shortname keyword in the
 title

---
 usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
index b9e27237..2ba36e8b 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
+++ b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
@@ -1,4 +1,4 @@
-#+TITLE: Welcome to the VOSA Handbook
+#+TITLE: <%=trail_customer_shortname%> Vizrt Guide
 #+AUTHOR: Vizrt Online / The SaaS Team
 #+OPTIONS: toc:2 
 #+DRAWERS: PLANTUML PROPERTIES

From 2d14ada2f48f377ba751d5fcccc6571876ffed74 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Wed, 10 Oct 2012 09:56:35 +0000
Subject: [PATCH 1383/2585] strip quotes from all values replaced

---
 .../doc/vizrt/vosa-handbook/create-handbook.sh | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 3326ed39..0fefb8dd 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -97,7 +97,7 @@ function set_defaults_if_the_trails_are_not_set() {
   trail_today_date_full=${trail_today_full-$(date)}
 }
 
-function expand_all_variables_in_org_files() {
+function expand_all_variables_in_org_files_old() {
   set_defaults_if_the_trails_are_not_set
 
   declare | grep ^trail_ | while read el; do
@@ -111,6 +111,22 @@ function expand_all_variables_in_org_files() {
   done
 }
 
+function expand_all_variables_in_org_files() {
+
+  declare | grep ^trail_ | while read el; do
+    local old_ifs=$IFS
+    IFS='='
+    read key value <<< "$el"
+    IFS=$old_ifs
+    value=$(echo $value | sed -e "s~^'~~" -e "s~'$~~")
+    find $target_dir -name "*.org" | while read f; do
+      sed -i -e "s~<%=[ ]*${key}[ ]*%>~${value}~g" -e "s~^'~~" ${f}
+    done
+  done
+}
+
+
+
 function set_up_build_directory() {
   if [[ -n "$target_dir" && -d $target_dir ]]; then
     rm -rf $target_dir

From dbead5e1ee2a2d2fd14726aa068071003d42cbd0 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Wed, 10 Oct 2012 09:59:21 +0000
Subject: [PATCH 1384/2585] replace Vizrt for Vosa again

---
 usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
index 2ba36e8b..ef4d199d 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
+++ b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
@@ -1,4 +1,4 @@
-#+TITLE: <%=trail_customer_shortname%> Vizrt Guide
+#+TITLE: <%=trail_customer_shortname%> Vosa Guide
 #+AUTHOR: Vizrt Online / The SaaS Team
 #+OPTIONS: toc:2 
 #+DRAWERS: PLANTUML PROPERTIES

From a815ddc9b86c52af676c8853d631cc59853730cb Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Thu, 11 Oct 2012 08:08:13 +0000
Subject: [PATCH 1385/2585] - Removed gray margins - Changed gray textual links
 to blue - Added visual markers (highlighting) to every link containing the
 string "tcl.nie.cust.vizrtsaas" - Removed the white padding on the page when
 the screen size is less than 600px

---
 .../vosa-handbook/vizrt-branding-org-mode.el  | 42 ++++++++++++++++---
 1 file changed, 36 insertions(+), 6 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
index c69ddad8..0f5a188a 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
+++ b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
@@ -70,8 +70,7 @@ body {
   font-size: 0.80em;
   line-height: 1.3em;
   background-color: #D1D4D3;
-  margin: 0 auto;
-  margin: 15px 15px;
+  margin: 15px 0;
 }
 
 
@@ -85,17 +84,28 @@ body {
   margin-top: 50px;
 }
 
-#text-table-of-contents li {
+#table-of-contents a {
+  color: #666666;
+  text-decoration: none;
+}
+
+#table-of-contents ul {
+  margin: 0;
+  padding: 0;
+  list-style: none;
+}
+
+#table-of-contents li {
   margin: 15px 0 0 0;
   font-weight: bold;
 
 }
 
-#text-table-of-contents li ul {
+#table-of-contents li ul {
   margin: 10px 0 0 0;
 }
 
-#text-table-of-contents li ul li {
+#table-of-contents li ul li {
   margin: 0 0 0 30px;
   padding: 0;
 }
@@ -115,10 +125,12 @@ h1, h2 {
 }
 
 h1 {
+  font-size: 1.8em;
   margin: 40px 0 20px 0;
 }
 
 h2 {
+  font-size: 1.4em;
   margin: 30px 0 10px 0;
 }
 
@@ -134,10 +146,21 @@ h6 {
 }
 
 a {
-  color: #666;
+  color: #3366cc;
+  text-decoration: none;
+}
+
+a.special {
+  display: inline-block;
+  color: #36C;
+  background-color: #DDD;
   text-decoration: none;
+  border-radius: 5px;
+  padding: 1px 5px;
+  margin-bottom: 1px;
 }
 
+
 a:hover {
   text-decoration: underline;
 }
@@ -203,6 +226,13 @@ div.note {
   margin-top: 50px;
 }
 
+@media screen and (max-width : 600px) {
+  #page {
+    padding: 5px;
+  }
+}
+
+
 </style>
 "
       )

From c5becd4981479bc6f48a69fa8f9a5dbf63f3e71a Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Thu, 11 Oct 2012 08:36:28 +0000
Subject: [PATCH 1386/2585] fixed the trail_network_name

---
 usr/share/doc/vizrt/vosa-handbook/monitoring.org | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/monitoring.org b/usr/share/doc/vizrt/vosa-handbook/monitoring.org
index d700ac6a..fe020f2a 100644
--- a/usr/share/doc/vizrt/vosa-handbook/monitoring.org
+++ b/usr/share/doc/vizrt/vosa-handbook/monitoring.org
@@ -27,7 +27,7 @@ produce a system-info report in YAML and check the files into a
 version repository.
 
 When browsing the Hugin web interface at
-http://<%= trail_control_host %><%= trail_dot_network_name %>:5679/ you can quickly 
+http://<%= trail_control_host %><%= trail_network_name %>:5679/ you can quickly 
 see all changes on the various servers. A change could be a new
 service which is all of a sudden listening on a new port or that the
 version of a installed package has changed. Nothing escapes Hugin's
@@ -39,7 +39,7 @@ trending of your site. I.e. how it has been behaving the last days,
 weeks and months.
 
 The address to your Munin instance is is:
- http://<%= trail_monitoring_host %><%= trail_dot_network_name %>/munin/
+ http://<%= trail_monitoring_host %><%= trail_network_name %>/munin/
 
 ** Icinga (enhanced Nagios)
 Icinga gives a good overview of the current health of the

From 37fc656f4efca293331633a00d834fdd4892ed97 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Thu, 11 Oct 2012 08:43:14 +0000
Subject: [PATCH 1387/2585] another one

---
 usr/share/doc/vizrt/vosa-handbook/monitoring.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/monitoring.org b/usr/share/doc/vizrt/vosa-handbook/monitoring.org
index fe020f2a..3034ed82 100644
--- a/usr/share/doc/vizrt/vosa-handbook/monitoring.org
+++ b/usr/share/doc/vizrt/vosa-handbook/monitoring.org
@@ -44,7 +44,7 @@ The address to your Munin instance is is:
 ** Icinga (enhanced Nagios)
 Icinga gives a good overview of the current health of the
 habitat. Head over to
- http://<%= trail_monitoring_host %><%= trail_dot_network_name %>/icinga/ 
+ http://<%= trail_monitoring_host %><%= trail_network_name %>/icinga/ 
 to get updates on host & service uptimes and disk fill rates. This is
 also the place were you'll schedule any maintenance work you do to
 prevent unnecessary alerts filling up your mobile phone and email

From 8b3051b01f7ccbeb6ba9d2a782b1885ce998bf35 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Thu, 11 Oct 2012 08:45:40 +0000
Subject: [PATCH 1388/2585] removed the check mk section as it is empty and I
 do not know why it is relevant to the reader

---
 usr/share/doc/vizrt/vosa-handbook/monitoring.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/monitoring.org b/usr/share/doc/vizrt/vosa-handbook/monitoring.org
index 3034ed82..bab22ba4 100644
--- a/usr/share/doc/vizrt/vosa-handbook/monitoring.org
+++ b/usr/share/doc/vizrt/vosa-handbook/monitoring.org
@@ -50,5 +50,5 @@ also the place were you'll schedule any maintenance work you do to
 prevent unnecessary alerts filling up your mobile phone and email
 inboxes.
 
-** Check MK
+
 

From b92cb3ff1df87e7c2eef2a5dd1f13b91eb1f56d1 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Thu, 11 Oct 2012 10:47:30 +0000
Subject: [PATCH 1389/2585] adding nifty javascript from hans olav

---
 .../vizrt/vosa-handbook/vizrt-branding-org-mode.el    | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
index 0f5a188a..4d733929 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
+++ b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
@@ -61,7 +61,16 @@
   Author: %a (%e)
   Date: %d
 </p>
-<!-- close #preamble --></div>")))
+<!-- close #postamble --></div>
+<!-- find all links containing tcl.nie.cust.vizrtsaas and add the special class.-->
+<script type="text/javascript">
+  var intLinks = document.links;
+  for(var i = 0; i < intLinks.length; i++){
+    if(intLinks[i].href.indexOf("tcl.nie.cust.vizrtsaas") > -1) {
+      intLinks[i].className += 'special';
+    }
+  }
+</script><!--preamble is closed by emacs-->")))
       org-export-html-style "<style type=\"text/css\">
 .title  { text-align: left; }
 

From 45bcaa71d16af7cb4844865a8fba3fcb2bc4a498 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Thu, 11 Oct 2012 10:53:16 +0000
Subject: [PATCH 1390/2585] fixing some quotes from hans olav

---
 usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
index 4d733929..35487553 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
+++ b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
@@ -63,10 +63,10 @@
 </p>
 <!-- close #postamble --></div>
 <!-- find all links containing tcl.nie.cust.vizrtsaas and add the special class.-->
-<script type="text/javascript">
+<script type='text/javascript'>
   var intLinks = document.links;
   for(var i = 0; i < intLinks.length; i++){
-    if(intLinks[i].href.indexOf("tcl.nie.cust.vizrtsaas") > -1) {
+    if(intLinks[i].href.indexOf('tcl.nie.cust.vizrtsaas') > -1) {
       intLinks[i].className += 'special';
     }
   }

From d3401a5149b163acaab974198a6b6c05eb2cb023 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Thu, 11 Oct 2012 11:02:13 +0000
Subject: [PATCH 1391/2585] added some more pretty colors from Hans Olav

---
 usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
index 35487553..887fcb49 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
+++ b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
@@ -162,9 +162,10 @@ a {
 a.special {
   display: inline-block;
   color: #36C;
-  background-color: #DDD;
+  background-color: #EEE;
   text-decoration: none;
   border-radius: 5px;
+  border: 1px solid #CFD8F6;
   padding: 1px 5px;
   margin-bottom: 1px;
 }

From c2b7d768e70268d623d4b69ef7d6181689ead458 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Thu, 11 Oct 2012 12:52:16 +0000
Subject: [PATCH 1392/2585] added viewport meta tag

---
 usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
index ef4d199d..fcffb771 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
+++ b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
@@ -2,6 +2,7 @@
 #+AUTHOR: Vizrt Online / The SaaS Team
 #+OPTIONS: toc:2 
 #+DRAWERS: PLANTUML PROPERTIES
+#+STYLE: <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
 
 #+INCLUDE: "overview.org"
 #+INCLUDE: "operating-system-maintenance.org" 

From c6ec6f53212f60c44b357667a3f9ec490ab138da Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Thu, 11 Oct 2012 13:21:11 +0000
Subject: [PATCH 1393/2585] closed the meta tag

---
 usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
index fcffb771..cc795e49 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
+++ b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
@@ -2,7 +2,7 @@
 #+AUTHOR: Vizrt Online / The SaaS Team
 #+OPTIONS: toc:2 
 #+DRAWERS: PLANTUML PROPERTIES
-#+STYLE: <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
+#+STYLE: <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"/>
 
 #+INCLUDE: "overview.org"
 #+INCLUDE: "operating-system-maintenance.org" 

From 1ecce59a8ef180606668af847f037b724cc36e8f Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Thu, 11 Oct 2012 13:43:31 +0000
Subject: [PATCH 1394/2585] #page in #preamble for @media style

---
 usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
index 887fcb49..124f6b96 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
+++ b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
@@ -237,7 +237,7 @@ div.note {
 }
 
 @media screen and (max-width : 600px) {
-  #page {
+  #preamble {
     padding: 5px;
   }
 }

From ed92a5c6b6958db810bcb6741083efbb1f58c22a Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Thu, 11 Oct 2012 19:00:39 +0000
Subject: [PATCH 1395/2585] corrected network name

---
 usr/share/doc/vizrt/vosa-handbook/search-server.org | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/search-server.org b/usr/share/doc/vizrt/vosa-handbook/search-server.org
index 6609eb5a..99a3cf5b 100644
--- a/usr/share/doc/vizrt/vosa-handbook/search-server.org
+++ b/usr/share/doc/vizrt/vosa-handbook/search-server.org
@@ -13,11 +13,11 @@ this, you can use the Component Browser in the escenic-admin
 interface.
 
 For instance, let's say you're upgrading the search server for
-<%= trail_editor_host %> and want it to temporarily use
+<%= trail_eOBditor_host %> and want it to temporarily use
 <%= trail_import_host %>'s search instance.
 
 First, go to:
-http://<%= trail_editor_host %><%= trail_dot_network_name %>:<%= trail_editor_port %>/escenic-admin/browser/Global/com/escenic/webservice/search/DelegatingSearchEngine?property=solrURI
+http://<%= trail_editor_host %><%= trail_network_name %>:<%= trail_editor_port %>/escenic-admin/browser/Global/com/escenic/webservice/search/DelegatingSearchEngine?property=solrURI
 
 Then, change the value from:
 #+BEGIN_SRC conf

From 82681a19d19c9158b3c50569d2f65a7858c3d8cf Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Fri, 12 Oct 2012 05:27:03 +0000
Subject: [PATCH 1396/2585] matching special links for all containing
 cust.vizrtsaas

---
 usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
index 124f6b96..d77bb1ec 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
+++ b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
@@ -66,7 +66,7 @@
 <script type='text/javascript'>
   var intLinks = document.links;
   for(var i = 0; i < intLinks.length; i++){
-    if(intLinks[i].href.indexOf('tcl.nie.cust.vizrtsaas') > -1) {
+    if(intLinks[i].href.indexOf('cust.vizrtsaas') > -1) {
       intLinks[i].className += 'special';
     }
   }

From 6d162bbf5d41e5aaa71785b0e601666dea2e7ed7 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Fri, 12 Oct 2012 07:07:54 +0000
Subject: [PATCH 1397/2585] added generate_aws_overview

---
 .../vizrt/vosa-handbook/create-handbook.sh    | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 0fefb8dd..58376820 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -704,6 +704,41 @@ For more background and documentation on virtualization hosts &
 guests, see the
 [[http://docs.redhat.com/docs/en-US/Red_Hat_Enterprise_Linux/6/html-single/Virtualization_Host_Configuration_and_Guest_Installation_Guide][Virtualization Host Configuration and Guest Installation Guide]]
 from RedHat.
+EOF
+
+  cat $file >> $target_dir/overview-generated.org
+}
+function generate_aws_overview_org() {
+  if [ -z "$trail_aws_map" ]; then
+    return
+  fi
+
+  local file=$target_dir/aws-overview-generated.org
+  cat > $file <<EOF
+** Amazon Overview
+Here's an overview of your AWS availability zones & their instances:
+
+|-------------------------------------------|
+| Virtualization host | Vpc-subnet  | Instance  |
+|-------------------------------------------|
+EOF
+  for el in $trail_aws_map; do
+    local old_ifs=$IFS
+    IFS='#'
+    read host subnet instances <<< "$el"
+    IFS=$old_ifs
+    echo -n "| $(get_fqdn $host) | $subnet | " >> $file
+    for ele in $(echo "$instances" | sed 's/,/ /g'); do
+      echo -n " [[$(get_link $ele):5678][$(get_fqdn $ele)]] " >> $file
+    done
+    echo "|" >> $file
+  done
+
+  cat >> $file <<EOF
+|-------------------------------------------|
+
+[[AWS Management Console $trail_customer_shortname][https://solartv.signin.aws.amazon.com/console]]
+
 EOF
 
   cat $file >> $target_dir/overview-generated.org
@@ -741,6 +776,7 @@ generate_db_org
 generate_nfs_org
 generate_backup_org
 generate_virtualization_overview_org
+generate_aws_overview_org
 add_customer_chapters
 generate_html_from_org
 generate_svg_from_blockdiag

From 7623924f25aedf2b741ef7e52db6dbb373c487f5 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Fri, 12 Oct 2012 07:20:06 +0000
Subject: [PATCH 1398/2585] fixed some mistakes in the AWS overview

---
 .../doc/vizrt/vosa-handbook/create-handbook.sh   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 58376820..c2b67873 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -716,18 +716,18 @@ function generate_aws_overview_org() {
   local file=$target_dir/aws-overview-generated.org
   cat > $file <<EOF
 ** Amazon Overview
-Here's an overview of your AWS availability zones & their instances:
+Here's an overview of your AWS Region, availability zones and  instances:
 
-|-------------------------------------------|
-| Virtualization host | Vpc-subnet  | Instance  |
-|-------------------------------------------|
+|----------------------------|
+| Zone | Subnet  | Instance  |
+|----------------------------|
 EOF
   for el in $trail_aws_map; do
     local old_ifs=$IFS
     IFS='#'
-    read host subnet instances <<< "$el"
+    read az subnet instances <<< "$el"
     IFS=$old_ifs
-    echo -n "| $(get_fqdn $host) | $subnet | " >> $file
+    echo -n "| $az | $subnet | " >> $file
     for ele in $(echo "$instances" | sed 's/,/ /g'); do
       echo -n " [[$(get_link $ele):5678][$(get_fqdn $ele)]] " >> $file
     done
@@ -735,9 +735,9 @@ EOF
   done
 
   cat >> $file <<EOF
-|-------------------------------------------|
+|-----------------------------|
 
-[[AWS Management Console $trail_customer_shortname][https://solartv.signin.aws.amazon.com/console]]
+[[https://solartv.signin.aws.amazon.com/console][AWS Management Console $trail_customer_shortname]]
 
 EOF
 

From 478af16defca0aa2679f14d5c38c1fd5cc50fc61 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Fri, 12 Oct 2012 07:24:00 +0000
Subject: [PATCH 1399/2585] more prettyness

---
 usr/share/doc/vizrt/vosa-handbook/create-handbook.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index c2b67873..8a16e25f 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -719,7 +719,7 @@ function generate_aws_overview_org() {
 Here's an overview of your AWS Region, availability zones and  instances:
 
 |----------------------------|
-| Zone | Subnet  | Instance  |
+| Zone | Subnet  | Instances  |
 |----------------------------|
 EOF
   for el in $trail_aws_map; do

From f2ce327d65caada8fd070894cca97d18e0fdae47 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Fri, 12 Oct 2012 08:11:19 +0000
Subject: [PATCH 1400/2585] added the aws_account_alias variable

---
 usr/share/doc/vizrt/vosa-handbook/create-handbook.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 8a16e25f..ec8e1ee0 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -737,7 +737,7 @@ EOF
   cat >> $file <<EOF
 |-----------------------------|
 
-[[https://solartv.signin.aws.amazon.com/console][AWS Management Console $trail_customer_shortname]]
+[[https://${trail_aws_account_alias}.signin.aws.amazon.com/console][AWS Management Console $trail_customer_shortname]]
 
 EOF
 

From 31df239fa7a1015b26059ef1ac0ecb772b4b1383 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Fri, 12 Oct 2012 08:27:03 +0000
Subject: [PATCH 1401/2585] capitalized Vosa to VOSA

---
 usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
index cc795e49..5ae2a227 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
+++ b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
@@ -1,4 +1,4 @@
-#+TITLE: <%=trail_customer_shortname%> Vosa Guide
+#+TITLE: <%=trail_customer_shortname%> VOSA Guide
 #+AUTHOR: Vizrt Online / The SaaS Team
 #+OPTIONS: toc:2 
 #+DRAWERS: PLANTUML PROPERTIES

From e759364e2e47591172cd96a3a61a71fea631d8ef Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Fri, 12 Oct 2012 09:08:25 +0000
Subject: [PATCH 1402/2585] added some print start finish

---
 usr/share/doc/vizrt/vosa-handbook/create-handbook.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index ec8e1ee0..cd663456 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -765,6 +765,7 @@ function get_user_input() {
   done
 }
 
+print "building $trail_customer_shortname VOSA Guide"
 get_user_input $@
 set_up_build_directory
 set_customer_specific_variables
@@ -780,4 +781,5 @@ generate_aws_overview_org
 add_customer_chapters
 generate_html_from_org
 generate_svg_from_blockdiag
+print "done: http://start.vizrtsaas.com/${trail_customer_acronym}/" 
 

From 2df6b890cfb1ed20e1b64cfd75e8cc053950a07f Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Fri, 12 Oct 2012 09:14:34 +0000
Subject: [PATCH 1403/2585] changed print into echo

---
 usr/share/doc/vizrt/vosa-handbook/create-handbook.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index cd663456..b0a59380 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -765,7 +765,7 @@ function get_user_input() {
   done
 }
 
-print "building $trail_customer_shortname VOSA Guide"
+echo "building $trail_customer_shortname VOSA Guide"
 get_user_input $@
 set_up_build_directory
 set_customer_specific_variables
@@ -781,5 +781,5 @@ generate_aws_overview_org
 add_customer_chapters
 generate_html_from_org
 generate_svg_from_blockdiag
-print "done: http://start.vizrtsaas.com/${trail_customer_acronym}/" 
+echo "done: http://start.vizrtsaas.com/${trail_customer_acronym}/" 
 

From 69131631fabe2c77c3b06660492c5c81ca2f16f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=F6n?= <oschoen@vizrt.com>
Date: Fri, 12 Oct 2012 15:13:34 +0200
Subject: [PATCH 1404/2585] ece-build - event system backport jar will only be
 added for 5.3 installations

---
 usr/share/escenic/build-scripts/ece-build | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 52d5a6eb..ad5e0695 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -237,14 +237,19 @@ function add_global_libs
     print_and_log "The global library $builder_root_dir/lib/java_memcached-release_2.0.1.jar is missing, exiting!"
     remove_pid_and_exit_in_error
   fi
-  if [ -e $builder_root_dir/lib/engine-backport-1.0-SNAPSHOT.jar ]; then
-    run ln -s $builder_root_dir/lib/engine-backport-1.0-SNAPSHOT.jar $assemblytool_lib_dir/
-  else
-    print_and_log "The global library $builder_root_dir/lib/engine-backport-1.0-SNAPSHOT.jar is missing, exiting!"
-    remove_pid_and_exit_in_error
+  local engine_version=`readlink $engine_root_dir`
+  echo "$engine_version" | grep "engine-5.3"
+  if [ $? = 0 ]; then
+    if [ -e $builder_root_dir/lib/engine-backport-1.0-SNAPSHOT.jar ]; then
+      run ln -s $builder_root_dir/lib/engine-backport-1.0-SNAPSHOT.jar $assemblytool_lib_dir/
+    else
+      print_and_log "The global library $builder_root_dir/lib/engine-backport-1.0-SNAPSHOT.jar is missing, exiting!"
+      remove_pid_and_exit_in_error
+    fi
   fi
 }
 
+
 ##
 function svn_fail_early
 {
@@ -458,11 +463,10 @@ function phase_clean_up
 function phase_verify_project
 {
   svn_fail_early
-  add_global_libs
   svn_verify_assembly
   symlink_ece_components
   verify_requested_versions
-  
+  add_global_libs
 }
 
 ## creates DEB and RPM packages with the server configuration for all

From f4d468988901133dd5665a79261105162fef0d0a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 9 Oct 2012 09:30:41 +0200
Subject: [PATCH 1405/2585] - currently, 2012-10-09, the precise packages are
 not signed by   the Varnish key, hence, we force the packages if we're
 installing on   Ubuntu 12.04/precise

---
 .../escenic/ece-scripts/ece-install.d/cache-server.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
index 686bd376..9a7cbf98 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
@@ -50,8 +50,15 @@ function install_varnish_software() {
     print "Installing the Varnish repository RPM"
     run rpm --nosignature -i $varnish_redhat_rpm_url
   fi
-  
-  install_packages_if_missing varnish
+
+  if [[ ${code_name} == "precise" ]]; then
+    # currently, 2012-10-09, the precise packages are not signed by
+    # the Varnish key.
+    local old_force_packages=${force_packages-0}
+    force_packages=1
+    install_packages_if_missing varnish
+    force_packages=${old_force_packages}
+  fi
   assert_pre_requisite varnishd
 }
 

From 489d176f836f88be9139318fe3eaf791015ba8a0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 9 Oct 2012 09:31:06 +0200
Subject: [PATCH 1406/2585] - fixed error in system-info::66-list-os-info.sh ::
 got error like 'No   LSB modules are available.', this has now been fixed.

---
 usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
index 1b0f9dee..2d232816 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
@@ -8,7 +8,7 @@ print_h3_header "Kernel"
 print_pre_text $(uname -a)
 
 print_h3_header "Distribution"
-if [[ -n $(which lsb_release 2>/dev/null) ]]; then
+if [[ -n $(which lsb_release > /dev/null 2>/dev/null) ]]; then
   print_pre_text "$(lsb_release -a)"
 elif [ -e /etc/redhat-release ]; then
   print_pre_text "$(cat /etc/redhat-release)"

From 49a3ec5cde4f3800c2577668c38578c77ea12d93 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 12 Oct 2012 11:08:19 +0200
Subject: [PATCH 1407/2585] - new apt repository server and new signing key,
 hence updating the   script.

---
 .../escenic/package-scripts/sign-and-add-packages-to-apt-repo   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/package-scripts/sign-and-add-packages-to-apt-repo b/usr/share/escenic/package-scripts/sign-and-add-packages-to-apt-repo
index 5088aae2..7af342e0 100644
--- a/usr/share/escenic/package-scripts/sign-and-add-packages-to-apt-repo
+++ b/usr/share/escenic/package-scripts/sign-and-add-packages-to-apt-repo
@@ -7,7 +7,7 @@ dir=$1
 suite=${2-stable}
 log=/tmp/$(basename $0).log
 apt_repo_dir=/var/www/apt
-gpg_key=AD747D97
+gpg_key=69D63D24
 
 if [[ ${dir}x == "x" || ! -d $dir ]]; then
   echo "You must pass a valid directory to $(basename $0)"

From dcef73e37a7c59887b89aa11609719adf66e2c41 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 12 Oct 2012 16:06:09 +0200
Subject: [PATCH 1408/2585] - new GPG key

---
 .../escenic/package-scripts/sign-and-add-packages-to-apt-repo   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/package-scripts/sign-and-add-packages-to-apt-repo b/usr/share/escenic/package-scripts/sign-and-add-packages-to-apt-repo
index 7af342e0..e418d8fb 100644
--- a/usr/share/escenic/package-scripts/sign-and-add-packages-to-apt-repo
+++ b/usr/share/escenic/package-scripts/sign-and-add-packages-to-apt-repo
@@ -7,7 +7,7 @@ dir=$1
 suite=${2-stable}
 log=/tmp/$(basename $0).log
 apt_repo_dir=/var/www/apt
-gpg_key=69D63D24
+gpg_key=8267B8FD
 
 if [[ ${dir}x == "x" || ! -d $dir ]]; then
   echo "You must pass a valid directory to $(basename $0)"

From ea0753b99a1ebc01367c04524b79651cd2bfc369 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 12 Oct 2012 16:26:42 +0200
Subject: [PATCH 1409/2585] - the vosa package failed to install with:

Fetched 29.6 kB in 0s (157 kB/s)
dpkg: error processing /var/cache/apt/archives/vosa_1.0-2012-10-12-316_all.deb (--unpack):
 parsing file '/var/lib/dpkg/tmp.ci/control' near line 11 package 'vosa':
 blank line in value of field 'Description'
Errors were encountered while processing:
 /var/cache/apt/archives/vosa_1.0-2012-10-12-316_all.deb

 removing a TAB character in the description block hopefully resolves this.
---
 usr/share/escenic/package-scripts/debian/vosa/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/package-scripts/debian/vosa/control b/usr/share/escenic/package-scripts/debian/vosa/control
index 9b3a5552..463d735a 100644
--- a/usr/share/escenic/package-scripts/debian/vosa/control
+++ b/usr/share/escenic/package-scripts/debian/vosa/control
@@ -9,4 +9,4 @@ Maintainer: MAINTAINER_NAME <MAINTAINER_EMAIL>
 Description: The Vizrt Online System Administration command line tools.
   See the documentation in /usr/share/doc/vizrt/ for further
   details.
- 
+

From 8394caef35fdcb9a72551cced6064a13ddfc801a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 15 Oct 2012 15:34:23 +0200
Subject: [PATCH 1410/2585] - default publication password is now the standard
 one.

---
 .../escenic/ece-scripts/ece-install.d/create-publication.sh     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
index 785dfb22..e9f6b925 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
@@ -106,7 +106,7 @@ function create_publication_in_db() {
   run curl ${curl_opts}  \
     -F "name=${publication_name}" \
     -F "publisherName=Escenic" \
-    -F "adminPassword=${publication_name}" \
+    -F "adminPassword=admin" \
     -F "adminPasswordConfirm=${publication_name}" \
     --cookie JSESSIONID="$cookie" \
     "${ece_admin_uri}/do/publication/insert"

From 46e6bfb2e82eb691f85cc0126132e9fc0dd3a536 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 15 Oct 2012 15:47:40 +0200
Subject: [PATCH 1411/2585] - fixed problem in
 common-os::get_user_home_directory where the   function would fail if the
 user's name was mentioned further down in   the listings of another user.

---
 usr/share/escenic/ece-scripts/common-os.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index 2e7de027..e22e8398 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -34,7 +34,7 @@ function common_os_is_loaded() {
 function get_user_home_directory() {
   if [ $(uname -s) = "Darwin" ]; then
     echo /Users/$1
-  elif [ $(grep $1 /etc/passwd | wc -l) -gt 0 ]; then
+  elif [ $(grep ^$1 /etc/passwd | wc -l) -gt 0 ]; then
     grep $1 /etc/passwd | cut -d':' -f6
   elif [ -r /etc/adduser.conf ]; then
     local dir=$(grep DHOME /etc/adduser.conf | grep -v ^# | cut -d'=' -f2)

From 94beca830a2ec39ed4654a22bb34c19a77b74166 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 15 Oct 2012 16:57:49 +0200
Subject: [PATCH 1412/2585] - there! That should fix those pesky false
 duplicate

---
 usr/share/escenic/ece-scripts/common-os.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index e22e8398..113dc412 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -35,7 +35,7 @@ function get_user_home_directory() {
   if [ $(uname -s) = "Darwin" ]; then
     echo /Users/$1
   elif [ $(grep ^$1 /etc/passwd | wc -l) -gt 0 ]; then
-    grep $1 /etc/passwd | cut -d':' -f6
+    grep ^$1 /etc/passwd | cut -d':' -f6
   elif [ -r /etc/adduser.conf ]; then
     local dir=$(grep DHOME /etc/adduser.conf | grep -v ^# | cut -d'=' -f2)
     echo $dir/$1

From ae14c08e604c81eae3f4e2e250dd86fc4630d23c Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Tue, 16 Oct 2012 16:41:24 +0200
Subject: [PATCH 1413/2585] tried to add the links to the publications to the
 presentation server overview

---
 .../doc/vizrt/vosa-handbook/create-handbook.sh     | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index b0a59380..d52970ea 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -446,6 +446,7 @@ function get_editor_host_overview() {
 EOF
 }
 
+## $1 :: host
 function get_presentation_host_overview() {
   cat <<EOF 
 | $(get_fqdn ${1}) | \
@@ -455,6 +456,19 @@ function get_presentation_host_overview() {
   [[$(get_link ${1}):${trail_search_port-8081}/solr/admin/][solr]] \
 |
 EOF
+for ep in nop $trail_publication_list; do
+  if [[ $ep == "nop" ]]; then
+    continue
+  fi
+  cat <<EOF
+  [[$ep.$(get_link ${1})/][pub:$ep]]
+  EOF  
+done
+
+cat <<EOF
+  |
+EOF  
+  
 }
 
 ## $1 :: host

From a05ab89da339e8d875bc588545e593fa302c8346 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Tue, 16 Oct 2012 21:13:06 +0200
Subject: [PATCH 1414/2585] recovering from a bad experiment :-)

---
 .../vizrt/vosa-handbook/create-handbook.sh    | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index d52970ea..60d3e6aa 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -456,18 +456,18 @@ function get_presentation_host_overview() {
   [[$(get_link ${1}):${trail_search_port-8081}/solr/admin/][solr]] \
 |
 EOF
-for ep in nop $trail_publication_list; do
-  if [[ $ep == "nop" ]]; then
-    continue
-  fi
-  cat <<EOF
-  [[$ep.$(get_link ${1})/][pub:$ep]]
-  EOF  
-done
-
-cat <<EOF
-  |
-EOF  
+#for ep in nop $trail_publication_list; do
+#  if [[ $ep == "nop" ]]; then
+#    continue
+#  fi
+#  cat <<EOF
+#  [[$ep.$(get_link ${1})/][pub:$ep]]
+#EOF  
+#done
+#
+#cat <<EOF
+#  |
+#EOF  
   
 }
 

From 9822f36007ca3cd3a44b28e947e601007a39c260 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 17 Oct 2012 13:48:31 +0200
Subject: [PATCH 1415/2585] - adminPasswordConfirm set tot he same (again) as
 adminPassword.

  Thanks to @speque for pointing this out
---
 .../escenic/ece-scripts/ece-install.d/create-publication.sh     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
index e9f6b925..d3dc689c 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
@@ -107,7 +107,7 @@ function create_publication_in_db() {
     -F "name=${publication_name}" \
     -F "publisherName=Escenic" \
     -F "adminPassword=admin" \
-    -F "adminPasswordConfirm=${publication_name}" \
+    -F "adminPasswordConfirm=admin" \
     --cookie JSESSIONID="$cookie" \
     "${ece_admin_uri}/do/publication/insert"
 }

From e04e31229261017c6115c3b26f2683accbb264c3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 17 Oct 2012 13:49:41 +0200
Subject: [PATCH 1416/2585] - added vosa cat

---
 usr/share/vizrt/vosa/commands/cat.sh | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 usr/share/vizrt/vosa/commands/cat.sh

diff --git a/usr/share/vizrt/vosa/commands/cat.sh b/usr/share/vizrt/vosa/commands/cat.sh
new file mode 100644
index 00000000..b6b93be2
--- /dev/null
+++ b/usr/share/vizrt/vosa/commands/cat.sh
@@ -0,0 +1,24 @@
+function get_vosa_file() {
+  local file=${vosa_dir}/${instance}/$vosa_input_file
+  if [ -e ${file} ]; then
+    echo $file
+  else
+    file=${vosa_dir}/common/$vosa_input_file
+    if [ -e ${file} ]; then
+      echo $file
+    fi
+  fi
+}
+
+function cat_vosa_file() {
+  local file=$(get_vosa_file)
+  if [ -e ${file} ]; then
+    echo "Contents of $file"
+    echo "===="
+    cat $file
+    echo "===="
+  else
+    echo "Couldn't find $vosa_input_file in any of the vosa file layers"
+    exit 1
+  fi
+}

From 4c5be6e544cf24f7db7b9238445965aad4547fb4 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 17 Oct 2012 13:49:57 +0200
Subject: [PATCH 1417/2585] - added vosa diff

---
 usr/share/vizrt/vosa/commands/diff.sh | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 usr/share/vizrt/vosa/commands/diff.sh

diff --git a/usr/share/vizrt/vosa/commands/diff.sh b/usr/share/vizrt/vosa/commands/diff.sh
new file mode 100644
index 00000000..b49c3563
--- /dev/null
+++ b/usr/share/vizrt/vosa/commands/diff.sh
@@ -0,0 +1,16 @@
+function get_vosa_file() {
+  local file=${vosa_dir}/${instance}/$vosa_input_file
+  if [ -e ${file} ]; then
+    echo $file
+  else
+    file=${vosa_dir}/common/$vosa_input_file
+    if [ -e ${file} ]; then
+      echo $file
+    fi
+  fi
+}
+
+function diff_vosa_file() {
+  local vosa_file=$(get_vosa_file)
+  diff $vosa_file $scm_dir/$vosa_input_file
+}

From 8aa419fe8ea10e957625ce5aa4427c9ea38e9086 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Wed, 17 Oct 2012 15:38:21 +0200
Subject: [PATCH 1418/2585] first stab at adding quick links for web site
 access directly on the app server.

---
 .../vizrt/vosa-handbook/create-handbook.sh    | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 60d3e6aa..70985938 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -454,23 +454,22 @@ function get_presentation_host_overview() {
   [[$(get_link ${1}):${2-8080}/escenic-admin/][escenic-admin]] \
   [[$(get_link ${1}):${2-8080}/escenic-admin/top][top]] \
   [[$(get_link ${1}):${trail_search_port-8081}/solr/admin/][solr]] \
+  $(get_publication_links_for_presentation_host $1) \
 |
 EOF
-#for ep in nop $trail_publication_list; do
-#  if [[ $ep == "nop" ]]; then
-#    continue
-#  fi
-#  cat <<EOF
-#  [[$ep.$(get_link ${1})/][pub:$ep]]
-#EOF  
-#done
-#
-#cat <<EOF
-#  |
-#EOF  
   
 }
 
+function get_publication_links_for_presentation_host() {
+    if [ -z $trail_publication_list ] ; then
+	return ""
+    fi
+
+    for ep in $trail_publication_list; do
+	echo "[[$(get_link ${ep}.${1})/][site:$ep]]"
+    done
+}
+
 ## $1 :: host
 function get_simple_host_overview() {
   cat <<EOF 

From d3f3f17bea02d34592f9e8a686e8605683259760 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Wed, 17 Oct 2012 16:38:40 +0200
Subject: [PATCH 1419/2585] added support for
 trail_publication_domain_mapping_list

---
 .../doc/vizrt/vosa-handbook/create-handbook.sh    | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 70985938..0f0ece45 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -465,9 +465,18 @@ function get_publication_links_for_presentation_host() {
 	return ""
     fi
 
-    for ep in $trail_publication_list; do
-	echo "[[$(get_link ${ep}.${1})/][site:$ep]]"
-    done
+#    for ep in $trail_publication_list; do
+#	echo "[[$(get_link ${ep}.${1})/][site:$ep]]"
+#    done
+
+  for el in $trail_publication_domain_mapping_list; do
+    local old_ifs=$IFS
+    IFS='#'
+    read ece_pub fqdn domain_prefix <<< "$el"
+    IFS=$old_ifs
+    echo "[[$(get_link ${domain_prefix}.${1})/][${fxdn}@${1}]]"
+  done
+
 }
 
 ## $1 :: host

From 77899a5a2c04a686c17d0e8e1b0e985592c73157 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Wed, 17 Oct 2012 16:42:32 +0200
Subject: [PATCH 1420/2585] showing the link to the backend properly

---
 usr/share/doc/vizrt/vosa-handbook/create-handbook.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 0f0ece45..b15fe4a2 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -474,7 +474,7 @@ function get_publication_links_for_presentation_host() {
     IFS='#'
     read ece_pub fqdn domain_prefix <<< "$el"
     IFS=$old_ifs
-    echo "[[$(get_link ${domain_prefix}.${1})/][${fxdn}@${1}]]"
+    echo "[[$(get_link ${domain_prefix}.${1})/][{1} as ${fqdn} backend]]"
   done
 
 }

From edcd538294e7e7553c28460e2e4c0831d4fbe09d Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Wed, 17 Oct 2012 18:27:27 +0200
Subject: [PATCH 1421/2585] forgot a dollar

---
 usr/share/doc/vizrt/vosa-handbook/create-handbook.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index b15fe4a2..7ccbd897 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -474,9 +474,8 @@ function get_publication_links_for_presentation_host() {
     IFS='#'
     read ece_pub fqdn domain_prefix <<< "$el"
     IFS=$old_ifs
-    echo "[[$(get_link ${domain_prefix}.${1})/][{1} as ${fqdn} backend]]"
+    echo "[[$(get_link ${domain_prefix}.${1})/][${1} as ${fqdn} backend]]"
   done
-
 }
 
 ## $1 :: host

From c2e651dbe68775b182700f51e7a6cd055bdecccb Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Wed, 17 Oct 2012 18:30:49 +0200
Subject: [PATCH 1422/2585] reduced the link to the domainname

---
 usr/share/doc/vizrt/vosa-handbook/create-handbook.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 7ccbd897..ac255ae7 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -474,7 +474,7 @@ function get_publication_links_for_presentation_host() {
     IFS='#'
     read ece_pub fqdn domain_prefix <<< "$el"
     IFS=$old_ifs
-    echo "[[$(get_link ${domain_prefix}.${1})/][${1} as ${fqdn} backend]]"
+    echo "[[$(get_link ${domain_prefix}.${1})/][${fqdn}]]"
   done
 }
 

From 03c41dd6e34a69af400a9ae0be34d4dfa4d46945 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Wed, 17 Oct 2012 18:57:52 +0200
Subject: [PATCH 1423/2585] correction so the test will not fail

---
 usr/share/doc/vizrt/vosa-handbook/create-handbook.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index ac255ae7..10f3f7d4 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -461,7 +461,7 @@ EOF
 }
 
 function get_publication_links_for_presentation_host() {
-    if [ -z $trail_publication_list ] ; then
+    if [ -z $trail_publication_domain_mapping_list ] ; then
 	return ""
     fi
 

From 92cdfeb5f4cc20bd8bf78842656dd92f6ecb2d8d Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Thu, 18 Oct 2012 07:38:35 +0200
Subject: [PATCH 1424/2585] corrected the route to gatekeeper

---
 usr/share/doc/vizrt/vosa-handbook/ssh-access.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/ssh-access.org b/usr/share/doc/vizrt/vosa-handbook/ssh-access.org
index a40d08b8..51342269 100644
--- a/usr/share/doc/vizrt/vosa-handbook/ssh-access.org
+++ b/usr/share/doc/vizrt/vosa-handbook/ssh-access.org
@@ -80,7 +80,7 @@ or Mac OS X]] section to generate and use your SSH key.
 ** Log on to the gatekeeper
 On your local machine, do:
 #+BEGIN_SRC text
-$ ssh <%= trail_control_host %>
+$ ssh <gatekeeper host> 
 #+END_SRC
 
 ** Log on to the control server

From c95f4f293269b3db9e43733e3de97982dd692185 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Thu, 18 Oct 2012 14:57:15 +0200
Subject: [PATCH 1425/2585] fixed some keyword typo's

---
 usr/share/doc/vizrt/vosa-handbook/search-server.org | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/search-server.org b/usr/share/doc/vizrt/vosa-handbook/search-server.org
index 99a3cf5b..18d359ff 100644
--- a/usr/share/doc/vizrt/vosa-handbook/search-server.org
+++ b/usr/share/doc/vizrt/vosa-handbook/search-server.org
@@ -13,11 +13,11 @@ this, you can use the Component Browser in the escenic-admin
 interface.
 
 For instance, let's say you're upgrading the search server for
-<%= trail_eOBditor_host %> and want it to temporarily use
+<%= trail_editor_host %> and want it to temporarily use
 <%= trail_import_host %>'s search instance.
 
 First, go to:
-http://<%= trail_editor_host %><%= trail_network_name %>:<%= trail_editor_port %>/escenic-admin/browser/Global/com/escenic/webservice/search/DelegatingSearchEngine?property=solrURI
+http://<%= trail_editor_host %>.<%= trail_network_name %>:<%= trail_editor_port %>/escenic-admin/browser/Global/com/escenic/webservice/search/DelegatingSearchEngine?property=solrURI
 
 Then, change the value from:
 #+BEGIN_SRC conf

From 4a110928adba13366cddb230b6344b776372f003 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Thu, 18 Oct 2012 15:02:57 +0200
Subject: [PATCH 1426/2585] fixing some typo's in dynamically generated url's

---
 usr/share/doc/vizrt/vosa-handbook/monitoring.org | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/monitoring.org b/usr/share/doc/vizrt/vosa-handbook/monitoring.org
index bab22ba4..bbfdd7d8 100644
--- a/usr/share/doc/vizrt/vosa-handbook/monitoring.org
+++ b/usr/share/doc/vizrt/vosa-handbook/monitoring.org
@@ -27,7 +27,7 @@ produce a system-info report in YAML and check the files into a
 version repository.
 
 When browsing the Hugin web interface at
-http://<%= trail_control_host %><%= trail_network_name %>:5679/ you can quickly 
+http://<%= trail_control_host %>.<%= trail_network_name %>:5679/ you can quickly 
 see all changes on the various servers. A change could be a new
 service which is all of a sudden listening on a new port or that the
 version of a installed package has changed. Nothing escapes Hugin's
@@ -39,12 +39,12 @@ trending of your site. I.e. how it has been behaving the last days,
 weeks and months.
 
 The address to your Munin instance is is:
- http://<%= trail_monitoring_host %><%= trail_network_name %>/munin/
+ http://<%= trail_monitoring_host %>.<%= trail_network_name %>/munin/
 
 ** Icinga (enhanced Nagios)
 Icinga gives a good overview of the current health of the
 habitat. Head over to
- http://<%= trail_monitoring_host %><%= trail_network_name %>/icinga/ 
+ http://<%= trail_monitoring_host %>.<%= trail_network_name %>/icinga/ 
 to get updates on host & service uptimes and disk fill rates. This is
 also the place were you'll schedule any maintenance work you do to
 prevent unnecessary alerts filling up your mobile phone and email

From fc299a15ea9c917bc22906ca21f59a7d171fcead Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Thu, 18 Oct 2012 15:27:06 +0200
Subject: [PATCH 1427/2585] clarified configuration for search in the website
 and search in Content Studio

---
 usr/share/doc/vizrt/vosa-handbook/search-server.org | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/search-server.org b/usr/share/doc/vizrt/vosa-handbook/search-server.org
index 18d359ff..f85c9785 100644
--- a/usr/share/doc/vizrt/vosa-handbook/search-server.org
+++ b/usr/share/doc/vizrt/vosa-handbook/search-server.org
@@ -5,14 +5,14 @@ these web applications on a dedicated JVM as their behaviour with
 regards to object creation, connections and garbage collection is
 highly different from that of a publication or presentation server.
 
-** Updating the Search Server
+** Changing the search server used by Content Studio.
 
 When updating the search server, you might want to reconfigure the
-ECE instance(s) that use the search server you're updating. To do
+ECE instance(s) that use the search server you're updating to allow Content Studio instances to search. To do
 this, you can use the Component Browser in the escenic-admin
 interface.
 
-For instance, let's say you're upgrading the search server for
+For instance, let's say you're upgrading the Content Studio search server for
 <%= trail_editor_host %> and want it to temporarily use
 <%= trail_import_host %>'s search instance.
 
@@ -29,3 +29,6 @@ to
 #+BEGIN_SRC conf
 http://<%= trail_import_host %>:8081/solr/select	  
 #+END_SRC
+
+** TODO Changing the search server used by the website.
+

From 8e4ebdbed54d5fab265d14c2ff278935a09e0089 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Thu, 18 Oct 2012 15:35:13 +0200
Subject: [PATCH 1428/2585] added information to configure the search engine
 for site search

---
 usr/share/doc/vizrt/vosa-handbook/search-server.org | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/search-server.org b/usr/share/doc/vizrt/vosa-handbook/search-server.org
index f85c9785..058d83ff 100644
--- a/usr/share/doc/vizrt/vosa-handbook/search-server.org
+++ b/usr/share/doc/vizrt/vosa-handbook/search-server.org
@@ -30,5 +30,14 @@ to
 http://<%= trail_import_host %>:8081/solr/select	  
 #+END_SRC
 
-** TODO Changing the search server used by the website.
+** Changing the search server used by the website.
+The following configuration points influence the search behavior in the website:
+- Site Search (Widget Framework): com.escenic.framework.search.solr.SolrHttpClient
+- Site Search (Widget Framework): com.escenic.framework.search.solr.SolrSearchEngine
+- Site Search (DEPRECATED): com.escenic.lucy.LucySearchEngine  
+
+** Changing the search server used for web studio person search 
+For some strange reason the web studio person search has a unique configuration for the search server:
+- escenic/solr-base-uri environment variable in context.xml (also used by indexer webapp)
+
 

From 653b0c2399266c01e26d0e2a0b493202a923ced4 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Thu, 18 Oct 2012 16:26:09 +0200
Subject: [PATCH 1429/2585] First attempt to say something about AWS-RDS

---
 .../doc/vizrt/vosa-handbook/database-rds.org   | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/database-rds.org

diff --git a/usr/share/doc/vizrt/vosa-handbook/database-rds.org b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
new file mode 100644
index 00000000..21380e35
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
@@ -0,0 +1,18 @@
+Slow Query Logging on Amazon RDS - a HOWTO Save
+Mar 2, 2011 threetee.posterous.com
+Slow Query Logging on Amazon RDS - a HOWTO
+Amazon RDS instances have slow query logging disabled by default. Here is how to enable slow query logging and access the slow query data on your RDS instance using the RDS command-line tools:
+
+Install the Amazon RDS command-line tools and configure your environment according to the documentation: http://aws.amazon.com/developertools/2928
+Create a parameter group:
+$ rds-create-db-parameter-group sweet-parameter-group -f mysql5.1 -d "This is a totally sweet database parameter group"
+Place your DB instance in that parameter group:
+$ rds-modify-db-instance my-instance --db-parameter-group-name sweet-parameter-group --apply-immediately
+Modify the parameter group to turn on slow query logging:
+$ rds-modify-db-parameter-group sweet-parameter-group --parameters "name=slow_query_log, value=ON, method=immediate" --parameters "name=long_query_time, value=1, method=immediate" --parameters "name=min_examined_row_limit, value=100, method=immediate"
+If you like, you can verify that your settings were made properly:
+$ rds-describe-db-parameters sweet-parameter-group
+
+Reboot your DB instance:
+$ rds-reboot-db-instance my-instance
+After following the above steps, you will be able to access the slow query log by querying the mysql.slow_log table.

From 19e7e163870bda20a26f082bee33522ad07d5246 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Thu, 18 Oct 2012 16:39:12 +0200
Subject: [PATCH 1430/2585] copied some text from the Internet about slow query
 log from hris Hauzenberger http://www.memonic.com/user/chris/profile

---
 .../doc/vizrt/vosa-handbook/database-rds.org  | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/database-rds.org b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
index 21380e35..c1d2f395 100644
--- a/usr/share/doc/vizrt/vosa-handbook/database-rds.org
+++ b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
@@ -1,18 +1,28 @@
-Slow Query Logging on Amazon RDS - a HOWTO Save
-Mar 2, 2011 threetee.posterous.com
-Slow Query Logging on Amazon RDS - a HOWTO
-Amazon RDS instances have slow query logging disabled by default. Here is how to enable slow query logging and access the slow query data on your RDS instance using the RDS command-line tools:
+* Amazon RDS-Mysql
+** TODO something in general about RDS
+** TODO restore and backup of RDS
+** Slow Query Logging on Amazon RDS - a HOWTO
+Amazon RDS-Mysql instances have slow query logging disabled by default. Here is how to enable slow query logging and access the slow query data on your RDS instance using the RDS command-line tools:
 
-Install the Amazon RDS command-line tools and configure your environment according to the documentation: http://aws.amazon.com/developertools/2928
-Create a parameter group:
+- Install the Amazon RDS command-line tools and configure your environment according to the documentation: [[http://aws.amazon.com/developertools/2928]] 
+- Create a parameter group:
+#+BEGIN_SRC sh
 $ rds-create-db-parameter-group sweet-parameter-group -f mysql5.1 -d "This is a totally sweet database parameter group"
-Place your DB instance in that parameter group:
+#+END_SRC
+- Place your DB instance in that parameter group:
+#+BEGIN_SRC sh
 $ rds-modify-db-instance my-instance --db-parameter-group-name sweet-parameter-group --apply-immediately
-Modify the parameter group to turn on slow query logging:
+#+END_SRC
+- Modify the parameter group to turn on slow query logging:
+#+BEGIN_SRC sh
 $ rds-modify-db-parameter-group sweet-parameter-group --parameters "name=slow_query_log, value=ON, method=immediate" --parameters "name=long_query_time, value=1, method=immediate" --parameters "name=min_examined_row_limit, value=100, method=immediate"
-If you like, you can verify that your settings were made properly:
+#+END_SRC
+- If you like, you can verify that your settings were made properly:
+#+BEGIN_SRC sh
 $ rds-describe-db-parameters sweet-parameter-group
-
-Reboot your DB instance:
+#+END_SRC
+- Reboot your DB instance:
+#+BEGIN_SRC sh
 $ rds-reboot-db-instance my-instance
+#+END_SRC
 After following the above steps, you will be able to access the slow query log by querying the mysql.slow_log table.

From 8e5e65d9f72cb9bf1bc1ff92d0b85baa5207c67d Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Thu, 18 Oct 2012 16:43:55 +0200
Subject: [PATCH 1431/2585] added include database-rds.org

---
 usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
index 5ae2a227..54ec0b4c 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
+++ b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
@@ -10,6 +10,7 @@
 #+INCLUDE: "content-engine.org"
 #+INCLUDE: "search-server.org"
 #+INCLUDE: "database.org"
+#+INCLUDE: "database-rds.org"
 #+INCLUDE: "cache-server.org"
 #+INCLUDE: "network-file-system.org"
 #+INCLUDE: "backups.org"

From 5fcb76edd123f5ea799ab4a9e9b00ef1861e8594 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Thu, 18 Oct 2012 16:45:10 +0200
Subject: [PATCH 1432/2585] first attempt to say something useful about naming

---
 .../doc/vizrt/vosa-handbook/host_naming.org   | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/host_naming.org

diff --git a/usr/share/doc/vizrt/vosa-handbook/host_naming.org b/usr/share/doc/vizrt/vosa-handbook/host_naming.org
new file mode 100644
index 00000000..f2f09117
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/host_naming.org
@@ -0,0 +1,36 @@
+* Host naming conventions
+Host names play a role in the Internet wide DNS system. Host names to find ip addresses. A host name can identify 0 or more ip addresses. Valid ip addresses might vary depending on the client network.
+
+This document assumes that you know how the global DNS system works.
+
+** What we use host names for
+
+We identify ip addresses with hostnames. So the real question is: 
+
+/what do we use ip addresses for?/
+
+*** TODO Virtual IP's
+
+** Machine roles
+
+The follwing roles are common in VOSA clusters:
+- Control :: (control) Ssh entrypoint operators
+- Monitoring :: (mon) Presenting operational performance trends and sending out events when performance or capacity limits are exceded.
+- Vme online control :: (vmeoc) VME Admin web interface (Diactus), All automatic workflows of VME are initiated and monitored from here.
+- Vme online delivery :: (vmeod*) Presenting video's to visitors
+- Vme online transcoder :: (vmeot*) Transcoding video's from one format to another, either live or as a batch process. 
+- Escenic Presentation :: (pres*) Generating webpages by merging content from a database with html from JSP files.
+- Escenic Editorial :: (edit*) Content Studio webservice, Imports
+- Escenic Analysis :: (analysis) Counting pageimpressions for use by the webpages to present lists that depend on performance of specific content items.
+
+** Virtual roles
+
+- analysis :: the analysis webservices that are currently in production
+- edit :: Content Studio webservice and Indexer Webservice that are currently in production
+- import :: All periodic downloads of external content currently going on.
+- nfs-master :: The filesharing server that is curently in production.
+- nfs-slave :: The filesharing server that is curently in production.
+- pres* :: The presentation hosts currently configured on the loadbalancer
+- control :: The control service currently in production
+- mon :: The monitoring service currently in production
+

From 2b78f1cd5ded314ff87bb32a537f3f736b11295c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 17 Oct 2012 16:59:51 +0200
Subject: [PATCH 1433/2585] - for tomcat6-user packaged tomcats (and perhaps
 others), set the   tomcat catalina out to  
 $log_dir/${instance_name}-tomcat-catalina.out, in sync with the   latest
 changes in ece-install, where tomcat is set up to use log4j++

---
 usr/bin/ece | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index ab4bfeef..72da673d 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -244,7 +244,7 @@ function set_type_port() {
     else
         if [ -r $tomcat_base/logs/catalina.out ]; then
             # for tomcat6-user packaged tomcats (and perhaps others)
-            out_log=$tomcat_base/logs/catalina.out
+            out_log=$log_dir/${instance_name}-tomcat-catalina.out
         else
             out_log=$log
         fi

From f3425402516a08f60b586358ab2bdfff6709ee53 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 17 Oct 2012 17:11:10 +0200
Subject: [PATCH 1434/2585] - changed trace.properties to set up
 <instance>-messages log4j log   instead of <server>-messages, where <server>
 is   <hostname>-<instance> name.

---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index cb971ee1..d756f7ab 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -476,7 +476,7 @@ function set_up_proper_logging_configuration() {
   cat > $common_nursery_dir/trace.properties <<EOF
 log4j.rootLogger=ERROR, ECELOG
 log4j.appender.ECELOG=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.ECELOG.File=$escenic_log_dir/\${escenic.server}-messages
+log4j.appender.ECELOG.File=$escenic_log_dir/\${instance_name}-messages
 log4j.appender.ECELOG.layout=org.apache.log4j.PatternLayout
 log4j.appender.ECELOG.layout.ConversionPattern=%d %5p [%t] %x (%c) %m%n
 

From 613be7ba4bead9507927d20bccb4a7ffd4638afa Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 18 Oct 2012 17:12:33 +0200
Subject: [PATCH 1435/2585] - ece-install now sets all Tomcats up to use log4j
 instead of   java.util.Logging, to do this it pulls down extra JARs for the
 same   Tomcat version which has been (dynamically) chosen to be   installed.

  There's still some fixing up to do, though, #75.

- moved content-engine::set_up_proper_logging_configuration to
  app_sever:set_up_proper_logging_configuration_for_ece so that all
  the logging configuration is done in one place.
---
 .../ece-scripts/ece-install.d/app-server.sh   | 139 +++++++++++++++++-
 .../ece-install.d/content-engine.sh           |  59 --------
 2 files changed, 137 insertions(+), 61 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index d6c80675..ca260f13 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -1,5 +1,4 @@
-function set_up_app_server()
-{
+function set_up_app_server() {
   print_and_log "Setting up the application server ..."
 
   if [ $fai_enabled -eq 0 ]; then
@@ -431,8 +430,18 @@ EOF
 </Context>
 EOF
   fi
+
+  ensure_app_server_is_using_log4j
+  set_up_proper_logging_configuration_for_ece
 }
 
+function ensure_app_server_is_using_log4j() {
+  print_and_log "Setting up Tomcat to use log4j ..."
+  log4j_create_catalina_log4j_properties
+  log4j_download_the_tomcat_juli_libraries_and_copy_these_to_cl
+  log4j_ensure_java_util_logging_is_not_doing_anything
+}  
+
 function set_appropriate_jvm_heap_sizes() {
   # in MB
   local heap_size=2048
@@ -476,3 +485,129 @@ function set_http_auth_credentials_if_needed() {
     set_ece_instance_conf escenic_admin_http_password "$http_password"
   fi
 }
+
+function log4j_create_catalina_log4j_properties() {
+  log "Creating catalina properties to use log4j ..."
+  cat > $tomcat_base/lib/log4j.properties <<EOF  
+# generated by $(basename $0) @ $(date --iso)	
+log4j.rootLogger=INFO, CATALINA
+
+# Define all the appenders
+log4j.appender.CATALINA=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.CATALINA.File=${escenic_log_dir}/\${com.escenic.instance}-tomcat-catalina
+log4j.appender.CATALINA.layout = org.apache.log4j.PatternLayout
+log4j.appender.CATALINA.layout.ConversionPattern = %d [%t] %-5p %c- %m%n
+
+log4j.appender.LOCALHOST=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.LOCALHOST.File=${escenic_log_dir}/\${com.escenic.instance}-tomcat-localhost
+log4j.appender.LOCALHOST.layout = org.apache.log4j.PatternLayout
+log4j.appender.LOCALHOST.layout.ConversionPattern = %d [%t] %-5p %c- %m%n
+
+log4j.appender.MANAGER=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.MANAGER.File=${escenic_log_dir}/\${com.escenic.instance}-tomcat-manager
+log4j.appender.MANAGER.layout = org.apache.log4j.PatternLayout
+log4j.appender.MANAGER.layout.ConversionPattern = %d [%t] %-5p %c- %m%n
+
+log4j.appender.HOST-MANAGER=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.HOST-MANAGER.File=${escenic_log_dir}/\${com.escenic.instance}-tomcat-host-manager.
+log4j.appender.HOST-MANAGER.layout = org.apache.log4j.PatternLayout
+log4j.appender.HOST-MANAGER.layout.ConversionPattern = %d [%t] %-5p %c- %m%n
+
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.layout = org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern = %d [%t] %-5p %c- %m%n
+
+# Configure which loggers log to which appenders
+log4j.logger.org.apache.catalina.core.ContainerBase.[Catalina].[localhost]=INFO, LOCALHOST
+log4j.logger.org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager]=\
+  INFO, MANAGER
+log4j.logger.org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager]=\
+  INFO, HOST-MANAGER
+
+EOF
+}
+
+function set_up_proper_logging_configuration_for_ece() {
+  print_and_log "Setting up proper log4j & Java logging configuration ..."
+  
+  cat > $common_nursery_dir/trace.properties <<EOF
+log4j.rootLogger=ERROR, ECELOG
+log4j.appender.ECELOG=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.ECELOG.File=$escenic_log_dir/\${com.escenic.instance}-messages
+log4j.appender.ECELOG.layout=org.apache.log4j.PatternLayout
+log4j.appender.ECELOG.layout.ConversionPattern=%d %5p [%t] %x (%c) %m%n
+
+# Get rid of the browser log which for some reason wanderse into the
+# standard log4j log
+log4j.appender.NOLOGGING=org.apache.log4j.varia.NullAppender
+log4j.additivity.browser=false
+log4j.category.browser=FATAL, NOLOGGING
+
+# Get rid of serialization errors to memcached.
+log4j.category.com.danga.MemCached.MemCachedClient=FATAL
+EOF
+  run cd $tomcat_base/lib/
+  make_ln $common_nursery_dir/trace.properties
+
+  # since the solr webapp otherwise will pollute our logs, we ask
+  # Tomcat specifically to make it log to dedicated logger.
+  if [ $install_profile_number -eq $PROFILE_SEARCH_SERVER -o \
+    $install_profile_number -eq $PROFILE_ALL_IN_ONE ]; then
+    cat > $tomcat_base/conf/logging.properties <<EOF
+handlers = 1catalina.org.apache.juli.FileHandler, 2localhost.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler, 6localhost.org.apache.juli.FileHandler
+
+.handlers = 1catalina.org.apache.juli.FileHandler
+
+1catalina.org.apache.juli.FileHandler.level = FINE
+1catalina.org.apache.juli.FileHandler.directory = \$\{catalina.base\}/logs
+1catalina.org.apache.juli.FileHandler.prefix = catalina.
+
+2localhost.org.apache.juli.FileHandler.level = FINE
+2localhost.org.apache.juli.FileHandler.directory = \$\{catalina.base\}/logs
+2localhost.org.apache.juli.FileHandler.prefix = localhost.
+
+java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
+
+6localhost.org.apache.juli.FileHandler.level = FINE
+6localhost.org.apache.juli.FileHandler.directory = $escenic_log_dir
+6localhost.org.apache.juli.FileHandler.prefix = solr.
+
+org.apache.solr.level=WARNING
+org.apache.solr.handlers=6localhost.org.apache.juli.FileHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.FileHandler
+EOF
+  fi
+}
+
+## libraries needed for overriding the default logging framework in
+## Tomcat.
+function log4j_download_the_tomcat_juli_libraries_and_copy_these_to_cl() {
+  log "Downloading Tomcat libraries to override java.util.Logging ..."
+  local libraries="tomcat-juli-adapters.jar tomcat-juli.jar"
+  local tomcat_base_uri=$(dirname $(get_tomcat_download_url))
+  for el in $libraries; do
+    local file=$(
+      download_uri_target_to_dir \
+        $tomcat_base_uri/extras/$el \
+        $download_dir
+    )
+  done
+
+  run cp $download_dir/tomcat-juli-adapters.jar $tomcat_home/lib/
+  run cp $download_dir/tomcat-juli.jar $tomcat_home/bin/
+  # we don't copy the log4j JAR as this is provided with ECE and EAE.
+}
+
+function log4j_ensure_java_util_logging_is_not_doing_anything() {
+  log "Ensure java.util.Logging is put to rest ..."
+  local file=$tomcat_base/conf/logging.properties
+  if [ -e $file ]; then
+    run rm $file
+  else
+    log $file "doesn't exist, strange"
+  fi
+}
+
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index d756f7ab..877bf19e 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -73,7 +73,6 @@ function install_ece_instance() {
   fi
 
   set_up_app_server
-  set_up_proper_logging_configuration
 
   if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER ]; then
     set_up_basic_nursery_configuration
@@ -470,64 +469,6 @@ function set_up_instance_specific_nursery_configuration() {
   fi
 }
 
-function set_up_proper_logging_configuration() {
-  print_and_log "Setting up proper log4j & Java logging configuration ..."
-  
-  cat > $common_nursery_dir/trace.properties <<EOF
-log4j.rootLogger=ERROR, ECELOG
-log4j.appender.ECELOG=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.ECELOG.File=$escenic_log_dir/\${instance_name}-messages
-log4j.appender.ECELOG.layout=org.apache.log4j.PatternLayout
-log4j.appender.ECELOG.layout.ConversionPattern=%d %5p [%t] %x (%c) %m%n
-
-# Get rid of the browser log which for some reason wanderse into the
-# standard log4j log
-log4j.appender.NOLOGGING=org.apache.log4j.varia.NullAppender
-log4j.additivity.browser=false
-log4j.category.browser=FATAL, NOLOGGING
-
-# Get rid of serialization errors to memcached.
-log4j.category.com.danga.MemCached.MemCachedClient=FATAL
-EOF
-  cd $tomcat_base/lib/
-  make_ln $common_nursery_dir/trace.properties
-  run ln -sf trace.properties log4j.properies
-
-  # since the solr webapp otherwise will pollute our logs, we ask
-  # Tomcat specifically to make it log to dedicated logger.
-  if [ $install_profile_number -eq $PROFILE_SEARCH_SERVER -o \
-    $install_profile_number -eq $PROFILE_ALL_IN_ONE ]; then
-    cat > $tomcat_base/conf/logging.properties <<EOF
-handlers = 1catalina.org.apache.juli.FileHandler, 2localhost.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler, 6localhost.org.apache.juli.FileHandler
-
-.handlers = 1catalina.org.apache.juli.FileHandler
-
-1catalina.org.apache.juli.FileHandler.level = FINE
-1catalina.org.apache.juli.FileHandler.directory = \$\{catalina.base\}/logs
-1catalina.org.apache.juli.FileHandler.prefix = catalina.
-
-2localhost.org.apache.juli.FileHandler.level = FINE
-2localhost.org.apache.juli.FileHandler.directory = \$\{catalina.base\}/logs
-2localhost.org.apache.juli.FileHandler.prefix = localhost.
-
-java.util.logging.ConsoleHandler.level = FINE
-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
-
-6localhost.org.apache.juli.FileHandler.level = FINE
-6localhost.org.apache.juli.FileHandler.directory = $escenic_log_dir
-6localhost.org.apache.juli.FileHandler.prefix = solr.
-
-org.apache.solr.level=WARNING
-org.apache.solr.handlers=6localhost.org.apache.juli.FileHandler
-
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.FileHandler
-EOF
-  else
-    run cp $tomcat_home/conf/logging.properties $tomcat_base/conf
-  fi
-}
-
 # Installs third party packages needed by the ECE (i.e. Java related).
 # Also see install_common_os_packages for packages common to all
 # servers in the architecture.

From 2a5ecdc1ec9f28bbf6314e2536ffcebc9d02c599 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Fri, 19 Oct 2012 08:49:58 +0200
Subject: [PATCH 1436/2585] Added text to explain AWS/RDS in connection with
 Escenic

---
 .../doc/vizrt/vosa-handbook/database-rds.org  | 26 +++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/database-rds.org b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
index c1d2f395..5a2916e1 100644
--- a/usr/share/doc/vizrt/vosa-handbook/database-rds.org
+++ b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
@@ -1,6 +1,28 @@
-* Amazon RDS-Mysql
-** TODO something in general about RDS
+* Amazon Webservices RDS
+RDS is the Amazon Webservices Product line for Database as a service. As of this writing they have the following database products available:
+- Mysql
+- Oracle
+- Microsoft SQL
+As of writing we have only used Mysql for Escenic.
+** RDS/Mysql flavors
+The database sizes and pricing are comparable to equivalent EC2 instances. We have good experience running Escenic in the following RDS configuration:
+- Extra Large Mysql DB Instance 
+- 15 Million PI 
+- 2 minutes full page ttl on Varnish
+- 2 presentation engines, No memcached
+- 20.000 presentatino article cache.
+We will share more experience as it becomes avaialable.
+** RDS Avaialability
+RDS goes down like any other Amazon resource but it is a bit more resilliant than EBS in our experience.
+Like any Amazon resource, redundancy over avaialability zones is needed and for this Amazon provides the multi-az option. Our experience with RDS+Multi-az availability is good. Our experience with RDS without multi-az is horrible. Do your backups often and practice the restores because you will need it.
+** RDS/Mysql limitations
+- No shell access :: Has not been been a problem for Escenic so far.
+- No triggers :: Minor upgrades of Escenic sometimes need triggers to run the databse migrations. This is a minor problem as the database migration is never done in production anyway. Just remember to do the migration of databases in a restore on a normal Mysql installation in an OS that you _can_ login to.
+- Different slow query log :: The slow query log is an important tool to understand database overload problems. You need to be able to investgate these problems in cases where template developers make inefficient templates or in cases where Escenic has bugs that cause it to overload the database. How to set up a slow query log on RDS/mysql is explained later in this document.
+- This it so far. More learnings should be added here.
+
 ** TODO restore and backup of RDS
+
 ** Slow Query Logging on Amazon RDS - a HOWTO
 Amazon RDS-Mysql instances have slow query logging disabled by default. Here is how to enable slow query logging and access the slow query data on your RDS instance using the RDS command-line tools:
 

From bf7e1ff167edbc893ef6c2952974a3fcd3fdecf8 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Fri, 19 Oct 2012 10:44:04 +0200
Subject: [PATCH 1437/2585] Maturing the text on Amazon RDS

---
 usr/share/doc/vizrt/vosa-handbook/database-rds.org | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/database-rds.org b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
index 5a2916e1..1b4df474 100644
--- a/usr/share/doc/vizrt/vosa-handbook/database-rds.org
+++ b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
@@ -1,5 +1,5 @@
-* Amazon Webservices RDS
-RDS is the Amazon Webservices Product line for Database as a service. As of this writing they have the following database products available:
+* Amazon Web services RDS
+RDS is the Amazon Web services Product line for Database as a service. As of this writing they have the following database products available:
 - Mysql
 - Oracle
 - Microsoft SQL
@@ -10,10 +10,10 @@ The database sizes and pricing are comparable to equivalent EC2 instances. We ha
 - 15 Million PI 
 - 2 minutes full page ttl on Varnish
 - 2 presentation engines, No memcached
-- 20.000 presentatino article cache.
-We will share more experience as it becomes avaialable.
-** RDS Avaialability
-RDS goes down like any other Amazon resource but it is a bit more resilliant than EBS in our experience.
+- 20.000 presentation article cache.
+We will share more experience as it becomes available.
+** RDS Availability
+RDS goes down like any other Amazon resource but it is a bit more resilient than EBS in our experience.
 Like any Amazon resource, redundancy over avaialability zones is needed and for this Amazon provides the multi-az option. Our experience with RDS+Multi-az availability is good. Our experience with RDS without multi-az is horrible. Do your backups often and practice the restores because you will need it.
 ** RDS/Mysql limitations
 - No shell access :: Has not been been a problem for Escenic so far.

From 9df9b293f480a7d1d41c9bb4725b35f9b838c617 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Fri, 19 Oct 2012 10:54:58 +0200
Subject: [PATCH 1438/2585] added credit to Chris Hauzenbergers RDS text

---
 usr/share/doc/vizrt/vosa-handbook/database-rds.org | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/database-rds.org b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
index 1b4df474..09643c3d 100644
--- a/usr/share/doc/vizrt/vosa-handbook/database-rds.org
+++ b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
@@ -19,11 +19,14 @@ Like any Amazon resource, redundancy over avaialability zones is needed and for
 - No shell access :: Has not been been a problem for Escenic so far.
 - No triggers :: Minor upgrades of Escenic sometimes need triggers to run the databse migrations. This is a minor problem as the database migration is never done in production anyway. Just remember to do the migration of databases in a restore on a normal Mysql installation in an OS that you _can_ login to.
 - Different slow query log :: The slow query log is an important tool to understand database overload problems. You need to be able to investgate these problems in cases where template developers make inefficient templates or in cases where Escenic has bugs that cause it to overload the database. How to set up a slow query log on RDS/mysql is explained later in this document.
-- This it so far. More learnings should be added here.
+- This it so far :: More learnings should be added here.
 
 ** TODO restore and backup of RDS
 
 ** Slow Query Logging on Amazon RDS - a HOWTO
+
+/(This is borrowed text from an [[http://www.memonic.com/user/chris/id/1pwgo][Article]] by [[http://www.memonic.com/user/chris/profile][Chris Hauzenberger]] on emonic.com)/
+
 Amazon RDS-Mysql instances have slow query logging disabled by default. Here is how to enable slow query logging and access the slow query data on your RDS instance using the RDS command-line tools:
 
 - Install the Amazon RDS command-line tools and configure your environment according to the documentation: [[http://aws.amazon.com/developertools/2928]] 

From 295bd533e0be2969f9895ee23efe05056f86ab80 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Fri, 19 Oct 2012 11:20:24 +0200
Subject: [PATCH 1439/2585] added a footnote

---
 usr/share/doc/vizrt/vosa-handbook/database-rds.org | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/database-rds.org b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
index 09643c3d..c314fd66 100644
--- a/usr/share/doc/vizrt/vosa-handbook/database-rds.org
+++ b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
@@ -25,7 +25,8 @@ Like any Amazon resource, redundancy over avaialability zones is needed and for
 
 ** Slow Query Logging on Amazon RDS - a HOWTO
 
-/(This is borrowed text from an [[http://www.memonic.com/user/chris/id/1pwgo][Article]] by [[http://www.memonic.com/user/chris/profile][Chris Hauzenberger]] on emonic.com)/
+/This is borrowed text[fn:1]/
+[fn:1] Slow query log text from an [[http://www.memonic.com/user/chris/id/1pwgo][Article]] by [[http://www.memonic.com/user/chris/profile][Chris Hauzenberger]] on emonic.com
 
 Amazon RDS-Mysql instances have slow query logging disabled by default. Here is how to enable slow query logging and access the slow query data on your RDS instance using the RDS command-line tools:
 

From 9f073f4bf38814eb5fb45adf1281bd895cdfe5d3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 19 Oct 2012 10:12:29 +0200
Subject: [PATCH 1440/2585] - removed redundant dot - set up consistent log
 file name for the solr log

---
 usr/share/escenic/ece-scripts/ece-install.d/app-server.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index ca260f13..804832ac 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -509,7 +509,7 @@ log4j.appender.MANAGER.layout = org.apache.log4j.PatternLayout
 log4j.appender.MANAGER.layout.ConversionPattern = %d [%t] %-5p %c- %m%n
 
 log4j.appender.HOST-MANAGER=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.HOST-MANAGER.File=${escenic_log_dir}/\${com.escenic.instance}-tomcat-host-manager.
+log4j.appender.HOST-MANAGER.File=${escenic_log_dir}/\${com.escenic.instance}-tomcat-host-manager
 log4j.appender.HOST-MANAGER.layout = org.apache.log4j.PatternLayout
 log4j.appender.HOST-MANAGER.layout.ConversionPattern = %d [%t] %-5p %c- %m%n
 
@@ -571,7 +571,7 @@ java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
 
 6localhost.org.apache.juli.FileHandler.level = FINE
 6localhost.org.apache.juli.FileHandler.directory = $escenic_log_dir
-6localhost.org.apache.juli.FileHandler.prefix = solr.
+6localhost.org.apache.juli.FileHandler.prefix = \${com.escenic.instance}-solr.
 
 org.apache.solr.level=WARNING
 org.apache.solr.handlers=6localhost.org.apache.juli.FileHandler

From 020e5f2f52f021e799b015362d5be4e26edefb32 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 19 Oct 2012 11:25:06 +0200
Subject: [PATCH 1441/2585] - added support for HTTP proxies.  If you want
 ECE/EAE to use an HTTP  proxy to access the internet, set the parameters you
 need here and  remove the rest. Default is no HTTP proxy. See 
 http://docs.oracle.com/javase/6/docs/technotes/guides/net/proxies.html  for
 more details on the available options here.

 Example configuration in ece.conf:

  jvm_proxy_settings="
    -Dhttp.proxyHost=proxyserver
    -Dhttp.proxyPort=3128
    -Dhttp.nonProxyHosts=localhost
    -Dhttps.proxyHost=proxyserver
    -Dhttps.proxyPort=3128
  "
---
 etc/escenic/ece.conf | 15 +++++++++++++++
 usr/bin/ece          |  3 +++
 2 files changed, 18 insertions(+)

diff --git a/etc/escenic/ece.conf b/etc/escenic/ece.conf
index 1607022e..12fb6dd8 100644
--- a/etc/escenic/ece.conf
+++ b/etc/escenic/ece.conf
@@ -158,6 +158,21 @@ jvm_gc_settings="
 -XX:SurvivorRatio=1
 "
 
+######################################################################
+# If you want ECE/EAE to use an HTTP proxy to access the internet, set
+# the parameters you need here and remove the rest. Default is no HTTP
+# proxy. See
+# http://docs.oracle.com/javase/6/docs/technotes/guides/net/proxies.html
+# for more details on the available options here.
+######################################################################
+# jvm_proxy_settings="
+#   -Dhttp.proxyHost=proxyserver
+#   -Dhttp.proxyPort=3128
+#   -Dhttp.nonProxyHosts=localhost
+#   -Dhttps.proxyHost=proxyserver
+#   -Dhttps.proxyPort=3128
+# "
+
 ######################################################################
 # Java will use IPv6 if it's available on the OS. This however, can
 # cause problems with applications that insists on using IPv4
diff --git a/usr/bin/ece b/usr/bin/ece
index 72da673d..00c8461f 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -321,6 +321,9 @@ function set_instance_settings() {
       ece_args=$ece_args" "$jvm_gc_settings
     fi
     
+    if [ "$jvm_proxy_settings" ]; then
+      ece_args=$ece_args" "$jvm_proxy_settings
+    fi
 
     if [ "$instance" != "default" ]; then
         ece_args=$ece_args" -Dcom.escenic.instance=$instance"

From 1d0b173a2d4b85ba0f21b066358bc065a3de0247 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 19 Oct 2012 11:35:44 +0200
Subject: [PATCH 1442/2585] - the solr specific log is now also using log4j -
 added log duplication blocks for all appenders/categories used. - simplified
 logging configuration, now only setting up   trace.properties (not putting
 something in log4j and something in   trace.properties). Also, simplified the
 BASH methods that generated   the various fragments. - given the instance
 name 'web1', the following log log4j files are   set up in /var/log/escenic:

  web1-catalina.out        - the standard out log used by the catalina.sh wrapper
  web1-gc.log              - the garbage collection log
  web1-messages            - the messages from ECE, EAE, antyhing com.escenic & neo
  web1-tomcat-catalina     - the log file (not system out) for the catalina component in Tomcat.
  web1-tomcat-host-manager - the log file for the host manager
  web1-tomcat-localhost    - the tomcat localhost log, normally where the interesting messages are written
  web1-tomcat-manager      - the log of the tomcat manager
  web1.out                 - the log file of for the ece script when it operates the 'web1' instance.

  Search instances in addition get

  search1-solr             - the log file for the solr (webapp)
---
 .../ece-scripts/ece-install.d/app-server.sh   | 93 ++++++++-----------
 1 file changed, 41 insertions(+), 52 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 804832ac..a88bc06b 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -431,15 +431,14 @@ EOF
 EOF
   fi
 
-  ensure_app_server_is_using_log4j
-  set_up_proper_logging_configuration_for_ece
+  set_up_logging
 }
 
-function ensure_app_server_is_using_log4j() {
+function set_up_logging() {
   print_and_log "Setting up Tomcat to use log4j ..."
-  log4j_create_catalina_log4j_properties
   log4j_download_the_tomcat_juli_libraries_and_copy_these_to_cl
   log4j_ensure_java_util_logging_is_not_doing_anything
+  log4j_create_configuration_file
 }  
 
 function set_appropriate_jvm_heap_sizes() {
@@ -486,13 +485,33 @@ function set_http_auth_credentials_if_needed() {
   fi
 }
 
-function log4j_create_catalina_log4j_properties() {
-  log "Creating catalina properties to use log4j ..."
-  cat > $tomcat_base/lib/log4j.properties <<EOF  
-# generated by $(basename $0) @ $(date --iso)	
-log4j.rootLogger=INFO, CATALINA
+function log4j_create_configuration_file() {
+  print_and_log "Setting up proper log4j & Java logging configuration ..."
+  
+  cat > $common_nursery_dir/trace.properties <<EOF
+# generated by $(basename $0) @ $(date --iso)
 
-# Define all the appenders
+######################################################################
+# The default logger
+log4j.rootLogger=ERROR, CATALINA
+log4j.additivity.com=false
+log4j.additivity.neo=false
+# Get rid of serialization errors to memcached.
+log4j.category.com.danga.MemCached.MemCachedClient=FATAL
+
+######################################################################
+# The ECE specific appender 
+log4j.appender.ECELOG=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.ECELOG.File=$escenic_log_dir/\${com.escenic.instance}-messages
+log4j.appender.ECELOG.layout=org.apache.log4j.PatternLayout
+log4j.appender.ECELOG.layout.ConversionPattern=%d %5p [%t] %x (%c) %m%n
+log4j.category.com.escenic=INFO, ECELOG
+log4j.category.neo=INFO, ECELOG
+log4j.additivity.neo=false
+log4j.additivity.com.escenic=false
+
+######################################################################
+# Tomcat specific appenders
 log4j.appender.CATALINA=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.CATALINA.File=${escenic_log_dir}/\${com.escenic.instance}-tomcat-catalina
 log4j.appender.CATALINA.layout = org.apache.log4j.PatternLayout
@@ -517,34 +536,20 @@ log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
 log4j.appender.CONSOLE.layout = org.apache.log4j.PatternLayout
 log4j.appender.CONSOLE.layout.ConversionPattern = %d [%t] %-5p %c- %m%n
 
-# Configure which loggers log to which appenders
 log4j.logger.org.apache.catalina.core.ContainerBase.[Catalina].[localhost]=INFO, LOCALHOST
 log4j.logger.org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager]=\
   INFO, MANAGER
 log4j.logger.org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager]=\
   INFO, HOST-MANAGER
+log4j.additivity.org.apache.catalina.core.ContainerBase=false
 
-EOF
-}
-
-function set_up_proper_logging_configuration_for_ece() {
-  print_and_log "Setting up proper log4j & Java logging configuration ..."
-  
-  cat > $common_nursery_dir/trace.properties <<EOF
-log4j.rootLogger=ERROR, ECELOG
-log4j.appender.ECELOG=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.ECELOG.File=$escenic_log_dir/\${com.escenic.instance}-messages
-log4j.appender.ECELOG.layout=org.apache.log4j.PatternLayout
-log4j.appender.ECELOG.layout.ConversionPattern=%d %5p [%t] %x (%c) %m%n
-
+######################################################################
 # Get rid of the browser log which for some reason wanderse into the
 # standard log4j log
 log4j.appender.NOLOGGING=org.apache.log4j.varia.NullAppender
-log4j.additivity.browser=false
 log4j.category.browser=FATAL, NOLOGGING
+log4j.additivity.browser=false
 
-# Get rid of serialization errors to memcached.
-log4j.category.com.danga.MemCached.MemCachedClient=FATAL
 EOF
   run cd $tomcat_base/lib/
   make_ln $common_nursery_dir/trace.properties
@@ -553,31 +558,15 @@ EOF
   # Tomcat specifically to make it log to dedicated logger.
   if [ $install_profile_number -eq $PROFILE_SEARCH_SERVER -o \
     $install_profile_number -eq $PROFILE_ALL_IN_ONE ]; then
-    cat > $tomcat_base/conf/logging.properties <<EOF
-handlers = 1catalina.org.apache.juli.FileHandler, 2localhost.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler, 6localhost.org.apache.juli.FileHandler
-
-.handlers = 1catalina.org.apache.juli.FileHandler
-
-1catalina.org.apache.juli.FileHandler.level = FINE
-1catalina.org.apache.juli.FileHandler.directory = \$\{catalina.base\}/logs
-1catalina.org.apache.juli.FileHandler.prefix = catalina.
-
-2localhost.org.apache.juli.FileHandler.level = FINE
-2localhost.org.apache.juli.FileHandler.directory = \$\{catalina.base\}/logs
-2localhost.org.apache.juli.FileHandler.prefix = localhost.
-
-java.util.logging.ConsoleHandler.level = FINE
-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
-
-6localhost.org.apache.juli.FileHandler.level = FINE
-6localhost.org.apache.juli.FileHandler.directory = $escenic_log_dir
-6localhost.org.apache.juli.FileHandler.prefix = \${com.escenic.instance}-solr.
-
-org.apache.solr.level=WARNING
-org.apache.solr.handlers=6localhost.org.apache.juli.FileHandler
-
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.FileHandler
+    cat >> $common_nursery_dir/trace.properties <<EOF
+######################################################################
+# The solr appender 
+log4j.appender.SOLR=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.SOLR.File=$escenic_log_dir/\${com.escenic.instance}-solr
+log4j.appender.SOLR.layout=org.apache.log4j.PatternLayout
+log4j.appender.SOLR.layout.ConversionPattern=%d %5p [%t] %x (%c) %m%n
+log4j.category.org.apache.solr=INFO, SOLR
+log4j.additivity.org.apache.solr=false
 EOF
   fi
 }

From f66da1120dfb78745bc506235c85d9cd6015dd42 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Fri, 19 Oct 2012 12:03:39 +0200
Subject: [PATCH 1443/2585] added the customer trail_rds_backup_retention_days
 in the guide

---
 usr/share/doc/vizrt/vosa-handbook/database-rds.org | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/database-rds.org b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
index c314fd66..306923d1 100644
--- a/usr/share/doc/vizrt/vosa-handbook/database-rds.org
+++ b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
@@ -14,14 +14,19 @@ The database sizes and pricing are comparable to equivalent EC2 instances. We ha
 We will share more experience as it becomes available.
 ** RDS Availability
 RDS goes down like any other Amazon resource but it is a bit more resilient than EBS in our experience.
-Like any Amazon resource, redundancy over avaialability zones is needed and for this Amazon provides the multi-az option. Our experience with RDS+Multi-az availability is good. Our experience with RDS without multi-az is horrible. Do your backups often and practice the restores because you will need it.
+Like any Amazon resource, redundancy over avaialability zones is needed. For this, Amazon provides the multi-az option. Our experience with RDS+Multi-az availability is good. Our experience with RDS without multi-az is horrible. Do your backups often and practice the restores because you will need it.
 ** RDS/Mysql limitations
 - No shell access :: Has not been been a problem for Escenic so far.
 - No triggers :: Minor upgrades of Escenic sometimes need triggers to run the databse migrations. This is a minor problem as the database migration is never done in production anyway. Just remember to do the migration of databases in a restore on a normal Mysql installation in an OS that you _can_ login to.
 - Different slow query log :: The slow query log is an important tool to understand database overload problems. You need to be able to investgate these problems in cases where template developers make inefficient templates or in cases where Escenic has bugs that cause it to overload the database. How to set up a slow query log on RDS/mysql is explained later in this document.
-- This it so far :: More learnings should be added here.
+- This is it so far :: More learnings should be added here.
 
-** TODO restore and backup of RDS
+** restore and backup of RDS
+Automated Backups – Turned on by default, the automated backup feature of Amazon RDS enables point-in-time recovery for your DB Instance. Amazon RDS will backup your database and transaction logs and store both for a user-specified retention period. This allows you to restore your DB Instance to any second during your retention period, up to the last five minutes. Your automatic backup retention period can be configured to up to thirty five days.
+
+It is reccommended to set the retnetion period to at least 7 days.
+
+The retention period of the RDS instance at <%= trail_customer_shortname %> is <%= trail_rds_backup_retention_days %> days.
 
 ** Slow Query Logging on Amazon RDS - a HOWTO
 

From aee1744c64dcd6e09f381b347200500b6524b47c Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Fri, 19 Oct 2012 12:04:27 +0200
Subject: [PATCH 1444/2585] added trail_rds_backup_retention_days replacement

---
 usr/share/doc/vizrt/vosa-handbook/database-rds.org | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/database-rds.org b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
index 306923d1..0a476ab5 100644
--- a/usr/share/doc/vizrt/vosa-handbook/database-rds.org
+++ b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
@@ -26,7 +26,8 @@ Automated Backups – Turned on by default, the automated backup feature of Amaz
 
 It is reccommended to set the retnetion period to at least 7 days.
 
-The retention period of the RDS instance at <%= trail_customer_shortname %> is <%= trail_rds_backup_retention_days %> days.
+The retention period of the RDS instance at <%= trail_customer_shortname %> is <%= trail_rds_backup_retention_days
+ %> days.
 
 ** Slow Query Logging on Amazon RDS - a HOWTO
 

From 03a8ddd51ea1da3e9de50c9e809dcaa1490b683d Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Fri, 19 Oct 2012 12:07:56 +0200
Subject: [PATCH 1445/2585] fixed a typo

---
 usr/share/doc/vizrt/vosa-handbook/database-rds.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/database-rds.org b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
index 0a476ab5..49ca0bd8 100644
--- a/usr/share/doc/vizrt/vosa-handbook/database-rds.org
+++ b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
@@ -21,7 +21,7 @@ Like any Amazon resource, redundancy over avaialability zones is needed. For thi
 - Different slow query log :: The slow query log is an important tool to understand database overload problems. You need to be able to investgate these problems in cases where template developers make inefficient templates or in cases where Escenic has bugs that cause it to overload the database. How to set up a slow query log on RDS/mysql is explained later in this document.
 - This is it so far :: More learnings should be added here.
 
-** restore and backup of RDS
+** Restore and backup of RDS
 Automated Backups – Turned on by default, the automated backup feature of Amazon RDS enables point-in-time recovery for your DB Instance. Amazon RDS will backup your database and transaction logs and store both for a user-specified retention period. This allows you to restore your DB Instance to any second during your retention period, up to the last five minutes. Your automatic backup retention period can be configured to up to thirty five days.
 
 It is reccommended to set the retnetion period to at least 7 days.

From 2d1295245dcbbc9e93b5fc0ae703f81aa7258667 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Fri, 19 Oct 2012 12:17:07 +0200
Subject: [PATCH 1446/2585] corrected a typo

---
 usr/share/doc/vizrt/vosa-handbook/database-rds.org | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/database-rds.org b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
index 49ca0bd8..521d61e7 100644
--- a/usr/share/doc/vizrt/vosa-handbook/database-rds.org
+++ b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
@@ -26,8 +26,7 @@ Automated Backups – Turned on by default, the automated backup feature of Amaz
 
 It is reccommended to set the retnetion period to at least 7 days.
 
-The retention period of the RDS instance at <%= trail_customer_shortname %> is <%= trail_rds_backup_retention_days
- %> days.
+The retention period of the RDS instance at <%= trail_customer_shortname %> is <%= trail_rds_backup_retention_days %> days.
 
 ** Slow Query Logging on Amazon RDS - a HOWTO
 

From 4fb79adeb2060e5b228211b9d8d895ef4dca4991 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Fri, 19 Oct 2012 12:20:43 +0200
Subject: [PATCH 1447/2585] fixed a typo

---
 usr/share/doc/vizrt/vosa-handbook/database-rds.org | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/database-rds.org b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
index 521d61e7..e5ac12ec 100644
--- a/usr/share/doc/vizrt/vosa-handbook/database-rds.org
+++ b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
@@ -31,6 +31,7 @@ The retention period of the RDS instance at <%= trail_customer_shortname %> is <
 ** Slow Query Logging on Amazon RDS - a HOWTO
 
 /This is borrowed text[fn:1]/
+
 [fn:1] Slow query log text from an [[http://www.memonic.com/user/chris/id/1pwgo][Article]] by [[http://www.memonic.com/user/chris/profile][Chris Hauzenberger]] on emonic.com
 
 Amazon RDS-Mysql instances have slow query logging disabled by default. Here is how to enable slow query logging and access the slow query data on your RDS instance using the RDS command-line tools:
@@ -56,4 +57,4 @@ $ rds-describe-db-parameters sweet-parameter-group
 #+BEGIN_SRC sh
 $ rds-reboot-db-instance my-instance
 #+END_SRC
-After following the above steps, you will be able to access the slow query log by querying the mysql.slow_log table.
+After following the above steps, you will be able to access the slow query log by querying the mysql.slow\_log table.

From 2fceb0c690a3b31f88942726617f8cc895beb990 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Fri, 19 Oct 2012 12:25:13 +0200
Subject: [PATCH 1448/2585] added that we need verification and validation of
 the slow querylog recipe

---
 usr/share/doc/vizrt/vosa-handbook/database-rds.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/database-rds.org b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
index e5ac12ec..5cdc3da9 100644
--- a/usr/share/doc/vizrt/vosa-handbook/database-rds.org
+++ b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
@@ -30,7 +30,7 @@ The retention period of the RDS instance at <%= trail_customer_shortname %> is <
 
 ** Slow Query Logging on Amazon RDS - a HOWTO
 
-/This is borrowed text[fn:1]/
+/This is borrowed text[fn:1] that still needs validation and verification/
 
 [fn:1] Slow query log text from an [[http://www.memonic.com/user/chris/id/1pwgo][Article]] by [[http://www.memonic.com/user/chris/profile][Chris Hauzenberger]] on emonic.com
 

From 32832afb2e685f957372efb717df782de428de02 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 19 Oct 2012 12:43:54 +0200
Subject: [PATCH 1449/2585] - create-handbook.sh will now only include the
 database RDS chapter if   trail_db_vendor=rds, the test is case insensitive.
 - removed inclusion of database-rds.org from vosa-handbook.org to   prevent
 it from being included regardless of the system having it or   not. - added
 constants for all DB vendors we support (MySQL, Percona &   Amazon RDS).

---
 usr/share/doc/vizrt/vosa-handbook/create-handbook.sh | 10 ++++++++++
 usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org  |  1 -
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 10f3f7d4..5741b6a3 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -15,6 +15,10 @@ EOF
   exit 1
 }
 
+DB_VENDOR_AMAZON_RDS=rds
+DB_VENDOR_MYSQL=mysql
+DB_VENDOR_PERCONA=percona
+
 function run() {
   "$@"
   if [ $? -ne 0 ]; then
@@ -588,6 +592,12 @@ function generate_db_org() {
         -n "${trail_db_slave_host}" ]]; then
     run cat $target_dir/database-changing-vip.org >> $target_dir/database.org
   fi
+  if [ $(echo "${trail_db_vendor}" | \
+    tr [A-Z] [a-z] | \
+    grep ${DB_VENDOR_AMAZON_RDS} | \
+    wc -l) -gt 0 ]; then
+    run cat $target_dir/database-rds.org >> $target_dir/database.org
+  fi
 }
 
 function generate_nfs_org() {
diff --git a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
index 54ec0b4c..5ae2a227 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
+++ b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
@@ -10,7 +10,6 @@
 #+INCLUDE: "content-engine.org"
 #+INCLUDE: "search-server.org"
 #+INCLUDE: "database.org"
-#+INCLUDE: "database-rds.org"
 #+INCLUDE: "cache-server.org"
 #+INCLUDE: "network-file-system.org"
 #+INCLUDE: "backups.org"

From 5e76089ac793bf44f8aafc2792631d3b616cc67c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 19 Oct 2012 12:51:07 +0200
Subject: [PATCH 1450/2585] - Mysql -> MySQL - spell checking - spelled out ECE
 & EAE - added some type setting - pretty printed long shell commands so
 they're easier to read.

---
 .../doc/vizrt/vosa-handbook/database-rds.org  | 39 ++++++++++++-------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/database-rds.org b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
index 5cdc3da9..6189db4e 100644
--- a/usr/share/doc/vizrt/vosa-handbook/database-rds.org
+++ b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
@@ -1,30 +1,36 @@
 * Amazon Web services RDS
 RDS is the Amazon Web services Product line for Database as a service. As of this writing they have the following database products available:
-- Mysql
+- MySQL
 - Oracle
 - Microsoft SQL
-As of writing we have only used Mysql for Escenic.
-** RDS/Mysql flavors
+
+As of writing we have only used MySQL for Escenic Content Engine and
+Escenic Analysis Engine.
+
+** RDS/MySQL flavors
 The database sizes and pricing are comparable to equivalent EC2 instances. We have good experience running Escenic in the following RDS configuration:
-- Extra Large Mysql DB Instance 
+- Extra Large MySQL DB Instance 
 - 15 Million PI 
-- 2 minutes full page ttl on Varnish
+- 2 minutes full page TTL on Varnish
 - 2 presentation engines, No memcached
 - 20.000 presentation article cache.
 We will share more experience as it becomes available.
+
 ** RDS Availability
 RDS goes down like any other Amazon resource but it is a bit more resilient than EBS in our experience.
-Like any Amazon resource, redundancy over avaialability zones is needed. For this, Amazon provides the multi-az option. Our experience with RDS+Multi-az availability is good. Our experience with RDS without multi-az is horrible. Do your backups often and practice the restores because you will need it.
-** RDS/Mysql limitations
+
+Like any Amazon resource, redundancy over availability zones is needed. For this, Amazon provides the multi-az option. Our experience with RDS+Multi-az availability is good. Our experience with RDS without multi-az is horrible. Do your backups often and practice the restores because you will need it.
+
+** RDS/MySQL limitations
 - No shell access :: Has not been been a problem for Escenic so far.
-- No triggers :: Minor upgrades of Escenic sometimes need triggers to run the databse migrations. This is a minor problem as the database migration is never done in production anyway. Just remember to do the migration of databases in a restore on a normal Mysql installation in an OS that you _can_ login to.
-- Different slow query log :: The slow query log is an important tool to understand database overload problems. You need to be able to investgate these problems in cases where template developers make inefficient templates or in cases where Escenic has bugs that cause it to overload the database. How to set up a slow query log on RDS/mysql is explained later in this document.
+- No triggers :: Minor upgrades of Escenic sometimes need triggers to run the database migrations. This is a minor problem as the database migration is never done in production anyway. Just remember to do the migration of databases in a restore on a normal MySQL installation in an OS that you _can_ login to.
+- Different slow query log :: The slow query log is an important tool to understand database overload problems. You need to be able to investigate these problems in cases where template developers make inefficient templates or in cases where Escenic has bugs that cause it to overload the database. How to set up a slow query log on RDS/MySQL is explained later in this document.
 - This is it so far :: More learnings should be added here.
 
 ** Restore and backup of RDS
 Automated Backups – Turned on by default, the automated backup feature of Amazon RDS enables point-in-time recovery for your DB Instance. Amazon RDS will backup your database and transaction logs and store both for a user-specified retention period. This allows you to restore your DB Instance to any second during your retention period, up to the last five minutes. Your automatic backup retention period can be configured to up to thirty five days.
 
-It is reccommended to set the retnetion period to at least 7 days.
+It is rec commended to set the retention period to at least 7 days.
 
 The retention period of the RDS instance at <%= trail_customer_shortname %> is <%= trail_rds_backup_retention_days %> days.
 
@@ -34,7 +40,7 @@ The retention period of the RDS instance at <%= trail_customer_shortname %> is <
 
 [fn:1] Slow query log text from an [[http://www.memonic.com/user/chris/id/1pwgo][Article]] by [[http://www.memonic.com/user/chris/profile][Chris Hauzenberger]] on emonic.com
 
-Amazon RDS-Mysql instances have slow query logging disabled by default. Here is how to enable slow query logging and access the slow query data on your RDS instance using the RDS command-line tools:
+Amazon RDS-MySQL instances have slow query logging disabled by default. Here is how to enable slow query logging and access the slow query data on your RDS instance using the RDS command-line tools:
 
 - Install the Amazon RDS command-line tools and configure your environment according to the documentation: [[http://aws.amazon.com/developertools/2928]] 
 - Create a parameter group:
@@ -43,11 +49,16 @@ $ rds-create-db-parameter-group sweet-parameter-group -f mysql5.1 -d "This is a
 #+END_SRC
 - Place your DB instance in that parameter group:
 #+BEGIN_SRC sh
-$ rds-modify-db-instance my-instance --db-parameter-group-name sweet-parameter-group --apply-immediately
+$ rds-modify-db-instance my-instance \
+    --db-parameter-group-name sweet-parameter-group \
+    --apply-immediately
 #+END_SRC
 - Modify the parameter group to turn on slow query logging:
 #+BEGIN_SRC sh
-$ rds-modify-db-parameter-group sweet-parameter-group --parameters "name=slow_query_log, value=ON, method=immediate" --parameters "name=long_query_time, value=1, method=immediate" --parameters "name=min_examined_row_limit, value=100, method=immediate"
+$ rds-modify-db-parameter-group sweet-parameter-group \
+    --parameters "name=slow_query_log, value=ON, method=immediate" \
+    --parameters "name=long_query_time, value=1, method=immediate" \
+    --parameters "name=min_examined_row_limit, value=100, method=immediate"
 #+END_SRC
 - If you like, you can verify that your settings were made properly:
 #+BEGIN_SRC sh
@@ -57,4 +68,4 @@ $ rds-describe-db-parameters sweet-parameter-group
 #+BEGIN_SRC sh
 $ rds-reboot-db-instance my-instance
 #+END_SRC
-After following the above steps, you will be able to access the slow query log by querying the mysql.slow\_log table.
+After following the above steps, you will be able to access the slow query log by querying the =mysql.slow\_log= table.

From 00206b7b1609fb7c964691a641680db2c60427da Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Fri, 19 Oct 2012 13:56:48 +0200
Subject: [PATCH 1451/2585] fixed some text improvements and added some links
 to AWS

---
 .../doc/vizrt/vosa-handbook/database-rds.org  | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/database-rds.org b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
index 5cdc3da9..808206d9 100644
--- a/usr/share/doc/vizrt/vosa-handbook/database-rds.org
+++ b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
@@ -1,10 +1,10 @@
-* Amazon Web services RDS
-RDS is the Amazon Web services Product line for Database as a service. As of this writing they have the following database products available:
-- Mysql
-- Oracle
-- Microsoft SQL
-As of writing we have only used Mysql for Escenic.
-** RDS/Mysql flavors
+* Amazon Relational Database Service (Amazon RDS)
+[[http://aws.amazon.com/rds/][RDS]] is the Amazon Web Services database as a service product. As of this writing they have the following database products available:
+- [[http://aws.amazon.com/rds/mysql/][Mysql]]
+- [[http://aws.amazon.com/rds/oracle/][Oracle]]
+- [[http://aws.amazon.com/rds/mysql/][Microsoft SQL Server]]
+As of writing we have only used  for Escenic.
+** Amazon RDS for MySql flavors
 The database sizes and pricing are comparable to equivalent EC2 instances. We have good experience running Escenic in the following RDS configuration:
 - Extra Large Mysql DB Instance 
 - 15 Million PI 
@@ -12,23 +12,23 @@ The database sizes and pricing are comparable to equivalent EC2 instances. We ha
 - 2 presentation engines, No memcached
 - 20.000 presentation article cache.
 We will share more experience as it becomes available.
-** RDS Availability
+** Amazon RDS for MySql Availability
 RDS goes down like any other Amazon resource but it is a bit more resilient than EBS in our experience.
 Like any Amazon resource, redundancy over avaialability zones is needed. For this, Amazon provides the multi-az option. Our experience with RDS+Multi-az availability is good. Our experience with RDS without multi-az is horrible. Do your backups often and practice the restores because you will need it.
-** RDS/Mysql limitations
+** Amazon RDS for MySql limitations
 - No shell access :: Has not been been a problem for Escenic so far.
 - No triggers :: Minor upgrades of Escenic sometimes need triggers to run the databse migrations. This is a minor problem as the database migration is never done in production anyway. Just remember to do the migration of databases in a restore on a normal Mysql installation in an OS that you _can_ login to.
 - Different slow query log :: The slow query log is an important tool to understand database overload problems. You need to be able to investgate these problems in cases where template developers make inefficient templates or in cases where Escenic has bugs that cause it to overload the database. How to set up a slow query log on RDS/mysql is explained later in this document.
 - This is it so far :: More learnings should be added here.
 
-** Restore and backup of RDS
+** Restore and backup of Amazon RDS for MySql 
 Automated Backups – Turned on by default, the automated backup feature of Amazon RDS enables point-in-time recovery for your DB Instance. Amazon RDS will backup your database and transaction logs and store both for a user-specified retention period. This allows you to restore your DB Instance to any second during your retention period, up to the last five minutes. Your automatic backup retention period can be configured to up to thirty five days.
 
 It is reccommended to set the retnetion period to at least 7 days.
 
 The retention period of the RDS instance at <%= trail_customer_shortname %> is <%= trail_rds_backup_retention_days %> days.
 
-** Slow Query Logging on Amazon RDS - a HOWTO
+** Slow Query Logging on Amazon RDS for MySql - a HOWTO
 
 /This is borrowed text[fn:1] that still needs validation and verification/
 

From 7383f24f99b6fd5d7f5b5015577572093af6c1a6 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Fri, 19 Oct 2012 14:14:12 +0200
Subject: [PATCH 1452/2585] some change I forgot about :-)

---
 usr/share/doc/vizrt/vosa-handbook/ssh-access.org | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/usr/share/doc/vizrt/vosa-handbook/ssh-access.org b/usr/share/doc/vizrt/vosa-handbook/ssh-access.org
index 51342269..e8891fb1 100644
--- a/usr/share/doc/vizrt/vosa-handbook/ssh-access.org
+++ b/usr/share/doc/vizrt/vosa-handbook/ssh-access.org
@@ -61,6 +61,19 @@ $ ssh-add -l
 
 
 ** Generate an SSH key on Windows
+
+*** Generating an SSH key Using Putty for Windows
+
+- Install the full Putty package including puttygen by using the Windows Installaller that is downloadable [[http://putty][here]]
+- Run puttygen
+- Choose to generate an RSA key
+  - *Add a passphrase* before saving
+- Save the key both as a .ppk and as a .des file
+*** TODO finish this 
+
+
+*** Using Cygwin
+
 Install [[http://cygwin.com][Cygwin]] and be sure to check for the =openssh-client= package
 when running =setup.exe=:
 
@@ -77,6 +90,7 @@ have on Linux. This command is what you can see being used and
 you can use the instructions above in the [[Generate an SSH key on Linux
 or Mac OS X]] section to generate and use your SSH key.
 
+
 ** Log on to the gatekeeper
 On your local machine, do:
 #+BEGIN_SRC text

From 4faa3d4e487dbe967adf3f86686c4e445d38f6f8 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Fri, 19 Oct 2012 14:28:12 +0200
Subject: [PATCH 1453/2585] reintroducing

---
 .../doc/vizrt/vosa-handbook/database-rds.org  | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/database-rds.org

diff --git a/usr/share/doc/vizrt/vosa-handbook/database-rds.org b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
new file mode 100644
index 00000000..30be3d8f
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
@@ -0,0 +1,69 @@
+* Amazon Relational Database Service (Amazon RDS)
+[[http://aws.amazon.com/rds/][RDS]] is the Amazon Web Services database as a service product. As of this writing they have the following database products available:
+- [[http://aws.amazon.com/rds/mysql/][MySQL]]
+- [[http://aws.amazon.com/rds/oracle/][Oracle]]
+- [[http://aws.amazon.com/rds/mysql/][Microsoft SQL Server]]
+As of writing we have only used MySQL for Escenic Content Engine and
+Escenic Analysis Engine.
+** Amazon RDS for MySql flavors
+The database sizes and pricing are comparable to equivalent EC2 instances. We have good experience running Escenic in the following RDS configuration:
+- Extra Large MySQL DB Instance 
+- 15 Million PI 
+- 2 minutes full page TTL on Varnish
+- 2 presentation engines, No memcached
+- 20.000 presentation article cache.
+We will share more experience as it becomes available.
+
+** Amazon RDS for MySQL availability 
+RDS goes down like any other Amazon resource but it is a bit more resilient than EBS in our experience.
+
+Like any Amazon resource, redundancy over availability zones is needed. For this, Amazon provides the multi-az option. Our experience with RDS+Multi-az availability is good. Our experience with RDS without multi-az is horrible. Do your backups often and practice the restores because you will need it.
+
+** Amazon RDS for MySQL limitations
+- No shell access :: Has not been been a problem for Escenic so far.
+- No triggers :: Minor upgrades of Escenic sometimes need triggers to run the database migrations. This is a minor problem as the database migration is never done in production anyway. Just remember to do the migration of databases in a restore on a normal MySQL installation in an OS that you _can_ login to.
+- Different slow query log :: The slow query log is an important tool to understand database overload problems. You need to be able to investigate these problems in cases where template developers make inefficient templates or in cases where Escenic has bugs that cause it to overload the database. How to set up a slow query log on RDS/MySQL is explained later in this document.
+- This is it so far :: More learnings should be added here.
+
+** Restore and backup of Amazon RDS for MySql 
+Automated Backups – Turned on by default, the automated backup feature of Amazon RDS enables point-in-time recovery for your DB Instance. Amazon RDS will backup your database and transaction logs and store both for a user-specified retention period. This allows you to restore your DB Instance to any second during your retention period, up to the last five minutes. Your automatic backup retention period can be configured to up to thirty five days.
+
+It is rec commended to set the retention period to at least 7 days.
+
+The retention period of the RDS instance at <%= trail_customer_shortname %> is <%= trail_rds_backup_retention_days %> days.
+
+** Slow Query Logging on Amazon RDS for MySql - a HOWTO
+
+/This is borrowed text[fn:1] that still needs validation and verification/
+
+[fn:1] Slow query log text from an [[http://www.memonic.com/user/chris/id/1pwgo][Article]] by [[http://www.memonic.com/user/chris/profile][Chris Hauzenberger]] on emonic.com
+
+Amazon RDS-MySQL instances have slow query logging disabled by default. Here is how to enable slow query logging and access the slow query data on your RDS instance using the RDS command-line tools:
+
+- Install the Amazon RDS command-line tools and configure your environment according to the documentation: [[http://aws.amazon.com/developertools/2928]] 
+- Create a parameter group:
+#+BEGIN_SRC sh
+$ rds-create-db-parameter-group sweet-parameter-group -f mysql5.1 -d "This is a totally sweet database parameter group"
+#+END_SRC
+- Place your DB instance in that parameter group:
+#+BEGIN_SRC sh
+$ rds-modify-db-instance my-instance \
+    --db-parameter-group-name sweet-parameter-group \
+    --apply-immediately
+#+END_SRC
+- Modify the parameter group to turn on slow query logging:
+#+BEGIN_SRC sh
+$ rds-modify-db-parameter-group sweet-parameter-group \
+    --parameters "name=slow_query_log, value=ON, method=immediate" \
+    --parameters "name=long_query_time, value=1, method=immediate" \
+    --parameters "name=min_examined_row_limit, value=100, method=immediate"
+#+END_SRC
+- If you like, you can verify that your settings were made properly:
+#+BEGIN_SRC sh
+$ rds-describe-db-parameters sweet-parameter-group
+#+END_SRC
+- Reboot your DB instance:
+#+BEGIN_SRC sh
+$ rds-reboot-db-instance my-instance
+#+END_SRC
+After following the above steps, you will be able to access the slow query log by querying the =mysql.slow\_log= table.

From cc4e0edcd92f9302102bda5557d7a029f48b91a2 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Fri, 19 Oct 2012 15:55:28 +0200
Subject: [PATCH 1454/2585] added some more rds variables to clarify the use of
 rds

---
 .../doc/vizrt/vosa-handbook/database-rds.org  | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/database-rds.org b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
index 30be3d8f..8781be2f 100644
--- a/usr/share/doc/vizrt/vosa-handbook/database-rds.org
+++ b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
@@ -1,11 +1,18 @@
-* Amazon Relational Database Service (Amazon RDS)
+** The Amazon Relational Database Service (Amazon RDS)
+<%= trail_customer_shortname %> uses Amazon RDS for MySQL for the production database.
+- Database hostname :: <%= trail_db_master_host %>
+- Database instance class :: <%= trail_rds_instance_class %>
+- Multi-AZ Deployment :: <%= trail_rds_multiaz %>
+- Zone :: <%= trail_rds_zone %>
+
+*** General information about Amazon RDS
 [[http://aws.amazon.com/rds/][RDS]] is the Amazon Web Services database as a service product. As of this writing they have the following database products available:
 - [[http://aws.amazon.com/rds/mysql/][MySQL]]
 - [[http://aws.amazon.com/rds/oracle/][Oracle]]
 - [[http://aws.amazon.com/rds/mysql/][Microsoft SQL Server]]
 As of writing we have only used MySQL for Escenic Content Engine and
 Escenic Analysis Engine.
-** Amazon RDS for MySql flavors
+**** Amazon RDS for MySql flavors
 The database sizes and pricing are comparable to equivalent EC2 instances. We have good experience running Escenic in the following RDS configuration:
 - Extra Large MySQL DB Instance 
 - 15 Million PI 
@@ -14,25 +21,25 @@ The database sizes and pricing are comparable to equivalent EC2 instances. We ha
 - 20.000 presentation article cache.
 We will share more experience as it becomes available.
 
-** Amazon RDS for MySQL availability 
+**** Amazon RDS for MySQL availability 
 RDS goes down like any other Amazon resource but it is a bit more resilient than EBS in our experience.
 
 Like any Amazon resource, redundancy over availability zones is needed. For this, Amazon provides the multi-az option. Our experience with RDS+Multi-az availability is good. Our experience with RDS without multi-az is horrible. Do your backups often and practice the restores because you will need it.
 
-** Amazon RDS for MySQL limitations
+**** Amazon RDS for MySQL limitations
 - No shell access :: Has not been been a problem for Escenic so far.
 - No triggers :: Minor upgrades of Escenic sometimes need triggers to run the database migrations. This is a minor problem as the database migration is never done in production anyway. Just remember to do the migration of databases in a restore on a normal MySQL installation in an OS that you _can_ login to.
 - Different slow query log :: The slow query log is an important tool to understand database overload problems. You need to be able to investigate these problems in cases where template developers make inefficient templates or in cases where Escenic has bugs that cause it to overload the database. How to set up a slow query log on RDS/MySQL is explained later in this document.
 - This is it so far :: More learnings should be added here.
 
-** Restore and backup of Amazon RDS for MySql 
+**** Restore and backup of Amazon RDS for MySql 
 Automated Backups – Turned on by default, the automated backup feature of Amazon RDS enables point-in-time recovery for your DB Instance. Amazon RDS will backup your database and transaction logs and store both for a user-specified retention period. This allows you to restore your DB Instance to any second during your retention period, up to the last five minutes. Your automatic backup retention period can be configured to up to thirty five days.
 
 It is rec commended to set the retention period to at least 7 days.
 
 The retention period of the RDS instance at <%= trail_customer_shortname %> is <%= trail_rds_backup_retention_days %> days.
 
-** Slow Query Logging on Amazon RDS for MySql - a HOWTO
+**** Slow Query Logging on Amazon RDS for MySql - a HOWTO
 
 /This is borrowed text[fn:1] that still needs validation and verification/
 

From ddcc2475931a391d0b8aeaa8939e9a1666e8d818 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 19 Oct 2012 14:25:01 +0200
Subject: [PATCH 1455/2585] - simplified log configuration, now setting up a
 solr log for all   profiles instead of appending it to the same
 trace.properties _if_   profile=all || profile=search.

---
 .../ece-scripts/ece-install.d/app-server.sh   | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index a88bc06b..cdcf08ea 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -492,7 +492,7 @@ function log4j_create_configuration_file() {
 # generated by $(basename $0) @ $(date --iso)
 
 ######################################################################
-# The default logger
+# The default logger (this is the catch all logger)
 log4j.rootLogger=ERROR, CATALINA
 log4j.additivity.com=false
 log4j.additivity.neo=false
@@ -500,7 +500,7 @@ log4j.additivity.neo=false
 log4j.category.com.danga.MemCached.MemCachedClient=FATAL
 
 ######################################################################
-# The ECE specific appender 
+# The ECE specific logging
 log4j.appender.ECELOG=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.ECELOG.File=$escenic_log_dir/\${com.escenic.instance}-messages
 log4j.appender.ECELOG.layout=org.apache.log4j.PatternLayout
@@ -511,7 +511,16 @@ log4j.additivity.neo=false
 log4j.additivity.com.escenic=false
 
 ######################################################################
-# Tomcat specific appenders
+# The solr logging
+log4j.appender.SOLR=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.SOLR.File=$escenic_log_dir/\${com.escenic.instance}-solr
+log4j.appender.SOLR.layout=org.apache.log4j.PatternLayout
+log4j.appender.SOLR.layout.ConversionPattern=%d %5p [%t] %x (%c) %m%n
+log4j.category.org.apache.solr=INFO, SOLR
+log4j.additivity.org.apache.solr=false
+
+######################################################################
+# Tomcat specific logging
 log4j.appender.CATALINA=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.CATALINA.File=${escenic_log_dir}/\${com.escenic.instance}-tomcat-catalina
 log4j.appender.CATALINA.layout = org.apache.log4j.PatternLayout
@@ -554,19 +563,9 @@ EOF
   run cd $tomcat_base/lib/
   make_ln $common_nursery_dir/trace.properties
 
-  # since the solr webapp otherwise will pollute our logs, we ask
-  # Tomcat specifically to make it log to dedicated logger.
   if [ $install_profile_number -eq $PROFILE_SEARCH_SERVER -o \
     $install_profile_number -eq $PROFILE_ALL_IN_ONE ]; then
     cat >> $common_nursery_dir/trace.properties <<EOF
-######################################################################
-# The solr appender 
-log4j.appender.SOLR=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.SOLR.File=$escenic_log_dir/\${com.escenic.instance}-solr
-log4j.appender.SOLR.layout=org.apache.log4j.PatternLayout
-log4j.appender.SOLR.layout.ConversionPattern=%d %5p [%t] %x (%c) %m%n
-log4j.category.org.apache.solr=INFO, SOLR
-log4j.additivity.org.apache.solr=false
 EOF
   fi
 }

From b028f49a02c0da3ceb80c7244daf2e1fd7a9d5c7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 19 Oct 2012 16:49:58 +0200
Subject: [PATCH 1456/2585] - added script that does analysis of iptables
 logging outgoing   connections. Here's an example iptables rule that logs all
 newly   created outgoing connections:

   # outgoing-connections
   Count  IP               Hostname
   6      27.120.101.66    v-27-120-101-66.ub-freebit.net
   1      91.189.95.36     bignay.canonical.com
   1      80.91.37.212     cache.medianorge.no
   1      79.125.106.24    ec2-79-125-106-24.eu-west-1.compute.amazonaws.com
   1      209.92.24.80     iqc80.iqnection.com
   1      208.118.235.148  wildebeest.gnu.org
   1      195.88.55.16     www.vg.no
   1      195.88.54.16     www.vg.no
   1      157.166.226.26   www.cnn.com
   1      140.211.167.51   load2d.linux-foundation.org

  The script assumes iptables logging like:
  # iptables \
      --append OUTPUT \
      --match state \
      --protocol tcp \
      --state NEW \
      -j LOG \
      --log-uid
---
 usr/sbin/outgoing-connections | 40 +++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100755 usr/sbin/outgoing-connections

diff --git a/usr/sbin/outgoing-connections b/usr/sbin/outgoing-connections
new file mode 100755
index 00000000..40dbdbad
--- /dev/null
+++ b/usr/sbin/outgoing-connections
@@ -0,0 +1,40 @@
+#! /usr/bin/env bash
+
+## Does analysis of iptables logging outgoing connections. Here's an
+## example iptables rule that logs all newly created outgoing
+## connections:
+##
+## iptables \
+##     --append OUTPUT \
+##     --match state \
+##     --protocol tcp \
+##     --state NEW \
+##     -j LOG \
+##     --log-uid
+
+log=/var/log/syslog
+
+function resolve_ip() {
+  nslookup $1 | \
+    grep 'name =' | \
+    sed 's/^.*name = //g' | \
+    sed 's/\.$//g'
+}
+
+function analyze_log() {
+  echo 'Count IP Hostname'
+  grep DST= $log | \
+    sed 's/.*DST=//g' | \
+    cut -d' ' -f1 | \
+    sort | \
+    uniq -c | \
+    sort -r -n | \
+    sed 's/^[ ]*//g' | \
+    while read line; do
+    read count ip <<< $line;
+    echo "${count} $ip $(resolve_ip $ip)"
+  done
+}
+
+analyze_log | column -t
+

From 44fc9c414aef7dc2111dca154e0d122865d408a3 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Fri, 19 Oct 2012 19:39:47 +0200
Subject: [PATCH 1457/2585] improved layout

---
 usr/share/doc/vizrt/vosa-handbook/database-rds.org | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/doc/vizrt/vosa-handbook/database-rds.org b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
index 8781be2f..740637db 100644
--- a/usr/share/doc/vizrt/vosa-handbook/database-rds.org
+++ b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
@@ -1,4 +1,5 @@
 ** The Amazon Relational Database Service (Amazon RDS)
+
 <%= trail_customer_shortname %> uses Amazon RDS for MySQL for the production database.
 - Database hostname :: <%= trail_db_master_host %>
 - Database instance class :: <%= trail_rds_instance_class %>

From 2ee0e9948e3b509daf02ce9f4ead88dc1956c4cf Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Fri, 19 Oct 2012 19:51:06 +0200
Subject: [PATCH 1458/2585] from definition to table :-(

---
 usr/share/doc/vizrt/vosa-handbook/database-rds.org | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/database-rds.org b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
index 740637db..f7d5d17a 100644
--- a/usr/share/doc/vizrt/vosa-handbook/database-rds.org
+++ b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
@@ -1,10 +1,10 @@
 ** The Amazon Relational Database Service (Amazon RDS)
 
 <%= trail_customer_shortname %> uses Amazon RDS for MySQL for the production database.
-- Database hostname :: <%= trail_db_master_host %>
-- Database instance class :: <%= trail_rds_instance_class %>
-- Multi-AZ Deployment :: <%= trail_rds_multiaz %>
-- Zone :: <%= trail_rds_zone %>
+| Database hostname       | <%= trail_db_master_host %>     |
+| Database instance class | <%= trail_rds_instance_class %> |
+| Multi-AZ Deployment     | <%= trail_rds_multiaz %>        |
+| Zone                    | <%= trail_rds_zone %>           |
 
 *** General information about Amazon RDS
 [[http://aws.amazon.com/rds/][RDS]] is the Amazon Web Services database as a service product. As of this writing they have the following database products available:

From 128727b2b3a5066a395da57876da7bd9d56044c4 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Fri, 19 Oct 2012 19:56:34 +0200
Subject: [PATCH 1459/2585] demoted the headings

---
 .../doc/vizrt/vosa-handbook/database-rds.org     | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/database-rds.org b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
index f7d5d17a..f7c2b334 100644
--- a/usr/share/doc/vizrt/vosa-handbook/database-rds.org
+++ b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
@@ -1,19 +1,17 @@
-** The Amazon Relational Database Service (Amazon RDS)
-
 <%= trail_customer_shortname %> uses Amazon RDS for MySQL for the production database.
+
 | Database hostname       | <%= trail_db_master_host %>     |
 | Database instance class | <%= trail_rds_instance_class %> |
 | Multi-AZ Deployment     | <%= trail_rds_multiaz %>        |
 | Zone                    | <%= trail_rds_zone %>           |
-
-*** General information about Amazon RDS
+** General information about Amazon RDS
 [[http://aws.amazon.com/rds/][RDS]] is the Amazon Web Services database as a service product. As of this writing they have the following database products available:
 - [[http://aws.amazon.com/rds/mysql/][MySQL]]
 - [[http://aws.amazon.com/rds/oracle/][Oracle]]
 - [[http://aws.amazon.com/rds/mysql/][Microsoft SQL Server]]
 As of writing we have only used MySQL for Escenic Content Engine and
 Escenic Analysis Engine.
-**** Amazon RDS for MySql flavors
+*** Amazon RDS for MySql flavors
 The database sizes and pricing are comparable to equivalent EC2 instances. We have good experience running Escenic in the following RDS configuration:
 - Extra Large MySQL DB Instance 
 - 15 Million PI 
@@ -22,25 +20,25 @@ The database sizes and pricing are comparable to equivalent EC2 instances. We ha
 - 20.000 presentation article cache.
 We will share more experience as it becomes available.
 
-**** Amazon RDS for MySQL availability 
+*** Amazon RDS for MySQL availability 
 RDS goes down like any other Amazon resource but it is a bit more resilient than EBS in our experience.
 
 Like any Amazon resource, redundancy over availability zones is needed. For this, Amazon provides the multi-az option. Our experience with RDS+Multi-az availability is good. Our experience with RDS without multi-az is horrible. Do your backups often and practice the restores because you will need it.
 
-**** Amazon RDS for MySQL limitations
+*** Amazon RDS for MySQL limitations
 - No shell access :: Has not been been a problem for Escenic so far.
 - No triggers :: Minor upgrades of Escenic sometimes need triggers to run the database migrations. This is a minor problem as the database migration is never done in production anyway. Just remember to do the migration of databases in a restore on a normal MySQL installation in an OS that you _can_ login to.
 - Different slow query log :: The slow query log is an important tool to understand database overload problems. You need to be able to investigate these problems in cases where template developers make inefficient templates or in cases where Escenic has bugs that cause it to overload the database. How to set up a slow query log on RDS/MySQL is explained later in this document.
 - This is it so far :: More learnings should be added here.
 
-**** Restore and backup of Amazon RDS for MySql 
+*** Restore and backup of Amazon RDS for MySql 
 Automated Backups – Turned on by default, the automated backup feature of Amazon RDS enables point-in-time recovery for your DB Instance. Amazon RDS will backup your database and transaction logs and store both for a user-specified retention period. This allows you to restore your DB Instance to any second during your retention period, up to the last five minutes. Your automatic backup retention period can be configured to up to thirty five days.
 
 It is rec commended to set the retention period to at least 7 days.
 
 The retention period of the RDS instance at <%= trail_customer_shortname %> is <%= trail_rds_backup_retention_days %> days.
 
-**** Slow Query Logging on Amazon RDS for MySql - a HOWTO
+*** Slow Query Logging on Amazon RDS for MySql - a HOWTO
 
 /This is borrowed text[fn:1] that still needs validation and verification/
 

From 0faf82aa0998bcd931b31c4fa0685503bafa1328 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Fri, 19 Oct 2012 20:06:09 +0200
Subject: [PATCH 1460/2585] typo

---
 usr/share/doc/vizrt/vosa-handbook/database-rds.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/database-rds.org b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
index f7c2b334..83289b38 100644
--- a/usr/share/doc/vizrt/vosa-handbook/database-rds.org
+++ b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
@@ -32,7 +32,7 @@ Like any Amazon resource, redundancy over availability zones is needed. For this
 - This is it so far :: More learnings should be added here.
 
 *** Restore and backup of Amazon RDS for MySql 
-Automated Backups – Turned on by default, the automated backup feature of Amazon RDS enables point-in-time recovery for your DB Instance. Amazon RDS will backup your database and transaction logs and store both for a user-specified retention period. This allows you to restore your DB Instance to any second during your retention period, up to the last five minutes. Your automatic backup retention period can be configured to up to thirty five days.
+Automated Backups are urned on by default, the automated backup feature of Amazon RDS enables point-in-time recovery for your DB Instance. Amazon RDS will backup your database and transaction logs and store both for a user-specified retention period. This allows you to restore your DB Instance to any second during your retention period, up to the last five minutes. Your automatic backup retention period can be configured to up to thirty five days.
 
 It is rec commended to set the retention period to at least 7 days.
 

From 269de7cce1092e38b1a5036a218dd7f0d80e4d2d Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Fri, 19 Oct 2012 20:12:26 +0200
Subject: [PATCH 1461/2585] typo

---
 usr/share/doc/vizrt/vosa-handbook/database-rds.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/database-rds.org b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
index 83289b38..e21a18c2 100644
--- a/usr/share/doc/vizrt/vosa-handbook/database-rds.org
+++ b/usr/share/doc/vizrt/vosa-handbook/database-rds.org
@@ -32,7 +32,7 @@ Like any Amazon resource, redundancy over availability zones is needed. For this
 - This is it so far :: More learnings should be added here.
 
 *** Restore and backup of Amazon RDS for MySql 
-Automated Backups are urned on by default, the automated backup feature of Amazon RDS enables point-in-time recovery for your DB Instance. Amazon RDS will backup your database and transaction logs and store both for a user-specified retention period. This allows you to restore your DB Instance to any second during your retention period, up to the last five minutes. Your automatic backup retention period can be configured to up to thirty five days.
+Automated Backups are turned on by default, the automated backup feature of Amazon RDS enables point-in-time recovery for your DB Instance. Amazon RDS will backup your database and transaction logs and store both for a user-specified retention period. This allows you to restore your DB Instance to any second during your retention period, up to the last five minutes. Your automatic backup retention period can be configured to up to thirty five days.
 
 It is rec commended to set the retention period to at least 7 days.
 

From c0791d15b4205f7281d48805615ff82537ea9d57 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Sat, 20 Oct 2012 08:53:56 +0200
Subject: [PATCH 1462/2585] Elaborate documentation on how to use Puttygen and
 Pagent

---
 .../doc/vizrt/vosa-handbook/ssh-access.org    | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/ssh-access.org b/usr/share/doc/vizrt/vosa-handbook/ssh-access.org
index e8891fb1..45bd0aac 100644
--- a/usr/share/doc/vizrt/vosa-handbook/ssh-access.org
+++ b/usr/share/doc/vizrt/vosa-handbook/ssh-access.org
@@ -62,15 +62,28 @@ $ ssh-add -l
 
 ** Generate an SSH key on Windows
 
-*** Generating an SSH key Using Putty for Windows
+*** Using Putty
 
-- Install the full Putty package including puttygen by using the Windows Installaller that is downloadable [[http://putty][here]]
-- Run puttygen
-- Choose to generate an RSA key
-  - *Add a passphrase* before saving
-- Save the key both as a .ppk and as a .des file
-*** TODO finish this 
+1. Install the full Putty package including puttygen by using the Windows Installaller that is downloadable [[http://putty][here]]
+2. Run puttygen
+3. Generate your personal key (It wants you to move your mouse around a bit)
+[[./graphics/puttygen1.png]]
+4. Give your key a name and enter a passphrase. We use keys for better security. Choosing a weak password will not help. It is called a [[http://en.wikipedia.org/wiki/Passphrase][passphrase]] because your are expected to enter a sentence and not just a word.
+[[./graphics/puttygen2.png]]
 
+/Storing your key:/
+Make a directory like C:\Users\thv.VIZRTINT\.ssh. Do not spread your key around further. If you loose your key because your laptop crashes, you can allways create a new one. Save your key as .pkk and as .pem
+- Save your key in and Privacy-enhanced Electronic Mail format(.pem)
+[[./graphics/puttygen3.png]]
+
+- Save your key in a Putty Private Key File(.pkk) 
+[[./graphics/puttygen4.png]]
+
+****Using Pagent
+Pagent is Putties [[http://en.wikipedia.org/wiki/Ssh-agent][SSH agent]]. Using am SSH agent makes the use of keys a lot easier. An SSH agent runs in the background to supply a key to any putty-ssh login you might perform during the day without retyping your passphrase.
+
+Pagent lets you load keys interactively or on the command line.
+[[./graphics/pagent.png]]
 
 *** Using Cygwin
 

From f598f8862799372b2a5e8a6316e544b5fa32d723 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Sat, 20 Oct 2012 08:57:49 +0200
Subject: [PATCH 1463/2585] some puttygen screenshots

---
 .../doc/vizrt/vosa-handbook/graphics/pagent.png | Bin 0 -> 17039 bytes
 .../vizrt/vosa-handbook/graphics/puttygen1.png  | Bin 0 -> 14748 bytes
 .../vizrt/vosa-handbook/graphics/puttygen2.png  | Bin 0 -> 10005 bytes
 .../vizrt/vosa-handbook/graphics/puttygen3.png  | Bin 0 -> 24521 bytes
 .../vizrt/vosa-handbook/graphics/puttygen4.png  | Bin 0 -> 9423 bytes
 5 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/graphics/pagent.png
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/graphics/puttygen1.png
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/graphics/puttygen2.png
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/graphics/puttygen3.png
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/graphics/puttygen4.png

diff --git a/usr/share/doc/vizrt/vosa-handbook/graphics/pagent.png b/usr/share/doc/vizrt/vosa-handbook/graphics/pagent.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5b53ab08f89ec50a809dc1ec07cb16327b4af08
GIT binary patch
literal 17039
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

literal 0
HcmV?d00001

diff --git a/usr/share/doc/vizrt/vosa-handbook/graphics/puttygen1.png b/usr/share/doc/vizrt/vosa-handbook/graphics/puttygen1.png
new file mode 100644
index 0000000000000000000000000000000000000000..0359c4c1497bec3786c8fa4704437dac641461d5
GIT binary patch
literal 14748
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

literal 0
HcmV?d00001

diff --git a/usr/share/doc/vizrt/vosa-handbook/graphics/puttygen2.png b/usr/share/doc/vizrt/vosa-handbook/graphics/puttygen2.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9b5814fab4f8f9622966faa7ef56569e5de2e81
GIT binary patch
literal 10005
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

literal 0
HcmV?d00001

diff --git a/usr/share/doc/vizrt/vosa-handbook/graphics/puttygen3.png b/usr/share/doc/vizrt/vosa-handbook/graphics/puttygen3.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf5f19cdebde11883488d55ea1ae71e3de34364e
GIT binary patch
literal 24521
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%0AHi72d)T{Fcy=8
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%0DsRHN&96qg|rSG?Wdgz^rB%Ri#{D{t=0zZ<a<1
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
Nl;qT9n`F!*{|_1=^cesE

literal 0
HcmV?d00001

diff --git a/usr/share/doc/vizrt/vosa-handbook/graphics/puttygen4.png b/usr/share/doc/vizrt/vosa-handbook/graphics/puttygen4.png
new file mode 100644
index 0000000000000000000000000000000000000000..8df7282ef68bf291c57e1c139ac9cd7c7f5fd721
GIT binary patch
literal 9423
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
W?Iy~+DD2)2Kt@7QyiCl%|9=5+fG<b@

literal 0
HcmV?d00001


From 724145b50588d31e09512a3834d1ca82c98c77de Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Sat, 20 Oct 2012 09:04:05 +0200
Subject: [PATCH 1464/2585] layout improvements

---
 usr/share/doc/vizrt/vosa-handbook/ssh-access.org | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/ssh-access.org b/usr/share/doc/vizrt/vosa-handbook/ssh-access.org
index 45bd0aac..0c333d11 100644
--- a/usr/share/doc/vizrt/vosa-handbook/ssh-access.org
+++ b/usr/share/doc/vizrt/vosa-handbook/ssh-access.org
@@ -64,11 +64,12 @@ $ ssh-add -l
 
 *** Using Putty
 
-1. Install the full Putty package including puttygen by using the Windows Installaller that is downloadable [[http://putty][here]]
-2. Run puttygen
-3. Generate your personal key (It wants you to move your mouse around a bit)
+/Generating your key:/
+- Install the full Putty package including puttygen by using the Windows Installaller that is downloadable [[http://putty][here]]
+- Run puttygen
+- Generate your personal key (It wants you to move your mouse around a bit)
 [[./graphics/puttygen1.png]]
-4. Give your key a name and enter a passphrase. We use keys for better security. Choosing a weak password will not help. It is called a [[http://en.wikipedia.org/wiki/Passphrase][passphrase]] because your are expected to enter a sentence and not just a word.
+- Give your key a name and enter a passphrase. We use keys for better security. Choosing a weak password will not help. It is called a [[http://en.wikipedia.org/wiki/Passphrase][passphrase]] because your are expected to enter a sentence and not just a word.
 [[./graphics/puttygen2.png]]
 
 /Storing your key:/

From 60ebd808fa218d50007e2e5402370cefe891a846 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Sat, 20 Oct 2012 09:06:08 +0200
Subject: [PATCH 1465/2585] layout improvements

---
 usr/share/doc/vizrt/vosa-handbook/ssh-access.org | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/doc/vizrt/vosa-handbook/ssh-access.org b/usr/share/doc/vizrt/vosa-handbook/ssh-access.org
index 0c333d11..d267ede3 100644
--- a/usr/share/doc/vizrt/vosa-handbook/ssh-access.org
+++ b/usr/share/doc/vizrt/vosa-handbook/ssh-access.org
@@ -73,6 +73,7 @@ $ ssh-add -l
 [[./graphics/puttygen2.png]]
 
 /Storing your key:/
+
 Make a directory like C:\Users\thv.VIZRTINT\.ssh. Do not spread your key around further. If you loose your key because your laptop crashes, you can allways create a new one. Save your key as .pkk and as .pem
 - Save your key in and Privacy-enhanced Electronic Mail format(.pem)
 [[./graphics/puttygen3.png]]

From 1f35bd350551b01c6d24945dbfc7a3c1738cd20b Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Sat, 20 Oct 2012 10:25:55 +0200
Subject: [PATCH 1466/2585] Added text about VIP and heartbeat

---
 .../doc/vizrt/vosa-handbook/host_naming.org   | 47 ++++++++++++-------
 1 file changed, 29 insertions(+), 18 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/host_naming.org b/usr/share/doc/vizrt/vosa-handbook/host_naming.org
index f2f09117..081fbcd0 100644
--- a/usr/share/doc/vizrt/vosa-handbook/host_naming.org
+++ b/usr/share/doc/vizrt/vosa-handbook/host_naming.org
@@ -5,32 +5,43 @@ This document assumes that you know how the global DNS system works.
 
 ** What we use host names for
 
-We identify ip addresses with hostnames. So the real question is: 
-
-/what do we use ip addresses for?/
-
-*** TODO Virtual IP's
+Paractical networking requires operators and machines to know about the ip addresses of the  machines in the network. IP adresses are not very descriptive so it is a good practice to use hostnames to refer to IP addresses. 
 
 ** Machine roles
 
-The follwing roles are common in VOSA clusters:
+The follwing machine roles are common in VOSA clusters:
+
+/General:/
 - Control :: (control) Ssh entrypoint operators
 - Monitoring :: (mon) Presenting operational performance trends and sending out events when performance or capacity limits are exceded.
-- Vme online control :: (vmeoc) VME Admin web interface (Diactus), All automatic workflows of VME are initiated and monitored from here.
-- Vme online delivery :: (vmeod*) Presenting video's to visitors
-- Vme online transcoder :: (vmeot*) Transcoding video's from one format to another, either live or as a batch process. 
+
+/VME Online:/
+- Controller :: (vmeoc) VME Admin web interface (Diactus), All automatic workflows of VME are initiated and monitored from here. Usually a VMEO control server can perform all roles in a VMEO service but delegates to other VMEO machines in order to scale for required transcoding capacity and delivery capacity.
+- Delivery :: (vmeod*) Presenting video's to visitors either by streaming protocols or file transfer protocols.
+- Transcoder :: (vmeot*) Transcoding video's from one format to another, either live or as a batch process. 
+
+/Escenic:/
 - Escenic Presentation :: (pres*) Generating webpages by merging content from a database with html from JSP files.
 - Escenic Editorial :: (edit*) Content Studio webservice, Imports
 - Escenic Analysis :: (analysis) Counting pageimpressions for use by the webpages to present lists that depend on performance of specific content items.
 
-** Virtual roles
+** Virtual roles and IP addresses
+We use virtual roles for internal services. Internal services have a danger to be a single point of failure so we must distribute the capability to perform an internal service over multiple machines. Many machines should have the ability to perform a server role but only one server should actually play the role at any time.
+
+When a machine assumes a role it often claims the corresponding [[http://en.wikipedia.org/wiki/Virtual_IP_address][virtual IP address]] (VIP). A VIP can sometimes be claimed automatically if a [[http://en.wikipedia.org/wiki/Heartbeat_(program)][Linux-HA setup]] is installed.
+
+/General:/
+- Control :: (control) The control service currently in production
+- Monitoring :: (mon) The monitoring service currently in production
+
+/VME-online:/
+- Controller :: The server that happens to run the database and the JBOSS server containing the Diactus Web Application.
 
-- analysis :: the analysis webservices that are currently in production
-- edit :: Content Studio webservice and Indexer Webservice that are currently in production
-- import :: All periodic downloads of external content currently going on.
-- nfs-master :: The filesharing server that is curently in production.
-- nfs-slave :: The filesharing server that is curently in production.
-- pres* :: The presentation hosts currently configured on the loadbalancer
-- control :: The control service currently in production
-- mon :: The monitoring service currently in production
+/Escenic:/
+- Analysis :: (analysis) the analysis webservices that are currently in production
+- Editorial :: (edit) Content Studio webservice and Indexer Webservice that are currently in production
+- Import jobs :: (import) All periodic downloads of external content currently going on.
+- NFS master :: (nfs-master) The filesharing server that is curently in production.
+- NFS slave :: (nfs-slave) The filesharing server that is curently in production.
+- Presentation :: (pres*) The presentation hosts currently configured on the loadbalancer
 

From 5f0c1b88ec7485712ed5b9af673deb037ca0c61f Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Sat, 20 Oct 2012 10:59:29 +0200
Subject: [PATCH 1467/2585] Added the VOSA cust.vizrtsaas.com naming scheme

---
 usr/share/doc/vizrt/vosa-handbook/host_naming.org | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/usr/share/doc/vizrt/vosa-handbook/host_naming.org b/usr/share/doc/vizrt/vosa-handbook/host_naming.org
index 081fbcd0..3b300d6b 100644
--- a/usr/share/doc/vizrt/vosa-handbook/host_naming.org
+++ b/usr/share/doc/vizrt/vosa-handbook/host_naming.org
@@ -45,3 +45,14 @@ When a machine assumes a role it often claims the corresponding [[http://en.wiki
 - NFS slave :: (nfs-slave) The filesharing server that is curently in production.
 - Presentation :: (pres*) The presentation hosts currently configured on the loadbalancer
 
+** VOSA standard Network naming
+We have use a standard nameing scheme for all machines and virtual roles that we control.
+
+/We use the following syntax:/
+<machine role>.<network name>.<customercode>.cust.vizrtsaas.com
+
+| <%= trail_customer_shortname %> customer code     | <%= trail_customer_acronym %>           |
+| <%= trail_customer_shortname %> remote datacentre | <%= trail_customer_remote_datacentre %> |
+| <%= trail_customer_shortname %> office network    | <%= trail_customer_office_network %>    |
+
+

From b5066f1cbff48b4d850c8f6df3c9b90548a99fb4 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Sat, 20 Oct 2012 11:09:31 +0200
Subject: [PATCH 1468/2585] added the host nameing chapter

---
 usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
index 5ae2a227..dc17cb18 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
+++ b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
@@ -15,4 +15,4 @@
 #+INCLUDE: "backups.org"
 #+INCLUDE: "monitoring.org"
 #+INCLUDE: "ssh-access.org"
-
+#+INCLUDE: "host-naming.org"

From e405ba0c21baa809da6eb5e4ac2fd241577d7d8a Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Sat, 20 Oct 2012 11:17:05 +0200
Subject: [PATCH 1469/2585] used underscore instead of dash: corrected it by
 renaming the file

---
 .../doc/vizrt/vosa-handbook/{host_naming.org => host-naming.org}  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename usr/share/doc/vizrt/vosa-handbook/{host_naming.org => host-naming.org} (100%)

diff --git a/usr/share/doc/vizrt/vosa-handbook/host_naming.org b/usr/share/doc/vizrt/vosa-handbook/host-naming.org
similarity index 100%
rename from usr/share/doc/vizrt/vosa-handbook/host_naming.org
rename to usr/share/doc/vizrt/vosa-handbook/host-naming.org

From daf1fed3a06563aa2f33f253c23197aeb5e972da Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Sat, 20 Oct 2012 11:38:18 +0200
Subject: [PATCH 1470/2585] improve network naming scheme

---
 usr/share/doc/vizrt/vosa-handbook/host-naming.org | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/host-naming.org b/usr/share/doc/vizrt/vosa-handbook/host-naming.org
index 3b300d6b..a7c863af 100644
--- a/usr/share/doc/vizrt/vosa-handbook/host-naming.org
+++ b/usr/share/doc/vizrt/vosa-handbook/host-naming.org
@@ -45,14 +45,14 @@ When a machine assumes a role it often claims the corresponding [[http://en.wiki
 - NFS slave :: (nfs-slave) The filesharing server that is curently in production.
 - Presentation :: (pres*) The presentation hosts currently configured on the loadbalancer
 
-** VOSA standard Network naming
+** VOSA Network naming
 We have use a standard nameing scheme for all machines and virtual roles that we control.
 
 /We use the following syntax:/
 <machine role>.<network name>.<customercode>.cust.vizrtsaas.com
 
 | <%= trail_customer_shortname %> customer code     | <%= trail_customer_acronym %>           |
-| <%= trail_customer_shortname %> remote datacentre | <%= trail_customer_remote_datacentre %> |
-| <%= trail_customer_shortname %> office network    | <%= trail_customer_office_network %>    |
+| <%= trail_customer_shortname %> remote datacentre | <%= trail_customer_remote_datacentre %>.<%= trail_customer_acronym %>.cust.vizrtsaas.com |
+| <%= trail_customer_shortname %> office network    | <%= trail_customer_office_network %>.<%= trail_customer_acronym %>.cust.vizrtsaas.com |
 
 

From 176e4bc4e663c4d8fb71135fe88059d10b060969 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Sat, 20 Oct 2012 11:40:28 +0200
Subject: [PATCH 1471/2585] improved terminoligy

---
 usr/share/doc/vizrt/vosa-handbook/host-naming.org | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/host-naming.org b/usr/share/doc/vizrt/vosa-handbook/host-naming.org
index a7c863af..4f7f6c51 100644
--- a/usr/share/doc/vizrt/vosa-handbook/host-naming.org
+++ b/usr/share/doc/vizrt/vosa-handbook/host-naming.org
@@ -26,18 +26,21 @@ The follwing machine roles are common in VOSA clusters:
 - Escenic Analysis :: (analysis) Counting pageimpressions for use by the webpages to present lists that depend on performance of specific content items.
 
 ** Virtual roles and IP addresses
-We use virtual roles for internal services. Internal services have a danger to be a single point of failure so we must distribute the capability to perform an internal service over multiple machines. Many machines should have the ability to perform a server role but only one server should actually play the role at any time.
+We use virtual roles for internal services. Internal services are often a single point of failure so we must distribute the capability to perform internal services over multiple machines. Many machines should have the ability to perform any vrtual role but only one machine should actually play the role at any time.
 
 When a machine assumes a role it often claims the corresponding [[http://en.wikipedia.org/wiki/Virtual_IP_address][virtual IP address]] (VIP). A VIP can sometimes be claimed automatically if a [[http://en.wikipedia.org/wiki/Heartbeat_(program)][Linux-HA setup]] is installed.
 
 /General:/
+
 - Control :: (control) The control service currently in production
 - Monitoring :: (mon) The monitoring service currently in production
 
 /VME-online:/
+
 - Controller :: The server that happens to run the database and the JBOSS server containing the Diactus Web Application.
 
 /Escenic:/
+
 - Analysis :: (analysis) the analysis webservices that are currently in production
 - Editorial :: (edit) Content Studio webservice and Indexer Webservice that are currently in production
 - Import jobs :: (import) All periodic downloads of external content currently going on.
@@ -51,8 +54,8 @@ We have use a standard nameing scheme for all machines and virtual roles that we
 /We use the following syntax:/
 <machine role>.<network name>.<customercode>.cust.vizrtsaas.com
 
-| <%= trail_customer_shortname %> customer code     | <%= trail_customer_acronym %>           |
+| <%= trail_customer_shortname %> customer code     | <%= trail_customer_acronym %>                                                            |
 | <%= trail_customer_shortname %> remote datacentre | <%= trail_customer_remote_datacentre %>.<%= trail_customer_acronym %>.cust.vizrtsaas.com |
-| <%= trail_customer_shortname %> office network    | <%= trail_customer_office_network %>.<%= trail_customer_acronym %>.cust.vizrtsaas.com |
+| <%= trail_customer_shortname %> office network    | <%= trail_customer_office_network %>.<%= trail_customer_acronym %>.cust.vizrtsaas.com    |
 
 

From 1bb3dc17ec8ddfff4e8e0fbbd65e2fd61f052805 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Sat, 20 Oct 2012 19:13:30 +0200
Subject: [PATCH 1472/2585] improved the naming text to make more sense

---
 .../doc/vizrt/vosa-handbook/host-naming.org   | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/host-naming.org b/usr/share/doc/vizrt/vosa-handbook/host-naming.org
index 4f7f6c51..48d507d8 100644
--- a/usr/share/doc/vizrt/vosa-handbook/host-naming.org
+++ b/usr/share/doc/vizrt/vosa-handbook/host-naming.org
@@ -1,26 +1,24 @@
 * Host naming conventions
-Host names play a role in the Internet wide DNS system. Host names to find ip addresses. A host name can identify 0 or more ip addresses. Valid ip addresses might vary depending on the client network.
-
 This document assumes that you know how the global DNS system works.
 
-** What we use host names for
+Using hostnames to reach a service is preferred over using IP addresses directly because it gives us more routing flexibility. We can for instance change the IP address of a service without changing the client configuration.
 
-Paractical networking requires operators and machines to know about the ip addresses of the  machines in the network. IP adresses are not very descriptive so it is a good practice to use hostnames to refer to IP addresses. 
+We have a standard for naming hosts and the following text describes it.
 
 ** Machine roles
 
 The follwing machine roles are common in VOSA clusters:
 
-/General:/
+*** General
 - Control :: (control) Ssh entrypoint operators
 - Monitoring :: (mon) Presenting operational performance trends and sending out events when performance or capacity limits are exceded.
 
-/VME Online:/
+*** VME Online
 - Controller :: (vmeoc) VME Admin web interface (Diactus), All automatic workflows of VME are initiated and monitored from here. Usually a VMEO control server can perform all roles in a VMEO service but delegates to other VMEO machines in order to scale for required transcoding capacity and delivery capacity.
 - Delivery :: (vmeod*) Presenting video's to visitors either by streaming protocols or file transfer protocols.
 - Transcoder :: (vmeot*) Transcoding video's from one format to another, either live or as a batch process. 
 
-/Escenic:/
+*** Escenic
 - Escenic Presentation :: (pres*) Generating webpages by merging content from a database with html from JSP files.
 - Escenic Editorial :: (edit*) Content Studio webservice, Imports
 - Escenic Analysis :: (analysis) Counting pageimpressions for use by the webpages to present lists that depend on performance of specific content items.
@@ -30,16 +28,16 @@ We use virtual roles for internal services. Internal services are often a single
 
 When a machine assumes a role it often claims the corresponding [[http://en.wikipedia.org/wiki/Virtual_IP_address][virtual IP address]] (VIP). A VIP can sometimes be claimed automatically if a [[http://en.wikipedia.org/wiki/Heartbeat_(program)][Linux-HA setup]] is installed.
 
-/General:/
+*** General
 
 - Control :: (control) The control service currently in production
 - Monitoring :: (mon) The monitoring service currently in production
 
-/VME-online:/
+*** VME-online
 
 - Controller :: The server that happens to run the database and the JBOSS server containing the Diactus Web Application.
 
-/Escenic:/
+*** Escenic
 
 - Analysis :: (analysis) the analysis webservices that are currently in production
 - Editorial :: (edit) Content Studio webservice and Indexer Webservice that are currently in production
@@ -54,6 +52,8 @@ We have use a standard nameing scheme for all machines and virtual roles that we
 /We use the following syntax:/
 <machine role>.<network name>.<customercode>.cust.vizrtsaas.com
 
+*** <%= trail_customer_shortname %> naming scheme
+
 | <%= trail_customer_shortname %> customer code     | <%= trail_customer_acronym %>                                                            |
 | <%= trail_customer_shortname %> remote datacentre | <%= trail_customer_remote_datacentre %>.<%= trail_customer_acronym %>.cust.vizrtsaas.com |
 | <%= trail_customer_shortname %> office network    | <%= trail_customer_office_network %>.<%= trail_customer_acronym %>.cust.vizrtsaas.com    |

From cba5103482ebc7ddd839b855b7c47dff55bd706c Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Sun, 21 Oct 2012 10:18:35 +0200
Subject: [PATCH 1473/2585] Improved the naming policy for virtual roles

---
 .../doc/vizrt/vosa-handbook/host-naming.org     | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/host-naming.org b/usr/share/doc/vizrt/vosa-handbook/host-naming.org
index 48d507d8..4525b454 100644
--- a/usr/share/doc/vizrt/vosa-handbook/host-naming.org
+++ b/usr/share/doc/vizrt/vosa-handbook/host-naming.org
@@ -43,19 +43,20 @@ When a machine assumes a role it often claims the corresponding [[http://en.wiki
 - Editorial :: (edit) Content Studio webservice and Indexer Webservice that are currently in production
 - Import jobs :: (import) All periodic downloads of external content currently going on.
 - NFS master :: (nfs-master) The filesharing server that is curently in production.
-- NFS slave :: (nfs-slave) The filesharing server that is curently in production.
+- NFS slave :: (nfs-slave) The backup filesharing server that is curently in production and should represent the exact same content as the master with a slight.
 - Presentation :: (pres*) The presentation hosts currently configured on the loadbalancer
 
-** VOSA Network naming
-We have use a standard nameing scheme for all machines and virtual roles that we control.
+** VOSA standard network naming
+We use a standard naming scheme for all machines and virtual roles that we control.
 
-/We use the following syntax:/
 <machine role>.<network name>.<customercode>.cust.vizrtsaas.com
+<virtual role>.<customercode>.cust.vizrtsaas.com
 
-*** <%= trail_customer_shortname %> naming scheme
+** <%= trail_customer_shortname %> Network naming
 
-| <%= trail_customer_shortname %> customer code     | <%= trail_customer_acronym %>                                                            |
-| <%= trail_customer_shortname %> remote datacentre | <%= trail_customer_remote_datacentre %>.<%= trail_customer_acronym %>.cust.vizrtsaas.com |
-| <%= trail_customer_shortname %> office network    | <%= trail_customer_office_network %>.<%= trail_customer_acronym %>.cust.vizrtsaas.com    |
+| <%= trail_customer_shortname %> customer network  | <%= trail_customer_acronym %>                                                            |
+| <%= trail_customer_shortname %> remote virtual roles     | <vrtual role><%= trail_customer_remote_datacentre %>.<%= trail_customer_acronym %>.cust.vizrtsaas.com |
+| <%= trail_customer_shortname %> remote datacentre assets | <machine role><%= trail_customer_remote_datacentre %>.<%= trail_customer_acronym %>.cust.vizrtsaas.com |
+| <%= trail_customer_shortname %> office network assets | <machine role><%= trail_customer_office_network %>.<%= trail_customer_acronym %>.cust.vizrtsaas.com |
 
 

From bd43caba68bff01901c767adddb0210ec3762e49 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Sun, 21 Oct 2012 11:18:59 +0200
Subject: [PATCH 1474/2585] Clarifying virtual roles and machine roles.

---
 .../doc/vizrt/vosa-handbook/host-naming.org   | 77 +++++++++++--------
 1 file changed, 43 insertions(+), 34 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/host-naming.org b/usr/share/doc/vizrt/vosa-handbook/host-naming.org
index 4525b454..3d147ed2 100644
--- a/usr/share/doc/vizrt/vosa-handbook/host-naming.org
+++ b/usr/share/doc/vizrt/vosa-handbook/host-naming.org
@@ -3,60 +3,69 @@ This document assumes that you know how the global DNS system works.
 
 Using hostnames to reach a service is preferred over using IP addresses directly because it gives us more routing flexibility. We can for instance change the IP address of a service without changing the client configuration.
 
-We have a standard for naming hosts and the following text describes it.
+We have a standard for naming policy for machines and their roles. The following paragraphs describes it.
+
+** VOSA standard network naming
+We use a standard naming scheme for all machines and virtual roles that we control. These names are built up out of the following name components: 
+
+- <network name> :: Often named after a location or a datacenter provider.
+- <machine role> :: A name that reflects the capabilities of the machine. It might not perform all of those capabilities at all times.
+- <virtual role> :: A name that reflects a specific role that is performed. One machine can have more than one virtual role. 
+
+Applying the above to make full names:
+
+- Machine roles :: <machine role>.<network name>.<customercode>.cust.vizrtsaas.com
+- Virtual roles :: <virtual role>.<customercode>.cust.vizrtsaas.com
+
+** <%= trail_customer_shortname %> Network naming
+
+| <%= trail_customer_shortname %> customer domain name         | <%= trail_customer_acronym %>.cuts.vizrtsaas.com                                                       |
+| <%= trail_customer_shortname %> virtual role names        | <vrtual role>.<%= trail_customer_remote_datacentre %>.<%= trail_customer_acronym %>.cust.vizrtsaas.com |
+| <%= trail_customer_shortname %> remote datacentre assets | <machine role>.<%= trail_customer_remote_datacentre %>.<%= trail_customer_acronym %>.cust.vizrtsaas.com |
+| <%= trail_customer_shortname %> office network assets    | <machine role>.<%= trail_customer_office_network %>.<%= trail_customer_acronym %>.cust.vizrtsaas.com   |
 
-** Machine roles
+
+** Machine role names
+
+The names of machine roles should reflect their capabilities to perform specific virtual roles. It is our goal to install machines in ways that allow to perform as many virtual roles as possible. However we are not quite there yet so many standard machine names resemble virtual role names.
 
 The follwing machine roles are common in VOSA clusters:
 
 *** General
-- Control :: (control) Ssh entrypoint operators
-- Monitoring :: (mon) Presenting operational performance trends and sending out events when performance or capacity limits are exceded.
+- Control :: (control) Dedicated machine to perform as an  Ssh entrypoint operators. 
+- Monitoring :: (mon) Dedicated machine that harvests samples of performance metrics from all the VOSA cluster machines and sending out events when performance or capacity limits are exceded.
 
 *** VME Online
-- Controller :: (vmeoc) VME Admin web interface (Diactus), All automatic workflows of VME are initiated and monitored from here. Usually a VMEO control server can perform all roles in a VMEO service but delegates to other VMEO machines in order to scale for required transcoding capacity and delivery capacity.
-- Delivery :: (vmeod*) Presenting video's to visitors either by streaming protocols or file transfer protocols.
-- Transcoder :: (vmeot*) Transcoding video's from one format to another, either live or as a batch process. 
+- Controller :: (vmeo*) All VME-online machines are able to perform all possible VME-online virtual roles. They are simply numbered. 
 
 *** Escenic
-- Escenic Presentation :: (pres*) Generating webpages by merging content from a database with html from JSP files.
-- Escenic Editorial :: (edit*) Content Studio webservice, Imports
-- Escenic Analysis :: (analysis) Counting pageimpressions for use by the webpages to present lists that depend on performance of specific content items.
+- Escenic Presentation :: (pres*) Dedicated machine for generating webpages by merging content from a database with html from JSP files.
+- Escenic Editorial :: (edit*) Dedicated machine for Content Studio webservice, Imports
+- Escenic Analysis :: (analysis) Dedicated machine for counting pageimpressions for use by the webpages to present lists that depend on performance of specific content items.
 
 ** Virtual roles and IP addresses
-We use virtual roles for internal services. Internal services are often a single point of failure so we must distribute the capability to perform internal services over multiple machines. Many machines should have the ability to perform any vrtual role but only one machine should actually play the role at any time.
+Virtual roles are often a single point of failure so we must distribute the capability to perform any virual role over multiple machines or privide very easy restore from a backup. Many machines should have the ability to perform a virtual role but at least one machine should actually play the virtual role at any time. If a virtual role  is clustered, the virtual role hostname might resolve to several ip addresses or the virtual role hostnames might be numbered.
 
-When a machine assumes a role it often claims the corresponding [[http://en.wikipedia.org/wiki/Virtual_IP_address][virtual IP address]] (VIP). A VIP can sometimes be claimed automatically if a [[http://en.wikipedia.org/wiki/Heartbeat_(program)][Linux-HA setup]] is installed.
+When a machine assumes a virtual role it often claims the corresponding [[http://en.wikipedia.org/wiki/Virtual_IP_address][virtual IP address]] (VIP). A VIP can sometimes be claimed automatically if a [[http://en.wikipedia.org/wiki/Heartbeat_(program)][Linux-HA setup]] is installed.
 
-*** General
+*** Virtual role names
 
-- Control :: (control) The control service currently in production
-- Monitoring :: (mon) The monitoring service currently in production
+- Control :: (control.<customer_acronym>.cust.vizrtsaas.com) The control role 
+- Monitoring :: (mon.<customer_acronym>.cust.vizrtsaas.com) The monitoring role
 
 *** VME-online
 
-- Controller :: The server that happens to run the database and the JBOSS server containing the Diactus Web Application.
+- Controller :: (vmeoc.<customer_acronym>.cust.vizrtsaas.com) The virtual role of runing the database and the JBOSS server containing the Diactus Web Application. VMEO machines are all installed with all VMEO capabilities (Escenic migrating to the same policy but is not quite there yet)
+- Transcoder :: (vmeot*.<customer_acronym>.cust.vizrtsaas.com) Providing transcoding capacity to the controller.
+- Delivery :: (vmeod*.<customer_acronym>.cust.vizrtsaas.com) Endpoint for publishing video on demand and live video streaming.
 
 *** Escenic
 
-- Analysis :: (analysis) the analysis webservices that are currently in production
-- Editorial :: (edit) Content Studio webservice and Indexer Webservice that are currently in production
-- Import jobs :: (import) All periodic downloads of external content currently going on.
-- NFS master :: (nfs-master) The filesharing server that is curently in production.
-- NFS slave :: (nfs-slave) The backup filesharing server that is curently in production and should represent the exact same content as the master with a slight.
-- Presentation :: (pres*) The presentation hosts currently configured on the loadbalancer
-
-** VOSA standard network naming
-We use a standard naming scheme for all machines and virtual roles that we control.
-
-<machine role>.<network name>.<customercode>.cust.vizrtsaas.com
-<virtual role>.<customercode>.cust.vizrtsaas.com
-
-** <%= trail_customer_shortname %> Network naming
+- Analysis :: (analysis.<customer_acronym>.cust.vizrtsaas.com) the analysis webservices
+- Editorial :: (edit.<customer_acronym>.cust.vizrtsaas.com) Content Studio webservice and Indexer Webservice. Currently ther can only be one.
+- Import jobs :: (import.<customer_acronym>.cust.vizrtsaas.com) All periodic downloads of external content currently going on.
+- NFS master :: (nfs.<customer_acronym>.cust.vizrtsaas.com) The nfs server
+- Presentation :: (pres*.<customer_acronym>.cust.vizrtsaas.com) The presentation hosts currently configured on the loadbalancer.
 
-| <%= trail_customer_shortname %> customer network  | <%= trail_customer_acronym %>                                                            |
-| <%= trail_customer_shortname %> remote virtual roles     | <vrtual role><%= trail_customer_remote_datacentre %>.<%= trail_customer_acronym %>.cust.vizrtsaas.com |
-| <%= trail_customer_shortname %> remote datacentre assets | <machine role><%= trail_customer_remote_datacentre %>.<%= trail_customer_acronym %>.cust.vizrtsaas.com |
-| <%= trail_customer_shortname %> office network assets | <machine role><%= trail_customer_office_network %>.<%= trail_customer_acronym %>.cust.vizrtsaas.com |
 
 

From 5104c912dabd32335b88262947df4c2183d7c958 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Sun, 21 Oct 2012 11:46:59 +0200
Subject: [PATCH 1475/2585] Changed some names around

---
 .../doc/vizrt/vosa-handbook/host-naming.org   | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/host-naming.org b/usr/share/doc/vizrt/vosa-handbook/host-naming.org
index 3d147ed2..96f1c3a4 100644
--- a/usr/share/doc/vizrt/vosa-handbook/host-naming.org
+++ b/usr/share/doc/vizrt/vosa-handbook/host-naming.org
@@ -11,11 +11,12 @@ We use a standard naming scheme for all machines and virtual roles that we contr
 - <network name> :: Often named after a location or a datacenter provider.
 - <machine role> :: A name that reflects the capabilities of the machine. It might not perform all of those capabilities at all times.
 - <virtual role> :: A name that reflects a specific role that is performed. One machine can have more than one virtual role. 
+- <ou> :: The lowercase name that represents an organizational unit often referred to as a customer or company.
 
 Applying the above to make full names:
 
-- Machine roles :: <machine role>.<network name>.<customercode>.cust.vizrtsaas.com
-- Virtual roles :: <virtual role>.<customercode>.cust.vizrtsaas.com
+- Machine roles :: <machine role>.<network name>.<ou>.cust.vizrtsaas.com
+- Virtual roles :: <virtual role>.<ou>.cust.vizrtsaas.com
 
 ** <%= trail_customer_shortname %> Network naming
 
@@ -50,22 +51,22 @@ When a machine assumes a virtual role it often claims the corresponding [[http:/
 
 *** Virtual role names
 
-- Control :: (control.<customer_acronym>.cust.vizrtsaas.com) The control role 
-- Monitoring :: (mon.<customer_acronym>.cust.vizrtsaas.com) The monitoring role
+- Control :: (control.<ou>.cust.vizrtsaas.com) The control role 
+- Monitoring :: (mon.<ou>.cust.vizrtsaas.com) The monitoring role
 
 *** VME-online
 
-- Controller :: (vmeoc.<customer_acronym>.cust.vizrtsaas.com) The virtual role of runing the database and the JBOSS server containing the Diactus Web Application. VMEO machines are all installed with all VMEO capabilities (Escenic migrating to the same policy but is not quite there yet)
-- Transcoder :: (vmeot*.<customer_acronym>.cust.vizrtsaas.com) Providing transcoding capacity to the controller.
-- Delivery :: (vmeod*.<customer_acronym>.cust.vizrtsaas.com) Endpoint for publishing video on demand and live video streaming.
+- Controller :: (vmeoc.<ou>.cust.vizrtsaas.com) The virtual role of runing the database and the JBOSS server containing the Diactus Web Application. VMEO machines are all installed with all VMEO capabilities (Escenic migrating to the same policy but is not quite there yet)
+- Transcoder :: (vmeot*.<ou>.cust.vizrtsaas.com) Providing transcoding capacity to the controller.
+- Delivery :: (vmeod*.<ou>.cust.vizrtsaas.com) Endpoint for publishing video on demand and live video streaming.
 
 *** Escenic
 
-- Analysis :: (analysis.<customer_acronym>.cust.vizrtsaas.com) the analysis webservices
-- Editorial :: (edit.<customer_acronym>.cust.vizrtsaas.com) Content Studio webservice and Indexer Webservice. Currently ther can only be one.
-- Import jobs :: (import.<customer_acronym>.cust.vizrtsaas.com) All periodic downloads of external content currently going on.
-- NFS master :: (nfs.<customer_acronym>.cust.vizrtsaas.com) The nfs server
-- Presentation :: (pres*.<customer_acronym>.cust.vizrtsaas.com) The presentation hosts currently configured on the loadbalancer.
+- Analysis :: (analysis.<ou>.cust.vizrtsaas.com) the analysis webservices
+- Editorial :: (edit.<ou>.cust.vizrtsaas.com) Content Studio webservice and Indexer Webservice. Currently ther can only be one.
+- Import jobs :: (import.<ou>.cust.vizrtsaas.com) All periodic downloads of external content currently going on.
+- NFS master :: (nfs.<ou>.cust.vizrtsaas.com) The nfs server
+- Presentation :: (pres*.<ou>.cust.vizrtsaas.com) The presentation hosts currently configured on the loadbalancer.
 
 
 

From eb0655d21b59770f21ffef5b915bc0b0c8d05871 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Sun, 21 Oct 2012 12:09:51 +0200
Subject: [PATCH 1476/2585] some corrections to the text

---
 .../doc/vizrt/vosa-handbook/host-naming.org    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/host-naming.org b/usr/share/doc/vizrt/vosa-handbook/host-naming.org
index 96f1c3a4..854b9517 100644
--- a/usr/share/doc/vizrt/vosa-handbook/host-naming.org
+++ b/usr/share/doc/vizrt/vosa-handbook/host-naming.org
@@ -1,5 +1,5 @@
-* Host naming conventions
-This document assumes that you know how the global DNS system works.
+* VOSA DNS naming conventions  
+This document assumes knowledge of the [[http://en.wikipedia.org/wiki/Domain_Name_System][global DNS system]].
 
 Using hostnames to reach a service is preferred over using IP addresses directly because it gives us more routing flexibility. We can for instance change the IP address of a service without changing the client configuration.
 
@@ -20,24 +20,24 @@ Applying the above to make full names:
 
 ** <%= trail_customer_shortname %> Network naming
 
-| <%= trail_customer_shortname %> customer domain name         | <%= trail_customer_acronym %>.cuts.vizrtsaas.com                                                       |
+| <%= trail_customer_shortname %> customer domain name         | <%= trail_customer_acronym %>.cust.vizrtsaas.com                                                       |
 | <%= trail_customer_shortname %> virtual role names        | <vrtual role>.<%= trail_customer_remote_datacentre %>.<%= trail_customer_acronym %>.cust.vizrtsaas.com |
 | <%= trail_customer_shortname %> remote datacentre assets | <machine role>.<%= trail_customer_remote_datacentre %>.<%= trail_customer_acronym %>.cust.vizrtsaas.com |
 | <%= trail_customer_shortname %> office network assets    | <machine role>.<%= trail_customer_office_network %>.<%= trail_customer_acronym %>.cust.vizrtsaas.com   |
 
 
-** Machine role names
+** Machine names
 
-The names of machine roles should reflect their capabilities to perform specific virtual roles. It is our goal to install machines in ways that allow to perform as many virtual roles as possible. However we are not quite there yet so many standard machine names resemble virtual role names.
+The names of machine should reflect their capabilities to perform specific virtual roles. It is our goal to install machines in ways that allow to perform as many virtual roles as possible. However we are not quite there yet so many standard machine names resemble virtual role names.
 
-The follwing machine roles are common in VOSA clusters:
+The follwing machine names are common in VOSA clusters:
 
 *** General
-- Control :: (control) Dedicated machine to perform as an  Ssh entrypoint operators. 
-- Monitoring :: (mon) Dedicated machine that harvests samples of performance metrics from all the VOSA cluster machines and sending out events when performance or capacity limits are exceded.
+- Control :: (control) Dedicated machine to perform as an SSH entrypoint for operators. 
+- Monitoring :: (mon) Dedicated machine that harvest samples of performance metrics from all the machines and sending out events when performance or capacity limits are exceded.
 
 *** VME Online
-- Controller :: (vmeo*) All VME-online machines are able to perform all possible VME-online virtual roles. They are simply numbered. 
+- VME-Online :: (vmeo*) All VME-online machines are able to perform all possible VME-online virtual roles. They are simply numbered. 
 
 *** Escenic
 - Escenic Presentation :: (pres*) Dedicated machine for generating webpages by merging content from a database with html from JSP files.

From 22ec7a271544dffd5572d0521478aabf243ce522 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Sun, 21 Oct 2012 12:16:16 +0200
Subject: [PATCH 1477/2585] more clarifications

---
 usr/share/doc/vizrt/vosa-handbook/host-naming.org | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/host-naming.org b/usr/share/doc/vizrt/vosa-handbook/host-naming.org
index 854b9517..f6986ef2 100644
--- a/usr/share/doc/vizrt/vosa-handbook/host-naming.org
+++ b/usr/share/doc/vizrt/vosa-handbook/host-naming.org
@@ -8,14 +8,14 @@ We have a standard for naming policy for machines and their roles. The following
 ** VOSA standard network naming
 We use a standard naming scheme for all machines and virtual roles that we control. These names are built up out of the following name components: 
 
-- <network name> :: Often named after a location or a datacenter provider.
-- <machine role> :: A name that reflects the capabilities of the machine. It might not perform all of those capabilities at all times.
+- <network> :: Often named after a location or a datacenter provider.
+- <machine> :: A name that reflects the capabilities of the machine. It might not perform all of those capabilities at all times.
 - <virtual role> :: A name that reflects a specific role that is performed. One machine can have more than one virtual role. 
 - <ou> :: The lowercase name that represents an organizational unit often referred to as a customer or company.
 
 Applying the above to make full names:
 
-- Machine roles :: <machine role>.<network name>.<ou>.cust.vizrtsaas.com
+- Machine roles :: <machine>.<network>.<ou>.cust.vizrtsaas.com
 - Virtual roles :: <virtual role>.<ou>.cust.vizrtsaas.com
 
 ** <%= trail_customer_shortname %> Network naming

From 6f7fb6f07f3aa35f32f8da638bbd0d5421387f4e Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Sun, 21 Oct 2012 12:18:58 +0200
Subject: [PATCH 1478/2585] correction

---
 usr/share/doc/vizrt/vosa-handbook/host-naming.org | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/host-naming.org b/usr/share/doc/vizrt/vosa-handbook/host-naming.org
index f6986ef2..9340831e 100644
--- a/usr/share/doc/vizrt/vosa-handbook/host-naming.org
+++ b/usr/share/doc/vizrt/vosa-handbook/host-naming.org
@@ -22,8 +22,8 @@ Applying the above to make full names:
 
 | <%= trail_customer_shortname %> customer domain name         | <%= trail_customer_acronym %>.cust.vizrtsaas.com                                                       |
 | <%= trail_customer_shortname %> virtual role names        | <vrtual role>.<%= trail_customer_remote_datacentre %>.<%= trail_customer_acronym %>.cust.vizrtsaas.com |
-| <%= trail_customer_shortname %> remote datacentre assets | <machine role>.<%= trail_customer_remote_datacentre %>.<%= trail_customer_acronym %>.cust.vizrtsaas.com |
-| <%= trail_customer_shortname %> office network assets    | <machine role>.<%= trail_customer_office_network %>.<%= trail_customer_acronym %>.cust.vizrtsaas.com   |
+| <%= trail_customer_shortname %> remote datacentre assets | <machine>.<%= trail_customer_remote_datacentre %>.<%= trail_customer_acronym %>.cust.vizrtsaas.com      |
+| <%= trail_customer_shortname %> office network assets    | <machine>.<%= trail_customer_office_network %>.<%= trail_customer_acronym %>.cust.vizrtsaas.com        |
 
 
 ** Machine names

From 6e2497eb64ec8d49705b3b230e446f67b8fd1ad2 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Sun, 21 Oct 2012 12:21:49 +0200
Subject: [PATCH 1479/2585] correction

---
 usr/share/doc/vizrt/vosa-handbook/host-naming.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/host-naming.org b/usr/share/doc/vizrt/vosa-handbook/host-naming.org
index 9340831e..5d7c9d80 100644
--- a/usr/share/doc/vizrt/vosa-handbook/host-naming.org
+++ b/usr/share/doc/vizrt/vosa-handbook/host-naming.org
@@ -21,7 +21,7 @@ Applying the above to make full names:
 ** <%= trail_customer_shortname %> Network naming
 
 | <%= trail_customer_shortname %> customer domain name         | <%= trail_customer_acronym %>.cust.vizrtsaas.com                                                       |
-| <%= trail_customer_shortname %> virtual role names        | <vrtual role>.<%= trail_customer_remote_datacentre %>.<%= trail_customer_acronym %>.cust.vizrtsaas.com |
+| <%= trail_customer_shortname %> virtual role names        | <vrtual role>.<%= trail_customer_acronym %>.cust.vizrtsaas.com                                         |
 | <%= trail_customer_shortname %> remote datacentre assets | <machine>.<%= trail_customer_remote_datacentre %>.<%= trail_customer_acronym %>.cust.vizrtsaas.com      |
 | <%= trail_customer_shortname %> office network assets    | <machine>.<%= trail_customer_office_network %>.<%= trail_customer_acronym %>.cust.vizrtsaas.com        |
 

From 7ce3cbffad181b736b2fda59f0fec935f68ba548 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Sun, 21 Oct 2012 13:02:18 +0200
Subject: [PATCH 1480/2585] added the split between global and local vitual
 roles

---
 usr/share/doc/vizrt/vosa-handbook/host-naming.org | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/host-naming.org b/usr/share/doc/vizrt/vosa-handbook/host-naming.org
index 5d7c9d80..4a23b91f 100644
--- a/usr/share/doc/vizrt/vosa-handbook/host-naming.org
+++ b/usr/share/doc/vizrt/vosa-handbook/host-naming.org
@@ -16,7 +16,8 @@ We use a standard naming scheme for all machines and virtual roles that we contr
 Applying the above to make full names:
 
 - Machine roles :: <machine>.<network>.<ou>.cust.vizrtsaas.com
-- Virtual roles :: <virtual role>.<ou>.cust.vizrtsaas.com
+- Global virtual roles :: <virtual role>.<ou>.cust.vizrtsaas.com
+- Local virtual roles :: <virtual role>.<network>.<ou>.cust.vizrtsaas.com 
 
 ** <%= trail_customer_shortname %> Network naming
 
@@ -51,8 +52,9 @@ When a machine assumes a virtual role it often claims the corresponding [[http:/
 
 *** Virtual role names
 
-- Control :: (control.<ou>.cust.vizrtsaas.com) The control role 
 - Monitoring :: (mon.<ou>.cust.vizrtsaas.com) The monitoring role
+- Control :: (control.<ou>.cust.vizrtsaas.com) The control role 
+- Proxy Gateway :: (httpproxy.<network>.<ou>.vizrtsaas.com)
 
 *** VME-online
 

From 24bd1d99de607d442c9742fa9b2bdb27c36ea3ea Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Sun, 21 Oct 2012 18:15:45 +0200
Subject: [PATCH 1481/2585] move the proxy name out of the proxied namespace

---
 usr/share/doc/vizrt/vosa-handbook/host-naming.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/host-naming.org b/usr/share/doc/vizrt/vosa-handbook/host-naming.org
index 4a23b91f..c686f4cb 100644
--- a/usr/share/doc/vizrt/vosa-handbook/host-naming.org
+++ b/usr/share/doc/vizrt/vosa-handbook/host-naming.org
@@ -54,7 +54,7 @@ When a machine assumes a virtual role it often claims the corresponding [[http:/
 
 - Monitoring :: (mon.<ou>.cust.vizrtsaas.com) The monitoring role
 - Control :: (control.<ou>.cust.vizrtsaas.com) The control role 
-- Proxy Gateway :: (httpproxy.<network>.<ou>.vizrtsaas.com)
+- Proxy Gateway :: (proxy-<network>.<ou>.vizrtsaas.com)
 
 *** VME-online
 

From ac19f47f9ac3718ba640576bd618cc1e662a4eb0 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Sun, 21 Oct 2012 18:28:37 +0200
Subject: [PATCH 1482/2585] typo

---
 usr/share/doc/vizrt/vosa-handbook/ssh-access.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/ssh-access.org b/usr/share/doc/vizrt/vosa-handbook/ssh-access.org
index d267ede3..23a3769a 100644
--- a/usr/share/doc/vizrt/vosa-handbook/ssh-access.org
+++ b/usr/share/doc/vizrt/vosa-handbook/ssh-access.org
@@ -81,7 +81,7 @@ Make a directory like C:\Users\thv.VIZRTINT\.ssh. Do not spread your key around
 - Save your key in a Putty Private Key File(.pkk) 
 [[./graphics/puttygen4.png]]
 
-****Using Pagent
+**** Using Pagent
 Pagent is Putties [[http://en.wikipedia.org/wiki/Ssh-agent][SSH agent]]. Using am SSH agent makes the use of keys a lot easier. An SSH agent runs in the background to supply a key to any putty-ssh login you might perform during the day without retyping your passphrase.
 
 Pagent lets you load keys interactively or on the command line.

From b457762ff7f62ddf8b6efe36c2a343e73a079948 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 22 Oct 2012 12:14:09 +0200
Subject: [PATCH 1483/2585] - added chapter on defining import jobs

---
 .../doc/vizrt/vosa-handbook/import-jobs.org   | 82 +++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/import-jobs.org

diff --git a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
new file mode 100644
index 00000000..006f05d2
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
@@ -0,0 +1,82 @@
+* Import Jobs
+
+** Conventions
+All file and directory names are to be lower cased with hyphens
+between sub words.
+
+** Specifying an import job
+When creating a new import job for your project, the following
+structure is required. We're calling the import job =moo= since we're
+setting up an import feed from our imaginary content provider, "Moo
+Cool Videos".
+
+#+BEGIN_SRC text
+moo/xsl/01-convert-all-cows-to-ducks.xsl
+moo/xsl/02-convert-duck-to-escenic-xml.xsl
+moo/cron.hourly/get-files-from-moo-ftp
+#+END_SRC
+
+As you can guess from the file names, the
+=01-convert-all-cows-to-ducks.xsl= stylesheet will be first applied to
+the incoming data (normally XML) and the
+=02-convert-duck-to-escenic-xml.xsl= will be applied next before the
+resulting Escenic XML will be imported into the Escenic Content
+Engine.
+
+- import job name :: lowercase with hyphens between words (if more
+     than one)
+- xsl :: directory with files prefixed with =<number>-=, indicating
+         the order of transformation to apply to your import job. 
+- cron.hourly :: scripts to be run every our. These will be put in
+                 =/etc/cron.hourly= on the import server. Be sure to
+                 set the execute bit on the file and note that as with
+                 all cron jobs, the file cannot have a file suffix.
+
+*** Pulling content from an FTP server
+We have ready made BASH libraries to do this. You only need to put a
+file in =moo/cron.hourly/get-files-from-moo-ftp= like:
+
+#+BEGIN_SRC text
+#! /usr/bin/env bash
+source /usr/share/escenic/engine/import/common-import-functions.sh
+
+ftp_user="user@server.com"
+ftp_password="foobar"
+ftp_url=ftp://ftp.server.com/myfeed/
+download_dir=/var/spool/escenic/import/mypub/moo/new
+log=/var/log/escenic/cron.$(basename $0 .sh).log
+ftp_download_history=/var/lib/escenic/ftp-history-cron.$(basename $0 .sh)
+lock_file=/var/lock/$(basename $0 .sh).lock
+
+now=$(date +%s)
+max_file_age_in_hours=2000
+
+echo $0 "called @ $(date)" >> $log
+download_latest_ftp_files
+fix_ownership_of_download_files
+echo $0 "finished @ $(date)" >> $log
+#+END_SRC
+
+This will give you many features including:
+- lock file support :: only one instance of your cron FTP script will
+  run at any given point in time.
+- state :: only files that previously haven't been downloaded will be
+           downloaded with a new run of the cron job.
+- log files :: logging of your cron script in a dedicated file
+
+** Import jobs deployed by VOSA
+When an import job has been deployed by VOSA, it will be put into the
+these directories.
+
+|--------------------------------------------------+--------------------------------------|
+| Path                                             | Description                          |
+|--------------------------------------------------+--------------------------------------|
+| =/usr/share/escenic/engine/import/<pub>/<job>=   | The transformers, such as XSLs       |
+| =/var/spool/escenic/import//<pub>/<job>/new=     | The 3rd party data (XML) feed        |
+| =/var/spool/escenic/import//<pub>/<job>/error=   | Failed 3rd party XML files           |
+| =/var/spool/escenic/import//<pub>/<job>/archive= | Successful 3rd party XML files       |
+| =/etc/cron.hourly/get-files-from-moo-ftp=        | Hourly cron job to get files via FTP |
+|--------------------------------------------------+--------------------------------------|
+
+
+

From 73967401a7632059098e8df05a4e76795baaafbc Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 22 Oct 2012 12:21:05 +0200
Subject: [PATCH 1484/2585] - added publication to the mix

---
 usr/share/doc/vizrt/vosa-handbook/import-jobs.org | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
index 006f05d2..bb3d5ab1 100644
--- a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
+++ b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
@@ -8,12 +8,13 @@ between sub words.
 When creating a new import job for your project, the following
 structure is required. We're calling the import job =moo= since we're
 setting up an import feed from our imaginary content provider, "Moo
-Cool Videos".
+Cool Videos" and our publication is the ubiquitous =mypub=.
 
 #+BEGIN_SRC text
-moo/xsl/01-convert-all-cows-to-ducks.xsl
-moo/xsl/02-convert-duck-to-escenic-xml.xsl
-moo/cron.hourly/get-files-from-moo-ftp
+$ unzip -timport-jobs.zip
+mypub/moo/xsl/01-convert-all-cows-to-ducks.xsl
+mypub/moo/xsl/02-convert-duck-to-escenic-xml.xsl
+mypub/moo/cron.hourly/get-files-from-moo-ftp
 #+END_SRC
 
 As you can guess from the file names, the

From 50af47a23222ad54bbae2500679702a3b5d0563a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 22 Oct 2012 13:16:11 +0200
Subject: [PATCH 1485/2585] - showed how multiple customers fit into the
 package gotten from the   developer.

---
 usr/share/doc/vizrt/vosa-handbook/import-jobs.org | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
index bb3d5ab1..ec081cee 100644
--- a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
+++ b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
@@ -11,10 +11,11 @@ setting up an import feed from our imaginary content provider, "Moo
 Cool Videos" and our publication is the ubiquitous =mypub=.
 
 #+BEGIN_SRC text
-$ unzip -timport-jobs.zip
+$ unzip -t import-jobs.zip
 mypub/moo/xsl/01-convert-all-cows-to-ducks.xsl
 mypub/moo/xsl/02-convert-duck-to-escenic-xml.xsl
 mypub/moo/cron.hourly/get-files-from-moo-ftp
+otherpub/foo/xsl/01-convert-from-foo-to-escenic-xml.xsl
 #+END_SRC
 
 As you can guess from the file names, the

From b0e4bb60644c53ba0f27a9f6351aa57bdee478f6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 22 Oct 2012 13:23:01 +0200
Subject: [PATCH 1486/2585] - documented the required fields for an FTP import
 job

---
 .../doc/vizrt/vosa-handbook/import-jobs.org   | 33 +++++++++++++------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
index ec081cee..08729df8 100644
--- a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
+++ b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
@@ -36,7 +36,7 @@ Engine.
 
 *** Pulling content from an FTP server
 We have ready made BASH libraries to do this. You only need to put a
-file in =moo/cron.hourly/get-files-from-moo-ftp= like:
+file in =mybub/moo/cron.hourly/get-files-from-moo-ftp= like:
 
 #+BEGIN_SRC text
 #! /usr/bin/env bash
@@ -59,6 +59,18 @@ fix_ownership_of_download_files
 echo $0 "finished @ $(date)" >> $log
 #+END_SRC
 
+The only values you need to touch is are:
+- =ftp_user=
+- =ftp_password=
+- =ftp_url= :: full URL to the directory on the FTP server.
+- =download_dir= :: it's really just the =/mypub/moo= part of the
+                    above example you'd  have to change.
+
+The rest of the options should do just fine. If you really want to
+tweak, you can of course decide how far back you want each run of the
+job to look for files (it will only download each file once) by
+setting =max_file_age_in_hours=.
+
 This will give you many features including:
 - lock file support :: only one instance of your cron FTP script will
   run at any given point in time.
@@ -70,15 +82,16 @@ This will give you many features including:
 When an import job has been deployed by VOSA, it will be put into the
 these directories.
 
-|--------------------------------------------------+--------------------------------------|
-| Path                                             | Description                          |
-|--------------------------------------------------+--------------------------------------|
-| =/usr/share/escenic/engine/import/<pub>/<job>=   | The transformers, such as XSLs       |
-| =/var/spool/escenic/import//<pub>/<job>/new=     | The 3rd party data (XML) feed        |
-| =/var/spool/escenic/import//<pub>/<job>/error=   | Failed 3rd party XML files           |
-| =/var/spool/escenic/import//<pub>/<job>/archive= | Successful 3rd party XML files       |
-| =/etc/cron.hourly/get-files-from-moo-ftp=        | Hourly cron job to get files via FTP |
-|--------------------------------------------------+--------------------------------------|
+|-------------------------------------------------+--------------------------------------|
+| Path                                            | Description                          |
+|-------------------------------------------------+--------------------------------------|
+| =/usr/share/escenic/engine/import/<pub>/<job>=  | The transformers, such as XSLs       |
+| =/var/spool/escenic/import/<pub>/<job>/new=     | The 3rd party data (XML) feed        |
+| =/var/spool/escenic/import/<pub>/<job>/error=   | Failed 3rd party XML files           |
+| =/var/spool/escenic/import/<pub>/<job>/archive= | Successful 3rd party XML files       |
+| =/etc/cron.hourly/<your cron script>=           | Hourly cron job to get files via FTP |
+|-------------------------------------------------+--------------------------------------|
+
 
 
 

From 2eb704469339fc2d492ffb5971f7dc1af49c84b0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 22 Oct 2012 13:28:37 +0200
Subject: [PATCH 1487/2585] - added example column for the the file matrix

---
 .../doc/vizrt/vosa-handbook/import-jobs.org   | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
index 08729df8..13aa11b2 100644
--- a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
+++ b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
@@ -82,15 +82,16 @@ This will give you many features including:
 When an import job has been deployed by VOSA, it will be put into the
 these directories.
 
-|-------------------------------------------------+--------------------------------------|
-| Path                                            | Description                          |
-|-------------------------------------------------+--------------------------------------|
-| =/usr/share/escenic/engine/import/<pub>/<job>=  | The transformers, such as XSLs       |
-| =/var/spool/escenic/import/<pub>/<job>/new=     | The 3rd party data (XML) feed        |
-| =/var/spool/escenic/import/<pub>/<job>/error=   | Failed 3rd party XML files           |
-| =/var/spool/escenic/import/<pub>/<job>/archive= | Successful 3rd party XML files       |
-| =/etc/cron.hourly/<your cron script>=           | Hourly cron job to get files via FTP |
-|-------------------------------------------------+--------------------------------------|
+|-------------------------------------------------+-------------------------------------------------------------------------------+--------------------------------------|
+| Path                                            | Example                                                                       | Description                          |
+|-------------------------------------------------+-------------------------------------------------------------------------------+--------------------------------------|
+| =/usr/share/escenic/engine/import/<pub>/<job>=  | =/usr/share/escenic/engine/import/mypub/moo/01-convert-all-cows-to-ducks.xsl= | The transformers, such as XSLs       |
+| =/var/spool/escenic/import/<pub>/<job>/new=     | =/var/spool/escenic/import/mypub/moo/new=                                     | The 3rd party data (XML) feed        |
+| =/var/spool/escenic/import/<pub>/<job>/error=   | =/var/spool/escenic/import/mypub/moo/error=                                   | Failed 3rd party XML files           |
+| =/var/spool/escenic/import/<pub>/<job>/archive= | =/var/spool/escenic/import/mypub/moo/archive=                                 | Successful 3rd party XML files       |
+| =/etc/cron.hourly/<your cron script>=           | =/etc/cron.hourly/get-files-from-moo-ftp=                                     | Hourly cron job to get files via FTP |
+| =/var/log/escenic/cron.<your coron script>.log= | =/var/log/escenic/cron.get-files-from-moo-ftp.log=                            | Log for your cron job                |
+|-------------------------------------------------+-------------------------------------------------------------------------------+--------------------------------------|
 
 
 

From 89d10afe5a78ada030da1356315c40f6615e6612 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 22 Oct 2012 13:49:53 +0200
Subject: [PATCH 1488/2585] - made matrix into two columns to not break the
 github formatting (and   other portrait oriented  page based formatting

---
 .../doc/vizrt/vosa-handbook/import-jobs.org   | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
index 13aa11b2..43ec99a6 100644
--- a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
+++ b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
@@ -82,16 +82,22 @@ This will give you many features including:
 When an import job has been deployed by VOSA, it will be put into the
 these directories.
 
-|-------------------------------------------------+-------------------------------------------------------------------------------+--------------------------------------|
-| Path                                            | Example                                                                       | Description                          |
-|-------------------------------------------------+-------------------------------------------------------------------------------+--------------------------------------|
-| =/usr/share/escenic/engine/import/<pub>/<job>=  | =/usr/share/escenic/engine/import/mypub/moo/01-convert-all-cows-to-ducks.xsl= | The transformers, such as XSLs       |
-| =/var/spool/escenic/import/<pub>/<job>/new=     | =/var/spool/escenic/import/mypub/moo/new=                                     | The 3rd party data (XML) feed        |
-| =/var/spool/escenic/import/<pub>/<job>/error=   | =/var/spool/escenic/import/mypub/moo/error=                                   | Failed 3rd party XML files           |
-| =/var/spool/escenic/import/<pub>/<job>/archive= | =/var/spool/escenic/import/mypub/moo/archive=                                 | Successful 3rd party XML files       |
-| =/etc/cron.hourly/<your cron script>=           | =/etc/cron.hourly/get-files-from-moo-ftp=                                     | Hourly cron job to get files via FTP |
-| =/var/log/escenic/cron.<your coron script>.log= | =/var/log/escenic/cron.get-files-from-moo-ftp.log=                            | Log for your cron job                |
-|-------------------------------------------------+-------------------------------------------------------------------------------+--------------------------------------|
+|-------------------------------------------------------------------------------+-------------------------------------------|
+| Path                                                                          | Description                               |
+|-------------------------------------------------------------------------------+-------------------------------------------|
+| =/usr/share/escenic/engine/import/<pub>/<job>=                                | The transformers, such as XSLs            |
+| =/usr/share/escenic/engine/import/mypub/moo/01-convert-all-cows-to-ducks.xsl= |                                           |
+| =/var/spool/escenic/import/<pub>/<job>/new=                                   | Input folder for the 3rd party (XML) data |
+| =/var/spool/escenic/import/mypub/moo/new=                                     |                                           |
+| =/var/spool/escenic/import/<pub>/<job>/error=                                 | Failed 3rd party XML files                |
+| =/var/spool/escenic/import/mypub/moo/error=                                   |                                           |
+| =/var/spool/escenic/import/<pub>/<job>/archive=                               | Successful imports of 3rd party files     |
+| =/var/spool/escenic/import/mypub/moo/archive=                                 |                                           |
+| =/etc/cron.hourly/<your cron script>=                                         | Cron script running every hour            |
+| =/etc/cron.hourly/get-files-from-moo-ftp=                                     |                                           |
+| =/var/log/escenic/cron.<your coron script>.log=                               | The log for your cron script              |
+| =/var/log/escenic/cron.get-files-from-moo-ftp.log=                            |                                           |
+|-------------------------------------------------------------------------------+-------------------------------------------|
 
 
 

From daae74a6da225d73a59dda30eaebcafd001c60e0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 22 Oct 2012 13:52:52 +0200
Subject: [PATCH 1489/2585] - added introductory section outlining the zip
 archive

---
 usr/share/doc/vizrt/vosa-handbook/import-jobs.org | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
index 43ec99a6..14ddffe8 100644
--- a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
+++ b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
@@ -4,6 +4,9 @@
 All file and directory names are to be lower cased with hyphens
 between sub words.
 
+All import jobs delivered to the VOSA operators is a =zip=
+archive with a strict structure, as defined in [[Specifying an import job]]
+
 ** Specifying an import job
 When creating a new import job for your project, the following
 structure is required. We're calling the import job =moo= since we're

From 1460f791a7dc5ef5975d286a84aaf2371605ef1e Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Mon, 22 Oct 2012 13:54:20 +0200
Subject: [PATCH 1490/2585] improved the build command

---
 usr/share/doc/vizrt/vosa-handbook/deployment.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/deployment.org b/usr/share/doc/vizrt/vosa-handbook/deployment.org
index 2721a710..7b2ffa85 100644
--- a/usr/share/doc/vizrt/vosa-handbook/deployment.org
+++ b/usr/share/doc/vizrt/vosa-handbook/deployment.org
@@ -5,7 +5,7 @@ the build script:
 
 #+BEGIN_SRC sh
 $ ssh <%= trail_builder_user %>@<%= trail_builder_host %>
-$ ./build.sh release
+$ ece-build
 #+END_SRC
 
 Once the build is done, the URI of the finished EAR file is printed in

From 11f58c130fe92f4f9eae06438835b7530bf5bc31 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 22 Oct 2012 13:56:20 +0200
Subject: [PATCH 1491/2585] - added more archive structure documentation

---
 usr/share/doc/vizrt/vosa-handbook/import-jobs.org | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
index 14ddffe8..1e3e95a0 100644
--- a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
+++ b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
@@ -28,6 +28,15 @@ the incoming data (normally XML) and the
 resulting Escenic XML will be imported into the Escenic Content
 Engine.
 
+#+BEGIN_SRC text
+<publication>/<import name>
+<publication>/<import name>/xsl
+<publication>/<import name>/cron.hourly
+#+END_SRC
+
+- publication name :: the name of the publication for which the import
+     job(s) are defined. You can have more than one publication in
+     each =zip= archive.
 - import job name :: lowercase with hyphens between words (if more
      than one)
 - xsl :: directory with files prefixed with =<number>-=, indicating

From 139a350ef4f2c582c34b66c99c5c0d4da5b0a876 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 22 Oct 2012 13:58:43 +0200
Subject: [PATCH 1492/2585] - re-ordered the import job specification, having
 the formal   definition before the examples is a good thing :)

---
 .../doc/vizrt/vosa-handbook/import-jobs.org   | 40 ++++++++++---------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
index 1e3e95a0..ad6041dd 100644
--- a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
+++ b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
@@ -9,7 +9,27 @@ archive with a strict structure, as defined in [[Specifying an import job]]
 
 ** Specifying an import job
 When creating a new import job for your project, the following
-structure is required. We're calling the import job =moo= since we're
+structure is required:
+
+#+BEGIN_SRC text
+<publication>/<import name>
+<publication>/<import name>/xsl/<number>-<transformer task>.xsl
+<publication>/<import name>/cron.hourly/<cron job script>
+#+END_SRC
+
+- publication name :: the name of the publication for which the import
+     job(s) are defined. You can have more than one publication in
+     each =zip= archive.
+- import job name :: lowercase with hyphens between words (if more
+     than one)
+- xsl :: directory with files prefixed with =<number>-=, indicating
+         the order of transformation to apply to your import job. 
+- cron.hourly :: scripts to be run every our. These will be put in
+                 =/etc/cron.hourly= on the import server. Be sure to
+                 set the execute bit on the file and note that as with
+                 all cron jobs, the file cannot have a file suffix.
+
+We're calling the import job =moo= since we're
 setting up an import feed from our imaginary content provider, "Moo
 Cool Videos" and our publication is the ubiquitous =mypub=.
 
@@ -28,24 +48,6 @@ the incoming data (normally XML) and the
 resulting Escenic XML will be imported into the Escenic Content
 Engine.
 
-#+BEGIN_SRC text
-<publication>/<import name>
-<publication>/<import name>/xsl
-<publication>/<import name>/cron.hourly
-#+END_SRC
-
-- publication name :: the name of the publication for which the import
-     job(s) are defined. You can have more than one publication in
-     each =zip= archive.
-- import job name :: lowercase with hyphens between words (if more
-     than one)
-- xsl :: directory with files prefixed with =<number>-=, indicating
-         the order of transformation to apply to your import job. 
-- cron.hourly :: scripts to be run every our. These will be put in
-                 =/etc/cron.hourly= on the import server. Be sure to
-                 set the execute bit on the file and note that as with
-                 all cron jobs, the file cannot have a file suffix.
-
 *** Pulling content from an FTP server
 We have ready made BASH libraries to do this. You only need to put a
 file in =mybub/moo/cron.hourly/get-files-from-moo-ftp= like:

From 9e45fb62400099db907cf2172124db97dbd3e787 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Mon, 22 Oct 2012 14:04:03 +0200
Subject: [PATCH 1493/2585] added tag and branch support

---
 usr/share/doc/vizrt/vosa-handbook/deployment.org | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/usr/share/doc/vizrt/vosa-handbook/deployment.org b/usr/share/doc/vizrt/vosa-handbook/deployment.org
index 7b2ffa85..d54d9eb7 100644
--- a/usr/share/doc/vizrt/vosa-handbook/deployment.org
+++ b/usr/share/doc/vizrt/vosa-handbook/deployment.org
@@ -3,11 +3,26 @@
 Log on to the build server as the user for the given habitat and run
 the build script:
 
+To log onto the builder:
 #+BEGIN_SRC sh
 $ ssh <%= trail_builder_user %>@<%= trail_builder_host %>
+#+END_SRC
+
+To build trunk:
+#+BEGIN_SRC sh
 $ ece-build
 #+END_SRC
 
+To build from a tag in subversion:
+#+BEGIN_SRC sh
+$ ece-build -t <tagname>
+#+END_SRC
+
+To build trunk:
+#+BEGIN_SRC sh
+$ ece-build -b <branchname>
+#+END_SRC
+
 Once the build is done, the URI of the finished EAR file is printed in
 the shell. This is the URI you use for the 'ece deploy' command below.
 

From 38c005df868cb7aad7e8250472da73f6cf648e02 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Mon, 22 Oct 2012 16:38:00 +0200
Subject: [PATCH 1494/2585] Added how to build an ear from the chatroom

---
 .../doc/vizrt/vosa-handbook/deployment.org    | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/usr/share/doc/vizrt/vosa-handbook/deployment.org b/usr/share/doc/vizrt/vosa-handbook/deployment.org
index d54d9eb7..f326ddc2 100644
--- a/usr/share/doc/vizrt/vosa-handbook/deployment.org
+++ b/usr/share/doc/vizrt/vosa-handbook/deployment.org
@@ -1,5 +1,27 @@
 * Deployment
 ** Building a new EAR file
+*** Build from from your Hipchat room
+You can start a build right from your chatroom!
+
+Go to the <%= trail_customer_shortname %> Hipchat room named: <%= trail_customer_hipchat_room_name %> or goto Hipchat in your [[https://vizrtcustomers.hipchat.com/chat][browser]].
+
+when you are in the chatroom type:
+#+BEGIN_SRC sh
+guru: build trunk
+#+END_SRC
+(As of this writing it was not possible to build from a tag or a branch yet)
+
+The chatroom will report on the progress of your build but if you are impatient you can type:
+#+BEGIN_SRC sh
+guru: jobs
+#+END_SRC
+
+Once the build is done, the URI of the finished EAR file is printed in
+the chat room. This is the URI you use for the 'ece deploy' command below.
+
+In future you will also be able to deploy an ear to staging in the chatroom.
+
+*** Build from the command line on your builder
 Log on to the build server as the user for the given habitat and run
 the build script:
 

From 5c9eeebcc0b553c3aa7569f285da97229cd5078d Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Mon, 22 Oct 2012 16:55:36 +0200
Subject: [PATCH 1495/2585] Added a section to describe the prerequisites to
 deploy to production

---
 .../doc/vizrt/vosa-handbook/deployment.org    | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/deployment.org b/usr/share/doc/vizrt/vosa-handbook/deployment.org
index f326ddc2..8a7ca34b 100644
--- a/usr/share/doc/vizrt/vosa-handbook/deployment.org
+++ b/usr/share/doc/vizrt/vosa-handbook/deployment.org
@@ -1,5 +1,8 @@
 * Deployment
 ** Building a new EAR file
+In the examples here, we have a build server on <%= trail_builder_host %>
+where we build EARs for the the <%= trail_builder_user %> website.
+
 *** Build from from your Hipchat room
 You can start a build right from your chatroom!
 
@@ -52,6 +55,17 @@ the shell. This is the URI you use for the 'ece deploy' command below.
 In the examples here, we have a build server on <%= trail_builder_host %>
 where we build EARs for the the <%= trail_builder_user %> website.
 
+** Deploying to a production system
+Deployments to production are only done by operators in the Support group of Vizrt Online in Dhaka or Oslo.
+If you are getting ready to depoy to a production system you have to check the following prerequisites:
+1. Has the EAR been properly tested?
+2. Do the release notes match the changes made to the codes and do they make sense?
+3. Are the changes in the EAR causing you to feel that the service will fail after deploy?
+4. Is there a valid rollback scenario after deploying the change?
+5. Is someone you trust available to help you if you run into trouble rolling back?
+6. Does the site on staging show the differences expected when reading the release notes?
+If any of these prerequisites is not in place you should refuse the deploy request and notify the user how they can convince you to perform the deploy.
+
 ** Make sure you can roll back
 Before deploying a new EAR, take note of the previously deployed EAR
 so that you can easily roll back:
@@ -64,7 +78,8 @@ $ sudo ssh escenic@<%= trail_presentation_host %> ece -i engine1 info
 [ece#engine-engine1] |-> MD5 sum: 58638b16efc7f4cebd8d0acb4eecfb40
 #+END_SRC
 
-If anything goes wrong in [[Deploying a new EAR file for an ECE
+
+If anything goes wrong in [[Deploying%20a%20new%20EAR%20file%20for%20an%20ECE%0Ainstance][Deploying a new EAR file for an ECE
 instance]], you can just repeat the deployment steps with the URL of the
 previous EAR.
 
@@ -116,7 +131,7 @@ torstein@control:~$ sudo ssh escenic@<%= trail_presentation_host %> ece
 
 
 ** Updating Publication Resources
-This document describes how you update publication resources. Here, we
+This section describes how you update publication resources. Here, we
 use content-type as an example.
 
 The content type publication resource is special because it's merged

From 5019055d25c44c94027d0fae4e4a8acb4cb961ae Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Mon, 22 Oct 2012 17:45:09 +0200
Subject: [PATCH 1496/2585] Added more wisdom to the deploy checklists

---
 .../doc/vizrt/vosa-handbook/deployment.org    | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/deployment.org b/usr/share/doc/vizrt/vosa-handbook/deployment.org
index 8a7ca34b..607a6f07 100644
--- a/usr/share/doc/vizrt/vosa-handbook/deployment.org
+++ b/usr/share/doc/vizrt/vosa-handbook/deployment.org
@@ -55,10 +55,24 @@ the shell. This is the URI you use for the 'ece deploy' command below.
 In the examples here, we have a build server on <%= trail_builder_host %>
 where we build EARs for the the <%= trail_builder_user %> website.
 
-** Deploying to a production system
+*** Preparing to deploy to production
+If you have changes to be deployed to production you should follow the next checklist:
+1. Find out whitch EAR is running in production today.
+2. Ensure that your EAR is running on staging and a smoketest has been performed.
+2. Make release notes:
+  1. Collect all subversion changes that have made it into the EAR that you want to deploy by reviewing all Subversion commits since the last deploy.
+  2. List all the Jira from those Subversion commits.
+  3. Ensure that all those Jira issues are tested on staging and closed. If you cannot close one, make a new issue for the resulting work and close it anyway.
+3. Copy and paste the list of Jira issues in a support case (by email or otherwise) and make sure that the subject contains the name of the EAR file.
+4. Expect the support team to perform the deploy within 24 hours or call the support phonnumber ask ask them to do it earlier.
+5. If you are a support engineer yourself ask one of your colleagues to deploy to production and follow the checklist there. You shoud not prepare a deploy and than go ahead and deploy it yourself :-).
+
+*** Deploying to a production system
 Deployments to production are only done by operators in the Support group of Vizrt Online in Dhaka or Oslo.
-If you are getting ready to depoy to a production system you have to check the following prerequisites:
-1. Has the EAR been properly tested?
+If you are getting ready to depoy to a production system you have to follow the next checklist:
+0. Verify that you are not the same person who did the changes to the codes :-)
+1. Has the EAR been properly release tested?
+1. Has the EAR been properly smoke tested?
 2. Do the release notes match the changes made to the codes and do they make sense?
 3. Are the changes in the EAR causing you to feel that the service will fail after deploy?
 4. Is there a valid rollback scenario after deploying the change?
@@ -66,6 +80,7 @@ If you are getting ready to depoy to a production system you have to check the f
 6. Does the site on staging show the differences expected when reading the release notes?
 If any of these prerequisites is not in place you should refuse the deploy request and notify the user how they can convince you to perform the deploy.
 
+
 ** Make sure you can roll back
 Before deploying a new EAR, take note of the previously deployed EAR
 so that you can easily roll back:
@@ -83,7 +98,7 @@ If anything goes wrong in [[Deploying%20a%20new%20EAR%20file%20for%20an%20ECE%0A
 instance]], you can just repeat the deployment steps with the URL of the
 previous EAR.
 
-*** Deploying a new EAR file for an ECE instance
+** Deploying a new EAR file for an ECE instance
 All the commands in this section is written to be executed on
 <%= trail_control_host %> (but you could of course also first log on to each
 of the servers and run the commands locally there).
@@ -114,7 +129,7 @@ $ sudo ssh root@<%= trail_presentation_host %> /etc/init.d/ece status
 [ece#search-search1] UP 0d 0h 11m 42s
 #+END_SRC
 
-*** Deploying a new EAR file for a search instance
+** Deploying a new EAR file for a search instance
 The search instance is special in that you have to specify the type
 parameter. Apart from this, the command is identical. You'll see that
 the search instance has a different deployment white list than that of

From 136037f8432b2c6f45a7c513be689c0959babcfd Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 23 Oct 2012 12:27:08 +0200
Subject: [PATCH 1497/2585] - added common library functions
 verify_writable_dir_list and   verify_readable_dir_list, both which accepts a
 list of directories   and checks if the current user has write or read access
 to each of   them. If any fail, the functions makes your program exit with
 status   1, printing stack trace and so on.

---
 usr/share/escenic/ece-scripts/common-io.sh | 29 ++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/common-io.sh b/usr/share/escenic/ece-scripts/common-io.sh
index ff55996d..d387dd0f 100644
--- a/usr/share/escenic/ece-scripts/common-io.sh
+++ b/usr/share/escenic/ece-scripts/common-io.sh
@@ -202,3 +202,32 @@ function get_file_age_in_seconds() {
   
   echo $(( now - changed ))
 }
+
+## Verifies that the passed list of directories exist and are
+## writeable by $USER. If not, the program will exit.
+##
+## $@ : a list of directories
+function verify_writable_dir_list() {
+  for dir in "$@"; do
+    if [ ! -w $dir ]; then
+      print_and_log "The directory $dir must exist and be writable by" \
+        "by $USER for $(basename $0) to work" 
+      remove_pid_and_exit_in_error
+    fi
+  done
+}
+
+## Verifies that the passed list of directories exist and are
+## readable by $USER. If not, the program will exit.
+##
+## $@ : a list of directories
+function verify_readable_dir_list() {
+  for dir in "$@"; do
+    if [ ! -r $dir ]; then
+      print_and_log "The directory $dir must exist and be readable by" \
+        "by $USER for $(basename $0) to work" 
+      remove_pid_and_exit_in_error
+    fi
+  done
+}
+

From 56e058505b973d4ee923157f8058651ab502f69e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 23 Oct 2012 12:29:49 +0200
Subject: [PATCH 1498/2585] - added ece-import which will run one VOSA import
 job one time. The   output is XML suitable for the standard Escenic
 Syndication XML   import job.  The script can also create an import job from
 an import   job archive.

  It's not yet ready, but can already apply four kinds of
  transformations: XSL, BASH, Python & Perl.

  See /usr/share/doc/vizrt/vosa-handbook/import-jobs.org for more
  details on the structures this command operates on.
---
 usr/bin/ece-import | 167 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 167 insertions(+)
 create mode 100644 usr/bin/ece-import

diff --git a/usr/bin/ece-import b/usr/bin/ece-import
new file mode 100644
index 00000000..7506720d
--- /dev/null
+++ b/usr/bin/ece-import
@@ -0,0 +1,167 @@
+#! /usr/bin/env bash
+
+## Runs one VOSA import job one time. The output is XML suitable for
+## the standard Escenic Syndication XML import job.
+##
+## The script can also create an import job from an import job archive
+
+common_libraries="
+  /usr/share/escenic/ece-scripts/common-bashing.sh
+  /usr/share/escenic/ece-scripts/common-io.sh
+"
+
+for el in $common_libraries; do
+  source $el || {
+    echo "$(basename $0): Could not load the library $el," \
+      "and I can't live without it :-(" | fmt
+    exit 1
+  }
+done
+
+
+pid_file=/var/run/escenic/$(basename $0).pid
+log=/var/log/escenic/$(basename $0).log
+
+job_name=""
+publication_name=""
+transformers_base_dir=/usr/share/escenic/import
+raw_spool_base_dir=/var/spool/escenic/raw
+escenic_spool_base_dir=/var/spool/escenic/import
+
+COMMAND_IMPORT=1
+COMMAND_CRETAE_IMPORT_CONFIGURATION=1
+command=COMMAND_IMPORT
+
+function get_user_input() {
+  local next_is_name=0
+  local next_is_publication=0
+  
+  for el in $@; do
+    if [[ "$el" == "-n" || "$el" == "--name" ]]; then
+      next_is_name=1
+    elif [[ "$el" == "-p" || "$el" == "--publication" ]]; then
+      next_is_publication=1
+    elif [ $next_is_name -eq 1 ]; then
+      job_name=$el
+      next_is_name=0
+    elif [ $next_is_publication -eq 1 ]; then
+      publication_name=$el
+      next_is_publication=0
+    else
+      if [[ "$el" == "create" ]]; then
+        command=COMMAND_CRETAE_IMPORT_CONFIGURATION
+      fi
+    fi
+  done
+
+  if [ -z $job_name ]; then
+    print_and_log "You must specify which import job to run"
+    print_and_log "E.g.: $(basename $0) --name video"
+    remove_pid_and_exit_in_error
+  fi
+
+  print_and_log "Running the import job $job_name"
+}
+
+function check_pre_requisites() {
+  local required_dir_list="
+    $(dirname $pid_file)
+    $(dirname $log)
+    ${raw_spool_base_dir}
+    ${escenic_spool_base_dir}
+    ${transformers_base_dir}
+  "
+  for dir in $required_dir_list; do
+    if [ ! -w $dir ]; then
+      echo "The directory $dir must exist and be writable by user $USER" \
+        " for $(basename $0) to work" | fmt
+      exit 1
+    fi
+  done
+
+  local required_command_list="
+    xsltproc
+  "
+  
+  for el in $required_command_list; do
+    which $el > /dev/null 2>/dev/null
+    if [ $? -gt 0 ]; then
+      print_and_log "$(basename $0) needs the command $el to be installed"
+      remove_pid_and_exit_in_error
+    fi
+  done
+
+  if [ ! -d $transformers_base_dir/$job_name ]; then
+    print_and_log $transformers_base_dir/$job_name "doesn't exist :-("
+    remove_pid_and_exit_in_error
+  fi
+
+  for el in new archive error; do
+    local dir=$escenic_spool_base_dir/$job_name/$el
+    if [ ! -d ${dir} ]; then
+      print_and_log ${dir} "doesn't exist, I will try to create it."
+      make_dir ${dir}
+    fi
+  done
+
+}
+
+function perform_transformations() {
+  find $raw_spool_base_dir/$job_name -type f | while read f; do
+    print_and_log "Importing raw XML $f ..."
+    local i=0
+    for el in $transformers_base_dir/$job_name/[0-9]*; do
+      if [[ "$el" == *".sh" ]]; then
+        log "Applying transformation $(basename $el) to $f"
+        echo bash $el $f
+      elif [[ "$el" == *".xsl" ]]; then
+        log "Applying transformation $(basename $el) to $f"
+        echo xsltproc --output $(basename $f).tmp $el $f 
+        echo run mv $(basename $f).tmp $(basename $f)
+      elif [[ "$el" == *".pl" ]]; then
+        log "Applying transformation $(basename $el) to $f"
+        echo perl $el $f
+      elif [[ "$el" == *".py" ]]; then
+        log "Applying transformation $(basename $el) $f"
+        echo python $el $f
+      fi
+      i=$(( i + 1 ))
+    done
+
+    log "Applied $i transformations to $f, moving it to " \
+      $escenic_spool_base_dir/$job_name/new
+    echo run mv $f $escenic_spool_base_dir/$job_name/new
+  done
+}
+
+function verify_import_job_configuration() {
+  verify_writable_dir_list \
+    $raw_spool_base_dir/$job_name \
+    $escenic_spool_base_dir/$job_name/new \
+    $escenic_spool_base_dir/$job_name/archive \
+    $escenic_spool_base_dir/$job_name/error
+  verify_readable_dir_list $transformers_base_dir/$job_name
+
+  local tranformation_count=$(
+    ls $transformers_base_dir/$job_name | \
+    grep ^[0-9] | \
+    egrep ".sh$|.pl|.py" | \
+    wc -l
+  )
+  
+  if [ $tranformation_count -lt 1 ]; then
+    print_and_log "$(yellow WARNING) No transformers found in" \
+      "$transformers_base_dir/${job_name}, I'm assuming the incoming" \
+      "data is already tranformed into Escenic Syndication XML"
+  fi
+}
+
+check_pre_requisites
+create_pid_if_doesnt_exist $pid_file
+print_and_log "Started @ $(date)"
+print "I'm logging to $log"
+get_user_input "$@"
+verify_import_job_configuration
+perform_transformations
+print_and_log "Finished @ $(date)"
+remove_pid_if_exists $pid_file

From c5ef8bef7ef7b15ff46451034c8cd83a6898ee61 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 23 Oct 2012 16:37:07 +0200
Subject: [PATCH 1499/2585] - first working version of ece-import, juhu!

  Given two import XML files from a third party source, such as video
  meta data:

    /var/spool/escenic/raw/mypub/video/video.xml
    /var/spool/escenic/raw/mypub/video/arne.xml

  and publication=mypub and import job name=video, the script is
  invoked like:

    $ ece-import --name video --publication mypub
    [ece-import-0] Started @ Tue Oct 23 16:31:29 CEST 2012
    [ece-import-0] I'm logging to /var/log/escenic/ece-import.log
    [ece-import-0] Running the import job video
    [ece-import-0] Importing raw XML #1: arne.xml ...
    [ece-import-0] Importing raw XML #2: video.xml ...
    [ece-import-0] Finished @ Tue Oct 23 16:31:29 CEST 2012

  As you may have guessed, the log file has more details:

    [ece-import-0] Started @ Tue Oct 23 16:31:29 CEST 2012
    [ece-import-0] Running the import job video
    [ece-import-0] Importing raw XML #1: arne.xml ...
    [ece-import-0] Applying transformation 01-add-line-break.sh to /var/spool/escenic/raw/mypub/video/arne.xml
    [ece-import-0] Applying transformation 02-select-name-element.xsl to /var/spool/escenic/raw/mypub/video/arne.xml
    [ece-import-0] Applying transformation 03-add-date-in-comment.sh to /var/spool/escenic/raw/mypub/video/arne.xml
    [ece-import-0] Applying transformation 04-massage-xml.sh to /var/spool/escenic/raw/mypub/video/arne.xml
    [ece-import-0] Applying transformation 05-kissed-by-a-python.py /var/spool/escenic/raw/mypub/video/arne.xml
    [ece-import-0] Applied transformations to /var/spool/escenic/raw/mypub/video/arne.xml
    [ece-import-0] Moving /var/spool/escenic/raw/mypub/video/arne.xml to /var/spool/escenic/import/mypub/video/new/arne.xml
    [ece-import-0] Importing raw XML #2: video.xml ...
    [ece-import-0] Applying transformation 01-add-line-break.sh to /var/spool/escenic/raw/mypub/video/video.xml
    [ece-import-0] Applying transformation 02-select-name-element.xsl to /var/spool/escenic/raw/mypub/video/video.xml
    [ece-import-0] Applying transformation 03-add-date-in-comment.sh to /var/spool/escenic/raw/mypub/video/video.xml
    [ece-import-0] Applying transformation 04-massage-xml.sh to /var/spool/escenic/raw/mypub/video/video.xml
    [ece-import-0] Applying transformation 05-kissed-by-a-python.py /var/spool/escenic/raw/mypub/video/video.xml
    [ece-import-0] Applied transformations to /var/spool/escenic/raw/mypub/video/video.xml
    [ece-import-0] Moving /var/spool/escenic/raw/mypub/video/video.xml to /var/spool/escenic/import/mypub/video/new/video.xml
    [ece-import-0] Finished @ Tue Oct 23 16:31:29 CEST 2012

  This import can be automated by having one cron entry per import
  job, they will all call the ece-import script with different
  parameters.

- ece-import itself only returns code=1 (error) if there's something
  wrong with the setup of the import jobs. Errors in the
  transformations of the import data files are flagged as ERROR in the
  log, but ece-import itself doesn't exit in error, but continues onto
  the next import data file.

- ece-import uses common libraries such as common-os.sh and
  common-io.sh
---
 usr/bin/ece-import | 158 ++++++++++++++++++++++++++++++++-------------
 1 file changed, 113 insertions(+), 45 deletions(-)

diff --git a/usr/bin/ece-import b/usr/bin/ece-import
index 7506720d..2fa83fd1 100644
--- a/usr/bin/ece-import
+++ b/usr/bin/ece-import
@@ -4,6 +4,9 @@
 ## the standard Escenic Syndication XML import job.
 ##
 ## The script can also create an import job from an import job archive
+## 
+##  See /usr/share/doc/vizrt/vosa-handbook/import-jobs.org for more
+##  details on the structures this command operates on.
 
 common_libraries="
   /usr/share/escenic/ece-scripts/common-bashing.sh
@@ -35,18 +38,24 @@ command=COMMAND_IMPORT
 function get_user_input() {
   local next_is_name=0
   local next_is_publication=0
+  local next_is_conf_file=0
   
   for el in $@; do
     if [[ "$el" == "-n" || "$el" == "--name" ]]; then
       next_is_name=1
     elif [[ "$el" == "-p" || "$el" == "--publication" ]]; then
       next_is_publication=1
+    elif [[ "$el" == "-f" || "$el" == "--conf-file" ]]; then
+      next_is_conf_file=1
     elif [ $next_is_name -eq 1 ]; then
       job_name=$el
       next_is_name=0
     elif [ $next_is_publication -eq 1 ]; then
       publication_name=$el
       next_is_publication=0
+    elif [ $next_is_conf_file -eq 1 ]; then
+      conf_file=$el
+      next_is_conf_file=0
     else
       if [[ "$el" == "create" ]]; then
         command=COMMAND_CRETAE_IMPORT_CONFIGURATION
@@ -54,9 +63,23 @@ function get_user_input() {
     fi
   done
 
+  local errors=0
   if [ -z $job_name ]; then
     print_and_log "You must specify which import job to run"
     print_and_log "E.g.: $(basename $0) --name video"
+    errors=1
+  fi
+  if [ -z $publication_name ]; then
+    print_and_log "You must specify the publication name"
+    print_and_log "E.g.: $(basename $0) --publication mypub"
+    errors=1
+  fi
+  if [ -n "${conf_file}" -a ! -r "${conf_file}" ]; then
+    print_and_log "You have specified a print job conf file" \
+      "but it doesn't exist :-()"
+    remove_pid_and_exit_in_error
+  fi
+  if [ $errors -eq 1 ]; then
     remove_pid_and_exit_in_error
   fi
 
@@ -81,6 +104,7 @@ function check_pre_requisites() {
 
   local required_command_list="
     xsltproc
+    xmllint
   "
   
   for el in $required_command_list; do
@@ -90,63 +114,107 @@ function check_pre_requisites() {
       remove_pid_and_exit_in_error
     fi
   done
+}
 
-  if [ ! -d $transformers_base_dir/$job_name ]; then
-    print_and_log $transformers_base_dir/$job_name "doesn't exist :-("
-    remove_pid_and_exit_in_error
-  fi
-
-  for el in new archive error; do
-    local dir=$escenic_spool_base_dir/$job_name/$el
-    if [ ! -d ${dir} ]; then
-      print_and_log ${dir} "doesn't exist, I will try to create it."
-      make_dir ${dir}
+## $1 :: file
+function perform_transformations() {
+  local i=0
+  for el in $transformers_base_dir/$publication_name/$job_name/[0-9]*; do
+    if [[ "$el" == *".sh" ]]; then
+      log "Applying transformation $(basename $el) to $1"
+      bash $el $1 >> $log 2>> $log
+      
+      if [ $? -gt 0 ]; then
+        log "$(red FAILED) The transformation $el on file $1" \
+          "moving $1 to the error directory and skipping to next import XML"
+        run mv $1 $escenic_spool_base_dir/$publication_name/$job_name/error
+        return
+      fi
+    elif [[ "$el" == *".xsl" ]]; then
+      log "Applying transformation $(basename $el) to $1"
+      xsltproc --output ${1}.tmp ${el} ${1} >> $log 2>> $log
+      
+      if [ $? -gt 0 ]; then
+        log "$(red FAILED) The transformation $el on file $1" \
+          "moving $1 to the error directory and skipping to next import XML"
+        run mv $1 $escenic_spool_base_dir/$publication_name/$job_name/error
+        return
+      else
+        run mv ${1}.tmp ${1}
+      fi
+    elif [[ "$el" == *".pl" ]]; then
+      log "Applying transformation $(basename $el) to $1"
+      perl $el $1 >> $log 2>> $log
+      if [ $? -gt 0 ]; then
+        log "$(red FAILED) The transformation $el on file $1" \
+          "moving $f to the error directory and skipping to next import XML"
+        run mv $1 $escenic_spool_base_dir/$publication_name/$job_name/error
+        return
+      fi
+    elif [[ "$el" == *".py" ]]; then
+      log "Applying transformation $(basename $el) $1"
+      python $el $f >> $log 2>> $log
+      if [ $? -gt 0 ]; then
+        log "$(red FAILED) The transformation $el on file $1" \
+          "moving $1 to the error directory and skipping to next import XML"
+        run mv $1 $escenic_spool_base_dir/$publication_name/$job_name/error
+        return
+      fi
     fi
+    i=$(( i + 1 ))
   done
+}
 
+function import_raw_files() {
+  raw_file_count=0
+  for f in $(find $raw_spool_base_dir/$publication_name/$job_name -type f); do
+    raw_file_count=$(( raw_file_count + 1 ))
+    print_and_log "Importing raw XML #${raw_file_count}: $(basename $f) ..."
+    perform_transformations $f
+
+    log "Applied $i transformations to $f"
+    if [ $(check_escenic_xml $f) -eq 0 ]; then
+      log "Moving $f to" \
+        $escenic_spool_base_dir/$publication_name/$job_name/new/$(basename $f)
+      run mv $f $escenic_spool_base_dir/$publication_name/$job_name/new
+    fi
+  done
 }
 
-function perform_transformations() {
-  find $raw_spool_base_dir/$job_name -type f | while read f; do
-    print_and_log "Importing raw XML $f ..."
-    local i=0
-    for el in $transformers_base_dir/$job_name/[0-9]*; do
-      if [[ "$el" == *".sh" ]]; then
-        log "Applying transformation $(basename $el) to $f"
-        echo bash $el $f
-      elif [[ "$el" == *".xsl" ]]; then
-        log "Applying transformation $(basename $el) to $f"
-        echo xsltproc --output $(basename $f).tmp $el $f 
-        echo run mv $(basename $f).tmp $(basename $f)
-      elif [[ "$el" == *".pl" ]]; then
-        log "Applying transformation $(basename $el) to $f"
-        echo perl $el $f
-      elif [[ "$el" == *".py" ]]; then
-        log "Applying transformation $(basename $el) $f"
-        echo python $el $f
-      fi
-      i=$(( i + 1 ))
-    done
+## $1 :: the XML
+function check_escenic_xml() {
+  if [ ! -e $1 ]; then
+    echo 1
+    return
+  fi
+  
+  xmllint --format $1 > /dev/null 2>&1
+  if [ $? -gt 0 ]; then
+    log $(yellow WARNING) "XML #${raw_file_count} after transformations," \
+      $f "isn't well formed XML. Importing it into Escenic Content Engine" \
+      " will fail, so I'll move it to" \
+      $escenic_spool_base_dir/$publication_name/$job_name/error
+    run mv $1 $escenic_spool_base_dir/$publication_name/$job_name/error
+    echo 1
+    return
+  fi
 
-    log "Applied $i transformations to $f, moving it to " \
-      $escenic_spool_base_dir/$job_name/new
-    echo run mv $f $escenic_spool_base_dir/$job_name/new
-  done
+  echo 0
 }
 
 function verify_import_job_configuration() {
   verify_writable_dir_list \
-    $raw_spool_base_dir/$job_name \
-    $escenic_spool_base_dir/$job_name/new \
-    $escenic_spool_base_dir/$job_name/archive \
-    $escenic_spool_base_dir/$job_name/error
-  verify_readable_dir_list $transformers_base_dir/$job_name
+    $raw_spool_base_dir/$publication_name/$job_name \
+    $escenic_spool_base_dir/$publication_name/$job_name/new \
+    $escenic_spool_base_dir/$publication_name/$job_name/archive \
+    $escenic_spool_base_dir/$publication_name/$job_name/error
+  verify_readable_dir_list $transformers_base_dir/$publication_name/$job_name
 
   local tranformation_count=$(
-    ls $transformers_base_dir/$job_name | \
-    grep ^[0-9] | \
-    egrep ".sh$|.pl|.py" | \
-    wc -l
+    ls $transformers_base_dir/$publication_name/$job_name | \
+      grep ^[0-9] | \
+      egrep ".sh$|.pl|.py" | \
+      wc -l
   )
   
   if [ $tranformation_count -lt 1 ]; then
@@ -162,6 +230,6 @@ print_and_log "Started @ $(date)"
 print "I'm logging to $log"
 get_user_input "$@"
 verify_import_job_configuration
-perform_transformations
+import_raw_files
 print_and_log "Finished @ $(date)"
 remove_pid_if_exists $pid_file

From 828173b6793dcec1a5b3ae16fe219c310e19cb48 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 23 Oct 2012 16:48:57 +0200
Subject: [PATCH 1500/2585] - added
 mypub/video/cron.every.10.minutes/do-something - added
 mypub/video/cron.every.10.hours/do-something-else

---
 usr/share/doc/vizrt/vosa-handbook/import-jobs.org | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
index ad6041dd..d7c9c847 100644
--- a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
+++ b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
@@ -15,6 +15,8 @@ structure is required:
 <publication>/<import name>
 <publication>/<import name>/xsl/<number>-<transformer task>.xsl
 <publication>/<import name>/cron.hourly/<cron job script>
+<publication>/<import name>/cron.every.<number>.minutes/<cron job script>
+<publication>/<import name>/cron.every.<number>.hours/<cron job script>
 #+END_SRC
 
 - publication name :: the name of the publication for which the import

From e429ac0c92a801753261bd0694b1703e6511579a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 24 Oct 2012 10:47:56 +0200
Subject: [PATCH 1501/2585] - updated the fall back URL, 
 mirrorservice.nomedia.no was just   hanging.

---
 usr/share/escenic/ece-scripts/common-os.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index 113dc412..f797cce2 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -8,7 +8,7 @@
 common_bashing_is_loaded > /dev/null 2>&1 || source $(pwd)/common-bashing.sh
 
 ## Only used if the Tomcat download mirror couldn't be determined
-fallback_tomcat_url="http://mirrorservice.nomedia.no/apache.org/tomcat/tomcat-6/v6.0.35/bin/apache-tomcat-6.0.35.tar.gz"
+fallback_tomcat_url="http://apache.komsys.org/tomcat/tomcat-6/v6.0.36/bin/apache-tomcat-6.0.36.tar.gz"
 
 wget_opts="--continue --inet4-only --quiet"
 

From a1607ee73b252e089c00f7c25dc8e20ae659636c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 24 Oct 2012 14:37:32 +0200
Subject: [PATCH 1502/2585] - added optional second parameter to
 common-bashing::extract_archive,   namely target directory.

---
 .../escenic/ece-scripts/common-bashing.sh     | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index d5168e06..908869b8 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -235,14 +235,27 @@ function is_archive_healthy() {
   fi
 }
 
-## $1 : the archive
+## $1 :: the archive
+## $2 :: optionally, the target directory
 function extract_archive() {
   if [[ "$1" == *".tar.gz" || "$1" == *".tgz" ]]; then
-    run tar xzf $1
+    if [[ -n "$2" && -d "$2" ]]; then
+      run tar xzf $1 -C $2
+    else
+      run tar xzf $1
+    fi
   elif [[ "$1" == *".tar.bz2" ]]; then
-    run tar xjf $1
+    if [[ -n "$2" && -d "$2" ]]; then
+      run tar xjf $1 -C $2
+    else
+      run tar xjf $1
+    fi
   elif [[ "$1" == *".zip" ]]; then
-    run unzip -q $1
+    if [[ -n "$2" && -d "$2" ]]; then
+      run unzip -q $1 -d $2
+    else
+      run unzip -q $1
+    fi
   fi
 }
 

From c4fcbf760c7fb94cf0b3de6b4413c706f8d3890a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 24 Oct 2012 14:53:00 +0200
Subject: [PATCH 1503/2585] - added commmon-bashing::create_pid_if_doesnt_exist
 and   common-bashing::remove_pid_if_exists

---
 .../escenic/ece-scripts/common-bashing.sh     | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index 908869b8..cc52cc3a 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -329,3 +329,29 @@ function split_string() {
 
   echo $splitted_string
 }
+
+## Creates $1 PID file if possible
+function create_pid_if_doesnt_exist() {
+  if [ -z $1 ]; then
+    return
+  elif [ -e $1 ]; then
+    return
+  fi    
+  
+  local dir=$(dirname $1)
+  if [ ! -w $dir ]; then
+    print_and_log "The PID file couldn't be created because" \
+      $dir "either didn't exist or wasn't writable"
+    return
+  fi
+  
+  touch $1
+}
+
+function remove_pid_if_exists() {
+  if [ -z $1 ]; then
+    return
+  elif [ ! -e $1 ]; then
+    return
+  fi
+}

From b2a5ccd6fc408ad8246f9d2bb22a03a8781f39bf Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 24 Oct 2012 15:25:29 +0200
Subject: [PATCH 1504/2585] - xsl -> transformers - more examples

---
 .../doc/vizrt/vosa-handbook/import-jobs.org   | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
index d7c9c847..e29d1c5f 100644
--- a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
+++ b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
@@ -13,10 +13,8 @@ structure is required:
 
 #+BEGIN_SRC text
 <publication>/<import name>
-<publication>/<import name>/xsl/<number>-<transformer task>.xsl
+<publication>/<import name>/transformers/<number>-<transformer task>.xsl
 <publication>/<import name>/cron.hourly/<cron job script>
-<publication>/<import name>/cron.every.<number>.minutes/<cron job script>
-<publication>/<import name>/cron.every.<number>.hours/<cron job script>
 #+END_SRC
 
 - publication name :: the name of the publication for which the import
@@ -24,8 +22,11 @@ structure is required:
      each =zip= archive.
 - import job name :: lowercase with hyphens between words (if more
      than one)
-- xsl :: directory with files prefixed with =<number>-=, indicating
-         the order of transformation to apply to your import job. 
+- transformers :: directory with files prefixed with =<number>-=, indicating
+                  the order of transformation to apply to your import job. If
+                  this is a =xsl= file, the escenic importer will run
+                  =xsltproc= on the file, whereas =.sh= files will be
+                  run in a =bash= wrapper.
 - cron.hourly :: scripts to be run every our. These will be put in
                  =/etc/cron.hourly= on the import server. Be sure to
                  set the execute bit on the file and note that as with
@@ -37,14 +38,15 @@ Cool Videos" and our publication is the ubiquitous =mypub=.
 
 #+BEGIN_SRC text
 $ unzip -t import-jobs.zip
-mypub/moo/xsl/01-convert-all-cows-to-ducks.xsl
-mypub/moo/xsl/02-convert-duck-to-escenic-xml.xsl
+mypub/moo/transformers/01-fix-encoding.sh
+mypub/moo/transformers/02-convert-all-cows-to-ducks.xsl
+mypub/moo/transformers/02-convert-duck-to-escenic-xml.xsl
 mypub/moo/cron.hourly/get-files-from-moo-ftp
-otherpub/foo/xsl/01-convert-from-foo-to-escenic-xml.xsl
+otherpub/foo/transformers/01-convert-from-foo-to-escenic-xml.xsl
 #+END_SRC
 
 As you can guess from the file names, the
-=01-convert-all-cows-to-ducks.xsl= stylesheet will be first applied to
+=02-convert-all-cows-to-ducks.xsl= stylesheet will be first applied to
 the incoming data (normally XML) and the
 =02-convert-duck-to-escenic-xml.xsl= will be applied next before the
 resulting Escenic XML will be imported into the Escenic Content
@@ -102,7 +104,7 @@ these directories.
 | Path                                                                          | Description                               |
 |-------------------------------------------------------------------------------+-------------------------------------------|
 | =/usr/share/escenic/engine/import/<pub>/<job>=                                | The transformers, such as XSLs            |
-| =/usr/share/escenic/engine/import/mypub/moo/01-convert-all-cows-to-ducks.xsl= |                                           |
+| =/usr/share/escenic/engine/import/mypub/moo/02-convert-all-cows-to-ducks.xsl= |                                           |
 | =/var/spool/escenic/import/<pub>/<job>/new=                                   | Input folder for the 3rd party (XML) data |
 | =/var/spool/escenic/import/mypub/moo/new=                                     |                                           |
 | =/var/spool/escenic/import/<pub>/<job>/error=                                 | Failed 3rd party XML files                |

From c3057a4c7f3267376de99dbb8be8fd67110bea0b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 24 Oct 2012 16:04:02 +0200
Subject: [PATCH 1505/2585] - added section on setting up a new import job
 using the new   'ece-import create' command.

---
 .../doc/vizrt/vosa-handbook/import-jobs.org   | 66 ++++++++++++++-----
 1 file changed, 50 insertions(+), 16 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
index e29d1c5f..6cd78bc1 100644
--- a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
+++ b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
@@ -15,6 +15,7 @@ structure is required:
 <publication>/<import name>
 <publication>/<import name>/transformers/<number>-<transformer task>.xsl
 <publication>/<import name>/cron.hourly/<cron job script>
+<publication>/<import name>/cron.every.<number>.minutes/<cron job script>
 #+END_SRC
 
 - publication name :: the name of the publication for which the import
@@ -27,10 +28,16 @@ structure is required:
                   this is a =xsl= file, the escenic importer will run
                   =xsltproc= on the file, whereas =.sh= files will be
                   run in a =bash= wrapper.
+
+                  Each of the transformers will be called with one
+                  argument, namely the input XML data. Each
+                  transformer is responsible to write changes back to
+                  the file.
 - cron.hourly :: scripts to be run every our. These will be put in
                  =/etc/cron.hourly= on the import server. Be sure to
                  set the execute bit on the file and note that as with
                  all cron jobs, the file cannot have a file suffix.
+- cron.every.<number>.minutes :: scripts to run every =<number>= minutes.
 
 We're calling the import job =moo= since we're
 setting up an import feed from our imaginary content provider, "Moo
@@ -42,6 +49,7 @@ mypub/moo/transformers/01-fix-encoding.sh
 mypub/moo/transformers/02-convert-all-cows-to-ducks.xsl
 mypub/moo/transformers/02-convert-duck-to-escenic-xml.xsl
 mypub/moo/cron.hourly/get-files-from-moo-ftp
+mypub/moo/cron.every.10.minutes/ask-for-public-ip
 otherpub/foo/transformers/01-convert-from-foo-to-escenic-xml.xsl
 #+END_SRC
 
@@ -97,25 +105,51 @@ This will give you many features including:
 - log files :: logging of your cron script in a dedicated file
 
 ** Import jobs deployed by VOSA
+
+*** Setting up a new import job
+When an import archive is gotten from a developer, the VOSA operator
+will create the import job harness, infrastructure as with the
+=ece-import= command as follows:
+#+BEGIN_SRC text
+$ ece-import \
+  --publication-name mypub \
+  --name video \
+  --import-archive /tmp/my-great-import-archive.zip \
+  create
+#+END_SRC
+
+The =ece-import= script will take care of putting transformers in the
+right place, create spool directories and create the Nursery
+configuration needed for the import job.
+
+The =ece-import= will with the above command create an import job
+with sensible defaults, the operator may override a few import
+settings with these parameters:
+- =--import-user= :: (the ECE user which will be the author of the
+     imported contents). Default is =<publication name>=_admin
+- =--import-section-name= :: the default, fallback section of imported
+     content. Default is =ece_incoming=
+
+*** Directories and Files
 When an import job has been deployed by VOSA, it will be put into the
 these directories.
 
-|-------------------------------------------------------------------------------+-------------------------------------------|
-| Path                                                                          | Description                               |
-|-------------------------------------------------------------------------------+-------------------------------------------|
-| =/usr/share/escenic/engine/import/<pub>/<job>=                                | The transformers, such as XSLs            |
-| =/usr/share/escenic/engine/import/mypub/moo/02-convert-all-cows-to-ducks.xsl= |                                           |
-| =/var/spool/escenic/import/<pub>/<job>/new=                                   | Input folder for the 3rd party (XML) data |
-| =/var/spool/escenic/import/mypub/moo/new=                                     |                                           |
-| =/var/spool/escenic/import/<pub>/<job>/error=                                 | Failed 3rd party XML files                |
-| =/var/spool/escenic/import/mypub/moo/error=                                   |                                           |
-| =/var/spool/escenic/import/<pub>/<job>/archive=                               | Successful imports of 3rd party files     |
-| =/var/spool/escenic/import/mypub/moo/archive=                                 |                                           |
-| =/etc/cron.hourly/<your cron script>=                                         | Cron script running every hour            |
-| =/etc/cron.hourly/get-files-from-moo-ftp=                                     |                                           |
-| =/var/log/escenic/cron.<your coron script>.log=                               | The log for your cron script              |
-| =/var/log/escenic/cron.get-files-from-moo-ftp.log=                            |                                           |
-|-------------------------------------------------------------------------------+-------------------------------------------|
+|--------------------------------------------------------------------------------------------+-------------------------------------------|
+| Path                                                                                       | Description                               |
+|--------------------------------------------------------------------------------------------+-------------------------------------------|
+| =/usr/share/escenic/engine/import/<pub>/<job>/transformers=                                | The transformers, such as XSLs            |
+| =/usr/share/escenic/engine/import/mypub/moo/transformers/02-convert-all-cows-to-ducks.xsl= |                                           |
+| =/var/spool/escenic/import/<pub>/<job>/new=                                                | Input folder for the 3rd party (XML) data |
+| =/var/spool/escenic/import/mypub/moo/new=                                                  |                                           |
+| =/var/spool/escenic/import/<pub>/<job>/error=                                              | Failed 3rd party XML files                |
+| =/var/spool/escenic/import/mypub/moo/error=                                                |                                           |
+| =/var/spool/escenic/import/<pub>/<job>/archive=                                            | Successful imports of 3rd party files     |
+| =/var/spool/escenic/import/mypub/moo/archive=                                              |                                           |
+| =/etc/cron.hourly/<your cron script>=                                                      | Cron script running every hour            |
+| =/etc/cron.hourly/get-files-from-moo-ftp=                                                  |                                           |
+| =/var/log/escenic/cron.<your coron script>.log=                                            | The log for your cron script              |
+| =/var/log/escenic/cron.get-files-from-moo-ftp.log=                                         |                                           |
+|--------------------------------------------------------------------------------------------+-------------------------------------------|
 
 
 

From d2f71b3870d1cbcb333469ec57ce776ff598f8d1 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 24 Oct 2012 16:07:04 +0200
Subject: [PATCH 1506/2585] - New command: ece-import create. This will take an
 import archive   and set up the Nursery configuration, but transformers in
 the right   places and (soon) create the needed spool directories.

  Example usage:

    $ ece-import --name video --publication mypub create -f /tmp/t.tar.gz
    [ece-import-2299] I'm logging to /var/log/escenic/ece-import.log
    [ece-import-2299] Running the import job video
    [ece-import-2299] Setting up import job 'reuters' for publication 'oranges' ...
    [ece-import-2299] Setting up import job 'video' for publication 'apples' ...
    [ece-import-2299] Copying transformers to
    [ece-import-2299] /usr/share/escenic/import/apples/video
    [ece-import-2299] Creating import job configuration 'video' for publication
    [ece-import-2299] 'mypub' ...
    [ece-import-2299] Escenic Content Engine import job created for you in
    [ece-import-2299] /etc/escenic/engine/common/imports/mypub/video.properties
    [ece-import-2299] You must now do two steps manually:
    [ece-import-2299] (1) Add '/imports/mypub/video' to the
    [ece-import-2299] 'importConfigurations' list inside your ECE instance's
    [ece-import-2299] /com/escenic/syndication/xml/XMLImportService e.g.:
    [ece-import-2299] /etc/escenic/engine/server/edit2-engine1/com/escenic/syndication/xml/XMLImportService.properties
    [ece-import-2299] (2) Add this Nursery service
    [ece-import-2299] service.9.9-xml-import-service=/com/escenic/syndication/xml/XMLImportSchedule
    [ece-import-2299] to your instance's Initial component, e.g.:
    [ece-import-2299] /etc/escenic/engine/server/edit2-engine1/Initial.properties
    [ece-import-2299] Finished @ Wed Oct 24 15:52:20 CEST 2012

  TODO ensure required spool directories are in place and test this properly :-)
---
 usr/bin/ece-import | 207 ++++++++++++++++++++++++++++++++++++---------
 1 file changed, 167 insertions(+), 40 deletions(-)

diff --git a/usr/bin/ece-import b/usr/bin/ece-import
index 2fa83fd1..fec4efac 100644
--- a/usr/bin/ece-import
+++ b/usr/bin/ece-import
@@ -4,7 +4,7 @@
 ## the standard Escenic Syndication XML import job.
 ##
 ## The script can also create an import job from an import job archive
-## 
+##
 ##  See /usr/share/doc/vizrt/vosa-handbook/import-jobs.org for more
 ##  details on the structures this command operates on.
 
@@ -21,7 +21,6 @@ for el in $common_libraries; do
   }
 done
 
-
 pid_file=/var/run/escenic/$(basename $0).pid
 log=/var/log/escenic/$(basename $0).log
 
@@ -30,35 +29,42 @@ publication_name=""
 transformers_base_dir=/usr/share/escenic/import
 raw_spool_base_dir=/var/spool/escenic/raw
 escenic_spool_base_dir=/var/spool/escenic/import
+nursery_base_dir=/etc/escenic/engine/common
 
 COMMAND_IMPORT=1
-COMMAND_CRETAE_IMPORT_CONFIGURATION=1
+COMMAND_CRETAE_IMPORT_CONFIGURATION=2
 command=COMMAND_IMPORT
 
 function get_user_input() {
   local next_is_name=0
   local next_is_publication=0
-  local next_is_conf_file=0
-  
+  local next_is_import_archive=0
+  local next_is_nursery_base_dir=0
+
   for el in $@; do
     if [[ "$el" == "-n" || "$el" == "--name" ]]; then
       next_is_name=1
     elif [[ "$el" == "-p" || "$el" == "--publication" ]]; then
       next_is_publication=1
-    elif [[ "$el" == "-f" || "$el" == "--conf-file" ]]; then
-      next_is_conf_file=1
+    elif [[ "$el" == "-f" || "$el" == "--import-archive" ]]; then
+      next_is_import_archive=1
+    elif [[ "$el" == "--nursery-base-dir" ]]; then
+      next_is_nursery_base_dir=1
     elif [ $next_is_name -eq 1 ]; then
       job_name=$el
       next_is_name=0
     elif [ $next_is_publication -eq 1 ]; then
       publication_name=$el
       next_is_publication=0
-    elif [ $next_is_conf_file -eq 1 ]; then
-      conf_file=$el
-      next_is_conf_file=0
+    elif [ $next_is_import_archive -eq 1 ]; then
+      import_archive=$el
+      next_is_import_archive=0
+    elif [ $next_is_nursery_base_dir -eq 1 ]; then
+      nursery_base_dir=$el
+      next_is_nursery_base_dir=0
     else
       if [[ "$el" == "create" ]]; then
-        command=COMMAND_CRETAE_IMPORT_CONFIGURATION
+        command=$COMMAND_CRETAE_IMPORT_CONFIGURATION
       fi
     fi
   done
@@ -74,9 +80,9 @@ function get_user_input() {
     print_and_log "E.g.: $(basename $0) --publication mypub"
     errors=1
   fi
-  if [ -n "${conf_file}" -a ! -r "${conf_file}" ]; then
-    print_and_log "You have specified a print job conf file" \
-      "but it doesn't exist :-()"
+  if [ -n "${import_archive}" -a ! -r "${import_archive}" ]; then
+    print_and_log "You have specified an import job archive file" \
+      "but it doesn't exist :-("
     remove_pid_and_exit_in_error
   fi
   if [ $errors -eq 1 ]; then
@@ -106,7 +112,7 @@ function check_pre_requisites() {
     xsltproc
     xmllint
   "
-  
+
   for el in $required_command_list; do
     which $el > /dev/null 2>/dev/null
     if [ $? -gt 0 ]; then
@@ -116,63 +122,85 @@ function check_pre_requisites() {
   done
 }
 
+## $1 :: the transformer (file name, relative or absoulte)
+function is_trannsformer_supported() {
+  if [ -z $1 ]; then
+    return
+  fi
+
+  local supported_transformer_list="pl py sh xsl"
+  for el in $supported_transformer_list; do
+    if [[ "$1" == *"${el}" ]]; then
+      echo 1
+      return
+    fi
+  done
+
+  echo 0
+}
+
 ## $1 :: file
 function perform_transformations() {
-  local i=0
   for el in $transformers_base_dir/$publication_name/$job_name/[0-9]*; do
+    if [ $(is_trannsformer_supported $el) -eq 0 ]; then
+      log "$(yellow WARNING) The transformer $el isn't supported by $(basename $0)"
+      continue
+    fi
+
+    log "Applying transformation $(basename $el) to $1"
+
     if [[ "$el" == *".sh" ]]; then
-      log "Applying transformation $(basename $el) to $1"
       bash $el $1 >> $log 2>> $log
-      
+
       if [ $? -gt 0 ]; then
-        log "$(red FAILED) The transformation $el on file $1" \
-          "moving $1 to the error directory and skipping to next import XML"
-        run mv $1 $escenic_spool_base_dir/$publication_name/$job_name/error
+        handle_transformation_error $el $1
         return
       fi
     elif [[ "$el" == *".xsl" ]]; then
-      log "Applying transformation $(basename $el) to $1"
       xsltproc --output ${1}.tmp ${el} ${1} >> $log 2>> $log
-      
+
       if [ $? -gt 0 ]; then
-        log "$(red FAILED) The transformation $el on file $1" \
-          "moving $1 to the error directory and skipping to next import XML"
-        run mv $1 $escenic_spool_base_dir/$publication_name/$job_name/error
+        handle_transformation_error $el $1
         return
       else
         run mv ${1}.tmp ${1}
       fi
     elif [[ "$el" == *".pl" ]]; then
-      log "Applying transformation $(basename $el) to $1"
       perl $el $1 >> $log 2>> $log
       if [ $? -gt 0 ]; then
-        log "$(red FAILED) The transformation $el on file $1" \
-          "moving $f to the error directory and skipping to next import XML"
-        run mv $1 $escenic_spool_base_dir/$publication_name/$job_name/error
+        handle_transformation_error $el $1
         return
       fi
     elif [[ "$el" == *".py" ]]; then
-      log "Applying transformation $(basename $el) $1"
       python $el $f >> $log 2>> $log
       if [ $? -gt 0 ]; then
-        log "$(red FAILED) The transformation $el on file $1" \
-          "moving $1 to the error directory and skipping to next import XML"
-        run mv $1 $escenic_spool_base_dir/$publication_name/$job_name/error
+        handle_transformation_error $el $1
         return
       fi
     fi
-    i=$(( i + 1 ))
+    transformation_count=$(( transformation_count + 1 ))
   done
 }
 
+## Will log the transformer error and move it to the error archive.
+##
+## $1 :: transformer
+## $2 :: the raw/input file
+function handle_transformation_error() {
+  log "$(red FAILED) The transformation $1 on file $2" \
+    "moving $2 to the error directory and skipping to next import XML"
+  run mv $1 $escenic_spool_base_dir/$publication_name/$job_name/error
+}
+
 function import_raw_files() {
   raw_file_count=0
   for f in $(find $raw_spool_base_dir/$publication_name/$job_name -type f); do
     raw_file_count=$(( raw_file_count + 1 ))
+    transformation_count=0
     print_and_log "Importing raw XML #${raw_file_count}: $(basename $f) ..."
     perform_transformations $f
 
-    log "Applied $i transformations to $f"
+    log "Applied $transformation_count transformations to $f"
     if [ $(check_escenic_xml $f) -eq 0 ]; then
       log "Moving $f to" \
         $escenic_spool_base_dir/$publication_name/$job_name/new/$(basename $f)
@@ -187,7 +215,7 @@ function check_escenic_xml() {
     echo 1
     return
   fi
-  
+
   xmllint --format $1 > /dev/null 2>&1
   if [ $? -gt 0 ]; then
     log $(yellow WARNING) "XML #${raw_file_count} after transformations," \
@@ -216,7 +244,7 @@ function verify_import_job_configuration() {
       egrep ".sh$|.pl|.py" | \
       wc -l
   )
-  
+
   if [ $tranformation_count -lt 1 ]; then
     print_and_log "$(yellow WARNING) No transformers found in" \
       "$transformers_base_dir/${job_name}, I'm assuming the incoming" \
@@ -224,12 +252,111 @@ function verify_import_job_configuration() {
   fi
 }
 
+function create_import_configuration() {
+  print_and_log "Creating import job configuration '${job_name}' for" \
+    "publication '${publication_name}' ..."
+
+  local job_nursery_fragment=imports/$publication_name/${job_name}
+  local file=$nursery_base_dir/${job_nursery_fragment}.properties
+  make_dir $(dirname $file)
+  cat > $file <<EOF
+## Import configuration generated by $(basename $0) @ $(date)
+\$class=com.escenic.syndication.xml.XMLImportConfiguration
+
+archiveDirectory=${escenic_spool_base_dir}/${publication_name}/${job_name}/archive
+defaultSectionName=${import_section_name-ece_incoming}
+defaultUserName=${import_user_name-${publication_name}_admin}
+errorDirectory=${escenic_spool_base_dir}/${publication_name}/${job_name}/error
+fileNames=*.xml
+importDirectory=${escenic_spool_base_dir}/${publication_name}/${job_name}/new
+importReporter=/com/escenic/syndication/xml/ImportReporter
+publicationName=${publication_name}
+EOF
+
+  print_and_log "Escenic Content Engine import job created for you in ${file}" \
+    "You must now do two steps manually:"
+  print_and_log "(1) Add '/${job_nursery_fragment}' to the 'importConfigurations' list" \
+    "inside your ECE instance's" \
+    "/com/escenic/syndication/xml/XMLImportService e.g.:" \
+    /etc/escenic/engine/server/edit2-engine1/com/escenic/syndication/xml/XMLImportService.properties
+  
+  print_and_log "(2) Add this Nursery service " \
+    service.9.9-xml-import-service=/com/escenic/syndication/xml/XMLImportSchedule \
+    "to your instance's Initial component, e.g.:" \
+    /etc/escenic/engine/server/edit2-engine1/Initial.properties
+}
+
+function apply_import_archive_if_present() {
+  if [ -z $import_archive ]; then
+    return
+  fi
+  
+  local tmp_dir=$(mktemp -d)
+  extract_archive $import_archive $tmp_dir
+
+  local publication_list=$(
+    find $tmp_dir/ -maxdepth 1 -type d | sed "s#${tmp_dir}/##g"
+  )
+  if [ -z "$publication_list" ]; then
+    print_and_log "$(red ERROR) No publications were found inside" \
+      "$import_archive please re-read the import job specification" \
+      "and fix your archive structure"
+    remove_pid_and_exit_in_error
+  fi
+  
+  for el in $publication_list; do
+    local import_job_list=$(
+      find $tmp_dir/$el -maxdepth 1 -type d | sed "s#${tmp_dir}/$el##g" | \
+        sed 's#^/##g'
+    )
+    if [ -z "$import_job_list" ]; then
+      print_and_log "$(red ERROR) No import jobs were defined for publication" \
+        "$el. The import archive isn't in accordance with the import archive" \
+        "specification, so I'll exit :-('"
+      remove_pid_and_exit_in_error
+    fi
+    for ele in $import_job_list; do
+      print_and_log "Setting up import job '$ele' for publication '$el' ..."
+      local src_dir=$tmp_dir/$el/$ele/transformers
+      local target_dir=$transformers_base_dir/$el/$ele
+      if [ -d $src_dir ]; then
+        print_and_log "Copying transformers to $target_dir"
+        make_dir $target_dir
+        run cp $src_dir/[0-9]* $target_dir
+      fi
+
+      src_dir=$tmp_dir/$el/$ele/cron.hourly
+      if [ -d $src_dir ]; then
+        print_and_log "Installing cron.hourly scripts for $ele"
+        run chmod +x $src_dir/*
+        for elem in $(find $src_dir -maxdepth 1 -type f); do
+          local cron_base=$(basename $elem)
+          run cp $elem /etc/cron.hourly/import-${el}-${ele}-${cron_base}
+        done
+      fi
+
+      # support for cron.every.<number>.minutes
+    done
+  done
+
+
+  run rm -rf ${tmp_dir}
+}
+
+
 check_pre_requisites
 create_pid_if_doesnt_exist $pid_file
 print_and_log "Started @ $(date)"
 print "I'm logging to $log"
 get_user_input "$@"
-verify_import_job_configuration
-import_raw_files
+
+if [[ "$command" == $COMMAND_IMPORT ]]; then
+  verify_import_job_configuration
+  import_raw_files
+elif [[ "$command" == $COMMAND_CRETAE_IMPORT_CONFIGURATION ]]; then
+  apply_import_archive_if_present
+  create_import_configuration
+fi
+
 print_and_log "Finished @ $(date)"
 remove_pid_if_exists $pid_file

From be21d139bf07790a5e8ccfab4358f1c4c84831a3 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 25 Oct 2012 08:37:43 +0200
Subject: [PATCH 1507/2585] check_mk plug-in: Fixed bug in reporting. Included
 percentages in check output.

---
 usr/lib/check_mk_agent/local/varnish | 33 +++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/usr/lib/check_mk_agent/local/varnish b/usr/lib/check_mk_agent/local/varnish
index 6e5317f0..298bec2e 100755
--- a/usr/lib/check_mk_agent/local/varnish
+++ b/usr/lib/check_mk_agent/local/varnish
@@ -17,14 +17,13 @@
 #  >10% other errors -> critical
 
 
-warning404=50   # 404 requests per 1000 (5%)
+warning404=200   # 404 requests per 1000 (12%)
 critical404=300 # 404 requests per 1000 (30%)
-warningerr=10   # failed requests per 1000 (1%)
+warningerr=20   # failed requests per 1000 (2%)
 criticalerr=100 # requests per 1000 (10%)
 name="varnish_health"
 
 function determine_health() {
-  state=0
   results=( $(varnishncsa -d -F %s | awk 'BEGIN { err404=0; err = 0; ok=0; } { if ($1 == 404) err404 = err404 +1 ; else if ($1 >= 400) err = err + 1; else ok = ok + 1 } END { factor404=int(err404*1000/(ok+err+err404+1)); factorerr=int(err*1000/(ok+err+err404+1)); print factor404 "\t" factorerr "\t"  ok "\t" err404 "\t" err } ') )
   if [ ${PIPESTATUS[0]} != 0 ] ; then
     echo "3 ${name}-404 - varnishncsa executed with ${PIPESTATUS[0]}"
@@ -37,18 +36,36 @@ function determine_health() {
   check "other" ${results[1]} $((${results[2]} + ${results[3]})) ${results[4]} $warningerr $criticalerr
 }
 
+
+#usage "percentage 55 1000"
+# echos 5.5%
+function percentage() {
+  local result=$(( $1 * 1000 / $2 ))
+  local intpart=$(( $result / 10))
+  local decpart=".$(( $result % 10))"
+  if [ $decpart == ".0" ] ; then
+    decpart=
+  fi
+  echo $intpart$decpart
+}
+
 function check() {
+  message=OK
+  state=0
   if [ $2 -gt $6 ] ; then
     state=2
+    message=CRITICAL
   elif [ $2 -gt $5 ] ; then
     state=1
+    message=WARNING
   fi
-
-  if [ $state -gt 0 ] ; then
-    message="$4 of the last $(( $3 + $4 )) requests responded with HTTP $1"
-  else
-    message="Fewer than $5 of 1000 requests ($4/$(($3+$4))) responded with HTTP $1"
+  if [ $(( $3 + $4 )) -lt 3000 ] ; then
+    if [ $state -gt 0 ] ; then
+      state=0
+      message="(Only $(( $3 + $4)) requests sampled; forcing OK) $message"
+    fi
   fi
+  message="$message: $(percentage $4 "$(($3+$4))")% of requests ($4/$(($3+$4))) responded with HTTP $1"
   echo "$state $name-$1 factor=$2|ok=$3|err=$4 $message"
 }
 

From 6c5cf8e6443325421d1bc82b6019595390bc22d8 Mon Sep 17 00:00:00 2001
From: Thomas <tvelthoven@vizrt.com>
Date: Thu, 25 Oct 2012 10:27:21 +0300
Subject: [PATCH 1508/2585] calrifying as I read this for the first time

---
 usr/share/doc/vizrt/vosa-handbook/import-jobs.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
index 6cd78bc1..d01a1c7a 100644
--- a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
+++ b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
@@ -8,7 +8,7 @@ All import jobs delivered to the VOSA operators is a =zip=
 archive with a strict structure, as defined in [[Specifying an import job]]
 
 ** Specifying an import job
-When creating a new import job for your project, the following
+When creating a new import job for your project, the following directory
 structure is required:
 
 #+BEGIN_SRC text

From ce5f559ef24773eeb4ab96e1bb95c8aa0236deeb Mon Sep 17 00:00:00 2001
From: Thomas <tvelthoven@vizrt.com>
Date: Thu, 25 Oct 2012 10:44:03 +0300
Subject: [PATCH 1509/2585] Adding an introduction

---
 usr/share/doc/vizrt/vosa-handbook/import-jobs.org | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
index d01a1c7a..bc11dcd1 100644
--- a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
+++ b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
@@ -1,5 +1,13 @@
 * Import Jobs
 
+An import job is a program that can import data into Escenic Engine. It can be deployed to any machine that has Escenic Engine running on it that was installed by ece-install.
+** An import job has the following features:
+- An execution plan :: You can include cron configuration to specify when and how often the import job runs.
+- A transformation plan :: You can specify the transformations that will be applied to the incoming data before it is imported to Escenic Content Engine.
+- A source configuration :: ?
+- A target configuration :: ?
+An import job can be depoloyed to an Escenic Engine machine by adhering to the standards discribed in the rest of this document.
+
 ** Conventions
 All file and directory names are to be lower cased with hyphens
 between sub words.

From b0afb4c1e0f37c48d53d8b12f6676f4ec038df8c Mon Sep 17 00:00:00 2001
From: Thomas <tvelthoven@vizrt.com>
Date: Thu, 25 Oct 2012 11:10:21 +0300
Subject: [PATCH 1510/2585] clarifying the Directories and files

---
 usr/share/doc/vizrt/vosa-handbook/import-jobs.org | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
index bc11dcd1..db321d76 100644
--- a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
+++ b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
@@ -139,15 +139,14 @@ settings with these parameters:
      content. Default is =ece_incoming=
 
 *** Directories and Files
-When an import job has been deployed by VOSA, it will be put into the
-these directories.
+When an import job has been deployed by VOSA, It will use the following locations to read from and write to.
 
 |--------------------------------------------------------------------------------------------+-------------------------------------------|
 | Path                                                                                       | Description                               |
 |--------------------------------------------------------------------------------------------+-------------------------------------------|
+| =/var/spool/escenic/import/<pub>/<job>/new=                                                | Input folder for the 3rd party (XML) data |
 | =/usr/share/escenic/engine/import/<pub>/<job>/transformers=                                | The transformers, such as XSLs            |
 | =/usr/share/escenic/engine/import/mypub/moo/transformers/02-convert-all-cows-to-ducks.xsl= |                                           |
-| =/var/spool/escenic/import/<pub>/<job>/new=                                                | Input folder for the 3rd party (XML) data |
 | =/var/spool/escenic/import/mypub/moo/new=                                                  |                                           |
 | =/var/spool/escenic/import/<pub>/<job>/error=                                              | Failed 3rd party XML files                |
 | =/var/spool/escenic/import/mypub/moo/error=                                                |                                           |

From 5d137aa45e7f239ab87f2085f96b27833241b693 Mon Sep 17 00:00:00 2001
From: Thomas <tvelthoven@vizrt.com>
Date: Thu, 25 Oct 2012 11:11:13 +0300
Subject: [PATCH 1511/2585] typo

---
 usr/share/doc/vizrt/vosa-handbook/import-jobs.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
index db321d76..200ce0b8 100644
--- a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
+++ b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
@@ -139,7 +139,7 @@ settings with these parameters:
      content. Default is =ece_incoming=
 
 *** Directories and Files
-When an import job has been deployed by VOSA, It will use the following locations to read from and write to.
+When an import job has been deployed by VOSA, it will use the following locations to read from and write to.
 
 |--------------------------------------------------------------------------------------------+-------------------------------------------|
 | Path                                                                                       | Description                               |

From 1696cec1d7a6f4b6d0229265abd31d0e56935ce1 Mon Sep 17 00:00:00 2001
From: Thomas <tvelthoven@vizrt.com>
Date: Thu, 25 Oct 2012 11:13:16 +0300
Subject: [PATCH 1512/2585] clarified the source, target stuff

---
 usr/share/doc/vizrt/vosa-handbook/import-jobs.org | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
index 200ce0b8..eb671a98 100644
--- a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
+++ b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
@@ -4,8 +4,7 @@ An import job is a program that can import data into Escenic Engine. It can be d
 ** An import job has the following features:
 - An execution plan :: You can include cron configuration to specify when and how often the import job runs.
 - A transformation plan :: You can specify the transformations that will be applied to the incoming data before it is imported to Escenic Content Engine.
-- A source configuration :: ?
-- A target configuration :: ?
+- A standard set of file locations to read from and write to.
 An import job can be depoloyed to an Escenic Engine machine by adhering to the standards discribed in the rest of this document.
 
 ** Conventions

From f854d0644f1952576556530b0203bbaca6fdfa77 Mon Sep 17 00:00:00 2001
From: Thomas <tvelthoven@vizrt.com>
Date: Thu, 25 Oct 2012 11:18:25 +0300
Subject: [PATCH 1513/2585] Added stuff about monitoring

---
 usr/share/doc/vizrt/vosa-handbook/import-jobs.org | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
index eb671a98..94d5ba20 100644
--- a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
+++ b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
@@ -4,7 +4,8 @@ An import job is a program that can import data into Escenic Engine. It can be d
 ** An import job has the following features:
 - An execution plan :: You can include cron configuration to specify when and how often the import job runs.
 - A transformation plan :: You can specify the transformations that will be applied to the incoming data before it is imported to Escenic Content Engine.
-- A standard set of file locations to read from and write to.
+- Standard locations :: A standard set of file locations to read from and write to.
+- Standard monitoring :: Standard monitoring is available to ensure that performance can be analysed and operators can be  signalled about failures.
 An import job can be depoloyed to an Escenic Engine machine by adhering to the standards discribed in the rest of this document.
 
 ** Conventions

From 4572424d3ea6ffc280082c5fb04bc44f03a65e86 Mon Sep 17 00:00:00 2001
From: Thomas <tvelthoven@vizrt.com>
Date: Thu, 25 Oct 2012 11:20:03 +0300
Subject: [PATCH 1514/2585] improved a title

---
 usr/share/doc/vizrt/vosa-handbook/import-jobs.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
index 94d5ba20..019aee85 100644
--- a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
+++ b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
@@ -1,7 +1,7 @@
 * Import Jobs
 
 An import job is a program that can import data into Escenic Engine. It can be deployed to any machine that has Escenic Engine running on it that was installed by ece-install.
-** An import job has the following features:
+** Features of import jobs
 - An execution plan :: You can include cron configuration to specify when and how often the import job runs.
 - A transformation plan :: You can specify the transformations that will be applied to the incoming data before it is imported to Escenic Content Engine.
 - Standard locations :: A standard set of file locations to read from and write to.

From 80d6361ca3e48d89501c393c5c7d0ed3570218eb Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 25 Oct 2012 09:15:53 +0200
Subject: [PATCH 1515/2585] - added examples on the file name conventions.

---
 usr/share/doc/vizrt/vosa-handbook/import-jobs.org | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
index 019aee85..e8c970d6 100644
--- a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
+++ b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
@@ -10,7 +10,8 @@ An import job can be depoloyed to an Escenic Engine machine by adhering to the s
 
 ** Conventions
 All file and directory names are to be lower cased with hyphens
-between sub words.
+between sub words, e.g. =my-import-job= and
+=01-convert-from-atom-to-escenic-xml.xsl=.
 
 All import jobs delivered to the VOSA operators is a =zip=
 archive with a strict structure, as defined in [[Specifying an import job]]

From 243579f6aee3092eb4c134e3af1d797008054a05 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 25 Oct 2012 10:35:22 +0200
Subject: [PATCH 1516/2585] - now, 'ece-import create' creates needed spool
 directories

---
 usr/bin/ece-import | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/usr/bin/ece-import b/usr/bin/ece-import
index fec4efac..c4369478 100644
--- a/usr/bin/ece-import
+++ b/usr/bin/ece-import
@@ -336,6 +336,18 @@ function apply_import_archive_if_present() {
       fi
 
       # support for cron.every.<number>.minutes
+
+      # create needed directories
+      local dir_list="
+        $raw_spool_base_dir/$el/$ele
+        $escenic_spool_base_dir/$el/$ele/new 
+        $escenic_spool_base_dir/$el/$ele/archive
+        $escenic_spool_base_dir/$el/$ele/error
+      "
+      for dir in $dir_list; do
+        make_dir $dir
+        run chown ${escenic_user-escenic}:${escenic_group-escenic} $dir
+      done
     done
   done
 

From 88577cebd21c727c1f6baa2a197fe7fbc13bcb73 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 25 Oct 2012 10:54:54 +0200
Subject: [PATCH 1517/2585] - fixed variable expansion. Argh! Annoying bug.

---
 usr/bin/ece-import | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/bin/ece-import b/usr/bin/ece-import
index c4369478..05f53e0f 100644
--- a/usr/bin/ece-import
+++ b/usr/bin/ece-import
@@ -33,7 +33,7 @@ nursery_base_dir=/etc/escenic/engine/common
 
 COMMAND_IMPORT=1
 COMMAND_CRETAE_IMPORT_CONFIGURATION=2
-command=COMMAND_IMPORT
+command=$COMMAND_IMPORT
 
 function get_user_input() {
   local next_is_name=0

From 81c49486b4bb83d2e6fe5aada1acca986358bab7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 25 Oct 2012 10:58:13 +0200
Subject: [PATCH 1518/2585] - corrected error message when no transformers can
 be found

---
 usr/bin/ece-import | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/usr/bin/ece-import b/usr/bin/ece-import
index 05f53e0f..651e5af2 100644
--- a/usr/bin/ece-import
+++ b/usr/bin/ece-import
@@ -238,8 +238,9 @@ function verify_import_job_configuration() {
     $escenic_spool_base_dir/$publication_name/$job_name/error
   verify_readable_dir_list $transformers_base_dir/$publication_name/$job_name
 
+  local dir=$transformers_base_dir/$publication_name/$job_name
   local tranformation_count=$(
-    ls $transformers_base_dir/$publication_name/$job_name | \
+    ls $dir | \
       grep ^[0-9] | \
       egrep ".sh$|.pl|.py" | \
       wc -l
@@ -247,7 +248,7 @@ function verify_import_job_configuration() {
 
   if [ $tranformation_count -lt 1 ]; then
     print_and_log "$(yellow WARNING) No transformers found in" \
-      "$transformers_base_dir/${job_name}, I'm assuming the incoming" \
+      "$dir/, I'm assuming the incoming" \
       "data is already tranformed into Escenic Syndication XML"
   fi
 }

From bcd789526b84adc6540ae076f5365f2d5cad5af3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 25 Oct 2012 11:04:58 +0200
Subject: [PATCH 1519/2585] - forgot to mention XSL in the transformer
 test/warning

---
 usr/bin/ece-import | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/bin/ece-import b/usr/bin/ece-import
index 651e5af2..68ecb406 100644
--- a/usr/bin/ece-import
+++ b/usr/bin/ece-import
@@ -242,7 +242,7 @@ function verify_import_job_configuration() {
   local tranformation_count=$(
     ls $dir | \
       grep ^[0-9] | \
-      egrep ".sh$|.pl|.py" | \
+      egrep ".sh$|.pl$|.py$|.xsl$" | \
       wc -l
   )
 

From 5ace8830b1746f1883b0ae677a0bf790603c985b Mon Sep 17 00:00:00 2001
From: Thomas <tvelthoven@vizrt.com>
Date: Thu, 25 Oct 2012 15:59:54 +0300
Subject: [PATCH 1520/2585] replaced import job with ICA

---
 .../doc/vizrt/vosa-handbook/import-jobs.org   | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
index e8c970d6..7eec0fa2 100644
--- a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
+++ b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
@@ -1,23 +1,24 @@
-* Import Jobs
+* Import Configuration Archive
 
-An import job is a program that can import data into Escenic Engine. It can be deployed to any machine that has Escenic Engine running on it that was installed by ece-install.
-** Features of import jobs
-- An execution plan :: You can include cron configuration to specify when and how often the import job runs.
+An Import Configuration Archive (ICA) is a collection of files packaged in an archive that can import data into Escenic Engine. It can be deployed to any machine that has Escenic Engine running on it that was installed by ece-install.
+
+** Features of ICA's
+- An execution plan :: You can include cron configuration to specify when and how often the import runs.
 - A transformation plan :: You can specify the transformations that will be applied to the incoming data before it is imported to Escenic Content Engine.
 - Standard locations :: A standard set of file locations to read from and write to.
 - Standard monitoring :: Standard monitoring is available to ensure that performance can be analysed and operators can be  signalled about failures.
-An import job can be depoloyed to an Escenic Engine machine by adhering to the standards discribed in the rest of this document.
+An Import Configuration Archive can be depoloyed to an Escenic Engine machine by adhering to the standards discribed in the rest of this document.
 
 ** Conventions
 All file and directory names are to be lower cased with hyphens
-between sub words, e.g. =my-import-job= and
+between sub words, e.g. =my-import-configuration= and
 =01-convert-from-atom-to-escenic-xml.xsl=.
 
-All import jobs delivered to the VOSA operators is a =zip=
-archive with a strict structure, as defined in [[Specifying an import job]]
+All ICA's delivered to the VOSA operators are =zip=
+archives with a strict structure, as defined in [[Specifying an ICA]]
 
-** Specifying an import job
-When creating a new import job for your project, the following directory
+** Specifying an ICA
+When creating a new ICA for your project, the following directory
 structure is required:
 
 #+BEGIN_SRC text
@@ -48,12 +49,12 @@ structure is required:
                  all cron jobs, the file cannot have a file suffix.
 - cron.every.<number>.minutes :: scripts to run every =<number>= minutes.
 
-We're calling the import job =moo= since we're
+We're calling the import configuration =moo= since we're
 setting up an import feed from our imaginary content provider, "Moo
 Cool Videos" and our publication is the ubiquitous =mypub=.
 
 #+BEGIN_SRC text
-$ unzip -t import-jobs.zip
+$ unzip -t my-great-import-archive.zip.zip
 mypub/moo/transformers/01-fix-encoding.sh
 mypub/moo/transformers/02-convert-all-cows-to-ducks.xsl
 mypub/moo/transformers/02-convert-duck-to-escenic-xml.xsl
@@ -103,7 +104,7 @@ The only values you need to touch is are:
 
 The rest of the options should do just fine. If you really want to
 tweak, you can of course decide how far back you want each run of the
-job to look for files (it will only download each file once) by
+import to look for files (it will only download each file once) by
 setting =max_file_age_in_hours=.
 
 This will give you many features including:
@@ -113,11 +114,11 @@ This will give you many features including:
            downloaded with a new run of the cron job.
 - log files :: logging of your cron script in a dedicated file
 
-** Import jobs deployed by VOSA
+** Import configuration deployed by VOSA
 
-*** Setting up a new import job
-When an import archive is gotten from a developer, the VOSA operator
-will create the import job harness, infrastructure as with the
+*** Setting up a new import configuration
+When an ICA is gotten from a developer, the VOSA operator
+will create the import configuration harness, infrastructure as with the
 =ece-import= command as follows:
 #+BEGIN_SRC text
 $ ece-import \

From 749e8a3b3216b91814f0c72367ab749f247846e1 Mon Sep 17 00:00:00 2001
From: Thomas <tvelthoven@vizrt.com>
Date: Thu, 25 Oct 2012 16:04:48 +0300
Subject: [PATCH 1521/2585] ICA -> EIKA

---
 .../doc/vizrt/vosa-handbook/import-jobs.org   | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
index 7eec0fa2..b226bccd 100644
--- a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
+++ b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
@@ -1,8 +1,8 @@
 * Import Configuration Archive
 
-An Import Configuration Archive (ICA) is a collection of files packaged in an archive that can import data into Escenic Engine. It can be deployed to any machine that has Escenic Engine running on it that was installed by ece-install.
+An Escenic Import Configuration Archive (EICA) is a collection of files packaged in an archive that can import data into Escenic Engine. It can be deployed to any machine that has Escenic Engine running on it that was installed by ece-install.
 
-** Features of ICA's
+** Features of EICA's
 - An execution plan :: You can include cron configuration to specify when and how often the import runs.
 - A transformation plan :: You can specify the transformations that will be applied to the incoming data before it is imported to Escenic Content Engine.
 - Standard locations :: A standard set of file locations to read from and write to.
@@ -14,26 +14,26 @@ All file and directory names are to be lower cased with hyphens
 between sub words, e.g. =my-import-configuration= and
 =01-convert-from-atom-to-escenic-xml.xsl=.
 
-All ICA's delivered to the VOSA operators are =zip=
-archives with a strict structure, as defined in [[Specifying an ICA]]
+All EICA's delivered to the VOSA operators are =zip=
+archives with a strict structure, as defined in [[Specifying an EICA]]
 
-** Specifying an ICA
-When creating a new ICA for your project, the following directory
+** Specifying an EICA
+When creating a new EICA for your project, the following directory
 structure is required:
 
 #+BEGIN_SRC text
-<publication>/<import name>
-<publication>/<import name>/transformers/<number>-<transformer task>.xsl
-<publication>/<import name>/cron.hourly/<cron job script>
-<publication>/<import name>/cron.every.<number>.minutes/<cron job script>
+<publEICAtion>/<import name>
+<publEICAtion>/<import name>/transformers/<number>-<transformer task>.xsl
+<publEICAtion>/<import name>/cron.hourly/<cron job script>
+<publEICAtion>/<import name>/cron.every.<number>.minutes/<cron job script>
 #+END_SRC
 
-- publication name :: the name of the publication for which the import
-     job(s) are defined. You can have more than one publication in
+- publEICAtion name :: the name of the publEICAtion for which the import
+     job(s) are defined. You can have more than one publEICAtion in
      each =zip= archive.
 - import job name :: lowercase with hyphens between words (if more
      than one)
-- transformers :: directory with files prefixed with =<number>-=, indicating
+- transformers :: directory with files prefixed with =<number>-=, indEICAting
                   the order of transformation to apply to your import job. If
                   this is a =xsl= file, the escenic importer will run
                   =xsltproc= on the file, whereas =.sh= files will be
@@ -51,7 +51,7 @@ structure is required:
 
 We're calling the import configuration =moo= since we're
 setting up an import feed from our imaginary content provider, "Moo
-Cool Videos" and our publication is the ubiquitous =mypub=.
+Cool Videos" and our publEICAtion is the ubiquitous =mypub=.
 
 #+BEGIN_SRC text
 $ unzip -t my-great-import-archive.zip.zip
@@ -112,17 +112,17 @@ This will give you many features including:
   run at any given point in time.
 - state :: only files that previously haven't been downloaded will be
            downloaded with a new run of the cron job.
-- log files :: logging of your cron script in a dedicated file
+- log files :: logging of your cron script in a dedEICAted file
 
 ** Import configuration deployed by VOSA
 
 *** Setting up a new import configuration
-When an ICA is gotten from a developer, the VOSA operator
+When an EICA is gotten from a developer, the VOSA operator
 will create the import configuration harness, infrastructure as with the
 =ece-import= command as follows:
 #+BEGIN_SRC text
 $ ece-import \
-  --publication-name mypub \
+  --publEICAtion-name mypub \
   --name video \
   --import-archive /tmp/my-great-import-archive.zip \
   create
@@ -136,7 +136,7 @@ The =ece-import= will with the above command create an import job
 with sensible defaults, the operator may override a few import
 settings with these parameters:
 - =--import-user= :: (the ECE user which will be the author of the
-     imported contents). Default is =<publication name>=_admin
+     imported contents). Default is =<publEICAtion name>=_admin
 - =--import-section-name= :: the default, fallback section of imported
      content. Default is =ece_incoming=
 

From c3ca7d0f412e134fb25b6f69f765ad22be725a40 Mon Sep 17 00:00:00 2001
From: Thomas <tvelthoven@vizrt.com>
Date: Thu, 25 Oct 2012 16:05:29 +0300
Subject: [PATCH 1522/2585] Import Configuration Archive -> Escenic Import
 Configuration Archive

---
 usr/share/doc/vizrt/vosa-handbook/import-jobs.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
index b226bccd..94844e34 100644
--- a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
+++ b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
@@ -1,4 +1,4 @@
-* Import Configuration Archive
+* Escenic Import Configuration Archive
 
 An Escenic Import Configuration Archive (EICA) is a collection of files packaged in an archive that can import data into Escenic Engine. It can be deployed to any machine that has Escenic Engine running on it that was installed by ece-install.
 

From 3d6c1be3f3105ea75e91c48a7c9bd17332b5efa2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 25 Oct 2012 16:03:03 +0200
Subject: [PATCH 1523/2585] - added common-bashing::fail_safe_run. It is a
 wrapper like   common-bashing::run, but it will not cause an internal loop or
 fail   in any way if the pre-requisite for running your program isn't met.

  This fixes a number of corner cases when the user running your
  program isn't privileged enough, or you haven't taken heed to create
  the necessary directories++ for running your program.

- made use of fail_safe_run in log and create_pid_if_doesnt_exist

- hardened log, create_pid_if_doesnt_exist and
  remove_pid_and_exit_in_error so that these methods can be used
  directly without having to care about setting up the log or pid_file
  variables in your program.

- fixed regression bug in common-bashing::exit_on_error where the exit
  code would always be 0. This has now been fixed, the method will
  ensure that you always get the correct exit code on program that
  fail. This is an internal method more than a public one, you
  normally use this method indirectly with calls to
  common-bashing::run
---
 .../escenic/ece-scripts/common-bashing.sh     | 56 +++++++++++++++----
 1 file changed, 46 insertions(+), 10 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index cc52cc3a..0fc3ad0c 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -58,7 +58,22 @@ function printne() {
   echo -ne $(get_id) $@
 }
 
+## Will log all messages past to it.
+##
+## - If the parent directory of the log file doesn't exist, the method
+## will try to create it.
+##
+## - If the log file doesn't exist, the method will try to create it.
+##
+## $@ :: list of strings
 function log() {
+  if [ -z $log ]; then
+    return
+  fi
+
+  # cannot use run wrapper her, it'll trigger an eternal loop.
+  fail_safe_run mkdir -p $(dirname $log)
+  fail_safe_run touch $log
   echo $(get_id) $@ >> $log
 }
 
@@ -88,14 +103,21 @@ function remove_pid_and_exit_in_error() {
     rm $pid_file
   fi
 
-  log_call_stack
+  # this method is also used from bootstrapping methods in scripts
+  # where the log file may not yet exist, hence, we test for its
+  # existence here before logging the call/stack trace.
+  if [ -w $log ]; then
+    log_call_stack
+  fi
   
   exit 1
 }
 
 function exit_on_error() {
-  if [ $? -gt 0 ]; then
-    print_and_log "The command [${@}] $(red FAILED) (exit code=$?), exiting :-("
+  local code=$?
+  if [ ${code} -gt 0 ]; then
+    print_and_log "The command [${@}] run as user $USER $(red FAILED)" \
+      "(the command exited with code ${code}), I'll exit now :-("
     print "See $log for further details."
     remove_pid_and_exit_in_error
   fi
@@ -106,6 +128,17 @@ function run() {
   exit_on_error $@
 }
 
+function fail_safe_run() {
+  "${@}"
+  if [ $? -gt 0 ]; then
+    echo $(basename $0) $(red FAILED) "executing the command [$@]" \
+      "as user" ${USER}"." \
+      $(basename $0) "will now exit." | \
+      fmt
+    exit 1
+  fi
+}
+
 ## Returns 1 if the passed argument is a number, 0 if not.
 ## $1: the value you wish to test.
 function is_number() {
@@ -165,6 +198,9 @@ function yellow() {
   echo -e "\E[37;33m\033[1m${@}\033[0m"
 }
 
+function blue() {
+  echo -e "\E[37;34m\033[1m${@}\033[0m";
+};
 
 ## $1: full path to the file.
 function get_base_dir_from_bundle()
@@ -339,13 +375,11 @@ function create_pid_if_doesnt_exist() {
   fi    
   
   local dir=$(dirname $1)
-  if [ ! -w $dir ]; then
-    print_and_log "The PID file couldn't be created because" \
-      $dir "either didn't exist or wasn't writable"
-    return
-  fi
-  
-  touch $1
+
+  # since this method can be called really early in scripts, we cannot
+  # use the run wrapper here.
+  fail_safe_run mkdir -p $(dirname $1)
+  fail_safe_run touch $1
 }
 
 function remove_pid_if_exists() {
@@ -354,4 +388,6 @@ function remove_pid_if_exists() {
   elif [ ! -e $1 ]; then
     return
   fi
+  
+  fail_safe_run rm $1
 }

From 3de35b91fd9fcdc485b0b05e6cb3ef68d56b23da Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 25 Oct 2012 16:05:35 +0200
Subject: [PATCH 1524/2585] - fixed bug: ece-import would only set up Nursery
 component for the   job specified on the command line, not the ones inside
 your import   archive. - Improved installation summary of the steps the user
 has to perform   to get a working import configuration.

---
 usr/bin/ece-import | 145 +++++++++++++++++++++++++++------------------
 1 file changed, 86 insertions(+), 59 deletions(-)
 mode change 100644 => 100755 usr/bin/ece-import

diff --git a/usr/bin/ece-import b/usr/bin/ece-import
old mode 100644
new mode 100755
index 68ecb406..0b908ecd
--- a/usr/bin/ece-import
+++ b/usr/bin/ece-import
@@ -8,29 +8,39 @@
 ##  See /usr/share/doc/vizrt/vosa-handbook/import-jobs.org for more
 ##  details on the structures this command operates on.
 
-common_libraries="
-  /usr/share/escenic/ece-scripts/common-bashing.sh
-  /usr/share/escenic/ece-scripts/common-io.sh
-"
-
-for el in $common_libraries; do
-  source $el || {
-    echo "$(basename $0): Could not load the library $el," \
-      "and I can't live without it :-(" | fmt
-    exit 1
-  }
-done
+function bootstrap_thyself() {
+  common_libraries="
+    /usr/share/escenic/ece-scripts/common-bashing.sh
+    /usr/share/escenic/ece-scripts/common-io.sh
+  "
 
-pid_file=/var/run/escenic/$(basename $0).pid
-log=/var/log/escenic/$(basename $0).log
+  for el in $common_libraries; do
+    source $el 2>/dev/null || {
+      echo "$(basename $0): Could not load the library $el," \
+        "and I can't live without it :-(" | fmt
+      exit 1
+    }
+  done
+}
+
+bootstrap_thyself
 
+# internal variables
+escenic_group=escenic
+escenic_spool_base_dir=/var/spool/escenic/import
+escenic_user=escenic
 job_name=""
+# since both regular users and root can use this command, we create
+# user specific log files. We put it in /var/log as it'll regardless
+# of user run as a deamon process.
+log=/var/log/escenic/$(basename $0)-${USER}.log
+nursery_base_dir=/etc/escenic/engine/common
+pid_file=/var/run/escenic/$(basename $0).pid
 publication_name=""
-transformers_base_dir=/usr/share/escenic/import
 raw_spool_base_dir=/var/spool/escenic/raw
-escenic_spool_base_dir=/var/spool/escenic/import
-nursery_base_dir=/etc/escenic/engine/common
+transformers_base_dir=/usr/share/escenic/import
 
+# available commands/operations for ece-import
 COMMAND_IMPORT=1
 COMMAND_CRETAE_IMPORT_CONFIGURATION=2
 command=$COMMAND_IMPORT
@@ -40,6 +50,8 @@ function get_user_input() {
   local next_is_publication=0
   local next_is_import_archive=0
   local next_is_nursery_base_dir=0
+  local next_is_escenic_user=0
+  local next_is_escenic_group=0
 
   for el in $@; do
     if [[ "$el" == "-n" || "$el" == "--name" ]]; then
@@ -48,6 +60,10 @@ function get_user_input() {
       next_is_publication=1
     elif [[ "$el" == "-f" || "$el" == "--import-archive" ]]; then
       next_is_import_archive=1
+    elif [[ "$el" == "--escenic-user" ]]; then
+      next_is_escenic_user=1
+    elif [[ "$el" == "--escenic-group" ]]; then
+      next_is_escenic_group=1
     elif [[ "$el" == "--nursery-base-dir" ]]; then
       next_is_nursery_base_dir=1
     elif [ $next_is_name -eq 1 ]; then
@@ -62,6 +78,12 @@ function get_user_input() {
     elif [ $next_is_nursery_base_dir -eq 1 ]; then
       nursery_base_dir=$el
       next_is_nursery_base_dir=0
+    elif [ $next_is_escenic_user -eq 1 ]; then
+      escenic_user=$el
+      next_is_escenic_user=0
+    elif [ $next_is_escenic_group -eq 1 ]; then
+      escenic_group=$el
+      next_is_escenic_group=0
     else
       if [[ "$el" == "create" ]]; then
         command=$COMMAND_CRETAE_IMPORT_CONFIGURATION
@@ -88,26 +110,9 @@ function get_user_input() {
   if [ $errors -eq 1 ]; then
     remove_pid_and_exit_in_error
   fi
-
-  print_and_log "Running the import job $job_name"
 }
 
 function check_pre_requisites() {
-  local required_dir_list="
-    $(dirname $pid_file)
-    $(dirname $log)
-    ${raw_spool_base_dir}
-    ${escenic_spool_base_dir}
-    ${transformers_base_dir}
-  "
-  for dir in $required_dir_list; do
-    if [ ! -w $dir ]; then
-      echo "The directory $dir must exist and be writable by user $USER" \
-        " for $(basename $0) to work" | fmt
-      exit 1
-    fi
-  done
-
   local required_command_list="
     xsltproc
     xmllint
@@ -254,6 +259,9 @@ function verify_import_job_configuration() {
 }
 
 function create_import_configuration() {
+  local job_name=$1
+  local publication_name=$2
+  
   print_and_log "Creating import job configuration '${job_name}' for" \
     "publication '${publication_name}' ..."
 
@@ -274,24 +282,16 @@ importReporter=/com/escenic/syndication/xml/ImportReporter
 publicationName=${publication_name}
 EOF
 
-  print_and_log "Escenic Content Engine import job created for you in ${file}" \
-    "You must now do two steps manually:"
-  print_and_log "(1) Add '/${job_nursery_fragment}' to the 'importConfigurations' list" \
-    "inside your ECE instance's" \
-    "/com/escenic/syndication/xml/XMLImportService e.g.:" \
-    /etc/escenic/engine/server/edit2-engine1/com/escenic/syndication/xml/XMLImportService.properties
-  
-  print_and_log "(2) Add this Nursery service " \
-    service.9.9-xml-import-service=/com/escenic/syndication/xml/XMLImportSchedule \
-    "to your instance's Initial component, e.g.:" \
-    /etc/escenic/engine/server/edit2-engine1/Initial.properties
+  print_and_log $(green NEW) \
+    "Import Nursery component created for you in ${file}"
+
+  import_configuration_list="
+    ${job_nursery_fragment}
+    ${import_configuration_list}
+  "
 }
 
-function apply_import_archive_if_present() {
-  if [ -z $import_archive ]; then
-    return
-  fi
-  
+function apply_import_archive() {
   local tmp_dir=$(mktemp -d)
   extract_archive $import_archive $tmp_dir
 
@@ -316,8 +316,11 @@ function apply_import_archive_if_present() {
         "specification, so I'll exit :-('"
       remove_pid_and_exit_in_error
     fi
+    
     for ele in $import_job_list; do
       print_and_log "Setting up import job '$ele' for publication '$el' ..."
+      create_import_configuration $ele $el
+
       local src_dir=$tmp_dir/$el/$ele/transformers
       local target_dir=$transformers_base_dir/$el/$ele
       if [ -d $src_dir ]; then
@@ -346,30 +349,54 @@ function apply_import_archive_if_present() {
         $escenic_spool_base_dir/$el/$ele/error
       "
       for dir in $dir_list; do
+        log "Creating spool directory" $dir
         make_dir $dir
-        run chown ${escenic_user-escenic}:${escenic_group-escenic} $dir
+        run chown ${escenic_user}:${escenic_group} $dir
       done
     done
   done
 
-
   run rm -rf ${tmp_dir}
 }
 
+function print_manual_steps() {
+  if [ -z "${import_configuration_list}" ]; then
+    return
+  fi
+    
+  print_and_log "You must now add your new Nursery components: " \
+
+  for el in $import_configuration_list; do
+    print_and_log "$(green ADD) /${el}"
+  done
+  
+  print_and_log "to the $(blue importConfigurations) variable in " \
+    "your ECE instance's" \
+    "/com/escenic/syndication/xml/XMLImportService e.g.:" \
+    "/etc/escenic/engine/server/edit2-engine1/com/escenic/syndication/xml/XMLImportService.properties"
+
+  print_and_log "The final step is to add the Nursery service " \
+    "service.9.9-xml-import-service=/com/escenic/syndication/xml/XMLImportSchedule" \
+    "to your instance's Initial component, e.g.:" \
+    /etc/escenic/engine/server/edit2-engine1/Initial.properties
+}
 
-check_pre_requisites
 create_pid_if_doesnt_exist $pid_file
-print_and_log "Started @ $(date)"
-print "I'm logging to $log"
-get_user_input "$@"
+check_pre_requisites
+print_and_log "Started @ $(date), I'm logging to $log"
+get_user_input $@
 
 if [[ "$command" == $COMMAND_IMPORT ]]; then
   verify_import_job_configuration
   import_raw_files
 elif [[ "$command" == $COMMAND_CRETAE_IMPORT_CONFIGURATION ]]; then
-  apply_import_archive_if_present
-  create_import_configuration
+  if [ -z $import_archive ]; then
+    create_import_configuration $job_name $publication_name
+  else
+    apply_import_archive
+  fi
 fi
 
-print_and_log "Finished @ $(date)"
+print_manual_steps
+print_and_log "Finished @ $(date), enjoy thyself!"
 remove_pid_if_exists $pid_file

From bc56b0f56c93085fcd0669be542b670718edc0bc Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 25 Oct 2012 16:08:37 +0200
Subject: [PATCH 1525/2585] - --publication and --name are now not needed (or
 heeded) when     --import-archive

---
 usr/bin/ece-import | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/usr/bin/ece-import b/usr/bin/ece-import
index 0b908ecd..16553c7c 100755
--- a/usr/bin/ece-import
+++ b/usr/bin/ece-import
@@ -92,15 +92,17 @@ function get_user_input() {
   done
 
   local errors=0
-  if [ -z $job_name ]; then
-    print_and_log "You must specify which import job to run"
-    print_and_log "E.g.: $(basename $0) --name video"
-    errors=1
-  fi
-  if [ -z $publication_name ]; then
-    print_and_log "You must specify the publication name"
-    print_and_log "E.g.: $(basename $0) --publication mypub"
-    errors=1
+  if [ $command -eq $COMMAND_IMPORT ]; then
+    if [ -z $job_name ]; then
+      print_and_log "You must specify which import job to run"
+      print_and_log "E.g.: $(basename $0) --name video"
+      errors=1
+    fi
+    if [ -z $publication_name ]; then
+      print_and_log "You must specify the publication name"
+      print_and_log "E.g.: $(basename $0) --publication mypub"
+      errors=1
+    fi
   fi
   if [ -n "${import_archive}" -a ! -r "${import_archive}" ]; then
     print_and_log "You have specified an import job archive file" \

From 3cd298932418529408a3955c6eebb67170d67248 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 25 Oct 2012 20:04:39 +0200
Subject: [PATCH 1526/2585] - a lot of hardening

- now gzip-s successful imports (but not the failures as these are
  interesting to easily retry).

- now prints status report:

    [ece-import-1] Started @ Thu Oct 25 13:27:15 EDT 2012, I'm logging to
    [ece-import-1] /var/log/escenic/ece-import-root.log
    [ece-import-1] Publication: solar-sportsdesk
    [ece-import-1] Import configuration: streaming-video
    [ece-import-1] Importing raw XML #1: 10.xml ...
    [ece-import-1] Importing raw XML #2: 101.xml ...
    [ece-import-2] Number of raw XML files proccessed: 2
    [ece-import-2] Number of raw XML successes: 1
    [ece-import-2] Number of raw XML errors: 1
    [ece-import-2] Finished @ Thu Oct 25 13:27:16 EDT 2012, enjoy thyself!

- now puts processed raw XML into FHS compliant locations:
  incoming: /var/spool/escenic/raw/<pub>/<import name>/
  in progress : /var/cache/escenic/raw/<pub>/<import name>/
  successes: /var/backups/escenic/raw/<pub>/<import name>/succeeded
  failures: /var/backups/escenic/raw/<pub>/<import name>/failed

  TODO: consider /var/lib for 'in progress'. Also consider similar
  paths for the ECE import jobs.
---
 usr/bin/ece-import | 141 +++++++++++++++++++++++++++++++--------------
 1 file changed, 98 insertions(+), 43 deletions(-)

diff --git a/usr/bin/ece-import b/usr/bin/ece-import
index 16553c7c..4b7d9979 100755
--- a/usr/bin/ece-import
+++ b/usr/bin/ece-import
@@ -38,6 +38,8 @@ nursery_base_dir=/etc/escenic/engine/common
 pid_file=/var/run/escenic/$(basename $0).pid
 publication_name=""
 raw_spool_base_dir=/var/spool/escenic/raw
+raw_transformation_base_dir=/var/cache/escenic/import
+raw_transformed_base_dir=/var/backups/escenic/import
 transformers_base_dir=/usr/share/escenic/import
 
 # available commands/operations for ece-import
@@ -92,18 +94,17 @@ function get_user_input() {
   done
 
   local errors=0
-  if [ $command -eq $COMMAND_IMPORT ]; then
-    if [ -z $job_name ]; then
-      print_and_log "You must specify which import job to run"
-      print_and_log "E.g.: $(basename $0) --name video"
-      errors=1
-    fi
-    if [ -z $publication_name ]; then
-      print_and_log "You must specify the publication name"
-      print_and_log "E.g.: $(basename $0) --publication mypub"
-      errors=1
-    fi
+  if [ -z "$job_name" -a -z "${import_archive}" ]; then
+    print_and_log "You must specify which import job to run"
+    print_and_log "E.g.: $(basename $0) --name video"
+    errors=1
+  fi
+  if [ -z "$publication_name" -a -z "${import_archive}" ]; then
+    print_and_log "You must specify the publication name"
+    print_and_log "E.g.: $(basename $0) --publication mypub"
+    errors=1
   fi
+  
   if [ -n "${import_archive}" -a ! -r "${import_archive}" ]; then
     print_and_log "You have specified an import job archive file" \
       "but it doesn't exist :-("
@@ -118,15 +119,22 @@ function check_pre_requisites() {
   local required_command_list="
     xsltproc
     xmllint
+    xml_grep
   "
 
+  local some_missing=0
+  
   for el in $required_command_list; do
     which $el > /dev/null 2>/dev/null
     if [ $? -gt 0 ]; then
       print_and_log "$(basename $0) needs the command $el to be installed"
-      remove_pid_and_exit_in_error
+      some_missing=1
     fi
   done
+
+  if [ $some_missing -eq 1 ]; then
+    remove_pid_and_exit_in_error
+  fi
 }
 
 ## $1 :: the transformer (file name, relative or absoulte)
@@ -199,37 +207,59 @@ function handle_transformation_error() {
   run mv $1 $escenic_spool_base_dir/$publication_name/$job_name/error
 }
 
+import_error_count=0
+
 function import_raw_files() {
+  print_and_log "Publication: $publication_name"
+  print_and_log "Import configuration: $job_name"
   raw_file_count=0
   for f in $(find $raw_spool_base_dir/$publication_name/$job_name -type f); do
     raw_file_count=$(( raw_file_count + 1 ))
     transformation_count=0
     print_and_log "Importing raw XML #${raw_file_count}: $(basename $f) ..."
-    perform_transformations $f
-
-    log "Applied $transformation_count transformations to $f"
-    if [ $(check_escenic_xml $f) -eq 0 ]; then
-      log "Moving $f to" \
-        $escenic_spool_base_dir/$publication_name/$job_name/new/$(basename $f)
-      run mv $f $escenic_spool_base_dir/$publication_name/$job_name/new
+    local file=$raw_transformation_base_dir/$publication_name/$job_name/$(basename $f)
+    run cp $f $file
+    perform_transformations $file
+
+    log "Applied $transformation_count transformations to $file"
+    if [ $(is_escenic_xml_ok $file) -eq 1 ]; then
+      local dir=$escenic_spool_base_dir/$publication_name/$job_name/new
+      log "Transformed XML is OK, moving transformed file to" $dir
+      run mv $file $dir
+      dir=$raw_transformed_base_dir/$publication_name/$job_name/succeeded
+      log "Transformed XML is OK, moving original raw XML to" $dir \
+        "and gzip-ing."
+      run mv $f $dir
+      run gzip $dir/$(basename $f)
+    else
+      local dir=$raw_transformed_base_dir/$publication_name/$job_name/failed
+      log $(red ERROR) "Transformed XML #${raw_file_count}," \
+        $file "isn't valid Escenic Syndication XML, so moving it to" $dir
+      run mv $f $dir
+      import_error_count=$(( import_error_count + 1 ))
     fi
   done
 }
 
 ## $1 :: the XML
-function check_escenic_xml() {
+function is_escenic_xml_ok() {
   if [ ! -e $1 ]; then
-    echo 1
+    echo 0
     return
   fi
 
+  # first, check for well formed-ness
   xmllint --format $1 > /dev/null 2>&1
   if [ $? -gt 0 ]; then
-    log $(yellow WARNING) "XML #${raw_file_count} after transformations," \
-      $f "isn't well formed XML. Importing it into Escenic Content Engine" \
-      " will fail, so I'll move it to" \
-      $escenic_spool_base_dir/$publication_name/$job_name/error
-    run mv $1 $escenic_spool_base_dir/$publication_name/$job_name/error
+    echo 0
+    return
+  fi
+
+  # check for an <escenic/> root element
+  local element_count=$(
+    xml_grep --cond /escenic $1 | wc -l 2>/dev/null
+  )
+  if [ $element_count -gt 0 ]; then
     echo 1
     return
   fi
@@ -240,6 +270,8 @@ function check_escenic_xml() {
 function verify_import_job_configuration() {
   verify_writable_dir_list \
     $raw_spool_base_dir/$publication_name/$job_name \
+    $raw_transformation_base_dir/$publication_name/$job_name \
+    $raw_transformed_base_dir/$publication_name/$job_name \
     $escenic_spool_base_dir/$publication_name/$job_name/new \
     $escenic_spool_base_dir/$publication_name/$job_name/archive \
     $escenic_spool_base_dir/$publication_name/$job_name/error
@@ -261,8 +293,8 @@ function verify_import_job_configuration() {
 }
 
 function create_import_configuration() {
-  local job_name=$1
-  local publication_name=$2
+  local publication_name=$1
+  local job_name=$2
   
   print_and_log "Creating import job configuration '${job_name}' for" \
     "publication '${publication_name}' ..."
@@ -321,7 +353,7 @@ function apply_import_archive() {
     
     for ele in $import_job_list; do
       print_and_log "Setting up import job '$ele' for publication '$el' ..."
-      create_import_configuration $ele $el
+      create_import_configuration $el $ele
 
       local src_dir=$tmp_dir/$el/$ele/transformers
       local target_dir=$transformers_base_dir/$el/$ele
@@ -343,24 +375,38 @@ function apply_import_archive() {
 
       # support for cron.every.<number>.minutes
 
-      # create needed directories
-      local dir_list="
-        $raw_spool_base_dir/$el/$ele
-        $escenic_spool_base_dir/$el/$ele/new 
-        $escenic_spool_base_dir/$el/$ele/archive
-        $escenic_spool_base_dir/$el/$ele/error
-      "
-      for dir in $dir_list; do
-        log "Creating spool directory" $dir
-        make_dir $dir
-        run chown ${escenic_user}:${escenic_group} $dir
-      done
+      create_import_directories $el $ele
     done
   done
 
   run rm -rf ${tmp_dir}
 }
 
+## $1 :: publication
+## $2 :: import name
+function create_import_directories() {
+  # we include log and pid_file's directories here to get the
+  # ownership right.
+  local dir_list="
+    $(dirname $log)
+    $(dirname $pid_file)
+    $escenic_spool_base_dir/$1/$2/archive
+    $escenic_spool_base_dir/$1/$2/error
+    $escenic_spool_base_dir/$1/$2/new 
+    $raw_spool_base_dir/$1/$2
+    $raw_transformation_base_dir/$1/$2 \
+    $raw_transformed_base_dir/$1/$2 \
+    $raw_transformed_base_dir/$1/$2/failed \
+    $raw_transformed_base_dir/$1/$2/succeeded \
+    $transformers_base_dir/$1/$2
+  "
+  for dir in $dir_list; do
+    log "Creating directory" $dir
+    make_dir $dir
+    run chown ${escenic_user}:${escenic_group} $dir
+  done
+}  
+
 function print_manual_steps() {
   if [ -z "${import_configuration_list}" ]; then
     return
@@ -383,6 +429,14 @@ function print_manual_steps() {
     /etc/escenic/engine/server/edit2-engine1/Initial.properties
 }
 
+function print_report() {
+  print_and_log "Number of raw XML files proccessed:" $raw_file_count
+  print_and_log "Number of raw XML successes:" \
+    $(green $(( raw_file_count - import_error_count )))
+  print_and_log "Number of raw XML errors:" $(red $import_error_count)
+  print_and_log "Finished @ $(date), enjoy thyself!"
+}
+
 create_pid_if_doesnt_exist $pid_file
 check_pre_requisites
 print_and_log "Started @ $(date), I'm logging to $log"
@@ -393,12 +447,13 @@ if [[ "$command" == $COMMAND_IMPORT ]]; then
   import_raw_files
 elif [[ "$command" == $COMMAND_CRETAE_IMPORT_CONFIGURATION ]]; then
   if [ -z $import_archive ]; then
-    create_import_configuration $job_name $publication_name
+    create_import_configuration $publication_name $job_name
+    create_import_directories $publication_name $job_name
   else
     apply_import_archive
   fi
 fi
 
 print_manual_steps
-print_and_log "Finished @ $(date), enjoy thyself!"
+print_report
 remove_pid_if_exists $pid_file

From 1fd5aa61ecbd8d7c2d5dd2d28cce923e942685cf Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 25 Oct 2012 20:19:46 +0200
Subject: [PATCH 1527/2585] - sorted out mess: publEICAtion -> publication

---
 .../doc/vizrt/vosa-handbook/import-jobs.org    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
index 94844e34..69060bda 100644
--- a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
+++ b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
@@ -22,14 +22,14 @@ When creating a new EICA for your project, the following directory
 structure is required:
 
 #+BEGIN_SRC text
-<publEICAtion>/<import name>
-<publEICAtion>/<import name>/transformers/<number>-<transformer task>.xsl
-<publEICAtion>/<import name>/cron.hourly/<cron job script>
-<publEICAtion>/<import name>/cron.every.<number>.minutes/<cron job script>
+<publication>/<import name>
+<publication>/<import name>/transformers/<number>-<transformer task>.xsl
+<publication>/<import name>/cron.hourly/<cron job script>
+<publication>/<import name>/cron.every.<number>.minutes/<cron job script>
 #+END_SRC
 
-- publEICAtion name :: the name of the publEICAtion for which the import
-     job(s) are defined. You can have more than one publEICAtion in
+- publication name :: the name of the publication for which the import
+     job(s) are defined. You can have more than one publication in
      each =zip= archive.
 - import job name :: lowercase with hyphens between words (if more
      than one)
@@ -51,7 +51,7 @@ structure is required:
 
 We're calling the import configuration =moo= since we're
 setting up an import feed from our imaginary content provider, "Moo
-Cool Videos" and our publEICAtion is the ubiquitous =mypub=.
+Cool Videos" and our publication is the ubiquitous =mypub=.
 
 #+BEGIN_SRC text
 $ unzip -t my-great-import-archive.zip.zip
@@ -122,7 +122,7 @@ will create the import configuration harness, infrastructure as with the
 =ece-import= command as follows:
 #+BEGIN_SRC text
 $ ece-import \
-  --publEICAtion-name mypub \
+  --publication-name mypub \
   --name video \
   --import-archive /tmp/my-great-import-archive.zip \
   create
@@ -136,7 +136,7 @@ The =ece-import= will with the above command create an import job
 with sensible defaults, the operator may override a few import
 settings with these parameters:
 - =--import-user= :: (the ECE user which will be the author of the
-     imported contents). Default is =<publEICAtion name>=_admin
+     imported contents). Default is =<publication name>=_admin
 - =--import-section-name= :: the default, fallback section of imported
      content. Default is =ece_incoming=
 

From 459ea7694413e9ac575c396d670b44662a239300 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 25 Oct 2012 20:21:49 +0200
Subject: [PATCH 1528/2585] - argh

---
 usr/share/doc/vizrt/vosa-handbook/import-jobs.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
index 69060bda..2c658a5d 100644
--- a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
+++ b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
@@ -33,7 +33,7 @@ structure is required:
      each =zip= archive.
 - import job name :: lowercase with hyphens between words (if more
      than one)
-- transformers :: directory with files prefixed with =<number>-=, indEICAting
+- transformers :: directory with files prefixed with =<number>-=, indicating
                   the order of transformation to apply to your import job. If
                   this is a =xsl= file, the escenic importer will run
                   =xsltproc= on the file, whereas =.sh= files will be

From 8259e92a8f5595c47f973e787311147bce76463c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 25 Oct 2012 20:26:12 +0200
Subject: [PATCH 1529/2585] - no genitive.

---
 usr/share/doc/vizrt/vosa-handbook/import-jobs.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
index 2c658a5d..b8db3a6d 100644
--- a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
+++ b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
@@ -2,7 +2,7 @@
 
 An Escenic Import Configuration Archive (EICA) is a collection of files packaged in an archive that can import data into Escenic Engine. It can be deployed to any machine that has Escenic Engine running on it that was installed by ece-install.
 
-** Features of EICA's
+** EICAs has the following features
 - An execution plan :: You can include cron configuration to specify when and how often the import runs.
 - A transformation plan :: You can specify the transformations that will be applied to the incoming data before it is imported to Escenic Content Engine.
 - Standard locations :: A standard set of file locations to read from and write to.

From bd2e6ff7b6c50fb182893a3653d6df8eb024dfd3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 25 Oct 2012 20:27:27 +0200
Subject: [PATCH 1530/2585] - has/have

---
 usr/share/doc/vizrt/vosa-handbook/import-jobs.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
index b8db3a6d..91a3ce1e 100644
--- a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
+++ b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
@@ -2,7 +2,7 @@
 
 An Escenic Import Configuration Archive (EICA) is a collection of files packaged in an archive that can import data into Escenic Engine. It can be deployed to any machine that has Escenic Engine running on it that was installed by ece-install.
 
-** EICAs has the following features
+** EICAs have the following features
 - An execution plan :: You can include cron configuration to specify when and how often the import runs.
 - A transformation plan :: You can specify the transformations that will be applied to the incoming data before it is imported to Escenic Content Engine.
 - Standard locations :: A standard set of file locations to read from and write to.

From 62f633e6d149c7b8f6a4af30a85419a565723128 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 26 Oct 2012 09:19:52 +0200
Subject: [PATCH 1531/2585] - fixed plural "s", it's not genitive, i.e. the
 plural of EICA is   EICAs and not EICA's.

- corrected product name, our product is called "Escenic Content
  Engine", not "Escenic Engine".

- spell checking
---
 usr/share/doc/vizrt/vosa-handbook/import-jobs.org | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
index 91a3ce1e..7693ac29 100644
--- a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
+++ b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
@@ -1,20 +1,25 @@
 * Escenic Import Configuration Archive
 
-An Escenic Import Configuration Archive (EICA) is a collection of files packaged in an archive that can import data into Escenic Engine. It can be deployed to any machine that has Escenic Engine running on it that was installed by ece-install.
+An Escenic Import Configuration Archive (EICA) is a collection of
+files packaged in an archive that can import data into the Escenic
+Content Engine. It can be deployed to any machine that has Escenic
+Content Engine running on it that was installed by =ece-install=.
 
 ** EICAs have the following features
 - An execution plan :: You can include cron configuration to specify when and how often the import runs.
-- A transformation plan :: You can specify the transformations that will be applied to the incoming data before it is imported to Escenic Content Engine.
+- A transformation plan :: You can specify the transformations that
+     will be applied to the incoming data before it is imported to the
+     Escenic Content Engine.
 - Standard locations :: A standard set of file locations to read from and write to.
-- Standard monitoring :: Standard monitoring is available to ensure that performance can be analysed and operators can be  signalled about failures.
-An Import Configuration Archive can be depoloyed to an Escenic Engine machine by adhering to the standards discribed in the rest of this document.
+- Standard monitoring :: Standard monitoring is available to ensure that performance can be analysed and operators can be  notified about failures.
+An Import Configuration Archive can be deployed to an Escenic Content Engine machine by adhering to the standards discribed in the rest of this document.
 
 ** Conventions
 All file and directory names are to be lower cased with hyphens
 between sub words, e.g. =my-import-configuration= and
 =01-convert-from-atom-to-escenic-xml.xsl=.
 
-All EICA's delivered to the VOSA operators are =zip=
+All EICAs delivered to the VOSA operators are =zip=
 archives with a strict structure, as defined in [[Specifying an EICA]]
 
 ** Specifying an EICA

From 8c89b46c3cefb092e6767fc2a36fbe1f420a0cc5 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 26 Oct 2012 09:48:03 +0200
Subject: [PATCH 1532/2585] - another EICA search and replace gone wrong.

---
 usr/share/doc/vizrt/vosa-handbook/import-jobs.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
index 7693ac29..00929f7f 100644
--- a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
+++ b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
@@ -117,7 +117,7 @@ This will give you many features including:
   run at any given point in time.
 - state :: only files that previously haven't been downloaded will be
            downloaded with a new run of the cron job.
-- log files :: logging of your cron script in a dedEICAted file
+- log files :: logging of your cron scripts dedicated files
 
 ** Import configuration deployed by VOSA
 

From 6bfe0b97d071c462e72ec886c9c5d3127e592af8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 26 Oct 2012 09:53:13 +0200
Subject: [PATCH 1533/2585] - only print import report when we're actually
 running an import (and   not e.g. creating an import job).

---
 usr/bin/ece-import | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/usr/bin/ece-import b/usr/bin/ece-import
index 4b7d9979..d976b26d 100755
--- a/usr/bin/ece-import
+++ b/usr/bin/ece-import
@@ -430,11 +430,13 @@ function print_manual_steps() {
 }
 
 function print_report() {
-  print_and_log "Number of raw XML files proccessed:" $raw_file_count
-  print_and_log "Number of raw XML successes:" \
-    $(green $(( raw_file_count - import_error_count )))
-  print_and_log "Number of raw XML errors:" $(red $import_error_count)
-  print_and_log "Finished @ $(date), enjoy thyself!"
+  if [ $command -eq $COMMAND_IMPORT ]; then
+    print_and_log "Number of raw XML files proccessed:" $raw_file_count
+    print_and_log "Number of raw XML successes:" \
+      $(green $(( raw_file_count - import_error_count )))
+    print_and_log "Number of raw XML errors:" $(red $import_error_count)
+    print_and_log "Finished @ $(date), enjoy thyself!"
+  fi
 }
 
 create_pid_if_doesnt_exist $pid_file

From 5ad4a324fbdd1f9221e3d5d2b66777329f3a3a50 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 26 Oct 2012 10:03:36 +0200
Subject: [PATCH 1534/2585] - (almost) every proper sentence needs an object

---
 usr/bin/ece-import | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/bin/ece-import b/usr/bin/ece-import
index d976b26d..b65b6bdf 100755
--- a/usr/bin/ece-import
+++ b/usr/bin/ece-import
@@ -228,7 +228,7 @@ function import_raw_files() {
       run mv $file $dir
       dir=$raw_transformed_base_dir/$publication_name/$job_name/succeeded
       log "Transformed XML is OK, moving original raw XML to" $dir \
-        "and gzip-ing."
+        "and gzip-ing it."
       run mv $f $dir
       run gzip $dir/$(basename $f)
     else

From aba89e9633e798827a6cc3d71f9bb5452a43ca63 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 26 Oct 2012 10:09:53 +0200
Subject: [PATCH 1535/2585] - need to use gzip --force in case the same XML
 files are retried.

---
 usr/bin/ece-import | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/bin/ece-import b/usr/bin/ece-import
index b65b6bdf..f1b93308 100755
--- a/usr/bin/ece-import
+++ b/usr/bin/ece-import
@@ -230,7 +230,7 @@ function import_raw_files() {
       log "Transformed XML is OK, moving original raw XML to" $dir \
         "and gzip-ing it."
       run mv $f $dir
-      run gzip $dir/$(basename $f)
+      run gzip --force $dir/$(basename $f)
     else
       local dir=$raw_transformed_base_dir/$publication_name/$job_name/failed
       log $(red ERROR) "Transformed XML #${raw_file_count}," \

From d80d05ab8056549cc42e61e22e8001d59dcab0b0 Mon Sep 17 00:00:00 2001
From: Thomas <tvelthoven@vizrt.com>
Date: Fri, 26 Oct 2012 12:33:06 +0300
Subject: [PATCH 1536/2585] changed EICA to import configuration

---
 .../doc/vizrt/vosa-handbook/import-jobs.org      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
index 00929f7f..10b6b125 100644
--- a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
+++ b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
@@ -1,11 +1,11 @@
-* Escenic Import Configuration Archive
+* Escenic Import Configuration
 
-An Escenic Import Configuration Archive (EICA) is a collection of
+An Escenic Import Configuration is a collection of
 files packaged in an archive that can import data into the Escenic
 Content Engine. It can be deployed to any machine that has Escenic
 Content Engine running on it that was installed by =ece-install=.
 
-** EICAs have the following features
+** Import configurations have the following features
 - An execution plan :: You can include cron configuration to specify when and how often the import runs.
 - A transformation plan :: You can specify the transformations that
      will be applied to the incoming data before it is imported to the
@@ -19,11 +19,11 @@ All file and directory names are to be lower cased with hyphens
 between sub words, e.g. =my-import-configuration= and
 =01-convert-from-atom-to-escenic-xml.xsl=.
 
-All EICAs delivered to the VOSA operators are =zip=
-archives with a strict structure, as defined in [[Specifying an EICA]]
+All import configurations delivered to the VOSA operators are =zip=
+archives with a strict structure, as defined in [[Specifying an import configuration]]
 
-** Specifying an EICA
-When creating a new EICA for your project, the following directory
+** Specifying an import configuration
+When creating a new import configuration for your project, the following directory
 structure is required:
 
 #+BEGIN_SRC text
@@ -122,7 +122,7 @@ This will give you many features including:
 ** Import configuration deployed by VOSA
 
 *** Setting up a new import configuration
-When an EICA is gotten from a developer, the VOSA operator
+When an import configuration is received from a developer, the VOSA operator
 will create the import configuration harness, infrastructure as with the
 =ece-import= command as follows:
 #+BEGIN_SRC text

From 098a309448d22fa7d091621d4487aaedc98f3542 Mon Sep 17 00:00:00 2001
From: Thomas <tvelthoven@vizrt.com>
Date: Fri, 26 Oct 2012 12:33:35 +0300
Subject: [PATCH 1537/2585] Update
 usr/share/doc/vizrt/vosa-handbook/import-jobs.org

---
 usr/share/doc/vizrt/vosa-handbook/import-jobs.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
index 10b6b125..1c4c0714 100644
--- a/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
+++ b/usr/share/doc/vizrt/vosa-handbook/import-jobs.org
@@ -1,6 +1,6 @@
 * Escenic Import Configuration
 
-An Escenic Import Configuration is a collection of
+An Escenic import configuration is a collection of
 files packaged in an archive that can import data into the Escenic
 Content Engine. It can be deployed to any machine that has Escenic
 Content Engine running on it that was installed by =ece-install=.

From 82fa6555203c83aa8d894c73c535b9cb133eb1f2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 26 Oct 2012 13:47:11 +0200
Subject: [PATCH 1538/2585] - made use of common-bashing methods.

---
 .../escenic/ece-scripts/ece-import.d/ftp.sh   | 95 +++++++++++++++++++
 1 file changed, 95 insertions(+)
 create mode 100644 usr/share/escenic/ece-scripts/ece-import.d/ftp.sh

diff --git a/usr/share/escenic/ece-scripts/ece-import.d/ftp.sh b/usr/share/escenic/ece-scripts/ece-import.d/ftp.sh
new file mode 100644
index 00000000..592fb806
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece-import.d/ftp.sh
@@ -0,0 +1,95 @@
+## Common library for downloading XML feeds via FTP.
+##
+## Example usage, e.g. /etc/cron.hourly/my-import
+##   ===================================================================
+##   # You must change these  
+##   download_dir=/var/spool/escenic/import/mypub/afeed
+##   ftp_password="foo"
+##   ftp_url=ftp://myfeed.com/afeed
+##   ftp_user="myuser"
+##
+##   # You can leave these at the defaults values in most cases 
+##   ftp_download_history=/var/lib/escenic/ftp-history-cron.$(basename $0 .sh)
+##   lock_file=/var/lock/escenic/$(basename $0 .sh).lock
+##   log=/var/log/escenic/cron.$(basename $0 .sh).log
+##   max_file_age_in_hours=10
+##   now=$(date +%s)
+##
+##   # Finally, you need these two lines to do the actual import.
+##   download_latest_ftp_files
+##   fix_ownership_of_download_files
+##   ===================================================================
+
+function create_parent_dir_if_it_does_not_exists() {
+  local dir=$(dirname $1)
+  if [ ! -d $dir ]; then
+    mkdir -p $dir
+  fi
+}
+
+function fix_ownership_of_download_files() {
+  if [ -d $download_dir ]; then
+    run chown -R escenic:escenic $download_dir/
+  fi
+
+  for el in archive error; do
+    local dir=$(dirname $download_dir)/$el
+    
+    if [ -e $dir ]; then
+      chown -R escenic:escenic $dir/
+    fi
+  done
+}
+
+function update_ftp_download_history() {
+  if [ -z $ftp_download_history ]; then
+    print_and_log "You must set ftp_download_history in your configuration"
+    return
+  fi
+
+  create_parent_dir_if_it_does_not_exists $ftp_download_history
+  echo $(date) $1 >> $ftp_download_history
+}
+
+function download_latest_ftp_files() {
+  wget -q --ftp-user "$ftp_user" --ftp-password "$ftp_password" $ftp_url -O - | \
+    grep .xml | \
+    sed -e 's/^[ ]*//g' -e 's/<a\ href=\"\(.*.xml\)\">.*/\1/g' | while read f; do
+    # remove everything before ftp:, that's the file URL
+    local file=$(echo "$f" | sed 's/.*\(ftp:.*\)/\1/g')
+    local date_string=$(
+      echo "$f" | \
+        cut -d' ' -f1-4 | \
+        sed \
+        -e 's/ Jan /-01-/g' \
+        -e 's/ Feb /-02-/g' \
+        -e 's/ Mar /-03-/g' \
+        -e 's/ Apr /-04-/g' \
+        -e 's/ May /-05-/g' \
+        -e 's/ Jun /-06-/g' \
+        -e 's/ Jul /-07-/g' \
+        -e 's/ Aug /-08-/g' \
+        -e 's/ Sep /-09-/g' \
+        -e 's/ Oct /-10-/g' \
+        -e 's/ Nov /-11-/g' \
+        -e 's/ Dec /-12-/g'
+    );
+    local file_date=$(date --date="$date_string" +%s)
+    local age=$(( ${now} - ${file_date} ))
+    local age_in_hours=$(( age / ( 60 * 60 ) ))
+    
+    if [ $age_in_hours -le $max_file_age_in_hours ]; then
+      if [ $(grep $file $ftp_download_history | wc -l) -gt 0 ]; then
+        print_and_log "Already downloaded $file, skipping it"
+        continue
+      fi
+      
+      print_and_log "Downloading ${file} which is $age_in_hours hours old" \
+        "($date_string)"
+      
+      download_uri_target_to_dir $file $download_dir
+      update_ftp_download_history $file
+    fi
+  done
+}
+

From e257ea6354664b7cb0c24d0355c846ab450f17ae Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 26 Oct 2012 15:20:42 +0200
Subject: [PATCH 1539/2585] - got basic download with state file, listing++
 working for HTTP   sources. FTP should work too.

  TODO test this with FTP, add support for --accept
---
 .../ece-scripts/ece-import.d/http-and-ftp.sh  | 68 +++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh

diff --git a/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh b/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh
new file mode 100644
index 00000000..74d99fc3
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh
@@ -0,0 +1,68 @@
+## Common library for downloading XML feeds via FTP and HTTP.
+
+function download_latest_files() {
+  if [[ $uri == "ftp://"* ]]; then
+    local user_and_password="
+      $wget_opts
+      --ftp-user $user
+      --ftp-password $password
+    "
+  elif [[ $uri == "http://"* ]]; then
+    local user_and_password="
+      $wget_opts
+      --http-user $user
+      --http-password $password
+    "
+  fi
+
+  # long sed from
+  # http://stackoverflow.com/questions/1881237/easiest-way-to-extract-the-urls-from-an-html-page-using-sed-or-awk-only
+  local list_of_files=$(
+    wget $user_and_password --quiet --output-document - $uri | \
+      grep ^'<a href' | \
+      sed -e 's/<a /\n<a /g' \
+      -e 's/<a .*href=['"'"'"]//' \
+      -e 's/["'"'"'].*$//' \
+      -e '/^$/ d'
+  )
+
+  download_files_if_desired $list_of_files
+}
+
+## Will only download files which are newer than max_file_age and
+## which haven't been downloaded before.
+## 
+## $@ :: list of URIs
+function download_files_if_desired() {
+  for el in $list_of_files; do
+    if [ $(is_already_downloaded $uri/$el) -eq 1 ]; then
+      print $el has already been downloaded, skipping to the next
+      continue
+    fi
+    print downloading $uri/$el "..."
+    download_uri_target_to_dir \
+      $uri/$el \
+      $raw_spool_base_dir/$publication_name/$job_name/
+    echo $uri/$el >> $(get_state_file)
+  done
+}
+
+function is_already_downloaded() {
+  if [ ! -e $(get_state_file) ]; then
+    echo 0
+    return
+  fi
+
+  if [ $(grep "$1" $(get_state_file) | wc -l) -gt 0 ]; then
+    echo 1
+    return
+  fi
+
+  echo 0
+}
+
+function get_state_file() {
+  echo $raw_state_base_dir/$publication_name/$job_name/download.state
+}
+
+

From c33e23a818b3c1d44d389f520187f1841acd86f6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 26 Oct 2012 15:23:45 +0200
Subject: [PATCH 1540/2585] - added module support for ece-import. - added
 support for downloading raw XML data from external sources   using the
 http-and-ftp.sh library:

 $ ece-import \
     --name video \
     --publication myname \
     --user bar \
     --password foo \
     --uri http://feeds.com/myfeed \
     download-import-data

  The command figures out correct switches depending on if the URI is
  HTTP or FTP.
---
 usr/bin/ece-import | 76 +++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 68 insertions(+), 8 deletions(-)

diff --git a/usr/bin/ece-import b/usr/bin/ece-import
index f1b93308..ccda1f4d 100755
--- a/usr/bin/ece-import
+++ b/usr/bin/ece-import
@@ -9,12 +9,26 @@
 ##  details on the structures this command operates on.
 
 function bootstrap_thyself() {
-  common_libraries="
-    /usr/share/escenic/ece-scripts/common-bashing.sh
-    /usr/share/escenic/ece-scripts/common-io.sh
+  # first, try to be nice, then check the standard location
+  local dir=$(dirname $0)/../share/escenic/ece-scripts
+  if [ ! -d $dir  ]; then
+    dir=/usr/share/escenic/ece-scripts
+  fi
+
+  local common_libraries="
+    common-bashing.sh
+    common-io.sh
   "
 
   for el in $common_libraries; do
+    source $dir/$el 2>/dev/null || {
+      echo "$(basename $0): Could not load the library $el," \
+        "and I can't live without it :-(" | fmt
+      exit 1
+    }
+  done
+  
+  for el in $dir/$(basename $0).d/*.sh; do
     source $el 2>/dev/null || {
       echo "$(basename $0): Could not load the library $el," \
         "and I can't live without it :-(" | fmt
@@ -38,13 +52,15 @@ nursery_base_dir=/etc/escenic/engine/common
 pid_file=/var/run/escenic/$(basename $0).pid
 publication_name=""
 raw_spool_base_dir=/var/spool/escenic/raw
+raw_state_base_dir=/var/lib/escenic/raw
 raw_transformation_base_dir=/var/cache/escenic/import
 raw_transformed_base_dir=/var/backups/escenic/import
 transformers_base_dir=/usr/share/escenic/import
 
 # available commands/operations for ece-import
 COMMAND_IMPORT=1
-COMMAND_CRETAE_IMPORT_CONFIGURATION=2
+COMMAND_CREATE_IMPORT_CONFIGURATION=2
+COMMAND_DOWNLOAD_RAW_DATA=3
 command=$COMMAND_IMPORT
 
 function get_user_input() {
@@ -54,6 +70,9 @@ function get_user_input() {
   local next_is_nursery_base_dir=0
   local next_is_escenic_user=0
   local next_is_escenic_group=0
+  local next_is_user=0
+  local next_is_password=0
+  local next_is_uri=0
 
   for el in $@; do
     if [[ "$el" == "-n" || "$el" == "--name" ]]; then
@@ -68,6 +87,12 @@ function get_user_input() {
       next_is_escenic_group=1
     elif [[ "$el" == "--nursery-base-dir" ]]; then
       next_is_nursery_base_dir=1
+    elif [[ "$el" == "--user" ]]; then
+      next_is_user=1
+    elif [[ "$el" == "--password" ]]; then
+      next_is_password=1
+    elif [[ "$el" == "--uri" ]]; then
+      next_is_uri=1
     elif [ $next_is_name -eq 1 ]; then
       job_name=$el
       next_is_name=0
@@ -86,9 +111,20 @@ function get_user_input() {
     elif [ $next_is_escenic_group -eq 1 ]; then
       escenic_group=$el
       next_is_escenic_group=0
+    elif [ $next_is_user -eq 1 ]; then
+      user=$el
+      next_is_user=0
+    elif [ $next_is_password -eq 1 ]; then
+      password=$el
+      next_is_password=0
+    elif [ $next_is_uri -eq 1 ]; then
+      uri=$el
+      next_is_uri=0
     else
       if [[ "$el" == "create" ]]; then
-        command=$COMMAND_CRETAE_IMPORT_CONFIGURATION
+        command=$COMMAND_CREATE_IMPORT_CONFIGURATION
+      elif [[ "$el" == "download-import-data" ]]; then
+        command=$COMMAND_DOWNLOAD_RAW_DATA
       fi
     fi
   done
@@ -108,8 +144,27 @@ function get_user_input() {
   if [ -n "${import_archive}" -a ! -r "${import_archive}" ]; then
     print_and_log "You have specified an import job archive file" \
       "but it doesn't exist :-("
-    remove_pid_and_exit_in_error
+    errors=1
+  fi
+  
+  if [ $command -eq $COMMAND_DOWNLOAD_RAW_DATA ]; then
+    if [ -z "$user" ]; then
+      print_and_log "You must specify the the user"
+      print_and_log "E.g.: $(basename $0) --user lisa"
+      errors=1
+    fi
+    if [ -z "$password" ]; then
+      print_and_log "You must specify the the user"
+      print_and_log "E.g.: $(basename $0) --password foo"
+      errors=1
+    fi
+    if [ -z "$uri" ]; then
+      print_and_log "You must specify the the URI"
+      print_and_log "E.g.: $(basename $0) --uri http://feeds.com/myfeed"
+      errors=1
+    fi
   fi
+  
   if [ $errors -eq 1 ]; then
     remove_pid_and_exit_in_error
   fi
@@ -270,6 +325,7 @@ function is_escenic_xml_ok() {
 function verify_import_job_configuration() {
   verify_writable_dir_list \
     $raw_spool_base_dir/$publication_name/$job_name \
+    $raw_state_base_dir/$publication_name/$job_name \
     $raw_transformation_base_dir/$publication_name/$job_name \
     $raw_transformed_base_dir/$publication_name/$job_name \
     $escenic_spool_base_dir/$publication_name/$job_name/new \
@@ -285,7 +341,7 @@ function verify_import_job_configuration() {
       wc -l
   )
 
-  if [ $tranformation_count -lt 1 ]; then
+  if [ $command -eq $COMMAND_IMPORT -a $tranformation_count -lt 1 ]; then
     print_and_log "$(yellow WARNING) No transformers found in" \
       "$dir/, I'm assuming the incoming" \
       "data is already tranformed into Escenic Syndication XML"
@@ -394,6 +450,7 @@ function create_import_directories() {
     $escenic_spool_base_dir/$1/$2/error
     $escenic_spool_base_dir/$1/$2/new 
     $raw_spool_base_dir/$1/$2
+    $raw_state_base_dir/$1/$2
     $raw_transformation_base_dir/$1/$2 \
     $raw_transformed_base_dir/$1/$2 \
     $raw_transformed_base_dir/$1/$2/failed \
@@ -447,13 +504,16 @@ get_user_input $@
 if [[ "$command" == $COMMAND_IMPORT ]]; then
   verify_import_job_configuration
   import_raw_files
-elif [[ "$command" == $COMMAND_CRETAE_IMPORT_CONFIGURATION ]]; then
+elif [[ "$command" == $COMMAND_CREATE_IMPORT_CONFIGURATION ]]; then
   if [ -z $import_archive ]; then
     create_import_configuration $publication_name $job_name
     create_import_directories $publication_name $job_name
   else
     apply_import_archive
   fi
+elif [[ "$command" == $COMMAND_DOWNLOAD_RAW_DATA  ]]; then
+  verify_import_job_configuration
+  download_latest_files
 fi
 
 print_manual_steps

From 00345378322e5bd7b0fb6f010ea8257cc48dad1e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 26 Oct 2012 15:24:30 +0200
Subject: [PATCH 1541/2585] - renamed it

---
 .../escenic/ece-scripts/ece-import.d/ftp.sh   | 95 -------------------
 1 file changed, 95 deletions(-)
 delete mode 100644 usr/share/escenic/ece-scripts/ece-import.d/ftp.sh

diff --git a/usr/share/escenic/ece-scripts/ece-import.d/ftp.sh b/usr/share/escenic/ece-scripts/ece-import.d/ftp.sh
deleted file mode 100644
index 592fb806..00000000
--- a/usr/share/escenic/ece-scripts/ece-import.d/ftp.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-## Common library for downloading XML feeds via FTP.
-##
-## Example usage, e.g. /etc/cron.hourly/my-import
-##   ===================================================================
-##   # You must change these  
-##   download_dir=/var/spool/escenic/import/mypub/afeed
-##   ftp_password="foo"
-##   ftp_url=ftp://myfeed.com/afeed
-##   ftp_user="myuser"
-##
-##   # You can leave these at the defaults values in most cases 
-##   ftp_download_history=/var/lib/escenic/ftp-history-cron.$(basename $0 .sh)
-##   lock_file=/var/lock/escenic/$(basename $0 .sh).lock
-##   log=/var/log/escenic/cron.$(basename $0 .sh).log
-##   max_file_age_in_hours=10
-##   now=$(date +%s)
-##
-##   # Finally, you need these two lines to do the actual import.
-##   download_latest_ftp_files
-##   fix_ownership_of_download_files
-##   ===================================================================
-
-function create_parent_dir_if_it_does_not_exists() {
-  local dir=$(dirname $1)
-  if [ ! -d $dir ]; then
-    mkdir -p $dir
-  fi
-}
-
-function fix_ownership_of_download_files() {
-  if [ -d $download_dir ]; then
-    run chown -R escenic:escenic $download_dir/
-  fi
-
-  for el in archive error; do
-    local dir=$(dirname $download_dir)/$el
-    
-    if [ -e $dir ]; then
-      chown -R escenic:escenic $dir/
-    fi
-  done
-}
-
-function update_ftp_download_history() {
-  if [ -z $ftp_download_history ]; then
-    print_and_log "You must set ftp_download_history in your configuration"
-    return
-  fi
-
-  create_parent_dir_if_it_does_not_exists $ftp_download_history
-  echo $(date) $1 >> $ftp_download_history
-}
-
-function download_latest_ftp_files() {
-  wget -q --ftp-user "$ftp_user" --ftp-password "$ftp_password" $ftp_url -O - | \
-    grep .xml | \
-    sed -e 's/^[ ]*//g' -e 's/<a\ href=\"\(.*.xml\)\">.*/\1/g' | while read f; do
-    # remove everything before ftp:, that's the file URL
-    local file=$(echo "$f" | sed 's/.*\(ftp:.*\)/\1/g')
-    local date_string=$(
-      echo "$f" | \
-        cut -d' ' -f1-4 | \
-        sed \
-        -e 's/ Jan /-01-/g' \
-        -e 's/ Feb /-02-/g' \
-        -e 's/ Mar /-03-/g' \
-        -e 's/ Apr /-04-/g' \
-        -e 's/ May /-05-/g' \
-        -e 's/ Jun /-06-/g' \
-        -e 's/ Jul /-07-/g' \
-        -e 's/ Aug /-08-/g' \
-        -e 's/ Sep /-09-/g' \
-        -e 's/ Oct /-10-/g' \
-        -e 's/ Nov /-11-/g' \
-        -e 's/ Dec /-12-/g'
-    );
-    local file_date=$(date --date="$date_string" +%s)
-    local age=$(( ${now} - ${file_date} ))
-    local age_in_hours=$(( age / ( 60 * 60 ) ))
-    
-    if [ $age_in_hours -le $max_file_age_in_hours ]; then
-      if [ $(grep $file $ftp_download_history | wc -l) -gt 0 ]; then
-        print_and_log "Already downloaded $file, skipping it"
-        continue
-      fi
-      
-      print_and_log "Downloading ${file} which is $age_in_hours hours old" \
-        "($date_string)"
-      
-      download_uri_target_to_dir $file $download_dir
-      update_ftp_download_history $file
-    fi
-  done
-}
-

From 924ee0c5e56415f417262cc35bbeefae36826878 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 29 Oct 2012 09:53:40 +0100
Subject: [PATCH 1542/2585] - will now only download files with the folowing
 suffixes: XML, PNG,   JPEG, JPG - added support for Apache 2.2.3's file
 listing format (as configured   on CentOS)

---
 .../escenic/ece-scripts/ece-import.d/http-and-ftp.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh b/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh
index 74d99fc3..dbf395dd 100644
--- a/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh
+++ b/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh
@@ -18,12 +18,16 @@ function download_latest_files() {
   # long sed from
   # http://stackoverflow.com/questions/1881237/easiest-way-to-extract-the-urls-from-an-html-page-using-sed-or-awk-only
   local list_of_files=$(
-    wget $user_and_password --quiet --output-document - $uri | \
+    wget $user_and_password \
+      --quiet \
+      --output-document \
+      - $uri | \
+      sed -e 's/<a /\n<a /g' | \
       grep ^'<a href' | \
-      sed -e 's/<a /\n<a /g' \
-      -e 's/<a .*href=['"'"'"]//' \
+      sed -e 's/<a .*href=['"'"'"]//' \
       -e 's/["'"'"'].*$//' \
-      -e '/^$/ d'
+      -e '/^$/ d' | \
+      egrep -i '.(xml|jpg|jpeg|gif|pdf)$'
   )
 
   download_files_if_desired $list_of_files

From 9e8d7f5050476e5f2e370b5e6408713264d83343 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 29 Oct 2012 09:54:13 +0100
Subject: [PATCH 1543/2585] - added feedback when (as in date) the import is
 finished

---
 usr/bin/ece-import | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/bin/ece-import b/usr/bin/ece-import
index ccda1f4d..3486d8a3 100755
--- a/usr/bin/ece-import
+++ b/usr/bin/ece-import
@@ -518,4 +518,5 @@ fi
 
 print_manual_steps
 print_report
+print_and_log "Finished @ $(date)"
 remove_pid_if_exists $pid_file

From 4ad673bf9b615ac3f149020914d952f4ff575b55 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 29 Oct 2012 10:00:58 +0100
Subject: [PATCH 1544/2585] - http-and-ftp.sh::download_latest_files now passes
 the user   credentials on to common-io.sh

---
 usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh b/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh
index dbf395dd..3eb3ab98 100644
--- a/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh
+++ b/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh
@@ -15,6 +15,10 @@ function download_latest_files() {
     "
   fi
 
+  # sets the global wget_opts variable, which
+  # common-io::download_uri_target_to_dir respects.
+  wget_opts="${user_and_password} ${wget_opts}"
+
   # long sed from
   # http://stackoverflow.com/questions/1881237/easiest-way-to-extract-the-urls-from-an-html-page-using-sed-or-awk-only
   local list_of_files=$(

From acf379c227fe3906f518349ca7726a0f2f635555 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 29 Oct 2012 10:05:31 +0100
Subject: [PATCH 1545/2585] - now keeping the result of
 common-io::download_uri_target_to_dir and   printing it to the log

---
 .../escenic/ece-scripts/ece-import.d/http-and-ftp.sh     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh b/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh
index 3eb3ab98..7b15dc23 100644
--- a/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh
+++ b/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh
@@ -44,13 +44,16 @@ function download_latest_files() {
 function download_files_if_desired() {
   for el in $list_of_files; do
     if [ $(is_already_downloaded $uri/$el) -eq 1 ]; then
-      print $el has already been downloaded, skipping to the next
+      print_and_log $el "has already been downloaded, skipping to the next one"
       continue
     fi
-    print downloading $uri/$el "..."
-    download_uri_target_to_dir \
+    print_and_log "Downloading" $uri/$el "..."
+    local result=$(
+      download_uri_target_to_dir \
       $uri/$el \
       $raw_spool_base_dir/$publication_name/$job_name/
+    )
+    log "Downloaded" $(basename $el) "to" $result
     echo $uri/$el >> $(get_state_file)
   done
 }

From e7826a79b380fca6bbeec3f6735552eee9625494 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 29 Oct 2012 10:18:55 +0100
Subject: [PATCH 1546/2585] - added method that is called after each run to
 ensure that new files   get the user/group of the ECE UNIX user. This is to
 ensure that both   the root user and the escenic user (or 'tomcat', 'ubuntu'
 and other   common users that run the JVM processes) can handle the data
 files.

---
 usr/bin/ece-import | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/usr/bin/ece-import b/usr/bin/ece-import
index 3486d8a3..8eea4bde 100755
--- a/usr/bin/ece-import
+++ b/usr/bin/ece-import
@@ -486,6 +486,22 @@ function print_manual_steps() {
     /etc/escenic/engine/server/edit2-engine1/Initial.properties
 }
 
+## we call this method after each run to ensure that new files get the
+## user/group of the ECE UNIX user.
+function ensure_correct_permissions_on_data_files() {
+  local dir_list="
+    $escenic_spool_base_dir/$1/$2/new 
+    $raw_spool_base_dir/$1/$2
+    $raw_state_base_dir/$1/$2
+  "
+  log "Ensuring correct permissions on all data files in these directories:" \
+    $dir_list
+
+  for dir in $dir_list; do
+    run chown -R ${escenic_user}:${escenic_group} $dir
+  done
+}
+
 function print_report() {
   if [ $command -eq $COMMAND_IMPORT ]; then
     print_and_log "Number of raw XML files proccessed:" $raw_file_count
@@ -516,6 +532,7 @@ elif [[ "$command" == $COMMAND_DOWNLOAD_RAW_DATA  ]]; then
   download_latest_files
 fi
 
+ensure_correct_permissions_on_data_files
 print_manual_steps
 print_report
 print_and_log "Finished @ $(date)"

From 6d8fa79ac24e6b23442d92332b433faf37a625c4 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 29 Oct 2012 10:21:41 +0100
Subject: [PATCH 1547/2585] - fixed publication_name and job_name in
 ensure_correct_permissions_on_data_files

---
 usr/bin/ece-import | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/bin/ece-import b/usr/bin/ece-import
index 8eea4bde..6a8a3b2c 100755
--- a/usr/bin/ece-import
+++ b/usr/bin/ece-import
@@ -490,9 +490,9 @@ function print_manual_steps() {
 ## user/group of the ECE UNIX user.
 function ensure_correct_permissions_on_data_files() {
   local dir_list="
-    $escenic_spool_base_dir/$1/$2/new 
-    $raw_spool_base_dir/$1/$2
-    $raw_state_base_dir/$1/$2
+    $escenic_spool_base_dir/$publication_name/$job_name/new 
+    $raw_spool_base_dir/$publication_name/$job_name
+    $raw_state_base_dir/$publication_name/$job_name
   "
   log "Ensuring correct permissions on all data files in these directories:" \
     $dir_list

From bf2fdebb1cfc86199b668e1fc9cc86bface86ea2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 30 Oct 2012 12:41:43 +0100
Subject: [PATCH 1548/2585] - updated documentation on how master and slave
 NFSs are synced.

---
 .../doc/vizrt/vosa-handbook/network-file-system-sync.org   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/network-file-system-sync.org b/usr/share/doc/vizrt/vosa-handbook/network-file-system-sync.org
index 71829289..3186fa1b 100644
--- a/usr/share/doc/vizrt/vosa-handbook/network-file-system-sync.org
+++ b/usr/share/doc/vizrt/vosa-handbook/network-file-system-sync.org
@@ -1,4 +1,9 @@
 ** Syncing the Master & Slave NFS
 
 The NFS slave on <%= trail_nfs_slave_host %> replicates the master NFS
-on <%= trail_nfs_master_host %> using an ourly cron job.
+on <%= trail_nfs_master_host %> using an hourly cron job.
+
+This is initiated by a file on <%= trail_nfs_slave_host %>'s
+=/etc/cron.hourly= directory which calls the
+=/usr/bin/sync-network-drive= with the appropriate parameters to sync
+the <%= trail_nfs_export_list %>.

From d24789739249fc57cbfe127d2976d4494af69baa Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 30 Oct 2012 13:06:39 +0100
Subject: [PATCH 1549/2585] - fixed bug in
 get_publication_links_for_presentation_host, this   should fix some
 documentation errors - replaced a few TABs with spaces

---
 usr/share/doc/vizrt/vosa-handbook/create-handbook.sh | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 5741b6a3..801c2bcf 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -465,14 +465,10 @@ EOF
 }
 
 function get_publication_links_for_presentation_host() {
-    if [ -z $trail_publication_domain_mapping_list ] ; then
-	return ""
-    fi
-
-#    for ep in $trail_publication_list; do
-#	echo "[[$(get_link ${ep}.${1})/][site:$ep]]"
-#    done
-
+  if [ -z "$trail_publication_domain_mapping_list" ] ; then
+    return ""
+  fi
+  
   for el in $trail_publication_domain_mapping_list; do
     local old_ifs=$IFS
     IFS='#'

From 9340e43b5311d42da484469bbea414f08da769fe Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 30 Oct 2012 13:29:10 +0100
Subject: [PATCH 1550/2585] - hardened
 common-bashing::remove_pid_and_exit_in_error in the event   that the pid_file
 hasn't been defined.

---
 .../escenic/ece-scripts/common-bashing.sh     | 41 +++++++++++++++++--
 1 file changed, 37 insertions(+), 4 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index 0fc3ad0c..e3c23da2 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -99,7 +99,7 @@ function log_call_stack() {
 }
 
 function remove_pid_and_exit_in_error() {
-  if [ -e $pid_file ]; then
+  if [[ -z $pid_file && -e $pid_file ]]; then
     rm $pid_file
   fi
 
@@ -119,6 +119,7 @@ function exit_on_error() {
     print_and_log "The command [${@}] run as user $USER $(red FAILED)" \
       "(the command exited with code ${code}), I'll exit now :-("
     print "See $log for further details."
+    remove_file_if_exists $lock_file
     remove_pid_and_exit_in_error
   fi
 }
@@ -366,8 +367,10 @@ function split_string() {
   echo $splitted_string
 }
 
-## Creates $1 PID file if possible
-function create_pid_if_doesnt_exist() {
+## Creates $1 file if possible
+##
+## $1 :: the file, typically a PID or lock file.
+function create_file_if_doesnt_exist() {
   if [ -z $1 ]; then
     return
   elif [ -e $1 ]; then
@@ -382,7 +385,7 @@ function create_pid_if_doesnt_exist() {
   fail_safe_run touch $1
 }
 
-function remove_pid_if_exists() {
+function remove_file_if_exists() {
   if [ -z $1 ]; then
     return
   elif [ ! -e $1 ]; then
@@ -391,3 +394,33 @@ function remove_pid_if_exists() {
   
   fail_safe_run rm $1
 }
+
+## basename $0 will resolve to the file name of the calling script,
+## not common-bashing itself.
+lock_file=/var/run/escenic/$(basename $0 .sh).lock
+
+## Will create a lock (and the lock's directory) for the caller. If
+## the lock already exists, this function will cause your program to
+## fail.
+##
+## $1 :: the lock file
+function create_lock() {
+  if [ -e $lock_file ]; then
+    echo $lock_file "exists, I'll exit"
+    exit 1
+  else
+    fail_safe_run mkdir -p $(dirname $lock_file)
+    fail_safe_run touch $lock_file
+  fi
+}
+
+## $1 :: the lock file
+function remove_lock() {
+  if [ ! -e $lock_file ]; then
+    print "Something is seriously wrong, the lock file ($lock_file) isn't there!"
+    exit 1
+  fi
+
+  fail_safe_run rm $lock_file
+}
+

From 454d28053126bae6508bf505c87dce672c6163de Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 30 Oct 2012 13:51:34 +0100
Subject: [PATCH 1551/2585] - added script made for syncing the NFS exports
 between the serving   hosts. The script ensures that there is only one
 instance of it   running and thus that two simultaneous runs it will not
 cause   corruption of data.

  Example usage with source (-s) and target (-t):

  $ sync-network-drive \
    -s remote-server:/var/lib \
    -t /var/backups/remote-server
---
 usr/bin/sync-network-drive | 197 +++++++++++++++++++++++++++++++++++++
 1 file changed, 197 insertions(+)
 create mode 100644 usr/bin/sync-network-drive

diff --git a/usr/bin/sync-network-drive b/usr/bin/sync-network-drive
new file mode 100644
index 00000000..7d2f5c82
--- /dev/null
+++ b/usr/bin/sync-network-drive
@@ -0,0 +1,197 @@
+#! /usr/bin/env bash
+
+# Script made for syncing the NFS exports between the serving
+# hosts. The script ensures that there is only one instance of it
+# running and thus that two simultaneous runs it will not cause
+# corruption of data.
+#
+# Example usage with source (-s) and target (-t):
+#
+# $ sync-network-drive \
+#   -s remote-server:/var/lib \
+#   -t /var/backups/remote-server
+#
+# The full path on the remote server is replicated locally here, so
+# after this command, you'll have remote-server's /var/lib directory
+# under your local directory /var/backups/remote-server/var/lib And
+# one last thing: trailing slashes are not needed
+
+log=/var/log/escenic/$(basename $0).log
+
+function bootstrap_thyself() {
+  # first, try to be nice, then check the standard location
+  local dir=$(dirname $0)/../share/escenic/ece-scripts
+  if [ ! -d $dir  ]; then
+    dir=/usr/share/escenic/ece-scripts
+  fi
+
+  for el in common-bashing.sh common-io.sh; do
+    source $dir/$el 2>/dev/null || {
+      echo "$(basename $0): Could not load the library $el," \
+        "and I can't live without it :-(" | fmt
+      exit 1
+    }
+  done
+}
+
+bootstrap_thyself
+
+tmp_known_hosts_file=$(mktemp)
+
+rsync_opts="
+--recursive
+--links
+--perms
+--group
+--owner
+--compress
+--itemize-changes
+--ignore-times
+--checksum
+--cvs-exclude
+"
+rsync_additional_outgoing_opts="
+--dry-run
+--verbose
+"
+# the backslashes need to be here
+rsync_ssh_opts="\
+-o BatchMode=yes \
+-o UserKnownHostsFile=${tmp_known_hosts_file} \
+-o StrictHostKeyChecking=no \
+-p 9022 \
+"
+
+outgoing=0
+verbose=0
+
+function ensure_src_is_sane() {
+  # checking that the src is <host>:<dir>
+  if [[ $(dirname $(echo "$src" | cut -d':' -f2 )) == /** ]]; then
+    return
+  else
+    print "Source $src is insane, should be <host>:<absolute dir>"
+    remove_lock
+    tidy_up
+    exit 1
+  fi
+}
+
+function ensure_target_dir_is_there() {
+  mkdir -p $target_dir || (echo "failed creating target dir"; exit 1 )
+
+  if [ ! -w $target_dir ]; then
+    print $USER "cannot write to $target_dir :-("
+    remove_lock
+    tidy_up
+    exit 1
+  fi
+}
+
+function sync_it() {
+  if [ $outgoing -eq 1 ]; then
+    rsync_opts=${rsync_opts}" "${rsync_additional_outgoing_opts}
+  fi
+
+  if [ $verbose -eq 1 ]; then
+    rsync_opts=${rsync_opts}" --verbose "
+  fi
+
+  print "Sync on $HOSTNAME started @ $(stat -c %y $lock_file)" \
+    "${src} -> ${target_dir}"
+  run rsync $rsync_opts \
+    -e "ssh $rsync_ssh_opts" \
+    $src/ \
+    $target_dir/
+}
+
+function tidy_up() {
+  run rm $tmp_known_hosts_file
+}
+
+function print_report() {
+  local now=$(date +%s)
+  local started=$(stat -c %Y $lock_file)
+  local seconds=$(( now - started ))
+  local days=$(( seconds / ( 60 * 60 * 24 ) ))
+  local seconds_left=$(( seconds - ( $days * 60 * 60 * 24 ) ))
+  local hours=$(( seconds_left / ( 60 * 60 ) ))
+  local seconds_left=$(( seconds_left - ( $hours * 60 * 60 ) ))
+  local minutes=$(( seconds_left / 60 ))
+  local seconds_left=$(( seconds_left - $minutes * 60 ))
+  
+  print "Hi! $src has now been synced to $target_dir"
+  print "It took" ${days}d ${hours}h ${minutes}m ${seconds_left}s
+
+}
+
+function get_user_options() {
+  while getopts ":s:t:ov" opt; do
+    case $opt in
+      s)
+        src=${OPTARG}
+        ;;
+      t)
+        target_dir_root=${OPTARG}
+        
+        if [[ $target_dir_root  == "/" ]]; then
+          target_dir_root=""
+        fi
+        
+        target_dir=${target_dir_root}$(echo $src | cut -d":" -f2)
+        ;;
+      o)
+        outgoing=1
+        ;;
+      v)
+        verbose=1
+        ;;
+      \?)
+        print "Invalid option: -$OPTARG" >&2
+        exit 1
+        ;;
+      :)
+        print "Option -$OPTARG requires an argument." >&2
+        exit 1
+        ;;
+      *)
+        print "Command is $OPTARG"
+        exit 0
+    esac
+  done
+}
+
+function ensure_user_options_are_ok() {
+  if [ -z "${src}" ]; then
+    cat <<EOF 
+You must specify a source with -s <host>:<dir>, e.g.:
+$(basename $0) -s app1:/var/log -t /var/backups/app1
+EOF
+
+tidy_up
+exit 1
+  fi
+  
+  if [ -z "${target_dir}" ]; then
+    cat <<EOF
+You must specify a local target directorywith -t <target dir>, e.g.:
+$(basename $0) -s app1:/var/log -t /var/backups/app1
+EOF
+
+tidy_up
+exit 1
+  fi
+
+}
+
+get_user_options $@
+ensure_user_options_are_ok
+create_pid
+create_lock
+ensure_src_is_sane
+ensure_target_dir_is_there
+sync_it
+print_report
+remove_lock
+tidy_up
+remove_pid

From 408d58bdb498977af841651150768e48936e7f06 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 30 Oct 2012 13:52:21 +0100
Subject: [PATCH 1552/2585] - added create_pid and remove_pid. The caller
 doesn't need to set the   pid_file variable either (but may override it).

---
 usr/share/escenic/ece-scripts/common-bashing.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index e3c23da2..eb25ec87 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -424,3 +424,14 @@ function remove_lock() {
   fail_safe_run rm $lock_file
 }
 
+pid_file=/var/run/escenic/$(basename $0 .sh).pid
+function create_pid() {
+  fail_safe_run mkdir -p $(dirname $pid_file)
+  echo $$ > $pid_file
+}
+
+function remove_pid() {
+  if [ -e $pid_file ]; then
+    fail_safe_run rm $pid_file
+  fi
+}

From f48b7320ba3b5ce0923c28b8e8aa1b81d1c38209 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 30 Oct 2012 13:53:54 +0100
Subject: [PATCH 1553/2585] - now using common-bashing::create_pid and
 common-bashing::remove_pid - added skeleton for the cron setup

---
 usr/bin/ece-import | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/usr/bin/ece-import b/usr/bin/ece-import
index 6a8a3b2c..433cc59b 100755
--- a/usr/bin/ece-import
+++ b/usr/bin/ece-import
@@ -49,7 +49,6 @@ job_name=""
 # of user run as a deamon process.
 log=/var/log/escenic/$(basename $0)-${USER}.log
 nursery_base_dir=/etc/escenic/engine/common
-pid_file=/var/run/escenic/$(basename $0).pid
 publication_name=""
 raw_spool_base_dir=/var/spool/escenic/raw
 raw_state_base_dir=/var/lib/escenic/raw
@@ -445,7 +444,6 @@ function create_import_directories() {
   # ownership right.
   local dir_list="
     $(dirname $log)
-    $(dirname $pid_file)
     $escenic_spool_base_dir/$1/$2/archive
     $escenic_spool_base_dir/$1/$2/error
     $escenic_spool_base_dir/$1/$2/new 
@@ -512,7 +510,14 @@ function print_report() {
   fi
 }
 
-create_pid_if_doesnt_exist $pid_file
+function set_up_cron_job() {
+  ## TODO, finish:
+  cat >> /etc/crontab <<EOF
+  */5 * * * * * su - ${escenic_user} -c "ece-import --name ${job_name} --publication ${publication_name} --user ${user} --password ${password} --uri  ${uri} download-import-data"
+EOF
+}
+
+create_pid
 check_pre_requisites
 print_and_log "Started @ $(date), I'm logging to $log"
 get_user_input $@
@@ -536,4 +541,4 @@ ensure_correct_permissions_on_data_files
 print_manual_steps
 print_report
 print_and_log "Finished @ $(date)"
-remove_pid_if_exists $pid_file
+remove_pid

From 1274ea756547f930348c2ab9fce6ca50eb917eda Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 30 Oct 2012 14:00:18 +0100
Subject: [PATCH 1554/2585] - ece-import is now included in the
 escenic-content-engine-scripts   package - sync-network-drive is now included
 in the escenic-common-scripts   package

---
 usr/share/escenic/package-scripts/create-packages | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index d504e32f..4a19c8ec 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -105,9 +105,12 @@ function set_up_escenic-content-engine-scripts() {
   mkdir -p $target_dir/{etc,usr,/etc/default}
 
   # bin
-  cp -r ../../../bin/ece $target_dir/usr/bin/
-  cp -r ../../escenic/ece-scripts/ece.d/ \
-    $target_dir/usr/share/escenic/ece-scripts/
+  local bin_list='ece ece-import'
+  for el in $bin_list; do
+    cp -r ../../../bin/$el $target_dir/usr/bin/
+    cp -r ../../escenic/ece-scripts/${el}.d/ \
+      $target_dir/usr/share/escenic/ece-scripts/
+  done
 
   # conf
   cp -r ../../../../etc/escenic/ $target_dir/etc/
@@ -164,6 +167,9 @@ function set_up_escenic-common-scripts() {
     $target_dir/usr/share/escenic/ece-scripts/
   cp -r ../../escenic/ece-scripts/*.html \
     $target_dir/usr/share/escenic/ece-scripts/
+
+  # everyone can need some network syncing
+  cp -r ../../../bin/sync-network-drive $target_dir/usr/bin/
 }
 
 function set_up_escenic-check-mk-plugins() {

From 7ed0915fbd58cd703bda239133dcae5cd6ddedec Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Tue, 30 Oct 2012 14:48:43 +0100
Subject: [PATCH 1555/2585] Adding the trail_service_header_org

---
 usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
index dc17cb18..6b570977 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
+++ b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
@@ -3,7 +3,9 @@
 #+OPTIONS: toc:2 
 #+DRAWERS: PLANTUML PROPERTIES
 #+STYLE: <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"/>
-
+#+OPTIONS: skip:t
+#+TEXT: <%= trail_service_header_org %>
+#+TEXT: [TABLE-OF-CONTENTS]
 #+INCLUDE: "overview.org"
 #+INCLUDE: "operating-system-maintenance.org" 
 #+INCLUDE: "deployment.org"

From 19dadeda6ff8a78fb91250622d9b6fff826400c8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 30 Oct 2012 16:06:23 +0100
Subject: [PATCH 1556/2585] - now adds the truth to all conf packages

---
 usr/share/escenic/build-scripts/ece-build | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index ad5e0695..7bceeada 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -507,6 +507,14 @@ function create_machine_conf_packages() {
     run cp -r $conf_dir/${machine}/* $target_dir/
     find $target_dir -name .svn -type d | xargs rm -rf
 
+    # add the truth
+    local file=$svn_src_dir/doc/vosa-handbook/create-handbook.conf
+    if [ -e $file ]; then
+      local dir=$target_dir/etc/vizrt
+      run mkdir -p $dir
+      run cp $file $dir/truth.conf
+    fi
+    
     # mark all files as conf files
     local conffiles_file=$target_dir/DEBIAN/conffiles
     run mkdir -p $(dirname $conffiles_file)

From a283d2e76c2c2839c0aab40f04612bc1cb7c0acc Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 30 Oct 2012 16:37:10 +0100
Subject: [PATCH 1557/2585] - added the executable bit

---
 usr/bin/sync-network-drive | 1 +
 1 file changed, 1 insertion(+)
 mode change 100644 => 100755 usr/bin/sync-network-drive

diff --git a/usr/bin/sync-network-drive b/usr/bin/sync-network-drive
old mode 100644
new mode 100755
index 7d2f5c82..57d0350d
--- a/usr/bin/sync-network-drive
+++ b/usr/bin/sync-network-drive
@@ -5,6 +5,7 @@
 # running and thus that two simultaneous runs it will not cause
 # corruption of data.
 #
+#
 # Example usage with source (-s) and target (-t):
 #
 # $ sync-network-drive \

From 1d877d92078e13b96f8da228659b01257ebcecc9 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 30 Oct 2012 17:03:55 +0100
Subject: [PATCH 1558/2585] - added support for import job specific cron jobs,
 installed from the   mport archive. Not yet, done, but pretty cool:

     $ tar tzf import-archive.zip
     mypub/foo/cron.every.10.minutes/say-hi
     mypub/bar/cron.every.59.minutes/sync-the-world

  Gives:

     $ cat /etc/cron.d/mypub-foo-cron
     */10 * * * * * /usr/share/escenic/import/mypub/foo/cron/say-hi
     */59 * * * * * /usr/share/escenic/import/mypub/foo/cron/sync-the-world

  TODO put the cron files in
  /usr/share/escenic/import/mypub/foo/cron/sync-the-world

- moved everything that has to do with import job creation out in its
  own module: create-job
---
 usr/bin/ece-import                            | 139 ------------------
 .../ece-scripts/ece-import.d/create-job.sh    | 129 ++++++++++++++++
 2 files changed, 129 insertions(+), 139 deletions(-)
 create mode 100644 usr/share/escenic/ece-scripts/ece-import.d/create-job.sh

diff --git a/usr/bin/ece-import b/usr/bin/ece-import
index 433cc59b..dabeecd8 100755
--- a/usr/bin/ece-import
+++ b/usr/bin/ece-import
@@ -347,121 +347,6 @@ function verify_import_job_configuration() {
   fi
 }
 
-function create_import_configuration() {
-  local publication_name=$1
-  local job_name=$2
-  
-  print_and_log "Creating import job configuration '${job_name}' for" \
-    "publication '${publication_name}' ..."
-
-  local job_nursery_fragment=imports/$publication_name/${job_name}
-  local file=$nursery_base_dir/${job_nursery_fragment}.properties
-  make_dir $(dirname $file)
-  cat > $file <<EOF
-## Import configuration generated by $(basename $0) @ $(date)
-\$class=com.escenic.syndication.xml.XMLImportConfiguration
-
-archiveDirectory=${escenic_spool_base_dir}/${publication_name}/${job_name}/archive
-defaultSectionName=${import_section_name-ece_incoming}
-defaultUserName=${import_user_name-${publication_name}_admin}
-errorDirectory=${escenic_spool_base_dir}/${publication_name}/${job_name}/error
-fileNames=*.xml
-importDirectory=${escenic_spool_base_dir}/${publication_name}/${job_name}/new
-importReporter=/com/escenic/syndication/xml/ImportReporter
-publicationName=${publication_name}
-EOF
-
-  print_and_log $(green NEW) \
-    "Import Nursery component created for you in ${file}"
-
-  import_configuration_list="
-    ${job_nursery_fragment}
-    ${import_configuration_list}
-  "
-}
-
-function apply_import_archive() {
-  local tmp_dir=$(mktemp -d)
-  extract_archive $import_archive $tmp_dir
-
-  local publication_list=$(
-    find $tmp_dir/ -maxdepth 1 -type d | sed "s#${tmp_dir}/##g"
-  )
-  if [ -z "$publication_list" ]; then
-    print_and_log "$(red ERROR) No publications were found inside" \
-      "$import_archive please re-read the import job specification" \
-      "and fix your archive structure"
-    remove_pid_and_exit_in_error
-  fi
-  
-  for el in $publication_list; do
-    local import_job_list=$(
-      find $tmp_dir/$el -maxdepth 1 -type d | sed "s#${tmp_dir}/$el##g" | \
-        sed 's#^/##g'
-    )
-    if [ -z "$import_job_list" ]; then
-      print_and_log "$(red ERROR) No import jobs were defined for publication" \
-        "$el. The import archive isn't in accordance with the import archive" \
-        "specification, so I'll exit :-('"
-      remove_pid_and_exit_in_error
-    fi
-    
-    for ele in $import_job_list; do
-      print_and_log "Setting up import job '$ele' for publication '$el' ..."
-      create_import_configuration $el $ele
-
-      local src_dir=$tmp_dir/$el/$ele/transformers
-      local target_dir=$transformers_base_dir/$el/$ele
-      if [ -d $src_dir ]; then
-        print_and_log "Copying transformers to $target_dir"
-        make_dir $target_dir
-        run cp $src_dir/[0-9]* $target_dir
-      fi
-
-      src_dir=$tmp_dir/$el/$ele/cron.hourly
-      if [ -d $src_dir ]; then
-        print_and_log "Installing cron.hourly scripts for $ele"
-        run chmod +x $src_dir/*
-        for elem in $(find $src_dir -maxdepth 1 -type f); do
-          local cron_base=$(basename $elem)
-          run cp $elem /etc/cron.hourly/import-${el}-${ele}-${cron_base}
-        done
-      fi
-
-      # support for cron.every.<number>.minutes
-
-      create_import_directories $el $ele
-    done
-  done
-
-  run rm -rf ${tmp_dir}
-}
-
-## $1 :: publication
-## $2 :: import name
-function create_import_directories() {
-  # we include log and pid_file's directories here to get the
-  # ownership right.
-  local dir_list="
-    $(dirname $log)
-    $escenic_spool_base_dir/$1/$2/archive
-    $escenic_spool_base_dir/$1/$2/error
-    $escenic_spool_base_dir/$1/$2/new 
-    $raw_spool_base_dir/$1/$2
-    $raw_state_base_dir/$1/$2
-    $raw_transformation_base_dir/$1/$2 \
-    $raw_transformed_base_dir/$1/$2 \
-    $raw_transformed_base_dir/$1/$2/failed \
-    $raw_transformed_base_dir/$1/$2/succeeded \
-    $transformers_base_dir/$1/$2
-  "
-  for dir in $dir_list; do
-    log "Creating directory" $dir
-    make_dir $dir
-    run chown ${escenic_user}:${escenic_group} $dir
-  done
-}  
-
 function print_manual_steps() {
   if [ -z "${import_configuration_list}" ]; then
     return
@@ -484,22 +369,6 @@ function print_manual_steps() {
     /etc/escenic/engine/server/edit2-engine1/Initial.properties
 }
 
-## we call this method after each run to ensure that new files get the
-## user/group of the ECE UNIX user.
-function ensure_correct_permissions_on_data_files() {
-  local dir_list="
-    $escenic_spool_base_dir/$publication_name/$job_name/new 
-    $raw_spool_base_dir/$publication_name/$job_name
-    $raw_state_base_dir/$publication_name/$job_name
-  "
-  log "Ensuring correct permissions on all data files in these directories:" \
-    $dir_list
-
-  for dir in $dir_list; do
-    run chown -R ${escenic_user}:${escenic_group} $dir
-  done
-}
-
 function print_report() {
   if [ $command -eq $COMMAND_IMPORT ]; then
     print_and_log "Number of raw XML files proccessed:" $raw_file_count
@@ -510,13 +379,6 @@ function print_report() {
   fi
 }
 
-function set_up_cron_job() {
-  ## TODO, finish:
-  cat >> /etc/crontab <<EOF
-  */5 * * * * * su - ${escenic_user} -c "ece-import --name ${job_name} --publication ${publication_name} --user ${user} --password ${password} --uri  ${uri} download-import-data"
-EOF
-}
-
 create_pid
 check_pre_requisites
 print_and_log "Started @ $(date), I'm logging to $log"
@@ -537,7 +399,6 @@ elif [[ "$command" == $COMMAND_DOWNLOAD_RAW_DATA  ]]; then
   download_latest_files
 fi
 
-ensure_correct_permissions_on_data_files
 print_manual_steps
 print_report
 print_and_log "Finished @ $(date)"
diff --git a/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh b/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh
new file mode 100644
index 00000000..201a1f22
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh
@@ -0,0 +1,129 @@
+## $1 :: publication
+## $2 :: import name
+function create_import_directories() {
+  # we include log and pid_file's directories here to get the
+  # ownership right.
+  local dir_list="
+    $(dirname $log)
+    $escenic_spool_base_dir/$1/$2/archive
+    $escenic_spool_base_dir/$1/$2/error
+    $escenic_spool_base_dir/$1/$2/new 
+    $raw_spool_base_dir/$1/$2
+    $raw_state_base_dir/$1/$2
+    $raw_transformation_base_dir/$1/$2 \
+    $raw_transformed_base_dir/$1/$2 \
+    $raw_transformed_base_dir/$1/$2/failed \
+    $raw_transformed_base_dir/$1/$2/succeeded \
+    $transformers_base_dir/$1/$2
+  "
+  for dir in $dir_list; do
+    log "Creating directory" $dir
+    make_dir $dir
+    run chown ${escenic_user}:${escenic_group} $dir
+  done
+}
+
+function create_import_configuration() {
+  local publication_name=$1
+  local job_name=$2
+  
+  print_and_log "Creating import job configuration '${job_name}' for" \
+    "publication '${publication_name}' ..."
+
+  local job_nursery_fragment=imports/$publication_name/${job_name}
+  local file=$nursery_base_dir/${job_nursery_fragment}.properties
+  make_dir $(dirname $file)
+  cat > $file <<EOF
+## Import configuration generated by $(basename $0) @ $(date)
+\$class=com.escenic.syndication.xml.XMLImportConfiguration
+
+archiveDirectory=${escenic_spool_base_dir}/${publication_name}/${job_name}/archive
+defaultSectionName=${import_section_name-ece_incoming}
+defaultUserName=${import_user_name-${publication_name}_admin}
+errorDirectory=${escenic_spool_base_dir}/${publication_name}/${job_name}/error
+fileNames=*.xml
+importDirectory=${escenic_spool_base_dir}/${publication_name}/${job_name}/new
+importReporter=/com/escenic/syndication/xml/ImportReporter
+publicationName=${publication_name}
+EOF
+
+  print_and_log $(green NEW) \
+    "Import Nursery component created for you in ${file}"
+
+  import_configuration_list="
+    ${job_nursery_fragment}
+    ${import_configuration_list}
+  "
+}
+
+function apply_import_archive() {
+  local tmp_dir=$(mktemp -d)
+  extract_archive $import_archive $tmp_dir
+
+  local publication_list=$(
+    find $tmp_dir/ -maxdepth 1 -type d | sed "s#${tmp_dir}/##g"
+  )
+  if [ -z "$publication_list" ]; then
+    print_and_log "$(red ERROR) No publications were found inside" \
+      "$import_archive please re-read the import job specification" \
+      "and fix your archive structure"
+    remove_pid_and_exit_in_error
+  fi
+  
+  for el in $publication_list; do
+    local import_job_list=$(
+      find $tmp_dir/$el -maxdepth 1 -type d | sed "s#${tmp_dir}/$el##g" | \
+        sed 's#^/##g'
+    )
+    if [ -z "$import_job_list" ]; then
+      print_and_log "$(red ERROR) No import jobs were defined for publication" \
+        "$el. The import archive isn't in accordance with the import archive" \
+        "specification, so I'll exit :-('"
+      remove_pid_and_exit_in_error
+    fi
+    
+    for ele in $import_job_list; do
+      print_and_log "Setting up import job '$ele' for publication '$el' ..."
+      create_import_configuration $el $ele
+
+      local src_dir=$tmp_dir/$el/$ele/transformers
+      local target_dir=$transformers_base_dir/$el/$ele
+      if [ -d $src_dir ]; then
+        print_and_log "Copying transformers to $target_dir"
+        make_dir $target_dir
+        run cp $src_dir/[0-9]* $target_dir
+      fi
+
+      create_import_cron_jobs $el $ele $tmp_dir/$el/$ele
+      create_import_directories $el $ele
+    done
+  done
+
+  run rm -rf ${tmp_dir}
+}
+
+
+## $1 : publication
+## $2 : job
+## $3 : archive directory of $1 and $2
+function create_import_cron_jobs() {
+  if [[ $(whoami) != "root" ]]; then
+    print_and_log $(red WARN) \
+      "You need to be root to set up the cron jobs, skipping it."
+    return
+  fi
+  local file=/etc/cron.d/$1-$2-cron
+  print_and_log "Setting up $file for ${1}'s $2 ..."
+  echo > $file
+  
+  find $3 -maxdepth 3 -name "cron*minutes" -type d | while read f; do
+    dir=$(basename $f)
+    minutes=$(echo $dir | cut -d'.' -f3)
+    for el in $(find $3/$dir -type f); do
+      echo "*/${minutes} * * * * $el" >> $file
+    done
+  done
+
+  cat $file
+
+}

From 1ba58db3a163ba0c2f8a9fd73e79df99efdb303e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 30 Oct 2012 17:06:42 +0100
Subject: [PATCH 1559/2585] - default port is now 22

---
 usr/bin/sync-network-drive | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/bin/sync-network-drive b/usr/bin/sync-network-drive
index 57d0350d..6cec78cf 100755
--- a/usr/bin/sync-network-drive
+++ b/usr/bin/sync-network-drive
@@ -60,7 +60,7 @@ rsync_ssh_opts="\
 -o BatchMode=yes \
 -o UserKnownHostsFile=${tmp_known_hosts_file} \
 -o StrictHostKeyChecking=no \
--p 9022 \
+-p 22 \
 "
 
 outgoing=0

From bbab150e05418f14a6fc40aee8d62bbf224e9c6e Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Tue, 30 Oct 2012 17:43:53 +0100
Subject: [PATCH 1560/2585] TV-230

---
 .../doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
index d77bb1ec..efb3a8cc 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
+++ b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
@@ -9,7 +9,12 @@
 
 ;; These two settings make exported HTML look like our Vizrt branded
 ; release notes.
-(setq org-export-html-preamble "<svg
+(setq org-export-html-preamble "<script>
+function renderclockiframe(url) {
+  return '<iframe src=\"+url+\" frameborder=\"0\" width=\"191\" height=\"19\"></iframe>
+';
+}
+</script><svg
         id=\"vizrt-logo\"
         version=\"1.1\"
         width=\"138\"

From c066a6ff91529e3253fa79c9abcd57762c09ecfa Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Tue, 30 Oct 2012 17:44:59 +0100
Subject: [PATCH 1561/2585] Adding a javascript function to render a clock

---
 usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
index efb3a8cc..0e215ac7 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
+++ b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
@@ -11,8 +11,7 @@
 ; release notes.
 (setq org-export-html-preamble "<script>
 function renderclockiframe(url) {
-  return '<iframe src=\"+url+\" frameborder=\"0\" width=\"191\" height=\"19\"></iframe>
-';
+  return '<iframe src=\"+url+\" frameborder=\"0\" width=\"191\" height=\"19\"></iframe>';
 }
 </script><svg
         id=\"vizrt-logo\"

From 72a84120f068e9beb6c74a40c169035cfffd37a0 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Tue, 30 Oct 2012 18:02:59 +0100
Subject: [PATCH 1562/2585] fixing some quoting issues

---
 usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
index 0e215ac7..789ac9e6 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
+++ b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
@@ -11,7 +11,7 @@
 ; release notes.
 (setq org-export-html-preamble "<script>
 function renderclockiframe(url) {
-  return '<iframe src=\"+url+\" frameborder=\"0\" width=\"191\" height=\"19\"></iframe>';
+  return '<iframe src=\"http://'+url+'\" frameborder=\"0\" width=\"191\" height=\"19\"></iframe>';
 }
 </script><svg
         id=\"vizrt-logo\"

From e63c379098a276f4921da59eb095cb6db92fab26 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Tue, 30 Oct 2012 18:13:31 +0100
Subject: [PATCH 1563/2585] made the time iframe a bit smaller

---
 usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
index 789ac9e6..b71a943a 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
+++ b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
@@ -11,7 +11,7 @@
 ; release notes.
 (setq org-export-html-preamble "<script>
 function renderclockiframe(url) {
-  return '<iframe src=\"http://'+url+'\" frameborder=\"0\" width=\"191\" height=\"19\"></iframe>';
+  return '<iframe src=\"http://'+url+'\" frameborder=\"0\" width=\"191\" height=\"12\"></iframe>';
 }
 </script><svg
         id=\"vizrt-logo\"

From 87de0758f034453615a59da0f20dfe320d260fa6 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Tue, 30 Oct 2012 18:22:32 +0100
Subject: [PATCH 1564/2585] smaller stil

---
 usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
index b71a943a..a8ea3b63 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
+++ b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
@@ -11,7 +11,7 @@
 ; release notes.
 (setq org-export-html-preamble "<script>
 function renderclockiframe(url) {
-  return '<iframe src=\"http://'+url+'\" frameborder=\"0\" width=\"191\" height=\"12\"></iframe>';
+  return '<iframe src=\"http://'+url+'\" frameborder=\"0\" width=\"150\" height=\"10\"></iframe>';
 }
 </script><svg
         id=\"vizrt-logo\"

From bf5701ff69013cf4e227fa5c2bec49e557f54ce4 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Tue, 30 Oct 2012 18:33:06 +0100
Subject: [PATCH 1565/2585] made the clock more distinctive

---
 usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
index a8ea3b63..a136f432 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
+++ b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
@@ -11,7 +11,8 @@
 ; release notes.
 (setq org-export-html-preamble "<script>
 function renderclockiframe(url) {
-  return '<iframe src=\"http://'+url+'\" frameborder=\"0\" width=\"150\" height=\"10\"></iframe>';
+  return '<iframe src=\"'+url+'\" frameborder=\"0\" width=\"170\" height=\"23\" allowTransparency=\"true\"></iframe>';
+
 }
 </script><svg
         id=\"vizrt-logo\"

From d72fa622f1831e270a28721c2719ab590aebabb6 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Tue, 30 Oct 2012 21:27:02 +0100
Subject: [PATCH 1566/2585] better clock

---
 .../vizrt/vosa-handbook/vizrt-branding-org-mode.el    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
index a136f432..a54236f1 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
+++ b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
@@ -9,10 +9,17 @@
 
 ;; These two settings make exported HTML look like our Vizrt branded
 ; release notes.
+;    return '<iframe src=\"'+url+'\" frameborder=\"0\" width=\"170\" height=\"23\" allowTransparency=\"true\"></iframe>';
+; http://free.timeanddate.com/clock/i3cmoi0t/n145/tlph/tct/pct/bas2/bat4/bacf90/pa2/tt0/tw1/tm1/td1/ts1/ta1/tb4
 (setq org-export-html-preamble "<script>
 function renderclockiframe(url) {
-  return '<iframe src=\"'+url+'\" frameborder=\"0\" width=\"170\" height=\"23\" allowTransparency=\"true\"></iframe>';
-
+var val='';
+val += '<iframe src=\"';
+val += url;
+val += '\" frameborder=\"0\" width=\"126\" height=\"42\" allowTransparency=\"true\" style=\"float:right\">'
+val += '</iframe>';
+alert(val);
+return val;
 }
 </script><svg
         id=\"vizrt-logo\"

From b6bbfe85e2f63010f360023379dcc04c5adc622f Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Tue, 30 Oct 2012 21:29:57 +0100
Subject: [PATCH 1567/2585] better clock

---
 .../vosa-handbook/vizrt-branding-org-mode.el     | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
index a54236f1..bd2d8166 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
+++ b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
@@ -9,17 +9,15 @@
 
 ;; These two settings make exported HTML look like our Vizrt branded
 ; release notes.
-;    return '<iframe src=\"'+url+'\" frameborder=\"0\" width=\"170\" height=\"23\" allowTransparency=\"true\"></iframe>';
-; http://free.timeanddate.com/clock/i3cmoi0t/n145/tlph/tct/pct/bas2/bat4/bacf90/pa2/tt0/tw1/tm1/td1/ts1/ta1/tb4
 (setq org-export-html-preamble "<script>
 function renderclockiframe(url) {
-var val='';
-val += '<iframe src=\"';
-val += url;
-val += '\" frameborder=\"0\" width=\"126\" height=\"42\" allowTransparency=\"true\" style=\"float:right\">'
-val += '</iframe>';
-alert(val);
-return val;
+  var val='';
+  val += '<iframe src=\"';
+  val += url;
+  val += '\" frameborder=\"0\" width=\"126\" height=\"42\" allowTransparency=\"true\" style=\"float:right\">'
+  val += '</iframe>';
+  alert(val);
+  return val;
 }
 </script><svg
         id=\"vizrt-logo\"

From 3352c0e054e5e0049dd5818322d9d5c5514523b2 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Tue, 30 Oct 2012 21:34:14 +0100
Subject: [PATCH 1568/2585] added the url scheme

---
 usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
index bd2d8166..baeb4388 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
+++ b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
@@ -12,7 +12,7 @@
 (setq org-export-html-preamble "<script>
 function renderclockiframe(url) {
   var val='';
-  val += '<iframe src=\"';
+  val += '<iframe src=\"http://';
   val += url;
   val += '\" frameborder=\"0\" width=\"126\" height=\"42\" allowTransparency=\"true\" style=\"float:right\">'
   val += '</iframe>';

From 672acc71f50742dd5c8f0cb4a7625a212db8cc77 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Tue, 30 Oct 2012 21:44:57 +0100
Subject: [PATCH 1569/2585] removed the debugging alert

---
 usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el | 1 -
 1 file changed, 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
index baeb4388..a8b5b669 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
+++ b/usr/share/doc/vizrt/vosa-handbook/vizrt-branding-org-mode.el
@@ -16,7 +16,6 @@ function renderclockiframe(url) {
   val += url;
   val += '\" frameborder=\"0\" width=\"126\" height=\"42\" allowTransparency=\"true\" style=\"float:right\">'
   val += '</iframe>';
-  alert(val);
   return val;
 }
 </script><svg

From 143483eda01cbfae0db687d2bf19bbc1cd9a868a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Wed, 31 Oct 2012 11:25:14 +0100
Subject: [PATCH 1570/2585] - cron.d support in 'ece-import create' is coming
 along:

  The cron scripts are copied out to paths like
  /usr/share/escenic/import/mypub/myjob/cron.every.10.minutes/<scripts>.

  All these are included in the publiation/job's own cron file, i.e.:
  /etc/cron.d/mypub-myjob-cron.

  Each script called from the cron job, get's their own log file, e.g.:
  /var/log/escenic/mypub-myjob-my-first-cron-script.log

- introduced new internal variable that the ece-import.d modules can
  use: log_base_dir
---
 usr/bin/ece-import                             |  3 ++-
 .../ece-scripts/ece-import.d/create-job.sh     | 18 +++++++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/usr/bin/ece-import b/usr/bin/ece-import
index dabeecd8..f35c6505 100755
--- a/usr/bin/ece-import
+++ b/usr/bin/ece-import
@@ -44,10 +44,11 @@ escenic_group=escenic
 escenic_spool_base_dir=/var/spool/escenic/import
 escenic_user=escenic
 job_name=""
+log_base_dir=/var/log/escenic
 # since both regular users and root can use this command, we create
 # user specific log files. We put it in /var/log as it'll regardless
 # of user run as a deamon process.
-log=/var/log/escenic/$(basename $0)-${USER}.log
+log=$log_base_dir/$(basename $0)-${USER}.log
 nursery_base_dir=/etc/escenic/engine/common
 publication_name=""
 raw_spool_base_dir=/var/spool/escenic/raw
diff --git a/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh b/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh
index 201a1f22..f96d6b39 100644
--- a/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh
+++ b/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh
@@ -112,18 +112,30 @@ function create_import_cron_jobs() {
       "You need to be root to set up the cron jobs, skipping it."
     return
   fi
+  
   local file=/etc/cron.d/$1-$2-cron
-  print_and_log "Setting up $file for ${1}'s $2 ..."
   echo > $file
   
   find $3 -maxdepth 3 -name "cron*minutes" -type d | while read f; do
     dir=$(basename $f)
     minutes=$(echo $dir | cut -d'.' -f3)
     for el in $(find $3/$dir -type f); do
-      echo "*/${minutes} * * * * $el" >> $file
+      local target_dir=$transformers_base_dir/$1/$2/$dir
+      make_dir $target_dir
+      run cp --force $el $target_dir
+      # it's  important that all cron scripts are executable'
+      run chmod +x $target_dir/*
+      echo "*/${minutes} * * * * $target_dir/$(basename $el) >> $log_base_dir/$1-$2-$(basename $el).log" \
+        >> $file
+      exit 1
     done
   done
 
-  cat $file
 
+  # remove empty cron files
+  if [ $(wc -c $file | cut -d' ' -f1) -lt 2 ]; then
+    run rm $file
+  else
+    print_and_log $(green NEW) "cron job(s) set up in $file"
+  fi
 }

From d85a7af8f151e0ac83bf8f112a6d167c4dd458c3 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Thu, 1 Nov 2012 12:38:49 +0100
Subject: [PATCH 1571/2585] start of a section on vmeo

---
 usr/share/doc/vizrt/vosa-handbook/vmeo.org | 30 ++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/vmeo.org

diff --git a/usr/share/doc/vizrt/vosa-handbook/vmeo.org b/usr/share/doc/vizrt/vosa-handbook/vmeo.org
new file mode 100644
index 00000000..80441d38
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/vmeo.org
@@ -0,0 +1,30 @@
+* Viz Media Engine - Online (VMEO)
+VME-Online is a content mangement system and online publishing system for Video.
+
+VME-Online gives a strong focus on online and mobile production. Video is transcoded and distributed to multiple mobile devices and web sites, thus ensuring an optimal end user experience. The Viz Media Engine enables customers to publish all of their existing inventory to all devices and is built for scaling. The system is integrated with the Vizrt Online Suite, but can also be integrated to your existing CMS or website using our various APIs. The systems is ready to connect to CDNs and supports easy adjustable profiles for different connection speeds and terminals.
+
+** Video Ingest
+VME-O offers many interfaces to ingest video into the VME-O system.
+After ingest the video's have the following state:
+- The video's are stored in the SOLARtv VME-O house format: MP4.
+- All available meta information is available through the UI and API.
+- All post ingest processes have started.
+
+The following ingest interfaces are used by SOLARtv:
+- file ingest :: A dropfolder can be made available as a fileshare with SMB, NFS or FTP. When a video is uploaded to this fileshare it is automatically imported in VME-Online. If it is accompanied with metainformation in the documented import format, this meta information is added to the content item in the VMEO database.
+- SDI ingest (live) :: An SDI feed can be ingested live.
+
+The following ingest interfaces are available but not used by SOLARtv
+- Mobile ingest (Viz reporter) :: Several apps on iphone and nokia are available to upload video content over slow mobile networks or faster wifi connections when available to the device. 
+- Webservice ingest :: A REST webservice is available to push meta information of video content including a uri that will be ued by VMEO to fetch the video for ingestion.
+- Ingest formats :: VME-O has a long list of video formats it is able to ingest.
+
+** Transcoding
+Many Web browsers on PC's, pads and smartphones are not capable of playing the VME-O house format. It is eather to big or of the wrong binary format. This is why VME-O can be configured to transcode video's to various alternative formats and sizes to allow for a veriety of devices to play them.
+
+Transcoding typically is quite cpu intensive. For this reason it makes no sense to transcode more than the amount of processors in a box in parrallel. VME-O has a queing mechanism to ensure that it is not overloaded. More transcoding power can be added by deploying more transcoding machines to the cluster.
+
+VME-O transcodes video's to a set of predefined formats as soon as possible after ingest.
+
+** Publishing
+Video's are requested by players with a streaming protocol or with HTTP. VME-O can take care of both. 

From 28617f91754ba8a6b7dbd87a7d51e90d651e2ef3 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 1 Nov 2012 12:48:58 +0100
Subject: [PATCH 1572/2585] Added some basic hugin scripts to
 escenic-content-engine-scripts

---
 .../escenic/package-scripts/create-packages   |  4 ++
 usr/share/hugin/publication-resources         | 43 +++++++++++++++++++
 usr/share/hugin/system-info                   |  9 ++++
 3 files changed, 56 insertions(+)
 create mode 100755 usr/share/hugin/publication-resources
 create mode 100755 usr/share/hugin/system-info

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 4a19c8ec..fe1964b9 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -126,6 +126,10 @@ function set_up_escenic-content-engine-scripts() {
   # cron
   cp -r ../../../../etc/cron.daily/remove-old-escenic-log-files \
     $target_dir/etc/cron.daily/
+
+  # hugin
+  cp -r ../../../../usr/share/hugin \
+    $target_dir/usr/share/
 }
 
 function set_up_vosa() {
diff --git a/usr/share/hugin/publication-resources b/usr/share/hugin/publication-resources
new file mode 100755
index 00000000..7a156606
--- /dev/null
+++ b/usr/share/hugin/publication-resources
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+# Hugin script to tell hugin how to collect publication resources
+
+# xmllint is needed for this
+if ! which xmllint > /dev/null ; then
+  echo 'xmllint not installed'
+  exit 1
+fi
+
+# A vosa system declaration too.
+if [ ! -r /etc/vosa-service-declaration.conf ] ; then
+  echo 'A vosa system declaration is needed'
+  exit 1
+fi
+
+
+xml_resources="
+/escenic/content-type
+/escenic/layout-group
+/escenic/plugin/menu
+"
+
+text_resources="
+/escenic/feature
+"
+
+. /etc/vosa-service-declaration.conf 
+
+pubs=( $trail_publication_domain_mapping_list )
+for pub in "${pubs[@]/\#*/}" ; do
+  for resource in $xml_resources ; do
+    name=${resource//[\/]/-}
+    echo "escenic-publication-${pub}$name" "curl -s http://localhost:8080/escenic-admin/publication-resources/$pub$resource | xmllint --encode UTF-8 --format -"
+  done
+  for resource in $text_resources ; do
+    name=${resource//[\/]/-}
+    echo "escenic-publication-${pub}$name" "curl -s http://localhost:8080/escenic-admin/publication-resources/$pub$resource"
+  done
+  echo "escenic-publication-${pub}-section-parameters" "curl -s http://localhost:8080/escenic-admin/section-parameters/$pub/ | grep -v ^# | sort -n"
+done
+
+
diff --git a/usr/share/hugin/system-info b/usr/share/hugin/system-info
new file mode 100755
index 00000000..fa8f7718
--- /dev/null
+++ b/usr/share/hugin/system-info
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+if ! which > /dev/null system-info ; then
+  echo "No system-info..."
+  exit 1
+fi
+
+echo "system-info system-info -f yaml -s"
+

From 61932eab6c602065130566d3cd7926e7ff187367 Mon Sep 17 00:00:00 2001
From: Olivier <ocortambert@vizrt.com>
Date: Thu, 1 Nov 2012 14:28:06 +0100
Subject: [PATCH 1573/2585] Update usr/share/doc/vizrt/vosa-handbook/vmeo.org

---
 usr/share/doc/vizrt/vosa-handbook/vmeo.org | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vmeo.org b/usr/share/doc/vizrt/vosa-handbook/vmeo.org
index 80441d38..5d4e23a2 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vmeo.org
+++ b/usr/share/doc/vizrt/vosa-handbook/vmeo.org
@@ -28,3 +28,5 @@ VME-O transcodes video's to a set of predefined formats as soon as possible afte
 
 ** Publishing
 Video's are requested by players with a streaming protocol or with HTTP. VME-O can take care of both. 
+
+@Olivier TODO

From bd49fae6403cdca3d5423f206a18c63c153596ed Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Thu, 1 Nov 2012 15:24:15 +0100
Subject: [PATCH 1574/2585] improved naming based on Oliviers instructions

---
 usr/share/doc/vizrt/vosa-handbook/host-naming.org | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/host-naming.org b/usr/share/doc/vizrt/vosa-handbook/host-naming.org
index c686f4cb..a8814502 100644
--- a/usr/share/doc/vizrt/vosa-handbook/host-naming.org
+++ b/usr/share/doc/vizrt/vosa-handbook/host-naming.org
@@ -38,7 +38,16 @@ The follwing machine names are common in VOSA clusters:
 - Monitoring :: (mon) Dedicated machine that harvest samples of performance metrics from all the machines and sending out events when performance or capacity limits are exceded.
 
 *** VME Online
-- VME-Online :: (vmeo*) All VME-online machines are able to perform all possible VME-online virtual roles. They are simply numbered. 
+All VME Online machines can be made redundant if there is a stable network connection between them. If a role is only represented once it does not get a number. if there are more, a number is added to the name. 
+**** Controller
+(vmeo-controller*) All vmeo clusters need a VME controller. It might do everything or delegate some work to the other vmeo machines.
+
+The following machine roles are controlle by the controller:
+- Transcoder :: (vmeo-transcoder*) transcodes any ingested video to any variant
+- Encoder :: (vmeo-encoder*) can encode an incoming stream or SDI cable to an ipstream that is used for streaming.
+- Delivery :: (vmeo-delivery*) [[http://en.wikipedia.org/wiki/Flash_Video][Flash]] and [[http://en.wikipedia.org/wiki/Real_Time_Streaming_Protocol][RTSP]] 
+- Segmenter :: (vmeo-segmenter*) creates [[http://en.wikipedia.org/wiki/HTTP_Live_Streaming][HLS]]
+- Reporter :: (vmeo-reporter*) receives live streams form the viz reporter app on mobile devices.
 
 *** Escenic
 - Escenic Presentation :: (pres*) Dedicated machine for generating webpages by merging content from a database with html from JSP files.

From 68e2b263ffefe2535a0579e6676f78449fbc58bc Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Thu, 1 Nov 2012 15:30:22 +0100
Subject: [PATCH 1575/2585] improved layout

---
 usr/share/doc/vizrt/vosa-handbook/host-naming.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/host-naming.org b/usr/share/doc/vizrt/vosa-handbook/host-naming.org
index a8814502..3f9538b7 100644
--- a/usr/share/doc/vizrt/vosa-handbook/host-naming.org
+++ b/usr/share/doc/vizrt/vosa-handbook/host-naming.org
@@ -39,7 +39,7 @@ The follwing machine names are common in VOSA clusters:
 
 *** VME Online
 All VME Online machines can be made redundant if there is a stable network connection between them. If a role is only represented once it does not get a number. if there are more, a number is added to the name. 
-**** Controller
+/Controller:/
 (vmeo-controller*) All vmeo clusters need a VME controller. It might do everything or delegate some work to the other vmeo machines.
 
 The following machine roles are controlle by the controller:

From 09e4297bcd5923e5c31ab0209692ef9c449e1b77 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Thu, 1 Nov 2012 15:32:51 +0100
Subject: [PATCH 1576/2585] typo

---
 usr/share/doc/vizrt/vosa-handbook/host-naming.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/host-naming.org b/usr/share/doc/vizrt/vosa-handbook/host-naming.org
index 3f9538b7..e96ada30 100644
--- a/usr/share/doc/vizrt/vosa-handbook/host-naming.org
+++ b/usr/share/doc/vizrt/vosa-handbook/host-naming.org
@@ -42,7 +42,7 @@ All VME Online machines can be made redundant if there is a stable network conne
 /Controller:/
 (vmeo-controller*) All vmeo clusters need a VME controller. It might do everything or delegate some work to the other vmeo machines.
 
-The following machine roles are controlle by the controller:
+The following machine roles are controlled by the controller:
 - Transcoder :: (vmeo-transcoder*) transcodes any ingested video to any variant
 - Encoder :: (vmeo-encoder*) can encode an incoming stream or SDI cable to an ipstream that is used for streaming.
 - Delivery :: (vmeo-delivery*) [[http://en.wikipedia.org/wiki/Flash_Video][Flash]] and [[http://en.wikipedia.org/wiki/Real_Time_Streaming_Protocol][RTSP]] 

From 4e8c7c97841e1dbabe608e44b83a38134dc356e7 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Thu, 1 Nov 2012 15:36:15 +0100
Subject: [PATCH 1577/2585] improved explainations

---
 usr/share/doc/vizrt/vosa-handbook/host-naming.org | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/host-naming.org b/usr/share/doc/vizrt/vosa-handbook/host-naming.org
index e96ada30..266c1005 100644
--- a/usr/share/doc/vizrt/vosa-handbook/host-naming.org
+++ b/usr/share/doc/vizrt/vosa-handbook/host-naming.org
@@ -45,8 +45,8 @@ All VME Online machines can be made redundant if there is a stable network conne
 The following machine roles are controlled by the controller:
 - Transcoder :: (vmeo-transcoder*) transcodes any ingested video to any variant
 - Encoder :: (vmeo-encoder*) can encode an incoming stream or SDI cable to an ipstream that is used for streaming.
-- Delivery :: (vmeo-delivery*) [[http://en.wikipedia.org/wiki/Flash_Video][Flash]] and [[http://en.wikipedia.org/wiki/Real_Time_Streaming_Protocol][RTSP]] 
-- Segmenter :: (vmeo-segmenter*) creates [[http://en.wikipedia.org/wiki/HTTP_Live_Streaming][HLS]]
+- Delivery :: (vmeo-delivery*) Delivers video files over http for video on demand(VOD). It can also take streams from reporter or encoder and deliveres [[http://en.wikipedia.org/wiki/Flash_Video][Flash]] and [[http://en.wikipedia.org/wiki/Real_Time_Streaming_Protocol][RTSP]] 
+- Segmenter :: (vmeo-segmenter*) Takes streams from reporter of encoder and delviers [[http://en.wikipedia.org/wiki/HTTP_Live_Streaming][HLS]]
 - Reporter :: (vmeo-reporter*) receives live streams form the viz reporter app on mobile devices.
 
 *** Escenic

From 46650dfd039e08262d57bc7297dc5b3d28808bed Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 31 Oct 2012 16:35:24 +0100
Subject: [PATCH 1578/2585] - removed the lock and pid file creation & deletion
 as this is now   provided out of the box from common-bashing.sh

---
 usr/sbin/ece-install | 36 +++++++-----------------------------
 1 file changed, 7 insertions(+), 29 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 50d8c291..9c3583cd 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -46,8 +46,6 @@ mirror_country_suffix=no
 java_home=/usr/lib/jvm/java-6-sun
 #####################################################################
 
-pid_file=/var/run/$(basename $0).pid
-lock_file=/var/lock/$(basename $0).lock
 download_dir=/var/cache/$(basename $0)
 log=/var/log/$(basename $0).log
 conf_file=$HOME/ece-install.conf
@@ -501,34 +499,14 @@ function assert_correct_runtime_environment()
         exit 1
     fi
 
-    if [ -e $lock_file ]; then
-      cat <<EOF
-The lock file is present: ${lock_file} and $(basename $0) will
-therefore refuse to run.
-EOF
-      exit 1
-    fi
+    create_pid
+    started=`stat -c %Y $pid_file`
+    create_lock
     
-    if [ -e $pid_file ]; then
-        echo "There's already one $(basename $0) process running."
-        echo "If you believe this is wrong, e.g. if a previous run of" 
-        echo "$(basename $0) was aborted before it completed, you"
-        echo "may remove ${pid_file} and run $(basename $0) again."
-        exit 1
-    else
-        echo $BASHPID > $pid_file
-        started=`stat -c %Y $pid_file`
-    fi
-
     if [ ! -e "$conf_file" ]; then
-        echo $conf_file "doesn't exist."
-        echo "I cannot live without it, so I'm exiting :-("
-        
-        if [ -e $pid_file ]; then
-          rm $pid_file
-        fi
-        
-        exit 1
+      print_and_log $conf_file "doesn't exist." \
+        "I cannot live without it, so I'm exiting :-("
+      remove_pid_and_exit_in_error
     fi
 }
 
@@ -975,8 +953,8 @@ for el in $@; do
     fi
 done
 
-assert_correct_runtime_environment
 init
+assert_correct_runtime_environment
 fai_enabled=$(get_boolean_conf_value fai_enabled)
 
 if [ $fai_enabled -eq 1 ]; then

From cd39e81993405e708e91b595eb40ee3f3f1d6c92 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 31 Oct 2012 17:02:28 +0100
Subject: [PATCH 1579/2585] - regression fix for installing on Debian stable
 (squeeze): need to   run an apt-get update after adding the backports package
 pool   (add_apt_source used to do it).

---
 usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index 1e3198bc..4512ac5c 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -177,6 +177,7 @@ function install_nagios_node()
   if [[ $(lsb_release -c -s) == "squeeze" ]]; then
     # needed for check-mk
     add_apt_source "deb http://backports.debian.org/debian-backports squeeze-backports main"
+    run apt-get update --quiet
   fi
   
   if [ $on_debian_or_derivative -eq 1 ]; then

From 73e79ba0252d979ec311a2b5cd566b96f6feb632 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 31 Oct 2012 17:02:56 +0100
Subject: [PATCH 1580/2585] - fixed the reading of ece-install.conf

---
 usr/sbin/ece-install | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 9c3583cd..0f4469e2 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -507,6 +507,8 @@ function assert_correct_runtime_environment()
       print_and_log $conf_file "doesn't exist." \
         "I cannot live without it, so I'm exiting :-("
       remove_pid_and_exit_in_error
+    else
+      source $conf_file
     fi
 }
 
@@ -644,7 +646,7 @@ function common_pre_install()
 # setting this.
 function ask_for_instance_name()
 {
-    if [ $fai_enabled -eq 0 ]; then
+    if [ ${fai_enabled-0} -eq 0 ]; then
         print "What do you want to call this ECE instance?"
         print "Press ENTER to accept the default instance name, $1."
         echo -n "Your choice [$1]> "
@@ -955,9 +957,8 @@ done
 
 init
 assert_correct_runtime_environment
-fai_enabled=$(get_boolean_conf_value fai_enabled)
 
-if [ $fai_enabled -eq 1 ]; then
+if [ ${fai_enabled-0} -eq 1 ]; then
     print_and_log "Full Automatic Install (FAI) enabled."
     print_and_log "All user input will be read from $conf_file"
     

From b7f6c5f47fff7c40dff3696a932dc1f6cd57a068 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 31 Oct 2012 17:28:47 +0100
Subject: [PATCH 1581/2585] - added get_app_base, it will return the app base
 for the passwed WAR   name. This is a useful method for both 'ece deploy' and
   ece-install.

---
 usr/share/escenic/ece-scripts/common-ece.sh | 24 +++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/common-ece.sh b/usr/share/escenic/ece-scripts/common-ece.sh
index d087dfb2..b897d58d 100644
--- a/usr/share/escenic/ece-scripts/common-ece.sh
+++ b/usr/share/escenic/ece-scripts/common-ece.sh
@@ -27,3 +27,27 @@ function get_instance_list() {
 
   echo $instance_list
 }
+
+## Will return the app base for the passwed WAR name.
+## 
+## $1 :: the name of the war file
+function get_app_base() {
+  local war=$(basename $1 .war)
+  local webapps_in_standard_webapps_list="
+    escenic
+    escenic-admin
+    inpage-ws
+    studio
+    webservice
+    dashboard
+  "
+
+  for el in $webapps_in_standard_webapps_list; do
+    if [[ "$el" == "$war" ]]; then
+      echo webapps
+      return
+    fi
+  done
+
+  echo webapps-${war}
+}

From e48d0c988b74a22f359bf31ae2f800079ecdd242 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 31 Oct 2012 17:32:04 +0100
Subject: [PATCH 1582/2585] made 'ece deploy' capable of deploying publication
 WARs into their own app server contexts

---
 usr/bin/ece                                   |  2 +-
 usr/share/escenic/ece-scripts/ece.d/deploy.sh | 33 +++++++++----------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 00c8461f..cc529839 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -92,7 +92,7 @@ function init() {
 
   if [ -d $dir ]; then
     # load common libraries
-    common_libraries="common-bashing.sh common-io.sh common-os.sh"
+    common_libraries="common-bashing.sh common-io.sh common-os.sh common-ece.sh"
     for el in $common_libraries; do
       source $dir/${el}
     done
diff --git a/usr/share/escenic/ece-scripts/ece.d/deploy.sh b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
index 92aea1e1..908463f5 100644
--- a/usr/share/escenic/ece-scripts/ece.d/deploy.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
@@ -103,8 +103,8 @@ function deploy() {
       run rm -rf $tomcat_base/work/*
 
       for war in $dir/*.war ; do
-        if [ -d $tomcat_base/webapps/`basename $war .war` ] ; then
-          run rm -rf $tomcat_base/webapps/`basename $war .war`
+        if [ -d $tomcat_base/$(get_app_base $war)/$(basename $war .war) ] ; then
+          run rm -rf $tomcat_base/$(get_app_base $war)/$(basename $war .war)
         fi
       done
 
@@ -123,16 +123,17 @@ function deploy() {
       fi
       
       for war in $dir/*.war ; do
-        name=`basename $war .war`
+        local app_base=$(get_app_base $war)
+        local name=$(basename $war .war)
 
-        deploy_this_war=1
+        local deploy_this_war=1
         if [ -n "$deploy_webapp_white_list" ]; then
-          deploy_this_war=0
+          local deploy_this_war=0
 
           for el in $deploy_webapp_white_list; do
-            if [ "$el" == $name ]; then
-              debug "found $war in white list, will deploy it"
-              deploy_this_war=1
+            if [[ "$el" == "$name" ]]; then
+              log "found $war in white list, will deploy it"
+              local deploy_this_war=1
             fi
           done
         fi
@@ -140,17 +141,13 @@ function deploy() {
         if [ "$deploy_this_war" -eq 0 ]; then
           continue
         fi
-        
-        (cd $tomcat_base/webapps &&
-          mkdir $name &&
-          cd $name &&
-          jar xf $war \
-            1>>$log \
-            2>>$log)
-        exit_on_error "extracting $war to $tomcat_base/webapps/"
-        
+
+        make_dir $tomcat_base/$app_base/$name
+        run cd $tomcat_base/$app_base/$name
+        run jar xf $war
+
         if [ ${enable_memcached_support-1} -eq 1 ]; then
-          add_memcached_support $tomcat_base/webapps/$name
+          add_memcached_support $tomcat_base/$app_base/$name
         fi
       done
       ;;

From a4521359c2764a5e72c700ff36d98525ab25faa6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 31 Oct 2012 17:33:24 +0100
Subject: [PATCH 1583/2585] - ece-install will now set up publication specific
 app server contexts. TODO test properly

---
 usr/sbin/ece-install                                      | 4 ++--
 usr/share/escenic/ece-scripts/ece-install.d/app-server.sh | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 0f4469e2..fa34a476 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -120,14 +120,14 @@ function init() {
 
   if [ -d $dir ]; then
     # load common librariees
-    common_libraries="common-bashing.sh common-pulse.sh common-io.sh common-os.sh"
+    common_libraries="common-ece.sh common-bashing.sh common-io.sh common-os.sh"
     for el in $common_libraries; do
       source $dir/${el}
     done
 
     # load ece-install modules
     for el in $dir/ece-install.d/*.sh; do
-      log "Loading $(basename $0) module:" $el
+      log "Loading $(basename $0) module:" $(basename $el)
       source $el
     done
   else
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index cdcf08ea..eb5622f5 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -322,7 +322,10 @@ EOF
       local file=$tomcat_base/conf/server.xml
 
       cat >> $file <<EOF
-      <Host name="${domain}" appBase="webapps" autoDeploy="false">
+      <Host
+        name="${domain}"
+        appBase="$(get_app_base $publication)"
+        autoDeploy="false">
 EOF
 
       # add the host aliases (if available)
@@ -598,4 +601,3 @@ function log4j_ensure_java_util_logging_is_not_doing_anything() {
     log $file "doesn't exist, strange"
   fi
 }
-

From 86d38560e1fe12ece7b656eb0227e29e82972a61 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 1 Nov 2012 13:17:18 +0100
Subject: [PATCH 1584/2585] - default logging level on com.escenic and neo is
 now ERROR and not INFO.

---
 usr/share/escenic/ece-scripts/ece-install.d/app-server.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index eb5622f5..8aa6ed39 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -508,8 +508,8 @@ log4j.appender.ECELOG=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.ECELOG.File=$escenic_log_dir/\${com.escenic.instance}-messages
 log4j.appender.ECELOG.layout=org.apache.log4j.PatternLayout
 log4j.appender.ECELOG.layout.ConversionPattern=%d %5p [%t] %x (%c) %m%n
-log4j.category.com.escenic=INFO, ECELOG
-log4j.category.neo=INFO, ECELOG
+log4j.category.com.escenic=ERROR, ECELOG
+log4j.category.neo=ERROR, ECELOG
 log4j.additivity.neo=false
 log4j.additivity.com.escenic=false
 

From 6bba98e89abde1d94294e721958ab35341a1e5ee Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 1 Nov 2012 16:46:37 +0100
Subject: [PATCH 1585/2585] changed useful debug to be logged

---
 usr/share/escenic/ece-scripts/ece.d/publication-resources.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/publication-resources.sh b/usr/share/escenic/ece-scripts/ece.d/publication-resources.sh
index bc8e1cb2..803577b6 100644
--- a/usr/share/escenic/ece-scripts/ece.d/publication-resources.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/publication-resources.sh
@@ -74,7 +74,7 @@ function update_publication_resources() {
   print "Updating the $(basename $resource) resource for the $publication" \
     "publication ..."
   
-  debug POSTing $resource to $url
+  log POSTing $resource to $url
   if [[ -n "$do_put" && "$do_put" == "true" ]]; then
     curl -T ${resource} \
       ${curl_appserver_auth} \

From d44c928c674d710f46f7d64b5d8530717cdd5b76 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 2 Nov 2012 14:44:05 +0100
Subject: [PATCH 1586/2585] - ece-install now sets up ONE tomcat log instead of
 the four different   ones: /var/log/escenic/<instance>-tomcat

- ece-install (again) makes a symlink called log4j to
  trace.properties, so that the ECE specific log4j configuration file,
  trace.properties, gets read by all Java classes that are set up to
  use log4j.
---
 .../ece-scripts/ece-install.d/app-server.sh   | 38 ++++---------------
 1 file changed, 8 insertions(+), 30 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 8aa6ed39..0aafc575 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -524,36 +524,13 @@ log4j.additivity.org.apache.solr=false
 
 ######################################################################
 # Tomcat specific logging
-log4j.appender.CATALINA=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.CATALINA.File=${escenic_log_dir}/\${com.escenic.instance}-tomcat-catalina
-log4j.appender.CATALINA.layout = org.apache.log4j.PatternLayout
-log4j.appender.CATALINA.layout.ConversionPattern = %d [%t] %-5p %c- %m%n
-
-log4j.appender.LOCALHOST=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.LOCALHOST.File=${escenic_log_dir}/\${com.escenic.instance}-tomcat-localhost
-log4j.appender.LOCALHOST.layout = org.apache.log4j.PatternLayout
-log4j.appender.LOCALHOST.layout.ConversionPattern = %d [%t] %-5p %c- %m%n
-
-log4j.appender.MANAGER=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.MANAGER.File=${escenic_log_dir}/\${com.escenic.instance}-tomcat-manager
-log4j.appender.MANAGER.layout = org.apache.log4j.PatternLayout
-log4j.appender.MANAGER.layout.ConversionPattern = %d [%t] %-5p %c- %m%n
-
-log4j.appender.HOST-MANAGER=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.HOST-MANAGER.File=${escenic_log_dir}/\${com.escenic.instance}-tomcat-host-manager
-log4j.appender.HOST-MANAGER.layout = org.apache.log4j.PatternLayout
-log4j.appender.HOST-MANAGER.layout.ConversionPattern = %d [%t] %-5p %c- %m%n
-
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.layout = org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern = %d [%t] %-5p %c- %m%n
-
-log4j.logger.org.apache.catalina.core.ContainerBase.[Catalina].[localhost]=INFO, LOCALHOST
-log4j.logger.org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager]=\
-  INFO, MANAGER
-log4j.logger.org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager]=\
-  INFO, HOST-MANAGER
-log4j.additivity.org.apache.catalina.core.ContainerBase=false
+log4j.appender.TOMCAT=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.TOMCAT.File=${escenic_log_dir}/\${com.escenic.instance}-tomcat
+log4j.appender.TOMCAT.layout = org.apache.log4j.PatternLayout
+log4j.appender.TOMCAT.layout.ConversionPattern = %d [%t] %-5p %c- %m%n
+
+log4j.category.org.apache.catalina=INFO, TOMCAT
+log4j.additivity.org.apache.catalina=false
 
 ######################################################################
 # Get rid of the browser log which for some reason wanderse into the
@@ -565,6 +542,7 @@ log4j.additivity.browser=false
 EOF
   run cd $tomcat_base/lib/
   make_ln $common_nursery_dir/trace.properties
+  run ln -s trace.properties log4j.properties
 
   if [ $install_profile_number -eq $PROFILE_SEARCH_SERVER -o \
     $install_profile_number -eq $PROFILE_ALL_IN_ONE ]; then

From 944d6a507067a7c204c2e15182a2ae5adb83e28c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 2 Nov 2012 15:07:11 +0100
Subject: [PATCH 1587/2585] - added indexer-webapp, indexer-webservice & solr
 to the web apps that   should go to the standard webapps folder.

---
 usr/share/escenic/ece-scripts/common-ece.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/common-ece.sh b/usr/share/escenic/ece-scripts/common-ece.sh
index b897d58d..392ff669 100644
--- a/usr/share/escenic/ece-scripts/common-ece.sh
+++ b/usr/share/escenic/ece-scripts/common-ece.sh
@@ -34,12 +34,15 @@ function get_instance_list() {
 function get_app_base() {
   local war=$(basename $1 .war)
   local webapps_in_standard_webapps_list="
+    dashboard
     escenic
     escenic-admin
+    indexer-webapp
+    indexer-webservice
     inpage-ws
+    solr
     studio
     webservice
-    dashboard
   "
 
   for el in $webapps_in_standard_webapps_list; do

From 754b44edc329707345901df215ee87c45d7d4815 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 2 Nov 2012 15:08:06 +0100
Subject: [PATCH 1588/2585] - fix in ece-install::common_post_install; now
 using the remove_lock   and remove_pid from common-bashing instead of
 manipulating the   global variable(s) directly

---
 usr/sbin/ece-install | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index fa34a476..d4075827 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -845,7 +845,8 @@ function common_post_install() {
   set_correct_permissions
   
   print_status_and_next_steps
-  run rm $pid_file
+  remove_lock
+  remove_pid
 }
 
 function un_install_everything() {

From 495607bc807136e61b18f197c797ba932fa14ed5 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 2 Nov 2012 15:10:13 +0100
Subject: [PATCH 1589/2585] - added ln --force to symlink creation
 (log4j/trace.properties) - added long options to tomcat symlink creation.

---
 usr/share/escenic/ece-scripts/ece-install.d/app-server.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 0aafc575..192b49d4 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -121,7 +121,7 @@ function set_up_app_server() {
   if [ -e tomcat ]; then
     run rm tomcat
   fi
-  run ln -sf ${tomcat_dir} tomcat
+  run ln --symbolic --force ${tomcat_dir} tomcat
 
   tomcat_home=${appserver_parent_dir}/tomcat
   tomcat_base=${appserver_parent_dir}/tomcat-${instance_name}
@@ -542,7 +542,7 @@ log4j.additivity.browser=false
 EOF
   run cd $tomcat_base/lib/
   make_ln $common_nursery_dir/trace.properties
-  run ln -s trace.properties log4j.properties
+  run ln --sumbolic --force trace.properties log4j.properties
 
   if [ $install_profile_number -eq $PROFILE_SEARCH_SERVER -o \
     $install_profile_number -eq $PROFILE_ALL_IN_ONE ]; then

From fc2cb726814c61d63b62b071293391579f1281a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Fri, 2 Nov 2012 15:29:09 +0100
Subject: [PATCH 1590/2585] - fix typo in app-server.sh

---
 usr/share/escenic/ece-scripts/ece-install.d/app-server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 192b49d4..384af3b1 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -542,7 +542,7 @@ log4j.additivity.browser=false
 EOF
   run cd $tomcat_base/lib/
   make_ln $common_nursery_dir/trace.properties
-  run ln --sumbolic --force trace.properties log4j.properties
+  run ln --symbolic --force trace.properties log4j.properties
 
   if [ $install_profile_number -eq $PROFILE_SEARCH_SERVER -o \
     $install_profile_number -eq $PROFILE_ALL_IN_ONE ]; then

From e98d5164ece831fa525e366e190241b5c34719a7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 2 Nov 2012 15:19:01 +0100
Subject: [PATCH 1591/2585] - added comments to the
 common-ece::webapps_in_standard_webapps_list

---
 usr/share/escenic/ece-scripts/common-ece.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/common-ece.sh b/usr/share/escenic/ece-scripts/common-ece.sh
index 392ff669..b300779b 100644
--- a/usr/share/escenic/ece-scripts/common-ece.sh
+++ b/usr/share/escenic/ece-scripts/common-ece.sh
@@ -33,6 +33,10 @@ function get_instance_list() {
 ## $1 :: the name of the war file
 function get_app_base() {
   local war=$(basename $1 .war)
+
+  # this is a list of web applications that are standard ECE related
+  # web applications which should not live in their own webapp context
+  # (i.e. not a publication).
   local webapps_in_standard_webapps_list="
     dashboard
     escenic

From bb8b23daa08df86e5276deffa475e5affbaad079 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 2 Nov 2012 15:20:25 +0100
Subject: [PATCH 1592/2585] - simplified logging

---
 usr/share/escenic/ece-scripts/ece.d/deploy.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/deploy.sh b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
index 908463f5..577da80b 100644
--- a/usr/share/escenic/ece-scripts/ece.d/deploy.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
@@ -117,9 +117,8 @@ function deploy() {
       
       if [ -n "$deploy_webapp_white_list" ]; then
         deploy_this_war=0
-        message="Deployment white list active, only deploying: "
-        message=$message"$deploy_webapp_white_list"
-        print_and_log $message
+        print_and_log "Deployment white list active, only deploying: " \
+          $deploy_webapp_white_list
       fi
       
       for war in $dir/*.war ; do
@@ -183,7 +182,10 @@ function add_memcached_support() {
   fi
 
   local exempt_from_memcached_list="
-      escenic escenic-admin indexer-webservice indexer-webapp studio
+      escenic
+      escenic-admin
+      indexer-webapp studio
+      indexer-webservice
       inpage-ws dashboard
     "
 

From 6aec41a1f1a26ee381d329b709965289c9522aaf Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 2 Nov 2012 16:24:09 +0100
Subject: [PATCH 1593/2585] - added documentation for specifying a different
 WAR file name than   that of the publication, #109

---
 usr/share/doc/escenic/ece-install-guide.org | 24 ++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index e11eea47..bbb90d46 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -816,13 +816,13 @@ fai_publication_domain_mapping_list="
 This will produce the following stanzas in server.xml:
 
 #+BEGIN_SRC nxml
-<Host name="fire.escenic.com" appBase="webapps" autoDeploy="false">
+<Host name="fire.escenic.com" appBase="webapps-firepub" autoDeploy="false">
   <Context displayName="fire.escenic.com"
            docBase="firepub"
            path=""
   />
 </Host>
-<Host name="ild.escenic.com" appBase="webapps" autoDeploy="false">
+<Host name="ild.escenic.com" appBase="webapps-ildpub" autoDeploy="false">
   <Alias>feuer.escenic.com</Alias>
   <Alias>fuego.escenic.com</Alias>
   <Context displayName="ild.escenic.com"
@@ -832,6 +832,24 @@ This will produce the following stanzas in server.xml:
 </Host>
 #+END_SRC
 
+*** Having WAR files with a different name than the publication
+Nine out of ten times (probably a lot more too), the WAR file matches
+the name of the publication, e.g. if your publication is called
+=sports=, your WAR is called =sports.war=.
+
+However, if you for some reason have a WAR with a different name, you
+can add this as an addition to the first element of the
+=fai_publication_domain_mapping_list= entry:
+#+BEGIN_SRC text
+fai_publication_domain_mapping_list="
+  firepub,fire.war#fire.escenic.com
+"
+#+END_SRC
+
+Now, the =appBase= and =docBase= values will become =webapps-fire= and
+=fire= respectively.
+
+*** Host name aliases
 As you can see, there's a third optional option to the
 =fai_publication_domain_mapping_list= which can be specified as a
 comma separated list of host aliases to be added to the app server host
@@ -918,7 +936,7 @@ $HOME/ece-install.conf file of the root user:
 | =fai_presentation_stop_and_clear=     | 0                                                            | After installation, stop the instances and clear its work & log files                                    |
 | =fai_public_host_name=                | ${HOSTNAME}:8080                                             | The public address for your website                                                                      |
 | =fai_publication_create=              | 0                                                            | Create a new publication                                                                                 |
-| =fai_publication_domain_mapping_list= | ""                                                           | Mapping between publication names and their domains: "one#one.com other#other.com[#<alias1>[,<alias2>]]" |
+| =fai_publication_domain_mapping_list= | ""                                                           | Mapping between publication names and their domains: "one[,other.war]#one.com other#other.com[#<alias1>[,<alias2>]]" |
 | =fai_publication_environment=         | "production"                                                 | The kind of environment/habitat. Typical values are: production, staging, testing, development.          |
 | =fai_publication_name=                | mypub                                                        | Name of the publication                                                                                  |
 | =fai_publication_use_instance=        | dev1                                                         | Name of local instance to use for creation                                                               |

From 9f52fa429b9872d6f6d8a4afda77914d8fbb949e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 2 Nov 2012 16:54:04 +0100
Subject: [PATCH 1594/2585] - added support for specifying WAR different from
 the publication name   with the fai_publication_domain_mapping_list, for
 instance:

    fai_publication_domain_mapping_list="
      oranges-news,news.war#oranges-news.com#orangesnews.example.net
      oranges-sports,sports.war#oranges-sports.com#orangessports.example.net
    "
    fai_presentation_deploy_white_list="news sports"

  See ece-install-guide.org for further description.

  This closes #109
---
 .../ece-scripts/ece-install.d/app-server.sh       | 15 ++++++++++++---
 .../ece-scripts/ece-install.d/content-engine.sh   |  4 +++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 384af3b1..b4439616 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -312,11 +312,20 @@ EOF
     for el in ${fai_publication_domain_mapping_list}; do
       local old_ifs=$IFS
       # the entries in the fai_publication_domain_mapping_list are on
-      # the form: <publication>#<domain>#[<alias1>[,<alias2>]]
+      # the form: <publication[,pub.war]>#<domain>[#<alias1>[,<alias2>]]
       IFS='#'
       read publication domain aliases <<< "$el"
+      IFS=','
+      read publication_name publication_war <<< "$publication"
       IFS=$old_ifs
 
+      # normally the WAR is called the same as the publication, in
+      # which case we set the publication_war to the same as the
+      # publication_name.
+      if [ -z "${publication_war}" ]; then
+        publication_war = $publication_name
+      fi
+
       ensure_domain_is_known_to_local_host ${domain}
 
       local file=$tomcat_base/conf/server.xml
@@ -324,7 +333,7 @@ EOF
       cat >> $file <<EOF
       <Host
         name="${domain}"
-        appBase="$(get_app_base $publication)"
+        appBase="$(get_app_base $publication_war)"
         autoDeploy="false">
 EOF
 
@@ -337,7 +346,7 @@ EOF
 
       cat >> $file <<EOF
         <Context displayName="${domain}"
-                 docBase="${publication}"
+                 docBase="$(basename ${publication_war} .war)"
                  path=""
         />
       </Host>
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 877bf19e..5ec370a0 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -430,7 +430,9 @@ function set_up_publication_nursery_conf() {
     for el in $fai_publication_domain_mapping_list; do
       local old_ifs=$IFS
       IFS='#'
-      read publication_name publication_domain publication_aliases <<< "$el"
+      read publication publication_domain publication_aliases <<< "$el"
+      IFS=','
+      read publication_name publication_war <<< "$publication"
       IFS=$old_ifs
       
       local file=$escenic_conf_dir/engine/environment/${fai_publication_environment-production}/neo/publications/Pub-${publication_name}.properties

From 389b1f5d89a607a4c493302a555c38df09709c75 Mon Sep 17 00:00:00 2001
From: "Thomas Velthoven (tvelthoven@vizrt.com)" <thv@thvdesktop.(none)>
Date: Fri, 2 Nov 2012 20:50:57 +0100
Subject: [PATCH 1595/2585] added some more wisdomw about video formats and
 streamin protocols

---
 usr/share/doc/vizrt/vosa-handbook/vmeo.org | 52 +++++++++++++++++-----
 1 file changed, 40 insertions(+), 12 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vmeo.org b/usr/share/doc/vizrt/vosa-handbook/vmeo.org
index 5d4e23a2..0ecc1a86 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vmeo.org
+++ b/usr/share/doc/vizrt/vosa-handbook/vmeo.org
@@ -1,32 +1,60 @@
 * Viz Media Engine - Online (VMEO)
 VME-Online is a content mangement system and online publishing system for Video.
 
-VME-Online gives a strong focus on online and mobile production. Video is transcoded and distributed to multiple mobile devices and web sites, thus ensuring an optimal end user experience. The Viz Media Engine enables customers to publish all of their existing inventory to all devices and is built for scaling. The system is integrated with the Vizrt Online Suite, but can also be integrated to your existing CMS or website using our various APIs. The systems is ready to connect to CDNs and supports easy adjustable profiles for different connection speeds and terminals.
+** TODO Overview
 
-** Video Ingest
+
+** Video file handling
 VME-O offers many interfaces to ingest video into the VME-O system.
 After ingest the video's have the following state:
-- The video's are stored in the SOLARtv VME-O house format: MP4.
+- The video's are stored in their original format.
 - All available meta information is available through the UI and API.
-- All post ingest processes have started.
+- All transcoding to preconfigured target variants is stated.
 
 The following ingest interfaces are used by SOLARtv:
-- file ingest :: A dropfolder can be made available as a fileshare with SMB, NFS or FTP. When a video is uploaded to this fileshare it is automatically imported in VME-Online. If it is accompanied with metainformation in the documented import format, this meta information is added to the content item in the VMEO database.
-- SDI ingest (live) :: An SDI feed can be ingested live.
+- file ingest :: \\vmeo-controller\drop\ is watced by jboss on the controller. If it is accompanied with metainformation in the documented import format, this meta information is added to the content item in the VMEO database.
+- SDI ingest (live) :: An SDI feed can be connected to the vmeo-controller in the offices of SOLARtv
 
 The following ingest interfaces are available but not used by SOLARtv
 - Mobile ingest (Viz reporter) :: Several apps on iphone and nokia are available to upload video content over slow mobile networks or faster wifi connections when available to the device. 
 - Webservice ingest :: A REST webservice is available to push meta information of video content including a uri that will be ued by VMEO to fetch the video for ingestion.
 - Ingest formats :: VME-O has a long list of video formats it is able to ingest.
 
-** Transcoding
+*** Transcoding
 Many Web browsers on PC's, pads and smartphones are not capable of playing the VME-O house format. It is eather to big or of the wrong binary format. This is why VME-O can be configured to transcode video's to various alternative formats and sizes to allow for a veriety of devices to play them.
 
-Transcoding typically is quite cpu intensive. For this reason it makes no sense to transcode more than the amount of processors in a box in parrallel. VME-O has a queing mechanism to ensure that it is not overloaded. More transcoding power can be added by deploying more transcoding machines to the cluster.
+Transcoding typically is quite cpu intensive. For this reason it makes no sense to transcode more than the amount of processors in a box in parrallel. VME-O has a queing mechanism to ensure that it is not overloaded. More transcoding capacty can be added by deploying more transcoding machines to the cluster.
+
+At SOLARtv transcoding is done by vmeo-controller
+
+/Active Target variants at SOLARtv are:/
+- Flash Video Format (.flv)
+- AVI Format (.avi)
+- Quicktime Format (.mov)
+- MP4 Format (.mp4)
+- Mpg Format (.mpg)
+
+/Other available variants in VMEO are:/
+- Windows Media Video Format (.wmv)
+- GP File Extension (.3gp)
+- Advances Streaming Format (.asf)
+- Real Media Format (.rm)
+- Flash Movie Format (.swf )
+- the RealVideo Format 
+
+*** Publishing
+Video files are most commonly served to clients using the HTTP protocol. The DiRetriever webservice on the controller is available for clients to choose the right variant. HTTP requires no special configuration other than allowing clients to acess the vmeo-delivery server on tcp:80
+
+In cases where the DiRetriever decides to direct a client to a video stream it uses:
+- Real Time Streaming Protocol (RTSP) :: is a network control protocol designed for use in entertainment and communications systems to control streaming media servers. The protocol is used for establishing and controlling media sessions between end points. Clients of media servers issue VCR-like commands, such as play and pause, to facilitate real-time control of playback of media files from the server. The transmission of streaming data itself is not a task of the RTSP protocol. Most RTSP servers use the Real-time Transport Protocol ([[http://en.wikipedia.org/wiki/Real-time_Transport_Protocol][RTP]]) in conjunction with Real-time Control Protocol ([[http://en.wikipedia.org/wiki/RTCP][RTCP]]) for media stream delivery, however some vendors implement proprietary transport protocols. The RTSP server from RealNetworks, for example, also features RealNetworks' proprietary Real Data Transport ([[http://en.wikipedia.org/wiki/Real_Data_Transport][RDT]]). RTSP usually needs TCP:554 to be routed between the clients and the vmeo-delivery server. This port is often opened on corporate firewalls to allow for clients to access RTSP streams.
+- HTTP Live Streaming (HLS) :: is an HTTP-based media streaming communications protocol implemented by Apple Inc. as part of their QuickTime X and iPhone software systems. It works by breaking the overall stream into a sequence of small HTTP-based file downloads, each download loading one short chunk of an overall potentially unbounded transport stream. As the stream is played, the client may select from a number of different alternate streams containing the same material encoded at a variety of data rates, allowing the streaming session to adapt to the available data rate. At the start of the streaming session, it downloads an extended M3U (m3u8) playlist containing the metadata for the various sub-streams which are available. HLS uses plain HTTP and requires no special network configuration.
+
+
+** Live video feeds
+VMEO can handle video feeds from various sources such as SDI or ip feeds.
+
+*** Encoding
+Incoming video feeds are encoded on the fly by vmeo-controller and made available to the various streaming options on vmeo-delivery. The feeds are pushed using the <vmeostreaming protocol> over tcp-i port 234.
 
-VME-O transcodes video's to a set of predefined formats as soon as possible after ingest.
 
-** Publishing
-Video's are requested by players with a streaming protocol or with HTTP. VME-O can take care of both. 
 
-@Olivier TODO

From 21ec70536578a9a903615cba2d45f9bfc629850c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 5 Nov 2012 13:16:41 +0100
Subject: [PATCH 1596/2585] - added --directories-only to 'ece-import create',
 which will only   create the necessary state, spool, run and log directories.
 This   options is useful when you e.g. have  DEB packages with the desired  
 BASH scripts and Nursery configuration and want to set up the import   job on
 a fresh server.

---
 usr/bin/ece-import | 29 +++++------------------------
 1 file changed, 5 insertions(+), 24 deletions(-)

diff --git a/usr/bin/ece-import b/usr/bin/ece-import
index f35c6505..57a63a4b 100755
--- a/usr/bin/ece-import
+++ b/usr/bin/ece-import
@@ -93,6 +93,8 @@ function get_user_input() {
       next_is_password=1
     elif [[ "$el" == "--uri" ]]; then
       next_is_uri=1
+    elif [[ "$el" == "--directories-only" ]]; then
+      directories_only=1
     elif [ $next_is_name -eq 1 ]; then
       job_name=$el
       next_is_name=0
@@ -348,28 +350,6 @@ function verify_import_job_configuration() {
   fi
 }
 
-function print_manual_steps() {
-  if [ -z "${import_configuration_list}" ]; then
-    return
-  fi
-    
-  print_and_log "You must now add your new Nursery components: " \
-
-  for el in $import_configuration_list; do
-    print_and_log "$(green ADD) /${el}"
-  done
-  
-  print_and_log "to the $(blue importConfigurations) variable in " \
-    "your ECE instance's" \
-    "/com/escenic/syndication/xml/XMLImportService e.g.:" \
-    "/etc/escenic/engine/server/edit2-engine1/com/escenic/syndication/xml/XMLImportService.properties"
-
-  print_and_log "The final step is to add the Nursery service " \
-    "service.9.9-xml-import-service=/com/escenic/syndication/xml/XMLImportSchedule" \
-    "to your instance's Initial component, e.g.:" \
-    /etc/escenic/engine/server/edit2-engine1/Initial.properties
-}
-
 function print_report() {
   if [ $command -eq $COMMAND_IMPORT ]; then
     print_and_log "Number of raw XML files proccessed:" $raw_file_count
@@ -390,7 +370,9 @@ if [[ "$command" == $COMMAND_IMPORT ]]; then
   import_raw_files
 elif [[ "$command" == $COMMAND_CREATE_IMPORT_CONFIGURATION ]]; then
   if [ -z $import_archive ]; then
-    create_import_configuration $publication_name $job_name
+    if [ ${directories_only-0} -eq 0 ]; then
+      create_import_configuration $publication_name $job_name
+    fi
     create_import_directories $publication_name $job_name
   else
     apply_import_archive
@@ -402,5 +384,4 @@ fi
 
 print_manual_steps
 print_report
-print_and_log "Finished @ $(date)"
 remove_pid

From d6c4d5d46fb1441361f09753fa788b0c727f03f8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 5 Nov 2012 13:24:48 +0100
Subject: [PATCH 1597/2585] - added a guide for the ece-import command.

---
 usr/share/doc/escenic/ece-import-guide.org | 80 ++++++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 usr/share/doc/escenic/ece-import-guide.org

diff --git a/usr/share/doc/escenic/ece-import-guide.org b/usr/share/doc/escenic/ece-import-guide.org
new file mode 100644
index 00000000..e7e4fac7
--- /dev/null
+++ b/usr/share/doc/escenic/ece-import-guide.org
@@ -0,0 +1,80 @@
+#+TITLE: User Guide for the ece-import Script
+#+AUTHOR: Vizrt Online / The SaaS Team
+#+OPTIONS: H:6 num:5 toc:2 
+
+* Introduction
+The =ece-import= script will help you with the following tasks:
+
+- Setting up imports, either [[From an import archive]] or
+[[  Without an import archive]]
+- [[Getting raw import data from HTTP or FTP servers]]
+- Running an import job, taking the raw XML from a 3rd party system,
+  applying all defined transformations on it and dumping it in the
+  designed import spool for Escenic Content Engine to pick it up and
+  import it into its CMS. This is typically set up from a cron job,
+  but [[Running an import job manually]] is easy with =ece-import=.
+
+* Setting up a new import job
+
+** From an import archive
+The preferred way is to use an import archive, which you typically get
+from the web site developers who've created the XSL files and so on.
+#+BEGIN_SRC text
+# ece-import --import-archive /tmp/import-archive.zip create
+#+END_SRC
+
+** Without an import archive
+#+BEGIN_SRC text
+# ece-import \
+#   --name  streaming-video \
+#   --publication mypub \
+#   create
+#+END_SRC
+
+* Getting raw import data from HTTP or FTP servers
+There's built-in support for this in =ece-import=:
+#+BEGIN_SRC text
+$ ece-import \
+  --name streaming-video \
+  --publication mypub \
+  --user my-ftp-user \
+  --password my-ftp-password \
+  --uri http://news-feed.com/my-import-job-feed
+  download-import-data
+[ece-import-0] Started @ Mon Nov 5 09:30:39 UTC 2012, I'm logging to
+[ece-import-0] /var/log/escenic/ece-import-root.log
+[ece-import-1] 12.xml has already been downloaded, skipping to the next one
+[ece-import-1] 19.xml has already been downloaded, skipping to the next one
+[ece-import-1] Downloading http://news-feed.com/my-import-job-feed/20.xml ...
+[ece-import-1] Downloading http://news-feed.com/my-import-job-feed/21.xml ...
+[ece-import-2] Downloading http://news-feed.com/my-import-job-feed/22.xml ...
+[ece-import-3] Downloading http://news-feed.com/my-import-job-feed/23.xml ...
+[ece-import-3] Downloading http://news-feed.com/my-import-job-feed/24.xml ...
+[ece-import-4] Downloading http://news-feed.com/my-import-job-feed/25.xml ...
+[ece-import-5] Downloading http://news-feed.com/my-import-job-feed/26.xml ...
+[ece-import-6] Finished @ Mon Nov 5 09:30:45 UTC 2012
+#+END_SRC
+
+You can safely re-run this as many times as you wish, =ece-import=
+will keep track of previously downloaded files. If you ever need to
+re-download third party data, you can remove the corresponding
+resource from =/var/lib/escenic/raw/mypub/streaming-video/download.state=
+
+* Running an import job manually
+#+BEGIN_SRC text
+$ ece-import \
+  --name streaming-video \
+  --publication mypub
+[ece-import-0] Started @ Mon Nov 5 09:36:33 UTC 2012, I'm logging to
+[ece-import-0] /var/log/escenic/ece-import-root.log
+[ece-import-0] Publication: mypub
+[ece-import-0] Import configuration: streaming-video
+[ece-import-0] Importing raw XML #1: 21.xml ...
+[ece-import-0] Importing raw XML #2: 26.xml ...
+[ece-import-1] Importing raw XML #3: 24.xml ...
+[ece-import-4] Number of raw XML files proccessed: 3
+[ece-import-4] Number of raw XML successes: 3
+[ece-import-4] Number of raw XML errors: 0
+[ece-import-4] Finished @ Mon Nov 5 09:36:37 UTC 2012, enjoy thyself!
+#+END_SRC
+

From 024751d9abd767b1c05f281068acb65d2a99faa8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 5 Nov 2012 13:25:18 +0100
Subject: [PATCH 1598/2585] - added org pre-amble with proper title, author and
 export options (to   get the menu nesting at desired depth).

---
 usr/share/doc/escenic/ece-guide.org | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/usr/share/doc/escenic/ece-guide.org b/usr/share/doc/escenic/ece-guide.org
index f8d6fe57..918d94ae 100644
--- a/usr/share/doc/escenic/ece-guide.org
+++ b/usr/share/doc/escenic/ece-guide.org
@@ -1,4 +1,6 @@
-Guide for the /usr/bin/ece Script
+#+TITLE: User Guide for the ece Script
+#+AUTHOR: Vizrt Online / The SaaS Team
+#+OPTIONS: H:6 num:5 toc:2 
 
 * TAB completion
 The ece script offers TAB completion, given that your version of BASH

From e12c1f390640b7395f370c29bc9575ed1f8d4294 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 5 Nov 2012 13:33:58 +0100
Subject: [PATCH 1599/2585] - ece-build now output the example URL for the DEB
 package(s) with the   variable ${HOSTNAME} instead of an example host. This
 way, it's   possible to copy and paste the URL on any of the machines to be  
 deployed and BASH will automagically expand the pasted URL to the   correct
 URL for the configuration for that package.

  E.g.: ece-build will now output:

     [ece-build-45] Configuration packages available here: http://builder.vizrtsaas.com/solartv/releases/vosa-conf-${HOSTNAME}-1-solartv-trunk-r5765.deb
     [ece-build-45] Replace '${HOSTNAME}' with any of: [ edit1 edit2 pres1 pres2 staging ] for the other machines' conf packages.

  When copy and pasting the URL into the shell of edit1, it will
  translate to:

    escenic@edit1$ echo http://builder.vizrtsaas.com/solartv/releases/vosa-conf-${HOSTNAME}-1-solartv-trunk-r5765.deb
    http://builder.vizrtsaas.com/solartv/releases/vosa-conf-edit1-1-solartv-trunk-r5765.deb

  This should avoid mishaps like installing another machine's
  configuration package.
---
 usr/share/escenic/build-scripts/ece-build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 7bceeada..4555ebbc 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -567,8 +567,8 @@ EOF
   done
 
   print_and_log "Configuration packages available here: " \
-    "http://builder.vizrtsaas.com/$customer/releases/${package_name}-${package_version}.deb"
-  print_and_log "Replace '$machine' with any of: [" \
+    "http://builder.vizrtsaas.com/$customer/releases/vosa-conf-\${HOSTNAME}-${package_version}.deb"
+  print_and_log "Replace '\${HOSTNAME}' with any of: [" \
     $machine_list "] for the other machines' conf packages."
 }
 

From acadad40dab102b8ade2baae14a0fc3e83348aa2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 5 Nov 2012 13:34:29 +0100
Subject: [PATCH 1600/2585] - moved print_manual_steps to
 create-job::print_manual_steps

---
 .../ece-scripts/ece-import.d/create-job.sh    | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh b/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh
index f96d6b39..e27193d6 100644
--- a/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh
+++ b/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh
@@ -139,3 +139,27 @@ function create_import_cron_jobs() {
     print_and_log $(green NEW) "cron job(s) set up in $file"
   fi
 }
+
+function print_manual_steps() {
+  if [ -z "${import_configuration_list}" ]; then
+    return
+  fi
+    
+  print_and_log "You must now add your new Nursery components: " \
+
+  for el in $import_configuration_list; do
+    print_and_log "$(green ADD) /${el}"
+  done
+  
+  print_and_log "to the $(blue importConfigurations) variable in " \
+    "your ECE instance's" \
+    "/com/escenic/syndication/xml/XMLImportService e.g.:" \
+    "/etc/escenic/engine/server/edit2-engine1/com/escenic/syndication/xml/XMLImportService.properties"
+
+  print_and_log "The final step is to add the Nursery service " \
+    "service.9.9-xml-import-service=/com/escenic/syndication/xml/XMLImportSchedule" \
+    "to your instance's Initial component, e.g.:" \
+    /etc/escenic/engine/server/edit2-engine1/Initial.properties
+}
+
+

From a30bd9b85c23237caec184ca7675797c36c3bc22 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 5 Nov 2012 14:29:32 +0100
Subject: [PATCH 1601/2585] - transformers are now put in  
 /usr/share/escenic/import/<pub>/<job>/transformers because we now   also have
 cron in /usr/share/escenic/import/<pub>/<job>/

---
 usr/bin/ece-import                                       | 4 ++--
 usr/share/escenic/ece-scripts/ece-import.d/create-job.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/bin/ece-import b/usr/bin/ece-import
index 57a63a4b..db6156fb 100755
--- a/usr/bin/ece-import
+++ b/usr/bin/ece-import
@@ -213,7 +213,7 @@ function is_trannsformer_supported() {
 
 ## $1 :: file
 function perform_transformations() {
-  for el in $transformers_base_dir/$publication_name/$job_name/[0-9]*; do
+  for el in $transformers_base_dir/$publication_name/$job_name/transformers/[0-9]*; do
     if [ $(is_trannsformer_supported $el) -eq 0 ]; then
       log "$(yellow WARNING) The transformer $el isn't supported by $(basename $0)"
       continue
@@ -335,7 +335,7 @@ function verify_import_job_configuration() {
     $escenic_spool_base_dir/$publication_name/$job_name/error
   verify_readable_dir_list $transformers_base_dir/$publication_name/$job_name
 
-  local dir=$transformers_base_dir/$publication_name/$job_name
+  local dir=$transformers_base_dir/$publication_name/$job_name/transformers
   local tranformation_count=$(
     ls $dir | \
       grep ^[0-9] | \
diff --git a/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh b/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh
index e27193d6..e7365f51 100644
--- a/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh
+++ b/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh
@@ -87,7 +87,7 @@ function apply_import_archive() {
       create_import_configuration $el $ele
 
       local src_dir=$tmp_dir/$el/$ele/transformers
-      local target_dir=$transformers_base_dir/$el/$ele
+      local target_dir=$transformers_base_dir/$el/$ele/transformers
       if [ -d $src_dir ]; then
         print_and_log "Copying transformers to $target_dir"
         make_dir $target_dir

From 5a19d7c5e9fc772b649c6cb803c6a02b627e0538 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 5 Nov 2012 16:46:33 +0100
Subject: [PATCH 1602/2585] - re-implemented the setup of cron jobs, now
 supporting only a white   list of:

  <import job archive>/cron.every.five.minutes/my-script
  <import job archive>/cron.hourly/my-script
  <import job archive>/cron.daily/my-script
  <import job archive>/cron.weekly/my-script
  <import job archive>/cron.monthly/my-script

  'ece-import create' will set up one file in /etc/cron.d for each
  import job, hence if an import job has more than one cron jobs,
  these will all be listed in the /etc/cron.d/mypub-myjob-cron file.

  These entries then again call the cron scripts supplied in the
  import archive, e.g. an archive with:

    water/voss/cron.monthly/say-goodbye
    water/voss/cron.hourly/say-hi

  results in these being copied to:

    /usr/share/escenic/import/water/voss

  and then referenced from /etc/cron.d/water-voss-cron:

    0 0 1 * * /usr/share/escenic/import/water/voss/cron.monthly/say-goodbye >> /var/log/escenic/water-voss-cron.log
    0 * * * * /usr/share/escenic/import/water/voss/cron.hourly/say-hi >> /var/log/escenic/water-voss-cron.log

  I use exact cron notation here in stead of the string notation (like
  @daily) so that it's apparent why the hourly script always executes
  on the first minutes, i.e. 10:00 of the hour.
---
 .../ece-scripts/ece-import.d/create-job.sh    | 51 +++++++++++++------
 1 file changed, 36 insertions(+), 15 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh b/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh
index e7365f51..e76441b9 100644
--- a/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh
+++ b/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh
@@ -105,33 +105,54 @@ function apply_import_archive() {
 
 ## $1 : publication
 ## $2 : job
-## $3 : archive directory of $1 and $2
+## $3 : parent directory of $1/$2 inside the archive
 function create_import_cron_jobs() {
   if [[ $(whoami) != "root" ]]; then
     print_and_log $(red WARN) \
       "You need to be root to set up the cron jobs, skipping it."
     return
   fi
-  
+
   local file=/etc/cron.d/$1-$2-cron
   echo > $file
   
-  find $3 -maxdepth 3 -name "cron*minutes" -type d | while read f; do
-    dir=$(basename $f)
-    minutes=$(echo $dir | cut -d'.' -f3)
-    for el in $(find $3/$dir -type f); do
-      local target_dir=$transformers_base_dir/$1/$2/$dir
-      make_dir $target_dir
-      run cp --force $el $target_dir
-      # it's  important that all cron scripts are executable'
-      run chmod +x $target_dir/*
-      echo "*/${minutes} * * * * $target_dir/$(basename $el) >> $log_base_dir/$1-$2-$(basename $el).log" \
-        >> $file
-      exit 1
+  # first, set up an y cron.hourly
+  find $3 \
+    -maxdepth 1 \
+    -type d | \
+    egrep "cron.(every.five.minutes|hourly|daily|weekly|monthly)" | while read f; do
+    target_dir=$transformers_base_dir/$1/$2
+    make_dir $target_dir
+    run cp -r $f $target_dir
+    
+    
+    for dir in $f; do
+      local type_of_cron=$(basename $dir)
+      print_and_log "Setting up ${type_of_cron} for " \
+        "import job $2 on publication $1"
+      
+      if [[ $type_of_cron == "cron.hourly" ]]; then
+        cron_pattern='0 * * * *'
+      elif [[ $type_of_cron == "cron.daily" ]]; then
+        cron_pattern='0 0 * * *'
+      elif [[ $type_of_cron == "cron.weekly" ]]; then
+        cron_pattern='0 0 * * 0'
+      elif [[ $type_of_cron == "cron.monthly" ]]; then
+        cron_pattern='0 0 1 * *'
+      elif [[ $type_of_cron == "cron.every.five.minutes" ]]; then
+        cron_pattern='*/5 * * * *'
+      fi
+
+      for cron_script in $(find $f -type f); do
+        local the_script=$target_dir/$type_of_cron/$(basename $cron_script)
+        run chmod +x $the_script
+        echo "$cron_pattern" $the_script \
+          '>>' $log_base_dir/$(basename $file).log \
+          >> $file
+      done
     done
   done
 
-
   # remove empty cron files
   if [ $(wc -c $file | cut -d' ' -f1) -lt 2 ]; then
     run rm $file

From af32e9695b6243c8649634970e64c81324868050 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Tue, 6 Nov 2012 10:01:18 +0100
Subject: [PATCH 1603/2585] Set user to escenic for munin plug-ins.

---
 usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index 4512ac5c..caaa0949 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -279,6 +279,10 @@ EOF
 }
 
 function install_escenic_munin_plugins() {
+  if [ ! -r /etc/munin/plugin-conf.d/escenic-munin-plugins ] ; then
+    (echo '[escenic_*]'; echo 'user escenic') | sudo tee /etc/munin/plugin-conf.d/escenic-munin-plugins
+  fi
+
   if [ $on_debian_or_derivative -eq 1 ]; then
     install_packages_if_missing escenic-munin-plugins
     return

From 6088ed97c0a27a2366bab2ba44a6e2c15b7914b3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 6 Nov 2012 12:30:00 +0100
Subject: [PATCH 1604/2585] - updated the documentation on app server virtual
 hosts

---
 usr/share/doc/escenic/ece-install-guide.org | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index bbb90d46..3047d39b 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -802,7 +802,8 @@ some things easier, such as ECE plugins which set cookies based on
 information they get from the app server.
 
 ece-install can set up the virtual hosts configuration for Tomcat
-application servers if the profile is editorial, all presentation.
+application servers if the profile is =editor=, =all= or
+=presentation=.
 
 To use this feature, you must define one domain for each publication
 in the following FAI parameter:
@@ -813,16 +814,22 @@ fai_publication_domain_mapping_list="
 "
 #+END_SRC
 
-This will produce the following stanzas in server.xml:
+This will produce the following stanzas in =server.xml=:
 
 #+BEGIN_SRC nxml
-<Host name="fire.escenic.com" appBase="webapps-firepub" autoDeploy="false">
+<Host
+  name="fire.escenic.com"
+  appBase="webapps-fire"
+  autoDeploy="false">
   <Context displayName="fire.escenic.com"
            docBase="firepub"
            path=""
   />
 </Host>
-<Host name="ild.escenic.com" appBase="webapps-ildpub" autoDeploy="false">
+<Host
+  name="ild.escenic.com"
+  appBase="webapps-ildpub"
+  autoDeploy="false">
   <Alias>feuer.escenic.com</Alias>
   <Alias>fuego.escenic.com</Alias>
   <Context displayName="ild.escenic.com"

From 5625b75604034aefb3d3f0823f5c75209a35d965 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Wed, 7 Nov 2012 09:50:53 +0100
Subject: [PATCH 1605/2585] vosa-handbook - added initial version of
 development process chapter

---
 .../vosa-handbook/development-process.org     | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/development-process.org

diff --git a/usr/share/doc/vizrt/vosa-handbook/development-process.org b/usr/share/doc/vizrt/vosa-handbook/development-process.org
new file mode 100644
index 00000000..f4e8cc34
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/development-process.org
@@ -0,0 +1,23 @@
+* Development Process
+
+The development process consists of a chain of processes and applications
+working together to create an efficient and agile environment for change
+management.  
+
+** TODO Jira
+
+
+** TODO Source code repository
+
+
+** TODO /The builder/
+
+
+** Development image
+
+The main environment for change is the local development environment 
+a.k.a. #+BEGIN_QUOTEdev image#+END_QUOTE. 
+
+Your dev image can be found here - [[<%= trail_dev_image_uri %>][Local development environment]].
+
+*** TODO Setup

From 4ff4853c8c556197e8c07cc16567b0f8bf1e7bb2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 6 Nov 2012 14:59:37 +0100
Subject: [PATCH 1606/2585] - fixed the root logger

---
 usr/share/escenic/ece-scripts/ece-install.d/app-server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index b4439616..cc10961d 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -505,7 +505,7 @@ function log4j_create_configuration_file() {
 
 ######################################################################
 # The default logger (this is the catch all logger)
-log4j.rootLogger=ERROR, CATALINA
+log4j.rootLogger=ERROR, TOMCAT
 log4j.additivity.com=false
 log4j.additivity.neo=false
 # Get rid of serialization errors to memcached.

From e9a2b950f3e94dca26d79d6f0d2d46be572a5543 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 7 Nov 2012 09:32:20 +0100
Subject: [PATCH 1607/2585] - a word was capitalised in the middle of the
 sentence.

---
 usr/sbin/ece-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index d4075827..4fb24633 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -900,7 +900,7 @@ function un_install_everything() {
 
   if [[ "$answer" != "$pretty_please" ]]; then
     print_and_log "You didn't type the confirmation string correctly."
-    print_and_log "You typed: [ ${answer} ]. I will not Uninstall anything"
+    print_and_log "You typed: [ ${answer} ]. I will not uninstall anything"
     return
   else
     print_and_log "OK, I'll do as you wish:"

From 2501b1052d5211db79e363b42a8dd60da5107dbb Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 7 Nov 2012 13:18:44 +0100
Subject: [PATCH 1608/2585] - added support for setting the version number of
 the various scripts   when creating the packages. This will enable us to have
 the various   programs return their own version number/string when queried,  
 without going the way of the DEB/RPM packages.

- added ece -V & ece --version

- added system-info -V & system-info --version

- added ece-install -V & ece-install --version

- added ece-import -V & ece-import --version

- added vosa -V

- added ece-builder -V

- added ece-build -V
---
 usr/bin/ece                                       | 4 ++--
 usr/bin/ece-import                                | 7 ++++++-
 usr/bin/system-info                               | 9 +++++++++
 usr/bin/vosa                                      | 8 +++++++-
 usr/sbin/ece-install                              | 7 +++++++
 usr/share/escenic/build-scripts/ece-build         | 7 ++++++-
 usr/share/escenic/build-scripts/ece-builder       | 9 +++++++--
 usr/share/escenic/package-scripts/create-packages | 6 +++++-
 8 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index cc529839..ac949523 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -19,7 +19,7 @@ escenic_conf_dir=/etc/escenic
 # Dear user, don't touch anyting in this script, especially below this
 # line :-)
 ######################################################################
-ece_script_version="github-2012-07-11 16:37"
+ece_scripts_version="straight-from-github"
 type=engine
 instance=default
 command=""
@@ -663,7 +663,7 @@ function set_type_command_and_instance() {
             backup_exclude_state=1
             continue
         elif [ "$el" == "--version" -o "$el" == "-V" ]; then
-             echo "$(basename $0) version:" $ece_script_version
+             echo "Version:" $ece_scripts_version
              exit 0
         fi
         
diff --git a/usr/bin/ece-import b/usr/bin/ece-import
index db6156fb..3085ce5a 100755
--- a/usr/bin/ece-import
+++ b/usr/bin/ece-import
@@ -45,6 +45,8 @@ escenic_spool_base_dir=/var/spool/escenic/import
 escenic_user=escenic
 job_name=""
 log_base_dir=/var/log/escenic
+ece_scripts_version="straight-from-github"
+
 # since both regular users and root can use this command, we create
 # user specific log files. We put it in /var/log as it'll regardless
 # of user run as a deamon process.
@@ -95,6 +97,9 @@ function get_user_input() {
       next_is_uri=1
     elif [[ "$el" == "--directories-only" ]]; then
       directories_only=1
+    elif [ "$el" == "--version" -o "$el" == "-V" ]; then
+      echo "Version:" $ece_scripts_version
+      exit 0
     elif [ $next_is_name -eq 1 ]; then
       job_name=$el
       next_is_name=0
@@ -362,8 +367,8 @@ function print_report() {
 
 create_pid
 check_pre_requisites
-print_and_log "Started @ $(date), I'm logging to $log"
 get_user_input $@
+print_and_log "Started @ $(date), I'm logging to $log"
 
 if [[ "$command" == $COMMAND_IMPORT ]]; then
   verify_import_job_configuration
diff --git a/usr/bin/system-info b/usr/bin/system-info
index a75d8b9f..07273c9e 100755
--- a/usr/bin/system-info
+++ b/usr/bin/system-info
@@ -10,6 +10,7 @@
 ## echo '* *     * * *   root    system-info -f html > /var/www/index.html' >> /etc/crontab
 
 ece_user=""
+ece_scripts_version="straight-from-github"
 
 ## possible values: html, org, confluence, yaml, json (not complete)
 format=yaml
@@ -336,6 +337,14 @@ EOF
 }
 
 function get_user_options() {
+  # starting to add support for --long-version options
+  for el in $@; do
+    if [ $el = "-V" -o $el = "--version" ]; then
+      echo "Version:" $ece_scripts_version
+      exit 0
+    fi
+  done
+  
   while getopts ":d:o:i:f:u:mvst" opt; do
     case $opt in
       i)
diff --git a/usr/bin/vosa b/usr/bin/vosa
index a984d42f..a8306bdc 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -15,11 +15,12 @@
 instance_dir=
 instance_name=
 usage=0
+ece_scripts_version="straight-from-github"
 
 ### To add an option, add it to the optstring, as defined in getopts, in alphabetical order.
 ### Also add a function "option-x" where x is the option. $1 will be the option value, if any.
 ### set any variables needed to default values as globals first.
-OPTSTRING=":i:v:hd"
+OPTSTRING=":i:v:hdV"
 
 function option-h() {
   usage=1
@@ -29,6 +30,11 @@ function option-d() {
   debug=$((debug + 1))
 }
 
+function option-V() {
+  echo "Version:" $ece_scripts_version
+  exit 0
+}
+
 function option-i() {
   if [[ "${1}" =~ ^[-a-z0-9]*$ ]] ; then
     instance_dir=${available_dir}/$1
diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 4fb24633..ae4f05bc 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -44,6 +44,10 @@ mirror_country_suffix=no
 # you're using a different system or have other preferences, change
 # java_home.
 java_home=/usr/lib/jvm/java-6-sun
+
+# This variable is updated by the package build scripts.
+ece_scripts_version="straight-from-github"
+
 #####################################################################
 
 download_dir=/var/cache/$(basename $0)
@@ -940,6 +944,9 @@ function leave_trail() {
 for el in $@; do
     if [ $el = "-v" -o $el = "--verbose" ]; then
         debug=1
+    elif [ $el = "-V" -o $el = "--version" ]; then
+      echo "Version:" $ece_scripts_version
+      exit 0
     elif [ $el = "-f" -o $el = "--conf-file" ]; then
         next_is_conf_file=1
     elif [[ -n $next_is_conf_file && $next_is_conf_file -eq 1 ]]; then
diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 4555ebbc..f15c707f 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -7,6 +7,7 @@
 ################################################################################
 
 # Common variables
+ece_scripts_version="straight-from-github"
 log=~/ece-build.log
 pid_file=~/ece-build.pid
 build_date=`date +%F_%H%M`
@@ -143,7 +144,7 @@ function verify_configuration {
 ##
 function get_user_options
 {
-  while getopts ":b:t:os" opt; do
+  while getopts ":b:t:osV" opt; do
     case $opt in
       b)
         svn_path=branches/${OPTARG}
@@ -162,6 +163,10 @@ function get_user_options
         skip_ear=1
         print_and_log "Skip .ear mode in effect!"
         ;;
+      V)
+        echo "Version:" $ece_scripts_version
+        exit 0
+        ;;
       \?)
         print "Invalid option: -$OPTARG" >&2
         remove_pid_and_exit_in_error
diff --git a/usr/share/escenic/build-scripts/ece-builder b/usr/share/escenic/build-scripts/ece-builder
index c3a4faf4..3f5a3a35 100755
--- a/usr/share/escenic/build-scripts/ece-builder
+++ b/usr/share/escenic/build-scripts/ece-builder
@@ -6,6 +6,7 @@
 ################################################################################
 
 # Common variables
+ece_scripts_version="straight-from-github"
 ece_scripts_home=/usr/share/escenic/ece-scripts
 log=/var/log/ece-builder.log
 pid_file=/var/run/ece-builder.pid
@@ -119,7 +120,7 @@ function verify_dependencies
 ##
 function get_user_options
 {
-  while getopts ":i:u:a:l:c:s:m:p:" opt; do
+  while getopts ":i:u:a:l:c:s:m:p:V" opt; do
     case $opt in
       i)
         print_and_log "Setting up a new builder under /home/$builder_user_name ..."
@@ -141,6 +142,10 @@ function get_user_options
         list_path=${OPTARG}
         add_artifact_list=1
         ;;
+      V)
+        echo "Version:" $ece_scripts_version
+        exit 0
+        ;;
       \?)
         print_and_log "Invalid option: -$OPTARG" >&2
         remove_pid_and_exit_in_error
@@ -576,9 +581,9 @@ function phase_shutdown
 # Run commands
 #####################################################
 phase_startup
+get_user_options $@
 print_and_log "Starting process @ $(date)"
 print_and_log "Additional output can be found in $log"
-get_user_options $@
 phase_execute
 print_and_log "SUCCESS! @ $(date)"
 phase_shutdown
diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index fe1964b9..3b9d3ad2 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -213,7 +213,11 @@ function create_packages() {
   sed -i "s#VERSION#${package_version}#g" $debian_dir/control
   sed -i "s#MAINTAINER_NAME#$(get_name)#g" $debian_dir/control
   sed -i "s#MAINTAINER_EMAIL#$(get_email)#g" $debian_dir/control
-
+  find ${target_dir}/usr/{bin,sbin}/ -type f | while read f; do
+    sed -i "s#^ece_scripts_version=.*#ece_scripts_version=${package_version}#g" \
+      $f
+  done
+  
   # fix permissions
   if [ -e $debian_dir/postinst ]; then
     chmod 755 $debian_dir/postinst

From 8c244287380d0cc2f87a04236e5f6fc96e3dd35f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Wed, 7 Nov 2012 15:21:25 +0100
Subject: [PATCH 1609/2585] Update
 usr/share/doc/vizrt/vosa-handbook/development-process.org

vosa-handbook - updated development process description.
---
 .../vosa-handbook/development-process.org     | 32 +++++++++++++++++--
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/development-process.org b/usr/share/doc/vizrt/vosa-handbook/development-process.org
index f4e8cc34..6fa27a86 100644
--- a/usr/share/doc/vizrt/vosa-handbook/development-process.org
+++ b/usr/share/doc/vizrt/vosa-handbook/development-process.org
@@ -10,14 +10,40 @@ management.
 ** TODO Source code repository
 
 
-** TODO /The builder/
+** TODO The builder
 
 
 ** Development image
 
 The main environment for change is the local development environment 
-a.k.a. #+BEGIN_QUOTEdev image#+END_QUOTE. 
+a.k.a. "dev image". 
+
+*** Download
 
 Your dev image can be found here - [[<%= trail_dev_image_uri %>][Local development environment]].
 
-*** TODO Setup
+*** Setup
+
+After the .ova file has been downloaded it can be imported into VirtualBox or VMWare Player. It works under Windows, OSX and Linux, and provides an Ubuntu image with Escenic Content Engine already installed with a publication and an .ear file from the project.
+
+Just by starting it up, you should be able to see its IP address when it boots. The image does not need a network connection or DHCP server in order to work, and the image is completely shielded from any network you’re connected to.
+
+*** What’s included
+
+- Ubuntu (actually, an Ubuntu Enterprise Cloud Image, modified to boot under almost any hypervisor.)
+- two virtual network cards, one for outbound NAT traffic and the other for inbound traffic.
+- varnish cache (just like in production)
+- memcached (just like in production)
+- separate solr java (just like in production)
+- remote debugging enabled (on port 5005)
+
+/Which publications are available?/
+|-----------------+------------------------------------|
+| Publication     | username / password                |
+|-----------------+------------------------------------|
+| [pubName]       | [pubName]_admin / admin            |
+|-----------------+------------------------------------|
+
+/What are the important credentials?/
+
+Operating system: The usernames ubuntu (with sudo privileges), escenic (runs escenic).
\ No newline at end of file

From 023008c2dbe8938b0880ca48ec446f8eab5b4490 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=F6n?= <oschoen@vizrt.com>
Date: Thu, 8 Nov 2012 08:15:22 +0100
Subject: [PATCH 1610/2585] ece-build - added latest link for .ear files

---
 usr/share/escenic/build-scripts/ece-build | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index f15c707f..7e7f34e0 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -414,6 +414,7 @@ function publish_ear
   resulting_ear=$customer-$release_label-rev$revision-$build_date.ear
   if [ -e $assemblytool_root_dir/dist/engine.ear ]; then 
     run cp $assemblytool_root_dir/dist/engine.ear $release_dir/$resulting_ear
+    run ln -fs $release_dir/$resulting_ear $release_dir/latest
   else
     print_and_log "I'm done, but the .ear is still missing, exiting!"
     remove_pid_and_exit_in_error

From 6b70c7f6a98743b5b6cf6659a7e68c56cdd47e02 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 8 Nov 2012 10:32:47 +0100
Subject: [PATCH 1611/2585] - fall back to 'cron' when the user variable isn't
 set.

---
 usr/bin/ece-import | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/bin/ece-import b/usr/bin/ece-import
index 3085ce5a..36874368 100755
--- a/usr/bin/ece-import
+++ b/usr/bin/ece-import
@@ -50,7 +50,7 @@ ece_scripts_version="straight-from-github"
 # since both regular users and root can use this command, we create
 # user specific log files. We put it in /var/log as it'll regardless
 # of user run as a deamon process.
-log=$log_base_dir/$(basename $0)-${USER}.log
+log=$log_base_dir/$(basename $0)-${USER-cron}.log
 nursery_base_dir=/etc/escenic/engine/common
 publication_name=""
 raw_spool_base_dir=/var/spool/escenic/raw

From 297386bd67883fd319fcf81a7b9239003693a4ac Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 8 Nov 2012 11:15:57 +0100
Subject: [PATCH 1612/2585] - will now move any multimedia files that the raw
 XML uses   (i.e. present in the raw XML's directory) to the ECE spool  
 directory.

---
 usr/bin/ece-import | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/usr/bin/ece-import b/usr/bin/ece-import
index 36874368..496da8b1 100755
--- a/usr/bin/ece-import
+++ b/usr/bin/ece-import
@@ -271,6 +271,22 @@ function handle_transformation_error() {
 
 import_error_count=0
 
+## $1 :: the directory to check for multimedia files.
+## $2 :: the directory to move any of these multimedia files to
+function move_any_multimedia_files_if_present() {
+  if [ ! -d $1 -o ! -d $2 ]; then
+    return
+  fi
+
+  local multimedia_file_count=$(
+    ls $1 | egrep -i ".(png|gif|jpg|jpeg|pdf)$" | wc -l
+  )
+  if [ $multimedia_file_count -gt 0 ]; then
+    log "Moving ${multimedia_file_count} multimedia files from $1 to $2"
+    mv $1/*.{png,gif,jpg,jpeg,pdf} $2 >> $log 2>/dev/null
+  fi
+}
+
 function import_raw_files() {
   print_and_log "Publication: $publication_name"
   print_and_log "Import configuration: $job_name"
@@ -288,6 +304,7 @@ function import_raw_files() {
       local dir=$escenic_spool_base_dir/$publication_name/$job_name/new
       log "Transformed XML is OK, moving transformed file to" $dir
       run mv $file $dir
+      move_any_multimedia_files_if_present $(dirname $file) $dir
       dir=$raw_transformed_base_dir/$publication_name/$job_name/succeeded
       log "Transformed XML is OK, moving original raw XML to" $dir \
         "and gzip-ing it."

From 28b5851bfb23b2e04ceba1fd08d2608b01830a73 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 8 Nov 2012 13:04:48 +0100
Subject: [PATCH 1613/2585] Added hugin debian build

---
 .../escenic/package-scripts/create-packages   | 23 ++++++++++++++
 .../package-scripts/debian/hugin/control      |  8 +++++
 .../package-scripts/debian/hugin/postinst     | 31 +++++++++++++++++++
 3 files changed, 62 insertions(+)
 create mode 100644 usr/share/escenic/package-scripts/debian/hugin/control
 create mode 100755 usr/share/escenic/package-scripts/debian/hugin/postinst

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 3b9d3ad2..fd21700f 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -67,6 +67,8 @@ function create_target_directory() {
     set_up_escenic-munin-plugins
   elif [[ $package_name == "escenic-check-mk-plugins" ]]; then
     set_up_escenic-check-mk-plugins
+  elif [[ $package_name == "hugin" ]]; then
+    set_up_hugin
   fi
 
   debian_dir=$target_dir/DEBIAN
@@ -201,6 +203,27 @@ function set_up_escenic-munin-plugins() {
   rm -rf $dir
 }
 
+function set_up_hugin() {
+  mkdir -p $target_dir/etc/{hugin.often,hugin.hourly,hugin.daily,hugin.weekly,cron.d}
+  mkdir -p $target_dir/usr/{bin,share/doc/hugin,share/hugin}
+  mkdir -p $target_dir/var/lib/hugin
+  
+  local dir=$(mktemp -d)
+  (
+    cd $dir
+    wget $wget_opts https://bitbucket.org/mogsie/hugin/get/default.tar.gz
+    tar xzf default.tar.gz
+    cp $dir/mogsie-hugin-*/bin/* $target_dir/usr/bin
+    cp $dir/mogsie-hugin-*/etc/* $target_dir/etc
+    cp $dir/mogsie-hugin-*/cron/* $target_dir/etc/cron.d/
+    cp $dir/mogsie-hugin-*/checks/* $target_dir/usr/share/hugin/
+    cp $dir/mogsie-hugin-*/README.md $target_dir/usr/share/doc/hugin
+
+    # chmod 755 $file $target_dir/usr/bin/*
+  )
+  rm -rf $dir
+}
+
 function get_name() {
   echo ${maintainer_name-$default_maintainer_name}
 }
diff --git a/usr/share/escenic/package-scripts/debian/hugin/control b/usr/share/escenic/package-scripts/debian/hugin/control
new file mode 100644
index 00000000..d65dee6c
--- /dev/null
+++ b/usr/share/escenic/package-scripts/debian/hugin/control
@@ -0,0 +1,8 @@
+Package: hugin
+Version: VERSION
+Depends: mercurial
+Section: base
+Priority: optional
+Architecture: all
+Maintainer: Erik Mogensen <mogsie@vizrt.com>
+Description: Keep historical records of files or program output
diff --git a/usr/share/escenic/package-scripts/debian/hugin/postinst b/usr/share/escenic/package-scripts/debian/hugin/postinst
new file mode 100755
index 00000000..ac0e31d1
--- /dev/null
+++ b/usr/share/escenic/package-scripts/debian/hugin/postinst
@@ -0,0 +1,31 @@
+#! /bin/sh
+
+set -e
+
+prevver="$2"
+
+add_hugin_system_user() {
+	if ! getent passwd hugin >/dev/null; then
+		adduser --group --system --no-create-home --home /var/lib/hugin hugin
+	fi
+}
+
+fixperms() {
+        dpkg-statoverride --list /var/lib/hugin >/dev/null || \
+		dpkg-statoverride --update --add hugin root 0755 /var/lib/hugin
+}
+
+case "$1" in
+	configure)
+		add_hugin_system_user
+		fixperms
+		;;
+	triggered|abort-upgrade|abort-deconfigure|abort-remove)
+		:
+		;;
+	*)
+		echo "Called with unknown argument $1, bailing out."
+		exit 1
+		;;
+esac
+

From 6589ce13a4a5045c767adc50565c15f9039dac92 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 8 Nov 2012 13:54:49 +0100
Subject: [PATCH 1614/2585] Added fakeroot to make deb-packages with root-owned
 files.

---
 usr/share/escenic/package-scripts/create-packages | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index fd21700f..526f9398 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -251,7 +251,7 @@ function create_packages() {
     exit 1
   fi
 
-  dpkg-deb --build $target_dir \
+  fakeroot dpkg-deb --build $target_dir \
     2>&1 > /dev/null
   mv ${target_dir}.deb $target_dir/${package_name}-${package_version}.deb
   

From 1c5a49b0684634cf57142d8dc558121ca22fe94c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=F6n?= <oschoen@vizrt.com>
Date: Fri, 9 Nov 2012 09:16:09 +0100
Subject: [PATCH 1615/2585] ece-build - added latest links for .deb and .rpm
 packages

---
 usr/share/escenic/build-scripts/ece-build | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 7e7f34e0..aa5e4089 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -567,7 +567,11 @@ EOF
 
     # move the machine's DEB and RPM packges to the release directory
     run mv $target_dir/*.{deb,rpm} $release_dir/
-    
+   
+    # adding latest links for conf packages
+    run ln -sf $release_dir/${package_name}-${package_version}.deb $release_dir/${package_name}-latest.deb
+    run ln -sf $release_dir/${package_name}-${package_version}.rpm $release_dir/${package_name}-latest.rpm
+ 
     # remove work directory
     run rm -rf $target_dir
   done

From 1dcb388e34d00cedfc6fa2301dcd41b773691850 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Fri, 9 Nov 2012 10:30:53 +0100
Subject: [PATCH 1616/2585] Renamed hugin .deb to hugin-node

---
 usr/share/escenic/package-scripts/create-packages           | 6 +++---
 .../package-scripts/debian/{hugin => hugin-node}/control    | 0
 .../package-scripts/debian/{hugin => hugin-node}/postinst   | 0
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename usr/share/escenic/package-scripts/debian/{hugin => hugin-node}/control (100%)
 rename usr/share/escenic/package-scripts/debian/{hugin => hugin-node}/postinst (100%)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 526f9398..44cd83ea 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -67,8 +67,8 @@ function create_target_directory() {
     set_up_escenic-munin-plugins
   elif [[ $package_name == "escenic-check-mk-plugins" ]]; then
     set_up_escenic-check-mk-plugins
-  elif [[ $package_name == "hugin" ]]; then
-    set_up_hugin
+  elif [[ $package_name == "hugin-node" ]]; then
+    set_up_hugin-node
   fi
 
   debian_dir=$target_dir/DEBIAN
@@ -203,7 +203,7 @@ function set_up_escenic-munin-plugins() {
   rm -rf $dir
 }
 
-function set_up_hugin() {
+function set_up_hugin-node() {
   mkdir -p $target_dir/etc/{hugin.often,hugin.hourly,hugin.daily,hugin.weekly,cron.d}
   mkdir -p $target_dir/usr/{bin,share/doc/hugin,share/hugin}
   mkdir -p $target_dir/var/lib/hugin
diff --git a/usr/share/escenic/package-scripts/debian/hugin/control b/usr/share/escenic/package-scripts/debian/hugin-node/control
similarity index 100%
rename from usr/share/escenic/package-scripts/debian/hugin/control
rename to usr/share/escenic/package-scripts/debian/hugin-node/control
diff --git a/usr/share/escenic/package-scripts/debian/hugin/postinst b/usr/share/escenic/package-scripts/debian/hugin-node/postinst
similarity index 100%
rename from usr/share/escenic/package-scripts/debian/hugin/postinst
rename to usr/share/escenic/package-scripts/debian/hugin-node/postinst

From 6328b6e315eb84b2edcaeeba6869115f9e8c69aa Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Fri, 9 Nov 2012 10:31:35 +0100
Subject: [PATCH 1617/2585] Renamed hugin .deb to hugin-node

---
 usr/share/escenic/package-scripts/debian/hugin-node/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/package-scripts/debian/hugin-node/control b/usr/share/escenic/package-scripts/debian/hugin-node/control
index d65dee6c..39379c1c 100644
--- a/usr/share/escenic/package-scripts/debian/hugin-node/control
+++ b/usr/share/escenic/package-scripts/debian/hugin-node/control
@@ -1,4 +1,4 @@
-Package: hugin
+Package: hugin-node
 Version: VERSION
 Depends: mercurial
 Section: base

From 45c40581111e9b71c648b9f8675a0e372f314d6f Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Fri, 9 Nov 2012 14:51:18 +0100
Subject: [PATCH 1618/2585] Added set -o pipefail to pipeline commands in order
 to ensure that we fail-fast to avoid checking in errors

---
 usr/share/hugin/publication-resources | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/hugin/publication-resources b/usr/share/hugin/publication-resources
index 7a156606..735a0a7a 100755
--- a/usr/share/hugin/publication-resources
+++ b/usr/share/hugin/publication-resources
@@ -31,13 +31,13 @@ pubs=( $trail_publication_domain_mapping_list )
 for pub in "${pubs[@]/\#*/}" ; do
   for resource in $xml_resources ; do
     name=${resource//[\/]/-}
-    echo "escenic-publication-${pub}$name" "curl -s http://localhost:8080/escenic-admin/publication-resources/$pub$resource | xmllint --encode UTF-8 --format -"
+    echo "escenic-publication-${pub}$name" "set -o pipefail; curl -s http://localhost:8080/escenic-admin/publication-resources/$pub$resource | xmllint --encode UTF-8 --format -"
   done
   for resource in $text_resources ; do
     name=${resource//[\/]/-}
     echo "escenic-publication-${pub}$name" "curl -s http://localhost:8080/escenic-admin/publication-resources/$pub$resource"
   done
-  echo "escenic-publication-${pub}-section-parameters" "curl -s http://localhost:8080/escenic-admin/section-parameters/$pub/ | grep -v ^# | sort -n"
+  echo "escenic-publication-${pub}-section-parameters" "set -o pipefail; curl -s http://localhost:8080/escenic-admin/section-parameters/$pub/ | grep -v ^# | sort -n"
 done
 
 

From 39f6307e5ea5c812f2b0dec7ee00ad006b14dce7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 9 Nov 2012 09:46:29 +0100
Subject: [PATCH 1619/2585] - moving the multimedia files to the ECE import
 spool before the   transformed XML in case ECE should pick up the XML
 instantly and   miss the pictures (this is perhaps just a theoretical
 problem, but   you never know).

---
 usr/bin/ece-import | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/bin/ece-import b/usr/bin/ece-import
index 496da8b1..3f41bf99 100755
--- a/usr/bin/ece-import
+++ b/usr/bin/ece-import
@@ -303,8 +303,8 @@ function import_raw_files() {
     if [ $(is_escenic_xml_ok $file) -eq 1 ]; then
       local dir=$escenic_spool_base_dir/$publication_name/$job_name/new
       log "Transformed XML is OK, moving transformed file to" $dir
-      run mv $file $dir
       move_any_multimedia_files_if_present $(dirname $file) $dir
+      run mv $file $dir
       dir=$raw_transformed_base_dir/$publication_name/$job_name/succeeded
       log "Transformed XML is OK, moving original raw XML to" $dir \
         "and gzip-ing it."

From b20277ea9419708a24585c88017e02e5c8688e39 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 9 Nov 2012 10:57:08 +0100
Subject: [PATCH 1620/2585] - added section on writing your own transformers -
 added the section on defining the import archive from the VOSA guide  
 chapter

---
 usr/share/doc/escenic/ece-import-guide.org | 102 ++++++++++++++++++++-
 1 file changed, 101 insertions(+), 1 deletion(-)

diff --git a/usr/share/doc/escenic/ece-import-guide.org b/usr/share/doc/escenic/ece-import-guide.org
index e7e4fac7..ea30cf1b 100644
--- a/usr/share/doc/escenic/ece-import-guide.org
+++ b/usr/share/doc/escenic/ece-import-guide.org
@@ -23,6 +23,9 @@ from the web site developers who've created the XSL files and so on.
 # ece-import --import-archive /tmp/import-archive.zip create
 #+END_SRC
 
+See [[Structure of an import archive]] for a detailed specification on how
+to create such an archive yourself.
+
 ** Without an import archive
 #+BEGIN_SRC text
 # ece-import \
@@ -72,9 +75,106 @@ $ ece-import \
 [ece-import-0] Importing raw XML #1: 21.xml ...
 [ece-import-0] Importing raw XML #2: 26.xml ...
 [ece-import-1] Importing raw XML #3: 24.xml ...
-[ece-import-4] Number of raw XML files proccessed: 3
+[ece-import-4] Number of raw XML files processed: 3
 [ece-import-4] Number of raw XML successes: 3
 [ece-import-4] Number of raw XML errors: 0
 [ece-import-4] Finished @ Mon Nov 5 09:36:37 UTC 2012, enjoy thyself!
 #+END_SRC
 
+* Structure of an import archive
+When creating a new import configuration for your project, the
+following directory structure is required:
+
+#+BEGIN_SRC text
+<publication>/<import name>
+<publication>/<import name>/transformers/<number>-<transformer task>.xsl
+<publication>/<import name>/cron.hourly/<cron job script>
+<publication>/<import name>/cron.every.five.minutes/<cron job script>
+#+END_SRC
+
+- publication name :: the name of the publication for which the import
+     job(s) are defined. You can have more than one publication in
+     each =zip= archive.
+- import job name :: lowercase with hyphens between words (if more
+     than one)
+- transformers :: directory with files prefixed with =<number>-=, indicating
+                  the order of transformation to apply to your import job. If
+                  this is a =xsl= file, the escenic importer will run
+                  =xsltproc= on the file, whereas =.sh= files will be
+                  run in a =bash= wrapper.
+
+                  Each of the transformers will be called with one
+                  argument, namely the input XML data. Each
+                  transformer is responsible to write changes back to
+                  the file.
+- cron.hourly :: scripts to be run every our. These will be put in
+                 =/etc/cron.hourly= on the import server. Be sure to
+                 set the execute bit on the file and note that as with
+                 all cron jobs, the file cannot have a file suffix.
+- cron.every.<number>.minutes :: scripts to run every =<number>= minutes.
+
+We're calling the import configuration =moo= since we're
+setting up an import feed from our imaginary content provider, "Moo
+Cool Videos" and our publication is the ubiquitous =mypub=.
+
+#+BEGIN_SRC text
+$ unzip -t my-great-import-archive.zip.zip
+mypub/moo/transformers/01-fix-encoding.sh
+mypub/moo/transformers/02-convert-all-cows-to-ducks.xsl
+mypub/moo/transformers/02-convert-duck-to-escenic-xml.xsl
+mypub/moo/cron.hourly/get-files-from-moo-ftp
+mypub/moo/cron.every.10.minutes/ask-for-public-ip
+otherpub/foo/transformers/01-convert-from-foo-to-escenic-xml.xsl
+#+END_SRC
+
+As you can guess from the file names, the
+=02-convert-all-cows-to-ducks.xsl= stylesheet will be first applied to
+the incoming data (normally XML) and the
+=02-convert-duck-to-escenic-xml.xsl= will be applied next before the
+resulting Escenic XML will be imported into the Escenic Content
+Engine.
+
+
+
+* Creating your own transformers
+You can write a transformer in either XSL, Perl, Python or BASH. You
+put it in =<publication>/<import name>/transformers/<number>-<transformer task>.<{xsl,pl,py,sh}>=
+and specify the order in which it should run by setting the =<number=
+before/after your other transformers (if any, many folks only have one
+transformer which is an XSL file).
+
+All transformers are run by the =ece-import= command and they get one
+argument, namely the raw XML file from the 3rd party system. All
+transformers work on the same XML file, so that changes done in
+e.g. =01-first.sh= are passed on to =02-second.pl=. Each transformer
+must read the file and write to the same file. That's the contract.
+
+Here's an example of a transformer that downloads all the pictures
+mentioned in the raw XML (=ece-import= will copy any multimedia files
+to the ECE import spool for you, so the transformer only needs to
+worry about downloading these to the directory of the incoming XML
+file: 
+
+#+BEGIN_SRC sh
+#! /usr/bin/env bash
+
+# Script which will download all thumbnails listed in the XML exported
+# from VMEO.
+#
+# It is normally called from ece-import, but can also be called
+# directly (when debugging).
+
+xpath_to_get_thumbnail_urls="/didl:DIDL/didl:Item/didl:Component/didl:Descriptor/didl:Statement/mpeg7:Mpeg7/mpeg7:Description/mpeg7:Summarization/mpeg7:Summary/mpeg7:VisualSummaryComponent/mpeg7:ImageLocator/mpeg7:MediaUri"
+
+# $1 is the raw XML
+cat "$1" | \
+  xml_grep --nowrap --cond $xpath_to_get_thumbnail_urls | \
+  sed 's/></>\n</g' | \
+  sed "s#.*>\(.*\)<.*#\1#g" | while read url; do
+  wget \
+    --quiet \
+    --continue \
+    --output-document $(dirname $1)/$(basename $url) \
+    $url;
+done
+#+END_SRC

From d573e699e573dab15b91946fe1f76c04ecab3c35 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 9 Nov 2012 14:59:12 +0100
Subject: [PATCH 1621/2585] - added "finished" statement at the end of _all_
 ece-import commands  (not only for command=import). - speling

---
 usr/bin/ece-import | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/bin/ece-import b/usr/bin/ece-import
index 3f41bf99..6e6114b1 100755
--- a/usr/bin/ece-import
+++ b/usr/bin/ece-import
@@ -374,11 +374,10 @@ function verify_import_job_configuration() {
 
 function print_report() {
   if [ $command -eq $COMMAND_IMPORT ]; then
-    print_and_log "Number of raw XML files proccessed:" $raw_file_count
+    print_and_log "Number of raw XML files processed:" $raw_file_count
     print_and_log "Number of raw XML successes:" \
       $(green $(( raw_file_count - import_error_count )))
     print_and_log "Number of raw XML errors:" $(red $import_error_count)
-    print_and_log "Finished @ $(date), enjoy thyself!"
   fi
 }
 
@@ -407,3 +406,4 @@ fi
 print_manual_steps
 print_report
 remove_pid
+print_and_log "Finished @ $(date), enjoy thyself!"

From 0dfb8bfad756a32c382430d64d7d99d616a63330 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 9 Nov 2012 15:14:31 +0100
Subject: [PATCH 1622/2585] - now prints out the publication_name and job_name
 when running any   kind of ece-import command. This is useful when reading
 the log   (which is naturally shared by all commands of ece-import).

- now removing the PID _after_ the final message has been issue , this
  ensues no n/a in the debug output.
---
 usr/bin/ece-import | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/usr/bin/ece-import b/usr/bin/ece-import
index 6e6114b1..c7e61ad7 100755
--- a/usr/bin/ece-import
+++ b/usr/bin/ece-import
@@ -288,8 +288,6 @@ function move_any_multimedia_files_if_present() {
 }
 
 function import_raw_files() {
-  print_and_log "Publication: $publication_name"
-  print_and_log "Import configuration: $job_name"
   raw_file_count=0
   for f in $(find $raw_spool_base_dir/$publication_name/$job_name -type f); do
     raw_file_count=$(( raw_file_count + 1 ))
@@ -370,6 +368,9 @@ function verify_import_job_configuration() {
       "$dir/, I'm assuming the incoming" \
       "data is already tranformed into Escenic Syndication XML"
   fi
+
+  print_and_log "Running import configuration" $job_name \
+    "for publication" $publication_name
 }
 
 function print_report() {
@@ -405,5 +406,5 @@ fi
 
 print_manual_steps
 print_report
-remove_pid
 print_and_log "Finished @ $(date), enjoy thyself!"
+remove_pid

From ab9a23dd12b0d5c7d728fa45710a52fc409abfdc Mon Sep 17 00:00:00 2001
From: root <root@local.test>
Date: Fri, 9 Nov 2012 15:19:39 +0100
Subject: [PATCH 1623/2585] vosa-handbook - added screenshot walkthrough of dev
 image import process

---
 .../vosa-handbook/development-process.org     |  34 +++++++++++++++---
 .../development-process/01-download-image.png | Bin 0 -> 36262 bytes
 .../development-process/02-import-image.png   | Bin 0 -> 64547 bytes
 .../03-agree-to-license.png                   | Bin 0 -> 28608 bytes
 .../04-wait-for-import.png                    | Bin 0 -> 32511 bytes
 .../05-adjust-settings.png                    | Bin 0 -> 122717 bytes
 .../development-process/06-apply-settings.png | Bin 0 -> 56117 bytes
 .../development-process/07-power-on.png       | Bin 0 -> 123440 bytes
 .../development-process/08-fetch-ip.png       | Bin 0 -> 41193 bytes
 9 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/graphics/development-process/01-download-image.png
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/graphics/development-process/02-import-image.png
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/graphics/development-process/03-agree-to-license.png
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/graphics/development-process/04-wait-for-import.png
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/graphics/development-process/05-adjust-settings.png
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/graphics/development-process/06-apply-settings.png
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/graphics/development-process/07-power-on.png
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/graphics/development-process/08-fetch-ip.png

diff --git a/usr/share/doc/vizrt/vosa-handbook/development-process.org b/usr/share/doc/vizrt/vosa-handbook/development-process.org
index 6fa27a86..a0273c34 100644
--- a/usr/share/doc/vizrt/vosa-handbook/development-process.org
+++ b/usr/share/doc/vizrt/vosa-handbook/development-process.org
@@ -1,3 +1,5 @@
+  in the VirtualBox Manager.
+the import process will start.
 * Development Process
 
 The development process consists of a chain of processes and applications
@@ -16,17 +18,37 @@ management.
 ** Development image
 
 The main environment for change is the local development environment 
-a.k.a. "dev image". 
+a.k.a. "dev image". The dev image is downloaded as a .ova file that 
+can be imported into VirtualBox or VMWare Player. It works under 
+Windows, OSX and Linux, and provides an Ubuntu image with Escenic 
+Content Engine already installed with a publication and an .ear 
+file from the project.
 
 *** Download
 
-Your dev image can be found here - [[<%= trail_dev_image_uri %>][Local development environment]].
+Your dev image can be downloaded here - [[<%= trail_dev_image_uri %>][Local development environment]].
 
 *** Setup
 
-After the .ova file has been downloaded it can be imported into VirtualBox or VMWare Player. It works under Windows, OSX and Linux, and provides an Ubuntu image with Escenic Content Engine already installed with a publication and an .ear file from the project.
+After you have downloaded the .ova file you can open the file in i.e. VirtualBox.
+[[./graphics/development-process/01-download-image.png]]
 
-Just by starting it up, you should be able to see its IP address when it boots. The image does not need a network connection or DHCP server in order to work, and the image is completely shielded from any network you’re connected to.
+VirtualBox will recognize the format and offer you a dialog for importing the image.
+[[./graphics/development-process/02-import-image.png]]
+
+After klicking "Import" you will be asked to agree to a license agreement and after clicking "Agree" the import process will start.
+[[./graphics/development-process/03-agree-to-license.png]]
+[[./graphics/development-process/04-wait-for-import.png]]
+
+When the import finished the VirtualBox Manager will open and your image will be visible in a list. It's now time to adjust your settings. Unless you have very specific changes you would like to perform for memory, number of CPUs etc... opening the settings dialog and then click "OK" is enough to finish the initial configuration.
+[[./graphics/development-process/05-adjust-settings.png]]
+[[./graphics/development-process/06-apply-settings.png]]
+
+The next step will be to start the image. This is done by selecting the image in the list and then click "Start" in the VirtualBox Manager.
+[[./graphics/development-process/07-power-on.png]]
+
+After the image has started up, you should be able to see its local IP address. This is the IP you need to add to the hosts file on your workstation/laptop.
+[[./graphics/development-process/08-fetch-ip.png]]
 
 *** What’s included
 
@@ -46,4 +68,6 @@ Just by starting it up, you should be able to see its IP address when it boots.
 
 /What are the important credentials?/
 
-Operating system: The usernames ubuntu (with sudo privileges), escenic (runs escenic).
\ No newline at end of file
+Operating system: The usernames ubuntu (with sudo privileges), escenic (runs escenic).
+
+
diff --git a/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/01-download-image.png b/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/01-download-image.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e183336e422e50d9ed6fb4504ccc4606fde986c
GIT binary patch
literal 36262
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
Uckq}U1pGU9+VB+dr2Xyx2lJwti~s-t

literal 0
HcmV?d00001

diff --git a/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/02-import-image.png b/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/02-import-image.png
new file mode 100644
index 0000000000000000000000000000000000000000..21d579a0edf0ca98126269fde26b7ce00d49bf97
GIT binary patch
literal 64547
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
R*&GY_QB%^qQ>X|F`9H$+bCdu8

literal 0
HcmV?d00001

diff --git a/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/03-agree-to-license.png b/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/03-agree-to-license.png
new file mode 100644
index 0000000000000000000000000000000000000000..bbc82aadad221ec76b265ca1e8310dda83ed2ac2
GIT binary patch
literal 28608
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%0AAz`<wtX
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

literal 0
HcmV?d00001

diff --git a/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/04-wait-for-import.png b/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/04-wait-for-import.png
new file mode 100644
index 0000000000000000000000000000000000000000..f931083083bc24ff87bbb7e86addfbb4d10df60c
GIT binary patch
literal 32511
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
BAr=4t

literal 0
HcmV?d00001

diff --git a/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/05-adjust-settings.png b/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/05-adjust-settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9cba452d25ccd83e24800d061685ffd4ea5542b
GIT binary patch
literal 122717
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

literal 0
HcmV?d00001

diff --git a/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/06-apply-settings.png b/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/06-apply-settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..eddfac143cedd9dd3e9b11db82025fe5310fb440
GIT binary patch
literal 56117
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

literal 0
HcmV?d00001

diff --git a/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/07-power-on.png b/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/07-power-on.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6660a50cc0d59bf0ba1cb345d57d361830463df
GIT binary patch
literal 123440
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%0DNu|oqofIpz?Qc)c&Kp?mkA^DI+gBX~!3h
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
T)tfB@ew{Wp`~8)X{jL84eAJ$y

literal 0
HcmV?d00001

diff --git a/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/08-fetch-ip.png b/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/08-fetch-ip.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b31c64e0c8c976f6d3d7d877a86a8e80c137e47
GIT binary patch
literal 41193
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

literal 0
HcmV?d00001


From 996fefabb3db71f9e6ba5226df4c97a4735705f4 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 9 Nov 2012 15:50:30 +0100
Subject: [PATCH 1624/2585] - too long output

---
 usr/bin/ece-import | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/bin/ece-import b/usr/bin/ece-import
index c7e61ad7..1afc6dad 100755
--- a/usr/bin/ece-import
+++ b/usr/bin/ece-import
@@ -369,7 +369,7 @@ function verify_import_job_configuration() {
       "data is already tranformed into Escenic Syndication XML"
   fi
 
-  print_and_log "Running import configuration" $job_name \
+  print_and_log "Running import" $job_name \
     "for publication" $publication_name
 }
 

From f5daa711d2814ebc1dae0fbdd8eb51c30a917278 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Fri, 9 Nov 2012 16:31:31 +0100
Subject: [PATCH 1625/2585] vosa-handbook - updated development-process chapter

---
 .../vosa-handbook/development-process.org     |  42 +++++++++++-------
 .../05-adjust-settings.png                    | Bin 122717 -> 55077 bytes
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/development-process.org b/usr/share/doc/vizrt/vosa-handbook/development-process.org
index a0273c34..38e96c12 100644
--- a/usr/share/doc/vizrt/vosa-handbook/development-process.org
+++ b/usr/share/doc/vizrt/vosa-handbook/development-process.org
@@ -24,33 +24,41 @@ Windows, OSX and Linux, and provides an Ubuntu image with Escenic
 Content Engine already installed with a publication and an .ear 
 file from the project.
 
-*** Download
+*** Download .ova file
 
 Your dev image can be downloaded here - [[<%= trail_dev_image_uri %>][Local development environment]].
 
-*** Setup
+*** Import .ova file into VirtualBox
 
-After you have downloaded the .ova file you can open the file in i.e. VirtualBox.
-[[./graphics/development-process/01-download-image.png]]
+1) After you have downloaded the .ova file you can open the file in i.e. VirtualBox.
 
-VirtualBox will recognize the format and offer you a dialog for importing the image.
-[[./graphics/development-process/02-import-image.png]]
+	[[./graphics/development-process/01-download-image.png]]
 
-After klicking "Import" you will be asked to agree to a license agreement and after clicking "Agree" the import process will start.
-[[./graphics/development-process/03-agree-to-license.png]]
-[[./graphics/development-process/04-wait-for-import.png]]
+2) VirtualBox will recognize the format and offer you a dialog for importing the image.
 
-When the import finished the VirtualBox Manager will open and your image will be visible in a list. It's now time to adjust your settings. Unless you have very specific changes you would like to perform for memory, number of CPUs etc... opening the settings dialog and then click "OK" is enough to finish the initial configuration.
-[[./graphics/development-process/05-adjust-settings.png]]
-[[./graphics/development-process/06-apply-settings.png]]
+	[[./graphics/development-process/02-import-image.png]]
 
-The next step will be to start the image. This is done by selecting the image in the list and then click "Start" in the VirtualBox Manager.
-[[./graphics/development-process/07-power-on.png]]
+3) After klicking "Import" you will be asked to agree to a license agreement and after clicking "Agree" the import process will start.
 
-After the image has started up, you should be able to see its local IP address. This is the IP you need to add to the hosts file on your workstation/laptop.
-[[./graphics/development-process/08-fetch-ip.png]]
+	[[./graphics/development-process/03-agree-to-license.png]]
+	
+	[[./graphics/development-process/04-wait-for-import.png]]
 
-*** What’s included
+4) When the import finished the VirtualBox Manager will open and your image will be visible in a list. It's now time to adjust your settings. Unless you have very specific changes you would like to perform for memory, number of CPUs etc... opening the settings dialog and then click "OK" is enough to finish the initial configuration.
+	
+	[[./graphics/development-process/05-adjust-settings.png]]
+
+	[[./graphics/development-process/06-apply-settings.png]]
+
+5) The next step will be to start the image. This is done by selecting the image in the list and then click "Start" in the VirtualBox Manager.
+
+	[[./graphics/development-process/07-power-on.png]]
+
+6) After the image has started up, you should be able to see its local IP address. This is the IP you need to add to the hosts file on your workstation/laptop.
+
+	[[./graphics/development-process/08-fetch-ip.png]]
+
+*** What's included
 
 - Ubuntu (actually, an Ubuntu Enterprise Cloud Image, modified to boot under almost any hypervisor.)
 - two virtual network cards, one for outbound NAT traffic and the other for inbound traffic.
diff --git a/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/05-adjust-settings.png b/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/05-adjust-settings.png
index b9cba452d25ccd83e24800d061685ffd4ea5542b..171e17c54d641513d61df9a5c7946518915e2127 100644
GIT binary patch
literal 55077
zcmZU4cRZVK+joE6s=Cx@(T&zhQ4~eD5~Ec_1ZfefMC=L@rKQ8FJ%W@PwQD72v^GIn
zYD9>gh)rT7gg5tnKkxfIpXdD}IX~x_>vNsgb)3iXJ;wLQr>91`0>{oD+qZ9@fZmgb
zCj0j7NA25p;Kk9yycMtk^$u_N$J0dj{=VWKaRzU4(D9z(y?y&iqxg4T9^%dU+@63v
z_w75;^smo9ZHVvoyhTB;M;2bs5e{B&UV6ax>3YCmuAZ+DUYC+BTpRc88^Gv2yl3ib
zvrvB|z-lJ`$MPOtYYdHX>5!_$)aVVl$Y`<lT@E_+<kG?YNy48QEv9xiRS&!T6cxKU
zboe;##!@{9?17)LF&mYy-i$=;(npj$9chscrt;mW<IBdquR2lK%~!11RQxT7X^k08
z4hqoX98Yj|tp+_dNK$ZCg(qIsZEzdTxY}0dfOT~Ju&zzU+xd;H2nUWf50ZAPm7&h6
z+`O^vEmXl?)RB142+B*8OTyw?YSiHawqF^oKhfNC)WGZ268)69Qi;FxjbUwW)$(|>
z)L`noG4cDv)a3wixYhhiam??b?2FQBG*51Q0l6_ozPFxq3Aq*m%6`RFB@^gh3aM3)
zV?bO;#iAc1)V#)8_~7t;?uZi%P07G6e|g05)|VaJ&T{4?h0Lttp6Hb1A6kZBNFuZI
zS#Uo?{`;00RCDj=p~Hc>H!y57l^HFayzah|DL4jQTr>ptd@!7v37^E1A3-FC9Ezwi
z9dKHH(Iie@smZwy<QmP8Ei`Mj3_{!ds54nh1T_!e;sy+t9qWM1;k%W*^Kg;_svTz=
z<f+$U1&1Ay&u$HCzZt&byiwn+gwzXB-F^k7&|NWQ6(%`yl+23<x(OS@e`g>qPDI=s
z+!f;jcd9e&ZL`G8;#(m0_fu5S?%D4v`TYD}LE?P<YuZ4Y8x<v>mdf1u=ka*JGhy$)
zQgh7TuSq}8MZNb83rstu8zy5P@HL{3)FwZY`nz>*&`!if-^uQnT1Qf2gwpWvjsPD#
z4z2Z?>X#c)p*o0|XED8%8i!LWjl?dvln=JM!J8bwvc|6-I3^H(C&QGQhmSjF^TAhG
zCg<+dU&|1XxgLG*P>a%UOG0I)h1gf@$s`)SpM$iW$Kov;DKd=2#39c7pi!8X?vD4u
z`r`0{-y)|7I-omWTPmtzOuo^i*gE8RQ9SY1vh<DRBOL8B;=t{Ik;X5pR^ySm_31jH
zs*z|htuYDGxTsWQwpys?e!JU{wm+@%Lv@Pc`P@o$TbqK@NL-kX>#pxP<p%atf@@tk
zl2dw&ZR3_|w>nNpx7H0vl@nHZ>>Vx_nkM?@cC`+F4@u7@HF$Y~x*V$EXIxmYIpBiL
zCI8SXpH894i%&rC-q7=8pzu$bX27F0gC&Etx|}nW7A-x)XPli27u|+!m%r_KFMQK>
z&|~-bLcU=KJt2i8D6DTDEZ!^3fSaiqn`>Q=`uP%mFYg%4MD}lqAVxMqYO=%j6;!%&
z!Y8@FWA>I%llo;ij;abd^e4+LVJz6>`<2^3$=~*FIr?8K&&kT#b-(|8`d-Nl=2ZT^
z8hCl<SIU~{{&(^UAsDlf;F#~wf^oxVrI`FP$-N0?`R!)<>78kPrVBYvM2IW4wwvIC
z=!=rY>7`fBxH4hC6MyQ-1ji;+$=@?D%`6it8v@u0*54&=toBz!-|1li(cUXkA6EKp
zw!&XN(1#ib?_W!NCc3{j@lqgx74i`aKq(^KrU444%=DlJm&Dm&{K=>biJww{SiKkd
zTMQ=IS$)5q((A$3Yu}Wdx#4<P*|R6wlC~r}w|oU_T&4kfJK~>=&#+6=S?nvzolq-I
z%p+~H@#on9spZR4^e5P>=!stK+m}#M*6#|DWlKl>Ex}PyAVZ$?f5TH3q7EDPET(YX
zl~$Ek4MnAAlCGmQ9DeCk%#CwzLY@^6w^jV7Mx*Sfv(BYVXeMQ^B<~9aj_t2U1v!)y
zR+I05+=TtRMe4F;-T()ezQ9Ux&l8G(eFJlgeDFl-Ae<PR66g=tQRt@|QU>NWUyu0A
z*;SfdE{uGV;wHrh%YRbi(o~i-LDn@s)dv&Oa`!3=wV~Zqcb;|N_ttp(d3@n6zr!)d
zxkYrsZ=t5Dvpq-c`Rszf+ghAzKdX_M)GHS|J4Sev?GZK&fmEC6yrFn)TT#4(`Yggm
zafS^g@P40MA&b5eW~KU>@9=#67jpcwuze^t=EuWBJ(jA7&W)TeasgyQh9i5Yqd~lJ
z27t;bdrT&1oYBcDA!GqmhzrenN!LuHC5}1l+=u-lo>5P}(*2@ZK53QTo+G{*<`^dK
zzM}M)4}29cCDJ7t0*j29xvX$%weXpD89MUGdxvPNU%;M?kT9%t(mxqL3}CNu0EM%^
z<V^0wP9J+TQ1tn@s|5|0Uuq!itL8ipbB=Aj3ESCE9yVR|4AJVVf?=`^b!^Z$z$IE_
z){$#t+Yc_OP!dz)4aIZ+cDanx3-k2H4n%29bxlC3(T+t~q|@5Dh4ZlDGxns1ZHaYh
zGR~T?5EYamelaFq?0(8<dautsY7{5)dxw(0Q)P2e#D&VVU$>}5tWDLIfM(nBDGIq!
z0|~iKMAn7{GixAm@ZmpZ37tLBZCSX74Msh0EjRu;Idx9l=oK|Dj)aN61Go6<kpc2;
zI{Bi)&dT@XhBITT9!V-v<shQNbqg7=Gu&lONrycj?(B#wSyy`g6%X|nRpNWWk0>h7
zt4G<hcyfy-OBGIS19RBNoeRwNgHranf<BGV9QMl}sOl2>X;D4Mp6I!R?g4=ClJ;Bs
z@s8Y3n>4jOFG(1EqxA-Q10=f!@;_YKu-n&sSB|=WQiOOsTb?PE;1>&gk9PVE*sN(B
z|BQvuyt7FN*JL%Gv9Ot)bw;fu-bIe#XIe<zoa+72gf202RRejp6l}+&8K7{oAHZx?
z*2{p|#M3MjkrK%zH7?7ap|8o>7E9eVT^OtUH_cj4mjvSG1j|uoamX|mXiT9rY-bWY
zY%mpH&jOn(TJ5;V1h*7z9|^~<7L;{SOtY5<8yfy3S5@5=@p@01;>S=DlNOou6?xWs
z5@5!%wX@7J;g9kkPkUoY(nHsH{q#Q7B@fyuVfe9I+cljy-DPMu?%6VSB%dk%GHQ@w
z?&wmRwhM;D=M?>=*cIuY_LdwHX+IcU_;^5BD%z;k<k26*<#SK)&5NI>t~e)HAD7jm
z3>~3)XuuqaGE#Br_>O@1d(O;Y!x^`9Ty?2~<SXcTL7g76QcS^pwGs<re-JIMY<-?B
zsp%DI??K7KFUBElFp#q6*<QI<gQeaogO=Tt-^v8K@(raOn2kemtI_G--#hFC+a@xY
zua8-)W+oB3AjXp*U4+j^=wb`$#(K^ZtUqKf^@kj7Gvw3#uXkp9mVv2Li7|^|-K+d0
zj=JYgz6|rQen=&0D<s~p0C4&q8>rI&NPD`)+%~;lhqN<#tm1-(;>?1cGJvULB2wsI
z;ZQfZcWW1jBYx)^Dm-uXeezFXqj;+xpVZPbinzWl%4M!nYO0BSfNjvT$Tzf2^+`uh
zi}K_#dVSl#AAeix1ou8IP&p92DeV~V`tp+=cC7Ic;vPe_+jP-g$>w5s5<PB6b<yPI
zExw~iv9NfT6X|>*@eX!n^iSzm@1;)*A*k|_n9V18Ef;Q7=3pHMH|Dq%X7+y;(0tuC
zS9hz<pdu>_mq8{|Io#gev!FkpS^h@EYhTm74oiB*Qxk?KJ<cWkvdS<yN7BzB-3?7>
z7wjBPmkaG`ViDPV<VT2Aqkwx+_@B~F6UI9yPlC=bo;(J<l;(6O2pLhTgwxslQx<pr
z4SyOAcu0l1uyKgv{gSMZ40SkD1tbn>dPjbfeXDGCEv*adaH42o-hpenQ(-v34!!|y
zuwclgPn64zRo!JO2WDKHf4ZBJ&tfC=+o6lo0A~i%u17HRM<Mi;&-K34A9p{g8Hn0~
zbpTU|S5Ui?Z>PhdDTnqacZMX>H(|1<gnP$GoRIEiPo>W<nXR`3X$lK&BFB?nw9q!$
z%+`wO3nZ#pLl;K<-MoTP`|SpRMe)fe(C=HY=pq4y&W>BIuF3ewY!b9Ewqjo!X@jhy
z&b(RAMy<A}rGMR?Omz4sa=RS#hJW<@Lyp4k;>Ge9LM7xxCr(Q`%P{eu-qN;H)suk5
z8MXozIFJ9(5$t^g*0(fe<fJGSVBWLdS%r2$R64B7eFGKBU-yH>`)7|hJG1OI;MhWP
zOorLqreMn6&eGz{089NoW{>+iFnqI(lTaK#x0#xtXQlO0pwqFGcTjhJbzS?y;r81A
zqgw@JVr<BFu17@5ak@LnDd38PJ0(h6>q_wtW6^;Zz9}d6Id_D42WKX&RD)8C>g3Z=
z#}#nkGKa+07XdvpG2XS6XN%#BuH6nb@YR&j$m1zz6;=+q6+7&szY6``%|SAEdp|)h
zl}{3_p0Z+ejAhZ@*HP%lxi=IRzW#-1PVhtjM!&4|ZDqf>EJ?k#3bgqnmU2VCXA71x
zCSoOU9(ViFj~`d-?_Ns~=<5;jG~aNL4V>`Yv05#_BJIfbTche2ustHy+%Y$9f%pBP
zq|3-^Wa6{GZ?d*|zH$3jNFseS9Qr~MQ4=BojsVT25{B}}rp*Sa&WAzFlr72PniDse
zhiC4{HBk>Lp}Q4oc2Z=r5ybSXW%QqlPU{@$wOQcB&TM=|ya@IDC2Rkvc>H#Fe3+}B
z%>|cj!W}keAGf6%lz`Bd1FH0ikXEW;R=HNrjUw%H>Sg$r_#c%rHqPswn|3NG#kXz5
z23~KAJ6*s&Q#x=a#a!xLO!Boj7^jkADr|PR$uj?%l!Kl`#)*pG26knlt(}9b9$v5X
zG+Zvgdh39oqoYU+8a&2MD!bk$&y`k#Oi$f%eEn87VmIK?n+xBHHX=z*;qolKB>rm1
z-mDwNV|hxc+XP^ZZ;NhtB=bQEJ#b8g>6i@_)WK{zf_3mCV(nY(Y#UjohUd&kwZ9o3
zG#=b=IG*4q!yNbnt+MC52B3K!ChxD<&H+hLgvzOqX}M=PaI0R#KQXu40HY&6s%|&q
z4}6OEt6#KIf<-Dh?%Zz%c!?#>=|NkOc3_v2CYlVQ70tV~+!C_({t320$hdKb@N>t&
zm~$V<qSkfUGl+Gkq$xr}dXQ>UFwGn9uGg@y4fBBkgV|+DY$bo@{u(`-wcI$iqy3OG
z38OwDs&#HiY}-?Nm8$b#BFIcTg!=lN^i0hM4WdAlPjoHhP2$)X<yok3p^uU@iJ)wj
zBX3EUA8@08WqWRjPn53}CAb^DrlHYAx10y$sA!#sw1S`H0mVv0`Sc;wlE_*aN?~)i
zVIGvSHB9`_zMNt$Tc5Zb>kc4S)?lT>Xgg?E=&*s|nSs2LnkX=hx&)lMGhe&$CY{N3
zSgX_SiGK)s&+T$tu`>fdh;8~EK0!Of@b*?_FXpzK*nYOSzb*n*o1B8|Kb|qz*x9uj
z;}LVJ_2BPjbS0~<Gksg=T)JEkXZ^Rxg8$%?D0cBFsrDBu&X^P9l~rBUvbBqfzv4$$
z=}$UuYlOjqVGCMDdKA}k244c#vm9-?+fPeCO--s1n@Pkib^bebTDz%i6cqppgxN=A
z11Qy+{a>061DFHRtmsAOR}5g+sTMr<yQOdp@LdLTJ7yyg*ih9(X#ybk@LAmLVA=a(
z_c?Ogp#IO)@qFqFhMJfEDMzuyEYyU{a^ug9OQqcHM%<AOn%0#?VTI%tz{_X4y;j{`
zl&bfM$UeEbqjB`u%@uxyR`+Ir%S+u$^B^w#O&O(u#BTaY-d3z4W!8>H>KN_b>B<)#
zzjcFAJ6={$5J$*6Bs;@Cfqn9)(?i{B<;!u*ZBRP8C~AZ}XN`PZ9=Lq6J5eY_(r+W}
zj{4p}vBwzE&VH><i7w(_S2*v$4sKM-sh575emr^F&@F4uEcq+8q{N&8n8zdG1!%9~
zg(Q|4*NVzrU+tN1xJB`=^Y?$*pp%~}V0La4FqJm%xm<445Q$e}aQ!#^;igK0A#Mp3
zdIS_O&vS1KWs`C#_$9cxv^9@g=*w15IM?;`{zlpRY@uS7H5>d%8R7mnj1vIp@u1&S
zxFFZi@9eCleslTerMFVS#RsJn%2q{kt_7Gf{KujR4jzxj`d33VdhYZvdOM^2;|cdM
zx}sLqi>RfN*<$^pv4q6Buadi!vH`1RRE?8n!~q|QlCuqY@U#w`Uu(6z<$`J(iL}vu
z)M2}>J5_?gRJz{bx%JwV)=i73KR=oHBg(XsR=@ru1%G0%OmYgO$p&_?Bw@RA{^euM
zLiPPaRqD6Z<ebpZ#!j0CD^cDQDTx@`AM~SsJT*SU3_g<T^I&{I&DBWgGi!S@+j=N^
zk%S&<?S3g+ae&`j2{9sW6`%H!xj3!Z^~2qB06hHjGxf)6{>CmU$fHg(@Froab*ur<
z=cCC`9g6H;E@;vTowtjGmNNmhGVfSLU$ESbXY3g)gvfGY+K(-zmHF@8V`$!icFN+2
z*A2s{Tdbq%Git`2gQV)`mOklHSDEJRN@-y;KrCb+0tjXI{z}nemfQNn(j2M`I0Fdz
zctYSSDUcHm-h@M$;nq1^U(XQ4gZmhH_`1rlQJ9YLq+M_np0uu>10FEU?h|Q;!+P7Q
z)0ODk#c_VN=WC<1RY~0gV1A;UM%h+xVb$@&Wgl*2GqTh_6Ikr~qQrv^X#(LuENs6n
zhE<7~k#|YHQKZEH-r#d=-z6tWbwZyRa8j&Qo*df`8xJN7`UY4rfTN+(E@mE24?hRV
z<sO5+0H*ysHftv1PuL-+J|u3CuLwy~a=Xh=Jv-WP+|MTAH(h@W#^kL3IQKekZ<8}m
z1geyjf4%x;k*M0|xM_!m_6w#*6D;+ivpL;nUCRYDzLUvn+udHh4_@ry3u&8@aQd0l
ztLBN!ZE-dcjfM`xtqN}~=oo)|YQg>?#cVADtUL6Khw_eYtWG@un0{;f=3(Q7qlN7!
z(yL<XHf`q`BbyiBye@Muk4-c5uhE~|>@A@QIKY$_#zb)Yq}fpm8awZ*6lO}u?1mcs
z6S;-dh?40v#S)8Mw@u<&?3mW&J?~wuH4DmSmRJ94Fy86I$ab#<o2?=--Oy93+fz@d
z+?gA|_0~9Mup~5e7Yv}e6$K5i;M!PNgn?Y)aj<swH~qW1=jh#2o*|@oW!=Kvo2J6w
z-PHGQ^%i)<Ct5>Zfbn<LhwQsV>Z`u6qc*civG;UmC$qb8eKC@M2u1;29H9s6m3!Aw
z=2a#Phy5R<K7I|{HsglYBtJq?Ee4)lEbmE?j-9Gs7~i?O;b#4GUp<LZ7iYTRQ@m}-
z_DxPyNu89xo0lp{f;bJaYfQD*$|78KO5$yRE=Dgtvg&X5S>ITUXu2M_i%n#Qx!3sp
z=&Fcsi*>0hjz1|3K38R-{k!XBxsP&;(%VOCK@ObaS<NTu{eyu%nR+kl7AX14cdHwf
zQ2Z`Bt&BB;AB8276EBVQhU&S=A~v6*`uPu0g;nyR&dnj9%9q{t3X1;>I!P5t`6d$%
zy-O|OYFkrt+oK6}RGG{M|3~RNX^@yDgrp6nw<S><aj{`YRiRYgYNSs?uD}-2+8<4*
zm`q%RGF7UeTb(_vnAHb6ucgrp<N2fHR!InhUp+^Ds<k_ayWQ*h&zYenKvgEbN7eO2
zD(6eUG^mk^Vq^h`5g5VFx}a~vwgt%Nk$WZ?E1e%!Q4?qA5r?AoIxRUd=8oH*q+n?u
z`{62euVROG?eL!6unsY`Blt<arBRSsvYP!^%ZofUuggZ2*Xr|?O8hOuBA)vut6fL$
zswymX&gUzYN1z@d%9-f(TAAz;H?ju1Tb@MZ!gb;<LfKWZ-L+dej<C+Ieve^qi5Z=q
zdLVjbUU&N2FQf+<4(RmMqG|MkzGGH%VhPpQY9^WHA0`>xOaEwnmy?p`wQk1H@0wf`
z0qq+tw6Z$;Zj=9Lsx+dM&S%ex!K#^0_S3!fYyIRyY|Ke}HjRslimc9#e;A(cNvE|M
z{<>gmv&V-<ew}4J=Ub(zS_-?Rf~elgsB{)%r(t}sm<47636jP8UW2O&O|p%3@N30<
z_*e%2lc)1Hs6HwfM|H3cW}B|Cvoh0@##HO2?VsCeIES4b$~)e(0&FNPvj3cBFeZcw
zgZV=05fp~Zjtn>Q3*%11p<>p$DWg0@Yt;oS>j`3kv++W{O0Uj*?>ms%X6f@gO=f)g
z*(`BF2xU&}yzg%#)WWy4$t}!eR)Wl3RsL8<*O?qz@jwxlLTV*TqA;kP?zTsz{dGNc
zgo<9e>yQh5{V;vK{}ZeK!6!BDXR6;Rf`)?QC3K}=!^+j+-i6Ubuh+Ub<~A=iLMXoV
ztN``yqE?@4))_pT6~468+P&KU^_;3}k5`ZLiz!-u53>6j3axs*G9any{;gW>wpHFo
z(sDtY5<*zkPhyq-W5DAeQWe{0JbdPL0+MUDVZsXtG+`}5xA0vUxPz*p@J-lDUEAbA
zEhB($nSMa6#AX2X>((Ljr)_1Zh&N)14s>f?g42t4>z88pp?Ej~K;Csl@5r;+{l@Ki
zAT23mIjAFV5SQ3yvm}oQxUIhnQVtrcTd{E>JH@cJ?&uV;z@Pp^YYVBW_0bc3Mh&o6
zJvAI%-(ea2_Dt2=!9sDuv4pH}o5E(X1}*gmv--wW2CcxlPuZisImYxIhBF7OrMnM)
z;l;RWEy8NcYSj~1ry=6T{yo%qDt5H;a<aB##>Y0P(mKp_)Qn7!YYr)1E7AFFlpgd|
z4hho-ng~np*~Bb3Ky_1A*xA<7O}TjWV70!EarQZ#z;E+gS5D&V{2z^70Wb1Vw`F{#
z-u8$$yk(IYvP}lZ4-B4<BREPWO@lope-m)Xw@bEPe3copH<7ikzfQLaNBNTP#}Zx~
zzPVDB+g89*PbLH@ktvO^pvBQQO4%jp%_TQnr-E7iMw~`9mtwZ6LJ#|!UgjzDIm6l?
zSA7j2yf}V8BxtDmd((XppQ?s0@3I?NYp2R2pCr)hbD)1u^W3*7Cm3cE8)lKG=BAA>
zr@V8CM0A*>$ps4QE@$gQC)stpx<qH5Y>;B13`K-E6e?a$kF@UnBysPhu{KuC>14x?
z5Q*d{CtyRSn!4=#!Wi8^`bU2|ju-j;Xc}|;Bc$_Yxk-jZFPhT%IG@=yuRj)Tr-xB)
zBi2fxm<|dF<t3=jjydbmNwexF^i4xdy@}DDoqzRq@|&4BsMd9zy3Fi5e~~pKBWr?e
z-xUM!S816lPtHg+6nE*Tb$f=SZd%`)?A<dypc-DvXMr5V_Bp~JC3Rx4+Mr2W$x#cO
z0+8WZ_Ti=E=oZ`+JRqncKX@2e`>B_n=m!;u^P0MnRMp-@+)!uk+Qd_FooZh?_+trC
z-tJ*K9{{*7O&!yRh}BDjq#LnxQ%+~9NfESnUCFQJ#kY#gAxQhP1sA`?LTZ0_n$8E(
zUd>P<Vf=oio&-x>v;C;!<+kI-oZ{${!cru9xj;r(YCrFlclD{V!-O-WC1kJTjJ28=
zJ<$sUJc$~aNnt>uuOUlI+Lq%2VsD|ko;v>ep#7LwmRP`=Ig&+6qbJItB<z#a+DPDE
z^YHme;Mg@tb4D4xgqr58Td7XLRkc<0dm{%)#|Jh;yOTGUoa-o6mr#|7+Sr#h5t!#j
z3*X<ttx^R($WMt3ZOXH)K=dlyxZcU0x*sw)_fPT*ZuHImMRuKc`RN}3^r{lVN?|A5
z)Jo>gD$rlM1Rz-a>I3{_jCZw~m!Rt#GeiWh7}=q%=q#2<*b>d*#TH&&Ha8)dnatE-
z#E4Z(osRUp$n6K}S>lMmw+BJ2!%<FQ@(WM!AD~w;6#A2~44Ev%#%IH|XL~o4a$iK(
z6=D<v>4}>i#w7u!$7qFL%8L<zu{+DI)hh{+YqMf~Gch{#a%%Y5D^1dXSV<Tqwc5hG
zli!tWJNXjUx;1AVcv&}(<xa~2Z}gO*IhFYDP2jhswjcF}Dm5B<tlyr7Ffc4+Kz1=6
z7N#)mc5z<elwNJp)gP9(RdsHf4|~(aYi35lO9=`_p$ayit??=WVM$x}1=N6!$uf{i
zF-Tr**XWtn(^|{SsDu_g-2FB$QOWh1Pk23AR`fZoeE)Dfft)bYS2piLsd)sflzLY@
zB1HVq0l_unoZQRbG;p(Sr+4%%Cx0z5|Kw>tg-e?V$3n`|CXQj`|E@&Eg~<<n1Y*nG
zY=il}Y12X&u1*6tnrisfQ^V7!OHWd$=xXZn8dU~0Khj0*lR+-|$Q@d%*jztFS3I<|
z$mF&aCd^EYvICav%=O+lMy5lS)(`z4^DB>dMrlnz@-dH%SCvqLX@)6U45of<Bn!!}
zzEjVcv%Rd_+NY7v91IXxqPze%X!ylG*nJHM%*&=WheHi^%eqfwr;UkN96wb<M%)#R
z>6ta`5I&^Jjc^Rx-wSFHFZH4`bL397udzPNB_IXqn`Vwvv@E$8i9VW~@KZhhV@PlG
zl5!W>Ks!giFX2wde(a@XCz_)}*TCUy0IwkW!p323M_Y{oA}S#|Co#N)McDWgj9S@K
z-MeZxe1^VxNV2}vbt>i=hbA&FMoKl|vAgMIFM3QET(*Techk6?RV_OsqDHtjsI^*p
zXLmr3%|Hf5_W}GYYBo}?9SR%JkOm9^EM;fN$>mFW;z2G@3w0Ca7a@vl56R!BRrYW{
zWynJ^mWcim*>D@rbZLc`8(a4g7wen1v&c;(|Fkiu1jQ=o*K%X1i%>Cs@v{x~s!tHx
z2koSa<QJB9rt_ya=z|_D>(?)S%TB5GRQkG64Jr2Cm|>P>mdd5a{$X<1wrv(UB&F{Y
z{wvj<OoN5+y`x0dA>hySzv{B?B2o%|yvU)u%lpej<aoCm9{NY!UloUjWI%9L=W6@;
z_yJbzwHYINU$=2w`Otp;cmm8>t3!;w+$OT)7hgx`OWR8tyB$SlB)sNoS0W{)KKC##
zrJrrx-uZl7|BE(gYh=-KL=KzQAx6nH1})PVbEEIs0lW7jU%T{(t8SKLL^=^u*9)eQ
zXzy#Ng)xvnBaFu*^vp&erc=MD=f7+%;b6EmvPe7K3iaMoNn*knI{m^+VH=van(GN(
zJ!wtky2x;VhV$;723GPn)98<%pu<9$WW>~@!ug|dNNzZGV=(?xGZV?}^^0f*P(n1Q
zstSy#SHub#P4_7W$4G~@-LN3V;||Ubh;=<fl98asJPF<<PQbc;i;nq1j$y64r`v^`
z?qz<`hWhp<5=I?=<`-efIbj~nz?8s-s|#eZNh{>FC0#pM<502*F8`r}{PlznwFYsJ
z^tr2`F|r=oZFq6bmtqXtDZC;t#4AisyGak`CivEy)%i?Yj!*Lk&L^CQce!{TI3Vwn
zuRC55IZZDb=(yN_JL4+)j4mf4!Old)#{e?)nAr2o<&!l0T53&n|6!t88g9Y?mi9;(
z%>=cXuew(!-s9Jal=prxGfwN=r7ztO8(xTu`1uUZh;#woZtOOquNbfVh+-aTN60Zn
z1lxY*UGOo$9K)91D1W0}qMT?<T2h(7Jg>73LDb3yT+SYyUbM{TX<k+qiF~oxRZ1y#
zu|RB<A38GOz@4+?*h*3jVAQ*<r0$LCe=)Lr^x9Uuo4bC!#+b}%#fN63EsvEQO&gft
zaTV0o7D5j#z-Dh`Fh6q7gZSZ7TakL;O^4WZqSQOFky^kgyDsRF21C`=hsX+A1@h7c
zb%<Ep#?}sDT5IQZSp=|ha~aq!8d@~FPU9Vd4fHqfyh?RaW6I{dx7ys`v<+Td^6o<u
zot3=8?p5=?SIxR$bxAN+F5Y$dL`-!UaVGQwH9<#bC7}ZOCS}Ce*zuh8kIvK0k6@HE
z=wuJMmU_@1x?@Y$4%`-AF0|gP_<UZxDdC!(nMAB`T%AkQ^MbYOm0y&Rf|1XNbJtat
zkE&4aXScTHR#PUowrOAom4U`cL;eLj$6%2Wrh?Vv9b~znVz9hhp{2n{Kv4O&KGVq<
z(vTtBGHL;mDZfarEnS8WZojW=ZZq1QJ(;rZ4?f&_fo}7`^Kr>%>Xmv_2HH!%M#ev3
z0z>B;lM^DGE5I>MyHHZE4lUe@teXjvgZ5rPRmKxS)5j9gQ#8MnG0+i&#}g<@51PU&
zK0gUomX^D8>?O}|nA>;2PXbj-5+yq;4t><YlR89^p3OY;?0*JD4_r@T0JWC?#SKmB
z|6yG@jW&Q(ZAl(`<jek@rY3UsSYYYh2qpA6b5>|1tQSoD)lX*h&;&+XC9k8+QgLUx
zwqV0m)pK(2JI^s`TZce)(uq^C<}8PLQl`FN(pLYk?U!(SQefd#)R7Yx4K3Oyi0OOo
zHh+YZ>&xy-^(aK|HaWI`QRJUaPV^%#MtMccy1tf;s$@vA!v=sE`jhvCv}3imXO_aS
zpB~<CC5_>Y%b)Lx>(Irij|Xhq(%FvVe&A{ouBhKM_~rw;J<UrqPR4S@VC2UXDYe==
z2&a$N{iHJLHKcmM2X{rUFCZD17*Woh+rj-+l^c+=u;ownpHB;{wb0SnAKz<A@aif`
zwt%_7{IGW+-?0EwK8OXcXUDW)hB)=h!@FFkol?%F|E8A@-u%-S#a|&b=LvB@*mU@G
zFTvla+Ts?da@`BbE9zx*m-f2;(}X;nVHhq>4l1xQ3&ht0AIQ(WT2TU=({VIzYwaCz
zf%furUI1p7{O#>l3(ieXWArkT64l&am#n%ikj^><SZ$5k>Wov=w-o)7y6R~jS_9Sr
zUCO8KyFH35>Djmh?iLFRdoUb<u}jXXvXbI?sS2%+3O??%2=b(8V90ma&g(l30LAA?
zWpAJ#+iPd2e@nZnZcA62Vq;c4+W@y9Vk2IfFcn0ASmF=vcG*Qh;4|IH4Ndbofw3y}
z>Mmy<*cBkt+>eQP;s1(lP34#BL(5hUHK?+QgPz_xVk){C1Wi+odL5I;GbLZZvTDwc
z-7vc*qf7eO*yumUBLQfigx5Fca|^C>4Ka3NYTHb%O9(>1a_!TZO0I^K{jdJQo?Y)C
zdBff`kQk-5NBAMH3uGv@WQtt%wSt^?8rOM?-OQ&uQYRc&nN)G;J^YjOtI{aG-~^j?
zVGZ!j5@d{h=2>SMAb*_$SP2i0s$@q#4Y?Ixz?P(p<hY+1pv^6QGRzek`WyViJPR*f
zv1Lb}Wm+(?&gp2^U^QbP-iN|#pOQhkVycJXMn1-mN?y#E(^E(9EEkU6AmXkag9?yF
zyDJi*Q^}M;Uu86}5T=PVz-OwhC*fF`rzowGa#JGhXUr<eCFL<{xD++*Hh{WaoU6*K
z$<y#v6GW$aNszj2X|=5r$*-tQsJ>&;kxr0W9-|{pW@ek%#pVShp_0|YN)2Su40BkU
z2>pFYr%}qc<fr*1S0I>63)B%pmb}$urj6RvOu}RneX~W?bp!9N__CjHJKH5tEb;Bv
zT7I`PAe**8+MMeg(6AhBl!Ms2tkwsLUol&+Z|sG0!l2nCrCWq8^)<Q!`pmR(h<%7d
ze4#p7C$I<GP#GrA`Tm$+>xk;pxx$XkCjD;-&-k5hfK_#e&R`_CLI}o;d^)@@#=h{*
zT%z6qm_9KFDG&ae8lDVzeK|Pc3QX!@X-;t56{yTpnI~vvr_cBz4%=MlI}4tGMhv`$
z7bxMA3vf?t3;vcIfM=sG^g0xdTrmP7>$I@jH5-41kHh=c35R5N95V4O#0B`DuJq5;
zUj5Ox<P>gZk(crKcj*aYRi+w`P9S$JuP()+g%DE-+RY`d%{-QsXgfulOE?^>=5j)_
z=qj$N33D~!3QCV(Gd1KNJxaA{u2m8e4fQtv80yG1;e~Oyqt7x{iFE@f9sN%MV&hUD
z9UHxHjk5XiyuDlbXq7scGYO{L;+2#(mw@Tmb5~F=%WSscR+BI`ua18i-J^1_8GyWy
z1G~%Za+%|$ql~lO%45|7y`bk4o)>b@rQUar+(Bkn-W?!y)~jA5(p;-!*SY=4DgPXQ
z@>ORKFiI}$z~`nnoKMBl(nj+!oZ(i2YXRr@poMC;IZ6W(dXQe$0?b$<7oq!hXSt2E
z3Nn1D4)^s(b@nsJlP|-Q$+-8&G0zjcAO^#!3*b8Sb4Ax)GRti|y~0hJyB^97?YBKE
zc&$62du7;*D~f=KyXWT%C0VdNvQ5m!D>~mNlt62Xu4EYYmE_8o<H&H}b4WUmncZoV
zMExC1a)2jqD;nz<_0s}Oe_=AaPiq-(7_g+|iru8DH3diCA@VD&N+DB)P?ao&0zN7q
z{h<_M>RDR>a{fnG*jB#{ulHazM{c40)<wCnvKO;d)XTOCvr>1@Sw*;>XLImO<Frsc
zInK8)9$C<E+HFf*2P$`FV~H8LFAO_yT8`NYVma{q$oB5j?tXG4OR{?z*h95Er;$);
zs2sW~2+FsNkQnizSPz{heE&A5gxHvhx1>g-O<)vdG04;r7vCW#iQVnRj%Xd}KK%0d
zpYx9F00!`E!`q#_qYA8)tAR2%jhIp^n&7*}2j3|rm38(#RQw$rrMEMZ4zOl|KIWjq
zJCXyfokT<r!sKma4BM+1cCp#rN?!+pXP&-6Cj(r~L%kqBx)_fAy|BLEN#QOB@MEG9
z^qwM9QVv>fRVpk90R6P}un(U86y5PGT|a3oXO7MoKFdw-O9-uy^rOUdE2$5tGU$2m
z7^<pMDejS20lBV?Y?sz{gfK9eT5-G7(6rQ(;y|A|=>Onv)GyfPC(jfYQsEpH4~cEd
ziVG-5Jujhg&$}!WG|o1(D(M#IL3JOvj)+^*1Y9=6h&;#3GWVRKO{?2>P^#@MFMUy;
zN~}r)dW-m617ZW0=I@RMUkgA(>jGZ&Chng7C<j_|aDNEt7gMWcZYxE==4ceEqJL?T
z)yTJv5v`s5OyxAeo0Hwx#B(EPX<r4zXauOA&gAHBw2<f#jt+|)L1lCvneamZXH4@^
zNM}jprLoit0_xQvzY4Jl;k@>vp9sZ&{#FOdXi5eB>ewNi(tu68U_Sb@EgE1jN#FI%
z*`AdbUeW)$Yxgef=t51trNNhOE1YljUt#|5&B!Yvq`GQmkI8$58{0JfR0z(?(!{6e
zMTkRB#SDZw-5sqejfubJB=hn)uW^;@SKbM(GaMjI-OmZ;d4yNR;vslGzuG?G5d5m&
zwl9W0UJ=2d1V<?KAUKDWdwOomjeLQXM<@wG7OGh#X8zXn`H+q33s}2tS@pmOwpd1u
zW<Le$XqQGaN{tLeo#7FhXN**`N`4XRyelI3$%J9Y?U8T8F~Z&lH`ah7tu1Avt2&`O
z*iS<jJowrw$elKC#>xyZT#amMRybC(4dAp#hzt4071xf)Tl;dW0YLP4=`DGM%d2tP
z4F^-I4;n9gM97F+bYp%5LOD$2C~9H^X~)N}S%!={3Q1e6Z#&ecjGUs4Ylpk9dTuU<
zMSXi?sk<h680W#~uoJ^$&a~l@84sZ?r{Sf?;V+sNf4E>h3vIkNR`|&cq(sl$u6dV{
z)R(CyIEworZWeHi`p)|@>Yr66&TkdistUbH9WhziFK^hI0y=XdA(Y!?u_3DtH+spT
z#bNE_Z%pM3p4maW{0VB<`l;k*!~QFL@O``q_tE}e>Ik%tLPmJLty-UD%x_8i=~TAE
zKN)=_R5Jguv{*Rvp+Y*C|1|#KGs-nVl>@4mtMj%DR#Nz)DOT!XVbAC29Wn7c>!R_6
z7SEAlQx)rZZ~`^q?_<WG>*1fO@<m4F0!HvNUO%c4Mym};^$iwj4OaDLuc-i;H|f0&
z^{yo?*H(DS%?!1UXqYQM^)n}l!K9bnS~s9{5O)76AyNb|+}rt6-RM642ffeW$vo1*
zKHOHfGDLjctlj`xx^?ct-ZzQ<_<;Qn`zJ*RAD}h7z8QlUz7U7H{rrc^C?Y*FLSTZ9
zsi$0QHh@QBePx*`hN|%BON^F?1e?iARLs{x!$Fl<B*Est-&l?2%o={p#?~9&?-pY<
z8%Q0jMXgf`C^7tUVrSZs^I2xI^A`LBsxWsLA%K$DUC-LC0++~Ra87Oi@HvaUSrEy+
zG4+D-6`Je3ME<#?=!J&lV%t(APKpeLYoHINri+&KZ`?I-!2xW|imV#2rP*W$Y20W;
zd3S_sYg#d5_dU$XGH=n^A}nF8u7~<%*K^KW65e9xFP8xNGvGolsXKp<l0W#g4PK-T
z_0{}}@AJUit0^`9TwYOnQAc)!yk{C1x+A=Y)NhbXWZFbCP?x-PKaAG&HMx!o12O4a
zal<|gcwUk3l)?>am9m{|@Ag^vlR=-^%}IDAn&5|0!DvZsh%e1=4GJ~5;-i)Z99)@r
zRZmgPZOUP4Y(A6lrQ6s1ja=I1-@lt)bkrT#@xBOXihEya*DW71PmFCcPN~7A&+Faw
zB?`9uU7PCLG<xyU4><-8wHGMR6#Of_cmF8fJ$~vy^S*x%hIbC9p!Na-rMA}}Mo#zF
zCV-VEG~MsNx_RmF$A4_!ivD}}`l;>iW5)L67GK7%|62O@5R@ZvK#_p~)jblq?(zw?
zvtuy!s|h+wuDd1r|2E+5^E=M&k^;)FIYpvebxcqP%GtPZJD*?cf9-Lj?X4{8L!^46
zh!m=J<HG6l$N&2Q-ip2&R{U}WRlEiF#u=4{h{sb-I=pI{8F1*%0)I_ouPNoFZq}rd
z7sQ=(NEZ;Bt2!iBfC`uJMglKzvYx6Az<wLF=yU!)$r0p$`<zR<r+Td+s$J#P#_-~Z
zHiuny(CP61+U>m5;rrR7X3|EkGJ}%k?`1X`+95CVe354A-Qcnm%kWl0jiDlxNylo1
zx6?m4<;)vwo)>WECUZce&O}-Y@0NxoVQsKo^8dJ{!eJ%-v9%Zp6K}CggKC<<^kmb1
zZdtW)&R_=%wW(6vuqvm%UftO2yu0G#<TJGhwsNc)eD!gj^tWNo2BJEc+KqbcXMIP3
zNjee!;^BV|@3))cmk`#XX;6N?fN8P@Bpbli{zZvhQqFsqdS3R(n8Ij5z^*~ba^P5?
z0MA|Y+(**9Y6;EGvuL}o*HBYG?_ONoU0t@`%g}1r96C8QxcC`1?r*eLzpa%U!&nEP
zb-3vIjar#qhK;6u`2FpqMNzkg{6O>Z0~i0J6+y8g2hL?99x;saYLahX>tWOq617@|
zKAS(!=U6oi&ikk@vKx<=L^IBxfqwgNEX`kFILGTtpV9IqJHcY<t$<(ia&hJ|0eOQ{
z>wl0JHd8Qp78`Cu*EXMnzdzI{N!vhsk1jvlU1i6=+<8|b;jxIm7y)tFDVrdnl=cdL
z9)0{@`YR3imux%Bta-A%uJ&F0j;0D5{flw{Ypjy|Bqk1X*ugi#VDQD5v7bPE;;P@G
z7UH#(8cUx;SkD`j2x^h0u4@kZd|(+cJUuS<vE+RPdOUBrH3$}KVg`){PbR)ewN~A!
zHl|^PM1Ot!k1>o-xA2SsVn%@EyS}qx5P<~f%EnJRQbMBCPiKnh;5V9YgUGm3AUW!&
z(>th9|INV7Ms`%ice8Td*dN}3GU&sPJDajo`WGQ)o21}CbFM!6!c=DC&NFKpSyDWk
z&iDA{mH!yucdTgpb<`tgA7DTH%MLiZq*DL+BsUl@9at>+S47ysmugS~>7Qq8YWpZ7
zR|om5-l3MmBbEMeXh)+1x%}Dd=UxsbjI`x*gzeqWa3sV^Tx@DTZ~JC$-D_PfS-S1M
z*QN9PX7K6%;KAL|e;K)~O|35Py(Ad^u9j>6+G^C%QdeEeVzM6T7CPAOC9uJrp0~J0
zN^}1ZAX>XSzPadc^9j7nq$>vxA~wSkv3oo2L!P<wkTsRmaP)Rz8FKM2dWTIbw}T<@
z%l`uxs!tub(W?g9oGqs<_kn8A*x#8yUwj|=zAdT^JrzRe)kWug`VRnQiX7nURl|Sp
zJx%z^ibo7dn^lhMiT@%gYZVtaV3#x+T}$Q%wUbGSh7IMlgba^ZeJF-u7WKx5)Z+Q`
z(|-<)2Outrr+7TlmPt0EyOn!CZ2tie$0q5*|K5oggsr~^m~jSNH7@;+r~Ma-RoGp6
z$gx^w(pg26fV=+-y`0+ao@W#se=>G2Ui*I`SEu5aXPj0eg|q)_eOU1+&wvwY@|MT;
zF75m0=-qw$PrcoDFhx5kych30sPO+|Eh8K80mHC+i`m$xj1Ir}-#Bh@{5^2&wRL+C
z>vEkv^1tN91GGzywwIo9OgCtL0*tAW{kuxn{vWCbjeH8KVjX%<YCg#zrro0*NhtmA
zAOFdUs_^c~DndS(5{US}5`1#;z>|x;A6TdVukUESd(ifhDTnq7`KBEI#g5*SW+DP_
zi<IbLx{MJXEO_qC*Z3~gpij^_IK-RcLG3Xdyr6FZCm$~~`~e=Z$62qzFAptM)X<)T
zNFXry1|!9NY$@WNb^Qg>b2S~J+xx5kaZ$>LO|nSuOK`m+XY1e;(>tcDfkN`7ivc&m
zGBUXKobC;xjbx|by;@_t*q<t}mbC#xkRDzPEsKEeL6GzmU^Yb}Fs^qpzRYRLPj~0M
z-ETzSywab7p)#-x-n6~-bA(BCW!ayOv9%c@Y`DTn>BY~tajM8QdvJ|c-e=s#p;hNN
z_W@Bmtn=%XhWDastr4QHszjfB(S~llmPNI+IA{AueJTUbxK8C9BbUJnywJ{tJET$1
znQ~IDzFvo=?v8nhOyZlGh(zysRSl(A9z(z1EfaHKtHI~mcifxoxkmt>#Ho_f8?J)t
zPcI8D*O^F#&jDH<5m|m}>d6i7+pzZc$Tf!N@>hyvAUAXnn}XH!BF$`jcxj;mR1zbj
zrgDC@e1ZD$^wq4wLW4a~i>UxPdHMdT>+af6oJ;cYi`sV*4!O)Gjjx|y5;!{WL+W2T
z@O8rWk`(IRM8PN4p^zH@M26McY(O<*B0~wqxst2|BUtTv1+j(z9%SpLtV<0~Lr>iJ
z!n`OdtyAxx--T^x>^PXRrDEDjvT>XrkT3HFW}ofp^1S9c)#`0hiu~qD`MQ(_bKbSk
z@|^jI^MHTI8n4!zsRyM;vpv`B4UwhK*NTSf^o}{s=)qbX$W<?km_wm+4_1z}yeE|f
z5I-k&CX>=-VoyXQ=ydJ88yQ(ToLp<4Aa}!Z`Xknw*|Gai!T0Z9NZQ*58;ca_BPYb&
zhIhH!X(fwO14R(n%J{FyeZwf@!=%{mkAsLRwR;v#DLf_4JaeEjLHo^8JSM}F-T+TL
zsgrU|BF826ndT#fYX2;&062nS<I$yFu|!aeU&D+Mr0EqYl3FJ|TdlMzF({6~a$w8p
zCs?hhcr>><a9!~fVTIhbiA6tIE52h!-60B?RQTn^#lJRp={t;Eu5Pm@#XRzBkwI@;
z&bQ^2W%UWJ?V#}O;pYUiD(thL&!L!|VX(%TT>UY%;ew+HPmthf2URh1)1BjEy_qc@
zJ{aY!g}c!%rq33=CY{)0?m98f>Gk>!a!FDf+}N~LWg12e;gf|}rq)MJFH-9%H>Og?
z;pEJjJwuHB_|Kp+zxCHbs}XU&^RH~+s2#c0)Sa?_8~9g7^WCCs(qaFFDrE0k-sRp+
zLE^A{VlHGeF-o}L52JyhN%-=CxzV05b)~Jco9t;-ELIMrT__t#ZWpQ_1QwWIB);8^
z&GsDp<FVOvz$`!Ew&Y8}cFs{L;tJSlV^n%6v21YZcfpV>rS-%YpTt!82isnWgUdC~
z{A|2x#7FDzO%GwNK(MFOIq3`OtNC>tCIYxk*}Hatx-63hxc%Tnp>>`F<q8tNcfSVb
zX9^quX4QFlzk}_h9+HwVAp#RR$$(Ua_-(ZgK6M$QQTP{E>GZfGQFr8WPv`)P12`VZ
zgiFT4B{se$Er9E&1hVp~@<e$|312!NwvwkN#Lq&q_D!JzJS+nNmJh72QX4&0)1c^Z
zAv>WK(eHu`%pGLV9o8>P#vRy)k)42`)Hj2^=SqKdFG%QQ^i8s+T)7_E=KA=HLgWl+
ziTb57Hh(lEXDI<Oa?`5kwK7Nn<8~Ll@-)bx-^0x*FTt|D3u=8Lyx}~a-t?w31%KhM
z>>qx2mS@94zrolS=aPZrWA~#4{eDS*W?i``3?4MGf9J5hv3Z8f%yZe@xqQyO3Fcv6
zOEvy%c61$0(T)M*10hs&SxBK3;rESoj_lj{HBM8y^F;pr>gjc+JtaflPfObLN230O
z2r7HKG{IwP0ywjDAgVp@D*7@=%QIxU8#5i}2M=oNupndPPzf{T9>uUdp5f4+qytc@
z_$Y&mh^}=mvxzBa$8&q9;zd8|jV+ih<&W~xgI%loA5jSzr7h=yiNeH1fI&PeUwqEJ
z%yh;zLW*<3$pH~deUS;u!VA5E<VRM%D0y;mJvN@>K3y!R^z@=dW|Tj)f$+U$U-C_K
zf}CZYzN*W}g8g=WP3Rn&R7~!~FQ+n<)y-edKq`B$V)K4$m0)|A2i+okval(0#5u31
z&xL3!9qn(=w^{QMDQr!p`wcqa>GAn1n(OY5e6~Hy97kq)X^nmM#XW4<K9@0J1g~~k
zqDa}Mh-=p_CnbNIR?|{Qcp$xTW3R~s9f0e)JpiO?uLWBL&R(hZSO!cFXhpRfho;Me
zDmg`GyRdWiJE|_!OOSelm$(uzWxIMuts@tUp0j7W2pSUCk{99=6N#Ml`LyND`9WSY
zhclESLmeh4L`5Ou5As|5I|(|~E&4s0MFzM!?}`&9Cq1fndk9L-wXq|fyAoy-l>Cme
zEAfODj(bkdw$%3#fdM4?V&01P==GSAO(+3k?-8OAkKUv0aM#)})P#(8(jA$PWF;~x
zT%gvU$9#l7cGp<gIZ!Pa?zEHr2J2Uh!q4UfJSq1Z-oQNr_IoU)v^`AFl9HzBd@TxT
zzt8n^m#s99uM;BWXTLuDW9LS+qz|Rr!?(4vm-AuohE`2wVx3-7R-t`-`O_@zz#lHh
z<?KKNf`PU;^+As>SGsI*$g<noHCi2dJT6@~J=XsORd#T(+CqVXPO!pr(d^an@|n-M
z3b8xv=eCn{q8-YnU~i;H#rfP|7OArqO(RYBn6F$x{Rz1G`s2`)%13!#GV#&x_}?d-
z<HIqMExi-#&(?hBGd$Yt-p$N?kZ%8JV#r`Lq{#$`nQgc%wqAiNo6fc(8#hajjZtI*
zN=k%~-wd+Wk45(ssBGs74Jhj_#UXZ(A5;A)xxG6Xr0h}IrZhQQ>(5xdw$OEF`<c&=
z)_%<c+J8C+E_QXqrpfp}+H^KwJ{@1BJF`{cJTuh3+%a))@0xDt4wP-%r9)iJ(@7BY
zEEc*Ea94A{MDX34`K%UbyGVIS+#q@fvG(@?Paja!IPjqwf$kKOHxC>USLagDtQn2b
zDf#E1d`j8Su~Aj6^!Pp~H^W5(cNaKY0NeU=VQoAEGrf_fMvQ<2N{YA+RHKC6wC|lz
zhoHB+5Z4e(S$?FgLnUKMKIWb4*(5B<F}c3dc~IZoz4R)|e6G>}8~^5AvbO&nunx7t
znN!|8^-<zKg1q(w8}G}dVcVlm{LXw-Ff&{$-F|Si(KSuqCc7hDW9)Q%eYcEX!TMC=
z+ZBN|rGUs4r*)QO+Of^l;vioG*+P`*ZbIJK$X=7>BPnd>2D53+=aEG9K+XtQ)OLHz
z%zVIbpli&bMc8WE@ciYH^xXq#Uf;`)N4@UwVW-J>zaf_L(K|EHfwCWtp!JLlbRe3U
zwzruE>WVW&k1NZFhrGXk*;5aA1cXx4_x7gSr*%4-bhx2)yTemTw!e>*xpdqi7fRX_
zWd@{vrV16+bgU^^XO+H~2}s5VM0VL|C=WO&q$>=p9m{S1*}=`Cd@c59dal-vzram7
zD?Xbc$#hzyPHe2TX(e{bV~XQx^JqzWi4IVK;`=RCY4&*aWHOW(r!IJ=84zo4o~uLn
z3TF5;zUPZvARn_9RB!k{RK0gtQ&|@;JYyY2#!&=B1QZ0MMo~aOf(?+aA|M3FC<IhW
zMtVsZMMOn<iPTsqQX^ejGKc~pKoo?~LZpTOA&>-82;?4}dGGzczj(rPo@AeM_Fj9f
z^((t&@#+T@t=_k4u*m>N2C;Nqt3L_ysb~>@wU55Fm)6wMx4?b2!M2I{Hzj^m(s3c7
zfV`up8jeNinJY4@ulN%?_T(LD7@J#hwQ|YXLksC$NpQ-Ne`P;N(nB;IUe~9x`yR6*
zdsj^Bt`y>~&5Z0+X4ZyM#xj`)A|2@K$mzrfY|n<*dckvde9zEFt+9Jvg7!LxdEiFy
z`#l47q_M5@+Ed9$g<3>3_NY8B*oeyzr@WoUzctu+dh~E~o<CZA$>{84xLe;~>aqxW
zuXD@VdzoCjRK`;hJ1G0%QXe&oEl204k~Pxe7Q=MQa;HZ%wG2%-!uu*G)An|fKC|*v
zWW&xiyH(gsB5$Z6y|-2m^heRQ2U*RI1bGpqgQCBx26-~%*rZTO7jJjICIPi@Bdb)7
zU|uHkjd9crz4z~D`4yi$>h5RkJ9749{Q-_T7BSVsICJ`JNlii)6P&qPV@sn0y>xG3
z`HWw2Sh;&+zu+!(gY6<;X}7jJb8!wM`CmP1=XK0n=u=Vp#UE<Ev_yTcKG77KW8VbD
z5ejT(zjkh19c#<U(|OTwFASbhzf%*j)2&jWjP3K0_qyoUfZu6;*^_=shrrUUarCF-
zXFO&q5h-N-X^N#12j>7vZr)-);WEy+v5TaKo^f5xWcu>eSmV)UAp#DofCKNt@W`7$
z2*3<wIVE`ys01N|*x74h0_N>oe33FQ{e__2aJCYQg1ET{HJ#_D!Mh*DiR~P--9|m4
zQhbDc6g?c+haJ8)o#f4XFF!M=gtRgCi~@3<IGcj8?G40_kvscR0`xt;+zw_|vetJ;
zBA;aDdx^i5huX+AC}d6tT{9c7ON3$OJI=i!ojAMLWD(yS410sn-R{6mHryYUTxKY~
z)Taq{tn@&njMwlnK@;o&r!ABgO-Xb{u$G27@e~?B=L<TEvvNmJ2sPjOUu%#7a$u=*
z8y|ehipAr8Z+u<B%~UYYg(V{+W1Q5mF+6SeyPb^P@62G5@HnbPFv#sq>O5fbBL%4Y
zQSC^9Errgd+yEM=7gB4h;UJVd3UU8hOg_;#mxy9_Jg(3@nyu})-}TM9p<OK8_8R|e
zJFiq7L3VutukzvF<SX8oY=%G4LNG&lX_3u0e-HKe++ZwAB<rFbJQr88da`P+(4#6=
z6YrH#ttY?%*i4<){B)`2A>y;m#nAm=X*_6dA$IZkcz@>%zW~}jxrMGMvkuG@B;~6a
zLL-`5xa{rhFpBSND{qt(LpX1vNi#8*jh=5IIPvZqJKD7DbRm7M62F0cS7K1;MA@3k
zOfL>DV`n(R930J(G_4M3bX=&g`qSxd(HA{LfI8#Of$6eK4W8`6tGl{yFtlPdLn75D
z(kInDQzq2&(+m^M)B*?*7u*z^A&SOfnDOu##YP9&pz-=mw?+ijHE6DSVCGw-Z?}?9
zt~##=?4o<?uP35AvxRKxuVNJfN_fNfL1*gVa+t2ZG~rJxN_FUZ-JTrS+S1z$I5Uj2
zH4;!SSCbKD$6q?{X*NJ9c2Kh9+b%6VsPCqLN2>zVUew1aO?AqL*`X>U_C2@^^aQUb
zJbcL&d^EI)C6B5(2oXdHlzVl-RmBMZ<XR>~4c4R|?;KWmBNkqzj(9ux%SK5{E3Pc4
zIeX=v70;a74TL2tX|U;QJH=e)URvu;W!_?^C3g|C7TvzKr4j<cjJf0`<LWfiO%z2p
z_e!|TBi`@r<$q8e%|4r!wBOB4t+|*0|9p27{i@k69=2>9@@wb847^4$N%k$FK!47p
zfa)Oj@QkR8<uXPtb|i>w)f^6MBh4Zlqr}VTkf}F;U#kUHdE5D~a$gE$1$RCQnue#9
zX21CMhOBmC^!@nB+L7yog5X6<@4g=5kG0b{m(bKbT!5o`d)So=S}LlqWRm`rZVl7p
z&u6gP+8k$kH_ehU>-owRVPahE_^M+ge5@qM@-t|rBY{q;ThvX~>IS99+w@_e+9o!A
zFN2@tW&*u?1UoCJy`W~MujR~a%SbWN$OiQ71x+J}5iDyo<x*|oApP}Vgk9x`qSutq
z4PQvr@H2Te|Ml%YN&%lMVGH0bfF5z;_cUY3Ker3r$KHG{=<{A~-)|P8hYCZJxFf-?
zHT3tL8?(@69MyBcZ}x%yM&u*;@t?ityHTf;Pa^YIV5#^>Ks>e9u!b@0WPrSM=%W*e
zMJK+`yI&If_tEJ2E1_S#N6Xxd^e6pV-D4eO1J0KQ^KJRdYmZqEv)rZzaY_S^$0V|u
z@~`CDsx*;Fr6Ocu`+Y$#Hp=Q^+og<OwbDjc{q<w~Rfm=xz{i?7Au+J#skch=C$99q
z3g|cGTZfiqe%3@r7T<4NS6btk6fp0JRXvOwQoptfyQX4m@+2|EjE_m4E@F2japUq=
z%H=bU$bL^)QAP%H=vr-&VIo&SZk^mjB_XTliQ;68q9EQj>+H9zX_vIc^+Md5w})!E
z`B<pi`#j{E;>zv-U8SXs(iZ$Qyr8$9kYTAMwqG9St2UyjW+XTT<pIE#nW8r{yMyKy
zl!*68Xk{}fqBPf79Abo=V+2`D$gyiyeY-Qf$m!AQdB<gY&)f8Q233k!kCjMCN*hXY
z#;{ju%o=U4P}~S;F;T(9Sq9{Jlr)nyob@uRWhB_`37Hl$0(QGcS%ym(`uF7%^G!Rt
z2?hi*wC6Ujj?9c?v)SJKmC34}SK`sZR-a{P4Oaa_+t0?>!y?)34;T`^L7n=2r(muP
z8OB)Ftjn%0R-pU|R`0L|B(&5uHZwG?Y$cSkkCvl}P-xwU-9wYoMAYAHKLE~a_mu<s
zNQz(e;GKm{P;BLn<#J}U=}>n#dhoI$@?Fk8#q+K{WY0IM|AYecZ_}^<-iZuT`innW
zKTJ!7I^cDU3mte=$ok{V`)Cd5i%kd>KBr6c+d@WeZH*NiLzgR7_~h)sr8Hn8uXIl|
zIG(RnM1Bv*_*~Ea%nzP@)wlgTm}yH55NdkVBWkQ^cGU}2=#=&SlmxD+5kt}Ae)aXe
zvyO71A}a>!dpP@J-<jDI9p5fyPG7oNrI`n+W-g@h{mfaxXHDsr*<vCYldoy!!4DSP
zn=A<$9UqvfbuA{!ozWf$uXjHykPTwh2G4Z6X8zi80dFQeB-n!DwV2HfnZHVzRa9|D
z<o_n-!GzjUzRGm?*E`idy(jt}_t7@TyIY-0JwE*Pdb#&Qm+P0?t`|4(RGJ>zd8^Ln
z(p{)Sp0QK04EJll_^9P!rcnyMh&R^`+Sl>oM~?RJNy0;ZE;s|6L!uj^?V;?yhe0lB
zco^w<o*;}jL2=CA3Te$$3{{t+1{RK~NjHRQJ^<2&VmZ98=_JRd2}qBB^bP`TfP}4(
zvoTuAU30m<R3Krt#Yk!F7j<A}nc=&-o*oeNF^(=8`j<LIHdNoKc_Au~YeCIMvWEug
z)=9L@8y4fJ!lSei%kY$;a*yjKMyGksYyY6XNH@_i(~J4Z4!UOMqap#Xe<NYNe|5;r
zdg3yr<m7!#&ZiwII%I|?az8QUA~Z#60HwRpxoHK)^9eId8~kycCtosh@{JO4w+A%Y
zbwK^whnD7&J86ypaU@DYXF2c&Ge<*WMveM(7U%tOm5_P>DvH?$UWc<sQdmUGICA=O
zoNijfe$n-&C4!@8c?%@pGa7TgL@N;v35|1qCE?JQy(!TcA{6xBnTur?Hxg2VT|_tV
zhI5AmeLA%C-JZhu5W$jD*4b$Hif%v;;T)u&Qe!U5p_9X_qtqU$`48E0m%w4o#N6K5
z8gqHzf(3nz+KrqUX=!Pr-kCnU;l2J7jKMODZSJ}2bG<qA@lNQMwj9fLeB?j!6F&i-
zvlWN0Y9XC^88vBo1`7x7ZEiSZL_@O{f1_FG5EH*RM3rz`Ut87IH%(T95J~e4pZz^S
zFcvsq|E|X@IcYp5vt+5Fe;>erJVzZZtgBq#oJ(k*snFdHb3?t}>Ia3})8E+{bS8S%
zy!|TEgFU_-9PKc{7`0d?02Vl4XNS>qrIwW$gf}p1@t}LCO=d~cORvJr2chkA9#U)C
zRNZhAJ~Ha&*aJIQ{+I33>p+KgC}?E{N@_!)aY?PNbKn(80jH3Db<vlVshgLdv4th5
zr*-a6RdqX3FWsUqXnTKfag8PNM2&FHGHwlD%FhWyms3py(9ff$j$)hTd^WPtw>xQe
zxx}|?(-D+zw%^z$ABu>1Vf4)=3eMEvVJ0*%pjKN{!*`edOAWb=_u4Xo+Db_?&2RDQ
zH2kc55WIP;z>5{8cOL#;TgOe?*|}1~FFF@CVcQ|2ed`!<V?A`H=S1HQvR<SbeEq9;
z-yGf5;>)rZ&#<wkbJSAGk}!g_<NH@)nF2#Veov1^H8!XrB5envYVNcg2K|Hr@5^rg
zl`(dd#D--L_<jjE-B}l&m_lrtaxSJZ)Q-EUI;m??bXZaExTYmp&7Gl%`7r*aSO@bJ
zxlNROD>R(i0ehMG*lehO*(6&BVLpa-Fx91dj#(DXN|){^AN03psx59rb1M4N&dv2@
zE2nixrh}DQUi+?~9Bk^EPILMkoMuAWK5fgR8PeS|2=R4@F{{`wGAP^rqB2|jVeRV6
zEJto~;1mLLRDM%MhlRSFDC4d|7R~te*E5m*&7E3$VV{capTIv?Uve!|59UX&IT_wE
zEaN6*8@YRKa;5K$%-(KXEF7DyukW4BG-&W^wi~OkZ?0fg1aUZq-2tF+WtVZDykHc%
zWhZ1Ul@z~vktwU?)(!2hOq<iH%-oF;IR|<mD%@*@6gIVr7OaQBuSn*UJ}M0sh&T~t
z(G_hQ8>${sCO`>#2#^wg^nF9e4b?>=GG}v4qw7^r>ve>8?J{A*^f0tpJ6!?`+pPn+
zTZZ-vt~g&G20ykE^Dh!)r@rf80U6qulfdoGuDhv-j(Rm7MWY9;DQur9wJhrPEwn7S
z`Wcttv+Qq^*%|sfb`Mk{kKpTyzxBi+7MHP?79T}$IonRLOY_}a`;>Ubf|ZUY+)GFB
zvK?kx<iY6>mf&iK!%Joly$n$4UCTx|-OUOQh<uiQ2$%ddCdwwM2A~jJZnEL_Ro<^K
zhLRIqw7%KBl)XCy&k7uGap!eGa9OPtP4ixP`E|`x4?L=(;}NF?2aSw{yMz4aX~eG@
znC@URQFhB#_jKRKBy$NLV^wNzj)5_qHFVa`N9!)roocQn0qY)rre}=)u+POvz9?Qt
z<O3Z$-*O=G@=OIPZ`QJc0E*ox?ymNVjcT%j+^d@f1;Izw*ej)evx(A%M34<ig?4>%
zV_Aom8h!JiPP+@{BV7#O4&=E-*ADWhKHB4v$9;MTwO9i~c*hGl`}Mx=wy+#i!17_{
zi!9hAqn*6s`fS*ms1GCM+#HBZyHkEx>*p$1P}{Xl!pOh`Qg;GAGKCF4BD!1b<v;x1
zwZ>pp57zBYMR^s77I-Y;-QFRcer@V6c>{({q*_+V7wYNWj2}4w4=6jF_+ah93Xc#)
zT4%Q0(RVz;oheTv76$N^ab{VQ6))GmFm#-g)eSFzbLRHaWf1{6&6{z$S6uN|jq^5w
zjp`wwDgGaMZ+S2FdT4nhL^mGI;li7)bIhaa110ik#bb?k@2!1mY33Sul$b2<GtFm;
z8CfmRRF%sF?cHWTOXkX!p*ML&Yo_Fkeafm==>AsoVA%AN&}yfeYjusD&CXh@m17_5
z$&|sMyNy0w)_@t}^VHeu@~gbl+E5*-P~8bKR8&<Cet)e#fB0DY{_xbkXvLIH3QajF
zgQ^{Vh^j`=7AGL0zlAGIa?T*?-NIK(W2;eVKE3BJR`lxcR`PQ_r$ulJBUeXeuI3m8
z7dZ~q?aQb7jF?Ip0R;Am@y6i1F<YT_4j{D)Fn>?&3<S34NJK|*Wn~7vWRonj@AlOn
z^oR@7i4U(ZAca%DI`18@y=3da`ofN;Q2CGvr;?tm<||JmNoi(grWXw*hq{aF<(iPB
z^Lf*}65%(bCZe?#F?K!eUYM{05;alTOI>`YWXEsvv*OwHvL*YOo^FiXe+B|YR~xJa
z-(2fVf`^pz8l1{GZT|h@qV&bzn(O@oAp}%KNaGU1=z}xp(pmjR7ulfle(4sD_?;43
zLk~i#pWgD^$-<s}8~(7~W-UEY>0EK>QAM_R=5e6Eb}(Ama<{lnainOh_66Ue;(?ha
zBq~=Kw6%33%g_*d=2;mxn>tupcduh~)S~xD;1{~hUHKssD7`mFn@)%<@;9o!NKs{_
z8FiXvpyI~5Z6Hdi>INe7<&%WVsK#|Y!O$?A6rPQCbgOMN_Y}OV*q8qeItR+rg87kh
z>A2p|qUds+p_3p`_#DmEf-G};hE6wO`^cF}wLW^ZEz2MvoAVXFPHLI%NJvvOjp}-L
z{cSD_;`3#0!_}4Y@>}N`JGU<0h2NI+GXd+6-)@x!^bQ&X5=Q-!`5+W*)^E-BTM7G1
z9IQWJ^0>eTV;(fo>NqnU+Uecmv-O1Wm=M`?x%<z};Ryrikol46kYD|wq-6%3GRI6o
z6JRa5l?D;S9?(oQk8Z^akDCVxBG;4=VN}0vQo%q5rfYpq6SMn($Ajw9oWL*RmwvY+
z*!xh|6pT(S2W6Zyxx@4ex<zWRv_M?`9l2#_oW!C;ogbrC(>d|5EfwFcDphp9Ha5Sl
zjI&X&<mS4`7iSo_KubA)SdzM>ZEo6YUv@<U=<W9pa&KoveZJl6Z{@k?4DxaW=1Poa
zmVRW|hDs2r!(`@T0;UVtDJ}6FI=tI7ai#TGjM{qIM;K?p3DDvI@dns%QT60}*v8W0
zD{j`|>~U8goG&?FFN%BjF;3Cz9e6s84$vEr!yhw&2YLVC_CzkzB;=+~>AX=u?8bwE
zb!6XZe<#xtY=B^X`dQFs1#&heQ;B$n9D;#DN315?L#}2r6uV-=vB{mX3Yn+f))gwV
zS|`TryAo>lTPc~=dDW_ophm)D+`~pVY>bH~#t)8y=(a2%8DE17d>+=8mtAtD$mQA9
z+g-hvqV0ChGQV-jePn%Wu*n7LH)1kn9l5+)tk#QOlZfQ{(o%kP5nW5{3)HoYV-%4#
zvx%#FplPP<x|nb@JE?!FR-6gZ1=~z)j!<Ui-<X6j*lSTsqh?*EvUwV<X3OPeVR2oh
z88(Y21~AXWZoO`mx*n?71g463L&Sp#CSO-ydeX(Qgb=Y|RBc)R#xCLtl4sFSF!tpm
z#$E&#&Z}68{3r4=!tF$eAA#jJCHQ^)NXO~ZpZ;woPX4H@)ewWp;FtwWq+NeULXPhC
z-S)|Gih>LIIZYnmffo}ybvn8<WWz8n)`aA3rkhKNd&Xu=it)#N8?@5bHIcqyZn`?l
zD90xJpo1Y-LCdS-&|Lu>@AJ^v1V(LAJO{`HG;L&h(^`mc3)VmmX|M)y@p+_>S1>5m
zU`4l2THN|OU=|O>sz(dO7wv6D&yOxqZDqr9kH_a5c?5prgpbt`pycTQRZv}%gK?ff
zGAo)Y&WO`BwV8-ojFc;Y)b(J`^d7L0>S@An&CnsZ;N6%CPfY=*$a;e}*1aDquH0uL
z$_+6=5zbe!ZkXPihOntQ1Rb4_SQhah{uO@&j6{`CK9LRF>Nf?p{H5uar@ijTfwi_f
z_Rsb<<IztdP<MV5O#n>(fWe6+Z@jcCA|D%ZZ)USYn<}0JkgMG3e4U}lTW@D56_~EV
zhW+WgmFAUomLo6g2I|{*4o0Gisb{Y$wuto`XXotM(;MnU@wlmzaqD{4J_Td*8q?Um
z;NkON5_@p=JpTLNqwdYAZ!&J2gEzg9r$UX#!<!LbHl+pSyd1qd*FagP0+U<TyYi};
zF{F^S<+Z5M4%Mb0o@Z7VC49CDf=l%@g$`{XPk33Pb+Oz9We_#GjQe#TEqTk-+ox@Z
zI;r8JO><~o;XVoLoOs_6{7w>`6rsZbivzU;s6}|!E7K$*QxH|OY)5;bhfo0DSHG+#
zdG~#4V3X3T_cvHG05}vJu2aL?+F+R|rNx3Y&62rkQ1H*9<d5xZ(m!~QRc|gm(t$97
z=Q2w86_5r`2gt2rEq#*rRDluupY6y32iDjA#kU9gn|W6oD?Z1u2Rbp`raBWD;Z2f%
z1)>)#E(Uc%!Rf~@7oCeYuszB&(vH4McE$GBUX;C<o;ja|bDOJ+l^sw^N*_6+W(383
z$!JB=BJGA+MVIs1!{6rK3W*84z~3#$E5=!G6tgl?nsi7aBSE&#w~V6f!5kyx8xCI(
zEWz!nhZ$pV%cOp%oqs>0WrzA5U6nUPrnj(fn+Vo}#j0jVz9su+aolVjm<j8eNdqBn
z%b7uHzcz=%JwBWn9*G#4W4o4M_9?-m*4BzTIR_y>dcuQ;uc{!8i{X$tBP8*Q=(B>k
zIn3C_uQ0Hx>Vo<tIa~&|Pw`E>sp4`)JXo#!Y05xtxgkZcwPX~ZC;iWsCRKQ-b!M^d
z1#MJ+)_#cWR+8yWsi=GVvHJvk>aWPn9&x5FT~yo>HAgAn$cfdM+(l1QW9y3(hh1BP
zvVv*V{dY8U-6m_<)d#6>W@gH@*FM81*_V3x_nw9PWf-}^F`U_aP4)JkxMum=VsJ)a
zDEe>hY2QN6u{g3!@IHBio~&u#vhaX>rLvGn$I3w42k1Lbe(qPLUdOD227dMM8e3>3
z4B{XZ>0GYf{BS!aucpb<+M1N7<56DW?pmIelhGvIc|-lJ%Pqj^t5=K%lJa)nq~7(=
zg$0zFl6)x0C{2H3K2ymCCa8|pGeti_Oz=DyLv<A`1G76B8xLgVOxR~!Z=EAGI;>Rn
zO|MmjhI;5nDvsd`ZDT`;rJwb@E<Uu)H@#RSd*9*)p?-|Hp&vORjC#SG^c`yinvV6c
z@i3l09t%RK=lCMma_FHo{Qn4RU*4Zi)+>fT*^AXT8*oYcwF)|<_SYf>{#SMeiUibO
zM33v&O9Ja#hJK8j+HiXFQMe7k+`fb|H*c4J>XU1V33BwDX>)kdA)M!=f9DM;gSE}W
zQq7@mp1On6wCAMfxk>AxUQ%Fe%rk62y}zrO)CH5bl)y5${dsgd{_Fp0_gv8r*Z^4W
zvD{e6a?m6EcYQUYM6;(9p$;&Ujzp_P4wZ}iX1{kN50bd;)85BhGa2}V$qhSZl>GKH
zm6J1shkCnS{9r4eEj;{NdieB5-zk>?cA(?Jc}n+wt^db<yP~>ls-K<_YRA8SrWmC8
zeO?`Y@V|u${P~i8=bsFG3?M7^kOCJZ9SgL+*i&~9_rD7+%mMrcEGYUa)aULFXBDqn
z#N&{KvzIb!l+$;f`o9;A9)6k;UOeWkGZCgU*vIX?tL|&y2cRlB2hhixnLS~8)81{o
z%91QkOx<HYiRPl2MM)I0dSeO-Zvqc;h4+OYj+seSI#(1py;{>;DR}?dyZp5$-TSj1
zjs!aWvwnE`(D*5kvjU?2ousvNNjMh&y|lX)>tNXCr`t<D?>K75b51aBs7qr!bSiK)
zb;%nSOWm8${!2%GZE+6!$+_l<rzLwW|Jz~`t|bBLCygv+)D3YTw4HV{aIf)ihh?F2
zkQLj8wam)*uY~~Y%x_lv1_$bb0-VH0KkoiFu6={-`&3Al!ZS1xL!}_3W(4*u#s}}d
zGxj5xrx)0Zkh2k>f(4)C<{44!SaGBsdNuo4VPxWazXzTJy}vcNwrxFwnz5g1y`Ru;
z@KYqfIS$)W<rm+gXi^glX5R}_92(L)W9WfR#UYzcwD=r^^F|Zw7N+lqc-;OtOOxSG
zR8Qtjjr{ZS#GDQ8&nMT+PfwyMjEO6-Zc23iWUKbuVH>uN{rSchfa~uRQQo4p_4c=u
z7KitD{Dfm4S{&HErz{+>PRJ?v(^az2VfUI;#$L<EcWz)#XdQ3JDL4zS%(`Uxin|q>
ze7tt?uM@h*+cC>-k0|n~C0yKyRL9HttQlj<ee&Yk*fx{Ntp@_pm5ur50ljV!*h`hB
zK+^V99U8r2>=$8bZ+5B1UoBYE_o9FUvr|f=kv;`v?PH}MS9wXZaa-$7+T(dXdcOP4
zlAj(@Kd~gcLpiBzgnVlJy9H32sGr%jZG#&Clmmg8I0HcMeI6C2{qomfaQG}eZ7y)n
zP|ESNgHmV3UIAB5xJDraHeGDNh_S<`Qccz_Ro#;XS%Ez7FD!VTWbHHeYj@i#O^p^0
zJ9k$ku`AobR>EA|cGsrb>X&LUvd)+6bv4o$mqiN;rZM#6nLp^DmR`qh2m26eAzBQ_
zYxZ-Md4|Qfy;XlL^PXWxINeQ}XRB=8@-6~}sFRg_KmjOo)y5F}wRgu*g=lAWrbZz<
zxiLdh19^Pb!zE%n8&j#hgb9hc^OU=~%iWi?(_3y~DaoPZG1lhJE8^!1-I+S|PumON
z?e(qwE#{;p<8<Xi`7@6*z%du!B-MOY0v6A5OCL8(6Op|Zud}P<-UU@(2`TIDhkE|~
zb-8l6yXU=krd9ua@AIj9Ddxwv505YAn7Dk+sOr^n=`O0SUK$osUe-H!Mj8s-T04z6
z8{0Ssq-2J6Y}|4j(qPM+Y~3}3qpZL@(G}%>!E2Ygo2|&RJ*=92p7VYYoK0?%7q9G|
zQiS{3odcdLKk3%5tU4}y%*AiZ8}R)I*e5t1*yBS;C6!hkyqBu2>f3Yw=*?&Ghwj8%
zE(!WQ<4u&ldUQ=%-(6ZPh&_7x!CvcE(4aL^>93Ospg$g9DUVt6Noeh6efjKGk<-`W
z?{y1xopW2R(3@{!;;*H;II8m+M_vD(*(rTHtLfGgGSHh$1O084RA&?==({7yLK*YO
zu5w2+rE3K!BCqU0OY&yP`iJ%=EBxe{K2f>U_OFQ#Kj}cuPm(CoX{aJNz-GHtrWS**
zf8Ges7!Rup(7OLJNQB+8TCerj$Z;<J`%Kl3srO$rTa(%Tx-2{fQhy9FvIk20$3WL0
z90z~$ih9dU6N*?XOXLgK4Xov680TZ`n!)f3SeVxy^>hERerN9N`&0m*d%o8+<#JBI
zShatRk8s^6SQu0_kWlCVR5Y??8xd2iEqmK7O&{_TQ#AAcLl@5beBsZv%01B74;*1K
z{>dNhGyc$PTT7fx3N%Ty+V1IVwj_CApk>#{fuAAq2z*~b3K-IAQ-nLdExfat)nVO2
z?5CrVD{N9>kSGErQ2G0R5&D<Y*QO6&O$8g0Fb+kyjthRu&+AhS^Hz4k4FzMyfBhNb
z39%EldmUjxBVR~*{lH5<T?qL>Fz^Q}%~GF8K4mJQUS@Cw+ambm!7$R(16@l0zo8GE
z{%%D(oz?i}M$&CBdm2$FadONb`;1lvN5nLuM9IFJmr>PsvMB+>W{Q)N@H@wl`w*LE
zXwA14r|r5^@SAZrh0e}RW#M_YP=r0L_TIo_XYsyFf+)y&1n(v0C+Xqf(2mC+{x1c)
z`o%*WifI`%H$un+s%-OY*GJsmYYeShuY-l$lLmlC&PJj~?9i!wnp@L^(nEyHXz_mb
zmWsn^#ZM>xw=-T#ILv1ga+PxoT)KH;`q4&So3AoSR~K1U-^I;X_C&TB0Y#C>@7T6@
z8K*qvMql`qq4ImL;wNGM(a{?(ekb4~O9u`}5lE=u)}FlPQ-;RQy`BKe2s%~QDl~`!
zCJ}P*gxgp%G}vx%inoS~e|eO>|0j?A*e?&uf8+PdhOWk2(aHxQ-gBBBJ+DW=fCW~h
zq1K!6lEB|i_-<@%vCNlpJvZhRM%18!y;ClRwUIJEsqjyKdH9NJ?kc*|Zy3GioK>hg
zA=mVrV%;KN&kRqztuhdP5OqWZyn=}j50-b%%sx|zeoC`C{D<eke_8Z;54{=jrTm?G
zNQnMGgVPzLaf8EW_;gqSt6=8`EOUcD{mJJ2SlVX?^8BpQj{k0$vFEWBZFRa6wkb?V
z$)1)abEN}<3*betjhmume41!F&3-QRGw7w{c_OBVbopPx{t*@6rvTMd*wV|RV8ktJ
z($EzPkvqc#Ve3=I?bW@(7|>(wlLqYkPd}*$w|fdzQ9P<E`E!s*<bhk<8O!?T;r42P
zmEqbL6nf$lNDUeM+)h|eEFT=ZDXcH$D*R~=^@<<;zBW9h17v+>ok=gCUWz)E|9*$P
z@~=?g$H#DheP12A=uAEAWz`oCJwM>vU;NRx-!OR4VC1G915y{1(E@ZqA{%@CBuAI@
znRO}xkgX_{{;S2oeR)rQ`S}1o?EysEstABrJS0FahKlimME>joA)*L(x4Ea^V4%PO
zFmuTOr{MrR6cE27m72vG8ZXaYd5)n|KG@})8c*r%+Om-`BZ-cqQY3d9|Nc|cP_n~T
zC^AAg_v>hC9x!Y7O~s4{W!(PL9;=1a@8!BaA&Y%4KqDr1HZqEGPMDdQg>CqI<bJ91
zbLlK%0tZtRYWZFba9gPh4t-U+gn33QX&U<gT`(6Z%k2s|^7AQv1cp8GMiR>3Vqgg%
zEXv@jb~|s81W&&HR^4Ko$E%iR4^lH=0613rHY!+%Sk+52n3Om0e|bn&)<o(Ala{J#
z^UW%o=ztau+_LzB!L#3t+^8|IR5I+;P<L6R4a@Y^o%K6i@3x;L>|5Iu-IlHPb1CJA
zvhvqdgDwA6ZCt24c#0vh7pu^|UNfMZkP*V<oD>1me*BF>Q}X4{WUbYqn?i$t(GzH1
zI9gpw&GzYPO^;`eL4fzvr)Sy8#`@;Mq4b^%eN|3>eO)03<`Mb2Tt_S91kQUT#I^3v
z=jAWYwB56_6L!>Jo4m;=m!R85RGwO`892}1{jYB1>8W4Sz*-Cd$~Ft<EtrjKw#Ox<
zq^2IMBEL;$atc@yS&nb|U0PI}rz%Rgc37~-7FjGX3tDcZcL$SA)zA3!B&VoYb}Nbb
zmg?gue!Eh4OC%?k3|Jm^<`vkQ_Z=|FXu72ZJ+?^EO=S-Td*9nSnYGG@)|*T)&?};<
z=*`8-=;5h(dL^3*dW^!cWc;fO%BTY<$lJvql9pqCSo|}$v@@2x?8W9yV?9rlx!^MI
z4eXuyb_SKfSpinKOCdbb8VeKNcbv#OA6YG$Hrsl;eYt)tFwH*CnCL<fIthpls5fy|
z2y;BQ5JZG-4njW{z=u6tx@IOk3L*ygNfR!)Lh;vzaIPn`e3CFN`FY;oIQxm|E{Ykd
z*syfT0kc$7^X;=MMQ!ZQ^;<!RXsA&YbJI8(U)BGyyR|ATKSXEGi&kjm8UgL;vPpVX
zmWx?==@XPMex=#ntm;9QXh{@j>wMBUt8V6dOnTmzdx!FlX2Wxz-mh@5aq9UeBb2u&
zXe%!3_e(#b!iBZpfPMWj9MFRV4H*fe&vc4E7vds(-Gw0pe728p4k$pc+L@cjj-$n!
z?5TKA_s3WX81P^FjWNO|q-ukoh0h{;XvG9>X4uMo^RRaAP1gr{@gH+Q-5=<zH0hWo
zVt#dF(A0&ju1RU-jnL~|iN}>8V40C`cHZqd%8Mp|jUeKyUP^Ff>6NB@U%k0!SkPZp
ztg>Ume%UlV=#ezVv?7$e+r%2KJ^BSGL@l+AOtrZ=$z8_O-#n^@;!!cvleWD7!s3Y3
zaBX8hah)3KU_&j2yRPr|f5Wp)1?LU8Ea}d_E8&h@A$qn(5qHYEf7hPBRi}xM%h#EU
z*b>n52KDe<9R$Z&gC+D8%;U|7<3P7PzK<fm{wc4z;cn_(O~5eZnkp+er4AQ=$V{iY
zJhtm&jy@<lp{rcW+{g2}7Q^O%W@pK`f9@WadJgO0GUoPi%i-XnahZt3TbUrW{MEZ<
zY~jaGtVEOSyYGTVe$F>QP4(>wkj;T}DD?CQCy@c`{H+QpBmdLpcIyntAjjUwc=b9X
zdRm}Y?qKO!rw#20^;d<=@uZAuuXyKmPozSe*k_s9=)|r9rDrcTGrPLbvT|F}0b+N0
ze{qp4gbK;HS(xs=*%(@vjE{IWqP6LBQq?#8h7>^_ZmYefjH(l4O;-Iol!t0o$LgcP
z^MPs{Dl!<nAoRa&5$c8s3n+X;+f+W2pWfDxudaj_zS7n`swG9c4_Z_Umo_@(RPe5_
zD;@jv#a2_-d$GD6A8x)2Kpq~7EysXQGpt2-VKtE}sGcQHmvL;N*?(F031R7AailHx
z(FXrG%8tD|GycE8{w@8&Bd$@rQHxWHJ`r%MJkplQ`^19T<7BE=Hceo&W4*9dElO8v
zXJ1A}Ql7f115^_RpU_rUGt*FKD`Ci6h|Cbb4cRO+zYpq2-18-cB_Dx>C|)Z<Eh=Wq
z;xo%e`Lftbbp@-x$fLShVZjfZpQ<bxA&u!ca~Hv>+hfvb#a9iIHkXRXSQg;zepOSc
zbC)hG@O7}I@AAa3%)?k!r=CsH;T?drOT4MJRF~QRv~WTB7Z6x*hAC87{s|(*7`t&@
z8>Iy`g<60^T8|zT|DEZBO?`{ZCgmIAQr{|oQjp}$OEY%VkFYP(#vqpKh~bQ4B!`Xd
zidI-o5uABK9Cpc1ui(^{H&?`=#D<y?(4iL-;=vosF8b3vkCX@5f}Du@t{ING57fnm
zQFFSIxj^O2ocCR|4C|MLYNy^_t891}Vl8KMI}qxAj@tj1yYA(;va2M4(tYFK{td*x
zsU&AJ94E_4xB(T~QVki_pXZe2aAkkV65hq@%z;Z)M?246=Dq6LXo%;E;;qM}ly{P!
z^+Z|}HHb25w>IzfH;+l_p+~RDZH_Ah-A%|0r<}(nIX22~(v+vsx~at`KIHzGWC_+m
zSJ8Xjg@_xQjKT#Q=r^yndib8qC?en7RC(U)=Wc%G?+gCNJ6lrovKbsmuO4!&q4EGB
zfO<o%OvWw^#q&^Cg?kjrHCom(7RE|6?+<XN$9<i?=cmppRHlT<VwG{VE!GzMqa4|0
zi^tD2-?s{nmQ69&d>SeH+?L?x{jhS>W6;fI_5KKDq_i+T_tr+yKq*q$a>p(MFWI!u
ztf_c&e=pyyi~pub$CA@_Yy*r!W69ku`Wmd|VZ6Pl9yw-QGJNwyu)1V&5=#h>82EQa
z_-#7X;h#3E!-rd|D>oAK7C>~X92@%-+2z)o!n>L9^_eZbmchL0*7q6Rd3z_u<wK$~
zoAm*$uFGmz=4L!Jm3@3avD`2)`Lu)B`N?^%mYnDx)lfBLjjRI(j$H!<b*n-%T6d41
zi3t`$tNDxrkx!xaN$2uneq=xof0Me}#RcpjrSRF-v_1uS)nQwaK_x`DhO?`?lewIx
zYv_K$1C4&t@?e%+kk>cqw@HUy?JUNnI7~!a``8L?Ey5AbGU)P=*5{bokg~EU7eD7~
zJo;EF#agXS(8?8YM%Z(b^lk`GWYJ{yAP+G-=PdZJnHQ>z#IMvrxsTlY#RyALJ#!*;
z<MmhbGo@`eKvS3vFZ=z+f9OMxrS1UgSWTq9dskI7-Dgj|hj1;CDepZX%%~1&yOMQE
zWGX1P^b@S~#ud6?EN3`82<b{|!1A{?y{7gWy|TrGAVhn7lU;lt4>Dl!yLO}%+q1=a
z0>8eG5k!Xdmu&{<z1wiqTd#3}jXqu0i@pQR!Wh09>TjqHDM_1@um1Cu)DC8nnKCV!
zzWeI|LXw$<NLeuLQ2g)UtatSHG0NVxfsxT+F4p(Ql*bG(q^7}mZx6;D4bRh#nV?){
z8@faK=Yh_vZN;YE1(_k3bwT`5+OVfhqr<&0T;5Gvq=j%i3?G7@RTj+8j=_fG$TnMD
ziq#QwS2aAqmkrW&GM`J9d6SB!+-#s<N1cL3nP#am)lOmEm$E`zu<oJrngUO{lDUfr
z&ry(O>0cMRzQX+%g>%)uU!^^4hjz8}=QSAxBTid>?z=n)PVu7U2c-6|2VmrsLehX2
zsU-zPUMvb>zGA|%zD&x=(bg5ScoWp>;0F*L2EKgO-D9%3sG?k+dSjw_Sv!)RLbDQw
zD`u2jp2&m+cXmffw+3X)R{M3TjntIgSidg-^2Cb4OuS?ch1i{12mmgGP+?2VbJ~8`
z+E)#|nfT=(>N=DpJ%$F+BB#-M&#{E8;H9$($<zJ!<;~ZRY*~D%Lsr%%IrITBeeFrM
z`hOw)?AeEBv+#L0fS^c#$DOF%G%2iZxvJK(@_q>lJsI6i@5(g4>`i(!QSJ9RE-1ti
zM2%+!r0Df7>ohsmASw!PoIy~X_!G#fBXa#5xh&JyxO7~$%9s}ATxtWHwf>3ng;Kt}
zK-Jy!4DW6vGT$_#kK+=fZ#k1rHdc!EHu^9k*^3DnlA$pYw|BJ$$=;TuZW6t<lMpz6
zykd4yQeKVCLo0!Jz)rZMyZz?``DI%|%!Ts<#jaoyS5TqWAAUg<H2k~5s8;+F$z)X|
zR7!9sF8}>$kA^#6&xC3<JxgCyMA!t%W<@pz65ps_){egUyDriS+`74qvEDVP$KCXW
zZGGEv>+qQBkvf}Yi$aMP7p$?wd@<|g(SC6~$@A-A2fztd$k9|uTFWSl2c_Bg=4((u
z=NwQ@A{zmYLYRF@D+-W5XxV4qb+v0LiyJ9_VvKk+>W#$`R$Rw9+&gZRqXFTZsOlbT
zwzg_wjY;r}|K^ijbNr`2JSdrJxO;v2>8;9bKWh*mcpN!!)vZ+?v^sP}_`Bk;PFp>i
zW}h{_YBW;i|E6p5AT`W<7PsPNYBznz)MHvJ>P2=p<%81VkaojeSDwDc{9kz?jcXXa
z`Brt<@(dX^kPWjBWBs$`v4@-^GS*K4=MWmKg``|5Tz7$&4y<d^WQJ;rPBs7lZz_!5
zr6iN5Axp;|m$fs!9GDZFnCpbd7j1ZnmC4~lrn|O_50WaE8He%o5vwE5`sgTTdd&74
zb2MD(SVb))uXC{JP_8x#`gQe^=sx#yN6dd|U&6x+?m~ZiY<;6AAQM(F{$P2B`2{@E
zRCKebh5HUsReaT(cQd@t6A!$$n@Klof<xlO&4GACRt<x_&ZwC6&{<qZt|?}L7m%*d
z>T9v^vTo1sMlob1ev4XvgU$0$V#oG=Iv-QOY=aX6<jI+S@t{<#OiyJ(HoC<9)U<o!
zF|l@|u^1s>K98R<Gu|vtW5^qMUHx;s)EKXmyc(=Hi4M4P_`GH>XunHnGi=)c(rhVo
z;a!XWly5a1&UnPve}Z+b{Po{AbWLSj6?<9K?{Oy}zb@57KYJkjmN^-2nW&ilMx=3L
zxF(_NYfwtJ19$$c={>KH`?)<-!jQ_ymc8kGT=r~p??^oE`>bCfBwovVyjY<iV)g7u
zt5?n5nTcV}POOQ5vtUh=V3|$-<{q>m@DLy8CAC;QQJmMIfCv_qP`;MnGEthnM%ij_
zWR)R9ovJ)tmZ0wui|H=g^)QvSIf!PcVqZvf5o<#>13@?vYySOWCKWgXz$T^hzcz!t
z@xvVeE{iMb51&~<t&V;5ii1rQD_M;UhhIt54o<X7izHBjL&WU>O=Yth$YQQ!nrXyg
z2->Z1BNs4|>6ujwqgLct=k23S{_}r_{4y)1kmIW`6Dr+fkHxEbY_uLHhoUX)o0;l;
z^*TyRi^sw<Mb|4mIMD*PVqE8AT#&E%$G=rG;ne<0sB<0bvvs*zShh}0f8Z@5Wf{X*
z521xy;~yRgVs9>-_?Y^cEE9E0CK>&|to*FpHjON>*|bYznGjNc)F|lM6f=2-FnGOQ
zM`Y`bepvZs@a;Dr_l3S$j!m<`<#~ENCcz8R-E0Uw=_PDAp=u+M8vso_3jQOa@;j#p
z<>|o~!%5h#&x<bmLBgGlfg@Md5QXYRR*O^~aS*a~OgzExJ3Tp8R5<quO@ujZR;DpI
z)@5z6(tU3vN!yCF1U^lsRNk7t>FXB(vQj+;L$Jfjs8Fjk`lEkaB4^J5CJ7mhvmOMe
zZx@7#il!$5O|;|oFJnq@b(u(5ObD2E(iC=?JTNGDu#CVH4$2AaQe30zmz(UX-)&U%
zPj8jMg!8<@J5<f$0(rEq*k}M<UddH;oOln*%N-G^v)fWJuu{ZHwDDgFA{#n7VGpg+
zDtoY-6mMu!GXzg!oc|mTs@w>pAy+ByDb*D>A5s3Azh?dZ+lD8q%=y`{j4t5gsfUu>
z+D?-AS$Y1l<G%GVyCMf3rR*VB!6fWTIr260pM0ub-Sl)&#9PIH`pXUXTnjDB>`ZOE
zpJwjby_t|1DTa_*jj?c~Z`RP38-pq|aJ_lzN?5?y{BKyX`v{^uh07e3PJ1_<XF_V)
z2*ga#M7uSNH?gqE{o;%3qBSul;;icmV$^~wIM525L?&q>R&zOI681vk&03AFctk^i
zI7M;j#QeW$aDUrrhSoQ2Y@MJfisEKhz={VYJ|9aYZsnQ4?#Efq-2GhK^lLCYMLPRH
zPEeEXcRnNo95B7*;yu~g=T2B9d#Y}lfKQg~RVQwljyWCKq!X9DGWvZ-PLooz_E96=
z=A=jjg2$ik(9OJ9mgHBBf(9p$+D`O-c<e1v^L)sAwPvyI|20qkzVKG{4-8m`C9}&d
zw2%b|vbq*B%!5RHS^F`ZTv3UF;tj^e1@E%@44t}`G6};DG{k%Ko+bj&%?Z5QA$rSM
zG~#zdMNB{J%uKTG_j4%Gt))m2-G=wobHEc)&b_PWb;IisXAMWOD_V|g`graZUjM<q
z%<veXwIisj$A+`=`Nq!6lAfI<#Y1*t+rOES6}ACW2GL<*ZTF{q{U1Gg&WCj-M*o*g
z+iwGeK05CTxfO1W-6<d-#|q#0o^J`8Vc{^1gbx=CP~zP|Q>>5;%z{rRV&wGXs%l@s
zXG~q%sl)mxD~R`jp1W@7$}f)g_f-h=T$MX-MhfFM#&3(uLvppTPoW8MDZBrhNegKg
z07m`-M_GZfVqVl#=$a-=C}-Gs*paf=Mu|}<cGJn=oGbPHJB{i+;>}!6*^2zj|JRWM
z9;$M3GNZ;HODly;RMdE8C663EpC%zy?|&x3xvy?1lh8ldog^aJzPiLy<Q9(3ocnN9
zMJk%ab~SkK0!qPdoqbUL2cc)FareL7*;l{r`BaE=j|F`>a#Lt~-v9R;D@(Pn?^!wD
z1tTU>GSTP73yFU}Yj{v6cy17P8ggJ?{`l?b$NWL+%N5)IazM9(fRz1`H2%-A8@)P^
zQlx^x{@#LPIXm~%|M@-9WIT3P{hu*tNr!(vjmmTnKT7iN=)v%O^Y8KfW~Kj2Vg9&!
zJlRti=EAy?SU#NnK5HJ<eKhOltw>6Di}z~vrLphf)&8$~nH(1zmyFkSJ>?k>Ydqw}
zzvoTv{O=1I9RM&|1={sdznSX1T(8r---aWjQ;6)Wtb6-szmL|1vhLqUruJ!3+@8r2
z%M@5?Yj+`EZf9K}b)f_#28pXCQhV<0?=W<Awdv<g{c#;wNsxk%4Od}gx4f%Z7{kBL
zw`pH;uef?CiJF9NwEU+!Dzl<Ov&;|u+btsad09y?{1fBA&u4lzXd6KFd5m-J_a(IG
zKrqX)tuU_t?O!^>^x5y<O_OTOkE`*C5~d=v-vFe3#H_j{bYFh)&syo%-#+a*;Um-@
zqXSaUa3-b>7TUjgqu~V>7P25bdds4kap2UX;p+Y|_}9Q1_NhWzkzu9#>3@GUY8xOB
z`euZT-wq)9z)=Xk+(R1vUu_>LVJ5!WTI3fK3NBlJ7!xxVt5=tN*g5vn8c8-NMZEpY
zk)4XN;UlVxx_8xbww&nv*iQ}<C6uo2#W$U*OLXnMs}~54G^kuSYD>`go&Khhwi_Ts
ze<H&nX)-~4kpIQI%DfR=$YNqLKrE!4cN(Q`RjI_CJ?t&D-C^9!cCW)8toR-~e1H@G
zR27x~Q<L>WL*mwPVW?j=y;TMM7WU!9WDT@WC%?<<!hNG-BUf)!PIS%$espycN(#I_
z1`?Xuk4(k$|FdrbXnThNo)Dxutl<`9sjedWV1s|vjewU+u1|K2sJwN-DBoxMqOUwA
z(mGvgQ-hlorgr0>n5~2w*`Jp+<NZXo0R6*nS80kFU;<MHDx8QGjeI%t7iNoR)TKy>
zSaibMZuxB8B0Ji5iz)=d{j-U_K9og2j>S;zMAu<ZNBmDpOV8<K3*q{?eu{WWVrCdB
zw)+V3$f@xSe*brlobHQ-Cn>Ph_Bm0?TA4illg81X=0Q&_exQ7eridaq>~_^r)5WD7
zBQ*d)pAvRuy=ytI_VD|im!b&;IZ?ay(3xvquPx6`l=BNeos;^3F<xu_DHkP7JvcKn
z>_W)Ab;E>y)D;!ei~t8jBV%&K-%dupYyZA0U_IM+-cRbcI*G?cAIZ*%>KFub|G{eV
z*TdqXgT?OZt3Rl`38w*4JABhbiTI3Q<DO+Q%P!09-F3#Jg-Cf7nQ`O2ef9k?+L#;i
z1l6)9eQN+S_@UJhk*JcBRhh){RctT%bW(fKQq8!b<AcU$6^iu|fJR<$d<q0mC-8vo
z@#gR;5;TQ^ims?-4FhK|eFr0NE7a@*NHuBC_mf%`z!_yqQ63ZWHQHetyQN%6X{;B?
zuO;e@8USnbKRc{T>}n{1d*3&9G$9>7EPr;=$T1lk(k)-Efb@ORIsfxXb|oDCtAI7k
z0iF1bHp$9UHlc%30LQ0}0?@$U8~qrUtymQVZvRW2O<#EGYT57S9#IU@2?&9&3z3W#
zU(;5Zx1qgqEh{vrXe)qMhkvvd5amS^CRD$9)A<>X%SE^DcCp5Yip2Qy<)X1<%0GSw
z;{QWL?T+utZry}G<M7t8(GSbr@SgRm%mGY55uE=<ferU{*Mdtz4+EAhKIAJa%meW=
zwSJ0LDfqVF=iV#1Q<`JRk*azTfzMRpw(oWBqB~-`e5GWKD@v|HAsOZy7##c7!1oKn
z8zZhh@D+2Os%Y{~=k}rW(@ABKh>yRA{X2Ij4&Rk=-_yvNB6*t=on7%L_;W7o$Q3}&
z>NUPs&`ri=LdRDM#yLSyh7qc;<@DW3(K`P3#2s7w?u`P<%v3}q@9k^7Yvz3g@Tb-u
z<-J-NuQ{Zn#6=UIeD2a2i-`qcNsHjVLuAcmLxykx!e00Dm|;?ASA@5&Fa738E*n*Q
zidB$)sSzkZO(TQv_#c-4m#J^C>kgo@0J<7w<-_kO_r`c?`CTaiMXbD(_*p++F)^jd
zPbnHW#7;qz*7Uwnw6w5$){MMaBieAK5Y4c{jhEcktt)`D)Z58^^qjRckn|bjdQw`+
zYP!kc(Z6T(;Q+Zw-UJ4Z+(rEIAkAA;&d`H>wauz8zre;gWQbtXe!wA2L%mwV&v#hY
z3##PPtV`P1m6<LSH7cCB4gS|79tVteA;_+SXj+txYV?-Z+WMSY@Nrz)wF$c|JY~O`
z%FFf0;G2hZ+GRzTi#U=Ve-Mr;_@U&!F+tlSKBgV++Wax;_+)hcF~seDjK*P+Emmjf
zePgtW3@bgytyO)0%aB79J;O-O%ugI8)W5@9l?~z|1kw!td~iRLQ>FLMC%AJ;%UYNj
zgWcWC9-+U5iN=+QpvvS&{cAU_6~tf4B&R<rOe_5J>s^gor`*TB+_!-SJN$De)o04P
zdPX80<Sr!Xz0S?nMjn4N-%}^?Gzat~0I)dhZYEMvS3)n$FRdEv+C!N})0z{%dzB$3
zjsiB^{E;x-`tK@^BKGDuy2k5;oEPxE0C$kHV?qjAC$7OClaWo8s0ZK^|JlHt{p#I~
zhG1sT^af(?$?!NB((`pH!{O81rl6m)!R*tU&!f!5`Wkn~O^0sC<l%TxV-4OP%gt}R
z55qn8d}i&5Kh&e7ytBqE^U<Tg8_5)_y=tx6JEcag+W7TAzXpI7j)lworlI!|0g;w4
zI`~-E2tv1Vp3lXf_`1*9V|Z-`0n0|*&bo?Ax}GC(*nRxA<t~fO-FaIaQsR%O3pi|z
z<k3WxM~#KC<>T-AW$zM!7ja7);Nu~MV3r`$R$&$2!vEsP7IwzWa2~<>3xnZu`mW|U
z?}S5#N|$ECor!*0JH7IgA06P?w0$95ZF@C$<J1ayG_bs$8=GOPvnZ?PT2-D08%Qkx
z6<%2a^<PzqW5@*Ui0#qPiGCv!CO!omb|@eB)N>{BOae?7L933=1gff5h3s%kQPBDJ
z9Ek@uO8i1wAjq!CZSTv}QA3v9<Ub0ql$_&^$Y>AVb7&D}z2MK7_71J3x+o#7M?;o%
zkwu5P$EZRgfEE_Kig<RYM|fech3UziG4PB>zfx>268s9j2j@xgM+O5Id7VIK`a1@C
zYLQ~xxCAjTBBOJm%D?w=RRfr*06I0&!*k{d$*xRWXg_Ezgbcy{I`}ew%)oEGki6rI
zJ?E}1rL%5j&i-HK%9rFH42%b^t@ogp#;RCX|4)109oAIW?MW9D5U>CiKoC%>AVow%
zP^2SbL!?AS1gTOK5E6<76lu~$2vSvg??IF%NHI}*7lcTMND0N+QBK0^`_BFDcjwML
z^E@;D<HOE5`|P^bZ~fNVYZoly^Ki00lf8wKAGYw`4egt*6hz-~KSgxDXGkn`I|s9#
z4`X)CDPZ;}3mp!c5L`Bcg+=n%9Bvs?YpoFaIGbc2yfeLR8H~wZ*Yn16Fa!L!OYBZU
zrHbH;S`)GNqAmXD@{>uYNEt~91%U{=Gl<-`f?_W;z?E@L2Oo*GX_OSgxw{ZIhI)i=
zuqHUgNXBUTpGYVyLfej<BQ%{i8>&lS?K9px*A(8)-$z;vIW+)9L^gfz)%TZw+|SS?
z5+Q%3QY6&(mXJMGUHZpY`5UX<k`14mGt7q?ucRQ2if%81IN!*2b)f}!^|<1%Dz|>r
zDq^iyZSdIFkr6Hh>18%AP?Z5&<02eZ@J|N3uVD9kL_UeTxvq9Xf?fdq%;)ibtAj`;
z!B0sgNLj;*GP&ZdMNdjRG5d&F=yLdb$w{L3kbi=w=g&Lms*iNMgg=s6xTlG<vGKl)
zXa}K^%H0+;ml0X-=jX^1&|wBL#+`nS-&PnaTTckMa_)d#x0t|g+px^itwk-?r5)F?
zD_0V}NZVFUotr^%9v<tws5~u5Z?^I#|3?ImEyxx$<)+$&Y1h6N5G@#snBor|wRUq^
z7bYGHFROCVuFCdJzUpip{?;J*YJ<_aBN?d@-&;qcaFt!y_KqzN$J5H>SsNGVM;Cet
ztNhhLCCCj$7xI)^oyf|oBvBKyD3}lKCl<oV-^A~p?S7TKYtF4t+HE<SRXV=gU&KY^
z){Z+rCJ*f@kRm#q<K0ypG>nrsjaZ547u{aqrhnWMX52Tfc;+4^QLuNUbia1o)}b+r
zq^rj6hoj!4-L-ggu(>@qEAL|C?GNbbLI%Z<`@GMDmQQi?ynDzJGk)gP@>jZu-+C{D
ztNsd6nkD^ld(?>0SKH1@!rhC5et7J{<H+II(YWwyyv`9!wEdw>w51<{d9t)e>(I~K
z?Mn=%kfjCrII;dM0^5?#uN2+*7}f_G?HVeR7P(k>a~{@yvHbmwq5O5}SBULymE&o1
z-~4SyzO=P`NXxj=u0?E~K<PA3<eqMJy_sM<Gd${eD-Gp1xC7m=orgz4*-pu*8D$;w
zqH|s~G%QxfY<Kvyvcu2p%a0?S++y1HUbt{Q48;)%I?&1n5@lkZJz3+hQCt+37_JB7
zd3X6PQ=yay>iyRC4_gv1u9_kZ;#}jyPq?+1Vdt8ChfyFPz2&}My?`V}O!DqejeCJn
zLa~aAAuwK$oW;RYy!X5DTf^tOKCdmS1%P}1TwFD;C@&Sm>O$u}pSK<EEZm=@>)VW7
zC@8W5)__Z|kVSv{`AjS2bL%oUVon@i^UF86cajI~aKUbWso{F7ETY*hy=c`wM$qw_
zyDxjC&~tqLvrOeI`=)l!`eSmR9BlmLRZZ_B%0X{}8>NB^2<ARlqcIMmca!p^8jC*6
z(2plie?C3e_Eu`{Tnh&KZ8GkR`|=uQuCQ-m@KrQ+IRG}du9&60?t_Y(K#GLUtu&Tp
zRq*Teu0)-f{XCETRv@2j78C?hfUC^)z0H}c@_UWdewZsX(u*iBIE9*R-7=S2)opGW
zt%2d$Yr)%p*;V!UEqA9HCO5<GA72COA7(Jr9}dzB&+Ak2IwGTTt+==`^FfA@bd7ZX
zs4n`q_Tb|r?Y3mnZZje6HbjZ`xo$h|idW|zeG~~j;M9=(^J)0ptv(LCqFV@oTOLum
z$SrJdsaZ5#XCmnNa%=yKAepkolBZl>jJlK-!cMGPin_f#&*`@IUT?TU<!e&QQi=3c
zq89h@B4ahN4!*?Qwr>gvv1?N*3gZ}_z?seue6$App2^|vHq6fleJF~H=5Jpxl5`oF
zj8v?(jcoI;VXt&DS_t7SGWz74)KX~u8vn$^^M}LSP276B?%CA^6kb$n)~piN_t9y#
z=>?3voirDR8FC{qI(j!c3m>N~Bo!u9VCV0Dnp5kxo4Y%zm)xyLTfh=r)Hfz>qWFEc
zcyE714i1KUHbvzk@NF6WA-IZHBW>kM1FogwP*(X0#(7-+94z|6m|x$RV7Rp1GON0T
zaC(pUj!To7peJoFHP&YuxP<fM6UJVx4rUn6ty$DIikk&CRQC0$qq^M_jXP|UJ(eHw
z%+*!xnj1C_iE+;e`&kaI_FHIHF<5=J@HTJ%`PE4S=^U%zX@djE!`*MkQa)E%=ZahV
zxDy3Ed->WCb=UEcE|X^G%Tbxp@=hCJ++DSBIC0@tie#VFGknY|pU94d5A|+)M>1HI
z%!hn9xRvb-o;JiBPE0uy;c!%_;q&PocO)?(=Z+ZUxx1CJG`_${1K&)`o0$TumE7{K
zydsYy9&ebRmt3h8>m1VPtN!vKE2pRnyZAn0N30kk?&dP;wd10Fktcs-0PLlYi^lrt
z<mu5~S)BaxgBNpzgUdlH4E0Di;bCgqQKdKYE2fwCL}IQAHRYPgHl=^b8K_Q@8NRn~
za9d|&t1^9cWM|addyd_&9uz(=pU{v)5arg!U4k)Ib7_+?%t51^yMBch1_=C`N7|dw
z7|qiw99_fD?ql8GI^(<Dvv;O<rU~1mw`N=>==9bkCSQ%4s*23=m#eLeH_9C=DW#uo
zyb=4p9W#QP`{*<|Qn0w9k)==nyw~U}#fj65S6m$2KK$4aq49I*t7Ds!*}hqKwZ>v0
z<WCQGdvzjDw1DHwDVx>s80D~jWbSF6C_zWf@t1SG?!FJS(d+yLPoo6XH4Wc(*kWu1
zABWk-?^`JDc)gdn*4M{wduy6A0?8bLX-zlb6OGE2Du7{*6yu%Do^@IIHNFpe>aU3y
zJj^M8{BkuCKN>eJA1Low>+L|I0c=PKQ_aIy1UpFcYFv)+u}#n#P>fw^i1Imo?rf=H
zk%|6t%-oZ>6o;(1%$KP)%&lL)Jc7j=<&9xH=C^1s${(-aaojh{Y|(UXu-=0k=9v-N
z8*?FSsr*CMc@unDwz>VSva`cY{2`tdKLkpMp-pqu9wBL4c!E7KBln{SvGdVd0|;1%
zQ)y(wqzEz+b3_Z{W|VanzwKtL&WkzOc?;Tso~hX2LG72lH%BLkiyszmhzJE>-gZvL
z@evmbMwu(nF76YkYa_iPS{SBxd&0`PKC;*xbo?~`rcesM*W(jX10ld2Y10>9yuGsi
z7ya?73>=O?lxQKcC(m4|4`C{O+&=t_*88r8T2sGRuc;>@C8O&Qy=Y{y(?abS)84fo
z8U-zxcY`kOT`LDZpeP4qtec1AU6lGgW**5?qhSi~<V%h%y%<Cr7!aG?izD+t>mV$`
zF<HG|3?w`(l0}iv!9}|JMhSi5MZ5f7EYC_TJI-$(d4>sh>}D3Hw@#Vvb|J8$ahxBA
z1hqpWsR=Es1wpoJM;-6;?r47GRC#-fbI#*~3rhvU@uoxq)<V#vvfSEz!TgCi2H|3V
zB>REj@8v7Z0HQPR8aEWZBG7kD(SGSqwb%M^V7B{nt^n5lBggWq(bRKiFCC`WPWk@n
z*7Hw$`%bp>tlj5%e>dai@)Xd|G0mnPy^0n5Ehl;}l@hoQt)+@P?Y6$`2D*laWn~i9
zCSIcEQrXLr=dD7VOk*W}qS{lh8!GKks_fiXX%9Pk5pz#Zxx{YBp+x1V%jk)@5Rac#
zQnwn*UOM4vl8wQgvn^jO7GC6LB5e(;oKNl+LS8d(6Pu2FT^{4OU-tyAeduv{)Qs)V
z)GYt~jkSBves!b0F2=R(cgVB^!#=!X0=7u)p=8IiWJz3nl&h||(oXvk^<)FIru6Nx
zL*bZ$sZX~;5m+Z@d#5~)wSscRIS|I#r=6n1%V*1rJl9p(seA91q08rlCXf|DYi9Y)
zQh6y5IG6H9<|6Cr=e1As#5$<1f9*rf6}U6h(@$sI$@Ng4Haz@ud02IM4((q55GmJa
zi#wgUd^>z~h1c{MZ$);x6<%8;j{)2idqK!!J%Oq6<9JpWOT<I7@>5Bo1XSNRv1M1`
zRe?)(&H2Fsz71t=sir$ZVS!hzi{&G9ra3*(IlqmnK{GyUeB(D&*2XFNZuee>4`b!G
z&YjISHW>S^Z}ruv45U=RPDR}<y<UW7-uuQV|HSIk@?{54?%>Lv&INNT{NRI8E!5ON
z`<HM`Ug?E~=tXCzg?{&Q1|s=Uj+aqOt2dS##4CnHkJq)pP-`y_IL=xa4e#ECQ4VMq
z>rX_Ebi1HLQZXe;iG+s|!!zIX1#fgcGguX}r~TT3-zJKCB%aMUkyUg_yB@!Q*Y3*|
zJcc+DDUGb6-*>66AXLFM^wyF*chvhAzj(P?cG@P?e8tbl<{;a6uOzBF^g>^g%+)g~
zAOcuDHrJ*|ex;$h<S1}4orrBo9mNNNo1KoLrx(v18Dl*h6>l-Vn>D;o>A3dzrODV5
z4}q=n$AU7n=AKm=nBWyxde`ROkM3?TyvOhRxc^k?xy77L;o(3j-{GRQ!VlArCc<N!
z{dYIcn8;5(FrFd6m%FA-gVE&|#8Sr%E21yYtcCLST&gW_%v6rFe`hE!Z6`MHYy5#d
z?#wJ>MA(jSOtPPBqh+#f@lFKCJG5{0=cI+6ZxF&o8lZI2b#ZdHzM$}J%cr7qZ<m(o
zHtHy;yIjzYZCoT>@e3SI(`}Af&7(#~boy|KZC#kv6atUp`C9SrsSSryCLubkQ_3ba
z|AmM};h2!Y-RQ$EIxvaFF+x^%>f;`n(?#~&PA4;`E{cu9)?a(9z2O{De=c~uVkJal
zi}v|vhDOQb+t43)Q*XcUV7J$reP6&KNdh4LQmr3RQm9Yg=nYe`oHoEDe?2c`ifel{
zqcFKGy7)TU**!5;$K*xo-XnSuKHQ~_E}s)cKu!Q5<f-X)mgq7Cr?pZ{lCV9ngwcA2
zNy)txfiksd(fLu}pdW9E?p<gMx)a#vY21FgxpdJ)p)xsh7<td@#m^;+W+~gB>t%&N
zNij6&nM#Bnt)G$Q9z-rop`-@$mI||u)=2h`vczqGzjm{?Au#K*ID5(Q!q-b~8Ku#f
zdGsE^wVO6!s|9tjat_HiiG5=)vGOWgBdm_%^X8_q6@Ppc5b=n8vFt&=O-(CuL9!vu
zL^+I_UNn||AIRkCrxf(l0}t!6?y_!ojz2T)aPkb&I&1Y+ua<>*W>fb{pw_!ZUT#Tc
zH-~~3UFJm{NGsy%iOg&Lsy00RA(hMS4W(hXm!buKr;pco0tnRTrAgP+)N})U-lblh
ze(o&$+ry2yb}XIy2663bnR_l}?h%+)jEj!t^B{5U5>vVU9RmRy=+=v?mCG{XXV6c{
zmpi}tBkmkU2I$iir;Pc<Pu3MJY9lm{nMJyJeB$;*wQ*bj5^U0S@I0K}a?XpT<=0F@
zMbjAH8`D+Q5BI(O$h<>M*jL~8Tkj5OkHXtuzq48|r3F?_KuPeu;mpP0yjAxBb<epx
zx>?1A@y3xjMV|V5KP28cIX)2n-eddT+|%?8QfAOh8FpRjyD}#MjV9eZz~~PQ%fRmu
z;xUb)!>!>4!mBjBgmBLg)5USgi)-psRq;|aUg37z^h%B$Ftugn<%SLAOVu21KY4-!
zkj!SJF|zG(IGb*GOFl}$0cQV2Yj@ul=2-#VzC+jJdnb8?KlbNw6?|<wW)LagUQ77a
zP{0-h7HMk-324MzSXwPii|K0WuPds^M!d1cte?vH5)zO>YpmytdX?$!5H7Yh?R0Ma
z(DKrgOVxs&!Q}Hj+@$l4l7WpWu_8$CyH{tW4=*qNWL%?fl;iruo>9y9C8ElGv@4Lw
zUv_oby-*TiR;-rkjb_?_ueChDWzn7fj?-p^wIt0Y)fjbAtF5K5cFgUfQNyj(ix;Qg
znJ4!QaF?!srfr;>t=nRs9k9j{F)pA6MjVU?xI@CJxzD6PYrzAjR3hM(JWO<o0r%#i
zn;O+!rUdp`)x9LhPlfpmM=27*Z#K)&F0}<pt`5|#?3~7xZ&#g0g3j+MW7W)_RCfOO
zfuMjL{W+d$@f<a(_<EbtL}8HfZUyH<C<N?2T$l0k)7a<5_DKRDbR{6N%=tjA)w{5|
zjcXLbyo8a$Nsfzy4+?+Y_9HCUm%4B+6Wh;^w4kKMwGgjgQAyC{3TInKiaKBOJbPIO
z9GbemI7mJTA}hq!NVsT~BH3~BD6%RtC*8Cz(2haq^~AUb@@oKpo<;l8JJ+jpjOm5~
zj{V5PPHM4BIbXg8;dw$<soA~Z@&3QObFFN2RuahdFNO@Y!;)g!W|id`7c8PxP;T<o
zu5#<`*~+_ZMBeT)c<?g^URXREbim+u6shhr_++wVhiy#IoipEIRyjHYvh7C}vos%R
z?l&f6U*mV_VUPQgr_4GL#IW+!%kAYIs+d$#m^}y*Oycm<?za=4X1EgWM3fFO&aYpi
z=e@M>L)&Em8LIlt$~>Xdxl-Bgg%OBI`-!i6WWG9qTHWyI!Q)Mtj$vJN<Spa|yE!bk
zyaAAJQZTyJaN*lf_0e<ZZ?uB26IE32o=2X#QC{IQ8P3++y-7PvIBHjYOLzGP6gA<$
zk_V9GB$!B*!Mv7nRickcHn=0jzYjH-+DO$kxqys$tGAG<LKEL6dENhx%^lkgIngSI
z!nuq9(d!87;S<!qx&n_EqT6$Z=wo0}xnye{sgrOOd)4q{S(YZ>e1(;C?VS~_&=W?*
zW}TgHa^2QXfb=Bg<)sx2alennfPgHk9WzPO4{Um!j=lWimLl1kY{<~6_4X1+x(Mx<
zXUpy<OB@<**<G}z8Cx#9^*sQgBhgxfs#&SS2NMm%KlgBNL=E-Roxu?3-7TX}81-E9
zKY_KS4i$S;SmTRk$zQ%P!E!k-N=h?tS0QHLV!;ysF^0R!-Jzd4^2GI;I_3{;91fvn
zvoyv=_FM~P422s}Kffh$HJAB{T5GPakkrDyFfNl)p&Cq2w6R4@)%^1Fr`=ycI!d`L
zYLu!Q(?$ioY`||V2PW0%ez;2-Zo8=b^K9UAz9EQvk(=$9gXWeAVcvQz^9G}Cwa#s1
zPM*S@T9NLLx1^7{r|0DA@Qe_?tBNi@+=yrqq0!YQzH5#4>)_wM<5=UwMR@@(p+^h*
zgcJ)eSH-p43&Dggpz_uj$LGO`fpw4-N!nHE(xrm&bgNSnHs3Uf{t~O}&yPH-Noxri
zDcSI9vz!6fj4W6cwpa&9<08d*V)j}l3~N7=RPWq+R-#|>^1^~(#KljYYP%OVmYR$q
z@H}s0L_bD^Mqu7NdXEUPa>9yP-%QqSjQEmo+|xn#Y1+T3EN{KD&rj&BSgvKRa+2|}
zjb$Oh2%M8;PfWA-r~B_v_&&5%uhuDwZ&~nSH|k(|()Y%TCSjrPt3Q1kSkAh}yLS3;
zmGx{^NXcDc0WDYEjS&sy_aex?9vr$3`SrcvO^kd<*{`*U8^Lej497n{RE%|5eK67C
za`5H;6OKCILaoD-igz<Qk3zHkE09?26cyfD=2X?g4PgXUBT<0u&@|7dFJ-g4@n6b*
z)WukAL~?>hgdf7c!rT{=_y$i?+B3xtd^lsAb;;M;4|Gn*u6Xnx_(mA%yNwfoqT>^^
z-iBakeJg|MN6I+5B6@ud>)F4&itmSlt%mmj1-7v7gwT#iyT=8Z+C>eewp)TRFZS9U
zr~4hP?ghWV1jh2+GjR?Z>mq)nKFd}j3-r?zJDlifud@*=K<bIc0WSjkPN;e~9}QhF
zhLKs?<iYQy1s>7hl_Etd|Bm|Rhg0GG-}2#3Lj`=`b=v>vb#VJmIFr9<XKIk^hCBmR
zDQHpQ8$Wp`8&TfWpu!9AP$r6w@t_vSd(K%_m*c=}M5l(9*a%?ZW8<dDB<w#X@|6=@
zXU&55*P(0Ghg!q0!pDc)CC!8Pua3uQLZu1npwWF%I5Vh#UjwY|-8Feg>!K;rWj$Kp
z;H7}yLy3*BJTSFA{D3fZ*e2h2EEJY{@%u^EB*~&j&-*q;fsf4`#5+v3J=~{(2z&2^
zf!+%qr^9L>9;P3_MUI>4k#7L<V*|J$z$E)a(}K9OcDZ%o*}j0Y`&utT&2fAI*CEyd
z%e4mF+cO)I>JE*H>Jy;x)NeQss&OYaaVjTCo^ya(K+CD#0gS_>0Y0X(YL{}>M}NY|
zQaw%ys+0dTkkyGg#Qfz>jI7Z@4!ElPq<1qkhQW<=Ls)tHiep2g<|}O%_>m<iW(Z^{
zYYCRAJ#a{<H=772URYg~wpYM%W@yA0LG2orA$2G!?@Wze9x`qz++ZrXJO+14Zxot8
zKMwE!3p%gu!$JU|p&X3TJ1-3R<KuKE@QPyZEwXmWcaKK6g<y<%?-4gny?MdINTQ%)
zLiTzmhCN~uCv9(7!_!cv|AdaX6<Wq;cHB<3@4v<^muBoU<VzSK6yp@g9ajS#KV=c|
z;jG@Onq}>Fy#M8cttQZ~j?cXWkcxmxyP@`)dA8cVIO3kR{Q15nd`PMj)H~HDU^*D|
z4Djb?^Pcu+8)_hu61*rwH%|vH2<N{~+lj$8l^NED%)i&$0?movR#Lx3&f;TCIT{zj
zZB7ysIOqsFpm^dQVc_pNz<uGY*!>GcFsvU^Ol}YzJy-Duev3gW8ukNV-FXWkyTrOJ
z%uSOd`Pt#}<jUzl;Nl3UzbMKsniH(>CCUotKMB_TY3U=Chc0~+@6&LT=a<^_9u=uk
zX9x4-&K^aPelHGHK(aGZm2RAG@q)`RRwvto^AY)9&J=><92y828ZT35y4YAq>r5%>
z-KYf-+|11$jj>dvs(|DJ9|s+{$w_>6x8^5?hO!Vps^d)1EFEN|OR~QMIs&HX^z~Kz
zK}sis4<a3APZ9Y!sGZ4!qrnCz@=JYm{(aaN?7>$%7$adOpH)&MzrR%Z35`O%Ak6{5
z1ND8;Ku82gBfU4|6yF@(n_$d-o92DXGgM^RRdN!@nedP#UTALN@mqmF8>IeU5NQ94
z^6-z>N%PhmU4|0vdMjna&gDs&6jjDzY|(UZ0}qxnL@G4~>Vax7h~S>nC9W1;sVAI1
zvS&;h8de2uAl0su_QQl9P6}G_{F*@c4QJzSK?MnFd>4u3Hi%D;VmGXO>(5cG2<T_N
zU?;kF$$BJFRFac&iu~CqDlF$<RqF4<pFkm~`htSkoRn0`6F^w`ntL^kY?EmyV-MU~
z`ungj(7MeewPUA&XM>u`rXdLQ#xCeplG*_$MvqiR&Dqg0yr77BT^c6r=o7T4=SRH%
zO?ay{)JVrr_!Gi1sjJ_-aH3FYf+o1SOb49mwq&5IfK)M`JSoO7{<6-(>Z3m&2P5;X
z7)P#^Ukwy=c;U#>0#v9^q!Bc2DEq|Bc#o__?Kl`U5RaL~vQy@X`3I0C3Il|#&=$Ak
zfD;oGrU<{!F@sg?2l~!0H{i@kd4e$nR#a`2?~p2E|LI(p%fudCY4Y>bjKgf+GFSs2
z!bmG0ZWq+Gf2n5wSXQ7T|Dl!!qg}5MAkf#5D@c>5#|dpNKW6GAN$FF%>f{1xP|%R5
z*H13^`x8Ja=}LyEv^kriWxo+lD~OFLLi1dr2G)172(m30W4!kUk(Rvef??M;j**d;
zk{A36UbL_H{08(2pkg3z11dVl7<e(^)?-e5<D_@03$$cZ{o#Iu5~md~+4M9O8$cM&
zSH#4JEK$M`ST{zSn(-KEWpx;q?6to^^kXBBXRsnk114Tzu%55U0#~>0b{uX#hT8%C
z&VL4spet1?5-Lbg0f{A6r6qy%quV6?_Rx`T76nR1jjC09)3acQl>qMj4><}h``fWi
zA%UHSKo)X`fYeJk(m-H`mPh>#uwHm+s35S!x0R%CzD?jpi>?DT$mK~Si)~c^Z`rvm
zOUV*9AN2kcND{jp62brQ#6eAT)40><f>f$xm$%9^G_UpIG`EtnnDLDn4k_~FL4E=D
z_$*cY3c27uP@iQB`xhEYQErhs2$@G{ik{d7!dCZ6=bcbljlyw;v&EyyZ+U}i9_ptA
zkqhEL!7>{~PV4gp^C2${?U%;IwyV3zZ+)-F3pEU=R5m<l?*XJf6E%_C)t#X4`dsFe
z!5C(G005)g2f}HX92Epu;jHW+*R){FT__?~;j>984S5wNkYwY(kO2RMCjeKorcOA>
zst7jN<%+#I8u4XN&xd8eeoFO?Y*ryJ|41sV`auX-f&+^r!?4xRy81a{D7k#E_ovj~
zyaQ>UJR+@mk~S4$7&`>*F?JvuPG1ei^Fsw}8X>UCYVDMu0cZ_T(UhFp5RE<DH||je
z;E!zxX2n}2h5S7@*u2)U;zp}#ZjpbjO9GjvOB^D}-)26_rr`tF<(d#uYSyUnB<por
z@)jIs1D*C|2+gGQ(wPo?n(_pY06v5ot@111#5?oV|7T)gL*y^K#VL}v+G#L9ZLT;Y
zsDNLKuYzEkQoi?7RD3si)cL&6;`2D{nXr-f-|I$_QL2cy7a?Ous8S_ZTr5l!Gf9HP
zxa>=k<lGVkqfC^*FVrG{Q}?3uqX(EzBh8nwWWm7~90AbdBO|x=!?UFUI=uQ6ndj&W
zyvS|ZXMuwH>ns34#EBQ!2Q|wJq@Dn4fKeTcuzHH5f$s|x)CjiIG$1cGpTIY};6YOo
zw!MC=)dK3eV>oGZF7k%3&tD*>yKz^ZJ2PDWMJg2m4TEYh$(%4hh~=yTtPQ#JA-JS@
z3%K*s{=#fG7eK9-CP?9|B%3Jloev6vfmGfv1i}33&&vz?A#T+GY--^f8%S=LEX_+S
zNXC~WY4sBB3GLl_a~gosf+Ua-8%0IK1GL31yJz}s<<j=tBPKp{lvTnEU}}Iwk64@W
zZ1*7zMDtUr{SdmNqTz_d&};C{LK_>Xg>ZNRL1Ab#!nIMvup%by{+UW>0R4DKH5r~g
zV5UPXe~K_1ffd?3Ha*cww*MT%;LivbtCO<!0W0)Csu6i8Lck8F(NAq57X*@UhM=i5
zGQ^+$I5Q+xS$6;x9@A}bKm)-Vble2$9iJmGp6gi@_LH&46Hss{@HmoO;7CHLYc`!6
zCAZ_>Lthyd0fQp$JUX|WQO<#H{GzgH%7Q>IqnF&~z^0ev8v7k>50+nvHUPH0Ims4K
z9dJGXUIe(HA@G9JF#^wdgzMpHwW|b*YzQHpbtudZ7LeA5la+kE8<?i%?Na+8P)|j}
zufeNN8S8)F>i;+4$bU2E@PGB!*}zKPC4KW+dANNi>E5NVh5cnGnaJA!9{(61fagn8
zj?0v}-3um2F06PvS;Sio(Qzb8o&_4ByIMV>(U)xTP}97|jy~qas=wGQq}U{oA}9^S
z6tlDvWlQ}rN<eO2%r)1htKCGku!HZaGCa3~gaDf@D9Eov_d$#Y+dn)3P=Kvb0o@gl
zLM&lFH-QI2HZK4{H}d&5mKzdSd~5(^2}o~Vv%fF9la?ImWqb-FlTdup5X{nH-bD8N
z+g#KiJqD`dKLpADFRjXdMdSVdq1)I`|J!9DFjsD>JbcQUKi9AZ8R&FJS}BZca5vB@
zJv@ke5M@S1w+~S7Mwbs%+3-fg_&2FkR*-&ln;$PWQt`fy9(kVuz{yOJ4vcIX;V?;X
zIfvw5EkTkFHMxA)OlPV5(VvJDpmh}ze{+QBOfg*8G$fHm9jTIks1`t!D%`$MEAeJ0
zND|PAaZHjN-GXK%OO*X2tAP{bY&xC=@XQ&u*7J~fa6|)8_=^)=t4j5SgrTZ0{0#ws
z8`&_I#2xg6on+}E9L$eI6$08~IVbf#`Ds5AxCv@-ZJLRmQNX4GzWD6UP0VW?AX9eN
z{W9VHc#rh$JYd2-Nbt&p8XG(hq%NR5F-r%K3d#%4Y|zIU*@0gwO6SPn{9Yir9#WZ*
z4brV7GG!!42eI=J8V1$Fwu=Pgo&`@D<%Q?DB>t5m+~CF>J!dGi;HLvXYX}N?pm1{%
z(U>t+Y9;aqMwt$3A>gZR{GdfklopM#y*f!`)z~<Q`01sJ9t6s~;DLanaCE+k-%VC0
zj3mIRDmux~)s=CB$Vj0bf<@^#k|YlS-I2*GwMMZg{+sau$+q5Ap57Pmc8ua$;D>CM
z`f95E<o^D*J1G8Nl59Y>T>G#)n#<C<h$k3we0X`22{+*Q5CTeiVF^pNu=oZ5L%~P~
zZAv~iYQV{Hip`$;+hm;viTHp_*g@+|-js|aPWMPXSx8U=tG$|xRoFm2NRnOlcWn<~
zG_x#a&KpQDItYe@U=F|o|Ai-putl!^9dAr3bMDDETvH)aTJ^F3)MN%6TBAUt1He3e
z2c-e|MNlOW3?H|P&i}2~07HB{iz7Rr5_CYp+!)RU8ZWSjjfwfy+HUgFQWV7PM+Gcm
zn)^Cr;?3(%nfx!t?caUf73=a@2_@dzk@^QKz=sS6xbUgyCS1q_I#2VL&OajnUs;%o
zz+c5Zuz?JKE&DHaCy?%y9nu~sU^iP*l#Ve!IKV1WP+o@EF!r00*Rh<?pz*P3f+;!Z
z8+(R~Gf8vwS?$F-S%hkWWoR)^1l)xDvsrj5B;D%u!GnRUV!a#L9>6D60OP;OaQwRh
z557cf%QoNkiQ*M-d_;wfJbFq~ovbtA_dqS1p7?t$e<COlka}CD@NizG!qIICe`rcT
zFC;A80!jHa5I3%S1(G{O4H{3!5KY;S)D2~S-7i2X<K{98W=*3b0ayN4w<t9}4Q!`x
zPk6DM(OmI~WF6=Q*Gg$=S<2|lg+}{t4C@|z8XItNZi(w7TlC_;T%1T^tvI2vY)U;z
z@`^Xyo;=L9fG*S<CFu7xO@?e@WuL&y%l9@CO43|IFd8+~v1GAb$5btiG`mPlFCn?L
z>gr;r$RCm-DZ_NEMbj>2X(YQpUFkN+&OWmPsHG@+%rDaGPcI)}=1EkT7{{0dq{kF=
zfmMtjOeVYX;BP?|2+TX(p)l79oBrqGE5}0aAEIn?1yVpu;(olpKY&OA0y^@P={|y!
zFTI^eSCdu#Oox}9!k9Tegp1+ituUg<z@=NKh>qrd_>E)+fY6&6B}^*w3n4R?N`S%6
z&I8Q=oX>@^I2sm?37MBW_%}F4Vr{MiH%Gsvtp;z^rbXxrVUWMtZD2=9xm27V`cadW
z?kKrJV5fMu_|zGJ1tp0}ys#dO*~fjYlu}z5i96(0P6}G0XmP*_3L)Q*rth#u6=tRT
z%-KybA0-O{zVDFHb<eWZ6WW@Nk4cOO@O?f}5*w~h4oQ)OI;r}cM0_=wj)%FJ;EjZV
z*YvATGqit$%{D4)%n3<R-1LeMfn{DA8TgB`!`H{pLq84g1ke@7k%jnnn&@ct0?!Q1
zF}pBep<d>-9eW2R{{;US4EjL<khzT?t|gy`s(|x_{2stC7p6^!Mv=}K-|cc)XKD4O
zU>^sG_di6TF!}X>{Ptj^g4kK_Lu?u#&n1Zg(&s`^*yal)C$(RMi|<FVpm0}hxyf%_
zg|Aep*B}OkZxnc)^d7b(f#lf$@Ycn#lK1!l8m1AGMvx{=0oa$PsZGdRWR&SaGyW)0
zp^m5tJRj68c7A|s*Lz?|k|*`y2IT$s50p)q%VQd7nn-H;Pf?N-#6_9<zq7`0q92(U
z|4+Qm7K|ylM;9Zzct}ppBJi)c?LVOuRf#<$z5j>uz-shgAt}a99w}C!>W-V~lHsf0
z5pR(s`yj}5cI|}oelmA5%m5yiuMIJ!C>jyq5}{*+1`{BTe^+yof)Q+b!#bZkt!GZ+
z>b{%2qtMpFTS09GYR^!cz6TJ_1Byfd2!{^uAMRT45g>p+?5myldEjOB|0|^dDEILj
z9X8feJ|N`euP=aa{na%`0#7!G4>tk3>3Fr33^^QsxyDFhwuoU<$jX0)y7|}S&VS(v
zO^a!wdJc#{QLRPWk+;D=5J!KjTN7J!Dd=h*Q1Sd<^(b)=jKD!!6p`m5z(GX`AFw1j
z(xjRxo;5#`BaMg3nHMtB{^1D{&EK2Y@;op2J_v~j+Ez;ToCT6x);4fFD|zXFG@v3#
z)7q>X^E|iu5|Tl7iCvClQA0(e3w&km)mwr$adDlXNx3hpkrb`6Lm0%U%~B7~LHpPX
zE(f5j%^?R~^3H9o21{1ggQ~=XTolX#=6<hM&ld7ZmvJDO%~STxA0xzdJv25y3qq>|
zL@1x6BRL7VZftU>f&?mB<*4Y$9SV%Blusx^0y<VDMVQ<#z6?UR<ATH{;Pc-BjsEu%
zYe1(7e9PptzB`pE8+gtCUx+4>>G_m58gs~(o?>6LgF!2iOCV4N`~k@d+D0BOAYSpw
zS=Y&8h?;qmjWa9<rmLtfl8mLOs6nuVIv+(!{7btCRPcY&Jov*Z`}6CNU&*OmI3Fnf
z4OU7tjJ(RI=$;=V@kOeDxIVj?xK^T03L5*5v<}#T<t);UefMS?%Rk};j*+W`PqBf!
z9}HG)^tb#A`ie0eCOZ2JaJhfs4uBJuRy{x6I=R<X)C`TOr=zCWlZ#9bZV-)UMbkPO
zzkMuGUMG-=96yr5D&4wCtN<yJptMe5vH#%-Kk;F%U6-q`p}|!}fB4ij5Ox8=6%@qz
zlJ3wn2Nz{~k>XxRhuU%g@vas}#{F!E0ihR@g_ZYAlv}|2U!ZF>gq9w^3Lh-BB?Kl<
zV(d7~^n@W%;>Sj<M+_8V1nB=IV|*I)4OJfi*c9f8GG7fYeUP&GBSI@l3vB=p7QfUw
zCGHADNob(Ohi-E^9*f3o1(5tPH6_G=js$%21w7&i4j?n|qfJc~{2i-P<^$pa{s{LQ
z!WtCo`*gxUuq&|@M@|Kupvo6Ou)XoaE-YbFbRdaiYiV3CtOcZ5bC43*DaCgZ1VR*P
zs&QU%Y6Kx_fADf32A22waVRu`icS@)g-{T7WZQ&|Ef^nYppAwAp1k=KzX=jp5NnUk
zFAuTc1&(iCeSYRdaLd6>0ObGb<Uae5Fd4eRoxFsCZULw9k8+!&qNVNK1fwxFRF0cu
zJSluZ_gYx78Z@nZXSGQjZu~ZdRkf6?2ypU{tavPqfr_Y=<uPU<7ro*nxp{1R!R0ph
z2Ae`5rAp-;dXf+1V+Fc@I_c>aNhn~FithVEQi!QUhgj7k!k2CKaS%g8&G=#`$#c66
zWX%ti<|!vf6|jL%9LA1j4V)%^e<-g<sp-sCYH6e}z2c_I_e8+E6p+@(LK3g3`xrpp
zP%4@qAf`7>z4(MIx!smxq^?MF7*i0^D|G-=mEMiKhSsqc+>FF_K771FkV?(UVP<cq
z7%^6QAUs-WOJKw0P>dHKVGDd4k5Z&+Er|BB789ttLn*p<(2MXzz&H*H$D(GG*-g@%
zMcF57fnRq`!>#DgFM!M9hK7o6Ho`Wve8EE2JIY7EfL$O>)QxwX_8R?~`#DYbk(Ki2
z!z5^`9E~}Cx+xSgZ^4{^@MA@{2{&`{T(@2&t#Pe#(`c8b-O@-Fxvk}t(70C?qy}c?
z%A@qb@!76m%srtN9ArmPc{3aY_JEM527)$_N|K(8*!OsW-~y3Y9dv&^L6!<>O5ty0
z*u0Z;Kqz&uv?R72F7URIGCB;u!fx8`BnK%VS>DD)QUo=N8sF>k@tez_GA>V3MsgQr
z0QPbsf>K7LDaFqKKEZ}hEboR-xKW&Ypp$?Cah1t-<iuMaA#UoSB_C-70dirfei2EL
zjV!<$XnlLQoNW5AS-OI?@&4#2IaQw*{QeG&Fd**lnVZU4*v;e&KuP#Olwk!sh!-VY
z%F-7#Uk!;rczhKp9Nq^#G7rn_EQJUV+Zq2M%Bx_1M1atUIy!usQTB<wl;x^JTCOsC
zjJJ`CUI~+Ur%sUXRNbv8&Tl@S{Gow^Y(SYk6PK=fE{p<8gNtS3-Wrln`MiTVDJ$;n
z9OdzNDS$Bd;4E*8lWT~N`z@hN8Y9GiJa~}`S%y?JEPAAv%@Po=&T|!wdBnTj6mq+O
zs<(lvO|$2cDD^mys&03^ElVjf1p?=XPq;9p&H#S^Sc_}#r%`6$2iQPqoarYHle_!R
zvPT0^adkwKvSGiHj$UNW4p>p-X9ZBC-|0m+364FS03qmp4n3BxJD?g^D|>RYJfj5@
zy&pb&m{Nfm2`VqJ4-qLv`+r9^mE9euhV~|_=_BZv6lqx>i~faTCBe<GsEwNw;TySz
zz|ByJgvq`NBg-Qj$6kM*KE72)h4uZ+{{tM;+jx}Co9h?*x@z8*|5Ms*l}mZ!99^j&
zb<%eH*DS@~f0GUr`oWn=@Orp(Y20gcAWH}OCH_~ngxU7}P_1xgRX&Daz}GWccCzv#
zmvZf|>y*I>JBjO5_*2BC@r^7~Uf{$iKN~H{d@qq$KR%$aBpUkr5UCfJWtWr};Q(^=
zj{5Izk($g7ng!6}N5oCt70IKuL9+tCk95BB2mJ_!t(R{64f^ZNSp6%;E7QM{)s=O<
zfqXaB^ShuQ8oZvpo38ev1I+>s^7%+Z+<N2FS+muR^oig38G^yBi<MIwe}n({Xh5?-
z5Zd@q7H!=9N@?;*&6NGL8oby#gv)<<cx4oS8dQeHt_0Rs3mS1;(X2s%6msh%2)c)v
z(f}|rLsG31tBsk@_8-6+TrSksS#7gZYNcv2wWv(jv@;?US`{IQT(;qZ8OHW4n8`0I
zQy{~B#>vW2`7*tk@s3e<!h+JdD=~$Jyoi8H35&MDg_;Oq+wP41G?i_}?kCYoD5mo8
zl7JxPxaO$t4vQzz*_X9Tn}(!vWUE_LkmYIvqi?oKj1ZMlFUk#mTYQ<RoMO)5DR~&z
z;S{q1JNsQ`dK5O37c)DGU3Pm@)uQ{(?5^f)idA92y`K*X&sPQ(@voI%vAy4?JYINe
z+9-DST#vW4_$N$R)5utP(AedUm2BBXC9|v*#dmI%jO7*wS9{v)TFiE$kIq)eEV#o4
z*AA__cO#V-QPV<e%r%~JJyL-+Zen-Sc=KkD>8*2X%-^}=S!i|pXIJHxB+u=)7COv=
zG&^f;rBiQMXcbB-tQhoW30p24Nh>TqCuF%7-Lo5S%an1lR{TwCcY5byPgb2cb77P8
z-Is;**K9+d8pda|u2`a15aYIq=eyLnl{^!lYFX~R@%cniK>8&kNr7)|<t*s3Gmlz6
zU|4V~DYkh(-1FKW$&^*R+3or9EONEg@M3{1aqYSMPofV}4ka*Zcz)emD#yX8_EW8~
zS=I9$JI;7qINmfQxa6jlE?5&+V|E>P+0-~7!hFJD(Lw~bW~OZKZ5{AK_U+rtPYViL
zZOy_Wal5O#E!WDW3I}9UJf;>CVK9b{YJ^LkH1?9EZD{R?5clgG1;;)$?w1b7uV)tg
zAm&*&{p{Sj(uqSShoN78MxzfLZ4@lKBy`{6LBY8SCEXZPk^3B19-}fc-rCaU+0{rN
zQO;qhmwc9Q`y6H8_1!A}ty8DjkCMqB47)CihE&~aYO4b^5R_gSKWZ@*5crlJ9zx_f
zuGOy$Qfmy9X9XSZc~vPar%)+bd&>!x<vLBvq`YFdE@ttgEK{!KV(cPX?M{F7BDQ)_
z;HQhr>SEzf#m?nk>q@i9#gzH77L;8%`f*2#N;LE1niAg1Fa8F?81d%wL(0peDxP)(
z*ey>KcFp)<U)<E_(b<IwR9hZWuXP1KJ$zH?9wC^0$DH}s!25S3kPF*H(s&;vA+qr!
zEu5Go^+iti+*LQ~o&27e`#{LphpP!ouL)~ECu1t?c1rDh=(g`58wU-Oe(Tv*FV*|l
zc{=B?^7pWJcDz1x9D-P_2?09&v#Qt6w|YIJdMOQSUs!7HIEq=AxG8*v^HS2p$D21j
zJTdOgs+<gTXkX>+$dVa(2BOZ_4mN`R{9$ice?GQ#3*Wx&$l_+URp#4?uC(ixo{XzK
zn7uOsOJ)NW@hx6gw-OU-DwBe@I`YvwmY{tH>ZS~6P|WKh1VgSVDu=ytN=p?*1HQ$C
zfmEmVZ;~w6o38HqcGW%j2^`&g_?Cd*DYUi7xtUX6=LdxESF#bQ%=bQo(VQ-0Bog??
z<_BC}#Y`HpY*8mhSK#hExZl6U3!ORnYMDwIj?g|kprjf6J^@zrc>3^bmC$2#_j!F`
zN1uYG<vhAq$bK_h`PD2J;k8S`PyPO(f%Zo*c(k|ta`4cjJ+!D>R0n7FvUr{w!z~K)
z5a?#Mj2UHI`aX-}{679+`;U>8&P#9g=sb5uxjjMaVU261^OI*n=GqO{-tgXsZQCz&
zM8U86;@h?RuvEH*_q;;eIX~~?PzbyGvgHtJ%5AS;#6USciifJ=`{;peW+EG!+X}6C
z>Fk74mBgJBvM<{TBD@g~F(<~3KIwl=v#K&{{TgXJJI-Bxu65M$!Kg0c{2?D$s+Q`-
z?XP_}d||2U^fQqe1ci&Oq9{7#rCEWc@mENm)iW9jK0{k(?ssirr)oZ%xL{b5rN2VA
z>~7vVnwgx$I=T9SaY@C{d_a9BbumGI<;sA?XBdq#$4)8*FMhfDop4@*?7Rz=V&++j
zHzwJLGm>xpYfe_&TYL0&`xD;2QEl1qo|e;^Rd4M(rbeD1xMZ5ACX3uAWu)SlPG797
zJ?AVEy7s}Q@7fQ&_YJ$Ql;05kkzwl38Twhswl9CkWr=%$(`S%vX;7h1rCSAkarO8c
z#K);*1G?*3y9le99aFnx0(v~O_A6V?%ROwn+@~KC*;#R(PT3e2W@DP`+MC-78f!aU
zYtu)a7I}eC`+YxGl<HQvca#53xvj+bT+10J?dw0}8cYJ4{LK`tc=PUEn?E_}BqzC(
z|8Y~}u1d|W@+!E&5x*&BD%>Ue#07<#AY$hE)$%6o0d<9e&#-Nmm{%PUx{MbqTZit*
z&A7%GY(>$~>s{FPaj}PrkkM`}i*EUnDBSYpQ=Q)TrS2<hrNtL4lv}>kpgrAlC4L|y
zGMtcordj>O^`e3YEpk0&$j9CH(71H{l!&L9+qxUl5~kPE=2wqPTtaumRgWW^Qt`v*
zJA&?eXw}Ykxb|MR*EU_byDq1KHfkI>*L3sfkBNcgQsnf@(mRXZrEa4rlONolxn4<~
oHH)u>2YBzHm1W3uV_w~I<N4sIPjAv`D)3M9^cmI6lUIHI2a3US!vFvP

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


From b13fbbb9fcee1f0c4cedb5e5a05db2cb6f16a4a8 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Mon, 12 Nov 2012 11:06:48 +0100
Subject: [PATCH 1626/2585] preparing tomake links to the webpagetest service
 in the vosa guide

---
 .../vizrt/vosa-handbook/graphics/webpagetest.png | Bin 0 -> 3551 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/graphics/webpagetest.png

diff --git a/usr/share/doc/vizrt/vosa-handbook/graphics/webpagetest.png b/usr/share/doc/vizrt/vosa-handbook/graphics/webpagetest.png
new file mode 100644
index 0000000000000000000000000000000000000000..a601a153ccb6956c37049db267b5448254459956
GIT binary patch
literal 3551
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
Xb8vIX1m2nPj{%JJ@90(Cc8mERzFoyZ

literal 0
HcmV?d00001


From c2328589ceccf01cb26936b8af35079dd3e4bef9 Mon Sep 17 00:00:00 2001
From: Debashis Paul <Dpaul@vizrt.com>
Date: Mon, 12 Nov 2012 17:10:59 +0100
Subject: [PATCH 1627/2585] added documentation for adding new nodes to monitor

---
 usr/share/doc/vizrt/vosa-handbook/monitoring.org | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/monitoring.org b/usr/share/doc/vizrt/vosa-handbook/monitoring.org
index bbfdd7d8..77bb70ce 100644
--- a/usr/share/doc/vizrt/vosa-handbook/monitoring.org
+++ b/usr/share/doc/vizrt/vosa-handbook/monitoring.org
@@ -41,6 +41,9 @@ weeks and months.
 The address to your Munin instance is is:
  http://<%= trail_monitoring_host %>.<%= trail_network_name %>/munin/
 
+You can add/edit server nodes to monitor here in the monitoring server -
+/etc/munin/munin-conf.d/escenic.conf
+
 ** Icinga (enhanced Nagios)
 Icinga gives a good overview of the current health of the
 habitat. Head over to
@@ -50,5 +53,14 @@ also the place were you'll schedule any maintenance work you do to
 prevent unnecessary alerts filling up your mobile phone and email
 inboxes.
 
-
+check_mk plugin for nagios does the automated monitoring configuration, which saves a lot of manual configuration effort. If you need to add/edit new nodes to monitor then-
+- Add/edit node entry in /etc/check_mk/main.mk file
+- Create Inventory of the new checks -
+#+BEGIN_SRC text
+# check_mk -I
+#+END_SRC
+- Update the checks for check_mk -
+#+BEGIN_SRC text
+# check_mk -O
+#+END_SRC
 

From 0cdf1d92acb5f749550239dc9b913fc1241bc5b8 Mon Sep 17 00:00:00 2001
From: Debashis Paul <Dpaul@vizrt.com>
Date: Mon, 12 Nov 2012 17:28:10 +0100
Subject: [PATCH 1628/2585] escape character handled for '_'

---
 usr/share/doc/vizrt/vosa-handbook/monitoring.org | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/monitoring.org b/usr/share/doc/vizrt/vosa-handbook/monitoring.org
index 77bb70ce..d0bea287 100644
--- a/usr/share/doc/vizrt/vosa-handbook/monitoring.org
+++ b/usr/share/doc/vizrt/vosa-handbook/monitoring.org
@@ -54,12 +54,12 @@ prevent unnecessary alerts filling up your mobile phone and email
 inboxes.
 
 check_mk plugin for nagios does the automated monitoring configuration, which saves a lot of manual configuration effort. If you need to add/edit new nodes to monitor then-
-- Add/edit node entry in /etc/check_mk/main.mk file
+- Add/edit node entry in /etc/check\_mk/main.mk file
 - Create Inventory of the new checks -
 #+BEGIN_SRC text
 # check_mk -I
 #+END_SRC
-- Update the checks for check_mk -
+- Update the checks for check\_mk -
 #+BEGIN_SRC text
 # check_mk -O
 #+END_SRC

From 9e32164899d5143388e91d057379356cf2bfd6c0 Mon Sep 17 00:00:00 2001
From: Debashis Paul <Dpaul@vizrt.com>
Date: Mon, 12 Nov 2012 17:56:18 +0100
Subject: [PATCH 1629/2585] escape character handled for '_'

---
 usr/share/doc/vizrt/vosa-handbook/monitoring.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/monitoring.org b/usr/share/doc/vizrt/vosa-handbook/monitoring.org
index d0bea287..6cf61b1b 100644
--- a/usr/share/doc/vizrt/vosa-handbook/monitoring.org
+++ b/usr/share/doc/vizrt/vosa-handbook/monitoring.org
@@ -53,7 +53,7 @@ also the place were you'll schedule any maintenance work you do to
 prevent unnecessary alerts filling up your mobile phone and email
 inboxes.
 
-check_mk plugin for nagios does the automated monitoring configuration, which saves a lot of manual configuration effort. If you need to add/edit new nodes to monitor then-
+check_\mk plugin for nagios does the automated monitoring configuration, which saves a lot of manual configuration effort. If you need to add/edit new nodes to monitor then-
 - Add/edit node entry in /etc/check\_mk/main.mk file
 - Create Inventory of the new checks -
 #+BEGIN_SRC text

From 1b2b2688010c2980ac77e2388b733d521e5f205a Mon Sep 17 00:00:00 2001
From: Debashis Paul <Dpaul@vizrt.com>
Date: Mon, 12 Nov 2012 17:57:44 +0100
Subject: [PATCH 1630/2585] escape character handled for '_'

---
 usr/share/doc/vizrt/vosa-handbook/monitoring.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/monitoring.org b/usr/share/doc/vizrt/vosa-handbook/monitoring.org
index 6cf61b1b..46012023 100644
--- a/usr/share/doc/vizrt/vosa-handbook/monitoring.org
+++ b/usr/share/doc/vizrt/vosa-handbook/monitoring.org
@@ -53,7 +53,7 @@ also the place were you'll schedule any maintenance work you do to
 prevent unnecessary alerts filling up your mobile phone and email
 inboxes.
 
-check_\mk plugin for nagios does the automated monitoring configuration, which saves a lot of manual configuration effort. If you need to add/edit new nodes to monitor then-
+check\_mk plugin for nagios does the automated monitoring configuration, which saves a lot of manual configuration effort. If you need to add/edit new nodes to monitor then-
 - Add/edit node entry in /etc/check\_mk/main.mk file
 - Create Inventory of the new checks -
 #+BEGIN_SRC text

From 44b27f0fa07960a01253e19ac5bc8884f931a804 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 12 Nov 2012 12:23:25 +0100
Subject: [PATCH 1631/2585] - the use of sudo in
 monitoring::install_escenic_munin_plugins made it   fail on all systems not
 using sudo, such as RedHat/CentOS and   Debian. Also, the sudo is redundant
 as ece-install insists on being   run as root.

- replaced tee with standard redirect, otherwise, the munin stanzas
  are written in between the standard ece-install output
---
 usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index caaa0949..fa548cd9 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -280,7 +280,8 @@ EOF
 
 function install_escenic_munin_plugins() {
   if [ ! -r /etc/munin/plugin-conf.d/escenic-munin-plugins ] ; then
-    (echo '[escenic_*]'; echo 'user escenic') | sudo tee /etc/munin/plugin-conf.d/escenic-munin-plugins
+    (echo '[escenic_*]'; echo 'user escenic') > \
+      /etc/munin/plugin-conf.d/escenic-munin-plugins
   fi
 
   if [ $on_debian_or_derivative -eq 1 ]; then

From 2fd7f2c608428062d34394589904a59b1429b18b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 12 Nov 2012 12:29:51 +0100
Subject: [PATCH 1632/2585] - spell checking - uppercased some acronyms

---
 usr/share/doc/vizrt/vosa-handbook/vmeo.org | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vmeo.org b/usr/share/doc/vizrt/vosa-handbook/vmeo.org
index 0ecc1a86..7d343f66 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vmeo.org
+++ b/usr/share/doc/vizrt/vosa-handbook/vmeo.org
@@ -6,8 +6,8 @@ VME-Online is a content mangement system and online publishing system for Video.
 
 ** Video file handling
 VME-O offers many interfaces to ingest video into the VME-O system.
-After ingest the video's have the following state:
-- The video's are stored in their original format.
+After ingest the videos have the following state:
+- The videos are stored in their original format.
 - All available meta information is available through the UI and API.
 - All transcoding to preconfigured target variants is stated.
 
@@ -17,13 +17,13 @@ The following ingest interfaces are used by SOLARtv:
 
 The following ingest interfaces are available but not used by SOLARtv
 - Mobile ingest (Viz reporter) :: Several apps on iphone and nokia are available to upload video content over slow mobile networks or faster wifi connections when available to the device. 
-- Webservice ingest :: A REST webservice is available to push meta information of video content including a uri that will be ued by VMEO to fetch the video for ingestion.
+- Webservice ingest :: A REST webservice is available to push meta information of video content including a URI that will be ued by VMEO to fetch the video for ingestion.
 - Ingest formats :: VME-O has a long list of video formats it is able to ingest.
 
 *** Transcoding
-Many Web browsers on PC's, pads and smartphones are not capable of playing the VME-O house format. It is eather to big or of the wrong binary format. This is why VME-O can be configured to transcode video's to various alternative formats and sizes to allow for a veriety of devices to play them.
+Many Web browsers on PCs, tablets and smart phones are not capable of playing the VME-O house format. It is either to big or of the wrong binary format. This is why VME-O can be configured to transcode videos to various alternative formats and sizes to allow for a variety of devices to play them.
 
-Transcoding typically is quite cpu intensive. For this reason it makes no sense to transcode more than the amount of processors in a box in parrallel. VME-O has a queing mechanism to ensure that it is not overloaded. More transcoding capacty can be added by deploying more transcoding machines to the cluster.
+Transcoding typically is quite CPU intensive. For this reason it makes no sense to transcode more than the amount of processors in a box in parrallel. VME-O has a queuing mechanism to ensure that it is not overloaded. More transcoding capacty can be added by deploying more transcoding machines to the cluster.
 
 At SOLARtv transcoding is done by vmeo-controller
 
@@ -43,7 +43,11 @@ At SOLARtv transcoding is done by vmeo-controller
 - the RealVideo Format 
 
 *** Publishing
-Video files are most commonly served to clients using the HTTP protocol. The DiRetriever webservice on the controller is available for clients to choose the right variant. HTTP requires no special configuration other than allowing clients to acess the vmeo-delivery server on tcp:80
+Video files are most commonly served to clients using the HTTP
+protocol. The DiRetriever webservice on the controller is available
+for clients to choose the right variant. HTTP requires no special
+configuration other than allowing clients to access the vmeo-delivery
+server on TCP port 80
 
 In cases where the DiRetriever decides to direct a client to a video stream it uses:
 - Real Time Streaming Protocol (RTSP) :: is a network control protocol designed for use in entertainment and communications systems to control streaming media servers. The protocol is used for establishing and controlling media sessions between end points. Clients of media servers issue VCR-like commands, such as play and pause, to facilitate real-time control of playback of media files from the server. The transmission of streaming data itself is not a task of the RTSP protocol. Most RTSP servers use the Real-time Transport Protocol ([[http://en.wikipedia.org/wiki/Real-time_Transport_Protocol][RTP]]) in conjunction with Real-time Control Protocol ([[http://en.wikipedia.org/wiki/RTCP][RTCP]]) for media stream delivery, however some vendors implement proprietary transport protocols. The RTSP server from RealNetworks, for example, also features RealNetworks' proprietary Real Data Transport ([[http://en.wikipedia.org/wiki/Real_Data_Transport][RDT]]). RTSP usually needs TCP:554 to be routed between the clients and the vmeo-delivery server. This port is often opened on corporate firewalls to allow for clients to access RTSP streams.
@@ -51,7 +55,7 @@ In cases where the DiRetriever decides to direct a client to a video stream it u
 
 
 ** Live video feeds
-VMEO can handle video feeds from various sources such as SDI or ip feeds.
+VMEO can handle video feeds from various sources such as SDI or IP feeds.
 
 *** Encoding
 Incoming video feeds are encoded on the fly by vmeo-controller and made available to the various streaming options on vmeo-delivery. The feeds are pushed using the <vmeostreaming protocol> over tcp-i port 234.

From a845c95ea11fea3c2721e87072ab1932c7d16fbf Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 12 Nov 2012 16:50:17 +0100
Subject: [PATCH 1633/2585] - removed /binary as The Adactus access point as
 we're not using this   at current projects (we've come up with a better
 approach to the   VMEO integration).

---
 .../doc/vizrt/vosa-handbook/cache-server.org  |  1 -
 .../ece-scripts/ece-install.d/web-server.sh   | 23 +------------------
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/cache-server.org b/usr/share/doc/vizrt/vosa-handbook/cache-server.org
index d6b5c666..f220e7b9 100644
--- a/usr/share/doc/vizrt/vosa-handbook/cache-server.org
+++ b/usr/share/doc/vizrt/vosa-handbook/cache-server.org
@@ -24,7 +24,6 @@ your habitat:
 | /studio        | Content Studio                     |
 | /webservice    | Escenic Content Engine Web service |
 | /munin         | The Munin overview                 |
-| /binary        | The Adactus access point           |
 |----------------+------------------------------------|
 
 ** Useful features for debugging
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/web-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/web-server.sh
index d29fc1be..df15a0b6 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/web-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/web-server.sh
@@ -28,13 +28,6 @@ function install_web_server()
 server {
   listen ${port} default;
   access_log  /var/log/nginx/localhost.access.log;
-
-  # Typical endpoint for Adactus/Mobilize to get the videos to
-  # transcode.
-  location /binary {
-    root $escenic_data_dir;
-    index index.html;
-  }
 }
 EOF
   elif [ $1 -eq 1 ]; then
@@ -61,25 +54,11 @@ server {
     root /var/cache/munin/www;
     index index.html;
   }
-
-  # Typical endpoint for Adactus/Mobilize to get the videos to
-  # transcode.
-  location /binary {
-    root $escenic_data_dir;
-    index index.html;
-  }
 }
 EOF
   fi
   
   run /etc/init.d/nginx restart
 
-  if [ $1 -eq 0 ]; then
-    add_next_step "http://${HOSTNAME}:${port}/binary gives the Adactus endpoint"
-  elif [ $1 -eq 1 ]; then
-    add_next_step "http://${HOSTNAME}:${port}/ gives the Munin interface"
-  elif [ $1 -eq 2 ]; then
-    add_next_step "http://${HOSTNAME}:${port}/       gives the Munin interface"
-    add_next_step "http://${HOSTNAME}:${port}/binary gives the Adactus endpoint"
-  fi
+  add_next_step "http://${HOSTNAME}:${port}/ gives the Munin interface"
 }

From 24a79d423e1ac28cbf533b7cfeb123c54f90f698 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 12 Nov 2012 17:16:47 +0100
Subject: [PATCH 1634/2585] - improved Varnish configuration with several
 features we've   implemented at recent customer projects:

  -- serving stale content when the backend is down
  -- compressing content (gzip-ing it), this closes #108
  -- automatic robots handling on the beta version of any web
     site. This is to prevent indexing bots like Google Bot to index
     test/beta content
  -- handling re-directs from e.g. www.mysite.com to
     mysite.com. ece-install will set up re-directs TO the
     FQDN you'e got in your fai_publication_domain_mapping_list

- removed support for Varnish 2.x, ece-install now insists on using
  Varnish 3.

- improved feedback message
---
 .../ece-scripts/ece-install.d/cache-server.sh | 433 ++++++++++++++----
 .../ece-scripts/ece-install.d/monitoring.sh   |   2 +-
 2 files changed, 348 insertions(+), 87 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
index 9a7cbf98..e085a066 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
@@ -58,7 +58,10 @@ function install_varnish_software() {
     force_packages=1
     install_packages_if_missing varnish
     force_packages=${old_force_packages}
+  else
+    install_packages_if_missing varnish
   fi
+  
   assert_pre_requisite varnishd
 }
 
@@ -77,12 +80,12 @@ function install_cache_server() {
     read backend_servers
     cache_port=$default_cache_port
   else
-    backend_servers=${fai_cache_backends}
+    backend_servers=(${fai_cache_backends})
     cache_port=${fai_cache_port-$default_cache_port}
   fi
 
   if [ -z "$backend_servers" ]; then
-    backend_servers="localhost:${appserver_port}"
+    backend_servers=("localhost:${appserver_port}")
   fi
 
   set_up_varnish $backend_servers
@@ -91,70 +94,76 @@ function install_cache_server() {
   add_next_step "Cache server is up and running at http://${HOSTNAME}:${cache_port}/"
 }
 
-function set_up_varnish()
-{
-  print_and_log "Setting up Varnish to match your environment ..."
-  run /etc/init.d/varnish stop
-
-  # we need to swap standard err and standard out here as varnishd -V
-  # for some reason writes to standard error.
-  local using_varnish_3=$(varnishd -V 3>&1 1>&2 2>&3 | grep varnish-3 | wc -l)
+function set_varnish_port() {
+  log "Setting Varnish to listen on port" ${cache_port} "..."
   
   local file=/etc/default/varnish
   if [ $on_redhat_or_derivative -eq 1 ]; then
     file=/etc/sysconfig/varnish
   fi
-  
-  run sed -i -e "s/6081/${cache_port}/g" \
-    -e 's/^START=no$/START=yes/' $file
 
-  cat > /etc/varnish/default.vcl <<EOF
-/* Varnish configuration for Escenic Content Engine              -*- java -*- */
+  run sed -i -e "s/6081/${cache_port}/g" -e 's/^START=no$/START=yes/' $file
+}
 
-/* IPs that are allowed to access the administrative pages/webapps. */
-acl staff {
-  "localhost";
+function create_varnish_conf_main() {
+  # first, we define the main VCL file where all the others are included
+  cat > ${varnish_conf_dir}/default.vcl <<EOF
+/* Varnish configuration for Escenic Content Engine          -*- java -*-
+ * generated by $(basename $0) @ $(date)
+ *
+ * The order of the VCL file inclusion is significant.
+ */
+include "host-specific.vcl";
+include "backends.vcl";
+include "access-control.vcl";
+include "request-cleaning.vcl";
+include "cache-key.vcl";
+include "serve-stale-content.vcl";
+include "compression.vcl";
+include "robots-on-beta.vcl";
+include "cookie-cleaner.vcl";
+include "caching-policies.vcl";
+include "varnish-hacks.vcl";
+include "redirects.vcl";
+include "cache-statistics.vcl";
+include "error-pages.vcl";
 EOF
-  for l in $(get_privileged_hosts); do
-    cat >> /etc/varnish/default.vcl <<EOF
-  # Privileged host (either doing the ece-install or listed as such)
-  "${l}";
-EOF
-  done
-  
-  cat >> /etc/varnish/default.vcl <<EOF
 }
 
-/* The IP of the Adactus/Mobilize server */
-acl adactus {
-  "203.33.232.216";
-}
 
-/* Our web server for serving static content */
-backend static {
-  .host = "localhost";
-  .port = "81";
+function create_varnish_conf_host_specific() {
+  local file=${varnish_conf_dir}/host-specific.vcl
+  cat > $file <<EOF
+sub vcl_deliver {
+  set resp.http.X-Cache-Host = "${HOSTNAME}";
 }
-
 EOF
-  local i=0
-  for el in $backend_servers; do
-    appserver_id=$(echo $el | cut -d':' -f1 | sed 's/-/_/g')
-    appserver_host=$(echo $el | cut -d':' -f1)
-    appserver_port=$(echo $el | cut -d':' -f2)
+}
 
-    cat >> /etc/varnish/default.vcl <<EOF
+function create_varnish_conf_backends() {
+  
+  local file=${varnish_conf_dir}/backends.vcl
+  echo > $file
+
+  # first, define the ECE and EAE backends
+  for (( i=0 ; i < ${#backend_servers[@]}; i++ )); do
+    local old_ifs=$IFS
+    IFS=':'
+    read appserver_host appserver_port <<< "${backend_servers[$i]}"
+    appserver_id=$(echo $appserver_host | sed 's/-/_/g')
+    IFS=$old_ifs
+
+    cat >> $file <<EOF
 backend ${appserver_id}${i} {
   .host = "$appserver_host";
   .port = "$appserver_port";
 }
 
 EOF
-    i=$(( $i+1 ))
   done
 
   if [ -n "${fai_analysis_host}" ]; then
-    cat >> /etc/varnish/default.vcl <<EOF
+    cat >> $file <<EOF
 backend analysis {
   .host = "${fai_analysis_host}";
   .port = "${fai_analysis_port-${default_app_server_port}}";
@@ -163,101 +172,353 @@ backend analysis {
 EOF
   fi
 
-  cat >> /etc/varnish/default.vcl <<EOF
+  # define a load balacner with session binding
+  cat >> $file <<EOF
 /* The client director gives us session stickiness based on client
  * IP. */
 director webdirector client {
 EOF
 
-  i=0
-  for el in $backend_servers; do
-	  appserver_id=$(echo $el | cut -d':' -f1 | sed 's/-/_/g')        
-    cat >> /etc/varnish/default.vcl <<EOF
+  for (( i=0 ; i < ${#backend_servers[@]}; i++ )); do
+	  appserver_id=$(echo ${backend_servers[$i]} | cut -d':' -f1 | sed 's/-/_/g')        
+    cat >> $file <<EOF
   {
      .backend = ${appserver_id}${i};
      .weight = 1;
   }
 EOF
-    i=$(( $i+1 ))
   done
 
-  cat >> /etc/varnish/default.vcl <<EOF
+  # make use of the backends
+  cat >> $file <<EOF
+}
+sub vcl_recv {
+  /* This is the default backend */
+  set req.backend = webdirector;
+
+EOF
+
+  if [ -n "${fai_analysis_host}" ]; then
+    cat >> $file <<EOF
+  if (req.url ~ "^/analysis-logger/") {
+    set req.backend = analysis;
+  }
+EOF
+  fi
+  
+  echo "}" >> $file
+}
+
+function create_varnish_conf_access_control() {
+  local file=${varnish_conf_dir}/access-control.vcl
+  cat > $file <<EOF
+/* IPs that are allowed to access the administrative pages/webapps. */
+acl staff {
+  "localhost";
 }
 
 sub vcl_recv {
   if (!client.ip ~ staff &&
-      (req.url ~ "^/escenic" ||
+      (req.url ~ "^/escenic/" ||
        req.url ~ "^/studio" ||
        req.url ~ "^/munin" ||
        req.url ~ "^/webservice" ||
        req.url ~ "^/escenic-admin")) {
-     error 405 "Not allowed.";
+    error 405 "Not allowed.";
   }
+}
+EOF
+}
 
-  /* Only Adactus/Mobilize is allowed to access the /binary context
-   * which contains all the full quality video files. */
-  if (!client.ip ~ adactus && req.url ~ "^/binary") {
-    error 405 "Not allowed.";
+function create_varnish_conf_request_cleaning() {
+  local file=${varnish_conf_dir}/request-cleaning.vcl
+  cat > $file <<EOF
+sub vcl_recv {
+  /* Normalize the User-Agent headers here (if you want) */
+}
+EOF
+}
+
+function create_varnish_conf_cache_key() {
+  local file=${varnish_conf_dir}/cache-key.vcl
+  cat > $file <<EOF
+sub vcl_hash {
+
+  /* Manipulate the cache keys here, e.g. if you've normalised the UA
+   * strings and want to inclue the UA string in the hash */
+}
+EOF
+}
+
+function create_varnish_conf_serve_stale_content() {
+  local file=${varnish_conf_dir}/serve-stale-content.vcl
+  cat > $file <<EOF
+backend unhealthy {
+  .host = "127.0.0.1";
+  .port = "1";
+  .probe = {
+    .url = "/fake.html";
+    .interval = 600s;
+    .timeout = 0.1s;
+    .window = 1;
+    .threshold = 1;
+    .initial = 1;
+  }
+}
+
+sub vcl_recv {
+  /* We accept up to this old data, if backends for some reason
+   * don't deliver (fresh) content, typically when they're down */
+  set req.grace = 2h;
+
+  if (req.http.unhealthy && req.http.unhealthy == "true" ) {
+    set req.backend = unhealthy;
   }
+}
 
-  if (req.url ~ "^/munin") {
-    set req.url = regsub(req.url, "^/munin", "/");
-    set req.backend = static;
+sub vcl_fetch {
+  /* Store objects 1 hour after they are due to be purged for
+   * grace-purposes (this means that we've got 1 hour to serve stale
+   * content in case of failing backends).
+  */
+  if (beresp.status == 200) {
+    set beresp.grace = 1h;
+  }
+  else if (beresp.status >= 500) {
+    /* For this URL, don't ask the backend again for this amount of
+     * time. */
+    set beresp.saintmode = 60s;
+    return(restart);
   }
+}
+
+sub vcl_error {
+  /* If we're serving a 503 and haven't restarted (this means the
+   * backend is down, 503 is the typical Varnish 'guru meditation',
+   * try to invoke grace mode. We do this by setting the backend to be
+   * the unhealthy, phony packend. This will never work, so Varnish
+   * will invoke grace mode, i.e. serve stale/old content from the
+   * previous status=200 for that URL.  */
+  if (obj.status == 503 && req.restarts == 0) {
+    set req.http.unhealthy = "true";
+    return(restart);
+  }
+}
 EOF
-  if [ -n "${fai_analysis_host}" ]; then
-    cat >> /etc/varnish/default.vcl <<EOF
-  else if (req.url ~ "^/analysis-logger/") {
-    set req.backend = analysis;
+}
+
+function create_varnish_conf_compression() {
+  local file=${varnish_conf_dir}/compression.vcl
+  cat > $file <<EOF
+sub vcl_fetch {
+  if (beresp.http.content-type ~ "^text/") {
+    set beresp.do_gzip = true;
   }
+}
 EOF
-  fi
-  
-  cat >> /etc/varnish/default.vcl <<EOF
-  else {
-    set req.backend = webdirector;
+}
+
+function create_varnish_conf_robots_on_beta() {
+  local file=${varnish_conf_dir}/robots-on-beta.vcl
+  cat > $file <<EOF
+sub vcl_recv {
+  if (req.http.host ~ "^beta\." && req.url == "/robots.txt") {
+    set req.http.marker-robots = "true";
+    error 200 "OK";
   }
+}
 
-  if (req.url ~ "\.(png|gif|jpg|css|js)$" || req.url == "/favicon.ico") { 
-    remove req.http.Cookie;
+sub vcl_error {
+  if (obj.status == 200 && req.http.marker-robots == "true") {
+    remove req.http.marker-robots;
+    synthetic {"User-Agent: *
+Disallow /
+"};
+    return(deliver);
+  }
+}
+EOF
+}
+
+function create_varnish_conf_cookie_cleaner() {
+  local file=${varnish_conf_dir}/cookie-cleaner.vcl
+  cat > $file <<EOF
+sub vcl_recv {
+  /* remove all cookies, except the poll cookie see
+   * https://www.varnish-cache.org/trac/wiki/VCLExampleRemovingSomeCookies#RemovingallBUTsomecookies */
+  if (req.http.Cookie) {
+    set req.http.Cookie = ";" + req.http.Cookie;
+    set req.http.Cookie = regsuball(req.http.Cookie, "; +", ";");
+    set req.http.Cookie = regsuball(req.http.Cookie, ";(mentometer)=", "; \1=");
+    set req.http.Cookie = regsuball(req.http.Cookie, ";[^ ][^;]*", "");
+    set req.http.Cookie = regsuball(req.http.Cookie, "^[; ]+|[; ]+$", "");
+
+    if (req.http.Cookie == "") {
+      remove req.http.Cookie;
+    }
+  }
+}
+
+sub vcl_fetch {
+  if (beresp.status == 200) {
+    remove beresp.http.Set-Cookie;
   }
 }
+EOF
+}
 
- /* Called when content is fetched from the backend. */
+function create_varnish_conf_caching_policies() {
+  local file=${varnish_conf_dir}/caching-policies.vcl
+  cat > $file <<EOF
 sub vcl_fetch {
+  /*   Cache everything for 2 minutes. */
+  if (beresp.status == 200) {
+    set beresp.ttl = 2m;
+  }
+
   /* Remove cookies from these resource types and cache them for a
    * long time */
-  if (req.url ~ "\.(png|gif|jpg|css|js)$" || req.url == "/favicon.ico") { 
+  if (req.url ~ "\.(png|gif|jpg|css|js)$" ||
+      req.url == "/favicon.ico" && beresp.status == 200) {
     set beresp.ttl = 5h;
-    remove beresp.http.Set-Cookie;
   }
 }
 
 sub vcl_deliver {
-  /* Adds debug header to the result so that we can easily see if a
-   * URL has been fetched from cache or not.
-   */
-  if (obj.hits > 0) {
+  if (req.url ~ "\.(png|gif|jpg)$" && resp.status == 200) {
+    set resp.http.Cache-Control = "public, max-age=3600";
+  }
+  else if ((req.url ~ "\.(css|js)$" || req.url == "/favicon.ico") &&
+           resp.status == 200) {
+    set resp.http.Cache-Control = "public, max-age=7200";
+  }
+}
 EOF
-  if [ $using_varnish_3 -gt 0 ]; then
-    cat >> /etc/varnish/default.vcl <<EOF
-    set resp.http.X-Cache = "HIT #" + obj.hits;
+
+  # if you've normalised the UA, add
+  # resp.http.Vary = "Accept-Encoding,User-Agent";
+  # at the end of the vcl_deliver above.
+}
+
+function create_varnish_conf_hacks() {
+  local file=${varnish_conf_dir}/varnish-hacks.vcl
+  cat > $file <<EOF
+sub vcl_deliver {
+  /* It seems that Varnish changes the Date header and the age header
+   * becomes wrong because of this. For this reason, we set the Age
+   * header to 0 to be standards compliant. */
+  set resp.http.Age = "0";
+}
 EOF
+}
+
+function get_from_domain() {
+  if [[ $1 == "^www." ]]; then
+    echo $1 | sed 's/^www.//g'
   else
-    cat >> /etc/varnish/default.vcl <<EOF
-    set resp.http.X-Cache = "HIT #" obj.hits;
+    echo "www.${1}"
+  fi
+}
+
+function create_varnish_conf_redirects() {
+  local file=${varnish_conf_dir}/redirects.vcl
+  echo "" > $file
+
+  if [ -n "${fai_publication_domain_mapping_list}" ]; then
+    echo "sub vcl_recv {" > $file
+
+    for el in $fai_publication_domain_mapping_list; do
+      local old_ifs=$IFS
+      IFS='#'
+      read publication publication_domain publication_aliases <<< "$el"
+      IFS=$old_ifs
+
+      local from_domain=$(get_from_domain $publication_domain)
+      
+      cat >> $file <<EOF
+  if (req.http.host == "${from_domain}") {
+    error 301 "Moved Temporarily";
+  }
 EOF
+    done
+
+    cat >> $file <<EOF
+}
+
+sub vcl_error {
+  /* We want both web sites to be identified by one URL, hence we make
+   * an HTTP re-direct here. See vcl_recv for how these 301 error
+   * directives.
+   */ 
+EOF
+    for el in $fai_publication_domain_mapping_list; do
+      local old_ifs=$IFS
+      IFS='#'
+      read publication publication_domain publication_aliases <<< "$el"
+      IFS=$old_ifs
+
+      local from_domain=$(get_from_domain $publication_domain)
+      
+      cat >> $file <<EOF
+  if (obj.status == 301 && req.http.host == "${from_domain}") {
+    set obj.http.Location = "http://${publication_domain}" + req.url;
+    return (deliver);
+  }
+EOF
+    done
+    
+    echo "}" >> $file
   fi
-  
-  cat >> /etc/varnish/default.vcl <<EOF
+}
+
+function create_varnish_conf_cache_statistics() {
+  local file=${varnish_conf_dir}/cache-statistics.vcl
+  cat > $file <<EOF
+sub vcl_deliver {
+  /* Adds debug header to the result so that we can easily see if a
+   * URL has been fetched from cache or not.
+   */
+  if (obj.hits > 0 && (resp.status == 200 || resp.status == 301)) {
+    set resp.http.X-Cache = "HIT #" + obj.hits + "/" + resp.http.Age + "s";
   }
-  else {
+  else if (resp.status == 200) {
     set resp.http.X-Cache = "MISS";
   }
-
   set resp.http.X-Cache-Backend = req.backend;
 }
 EOF
+}
+
+function create_varnish_conf_error_pages() {
+  local file=${varnish_conf_dir}/error-pages.vcl
+  echo "" > $file
+}
+
+function create_varnish_conf() {
+  varnish_conf_dir=${fai_cache_conf_dir-/etc/varnish}
+
+  create_varnish_conf_main
+  create_varnish_conf_host_specific
+  create_varnish_conf_backends
+  create_varnish_conf_access_control
+  create_varnish_conf_request_cleaning
+  create_varnish_conf_cache_key
+  create_varnish_conf_serve_stale_content
+  create_varnish_conf_compression
+  create_varnish_conf_robots_on_beta
+  create_varnish_conf_cookie_cleaner
+  create_varnish_conf_caching_policies
+  create_varnish_conf_hacks
+  create_varnish_conf_redirects
+  create_varnish_conf_cache_statistics
+  create_varnish_conf_error_pages
+}
+
+function set_up_varnish() {
+  print_and_log "Setting up Varnish to match your environment ..."
+  run /etc/init.d/varnish stop
+  set_varnish_port
+  create_varnish_conf
   run /etc/init.d/varnish start
 }
 
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index fa548cd9..fc79cc20 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -220,7 +220,7 @@ function install_nagios_node()
   run touch /var/run/nagios/nrpe.pid
   run /etc/init.d/nagios-nrpe-server restart
 
-  add_next_step "A Nagios NRPE node and check_mk has been installed" \
+  add_next_step "A Nagios NRPE node and check_mk have been installed" \
     "on ${HOSTNAME}"
 }
 

From 8b4aaf3cb3b001713533236186ca4384dabb3284 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 12 Nov 2012 17:21:11 +0100
Subject: [PATCH 1635/2585] - added locks. The default behaviour right now will
 then be that all   usrs of the program share the same locks. I.e. the
 'escenic' users   cannot call ece-import if cron or root is already using it.

---
 usr/bin/ece-import | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/usr/bin/ece-import b/usr/bin/ece-import
index 1afc6dad..b87fde70 100755
--- a/usr/bin/ece-import
+++ b/usr/bin/ece-import
@@ -382,6 +382,7 @@ function print_report() {
   fi
 }
 
+create_lock
 create_pid
 check_pre_requisites
 get_user_input $@
@@ -408,3 +409,4 @@ print_manual_steps
 print_report
 print_and_log "Finished @ $(date), enjoy thyself!"
 remove_pid
+remove_lock

From f1c310891b18cfb84527b0288682c94c91db29e5 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 13 Nov 2012 09:34:50 +0100
Subject: [PATCH 1636/2585] - changed create_lock to NOT make the calling
 program fail.

- added create_lock_or_fail which does the same as create_lock with
  the difference that it will make your program fail if the lock
  already exists and it will print the error to standard out as well
  as in the log.
---
 .../escenic/ece-scripts/common-bashing.sh     | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index eb25ec87..7a0df11b 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -400,13 +400,29 @@ function remove_file_if_exists() {
 lock_file=/var/run/escenic/$(basename $0 .sh).lock
 
 ## Will create a lock (and the lock's directory) for the caller. If
-## the lock already exists, this function will cause your program to
-## fail.
+## the lock already exists, this function will NOT cause your program
+## to fail. If you want to it to fail, use create_lock_or_fail
+## instead.
 ##
 ## $1 :: the lock file
 function create_lock() {
   if [ -e $lock_file ]; then
-    echo $lock_file "exists, I'll exit"
+    log $lock_file "exists, I'll exit"
+    exit 0
+  else
+    fail_safe_run mkdir -p $(dirname $lock_file)
+    fail_safe_run touch $lock_file
+  fi
+}
+
+## Does the same as create_lock with the difference that it will make
+## your program fail if the lock already exists and it will print the
+## error to standard out as well as in the log.
+##
+## $1 :: the lock file
+function create_lock_or_fail() {
+  if [ -e $lock_file ]; then
+    print_and_log $lock_file "exists, I'll exit"
     exit 1
   else
     fail_safe_run mkdir -p $(dirname $lock_file)

From 92e25dc53e940a3ccf456fec5416aee4222db6e6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 13 Nov 2012 10:21:31 +0100
Subject: [PATCH 1637/2585] - removed the user specific logs as it feels weird.

- removed the debug loop
---
 usr/bin/ece-import | 56 ++++++++++++++++++++++++++++++++++++----------
 1 file changed, 44 insertions(+), 12 deletions(-)

diff --git a/usr/bin/ece-import b/usr/bin/ece-import
index b87fde70..56742328 100755
--- a/usr/bin/ece-import
+++ b/usr/bin/ece-import
@@ -47,10 +47,7 @@ job_name=""
 log_base_dir=/var/log/escenic
 ece_scripts_version="straight-from-github"
 
-# since both regular users and root can use this command, we create
-# user specific log files. We put it in /var/log as it'll regardless
-# of user run as a deamon process.
-log=$log_base_dir/$(basename $0)-${USER-cron}.log
+log=$log_base_dir/$(basename $0).log
 nursery_base_dir=/etc/escenic/engine/common
 publication_name=""
 raw_spool_base_dir=/var/spool/escenic/raw
@@ -382,16 +379,24 @@ function print_report() {
   fi
 }
 
-create_lock
-create_pid
 check_pre_requisites
 get_user_input $@
-print_and_log "Started @ $(date), I'm logging to $log"
 
-if [[ "$command" == $COMMAND_IMPORT ]]; then
+function run_import() {
+  pid_file=${pid_file/%.pid/-run-import.pid}
+  lock_file=${lock_file/%.lock/-run-import.lock}
+  common_pre_run
+  
   verify_import_job_configuration
   import_raw_files
-elif [[ "$command" == $COMMAND_CREATE_IMPORT_CONFIGURATION ]]; then
+  common_post_run
+}
+
+function run_create_import_configuration() {
+  pid_file=${pid_file/%.pid/-create.pid}
+  lock_file=${lock_file/%.lock/-create.lock}
+  common_pre_run
+  
   if [ -z $import_archive ]; then
     if [ ${directories_only-0} -eq 0 ]; then
       create_import_configuration $publication_name $job_name
@@ -400,13 +405,40 @@ elif [[ "$command" == $COMMAND_CREATE_IMPORT_CONFIGURATION ]]; then
   else
     apply_import_archive
   fi
-elif [[ "$command" == $COMMAND_DOWNLOAD_RAW_DATA  ]]; then
+
+  common_post_run
+}
+
+function run_download_raw_data() {
+  pid_file=${pid_file/%.pid/-download.pid}
+  lock_file=${lock_file/%.lock/-download.lock}
+
+  common_pre_run
   verify_import_job_configuration
   download_latest_files
+  common_post_run
+}
+
+function common_pre_run() {
+  print_and_log "Started @ $(date), I'm logging to $log"
+  create_pid
+  create_lock_or_fail
+}
+
+function common_post_run() {
+  remove_pid
+  remove_lock
+}
+
+if [[ "$command" == $COMMAND_IMPORT ]]; then
+  run_import
+elif [[ "$command" == $COMMAND_CREATE_IMPORT_CONFIGURATION ]]; then
+  run_create_import_configuration
+elif [[ "$command" == $COMMAND_DOWNLOAD_RAW_DATA  ]]; then
+  run_download_raw_data
 fi
 
 print_manual_steps
 print_report
 print_and_log "Finished @ $(date), enjoy thyself!"
-remove_pid
-remove_lock
+

From 5d3d19d43b30a139dbbd0f9da74db96b470deac0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 13 Nov 2012 10:28:33 +0100
Subject: [PATCH 1638/2585] - moved the definitions of the pid_file and
 lock_file to the top of   the script.

- made create_lock write output to standard out as well as the log
  file if the creation fails.
---
 usr/share/escenic/ece-scripts/common-bashing.sh | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index 7a0df11b..11ebc20d 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -10,6 +10,13 @@
 
 debug=0
 
+## basename $0 will resolve to the file name of the calling script,
+## not common-bashing itself.
+lock_file=/var/run/escenic/$(basename $0 .sh).lock
+
+## Same comment as for the lock file :-)
+pid_file=/var/run/escenic/$(basename $0 .sh).pid
+
 function common_bashing_is_loaded() {
   echo 1
 }
@@ -395,10 +402,6 @@ function remove_file_if_exists() {
   fail_safe_run rm $1
 }
 
-## basename $0 will resolve to the file name of the calling script,
-## not common-bashing itself.
-lock_file=/var/run/escenic/$(basename $0 .sh).lock
-
 ## Will create a lock (and the lock's directory) for the caller. If
 ## the lock already exists, this function will NOT cause your program
 ## to fail. If you want to it to fail, use create_lock_or_fail
@@ -407,7 +410,7 @@ lock_file=/var/run/escenic/$(basename $0 .sh).lock
 ## $1 :: the lock file
 function create_lock() {
   if [ -e $lock_file ]; then
-    log $lock_file "exists, I'll exit"
+    print_and_log $lock_file "exists, I'll exit"
     exit 0
   else
     fail_safe_run mkdir -p $(dirname $lock_file)
@@ -440,7 +443,6 @@ function remove_lock() {
   fail_safe_run rm $lock_file
 }
 
-pid_file=/var/run/escenic/$(basename $0 .sh).pid
 function create_pid() {
   fail_safe_run mkdir -p $(dirname $pid_file)
   echo $$ > $pid_file

From 9f5a91db36a1011755426fbd18238ca17ff44f70 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 13 Nov 2012 11:14:25 +0100
Subject: [PATCH 1639/2585] - fix to expand_all_variables_in_org_files to get
 unicode right.  We   must read this from the sourced variable and not the
 declare   registry to get unicode encoded characters right.

---
 usr/share/doc/vizrt/vosa-handbook/create-handbook.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 801c2bcf..eeb7e844 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -122,6 +122,11 @@ function expand_all_variables_in_org_files() {
     IFS='='
     read key value <<< "$el"
     IFS=$old_ifs
+    
+    # must read this from the sourced variable and not the declare
+    # registry to get unicode encoded characters right.
+    value=$(eval echo $`echo $key`)
+
     value=$(echo $value | sed -e "s~^'~~" -e "s~'$~~")
     find $target_dir -name "*.org" | while read f; do
       sed -i -e "s~<%=[ ]*${key}[ ]*%>~${value}~g" -e "s~^'~~" ${f}

From d3384cabd99060a4fd75bac32546ad8ba1f286d6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 13 Nov 2012 11:28:01 +0100
Subject: [PATCH 1640/2585] - removed the expand_all_variables_in_org_files_old
 (this shouldn't   have been committed in the first place)

- in the new, copied expand_all_variables_in_org_files, the call to
  set_defaults_if_the_trails_are_not_set wasn't present, hence none of
  the defaults have kicked in for quite a while :-(
---
 .../doc/vizrt/vosa-handbook/create-handbook.sh  | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index eeb7e844..68a9cfd3 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -101,21 +101,8 @@ function set_defaults_if_the_trails_are_not_set() {
   trail_today_date_full=${trail_today_full-$(date)}
 }
 
-function expand_all_variables_in_org_files_old() {
-  set_defaults_if_the_trails_are_not_set
-
-  declare | grep ^trail_ | while read el; do
-    local old_ifs=$IFS
-    IFS='='
-    read key value <<< "$el"
-    IFS=$old_ifs
-    find $target_dir -name "*.org" | while read f; do
-      sed -i "s~<%=[ ]*${key}[ ]*%>~${value}~g" ${f}
-    done
-  done
-}
-
 function expand_all_variables_in_org_files() {
+  set_defaults_if_the_trails_are_not_set
 
   declare | grep ^trail_ | while read el; do
     local old_ifs=$IFS
@@ -134,8 +121,6 @@ function expand_all_variables_in_org_files() {
   done
 }
 
-
-
 function set_up_build_directory() {
   if [[ -n "$target_dir" && -d $target_dir ]]; then
     rm -rf $target_dir

From 6ff63eee307de5f12979e16412056595b43c7225 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Tue, 13 Nov 2012 13:13:37 +0000
Subject: [PATCH 1641/2585] first attempts to descibe an upgrade process

---
 usr/share/doc/vizrt/vosa-handbook/upgrade-minor.org | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/upgrade-minor.org

diff --git a/usr/share/doc/vizrt/vosa-handbook/upgrade-minor.org b/usr/share/doc/vizrt/vosa-handbook/upgrade-minor.org
new file mode 100644
index 00000000..4fae598e
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/upgrade-minor.org
@@ -0,0 +1,12 @@
+* Upgrading from Escenic *.x.* to *.y.* (minor version upgrade)
+When an Escenic cluster needs to be upgraded we perform the following steps.
+01. Make a branch in subversion of the escenic customer project.
+02. Write a script to Upgrade the dev image db and mm (make available as deb package).
+03. Change the root pom in the customer project to reflect the target version.
+04. Make an ear and test it in the dev image.
+05. Provide the tested dev image to the customer and point out the standard template upgrade issues.
+06. Wait for template development to upgrade the templates.
+07. Create a test server so the new stuff can be tried by editorial when the templates are ready.
+08. Start an automatic copy and upgrade of the mm directory and the database.
+09. Create a production platform with full redundancy but small scale that points to it.
+10. 

From eb3bedac3ac05ea648feca103626f4038b35ba5d Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Tue, 13 Nov 2012 13:23:18 +0000
Subject: [PATCH 1642/2585] test

---
 usr/share/doc/vizrt/vosa-handbook/upgrade-minor.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/upgrade-minor.org b/usr/share/doc/vizrt/vosa-handbook/upgrade-minor.org
index 4fae598e..9a513bb4 100644
--- a/usr/share/doc/vizrt/vosa-handbook/upgrade-minor.org
+++ b/usr/share/doc/vizrt/vosa-handbook/upgrade-minor.org
@@ -9,4 +9,4 @@ When an Escenic cluster needs to be upgraded we perform the following steps.
 07. Create a test server so the new stuff can be tried by editorial when the templates are ready.
 08. Start an automatic copy and upgrade of the mm directory and the database.
 09. Create a production platform with full redundancy but small scale that points to it.
-10. 
+10. tsss

From 7c821a08f3f601d803595b4bbea90f786bd0e33a Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Tue, 13 Nov 2012 13:24:47 +0000
Subject: [PATCH 1643/2585] test

---
 usr/share/doc/vizrt/vosa-handbook/upgrade-minor.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/upgrade-minor.org b/usr/share/doc/vizrt/vosa-handbook/upgrade-minor.org
index 9a513bb4..4fae598e 100644
--- a/usr/share/doc/vizrt/vosa-handbook/upgrade-minor.org
+++ b/usr/share/doc/vizrt/vosa-handbook/upgrade-minor.org
@@ -9,4 +9,4 @@ When an Escenic cluster needs to be upgraded we perform the following steps.
 07. Create a test server so the new stuff can be tried by editorial when the templates are ready.
 08. Start an automatic copy and upgrade of the mm directory and the database.
 09. Create a production platform with full redundancy but small scale that points to it.
-10. tsss
+10. 

From dd11b00e9cb60f89517011b380f586746e769fb0 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Tue, 13 Nov 2012 13:57:50 +0000
Subject: [PATCH 1644/2585] more completeness

---
 .../doc/vizrt/vosa-handbook/upgrade-minor.org | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/upgrade-minor.org b/usr/share/doc/vizrt/vosa-handbook/upgrade-minor.org
index 4fae598e..1b2eb159 100644
--- a/usr/share/doc/vizrt/vosa-handbook/upgrade-minor.org
+++ b/usr/share/doc/vizrt/vosa-handbook/upgrade-minor.org
@@ -1,12 +1,20 @@
 * Upgrading from Escenic *.x.* to *.y.* (minor version upgrade)
 When an Escenic cluster needs to be upgraded we perform the following steps.
-01. Make a branch in subversion of the escenic customer project.
-02. Write a script to Upgrade the dev image db and mm (make available as deb package).
-03. Change the root pom in the customer project to reflect the target version.
-04. Make an ear and test it in the dev image.
-05. Provide the tested dev image to the customer and point out the standard template upgrade issues.
-06. Wait for template development to upgrade the templates.
-07. Create a test server so the new stuff can be tried by editorial when the templates are ready.
-08. Start an automatic copy and upgrade of the mm directory and the database.
-09. Create a production platform with full redundancy but small scale that points to it.
-10. 
+1. (operator) Make a branch in subversion of the escenic customer project.
+2. (operator) Write a script to Upgrade the dev image db and mm (make available as deb package).
+3. (operator) Change the root pom in the customer project to reflect the target version.
+4. (operator) Make an ear and test it in the dev image.
+5. (operator) Provide the tested dev image to the customer and point out the standard template upgrade issues.
+6. (template dev) Wait for template development to upgrade the templates.
+7. (operator) Create a test server so the new stuff can be tried by editorial when the templates are ready.
+8. (operator) Create an automatic daily copied and upgraded new db and mm. 
+9. (operator) Create a production platform with full redundancy but small scale that points to it.
+10. (users) Do user acceptence testing on the new production platform.
+11. (operator, users) Agree with customers when to switch to the new system.
+12. (operator) stop the automatic daily copy and upgrade script.
+13. (operator) make the old system unavailable
+14. (users) Start using the new system
+15. (users) Report problems as they arise
+16. (operator) rollback:  make the new system unavailable and the old system available.
+17. (operator) commit: destroy the old system
+

From a0bf6974644a476e9e90b052fa4fb61c28266552 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 13 Nov 2012 16:30:41 +0100
Subject: [PATCH 1645/2585] - added fai_monitoring_node_install which will only
 install a munin   node, a nagios node and the escenic check_mk plugins. This
 closes   #112

  Note that when you're running a regular ece-install profile, all of
  the above monitoring nodes are installed automatically, hence this
  profile is only for the times where you want to install the
  monitoring clients on servers that are not installed with
  ece-install.
---
 usr/sbin/ece-install                                     | 7 +++++++
 usr/share/escenic/ece-scripts/ece-install.d/constants.sh | 1 +
 2 files changed, 8 insertions(+)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index ae4f05bc..bddb0b79 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -1095,6 +1095,13 @@ if [ ${fai_enabled-0} -eq 1 ]; then
       install_db_backup_server
       no_fai_profile=0
     fi
+
+    if [ ${fai_monitoring_node_install-0} -eq 1 ]; then
+      install_profile_number=$PROFILE_MONITORING_NODE
+      # no need to call anything specific here as all the work is done
+      # in the common_post_install function.
+      no_fai_profile=0
+    fi
     
     if [ $no_fai_profile -eq 1 ]; then
         print_and_log "No install profile selected, be sure to have one of the "
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/constants.sh b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
index cb033820..8f4e9e8d 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
@@ -19,6 +19,7 @@ PROFILE_NFS_SERVER=14
 PROFILE_NFS_CLIENT=15
 PROFILE_DB_BACKUP_SERVER=16
 PROFILE_UN_INSTALL=17
+PROFILE_MONITORING_NODE=18
 
 # database constants
 default_db_port=3306

From 109e75fe571e75ad5e5aec0c2a745603e58af079 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 14 Nov 2012 10:48:41 +0100
Subject: [PATCH 1646/2585] - fixed regression bug:  
 ece-install::monitoring::install_munin_gatherer would not include   the host
 from which the user doing the installation from is   connecting from. Hence,
 you would always get a 403 forbidden when   accessing the /munin context in
 the web browser.

  However, normally, you would specify the
  fai_monitoring_privileged_hosts variable (previously called
  fai_privileged_hosts) with the IPs of hosts that should be able to
  access the /munin and /icigina contexts on the monitoring server so
  that *shouldn't be a problem.

  This should close #111

- simplified and hardened code in various monitoring methods.

- renamed fai_privileged_hosts => fai_monitoring_privileged_hosts as
  it's only used in the monitoring module

- moved get_privileged_hosts from ece-install to monitoring as it's
  only used in this module.
---
 usr/sbin/ece-install                          | 26 --------
 .../ece-scripts/ece-install.d/monitoring.sh   | 64 ++++++++++++++-----
 2 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index bddb0b79..10dcce31 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -430,32 +430,6 @@ EOF
   fi
 }
 
-## Returns the privileged hosts. This will include both the IP(s) the
-## logged in user conduction the ece-install is coming from, as well
-## as any IPs defined in fai_privileged_hosts.
-function get_privileged_hosts() {
-  local privileged_hosts=${fai_privileged_hosts}
-
-  for ip in $(
-    w -h  | \
-      grep pts | \
-      grep -v ":0.0" | \
-      sed "s#.*pts/[0-9]*[ ]*\(.*\)#\1#" | \
-      cut -d' ' -f1 | \
-      cut -d':' -f1 | \
-      sort | \
-      uniq
-  ); do
-    # ensure that all privileged_hosts are resolvable, or else
-    # services which uses them, like Varnish, may fail to start.
-    if [ $(host ${ip} | grep "not found" | wc -l) -eq 0 ]; then
-      privileged_hosts=${privileged_hosts}" "${ip}
-    fi
-  done
-
-  echo ${privileged_hosts}
-}
-
 function read_user_input()
 {
     installation_profiles=(
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index fc79cc20..8feaee63 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -58,9 +58,18 @@ function install_nagios_monitoring_server()
 
   if [ $on_debian_or_derivative -eq 1 ]; then
     if [[ $monitoring_vendor == $MONITORING_VENDOR_ICINGA ]]; then
-      # see /usr/share/doc/icinga-common/README.Debian
-      dpkg-statoverride --update --add nagios www-data 2710 /var/lib/icinga/rw
-      dpkg-statoverride --update --add nagios nagios 751 /var/lib/icinga
+      # see /usr/share/doc/icinga-common/README.Debian we use --force
+      # here so that it doesn't fail if we're re-running this profile.
+      run dpkg-statoverride \
+        --force \
+        --update \
+        --add nagios www-data 2710 /var/lib/icinga/rw
+      run dpkg-statoverride \
+        --force \
+        --update \
+        --add nagios \
+        nagios 751 \
+        /var/lib/icinga
     fi
   fi
 
@@ -346,7 +355,7 @@ EOF
 function install_munin_gatherer()
 {
   print_and_log "Installing a Munin gatherer on $HOSTNAME ..."
-
+  
   if [ $on_debian_or_derivative -eq 1 ]; then
     packages="munin"
     install_packages_if_missing $packages
@@ -369,10 +378,6 @@ function install_munin_gatherer()
     node_list=${fai_monitoring_munin_node_list}
   fi
 
-  if [ -z "$node_list" ]; then
-    return
-  fi
-
   for el in $node_list; do
     local file=/etc/munin/munin-conf.d/escenic.conf
     if [[ -e $file &&  $(grep '\['${el}'\]' $file | wc -l) -gt 0 ]]; then
@@ -388,17 +393,17 @@ use_node_name yes
 EOF
   done
 
-  # TODO add the priveleged network to the allowed stanza (i.e. the
+  # TODO add the privileged network to the allowed stanza (i.e. the
   # network wich will do the monitoring of the servers.
   local file=/etc/apache2/conf.d/munin
-  if [ -n "$(get_privileged_hosts)" ]; then
-    local privileged_hosts=$(
-      echo $(get_privileged_hosts) | sed "s#\ #\\\ #g"
-    )
-    sed -i "s#Allow\ from\ localhost#Allow\ from\ ${privileged_hosts}\ localhost#g" \
+  local privileged_hosts=$(get_privileged_hosts)
+
+  if [ -n "${privileged_hosts}" ]; then
+    # local privileged_hosts=$(
+    #   echo $(get_privileged_hosts) | sed "s#\ #\\\ #g"
+    # )
+    run sed -i "s#[ ]*Allow from .*#        Allow from ${privileged_hosts} localhost 127.0.0.0/8 ::1#g" \
       $file
-    exit_on_error "Failed adding ${fai_privileged_hosts} to" \
-      "Munin's allowed addresses."
     run /etc/init.d/apache2 reload
   fi
 
@@ -590,3 +595,30 @@ function install_system_info() {
   add_next_step "Always up to date system info: http://$HOSTNAME:$port/" \
     "you can also see system-info in the shell, type: system-info"
 }
+
+## Returns the privileged hosts. This will include both the IP(s) the
+## logged in user conduction the ece-install is coming from, as well
+## as any IPs defined in fai_monitoring_privileged_hosts.
+function get_privileged_hosts() {
+  local privileged_hosts=${fai_monitoring_privileged_hosts}
+
+  log fai_monitoring_privileged_hosts=$fai_monitoring_privileged_hosts
+  
+  for ip in $(
+    w -h  | \
+      grep pts | \
+      grep -v ":0.0" | \
+      sed "s#.*pts/[0-9]*[ ]*\(.*\)#\1#" | \
+      cut -d' ' -f1 | \
+      cut -d':' -f1 | \
+      sort | \
+      uniq
+  ); do
+    privileged_hosts=${privileged_hosts}" "${ip}
+  done
+
+  log privileged_hosts=$privileged_hosts
+  
+  echo ${privileged_hosts}
+}
+

From faa948e9a1c74ac4d12b9e00173aaa58dcb53041 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Wed, 14 Nov 2012 11:51:25 +0100
Subject: [PATCH 1647/2585] ece-build - added reporter to the list of plugins

---
 usr/share/escenic/build-scripts/ece-build | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index aa5e4089..12065e79 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -35,6 +35,7 @@ section-feed
 dashboard
 poll
 lucy
+reporter
 widget-framework-core
 widget-framework-common
 widget-framework-mobile

From 9064dd4a2d24992b90e2cdac9b3645b349ce6021 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 15 Nov 2012 10:42:23 +0100
Subject: [PATCH 1648/2585] - fixed wrong variable assignment

---
 usr/share/escenic/ece-scripts/ece-install.d/app-server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index cc10961d..930ae9b1 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -323,7 +323,7 @@ EOF
       # which case we set the publication_war to the same as the
       # publication_name.
       if [ -z "${publication_war}" ]; then
-        publication_war = $publication_name
+        publication_war=$publication_name
       fi
 
       ensure_domain_is_known_to_local_host ${domain}

From 9b7734318b8e0e7827cb74d158c1d49994c57c92 Mon Sep 17 00:00:00 2001
From: Thomas <tvelthoven@vizrt.com>
Date: Thu, 15 Nov 2012 11:15:53 +0100
Subject: [PATCH 1649/2585] Update
 usr/share/doc/vizrt/vosa-handbook/upgrade-minor.org

---
 .../doc/vizrt/vosa-handbook/upgrade-minor.org | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/upgrade-minor.org b/usr/share/doc/vizrt/vosa-handbook/upgrade-minor.org
index 1b2eb159..4744c26e 100644
--- a/usr/share/doc/vizrt/vosa-handbook/upgrade-minor.org
+++ b/usr/share/doc/vizrt/vosa-handbook/upgrade-minor.org
@@ -1,20 +1,20 @@
-* Upgrading from Escenic *.x.* to *.y.* (minor version upgrade)
+* Template plan for upgrading from Escenic *.x.* to *.y.* (minor version upgrade)
 When an Escenic cluster needs to be upgraded we perform the following steps.
-1. (operator) Make a branch in subversion of the escenic customer project.
-2. (operator) Write a script to Upgrade the dev image db and mm (make available as deb package).
-3. (operator) Change the root pom in the customer project to reflect the target version.
-4. (operator) Make an ear and test it in the dev image.
-5. (operator) Provide the tested dev image to the customer and point out the standard template upgrade issues.
-6. (template dev) Wait for template development to upgrade the templates.
-7. (operator) Create a test server so the new stuff can be tried by editorial when the templates are ready.
-8. (operator) Create an automatic daily copied and upgraded new db and mm. 
-9. (operator) Create a production platform with full redundancy but small scale that points to it.
-10. (users) Do user acceptence testing on the new production platform.
-11. (operator, users) Agree with customers when to switch to the new system.
-12. (operator) stop the automatic daily copy and upgrade script.
-13. (operator) make the old system unavailable
-14. (users) Start using the new system
-15. (users) Report problems as they arise
-16. (operator) rollback:  make the new system unavailable and the old system available.
-17. (operator) commit: destroy the old system
+1. TODO (operator) Make a branch in subversion of the escenic customer project.
+2. TODO (operator) Write a script to Upgrade the dev image db and mm (make available as deb package).
+3. TODO (operator) Change the root pom in the customer project to reflect the target version.
+4. TODO (operator) Make an ear and test it in the dev image.
+5. TODO (operator) Provide the tested dev image to the customer and point out the standard template upgrade issues.
+6. TODO (template dev) Wait for template development to upgrade the templates.
+7. TODO (operator) Create a test server so the new stuff can be tried by editorial when the templates are ready.
+8. TODO (operator) Create an automatic daily copied and upgraded new db and mm. 
+9. TODO (operator) Create a production platform with full redundancy but small scale that points to it.
+10. TODO (users) Do user acceptence testing on the new production platform.
+11. TODO (operator, users) Agree with customers when to switch to the new system.
+12. TODO (operator) stop the automatic daily copy and upgrade script.
+13. TODO (operator) make the old system unavailable
+14. TODO (users) Start using the new system
+15. TODO (users) Report problems as they arise
+16. TODO (operator) rollback:  make the new system unavailable and the old system available.
+17. TODO (operator) commit: destroy the old system
 

From 97e6098ecbabb18c5aa7c59949ad0d802d9b6b65 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 15 Nov 2012 14:45:18 +0100
Subject: [PATCH 1650/2585] - added chapter explaining the VMEO/ECE integration
 as we've set it up   at SolarTV. This is the way we intend to be the default
 way of setting up   this integration and I've thus not referred to SolarTV in
 any way.

- added three diagrams illustrating the three major steps in the
  VMOE/ECE integration,
---
 .../vmeo-browser-playing-video.blockdiag      | 15 ++++
 .../graphics/vmeo-browser-playing-video.svg   | 67 ++++++++++++++
 .../graphics/vmeo-import-to-ece.blockdiag     | 17 ++++
 .../graphics/vmeo-import-to-ece.svg           | 67 ++++++++++++++
 .../graphics/vmeo-mam-to-vmeo.blockdiag       | 14 +++
 .../graphics/vmeo-mam-to-vmeo.svg             | 89 +++++++++++++++++++
 usr/share/doc/vizrt/vosa-handbook/vmeo.org    | 80 +++++++++++++++--
 7 files changed, 343 insertions(+), 6 deletions(-)
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/graphics/vmeo-browser-playing-video.blockdiag
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/graphics/vmeo-browser-playing-video.svg
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/graphics/vmeo-import-to-ece.blockdiag
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/graphics/vmeo-import-to-ece.svg
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/graphics/vmeo-mam-to-vmeo.blockdiag
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/graphics/vmeo-mam-to-vmeo.svg

diff --git a/usr/share/doc/vizrt/vosa-handbook/graphics/vmeo-browser-playing-video.blockdiag b/usr/share/doc/vizrt/vosa-handbook/graphics/vmeo-browser-playing-video.blockdiag
new file mode 100644
index 00000000..8670c1be
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/graphics/vmeo-browser-playing-video.blockdiag
@@ -0,0 +1,15 @@
+blockdiag {
+  orientation = "portrait";
+
+  browser [shape = "actor"];
+  browser -> video-widget [label="gets"];
+  content-engine [label="content-engine", color="orange"];
+  adactus-control [label="vmeo-controller", color="green"];
+  adactus-streaming [label="vmeo-streaming", color="cyan"];
+  
+  video-widget [label="video-widget", color="brown"];
+  video-widget -> cache-server -> content-engine -> adactus-control [label="gets XML"];
+  browser -> adactus-streaming [label="streams"];
+
+  
+}
diff --git a/usr/share/doc/vizrt/vosa-handbook/graphics/vmeo-browser-playing-video.svg b/usr/share/doc/vizrt/vosa-handbook/graphics/vmeo-browser-playing-video.svg
new file mode 100644
index 00000000..4242a0a3
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/graphics/vmeo-browser-playing-video.svg
@@ -0,0 +1,67 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg viewBox="0 0 448 440" xmlns="http://www.w3.org/2000/svg" xmlns:inkspace="http://www.inkscape.org/namespaces/inkscape" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <defs id="defs_block">
+    <filter height="1.504" id="filter_blur" inkspace:collect="always" width="1.1575" x="-0.07875" y="-0.252">
+      <feGaussianBlur id="feGaussianBlur3780" inkspace:collect="always" stdDeviation="4.2" />
+    </filter>
+  </defs>
+  <title>blockdiag</title>
+  <desc>blockdiag {
+  orientation = "portrait";
+
+  browser [shape = "actor"];
+  browser -&gt; video-widget [label="gets"];
+  content-engine [label="content-engine", color="orange"];
+  adactus-control [label="vmeo-controller", color="green"];
+  adactus-streaming [label="vmeo-streaming", color="cyan"];
+  
+  video-widget [label="video-widget", color="brown"];
+  video-widget -&gt; cache-server -&gt; content-engine -&gt; adactus-control [label="gets XML"];
+  browser -&gt; adactus-streaming [label="streams"];
+
+  
+}
+</desc>
+  <polygon fill="rgb(0,0,0)" points="134,56 134,61 151,61 151,66 134,66 134,71 148,86 141,86 131,76 121,86 114,86 128,71 128,66 111,66 111,61 128,61 128,56" style="filter:url(#filter_blur);opacity:0.7;fill-opacity:1" />
+  <ellipse cx="131" cy="51" fill="rgb(0,0,0)" rx="7" ry="7" stroke="rgb(0,0,0)" style="filter:url(#filter_blur);opacity:0.7;fill-opacity:1" />
+  <rect fill="rgb(0,0,0)" height="40" stroke="rgb(0,0,0)" style="filter:url(#filter_blur);opacity:0.7;fill-opacity:1" width="128" x="67" y="126" />
+  <rect fill="rgb(0,0,0)" height="40" stroke="rgb(0,0,0)" style="filter:url(#filter_blur);opacity:0.7;fill-opacity:1" width="128" x="259" y="126" />
+  <rect fill="rgb(0,0,0)" height="40" stroke="rgb(0,0,0)" style="filter:url(#filter_blur);opacity:0.7;fill-opacity:1" width="128" x="67" y="286" />
+  <rect fill="rgb(0,0,0)" height="40" stroke="rgb(0,0,0)" style="filter:url(#filter_blur);opacity:0.7;fill-opacity:1" width="128" x="67" y="366" />
+  <rect fill="rgb(0,0,0)" height="40" stroke="rgb(0,0,0)" style="filter:url(#filter_blur);opacity:0.7;fill-opacity:1" width="128" x="67" y="206" />
+  <polygon fill="rgb(255,255,255)" points="131,50 131,55 148,55 148,60 131,60 131,65 145,80 138,80 128,70 118,80 111,80 125,65 125,60 108,60 108,55 125,55 125,50" stroke="rgb(0,0,0)" />
+  <ellipse cx="128" cy="45" fill="rgb(255,255,255)" rx="7" ry="7" stroke="rgb(0,0,0)" />
+  <rect fill="rgb(165,42,42)" height="40" stroke="rgb(0,0,0)" width="128" x="64" y="120" />
+  <text fill="rgb(0,0,0)" font-family="sansserif" font-size="11" font-style="normal" font-weight="normal" x="92" y="146">video-widget</text>
+  <rect fill="rgb(0,255,255)" height="40" stroke="rgb(0,0,0)" width="128" x="256" y="120" />
+  <text fill="rgb(0,0,0)" font-family="sansserif" font-size="11" font-style="normal" font-weight="normal" x="278" y="146">vmeo-streaming</text>
+  <rect fill="rgb(255,165,0)" height="40" stroke="rgb(0,0,0)" width="128" x="64" y="280" />
+  <text fill="rgb(0,0,0)" font-family="sansserif" font-size="11" font-style="normal" font-weight="normal" x="86" y="306">content-engine</text>
+  <rect fill="rgb(0,128,0)" height="40" stroke="rgb(0,0,0)" width="128" x="64" y="360" />
+  <text fill="rgb(0,0,0)" font-family="sansserif" font-size="11" font-style="normal" font-weight="normal" x="83" y="386">vmeo-controller</text>
+  <rect fill="rgb(255,255,255)" height="40" stroke="rgb(0,0,0)" width="128" x="64" y="200" />
+  <text fill="rgb(0,0,0)" font-family="sansserif" font-size="11" font-style="normal" font-weight="normal" x="92" y="226">cache-server</text>
+  <path d="M 128 80 L 128 112" fill="none" stroke="rgb(0,0,0)" />
+  <polygon fill="rgb(0,0,0)" points="128,119 124,112 132,112 128,119" stroke="rgb(0,0,0)" />
+  <rect fill="white" height="15" stroke="rgb(0,0,0)" width="40" x="156" y="103" />
+  <text fill="rgb(0,0,0)" font-family="sansserif" font-size="11" font-style="normal" font-weight="normal" x="164" y="116">gets</text>
+  <path d="M 128 80 L 128 100" fill="none" stroke="rgb(0,0,0)" />
+  <path d="M 128 100 L 320 100" fill="none" stroke="rgb(0,0,0)" />
+  <path d="M 320 100 L 320 112" fill="none" stroke="rgb(0,0,0)" />
+  <polygon fill="rgb(0,0,0)" points="320,119 316,112 324,112 320,119" stroke="rgb(0,0,0)" />
+  <rect fill="white" height="15" stroke="rgb(0,0,0)" width="58" x="259" y="103" />
+  <text fill="rgb(0,0,0)" font-family="sansserif" font-size="11" font-style="normal" font-weight="normal" x="267" y="116">streams</text>
+  <path d="M 128 160 L 128 192" fill="none" stroke="rgb(0,0,0)" />
+  <polygon fill="rgb(0,0,0)" points="128,199 124,192 132,192 128,199" stroke="rgb(0,0,0)" />
+  <rect fill="white" height="15" stroke="rgb(0,0,0)" width="64" x="144" y="183" />
+  <text fill="rgb(0,0,0)" font-family="sansserif" font-size="11" font-style="normal" font-weight="normal" x="152" y="196">gets XML</text>
+  <path d="M 128 320 L 128 352" fill="none" stroke="rgb(0,0,0)" />
+  <polygon fill="rgb(0,0,0)" points="128,359 124,352 132,352 128,359" stroke="rgb(0,0,0)" />
+  <rect fill="white" height="15" stroke="rgb(0,0,0)" width="64" x="144" y="343" />
+  <text fill="rgb(0,0,0)" font-family="sansserif" font-size="11" font-style="normal" font-weight="normal" x="152" y="356">gets XML</text>
+  <path d="M 128 240 L 128 272" fill="none" stroke="rgb(0,0,0)" />
+  <polygon fill="rgb(0,0,0)" points="128,279 124,272 132,272 128,279" stroke="rgb(0,0,0)" />
+  <rect fill="white" height="15" stroke="rgb(0,0,0)" width="64" x="144" y="263" />
+  <text fill="rgb(0,0,0)" font-family="sansserif" font-size="11" font-style="normal" font-weight="normal" x="152" y="276">gets XML</text>
+</svg>
diff --git a/usr/share/doc/vizrt/vosa-handbook/graphics/vmeo-import-to-ece.blockdiag b/usr/share/doc/vizrt/vosa-handbook/graphics/vmeo-import-to-ece.blockdiag
new file mode 100644
index 00000000..7a567446
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/graphics/vmeo-import-to-ece.blockdiag
@@ -0,0 +1,17 @@
+blockdiag {
+  orientation = "landscape";
+
+  content-engine [label="content-engine", color="orange"];
+  video-widget [label="video-widget", color="brown"];
+  
+  video.xml [label="video.xml"];
+  key-frames [label="key-frames"];
+  adactus-control [label="vmeo-controller", color="green"];
+  
+  content-engine -> video.xml [label="imports"];
+  video.xml -> adactus-control;
+  
+  content-engine -> key-frames [label="imports"];
+  key-frames -> adactus-control [label="gets"];
+  content-engine -> video-widget [label="renders"];
+}
diff --git a/usr/share/doc/vizrt/vosa-handbook/graphics/vmeo-import-to-ece.svg b/usr/share/doc/vizrt/vosa-handbook/graphics/vmeo-import-to-ece.svg
new file mode 100644
index 00000000..5b4fa4ab
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/graphics/vmeo-import-to-ece.svg
@@ -0,0 +1,67 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg viewBox="0 0 640 280" xmlns="http://www.w3.org/2000/svg" xmlns:inkspace="http://www.inkscape.org/namespaces/inkscape" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <defs id="defs_block">
+    <filter height="1.504" id="filter_blur" inkspace:collect="always" width="1.1575" x="-0.07875" y="-0.252">
+      <feGaussianBlur id="feGaussianBlur3780" inkspace:collect="always" stdDeviation="4.2" />
+    </filter>
+  </defs>
+  <title>blockdiag</title>
+  <desc>blockdiag {
+  orientation = "landscape";
+
+  content-engine [label="content-engine", color="orange"];
+  video-widget [label="video-widget", color="brown"];
+  
+  video.xml [label="video.xml"];
+  key-frames [label="key-frames"];
+  adactus-control [label="vmeo-controller", color="green"];
+  
+  content-engine -&gt; video.xml [label="imports"];
+  video.xml -&gt; adactus-control;
+  
+  content-engine -&gt; key-frames [label="imports"];
+  key-frames -&gt; adactus-control [label="gets"];
+  content-engine -&gt; video-widget [label="renders"];
+}
+</desc>
+  <rect fill="rgb(0,0,0)" height="40" stroke="rgb(0,0,0)" style="filter:url(#filter_blur);opacity:0.7;fill-opacity:1" width="128" x="67" y="46" />
+  <rect fill="rgb(0,0,0)" height="40" stroke="rgb(0,0,0)" style="filter:url(#filter_blur);opacity:0.7;fill-opacity:1" width="128" x="259" y="46" />
+  <rect fill="rgb(0,0,0)" height="40" stroke="rgb(0,0,0)" style="filter:url(#filter_blur);opacity:0.7;fill-opacity:1" width="128" x="259" y="126" />
+  <rect fill="rgb(0,0,0)" height="40" stroke="rgb(0,0,0)" style="filter:url(#filter_blur);opacity:0.7;fill-opacity:1" width="128" x="259" y="206" />
+  <rect fill="rgb(0,0,0)" height="40" stroke="rgb(0,0,0)" style="filter:url(#filter_blur);opacity:0.7;fill-opacity:1" width="128" x="451" y="126" />
+  <rect fill="rgb(255,165,0)" height="40" stroke="rgb(0,0,0)" width="128" x="64" y="40" />
+  <text fill="rgb(0,0,0)" font-family="sansserif" font-size="11" font-style="normal" font-weight="normal" x="86" y="66">content-engine</text>
+  <rect fill="rgb(165,42,42)" height="40" stroke="rgb(0,0,0)" width="128" x="256" y="40" />
+  <text fill="rgb(0,0,0)" font-family="sansserif" font-size="11" font-style="normal" font-weight="normal" x="284" y="66">video-widget</text>
+  <rect fill="rgb(255,255,255)" height="40" stroke="rgb(0,0,0)" width="128" x="256" y="120" />
+  <text fill="rgb(0,0,0)" font-family="sansserif" font-size="11" font-style="normal" font-weight="normal" x="293" y="146">video.xml</text>
+  <rect fill="rgb(255,255,255)" height="40" stroke="rgb(0,0,0)" width="128" x="256" y="200" />
+  <text fill="rgb(0,0,0)" font-family="sansserif" font-size="11" font-style="normal" font-weight="normal" x="290" y="226">key-frames</text>
+  <rect fill="rgb(0,128,0)" height="40" stroke="rgb(0,0,0)" width="128" x="448" y="120" />
+  <text fill="rgb(0,0,0)" font-family="sansserif" font-size="11" font-style="normal" font-weight="normal" x="467" y="146">vmeo-controller</text>
+  <path d="M 192 60 L 248 60" fill="none" stroke="rgb(0,0,0)" />
+  <polygon fill="rgb(0,0,0)" points="255,60 248,56 248,64 255,60" stroke="rgb(0,0,0)" />
+  <rect fill="white" height="15" stroke="rgb(0,0,0)" width="58" x="195" y="38" />
+  <text fill="rgb(0,0,0)" font-family="sansserif" font-size="11" font-style="normal" font-weight="normal" x="203" y="51">renders</text>
+  <path d="M 192 60 L 224 60" fill="none" stroke="rgb(0,0,0)" />
+  <path d="M 224 60 L 224 140" fill="none" stroke="rgb(0,0,0)" />
+  <path d="M 224 140 L 248 140" fill="none" stroke="rgb(0,0,0)" />
+  <polygon fill="rgb(0,0,0)" points="255,140 248,136 248,144 255,140" stroke="rgb(0,0,0)" />
+  <rect fill="white" height="15" stroke="rgb(0,0,0)" width="58" x="195" y="118" />
+  <text fill="rgb(0,0,0)" font-family="sansserif" font-size="11" font-style="normal" font-weight="normal" x="203" y="131">imports</text>
+  <path d="M 192 60 L 224 60" fill="none" stroke="rgb(0,0,0)" />
+  <path d="M 224 60 L 224 220" fill="none" stroke="rgb(0,0,0)" />
+  <path d="M 224 220 L 248 220" fill="none" stroke="rgb(0,0,0)" />
+  <polygon fill="rgb(0,0,0)" points="255,220 248,216 248,224 255,220" stroke="rgb(0,0,0)" />
+  <rect fill="white" height="15" stroke="rgb(0,0,0)" width="58" x="195" y="198" />
+  <text fill="rgb(0,0,0)" font-family="sansserif" font-size="11" font-style="normal" font-weight="normal" x="203" y="211">imports</text>
+  <path d="M 384 140 L 440 140" fill="none" stroke="rgb(0,0,0)" />
+  <polygon fill="rgb(0,0,0)" points="447,140 440,136 440,144 447,140" stroke="rgb(0,0,0)" />
+  <path d="M 384 220 L 432 220" fill="none" stroke="rgb(0,0,0)" />
+  <path d="M 432 220 L 432 140" fill="none" stroke="rgb(0,0,0)" />
+  <path d="M 432 140 L 440 140" fill="none" stroke="rgb(0,0,0)" />
+  <polygon fill="rgb(0,0,0)" points="447,140 440,136 440,144 447,140" stroke="rgb(0,0,0)" />
+  <rect fill="white" height="15" stroke="rgb(0,0,0)" width="40" x="396" y="183" />
+  <text fill="rgb(0,0,0)" font-family="sansserif" font-size="11" font-style="normal" font-weight="normal" x="404" y="196">gets</text>
+</svg>
diff --git a/usr/share/doc/vizrt/vosa-handbook/graphics/vmeo-mam-to-vmeo.blockdiag b/usr/share/doc/vizrt/vosa-handbook/graphics/vmeo-mam-to-vmeo.blockdiag
new file mode 100644
index 00000000..58090669
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/graphics/vmeo-mam-to-vmeo.blockdiag
@@ -0,0 +1,14 @@
+blockdiag {
+  orientation = "landscape";
+
+  media-asset-management [label="MAM" color="yellow"];
+  adactus-control [label="vmeo-controller", color="green"];
+  adactus-streaming [label="vmeo-streaming", color="cyan"];
+  
+  video.raw -> media-asset-management [label="copied"];
+  media-asset-management -> adactus-control [label="triggers"];
+  adactus-control -> video.mp4, video.ogg [label="encodes"];
+  video.mp4, video.ogg -> adactus-streaming [label="uploads"];
+  adactus-control -> video.xml [label="exports"];
+  adactus-control -> key-frames [label="creates"];
+}
diff --git a/usr/share/doc/vizrt/vosa-handbook/graphics/vmeo-mam-to-vmeo.svg b/usr/share/doc/vizrt/vosa-handbook/graphics/vmeo-mam-to-vmeo.svg
new file mode 100644
index 00000000..1d2c57e5
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/graphics/vmeo-mam-to-vmeo.svg
@@ -0,0 +1,89 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg viewBox="0 0 1024 360" xmlns="http://www.w3.org/2000/svg" xmlns:inkspace="http://www.inkscape.org/namespaces/inkscape" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <defs id="defs_block">
+    <filter height="1.504" id="filter_blur" inkspace:collect="always" width="1.1575" x="-0.07875" y="-0.252">
+      <feGaussianBlur id="feGaussianBlur3780" inkspace:collect="always" stdDeviation="4.2" />
+    </filter>
+  </defs>
+  <title>blockdiag</title>
+  <desc>blockdiag {
+  orientation = "landscape";
+
+  media-asset-management [label="MAM" color="yellow"];
+  adactus-control [label="vmeo-controller", color="green"];
+  adactus-streaming [label="vmeo-streaming", color="cyan"];
+  
+  video.raw -&gt; media-asset-management [label="copied"];
+  media-asset-management -&gt; adactus-control [label="triggers"];
+  adactus-control -&gt; video.mp4, video.ogg [label="encodes"];
+  video.mp4, video.ogg -&gt; adactus-streaming [label="uploads"];
+  adactus-control -&gt; video.xml [label="exports"];
+  adactus-control -&gt; key-frames [label="creates"];
+}
+</desc>
+  <rect fill="rgb(0,0,0)" height="40" stroke="rgb(0,0,0)" style="filter:url(#filter_blur);opacity:0.7;fill-opacity:1" width="128" x="259" y="46" />
+  <rect fill="rgb(0,0,0)" height="40" stroke="rgb(0,0,0)" style="filter:url(#filter_blur);opacity:0.7;fill-opacity:1" width="128" x="451" y="46" />
+  <rect fill="rgb(0,0,0)" height="40" stroke="rgb(0,0,0)" style="filter:url(#filter_blur);opacity:0.7;fill-opacity:1" width="128" x="835" y="46" />
+  <rect fill="rgb(0,0,0)" height="40" stroke="rgb(0,0,0)" style="filter:url(#filter_blur);opacity:0.7;fill-opacity:1" width="128" x="67" y="46" />
+  <rect fill="rgb(0,0,0)" height="40" stroke="rgb(0,0,0)" style="filter:url(#filter_blur);opacity:0.7;fill-opacity:1" width="128" x="643" y="46" />
+  <rect fill="rgb(0,0,0)" height="40" stroke="rgb(0,0,0)" style="filter:url(#filter_blur);opacity:0.7;fill-opacity:1" width="128" x="643" y="126" />
+  <rect fill="rgb(0,0,0)" height="40" stroke="rgb(0,0,0)" style="filter:url(#filter_blur);opacity:0.7;fill-opacity:1" width="128" x="643" y="206" />
+  <rect fill="rgb(0,0,0)" height="40" stroke="rgb(0,0,0)" style="filter:url(#filter_blur);opacity:0.7;fill-opacity:1" width="128" x="643" y="286" />
+  <rect fill="rgb(255,255,0)" height="40" stroke="rgb(0,0,0)" width="128" x="256" y="40" />
+  <text fill="rgb(0,0,0)" font-family="sansserif" font-size="11" font-style="normal" font-weight="normal" x="311" y="66">MAM</text>
+  <rect fill="rgb(0,128,0)" height="40" stroke="rgb(0,0,0)" width="128" x="448" y="40" />
+  <text fill="rgb(0,0,0)" font-family="sansserif" font-size="11" font-style="normal" font-weight="normal" x="467" y="66">vmeo-controller</text>
+  <rect fill="rgb(0,255,255)" height="40" stroke="rgb(0,0,0)" width="128" x="832" y="40" />
+  <text fill="rgb(0,0,0)" font-family="sansserif" font-size="11" font-style="normal" font-weight="normal" x="854" y="66">vmeo-streaming</text>
+  <rect fill="rgb(255,255,255)" height="40" stroke="rgb(0,0,0)" width="128" x="64" y="40" />
+  <text fill="rgb(0,0,0)" font-family="sansserif" font-size="11" font-style="normal" font-weight="normal" x="101" y="66">video.raw</text>
+  <rect fill="rgb(255,255,255)" height="40" stroke="rgb(0,0,0)" width="128" x="640" y="40" />
+  <text fill="rgb(0,0,0)" font-family="sansserif" font-size="11" font-style="normal" font-weight="normal" x="677" y="66">video.mp4</text>
+  <rect fill="rgb(255,255,255)" height="40" stroke="rgb(0,0,0)" width="128" x="640" y="120" />
+  <text fill="rgb(0,0,0)" font-family="sansserif" font-size="11" font-style="normal" font-weight="normal" x="677" y="146">video.ogg</text>
+  <rect fill="rgb(255,255,255)" height="40" stroke="rgb(0,0,0)" width="128" x="640" y="200" />
+  <text fill="rgb(0,0,0)" font-family="sansserif" font-size="11" font-style="normal" font-weight="normal" x="677" y="226">video.xml</text>
+  <rect fill="rgb(255,255,255)" height="40" stroke="rgb(0,0,0)" width="128" x="640" y="280" />
+  <text fill="rgb(0,0,0)" font-family="sansserif" font-size="11" font-style="normal" font-weight="normal" x="674" y="306">key-frames</text>
+  <path d="M 384 60 L 440 60" fill="none" stroke="rgb(0,0,0)" />
+  <polygon fill="rgb(0,0,0)" points="447,60 440,56 440,64 447,60" stroke="rgb(0,0,0)" />
+  <rect fill="white" height="15" stroke="rgb(0,0,0)" width="64" x="384" y="38" />
+  <text fill="rgb(0,0,0)" font-family="sansserif" font-size="11" font-style="normal" font-weight="normal" x="392" y="51">triggers</text>
+  <path d="M 576 60 L 632 60" fill="none" stroke="rgb(0,0,0)" />
+  <polygon fill="rgb(0,0,0)" points="639,60 632,56 632,64 639,60" stroke="rgb(0,0,0)" />
+  <rect fill="white" height="15" stroke="rgb(0,0,0)" width="58" x="579" y="38" />
+  <text fill="rgb(0,0,0)" font-family="sansserif" font-size="11" font-style="normal" font-weight="normal" x="587" y="51">encodes</text>
+  <path d="M 576 60 L 608 60" fill="none" stroke="rgb(0,0,0)" />
+  <path d="M 608 60 L 608 300" fill="none" stroke="rgb(0,0,0)" />
+  <path d="M 608 300 L 632 300" fill="none" stroke="rgb(0,0,0)" />
+  <polygon fill="rgb(0,0,0)" points="639,300 632,296 632,304 639,300" stroke="rgb(0,0,0)" />
+  <rect fill="white" height="15" stroke="rgb(0,0,0)" width="58" x="579" y="278" />
+  <text fill="rgb(0,0,0)" font-family="sansserif" font-size="11" font-style="normal" font-weight="normal" x="587" y="291">creates</text>
+  <path d="M 576 60 L 608 60" fill="none" stroke="rgb(0,0,0)" />
+  <path d="M 608 60 L 608 220" fill="none" stroke="rgb(0,0,0)" />
+  <path d="M 608 220 L 632 220" fill="none" stroke="rgb(0,0,0)" />
+  <polygon fill="rgb(0,0,0)" points="639,220 632,216 632,224 639,220" stroke="rgb(0,0,0)" />
+  <rect fill="white" height="15" stroke="rgb(0,0,0)" width="58" x="579" y="198" />
+  <text fill="rgb(0,0,0)" font-family="sansserif" font-size="11" font-style="normal" font-weight="normal" x="587" y="211">exports</text>
+  <path d="M 576 60 L 608 60" fill="none" stroke="rgb(0,0,0)" />
+  <path d="M 608 60 L 608 140" fill="none" stroke="rgb(0,0,0)" />
+  <path d="M 608 140 L 632 140" fill="none" stroke="rgb(0,0,0)" />
+  <polygon fill="rgb(0,0,0)" points="639,140 632,136 632,144 639,140" stroke="rgb(0,0,0)" />
+  <rect fill="white" height="15" stroke="rgb(0,0,0)" width="58" x="579" y="118" />
+  <text fill="rgb(0,0,0)" font-family="sansserif" font-size="11" font-style="normal" font-weight="normal" x="587" y="131">encodes</text>
+  <path d="M 192 60 L 248 60" fill="none" stroke="rgb(0,0,0)" />
+  <polygon fill="rgb(0,0,0)" points="255,60 248,56 248,64 255,60" stroke="rgb(0,0,0)" />
+  <rect fill="white" height="15" stroke="rgb(0,0,0)" width="52" x="198" y="38" />
+  <text fill="rgb(0,0,0)" font-family="sansserif" font-size="11" font-style="normal" font-weight="normal" x="206" y="51">copied</text>
+  <path d="M 768 60 L 824 60" fill="none" stroke="rgb(0,0,0)" />
+  <polygon fill="rgb(0,0,0)" points="831,60 824,56 824,64 831,60" stroke="rgb(0,0,0)" />
+  <rect fill="white" height="15" stroke="rgb(0,0,0)" width="58" x="771" y="38" />
+  <text fill="rgb(0,0,0)" font-family="sansserif" font-size="11" font-style="normal" font-weight="normal" x="779" y="51">uploads</text>
+  <path d="M 768 140 L 816 140" fill="none" stroke="rgb(0,0,0)" />
+  <path d="M 816 140 L 816 60" fill="none" stroke="rgb(0,0,0)" />
+  <path d="M 816 60 L 824 60" fill="none" stroke="rgb(0,0,0)" />
+  <polygon fill="rgb(0,0,0)" points="831,60 824,56 824,64 831,60" stroke="rgb(0,0,0)" />
+  <rect fill="white" height="15" stroke="rgb(0,0,0)" width="58" x="771" y="103" />
+  <text fill="rgb(0,0,0)" font-family="sansserif" font-size="11" font-style="normal" font-weight="normal" x="779" y="116">uploads</text>
+</svg>
diff --git a/usr/share/doc/vizrt/vosa-handbook/vmeo.org b/usr/share/doc/vizrt/vosa-handbook/vmeo.org
index 7d343f66..b1e0c45b 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vmeo.org
+++ b/usr/share/doc/vizrt/vosa-handbook/vmeo.org
@@ -1,11 +1,79 @@
 * Viz Media Engine - Online (VMEO)
 VME-Online is a content mangement system and online publishing system for Video.
 
-** TODO Overview
-
+** VMEO & ECE Integration
+
+*** Getting video into VMEO
+[[./graphics/vmeo-mam-to-vmeo.svg]]
+
+Video is normally stored on a MAM, a huge file server onto which the
+users copy their videos. 
+
+VMEO controller watches a folder on the MAM for updates and imports
+new raw video files as soon as they occur. The new video file is then
+transcoded into a number of pre-set formats. Once all the video
+formats and variants are created, the files are uploaded to the
+=vmeo-streamer=.
+
+The VMEO controller also generates a number of pictures of the video
+file at several places in the clip. These snapshots are called key
+frames. 
+
+The last thing VMEO does, is to export an XML file describing the new
+video file available in the VMEO controller.
+
+*** Getting the video (meta data) into ECE
+[[./graphics/vmeo-import-to-ece.svg]]
+
+The Escenic Content Engine downloads the exported video XML, applies a
+number of transformers on it (these can be XSL, BASH, Python or Perl
+files) into ECE Syndication XML and downloads the key frames from the
+VMEO controller.
+
+The ECE syndication XML files is then imported into ECE and the users
+can see the video content item in the Escenic Content Studio with the
+key frame pictures available as related content items on the video
+article.
+
+*** Displaying video in the web browser
+[[./graphics/vmeo-browser-playing-video.svg]]
+
+When one of these video content items is desked on the website, ECE
+will render the video widget. In addition to the markup, the video
+widget will render some JavaScript which will ask ECE to proxy a
+request to =vmeo-controller= for the URL the video stream or file. The
+URL the browser calls via JavaScript looks something like this:
+=/escenic-adactus-proxy/videoId=123=
+
+The response from the =vmeo-controller= is cached in the caching
+server and returned to the JavaScript running in the browser which
+will inject the URL in a player. Normally this is a Flash player like
+Flowplayer or an HTML =<video/>= element.
+
+*** Device specific videos
+Different devices can display different video formats and
+variants. To be able to retain a high cache-ability, we've chosen to
+have the following "buckets" of devices, where all devices in one
+"bucket" get the same video variant.
+
+Also worth nothing here, is that it only makes sense to heed device
+detection for variants that the VMEO can deliver. I.e., if VMEO is set
+up to only deliver to variants of the each video file, being able to
+detect and request 14,000 different variants of the video doesn't make
+any sense. 
+
+Currently, we're using the following "buckets"
+
+- iPhone :: all iPhones get the same video content
+- iPad :: all iPads get the same video.
+- Android :: since there's so many, so different Android devices out
+             there, we're currently dynamically creating one bucket
+             for each new Android device
+- Desktop & the rest :: If the browser is neither of the above, it
+     gets the standard desktop version of the video.
 
 ** Video file handling
-VME-O offers many interfaces to ingest video into the VME-O system.
+VMEO offers many interfaces to ingest video into the VMEO system.
 After ingest the videos have the following state:
 - The videos are stored in their original format.
 - All available meta information is available through the UI and API.
@@ -18,12 +86,12 @@ The following ingest interfaces are used by SOLARtv:
 The following ingest interfaces are available but not used by SOLARtv
 - Mobile ingest (Viz reporter) :: Several apps on iphone and nokia are available to upload video content over slow mobile networks or faster wifi connections when available to the device. 
 - Webservice ingest :: A REST webservice is available to push meta information of video content including a URI that will be ued by VMEO to fetch the video for ingestion.
-- Ingest formats :: VME-O has a long list of video formats it is able to ingest.
+- Ingest formats :: VMEO has a long list of video formats it is able to ingest.
 
 *** Transcoding
-Many Web browsers on PCs, tablets and smart phones are not capable of playing the VME-O house format. It is either to big or of the wrong binary format. This is why VME-O can be configured to transcode videos to various alternative formats and sizes to allow for a variety of devices to play them.
+Many Web browsers on PCs, tablets and smart phones are not capable of playing the VMEO house format. It is either to big or of the wrong binary format. This is why VMEO can be configured to transcode videos to various alternative formats and sizes to allow for a variety of devices to play them.
 
-Transcoding typically is quite CPU intensive. For this reason it makes no sense to transcode more than the amount of processors in a box in parrallel. VME-O has a queuing mechanism to ensure that it is not overloaded. More transcoding capacty can be added by deploying more transcoding machines to the cluster.
+Transcoding typically is quite CPU intensive. For this reason it makes no sense to transcode more than the amount of processors in a box in parrallel. VMEO has a queuing mechanism to ensure that it is not overloaded. More transcoding capacty can be added by deploying more transcoding machines to the cluster.
 
 At SOLARtv transcoding is done by vmeo-controller
 

From 454449c6d096099e4f33a15fb3838573c04fb8c1 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Fri, 16 Nov 2012 11:39:16 +0000
Subject: [PATCH 1651/2585] a story about private keys

---
 .../doc/vizrt/vosa-handbook/privatekeys.org   | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/privatekeys.org

diff --git a/usr/share/doc/vizrt/vosa-handbook/privatekeys.org b/usr/share/doc/vizrt/vosa-handbook/privatekeys.org
new file mode 100644
index 00000000..17bd5167
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/privatekeys.org
@@ -0,0 +1,23 @@
+* How to manage your private keys
+Vizrt needs to make it very easy to allow an operator to make changes to the configuration of a system that we maintain for our customers. At the same time we must protect systems against unauthorized access.
+We have chosen to use ssh keys to solve this problem. This means that ssh keys are at the center of our security policy. This document explains how we need people to work with them.
+
+Read the following rules as if it is about your personal creditcard:
+- Never duplicate a private key. Just make a new one if you loose it.
+- Allways put a passphrase on a private key.
+- A passphrase contains at least 3 words. The longer the better.
+- Keys are personal. Do not share keys amongst people.
+- Use agent forwarding when ssh hopping. (ssh -A thv@somehost.com)
+- Notify the saas team if you need to block your key immediately.
+
+** Why is it so important?
+Each private key file represents a sucurity threat to our customer or Vizrt. Emagine that we would somehow use physical keys. How secure is a building that can be opened by a key for whitch we have many different copies?
+It is as simple as that. We have many doors. When we enable your key, we ajust all those doors to open with your key. If an unauthorized person can use your key, our customers and Vizrt are in big, big trouble.
+
+** Personal responsibility
+Vizrt is ensured up to 10 million US Dollars per incident when a customer claims that we have caused them harm. We pay a lot of money for this ensurance but it does not protect us at all if:
+1. The harm is done to Vizrt and not to the customer.
+2. The harm is caused by a Security Breach: failure or lack of the Insured's Software Products or the Insured's Electronics Products to prevent unauthorised access to or use of an electronic system or program.
+
+** Help others be safe and be safe yourself.
+We use ssh keys to protect our dearest secrets. You are the last line of defense. This is why we have to behave in a way that resembles your behavior around physical safety. What do you do when you boss is about to fall of a ledge? You grab him and drag him to safety. Your boss will be startled at first and thank you afterward. In fact he might accuse you of neglecting to tell you of the danger if you didn't act. That is how you should act when you see others act unresponsible with keys. Even your boss.

From b6832867318a155258a56a681eef87eb5c9d6672 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Fri, 16 Nov 2012 11:42:27 +0000
Subject: [PATCH 1652/2585] included a story about private keys

---
 usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
index 6b570977..08d00acd 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
+++ b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
@@ -17,4 +17,5 @@
 #+INCLUDE: "backups.org"
 #+INCLUDE: "monitoring.org"
 #+INCLUDE: "ssh-access.org"
+#+INCLUDE: "privatekeys.org"
 #+INCLUDE: "host-naming.org"

From 44176a37cfd91b012924c5c5cc4e6e714b34dd02 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Fri, 16 Nov 2012 11:52:21 +0000
Subject: [PATCH 1653/2585] made it more general

---
 usr/share/doc/vizrt/vosa-handbook/privatekeys.org | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/privatekeys.org b/usr/share/doc/vizrt/vosa-handbook/privatekeys.org
index 17bd5167..238cdfb8 100644
--- a/usr/share/doc/vizrt/vosa-handbook/privatekeys.org
+++ b/usr/share/doc/vizrt/vosa-handbook/privatekeys.org
@@ -15,9 +15,9 @@ Each private key file represents a sucurity threat to our customer or Vizrt. Ema
 It is as simple as that. We have many doors. When we enable your key, we ajust all those doors to open with your key. If an unauthorized person can use your key, our customers and Vizrt are in big, big trouble.
 
 ** Personal responsibility
-Vizrt is ensured up to 10 million US Dollars per incident when a customer claims that we have caused them harm. We pay a lot of money for this ensurance but it does not protect us at all if:
-1. The harm is done to Vizrt and not to the customer.
-2. The harm is caused by a Security Breach: failure or lack of the Insured's Software Products or the Insured's Electronics Products to prevent unauthorised access to or use of an electronic system or program.
+Vizrt and customers are ensured for security incidents. This ensurance but it does not protect us at all if:
+1. The harm is done to Vizrt by a Vizrt employee or by the customer to the customer.
+2. The harm is caused by a Security Breach that could have been avoided by the design of the software.
 
 ** Help others be safe and be safe yourself.
 We use ssh keys to protect our dearest secrets. You are the last line of defense. This is why we have to behave in a way that resembles your behavior around physical safety. What do you do when you boss is about to fall of a ledge? You grab him and drag him to safety. Your boss will be startled at first and thank you afterward. In fact he might accuse you of neglecting to tell you of the danger if you didn't act. That is how you should act when you see others act unresponsible with keys. Even your boss.

From ca5a5bab4da11f21fcc9e5f54767d7568aa81fe8 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Fri, 16 Nov 2012 13:17:23 +0000
Subject: [PATCH 1654/2585] typo

---
 usr/share/doc/vizrt/vosa-handbook/privatekeys.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/privatekeys.org b/usr/share/doc/vizrt/vosa-handbook/privatekeys.org
index 238cdfb8..a3b000e7 100644
--- a/usr/share/doc/vizrt/vosa-handbook/privatekeys.org
+++ b/usr/share/doc/vizrt/vosa-handbook/privatekeys.org
@@ -15,7 +15,7 @@ Each private key file represents a sucurity threat to our customer or Vizrt. Ema
 It is as simple as that. We have many doors. When we enable your key, we ajust all those doors to open with your key. If an unauthorized person can use your key, our customers and Vizrt are in big, big trouble.
 
 ** Personal responsibility
-Vizrt and customers are ensured for security incidents. This ensurance but it does not protect us at all if:
+Vizrt and customers are ensured for security incidents. This ensurance does not protect us at all if:
 1. The harm is done to Vizrt by a Vizrt employee or by the customer to the customer.
 2. The harm is caused by a Security Breach that could have been avoided by the design of the software.
 

From 3562d83cd41c81aada7f6d77cb634f251ce3a9c6 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Fri, 16 Nov 2012 13:25:23 +0000
Subject: [PATCH 1655/2585] added a warning

---
 usr/share/doc/vizrt/vosa-handbook/privatekeys.org | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/usr/share/doc/vizrt/vosa-handbook/privatekeys.org b/usr/share/doc/vizrt/vosa-handbook/privatekeys.org
index a3b000e7..8314eb9f 100644
--- a/usr/share/doc/vizrt/vosa-handbook/privatekeys.org
+++ b/usr/share/doc/vizrt/vosa-handbook/privatekeys.org
@@ -18,6 +18,10 @@ It is as simple as that. We have many doors. When we enable your key, we ajust a
 Vizrt and customers are ensured for security incidents. This ensurance does not protect us at all if:
 1. The harm is done to Vizrt by a Vizrt employee or by the customer to the customer.
 2. The harm is caused by a Security Breach that could have been avoided by the design of the software.
+In other words:
+#+BEGIN_QUOTE
+Keep your keys safe and we will be okay even if we make bad mistakes.
+#+END_QUOTE
 
 ** Help others be safe and be safe yourself.
 We use ssh keys to protect our dearest secrets. You are the last line of defense. This is why we have to behave in a way that resembles your behavior around physical safety. What do you do when you boss is about to fall of a ledge? You grab him and drag him to safety. Your boss will be startled at first and thank you afterward. In fact he might accuse you of neglecting to tell you of the danger if you didn't act. That is how you should act when you see others act unresponsible with keys. Even your boss.

From 7dcb1cb21271205e9c1cfcf56ba44be9b86f2ce0 Mon Sep 17 00:00:00 2001
From: Kevin Flynn <kevin@kevin-Precision-M4500.(none)>
Date: Fri, 16 Nov 2012 14:36:32 +0100
Subject: [PATCH 1656/2585] added first draft of installation/set-up
 instructions

---
 .../vosa-handbook/development-process.org     | 130 +++++++++++++++++-
 1 file changed, 125 insertions(+), 5 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/development-process.org b/usr/share/doc/vizrt/vosa-handbook/development-process.org
index 38e96c12..b66f627b 100644
--- a/usr/share/doc/vizrt/vosa-handbook/development-process.org
+++ b/usr/share/doc/vizrt/vosa-handbook/development-process.org
@@ -1,10 +1,130 @@
-  in the VirtualBox Manager.
-the import process will start.
 * Development Process
 
-The development process consists of a chain of processes and applications
-working together to create an efficient and agile environment for change
-management.  
+This chapter tells you how to install and set up your development
+environment, and then describes how you can use the
+tools in the environment to carry out everyday development tasks.
+
+The main components of the VOSA development environment are:
+
+ * Apache Subversion :: All your project code is stored here, under strict
+                 version control.
+ * Apache Maven :: Apache Maven provides dependency management and
+                   controls the SW build process.
+ * IntelliJ IDEA Ultimate :: Your editor and coding environment.
+ * VirtualBox :: Lets you run a complete
+                 copy of your production site in a virtual
+                 machine on your PC, making it easy to test your code changes
+                 as you make them.
+ * HipChat :: A chat room service that you can use to communicate with
+              other members of your project, stakeholders in the
+              project (customers, users and so on) and Vizrt support
+              staff. The chat room for your project also has a special
+              member called Guru. Guru is a robot who will do various
+              jobs for you such as building and deploying new versions
+              of the site.
+ * JIRA :: A bug tracking service that is used to track all work done
+           in the project. All changes to be made are registered as
+           change requests in JIRA, and Subversion will only allow you
+           to check in changes that have a valid JIRA ticket number.
+
+** Installation
+
+You need to install the following items on your PC or Mac:
+
+ * The Oracle Java Development Kit, version 7 (??). You can get this
+   from [[http://www.oracle.com/technetwork/java/javase/downloads/java-se-jdk-7-download-432154.html]].
+ * Apache Subversion client software. You can get this from [[http://subversion.apache.org/packages.html]].
+ * Apache Maven version 3. You can get this from [[http://maven.apache.org/download.html]].
+ * IntelliJ IDEA Ultimate, version 11.x. You can download this from
+   [[http://www.jetbrains.com/idea/download/]]. Be sure to download the
+   Ultimate version, which is licensed software. Depending on the
+   licensing arrangement at your site you may need to enter a license
+   number after installation - talk to your project manager for more
+   information. Note that earlier versions of IntelliJ IDEA do not
+   contain all the functions required by the VOSA development process
+   and will not work properly.
+
+During the IntelliJ IDEA installation process you are allowed to
+choose which plug-ins to activate. You should activate at least the
+following plug-ins (although you may find you have use for others):
+
+
+ * Maven integration plug-in
+ * Subversion integration plug-in
+ * ??
+
+All of the above products have their own installation
+procedures. Follow the relevant procedures for your operating system,
+and make sure they are correctly installed before continuing with the
+set-up of your development environment.
+
+** Set-up
+
+Setting up your development environment involves a combination of
+configuring the SW you have installed and obtaining copies of the code
+and systems you are going to work on.
+
+*** Set up your local test site
+
+Download the following virtual machine image:
+
+ [[<%= trail_dev_image_uri %>]]
+
+When the file has finished downloading, double-click on it. This
+starts VirtualBox, which opens the file and creates a virtual machine
+from it. When the virtual machine is ready, a [name] entry will appear
+in the list on the left hand side of the VirtualBox window. 
+
+
+Click on Start to run the machine. A terminal window is displayed,
+showing the virtual machine boot-up messages. When the boot sequence
+has finished, the terminal window will contain an information page
+starting with the following welcome message:
+
+Welcome to [URL]
+
+This is the URL you must use to access your test site.
+
+Below this welcome messages are the IP addresses used by the virtual
+machine and the user name/password combinations you can use to log in
+to the system.
+
+In order to be able to use [URL] URLs, you need to add the host name
+[host] to your computer's =hosts= file. To do this:
+
+ 1 Open your hosts file in a text editor. On a PC, you will find the
+   hosts file at =??=. On a Mac or Linux machine you will find it at =/etc/hosts=.
+
+ 2 Add the following line to the file:
+ 
+#+BEGIN_SRC default
+ip-address [host]
+#+END_SRC
+
+where ip-address is the eth1 IP address listed on the virtual machine's welcome page.
+
+  3 Save your changes.
+  
+Your test system is now up and running. You should be able to access
+your test site by opening a browser and navigating to [URL].
+
+*** Check out your project
+
+Start Intellij.
+
+Click on the "Check out from Version Control" link.
+
+If a list of version control systems is displayed, select Subversion.
+
+Click on the + icon to add a new repository.
+
+Paste this:
+
+[subversion-url]
+
+into the displayed dialog, and click on OK.
+
+
 
 ** TODO Jira
 

From 7c79bc5401c39ce6f5cbba49bc1abf531ece6f74 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Fri, 16 Nov 2012 13:45:17 +0000
Subject: [PATCH 1657/2585] fixed some typo's

---
 .../doc/vizrt/vosa-handbook/privatekeys.org    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/privatekeys.org b/usr/share/doc/vizrt/vosa-handbook/privatekeys.org
index 8314eb9f..19f98b3e 100644
--- a/usr/share/doc/vizrt/vosa-handbook/privatekeys.org
+++ b/usr/share/doc/vizrt/vosa-handbook/privatekeys.org
@@ -1,21 +1,21 @@
 * How to manage your private keys
 Vizrt needs to make it very easy to allow an operator to make changes to the configuration of a system that we maintain for our customers. At the same time we must protect systems against unauthorized access.
-We have chosen to use ssh keys to solve this problem. This means that ssh keys are at the center of our security policy. This document explains how we need people to work with them.
+We have chosen to use SSH keys to solve this problem. This means that ssh keys are at the center of our security policy. This document explains how we need people to work with them.
 
-Read the following rules as if it is about your personal creditcard:
+Read the following rules as if it is about your personal credit card:
 - Never duplicate a private key. Just make a new one if you loose it.
-- Allways put a passphrase on a private key.
-- A passphrase contains at least 3 words. The longer the better.
+- Always put a pass phrase on a private key.
+- A pass phrase contains at least 3 words. The longer the better.
 - Keys are personal. Do not share keys amongst people.
 - Use agent forwarding when ssh hopping. (ssh -A thv@somehost.com)
-- Notify the saas team if you need to block your key immediately.
+- Notify the SaaS team if you need to block your key immediately.
 
 ** Why is it so important?
-Each private key file represents a sucurity threat to our customer or Vizrt. Emagine that we would somehow use physical keys. How secure is a building that can be opened by a key for whitch we have many different copies?
-It is as simple as that. We have many doors. When we enable your key, we ajust all those doors to open with your key. If an unauthorized person can use your key, our customers and Vizrt are in big, big trouble.
+Each private key file represents a security threat to our customer or Vizrt. Imagine that we would somehow use physical keys. How secure is a building that can be opened by a key for which we have many different copies?
+It is as simple as that. We have many doors. When we enable your key, we adjust all those doors to open with your key. If an unauthorized person can use your key, our customers and Vizrt are in big, big trouble.
 
 ** Personal responsibility
-Vizrt and customers are ensured for security incidents. This ensurance does not protect us at all if:
+Vizrt and customers are ensured for security incidents. This insurance does not protect us at all if:
 1. The harm is done to Vizrt by a Vizrt employee or by the customer to the customer.
 2. The harm is caused by a Security Breach that could have been avoided by the design of the software.
 In other words:
@@ -24,4 +24,4 @@ Keep your keys safe and we will be okay even if we make bad mistakes.
 #+END_QUOTE
 
 ** Help others be safe and be safe yourself.
-We use ssh keys to protect our dearest secrets. You are the last line of defense. This is why we have to behave in a way that resembles your behavior around physical safety. What do you do when you boss is about to fall of a ledge? You grab him and drag him to safety. Your boss will be startled at first and thank you afterward. In fact he might accuse you of neglecting to tell you of the danger if you didn't act. That is how you should act when you see others act unresponsible with keys. Even your boss.
+We use SSH keys to protect our dearest secrets. You are the last line of defense. This is why we have to behave in a way that resembles your behavior around physical safety. What do you do when you boss is about to fall of a ledge? You grab him and drag him to safety. Your boss will be startled at first and thank you afterward. In fact he might accuse you of neglecting to tell you of the danger if you didn't act. That is how you should act when you see others act UN responsible with keys. Even your boss.

From 410e25216180ca66d675318202b862b85813cbe6 Mon Sep 17 00:00:00 2001
From: Kevin Flynn <kevin@kevin-Precision-M4500.(none)>
Date: Fri, 16 Nov 2012 14:46:55 +0100
Subject: [PATCH 1658/2585] fixed bad org-mode list markup

---
 .../vosa-handbook/development-process.org     | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/development-process.org b/usr/share/doc/vizrt/vosa-handbook/development-process.org
index b66f627b..6965f9e2 100644
--- a/usr/share/doc/vizrt/vosa-handbook/development-process.org
+++ b/usr/share/doc/vizrt/vosa-handbook/development-process.org
@@ -6,23 +6,23 @@ tools in the environment to carry out everyday development tasks.
 
 The main components of the VOSA development environment are:
 
- * Apache Subversion :: All your project code is stored here, under strict
+ - Apache Subversion :: All your project code is stored here, under strict
                  version control.
- * Apache Maven :: Apache Maven provides dependency management and
+ - Apache Maven :: Apache Maven provides dependency management and
                    controls the SW build process.
- * IntelliJ IDEA Ultimate :: Your editor and coding environment.
- * VirtualBox :: Lets you run a complete
+ - IntelliJ IDEA Ultimate :: Your editor and coding environment.
+ - VirtualBox :: Lets you run a complete
                  copy of your production site in a virtual
                  machine on your PC, making it easy to test your code changes
                  as you make them.
- * HipChat :: A chat room service that you can use to communicate with
+ - HipChat :: A chat room service that you can use to communicate with
               other members of your project, stakeholders in the
               project (customers, users and so on) and Vizrt support
               staff. The chat room for your project also has a special
               member called Guru. Guru is a robot who will do various
               jobs for you such as building and deploying new versions
               of the site.
- * JIRA :: A bug tracking service that is used to track all work done
+ - JIRA :: A bug tracking service that is used to track all work done
            in the project. All changes to be made are registered as
            change requests in JIRA, and Subversion will only allow you
            to check in changes that have a valid JIRA ticket number.
@@ -31,11 +31,11 @@ The main components of the VOSA development environment are:
 
 You need to install the following items on your PC or Mac:
 
- * The Oracle Java Development Kit, version 7 (??). You can get this
+ - The Oracle Java Development Kit, version 7 (??). You can get this
    from [[http://www.oracle.com/technetwork/java/javase/downloads/java-se-jdk-7-download-432154.html]].
- * Apache Subversion client software. You can get this from [[http://subversion.apache.org/packages.html]].
- * Apache Maven version 3. You can get this from [[http://maven.apache.org/download.html]].
- * IntelliJ IDEA Ultimate, version 11.x. You can download this from
+ - Apache Subversion client software. You can get this from [[http://subversion.apache.org/packages.html]].
+ - Apache Maven version 3. You can get this from [[http://maven.apache.org/download.html]].
+ - IntelliJ IDEA Ultimate, version 11.x. You can download this from
    [[http://www.jetbrains.com/idea/download/]]. Be sure to download the
    Ultimate version, which is licensed software. Depending on the
    licensing arrangement at your site you may need to enter a license
@@ -49,9 +49,9 @@ choose which plug-ins to activate. You should activate at least the
 following plug-ins (although you may find you have use for others):
 
 
- * Maven integration plug-in
- * Subversion integration plug-in
- * ??
+ - Maven integration plug-in
+ - Subversion integration plug-in
+ - ??
 
 All of the above products have their own installation
 procedures. Follow the relevant procedures for your operating system,
@@ -198,4 +198,3 @@ Your dev image can be downloaded here - [[<%= trail_dev_image_uri %>][Local deve
 
 Operating system: The usernames ubuntu (with sudo privileges), escenic (runs escenic).
 
-

From 1da1e6d7eb997156b73f0d5a2e43744a9a3d2a05 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Fri, 16 Nov 2012 14:00:13 +0000
Subject: [PATCH 1659/2585] changed the word document in section

---
 usr/share/doc/vizrt/vosa-handbook/privatekeys.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/privatekeys.org b/usr/share/doc/vizrt/vosa-handbook/privatekeys.org
index 19f98b3e..5ef84130 100644
--- a/usr/share/doc/vizrt/vosa-handbook/privatekeys.org
+++ b/usr/share/doc/vizrt/vosa-handbook/privatekeys.org
@@ -1,6 +1,6 @@
 * How to manage your private keys
 Vizrt needs to make it very easy to allow an operator to make changes to the configuration of a system that we maintain for our customers. At the same time we must protect systems against unauthorized access.
-We have chosen to use SSH keys to solve this problem. This means that ssh keys are at the center of our security policy. This document explains how we need people to work with them.
+We have chosen to use SSH keys to solve this problem. This means that ssh keys are at the center of our security policy. This section explains how we need people to work with them.
 
 Read the following rules as if it is about your personal credit card:
 - Never duplicate a private key. Just make a new one if you loose it.

From b5bfbe03851fae7d37518b65c21425501449c0dc Mon Sep 17 00:00:00 2001
From: Kevin Flynn <kevin@kevin-Precision-M4500.(none)>
Date: Fri, 16 Nov 2012 15:18:57 +0100
Subject: [PATCH 1660/2585] improved formatting

---
 .../vosa-handbook/development-process.org     | 58 +++++++++----------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/development-process.org b/usr/share/doc/vizrt/vosa-handbook/development-process.org
index 6965f9e2..3c039ac9 100644
--- a/usr/share/doc/vizrt/vosa-handbook/development-process.org
+++ b/usr/share/doc/vizrt/vosa-handbook/development-process.org
@@ -33,8 +33,12 @@ You need to install the following items on your PC or Mac:
 
  - The Oracle Java Development Kit, version 7 (??). You can get this
    from [[http://www.oracle.com/technetwork/java/javase/downloads/java-se-jdk-7-download-432154.html]].
- - Apache Subversion client software. You can get this from [[http://subversion.apache.org/packages.html]].
- - Apache Maven version 3. You can get this from [[http://maven.apache.org/download.html]].
+ - Apache Subversion client software. You can get this from
+   [[http://subversion.apache.org/packages.html]] (or on Linux, you can
+   most likely install it using your package manager).
+ - Apache Maven version 3. You can get this from
+   [[http://maven.apache.org/download.html]]  (or on Linux, you can
+   most likely install it using your package manager).
  - IntelliJ IDEA Ultimate, version 11.x. You can download this from
    [[http://www.jetbrains.com/idea/download/]]. Be sure to download the
    Ultimate version, which is licensed software. Depending on the
@@ -48,7 +52,6 @@ During the IntelliJ IDEA installation process you are allowed to
 choose which plug-ins to activate. You should activate at least the
 following plug-ins (although you may find you have use for others):
 
-
  - Maven integration plug-in
  - Subversion integration plug-in
  - ??
@@ -60,9 +63,10 @@ set-up of your development environment.
 
 ** Set-up
 
-Setting up your development environment involves a combination of
-configuring the SW you have installed and obtaining copies of the code
-and systems you are going to work on.
+Setting up your development environment involves:
+
+ - Configuring the SW you have installed
+ - Obtaining copies of the code and systems you are going to work on
 
 *** Set up your local test site
 
@@ -76,12 +80,14 @@ from it. When the virtual machine is ready, a [name] entry will appear
 in the list on the left hand side of the VirtualBox window. 
 
 
-Click on Start to run the machine. A terminal window is displayed,
+Click on *Start* to run the machine. A terminal window is displayed,
 showing the virtual machine boot-up messages. When the boot sequence
 has finished, the terminal window will contain an information page
 starting with the following welcome message:
 
+#+BEGIN_SRC default
 Welcome to [URL]
+#+END_SRC
 
 This is the URL you must use to access your test site.
 
@@ -94,15 +100,11 @@ In order to be able to use [URL] URLs, you need to add the host name
 
  1 Open your hosts file in a text editor. On a PC, you will find the
    hosts file at =??=. On a Mac or Linux machine you will find it at =/etc/hosts=.
-
  2 Add the following line to the file:
- 
-#+BEGIN_SRC default
-ip-address [host]
-#+END_SRC
-
-where ip-address is the eth1 IP address listed on the virtual machine's welcome page.
-
+   #+BEGIN_SRC default
+   ip-address [host]
+   #+END_SRC
+   where ip-address is the eth1 IP address listed on the virtual machine's welcome page.
   3 Save your changes.
   
 Your test system is now up and running. You should be able to access
@@ -110,21 +112,17 @@ your test site by opening a browser and navigating to [URL].
 
 *** Check out your project
 
-Start Intellij.
-
-Click on the "Check out from Version Control" link.
-
-If a list of version control systems is displayed, select Subversion.
-
-Click on the + icon to add a new repository.
-
-Paste this:
-
-[subversion-url]
-
-into the displayed dialog, and click on OK.
-
-
+To check out your project:
+
+ 1 Start Intellij.
+ 2 Click on the "Check out from Version Control" link.
+ 3 If a list of version control systems is displayed, select Subversion.
+ 4 Click on the + icon to add a new repository.
+ 5 Paste this:
+   #+BEGIN_SRC default
+   [subversion-url]
+   #+END_SRC
+   into the displayed dialog, and click on OK.
 
 ** TODO Jira
 

From 312e84f4f9b9aa7d7899cf4d4de90017672d1a11 Mon Sep 17 00:00:00 2001
From: Kevin Flynn <kevin@kevin-Precision-M4500.(none)>
Date: Fri, 16 Nov 2012 15:29:13 +0100
Subject: [PATCH 1661/2585] fixed numbered lists

---
 .../vizrt/vosa-handbook/development-process.org  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/development-process.org b/usr/share/doc/vizrt/vosa-handbook/development-process.org
index 3c039ac9..b40c9b32 100644
--- a/usr/share/doc/vizrt/vosa-handbook/development-process.org
+++ b/usr/share/doc/vizrt/vosa-handbook/development-process.org
@@ -98,14 +98,14 @@ to the system.
 In order to be able to use [URL] URLs, you need to add the host name
 [host] to your computer's =hosts= file. To do this:
 
- 1 Open your hosts file in a text editor. On a PC, you will find the
+1. Open your hosts file in a text editor. On a PC, you will find the
    hosts file at =??=. On a Mac or Linux machine you will find it at =/etc/hosts=.
- 2 Add the following line to the file:
+2. Add the following line to the file:
    #+BEGIN_SRC default
    ip-address [host]
    #+END_SRC
    where ip-address is the eth1 IP address listed on the virtual machine's welcome page.
-  3 Save your changes.
+3. Save your changes.
   
 Your test system is now up and running. You should be able to access
 your test site by opening a browser and navigating to [URL].
@@ -114,11 +114,11 @@ your test site by opening a browser and navigating to [URL].
 
 To check out your project:
 
- 1 Start Intellij.
- 2 Click on the "Check out from Version Control" link.
- 3 If a list of version control systems is displayed, select Subversion.
- 4 Click on the + icon to add a new repository.
- 5 Paste this:
+1. Start Intellij.
+2. Click on the "Check out from Version Control" link.
+3. If a list of version control systems is displayed, select Subversion.
+4. Click on the + icon to add a new repository.
+5. Paste this:
    #+BEGIN_SRC default
    [subversion-url]
    #+END_SRC

From 00c69bf3819fe12e94950d8f446760e75527219d Mon Sep 17 00:00:00 2001
From: Kevin Flynn <kevin@kevin-Precision-M4500.(none)>
Date: Mon, 19 Nov 2012 13:51:00 +0100
Subject: [PATCH 1662/2585] minor formatting and editing

---
 .../vosa-handbook/development-process.org     | 39 +++++++++++++------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/development-process.org b/usr/share/doc/vizrt/vosa-handbook/development-process.org
index b40c9b32..9246a747 100644
--- a/usr/share/doc/vizrt/vosa-handbook/development-process.org
+++ b/usr/share/doc/vizrt/vosa-handbook/development-process.org
@@ -76,7 +76,7 @@ Download the following virtual machine image:
 
 When the file has finished downloading, double-click on it. This
 starts VirtualBox, which opens the file and creates a virtual machine
-from it. When the virtual machine is ready, a [name] entry will appear
+from it. When the virtual machine is ready, a [[<%= trail_dev_image_name %>]] entry will appear
 in the list on the left hand side of the VirtualBox window. 
 
 
@@ -86,7 +86,7 @@ has finished, the terminal window will contain an information page
 starting with the following welcome message:
 
 #+BEGIN_SRC default
-Welcome to [URL]
+Welcome to http://[[<%= trail_dev_host_name %>]] development environment
 #+END_SRC
 
 This is the URL you must use to access your test site.
@@ -95,34 +95,49 @@ Below this welcome messages are the IP addresses used by the virtual
 machine and the user name/password combinations you can use to log in
 to the system.
 
-In order to be able to use [URL] URLs, you need to add the host name
-[host] to your computer's =hosts= file. To do this:
+In order to be able to use [[<%= trail_dev_host_name %>]] URLs, you need to add the host name
+[[<%= trail_dev_host_name %>]] to your computer's =hosts= file. To do this:
 
-1. Open your hosts file in a text editor. On a PC, you will find the
-   hosts file at =??=. On a Mac or Linux machine you will find it at =/etc/hosts=.
+1. Open your hosts file in a text editor. On a Windows PC, you will find the
+   hosts file at =C:\Windows\System32\drivers\etc\hosts=. On a Mac or Linux 
+   machine you will find it at =/etc/hosts=.
 2. Add the following line to the file:
    #+BEGIN_SRC default
-   ip-address [host]
+   /ip-address/ [[<%= trail_dev_host_name %>]]
    #+END_SRC
-   where ip-address is the eth1 IP address listed on the virtual machine's welcome page.
+   where /ip-address/ is the =eth1= IP address listed on the virtual machine's welcome page.
 3. Save your changes.
   
 Your test system is now up and running. You should be able to access
-your test site by opening a browser and navigating to [URL].
+your test site by opening a browser and navigating to http://[[<%= trail_dev_host_name %>]].
 
 *** Check out your project
 
 To check out your project:
 
 1. Start Intellij.
-2. Click on the "Check out from Version Control" link.
+2. Click on the *Check out from Version Control* link.
 3. If a list of version control systems is displayed, select Subversion.
 4. Click on the + icon to add a new repository.
 5. Paste this:
    #+BEGIN_SRC default
-   [subversion-url]
+   https://vizrtcustomers.jira.com/svn/[[<%= trail_dev_project_name %>]]
    #+END_SRC
-   into the displayed dialog, and click on OK.
+   into the displayed dialog, and click on *OK*.
+6. Select the repository you have added to the list and select *Checkout*.
+7. Choose/create a destination folder for the project and click *OK* three times.
+8. When asked if you want to create an IntelliJ project for the source files, select 
+   *No* and except the wizard's defaults.
+
+*** Configure Maven
+
+You need to add a reference to the Vizrt software repository to your
+Maven settings files. To do this:
+
+1. Open the Maven settings file for editing. On Windows you will find
+   it at =??=. On  Mac and Linux you will find it at
+   =/home/<your-user>/.m2/settings.xml=.
+2. Add the following 
 
 ** TODO Jira
 

From 2911683de1897ab3a7e95233da0b7199f249bbc6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 19 Nov 2012 15:51:35 +0100
Subject: [PATCH 1663/2585] - added jvm_connection_settings to ece.conf & ece
 which overrides the   default connection settings of all classes that
 directly or   indirectly open TCP connections inside the JVM.

  To ensue more stable connections to EAE, we set max timeouts
  here. If you're not using EAE, you probably don't need these and can
  comment out the variable.

  The values are in milliseconds and are set to 5 seconds (5000
  milliseconds).
---
 etc/escenic/ece.conf | 15 +++++++++++++++
 usr/bin/ece          |  4 ++++
 2 files changed, 19 insertions(+)

diff --git a/etc/escenic/ece.conf b/etc/escenic/ece.conf
index 12fb6dd8..fd4dc52f 100644
--- a/etc/escenic/ece.conf
+++ b/etc/escenic/ece.conf
@@ -173,6 +173,21 @@ jvm_gc_settings="
 #   -Dhttps.proxyPort=3128
 # "
 
+######################################################################
+# This overrides the default connection settings of all classes that
+# directly or indirectly open TCP connections inside the JVM.
+#
+# To ensue more stable connections to EAE, we set max timeouts
+# here. If you're not using EAE, you probably don't need these and can
+# comment out the variable.
+#
+# The values are in milliseconds and are set to 5 seconds (5000
+# milliseconds).
+jvm_connection_settings="
+  sun.net.client.defaultConnectTimeout=5000
+  sun.net.client.defaultReadTimeout=5000
+"
+
 ######################################################################
 # Java will use IPv6 if it's available on the OS. This however, can
 # cause problems with applications that insists on using IPv4
diff --git a/usr/bin/ece b/usr/bin/ece
index ac949523..2648b2dd 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -324,6 +324,10 @@ function set_instance_settings() {
     if [ "$jvm_proxy_settings" ]; then
       ece_args=$ece_args" "$jvm_proxy_settings
     fi
+    
+    if [ "$jvm_connection_settings" ]; then
+      ece_args=$ece_args" "$jvm_connection_settings
+    fi
 
     if [ "$instance" != "default" ]; then
         ece_args=$ece_args" -Dcom.escenic.instance=$instance"

From fed4a837d51fcedc4c1d450ca647e8e3ca14b54c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 20 Nov 2012 09:49:22 +0100
Subject: [PATCH 1664/2585] - fixed error in check_mk plugin:

  /usr/lib/check_mk_agent/local/ftp-feed-sources: line 10: syntax
  error near unexpected token `2'
---
 usr/lib/check_mk_agent/local/ftp-feed-sources | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/lib/check_mk_agent/local/ftp-feed-sources b/usr/lib/check_mk_agent/local/ftp-feed-sources
index 01178bfd..24d9428c 100644
--- a/usr/lib/check_mk_agent/local/ftp-feed-sources
+++ b/usr/lib/check_mk_agent/local/ftp-feed-sources
@@ -7,7 +7,7 @@
 ## to determine which FTP feeds to check the health of.
 
 function read_trails() {
-  for el in /var/lib/ece-install/*.trail 2>/dev/null; do
+  for el in $(ls /var/lib/ece-install/*.trail 2>/dev/null); do
     source $el
   done
 }

From 14c2ba942ce049cabefa43538b4b639642e9e7f3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 20 Nov 2012 09:59:33 +0100
Subject: [PATCH 1665/2585] - added the executable bit

---
 usr/lib/check_mk_agent/local/ftp-feed-sources | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 usr/lib/check_mk_agent/local/ftp-feed-sources

diff --git a/usr/lib/check_mk_agent/local/ftp-feed-sources b/usr/lib/check_mk_agent/local/ftp-feed-sources
old mode 100644
new mode 100755

From 6f24882556960dd55c728b8fc5b311f2f3fdfaf7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 20 Nov 2012 11:07:08 +0100
Subject: [PATCH 1666/2585] - lowered the default connection timeout from 5 to
 1 second.

---
 etc/escenic/ece.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/escenic/ece.conf b/etc/escenic/ece.conf
index fd4dc52f..dec32673 100644
--- a/etc/escenic/ece.conf
+++ b/etc/escenic/ece.conf
@@ -184,7 +184,7 @@ jvm_gc_settings="
 # The values are in milliseconds and are set to 5 seconds (5000
 # milliseconds).
 jvm_connection_settings="
-  sun.net.client.defaultConnectTimeout=5000
+  sun.net.client.defaultConnectTimeout=1000
   sun.net.client.defaultReadTimeout=5000
 "
 

From 46710b75ec80b702af5f0a3422ad6675184e9d9f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 20 Nov 2012 13:32:52 +0100
Subject: [PATCH 1667/2585] - forgot -D prefixes on the JVM connection
 parameters

---
 etc/escenic/ece.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/escenic/ece.conf b/etc/escenic/ece.conf
index dec32673..3d0882bc 100644
--- a/etc/escenic/ece.conf
+++ b/etc/escenic/ece.conf
@@ -184,8 +184,8 @@ jvm_gc_settings="
 # The values are in milliseconds and are set to 5 seconds (5000
 # milliseconds).
 jvm_connection_settings="
-  sun.net.client.defaultConnectTimeout=1000
-  sun.net.client.defaultReadTimeout=5000
+  -Dsun.net.client.defaultConnectTimeout=1000
+  -Dsun.net.client.defaultReadTimeout=5000
 "
 
 ######################################################################

From bcd229abef048c5ecc7e8d99120f94b435e299ae Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 21 Nov 2012 10:31:33 +0100
Subject: [PATCH 1668/2585] - fixed bug in
 ece-import::handle_transformation_error (avoided a pun   there, that was
 close!) where it would put the transformer and not   the (working copy) XML
 to the error directory.

- changed the error directory in
  ece-import::handle_transformation_error to being the raw specific
  failed directory and not the ECE spool/<publication>/<job>/error
  directory.
---
 usr/bin/ece-import | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/usr/bin/ece-import b/usr/bin/ece-import
index 56742328..ebeb761f 100755
--- a/usr/bin/ece-import
+++ b/usr/bin/ece-import
@@ -261,9 +261,10 @@ function perform_transformations() {
 ## $1 :: transformer
 ## $2 :: the raw/input file
 function handle_transformation_error() {
+  local dir=$raw_transformed_base_dir/$publication_name/$job_name/failed
   log "$(red FAILED) The transformation $1 on file $2" \
-    "moving $2 to the error directory and skipping to next import XML"
-  run mv $1 $escenic_spool_base_dir/$publication_name/$job_name/error
+    "moving $2 to $dir and skipping to the next XML file"
+  run mv $2 $dir
 }
 
 import_error_count=0

From 89fae82de2e8e8f4d9fa836f83fa588ceb93994b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 21 Nov 2012 10:33:33 +0100
Subject: [PATCH 1669/2585] - not log existing downloads in  
 ece-import::http-and-ftp::download_files_if_desired as this will   create log
 files in production.

---
 usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh b/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh
index 7b15dc23..0734bba2 100644
--- a/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh
+++ b/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh
@@ -44,7 +44,8 @@ function download_latest_files() {
 function download_files_if_desired() {
   for el in $list_of_files; do
     if [ $(is_already_downloaded $uri/$el) -eq 1 ]; then
-      print_and_log $el "has already been downloaded, skipping to the next one"
+      # not logging anything here as this will create log files in
+      # production.
       continue
     fi
     print_and_log "Downloading" $uri/$el "..."

From 52814e94520384fa34bf0b4c54e2436aafc3ccb4 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 21 Nov 2012 11:08:19 +0100
Subject: [PATCH 1670/2585] - corrected the directory structure - fixed some
 formatting issues

---
 usr/share/doc/escenic/ece-import-guide.org | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/usr/share/doc/escenic/ece-import-guide.org b/usr/share/doc/escenic/ece-import-guide.org
index ea30cf1b..dbef679e 100644
--- a/usr/share/doc/escenic/ece-import-guide.org
+++ b/usr/share/doc/escenic/ece-import-guide.org
@@ -5,8 +5,7 @@
 * Introduction
 The =ece-import= script will help you with the following tasks:
 
-- Setting up imports, either [[From an import archive]] or
-[[  Without an import archive]]
+- Setting up imports, either [[From an import archive]] or [[Without an import archive]]
 - [[Getting raw import data from HTTP or FTP servers]]
 - Running an import job, taking the raw XML from a 3rd party system,
   applying all defined transformations on it and dumping it in the
@@ -29,9 +28,9 @@ to create such an archive yourself.
 ** Without an import archive
 #+BEGIN_SRC text
 # ece-import \
-#   --name  streaming-video \
-#   --publication mypub \
-#   create
+    --name streaming-video \
+    --publication mypub \
+    create
 #+END_SRC
 
 * Getting raw import data from HTTP or FTP servers
@@ -111,7 +110,7 @@ following directory structure is required:
                  =/etc/cron.hourly= on the import server. Be sure to
                  set the execute bit on the file and note that as with
                  all cron jobs, the file cannot have a file suffix.
-- cron.every.<number>.minutes :: scripts to run every =<number>= minutes.
+- cron.every.five.minutes :: scripts to run every five minutes.
 
 We're calling the import configuration =moo= since we're
 setting up an import feed from our imaginary content provider, "Moo
@@ -123,7 +122,7 @@ mypub/moo/transformers/01-fix-encoding.sh
 mypub/moo/transformers/02-convert-all-cows-to-ducks.xsl
 mypub/moo/transformers/02-convert-duck-to-escenic-xml.xsl
 mypub/moo/cron.hourly/get-files-from-moo-ftp
-mypub/moo/cron.every.10.minutes/ask-for-public-ip
+mypub/moo/cron.every.five.minutes/ask-for-public-ip
 otherpub/foo/transformers/01-convert-from-foo-to-escenic-xml.xsl
 #+END_SRC
 

From 4726b090afaf0bf05007c7e178d4532a0a22650b Mon Sep 17 00:00:00 2001
From: Kevin Flynn <kevin@kevin-Precision-M4500.(none)>
Date: Wed, 21 Nov 2012 14:42:52 +0100
Subject: [PATCH 1671/2585] added maven set-up and deployment mapping
 instructions

---
 .../vosa-handbook/development-process.org     | 79 +++++++++++++++++--
 1 file changed, 71 insertions(+), 8 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/development-process.org b/usr/share/doc/vizrt/vosa-handbook/development-process.org
index 9246a747..7bef24f1 100644
--- a/usr/share/doc/vizrt/vosa-handbook/development-process.org
+++ b/usr/share/doc/vizrt/vosa-handbook/development-process.org
@@ -111,6 +111,44 @@ In order to be able to use [[<%= trail_dev_host_name %>]] URLs, you need to add
 Your test system is now up and running. You should be able to access
 your test site by opening a browser and navigating to http://[[<%= trail_dev_host_name %>]].
 
+*** Configure Maven
+
+You need to add a reference to the Vizrt software repository to your
+Maven settings files. To do this:
+
+1. Open the Maven settings file for editing. On Windows you will find
+   it at =??=. On  Mac and Linux you will find it at
+   =/home/<your-user>/.m2/settings.xml=.
+2. Add a repository definition like the one shown below to the file:
+   #+BEGIN_SRC xml
+   <settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                         http://maven.apache.org/xsd/settings-1.0.0.xsd">
+     <profiles>
+       <profile>
+         <id>default</id>
+         <activation>
+           <activeByDefault>true</activeByDefault>
+         </activation>
+           <repositories>
+             <repository>
+             <id>escenic-repo</id>
+             <name>Oslo Releases</name>
+             <url>http://repo.dev.escenic.com/content/groups/trunk</url>
+             <layout>default</layout>
+           </repository>
+         </repositories>
+       </profile>
+     </profiles>
+   </settings>
+   #+END_SRC
+   (The above example shows the minimum content required for [[<%= trail_dev_project_name %>]] to 
+   work. Your =settings.xml= may of course contain other settings. For a complete description of 
+   how to use =settings.xml=, see http://maven.apache.org/settings.html.)
+   TODO Is the above example correct?
+3. Save your changes.
+  
 *** Check out your project
 
 To check out your project:
@@ -127,17 +165,42 @@ To check out your project:
 6. Select the repository you have added to the list and select *Checkout*.
 7. Choose/create a destination folder for the project and click *OK* three times.
 8. When asked if you want to create an IntelliJ project for the source files, select 
-   *No* and except the wizard's defaults.
+   *No*.
+
+*** Set up your project
+
+To set up your project:
+
+1. Click on the *Open project* link.
+2. In the *Open Project* dialog, open the project's =trunk= folder (or one of its =branches/n.n=
+   folders if that is where you are going to work).
+3. Select the =pom.xml= file in the folder and click *OK*.
+4. Select *File* > *Settings...*.
+5. In the displayed *Settings* dialog, select *Maven* > *Importing*.
+6. Make sure that the *Import Maven projects automatically* option is checked and click *OK*.
+7. Select *Tools* > *Deployment* > *Configuration*.
+8. In the displayed *Deployment* dialog, click on the + icon.
+9. Enter a name for your deployment set-up in the *Name* field,  *SFTP* in the *Type* field and 
+   click on *OK*.
+10. On the *Connections* tab of the displayed form, enter *[[<%= trail_dev_host_name %>]]* in 
+    the *SFTP Host* field, *escenic* in the *User name* field and the corresponding password 
+    in the *Password* field.
+11. Click on *Test SFTP Connection...* to check you have entered the correct login credentials.
+12. On the form's *Mappings* tab, enter the following two mappings:
+    | Local path                                                               | Deployment path                                                         |
+    |--------------------------------------------------------------------------+-------------------------------------------------------------------------|
+    | publications/shared-war/src/main/webapp/template/                        | /opt/tomcat-engine1/webapps/[[<%= trail_publication_name %>]]/template/ |
+    | publications/[[<%= trail_publication_name %>]]/src/main/webapp/template/ | /opt/tomcat-engine1/webapps/[[<%= trail_publication_name %>]]/template/ |
+13. Click *OK*.
+14. Select *Tools* > *Deployment* > *Automatic upload*.
+
+*** Test automatic deployment
+
+Any changes you make to your project should now be automatically deployed to the correct location 
+on your test server. To test that this is actually the case:
 
-*** Configure Maven
 
-You need to add a reference to the Vizrt software repository to your
-Maven settings files. To do this:
 
-1. Open the Maven settings file for editing. On Windows you will find
-   it at =??=. On  Mac and Linux you will find it at
-   =/home/<your-user>/.m2/settings.xml=.
-2. Add the following 
 
 ** TODO Jira
 

From 88fc6e1699b2e4b9808f1bba2f369fcedb22da1c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 21 Nov 2012 11:12:39 +0100
Subject: [PATCH 1672/2585] - fixed formatting error

- fixed dangling paranthesis.

- same indentation for all code examples

- added further steps/explanation on what to do when you create an
  import job without an import archive.
---
 usr/share/doc/escenic/ece-import-guide.org | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/usr/share/doc/escenic/ece-import-guide.org b/usr/share/doc/escenic/ece-import-guide.org
index dbef679e..5b5e6903 100644
--- a/usr/share/doc/escenic/ece-import-guide.org
+++ b/usr/share/doc/escenic/ece-import-guide.org
@@ -28,11 +28,16 @@ to create such an archive yourself.
 ** Without an import archive
 #+BEGIN_SRC text
 # ece-import \
-    --name streaming-video \
-    --publication mypub \
-    create
+  --name streaming-video \
+  --publication mypub \
+  create
 #+END_SRC
 
+Here, =ece-import= will set up the file structure for your import job,
+but you'll have to either put your transformers & cron jobs on the
+system yourself, or make sure that the XML you want import already is
+in the [[http://documentation.vizrt.com/ece-syndication-ref/5.4/escenic_syndication.html][Escenic Syndication XML format]].
+
 * Getting raw import data from HTTP or FTP servers
 There's built-in support for this in =ece-import=:
 #+BEGIN_SRC text
@@ -138,7 +143,7 @@ Engine.
 * Creating your own transformers
 You can write a transformer in either XSL, Perl, Python or BASH. You
 put it in =<publication>/<import name>/transformers/<number>-<transformer task>.<{xsl,pl,py,sh}>=
-and specify the order in which it should run by setting the =<number=
+and specify the order in which it should run by setting the =<number>=
 before/after your other transformers (if any, many folks only have one
 transformer which is an XSL file).
 
@@ -149,7 +154,7 @@ e.g. =01-first.sh= are passed on to =02-second.pl=. Each transformer
 must read the file and write to the same file. That's the contract.
 
 Here's an example of a transformer that downloads all the pictures
-mentioned in the raw XML (=ece-import= will copy any multimedia files
+mentioned in the raw XML. =ece-import= will copy any multimedia files
 to the ECE import spool for you, so the transformer only needs to
 worry about downloading these to the directory of the incoming XML
 file: 

From 877d895c99c1e41558541cff83eab4c5931f4d49 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 21 Nov 2012 11:23:22 +0100
Subject: [PATCH 1673/2585] - moved the printing of the import report and the
 goodbye message to   common_post_run before the call to remove_pid,
 otherwise, these get   confusing 'n/a'-s in the log output.

---
 usr/bin/ece-import | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/usr/bin/ece-import b/usr/bin/ece-import
index ebeb761f..6c11b209 100755
--- a/usr/bin/ece-import
+++ b/usr/bin/ece-import
@@ -427,6 +427,10 @@ function common_pre_run() {
 }
 
 function common_post_run() {
+  print_manual_steps
+  print_report
+  
+  print_and_log "Finished @ $(date), enjoy thyself!"
   remove_pid
   remove_lock
 }
@@ -439,7 +443,4 @@ elif [[ "$command" == $COMMAND_DOWNLOAD_RAW_DATA  ]]; then
   run_download_raw_data
 fi
 
-print_manual_steps
-print_report
-print_and_log "Finished @ $(date), enjoy thyself!"
 

From 8cb0f4744c37d2334b9da0929bab44d22efa0521 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 21 Nov 2012 16:36:50 +0100
Subject: [PATCH 1674/2585] - fixed bug in
 ece-install::restore-from-backup::restore_from_backup   where ece-install
 would only restore one of the restore items when   running in FAI mode.

  Hence, if you specified both fai_restore_db and
  fai_restore_data_files, only the first one would get restored.

  Thanks to @debashis for raising the issue that FAI restore wasn't
  working properly.
---
 .../ece-install.d/restore-from-backup.sh         | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/restore-from-backup.sh b/usr/share/escenic/ece-scripts/ece-install.d/restore-from-backup.sh
index 48b0ab16..76cc6c20 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/restore-from-backup.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/restore-from-backup.sh
@@ -55,14 +55,22 @@ function restore_from_backup()
 
     if [ $(get_boolean_conf_value fai_restore_all) -eq 1 ]; then
       restore_all=1
-    elif [ $(get_boolean_conf_value fai_restore_db) -eq 1 ]; then
+    fi
+    
+    if [ $(get_boolean_conf_value fai_restore_db) -eq 1 ]; then
       restore_db=1
-    elif [ $(get_boolean_conf_value fai_restore_data_files) -eq 1 ]; then
+    fi
+    
+    if [ $(get_boolean_conf_value fai_restore_data_files) -eq 1 ]; then
       restore_data_files=1
-    elif [ $(get_boolean_conf_value fai_restore_software_binaries) -eq 1 ]
+    fi
+    
+    if [ $(get_boolean_conf_value fai_restore_software_binaries) -eq 1 ]
     then
       restore_binaries=1
-    elif [ $(get_boolean_conf_value fai_restore_configuration) -eq 1 ]; then
+    fi
+    
+    if [ $(get_boolean_conf_value fai_restore_configuration) -eq 1 ]; then
       restore_conf=1
     fi
   elif [ $(get_boolean_conf_value fai_enabled) -eq 0 ]; then

From de25e49fed0dc669d59ca7a121baf2a159a3e507 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 22 Nov 2012 11:25:24 +0100
Subject: [PATCH 1675/2585] - added ece -i <instance> top which will run the
 /escenic/top inside   watch making it easy for users to access the different
 instance's   JSP performance overview (as in load per JSP).

---
 etc/bash_completion.d/ece                  | 1 +
 usr/bin/ece                                | 3 +++
 usr/share/escenic/ece-scripts/ece.d/top.sh | 4 ++++
 3 files changed, 8 insertions(+)
 create mode 100644 usr/share/escenic/ece-scripts/ece.d/top.sh

diff --git a/etc/bash_completion.d/ece b/etc/bash_completion.d/ece
index 2570c15d..6fd14012 100644
--- a/etc/bash_completion.d/ece
+++ b/etc/bash_completion.d/ece
@@ -26,6 +26,7 @@ _ece_commands()
       status
       stop
       threaddump
+      top
       update
       versions
     "
diff --git a/usr/bin/ece b/usr/bin/ece
index 2648b2dd..b83ab585 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -825,6 +825,9 @@ for el in $command; do
         flush)
             flush_caches
             ;;
+        top)
+            run_ece_top
+            ;;
         help)
             print_help
             ;;
diff --git a/usr/share/escenic/ece-scripts/ece.d/top.sh b/usr/share/escenic/ece-scripts/ece.d/top.sh
new file mode 100644
index 00000000..407c64e4
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece.d/top.sh
@@ -0,0 +1,4 @@
+function run_ece_top() {
+  set_type_port
+  watch curl -s http://localhost:${port}/escenic-admin/top
+}

From b3a658b5d2cf01d07fd4ea2e7602170bc655d64d Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 22 Nov 2012 11:49:51 +0100
Subject: [PATCH 1676/2585] Added spore .deb and .rpm packages

---
 .../escenic/package-scripts/create-packages    | 18 ++++++++++++++++++
 .../package-scripts/debian/spore/control       |  8 ++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 usr/share/escenic/package-scripts/debian/spore/control

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 44cd83ea..c58c82a5 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -69,6 +69,8 @@ function create_target_directory() {
     set_up_escenic-check-mk-plugins
   elif [[ $package_name == "hugin-node" ]]; then
     set_up_hugin-node
+  elif [[ $package_name == "spore" ]]; then
+    set_up_spore
   fi
 
   debian_dir=$target_dir/DEBIAN
@@ -224,6 +226,22 @@ function set_up_hugin-node() {
   rm -rf $dir
 }
 
+function set_up_spore() {
+  mkdir -p $target_dir/usr/bin \
+           $target_dir/usr/share/doc/spore
+
+  local dir=$(mktemp -d)
+  (
+    cd $dir
+    wget $wget_opts https://github.com/vizrt/spore/archive/master.tar.gz 
+    tar xzf master.tar.gz
+    cp $dir/spore-master/bin/* $target_dir/usr/bin
+    cp $dir/spore-master/README.md $target_dir/usr/share/doc/spore
+    cp -r $dir/spore-master/examples $target_dir/usr/share/doc/spore/examples
+  )
+  rm -rf $dir
+}
+
 function get_name() {
   echo ${maintainer_name-$default_maintainer_name}
 }
diff --git a/usr/share/escenic/package-scripts/debian/spore/control b/usr/share/escenic/package-scripts/debian/spore/control
new file mode 100644
index 00000000..1420afd0
--- /dev/null
+++ b/usr/share/escenic/package-scripts/debian/spore/control
@@ -0,0 +1,8 @@
+Package: spore
+Version: VERSION
+Depends: coreutils, passwd
+Section: base
+Priority: optional
+Architecture: all
+Maintainer: Erik Mogensen <mogsie@vizrt.com>
+Description: Creates users and groups and seeds users with public SSH keys

From 325f34149bd600181f7507640ce56ca6fc1820d3 Mon Sep 17 00:00:00 2001
From: Kevin Flynn <kevin@kevin-Precision-M4500.(none)>
Date: Thu, 22 Nov 2012 13:38:13 +0100
Subject: [PATCH 1677/2585] added more stuff about testing the deployment
 mappings

---
 .../vosa-handbook/development-process.org     | 77 +++++++++++++++++--
 1 file changed, 71 insertions(+), 6 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/development-process.org b/usr/share/doc/vizrt/vosa-handbook/development-process.org
index 7bef24f1..69bb4d8f 100644
--- a/usr/share/doc/vizrt/vosa-handbook/development-process.org
+++ b/usr/share/doc/vizrt/vosa-handbook/development-process.org
@@ -76,8 +76,9 @@ Download the following virtual machine image:
 
 When the file has finished downloading, double-click on it. This
 starts VirtualBox, which opens the file and creates a virtual machine
-from it. When the virtual machine is ready, a [[<%= trail_dev_image_name %>]] entry will appear
-in the list on the left hand side of the VirtualBox window. 
+from it. When the virtual machine is ready, a [[<%= trail_dev_image_name
+%>]] entry will appear in the list on the left hand side of the
+VirtualBox window.
 
 
 Click on *Start* to run the machine. A terminal window is displayed,
@@ -187,10 +188,10 @@ To set up your project:
     in the *Password* field.
 11. Click on *Test SFTP Connection...* to check you have entered the correct login credentials.
 12. On the form's *Mappings* tab, enter the following two mappings:
-    | Local path                                                               | Deployment path                                                         |
-    |--------------------------------------------------------------------------+-------------------------------------------------------------------------|
-    | publications/shared-war/src/main/webapp/template/                        | /opt/tomcat-engine1/webapps/[[<%= trail_publication_name %>]]/template/ |
-    | publications/[[<%= trail_publication_name %>]]/src/main/webapp/template/ | /opt/tomcat-engine1/webapps/[[<%= trail_publication_name %>]]/template/ |
+    | Local path                                                                                 | Deployment path                                                         |
+    |--------------------------------------------------------------------------------------------+-------------------------------------------------------------------------|
+    | /<path-from-root>/publications/shared-war/src/main/webapp/template/                        | /opt/tomcat-engine1/webapps/[[<%= trail_publication_name %>]]/template/ |
+    | /<path-from-root>/publications/[[<%= trail_publication_name %>]]/src/main/webapp/template/ | /opt/tomcat-engine1/webapps/[[<%= trail_publication_name %>]]/template/ |
 13. Click *OK*.
 14. Select *Tools* > *Deployment* > *Automatic upload*.
 
@@ -199,8 +200,72 @@ To set up your project:
 Any changes you make to your project should now be automatically deployed to the correct location 
 on your test server. To test that this is actually the case:
 
+1. Display your test server's file system by selecting *Tools* > *Deployment* > *Browse Remote Host*.
+2. Navigate down the displayed tree to show the contents of the =/opt/tomcat-engine1/webapps/[[<%= trail_publication_name %>]]/template/widgets= folder.
+   (=/opt/tomcat-engine1/webapps/[[<%= trail_publication_name %>]]/template/= and all its children should be highlighted in green. If this is not the case,
+   go back and and check that you entered the deployment path correctly in the *Deployment* dialog.)
+3. In your local code tree, navigate to publications/[[<%= trail_publication_name %>]]/src/main/webapp/template/widgets/dummy.
+4. Create a file (any name) in this folder. The dummy folder and the file you have created should immediately be duplicated in the deployment tree.  If this is not the case,
+   go back and and check that you entered the correct local paths in the *Deployment* dialog.
+5. Delete the test file you created. It should also disappear from the deployment tree.
 
 
+** Procedures
+
+*** TODO Communicating with your colleagues
+
+(about using HipChat)
+
+*** TODO Change management
+
+(about using Jira)
+
+*** TODO Version control
+
+(about using Subversion)
+
+*** TODO Development
+
+The [[<%= trail_publication_name %>]] publication is made using the *Escenic Widget Framework*. This means that
+all publication layout and functionality is assembled from *widgets*. A widget is a package of JSP, CSS and graphics files 
+that together provide a web site component. A component may be primarily graphical (such as the =storyContent= widget that 
+governs the layout of a story in a publication), primarily functional (such as the =webAnalytics= widget) or a combination
+of the two (such as the =navigation= widget).
+
+Escenic Widget Framework is supplied with a comprehensive set of ready-made widgets from which web site designers can 
+construct web sites using a point and click interface in *Content Studio*, Vizrt's web site editor. The widgets can also
+be customized using this interface, so a wide range of different web sites can be constructed without ever needing to write
+any JSP, HTML or CSS code.
+
+If the standard widgets do not provide all the functionality you need you can extend the Widget Framework
+in two ways:
+
+ - By adding widgets of your own
+ - By customizing existing widgets
+
+This manual does not cover the details of Widget Framework development, since this is covered elsewhere 
+([[<%= trail_virtual_host_documentation %>]]/widget-framework-2.0.html).
+
+The development environment you have set up is designed to support and simplify the process of extending
+the standard widgets supplied with the Widget Framework. The =publications/[[<%= trail_publication_name %>]]/src/main/webapp/template/= 
+tree is a *customization layer* that you can use to store any modifications you want to make to the standard widgets
+in the =publications/shared-war/src/main/webapp/template/= tree. During the application build process,
+the files in your customization layer are merged with the standard widgets to create a customized widget
+set for deployment.
+
+The deployment mappings you have set up mimic this process: any changes you make in
+=publications/[[<%= trail_publication_name %>]]/src/main/webapp/template/= are instantly copied to your
+test server. This means you can instantly test all changes you make by displaying an appropriate page of 
+your test [[<%= trail_publication_name %>]] publication.
+
+**** TODO Customizing a widget
+
+**** TODO Creating a new widget???
+
+*** TODO Building and deployment
+
+(about using guru to do it for you)
+
 
 ** TODO Jira
 

From 0910dad61c17140e62174fc1336de8e5031490b0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 22 Nov 2012 13:40:38 +0100
Subject: [PATCH 1678/2585] Added command which deployes an EAR and DEB package
 by their URIs.

The command will deploy the EAR for all Escenic Content Engines and
Search servers installed on the given host and will figure out
instances and user/passwords by itself. It will also clear the work
directory before starting the instances again. The last thing the
script does, is to deploy the conf package.

The deploy-ear-and-conf command will speed up new deployments
significantly.
---
 usr/sbin/deploy-ear-and-conf | 78 ++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 usr/sbin/deploy-ear-and-conf

diff --git a/usr/sbin/deploy-ear-and-conf b/usr/sbin/deploy-ear-and-conf
new file mode 100644
index 00000000..96464919
--- /dev/null
+++ b/usr/sbin/deploy-ear-and-conf
@@ -0,0 +1,78 @@
+#! /usr/bin/env bash
+
+## Command which deployes an EAR and DEB package by their URIs.
+##
+## The command will deploy the EAR for all Escenic Content Engines and
+## Search servers installed on the given host and will figure out
+## instances and user/passwords by itself. It will also clear the work
+## directory before starting the instances again. The last thing the
+## script does, is to deploy the conf package.
+
+function bootstrap_thyself() {
+  # first, try to be nice, then check the standard location
+  local dir=$(dirname $0)/../share/escenic/ece-scripts
+  if [ ! -d $dir  ]; then
+    dir=/usr/share/escenic/ece-scripts
+  fi
+
+  local common_libraries="
+    common-bashing.sh
+    common-io.sh
+  "
+
+  for el in $common_libraries; do
+    source $dir/$el 2>/dev/null || {
+      echo "$(basename $0): Could not load the library $el," \
+        "and I can't live without it :-(" | fmt
+      exit 1
+    }
+  done
+}
+
+bootstrap_thyself
+log=/var/log/escenic/$(basename $0).log
+tmp_dir=$(mkdir -p $HOME/$(date --iso))
+run source /etc/default/ece
+
+function deploy_ear() {
+  for el in $engine_instance_list; do
+	  su - $ece_unix_user -c \
+	    "ece -i $el stop deploy clean start --uri $ear_uri"
+  done
+  for el in $search_instance_list; do
+	  su - $ece_unix_user -c \
+	    "ece -i $el -t search stop deploy clean start --uri $ear_uri"
+  done
+}
+
+function deploy_conf() {
+  run source /etc/escenic/ece.conf
+
+  echo "Downloading" $conf_package_uri "..."
+  (
+	  cd $tmp_dir
+	  run wget \
+	    --quiet \
+	    --continue \
+	    --http-user $builder_http_user \
+	    --http-password $builder_http_password \
+	    $conf_package_uri
+  )
+
+  print "Installing" $(basename $conf_package_uri) "..."
+  run dpkg -i $tmp_dir/$(basename $conf_package_uri)
+}
+
+function read_user_input() {
+  if [ $# -ne 2 ]; then
+	  echo "Usage:" $(basename $0) "<URI to EAR file>" "<URI to conf package>"
+	  exit 1
+  fi
+
+  ear_uri=$1
+  conf_package_uri=$2
+}
+
+read_user_input "$@"
+deploy_ear
+deploy_conf

From 8bc80c9952ac0cd385ccdaafc411a90e1374808f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 22 Nov 2012 13:48:50 +0100
Subject: [PATCH 1679/2585] - set the executable bit

---
 usr/sbin/deploy-ear-and-conf | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 usr/sbin/deploy-ear-and-conf

diff --git a/usr/sbin/deploy-ear-and-conf b/usr/sbin/deploy-ear-and-conf
old mode 100644
new mode 100755

From 20156eba66d1c46a3b9b803363f3fb7c995d04fb Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 22 Nov 2012 13:54:36 +0100
Subject: [PATCH 1680/2585] - now includes the deploy-ear-and-conf in the  
 escenic-content-engine-scripts package

---
 usr/share/escenic/package-scripts/create-packages | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index c58c82a5..a4b6b019 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -116,6 +116,10 @@ function set_up_escenic-content-engine-scripts() {
       $target_dir/usr/share/escenic/ece-scripts/
   done
 
+  # sbin
+  cp ../../../sbin/deploy-ear-and-conf \
+    $target_dir/usr/sbin/
+
   # conf
   cp -r ../../../../etc/escenic/ $target_dir/etc/
   cp -r ../../../../etc/bash_completion.d/ece \

From 034714534cba462c7230ae375635ae31c9881ecb Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 22 Nov 2012 14:10:49 +0100
Subject: [PATCH 1681/2585] - added --force-overwrite for the installation of
 the configuration package

---
 usr/sbin/deploy-ear-and-conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/deploy-ear-and-conf b/usr/sbin/deploy-ear-and-conf
index 96464919..4b6fab99 100755
--- a/usr/sbin/deploy-ear-and-conf
+++ b/usr/sbin/deploy-ear-and-conf
@@ -60,7 +60,7 @@ function deploy_conf() {
   )
 
   print "Installing" $(basename $conf_package_uri) "..."
-  run dpkg -i $tmp_dir/$(basename $conf_package_uri)
+  run dpkg --force-overwrite -i $tmp_dir/$(basename $conf_package_uri)
 }
 
 function read_user_input() {

From 8d6605d3caad195f429e400ee0a74989e9121e20 Mon Sep 17 00:00:00 2001
From: Kevin Flynn <kevin@kevin-Precision-M4500.(none)>
Date: Thu, 22 Nov 2012 14:49:26 +0100
Subject: [PATCH 1682/2585] minor correction

---
 usr/share/doc/vizrt/vosa-handbook/development-process.org | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/development-process.org b/usr/share/doc/vizrt/vosa-handbook/development-process.org
index 69bb4d8f..277c2453 100644
--- a/usr/share/doc/vizrt/vosa-handbook/development-process.org
+++ b/usr/share/doc/vizrt/vosa-handbook/development-process.org
@@ -34,17 +34,17 @@ You need to install the following items on your PC or Mac:
  - The Oracle Java Development Kit, version 7 (??). You can get this
    from [[http://www.oracle.com/technetwork/java/javase/downloads/java-se-jdk-7-download-432154.html]].
  - Apache Subversion client software. You can get this from
-   [[http://subversion.apache.org/packages.html]] (or on Linux, you can
+   [[http://subversion.apache.org/packages.html]] (or on Linux you can
    most likely install it using your package manager).
  - Apache Maven version 3. You can get this from
-   [[http://maven.apache.org/download.html]]  (or on Linux, you can
+   [[http://maven.apache.org/download.html]]  (or on Linux you can
    most likely install it using your package manager).
  - IntelliJ IDEA Ultimate, version 11.x. You can download this from
    [[http://www.jetbrains.com/idea/download/]]. Be sure to download the
    Ultimate version, which is licensed software. Depending on the
    licensing arrangement at your site you may need to enter a license
    number after installation - talk to your project manager for more
-   information. Note that earlier versions of IntelliJ IDEA do not
+   information. Note that version 11.x is required: earlier versions of IntelliJ IDEA do not
    contain all the functions required by the VOSA development process
    and will not work properly.
 
@@ -67,6 +67,7 @@ Setting up your development environment involves:
 
  - Configuring the SW you have installed
  - Obtaining copies of the code and systems you are going to work on
+ - Getting access to the project infrastructure (HipChat, Jira and so on) 
 
 *** Set up your local test site
 

From 20030e033aa02466fa704d4564aee611814913e9 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 22 Nov 2012 14:25:48 +0100
Subject: [PATCH 1683/2585] - changed echo -> print

---
 usr/sbin/deploy-ear-and-conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/deploy-ear-and-conf b/usr/sbin/deploy-ear-and-conf
index 4b6fab99..6a86f381 100755
--- a/usr/sbin/deploy-ear-and-conf
+++ b/usr/sbin/deploy-ear-and-conf
@@ -48,7 +48,7 @@ function deploy_ear() {
 function deploy_conf() {
   run source /etc/escenic/ece.conf
 
-  echo "Downloading" $conf_package_uri "..."
+  print "Downloading" $conf_package_uri "..."
   (
 	  cd $tmp_dir
 	  run wget \

From 80385b550990072624e068afd5657df9ffd4c0a3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 22 Nov 2012 14:27:15 +0100
Subject: [PATCH 1684/2585] - removed the run wrapper from dpkg as it may run
 interactively

---
 usr/sbin/deploy-ear-and-conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/deploy-ear-and-conf b/usr/sbin/deploy-ear-and-conf
index 6a86f381..08933caf 100755
--- a/usr/sbin/deploy-ear-and-conf
+++ b/usr/sbin/deploy-ear-and-conf
@@ -60,7 +60,7 @@ function deploy_conf() {
   )
 
   print "Installing" $(basename $conf_package_uri) "..."
-  run dpkg --force-overwrite -i $tmp_dir/$(basename $conf_package_uri)
+  dpkg --force-overwrite -i $tmp_dir/$(basename $conf_package_uri)
 }
 
 function read_user_input() {

From faeee24ec9ba7c4edc86905dba420b87f8867db6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 22 Nov 2012 14:35:16 +0100
Subject: [PATCH 1685/2585] we don't include /etc/default/ece in the
 escenic-content-engine-scripts package anymore as this file often is also
 included in the conf packages and create conflicts when upgrading the OS
 packages.

---
 usr/share/escenic/package-scripts/create-packages | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index a4b6b019..e4657393 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -124,7 +124,9 @@ function set_up_escenic-content-engine-scripts() {
   cp -r ../../../../etc/escenic/ $target_dir/etc/
   cp -r ../../../../etc/bash_completion.d/ece \
     $target_dir/etc/bash_completion.d
-  cp -r ../../../../etc/default/ece $target_dir/etc/default/
+  # we don't include /etc/default/ece as this file often is also
+  # included in the conf packages.
+  # cp -r ../../../../etc/default/ece $target_dir/etc/default/
   cp -r ../../../../etc/init.d/ece $target_dir/etc/init.d/
 
   # doc

From 2050f65fa97432f57b7de398b43290e3ace77a0c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 23 Nov 2012 15:49:45 +0100
Subject: [PATCH 1686/2585] - simplified the installation of Java on Debian.
 Since we've got a new   stable soon-ish, we'll just assume java-6-sun isn't
 in the   repositories.

---
 .../ece-install.d/content-engine.sh           | 33 +++++++------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 5ec370a0..369dbf99 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -508,30 +508,21 @@ function install_ece_third_party_packages
       local version=$(lsb_release -s -r | sed "s#\.##g")
     fi
 
-    # Debian testing has started to report just testing instead of a
-    # relase number. Assessed 2012-07-05 10:34
-    if [[ $version == "testing" ]]; then
-      create_java_deb_packages_and_repo
-    elif [ $version -ge $version_needs_local_java_deb -a \
-      $(has_sun_java_installed) -eq 0 ]; then
+    if [ $(has_sun_java_installed) -eq 0 ]; then
       create_java_deb_packages_and_repo
+      
+      # Here, we install sun-java6-jdk first so that ant doesn't pull
+      # down OpenJDK.
+      #
+      # This if guard is in palce to not attempt to install the
+      # package if Sun Java already is installed (typically, manually
+      # installed).
+      echo "sun-java6-jdk shared/accepted-sun-dlj-v1-1 boolean true" | \
+        debconf-set-selections
+      install_packages_if_missing sun-java6-jdk
     fi
     
-    echo "sun-java6-jdk shared/accepted-sun-dlj-v1-1 boolean true" | \
-      debconf-set-selections
-
-    # Here, we install sun-java6-jdk first so that ant doesn't pull
-    # down OpenJDK.
-    #
-    # This if guard is in palce to not attempt to install the package
-    # if Sun Java already is installed (typically, manually
-    # installed).
-    local packages="sun-java6-jdk"
-    if [ $(has_sun_java_installed) -eq 0 ]; then
-      install_packages_if_missing $packages
-    fi
-
-    packages="
+    local packages="
       ant
       ant-contrib
       ant-optional

From c32d96a127ede1a7fbc08853ad4f2a081f0290be Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 23 Nov 2012 15:51:16 +0100
Subject: [PATCH 1687/2585] - added common_bashing_exit_hook: To make your
 script call this   whenever it does a controlled exit, either by running
 through the   script, call this hook

- added common_bashing_user_cancelled_hook: Use this in your script to
  have it exit whenever the user hits the user pressing Ctrl+c or by
  someone sending a regular kill <PID> signal to it.
---
 .../escenic/ece-scripts/common-bashing.sh     | 27 +++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index 11ebc20d..4b3600a1 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -436,8 +436,7 @@ function create_lock_or_fail() {
 ## $1 :: the lock file
 function remove_lock() {
   if [ ! -e $lock_file ]; then
-    print "Something is seriously wrong, the lock file ($lock_file) isn't there!"
-    exit 1
+    return
   fi
 
   fail_safe_run rm $lock_file
@@ -453,3 +452,27 @@ function remove_pid() {
     fail_safe_run rm $pid_file
   fi
 }
+
+## To make your script call this whenever it does a controlled exit,
+## either by running through the script, call this hook.
+##
+## Put this line at the start of your script:
+##
+## trap common_bashing_exit_hook EXIT
+function common_bashing_exit_hook() {
+  remove_pid
+  remove_lock
+  kill $$
+}
+
+## Put this in your script to have it exit whenever the user hits the
+## user pressing Ctrl+c or by someone sending a regular kill <PID>
+## signal to it.
+## 
+## Usage:
+## trap common_bashing_user_cancelled_hook SIGHUP SIGINT
+function common_bashing_user_cancelled_hook() {
+  print "User cancelled $(basename $0), cleaning up after me ..."
+  common_bashing_exit_hook
+}
+

From cf23659b7df1801054722696aff98b7a280d0ccd Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 23 Nov 2012 15:52:11 +0100
Subject: [PATCH 1688/2585] - added  hooks for when the scirpt exits cleanly
 and when a user or someone   kills the process.

  This will e.g. improve the script when someone hits Ctrl-c and upon
  re-running the script gets a "lock exists" error.
---
 usr/sbin/ece-install | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 10dcce31..09830b2a 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -109,6 +109,11 @@ escenic_sources=/etc/apt/sources.list.d/escenic.list
 # prepare the pre-requisites.
 dry_run=0
 
+# hooks for when the scirpt exits cleanly and when a user or someone
+# kills the process
+trap common_bashing_exit_hook EXIT
+trap common_bashing_user_cancelled_hook SIGINT SIGHUP
+
 ## Bootstrapping, load files from /usr/share/escenic/ece-scripts The
 ## method will first try to be smart, in case the user has copied the
 ## ece-scripts somewhere else., e.g.: moved everything to ~/ece-scrpts
@@ -823,8 +828,6 @@ function common_post_install() {
   set_correct_permissions
   
   print_status_and_next_steps
-  remove_lock
-  remove_pid
 }
 
 function un_install_everything() {

From c6da9d9f962f99b50a32b0b6152e70f2e230064b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 23 Nov 2012 16:13:54 +0100
Subject: [PATCH 1689/2585] - now, remove_pid_and_exit_in_error will kill the
 main BASH process ID   of the script. This fixes cases were this method is
 called from sub   processes and fail to do what the method signature says.

---
 usr/share/escenic/ece-scripts/common-bashing.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index 4b3600a1..4541e0a9 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -117,7 +117,7 @@ function remove_pid_and_exit_in_error() {
     log_call_stack
   fi
   
-  exit 1
+  kill $$
 }
 
 function exit_on_error() {

From 9ac1ea705420743c3bbf2b6a346b37346908c074 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 23 Nov 2012 17:12:45 +0100
Subject: [PATCH 1690/2585] - added set_builder_user_and_password method which
 will search the   global ece.conf as well as all the ece-<instance>.conf (for
 the   ECEs) installed for the user name and password for the builder.

- made use of the new traps in common-bashing to handle user
  interruptions and process termination.

- added better user input checking, the user can now specify in any
  order --conf and --ear for telling the command the URIs to the
  configuration package and EAR respectively.
---
 usr/sbin/deploy-ear-and-conf | 79 ++++++++++++++++++++++++++++++++----
 1 file changed, 72 insertions(+), 7 deletions(-)

diff --git a/usr/sbin/deploy-ear-and-conf b/usr/sbin/deploy-ear-and-conf
index 08933caf..548c2aeb 100755
--- a/usr/sbin/deploy-ear-and-conf
+++ b/usr/sbin/deploy-ear-and-conf
@@ -27,9 +27,18 @@ function bootstrap_thyself() {
       exit 1
     }
   done
+
+  create_pid
+  create_lock
+  
+  # hooks for when the scirpt exits cleanly and when a user or someone
+  # kills the process
+  trap common_bashing_exit_hook EXIT
+  trap common_bashing_user_cancelled_hook SIGINT SIGHUP
 }
 
 bootstrap_thyself
+
 log=/var/log/escenic/$(basename $0).log
 tmp_dir=$(mkdir -p $HOME/$(date --iso))
 run source /etc/default/ece
@@ -42,11 +51,40 @@ function deploy_ear() {
   for el in $search_instance_list; do
 	  su - $ece_unix_user -c \
 	    "ece -i $el -t search stop deploy clean start --uri $ear_uri"
+    exit_on_error "Running ece deploy as $ece_unix_user"
   done
 }
 
-function deploy_conf() {
+function set_builder_user_and_password() {
   run source /etc/escenic/ece.conf
+  for el in $engine_instance_list; do
+    file=/etc/escenic/ece-${el}.conf
+    if [ -e $file ]; then
+      run source $file
+    fi
+  done
+
+  local found=0
+  if [[ -n "$builder_http_user" && -n "$builder_http_password" ]]; then
+    found=1
+  fi
+  
+  if [ $found -eq 0 ]; then
+    local file_list=/etc/escenic/ece.conf
+    for el in $engine_instance_list; do
+      file_list="$file_list /etc/escenic/ece-${el}.conf"
+    done
+    print_and_log \
+      "You need to set builder_http_user & and builder_http_password" \
+      "in one of these files:" \
+      $file_list
+    exit 1
+  fi
+}
+
+
+function deploy_conf() {
+  set_builder_user_and_password
 
   print "Downloading" $conf_package_uri "..."
   (
@@ -64,15 +102,42 @@ function deploy_conf() {
 }
 
 function read_user_input() {
-  if [ $# -ne 2 ]; then
-	  echo "Usage:" $(basename $0) "<URI to EAR file>" "<URI to conf package>"
-	  exit 1
-  fi
+  local next_is_ear_uri=0
+  local next_is_conf_uri=0
+  
+  for el in "$@"; do
+    if [[ $el == "--ear" ]]; then
+      next_is_ear_uri=1
+    elif [[ $el == "--conf" ]]; then
+      next_is_conf_uri=1
+    elif [ $next_is_ear_uri -eq 1 ]; then
+      ear_uri=$el
+      next_is_ear_uri=0
+    elif [ $next_is_conf_uri -eq 1 ]; then
+      conf_package_uri=$el
+      next_is_ear_uri=0
+    fi
+  done
+}
 
-  ear_uri=$1
-  conf_package_uri=$2
+function verify_user_input() {
+  local errors=0
+  if [ -z "$conf_package_uri" ]; then
+    print "You must specify the conf package with --conf :-("
+    errors=1
+  fi
+  if [ -z "$ear_uri" ]; then
+    print "You must specify the URI of the EAR file with --ear :-("
+    errors=1
+  fi
+  if [ $errors -eq 1 ]; then
+    exit 1
+  fi
 }
 
 read_user_input "$@"
+verify_user_input
 deploy_ear
 deploy_conf
+
+

From 5acd790f91c55de140bd39157316a0ed550f0f1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Mon, 26 Nov 2012 14:42:46 +0100
Subject: [PATCH 1691/2585] vosa-handbook - updated documentation for
 development process

---
 .../vosa-handbook/development-process.org     | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/usr/share/doc/vizrt/vosa-handbook/development-process.org b/usr/share/doc/vizrt/vosa-handbook/development-process.org
index 38e96c12..5b2ade98 100644
--- a/usr/share/doc/vizrt/vosa-handbook/development-process.org
+++ b/usr/share/doc/vizrt/vosa-handbook/development-process.org
@@ -57,6 +57,25 @@ Your dev image can be downloaded here - [[<%= trail_dev_image_uri %>][Local deve
 6) After the image has started up, you should be able to see its local IP address. This is the IP you need to add to the hosts file on your workstation/laptop.
 
 	[[./graphics/development-process/08-fetch-ip.png]]
+	[[./graphics/development-process/09-add-host-entry.png]]
+
+*** Verify available services
+
+1) With the image runing you should now be able to access the following features
+
+|---------------------+---------------------------------------------------------------|
+| Feature             | URL                                                           |
+|---------------------+---------------------------------------------------------------|
+| Escenic Admin       | http://<%= trail_customer_acronym %>-dev:8080/escenic-admin   |
+|---------------------+---------------------------------------------------------------|
+| Web Studio          | http://<%= trail_customer_acronym %>-dev:8080/escenic-admin   |
+|---------------------+---------------------------------------------------------------|
+| Content Studio      | http://<%= trail_customer_acronym %>-dev:8080/escenic-admin   |
+|---------------------+---------------------------------------------------------------|
+| Solr                | http://<%= trail_customer_acronym %>-dev:8180/solr            |
+|---------------------+---------------------------------------------------------------|
+
+
 
 *** What's included
 

From 3673cea23bdc3ea778c1dae63b2bf499f41114ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Mon, 26 Nov 2012 14:43:47 +0100
Subject: [PATCH 1692/2585] vosa-handbook - updated documentation for
 development process

---
 .../development-process/01-download-image.png | Bin 36262 -> 22007 bytes
 .../05-adjust-settings.png                    | Bin 55077 -> 40802 bytes
 .../development-process/07-power-on.png       | Bin 123440 -> 38552 bytes
 .../development-process/08-fetch-ip.png       | Bin 41193 -> 29739 bytes
 .../development-process/09-add-host-entry.png | Bin 0 -> 3269 bytes
 .../doc/vizrt/vosa-handbook/vosa-handbook.org |   1 +
 6 files changed, 1 insertion(+)
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/graphics/development-process/09-add-host-entry.png

diff --git a/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/01-download-image.png b/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/01-download-image.png
index 5e183336e422e50d9ed6fb4504ccc4606fde986c..06bf4cfcea0c94baceb7253b226cedb1635338a7 100644
GIT binary patch
literal 22007
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
DHepq&

literal 36262
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
Uckq}U1pGU9+VB+dr2Xyx2lJwti~s-t

diff --git a/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/05-adjust-settings.png b/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/05-adjust-settings.png
index 171e17c54d641513d61df9a5c7946518915e2127..3c0e93b0b554731879d4ba95cf225629e0b3228a 100644
GIT binary patch
literal 40802
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
bx&E!0e1d;gTgKa)3ivy(i_j_3z8d}?@r!#7

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

diff --git a/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/07-power-on.png b/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/07-power-on.png
index d6660a50cc0d59bf0ba1cb345d57d361830463df..bc776c7730856dfa6e9a4e9d03d745bc1a62f869 100644
GIT binary patch
literal 38552
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
XFf_kkk-f}!0Q~fIOweU0=g9v9B9Vd6

literal 123440
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%0DNu|oqofIpz?Qc)c&Kp?mkA^DI+gBX~!3h
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
T)tfB@ew{Wp`~8)X{jL84eAJ$y

diff --git a/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/08-fetch-ip.png b/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/08-fetch-ip.png
index 8b31c64e0c8c976f6d3d7d877a86a8e80c137e47..e4eabc8d6e199c5ba99a208192a9c776014ba3d7 100644
GIT binary patch
literal 29739
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

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

diff --git a/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/09-add-host-entry.png b/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/09-add-host-entry.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ae2c83ede579422349095bef3849aaf3720db68
GIT binary patch
literal 3269
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

literal 0
HcmV?d00001

diff --git a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
index 6b570977..2f6dbf48 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
+++ b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
@@ -18,3 +18,4 @@
 #+INCLUDE: "monitoring.org"
 #+INCLUDE: "ssh-access.org"
 #+INCLUDE: "host-naming.org"
+#+INCLUDE: "development-process.org"

From 9f752d2cd1ac87c050f2c2530196ccc07e58f69a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Mon, 26 Nov 2012 15:18:24 +0100
Subject: [PATCH 1693/2585] vosa-guide - Adjusting trails for inclusion of
 customer values

---
 .../vizrt/vosa-handbook/development-process.org | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/development-process.org b/usr/share/doc/vizrt/vosa-handbook/development-process.org
index 0367b8b6..d5072ed5 100644
--- a/usr/share/doc/vizrt/vosa-handbook/development-process.org
+++ b/usr/share/doc/vizrt/vosa-handbook/development-process.org
@@ -88,7 +88,7 @@ has finished, the terminal window will contain an information page
 starting with the following welcome message:
 
 #+BEGIN_SRC default
-Welcome to http://[[<%= trail_dev_host_name %>]] development environment
+Welcome to the <%= trail_dev_host_name %> development environment
 #+END_SRC
 
 This is the URL you must use to access your test site.
@@ -97,21 +97,20 @@ Below this welcome messages are the IP addresses used by the virtual
 machine and the user name/password combinations you can use to log in
 to the system.
 
-In order to be able to use [[<%= trail_dev_host_name %>]] URLs, you need to add the host name
-[[<%= trail_dev_host_name %>]] to your computer's =hosts= file. To do this:
+In order to be able to use the <%= trail_dev_host_name %> URLs, you need to add the host name <%= trail_dev_host_name %> to your computer's =hosts= file. To do this:
 
 1. Open your hosts file in a text editor. On a Windows PC, you will find the
    hosts file at =C:\Windows\System32\drivers\etc\hosts=. On a Mac or Linux 
    machine you will find it at =/etc/hosts=.
 2. Add the following line to the file:
    #+BEGIN_SRC default
-   /ip-address/ [[<%= trail_dev_host_name %>]]
+   <ip-address> <%= trail_dev_host_name %>
    #+END_SRC
-   where /ip-address/ is the =eth1= IP address listed on the virtual machine's welcome page.
+   where <ip-address> is the =eth1= IP address listed on the virtual machine's welcome page.
 3. Save your changes.
   
 Your test system is now up and running. You should be able to access
-your test site by opening a browser and navigating to http://[[<%= trail_dev_host_name %>]].
+your test site by opening a browser and navigating to [[http://<%= trail_dev_host_name %>]].
 
 *** Configure Maven
 
@@ -145,7 +144,7 @@ Maven settings files. To do this:
      </profiles>
    </settings>
    #+END_SRC
-   (The above example shows the minimum content required for [[<%= trail_dev_project_name %>]] to 
+   (The above example shows the minimum content required for <%= trail_dev_project_name %> to 
    work. Your =settings.xml= may of course contain other settings. For a complete description of 
    how to use =settings.xml=, see http://maven.apache.org/settings.html.)
    TODO Is the above example correct?
@@ -161,7 +160,7 @@ To check out your project:
 4. Click on the + icon to add a new repository.
 5. Paste this:
    #+BEGIN_SRC default
-   https://vizrtcustomers.jira.com/svn/[[<%= trail_dev_project_name %>]]
+   [[https://vizrtcustomers.jira.com/svn/<%= trail_dev_project_name %>]]
    #+END_SRC
    into the displayed dialog, and click on *OK*.
 6. Select the repository you have added to the list and select *Checkout*.
@@ -192,7 +191,7 @@ To set up your project:
     | Local path                                                                                 | Deployment path                                                         |
     |--------------------------------------------------------------------------------------------+-------------------------------------------------------------------------|
     | /<path-from-root>/publications/shared-war/src/main/webapp/template/                        | /opt/tomcat-engine1/webapps/[[<%= trail_publication_name %>]]/template/ |
-    | /<path-from-root>/publications/[[<%= trail_publication_name %>]]/src/main/webapp/template/ | /opt/tomcat-engine1/webapps/[[<%= trail_publication_name %>]]/template/ |
+    | /<path-from-root>/publications/<%= trail_publication_name %>/src/main/webapp/template/ | /opt/tomcat-engine1/webapps/<%= trail_publication_name %>/template/ |
 13. Click *OK*.
 14. Select *Tools* > *Deployment* > *Automatic upload*.
 

From 53d7645291471b7037c402645791314bd474703d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Mon, 26 Nov 2012 15:36:46 +0100
Subject: [PATCH 1694/2585] vosa-guide - Adjusting trails for inclusion of
 customer values

---
 .../vosa-handbook/development-process.org      | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/development-process.org b/usr/share/doc/vizrt/vosa-handbook/development-process.org
index d5072ed5..73a0e27e 100644
--- a/usr/share/doc/vizrt/vosa-handbook/development-process.org
+++ b/usr/share/doc/vizrt/vosa-handbook/development-process.org
@@ -77,8 +77,8 @@ Download the following virtual machine image:
 
 When the file has finished downloading, double-click on it. This
 starts VirtualBox, which opens the file and creates a virtual machine
-from it. When the virtual machine is ready, a [[<%= trail_dev_image_name
-%>]] entry will appear in the list on the left hand side of the
+from it. When the virtual machine is ready, a <%= trail_dev_image_name%>
+entry will appear in the list on the left hand side of the
 VirtualBox window.
 
 
@@ -160,7 +160,7 @@ To check out your project:
 4. Click on the + icon to add a new repository.
 5. Paste this:
    #+BEGIN_SRC default
-   [[https://vizrtcustomers.jira.com/svn/<%= trail_dev_project_name %>]]
+   https://vizrtcustomers.jira.com/svn/<%= trail_dev_project_name %>
    #+END_SRC
    into the displayed dialog, and click on *OK*.
 6. Select the repository you have added to the list and select *Checkout*.
@@ -190,7 +190,7 @@ To set up your project:
 12. On the form's *Mappings* tab, enter the following two mappings:
     | Local path                                                                                 | Deployment path                                                         |
     |--------------------------------------------------------------------------------------------+-------------------------------------------------------------------------|
-    | /<path-from-root>/publications/shared-war/src/main/webapp/template/                        | /opt/tomcat-engine1/webapps/[[<%= trail_publication_name %>]]/template/ |
+    | /<path-from-root>/publications/shared-war/src/main/webapp/template/                        | /opt/tomcat-engine1/webapps/<%= trail_publication_name %>/template/ |
     | /<path-from-root>/publications/<%= trail_publication_name %>/src/main/webapp/template/ | /opt/tomcat-engine1/webapps/<%= trail_publication_name %>/template/ |
 13. Click *OK*.
 14. Select *Tools* > *Deployment* > *Automatic upload*.
@@ -201,10 +201,10 @@ Any changes you make to your project should now be automatically deployed to the
 on your test server. To test that this is actually the case:
 
 1. Display your test server's file system by selecting *Tools* > *Deployment* > *Browse Remote Host*.
-2. Navigate down the displayed tree to show the contents of the =/opt/tomcat-engine1/webapps/[[<%= trail_publication_name %>]]/template/widgets= folder.
-   (=/opt/tomcat-engine1/webapps/[[<%= trail_publication_name %>]]/template/= and all its children should be highlighted in green. If this is not the case,
+2. Navigate down the displayed tree to show the contents of the =/opt/tomcat-engine1/webapps/<%= trail_publication_name %>/template/widgets= folder.
+   (=/opt/tomcat-engine1/webapps/<%= trail_publication_name %>/template/= and all its children should be highlighted in green. If this is not the case,
    go back and and check that you entered the deployment path correctly in the *Deployment* dialog.)
-3. In your local code tree, navigate to publications/[[<%= trail_publication_name %>]]/src/main/webapp/template/widgets/dummy.
+3. In your local code tree, navigate to publications/<%= trail_publication_name %>/src/main/webapp/template/widgets/dummy.
 4. Create a file (any name) in this folder. The dummy folder and the file you have created should immediately be duplicated in the deployment tree.  If this is not the case,
    go back and and check that you entered the correct local paths in the *Deployment* dialog.
 5. Delete the test file you created. It should also disappear from the deployment tree.
@@ -244,10 +244,10 @@ in two ways:
  - By customizing existing widgets
 
 This manual does not cover the details of Widget Framework development, since this is covered elsewhere 
-([[<%= trail_virtual_host_documentation %>]]/widget-framework-2.0.html).
+([[<%= trail_virtual_host_documentation %>/widget-framework-2.0.html]]).
 
 The development environment you have set up is designed to support and simplify the process of extending
-the standard widgets supplied with the Widget Framework. The =publications/[[<%= trail_publication_name %>]]/src/main/webapp/template/= 
+the standard widgets supplied with the Widget Framework. The =publications/<%= trail_publication_name %>/src/main/webapp/template/= 
 tree is a *customization layer* that you can use to store any modifications you want to make to the standard widgets
 in the =publications/shared-war/src/main/webapp/template/= tree. During the application build process,
 the files in your customization layer are merged with the standard widgets to create a customized widget

From 1d4c649d04e18690384c0c658d81bafae7f4e500 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 26 Nov 2012 09:54:27 +0100
Subject: [PATCH 1695/2585] - added generate_deployment_id - added
 update_publication_resources skeleton - added (working!)
 backup_existing_publication_resources, which will   figure out all the
 publications by itself and backup all of its   resources.

---
 usr/sbin/deploy-ear-and-conf | 54 +++++++++++++++++++++++++++++++++++-
 1 file changed, 53 insertions(+), 1 deletion(-)

diff --git a/usr/sbin/deploy-ear-and-conf b/usr/sbin/deploy-ear-and-conf
index 548c2aeb..b9a1cdce 100755
--- a/usr/sbin/deploy-ear-and-conf
+++ b/usr/sbin/deploy-ear-and-conf
@@ -110,6 +110,8 @@ function read_user_input() {
       next_is_ear_uri=1
     elif [[ $el == "--conf" ]]; then
       next_is_conf_uri=1
+    elif [[ $el == "--update-publication-resources" ]]; then
+      update_the_publication_resources=1
     elif [ $next_is_ear_uri -eq 1 ]; then
       ear_uri=$el
       next_is_ear_uri=0
@@ -135,9 +137,59 @@ function verify_user_input() {
   fi
 }
 
+function backup_existing_publication_resources() {
+  local publication_resource_list="
+    content-type
+    image-version
+    feature
+    layout
+    layout-group
+    teaser-type
+  "
+  
+  for el in $engine_instance_list; do
+    local publication_list=$(
+      curl -s  http://localhost:8080/escenic-admin/pages/publication/list.jsp | \
+        grep '/escenic-admin/pages/publication/view.jsp' | \
+        sed 's/.*name=\(.*\)".*/\1/g'
+    )
+
+    for publication in $publication_list; do
+      local dir=/tmp/${deployment_id}/${publication}
+      for publication_resource in $publication_resource_list; do
+        (
+          unset http_proxy
+          make_dir $dir
+          cd $dir
+          run wget --quiet --continue \
+            http://localhost:8080/escenic-admin/publication-resources/${publication}/escenic/${publication_resource}
+        )
+      done
+    done
+  done
+}
+
+function update_publication_resources() {
+  if [ ${update_the_publication_resources-0} -eq 0 ]; then
+    return
+  fi
+
+  print_and_log "Updating publication resources ..."
+  backup_existing_publication_resources
+  
+  
+}
+
+function generate_deployment_id() {
+  deployment_id=$(date +%s)
+  print "Deployment ID" ${deployment_id}
+}
+
 read_user_input "$@"
 verify_user_input
+
+generate_deployment_id
 deploy_ear
 deploy_conf
-
+update_publication_resources
 

From a5bf527827095e01a9728e24ab40fb5ebea51eac Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 26 Nov 2012 15:51:33 +0100
Subject: [PATCH 1696/2585] - ece-deploy can now roll back EAR and publication
 resources - ece-deploy can now deploy a new EAR and conf archive from a URI -
 ece-deploy can now create backup of the current publication   resources and
 deployment state, as well as showing the user any   changes in the
 publication resources that will be applied.

---
 usr/sbin/ece-deploy | 373 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 373 insertions(+)
 create mode 100755 usr/sbin/ece-deploy

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
new file mode 100755
index 00000000..038e02ea
--- /dev/null
+++ b/usr/sbin/ece-deploy
@@ -0,0 +1,373 @@
+#! /usr/bin/env bash
+
+## Command which deployes an EAR and DEB package by their URIs.
+##
+## The command will deploy the EAR for all Escenic Content Engines and
+## Search servers installed on the given host and will figure out
+## instances and user/passwords by itself. It will also clear the work
+## directory before starting the instances again. The last thing the
+## script does, is to deploy the conf package.
+
+data_dir=/var/lib/escenic/$(basename $0)
+
+function bootstrap_thyself() {
+  # first, try to be nice, then check the standard location
+  local dir=$(dirname $0)/../share/escenic/ece-scripts
+  if [ ! -d $dir  ]; then
+    dir=/usr/share/escenic/ece-scripts
+  fi
+
+  local common_libraries="
+    common-bashing.sh
+    common-io.sh
+  "
+
+  for el in $common_libraries; do
+    source $dir/$el 2>/dev/null || {
+      echo "$(basename $0): Could not load the library $el," \
+        "and I can't live without it :-(" | fmt
+      exit 1
+    }
+  done
+
+  create_pid
+  create_lock
+  
+  # hooks for when the scirpt exits cleanly and when a user or someone
+  # kills the process
+  trap common_bashing_exit_hook EXIT
+  trap common_bashing_user_cancelled_hook SIGINT SIGHUP
+}
+
+bootstrap_thyself
+
+log=/var/log/escenic/$(basename $0).log
+tmp_dir=$(mkdir -p $HOME/$(date --iso))
+run source /etc/default/ece
+
+function deploy_ear() {
+  for el in $engine_instance_list; do
+	  su - $ece_unix_user -c \
+	    "ece -i $el stop deploy clean start --uri $ear_uri"
+  done
+  for el in $search_instance_list; do
+	  su - $ece_unix_user -c \
+	    "ece -i $el -t search stop deploy clean start --uri $ear_uri"
+    exit_on_error "Running ece deploy as $ece_unix_user"
+  done
+}
+
+function set_builder_user_and_password() {
+  run source /etc/escenic/ece.conf
+  for el in $engine_instance_list; do
+    file=/etc/escenic/ece-${el}.conf
+    if [ -e $file ]; then
+      run source $file
+    fi
+  done
+
+  local found=0
+  if [[ -n "$builder_http_user" && -n "$builder_http_password" ]]; then
+    found=1
+  fi
+  
+  if [ $found -eq 0 ]; then
+    local file_list=/etc/escenic/ece.conf
+    for el in $engine_instance_list; do
+      file_list="$file_list /etc/escenic/ece-${el}.conf"
+    done
+    print_and_log \
+      "You need to set builder_http_user & and builder_http_password" \
+      "in one of these files:" \
+      $file_list
+    exit 1
+  fi
+}
+
+
+function deploy_conf() {
+  set_builder_user_and_password
+
+  print "Downloading" $conf_package_uri "..."
+  (
+	  cd $tmp_dir
+	  run wget \
+	    --quiet \
+	    --continue \
+	    --http-user $builder_http_user \
+	    --http-password $builder_http_password \
+	    $conf_package_uri
+  )
+
+  print "Installing" $(basename $conf_package_uri) "..."
+  dpkg --force-overwrite -i $tmp_dir/$(basename $conf_package_uri)
+}
+
+function read_user_input() {
+  local next_is_ear_uri=0
+  local next_is_conf_uri=0
+  
+  for el in "$@"; do
+    if [[ $el == "--ear" ]]; then
+      next_is_ear_uri=1
+    elif [[ $el == "--conf" ]]; then
+      next_is_conf_uri=1
+    elif [[ $el == "--rollback" ]]; then
+      roll_back=1
+      next_is_roll_back_to_version=1
+    elif [[ $el == "--update-publication-resources" ]]; then
+      update_the_publication_resources=1
+    elif [[ $el == "--list-deployments" ]]; then
+      list_the_revious_deployments=1
+    elif [ $next_is_ear_uri -eq 1 ]; then
+      ear_uri=$el
+      next_is_ear_uri=0
+    elif [ $next_is_conf_uri -eq 1 ]; then
+      conf_package_uri=$el
+      next_is_ear_uri=0
+    elif [ ${next_is_roll_back_to_version-0} -eq 1 ]; then
+      roll_back_to_version=$el
+      next_is_roll_back_to_version=0
+    fi
+  done
+}
+
+function verify_user_input() {
+  local errors=0
+  if [ ${roll_back-0} -eq 1 ]; then
+    if [ -z "${roll_back_to_version}" ]; then
+      print  "You must specify which version to roll back to."
+      errors=1
+    fi
+  elif [ ${list_the_revious_deployments-0} -eq 1 ]; then
+    nop=foo
+  else
+    if [ -z "$conf_package_uri" ]; then
+      print "You must specify the conf package with --conf :-("
+      errors=1
+    fi
+    if [ -z "$ear_uri" ]; then
+      print "You must specify the URI of the EAR file with --ear :-("
+      errors=1
+    fi
+  fi
+  
+  if [ $errors -eq 1 ]; then
+    exit 1
+  fi
+}
+
+function list_previous_deployments() {
+  if [ ${list_the_revious_deployments-0} -eq 0 ]; then
+    return
+  fi
+  
+  for el in $(find $data_dir -maxdepth 1 -type d | sed "s#${data_dir}##g" | sort -nr | head -20); do
+    local id=$(basename $el)
+    echo "   - Deployment" ${id} "was made @" $(date --date="@${id}")
+  done
+}
+
+function prepare_rollback() {
+  local publication_resource_list="
+    0/escenic/section-parameter
+    escenic/content-type
+    escenic/feature
+    escenic/image-version
+    escenic/layout
+    escenic/layout-group
+    escenic/plugin/menu
+    escenic/teaser-type
+  "
+  
+  for el in $engine_instance_list; do
+    source /etc/escenic/ece-${el}.conf
+    local publication_list=$(
+      curl -s  http://localhost:${appserver_port}/escenic-admin/pages/publication/list.jsp | \
+        grep '/escenic-admin/pages/publication/view.jsp' | \
+        sed 's/.*name=\(.*\)".*/\1/g'
+    )
+
+    for publication in $publication_list; do
+      local dir=${data_dir}/${deployment_id}/backup/${publication}
+      
+      for publication_resource in $publication_resource_list; do
+        (
+          make_dir $dir/$(dirname $publication_resource)
+          
+          run cd $dir
+          local xml=$(
+            wget --quiet --continue --output-document - \
+              http://localhost:${appserver_port}/escenic-admin/publication-resources/${publication}/${publication_resource}
+          )
+
+          if [[ -n "${xml}"  && ${xml:0:1} == "<" ]]; then
+            echo "${xml}" | xmllint --format - > ${publication_resource}
+          else
+            echo "${xml}" > ${publication_resource}
+          fi
+        )
+      done
+    done
+
+    # copying the current deployment state, so that we can roll back
+    dir=${data_dir}/${deployment_id}/backup
+    make_dir $dir
+    if [ -e /var/lib/escenic/${el}.state ]; then
+      run cp /var/lib/escenic/${el}.state $dir
+    fi
+
+    # get a hold of the current vosa-conf package, first all packages
+    # to detect if we've got packages intended for other hosts.
+    dpkg -l vosa-conf-* | tail -1 2>/dev/null\
+      > $dir/vosa-conf-package.list
+    dpkg -l vosa-conf-$HOSTNAME 2>/dev/null | tail -1 | awk '{print $3;}' \
+      > $dir/vosa-conf-${HOSTNAME}.version
+  done
+
+  print_and_log "Rollback prepared in" $data_dir/$deployment_id/backup
+}
+
+function looks_like_xml() {
+  local xml=$(cat "$1")
+  if [[ ${xml:0:1} == "<" ]]; then
+    echo 1
+  else
+    echo 0
+  fi
+}
+
+## app server port
+function get_publication_list() {
+  curl -s  http://localhost:${1}/escenic-admin/pages/publication/list.jsp | \
+    grep '/escenic-admin/pages/publication/view.jsp' | \
+    sed 's/.*name=\(.*\)".*/\1/g'
+}
+  
+function update_publication_resources() {
+  if [ ${update_the_publication_resources-0} -eq 0 ]; then
+    return
+  fi
+
+  print_and_log "Updating publication resources ..."
+  for el in $engine_instance_list; do
+    source /etc/escenic/ece-${el}.conf
+    local publication_list=$(get_publication_list ${appserver_port})
+
+    for publication in $publication_list; do
+      local publication_resources_dir=$tomcat_base/webapps-${publication}/${publication}/META-INF/escenic/publication-resources 
+      if [ ! -e $publication_resources_dir ]; then
+        continue
+      fi
+      
+      (
+        cd $publication_resources_dir
+        for ele in $(find -type f | sed 's#^./##g'); do
+            # echo \
+            # http://localhost:${appserver_port}/escenic-admin/publication-resources/${publication}/${ele}
+
+          dir=$data_dir/$deployment_id/new/$publication/$(dirname $ele)
+          make_dir $dir
+          
+          old_file=$data_dir/$deployment_id/backup/$publication/${ele}
+          
+          if [ $(looks_like_xml $ele) -eq 1 ]; then
+            file=$dir/$(basename $ele)
+            xmllint --format $ele > $file
+          else
+            file=$dir/$(basename $ele)
+            cp $ele $dir/$(basename $ele)
+          fi
+
+          if [ ! -e $old_file ]; then
+            old_file=$(mktemp)
+          fi
+
+          local number_of_lines_changed=$(diff \
+            <(cat $old_file | grep -v '^$') \
+            <(cat $file | grep -v '^$') | \
+            egrep '<|>' | \
+            wc -l
+          )
+          if [ ${number_of_lines_changed} -lt 1 ]; then
+            continue
+          fi
+          
+          print_and_log "Applying" \
+            $number_of_lines_changed \
+            "changes to" $ele \
+            "full diff can be found here: $dir/$(basename $ele).diff"
+          diff $old_file $file > $dir/$(basename $ele).diff
+
+          run curl --silent \
+            -T $ele \
+            http://localhost:${appserver_port}/escenic-admin/publication-resources/${publication}/$ele
+        done
+      )
+    done
+  done
+}
+
+function generate_deployment_id() {
+  deployment_id=$(date +%s)
+  print_and_log "This deployment has ID" ${deployment_id}
+}
+
+function roll_back_everything_to_version() {
+  if [ ${roll_back-0} -eq 0 ]; then
+    return
+  fi
+  
+  print_and_log "Rolling back to" \
+    ${roll_back_to_version} \
+    "from" $(date --date @${roll_back_to_version}) \
+    "..."
+
+  print_and_log "Rolling back publication resources ..."
+  for el in $engine_instance_list; do
+    source /etc/escenic/ece-${el}.conf
+    for publication in $(get_publication_list ${appserver_port}); do
+      (
+        cd $data_dir/${roll_back_to_version}/backup/${publication}
+        for ele in $(find -type f | sed 's#^./##g'); do
+          run curl --silent \
+            -T $ele \
+            http://localhost:${appserver_port}/escenic-admin/publication-resources/${publication}/$ele
+        done
+      )
+    done
+  done
+
+  for el in $engine_instance_list; do
+    file=$data_dir/${roll_back_to_version}/backup/${el}.state
+    if [ ! -e $file ]; then
+      continue
+    fi
+
+    # we source the state file to get the 'ear_used' value
+    local old_ear=$(grep ear_used $file | cut -d'=' -f2)
+    print_and_log "Rolling back ${el}'s EAR to ${old_ear} ..."
+	  su - $ece_unix_user -c \
+	    "ece -i $el -t search stop deploy clean start --uri ${old_ear}"
+    exit_on_error "Running ece deploy as $ece_unix_user"
+  done
+
+
+  print_and_log "You must now install the vosa-conf packages of this version(s):"
+  cat $data_dir/${roll_back_to_version}/backup/vosa-conf*
+
+  print_and_log "You have now rolled back to ${roll_back_to_version}"
+}
+
+
+unset http_proxy
+
+read_user_input "$@"
+verify_user_input
+generate_deployment_id
+prepare_rollback
+deploy_ear
+deploy_conf
+update_publication_resources
+list_previous_deployments
+roll_back_everything_to_version

From 293414bc881d44e10316df123ac27709bc8a122c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 26 Nov 2012 15:52:05 +0100
Subject: [PATCH 1697/2585] - changes in create-package to reflect the name
 change of   deploy-ear-and-conf to ece-deploy

---
 usr/share/escenic/package-scripts/create-packages | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index e4657393..78e0ca96 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -117,8 +117,7 @@ function set_up_escenic-content-engine-scripts() {
   done
 
   # sbin
-  cp ../../../sbin/deploy-ear-and-conf \
-    $target_dir/usr/sbin/
+  cp ../../../sbin/ece-deploy $target_dir/usr/sbin/
 
   # conf
   cp -r ../../../../etc/escenic/ $target_dir/etc/

From 9596aca97f8c02cd0670915ca0eb88e8c89e33c0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 26 Nov 2012 15:52:16 +0100
Subject: [PATCH 1698/2585] - renamed

---
 usr/sbin/deploy-ear-and-conf | 195 -----------------------------------
 1 file changed, 195 deletions(-)
 delete mode 100755 usr/sbin/deploy-ear-and-conf

diff --git a/usr/sbin/deploy-ear-and-conf b/usr/sbin/deploy-ear-and-conf
deleted file mode 100755
index b9a1cdce..00000000
--- a/usr/sbin/deploy-ear-and-conf
+++ /dev/null
@@ -1,195 +0,0 @@
-#! /usr/bin/env bash
-
-## Command which deployes an EAR and DEB package by their URIs.
-##
-## The command will deploy the EAR for all Escenic Content Engines and
-## Search servers installed on the given host and will figure out
-## instances and user/passwords by itself. It will also clear the work
-## directory before starting the instances again. The last thing the
-## script does, is to deploy the conf package.
-
-function bootstrap_thyself() {
-  # first, try to be nice, then check the standard location
-  local dir=$(dirname $0)/../share/escenic/ece-scripts
-  if [ ! -d $dir  ]; then
-    dir=/usr/share/escenic/ece-scripts
-  fi
-
-  local common_libraries="
-    common-bashing.sh
-    common-io.sh
-  "
-
-  for el in $common_libraries; do
-    source $dir/$el 2>/dev/null || {
-      echo "$(basename $0): Could not load the library $el," \
-        "and I can't live without it :-(" | fmt
-      exit 1
-    }
-  done
-
-  create_pid
-  create_lock
-  
-  # hooks for when the scirpt exits cleanly and when a user or someone
-  # kills the process
-  trap common_bashing_exit_hook EXIT
-  trap common_bashing_user_cancelled_hook SIGINT SIGHUP
-}
-
-bootstrap_thyself
-
-log=/var/log/escenic/$(basename $0).log
-tmp_dir=$(mkdir -p $HOME/$(date --iso))
-run source /etc/default/ece
-
-function deploy_ear() {
-  for el in $engine_instance_list; do
-	  su - $ece_unix_user -c \
-	    "ece -i $el stop deploy clean start --uri $ear_uri"
-  done
-  for el in $search_instance_list; do
-	  su - $ece_unix_user -c \
-	    "ece -i $el -t search stop deploy clean start --uri $ear_uri"
-    exit_on_error "Running ece deploy as $ece_unix_user"
-  done
-}
-
-function set_builder_user_and_password() {
-  run source /etc/escenic/ece.conf
-  for el in $engine_instance_list; do
-    file=/etc/escenic/ece-${el}.conf
-    if [ -e $file ]; then
-      run source $file
-    fi
-  done
-
-  local found=0
-  if [[ -n "$builder_http_user" && -n "$builder_http_password" ]]; then
-    found=1
-  fi
-  
-  if [ $found -eq 0 ]; then
-    local file_list=/etc/escenic/ece.conf
-    for el in $engine_instance_list; do
-      file_list="$file_list /etc/escenic/ece-${el}.conf"
-    done
-    print_and_log \
-      "You need to set builder_http_user & and builder_http_password" \
-      "in one of these files:" \
-      $file_list
-    exit 1
-  fi
-}
-
-
-function deploy_conf() {
-  set_builder_user_and_password
-
-  print "Downloading" $conf_package_uri "..."
-  (
-	  cd $tmp_dir
-	  run wget \
-	    --quiet \
-	    --continue \
-	    --http-user $builder_http_user \
-	    --http-password $builder_http_password \
-	    $conf_package_uri
-  )
-
-  print "Installing" $(basename $conf_package_uri) "..."
-  dpkg --force-overwrite -i $tmp_dir/$(basename $conf_package_uri)
-}
-
-function read_user_input() {
-  local next_is_ear_uri=0
-  local next_is_conf_uri=0
-  
-  for el in "$@"; do
-    if [[ $el == "--ear" ]]; then
-      next_is_ear_uri=1
-    elif [[ $el == "--conf" ]]; then
-      next_is_conf_uri=1
-    elif [[ $el == "--update-publication-resources" ]]; then
-      update_the_publication_resources=1
-    elif [ $next_is_ear_uri -eq 1 ]; then
-      ear_uri=$el
-      next_is_ear_uri=0
-    elif [ $next_is_conf_uri -eq 1 ]; then
-      conf_package_uri=$el
-      next_is_ear_uri=0
-    fi
-  done
-}
-
-function verify_user_input() {
-  local errors=0
-  if [ -z "$conf_package_uri" ]; then
-    print "You must specify the conf package with --conf :-("
-    errors=1
-  fi
-  if [ -z "$ear_uri" ]; then
-    print "You must specify the URI of the EAR file with --ear :-("
-    errors=1
-  fi
-  if [ $errors -eq 1 ]; then
-    exit 1
-  fi
-}
-
-function backup_existing_publication_resources() {
-  local publication_resource_list="
-    content-type
-    image-version
-    feature
-    layout
-    layout-group
-    teaser-type
-  "
-  
-  for el in $engine_instance_list; do
-    local publication_list=$(
-      curl -s  http://localhost:8080/escenic-admin/pages/publication/list.jsp | \
-        grep '/escenic-admin/pages/publication/view.jsp' | \
-        sed 's/.*name=\(.*\)".*/\1/g'
-    )
-
-    for publication in $publication_list; do
-      local dir=/tmp/${deployment_id}/${publication}
-      for publication_resource in $publication_resource_list; do
-        (
-          unset http_proxy
-          make_dir $dir
-          cd $dir
-          run wget --quiet --continue \
-            http://localhost:8080/escenic-admin/publication-resources/${publication}/escenic/${publication_resource}
-        )
-      done
-    done
-  done
-}
-
-function update_publication_resources() {
-  if [ ${update_the_publication_resources-0} -eq 0 ]; then
-    return
-  fi
-
-  print_and_log "Updating publication resources ..."
-  backup_existing_publication_resources
-  
-  
-}
-
-function generate_deployment_id() {
-  deployment_id=$(date +%s)
-  print "Deployment ID" ${deployment_id}
-}
-
-read_user_input "$@"
-verify_user_input
-
-generate_deployment_id
-deploy_ear
-deploy_conf
-update_publication_resources
-

From 272e29e1084483e2f0a2f23956f3d02596b6952d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 26 Nov 2012 15:55:16 +0100
Subject: [PATCH 1699/2585] - /etc/default/ece is no longer included in the
 packages

---
 .../debian/escenic-content-engine-scripts/conffiles              | 1 -
 1 file changed, 1 deletion(-)

diff --git a/usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/conffiles b/usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/conffiles
index fcdd2799..6350ab5c 100644
--- a/usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/conffiles
+++ b/usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/conffiles
@@ -1,3 +1,2 @@
-/etc/default/ece
 /etc/escenic/ece.conf
 /etc/cron.daily/remove-old-escenic-log-files

From 5e7017f1dc5da9b6a5677291733f5611f8474e48 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 26 Nov 2012 15:59:39 +0100
Subject: [PATCH 1700/2585] - some packages don't have /usr/{bin,sbin}, hence
 re-directing   standard error in create_packages

---
 usr/share/escenic/package-scripts/create-packages | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 78e0ca96..e5cc6812 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -259,7 +259,7 @@ function create_packages() {
   sed -i "s#VERSION#${package_version}#g" $debian_dir/control
   sed -i "s#MAINTAINER_NAME#$(get_name)#g" $debian_dir/control
   sed -i "s#MAINTAINER_EMAIL#$(get_email)#g" $debian_dir/control
-  find ${target_dir}/usr/{bin,sbin}/ -type f | while read f; do
+  find ${target_dir}/usr/{bin,sbin}/ -type f 2>/dev/null | while read f; do
     sed -i "s#^ece_scripts_version=.*#ece_scripts_version=${package_version}#g" \
       $f
   done

From 726a3322e183e72adbf10826d4300e2b16ab0549 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 26 Nov 2012 16:59:03 +0100
Subject: [PATCH 1701/2585] - hardening when running --list-deployments or
 --rollback - hardening, when the version to roll back doesn't contain the
 right   publication files.

---
 usr/sbin/ece-deploy | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
index 038e02ea..ffb084a2 100755
--- a/usr/sbin/ece-deploy
+++ b/usr/sbin/ece-deploy
@@ -46,6 +46,10 @@ tmp_dir=$(mkdir -p $HOME/$(date --iso))
 run source /etc/default/ece
 
 function deploy_ear() {
+  if [ ${make_deployment-1} -eq 0 ]; then
+    return
+  fi
+  
   for el in $engine_instance_list; do
 	  su - $ece_unix_user -c \
 	    "ece -i $el stop deploy clean start --uri $ear_uri"
@@ -86,6 +90,10 @@ function set_builder_user_and_password() {
 
 
 function deploy_conf() {
+  if [ ${make_deployment-1} -eq 0 ]; then
+    return
+  fi
+  
   set_builder_user_and_password
 
   print "Downloading" $conf_package_uri "..."
@@ -115,10 +123,12 @@ function read_user_input() {
     elif [[ $el == "--rollback" ]]; then
       roll_back=1
       next_is_roll_back_to_version=1
+      make_deployment=0
     elif [[ $el == "--update-publication-resources" ]]; then
       update_the_publication_resources=1
     elif [[ $el == "--list-deployments" ]]; then
       list_the_revious_deployments=1
+      make_deployment=0
     elif [ $next_is_ear_uri -eq 1 ]; then
       ear_uri=$el
       next_is_ear_uri=0
@@ -327,8 +337,13 @@ function roll_back_everything_to_version() {
   for el in $engine_instance_list; do
     source /etc/escenic/ece-${el}.conf
     for publication in $(get_publication_list ${appserver_port}); do
+      dir=$data_dir/${roll_back_to_version}/backup/${publication}
+      if [ ! -d $dir ]; then
+        continue
+      fi
+      
       (
-        cd $data_dir/${roll_back_to_version}/backup/${publication}
+        run cd $dir
         for ele in $(find -type f | sed 's#^./##g'); do
           run curl --silent \
             -T $ele \

From db867e88c802bad2aaa3599cb6e9a33d9eb26cc7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 27 Nov 2012 10:02:38 +0100
Subject: [PATCH 1702/2585] - changed the backup directory from 'backup' to
 'old' so that there's   a clear balance with the 'new' directory for the, eh,
 new files.

  It also makes the diff paths more logical.

- removed dead code
---
 usr/sbin/ece-deploy | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
index ffb084a2..68969e0f 100755
--- a/usr/sbin/ece-deploy
+++ b/usr/sbin/ece-deploy
@@ -199,7 +199,7 @@ function prepare_rollback() {
     )
 
     for publication in $publication_list; do
-      local dir=${data_dir}/${deployment_id}/backup/${publication}
+      local dir=${data_dir}/${deployment_id}/old/${publication}
       
       for publication_resource in $publication_resource_list; do
         (
@@ -273,13 +273,10 @@ function update_publication_resources() {
       (
         cd $publication_resources_dir
         for ele in $(find -type f | sed 's#^./##g'); do
-            # echo \
-            # http://localhost:${appserver_port}/escenic-admin/publication-resources/${publication}/${ele}
-
           dir=$data_dir/$deployment_id/new/$publication/$(dirname $ele)
           make_dir $dir
           
-          old_file=$data_dir/$deployment_id/backup/$publication/${ele}
+          old_file=$data_dir/$deployment_id/old/$publication/${ele}
           
           if [ $(looks_like_xml $ele) -eq 1 ]; then
             file=$dir/$(basename $ele)
@@ -337,7 +334,7 @@ function roll_back_everything_to_version() {
   for el in $engine_instance_list; do
     source /etc/escenic/ece-${el}.conf
     for publication in $(get_publication_list ${appserver_port}); do
-      dir=$data_dir/${roll_back_to_version}/backup/${publication}
+      dir=$data_dir/${roll_back_to_version}/old/${publication}
       if [ ! -d $dir ]; then
         continue
       fi
@@ -354,7 +351,7 @@ function roll_back_everything_to_version() {
   done
 
   for el in $engine_instance_list; do
-    file=$data_dir/${roll_back_to_version}/backup/${el}.state
+    file=$data_dir/${roll_back_to_version}/old/${el}.state
     if [ ! -e $file ]; then
       continue
     fi
@@ -369,7 +366,7 @@ function roll_back_everything_to_version() {
 
 
   print_and_log "You must now install the vosa-conf packages of this version(s):"
-  cat $data_dir/${roll_back_to_version}/backup/vosa-conf*
+  cat $data_dir/${roll_back_to_version}/old/vosa-conf*
 
   print_and_log "You have now rolled back to ${roll_back_to_version}"
 }

From 19f3b42056b3d5c08ea3cb435e6a1afc44951be3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 27 Nov 2012 12:16:51 +0100
Subject: [PATCH 1703/2585] - added /escenic/plugin/community/security to the
 list of publication   resources to back up

---
 usr/sbin/ece-deploy | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
index 68969e0f..fd25d083 100755
--- a/usr/sbin/ece-deploy
+++ b/usr/sbin/ece-deploy
@@ -186,6 +186,7 @@ function prepare_rollback() {
     escenic/image-version
     escenic/layout
     escenic/layout-group
+    escenic/plugin/community/security
     escenic/plugin/menu
     escenic/teaser-type
   "
@@ -371,9 +372,28 @@ function roll_back_everything_to_version() {
   print_and_log "You have now rolled back to ${roll_back_to_version}"
 }
 
+function check_pre_requisites() {
+  local required_command_list="
+    xmllint
+  "
 
-unset http_proxy
+  local some_missing=0
+  
+  for el in $required_command_list; do
+    which $el > /dev/null 2>/dev/null
+    if [ $? -gt 0 ]; then
+      print_and_log "$(basename $0) needs the command $el to be installed"
+      some_missing=1
+    fi
+  done
 
+  if [ $some_missing -eq 1 ]; then
+    exit 1
+  fi
+}
+
+unset http_proxy
+check_pre_requisites
 read_user_input "$@"
 verify_user_input
 generate_deployment_id

From 52b0c75849fdd82516a3067ff6b60887b6246b2e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 27 Nov 2012 13:26:29 +0100
Subject: [PATCH 1704/2585] - fixed some wild card expansion going astray.

---
 usr/sbin/ece-deploy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
index fd25d083..4192e696 100755
--- a/usr/sbin/ece-deploy
+++ b/usr/sbin/ece-deploy
@@ -230,7 +230,7 @@ function prepare_rollback() {
 
     # get a hold of the current vosa-conf package, first all packages
     # to detect if we've got packages intended for other hosts.
-    dpkg -l vosa-conf-* | tail -1 2>/dev/null\
+    dpkg -l "vosa-conf-*" | tail -1 2>/dev/null\
       > $dir/vosa-conf-package.list
     dpkg -l vosa-conf-$HOSTNAME 2>/dev/null | tail -1 | awk '{print $3;}' \
       > $dir/vosa-conf-${HOSTNAME}.version

From 02f93c2619f1a7fe5865a3402daaaeb158674aff Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 27 Nov 2012 13:38:07 +0100
Subject: [PATCH 1705/2585] - argh

---
 usr/sbin/ece-deploy | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
index 4192e696..c55b3627 100755
--- a/usr/sbin/ece-deploy
+++ b/usr/sbin/ece-deploy
@@ -222,7 +222,7 @@ function prepare_rollback() {
     done
 
     # copying the current deployment state, so that we can roll back
-    dir=${data_dir}/${deployment_id}/backup
+    dir=${data_dir}/${deployment_id}/old
     make_dir $dir
     if [ -e /var/lib/escenic/${el}.state ]; then
       run cp /var/lib/escenic/${el}.state $dir
@@ -236,7 +236,7 @@ function prepare_rollback() {
       > $dir/vosa-conf-${HOSTNAME}.version
   done
 
-  print_and_log "Rollback prepared in" $data_dir/$deployment_id/backup
+  print_and_log "Rollback prepared in" $data_dir/$deployment_id/old
 }
 
 function looks_like_xml() {

From effc6178118d04a22b2bd7b8a0c856d8cce78ef0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 27 Nov 2012 14:25:20 +0100
Subject: [PATCH 1706/2585] - rollback now calls the same deploy_ear method
 that regular   deployment calls. This should fix a number of other problems
 too.

---
 usr/sbin/ece-deploy | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
index c55b3627..01460ed0 100755
--- a/usr/sbin/ece-deploy
+++ b/usr/sbin/ece-deploy
@@ -46,10 +46,6 @@ tmp_dir=$(mkdir -p $HOME/$(date --iso))
 run source /etc/default/ece
 
 function deploy_ear() {
-  if [ ${make_deployment-1} -eq 0 ]; then
-    return
-  fi
-  
   for el in $engine_instance_list; do
 	  su - $ece_unix_user -c \
 	    "ece -i $el stop deploy clean start --uri $ear_uri"
@@ -360,9 +356,8 @@ function roll_back_everything_to_version() {
     # we source the state file to get the 'ear_used' value
     local old_ear=$(grep ear_used $file | cut -d'=' -f2)
     print_and_log "Rolling back ${el}'s EAR to ${old_ear} ..."
-	  su - $ece_unix_user -c \
-	    "ece -i $el -t search stop deploy clean start --uri ${old_ear}"
-    exit_on_error "Running ece deploy as $ece_unix_user"
+    ear_uri=${old_ear}
+    deploy_ear
   done
 
 
@@ -398,8 +393,12 @@ read_user_input "$@"
 verify_user_input
 generate_deployment_id
 prepare_rollback
-deploy_ear
-deploy_conf
+
+if [ ${make_deployment-1} -eq 0 ]; then
+  deploy_ear
+  deploy_conf
+fi
+
 update_publication_resources
 list_previous_deployments
 roll_back_everything_to_version

From 05e7d8e500fe083b957f1d17c24df3c64f9fc9c5 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 27 Nov 2012 14:32:05 +0100
Subject: [PATCH 1707/2585] - now, the (default) EAR and conf methods are not
 called for   --rollback and --list-deployments

---
 usr/sbin/ece-deploy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
index 01460ed0..5b613070 100755
--- a/usr/sbin/ece-deploy
+++ b/usr/sbin/ece-deploy
@@ -394,7 +394,7 @@ verify_user_input
 generate_deployment_id
 prepare_rollback
 
-if [ ${make_deployment-1} -eq 0 ]; then
+if [ ${make_deployment-1} -eq 1 ]; then
   deploy_ear
   deploy_conf
 fi

From 5f4f2c2c04ba23269e7d1091fb7b5528dd514efd Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Wed, 28 Nov 2012 09:10:55 +0100
Subject: [PATCH 1708/2585] Increased default warning and critical levels for #
 of connections

---
 usr/lib/check_mk_agent/local/ece-install-trail | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/lib/check_mk_agent/local/ece-install-trail b/usr/lib/check_mk_agent/local/ece-install-trail
index a3413c7b..23ab90d8 100755
--- a/usr/lib/check_mk_agent/local/ece-install-trail
+++ b/usr/lib/check_mk_agent/local/ece-install-trail
@@ -11,8 +11,8 @@
 # trail_presentation_port=1234
 # trail_editorial_port=1235
 
-critical=150
-warning=100
+critical=400
+warning=250
 
 function check_trail() {
   for el in /var/lib/ece-install/*.trail ; do

From 99ec41b1eeeef7448ce29dc4519e82e998095290 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 27 Nov 2012 15:44:13 +0100
Subject: [PATCH 1709/2585] - don't prepare rollback for --list-deployments

---
 usr/sbin/ece-deploy | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
index 5b613070..005b3542 100755
--- a/usr/sbin/ece-deploy
+++ b/usr/sbin/ece-deploy
@@ -42,7 +42,6 @@ function bootstrap_thyself() {
 bootstrap_thyself
 
 log=/var/log/escenic/$(basename $0).log
-tmp_dir=$(mkdir -p $HOME/$(date --iso))
 run source /etc/default/ece
 
 function deploy_ear() {
@@ -90,11 +89,14 @@ function deploy_conf() {
     return
   fi
   
+  local ece_deploy_download_dir=/var/cache/escenic
+  make_dir $ece_deploy_download_dir
+
   set_builder_user_and_password
 
   print "Downloading" $conf_package_uri "..."
   (
-	  cd $tmp_dir
+	  cd $ece_deploy_download_dir
 	  run wget \
 	    --quiet \
 	    --continue \
@@ -104,7 +106,9 @@ function deploy_conf() {
   )
 
   print "Installing" $(basename $conf_package_uri) "..."
-  dpkg --force-overwrite -i $tmp_dir/$(basename $conf_package_uri)
+  dpkg \
+    --force-overwrite \
+    --install $ece_deploy_download_dir/$(basename $conf_package_uri)
 }
 
 function read_user_input() {
@@ -327,6 +331,15 @@ function roll_back_everything_to_version() {
     "from" $(date --date @${roll_back_to_version}) \
     "..."
 
+  local old_data_dir=$data_dir/${roll_back_to_version}/old
+  if [ ! -d $old_data_dir ]; then
+    print_and_log "I cannot find ${roll_back_to_version}'s files," \
+      "they should have been here:" $old_data_dir
+    exit 1
+  else
+    log "Using data in" $old_data_dir "to perform the rollback"
+  fi
+
   print_and_log "Rolling back publication resources ..."
   for el in $engine_instance_list; do
     source /etc/escenic/ece-${el}.conf
@@ -339,7 +352,9 @@ function roll_back_everything_to_version() {
       (
         run cd $dir
         for ele in $(find -type f | sed 's#^./##g'); do
-          run curl --silent \
+          print_and_log "Rolling back publication resource ${ele} ..."
+          run curl \
+            --silent \
             -T $ele \
             http://localhost:${appserver_port}/escenic-admin/publication-resources/${publication}/$ele
         done
@@ -392,7 +407,10 @@ check_pre_requisites
 read_user_input "$@"
 verify_user_input
 generate_deployment_id
-prepare_rollback
+
+if [ ${list_the_revious_deployments-0} -eq 0 ]; then
+  prepare_rollback
+fi
 
 if [ ${make_deployment-1} -eq 1 ]; then
   deploy_ear

From 8f2e425173bdb7d977bb733fd18993fa84ff110f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 27 Nov 2012 16:13:53 +0100
Subject: [PATCH 1710/2585] - ece-deploy now tries to find the conf DEB -
 ece-deploy will install or inform about the conf DEB before   performing any
 of the other rollback functions - some more hardening

---
 usr/sbin/ece-deploy | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
index 005b3542..598282f4 100755
--- a/usr/sbin/ece-deploy
+++ b/usr/sbin/ece-deploy
@@ -9,6 +9,7 @@
 ## script does, is to deploy the conf package.
 
 data_dir=/var/lib/escenic/$(basename $0)
+ece_deploy_download_dir=/var/cache/escenic
 
 function bootstrap_thyself() {
   # first, try to be nice, then check the standard location
@@ -89,7 +90,6 @@ function deploy_conf() {
     return
   fi
   
-  local ece_deploy_download_dir=/var/cache/escenic
   make_dir $ece_deploy_download_dir
 
   set_builder_user_and_password
@@ -340,6 +340,24 @@ function roll_back_everything_to_version() {
     log "Using data in" $old_data_dir "to perform the rollback"
   fi
 
+  local package_version_file=$data_dir/${roll_back_to_version}/old/vosa-conf-${HOSTNAME}.version
+  if [ -e $package_version_file ]; then
+    local deb_file=$ece_deploy_download_dir/vosa-conf-$HOSTNAME-$(cat $package_version_file).deb
+    if [ -e $deb_file ]; then
+      print_and_log "Reverting back to version" $(cat $package_version_file) \
+        "vosa-conf-$HOSTNAME ..."
+      dpkg --install --force-overwrite $deb_file
+    else
+      print_and_log "You must now install version" \
+        $(cat $package_version_file) \
+        "of the vosa-conf-$HOSTNAME package" \
+        "I couldn't find it in" $deb_file
+    fi
+  else
+    print_and_log "Couldn't find the previous version for vosa-conf-$HOSTNAME" \
+      "you must get a hold of the latest/approriate one yourself."
+  fi
+
   print_and_log "Rolling back publication resources ..."
   for el in $engine_instance_list; do
     source /etc/escenic/ece-${el}.conf
@@ -376,10 +394,7 @@ function roll_back_everything_to_version() {
   done
 
 
-  print_and_log "You must now install the vosa-conf packages of this version(s):"
-  cat $data_dir/${roll_back_to_version}/old/vosa-conf*
-
-  print_and_log "You have now rolled back to ${roll_back_to_version}"
+  print_and_log "You have now rolled back to deployment ${roll_back_to_version}"
 }
 
 function check_pre_requisites() {

From 12ed142005ff2b831d19e0c2773530a51055cd11 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 28 Nov 2012 09:23:19 +0100
Subject: [PATCH 1711/2585] - lowered the connection timeout for the call to
 ifconfig.me from 30   to 10 seconds, this should at least ease the likes of
 #115.

- used the make_dir wrapper instead of calling mkdir -p directly
---
 usr/share/escenic/ece-scripts/system-info.d/55-list-ips.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/55-list-ips.sh b/usr/share/escenic/ece-scripts/system-info.d/55-list-ips.sh
index b5851805..7a09501e 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/55-list-ips.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/55-list-ips.sh
@@ -1,6 +1,6 @@
 function print_my_ip_to_the_world() {
   local file=$HOME/.vizrt/system-info/myip.cache
-  mkdir -p $(dirname $file)
+  make_dir $(dirname $file)
 
   # we only query ifconfig.me every ten minutes
   local max_age=600
@@ -21,7 +21,7 @@ function print_my_ip_to_the_world() {
 
   if [[ $update -eq 1 ]]; then
     new_value="$( curl --silent \
-        --connect-timeout 30 \
+        --connect-timeout 10 \
         ifconfig.me 2>/dev/null )"
   fi
 

From 58b977e5ae5ec42ac4ab54eb23587fe5ae10e91a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 28 Nov 2012 12:08:23 +0100
Subject: [PATCH 1712/2585] - there should be no reason to delete the .svn
 folders in the original   configuration tree.

  This will close #116
---
 usr/share/escenic/build-scripts/ece-build | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 12065e79..a1bdb5b2 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -508,10 +508,11 @@ function create_machine_conf_packages() {
 
     # common files
     run cp -r $conf_dir/common/* $target_dir/
-    find $conf_dir -name .svn -type d | xargs rm -rf
 
     # machine specific files
     run cp -r $conf_dir/${machine}/* $target_dir/
+
+    # delete those pesky .svn folders
     find $target_dir -name .svn -type d | xargs rm -rf
 
     # add the truth

From 72d00e10aa6a6d9c8e9139bcd9da3e0d9d72b268 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Wed, 28 Nov 2012 13:58:18 +0100
Subject: [PATCH 1713/2585] vosa-handbook - updated documentation for
 development process

---
 .../vosa-handbook/development-process.org     | 202 +++++++-----------
 1 file changed, 78 insertions(+), 124 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/development-process.org b/usr/share/doc/vizrt/vosa-handbook/development-process.org
index 73a0e27e..7f18f598 100644
--- a/usr/share/doc/vizrt/vosa-handbook/development-process.org
+++ b/usr/share/doc/vizrt/vosa-handbook/development-process.org
@@ -31,8 +31,9 @@ The main components of the VOSA development environment are:
 
 You need to install the following items on your PC or Mac:
 
- - The Oracle Java Development Kit, version 7 (??). You can get this
-   from [[http://www.oracle.com/technetwork/java/javase/downloads/java-se-jdk-7-download-432154.html]].
+ - The Oracle Java Development Kit, version 6 or 7. You can get this
+   from [[http://www.oracle.com/technetwork/java/javase/downloads/jdk6u37-downloads-1859587.html]] 
+   and [[http://www.oracle.com/technetwork/java/javase/downloads/java-se-jdk-7-download-432154.html]] 
  - Apache Subversion client software. You can get this from
    [[http://subversion.apache.org/packages.html]] (or on Linux you can
    most likely install it using your package manager).
@@ -54,7 +55,6 @@ following plug-ins (although you may find you have use for others):
 
  - Maven integration plug-in
  - Subversion integration plug-in
- - ??
 
 All of the above products have their own installation
 procedures. Follow the relevant procedures for your operating system,
@@ -69,38 +69,45 @@ Setting up your development environment involves:
  - Obtaining copies of the code and systems you are going to work on
  - Getting access to the project infrastructure (HipChat, Jira and so on) 
 
-*** Set up your local test site
+*** Set up your local development environment
 
-Download the following virtual machine image:
+The main environment for change is the local development environment
+a.k.a. "dev image". The dev image is downloaded as a .ova file that
+can be imported into VirtualBox or VMWare Player. It works under
+Windows, OSX and Linux, and provides an Ubuntu image with Escenic
+Content Engine already installed with a publication and an .ear
+file from the project.
+
+Start by downloading the image: [[<%= trail_dev_image_uri %>][Local Development Environment]]
+
+*** Import .ova file into VirtualBox
+
+1) After you have downloaded the .ova file you can open the file in i.e. VirtualBox.
 
- [[<%= trail_dev_image_uri %>]]
+2) VirtualBox will recognize the format and offer you a dialog for importing the image.
+
+3) After klicking "Import" you will be asked to agree to a license agreement and after clicking "Agree" the import process will start.
 
-When the file has finished downloading, double-click on it. This
-starts VirtualBox, which opens the file and creates a virtual machine
-from it. When the virtual machine is ready, a <%= trail_dev_image_name%>
-entry will appear in the list on the left hand side of the
-VirtualBox window.
+4) When the import finished the VirtualBox Manager will open and your image will be visible in a list. It's now time to adjust your settings. Unless you have very specific changes you would like to perform for memory, number of CPUs etc... opening the settings dialog and then click "OK" is enough to finish the initial configuration.
 
+5) The next step will be to start the image. This is done by selecting the image in the list and then click "Start" in the VirtualBox Manager.
 
-Click on *Start* to run the machine. A terminal window is displayed,
-showing the virtual machine boot-up messages. When the boot sequence
-has finished, the terminal window will contain an information page
-starting with the following welcome message:
+6) When the boot sequence has finished, the terminal window will contain an information page starting with the following welcome message:
 
 #+BEGIN_SRC default
 Welcome to the <%= trail_dev_host_name %> development environment
 #+END_SRC
 
-This is the URL you must use to access your test site.
-
 Below this welcome messages are the IP addresses used by the virtual
 machine and the user name/password combinations you can use to log in
-to the system.
+to the system. 
 
-In order to be able to use the <%= trail_dev_host_name %> URLs, you need to add the host name <%= trail_dev_host_name %> to your computer's =hosts= file. To do this:
+In order to be able to use the *<%= trail_dev_host_name %>* 
+URLs, you need to add the host name *<%= trail_dev_host_name %>* to 
+your computer's =hosts= file. To do this:
 
 1. Open your hosts file in a text editor. On a Windows PC, you will find the
-   hosts file at =C:\Windows\System32\drivers\etc\hosts=. On a Mac or Linux 
+   hosts file at =C:\Windows\System32\drivers\etc\hosts=. On a Mac or Linux
    machine you will find it at =/etc/hosts=.
 2. Add the following line to the file:
    #+BEGIN_SRC default
@@ -108,9 +115,39 @@ In order to be able to use the <%= trail_dev_host_name %> URLs, you need to add
    #+END_SRC
    where <ip-address> is the =eth1= IP address listed on the virtual machine's welcome page.
 3. Save your changes.
-  
-Your test system is now up and running. You should be able to access
-your test site by opening a browser and navigating to [[http://<%= trail_dev_host_name %>]].
+
+Your test system is now up and running. You should be able to verify your system by opening a browser and navigating to [[http://<%= trail_dev_host_name %>:8080/escenic-admin/status.jsp?tests=all]].
+
+*** Verify available services
+
+- With the image runing you should now be able to access the following features:
+|---------------------+---------------------------------------------------------------|
+| Feature             | URL                                                           |
+|---------------------+---------------------------------------------------------------|
+| Escenic Admin       | http://<%= trail_customer_acronym %>-dev:8080/escenic-admin   |
+|---------------------+---------------------------------------------------------------|
+| Web Studio          | http://<%= trail_customer_acronym %>-dev:8080/escenic-admin   |
+|---------------------+---------------------------------------------------------------|
+| Content Studio      | http://<%= trail_customer_acronym %>-dev:8080/escenic-admin   |
+|---------------------+---------------------------------------------------------------|
+| Solr                | http://<%= trail_customer_acronym %>-dev:8180/solr            |
+|---------------------+---------------------------------------------------------------|
+- Where is/are my publication(s)?
+|--------------------+------------------------------------+-----------------------------------------|
+| Publication        | username / password                |                                         |
+|--------------------+------------------------------------+-----------------------------------------|
+| <publication-name> | <publication-name>\_admin / admin  | [[http://local.<publication-name>.com]] |
+|--------------------+------------------------------------+-----------------------------------------|
+
+
+*** What's included
+
+- Ubuntu (actually, an Ubuntu Enterprise Cloud Image, modified to boot under almost any hypervisor.)
+- two virtual network cards, one for outbound NAT traffic and the other for inbound traffic.
+- varnish cache (just like in production)
+- memcached (just like in production)
+- separate solr java (just like in production)
+- remote debugging enabled (on port 5005)
 
 *** Configure Maven
 
@@ -183,15 +220,17 @@ To set up your project:
 8. In the displayed *Deployment* dialog, click on the + icon.
 9. Enter a name for your deployment set-up in the *Name* field,  *SFTP* in the *Type* field and 
    click on *OK*.
-10. On the *Connections* tab of the displayed form, enter *[[<%= trail_dev_host_name %>]]* in 
+10. On the *Connections* tab of the displayed form, enter *<%= trail_dev_host_name %>* in 
     the *SFTP Host* field, *escenic* in the *User name* field and the corresponding password 
     in the *Password* field.
 11. Click on *Test SFTP Connection...* to check you have entered the correct login credentials.
 12. On the form's *Mappings* tab, enter the following two mappings:
-    | Local path                                                                                 | Deployment path                                                         |
-    |--------------------------------------------------------------------------------------------+-------------------------------------------------------------------------|
-    | /<path-from-root>/publications/shared-war/src/main/webapp/template/                        | /opt/tomcat-engine1/webapps/<%= trail_publication_name %>/template/ |
-    | /<path-from-root>/publications/<%= trail_publication_name %>/src/main/webapp/template/ | /opt/tomcat-engine1/webapps/<%= trail_publication_name %>/template/ |
+
+    | Local path                                                                  | Deployment path                                                             |
+    |-----------------------------------------------------------------------------+-----------------------------------------------------------------------------|
+    | /<path-from-root>/publications/shared-war/src/main/webapp/template/         | /opt/tomcat-engine1/webapps-<publication-name>/<publication-name>/template/ |
+    | /<path-from-root>/publications/<publication-name>/src/main/webapp/template/ | /opt/tomcat-engine1/webapps-<publication-name>/<publication-name>/template/ |
+
 13. Click *OK*.
 14. Select *Tools* > *Deployment* > *Automatic upload*.
 
@@ -201,10 +240,10 @@ Any changes you make to your project should now be automatically deployed to the
 on your test server. To test that this is actually the case:
 
 1. Display your test server's file system by selecting *Tools* > *Deployment* > *Browse Remote Host*.
-2. Navigate down the displayed tree to show the contents of the =/opt/tomcat-engine1/webapps/<%= trail_publication_name %>/template/widgets= folder.
-   (=/opt/tomcat-engine1/webapps/<%= trail_publication_name %>/template/= and all its children should be highlighted in green. If this is not the case,
+2. Navigate down the displayed tree to show the contents of the =/opt/tomcat-engine1/webapps-<publication-name>/<publication-name>/template/widgets= folder.
+   (=/opt/tomcat-engine1/webapps-<publication-name>/<publication-name>/template/= and all its children should be highlighted in green. If this is not the case,
    go back and and check that you entered the deployment path correctly in the *Deployment* dialog.)
-3. In your local code tree, navigate to publications/<%= trail_publication_name %>/src/main/webapp/template/widgets/dummy.
+3. In your local code tree, navigate to publications/<publication-name>/src/main/webapp/template/widgets/dummy.
 4. Create a file (any name) in this folder. The dummy folder and the file you have created should immediately be duplicated in the deployment tree.  If this is not the case,
    go back and and check that you entered the correct local paths in the *Deployment* dialog.
 5. Delete the test file you created. It should also disappear from the deployment tree.
@@ -226,7 +265,7 @@ on your test server. To test that this is actually the case:
 
 *** TODO Development
 
-The [[<%= trail_publication_name %>]] publication is made using the *Escenic Widget Framework*. This means that
+The <%= trail_dev_project_name %> publication(s) is/are made using the *Escenic Widget Framework*. This means that
 all publication layout and functionality is assembled from *widgets*. A widget is a package of JSP, CSS and graphics files 
 that together provide a web site component. A component may be primarily graphical (such as the =storyContent= widget that 
 governs the layout of a story in a publication), primarily functional (such as the =webAnalytics= widget) or a combination
@@ -244,117 +283,32 @@ in two ways:
  - By customizing existing widgets
 
 This manual does not cover the details of Widget Framework development, since this is covered elsewhere 
-([[<%= trail_virtual_host_documentation %>/widget-framework-2.0.html]]).
+([[http://documentation.vizrt.com/widget-framework-2.0.html]]).
 
 The development environment you have set up is designed to support and simplify the process of extending
-the standard widgets supplied with the Widget Framework. The =publications/<%= trail_publication_name %>/src/main/webapp/template/= 
+the standard widgets supplied with the Widget Framework. The =publications/<publication-name>/src/main/webapp/template/= 
 tree is a *customization layer* that you can use to store any modifications you want to make to the standard widgets
 in the =publications/shared-war/src/main/webapp/template/= tree. During the application build process,
 the files in your customization layer are merged with the standard widgets to create a customized widget
 set for deployment.
 
-The deployment mappings you have set up mimic this process: any changes you make in
-=publications/[[<%= trail_publication_name %>]]/src/main/webapp/template/= are instantly copied to your
-test server. This means you can instantly test all changes you make by displaying an appropriate page of 
-your test [[<%= trail_publication_name %>]] publication.
+The deployment mappings you have set up mimic this process: any changes you make in 
+=publications/<publication-name>/src/main/webapp/template/= are instantly copied to your development image. T
+his means you can instantly test all changes you've made by using browser to request the appropriate page from the
+publication on your development image.
 
 **** TODO Customizing a widget
 
-**** TODO Creating a new widget???
+**** TODO Creating a new widget
 
 *** TODO Building and deployment
 
 (about using guru to do it for you)
 
-
 ** TODO Jira
 
-
 ** TODO Source code repository
 
-
 ** TODO The builder
 
 
-** Development image
-
-The main environment for change is the local development environment 
-a.k.a. "dev image". The dev image is downloaded as a .ova file that 
-can be imported into VirtualBox or VMWare Player. It works under 
-Windows, OSX and Linux, and provides an Ubuntu image with Escenic 
-Content Engine already installed with a publication and an .ear 
-file from the project.
-
-*** Download .ova file
-
-Your dev image can be downloaded here - [[<%= trail_dev_image_uri %>][Local development environment]].
-
-*** Import .ova file into VirtualBox
-
-1) After you have downloaded the .ova file you can open the file in i.e. VirtualBox.
-
-	[[./graphics/development-process/01-download-image.png]]
-
-2) VirtualBox will recognize the format and offer you a dialog for importing the image.
-
-	[[./graphics/development-process/02-import-image.png]]
-
-3) After klicking "Import" you will be asked to agree to a license agreement and after clicking "Agree" the import process will start.
-
-	[[./graphics/development-process/03-agree-to-license.png]]
-	
-	[[./graphics/development-process/04-wait-for-import.png]]
-
-4) When the import finished the VirtualBox Manager will open and your image will be visible in a list. It's now time to adjust your settings. Unless you have very specific changes you would like to perform for memory, number of CPUs etc... opening the settings dialog and then click "OK" is enough to finish the initial configuration.
-	
-	[[./graphics/development-process/05-adjust-settings.png]]
-
-	[[./graphics/development-process/06-apply-settings.png]]
-
-5) The next step will be to start the image. This is done by selecting the image in the list and then click "Start" in the VirtualBox Manager.
-
-	[[./graphics/development-process/07-power-on.png]]
-
-6) After the image has started up, you should be able to see its local IP address. This is the IP you need to add to the hosts file on your workstation/laptop.
-
-	[[./graphics/development-process/08-fetch-ip.png]]
-	[[./graphics/development-process/09-add-host-entry.png]]
-
-*** Verify available services
-
-1) With the image runing you should now be able to access the following features
-
-|---------------------+---------------------------------------------------------------|
-| Feature             | URL                                                           |
-|---------------------+---------------------------------------------------------------|
-| Escenic Admin       | http://<%= trail_customer_acronym %>-dev:8080/escenic-admin   |
-|---------------------+---------------------------------------------------------------|
-| Web Studio          | http://<%= trail_customer_acronym %>-dev:8080/escenic-admin   |
-|---------------------+---------------------------------------------------------------|
-| Content Studio      | http://<%= trail_customer_acronym %>-dev:8080/escenic-admin   |
-|---------------------+---------------------------------------------------------------|
-| Solr                | http://<%= trail_customer_acronym %>-dev:8180/solr            |
-|---------------------+---------------------------------------------------------------|
-
-
-
-*** What's included
-
-- Ubuntu (actually, an Ubuntu Enterprise Cloud Image, modified to boot under almost any hypervisor.)
-- two virtual network cards, one for outbound NAT traffic and the other for inbound traffic.
-- varnish cache (just like in production)
-- memcached (just like in production)
-- separate solr java (just like in production)
-- remote debugging enabled (on port 5005)
-
-/Which publications are available?/
-|-----------------+------------------------------------|
-| Publication     | username / password                |
-|-----------------+------------------------------------|
-| [pubName]       | [pubName]_admin / admin            |
-|-----------------+------------------------------------|
-
-/What are the important credentials?/
-
-Operating system: The usernames ubuntu (with sudo privileges), escenic (runs escenic).
-

From 0f41df5b3d3cadc2598c0bf50e628786954759d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Wed, 28 Nov 2012 14:01:05 +0100
Subject: [PATCH 1714/2585] vosa-handbook - screenshots removed since text was
 proven better cross OS

---
 .../development-process/01-download-image.png   | Bin 22007 -> 0 bytes
 .../development-process/02-import-image.png     | Bin 64547 -> 0 bytes
 .../development-process/03-agree-to-license.png | Bin 28608 -> 0 bytes
 .../development-process/04-wait-for-import.png  | Bin 32511 -> 0 bytes
 .../development-process/05-adjust-settings.png  | Bin 40802 -> 0 bytes
 .../development-process/06-apply-settings.png   | Bin 56117 -> 0 bytes
 .../development-process/07-power-on.png         | Bin 38552 -> 0 bytes
 .../development-process/08-fetch-ip.png         | Bin 29739 -> 0 bytes
 .../development-process/09-add-host-entry.png   | Bin 3269 -> 0 bytes
 9 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 usr/share/doc/vizrt/vosa-handbook/graphics/development-process/01-download-image.png
 delete mode 100644 usr/share/doc/vizrt/vosa-handbook/graphics/development-process/02-import-image.png
 delete mode 100644 usr/share/doc/vizrt/vosa-handbook/graphics/development-process/03-agree-to-license.png
 delete mode 100644 usr/share/doc/vizrt/vosa-handbook/graphics/development-process/04-wait-for-import.png
 delete mode 100644 usr/share/doc/vizrt/vosa-handbook/graphics/development-process/05-adjust-settings.png
 delete mode 100644 usr/share/doc/vizrt/vosa-handbook/graphics/development-process/06-apply-settings.png
 delete mode 100644 usr/share/doc/vizrt/vosa-handbook/graphics/development-process/07-power-on.png
 delete mode 100644 usr/share/doc/vizrt/vosa-handbook/graphics/development-process/08-fetch-ip.png
 delete mode 100644 usr/share/doc/vizrt/vosa-handbook/graphics/development-process/09-add-host-entry.png

diff --git a/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/01-download-image.png b/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/01-download-image.png
deleted file mode 100644
index 06bf4cfcea0c94baceb7253b226cedb1635338a7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 22007
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
DHepq&

diff --git a/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/02-import-image.png b/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/02-import-image.png
deleted file mode 100644
index 21d579a0edf0ca98126269fde26b7ce00d49bf97..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 64547
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
R*&GY_QB%^qQ>X|F`9H$+bCdu8

diff --git a/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/03-agree-to-license.png b/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/03-agree-to-license.png
deleted file mode 100644
index bbc82aadad221ec76b265ca1e8310dda83ed2ac2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 28608
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%0AAz`<wtX
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

diff --git a/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/04-wait-for-import.png b/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/04-wait-for-import.png
deleted file mode 100644
index f931083083bc24ff87bbb7e86addfbb4d10df60c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 32511
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
BAr=4t

diff --git a/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/05-adjust-settings.png b/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/05-adjust-settings.png
deleted file mode 100644
index 3c0e93b0b554731879d4ba95cf225629e0b3228a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 40802
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
bx&E!0e1d;gTgKa)3ivy(i_j_3z8d}?@r!#7

diff --git a/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/06-apply-settings.png b/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/06-apply-settings.png
deleted file mode 100644
index eddfac143cedd9dd3e9b11db82025fe5310fb440..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/07-power-on.png b/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/07-power-on.png
deleted file mode 100644
index bc776c7730856dfa6e9a4e9d03d745bc1a62f869..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 38552
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
XFf_kkk-f}!0Q~fIOweU0=g9v9B9Vd6

diff --git a/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/08-fetch-ip.png b/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/08-fetch-ip.png
deleted file mode 100644
index e4eabc8d6e199c5ba99a208192a9c776014ba3d7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/09-add-host-entry.png b/usr/share/doc/vizrt/vosa-handbook/graphics/development-process/09-add-host-entry.png
deleted file mode 100644
index 8ae2c83ede579422349095bef3849aaf3720db68..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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


From fa9aec0e798ad333560db6fcd1aea5433ef76c2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Wed, 28 Nov 2012 15:23:33 +0100
Subject: [PATCH 1715/2585] vosa-handbook - fixed typo in available services

---
 usr/share/doc/vizrt/vosa-handbook/development-process.org | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/development-process.org b/usr/share/doc/vizrt/vosa-handbook/development-process.org
index 7f18f598..7bf63501 100644
--- a/usr/share/doc/vizrt/vosa-handbook/development-process.org
+++ b/usr/share/doc/vizrt/vosa-handbook/development-process.org
@@ -126,9 +126,9 @@ Your test system is now up and running. You should be able to verify your system
 |---------------------+---------------------------------------------------------------|
 | Escenic Admin       | http://<%= trail_customer_acronym %>-dev:8080/escenic-admin   |
 |---------------------+---------------------------------------------------------------|
-| Web Studio          | http://<%= trail_customer_acronym %>-dev:8080/escenic-admin   |
+| Web Studio          | http://<%= trail_customer_acronym %>-dev:8080/escenic         |
 |---------------------+---------------------------------------------------------------|
-| Content Studio      | http://<%= trail_customer_acronym %>-dev:8080/escenic-admin   |
+| Content Studio      | http://<%= trail_customer_acronym %>-dev:8080/studio          |
 |---------------------+---------------------------------------------------------------|
 | Solr                | http://<%= trail_customer_acronym %>-dev:8180/solr            |
 |---------------------+---------------------------------------------------------------|

From 80d65b5dcaae702e453438e3a22504b0e0f8e192 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 29 Nov 2012 15:59:22 +0100
Subject: [PATCH 1716/2585] Added sbin files from hugin to the distro

---
 usr/share/escenic/package-scripts/create-packages | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index e5cc6812..01bdd19a 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -212,7 +212,7 @@ function set_up_escenic-munin-plugins() {
 
 function set_up_hugin-node() {
   mkdir -p $target_dir/etc/{hugin.often,hugin.hourly,hugin.daily,hugin.weekly,cron.d}
-  mkdir -p $target_dir/usr/{bin,share/doc/hugin,share/hugin}
+  mkdir -p $target_dir/usr/{bin,sbin,share/doc/hugin,share/hugin}
   mkdir -p $target_dir/var/lib/hugin
   
   local dir=$(mktemp -d)
@@ -221,6 +221,7 @@ function set_up_hugin-node() {
     wget $wget_opts https://bitbucket.org/mogsie/hugin/get/default.tar.gz
     tar xzf default.tar.gz
     cp $dir/mogsie-hugin-*/bin/* $target_dir/usr/bin
+    cp $dir/mogsie-hugin-*/sbin/* $target_dir/usr/sbin
     cp $dir/mogsie-hugin-*/etc/* $target_dir/etc
     cp $dir/mogsie-hugin-*/cron/* $target_dir/etc/cron.d/
     cp $dir/mogsie-hugin-*/checks/* $target_dir/usr/share/hugin/

From e7d5a42014d5d896eec46bb07561d9efae27d165 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 29 Nov 2012 16:05:37 +0100
Subject: [PATCH 1717/2585] Added the "gzip --rsyncable" option to ece backup
 and the nightly backup job left behind by ece-install.

---
 usr/share/escenic/ece-scripts/ece-install.d/database.sh | 2 +-
 usr/share/escenic/ece-scripts/ece.d/backup.sh           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 2575bdf3..72a6a0c0 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -628,7 +628,7 @@ mysqldump \\
   --single-transaction \\
   -h $db_host \\
   $db_schema | \\
-  gzip -9 - \\
+  gzip --rsyncable -9 - \\
   > ${escenic_backups_dir}/\${fn}
 
 # (2) make sure the backup went OK 
diff --git a/usr/share/escenic/ece-scripts/ece.d/backup.sh b/usr/share/escenic/ece-scripts/ece.d/backup.sh
index c59e8cc5..1273c958 100644
--- a/usr/share/escenic/ece-scripts/ece.d/backup.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/backup.sh
@@ -185,7 +185,7 @@ function backup_db() {
       -p${db_password} \
       -h ${db_host} \
       -P ${db_port} ${db} | \
-      gzip -9 \
+      gzip --rsyncable -9 \
       > $db_backup_file
 
     print "Database dumped: $db_backup_file"

From f160ab2c1a62e5a366d8d86a30a8f9012a13c5fc Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 29 Nov 2012 10:02:58 +0100
Subject: [PATCH 1718/2585] - improved and renamed
 common-os::assert_pre_requisite to   assert_commands_available.

  The function now takes a list of commands to check for and prints
  errors for each of these before exiting in error -- if any errors
  were encountered.

  Example usage: assert_commands_available mysqldump jar java gzip

- updated all modules that used common-os::assert_pre_requisite to use
  the new common-os::assert_commands_available. This also simplified
  the implementations here and there as they themselves had
  implemented the looping of commands to check for.
---
 usr/sbin/ece-install                            |  9 +++------
 usr/share/escenic/ece-scripts/common-os.sh      | 17 ++++++++++++-----
 .../ece-scripts/ece-install.d/cache-server.sh   |  2 +-
 .../ece-scripts/ece-install.d/content-engine.sh |  5 +----
 .../ece-install.d/create-publication.sh         |  2 +-
 .../ece-scripts/ece-install.d/database.sh       | 10 +++++-----
 .../ece-scripts/ece-install.d/memory-cache.sh   |  2 +-
 .../ece-scripts/ece-install.d/monitoring.sh     |  6 +++++-
 .../ece-install.d/widget-framework.sh           |  2 +-
 9 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 09830b2a..11fe34e3 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -227,10 +227,7 @@ function install_common_os_packages()
   fi
   
   install_packages_if_missing $packages $git_package
-  
-  for el in lsb_release curl host wget git unzip; do
-    assert_pre_requisite $el
-  done
+  assert_commands_available lsb_release curl host wget git unzip
 
   # all hosts need the system-info package, hence we'll install the
   # escenic-content-engine package here if on a Debian based
@@ -498,7 +495,7 @@ function assert_correct_runtime_environment()
 ## checks the Technet and WF credentials.
 function check_software_credentials() {
   install_packages_if_missing curl
-  assert_pre_requisite curl
+  assert_commands_available curl
 
   if [ ${fai_offline_mode-0} -eq 1 ]; then
     return
@@ -606,7 +603,7 @@ function common_pre_install()
     fi
 
     check_software_credentials
-    assert_pre_requisite lsb_release
+    assert_commands_available lsb_release
     
     if [ $(lsb_release -i | grep Ubuntu | wc -l) -gt 0 ]; then
         on_ubuntu=1
diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index f797cce2..3aa3d1f9 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -104,11 +104,18 @@ function get_ip() {
 ## current context. If it is not, the program aborts and removes the
 ## PID.
 ##
-## $1: the binary/executable/program
-function assert_pre_requisite() {
-  if [ $(which $1 2>/dev/null | wc -l) -lt 1 ]; then
-    print_and_log "Please install $1 and then run $(basename $0) again."
-    remove_pid_and_exit_in_error
+## $@: a list of the binary/executable/program
+function assert_commands_available() {
+  local errors_found=0
+  for el in $@; do
+    if [ $(which ${el} 2>/dev/null | wc -l) -lt 1 ]; then
+      print_and_log "Please install $1 and then run $(basename $0) again."
+      errors_found=1
+    fi
+  done
+
+  if [ $errors_found -eq 1 ]; then
+    exit 1
   fi
 }
 
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
index e085a066..9a3a990a 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
@@ -62,7 +62,7 @@ function install_varnish_software() {
     install_packages_if_missing varnish
   fi
   
-  assert_pre_requisite varnishd
+  assert_commands_available varnishd
 }
 
 function install_cache_server() {
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 369dbf99..b59849f0 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -549,10 +549,7 @@ function install_ece_third_party_packages
   fi
   
   install_packages_if_missing $packages
-  
-  for el in ant java jar; do
-    assert_pre_requisite $el
-  done
+  assert_commands_available ant java jar
 }
 
 ece_instance_ear_file=""
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
index d3dc689c..425bd990 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
@@ -148,7 +148,7 @@ EOF
     if [ -d $escenic_root_dir/widget-framework-core-*/publications/demo-core ]; then
       run cd $escenic_root_dir/widget-framework-core-*/publications/demo-core
       install_packages_if_missing "maven2"
-      assert_pre_requisite mvn
+      assert_commands_available mvn
       run mvn $maven_opts package
       run cp target/demo-core-*.war ${publication_war}
     # WF 2.x
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 72a6a0c0..f3e2353e 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -101,7 +101,7 @@ function install_mysql_server_software() {
       run /etc/init.d/mysql restart
     fi
 
-    assert_pre_requisite mysqld
+    assert_commands_available mysqld
   else
     # when only running the SQL scripts, typically when using Amazon
     # RDS, we need the mysql-client.
@@ -112,7 +112,7 @@ function install_mysql_server_software() {
 function install_mysql_client_software() {
   set_up_percona_repository_if_possible
   install_packages_if_missing $mysql_client_packages
-  assert_pre_requisite mysql
+  assert_commands_available mysql
 }
 
 ## $1: optional parameter, binaries_only. If passed, $1=binaries_only,
@@ -130,14 +130,14 @@ function install_database_server() {
       run /etc/init.d/mysql restart
     fi
 
-    assert_pre_requisite mysqld
+    assert_commands_available mysqld
   else
     # when only running the SQL scripts, typically when using Amazon
     # RDS, we need the mysql-client.
     install_mysql_client_software
    fi
 
-  assert_pre_requisite mysql
+  assert_commands_available mysql
 
   if [ -z "$1" ]; then
     download_escenic_components
@@ -604,7 +604,7 @@ function leave_db_trails() {
 ## *sounds* grand *is* grand, right?)
 function install_db_backup_server() {
   install_mysql_client_software
-  assert_pre_requisite mysqldump
+  assert_commands_available mysqldump
   make_dir ${escenic_backups_dir}
   local file=/etc/cron.daily/${db_schema}-backup
   cat > $file <<EOF
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh b/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
index 5c73fe3c..dd337f8c 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
@@ -11,7 +11,7 @@ function install_memory_cache()
     run /etc/init.d/memcached restart
   fi
   
-  assert_pre_requisite memcached
+  assert_commands_available memcached
   
   run cd $download_dir
   run wget $wget_opts $memcached_java_lib_url
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index 8feaee63..d507d917 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -516,7 +516,7 @@ function install_system_info() {
   print_and_log "Setting up a self-reporting module on $HOSTNAME ..."
 
   install_packages_if_missing lighttpd escenic-common-scripts
-  assert_pre_requisite lighttpd
+  assert_commands_available lighttpd
 
   local port=${fai_reporting_port-5678}
   local dir=${fai_reporting_dir-/var/www/system-info}
@@ -533,6 +533,10 @@ function install_system_info() {
     run sed -i "s~^${property}.*=.*$~${property}=\"${port}\"~g" $file
   fi
 
+  # disable the hackish IPv6 listener on port 80
+  local ipv6_pl='include_shell "/usr/share/lighttpd/use-ipv6.pl"'
+  run sed -is "s~^${ipv6_pl}~#${ipv6_pl}~g" $file
+
   # set the document root
   property=server.document-root
   run sed -i "s~^${property}.*=.*\"/var/www\"$~${property}=\"$dir\"~g" $file
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh b/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
index 53a10d84..c8efe896 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
@@ -124,7 +124,7 @@ function install_wf_1_if_present() {
     fi
     
     install_packages_if_missing "maven2"
-    assert_pre_requisite mvn
+    assert_commands_available mvn
     export JAVA_HOME=$java_home
     
     print_and_log "Installing Widget Framework into your Maven repository ..."

From 641abf2a8f1df6ac2954d33f1c4aeb886b47187c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 30 Nov 2012 10:39:58 +0100
Subject: [PATCH 1719/2585] - Fixed regression bug: /etc/default/ece is no
 longer included in the   escenic-content-engine-scripts package.

  - It is no included in the escenic-content-engine-scripts under
    /usr/share/doc/escenic/escenic-content-engine-scripts/examples/etc/default/ece
    instead.

  - If /etc/default/ece isn't available on the system to be
    installed (such as pure, fresh system) ece-install will test to
    see if the examples file is there and if yes, use it. If the file
    is not there, ece-install will generate a simple one (without
    comments).

- long overdue cleanup: removed the use of get_boolean_conf_value in
  favour of doing a regular BASH evaluation with fall back values
  directly in the statement. This reduces code size and maintenance
  time of own utility methods. Yah!
---
 usr/sbin/ece-install                          | 82 +++++++++++--------
 .../ece-install.d/restore-from-backup.sh      | 16 ++--
 .../escenic/package-scripts/create-packages   | 11 ++-
 3 files changed, 62 insertions(+), 47 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 11fe34e3..dc147224 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -649,12 +649,42 @@ function ask_for_instance_name()
     make_dir $escenic_conf_dir/engine/instance/${instance_name}
 }
 
+## Will source /etc/default/ece if it exists, if not, it will provide
+## the one shipped with the escenic-content-engine-scripts package.
+function source_default_ece_or_add_it_if_not_exists() {
+  if [ ! -e /etc/default/ece ]; then
+    print_and_log "No /etc/default/ece present, adding a default one for you."
+    local file=/usr/share/doc/escenic/escenic-content-engine-scripts/examples/etc/default/ece
+    if [ -r $file ]; then
+      cp $file /etc/default/ece
+      run source /etc/default/ece
+    else
+      # just adding the bare necessities, the other values are added
+      # by ece-install itself if not present.
+      cat > /etc/default/ece <<EOF
+# added by $(basename $0) @ $(date)
+engine_instance_list=""
+search_instance_list=""
+analysis_instance_list=""
+
+ece_unix_group="escenic"
+ece_unix_user="escenic"
+
+ece_script=/usr/bin/ece
+remove_old_log=1
+EOF
+    fi
+  else
+    run source /etc/default/ece
+  fi
+}
+
 # Will update /etc/default/instance with the type instances which are
 # installed on the given host. This method should work for engine,
 # search and analysis instances.
 function update_type_instances_to_start_up()
 {
-  run source /etc/default/ece
+  source_default_ece_or_add_it_if_not_exists
 
   if [ $type = "engine" ]; then
     if [[ "$engine_instance_list" != *"${instance_name}"* ]]; then
@@ -742,24 +772,6 @@ function get_conf_value()
     fi
 }
 
-# returns 0 for false, 1 for true
-#
-# parameters: $1 : the conf key, see get_conf_value
-function get_boolean_conf_value()
-{
-    value=$(get_conf_value $1)
-    if [ -z "$value" ]; then
-        echo 0
-    elif [ "$value" = "" ]; then
-        echo 0
-    elif [ "$value" -eq 1 ]; then
-        echo 1
-    else
-        echo 0
-    fi
-}
-
-
 # useful for development and test environments.
 function install_all_in_one_environment()
 {
@@ -957,75 +969,75 @@ if [ ${fai_enabled-0} -eq 1 ]; then
 
     # some profiles, like DB slave might need the NFS client, hence we
     # install it pretty far up.
-    if [ $(get_boolean_conf_value fai_nfs_client_install) -eq 1 ]; then
+    if [ ${fai_nfs_client_install-0} -eq 1 ]; then
       install_profile_number=$PROFILE_NFS_CLIENT
       install_nfs_client
       no_fai_profile=0
     fi
 
-    if [ $(get_boolean_conf_value fai_all_install) -eq 1 ]; then
+    if [ ${fai_all_install-0} -eq 1 ]; then
         install_profile_number=$PROFILE_ALL_IN_ONE
         install_all_in_one_environment
         no_fai_profile=0
     fi
     
-    if [[ $(get_boolean_conf_value fai_db_install) -eq 1 ||
-          $(get_boolean_conf_value fai_analysis_db_install) -eq 1 ]]; then
+    if [[ ${fai_db_install-0} -eq 1 ||
+          ${fai_analysis_db_install-0} -eq 1 ]]; then
         install_profile_number=$PROFILE_DB_SERVER
         install_database_server
         no_fai_profile=0
     fi
     
-    if [ $(get_boolean_conf_value fai_editor_install) -eq 1 ]; then
+    if [ ${fai_editor_install-0} -eq 1 ]; then
         install_profile_number=$PROFILE_EDITORIAL_SERVER
         install_editorial_server
         no_fai_profile=0
     fi
     
-    if [ $(get_boolean_conf_value fai_search_install) -eq 1 ]; then
+    if [ ${fai_search_install-0} -eq 1 ]; then
         install_profile_number=$PROFILE_SEARCH_SERVER
         install_search_server
         no_fai_profile=0
     fi
     
-    if [ $(get_boolean_conf_value fai_wf_install) -eq 1 ]; then
+    if [ ${fai_wf_install-0} -eq 1 ]; then
         install_profile_number=$PROFILE_WIDGET_FRAMEWORK
         install_widget_framework
         no_fai_profile=0
     fi
     
-    if [ $(get_boolean_conf_value fai_presentation_install) -eq 1 ]; then
+    if [ ${fai_presentation_install-0} -eq 1 ]; then
         install_profile_number=$PROFILE_PRESENTATION_SERVER
         install_presentation_server
         no_fai_profile=0
     fi
     
-    if [ $(get_boolean_conf_value fai_cache_install) -eq 1 ]; then
+    if [ ${fai_cache_install-0} -eq 1 ]; then
         install_profile_number=$PROFILE_CACHE_SERVER
         install_cache_server
         install_web_server 0
         no_fai_profile=0
     fi
     
-    if [ $(get_boolean_conf_value fai_publication_create) -eq 1 ]; then
+    if [ ${fai_publication_create-0} -eq 1 ]; then
         install_profile_number=$PROFILE_CREATE_PUBLICATION
         create_publication
         no_fai_profile=0
     fi
     
-    if [ $(get_boolean_conf_value fai_monitoring_install) -eq 1 ]; then
+    if [ ${fai_monitoring_install-0} -eq 1 ]; then
         install_profile_number=$PROFILE_MONITORING_SERVER
         install_monitoring_server
         no_fai_profile=0
     fi
     
-    if [ $(get_boolean_conf_value fai_restore_from_backup) -eq 1 ]; then
+    if [ ${fai_restore_from_backup-0} -eq 1 ]; then
         install_profile_number=$PROFILE_RESTORE_FROM_BACKUP
         restore_from_backup
         no_fai_profile=0
     fi
     
-    if [ $(get_boolean_conf_value fai_rmi_install) -eq 1 ]; then
+    if [ ${fai_rmi_install-0} -eq 1 ]; then
         install_profile_number=$PROFILE_RMI_HUB
         install_rmi_hub
         no_fai_profile=0
@@ -1043,13 +1055,13 @@ if [ ${fai_enabled-0} -eq 1 ]; then
     # them. This because it configures the EAE ECE plugin, which the
     # ECE profiles also will copy out if EAE is listed in the
     # technet_download_list.
-    if [ $(get_boolean_conf_value fai_analysis_install) -eq 1 ]; then
+    if [ ${fai_analysis_install-0} -eq 1 ]; then
         install_profile_number=$PROFILE_ANALYSIS_SERVER
         install_analysis_server
         no_fai_profile=0
     fi
     
-    if [ $(get_boolean_conf_value fai_nfs_server_install) -eq 1 ]; then
+    if [ ${fai_nfs_server_install-0} -eq 1 ]; then
       install_profile_number=$PROFILE_NFS_SERVER
       install_nfs_server
       no_fai_profile=0
@@ -1058,7 +1070,7 @@ if [ ${fai_enabled-0} -eq 1 ]; then
     # checking for VIP profile last so that ece-install can (if so
     # configured in the ece-install.con) install all dependent
     # services first.
-    if [ $(get_boolean_conf_value fai_vip_install) -eq 1 ]; then
+    if [ ${fai_vip_install-0} -eq 1 ]; then
       install_profile_number=$PROFILE_VIP_PROVIDER
       install_vip_provider
       no_fai_profile=0
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/restore-from-backup.sh b/usr/share/escenic/ece-scripts/ece-install.d/restore-from-backup.sh
index 76cc6c20..215ca8a3 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/restore-from-backup.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/restore-from-backup.sh
@@ -42,8 +42,8 @@ function restore_from_backup()
 
   wipe_the_slate_clean
   
-  if [ $(get_boolean_conf_value fai_enabled) -eq 1 -a \
-    $(get_boolean_conf_value fai_restore_from_backup) -eq 1 ]; then
+  if [ ${fai_enabled-0} -eq 1 -a \
+    ${fai_restore_from_backup-0} -eq 1 ]; then
     print_and_log "Restoring from backup on $HOSTNAME ..."
     
     backup_file=${fai_restore_from_file}
@@ -53,27 +53,27 @@ function restore_from_backup()
       remove_pid_and_exit_in_error
     fi
 
-    if [ $(get_boolean_conf_value fai_restore_all) -eq 1 ]; then
+    if [ ${fai_restore_all-0} -eq 1 ]; then
       restore_all=1
     fi
     
-    if [ $(get_boolean_conf_value fai_restore_db) -eq 1 ]; then
+    if [ ${fai_restore_db-0} -eq 1 ]; then
       restore_db=1
     fi
     
-    if [ $(get_boolean_conf_value fai_restore_data_files) -eq 1 ]; then
+    if [ ${fai_restore_data_files-0} -eq 1 ]; then
       restore_data_files=1
     fi
     
-    if [ $(get_boolean_conf_value fai_restore_software_binaries) -eq 1 ]
+    if [ ${fai_restore_software_binaries-0} -eq 1 ]
     then
       restore_binaries=1
     fi
     
-    if [ $(get_boolean_conf_value fai_restore_configuration) -eq 1 ]; then
+    if [ ${fai_restore_configuration-0} -eq 1 ]; then
       restore_conf=1
     fi
-  elif [ $(get_boolean_conf_value fai_enabled) -eq 0 ]; then
+  elif [ ${fai_enabled-0} -eq 0 ]; then
     print "From which dataset do you wish to restore?"
     if [ ! -d $backup_dir ]; then
       print_and_log "Directory $backup_dir doesn't exist or isn't readable"
diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 01bdd19a..b2fa0a3c 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -100,10 +100,11 @@ function set_up_escenic-build-scripts() {
 }
 
 function set_up_escenic-content-engine-scripts() {
+  local doc_dir=$target_dir/usr/share/doc/escenic/escenic-content-engine-scripts
   mkdir -p $target_dir/etc/bash_completion.d
   mkdir -p $target_dir/etc/cron.daily/
   mkdir -p $target_dir/etc/init.d
-  mkdir -p $target_dir/usr/share/doc/escenic
+  mkdir -p $doc_dir
   mkdir -p $target_dir/usr/share/escenic/ece-scripts
   mkdir -p $target_dir/usr/{bin,sbin,share/doc}
   mkdir -p $target_dir/{etc,usr,/etc/default}
@@ -129,9 +130,11 @@ function set_up_escenic-content-engine-scripts() {
   cp -r ../../../../etc/init.d/ece $target_dir/etc/init.d/
 
   # doc
-  cp -r ../../doc/escenic/ece-guide.org \
-    $target_dir/usr/share/doc/escenic
-
+  cp ../../doc/escenic/ece-guide.org $doc_dir/
+  local examples_dir=$doc_dir/examples/etc/default
+  mkdir -p $examples_dir
+  cp ../../../../etc/default/ece $examples_dir
+  
   # cron
   cp -r ../../../../etc/cron.daily/remove-old-escenic-log-files \
     $target_dir/etc/cron.daily/

From a33d4f2d3dcffe10030d1d447c8cd0a272698ac8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 30 Nov 2012 10:40:53 +0100
Subject: [PATCH 1720/2585] - re-implemented the way rollback handles the
 publication resources - hardening

---
 usr/sbin/ece-deploy | 125 +++++++++++++++++++-------------------------
 1 file changed, 54 insertions(+), 71 deletions(-)

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
index 598282f4..c050786e 100755
--- a/usr/sbin/ece-deploy
+++ b/usr/sbin/ece-deploy
@@ -21,6 +21,7 @@ function bootstrap_thyself() {
   local common_libraries="
     common-bashing.sh
     common-io.sh
+    common-os.sh
   "
 
   for el in $common_libraries; do
@@ -168,7 +169,7 @@ function verify_user_input() {
 }
 
 function list_previous_deployments() {
-  if [ ${list_the_revious_deployments-0} -eq 0 ]; then
+  if [ ! -d $data_dir ]; then
     return
   fi
   
@@ -230,7 +231,7 @@ function prepare_rollback() {
 
     # get a hold of the current vosa-conf package, first all packages
     # to detect if we've got packages intended for other hosts.
-    dpkg -l "vosa-conf-*" | tail -1 2>/dev/null\
+    dpkg -l "vosa-conf-*" 2>/dev/null | tail -1\
       > $dir/vosa-conf-package.list
     dpkg -l vosa-conf-$HOSTNAME 2>/dev/null | tail -1 | awk '{print $3;}' \
       > $dir/vosa-conf-${HOSTNAME}.version
@@ -250,40 +251,54 @@ function looks_like_xml() {
 
 ## app server port
 function get_publication_list() {
-  curl -s  http://localhost:${1}/escenic-admin/pages/publication/list.jsp | \
+  curl --silent \
+    --connect-timeout 30 \
+    http://localhost:${1}/escenic-admin/pages/publication/list.jsp | \
     grep '/escenic-admin/pages/publication/view.jsp' | \
     sed 's/.*name=\(.*\)".*/\1/g'
 }
-  
+
+
+## $1 :: base dir of the new publication resource to apply to the
+## running instance. If this base dir is the $tomcat_base from the
+## ece-<instance>.conf, the function will figure out the path to the
+## publication resources inside the exploded publication specific
+## webapps directories by itself.
 function update_publication_resources() {
-  if [ ${update_the_publication_resources-0} -eq 0 ]; then
+  if [ ! -d $1 ]; then
     return
   fi
-
-  print_and_log "Updating publication resources ..."
+  
   for el in $engine_instance_list; do
     source /etc/escenic/ece-${el}.conf
     local publication_list=$(get_publication_list ${appserver_port})
 
     for publication in $publication_list; do
-      local publication_resources_dir=$tomcat_base/webapps-${publication}/${publication}/META-INF/escenic/publication-resources 
-      if [ ! -e $publication_resources_dir ]; then
+      print_and_log "Updating resources for publication" $publication "..."
+      
+      if [[ "$1" == "$tomcat_base" ]]; then
+        local publication_resources_dir=$tomcat_base/webapps-${publication}/${publication}/META-INF/escenic/publication-resources
+      else
+        local publication_resources_dir=${1}/${publication}
+      fi
+      
+      if [ ! -d $publication_resources_dir ]; then
         continue
       fi
       
       (
         cd $publication_resources_dir
         for ele in $(find -type f | sed 's#^./##g'); do
-          dir=$data_dir/$deployment_id/new/$publication/$(dirname $ele)
-          make_dir $dir
+          new_dir=$data_dir/$deployment_id/new/$publication/$(dirname $ele)
+          make_dir $new_dir
           
           old_file=$data_dir/$deployment_id/old/$publication/${ele}
           
           if [ $(looks_like_xml $ele) -eq 1 ]; then
-            file=$dir/$(basename $ele)
+            file=$new_dir/$(basename $ele)
             xmllint --format $ele > $file
           else
-            file=$dir/$(basename $ele)
+            file=$new_dir/$(basename $ele)
             cp $ele $dir/$(basename $ele)
           fi
 
@@ -291,11 +306,12 @@ function update_publication_resources() {
             old_file=$(mktemp)
           fi
 
-          local number_of_lines_changed=$(diff \
-            <(cat $old_file | grep -v '^$') \
-            <(cat $file | grep -v '^$') | \
-            egrep '<|>' | \
-            wc -l
+          local number_of_lines_changed=$(
+            diff \
+              <(cat $old_file | grep -v '^$') \
+              <(cat $file | grep -v '^$') | \
+              egrep '<|>' | \
+              wc -l
           )
           if [ ${number_of_lines_changed} -lt 1 ]; then
             continue
@@ -304,8 +320,8 @@ function update_publication_resources() {
           print_and_log "Applying" \
             $number_of_lines_changed \
             "changes to" $ele \
-            "full diff can be found here: $dir/$(basename $ele).diff"
-          diff $old_file $file > $dir/$(basename $ele).diff
+            "full diff can be found here: $new_dir/$(basename $ele).diff"
+          diff $old_file $file > $new_dir/$(basename $ele).diff
 
           run curl --silent \
             -T $ele \
@@ -322,10 +338,6 @@ function generate_deployment_id() {
 }
 
 function roll_back_everything_to_version() {
-  if [ ${roll_back-0} -eq 0 ]; then
-    return
-  fi
-  
   print_and_log "Rolling back to" \
     ${roll_back_to_version} \
     "from" $(date --date @${roll_back_to_version}) \
@@ -358,28 +370,6 @@ function roll_back_everything_to_version() {
       "you must get a hold of the latest/approriate one yourself."
   fi
 
-  print_and_log "Rolling back publication resources ..."
-  for el in $engine_instance_list; do
-    source /etc/escenic/ece-${el}.conf
-    for publication in $(get_publication_list ${appserver_port}); do
-      dir=$data_dir/${roll_back_to_version}/old/${publication}
-      if [ ! -d $dir ]; then
-        continue
-      fi
-      
-      (
-        run cd $dir
-        for ele in $(find -type f | sed 's#^./##g'); do
-          print_and_log "Rolling back publication resource ${ele} ..."
-          run curl \
-            --silent \
-            -T $ele \
-            http://localhost:${appserver_port}/escenic-admin/publication-resources/${publication}/$ele
-        done
-      )
-    done
-  done
-
   for el in $engine_instance_list; do
     file=$data_dir/${roll_back_to_version}/old/${el}.state
     if [ ! -e $file ]; then
@@ -397,41 +387,34 @@ function roll_back_everything_to_version() {
   print_and_log "You have now rolled back to deployment ${roll_back_to_version}"
 }
 
-function check_pre_requisites() {
-  local required_command_list="
-    xmllint
-  "
-
-  local some_missing=0
-  
-  for el in $required_command_list; do
-    which $el > /dev/null 2>/dev/null
-    if [ $? -gt 0 ]; then
-      print_and_log "$(basename $0) needs the command $el to be installed"
-      some_missing=1
-    fi
-  done
-
-  if [ $some_missing -eq 1 ]; then
-    exit 1
-  fi
-}
-
 unset http_proxy
-check_pre_requisites
+assert_commands_available xmllint
 read_user_input "$@"
 verify_user_input
-generate_deployment_id
 
 if [ ${list_the_revious_deployments-0} -eq 0 ]; then
+  generate_deployment_id
   prepare_rollback
 fi
 
 if [ ${make_deployment-1} -eq 1 ]; then
   deploy_ear
   deploy_conf
+
+  if [ ${update_the_publication_resources-0} -eq 1 ]; then
+    update_publication_resources $tomcat_base
+  fi
+fi
+
+if [ ${list_the_revious_deployments-0} -eq 1 ]; then
+  list_previous_deployments
 fi
 
-update_publication_resources
-list_previous_deployments
-roll_back_everything_to_version
+if [ ${roll_back-0} -eq 1 ]; then
+  roll_back_everything_to_version
+  
+  if [ ${update_the_publication_resources-0} -eq 1 ]; then
+    update_publication_resources $data_dir/${roll_back_to_version}/new
+  fi
+fi
+  

From 6569d2d0969d20a08457398a2036f01b50888f3b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 30 Nov 2012 11:28:52 +0100
Subject: [PATCH 1721/2585] - log needs to be set since system-info modules
 might use the run (and   other) common-bashing wrappers which requires this
 variable to be   set.

---
 usr/bin/system-info | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/bin/system-info b/usr/bin/system-info
index 07273c9e..33b6fd38 100755
--- a/usr/bin/system-info
+++ b/usr/bin/system-info
@@ -22,6 +22,7 @@ current_indent_level=0
 INDENT="  "
 verbose=0
 temporaries=1
+log=$HOME/.$(basename $0).log
 
 function init() {
   # first, try to be nice

From 7fda245158dd1ad7bbb8188be97e2cd918220d4c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 30 Nov 2012 11:48:09 +0100
Subject: [PATCH 1722/2585] - copying of conf files must be -rf to that it'll
 overwrite read only   files, if present.

---
 usr/share/escenic/build-scripts/ece-build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index a1bdb5b2..ba826b6b 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -507,10 +507,10 @@ function create_machine_conf_packages() {
     echo "$(get_etc_hosts_for_machine ${machine} $conf_dir)" > $target_dir/etc/hosts
 
     # common files
-    run cp -r $conf_dir/common/* $target_dir/
+    run cp -rf $conf_dir/common/* $target_dir/
 
     # machine specific files
-    run cp -r $conf_dir/${machine}/* $target_dir/
+    run cp -rf $conf_dir/${machine}/* $target_dir/
 
     # delete those pesky .svn folders
     find $target_dir -name .svn -type d | xargs rm -rf

From 5bbddd04f2e9bf9f3a230ba85d8d17f88cc1f555 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 30 Nov 2012 13:37:25 +0100
Subject: [PATCH 1723/2585] - common-io::download_uri_target_to_dir no longer
 returns the   downloaded artifact as a return value from the function. This
 is   because it uses the run wrapper inside, which in turn will report   any
 problems when e.g. downloading the requested resource.

  The downside of this, is that the calling functions must take care
  of constructing the location of the downloaded artifact themselves,
  it'll always be $dir/$uri, as in:

     download_uri_target_to_dir $uri $dir

  so it shouldn't be too hard :-)

- changed ece-import::http-and-ftp, ece-install::app-server,
  ece-install::content-engine, ece-install::create-publication,
  ece-install::search-server and ece::deploy to use the new
  common-io:: download_uri_target_to_dir without this return
  value.

  This gain of this, is that any problems with the download will be
  reflected in the calling script and not being swallowed in the
  subshell that the calling functions would spawn when calling
  common-io::download_uri_target_to_dir
---
 usr/share/escenic/ece-scripts/common-io.sh    |  2 --
 .../ece-scripts/ece-import.d/http-and-ftp.sh  |  6 +++---
 .../ece-scripts/ece-install.d/app-server.sh   |  9 ++++-----
 .../ece-install.d/content-engine.sh           | 19 +++++++++----------
 .../ece-install.d/create-publication.sh       |  2 +-
 .../ece-install.d/search-server.sh            | 10 +++++-----
 usr/share/escenic/ece-scripts/ece.d/deploy.sh |  3 ++-
 7 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/common-io.sh b/usr/share/escenic/ece-scripts/common-io.sh
index d387dd0f..41cb03db 100644
--- a/usr/share/escenic/ece-scripts/common-io.sh
+++ b/usr/share/escenic/ece-scripts/common-io.sh
@@ -111,8 +111,6 @@ function download_uri_target_to_dir() {
   else
     file=$uri
   fi
-
-  echo $file
 }
 
 ## Will verify that the archive passed to the function is ok. If it's
diff --git a/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh b/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh
index 0734bba2..e7e2bbb1 100644
--- a/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh
+++ b/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh
@@ -49,11 +49,11 @@ function download_files_if_desired() {
       continue
     fi
     print_and_log "Downloading" $uri/$el "..."
-    local result=$(
-      download_uri_target_to_dir \
+    download_uri_target_to_dir \
       $uri/$el \
       $raw_spool_base_dir/$publication_name/$job_name/
-    )
+    local result=$raw_spool_base_dir/$publication_name/$job_name/$(basename $el)
+
     log "Downloaded" $(basename $el) "to" $result
     echo $uri/$el >> $(get_state_file)
   done
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 930ae9b1..4289ca2b 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -567,11 +567,10 @@ function log4j_download_the_tomcat_juli_libraries_and_copy_these_to_cl() {
   local libraries="tomcat-juli-adapters.jar tomcat-juli.jar"
   local tomcat_base_uri=$(dirname $(get_tomcat_download_url))
   for el in $libraries; do
-    local file=$(
-      download_uri_target_to_dir \
-        $tomcat_base_uri/extras/$el \
-        $download_dir
-    )
+    download_uri_target_to_dir \
+      $tomcat_base_uri/extras/$el \
+      $download_dir
+    local file=$download_dir/$(basename $el)
   done
 
   run cp $download_dir/tomcat-juli-adapters.jar $tomcat_home/lib/
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index b59849f0..e2009192 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -280,11 +280,10 @@ EOF
     
     wget_auth=$wget_builder_auth
     for el in ${fai_publication_war_uri_list}; do
-      local download_file=$(
-        download_uri_target_to_dir \
-          $el \
-          $escenic_root_dir/assemblytool/publications
-      )
+      download_uri_target_to_dir \
+        $el \
+        $escenic_root_dir/assemblytool/publications
+      local download_file=$escenic_root_dir/assemblytool/publications/$(basename $el)
       
       if [ ! -e $(basename $el) ]; then
         print_and_log "Failed to get user publication $el." \
@@ -325,11 +324,11 @@ function set_up_basic_nursery_configuration() {
     wget_auth=$wget_builder_auth
     
     local a_tmp_dir=$(mktemp -d)
-    local file=$(
-      download_uri_target_to_dir \
-        $ece_instance_conf_archive \
-        $a_tmp_dir
-    )
+    download_uri_target_to_dir \
+      $ece_instance_conf_archive \
+      $a_tmp_dir
+    local file=$a_tmp_dir/$(basename $ece_instance_conf_archive)
+
     run cd $a_tmp_dir
     extract_archive $file
     
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
index 425bd990..43de51fc 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
@@ -116,7 +116,7 @@ function create_publication_definition_and_war()
 {
   publication_name=mypub
 
-  if [ $fai_enabled -eq 0 ]; then
+  if [ ${fai_enabled-0} -eq 0 ]; then
     print "What name do you wish to give your publication?"
     print "Press ENTER to accept ${publication_name}"
     echo -n "Your choice [${publication_name}]> "
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
index ebd8e8f1..20bc85fa 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
@@ -24,11 +24,11 @@ function set_up_solr() {
       wget_auth=$wget_builder_auth
     
       local a_tmp_dir=$(mktemp -d)
-      local file=$(
-        download_uri_target_to_dir \
-          $ece_instance_conf_archive \
-          $a_tmp_dir
-      )
+      download_uri_target_to_dir \
+        $ece_instance_conf_archive \
+        $a_tmp_dir
+      local file=$a_tmp_dir/$(basename $ece_instance_conf_archive)
+
       run cd $a_tmp_dir
       run tar xzf $(basename $ece_instance_conf_archive) engine/solr/conf
       run cp -r engine/solr/conf $escenic_conf_dir/solr
diff --git a/usr/share/escenic/ece-scripts/ece.d/deploy.sh b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
index 577da80b..4041b48c 100644
--- a/usr/share/escenic/ece-scripts/ece.d/deploy.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
@@ -49,7 +49,8 @@ function deploy() {
 
     # wget_auth is needed for download_uri_target_to_dir
     wget_auth=$wget_builder_auth
-    ear=$(download_uri_target_to_dir $file $cache_dir)
+    download_uri_target_to_dir $file $cache_dir
+    ear=$cache_dir/$(basename $file)
     
     if [ ! -e "$ear" ]; then
       print_and_log "The EAR $ear_uri specified in $file could" \

From 4be1c58756b6a054511ef5f9f55e95d986b7552a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 30 Nov 2012 13:45:24 +0100
Subject: [PATCH 1724/2585] - changed the default ECE instance name from web1
 to engine1 as this   is what we're using for our SaaS

- updated all examples and documentation to refer to the new name
---
 usr/bin/system-info                         |   2 +-
 usr/sbin/ece-install                        |   2 +-
 usr/share/doc/escenic/ece-guide.org         | 106 ++++++++++----------
 usr/share/doc/escenic/ece-install-guide.org |  10 +-
 usr/share/escenic/ece-scripts/ece.d/help.sh |   2 +-
 5 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/usr/bin/system-info b/usr/bin/system-info
index 33b6fd38..9e71b012 100755
--- a/usr/bin/system-info
+++ b/usr/bin/system-info
@@ -3,7 +3,7 @@
 ## Script which creates an overview of system information related to
 ## the specified ECE/EAE/Search instance, example invocation:
 ##
-## $ system-info -i web1 | xmllint --format - > /var/www/web1.html
+## $ system-info -i engine1 | xmllint --format - > /var/www/engine1.html
 ##
 ## TODO:
 ## Add this to /etc/cronttab
diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index dc147224..825dc7ce 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -714,7 +714,7 @@ function install_presentation_server()
 {
     print_and_log "Installing a presentation server on $HOSTNAME."
     type=engine
-    install_ece_instance "web1" $PROFILE_PRESENTATION_SERVER
+    install_ece_instance "engine1" $PROFILE_PRESENTATION_SERVER
 }
 
 # If the system is installed using the recommended paths, the method
diff --git a/usr/share/doc/escenic/ece-guide.org b/usr/share/doc/escenic/ece-guide.org
index 918d94ae..76530609 100644
--- a/usr/share/doc/escenic/ece-guide.org
+++ b/usr/share/doc/escenic/ece-guide.org
@@ -51,7 +51,7 @@ DESCRIPTION
       analysis - The Escenic Analysis Engine also knows as 'Stats'
 
  -i --instance <instance>
-      The type instance, such as editor1, web1 or search1
+      The type instance, such as editor1, engine1 or search1
 
  -p --publication <publication>
       Needed only for updating publication resources
@@ -212,40 +212,40 @@ $ ece -i myinstance flush
 The "ece info" command will give you a lot of useful information about
 the current instance:
 #+BEGIN_SRC text
-$ ece -i web1 info
-[ece#engine-web1] Current instance: web1
-[ece#engine-web1] Instances available on myhost: web1
-[ece#engine-web1] Conf files parsed: /etc/escenic/ece-web1.conf /etc/escenic/ece.conf
-[ece#engine-web1] ECE location: /opt/escenic/engine
-[ece#engine-web1] Assembly Tool location: /opt/escenic/assemblytool
-[ece#engine-web1] Java location: /usr/lib/jvm/java-6-sun
-[ece#engine-web1] Log files:
-[ece#engine-web1] |-> System out log: /var/log/escenic/engine-web1.out
-[ece#engine-web1] |-> App server log: /opt/tomcat-web1/logs/localhost.2012-04-02.log
-[ece#engine-web1] |-> Log4j log: /var/log/escenic/ece-web1-messages
-[ece#engine-web1] |-> GC log: /var/log/escenic/engine-web1-gc.log
-[ece#engine-web1] Application server:
-[ece#engine-web1] |-> Status: DOWN
-[ece#engine-web1] |-> Port: 8080
-[ece#engine-web1] |-> Type: tomcat
-[ece#engine-web1] |-> Tomcat home: /opt/tomcat
-[ece#engine-web1] |-> Tomcat base: /opt/tomcat-web1
-[ece#engine-web1] Application server resources:
-[ece#engine-web1] |-> escenic/solr-base-uri: http://mysearch:8080/solr/
-[ece#engine-web1] Database:
-[ece#engine-web1] |-> name: jdbc/ECE_READ_DS
-[ece#engine-web1] |-> url: mysql://mydb:3306/ece5db?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;characterSetResults=UTF-8
-[ece#engine-web1] |-> username: ece5user
-[ece#engine-web1] |-> name: jdbc/ECE_UPDATE_DS
-[ece#engine-web1] |-> url: mysql://mydb:3306/ece5db?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;characterSetResults=UTF-8
-[ece#engine-web1] |-> username: ece5user
-[ece#engine-web1] Deployed web applications:
-[ece#engine-web1] |-> http://myhost:8080/escenic-admin
-[ece#engine-web1] Deployment state:
-[ece#engine-web1] |-> Version: mysite.com-1.2.3
-[ece#engine-web1] |-> EAR used: http://my.build.server.com/engine-mysite.com-1.2.3.ear
-[ece#engine-web1] |-> MD5 sum: 5881d1895c09c7b35a032806c6249433
-[ece#engine-web1] |-> Deployment date: Wed Mar 28 18:29:58 CST 2012  
+$ ece -i engine1 info
+[ece#engine-engine1] Current instance: engine1
+[ece#engine-engine1] Instances available on myhost: engine1
+[ece#engine-engine1] Conf files parsed: /etc/escenic/ece-engine1.conf /etc/escenic/ece.conf
+[ece#engine-engine1] ECE location: /opt/escenic/engine
+[ece#engine-engine1] Assembly Tool location: /opt/escenic/assemblytool
+[ece#engine-engine1] Java location: /usr/lib/jvm/java-6-sun
+[ece#engine-engine1] Log files:
+[ece#engine-engine1] |-> System out log: /var/log/escenic/engine-engine1.out
+[ece#engine-engine1] |-> App server log: /opt/tomcat-engine1/logs/localhost.2012-04-02.log
+[ece#engine-engine1] |-> Log4j log: /var/log/escenic/ece-engine1-messages
+[ece#engine-engine1] |-> GC log: /var/log/escenic/engine-engine1-gc.log
+[ece#engine-engine1] Application server:
+[ece#engine-engine1] |-> Status: DOWN
+[ece#engine-engine1] |-> Port: 8080
+[ece#engine-engine1] |-> Type: tomcat
+[ece#engine-engine1] |-> Tomcat home: /opt/tomcat
+[ece#engine-engine1] |-> Tomcat base: /opt/tomcat-engine1
+[ece#engine-engine1] Application server resources:
+[ece#engine-engine1] |-> escenic/solr-base-uri: http://mysearch:8080/solr/
+[ece#engine-engine1] Database:
+[ece#engine-engine1] |-> name: jdbc/ECE_READ_DS
+[ece#engine-engine1] |-> url: mysql://mydb:3306/ece5db?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;characterSetResults=UTF-8
+[ece#engine-engine1] |-> username: ece5user
+[ece#engine-engine1] |-> name: jdbc/ECE_UPDATE_DS
+[ece#engine-engine1] |-> url: mysql://mydb:3306/ece5db?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;characterSetResults=UTF-8
+[ece#engine-engine1] |-> username: ece5user
+[ece#engine-engine1] Deployed web applications:
+[ece#engine-engine1] |-> http://myhost:8080/escenic-admin
+[ece#engine-engine1] Deployment state:
+[ece#engine-engine1] |-> Version: mysite.com-1.2.3
+[ece#engine-engine1] |-> EAR used: http://my.build.server.com/engine-mysite.com-1.2.3.ear
+[ece#engine-engine1] |-> MD5 sum: 5881d1895c09c7b35a032806c6249433
+[ece#engine-engine1] |-> Deployment date: Wed Mar 28 18:29:58 CST 2012  
 #+END_SRC
 
 * Installation
@@ -380,24 +380,24 @@ the search instance which runs the Solr indexer, so that the Solr
 index isn't corrupted:
 #+BEGIN_SRC text
 $ ece -i search1 stop
-$ ece -i web1 backup
-[ece#engine-web1] Backing up the web1 instance of engine on raven ...
-[ece#engine-web1] Cleaning up generated files in /opt/escenic/assemblytool ...
-[ece#engine-web1] Cleaning up web1's work directory in /opt/tomcat-web1/work ...
-[ece#engine-web1] Cleaning up web1's temp directory in /opt/tomcat-web1/temp ...
-[ece#engine-web1] Database dumped: /var/backups/escenic/ece5db-2012-08-17.sql.gz
-[ece#engine-web1] Creating snapshot ... (this may take a while)
-[ece#engine-web1] Backup ready: /var/backups/escenic/engine-web1-backup-2012-08-17.tar size: 62M
-[ece#engine-web1] The backup arhcive includes:
-[ece#engine-web1] - Database snapshot
-[ece#engine-web1] - All Solr in /var/lib/escenic/solr
-[ece#engine-web1] - All Escenic data files in /var/lib/escenic/engine
-[ece#engine-web1] - All app servers in /opt
-[ece#engine-web1] - All Escenic software binaries in /opt/escenic/engine
-[ece#engine-web1] - All configuration in /etc/escenic and /etc/default/ece
-[ece#engine-web1] - All bootstrap scripts from /etc/init.d
-[ece#engine-web1] - All state files in /var/lib/escenic
-[ece#engine-web1] Enjoy!
+$ ece -i engine1 backup
+[ece#engine-engine1] Backing up the engine1 instance of engine on raven ...
+[ece#engine-engine1] Cleaning up generated files in /opt/escenic/assemblytool ...
+[ece#engine-engine1] Cleaning up engine1's work directory in /opt/tomcat-engine1/work ...
+[ece#engine-engine1] Cleaning up engine1's temp directory in /opt/tomcat-engine1/temp ...
+[ece#engine-engine1] Database dumped: /var/backups/escenic/ece5db-2012-08-17.sql.gz
+[ece#engine-engine1] Creating snapshot ... (this may take a while)
+[ece#engine-engine1] Backup ready: /var/backups/escenic/engine-engine1-backup-2012-08-17.tar size: 62M
+[ece#engine-engine1] The backup arhcive includes:
+[ece#engine-engine1] - Database snapshot
+[ece#engine-engine1] - All Solr in /var/lib/escenic/solr
+[ece#engine-engine1] - All Escenic data files in /var/lib/escenic/engine
+[ece#engine-engine1] - All app servers in /opt
+[ece#engine-engine1] - All Escenic software binaries in /opt/escenic/engine
+[ece#engine-engine1] - All configuration in /etc/escenic and /etc/default/ece
+[ece#engine-engine1] - All bootstrap scripts from /etc/init.d
+[ece#engine-engine1] - All state files in /var/lib/escenic
+[ece#engine-engine1] Enjoy!
 #+END_SRC
 
 
diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 3047d39b..b90adf96 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -936,7 +936,7 @@ $HOME/ece-install.conf file of the root user:
 | =fai_presentation_conf_archive=       | ""                                                           | conf.tar.gz to use for Nursery & JAAS configuration                                                      |
 | =fai_presentation_ear=                | ""                                                           | EAR to use instead of the Escenic binaries                                                               |
 | =fai_presentation_install=            | 0                                                            | Install the presentation server profile                                                                  |
-| =fai_presentation_name=               | web1                                                         | Name of the presentation server instance                                                                 |
+| =fai_presentation_name=               | engine1                                                  | Name of the presentation server instance                                                                 |
 | =fai_presentation_port=               | 8080                                                         | HTTP port of the presentation server instance                                                            |
 | =fai_presentation_deploy_white_list=  | "escenic-admin <assemblytool/publications/*>"                | The list of WARs to be deployed on this instance.                                                        |
 | =fai_presentation_shutdown=           | 8005                                                         | Shutdown port of the presentation instance                                                               |
@@ -988,19 +988,19 @@ fai_publication_name=jollygood
 #+END_SRC
 
 ****** Install Two Presentation Servers On a Single Host
-To install two presentation servers called =web1= and
-=web2= on the same host,  first run =ece-install= with the following settings:
+To install two presentation servers called =engine1= and
+=engine2= on the same host,  first run =ece-install= with the following settings:
 #+BEGIN_SRC conf
 fai_enabled=1
 fai_presentation_install=1
-fai_presentation_name=web1
+fai_presentation_name=engine1
 #+END_SRC 
 
 Then run it a second time with the following settings:
 #+BEGIN_SRC conf
 fai_enabled=1
 fai_presentation_install=1
-fai_presentation_name=web2
+fai_presentation_name=engine2
 fai_presentation_port=8081
 fai_presentation_shutdown=8105
 #+END_SRC
diff --git a/usr/share/escenic/ece-scripts/ece.d/help.sh b/usr/share/escenic/ece-scripts/ece.d/help.sh
index 974be9f3..0e8b0e5b 100644
--- a/usr/share/escenic/ece-scripts/ece.d/help.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/help.sh
@@ -13,7 +13,7 @@ DESCRIPTION"
        analysis - The Escenic Analysis Engine also knows as 'Stats'
 
  -i --instance <instance> 
-      The type instance, such as editor1, web1 or search1
+      The type instance, such as editor1, engine1 or search1
 
  -f --file <file> } --uri <uri>
       Specificies the file that the given comand shall act upon.

From 644c5ae91613812405a99825ecd5996caf3bfb18 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 30 Nov 2012 14:38:16 +0100
Subject: [PATCH 1725/2585] - common-io::download_uri_target_to_dir now
 includes the HTTP response   headers. This is very useful, for instance when
 the download fails   because of authorisation. This information will be
 present in the   logs.

---
 usr/share/escenic/ece-scripts/common-io.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/common-io.sh b/usr/share/escenic/ece-scripts/common-io.sh
index 41cb03db..0b3d850e 100644
--- a/usr/share/escenic/ece-scripts/common-io.sh
+++ b/usr/share/escenic/ece-scripts/common-io.sh
@@ -103,7 +103,12 @@ function download_uri_target_to_dir() {
   
   if [[ $uri == "http://"* || $uri == "https://"* ]]; then
     run cd $target_dir
-    run wget $wget_opts $wget_auth $uri -O $(basename $uri)
+    run wget \
+      $wget_opts \
+      $wget_auth \
+      --server-response \
+      --output-document $(basename $uri) \
+      $uri
     file=$target_dir/$(basename $uri)
   elif [[ $uri == "file://"* ]]; then
       # length of file:// is 7

From 44dbed5bd7d546b877b82fb83b4a4f69c6fccbab Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 30 Nov 2012 14:39:58 +0100
Subject: [PATCH 1726/2585] - ece-deploy was wiping away any http_proxy
 environment variable that   was set in the SHELL :-(

---
 usr/sbin/ece-deploy | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
index c050786e..bd47cbd7 100755
--- a/usr/sbin/ece-deploy
+++ b/usr/sbin/ece-deploy
@@ -352,7 +352,7 @@ function roll_back_everything_to_version() {
     log "Using data in" $old_data_dir "to perform the rollback"
   fi
 
-  local package_version_file=$data_dir/${roll_back_to_version}/old/vosa-conf-${HOSTNAME}.version
+  local package_version_file=$data_dir/${roll_back_to_version}/new/vosa-conf-${HOSTNAME}.version
   if [ -e $package_version_file ]; then
     local deb_file=$ece_deploy_download_dir/vosa-conf-$HOSTNAME-$(cat $package_version_file).deb
     if [ -e $deb_file ]; then
@@ -371,7 +371,7 @@ function roll_back_everything_to_version() {
   fi
 
   for el in $engine_instance_list; do
-    file=$data_dir/${roll_back_to_version}/old/${el}.state
+    file=$data_dir/${roll_back_to_version}/new/${el}.state
     if [ ! -e $file ]; then
       continue
     fi
@@ -387,7 +387,6 @@ function roll_back_everything_to_version() {
   print_and_log "You have now rolled back to deployment ${roll_back_to_version}"
 }
 
-unset http_proxy
 assert_commands_available xmllint
 read_user_input "$@"
 verify_user_input

From e59a8e629c92370efb620adefd001a77b32d482b Mon Sep 17 00:00:00 2001
From: Kevin Flynn <kevin@kevin-Precision-M4500.(none)>
Date: Fri, 30 Nov 2012 15:34:29 +0100
Subject: [PATCH 1727/2585] editing, plus added new stuff on jira and
 subversion

---
 .../vosa-handbook/development-process.org     | 162 ++++++++++++++----
 1 file changed, 124 insertions(+), 38 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/development-process.org b/usr/share/doc/vizrt/vosa-handbook/development-process.org
index 7bf63501..d6187d53 100644
--- a/usr/share/doc/vizrt/vosa-handbook/development-process.org
+++ b/usr/share/doc/vizrt/vosa-handbook/development-process.org
@@ -48,6 +48,10 @@ You need to install the following items on your PC or Mac:
    information. Note that version 11.x is required: earlier versions of IntelliJ IDEA do not
    contain all the functions required by the VOSA development process
    and will not work properly.
+ - Oracle VirtualBox. You can get this from [[https://www.virtualbox.org/wiki/Downloads]]
+   (or on Linux you can most likely install it using your package manager). You 
+   can use another virtual machine hypervisor such as VMWare if you prefer, but this
+   documentation assumes you are using VirtualBox.
 
 During the IntelliJ IDEA installation process you are allowed to
 choose which plug-ins to activate. You should activate at least the
@@ -69,30 +73,54 @@ Setting up your development environment involves:
  - Obtaining copies of the code and systems you are going to work on
  - Getting access to the project infrastructure (HipChat, Jira and so on) 
 
-*** Set up your local development environment
+*** Set up your local test system
 
-The main environment for change is the local development environment
-a.k.a. "dev image". The dev image is downloaded as a .ova file that
-can be imported into VirtualBox or VMWare Player. It works under
-Windows, OSX and Linux, and provides an Ubuntu image with Escenic
-Content Engine already installed with a publication and an .ear
-file from the project.
+You will have your own test copy of the site you are working on. It is a 
+complete working copy of the production server and runs in a virtual machine
+on your PC. It is supplied as an Ubuntu Enterprise Cloud Image, modified to boot 
+under almost any hypervisor (VirtualBox, for example).
 
-Start by downloading the image: [[<%= trail_dev_image_uri %>][Local Development Environment]]
+The supplied image consists of an Ubuntu server OS, with the following SW installed 
+and preconfigured:
 
-*** Import .ova file into VirtualBox
+- Java
+- Escenic Content Engine
+- Varnish cache (like the production server)
+- Memcached (like the production server)
+- Solr running in a separate Java VM (like the production server)
+- A publication and .ear file from your project
 
-1) After you have downloaded the .ova file you can open the file in i.e. VirtualBox.
+The system is configured with two virtual network cards (one for outbound NAT traffic
+and the other for inbound traffic), and has remote debugging enabled on port 5005.
 
-2) VirtualBox will recognize the format and offer you a dialog for importing the image.
+Click on this link to download the virtual machine image:
 
-3) After klicking "Import" you will be asked to agree to a license agreement and after clicking "Agree" the import process will start.
+[[<%= trail_dev_image_uri %>]]
 
-4) When the import finished the VirtualBox Manager will open and your image will be visible in a list. It's now time to adjust your settings. Unless you have very specific changes you would like to perform for memory, number of CPUs etc... opening the settings dialog and then click "OK" is enough to finish the initial configuration.
+When the file has finished downloading, you can open it with your chosen
+hypervisor. If you are using VirtualBox then the procedure for
+installing the image is as follows:
 
-5) The next step will be to start the image. This is done by selecting the image in the list and then click "Start" in the VirtualBox Manager.
+1. Start VirtualBox and open the downloaded <%= trail_dev_image_name %> file.
 
-6) When the boot sequence has finished, the terminal window will contain an information page starting with the following welcome message:
+2. VirtualBox recognizes the format and displays an import dialog. Click *Import*.
+
+3. A license agreement dialog is displayed. Click *Agree* to continue.
+
+4. When the image file has been imported, the VirtualBox Manager window is displayed, 
+   and the imported image is displayed in a list. Select the image and click on
+   *Settings*. 
+   
+5. The settings page displays various parameters that you can use to configure the 
+   virtual machine. Unless you know that you have specific changes that you want to make regarding
+   memory allocation, number of CPUs etc., the default settings should be good enough
+   so you can just click *OK* to accept them.
+
+6. Make sure your image is still selected and click *Start* to start the virtual machine.
+
+A terminal window is displayed showing the virtual machine boot-up messages. When the boot sequence 
+has finished, the terminal window will contain an information page starting with the
+following welcome message:
 
 #+BEGIN_SRC default
 Welcome to the <%= trail_dev_host_name %> development environment
@@ -113,16 +141,17 @@ your computer's =hosts= file. To do this:
    #+BEGIN_SRC default
    <ip-address> <%= trail_dev_host_name %>
    #+END_SRC
-   where <ip-address> is the =eth1= IP address listed on the virtual machine's welcome page.
+   where =<ip-address>= is the =eth1= IP address listed on the virtual machine's welcome page.
 3. Save your changes.
 
-Your test system is now up and running. You should be able to verify your system by opening a browser and navigating to [[http://<%= trail_dev_host_name %>:8080/escenic-admin/status.jsp?tests=all]].
+Your test system is now up and running. You should be able to verify your system by opening a browser 
+and navigating to [[http://<%= trail_dev_host_name %>:8080/escenic-admin/status.jsp?tests=all]].
 
-*** Verify available services
+*** Verify available services and publications
 
-- With the image runing you should now be able to access the following features:
+- With the image runing you should now be able to access the following services:
 |---------------------+---------------------------------------------------------------|
-| Feature             | URL                                                           |
+| Service             | URL                                                           |
 |---------------------+---------------------------------------------------------------|
 | Escenic Admin       | http://<%= trail_customer_acronym %>-dev:8080/escenic-admin   |
 |---------------------+---------------------------------------------------------------|
@@ -132,23 +161,16 @@ Your test system is now up and running. You should be able to verify your system
 |---------------------+---------------------------------------------------------------|
 | Solr                | http://<%= trail_customer_acronym %>-dev:8180/solr            |
 |---------------------+---------------------------------------------------------------|
-- Where is/are my publication(s)?
+
+You should also be able to access the following publications:
+
 |--------------------+------------------------------------+-----------------------------------------|
-| Publication        | username / password                |                                         |
+| Publication        | username / password                | URL                                     |
 |--------------------+------------------------------------+-----------------------------------------|
 | <publication-name> | <publication-name>\_admin / admin  | [[http://local.<publication-name>.com]] |
 |--------------------+------------------------------------+-----------------------------------------|
 
 
-*** What's included
-
-- Ubuntu (actually, an Ubuntu Enterprise Cloud Image, modified to boot under almost any hypervisor.)
-- two virtual network cards, one for outbound NAT traffic and the other for inbound traffic.
-- varnish cache (just like in production)
-- memcached (just like in production)
-- separate solr java (just like in production)
-- remote debugging enabled (on port 5005)
-
 *** Configure Maven
 
 You need to add a reference to the Vizrt software repository to your
@@ -251,17 +273,80 @@ on your test server. To test that this is actually the case:
 
 ** Procedures
 
-*** TODO Communicating with your colleagues
+You have now installed and configured all the local components of your development
+environment. However, your development environment consists of many other systems
+in your local network and on the Internet, and also includes the people you will be working
+with. This section provides:
 
-(about using HipChat)
+ - An overview of how all these systems and people fit together
+ - Some suggested procedures for making the best use of your environment
+
+*** Change management
+
+VOSA aims to provide a development environment that is organized but flexible
+and above all *transparent*. It should be easy for any interested party to find
+out what is going on at any time:
+
+ - What tasks have been carried out, what tasks are in progress, what
+   tasks are planned.
+ - Who is involved in carrying out the tasks.
+ - Why the tasks are being carried out (what requirements they are intended to satisfy).
+ - Where the task is in the development cycle.
 
-*** TODO Change management
+The environment is designed to support agile development methodologies such as
+[[http://en.wikipedia.org/wiki/Scrum_(development)][Scrum]] and is centered around a web-based bug-tracking and change
+management system called *Jira*. Every VOSA project
+has a corresponding Jira project at [[https://vizrtcustomers.jira.com]]. All the work
+to be carried out in the VOSA project must be registered as *issues* in this Jira project.
 
-(about using Jira)
+Jira supports a hierarchy of issues so that high level requirements (called *epics* in 
+Scrum terminology) can be broken down into smaller requirements (*stories*) and the individual
+development tasks that you will actually work with. Jira tracks the progress of these
+tasks (plus bug correction tasks, which are also registered as issues) through a lifecycle
+of development work, testing, error correction and release. It keeps track of who is working
+on the tasks and mantains a log of all code changes associated with them, plus comments, notes
+and discussions.
 
-*** TODO Version control
+Jira is a large and very powerful change management system that can be used in many different
+ways. You will need to find your way around at least some parts of it, and you are recommended 
+to make use of its help facilities and documentation to do so. As a VOSA developer, 
+however, the most important points you need to understand are:
+
+ - Jira is where your work comes from :: If you haven't got the number of a Jira issue describing
+   the work you are doing, then you should not be writing or modifying any code.
+ - Jira needs to know how you're getting on :: When you are satisfied enough with a change to
+   check it in to Subversion, then you must include the issue number in your check-in comment.
+   The check-in is then recorded in the issue. Add notes and comments to the issue as you go
+   along so it contains a complete record of decisisons and changes made along the way. When
+   you are finished with the task, record the fact in Jira by *resolving*??  the issue.
+
+You can access your Jira project(s) from:
+
+[[http://start.vizrtsaas.com/<%= trail_dev_project_name %>]]
+
+*** Version control
+
+All code (JSP, HTML, XML, Java, Javascript, CSS etc.), documentation and other resources (images, videos,
+sound, configuration files) in a VOSA project is stored in a Subversion repository. The code
+you work with on your machine is only a copy of the code stored in Subversion, and you cannot
+build or deploy your changes for others to see until you have checked them back in to Subversion.
+
+Subversion is a very widely-used version control system and there are plenty of resources
+available on the Internet for learning how to use it. The Subversion client you have
+installed only has a command line user interface. If you are not comfortable with using
+that, there are [[http://en.wikipedia.org/wiki/Comparison_of_Subversion_clients][many]] graphical front ends available for it. In
+addition, most of the simple everyday operations can be carried out
+
+using IntelliJ's built-in Subversion support.
+
+Note that VOSA's Subversion server is set up to prevent you checking in any changes 
+without a Jira issue number in your check-in comment.
+
+
+*** TODO Communicating with your colleagues
+
+(about using HipChat)
 
-(about using Subversion)
 
 *** TODO Development
 
@@ -294,7 +379,7 @@ set for deployment.
 
 The deployment mappings you have set up mimic this process: any changes you make in 
 =publications/<publication-name>/src/main/webapp/template/= are instantly copied to your development image. T
-his means you can instantly test all changes you've made by using browser to request the appropriate page from the
+his means you can instantly test all changes you've made by using the browser to request the appropriate page from the
 publication on your development image.
 
 **** TODO Customizing a widget
@@ -312,3 +397,4 @@ publication on your development image.
 ** TODO The builder
 
 
+   

From 7011c866f8477ed7100dd2e82a127f944d4f7f67 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 30 Nov 2012 15:33:09 +0100
Subject: [PATCH 1728/2585] - re-implemented ece-deploy with focus on what the
 --rollback function   rolls back to. Before, it rolled back to the state at
 which the   given deployment was at, before that deployment took place. Now,
 the   preparation for the rollback and the rollback function itself aims  
 for letting the user being able to rollback to the version   specif iced with
 --rollback <id>

- added support for passing the HTTP proxy on to the $ece_unix_user
  which makes the actual ECE & search & EAE deployments.

- tested regular deployment.

  TODO: - test update of publication resources after the re-implementation
  TODO: - rollback after the re-implementation
---
 usr/sbin/ece-deploy | 155 ++++++++++++++++++--------------------------
 1 file changed, 63 insertions(+), 92 deletions(-)

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
index bd47cbd7..1433f052 100755
--- a/usr/sbin/ece-deploy
+++ b/usr/sbin/ece-deploy
@@ -8,7 +8,7 @@
 ## directory before starting the instances again. The last thing the
 ## script does, is to deploy the conf package.
 
-data_dir=/var/lib/escenic/$(basename $0)
+ece_deploy_data_dir=/var/lib/escenic/$(basename $0)
 ece_deploy_download_dir=/var/cache/escenic
 
 function bootstrap_thyself() {
@@ -34,7 +34,7 @@ function bootstrap_thyself() {
 
   create_pid
   create_lock
-  
+
   # hooks for when the scirpt exits cleanly and when a user or someone
   # kills the process
   trap common_bashing_exit_hook EXIT
@@ -47,13 +47,18 @@ log=/var/log/escenic/$(basename $0).log
 run source /etc/default/ece
 
 function deploy_ear() {
+  local proxy_setings=""
+  if [ -n "$http_proxy" ]; then
+    proxy_settings="http_proxy=$http_proxy"
+  fi
+  
   for el in $engine_instance_list; do
-	  su - $ece_unix_user -c \
-	    "ece -i $el stop deploy clean start --uri $ear_uri"
+    su - $ece_unix_user -c \
+      "${proxy_settings} ece -i $el stop deploy clean start --uri $ear_uri"
   done
   for el in $search_instance_list; do
-	  su - $ece_unix_user -c \
-	    "ece -i $el -t search stop deploy clean start --uri $ear_uri"
+    su - $ece_unix_user -c \
+      "${proxy_settings} ece -i $el -t search stop deploy clean start --uri $ear_uri"
     exit_on_error "Running ece deploy as $ece_unix_user"
   done
 }
@@ -71,7 +76,7 @@ function set_builder_user_and_password() {
   if [[ -n "$builder_http_user" && -n "$builder_http_password" ]]; then
     found=1
   fi
-  
+
   if [ $found -eq 0 ]; then
     local file_list=/etc/escenic/ece.conf
     for el in $engine_instance_list; do
@@ -85,25 +90,24 @@ function set_builder_user_and_password() {
   fi
 }
 
-
 function deploy_conf() {
   if [ ${make_deployment-1} -eq 0 ]; then
     return
   fi
-  
+
   make_dir $ece_deploy_download_dir
 
   set_builder_user_and_password
 
   print "Downloading" $conf_package_uri "..."
   (
-	  cd $ece_deploy_download_dir
-	  run wget \
-	    --quiet \
-	    --continue \
-	    --http-user $builder_http_user \
-	    --http-password $builder_http_password \
-	    $conf_package_uri
+  cd $ece_deploy_download_dir
+  run wget \
+    --quiet \
+    --continue \
+    --http-user $builder_http_user \
+    --http-password $builder_http_password \
+    $conf_package_uri
   )
 
   print "Installing" $(basename $conf_package_uri) "..."
@@ -115,7 +119,7 @@ function deploy_conf() {
 function read_user_input() {
   local next_is_ear_uri=0
   local next_is_conf_uri=0
-  
+
   for el in "$@"; do
     if [[ $el == "--ear" ]]; then
       next_is_ear_uri=1
@@ -162,25 +166,24 @@ function verify_user_input() {
       errors=1
     fi
   fi
-  
+
   if [ $errors -eq 1 ]; then
     exit 1
   fi
 }
 
 function list_previous_deployments() {
-  if [ ! -d $data_dir ]; then
+  if [ ! -d $ece_deploy_data_dir ]; then
     return
   fi
-  
-  for el in $(find $data_dir -maxdepth 1 -type d | sed "s#${data_dir}##g" | sort -nr | head -20); do
+
+  for el in $(find $ece_deploy_data_dir -maxdepth 1 -type d | sed "s#${ece_deploy_data_dir}##g" | sort -nr | head -20); do
     local id=$(basename $el)
     echo "   - Deployment" ${id} "was made @" $(date --date="@${id}")
   done
 }
 
-function prepare_rollback() {
-  local publication_resource_list="
+publication_resource_list="
     0/escenic/section-parameter
     escenic/content-type
     escenic/feature
@@ -191,54 +194,6 @@ function prepare_rollback() {
     escenic/plugin/menu
     escenic/teaser-type
   "
-  
-  for el in $engine_instance_list; do
-    source /etc/escenic/ece-${el}.conf
-    local publication_list=$(
-      curl -s  http://localhost:${appserver_port}/escenic-admin/pages/publication/list.jsp | \
-        grep '/escenic-admin/pages/publication/view.jsp' | \
-        sed 's/.*name=\(.*\)".*/\1/g'
-    )
-
-    for publication in $publication_list; do
-      local dir=${data_dir}/${deployment_id}/old/${publication}
-      
-      for publication_resource in $publication_resource_list; do
-        (
-          make_dir $dir/$(dirname $publication_resource)
-          
-          run cd $dir
-          local xml=$(
-            wget --quiet --continue --output-document - \
-              http://localhost:${appserver_port}/escenic-admin/publication-resources/${publication}/${publication_resource}
-          )
-
-          if [[ -n "${xml}"  && ${xml:0:1} == "<" ]]; then
-            echo "${xml}" | xmllint --format - > ${publication_resource}
-          else
-            echo "${xml}" > ${publication_resource}
-          fi
-        )
-      done
-    done
-
-    # copying the current deployment state, so that we can roll back
-    dir=${data_dir}/${deployment_id}/old
-    make_dir $dir
-    if [ -e /var/lib/escenic/${el}.state ]; then
-      run cp /var/lib/escenic/${el}.state $dir
-    fi
-
-    # get a hold of the current vosa-conf package, first all packages
-    # to detect if we've got packages intended for other hosts.
-    dpkg -l "vosa-conf-*" 2>/dev/null | tail -1\
-      > $dir/vosa-conf-package.list
-    dpkg -l vosa-conf-$HOSTNAME 2>/dev/null | tail -1 | awk '{print $3;}' \
-      > $dir/vosa-conf-${HOSTNAME}.version
-  done
-
-  print_and_log "Rollback prepared in" $data_dir/$deployment_id/old
-}
 
 function looks_like_xml() {
   local xml=$(cat "$1")
@@ -268,32 +223,32 @@ function update_publication_resources() {
   if [ ! -d $1 ]; then
     return
   fi
-  
+
   for el in $engine_instance_list; do
     source /etc/escenic/ece-${el}.conf
     local publication_list=$(get_publication_list ${appserver_port})
 
     for publication in $publication_list; do
       print_and_log "Updating resources for publication" $publication "..."
-      
+
       if [[ "$1" == "$tomcat_base" ]]; then
         local publication_resources_dir=$tomcat_base/webapps-${publication}/${publication}/META-INF/escenic/publication-resources
       else
         local publication_resources_dir=${1}/${publication}
       fi
-      
+
       if [ ! -d $publication_resources_dir ]; then
         continue
       fi
-      
+
       (
         cd $publication_resources_dir
         for ele in $(find -type f | sed 's#^./##g'); do
-          new_dir=$data_dir/$deployment_id/new/$publication/$(dirname $ele)
+          new_dir=$ece_deploy_data_dir/$deployment_id/new/$publication/$(dirname $ele)
           make_dir $new_dir
-          
-          old_file=$data_dir/$deployment_id/old/$publication/${ele}
-          
+
+          old_file=$ece_deploy_data_dir/$deployment_id/old/$publication/${ele}
+
           if [ $(looks_like_xml $ele) -eq 1 ]; then
             file=$new_dir/$(basename $ele)
             xmllint --format $ele > $file
@@ -316,7 +271,7 @@ function update_publication_resources() {
           if [ ${number_of_lines_changed} -lt 1 ]; then
             continue
           fi
-          
+
           print_and_log "Applying" \
             $number_of_lines_changed \
             "changes to" $ele \
@@ -343,16 +298,16 @@ function roll_back_everything_to_version() {
     "from" $(date --date @${roll_back_to_version}) \
     "..."
 
-  local old_data_dir=$data_dir/${roll_back_to_version}/old
-  if [ ! -d $old_data_dir ]; then
+  local old_ece_deploy_data_dir=$ece_deploy_data_dir/${roll_back_to_version}/old
+  if [ ! -d $old_ece_deploy_data_dir ]; then
     print_and_log "I cannot find ${roll_back_to_version}'s files," \
-      "they should have been here:" $old_data_dir
+      "they should have been here:" $old_ece_deploy_data_dir
     exit 1
   else
-    log "Using data in" $old_data_dir "to perform the rollback"
+    log "Using data in" $old_ece_deploy_data_dir "to perform the rollback"
   fi
 
-  local package_version_file=$data_dir/${roll_back_to_version}/new/vosa-conf-${HOSTNAME}.version
+  local package_version_file=$ece_deploy_data_dir/${roll_back_to_version}/new/vosa-conf-${HOSTNAME}.version
   if [ -e $package_version_file ]; then
     local deb_file=$ece_deploy_download_dir/vosa-conf-$HOSTNAME-$(cat $package_version_file).deb
     if [ -e $deb_file ]; then
@@ -371,7 +326,7 @@ function roll_back_everything_to_version() {
   fi
 
   for el in $engine_instance_list; do
-    file=$data_dir/${roll_back_to_version}/new/${el}.state
+    file=$ece_deploy_data_dir/${roll_back_to_version}/new/${el}.state
     if [ ! -e $file ]; then
       continue
     fi
@@ -383,26 +338,43 @@ function roll_back_everything_to_version() {
     deploy_ear
   done
 
-
   print_and_log "You have now rolled back to deployment ${roll_back_to_version}"
 }
 
+function prepare_rollback() {
+  print_and_log "Making it possible to roll back to $deployment_id ..."
+  make_dir $ece_deploy_data_dir/$deployment_id/new
+  
+  for el in $engine_instance_list $search_instance_list; do
+    local file=/var/lib/escenic/${el}.state
+    if [ -e $file ]; then
+      cp /var/lib/escenic/${el}.state $ece_deploy_data_dir/$deployment_id/new/
+    fi
+  done
+  
+  dpkg -l vosa-conf-$HOSTNAME 2>/dev/null | \
+    grep vosa-conf-$HOSTNAME | \
+    awk '{ print $3 }' > \
+    $ece_deploy_data_dir/${deployment_id}/new/vosa-conf-${HOSTNAME}.version
+}
+
 assert_commands_available xmllint
 read_user_input "$@"
 verify_user_input
 
 if [ ${list_the_revious_deployments-0} -eq 0 ]; then
   generate_deployment_id
-  prepare_rollback
 fi
 
 if [ ${make_deployment-1} -eq 1 ]; then
   deploy_ear
   deploy_conf
-
+  
   if [ ${update_the_publication_resources-0} -eq 1 ]; then
     update_publication_resources $tomcat_base
   fi
+  
+  prepare_rollback
 fi
 
 if [ ${list_the_revious_deployments-0} -eq 1 ]; then
@@ -411,9 +383,8 @@ fi
 
 if [ ${roll_back-0} -eq 1 ]; then
   roll_back_everything_to_version
-  
+
   if [ ${update_the_publication_resources-0} -eq 1 ]; then
-    update_publication_resources $data_dir/${roll_back_to_version}/new
+    update_publication_resources $ece_deploy_data_dir/${roll_back_to_version}/new
   fi
 fi
-  

From 1bb46983d2a842d58faf55c6a930b4c92bcda112 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 30 Nov 2012 15:36:29 +0100
Subject: [PATCH 1729/2585] - changed the deployment ID from <number> to
 <host>-<number> as a   deployment is (because of the conf packages++) unique
 to one host.

---
 usr/sbin/ece-deploy | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
index 1433f052..2dd49cb1 100755
--- a/usr/sbin/ece-deploy
+++ b/usr/sbin/ece-deploy
@@ -179,7 +179,7 @@ function list_previous_deployments() {
 
   for el in $(find $ece_deploy_data_dir -maxdepth 1 -type d | sed "s#${ece_deploy_data_dir}##g" | sort -nr | head -20); do
     local id=$(basename $el)
-    echo "   - Deployment" ${id} "was made @" $(date --date="@${id}")
+    echo "   - Deployment" ${id} "was made @" $(date --date="@$(echo ${id} | cut -d'-' -f2)")
   done
 }
 
@@ -288,7 +288,7 @@ function update_publication_resources() {
 }
 
 function generate_deployment_id() {
-  deployment_id=$(date +%s)
+  deployment_id=${HOSTNAME}-$(date +%s)
   print_and_log "This deployment has ID" ${deployment_id}
 }
 

From aecb21b5bc902482ce62d06860d326facc6c28c2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 30 Nov 2012 15:43:34 +0100
Subject: [PATCH 1730/2585] ece-deploy now notes the old deployment states of
 all the instances

---
 usr/sbin/ece-deploy | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
index 2dd49cb1..723254a4 100755
--- a/usr/sbin/ece-deploy
+++ b/usr/sbin/ece-deploy
@@ -51,7 +51,17 @@ function deploy_ear() {
   if [ -n "$http_proxy" ]; then
     proxy_settings="http_proxy=$http_proxy"
   fi
-  
+
+  print_and_log "Noting the old deployment states for all instances ..."
+  for el in $engine_instance_list $search_instance_list; do
+    local old_dir=$ece_deploy_data_dir/$deployment_id/old
+    make_dir $old_dir
+    local file=/var/lib/escenic/${el}.state
+    if [ -e $file ]; then
+      run cp $file $old_dir
+    fi
+  done
+    
   for el in $engine_instance_list; do
     su - $ece_unix_user -c \
       "${proxy_settings} ece -i $el stop deploy clean start --uri $ear_uri"
@@ -177,9 +187,14 @@ function list_previous_deployments() {
     return
   fi
 
-  for el in $(find $ece_deploy_data_dir -maxdepth 1 -type d | sed "s#${ece_deploy_data_dir}##g" | sort -nr | head -20); do
+  for el in $(find $ece_deploy_data_dir -maxdepth 1 -type d | \
+    sed "s#${ece_deploy_data_dir}##g" | \
+    sort -nr | \
+    head -20); do
     local id=$(basename $el)
-    echo "   - Deployment" ${id} "was made @" $(date --date="@$(echo ${id} | cut -d'-' -f2)")
+    echo "   - Deployment" ${id} \
+      "was made @" \
+      $(date --date="@$(echo ${id} | cut -d'-' -f2)")
   done
 }
 

From a59f421b6d1aa632bfff6bf0c6d46a25f3dc1fea Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 3 Dec 2012 10:34:16 +0100
Subject: [PATCH 1731/2585] - added another 10 attempts (and thus 10 seconds)
 to attempting   stopping the JVM gracefully.

---
 usr/share/escenic/ece-scripts/ece.d/stop.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/stop.sh b/usr/share/escenic/ece-scripts/ece.d/stop.sh
index 123ec2fa..2fbaf041 100644
--- a/usr/share/escenic/ece-scripts/ece.d/stop.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/stop.sh
@@ -19,7 +19,7 @@ function stop_type() {
       fi
     fi
 
-    for i in {0..5}; do
+    for i in {0..15}; do
       set_type_pid
       
       if [ -n "$type_pid" ]; then

From bd3fbc0eeaf3ae82cf304921e03ece43bad8d4a0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 3 Dec 2012 10:37:40 +0100
Subject: [PATCH 1732/2585] - introduced get_old_dir and get_new_dir

- improved & clarified user feedback
---
 usr/sbin/ece-deploy | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
index 723254a4..b163e86f 100755
--- a/usr/sbin/ece-deploy
+++ b/usr/sbin/ece-deploy
@@ -46,19 +46,29 @@ bootstrap_thyself
 log=/var/log/escenic/$(basename $0).log
 run source /etc/default/ece
 
+function get_old_dir() {
+  local old_dir=$ece_deploy_data_dir/$deployment_id/old
+  make_dir $old_dir
+  echo $old_dir
+}
+
+function get_new_dir() {
+  local new_dir=$ece_deploy_data_dir/$deployment_id/new
+  make_dir $new_dir
+  echo $new_dir
+}
+
 function deploy_ear() {
   local proxy_setings=""
   if [ -n "$http_proxy" ]; then
     proxy_settings="http_proxy=$http_proxy"
   fi
 
-  print_and_log "Noting the old deployment states for all instances ..."
+  print_and_log "Remembering the old deployment states for all instances ..."
   for el in $engine_instance_list $search_instance_list; do
-    local old_dir=$ece_deploy_data_dir/$deployment_id/old
-    make_dir $old_dir
     local file=/var/lib/escenic/${el}.state
     if [ -e $file ]; then
-      run cp $file $old_dir
+      run cp $file $(get_old_dir)
     fi
   done
     

From c8c46cec2155b27d2e1e22425ba1042604fefd5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Mon, 3 Dec 2012 15:40:51 +0100
Subject: [PATCH 1733/2585] ece-build - added additional items to the list of
 approved plugins

---
 usr/share/escenic/build-scripts/ece-build | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index ba826b6b..10088dac 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -36,6 +36,10 @@ dashboard
 poll
 lucy
 reporter
+video
+newsroom
+vcpeditor
+online-graphics
 widget-framework-core
 widget-framework-common
 widget-framework-mobile

From a8c99890b427c6260587ba0528a8d2ae559a1e64 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 3 Dec 2012 17:01:39 +0100
Subject: [PATCH 1734/2585] - now remembers state before and after

- added crawling
---
 usr/sbin/ece-deploy | 67 ++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 60 insertions(+), 7 deletions(-)

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
index b163e86f..5a6c7ea3 100755
--- a/usr/sbin/ece-deploy
+++ b/usr/sbin/ece-deploy
@@ -83,6 +83,13 @@ function deploy_ear() {
   done
 }
 
+function start_all_content_engine_instances() {
+  for el in $engine_instance_list; do
+    su - $ece_unix_user -c \
+      "${proxy_settings} ece -i $el status restart"
+  done
+}  
+
 function set_builder_user_and_password() {
   run source /etc/escenic/ece.conf
   for el in $engine_instance_list; do
@@ -251,7 +258,13 @@ function update_publication_resources() {
 
   for el in $engine_instance_list; do
     source /etc/escenic/ece-${el}.conf
+    
     local publication_list=$(get_publication_list ${appserver_port})
+    if [ -z "${publication_list}" ]; then
+      print_and_log "$el doesn't have any publications" \
+        "so there's no publication resources to update ;-)"
+      continue
+    fi
 
     for publication in $publication_list; do
       print_and_log "Updating resources for publication" $publication "..."
@@ -366,21 +379,52 @@ function roll_back_everything_to_version() {
   print_and_log "You have now rolled back to deployment ${roll_back_to_version}"
 }
 
-function prepare_rollback() {
-  print_and_log "Making it possible to roll back to $deployment_id ..."
-  make_dir $ece_deploy_data_dir/$deployment_id/new
+## $1 :: dir, can be the patht to the new or old directory of this
+## deployment
+function remember_state() {
+  make_dir $1
   
   for el in $engine_instance_list $search_instance_list; do
     local file=/var/lib/escenic/${el}.state
     if [ -e $file ]; then
-      cp /var/lib/escenic/${el}.state $ece_deploy_data_dir/$deployment_id/new/
+      cp /var/lib/escenic/${el}.state $1/
     fi
   done
   
   dpkg -l vosa-conf-$HOSTNAME 2>/dev/null | \
     grep vosa-conf-$HOSTNAME | \
     awk '{ print $3 }' > \
-    $ece_deploy_data_dir/${deployment_id}/new/vosa-conf-${HOSTNAME}.version
+    $1/vosa-conf-${HOSTNAME}.version
+}
+
+function print_summary() {
+  print_and_log "Finished @ $(date)"
+  print_and_log "A full summary of the changes can be found in" \
+    $ece_deploy_data_dir/${deployment_id} "Here's a short summary:"
+  diff -r $ece_deploy_data_dir/${deployment_id}/old \
+    $ece_deploy_data_dir/${deployment_id}/new
+}
+
+function crawl_a_wee_bit() {
+  for el in $engine_instance_list; do
+    source /etc/escenic/ece-${el}.conf
+    local file=$tomcat_base/conf/server.xml
+    local virtual_hosts=$(
+      xml_grep \
+        --nowrap \
+        --text \
+        --cond 'Server/Service/Engine/Host/Alias' \
+        $file
+    )
+
+    for ele in $virtual_hosts; do
+      print_and_log "Crawling $ele ..."
+      echo wget \
+        --page-requisites \
+        --delete-after \
+        --header "Host: $ele" http://localhost:${appserver_port}/
+    done
+  done
 }
 
 assert_commands_available xmllint
@@ -388,18 +432,23 @@ read_user_input "$@"
 verify_user_input
 
 if [ ${list_the_revious_deployments-0} -eq 0 ]; then
+  print_and_log "Started @ $(date)"
   generate_deployment_id
 fi
 
 if [ ${make_deployment-1} -eq 1 ]; then
+  remember_state $ece_deploy_data_dir/$deployment_id/old
+
   deploy_ear
   deploy_conf
   
   if [ ${update_the_publication_resources-0} -eq 1 ]; then
     update_publication_resources $tomcat_base
   fi
-  
-  prepare_rollback
+
+  start_all_content_engine_instances
+  remember_state $ece_deploy_data_dir/$deployment_id/new
+  crawl_a_wee_bit
 fi
 
 if [ ${list_the_revious_deployments-0} -eq 1 ]; then
@@ -413,3 +462,7 @@ if [ ${roll_back-0} -eq 1 ]; then
     update_publication_resources $ece_deploy_data_dir/${roll_back_to_version}/new
   fi
 fi
+
+if [ ${list_the_revious_deployments-0} -eq 0 ]; then
+  print_summary
+fi

From d237016291dfb8ffc7a5a89d3ab4f0ac7bd6684e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 4 Dec 2012 11:37:12 +0100
Subject: [PATCH 1735/2585] - fix in create_packages where ece-build now will
 check both the   common and machine specific configuration directory tree if
 they   actual exist before attempting to copy them.

  This should close #119
---
 usr/share/escenic/build-scripts/ece-build | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 10088dac..be048318 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -510,11 +510,12 @@ function create_machine_conf_packages() {
     mkdir -p $target_dir/etc
     echo "$(get_etc_hosts_for_machine ${machine} $conf_dir)" > $target_dir/etc/hosts
 
-    # common files
-    run cp -rf $conf_dir/common/* $target_dir/
-
-    # machine specific files
-    run cp -rf $conf_dir/${machine}/* $target_dir/
+    # copy common and machine specific files
+    for el in common ${machine}; do
+      if [ -d $conf_dir/$el ]; then
+        run cp -rf $conf_dir/$el/* $target_dir/
+      fi
+    done
 
     # delete those pesky .svn folders
     find $target_dir -name .svn -type d | xargs rm -rf

From 1173b6fe3ed82faef15d3e4d1948b89265c03f1e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 4 Dec 2012 13:25:16 +0100
Subject: [PATCH 1736/2585] - added xml_grep to the required list

---
 usr/sbin/ece-deploy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
index 5a6c7ea3..73a0c9d1 100755
--- a/usr/sbin/ece-deploy
+++ b/usr/sbin/ece-deploy
@@ -427,7 +427,7 @@ function crawl_a_wee_bit() {
   done
 }
 
-assert_commands_available xmllint
+assert_commands_available xmllint xml_grep
 read_user_input "$@"
 verify_user_input
 

From 92a3721fb5717b3a3d27ec1c54a61f2c3aabdb5d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 4 Dec 2012 13:25:52 +0100
Subject: [PATCH 1737/2585] - added logging on
 common-io::download_uri_target_to_dir so that it's   easier to follow what
 it's doing.

---
 usr/share/escenic/ece-scripts/common-io.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/ece-scripts/common-io.sh b/usr/share/escenic/ece-scripts/common-io.sh
index 0b3d850e..dcf59bf3 100644
--- a/usr/share/escenic/ece-scripts/common-io.sh
+++ b/usr/share/escenic/ece-scripts/common-io.sh
@@ -102,6 +102,7 @@ function download_uri_target_to_dir() {
   local file=""
   
   if [[ $uri == "http://"* || $uri == "https://"* ]]; then
+    log "Downloading" $uri "to" $target_dir "..." 
     run cd $target_dir
     run wget \
       $wget_opts \

From 50885da666645b8a64c1073f950179333cf1fd37 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 4 Dec 2012 13:27:50 +0100
Subject: [PATCH 1738/2585] - updated the URL of the memcached library as the
 old site is no   longer available.

  This means an upgrade from 2.0.x to 2.5.x of the Memcached Java
  library. This should apparently mean a big performance boost.

- simplified the implementation of memory-cache::install_memory_cache
  to use more of the features in common-io.
---
 .../ece-scripts/ece-install.d/memory-cache.sh | 20 +++++--------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh b/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
index dd337f8c..f0cb0cdb 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
@@ -1,6 +1,6 @@
 # ece-install module for installing the memory cache
 
-memcached_java_lib_url=http://img.whalin.com/memcached/jdk5/log4j/java_memcached-release_2.0.1.tar.gz
+memcached_java_lib_url=https://github.com/downloads/gwhalin/Memcached-Java-Client/java_memcached-release_2.5.3.jar
 
 function install_memory_cache()
 {
@@ -12,26 +12,16 @@ function install_memory_cache()
   fi
   
   assert_commands_available memcached
-  
-  run cd $download_dir
-  run wget $wget_opts $memcached_java_lib_url
 
-  local tmp_dir=$(mktemp -d)
-  run cd $tmp_dir
-  run tar xzf $download_dir/$(basename $memcached_java_lib_url)
-  local name=$(get_base_dir_from_bundle $memcached_java_lib_url)
+  print_and_log "Downloading the memcached java library ..."
+  download_uri_target_to_dir $memcached_java_lib_url $download_dir
+
   make_dir ${escenic_root_dir}/assemblytool/lib
-  run cp $name/$name.jar ${escenic_root_dir}/assemblytool/lib
-  run rm -rf $tmp_dir
-  run cd ~/
-  
+  run cp $(basename $memcached_java_lib_url) ${escenic_root_dir}/assemblytool/lib
   memcached_set_up_common_nursery
 
   # ece deploy will set up the necessary in-publication Nursery
   # configuration, if needed.
-  
-  # TODO inform the user that he/she might want to do this in the
-  # publication tree as well.
 }
 
 function memcached_set_up_common_nursery() {

From fc3dc4374f1f0e9a1f54abac34d5bd7e63e2b61b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 4 Dec 2012 16:04:50 +0100
Subject: [PATCH 1739/2585] - fixes in ece-deploy::get_publication_list

- now both of --conf and --ear are optional. ece-deploy will still
  complain if either of them are missing their value.
---
 usr/sbin/ece-deploy | 56 +++++++++++++++++++++++++++++++--------------
 1 file changed, 39 insertions(+), 17 deletions(-)

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
index 73a0c9d1..3158956f 100755
--- a/usr/sbin/ece-deploy
+++ b/usr/sbin/ece-deploy
@@ -75,6 +75,9 @@ function deploy_ear() {
   for el in $engine_instance_list; do
     su - $ece_unix_user -c \
       "${proxy_settings} ece -i $el stop deploy clean start --uri $ear_uri"
+    # asking for the versions to make sure the ECEs are
+    # bootstrapped. It's also nice user feedback to see which versions
+    # are deployed/upgraded.
   done
   for el in $search_instance_list; do
     su - $ece_unix_user -c \
@@ -86,7 +89,7 @@ function deploy_ear() {
 function start_all_content_engine_instances() {
   for el in $engine_instance_list; do
     su - $ece_unix_user -c \
-      "${proxy_settings} ece -i $el status restart"
+      "${proxy_settings} ece -i $el restart"
   done
 }  
 
@@ -149,8 +152,10 @@ function read_user_input() {
 
   for el in "$@"; do
     if [[ $el == "--ear" ]]; then
+      deploy_an_ear_file=1
       next_is_ear_uri=1
     elif [[ $el == "--conf" ]]; then
+      deploy_a_conf_file=1
       next_is_conf_uri=1
     elif [[ $el == "--rollback" ]]; then
       roll_back=1
@@ -183,15 +188,16 @@ function verify_user_input() {
     fi
   elif [ ${list_the_revious_deployments-0} -eq 1 ]; then
     nop=foo
-  else
-    if [ -z "$conf_package_uri" ]; then
-      print "You must specify the conf package with --conf :-("
-      errors=1
-    fi
-    if [ -z "$ear_uri" ]; then
-      print "You must specify the URI of the EAR file with --ear :-("
-      errors=1
-    fi
+  fi
+  
+  if [[ ${deploy_an_ear_file-0} -eq 1 && -z "${ear_uri}" ]]; then
+    print "You must specify the URI of the EAR file with --ear :-("
+    errors=1
+  fi
+  
+  if [[ ${deploy_a_conf_file-0} -eq 1 && -z "$conf_package_uri" ]]; then
+    print "You must specify the conf package with --conf :-("
+    errors=1
   fi
 
   if [ $errors -eq 1 ]; then
@@ -239,8 +245,7 @@ function looks_like_xml() {
 ## app server port
 function get_publication_list() {
   curl --silent \
-    --connect-timeout 30 \
-    http://localhost:${1}/escenic-admin/pages/publication/list.jsp | \
+    http://localhost:8080/escenic-admin/pages/publication/list.jsp | \
     grep '/escenic-admin/pages/publication/view.jsp' | \
     sed 's/.*name=\(.*\)".*/\1/g'
 }
@@ -258,8 +263,21 @@ function update_publication_resources() {
 
   for el in $engine_instance_list; do
     source /etc/escenic/ece-${el}.conf
-    
-    local publication_list=$(get_publication_list ${appserver_port})
+
+    print_and_log "Getting the publication list on $el ..."
+    for i in {0..5}; do
+      local publication_list=$(get_publication_list ${appserver_port})
+      
+      if [ -n "${publication_list}" ]; then
+        break
+      fi
+      
+      # if we haven't gotten any content from the local ECE (yet), it
+      # might be because it hasn't come up yet (slow app server),
+      # hence we sleep for a wee while and try again.
+      sleep 3
+    done
+
     if [ -z "${publication_list}" ]; then
       print_and_log "$el doesn't have any publications" \
         "so there's no publication resources to update ;-)"
@@ -419,7 +437,8 @@ function crawl_a_wee_bit() {
 
     for ele in $virtual_hosts; do
       print_and_log "Crawling $ele ..."
-      echo wget \
+      wget \
+        --quiet \
         --page-requisites \
         --delete-after \
         --header "Host: $ele" http://localhost:${appserver_port}/
@@ -440,10 +459,13 @@ if [ ${make_deployment-1} -eq 1 ]; then
   remember_state $ece_deploy_data_dir/$deployment_id/old
 
   deploy_ear
-  deploy_conf
+  if [ -n "$conf_uri" ]; then
+    deploy_conf
+  fi
   
   if [ ${update_the_publication_resources-0} -eq 1 ]; then
-    update_publication_resources $tomcat_base
+    # not active until gets stable
+    echo update_publication_resources $tomcat_base
   fi
 
   start_all_content_engine_instances

From b28444a502628e9f5588913f2a746375284500b3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 5 Dec 2012 08:25:57 +0100
Subject: [PATCH 1740/2585] - moved the info about attempting to create a
 publication up to the   start of ece-install::create_publication to make it
 more logical --   in case the function fails.

---
 .../escenic/ece-scripts/ece-install.d/create-publication.sh    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
index 43de51fc..cef0c90f 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
@@ -1,4 +1,6 @@
 function create_publication() {
+  print_and_log "Getting ready to create a new publication ..."
+  
   if [ ! -e $escenic_root_dir/engine -o \
     ! -e $escenic_root_dir/assemblytool ]; then
     print_and_log "Please install ECE and an assembly environment before" \
@@ -6,7 +8,6 @@ function create_publication() {
     remove_pid_and_exit_in_error
   fi
 
-  print_and_log "Getting ready to create a new publication ..."
   create_publication_definition_and_war
 
   instance_list=$(get_instance_list)

From 08fb4dbd15b84edf403d6a5b5b195d0d953151a9 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 5 Dec 2012 09:16:41 +0100
Subject: [PATCH 1741/2585] - changed ['s for <'s to make the commands double
 clickiable in the   terminal when something goes wrong (the run wrapper
 prints out the   command that failed).

---
 usr/share/escenic/ece-scripts/common-bashing.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index 4541e0a9..dd44a187 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -123,7 +123,7 @@ function remove_pid_and_exit_in_error() {
 function exit_on_error() {
   local code=$?
   if [ ${code} -gt 0 ]; then
-    print_and_log "The command [${@}] run as user $USER $(red FAILED)" \
+    print_and_log "The command <${@}> run as user $USER $(red FAILED)" \
       "(the command exited with code ${code}), I'll exit now :-("
     print "See $log for further details."
     remove_file_if_exists $lock_file

From 18d9304fcc776d9581f3be549760d82f9e10d676 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 5 Dec 2012 10:22:21 +0100
Subject: [PATCH 1742/2585] - ece-build should now not fail if a
 server-admin/<machine> directory   exists, but is empty.

  This should close #119
---
 usr/share/escenic/build-scripts/ece-build | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index be048318..70db3f3c 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -512,7 +512,8 @@ function create_machine_conf_packages() {
 
     # copy common and machine specific files
     for el in common ${machine}; do
-      if [ -d $conf_dir/$el ]; then
+      if [[ -d $conf_dir/$el && \
+        $(find $conf_dir/$el -maxdepth 1 | wc -l) -gt 1 ]]; then
         run cp -rf $conf_dir/$el/* $target_dir/
       fi
     done

From 9794425775d750a62259b0e9faea6ce5815fcb59 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 5 Dec 2012 10:24:03 +0100
Subject: [PATCH 1743/2585] - added default_ece_intance_name instead of hard
 coding it everywhere

---
 usr/share/escenic/ece-scripts/ece-install.d/constants.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/constants.sh b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
index 8f4e9e8d..06e4be55 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
@@ -35,3 +35,6 @@ default_app_server_redirect=8443
 
 # cache server constants
 default_cache_port=80
+
+# ece constants
+default_ece_intance_name=engine1

From a99fd3e54d3a07378951ebd965ac7f061dca33f7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 5 Dec 2012 10:24:25 +0100
Subject: [PATCH 1744/2585] - made use of default_ece_intance_name in
 ece-insetall

---
 usr/sbin/ece-install | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 825dc7ce..f3f14970 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -679,7 +679,7 @@ EOF
   fi
 }
 
-# Will update /etc/default/instance with the type instances which are
+# Will update /etc/default/ece with the type instances which are
 # installed on the given host. This method should work for engine,
 # search and analysis instances.
 function update_type_instances_to_start_up()
@@ -714,7 +714,7 @@ function install_presentation_server()
 {
     print_and_log "Installing a presentation server on $HOSTNAME."
     type=engine
-    install_ece_instance "engine1" $PROFILE_PRESENTATION_SERVER
+    install_ece_instance $default_ece_intance_name $PROFILE_PRESENTATION_SERVER
 }
 
 # If the system is installed using the recommended paths, the method
@@ -778,7 +778,7 @@ function install_all_in_one_environment()
     print_and_log "Installing an all-in-one environment on $HOSTNAME ..."
     type=engine
     install_database_server
-    install_ece_instance "dev1" 0
+    install_ece_instance $default_ece_intance_name 0
     install_cache_server
     install_web_server 2
     install_munin_gatherer

From 33f4547e425b136fc7fe440588ceaab4e2b14fbb Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 5 Dec 2012 10:34:28 +0100
Subject: [PATCH 1745/2585] - fixed and significantly improved and hardened the
 profile creation   profile (fai_publication_create).

  fai_publication_create=1
  fai_publication_war=/tmp/mypub.war

  Alternatively, ece-install will look for the ece-demo.war in the
  standard ECE directory and, if found, use this for creating the
  publication.

  #98

- removed a lot of old code

- publication creation will not work for interactive mode anymore.

- TODO: test properly with fai_all_install=1

- TODO: add proper implementation of ensure_that_instance_is_running
---
 .../ece-install.d/create-publication.sh       | 211 +++++++-----------
 1 file changed, 82 insertions(+), 129 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
index cef0c90f..5f5e671a 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
@@ -1,78 +1,77 @@
 function create_publication() {
   print_and_log "Getting ready to create a new publication ..."
-  
-  if [ ! -e $escenic_root_dir/engine -o \
-    ! -e $escenic_root_dir/assemblytool ]; then
-    print_and_log "Please install ECE and an assembly environment before" \
-      "running this installation profile again."
-    remove_pid_and_exit_in_error
-  fi
-
-  create_publication_definition_and_war
-
-  instance_list=$(get_instance_list)
-  default_instance=$(echo ${instance_list} | cut -d' ' -f1)
 
-  if [ $fai_enabled -eq 0 ]; then
-    print "Which ECE instance do you wish to use to create it?"
-    print "These instances are available: $instance_list"
-    echo -n "Your choice [$default_instance]> "
-    read instance_name
-  else
-    instance_name=$(get_conf_value fai_publication_use_instance)
-  fi
-
-  if [ -z "$instance_name" ]; then
-    instance_name=$default_instance
-  fi
+  if [ ${fai_enabled-0} -eq 1 ]; then
+    local publication_name=${fai_publication_name-mypub}
+
+    # figure out which WAR to use for the publication creation
+    local publication_war=""
+    if [ -n "${fai_publication_ear}" ]; then
+      print_and_log "Will try to find" ${fai_publication_name}.war \
+        "inside" $fai_publication_ear 
+    else
+      if [ -z "${fai_publication_war}" ]; then
+        # if the user hasn't set the fai_publication_war, see if the
+        # demo-clean.war is available on the system.
+        local file=$escenic_root_dir/engine/contrib/wars/demo-clean.war
+        if [ -e $file ]; then
+          publication_war=$file
+        else
+          # if neither fai_publication_war nor demo-clean.war are
+          # available make the installation fail and inform the user
+          # of the need to set fai_publication_war
+          ensure_variable_is_set fai_publication_war
+        fi
+      else
+        publication_war=$fai_publication_war
+      fi
+    fi
 
-  type=engine
-  ensure_that_instance_is_running $instance_name
-  create_publication_in_db $publication_war
+    local the_instance=${fai_publication_use_instance-$default_ece_intance_name}
+    ensure_that_instance_is_running $the_instance
+    create_publication_in_db $publication_name $publication_war $the_instance
+    add_publication_to_deployment_lists $(basename $publication_war .war)
 
-  # don't set/introduce the deployment white list for profile=all
-  if [ $install_profile_number -ne $PROFILE_ALL_IN_ONE ]; then
-    add_publication_to_deployment_lists
+    add_next_step "A publication with name" $publication_name \
+      "has been created using the publication resources in" \
+      $publication_war "The WAR has been added to the deployment" \
+      "white list, so that it will be included next time you do" \
+      "ece -i ${the_instance} deploy"
   fi
-  
-  assemble_deploy_and_restart_type
-
-  add_next_step "A new publication $publication_name has been created."
 }
 
-## $1 : publication name
+## $1 : publication WAR name
 function add_publication_to_deployment_lists() {
-  if [ $fai_enabled -eq 0 ]; then
-    print "On which ECE instances do you wish to deploy $publication_name"
-    print "These instances are available: $instance_list"
-    echo -n "Your choice [$default_instance]> "
-    read update_instance_list
-  else
-    update_instance_list=${fai_publication_instance_list-${default_instance}}
-  fi
-
-  if [ -z $update_instance_list ]; then
-    update_instance_list=$default_instance
-  fi
-
-  for el in $update_instance_list; do
-    print "Adding $publication_name to instance ${el}'s deployment list ..."
-    local file=$escenic_conf_dir/ece-${el}.conf
-    if [ -e $file ]; then
-      # don't want to source it as it'll pollute the variable name
-      # space.
-      local existing_value=$(
-        grep deploy_webapp_white_list $file | cut -d'=' -f2 | sed 's#"##g'
-      )
-      set_conf_file_value \
-        deploy_webapp_white_list \
-        $publication_name $existing_value \
-        $file
+  run source /etc/default/ece
+  local please_add=1
+  
+  for el in $engine_instance_list; do
+    local file=/etc/escenic/ece-${el}.conf
+    run source $file
+    
+    for ele in $deploy_webapp_white_list; do
+      if [[ "$el" == "$1" ]]; then
+        please_add=0
+      fi
+    done
+
+    if [ $please_add -eq 1 ]; then
+      print_and_log "Adding $1 to the deploy white list of" \
+        "instance" $el
+      deploy_webapp_white_list="$deploy_webapp_white_list $1"
     fi
+    
+    set_conf_file_value \
+      deploy_webapp_white_list \
+      $deploy_webapp_white_list \
+      $file
   done
 }
 
+## $1 :: the instance name
 function ensure_that_instance_is_running() {
+  return
+  
   local ece_command="ece -i $1 -t $type status"
   if [ $(su - $ece_user -c "$ece_command" | grep UP | wc -l) -lt 1 ]; then
     ece_command="ece -i $1 -t $type start"
@@ -82,25 +81,38 @@ function ensure_that_instance_is_running() {
   fi
 }
 
-# Based on Erik Mogensen's work:
-# //depot/branches/personal/mogsie/fromscratch/create-publication.sh
+## $1 :: publication name
+## $2 :: publication war
+## $3 :: instance name
+## 
+## Based on Erik Mogensen's work:
+## //depot/branches/personal/mogsie/fromscratch/create-publication.sh
 function create_publication_in_db() {
-  print_and_log "Creating ${publication_name} using $instance_name ..."
+  local publication_name=$1
+  local publication_war=$2
+  local instance_name=$3
+  
+  print_and_log "Creating publication" ${publication_name} \
+    "using instance" $instance_name "..."
+  
+  # sourcing the instance's ECE configuration to get the app server
+  # port.
+  run source /etc/escenic/ece-${instance_name}.conf
 
-  ece_admin_uri=http://$HOSTNAME:${appserver_port}/escenic-admin
+  local ece_admin_uri=http://localhost:${appserver_port}/escenic-admin
   
-  cookie=$(curl ${curl_opts} -I ${ece_admin_uri}/ | \
+  local cookie=$(curl ${curl_opts} -I ${ece_admin_uri}/ | \
     grep -i "^Set-Cookie" | \
     sed s/.*'JSESSIONID=\([^;]*\).*'/'\1'/)
 
-  if [ "$cookie" == "" ] ; then
-    print_and_log "Unable to get a session cookie."
-    remove_pid_and_exit_in_error;
+  if [[ "$cookie" == "" ]] ; then
+    print_and_log "Unable to get a session cookie from instance $instance_name"
+    exit 1
   fi
 
   run curl ${curl_opts} \
     -F "type=webapp" \
-    -F "resourceFile=@${1}" \
+    -F "resourceFile=@${publication_war}" \
     --cookie JSESSIONID="$cookie" \
     "${ece_admin_uri}/do/publication/resource"
   
@@ -112,62 +124,3 @@ function create_publication_in_db() {
     --cookie JSESSIONID="$cookie" \
     "${ece_admin_uri}/do/publication/insert"
 }
-
-function create_publication_definition_and_war()
-{
-  publication_name=mypub
-
-  if [ ${fai_enabled-0} -eq 0 ]; then
-    print "What name do you wish to give your publication?"
-    print "Press ENTER to accept ${publication_name}"
-    echo -n "Your choice [${publication_name}]> "
-    read publication_name
-  else
-    publication_name=$(get_conf_value fai_publication_name)
-  fi
-
-  if [ -z "$publication_name" ]; then
-    publication_name=mypub
-  fi
-
-  print_and_log "Setting up the ${publication_name} publication ..."
-  make_dir $escenic_root_dir/assemblytool/publications/
-  run cd $escenic_root_dir/assemblytool/publications/
-  cat > $escenic_root_dir/assemblytool/publications/${publication_name}.properties <<EOF
-name: ${publication_name}
-source-war: ${publication_name}.war
-context-root: ${publication_name}
-EOF
-
-  publication_war=$escenic_root_dir/assemblytool/publications/${publication_name}.war
-  if [[ $fai_enabled -eq 1 && -n "${fai_publication_war}" ]]; then
-    print_and_log "Basing ${publication_name}.war on the one specified in $conf_file"
-    run cp ${fai_publication_war} ${publication_war}
-  elif [ -d $escenic_root_dir/widget-framework-core-* ]; then
-    print_and_log "Basing ${publication_name}.war on Widget Framework Demo ..."
-    # WF 1.x
-    if [ -d $escenic_root_dir/widget-framework-core-*/publications/demo-core ]; then
-      run cd $escenic_root_dir/widget-framework-core-*/publications/demo-core
-      install_packages_if_missing "maven2"
-      assert_commands_available mvn
-      run mvn $maven_opts package
-      run cp target/demo-core-*.war ${publication_war}
-    # WF 2.x
-    elif [ -e $escenic_root_dir/widget-framework-core-*/wars/wf-core-war-2*.war ]; then
-      run cp $escenic_root_dir/widget-framework-core-*/wars/wf-core-war-2*.war \
-        ${publication_war}
-    fi
-  else
-    print_and_log "Basing your ${publication_name}.war on ECE/demo-clean ..."
-    run cp $escenic_root_dir/engine/contrib/wars/demo-clean.war ${publication_war}
-  fi
-
-    # TODO add support for the community widgets
-    #
-    # 1 - add the core widgets to the
-    # publications/demo-community/pom.xml
-    # 
-    # 2 - add the <ui:group name="core-widgets"/> definition for core
-    # widgets in:
-    # publications/demo-community/src/main/webapp/META-INF/escenic/publication-resources/escenic/content-type
-}

From 541778ce8bf140bb3aa03b310acca8ae874d82e6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 5 Dec 2012 10:40:54 +0100
Subject: [PATCH 1746/2585] - don't install the Munin gatherer for the all in
 one profile (it   conflicts with the cache server and it's too much bother
 right now   to add it).

---
 usr/sbin/ece-install | 1 -
 1 file changed, 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index f3f14970..23ac9555 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -781,7 +781,6 @@ function install_all_in_one_environment()
     install_ece_instance $default_ece_intance_name 0
     install_cache_server
     install_web_server 2
-    install_munin_gatherer
     set_up_solr
 
     install_widget_framework

From f6e2d5965909a280c5667f8937668a155482a8ab Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 5 Dec 2012 10:59:38 +0100
Subject: [PATCH 1747/2585] - fix in ece-build::create_machine_conf_packages:
 don't try to copy   files if there's nothing but .svn or .git in the conf
 directory of   the machine.

  #119
---
 usr/share/escenic/build-scripts/ece-build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 70db3f3c..7dd9df8d 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -513,7 +513,7 @@ function create_machine_conf_packages() {
     # copy common and machine specific files
     for el in common ${machine}; do
       if [[ -d $conf_dir/$el && \
-        $(find $conf_dir/$el -maxdepth 1 | wc -l) -gt 1 ]]; then
+        $(find $conf_dir/$el -maxdepth 1 | egrep -v ".git|.svn" | wc -l) -gt 1 ]]; then
         run cp -rf $conf_dir/$el/* $target_dir/
       fi
     done

From 8785239049371ff191bd89a698afcd72780dc968 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Wed, 5 Dec 2012 11:21:00 +0100
Subject: [PATCH 1748/2585] ece-build - added correct file extension to latest
 link for .ear

---
 usr/share/escenic/build-scripts/ece-build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 7dd9df8d..0888fce0 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -419,7 +419,7 @@ function publish_ear
   resulting_ear=$customer-$release_label-rev$revision-$build_date.ear
   if [ -e $assemblytool_root_dir/dist/engine.ear ]; then 
     run cp $assemblytool_root_dir/dist/engine.ear $release_dir/$resulting_ear
-    run ln -fs $release_dir/$resulting_ear $release_dir/latest
+    run ln -fs $release_dir/$resulting_ear $release_dir/latest.ear
   else
     print_and_log "I'm done, but the .ear is still missing, exiting!"
     remove_pid_and_exit_in_error

From 3b8583e5151089543d841cdb5676f30da46d3b5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Wed, 5 Dec 2012 11:25:25 +0100
Subject: [PATCH 1749/2585] ece-build - old style latest links will be removed

---
 usr/share/escenic/build-scripts/ece-build | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 0888fce0..bf900af7 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -419,6 +419,11 @@ function publish_ear
   resulting_ear=$customer-$release_label-rev$revision-$build_date.ear
   if [ -e $assemblytool_root_dir/dist/engine.ear ]; then 
     run cp $assemblytool_root_dir/dist/engine.ear $release_dir/$resulting_ear
+    
+    # remove old style latest link
+    run rm -f $release_dir/latest
+    
+    # add new latest.ear link
     run ln -fs $release_dir/$resulting_ear $release_dir/latest.ear
   else
     print_and_log "I'm done, but the .ear is still missing, exiting!"

From 9330ac19961c042f45f2a49896cfe6c3008aabc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Wed, 5 Dec 2012 11:28:38 +0100
Subject: [PATCH 1750/2585] ece-build - old style latest links will only be
 removed if they exist

---
 usr/share/escenic/build-scripts/ece-build | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index bf900af7..54f73e96 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -421,7 +421,9 @@ function publish_ear
     run cp $assemblytool_root_dir/dist/engine.ear $release_dir/$resulting_ear
     
     # remove old style latest link
-    run rm -f $release_dir/latest
+    if [ -e $release_dir/latest ]; then
+      run rm -f $release_dir/latest
+    fi
     
     # add new latest.ear link
     run ln -fs $release_dir/$resulting_ear $release_dir/latest.ear

From 6f3efda11b02541bc7747dff27956c3f77a5f898 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 5 Dec 2012 14:12:49 +0100
Subject: [PATCH 1751/2585] - fixed bug: both PROFILE_ANALYSIS_SERVER and  
 PROFILE_ANALYSIS_DB_SERVER had the same ID

- sorted PROFILE_ constants by their value, not their key, to make it
  easier to sport errors
---
 .../ece-scripts/ece-install.d/constants.sh     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/constants.sh b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
index 06e4be55..c5049977 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
@@ -2,10 +2,10 @@
 
 # installation profiles
 PROFILE_ALL_IN_ONE=1
-PROFILE_CACHE_SERVER=5
-PROFILE_DB_SERVER=4
 PROFILE_EDITORIAL_SERVER=2
 PROFILE_PRESENTATION_SERVER=3
+PROFILE_DB_SERVER=4
+PROFILE_CACHE_SERVER=5
 PROFILE_RMI_HUB=6
 PROFILE_SEARCH_SERVER=7
 PROFILE_WIDGET_FRAMEWORK=8
@@ -13,13 +13,13 @@ PROFILE_CREATE_PUBLICATION=9
 PROFILE_MONITORING_SERVER=10
 PROFILE_RESTORE_FROM_BACKUP=11
 PROFILE_ANALYSIS_SERVER=12
-PROFILE_ANALYSIS_DB_SERVER=12
-PROFILE_VIP_PROVIDER=13
-PROFILE_NFS_SERVER=14
-PROFILE_NFS_CLIENT=15
-PROFILE_DB_BACKUP_SERVER=16
-PROFILE_UN_INSTALL=17
-PROFILE_MONITORING_NODE=18
+PROFILE_ANALYSIS_DB_SERVER=13
+PROFILE_VIP_PROVIDER=14
+PROFILE_NFS_SERVER=15
+PROFILE_NFS_CLIENT=16
+PROFILE_DB_BACKUP_SERVER=17
+PROFILE_UN_INSTALL=18
+PROFILE_MONITORING_NODE=19
 
 # database constants
 default_db_port=3306

From c8be44c81e511506d99966dc8943a13237918b7d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 5 Dec 2012 14:14:00 +0100
Subject: [PATCH 1752/2585] - added common-ece::is_webapp_a_publication

---
 usr/share/escenic/ece-scripts/common-ece.sh | 45 +++++++++++++--------
 1 file changed, 29 insertions(+), 16 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/common-ece.sh b/usr/share/escenic/ece-scripts/common-ece.sh
index b300779b..eb53c5f2 100644
--- a/usr/share/escenic/ece-scripts/common-ece.sh
+++ b/usr/share/escenic/ece-scripts/common-ece.sh
@@ -9,16 +9,16 @@ function get_instance_list() {
   local allowed_types="engine analysis changelogd search rmi-hub"
   instance_list=""
   for el in $(\ls /etc/escenic/ece-*.conf 2>/dev/null); do
-    
+
     local instance=$(basename $el .conf)
     instance=${instance##ece-}
-    
+
     for ele in $allowed_types; do
       if [[ $instance == $ele ]]; then
         instance=""
         continue
       fi
-      
+
       local away="${ele}-"
       instance=${instance##${away}}
     done
@@ -28,8 +28,33 @@ function get_instance_list() {
   echo $instance_list
 }
 
+webapps_in_standard_webapps_list="
+  dashboard
+  escenic
+  escenic-admin
+  indexer-webapp
+  indexer-webservice
+  inpage-ws
+  solr
+  studio
+  webservice
+"
+
+## $1 :: the war file (or just the name of the war file, without the
+##       file suffix)
+function is_webapp_a_publication() {
+  for el in $webapps_in_standard_webapps_list; do
+    if [[ "$(basename $1 .war)" == $el ]]; then
+      echo 0
+      return
+    fi
+  done
+
+  echo 1
+}
+
 ## Will return the app base for the passwed WAR name.
-## 
+##
 ## $1 :: the name of the war file
 function get_app_base() {
   local war=$(basename $1 .war)
@@ -37,18 +62,6 @@ function get_app_base() {
   # this is a list of web applications that are standard ECE related
   # web applications which should not live in their own webapp context
   # (i.e. not a publication).
-  local webapps_in_standard_webapps_list="
-    dashboard
-    escenic
-    escenic-admin
-    indexer-webapp
-    indexer-webservice
-    inpage-ws
-    solr
-    studio
-    webservice
-  "
-
   for el in $webapps_in_standard_webapps_list; do
     if [[ "$el" == "$war" ]]; then
       echo webapps

From 24d104ed686345de81b5843185efe77089880c45 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 5 Dec 2012 14:17:26 +0100
Subject: [PATCH 1753/2585] - fixed the deploy white list for the all in one
 profile (old bug)

- fixed the deploy white list in general where it's now taken from the
  fai_<profile>_deploy_white_list variables depending on the
  installation profile.
---
 .../ece-install.d/content-engine.sh           | 124 +++++++++++-------
 1 file changed, 74 insertions(+), 50 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index e2009192..4a198a75 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -1,12 +1,12 @@
 # ece-install module Content Engine specific code.
 
 function get_deploy_white_list() {
-  
+
   local deploy_white_list=""
   local presentation_deploy_white_list="escenic-admin $(get_publication_short_name_list)"
   local editor_deploy_white_list="escenic-admin escenic studio indexer-webservice webservice"
   local search_deploy_white_list="solr indexer-webapp"
-  
+
   # user's deploy white list, if present, takes precedence.
   if [ $fai_enabled -eq 1 ]; then
     if [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ]; then
@@ -15,6 +15,13 @@ function get_deploy_white_list() {
       deploy_white_list=${fai_editor_deploy_white_list-$editor_deploy_white_list}
     elif [ $install_profile_number -eq $PROFILE_SEARCH_SERVER ]; then
       deploy_white_list=${fai_search_deploy_white_list-$search_deploy_white_list}
+    elif [ $install_profile_number -eq $PROFILE_ALL_IN_ONE ]; then
+      local default_all_deploy_white_list="
+        ${presentation_deploy_white_list}
+        ${editor_deploy_white_list}
+        ${search_deploy_white_list}
+      "
+      deploy_white_list=${fai_all_deploy_white_list-$default_all_deploy_white_list}
     else
       deploy_white_list=${fai_publication_deploy_white_list-""}
     fi
@@ -24,23 +31,42 @@ function get_deploy_white_list() {
 }
 
 function get_publication_short_name_list() {
-  local short_name_list=""
-  
-  local publication_def_dir=${escenic_root_dir}/assemblytool/publications
+  local deploy_white_list=""
 
-  if [ ! -d $publication_def_dir ]; then
-    echo ${short_name_list}
-    return
+  if [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ]; then
+    deploy_white_list=${fai_presentation_deploy_white_list}
+  elif [ $install_profile_number -eq $PROFILE_EDITORIAL_SERVER ]; then
+    deploy_white_list=${fai_editor_deploy_white_list}
+  elif [ $install_profile_number -eq $PROFILE_SEARCH_SERVER ]; then
+    deploy_white_list=${fai_search_deploy_white_list}
+  elif [ $install_profile_number -eq $PROFILE_ALL_IN_ONE ]; then
+    deploy_white_list=${fai_all_deploy_white_list}
   fi
 
-  if [ $(ls ${publication_def_dir} | grep .properties$ | wc -l) -eq 0 ]; then
-    echo ${short_name_list}
-    return
+  if [[ -z "$deploy_white_list" && \
+    -n "${fai_publication_domain_mapping_list}" ]]; then
+    for el in $fai_publication_domain_mapping_list; do
+      log el=$el
+
+      old_ifs=$IFS
+      IFS='#' read publication domain aliases <<< "$el"
+      log publication=$publication domain=$domain aliases=$aliases
+      IFS=',' read publication_name publication_war <<< "$publication"
+      log publication_name=$publication_name publication_war=$publication_war
+      IFS=$old_ifs
+      if [ -z "${publication_war}" ]; then
+        publication_war=${publication_name}.war
+      fi
+      deploy_white_list="${deploy_white_list} $(basename $publication_war .war)"
+    done
   fi
 
-  for el in $(find ${publication_def_dir} -maxdepth 1 -name "*.properties"); do
-    local short_name=$(basename $el .properties)
-    short_name_list="${short_name_list} ${short_name}"
+  local short_name_list=""
+
+  for el in $deploy_white_list; do
+    if [ $(is_webapp_a_publication $el) -eq 1 ]; then
+      short_name_list="${short_name_list} $el"
+    fi
   done
 
   echo ${short_name_list}
@@ -49,13 +75,13 @@ function get_publication_short_name_list() {
 ## $1=<default instance name>
 function install_ece_instance() {
   install_ece_third_party_packages
-  
+
   ask_for_instance_name $1
   set_up_engine_directories
   set_up_ece_scripts
 
   set_archive_files_depending_on_profile
-  
+
   download_escenic_components
   check_for_required_downloads
   set_up_engine_and_plugins
@@ -78,10 +104,9 @@ function install_ece_instance() {
     set_up_basic_nursery_configuration
     set_up_instance_specific_nursery_configuration
   fi
-  
+
   # We set a WAR white list for all profiles except all in one
-  if [ $install_profile_number -ne $PROFILE_ALL_IN_ONE -a \
-    $install_profile_number -ne $PROFILE_ANALYSIS_SERVER ]; then
+  if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER ]; then
     local file=$escenic_conf_dir/ece-${instance_name}.conf
     print_and_log "Creating deployment white list in $file ..."
     set_conf_file_value \
@@ -95,7 +120,7 @@ function install_ece_instance() {
     install_memory_cache
     assemble_deploy_and_restart_type
   fi
-  
+
   update_type_instances_to_start_up
   set_conf_file_value ece_unix_user $ece_user /etc/default/ece
   set_conf_file_value ece_unix_group $ece_group /etc/default/ece
@@ -117,7 +142,7 @@ function set_up_engine_and_plugins() {
   if [ $ece_software_setup_completed -eq 1 ]; then
     return
   fi
-  
+
   print_and_log "Setting up the Escenic Content Engine & its plugins ..."
   make_dir $escenic_root_dir
   run cd $escenic_root_dir/
@@ -132,13 +157,13 @@ function set_up_engine_and_plugins() {
       engine_file=$(basename $el)
     fi
   done
-  
+
   if [ -n "$engine_dir" -a ! -d "${engine_dir}" ]; then
     run unzip -q -u -o $download_dir/${engine_file}
     if [ -h engine ]; then
       run rm engine
     fi
-    
+
     run ln -s ${engine_dir} engine
   else
     debug "${engine_dir} is already there, skipping to next step."
@@ -160,10 +185,10 @@ function set_up_engine_and_plugins() {
 
 function set_up_assembly_tool() {
   log "Setting up the Assembly Tool ..."
-  
+
   make_dir $escenic_root_dir/assemblytool/
   cd $escenic_root_dir/assemblytool/
-  
+
   if [ -e $download_dir/assemblytool*zip ]; then
     run unzip -q -u -o $download_dir/assemblytool*zip
   fi
@@ -176,7 +201,7 @@ function set_up_assembly_tool() {
   run cp -r layers/host layers/instance
   run cp -r layers/host layers/vosa
   run cp -r layers/host layers/server
-  
+
   cat > layers/environment/Files.properties <<EOF
 \$class=neo.nursery.FileSystemDepot
 fileSystemRoot = $escenic_conf_dir/engine/environment/\${com.escenic.environment "unknown"}/
@@ -217,7 +242,7 @@ layer.05 = /layers/family/Layer
 # Customer :: environment layer (e.g. testing, staging, production)
 layer.06 = /layers/environment/Layer
 
-# Customer :: host specific layer 
+# Customer :: host specific layer
 layer.07 = /layers/host/Layer
 
 # Customer :: instance specific layer
@@ -234,7 +259,7 @@ EOF
   do
     sed -i "s#/etc/escenic#${escenic_conf_dir}#g" $el
   done
-  
+
   # set up which plugins to use
   run cd $escenic_root_dir/assemblytool/
   make_dir plugins
@@ -246,7 +271,7 @@ EOF
       $(echo $directory | grep widget-framework | wc -l) -gt 0 ]; then
       continue
     fi
-    
+
     # nuisance to get the community engine and analysis engine, but
     # not the engine
     if [ $(echo $directory | \
@@ -266,7 +291,7 @@ EOF
     assemble.properties \
     1>>$log 2>>$log
   exit_on_error "sed on assemble.properties"
-  
+
   sed -i "s~\#\# plugins\ =\ /path/to/plugins~plugins=${escenic_root_dir}/assemblytool/plugins~g" \
     assemble.properties \
     1>>$log 2>>$log
@@ -277,14 +302,14 @@ EOF
   # set up user publication definitions
   if [ -n "${fai_publication_war_uri_list}" ]; then
     run cd $escenic_root_dir/assemblytool/publications
-    
+
     wget_auth=$wget_builder_auth
     for el in ${fai_publication_war_uri_list}; do
       download_uri_target_to_dir \
         $el \
         $escenic_root_dir/assemblytool/publications
       local download_file=$escenic_root_dir/assemblytool/publications/$(basename $el)
-      
+
       if [ ! -e $(basename $el) ]; then
         print_and_log "Failed to get user publication $el." \
           "I will skip it and continue to the next one."
@@ -322,7 +347,7 @@ function set_up_basic_nursery_configuration() {
     # the conf archive typically resides on the build server, hence we
     # set its authentication credentials here.
     wget_auth=$wget_builder_auth
-    
+
     local a_tmp_dir=$(mktemp -d)
     download_uri_target_to_dir \
       $ece_instance_conf_archive \
@@ -331,7 +356,7 @@ function set_up_basic_nursery_configuration() {
 
     run cd $a_tmp_dir
     extract_archive $file
-    
+
     if [ -d ${a_tmp_dir}/engine/security ]; then
       run cp -r $a_tmp_dir/engine/security/ $common_nursery_dir/
     else
@@ -339,7 +364,7 @@ function set_up_basic_nursery_configuration() {
       print "I'll use standard JAAS (engine/security) instead."
       run cp -r $escenic_root_dir/engine/security/ $common_nursery_dir/
     fi
-    
+
     run cp -r engine/siteconfig/config-skeleton/* $common_nursery_dir/
   else
     print_and_log "I'm using Nursery & JAAS configuration (skeleton) " \
@@ -352,7 +377,7 @@ function set_up_basic_nursery_configuration() {
   if [ -n "${a_tmp_dir}" ]; then
     run rm -rf ${a_tmp_dir}
   fi
-  
+
   public_host_name=$HOSTNAME:${appserver_port}
   if [ $fai_enabled -eq 1 ]; then
     if [ -n "$fai_public_host_name" ]; then
@@ -368,7 +393,7 @@ function set_up_basic_nursery_configuration() {
   if [ -n "$user_host_name" ]; then
     public_host_name=$user_host_name
   fi
-  
+
   cat > $common_nursery_dir/ServerConfig.properties <<EOF
 databaseProductName=MySQL
 filePublicationRoot=$escenic_data_dir/engine/
@@ -433,9 +458,9 @@ function set_up_publication_nursery_conf() {
       IFS=','
       read publication_name publication_war <<< "$publication"
       IFS=$old_ifs
-      
+
       local file=$escenic_conf_dir/engine/environment/${fai_publication_environment-production}/neo/publications/Pub-${publication_name}.properties
-      
+
       print_and_log "Creating Nursery component" \
         $(basename $file .properties) \
         "for publication $publication_name"
@@ -451,7 +476,7 @@ EOF
 
 function set_up_instance_specific_nursery_configuration() {
   print_and_log "Setting up instance specific Nursery configuration ..."
-  
+
   for el in $escenic_conf_dir/engine/instance/*; do
     i=$(( i + 1 ))
     if [ $(basename $el) = $instance_name ]; then
@@ -463,7 +488,7 @@ function set_up_instance_specific_nursery_configuration() {
   nursery_context=neo/io/managers/HubConnectionManager.properties
   file=$escenic_conf_dir/engine/instance/$instance_name/$nursery_context
   make_dir $(dirname $file)
-  
+
   # we don't touch it if the file already exists.
   if [ ! -e $file ]; then
     run echo "hostname=$HOSTNAME" >> $file
@@ -477,7 +502,7 @@ function install_ece_third_party_packages
 {
   run_hook install_ece_third_party_packages.preinst
   print_and_log "Installing 3rd party packages needed by $type instances"
-  
+
   if [ $on_debian_or_derivative -eq 1 ]; then
     if [ $on_ubuntu -eq 1 ]; then
       # Sun Java was removed in Ubuntu in 11.10 and later also from
@@ -485,7 +510,7 @@ function install_ece_third_party_packages
       # (2012-02-20 11:22)
       local version_needs_local_java_deb=1004
       local version=$(lsb_release -s -r | sed "s#\.##g")
-      
+
       add_apt_source \
         "deb http://archive.canonical.com/ $(lsb_release -s -c) partner"
     elif [ $on_debian -eq 1 ]; then
@@ -509,7 +534,7 @@ function install_ece_third_party_packages
 
     if [ $(has_sun_java_installed) -eq 0 ]; then
       create_java_deb_packages_and_repo
-      
+
       # Here, we install sun-java6-jdk first so that ant doesn't pull
       # down OpenJDK.
       #
@@ -520,7 +545,7 @@ function install_ece_third_party_packages
         debconf-set-selections
       install_packages_if_missing sun-java6-jdk
     fi
-    
+
     local packages="
       ant
       ant-contrib
@@ -546,7 +571,7 @@ function install_ece_third_party_packages
     # TODO no tomcat APR wrappers in official repositories
     install_sun_java_on_redhat
   fi
-  
+
   install_packages_if_missing $packages
   assert_commands_available ant java jar
 }
@@ -622,7 +647,7 @@ function assemble_deploy_and_restart_type()
   else
     print_and_log "Assembling, deploying & starting $instance_name ..."
   fi
-  
+
   su - $ece_user -c "$ece_command" 1>>$log 2>>$log
   exit_on_error "su - $ece_user -c \"$ece_command\""
 }
@@ -678,7 +703,7 @@ function set_up_search_client_nursery_conf() {
   make_dir $dir
   echo "solrServerURI=http://${search_host}:${search_port}/solr" \
     >>  $dir/SolrSearchEngine.properties
-  
+
   dir=$common_nursery_dir/com/escenic/webservice/search
   make_dir $dir
   echo "solrURI=http://${search_host}:${search_port}/solr/select" \
@@ -693,5 +718,4 @@ function set_up_search_client_nursery_conf() {
   make_dir $dir
   echo "solrURI=http://${search_host}:${search_port}/solr" \
     >> $dir/SearchEngine.properties
-}  
-
+}

From 4d071f35552a1ed79328d7cc647bb2ed3b87aad8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 5 Dec 2012 14:18:56 +0100
Subject: [PATCH 1754/2585] - added support for creating all publications
 mentioned in the   fai_publication_domain_mapping_list:

  fai_publication_create=1
  fai_publication_ear=/var/cache/escenic/stoppok-trunk-rev6195-2012-12-04_1134.ear
  fai_publication_domain_mapping_list="
    stoppok,st.war#stoppok.skybert.net#newindian.skybert.net
    helden#dinamani.skybert.net#helden.skybert.net
  "

  Will make ece-install set up two publications: stoppok helden based
  on the contents of the domain mapping list and use the corresponding
  publication resources from the provided EAR file.

- TODO : fix the ensure_that_instance_is_running properly
---
 .../ece-install.d/create-publication.sh       | 69 +++++++++++++++----
 1 file changed, 54 insertions(+), 15 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
index 5f5e671a..db54507f 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
@@ -1,15 +1,42 @@
 function create_publication() {
-  print_and_log "Getting ready to create a new publication ..."
+  print_and_log "Preparing publication creation ..."
 
   if [ ${fai_enabled-0} -eq 1 ]; then
-    local publication_name=${fai_publication_name-mypub}
-
     # figure out which WAR to use for the publication creation
     local publication_war=""
     if [ -n "${fai_publication_ear}" ]; then
-      print_and_log "Will try to find" ${fai_publication_name}.war \
-        "inside" $fai_publication_ear 
+      print_and_log "I will create all publications in" \
+        $fai_publication_ear "using the the domain mapping list ..."
+      
+      ensure_variable_is_set fai_publication_domain_mapping_list
+      local the_tmp_dir=$(mktemp -d)
+      (
+        run cd $the_tmp_dir
+        run jar xf $fai_publication_ear
+      )
+
+      for el in ${fai_publication_domain_mapping_list}; do
+        local old_ifs=$IFS
+        # the entries in the fai_publication_domain_mapping_list are on
+        # the form: <publication[,pub.war]>#<domain>[#<alias1>[,<alias2>]]
+        IFS='#' read publication domain aliases <<< "$el"
+        IFS=',' read publication_name publication_war <<< "$publication"
+        IFS=$old_ifs
+
+        # this is the default case were the WAR is called the same as
+        # the publication name with the .war suffix.
+        if [ -z "${publication_war}" ]; then
+          publication_war=${publication_name}.war
+        fi
+        
+        create_the_publication $publication_name $the_tmp_dir/$publication_war
+      done
+
+      log "Cleaing up $the_tmp_dir ..."
+      run rm -rf $the_tmp_dir
     else
+      local publication_name=${fai_publication_name-mypub}
+      
       if [ -z "${fai_publication_war}" ]; then
         # if the user hasn't set the fai_publication_war, see if the
         # demo-clean.war is available on the system.
@@ -25,19 +52,31 @@ function create_publication() {
       else
         publication_war=$fai_publication_war
       fi
+
+      create_the_publication $publication_name $publication_war
     fi
+  fi
+}
 
-    local the_instance=${fai_publication_use_instance-$default_ece_intance_name}
-    ensure_that_instance_is_running $the_instance
-    create_publication_in_db $publication_name $publication_war $the_instance
-    add_publication_to_deployment_lists $(basename $publication_war .war)
+## $1 :: publication name
+## $2 :: publication war
+function create_the_publication() {
+  local publication_name=$1
+  local publication_war=$2
+  
+  print_and_log "Creating a publication with name" $publication_name \
+    "using the publication resources from" $publication_war
+  
+  local the_instance=${fai_publication_use_instance-$default_ece_intance_name}
+  ensure_that_instance_is_running $the_instance
+  create_publication_in_db $publication_name $publication_war $the_instance
+  add_publication_to_deployment_lists $(basename $publication_war .war)
 
-    add_next_step "A publication with name" $publication_name \
-      "has been created using the publication resources in" \
-      $publication_war "The WAR has been added to the deployment" \
-      "white list, so that it will be included next time you do" \
-      "ece -i ${the_instance} deploy"
-  fi
+  add_next_step "A publication with name" $publication_name \
+    "has been created using the publication resources in" \
+    $publication_war "The WAR has been added to the deployment" \
+    "white list, so that it will be included next time you do" \
+    "ece -i ${the_instance} deploy"
 }
 
 ## $1 : publication WAR name

From 3557fd003f154fb0e9a20d95de2f106f18330ec4 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 5 Dec 2012 14:59:36 +0100
Subject: [PATCH 1755/2585] - ece-install will now remove any number of
 pre-defined files from all   the WARs (if present) when creating new
 publications.

  For instance:

     fai_publication_create=1
     fai_publication_domain_mapping_list="
       mypub#myhost.com#www.myhost.com
     "
     fai_publication_war_remove_file_list="
       META-INF/escenic/publication-resources/escenic/plugin/menu
     "

  Will make ece-install remove the menu publication resources in any
  WAR file it uses for the publication creation:

     [ece-install-28] Removing
     [ece-install-28] META-INF/escenic/publication-resources/escenic/plugin/menu
     [ece-install-28] from mypub.war ...

  This works on any file path inside the WARs. The paths must be relative.

  This change should close #118
---
 .../ece-install.d/create-publication.sh       | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
index db54507f..77748179 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
@@ -1,3 +1,23 @@
+## $1 :: full path to the WAR file
+function create_publication_prepare_war_file() {
+  if [ -n "${fai_publication_war_remove_file_list}" ]; then
+    local the_tmp_dir=$(mktemp -d)
+    (
+      cd $the_tmp_dir
+      run jar xf $1
+
+      for el in $fai_publication_war_remove_file_list; do
+        if [ -e $el ]; then
+          print_and_log "Removing" $el "from" $(basename $1) "..."
+          run rm $el
+        fi
+      done
+
+      run jar cf $1 .
+    )
+  fi
+}
+
 function create_publication() {
   print_and_log "Preparing publication creation ..."
 
@@ -66,7 +86,8 @@ function create_the_publication() {
   
   print_and_log "Creating a publication with name" $publication_name \
     "using the publication resources from" $publication_war
-  
+
+  create_publication_prepare_war_file $publication_war
   local the_instance=${fai_publication_use_instance-$default_ece_intance_name}
   ensure_that_instance_is_running $the_instance
   create_publication_in_db $publication_name $publication_war $the_instance

From 0a93f02f34189839c3707d1144af57f6df3758b2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 5 Dec 2012 15:31:07 +0100
Subject: [PATCH 1756/2585] - updated installation summary to link to the 5.5
 documentation   instead of 5.3

- added more in-code documentation in ece-install::create-publication
---
 usr/sbin/ece-install                                           | 2 +-
 .../escenic/ece-scripts/ece-install.d/create-publication.sh    | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 23ac9555..90ed53d2 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -366,7 +366,7 @@ function print_status_and_next_steps()
         $install_profile_number -ne $PROFILE_CACHE_SERVER -a \
         $install_profile_number -ne $PROFILE_WIDGET_FRAMEWORK ]; then
         add_next_step "Install info: "\ "/usr/share/doc/escenic/ece-install-guide.txt"
-        add_next_step "Guide books: http://documentation.vizrt.com/ece-5.3.html"
+        add_next_step "Guide books: http://documentation.vizrt.com/ece-5.5.html"
     fi
 
     print_next_step_list
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
index 77748179..5213783b 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
@@ -1,3 +1,6 @@
+## If the user has fai_publication_war_remove_file_list set, these
+## files will, if present, be removed from the WAR file.
+##
 ## $1 :: full path to the WAR file
 function create_publication_prepare_war_file() {
   if [ -n "${fai_publication_war_remove_file_list}" ]; then

From a0126c5a808c52dd30c49832723b15ad919b8c9b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 5 Dec 2012 15:41:30 +0100
Subject: [PATCH 1757/2585] - removed the option from info screen to create a
 publication when running in   interactive mode

---
 usr/sbin/ece-install | 2 --
 1 file changed, 2 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 90ed53d2..cc99e3cb 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -444,8 +444,6 @@ function read_user_input()
 "$PROFILE_RMI_HUB - RMI hub"
 "$PROFILE_SEARCH_SERVER - Search server (Solr + indexer-webapp)"
 "$PROFILE_WIDGET_FRAMEWORK - Install Widget Framework."
-"$PROFILE_CREATE_PUBLICATION - Create a new publication"\
-" based on WF if available, ECE/clean-demo if not"
 "$PROFILE_MONITORING_SERVER - A monitoring server (web server +"\
 " Munin gatherer)"
 "$PROFILE_RESTORE_FROM_BACKUP - Restore from backup"\

From 39b7b8acd322c633fcacaf023f152554081d0a02 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 5 Dec 2012 15:52:30 +0100
Subject: [PATCH 1758/2585] - fix in
 create-publication::add_publication_to_deployment_lists

---
 .../escenic/ece-scripts/ece-install.d/create-publication.sh   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
index 5213783b..8b17eb56 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
@@ -88,7 +88,7 @@ function create_the_publication() {
   local publication_war=$2
   
   print_and_log "Creating a publication with name" $publication_name \
-    "using the publication resources from" $publication_war
+    "using the publication resources from" $(basename $publication_war)
 
   create_publication_prepare_war_file $publication_war
   local the_instance=${fai_publication_use_instance-$default_ece_intance_name}
@@ -113,7 +113,7 @@ function add_publication_to_deployment_lists() {
     run source $file
     
     for ele in $deploy_webapp_white_list; do
-      if [[ "$el" == "$1" ]]; then
+      if [[ "$ele" == "$1" ]]; then
         please_add=0
       fi
     done

From 3d30525e8d1a5f5ff53ae6de0543f2d280bcc7fa Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 5 Dec 2012 15:57:52 +0100
Subject: [PATCH 1759/2585] - added documentation for fai_publication_ear and  
 fai_publication_war_remove_file_list

---
 usr/share/doc/escenic/ece-install-guide.org | 183 ++++++++++----------
 1 file changed, 93 insertions(+), 90 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index b90adf96..2b257056 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -880,96 +880,99 @@ fai_keep_off_etc_hosts=1 in your ece-install.conf
 The ece-install script understands the following settings in the
 $HOME/ece-install.conf file of the root user:
 
-|---------------------------------------+--------------------------------------------------------------+----------------------------------------------------------------------------------------------------------|
-| Parameter                             | Default                                                      | Description                                                                                              |
-|---------------------------------------+--------------------------------------------------------------+----------------------------------------------------------------------------------------------------------|
-| =fai_all_conf_archive=                | ""                                                           | conf.tar.gz to use for Nursery & JAAS configuration                                                      |
-| =fai_all_ear=                         | ""                                                           | EAR to use instead of the Escenic binaries                                                               |
-| =fai_all_install=                     | 0                                                            | Install all components on your server.                                                                   |
-| =fai_all_stop_and_clear=              | 0                                                            | After installation, stop the instance and clear its work & log files.                                    |
-| =fai_analysis_db_host=                | localhost                                                    | For the EAE DB (different from ECE's)                                                                    |
-| =fai_analysis_db_install=             | 0                                                            | Install DB profile                                                                                       |
-| =fai_analysis_db_password=            | read-the-source-luke                                         | For the EAE DB (different from ECE's)                                                                    |
-| =fai_analysis_db_port=                | 3306                                                         | For the EAE DB (different from ECE's)                                                                    |
-| =fai_analysis_db_schema=              | ece5db                                                       | For the EAE DB (different from ECE's)                                                                    |
-| =fai_analysis_db_user=                | ece5user                                                     | For the EAE DB (different from ECE's)                                                                    |
-| =fai_analysis_install=                | 0                                                            | Will install the Escenic Analysis Engine, aka Stats, EAE.                                                |
-| =fai_analysis_name=                   | analysis1                                                    | EAE instance name                                                                                        |
-| =fai_analysis_port=                   | 8080                                                         | Port of the EAE                                                                                          |
-| =fai_analysis_shutdown=               | 8005                                                         | Shutdown port for the EAE app server                                                                     |
-| =fai_analysis_stop_and_clear=         | 0                                                            | After installation, stop the instances and clear its work & log files                                    |
-| =fai_apt_vizrt_pool=                  | stable                                                       | Which package pool in the Vizrt APT to install package from.                                             |
-| =fai_cache_backends=                  | ${HOSTNAME}:8080                                             | Space separated, e.g. "app1:8080 app2:8080"                                                              |
-| =fai_cache_install=                   | 0                                                            | Install cache server profile                                                                             |
-| =fai_db_daily_backup=                 | 0                                                            | Sets up daily backup of the DB.                                                                          |
-| =fai_db_drop_old_db_first=            | 0                                                            | Warning: this will drop the old database before installing a new one                                     |
-| =fai_db_host=                         | $HOSTNAME                                                    | Useful for editor & presentation profiles                                                                |
-| =fai_db_install=                      | 0                                                            | Install db profile                                                                                       |
-| =fai_db_password=                     | read-the-source-luke                                         | Useful for DB installation profile                                                                       |
-| =fai_db_port=                         | 3306                                                         | Useful for editor & presentation profiles                                                                |
-| =fai_db_schema=                       | ece5db                                                       | Useful for DB installation profile                                                                       |
-| =fai_db_user=                         | ece5user                                                     | Useful for DB installation profile                                                                       |
-| =fai_dry_run=                         | 0                                                            | ece-install will download Escenic archives and install OS packages, but will not configure anything.     |
-| =fai_editor_conf_archive=             | ""                                                           | conf.tar.gz to use for Nursery & JAAS configuration                                                      |
-| =fai_editor_deploy_white_list=        | "escenic-admin escenic studio indexer-webservice webservice" | The list of WARs to be deployed on this instance.                                                        |
-| =fai_editor_ear=                      | ""                                                           | EAR to use instead of the Escenic binaries                                                               |
-| =fai_editor_install=                  | 0                                                            | Install the editorial profile                                                                            |
-| =fai_editor_name=                     | editor1                                                      | Name of the editor instance                                                                              |
-| =fai_editor_port=                     | 8080                                                         | HTTP port of the editor instance                                                                         |
-| =fai_editor_shutdown=                 | 8005                                                         | Shutdown port of the editor instance                                                                     |
-| =fai_editor_stop_and_clear=           | 0                                                            | After installation, stop the instances and clear its work & log files                                    |
-| =fai_enabled=                         | 0                                                            | Whether or not to run ece-install in FAI mode                                                            |
-| =fai_keep_off_etc_hosts=              | 0                                                            | Set this to 1 if you don't want ece-install adding entries to /etc/hosts                                 |
-| =fai_monitoring_admin_password=       | No telling you here ;-)                                      | The admin password of the web interface(s). Currenlty only set for Icinga.                               |
-| =fai_monitoring_ece_host_list=        | ""                                                           | Hosts running one or more ECE instance                                                                   |
-| =fai_monitoring_host_list=            | ""                                                           | Quoted, space separated list of <host>#<ip> pairs, e.g.: "pres1#10.72.227.250 pres2#10.72.227.251"       |
-| =fai_monitoring_install=              | 0                                                            | Install the monitoring server profile.                                                                   |
-| =fai_monitoring_munin_node_list=      | ""                                                           | Set this to a whitespace separated list of nodes that munin should monitor                               |
-| =fai_monitoring_search_host_list=     | ""                                                           | Hosts running search instance(s) (Solr + indexer)                                                        |
-| =fai_monitoring_server_ip=            | 127.0.0.1                                                    | The IP of the monitoring server.                                                                         |
-| =fai_nfs_allowed_client_network=      | ""                                                           | IP/netmwask of allowed NFS clients, example: 192.168.1.0/255.255.255.0                                   |
-| =fai_nfs_client_install=              | 0                                                            | Installs an NFS client                                                                                   |
-| =fai_nfs_client_mount_point_parent=   | /mnt                                                         | Mount point parent directory                                                                             |
-| =fai_nfs_export_list=                 | ""                                                           | Space separated list of NFS export directories, full paths as seen on the NFS server.                    |
-| =fai_nfs_server_address=              | ""                                                           | Address of the NFS server, useful for the NFS client profile                                             |
-| =fai_nfs_server_install=              | 0                                                            | Install an NFS server                                                                                    |
-| =fai_presentation_conf_archive=       | ""                                                           | conf.tar.gz to use for Nursery & JAAS configuration                                                      |
-| =fai_presentation_ear=                | ""                                                           | EAR to use instead of the Escenic binaries                                                               |
-| =fai_presentation_install=            | 0                                                            | Install the presentation server profile                                                                  |
-| =fai_presentation_name=               | engine1                                                  | Name of the presentation server instance                                                                 |
-| =fai_presentation_port=               | 8080                                                         | HTTP port of the presentation server instance                                                            |
-| =fai_presentation_deploy_white_list=  | "escenic-admin <assemblytool/publications/*>"                | The list of WARs to be deployed on this instance.                                                        |
-| =fai_presentation_shutdown=           | 8005                                                         | Shutdown port of the presentation instance                                                               |
-| =fai_presentation_stop_and_clear=     | 0                                                            | After installation, stop the instances and clear its work & log files                                    |
-| =fai_public_host_name=                | ${HOSTNAME}:8080                                             | The public address for your website                                                                      |
-| =fai_publication_create=              | 0                                                            | Create a new publication                                                                                 |
-| =fai_publication_domain_mapping_list= | ""                                                           | Mapping between publication names and their domains: "one[,other.war]#one.com other#other.com[#<alias1>[,<alias2>]]" |
-| =fai_publication_environment=         | "production"                                                 | The kind of environment/habitat. Typical values are: production, staging, testing, development.          |
-| =fai_publication_name=                | mypub                                                        | Name of the publication                                                                                  |
-| =fai_publication_use_instance=        | dev1                                                         | Name of local instance to use for creation                                                               |
-| =fai_publication_war_uri_list=        | ""                                                           | Publication WARs used for setting up Assembly tool.                                                      |
-| =fai_publication_war=                 | "WF or ECE demo WAR"                                         | WAR to base the new publication on                                                                       |
-| =fai_rmi_install=                     | 0                                                            | Install RMI hub profile                                                                                  |
-| =fai_search_conf_archive=             | ""                                                           | conf.tar.gz to use for Nursery & JAAS configuration                                                      |
-| =fai_search_deploy_white_list=        | "solr indexer-webapp"                                        | The list of WARs to be deployed on this instance.                                                        |
-| =fai_search_ear=                      | ""                                                           | EAR to use instead of the Escenic binaries                                                               |
-| =fai_search_for_editor=               | 0                                                            | If 1 (true), will configure Solr for use with an editorial server, if not for presentation servers.      |
-| =fai_search_indexer_ws_uri=           | http://${HOSTNAME}:8080/indexer-webservice/index/            | URI of the indexer-webservice that the search instance shall use for knowing what to index.              |
-| =fai_search_install=                  | 0                                                            | Install the search server profile (Solr + indexer)                                                       |
-| =fai_search_name=                     | search1                                                      | Name of the search instance                                                                              |
-| =fai_search_port=                     | 8080                                                         | HTTP port of the search instance                                                                         |
-| =fai_search_shutdown=                 | 8005                                                         | Shutdown port of the search instance                                                                     |
-| =fai_vip_address=                     | ""                                                           | The virtual IP the provider will claim                                                                   |
-| =fai_vip_install=                     | 0                                                            | Install a VIP provider                                                                                   |
-| =fai_vip_primary_node_auth_key=       | ""                                                           | Optional, but useful to set to make conf files consistent. Will be generated if not set                  |
-| =fai_vip_primary_node_ip=             | ""                                                           | Primary node IP                                                                                          |
-| =fai_vip_primary_node_name=           | ""                                                           | Primary node name, must be what $(uname -n) returns                                                      |
-| =fai_vip_secondary_node_ip=           | ""                                                           | Secondary node IP                                                                                        |
-| =fai_vip_secondary_node_name=         | ""                                                           | Secondary node name, must be what $(uname -n) returns                                                    |
-| =fai_vip_service_list=                | ""                                                           | List of init.d scripts to invoke when the VIP is acclaimed/revoked, script must support start & stop     |
-| =fai_vip_sibling_ip=                  | ""                                                           | The IP of the other node offering the VIP                                                                |
-| =fai_wf_install=                      | 0                                                            | Install Widget Framework profile                                                                         |
-|---------------------------------------+--------------------------------------------------------------+----------------------------------------------------------------------------------------------------------|
+|----------------------------------------+--------------------------------------------------------------+-------------------------------------------------------------------------------------------------------|
+| Parameter                              | Default                                                      | Description                                                                                           |
+|----------------------------------------+--------------------------------------------------------------+-------------------------------------------------------------------------------------------------------|
+| =fai_all_conf_archive=                 | ""                                                           | conf.tar.gz to use for Nursery & JAAS configuration                                                   |
+| =fai_all_ear=                          | ""                                                           | EAR to use instead of the Escenic binaries                                                            |
+| =fai_all_install=                      | 0                                                            | Install all components on your server.                                                                |
+| =fai_all_stop_and_clear=               | 0                                                            | After installation, stop the instance and clear its work & log files.                                 |
+| =fai_analysis_db_host=                 | localhost                                                    | For the EAE DB (different from ECE's)                                                                 |
+| =fai_analysis_db_install=              | 0                                                            | Install DB profile                                                                                    |
+| =fai_analysis_db_password=             | read-the-source-luke                                         | For the EAE DB (different from ECE's)                                                                 |
+| =fai_analysis_db_port=                 | 3306                                                         | For the EAE DB (different from ECE's)                                                                 |
+| =fai_analysis_db_schema=               | ece5db                                                       | For the EAE DB (different from ECE's)                                                                 |
+| =fai_analysis_db_user=                 | ece5user                                                     | For the EAE DB (different from ECE's)                                                                 |
+| =fai_analysis_install=                 | 0                                                            | Will install the Escenic Analysis Engine, aka Stats, EAE.                                             |
+| =fai_analysis_name=                    | analysis1                                                    | EAE instance name                                                                                     |
+| =fai_analysis_port=                    | 8080                                                         | Port of the EAE                                                                                       |
+| =fai_analysis_shutdown=                | 8005                                                         | Shutdown port for the EAE app server                                                                  |
+| =fai_analysis_stop_and_clear=          | 0                                                            | After installation, stop the instances and clear its work & log files                                 |
+| =fai_apt_vizrt_pool=                   | stable                                                       | Which package pool in the Vizrt APT to install package from.                                          |
+| =fai_cache_backends=                   | ${HOSTNAME}:8080                                             | Space separated, e.g. "app1:8080 app2:8080"                                                           |
+| =fai_cache_install=                    | 0                                                            | Install cache server profile                                                                          |
+| =fai_db_daily_backup=                  | 0                                                            | Sets up daily backup of the DB.                                                                       |
+| =fai_db_drop_old_db_first=             | 0                                                            | Warning: this will drop the old database before installing a new one                                  |
+| =fai_db_host=                          | $HOSTNAME                                                    | Useful for editor & presentation profiles                                                             |
+| =fai_db_install=                       | 0                                                            | Install db profile                                                                                    |
+| =fai_db_password=                      | read-the-source-luke                                         | Useful for DB installation profile                                                                    |
+| =fai_db_port=                          | 3306                                                         | Useful for editor & presentation profiles                                                             |
+| =fai_db_schema=                        | ece5db                                                       | Useful for DB installation profile                                                                    |
+| =fai_db_user=                          | ece5user                                                     | Useful for DB installation profile                                                                    |
+| =fai_dry_run=                          | 0                                                            | ece-install will download Escenic archives and install OS packages, but will not configure anything.  |
+| =fai_editor_conf_archive=              | ""                                                           | conf.tar.gz to use for Nursery & JAAS configuration                                                   |
+| =fai_editor_deploy_white_list=         | "escenic-admin escenic studio indexer-webservice webservice" | The list of WARs to be deployed on this instance.                                                     |
+| =fai_editor_ear=                       | ""                                                           | EAR to use instead of the Escenic binaries                                                            |
+| =fai_editor_install=                   | 0                                                            | Install the editorial profile                                                                         |
+| =fai_editor_name=                      | editor1                                                      | Name of the editor instance                                                                           |
+| =fai_editor_port=                      | 8080                                                         | HTTP port of the editor instance                                                                      |
+| =fai_editor_shutdown=                  | 8005                                                         | Shutdown port of the editor instance                                                                  |
+| =fai_editor_stop_and_clear=            | 0                                                            | After installation, stop the instances and clear its work & log files                                 |
+| =fai_enabled=                          | 0                                                            | Whether or not to run ece-install in FAI mode                                                         |
+| =fai_keep_off_etc_hosts=               | 0                                                            | Set this to 1 if you don't want ece-install adding entries to /etc/hosts                              |
+| =fai_monitoring_admin_password=        | No telling you here ;-)                                      | The admin password of the web interface(s). Currenlty only set for Icinga.                            |
+| =fai_monitoring_ece_host_list=         | ""                                                           | Hosts running one or more ECE instance                                                                |
+| =fai_monitoring_host_list=             | ""                                                           | Quoted, space separated list of <host>#<ip> pairs, e.g.: "pres1#10.72.227.250 pres2#10.72.227.251"    |
+| =fai_monitoring_install=               | 0                                                            | Install the monitoring server profile.                                                                |
+| =fai_monitoring_munin_node_list=       | ""                                                           | Set this to a whitespace separated list of nodes that munin should monitor                            |
+| =fai_monitoring_search_host_list=      | ""                                                           | Hosts running search instance(s) (Solr + indexer)                                                     |
+| =fai_monitoring_server_ip=             | 127.0.0.1                                                    | The IP of the monitoring server.                                                                      |
+| =fai_nfs_allowed_client_network=       | ""                                                           | IP/netmwask of allowed NFS clients, example: 192.168.1.0/255.255.255.0                                |
+| =fai_nfs_client_install=               | 0                                                            | Installs an NFS client                                                                                |
+| =fai_nfs_client_mount_point_parent=    | /mnt                                                         | Mount point parent directory                                                                          |
+| =fai_nfs_export_list=                  | ""                                                           | Space separated list of NFS export directories, full paths as seen on the NFS server.                 |
+| =fai_nfs_server_address=               | ""                                                           | Address of the NFS server, useful for the NFS client profile                                          |
+| =fai_nfs_server_install=               | 0                                                            | Install an NFS server                                                                                 |
+| =fai_presentation_conf_archive=        | ""                                                           | conf.tar.gz to use for Nursery & JAAS configuration                                                   |
+| =fai_presentation_ear=                 | ""                                                           | EAR to use instead of the Escenic binaries                                                            |
+| =fai_presentation_install=             | 0                                                            | Install the presentation server profile                                                               |
+| =fai_presentation_name=                | engine1                                                      | Name of the presentation server instance                                                              |
+| =fai_presentation_port=                | 8080                                                         | HTTP port of the presentation server instance                                                         |
+| =fai_presentation_deploy_white_list=   | "escenic-admin <assemblytool/publications/*>"                | The list of WARs to be deployed on this instance.                                                     |
+| =fai_presentation_shutdown=            | 8005                                                         | Shutdown port of the presentation instance                                                            |
+| =fai_presentation_stop_and_clear=      | 0                                                            | After installation, stop the instances and clear its work & log files                                 |
+| =fai_public_host_name=                 | ${HOSTNAME}:8080                                             | The public address for your website                                                                   |
+| =fai_publication_create=               | 0                                                            | Create a new publication                                                                              |
+| =fai_publication_domain_mapping_list=  | ""                                                           | Mapping between publications and domains: "<pub>[,pub.war]#<domain>[#,<alias1>,<alias2>]"             |
+| =fai_publication_ear=                  | ""                                                           | All publications WARs inside will be used for publication creation (assumes =fai_publication_create=) |
+| =fai_publication_environment=          | "production"                                                 | The kind of environment/habitat. Typical values are: production, staging, testing, development.       |
+| =fai_publication_name=                 | mypub                                                        | Name of the publication                                                                               |
+| =fai_publication_use_instance=         | dev1                                                         | Name of local instance to use for creation                                                            |
+| =fai_publication_war=                  | "WF or ECE demo WAR"                                         | WAR to base the new publication on                                                                    |
+| =fai_publication_war_remove_file_list= | ""                                                           | File list that should be removed from all WARs inside =fai_publication_ear= or =fai_publication_war=  |
+| =fai_publication_war_uri_list=         | ""                                                           | Publication WARs used for setting up Assembly tool.                                                   |
+| =fai_rmi_install=                      | 0                                                            | Install RMI hub profile                                                                               |
+| =fai_search_conf_archive=              | ""                                                           | conf.tar.gz to use for Nursery & JAAS configuration                                                   |
+| =fai_search_deploy_white_list=         | "solr indexer-webapp"                                        | The list of WARs to be deployed on this instance.                                                     |
+| =fai_search_ear=                       | ""                                                           | EAR to use instead of the Escenic binaries                                                            |
+| =fai_search_for_editor=                | 0                                                            | If 1 (true), will configure Solr for use with an editorial server, if not for presentation servers.   |
+| =fai_search_indexer_ws_uri=            | http://${HOSTNAME}:8080/indexer-webservice/index/            | URI of the indexer-webservice that the search instance shall use for knowing what to index.           |
+| =fai_search_install=                   | 0                                                            | Install the search server profile (Solr + indexer)                                                    |
+| =fai_search_name=                      | search1                                                      | Name of the search instance                                                                           |
+| =fai_search_port=                      | 8080                                                         | HTTP port of the search instance                                                                      |
+| =fai_search_shutdown=                  | 8005                                                         | Shutdown port of the search instance                                                                  |
+| =fai_vip_address=                      | ""                                                           | The virtual IP the provider will claim                                                                |
+| =fai_vip_install=                      | 0                                                            | Install a VIP provider                                                                                |
+| =fai_vip_primary_node_auth_key=        | ""                                                           | Optional, but useful to set to make conf files consistent. Will be generated if not set               |
+| =fai_vip_primary_node_ip=              | ""                                                           | Primary node IP                                                                                       |
+| =fai_vip_primary_node_name=            | ""                                                           | Primary node name, must be what $(uname -n) returns                                                   |
+| =fai_vip_secondary_node_ip=            | ""                                                           | Secondary node IP                                                                                     |
+| =fai_vip_secondary_node_name=          | ""                                                           | Secondary node name, must be what $(uname -n) returns                                                 |
+| =fai_vip_service_list=                 | ""                                                           | List of init.d scripts to invoke when the VIP is acclaimed/revoked, script must support start & stop  |
+| =fai_vip_sibling_ip=                   | ""                                                           | The IP of the other node offering the VIP                                                             |
+| =fai_wf_install=                       | 0                                                            | Install Widget Framework profile                                                                      |
+|----------------------------------------+--------------------------------------------------------------+-------------------------------------------------------------------------------------------------------|
+#+TBLFM: $1=fai_publication_war=
 
 0 means "false" and 1 means "true".
 

From 91b54cdcbd5add7c44ab887b44c73fe377ad0fba Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 5 Dec 2012 17:00:59 +0100
Subject: [PATCH 1760/2585] - fix in common-io::download_uri_target_to_dir when
 the URI is a local   file, either prefixed with file:/// or just a plain
 /<path>/file   reference

---
 usr/share/escenic/ece-scripts/common-io.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/common-io.sh b/usr/share/escenic/ece-scripts/common-io.sh
index dcf59bf3..dc195b35 100644
--- a/usr/share/escenic/ece-scripts/common-io.sh
+++ b/usr/share/escenic/ece-scripts/common-io.sh
@@ -99,7 +99,7 @@ function make_ln() {
 function download_uri_target_to_dir() {
   local uri=$1
   local target_dir=$2
-  local file=""
+  make_dir $target_dir
   
   if [[ $uri == "http://"* || $uri == "https://"* ]]; then
     log "Downloading" $uri "to" $target_dir "..." 
@@ -110,12 +110,13 @@ function download_uri_target_to_dir() {
       --server-response \
       --output-document $(basename $uri) \
       $uri
-    file=$target_dir/$(basename $uri)
   elif [[ $uri == "file://"* ]]; then
       # length of file:// is 7
-    file=${file:7}
+    local file=${file:7}
+    run cp $file $target_dir
   else
-    file=$uri
+    local file=$uri
+    run cp $file $target_dir
   fi
 }
 

From d82932235e5e35863fd2a7e5d98970cc9245d208 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 5 Dec 2012 17:01:59 +0100
Subject: [PATCH 1761/2585] - fai_publication_ear now supports EARs adressed by
 file://, http://   and https:// as well as local file references.

---
 .../escenic/ece-scripts/ece-install.d/create-publication.sh  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
index 8b17eb56..e461500c 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
@@ -33,11 +33,12 @@ function create_publication() {
       
       ensure_variable_is_set fai_publication_domain_mapping_list
       local the_tmp_dir=$(mktemp -d)
+      download_uri_target_to_dir $fai_publication_ear $download_dir
       (
         run cd $the_tmp_dir
-        run jar xf $fai_publication_ear
+        run jar xf $download_dir/$(basename $fai_publication_ear)
       )
-
+      
       for el in ${fai_publication_domain_mapping_list}; do
         local old_ifs=$IFS
         # the entries in the fai_publication_domain_mapping_list are on

From 7f34812a6a02e6a84af4e52d9f11085e3c645b2b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 6 Dec 2012 10:18:34 +0100
Subject: [PATCH 1762/2585] - ece deploy will now update a new deployment log
 file, specific to   the ECE instance:
 /var/lib/escenic/<instance>-deployment.log

  The log format will be:
  <date> <URI of the EAR> <EAR version> <MD5 sum of the downloaded EAR>
---
 usr/share/escenic/ece-scripts/ece.d/deploy.sh | 35 ++++++++++++++-----
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/deploy.sh b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
index 4041b48c..b2b0a112 100644
--- a/usr/share/escenic/ece-scripts/ece.d/deploy.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
@@ -4,6 +4,10 @@ function get_state_file() {
   echo $data_dir/${instance}.state
 }
 
+function get_deployment_log_file() {
+  echo $data_dir/${instance}-deployment.log
+}
+
 ## $1 : local EAR file
 function get_version_from_ear_file() {
   local version=$(basename $1 .ear | sed 's/^engine-//g')
@@ -18,7 +22,7 @@ function get_version_from_ear_file() {
 }
 
 ## $1 : local EAR file
-function update_deployment_state_file() {
+function update_deployment_state_and_log_files() {
   local state_file=$(get_state_file)
 
   if [ ! -w $(dirname $state_file) ]; then
@@ -27,17 +31,30 @@ function update_deployment_state_file() {
   fi
 
   if [ -n "${file}" ]; then
-    echo "ear_used=$file" > $state_file
+    ear_used=$file
   else
-    echo "ear_used=$1" > $state_file
+    ear_used=$1
   fi
-  
-  cat >> $state_file <<EOF
-version=$(get_version_from_ear_file $1)
-md5_sum=$(md5sum $1 | cut -d' ' -f1)
-deployed_date=$(date)
+
+  local deployment_date=$(date)
+  # we use $1 here as this is the locally downloaded EAR (if the
+  # deployment was done with --uri)
+  local ear_md5_sum=$(md5sum $1 | cut -d' ' -f1)
+
+  cat > $state_file <<EOF
+ear_used=$ear_used
+version=$(get_version_from_ear_file ${ear_used})
+md5_sum=${ear_md5_sum}
+deployed_date=${deployment_date}
 EOF
 
+  # update the deployment log too
+  echo ${deployment_date} \
+    ${ear_used} \
+    $(get_version_from_ear_file ${ear_used}) \
+    ${ear_md5_sum} \
+    > $(get_deployment_log_file)
+  
   print_and_log "Deployment state file updated: $state_file"
 }
 
@@ -168,7 +185,7 @@ function deploy() {
   esac
 
   run rm -rf ${dir}
-  update_deployment_state_file $ear
+  update_deployment_state_and_log_files $ear
 }
 
 ## $1 : dir of the webapp 

From 6772b32f8b40bb3db4cd954eb76104fc6d9e6256 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 6 Dec 2012 10:40:23 +0100
Subject: [PATCH 1763/2585] - added command which will generate a change log of
 all the changes   from (and optionally to) a Subversion revision or tag.

-  The script will search all commit messages in this period for any
   JIRA keys and if found, query JIRA to get background information
    about the issue.

-  The script will also generate a full diff for the user to view,
   either by cat-ing a file or getting the diff displayed on the
   command line (if the user adds the --full) parameter.

- Example run:

    $ generate-changelog --from 6161 --project MYP
    [#MYP-210] Fix customer reported problems in Drum Sports  - mycustomer
    URL: https://mycustomer.jira.com}/browse/MYP-210
    [#MYP-243] Put new Reporter Plugin in production - mycustomer
    URL: https://mycustomer.jira.com}/browse/MYP-243
    [#MYP-252] Streaming failed due to bad proxy configuration of ece - mycustomer
    URL: https://mycustomer.jira.com}/browse/MYP-252
    [#MYP-254] DrumPost and Base loads wrong on ipad/iphone - mycustomer
    URL: https://mycustomer.jira.com}/browse/MYP-254
    A full overview of all the changes can be viewed here:
    /tmp/tmp.lWWtyvLepq-MYP-from-6161-to-6213.diff
---
 usr/bin/generate-changelog | 108 +++++++++++++++++++++++++++++++++++++
 1 file changed, 108 insertions(+)
 create mode 100755 usr/bin/generate-changelog

diff --git a/usr/bin/generate-changelog b/usr/bin/generate-changelog
new file mode 100755
index 00000000..04aea9aa
--- /dev/null
+++ b/usr/bin/generate-changelog
@@ -0,0 +1,108 @@
+#! /usr/bin/env bash
+
+log=$HOME/.$(basename $0).log
+
+function bootstrap_thyself() {
+  # first, try to be nice, then check the standard location
+  local dir=$(dirname $0)/../share/escenic/ece-scripts
+  if [ ! -d $dir  ]; then
+    dir=/usr/share/escenic/ece-scripts
+  fi
+
+  local common_libraries="
+    common-bashing.sh
+    common-io.sh
+  "
+
+  for el in $common_libraries; do
+    source $dir/$el 2>/dev/null || {
+      echo "$(basename $0): Could not load the library $el," \
+        "and I can't live without it :-(" | fmt
+      exit 1
+    }
+  done
+}
+
+function read_user_settings() {
+  local file=$HOME/.$(basename $0).conf
+  run source $file
+}
+
+function get_header_from_jira() {
+  local body=$(curl -s https://${user}:${password}@${jira_host}/browse/${1})
+  echo "$body" | grep '<title>' | sed -e 's/<title>//g' -e 's/<\/title>//g'
+  echo "URL:" https://$jira_host}/browse/${1}
+}
+
+function get_to_revision() {
+  svn info | grep ^'Last Changed Rev' | awk '{ print $4 }'
+}
+
+function get_from_revision() {
+  echo ${from-PREV}
+}
+
+function get_user_input() {
+  local next_is_from=0
+  local next_is_to=0
+  local next_is_project=0
+  
+  for el in "$@"; do
+    if [[ "$el" == "-s" || "$el" == "--from" ]]; then
+      next_is_from=1
+    elif [[ "$el" == "-t" || "$el" == "--to" ]]; then
+      next_is_to=1
+    elif [[ "$el" == "-p" || "$el" == "--project" ]]; then
+      next_is_project=1
+    elif [[ "$el" == "-f" || "$el" == "--full" ]]; then
+      full_listing=1
+    elif [ ${next_is_from-0} -eq 1 ]; then
+      from=$el
+      next_is_from=0
+    elif [ ${next_is_to-0} -eq 1 ]; then
+      to=$el
+      next_is_to=0
+    elif [ ${next_is_project-0} -eq 1 ]; then
+      project_code=$el
+      next_is_project=0
+    fi
+  done
+}
+
+function get_commit_information_from_vcs() {
+  local suffix=-${project_code}-from-$(get_from_revision)-to-$(get_to_revision).diff
+  local tmp_diff=$(mktemp --suffix "${suffix}")
+  svn diff -r $(get_from_revision):$(get_to_revision) > $tmp_diff
+  exit_on_error "svn diff"
+  if [ ${full_listing-0} -eq 1 ]; then
+    cat $tmp_diff
+  else
+    echo "A full overview of all the changes can be viewed here:" $tmp_diff | fmt
+  fi
+}
+
+function get_related_issue_overview() {
+  local commit_log=$(svn log -r $(get_from_revision):$(get_to_revision))
+  echo "$commit_log" | \
+    grep ${project_code}-[0-9]* | \
+    sed "s#.*\(${project_code}-[0-9]*\).*#\1#g" | \
+    sort | \
+    uniq | while read f; do
+    get_header_from_jira $f
+  done
+}
+
+function sanity_check() {
+  if [ ! -e $(pwd)/.svn ]; then
+    print "This directory, $(pwd), " \
+      "does not contain a working version control checkout."
+    exit 1
+  fi
+}
+
+bootstrap_thyself
+read_user_settings
+get_user_input "$@"
+sanity_check
+get_related_issue_overview
+get_commit_information_from_vcs

From bbbaaac722328a122d3c73b403e8565543b08f5f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 6 Dec 2012 11:00:08 +0100
Subject: [PATCH 1764/2585] - 'ece deploy' will now update an instance specific
 deployment log with:

    <date> <EAR> <MD5 sum of the EAR>

- 'ece list-logs' will now list the new deployment log

- improved ece list-logs, it will now not show any of the log files if
  they don't exist on the file system.

- fixed regression bug in 'ece list-logs', which didn't list the log4j
  file or app server file (for Tomcat) with the latest/later changes
  to ece-install's way of setting up the logging.

- removed the file version column from the deployment log as it's
  already there in the file name of the EAR.
---
 usr/bin/ece                                   |  1 +
 usr/share/escenic/ece-scripts/ece.d/deploy.sh |  9 +++++----
 usr/share/escenic/ece-scripts/ece.d/logs.sh   | 13 +++++++++++--
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index b83ab585..5b746892 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -195,6 +195,7 @@ function set_common_settings() {
 
     log4j_file_list="
       $log_dir/${HOSTNAME}-${instance}-messages
+      $log_dir/${instance}-messages
       $log_dir/messages
       $log_dir/Escenic-error.log
     "
diff --git a/usr/share/escenic/ece-scripts/ece.d/deploy.sh b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
index b2b0a112..077aa965 100644
--- a/usr/share/escenic/ece-scripts/ece.d/deploy.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
@@ -48,14 +48,15 @@ md5_sum=${ear_md5_sum}
 deployed_date=${deployment_date}
 EOF
 
+  print_and_log "Deployment state file updated: $state_file"
+
   # update the deployment log too
   echo ${deployment_date} \
-    ${ear_used} \
-    $(get_version_from_ear_file ${ear_used}) \
+    $(basename ${ear_used}) \
     ${ear_md5_sum} \
-    > $(get_deployment_log_file)
+    >> $(get_deployment_log_file)
   
-  print_and_log "Deployment state file updated: $state_file"
+  print_and_log "Deployment log file updated:" $(get_deployment_log_file)
 }
 
 function deploy() {
diff --git a/usr/share/escenic/ece-scripts/ece.d/logs.sh b/usr/share/escenic/ece-scripts/ece.d/logs.sh
index b4bd57e9..a1453a15 100644
--- a/usr/share/escenic/ece-scripts/ece.d/logs.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/logs.sh
@@ -1,5 +1,13 @@
 function get_gc_log() {
-  echo ${gc_log}
+  if [ -r $gc_log ]; then
+    echo ${gc_log}
+  fi
+}
+
+function get_deployment_log() {
+  if [ -r $log_dir/${instance}-deployment.log ]; then
+    echo $log_dir/${instance}-deployment.log
+  fi
 }
 
 function get_log4j_log() {
@@ -32,7 +40,7 @@ function tail_out_log() {
 function get_app_log() {
   local app_log=""
   if [ "$appserver" == "tomcat" ]; then
-    app_log=$tomcat_base/logs/localhost.`date +%F`.log
+    app_log=$log_dir/${instance}-tomcat
   elif [ "$appserver" == "resin" -a -e $resin_home/log/jvm-default.log ]; then
     app_log=$resin_home/log/jvm-default.log
   else
@@ -65,6 +73,7 @@ function show_all_log_paths() {
     print "Log4j log:  "$(get_log4j_log)
     print "GC log:  "$(get_gc_log)
     print "$(basename $0) script log: "$log
+    print "Deployment log:" $(get_deployment_log)
   else
     echo $(get_app_log)
     if [[ $appserver == "tomcat" ]]; then

From 3b99c6a4fe02ddf349594d3e5c0fae21f07e4a35 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 6 Dec 2012 11:47:13 +0100
Subject: [PATCH 1765/2585] Added support for sbin in spore packages

---
 usr/share/escenic/package-scripts/create-packages | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index b2fa0a3c..ee6c453a 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -236,7 +236,7 @@ function set_up_hugin-node() {
 }
 
 function set_up_spore() {
-  mkdir -p $target_dir/usr/bin \
+  mkdir -p $target_dir/usr/{bin,sbin} \
            $target_dir/usr/share/doc/spore
 
   local dir=$(mktemp -d)
@@ -245,6 +245,7 @@ function set_up_spore() {
     wget $wget_opts https://github.com/vizrt/spore/archive/master.tar.gz 
     tar xzf master.tar.gz
     cp $dir/spore-master/bin/* $target_dir/usr/bin
+    cp $dir/spore-master/sbin/* $target_dir/usr/sbin
     cp $dir/spore-master/README.md $target_dir/usr/share/doc/spore
     cp -r $dir/spore-master/examples $target_dir/usr/share/doc/spore/examples
   )

From a1e5cdbdd9d71849a5f4603abdcd9966952bf34a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 6 Dec 2012 12:31:58 +0100
Subject: [PATCH 1766/2585] - cleaned up the use of print

---
 usr/share/escenic/ece-scripts/ece.d/start.sh | 25 +++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/start.sh b/usr/share/escenic/ece-scripts/ece.d/start.sh
index c95a0dba..7e691190 100644
--- a/usr/share/escenic/ece-scripts/ece.d/start.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/start.sh
@@ -12,10 +12,10 @@ function start_type() {
     if [ -r $rmi_hub_conf ]; then
       export CLASSPATH=$rmi_hub_conf:$CLASSPATH
     else
-      print $rmi_hub_conf "must point to a valid Nursery configuration"
-      print "for the rmi-hub, you may copy the one found in"
-      print "$ece_home/contrib/rmi-hub/config."
-      print "Exiting :-("
+      print $rmi_hub_conf "must point to a valid Nursery configuration" \
+        "for the rmi-hub, you may copy the one found in" \
+        "$ece_home/contrib/rmi-hub/config." \
+        "Exiting :-("
       exit 1
     fi
     
@@ -31,7 +31,7 @@ function start_type() {
     
     echo $pid > $pid_file
     exit 0
-
+    
   elif [ "$type" == "search" ]; then
     # TODO trim & tun the default parameters for the search
     # instance.
@@ -39,9 +39,9 @@ function start_type() {
   elif [ "$type" == "engine" ]; then
     ensure_that_required_fields_are_set $engine_required_fields
     if [ ! -d "$ece_security_configuration_dir" ] ; then
-      print "ece_security_configuration_dir $ece_security_configuration_dir"
-      print "did not exist."
-      print "Exiting :-("
+      print "ece_security_configuration_dir $ece_security_configuration_dir" \
+        "did not exist." \
+        "Exiting :-("
       exit 1
     fi
   elif [ "$type" == "analysis" ]; then
@@ -56,16 +56,14 @@ function start_type() {
       # Tomcat respects JAVA_OPTS set in configure(), so no need to
       # set them here.
       if [ ! -x $tomcat_home/bin/catalina.sh ]; then
-        print "$tomcat_home/bin/catalina.sh was not executable"
-        print "unable to start tomcat"
+        print "$tomcat_home/bin/catalina.sh was not executable" \
+          "unable to start tomcat"
         exit 1
       fi
 
       export CATALINA_PID=$pid_file
       export CATALINA_OUT=$(get_catalina_out_file)
-      $tomcat_home/bin/catalina.sh start \
-        1>>$log \
-        2>>$log
+      run $tomcat_home/bin/catalina.sh start
       ;;
     oc4j)
       export OC4J_JVM_ARGS=$ece_args
@@ -113,6 +111,5 @@ function start_type() {
       exit 1
   esac
   
-  
   exit_on_error $message
 }

From 04a93e76455976bb3fbd402e708e1139c4cd7a14 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 6 Dec 2012 13:09:44 +0100
Subject: [PATCH 1767/2585] - ece -p TAB now auto completes the publication
 names!

  It does this by using common-ece::get_publication_list (if
  available).
---
 etc/bash_completion.d/ece | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/etc/bash_completion.d/ece b/etc/bash_completion.d/ece
index 6fd14012..69993a72 100644
--- a/etc/bash_completion.d/ece
+++ b/etc/bash_completion.d/ece
@@ -18,6 +18,7 @@ _ece_commands()
       kill
       list-instances
       list-logs
+      list-publications
       log
       outlog
       package
@@ -40,14 +41,6 @@ _ece_commands()
     # default completions is the list of commands
     completions=$commands" "$options
 
-    publications=""
-    dir=/opt/escenic/assemblytool/publications
-    if [ -r $dir ] ; then
-        for el in ${dir}/*.properties; do
-            publications=$(basename $el .properties)" "$publications
-        done
-    fi
-
     case "$prev" in
         backup)
             exclude_list="
@@ -71,7 +64,13 @@ _ece_commands()
             completions=$(ece -q list-instances)
             ;;
         -p|--publication)
-            completions=$publications
+            local file=/usr/share/escenic/ece-scripts/common-ece.sh
+            if [ -r $file ]; then
+              source $file
+              completions=$(get_publication_list)
+            else
+              completions=""
+            fi
             ;;
         -r|--publication-resource)
             completions=$resources

From 6c5fb4b893e1a68870d1a5d7dcdafabf7fcdff4d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 6 Dec 2012 13:10:54 +0100
Subject: [PATCH 1768/2585] - added common-ece::get_publication_list which will
 list the   publications listed on the local host's /escenic-admin  
 application.

  The method accepts an optional argument of the port number of the
  running instance.
---
 usr/share/escenic/ece-scripts/common-ece.sh | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/common-ece.sh b/usr/share/escenic/ece-scripts/common-ece.sh
index eb53c5f2..c45002ff 100644
--- a/usr/share/escenic/ece-scripts/common-ece.sh
+++ b/usr/share/escenic/ece-scripts/common-ece.sh
@@ -71,3 +71,18 @@ function get_app_base() {
 
   echo webapps-${war}
 }
+
+## Returns a list of publications on the local host
+## 
+## $1 :: app server port. Optional, default is 8080.
+function get_publication_list() {
+  if [ $(which curl | wc -l) -lt 1 ]; then
+    return ""
+  fi
+  
+  curl --silent \
+    --connect-timeout 20 \
+    http://localhost:${1-8080}/escenic-admin/pages/publication/list.jsp | \
+    grep '/escenic-admin/pages/publication/view.jsp' | \
+    sed 's/.*name=\(.*\)".*/\1/g'
+}

From af3adcbd142c5a018619f8bec5216221f8949aaa Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 6 Dec 2012 13:11:14 +0100
Subject: [PATCH 1769/2585] - added new command to 'ece', namely 'ece
 list-publications'

---
 usr/bin/ece | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/usr/bin/ece b/usr/bin/ece
index 5b746892..22009be9 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -749,6 +749,12 @@ function get_escenic_admin_url() {
     echo ${url}
 }
 
+function show_all_publications() {
+  set_type_port
+  print "These are all the publications on ${instance}:"
+  get_publication_list ${port}
+}  
+
 init
 read_rc_file_if_present
 set_type_command_and_instance $@
@@ -781,6 +787,9 @@ for el in $command; do
         list-logs)
             show_all_log_paths
             ;;
+        list-publications)
+            show_all_publications
+            ;;
         outlog)
             tail_out_log
             ;;

From 0e5cdb48f5f4f44fb53d51cd54332ec473cf5549 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 6 Dec 2012 14:32:58 +0100
Subject: [PATCH 1770/2585] - added in code documentation why we set up the
 virtual hosts the way   we do WRT WAR names versus publication names

---
 usr/share/escenic/ece-scripts/ece-install.d/app-server.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 4289ca2b..86fc4dc3 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -330,6 +330,12 @@ EOF
 
       local file=$tomcat_base/conf/server.xml
 
+      # We are using the WAR and not the publication as the base for
+      # the appBase and docBase variables here to make it possible for
+      # 'ece deploy' to figure out the same location for deploying the
+      # WARs. As 'ece deploy' doesn't have any concept of which
+      # publication the WARs belong to, we must use a scheme were it's
+      # the WAR file name which determines the webapp context.
       cat >> $file <<EOF
       <Host
         name="${domain}"

From 1eebcbb19ed780233de68b5893c65606d41282ee Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 7 Dec 2012 09:34:24 +0100
Subject: [PATCH 1771/2585] - fixed regression in deployment of conf packages -
 hardening - made more use of common code - added own exit trap/hook to clean
 up partial (failed) deployments.

---
 usr/sbin/ece-deploy | 184 +++++++++++++++++++++++++-------------------
 1 file changed, 104 insertions(+), 80 deletions(-)

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
index 3158956f..146a2d3d 100755
--- a/usr/sbin/ece-deploy
+++ b/usr/sbin/ece-deploy
@@ -11,6 +11,12 @@
 ece_deploy_data_dir=/var/lib/escenic/$(basename $0)
 ece_deploy_download_dir=/var/cache/escenic
 
+function ece_deploy_cancel_hook() {
+  local the_dir=$ece_deploy_data_dir/$deployment_id
+  run rm -rf $the_dir
+  common_bashing_user_cancelled_hook
+}
+
 function bootstrap_thyself() {
   # first, try to be nice, then check the standard location
   local dir=$(dirname $0)/../share/escenic/ece-scripts
@@ -22,6 +28,7 @@ function bootstrap_thyself() {
     common-bashing.sh
     common-io.sh
     common-os.sh
+    common-ece.sh
   "
 
   for el in $common_libraries; do
@@ -38,7 +45,7 @@ function bootstrap_thyself() {
   # hooks for when the scirpt exits cleanly and when a user or someone
   # kills the process
   trap common_bashing_exit_hook EXIT
-  trap common_bashing_user_cancelled_hook SIGINT SIGHUP
+  trap ece_deploy_cancel_hook SIGINT SIGHUP
 }
 
 bootstrap_thyself
@@ -75,6 +82,10 @@ function deploy_ear() {
   for el in $engine_instance_list; do
     su - $ece_unix_user -c \
       "${proxy_settings} ece -i $el stop deploy clean start --uri $ear_uri"
+    if [ ${PIPESTATUS[@]} -gt 0 ]; then
+      exit 1
+    fi
+    
     # asking for the versions to make sure the ECEs are
     # bootstrapped. It's also nice user feedback to see which versions
     # are deployed/upgraded.
@@ -234,6 +245,14 @@ publication_resource_list="
   "
 
 function looks_like_xml() {
+  if [ -z "$1" ]; then
+    echo 0
+  fi
+
+  if [ ! -r "$1" ]; then
+    echo 0
+  fi
+  
   local xml=$(cat "$1")
   if [[ ${xml:0:1} == "<" ]]; then
     echo 1
@@ -242,15 +261,6 @@ function looks_like_xml() {
   fi
 }
 
-## app server port
-function get_publication_list() {
-  curl --silent \
-    http://localhost:8080/escenic-admin/pages/publication/list.jsp | \
-    grep '/escenic-admin/pages/publication/view.jsp' | \
-    sed 's/.*name=\(.*\)".*/\1/g'
-}
-
-
 ## $1 :: base dir of the new publication resource to apply to the
 ## running instance. If this base dir is the $tomcat_base from the
 ## ece-<instance>.conf, the function will figure out the path to the
@@ -261,84 +271,96 @@ function update_publication_resources() {
     return
   fi
 
-  for el in $engine_instance_list; do
-    source /etc/escenic/ece-${el}.conf
-
-    print_and_log "Getting the publication list on $el ..."
-    for i in {0..5}; do
-      local publication_list=$(get_publication_list ${appserver_port})
-      
-      if [ -n "${publication_list}" ]; then
-        break
-      fi
-      
+  print_and_log "Will now update the publication resources" \
+    "getting list of all publications on $el ..."
+  for i in {0..5}; do
+    local publication_list=$(get_publication_list ${appserver_port})
+    
+    if [ -n "${publication_list}" ]; then
+      break
+    fi
+    
       # if we haven't gotten any content from the local ECE (yet), it
       # might be because it hasn't come up yet (slow app server),
       # hence we sleep for a wee while and try again.
-      sleep 3
-    done
+    sleep 3
+  done
 
-    if [ -z "${publication_list}" ]; then
-      print_and_log "$el doesn't have any publications" \
-        "so there's no publication resources to update ;-)"
-      continue
+  if [ -z "${publication_list}" ]; then
+    print_and_log "$el doesn't have any publications" \
+      "so there's no publication resources to update ;-)"
+    continue
+  fi
+
+  for publication in $publication_list; do
+    if [[ "$1" == "$tomcat_base" ]]; then
+      local publication_resources_dir=$tomcat_base/webapps-${publication}/${publication}/META-INF/escenic/publication-resources
+    else
+      local publication_resources_dir=${1}/${publication}
     fi
 
-    for publication in $publication_list; do
-      print_and_log "Updating resources for publication" $publication "..."
+    if [ ! -d $publication_resources_dir ]; then
+      continue
+    fi
 
-      if [[ "$1" == "$tomcat_base" ]]; then
-        local publication_resources_dir=$tomcat_base/webapps-${publication}/${publication}/META-INF/escenic/publication-resources
+    print_and_log "Updating resources for publication" $publication "..."
+    for ele in $(find $publication_resources_dir -type f | sed "s#${publication_resources_dir}/##g"); do
+      new_dir=$ece_deploy_data_dir/$deployment_id/new/$publication/$(dirname $ele)
+      make_dir $new_dir
+      old_file=$ece_deploy_data_dir/$deployment_id/old/$publication/${ele}
+      
+      # when updating the resources as a part of a regular
+      # deployment (as opposed to a roll back) we must download the
+      # old/current version of the file.
+      if [ ! -e $old_file ]; then
+        make_dir $(dirname $old_file)
+        (
+          cd $(dirname $old_file)
+          wget \
+            --quiet \
+            --continue \
+            http://localhost:${appserver_port}/escenic-admin/publication-resources/$publication/${ele} \
+            2>/dev/null
+
+          if [ $(looks_like_xml $(basename ${ele})) -eq 1 ]; then
+            xmllint --format ${ele} > ${ele}.tmp
+            mv ${ele}.tmp ${ele}
+          fi
+        )
+      fi
+      
+      if [ $(looks_like_xml $publication_resources_dir/$ele) -eq 1 ]; then
+        new_file=$new_dir/$(basename $ele)
+        xmllint --format $publication_resources_dir/$ele > $new_file
       else
-        local publication_resources_dir=${1}/${publication}
+        new_file=$new_dir/$(basename $ele)
+        cp $publication_resources_dir/$ele $new_dir/$(basename $ele)
       fi
 
-      if [ ! -d $publication_resources_dir ]; then
-        continue
+      if [ ! -e $old_file ]; then
+        old_file=$(mktemp)
       fi
 
-      (
-        cd $publication_resources_dir
-        for ele in $(find -type f | sed 's#^./##g'); do
-          new_dir=$ece_deploy_data_dir/$deployment_id/new/$publication/$(dirname $ele)
-          make_dir $new_dir
-
-          old_file=$ece_deploy_data_dir/$deployment_id/old/$publication/${ele}
-
-          if [ $(looks_like_xml $ele) -eq 1 ]; then
-            file=$new_dir/$(basename $ele)
-            xmllint --format $ele > $file
-          else
-            file=$new_dir/$(basename $ele)
-            cp $ele $dir/$(basename $ele)
-          fi
-
-          if [ ! -e $old_file ]; then
-            old_file=$(mktemp)
-          fi
-
-          local number_of_lines_changed=$(
-            diff \
-              <(cat $old_file | grep -v '^$') \
-              <(cat $file | grep -v '^$') | \
-              egrep '<|>' | \
-              wc -l
-          )
-          if [ ${number_of_lines_changed} -lt 1 ]; then
-            continue
-          fi
+      local number_of_lines_changed=$(
+        diff -w \
+          <(cat $old_file | grep -v '^$') \
+          <(cat $new_file | grep -v '^$') | \
+          egrep '<|>' | \
+          wc -l
+      )
+      if [ ${number_of_lines_changed} -lt 1 ]; then
+        continue
+      fi
 
-          print_and_log "Applying" \
-            $number_of_lines_changed \
-            "changes to" $ele \
-            "full diff can be found here: $new_dir/$(basename $ele).diff"
-          diff $old_file $file > $new_dir/$(basename $ele).diff
+      print_and_log "Applying" \
+        $number_of_lines_changed \
+        "changes to" $ele \
+        "full diff can be found here: $new_dir/$(basename $ele).diff"
+      diff -w $old_file $new_file > $new_dir/$(basename $ele).diff
 
-          run curl --silent \
-            -T $ele \
-            http://localhost:${appserver_port}/escenic-admin/publication-resources/${publication}/$ele
-        done
-      )
+      run curl --silent \
+        -T $publication_resources_dir/$ele \
+        http://localhost:${appserver_port}/escenic-admin/publication-resources/${publication}/$ele
     done
   done
 }
@@ -351,7 +373,7 @@ function generate_deployment_id() {
 function roll_back_everything_to_version() {
   print_and_log "Rolling back to" \
     ${roll_back_to_version} \
-    "from" $(date --date @${roll_back_to_version}) \
+    "from" $(date --date @$(echo ${roll_back_to_version} | cut -d'-' -f2)) \
     "..."
 
   local old_ece_deploy_data_dir=$ece_deploy_data_dir/${roll_back_to_version}/old
@@ -393,8 +415,6 @@ function roll_back_everything_to_version() {
     ear_uri=${old_ear}
     deploy_ear
   done
-
-  print_and_log "You have now rolled back to deployment ${roll_back_to_version}"
 }
 
 ## $1 :: dir, can be the patht to the new or old directory of this
@@ -459,13 +479,15 @@ if [ ${make_deployment-1} -eq 1 ]; then
   remember_state $ece_deploy_data_dir/$deployment_id/old
 
   deploy_ear
-  if [ -n "$conf_uri" ]; then
+  if [ -n "$conf_package_uri" ]; then
     deploy_conf
   fi
   
   if [ ${update_the_publication_resources-0} -eq 1 ]; then
-    # not active until gets stable
-    echo update_publication_resources $tomcat_base
+    for el in $engine_instance_list; do
+      run source /etc/escenic/ece-${el}.conf
+      update_publication_resources $tomcat_base
+    done
   fi
 
   start_all_content_engine_instances
@@ -483,6 +505,8 @@ if [ ${roll_back-0} -eq 1 ]; then
   if [ ${update_the_publication_resources-0} -eq 1 ]; then
     update_publication_resources $ece_deploy_data_dir/${roll_back_to_version}/new
   fi
+  
+  print_and_log "You have now rolled back to deployment ${roll_back_to_version}"
 fi
 
 if [ ${list_the_revious_deployments-0} -eq 0 ]; then

From b58e463f489171ce8eba22d26814a366bbb17420 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 7 Dec 2012 10:21:26 +0100
Subject: [PATCH 1772/2585] - ece.conf is now included in the
 escenic-content-engine-scripts package

---
 usr/share/escenic/package-scripts/create-packages | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index ee6c453a..8d68a680 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -134,6 +134,7 @@ function set_up_escenic-content-engine-scripts() {
   local examples_dir=$doc_dir/examples/etc/default
   mkdir -p $examples_dir
   cp ../../../../etc/default/ece $examples_dir
+  cp ../../../../etc/escenic/ece.conf $doc_dir/examples/etc
   
   # cron
   cp -r ../../../../etc/cron.daily/remove-old-escenic-log-files \

From b133254abdf240e7f962f5ec9c951bce99413eda Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 7 Dec 2012 16:59:16 +0100
Subject: [PATCH 1773/2585] - deployment with publication resource update for
 the win! Now   starting to work nicely with .diff file summary and all.

---
 usr/sbin/ece-deploy | 152 +++++++++++++++++++++++++++-----------------
 1 file changed, 94 insertions(+), 58 deletions(-)

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
index 146a2d3d..b2417165 100755
--- a/usr/sbin/ece-deploy
+++ b/usr/sbin/ece-deploy
@@ -17,6 +17,19 @@ function ece_deploy_cancel_hook() {
   common_bashing_user_cancelled_hook
 }
 
+function create_pretty_printed_file_if_xml() {
+  if [ ! $1 ]; then
+    return
+  fi
+  if [ ! -e $1 ]; then
+    return
+  fi
+  
+  if [ $(looks_like_xml ${1}) -eq 1 ]; then
+    xmllint --format ${1} > ${1}.xml
+  fi
+}
+
 function bootstrap_thyself() {
   # first, try to be nice, then check the standard location
   local dir=$(dirname $0)/../share/escenic/ece-scripts
@@ -53,18 +66,6 @@ bootstrap_thyself
 log=/var/log/escenic/$(basename $0).log
 run source /etc/default/ece
 
-function get_old_dir() {
-  local old_dir=$ece_deploy_data_dir/$deployment_id/old
-  make_dir $old_dir
-  echo $old_dir
-}
-
-function get_new_dir() {
-  local new_dir=$ece_deploy_data_dir/$deployment_id/new
-  make_dir $new_dir
-  echo $new_dir
-}
-
 function deploy_ear() {
   local proxy_setings=""
   if [ -n "$http_proxy" ]; then
@@ -75,7 +76,7 @@ function deploy_ear() {
   for el in $engine_instance_list $search_instance_list; do
     local file=/var/lib/escenic/${el}.state
     if [ -e $file ]; then
-      run cp $file $(get_old_dir)
+      run cp $file $(get_publication_old_dir)
     fi
   done
     
@@ -261,6 +262,18 @@ function looks_like_xml() {
   fi
 }
 
+function get_deployment_dir() {
+  echo $ece_deploy_data_dir/$deployment_id
+}
+
+function get_publication_new_dir() {
+  echo $(get_deployment_dir)/new/$publication
+}
+
+function get_publication_old_dir() {
+  echo $(get_deployment_dir)/old/$publication
+}
+
 ## $1 :: base dir of the new publication resource to apply to the
 ## running instance. If this base dir is the $tomcat_base from the
 ## ece-<instance>.conf, the function will figure out the path to the
@@ -304,63 +317,79 @@ function update_publication_resources() {
     fi
 
     print_and_log "Updating resources for publication" $publication "..."
-    for ele in $(find $publication_resources_dir -type f | sed "s#${publication_resources_dir}/##g"); do
-      new_dir=$ece_deploy_data_dir/$deployment_id/new/$publication/$(dirname $ele)
-      make_dir $new_dir
-      old_file=$ece_deploy_data_dir/$deployment_id/old/$publication/${ele}
+    for publication_resource in $(find $publication_resources_dir -type f); do
+      local relative_resource=$(
+        echo $publication_resource | sed "s#${publication_resources_dir}/##g"
+      )
+
+      local new_file=$(get_publication_new_dir)/${relative_resource}
+      local old_file=$(get_publication_old_dir)/${relative_resource}
+      make_dir $(dirname $new_file) $(dirname $old_file)
+
+      # copy the new file to the deployment data directory
+      run cp $publication_resource $new_file
       
-      # when updating the resources as a part of a regular
-      # deployment (as opposed to a roll back) we must download the
-      # old/current version of the file.
+      # when updating the resources as a part of a regular deployment
+      # (as opposed to a roll back) we must download the old/current
+      # version of the file.
       if [ ! -e $old_file ]; then
-        make_dir $(dirname $old_file)
-        (
-          cd $(dirname $old_file)
-          wget \
-            --quiet \
-            --continue \
-            http://localhost:${appserver_port}/escenic-admin/publication-resources/$publication/${ele} \
-            2>/dev/null
-
-          if [ $(looks_like_xml $(basename ${ele})) -eq 1 ]; then
-            xmllint --format ${ele} > ${ele}.tmp
-            mv ${ele}.tmp ${ele}
-          fi
-        )
+        wget \
+          --quiet \
+          --continue \
+          --output-document $old_file \
+          http://localhost:${appserver_port}/escenic-admin/publication-resources/$publication/${relative_resource} \
+          2>/dev/null
       fi
+
+      create_pretty_printed_file_if_xml $old_file
+      create_pretty_printed_file_if_xml $new_file
+
+      
+      local diff_from_file=$old_file
+      local diff_to_file=$new_file
       
-      if [ $(looks_like_xml $publication_resources_dir/$ele) -eq 1 ]; then
-        new_file=$new_dir/$(basename $ele)
-        xmllint --format $publication_resources_dir/$ele > $new_file
-      else
-        new_file=$new_dir/$(basename $ele)
-        cp $publication_resources_dir/$ele $new_dir/$(basename $ele)
+      if [[ -e ${old_file}.xml && -e ${new_file}.xml ]]; then
+        diff_from_file=$old_file.xml
+        diff_to_file=$new_file.xml
       fi
 
+      # in case the running system doesn't have the publication
+      # resource from the the new EAR.
       if [ ! -e $old_file ]; then
         old_file=$(mktemp)
       fi
 
-      local number_of_lines_changed=$(
+      local the_diff=$(
         diff -w \
-          <(cat $old_file | grep -v '^$') \
-          <(cat $new_file | grep -v '^$') | \
-          egrep '<|>' | \
-          wc -l
+          <(cat ${diff_from_file} | grep -v '^$') \
+          <(cat ${diff_to_file} | grep -v '^$') | \
+          egrep '<|>'
       )
-      if [ ${number_of_lines_changed} -lt 1 ]; then
+      local number_of_lines_changed=$(echo "$the_diff" | wc -l)
+        
+      # add the diff to this variable and print it out in print_summary
+      if [ -n "$the_diff" ]; then
+        diff_list="${diff_list}Changes to ${relative_resource}:
+${the_diff}
+"
+      fi
+
+      # since we echo the string above, an empty string will be of one
+      # lines (as with wc -l), thus we test for -lt 2 here
+      if [ ${number_of_lines_changed} -lt 2 ]; then
         continue
       fi
 
+      local diff_file=$(dirname $new_file)/$(basename $relative_resource).diff
       print_and_log "Applying" \
         $number_of_lines_changed \
-        "changes to" $ele \
-        "full diff can be found here: $new_dir/$(basename $ele).diff"
-      diff -w $old_file $new_file > $new_dir/$(basename $ele).diff
+        "changes to" $publication_resource \
+        "full diff can be found here:" $diff_file
+      diff -w ${diff_from_file-$old_file} ${diff_to_file-$new_file} > ${new_file}.diff
 
       run curl --silent \
-        -T $publication_resources_dir/$ele \
-        http://localhost:${appserver_port}/escenic-admin/publication-resources/${publication}/$ele
+        -T $new_file \
+        http://localhost:${appserver_port}/escenic-admin/publication-resources/${publication}/${relative_resource}
     done
   done
 }
@@ -437,10 +466,13 @@ function remember_state() {
 
 function print_summary() {
   print_and_log "Finished @ $(date)"
-  print_and_log "A full summary of the changes can be found in" \
-    $ece_deploy_data_dir/${deployment_id} "Here's a short summary:"
-  diff -r $ece_deploy_data_dir/${deployment_id}/old \
-    $ece_deploy_data_dir/${deployment_id}/new
+  local diff_files=$(find $(get_deployment_dir) -name "*.diff")
+  if [ $(echo "$diff_files" | wc -l) -gt 1 ]; then
+    print_and_log "Here are diffs of all publication resources that were changed:"
+    for el in $diff_files; do
+      echo $el
+    done
+  fi
 }
 
 function crawl_a_wee_bit() {
@@ -476,9 +508,13 @@ if [ ${list_the_revious_deployments-0} -eq 0 ]; then
 fi
 
 if [ ${make_deployment-1} -eq 1 ]; then
-  remember_state $ece_deploy_data_dir/$deployment_id/old
+  make_dir $(get_deployment_dir)/old $(get_deployment_dir)/new
+  remember_state $(get_deployment_dir)/old
 
-  deploy_ear
+  if [ -n "$ear_uri" ]; then
+    deploy_ear
+  fi
+  
   if [ -n "$conf_package_uri" ]; then
     deploy_conf
   fi
@@ -491,7 +527,7 @@ if [ ${make_deployment-1} -eq 1 ]; then
   fi
 
   start_all_content_engine_instances
-  remember_state $ece_deploy_data_dir/$deployment_id/new
+  remember_state $(get_deployment_dir)/new
   crawl_a_wee_bit
 fi
 

From 3620d9fa782e78688d31878232e3a93373d59c31 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 7 Dec 2012 16:59:39 +0100
Subject: [PATCH 1774/2585] - common-io::make_dir now accepts an array of
 directories

---
 usr/share/escenic/ece-scripts/common-io.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/common-io.sh b/usr/share/escenic/ece-scripts/common-io.sh
index dc195b35..1816fe06 100644
--- a/usr/share/escenic/ece-scripts/common-io.sh
+++ b/usr/share/escenic/ece-scripts/common-io.sh
@@ -62,9 +62,11 @@ function set_conf_file_value() {
 }
 
 function make_dir() {
-  if [ ! -d $1 ]; then
-    run mkdir -p $1
-  fi
+  for el in $@; do
+    if [ ! -d $el ]; then
+      run mkdir -p $el
+    fi
+  done
 }
 
 function remove_dir() {

From c5073437ced5fe2d5b20a42aeeb3e066e2e02328 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 10 Dec 2012 10:56:37 +0100
Subject: [PATCH 1775/2585] - updated the 'ece info' command to list the
 publication specific   webapp contexts that were introduced in #110.

  Here's an example run for an application server that serves two
  publications on two different contexts, in addition to
  /escenic-admin on the standard context:

     $ ece -i engine1 info
     [..]
     [ece#engine-engine1] Deployed web applications:
     [ece#engine-engine1] |-> webapps/escenic-admin
     [ece#engine-engine1] |-> webapps-green/green
     [ece#engine-engine1] |-> webapps-tree/tree

  This is the command called for each ECE and EAE instance on the
  given host when you run system-info.

  This fix should close #123
---
 usr/share/escenic/ece-scripts/ece.d/info.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/info.sh b/usr/share/escenic/ece-scripts/ece.d/info.sh
index 8fdfead2..09274a1e 100644
--- a/usr/share/escenic/ece-scripts/ece.d/info.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/info.sh
@@ -67,7 +67,7 @@ function print_deployment_state() {
   print "|-> Deployment date:" $(grep ^deployed_date $file | cut -d'=' -f2-)
 }
 
-## $1: dir
+## $1: tomcat dir
 function print_deployed_webapps() {
   local webapps=""
 
@@ -76,9 +76,10 @@ function print_deployed_webapps() {
   fi
 
   print "Deployed web applications:"
-  for el in $(find $1/webapps -maxdepth 1 -type d | \
-    grep -v webapps$); do
-    print "|-> http://${HOSTNAME}:${port}/"$(basename $el)
+  for context in $1/webapps*; do
+    for el in $(find $context -maxdepth 1 -type d | sed -n 2,50p); do
+      print "|->" $(echo $el | sed "s#${1}/##g")
+    done
   done
 
 }

From ff0fa52178577255984660a1c35514ff63f105f1 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 10 Dec 2012 10:59:37 +0100
Subject: [PATCH 1776/2585] - fixed the test used for generating the summary.
 ece-deploy will now   list all changed files like this:

     # ece-deploy --ear http://myhost/an.ear
     [..]
     [ece-deploy-9] Here are diffs of all publication resources that were changed:
     - /var/lib/escenic/ece-deploy/ubiquitous-1354895609/new/dn/escenic/content-type.diff
     - /var/lib/escenic/ece-deploy/ubiquitous-1354895609/new/dn/escenic/layout-group.diff
     - /var/lib/escenic/ece-deploy/ubiquitous-1354895609/new/dn/escenic/feature.diff
---
 usr/sbin/ece-deploy | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
index b2417165..1ca1bb58 100755
--- a/usr/sbin/ece-deploy
+++ b/usr/sbin/ece-deploy
@@ -284,8 +284,8 @@ function update_publication_resources() {
     return
   fi
 
-  print_and_log "Will now update the publication resources" \
-    "getting list of all publications on $el ..."
+  print_and_log "Will now update the publication resources," \
+    "first getting a list of all publications on $el ..."
   for i in {0..5}; do
     local publication_list=$(get_publication_list ${appserver_port})
     
@@ -466,9 +466,20 @@ function remember_state() {
 
 function print_summary() {
   print_and_log "Finished @ $(date)"
+  for el in $engine_instance_list $search_instance_list; do
+    for ele in ${el}.state vosa-conf-$HOSTNAME.version; do
+      if [[ -e $(get_deployment_dir)/old/${ele} && \
+        -e $(get_deployment_dir)/new/${ele} ]]; then
+        diff $(get_deployment_dir)/old/${ele} \
+          $(get_deployment_dir)/new/${ele} \
+          > $(get_deployment_dir)new/${ele}.diff
+      fi
+    done
+  done
+  
   local diff_files=$(find $(get_deployment_dir) -name "*.diff")
-  if [ $(echo "$diff_files" | wc -l) -gt 1 ]; then
-    print_and_log "Here are diffs of all publication resources that were changed:"
+  if [ $(echo "$diff_files" | wc -c) -gt 2 ]; then
+    print_and_log "Here are the diffs of all publication resources that were changed:"
     for el in $diff_files; do
       echo $el
     done

From a884ad80925e9ef42b5e5967403ac05b7d3b4e8b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 10 Dec 2012 11:05:53 +0100
Subject: [PATCH 1777/2585] - a wee, but crucial one character fix to
 print_summary

---
 usr/sbin/ece-deploy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
index 1ca1bb58..6e2c3e46 100755
--- a/usr/sbin/ece-deploy
+++ b/usr/sbin/ece-deploy
@@ -472,7 +472,7 @@ function print_summary() {
         -e $(get_deployment_dir)/new/${ele} ]]; then
         diff $(get_deployment_dir)/old/${ele} \
           $(get_deployment_dir)/new/${ele} \
-          > $(get_deployment_dir)new/${ele}.diff
+          > $(get_deployment_dir)/new/${ele}.diff
       fi
     done
   done

From c107793023ea43afeb849b8d7cbc618993b14128 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 10 Dec 2012 12:54:13 +0100
Subject: [PATCH 1778/2585] - added useful hardening & user feedback to 'ece
 edit'. When   attempting to edit a publication resource of a non existing  
 publication, ece will give a due error (before, it would just give a  
 generic error because of the failed GET to the resource ) and list   all the
 valid publication names:

     $ ece -i engine1 -r content-type -p apple edit
     [ece#engine-engine1] There is no publication called apple (only banana
     [ece#engine-engine1] orange lemon)
---
 .../ece-scripts/ece.d/publication-resources.sh     | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece.d/publication-resources.sh b/usr/share/escenic/ece-scripts/ece.d/publication-resources.sh
index 803577b6..bab083bd 100644
--- a/usr/share/escenic/ece-scripts/ece.d/publication-resources.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/publication-resources.sh
@@ -8,6 +8,20 @@ function update_publication_resources() {
     print "You must specify which publication to update (-p <publication>)"
     exit 1
   fi
+
+  local found=0
+  local publication_list=$(get_publication_list)
+  for el in $publication_list; do
+    if [[ "$publication" == "$el" ]]; then
+      found=1
+    fi
+  done
+  
+  if [ $found -eq 0 ]; then
+    print "There is no publication called" \
+      $publication "(only $publication_list)"
+    exit 1
+  fi
   
   local url=$(get_escenic_admin_url)/publication-resources
 

From 39fc4a56ffc32a9d1ca0c41225629d66f92de9c0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 10 Dec 2012 14:45:02 +0100
Subject: [PATCH 1779/2585] - 'ece edit' now fails if the POSTing of the
 new/edited publication    resource failed.

- The server response headers are written to the log when running 'ece
  edit'. This improves debugging issues when the user has made
  mistakes in the XML editing.
---
 .../ece-scripts/ece.d/publication-resources.sh     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/publication-resources.sh b/usr/share/escenic/ece-scripts/ece.d/publication-resources.sh
index bab083bd..294469eb 100644
--- a/usr/share/escenic/ece-scripts/ece.d/publication-resources.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/publication-resources.sh
@@ -90,16 +90,16 @@ function update_publication_resources() {
   
   log POSTing $resource to $url
   if [[ -n "$do_put" && "$do_put" == "true" ]]; then
-    curl -T ${resource} \
+    run curl -T ${resource} \
       ${curl_appserver_auth} \
-      ${url} \
-      1>>$log 2>>$log
+      --fail \
+      ${url}
   else
-    wget $wget_appserver_auth \
-      -O - \
+    run wget $wget_appserver_auth \
+      --output-document - \
+      --server-response \
       --post-file ${resource} \
-      $url \
-      1>>$log 2>>$log
+      $url
   fi
 
   if [ -d $tmp_dir ]; then

From a9abb0958293859fff5f9733ba13c3b6e0dad6df Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 10 Dec 2012 17:01:19 +0100
Subject: [PATCH 1780/2585] - rollback is working again

- added xml_pp in front of pipe to xmllint as the former formalises
  XML with regards to the order of the element attributes. This means
  that these will be formatted the same:

    <colour name="green" value="#00ff00"/>
    <colour value="#00ff00" name="green/>

- code clean up

- TODO a lot of rollback testing
---
 usr/sbin/ece-deploy | 115 +++++++++++++++++++++-----------------------
 1 file changed, 56 insertions(+), 59 deletions(-)

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
index 6e2c3e46..c61658b7 100755
--- a/usr/sbin/ece-deploy
+++ b/usr/sbin/ece-deploy
@@ -26,7 +26,7 @@ function create_pretty_printed_file_if_xml() {
   fi
   
   if [ $(looks_like_xml ${1}) -eq 1 ]; then
-    xmllint --format ${1} > ${1}.xml
+    xml_pp ${1} | xmllint --format - > ${1}.xml
   fi
 }
 
@@ -142,19 +142,21 @@ function deploy_conf() {
   set_builder_user_and_password
 
   print "Downloading" $conf_package_uri "..."
-  (
-  cd $ece_deploy_download_dir
-  run wget \
-    --quiet \
-    --continue \
-    --http-user $builder_http_user \
-    --http-password $builder_http_password \
-    $conf_package_uri
-  )
+  
+  # common-ece::download_uri_target_to_dir honors wget_auth
+  wget_auth="
+    --http-user $builder_http_user
+    --http-password $builder_http_password
+  "
+  download_uri_target_to_dir $conf_package_uri $ece_deploy_download_dir
 
   print "Installing" $(basename $conf_package_uri) "..."
+  if [ ${force_everything-0} -eq 1 ]; then
+    dpkg_opts="--force-overwrite"
+  fi
+
   dpkg \
-    --force-overwrite \
+    $dpkg_opts \
     --install $ece_deploy_download_dir/$(basename $conf_package_uri)
 }
 
@@ -234,16 +236,16 @@ function list_previous_deployments() {
 }
 
 publication_resource_list="
-    0/escenic/section-parameter
-    escenic/content-type
-    escenic/feature
-    escenic/image-version
-    escenic/layout
-    escenic/layout-group
-    escenic/plugin/community/security
-    escenic/plugin/menu
-    escenic/teaser-type
-  "
+  0/escenic/section-parameter
+  escenic/content-type
+  escenic/feature
+  escenic/image-version
+  escenic/layout
+  escenic/layout-group
+  escenic/plugin/community/security
+  escenic/plugin/menu
+  escenic/teaser-type
+"
 
 function looks_like_xml() {
   if [ -z "$1" ]; then
@@ -306,10 +308,12 @@ function update_publication_resources() {
   fi
 
   for publication in $publication_list; do
+    # this means a regular deployment
     if [[ "$1" == "$tomcat_base" ]]; then
       local publication_resources_dir=$tomcat_base/webapps-${publication}/${publication}/META-INF/escenic/publication-resources
     else
-      local publication_resources_dir=${1}/${publication}
+      # this means roll back
+      local publication_resources_dir=${1}/${publication}/old
     fi
 
     if [ ! -d $publication_resources_dir ]; then
@@ -317,7 +321,10 @@ function update_publication_resources() {
     fi
 
     print_and_log "Updating resources for publication" $publication "..."
-    for publication_resource in $(find $publication_resources_dir -type f); do
+    # we gep away .xml and .diff file shere as these will be present
+    # when rolling back a deployment.
+    for publication_resource in \
+      $(find $publication_resources_dir -type f | egrep -v ".(xml|diff)$"); do
       local relative_resource=$(
         echo $publication_resource | sed "s#${publication_resources_dir}/##g"
       )
@@ -344,7 +351,6 @@ function update_publication_resources() {
       create_pretty_printed_file_if_xml $old_file
       create_pretty_printed_file_if_xml $new_file
 
-      
       local diff_from_file=$old_file
       local diff_to_file=$new_file
       
@@ -359,36 +365,21 @@ function update_publication_resources() {
         old_file=$(mktemp)
       fi
 
-      local the_diff=$(
-        diff -w \
-          <(cat ${diff_from_file} | grep -v '^$') \
-          <(cat ${diff_to_file} | grep -v '^$') | \
-          egrep '<|>'
-      )
-      local number_of_lines_changed=$(echo "$the_diff" | wc -l)
-        
-      # add the diff to this variable and print it out in print_summary
-      if [ -n "$the_diff" ]; then
-        diff_list="${diff_list}Changes to ${relative_resource}:
-${the_diff}
-"
-      fi
-
-      # since we echo the string above, an empty string will be of one
-      # lines (as with wc -l), thus we test for -lt 2 here
-      if [ ${number_of_lines_changed} -lt 2 ]; then
+      diff -w ${diff_from_file-$old_file} \
+        ${diff_to_file-$new_file} \
+        > ${new_file}.diff
+      local number_of_lines_changed=$(egrep '<|>' ${new_file}.diff | wc -l)
+      if [ $number_of_lines_changed -lt 1 ]; then
         continue
       fi
-
-      local diff_file=$(dirname $new_file)/$(basename $relative_resource).diff
-      print_and_log "Applying" \
-        $number_of_lines_changed \
-        "changes to" $publication_resource \
-        "full diff can be found here:" $diff_file
-      diff -w ${diff_from_file-$old_file} ${diff_to_file-$new_file} > ${new_file}.diff
-
-      run curl --silent \
-        -T $new_file \
+      
+      print_and_log "Applying" $number_of_lines_changed \
+        "changes to" $publication_resource
+      run curl \
+        --silent \
+        --upload-file $new_file \
+        --fail \
+        --verbose \
         http://localhost:${appserver_port}/escenic-admin/publication-resources/${publication}/${relative_resource}
     done
   done
@@ -411,7 +402,7 @@ function roll_back_everything_to_version() {
       "they should have been here:" $old_ece_deploy_data_dir
     exit 1
   else
-    log "Using data in" $old_ece_deploy_data_dir "to perform the rollback"
+    print_and_log "Using data in" $old_ece_deploy_data_dir "to perform the rollback"
   fi
 
   local package_version_file=$ece_deploy_data_dir/${roll_back_to_version}/new/vosa-conf-${HOSTNAME}.version
@@ -420,7 +411,7 @@ function roll_back_everything_to_version() {
     if [ -e $deb_file ]; then
       print_and_log "Reverting back to version" $(cat $package_version_file) \
         "vosa-conf-$HOSTNAME ..."
-      dpkg --install --force-overwrite $deb_file
+      dpkg --install ${dpkg_opts} $deb_file
     else
       print_and_log "You must now install version" \
         $(cat $package_version_file) \
@@ -433,7 +424,7 @@ function roll_back_everything_to_version() {
   fi
 
   for el in $engine_instance_list; do
-    file=$ece_deploy_data_dir/${roll_back_to_version}/new/${el}.state
+    local file=$ece_deploy_data_dir/${roll_back_to_version}/new/${el}.state
     if [ ! -e $file ]; then
       continue
     fi
@@ -479,9 +470,11 @@ function print_summary() {
   
   local diff_files=$(find $(get_deployment_dir) -name "*.diff")
   if [ $(echo "$diff_files" | wc -c) -gt 2 ]; then
-    print_and_log "Here are the diffs of all publication resources that were changed:"
+    print_and_log "Here are the diffs of all resources that were changed:"
     for el in $diff_files; do
-      echo $el
+      if [ $(wc -c $el | awk '{print $1;}') -gt 0 ]; then
+        echo $el $(egrep '<|>' $el | wc -l) "changes"
+      fi
     done
   fi
 }
@@ -509,7 +502,7 @@ function crawl_a_wee_bit() {
   done
 }
 
-assert_commands_available xmllint xml_grep
+assert_commands_available xmllint xml_grep xml_pp
 read_user_input "$@"
 verify_user_input
 
@@ -547,10 +540,14 @@ if [ ${list_the_revious_deployments-0} -eq 1 ]; then
 fi
 
 if [ ${roll_back-0} -eq 1 ]; then
+  make_dir $(get_deployment_dir)/old $(get_deployment_dir)/new
   roll_back_everything_to_version
 
   if [ ${update_the_publication_resources-0} -eq 1 ]; then
-    update_publication_resources $ece_deploy_data_dir/${roll_back_to_version}/new
+    for el in $engine_instance_list; do
+      run source /etc/escenic/ece-${el}.conf
+      update_publication_resources $ece_deploy_data_dir/${roll_back_to_version}/new
+    done
   fi
   
   print_and_log "You have now rolled back to deployment ${roll_back_to_version}"

From 3ff5905cb8d6a6b62bdbe250091c223d185009ff Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 11 Dec 2012 09:25:06 +0100
Subject: [PATCH 1781/2585] - updated README with the latest news that
 development has moved to   the vizrt organisation.

---
 README | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/README b/README
index 5fa16361..4b19a576 100644
--- a/README
+++ b/README
@@ -1,3 +1,16 @@
+===============
+Read this first
+===============
+The development of ece-scripts have now (2012-12-11) been moved to
+Vizrt's github space: https://github.com/vizrt/ece-scripts, so go here
+for the latest code and issue tracking.
+
+The APT archive is the same as before: http://apt.vizrt.com
+
+Cheers,
+
+-Torstein
+
 ========
 Overview
 ========

From b87a811f07d480894c7a9d833b1e338bf2c70ba1 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 11 Dec 2012 09:28:21 +0100
Subject: [PATCH 1782/2585] - replaced all references to
 github.com/skybert/ece-scripts with   github.com/vizrt/ece-scripts

---
 README                                                    | 8 ++++----
 usr/sbin/ece-install                                      | 2 +-
 usr/share/doc/escenic/ece-install-guide.org               | 4 ++--
 .../puppet/modules/util/manifests/templated_file_list.pp  | 2 +-
 usr/share/vizrt/vosa/post-install-hooks/install-engine.sh | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/README b/README
index 5fa16361..4f336859 100644
--- a/README
+++ b/README
@@ -16,22 +16,22 @@ documentational purposes :-)
 ===================================
 Features of the /usr/bin/ece script
 ===================================
-https://github.com/skybert/ece-scripts/blob/master/usr/share/doc/escenic/ece-guide.org
+https://github.com/vizrt/ece-scripts/blob/master/usr/share/doc/escenic/ece-guide.org
 
 ============================================
 Features of the /usr/sbin/ece-install script
 ============================================
-https://github.com/skybert/ece-scripts/blob/master/usr/share/doc/escenic/ece-install-guide.org
+https://github.com/vizrt/ece-scripts/blob/master/usr/share/doc/escenic/ece-install-guide.org
 
 ===========================================
 Features of the /usr/bin/system-info script
 ===========================================
-https://github.com/skybert/ece-scripts/blob/master/usr/share/doc/escenic/system-info-guide.org
+https://github.com/vizrt/ece-scripts/blob/master/usr/share/doc/escenic/system-info-guide.org
 
 ====================================
 Features of the /usr/bin/vosa script
 ====================================
-https://github.com/skybert/ece-scripts/blob/master/usr/share/doc/vizrt/vosa-guide.org
+https://github.com/vizrt/ece-scripts/blob/master/usr/share/doc/vizrt/vosa-guide.org
 
 ========
 Feedback
diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index cc99e3cb..cb4a7a2f 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -53,7 +53,7 @@ ece_scripts_version="straight-from-github"
 download_dir=/var/cache/$(basename $0)
 log=/var/log/$(basename $0).log
 conf_file=$HOME/ece-install.conf
-ece_scripts_git_source=https://github.com/skybert/ece-scripts.git
+ece_scripts_git_source=https://github.com/vizrt/ece-scripts.git
 maven_opts="--batch-mode"
 wget_opts="--continue --inet4-only --quiet"
 apt_opts="--no-install-recommends"
diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 2b257056..0aaa1f66 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -131,7 +131,7 @@ Use =git= to get the ece-install script. Type this in
 your shell:
 
 #+BEGIN_SRC text
-$ git clone https://github.com/skybert/ece-scripts.git
+$ git clone https://github.com/vizrt/ece-scripts.git
 #+END_SRC
 
 The reason why we want you to use git to download ece-install, is that
@@ -140,7 +140,7 @@ one of your reported issues), by doing "git pull" inside the
 ece-scripts directory.
 
 If you have problems installing git, you can also download a ZIP
-archive here: https://github.com/skybert/ece-scripts/zipball/master
+archive here: https://github.com/vizrt/ece-scripts/zipball/master
 
 ** <<<Become Root>>>
 You must be the root user to run =ece-install=. If you try to run it as
diff --git a/usr/share/puppet/modules/util/manifests/templated_file_list.pp b/usr/share/puppet/modules/util/manifests/templated_file_list.pp
index 6975266f..3c9ee1e7 100644
--- a/usr/share/puppet/modules/util/manifests/templated_file_list.pp
+++ b/usr/share/puppet/modules/util/manifests/templated_file_list.pp
@@ -8,7 +8,7 @@
 #														{module}/templates directory that needs to be deployed.
 #
 # $util_module_directory::  This parameter must point to the directory where 
-#														https://github.com/skybert/ece-scripts/tree/master/usr/share/puppet/modules/util
+#														https://github.com/vizrt/ece-scripts/tree/master/usr/share/puppet/modules/util
 #                   				is deployed on your puppet master
 #														default: "/etc/puppet/modules/util/"
 #
diff --git a/usr/share/vizrt/vosa/post-install-hooks/install-engine.sh b/usr/share/vizrt/vosa/post-install-hooks/install-engine.sh
index e2cf584a..d46402f0 100755
--- a/usr/share/vizrt/vosa/post-install-hooks/install-engine.sh
+++ b/usr/share/vizrt/vosa/post-install-hooks/install-engine.sh
@@ -40,7 +40,7 @@ if [ -z "$ECE_INSTALLER" ] ; then
 fi
 
 if [ -z "$ECE_INSTALLER" ] ; then
-  wget "https://github.com/skybert/ece-scripts/tarball/master" -O $2/ece-install.tar.gz
+  wget "https://github.com/vizrt/ece-scripts/tarball/master" -O $2/ece-install.tar.gz
   scp -F $2/ssh.conf $2/ece-install.tar.gz root@guest:
   ssh -F $2/ssh.conf root@guest tar xfz ece-install.tar.gz
   ECE_INSTALLER="bash *-ece-scripts-*/usr/sbin/ece-install"

From 96d335d454510f76d07cf68c176adca3736a1b3f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 11 Dec 2012 10:09:14 +0100
Subject: [PATCH 1783/2585] - replaced all occurrences of github.com/escenic
 with github.com/vizrt

---
 usr/sbin/ece-install                                          | 2 +-
 .../presentations/ece-install-introduction/presentation.org   | 2 +-
 .../debian/escenic-content-engine-installer/postinst          | 2 +-
 usr/share/escenic/package-scripts/debian/vosa/postinst        | 2 +-
 usr/share/escenic/package-scripts/html/index.html             | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index cb4a7a2f..5a9eb2dc 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -7,7 +7,7 @@
 # with the "ece -i <instance> backup" command.
 #
 # Always check for the latest version at
-# http://github.com/escenic/ece-scripts
+# http://github.com/vizrt/ece-scripts
 
 # echo comments and suggestions > tkj@vizrt.com
 # echo frustrations > /dev/null
diff --git a/usr/share/doc/escenic/presentations/ece-install-introduction/presentation.org b/usr/share/doc/escenic/presentations/ece-install-introduction/presentation.org
index 9e97a5b0..ce2382de 100644
--- a/usr/share/doc/escenic/presentations/ece-install-introduction/presentation.org
+++ b/usr/share/doc/escenic/presentations/ece-install-introduction/presentation.org
@@ -103,7 +103,7 @@ Yes, that's it.
 
 * How?
 
-- git clone https://github.com/escenic/ece-scripts/ (or zip download)
+- git clone https://github.com/vizrt/ece-scripts/ (or zip download)
 - Daily builds of DEB and RPM packages from
   http://hudson.dev.escenic.com
 
diff --git a/usr/share/escenic/package-scripts/debian/escenic-content-engine-installer/postinst b/usr/share/escenic/package-scripts/debian/escenic-content-engine-installer/postinst
index 01808e8f..762aa6a0 100755
--- a/usr/share/escenic/package-scripts/debian/escenic-content-engine-installer/postinst
+++ b/usr/share/escenic/package-scripts/debian/escenic-content-engine-installer/postinst
@@ -6,7 +6,7 @@ chmod +x /usr/sbin/ece-install
 cat <<EOF
 Thank you for installing ece-install. This is currently un-supported
 software as it's undergoing heavy development. Report any issues to
-https://github.com/escenic/ece-scripts/issues
+https://github.com/vizrt/ece-scripts/issues
 
 Have fun!
 
diff --git a/usr/share/escenic/package-scripts/debian/vosa/postinst b/usr/share/escenic/package-scripts/debian/vosa/postinst
index 6cca8d6c..13b844e2 100644
--- a/usr/share/escenic/package-scripts/debian/vosa/postinst
+++ b/usr/share/escenic/package-scripts/debian/vosa/postinst
@@ -6,7 +6,7 @@ chmod +x /usr/bin/vosa
 cat <<EOF
 Thank you for installing the vosa package. This is currently
 un-supported software as it's undergoing heavy development. Report any
-issues to https://github.com/escenic/ece-scripts/issues
+issues to https://github.com/vizrt/ece-scripts/issues
 
 Have fun!
 
diff --git a/usr/share/escenic/package-scripts/html/index.html b/usr/share/escenic/package-scripts/html/index.html
index a2ff9689..741b754b 100644
--- a/usr/share/escenic/package-scripts/html/index.html
+++ b/usr/share/escenic/package-scripts/html/index.html
@@ -93,8 +93,8 @@ <h1>Welcome to the Vizrt APT repository</h1>
     </p>
     <p>
       If you find any issues with these packages, please report this on github:
-      <a href="https://github.com/escenic/ece-scripts/issues">
-        https://github.com/escenic/ece-scripts/issues
+      <a href="https://github.com/vizrt/ece-scripts/issues">
+        https://github.com/vizrt/ece-scripts/issues
       </a>
     </p>
     <p>

From 539692fc6e0bf7eda21dcebe0c5b44ba7d920f0a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 11 Dec 2012 15:19:38 +0100
Subject: [PATCH 1784/2585] - ece-deploy now remembers all the files of the
 current and new conf   packages and creates an accumulated diff for the user
 to inspect   after the deployment.

- removed dead comment
---
 usr/sbin/ece-deploy | 50 +++++++++++++++++++++++++++++++++++++--------
 1 file changed, 41 insertions(+), 9 deletions(-)

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
index c61658b7..bf12b495 100755
--- a/usr/sbin/ece-deploy
+++ b/usr/sbin/ece-deploy
@@ -10,6 +10,7 @@
 
 ece_deploy_data_dir=/var/lib/escenic/$(basename $0)
 ece_deploy_download_dir=/var/cache/escenic
+log=/var/log/escenic/$(basename $0).log
 
 function ece_deploy_cancel_hook() {
   local the_dir=$ece_deploy_data_dir/$deployment_id
@@ -63,7 +64,6 @@ function bootstrap_thyself() {
 
 bootstrap_thyself
 
-log=/var/log/escenic/$(basename $0).log
 run source /etc/default/ece
 
 function deploy_ear() {
@@ -86,11 +86,8 @@ function deploy_ear() {
     if [ ${PIPESTATUS[@]} -gt 0 ]; then
       exit 1
     fi
-    
-    # asking for the versions to make sure the ECEs are
-    # bootstrapped. It's also nice user feedback to see which versions
-    # are deployed/upgraded.
   done
+  
   for el in $search_instance_list; do
     su - $ece_unix_user -c \
       "${proxy_settings} ece -i $el -t search stop deploy clean start --uri $ear_uri"
@@ -175,6 +172,8 @@ function read_user_input() {
       roll_back=1
       next_is_roll_back_to_version=1
       make_deployment=0
+    elif [[ $el == "--force" ]]; then
+      force_everything=1
     elif [[ $el == "--update-publication-resources" ]]; then
       update_the_publication_resources=1
     elif [[ $el == "--list-deployments" ]]; then
@@ -387,7 +386,8 @@ function update_publication_resources() {
 
 function generate_deployment_id() {
   deployment_id=${HOSTNAME}-$(date +%s)
-  print_and_log "This deployment has ID" ${deployment_id}
+  print_and_log "This deployment has ID" ${deployment_id} \
+    "and is logging to" $log
 }
 
 function roll_back_everything_to_version() {
@@ -448,11 +448,32 @@ function remember_state() {
       cp /var/lib/escenic/${el}.state $1/
     fi
   done
+
+  if [ $(dpkg -l vosa-conf-$HOSTNAME | wc -l) -eq 0 ]; then
+    return
+  fi
   
-  dpkg -l vosa-conf-$HOSTNAME 2>/dev/null | \
+  dpkg -l vosa-conf-$HOSTNAME | \
     grep vosa-conf-$HOSTNAME | \
     awk '{ print $3 }' > \
     $1/vosa-conf-${HOSTNAME}.version
+
+  print_and_log "Remembering all files from the current version of" \
+    vosa-conf-$HOSTNAME "..."
+  dpkg -L vosa-conf-$HOSTNAME | while read f; do
+    local dir=${1}/vosa-conf-${HOSTNAME}/$(dirname $f)
+    make_dir $dir
+    if [ -d $f ]; then
+      continue
+    fi
+    if [ ! -e $f ]; then
+      print_and_log $(yellow WARNING) $f "was installed with the" \
+        "vosa-conf-$HOSTNAME package," \
+        "however, it's not present on $HOSTNAME."
+      continue
+    fi
+    cp $f $dir/
+  done
 }
 
 function print_summary() {
@@ -461,22 +482,33 @@ function print_summary() {
     for ele in ${el}.state vosa-conf-$HOSTNAME.version; do
       if [[ -e $(get_deployment_dir)/old/${ele} && \
         -e $(get_deployment_dir)/new/${ele} ]]; then
-        diff $(get_deployment_dir)/old/${ele} \
+        diff --ignore-all-space $(get_deployment_dir)/old/${ele} \
           $(get_deployment_dir)/new/${ele} \
           > $(get_deployment_dir)/new/${ele}.diff
       fi
     done
   done
   
+  if [[ $(dpkg -l vosa-conf-$HOSTNAME | wc -l) -gt 0 && \
+    -d $(get_deployment_dir)/old/vosa-conf-$HOSTNAME && \
+    -d $(get_deployment_dir)/new/vosa-conf-$HOSTNAME ]]; then
+    diff --recursive --ignore-all-space \
+      $(get_deployment_dir)/old/vosa-conf-$HOSTNAME \
+      $(get_deployment_dir)/new/vosa-conf-$HOSTNAME \
+      > $(get_deployment_dir)/new/vosa-conf-${HOSTNAME}.diff
+  fi
+  
   local diff_files=$(find $(get_deployment_dir) -name "*.diff")
   if [ $(echo "$diff_files" | wc -c) -gt 2 ]; then
-    print_and_log "Here are the diffs of all resources that were changed:"
+    print_and_log "Here are the diffs of all publication resources" \
+      "and files that were changed:"
     for el in $diff_files; do
       if [ $(wc -c $el | awk '{print $1;}') -gt 0 ]; then
         echo $el $(egrep '<|>' $el | wc -l) "changes"
       fi
     done
   fi
+
 }
 
 function crawl_a_wee_bit() {

From f554428fa52d41de2a5014972119a055964672e8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 11 Dec 2012 16:10:40 +0100
Subject: [PATCH 1785/2585] - generate-changelog now generates GNU
 changelog-ish:

     $ generate-changelog --from 6180 --to 6192
     Changes in  https://myjira.jira.com/svn/BOOM/trunk
     From: revision 6180 @ 2012-12-03 13:51:48 +0100 (Mon, 03 Dec 2012)
     To  : revision 6192 @ 2012-12-04 09:43:20 +0100 (Tue, 04 Dec 2012)
        * [#BOOM-639] Fix BOOM Production Server Exception - myjira
        URL: https://myjira.jira.com/browse/BOOM-639

        * [#BOOM-721] Postings take 2-3 minutes from their approved in Dashboard
        to the appear on the website - myjira
        URL: https://myjira.jira.com/browse/BOOM-721

     A full overview of all 2 changes can be viewed here:
     /tmp/tmp.N02QK7XzIa-BOOM-from-6180-to-6192.diff
---
 usr/bin/generate-changelog | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/usr/bin/generate-changelog b/usr/bin/generate-changelog
index 04aea9aa..4a121e7e 100755
--- a/usr/bin/generate-changelog
+++ b/usr/bin/generate-changelog
@@ -31,11 +31,14 @@ function read_user_settings() {
 function get_header_from_jira() {
   local body=$(curl -s https://${user}:${password}@${jira_host}/browse/${1})
   echo "$body" | grep '<title>' | sed -e 's/<title>//g' -e 's/<\/title>//g'
-  echo "URL:" https://$jira_host}/browse/${1}
 }
 
 function get_to_revision() {
-  svn info | grep ^'Last Changed Rev' | awk '{ print $4 }'
+  if [ -n "${to}" ]; then
+    echo "${to}"
+  else
+    svn info | grep ^'Last Changed Rev' | awk '{ print $4 }'
+  fi
 }
 
 function get_from_revision() {
@@ -73,11 +76,12 @@ function get_commit_information_from_vcs() {
   local suffix=-${project_code}-from-$(get_from_revision)-to-$(get_to_revision).diff
   local tmp_diff=$(mktemp --suffix "${suffix}")
   svn diff -r $(get_from_revision):$(get_to_revision) > $tmp_diff
-  exit_on_error "svn diff"
+  exit_on_error "svn diff -r $(get_from_revision):$(get_to_revision)"
   if [ ${full_listing-0} -eq 1 ]; then
     cat $tmp_diff
   else
-    echo "A full overview of all the changes can be viewed here:" $tmp_diff | fmt
+    echo "A full overview of all" $(egrep '^(\+|\-) ' $tmp_diff | wc -l) \
+      "changes can be viewed here:" $tmp_diff | fmt
   fi
 }
 
@@ -88,10 +92,29 @@ function get_related_issue_overview() {
     sed "s#.*\(${project_code}-[0-9]*\).*#\1#g" | \
     sort | \
     uniq | while read f; do
-    get_header_from_jira $f
+    echo "   *" $(get_header_from_jira $f) | fmt
+    echo "   URL: https://$jira_host}/browse/${1}"
+    echo ""
   done
 }
 
+## $@ :: svn revision number or tag name
+function get_date_from_svn_log() {
+  echo $(svn log -r "$@" | sed -n '2p' | cut -d'|' -f3)
+}
+
+function get_svn_location() {
+  svn info | grep URL | cut -d':' -f2-
+}
+
+function get_header() {
+  cat <<EOF
+Changes in $(get_svn_location)
+From: revision $(get_from_revision) @ $(get_date_from_svn_log $(get_from_revision))
+To  : revision $(get_to_revision) @ $(get_date_from_svn_log $(get_to_revision))
+EOF
+}
+
 function sanity_check() {
   if [ ! -e $(pwd)/.svn ]; then
     print "This directory, $(pwd), " \
@@ -104,5 +127,6 @@ bootstrap_thyself
 read_user_settings
 get_user_input "$@"
 sanity_check
+get_header
 get_related_issue_overview
 get_commit_information_from_vcs

From 10d3c78f5b5a978cf68147bc879707b6c8277d0b Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Wed, 12 Dec 2012 10:45:07 +0100
Subject: [PATCH 1786/2585] Added support for specifying bridge

---
 usr/share/vizrt/vosa/commands/boot.sh            | 5 +++++
 usr/share/vizrt/vosa/commands/boot_config_parser | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/usr/share/vizrt/vosa/commands/boot.sh b/usr/share/vizrt/vosa/commands/boot.sh
index 910d97b1..0bf8b822 100755
--- a/usr/share/vizrt/vosa/commands/boot.sh
+++ b/usr/share/vizrt/vosa/commands/boot.sh
@@ -98,6 +98,11 @@ function select_tap_interface() {
     local network
     for network in $rundir/*.availablenetwork ; do
       [[ -f $network ]] || continue
+      # If we have a bridge preference, and it doesn't match the
+      # contents of the network file, ignore it as an available
+      # network.
+      [[ "$boot_config_bridge" != "" ]] && [[ "$boot_config_bridge" != "$(cat "$network")" ]] && continue;
+
       # $network == tap4.availablenetwork.  Contains the name(s) of vm04's networks
       local tap
       tap=$(basename $network .availablenetwork)
diff --git a/usr/share/vizrt/vosa/commands/boot_config_parser b/usr/share/vizrt/vosa/commands/boot_config_parser
index e4c46b49..58c83c24 100644
--- a/usr/share/vizrt/vosa/commands/boot_config_parser
+++ b/usr/share/vizrt/vosa/commands/boot_config_parser
@@ -4,6 +4,7 @@
 boot_config_memory=
 boot_config_processor_affinity=
 boot_config_vnc_port=
+boot_config_bridge=
 
 
 function boot_config_memory() {
@@ -18,6 +19,10 @@ function boot_config_vnc_port() {
   boot_config_vnc_port=$1
 }
 
+function boot_config_bridge() {
+  boot_config_bridge=$1
+}
+
 # Handle arrays
 
 # declare -a ssh_keys

From 81ebddf78f45ba4710337636145ef00c32b4c59c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Wed, 12 Dec 2012 15:38:51 +0100
Subject: [PATCH 1787/2585] vosa - adding generated server template for dev
 image

---
 .../hooks/post-install-hook-apply-patch.sh    | 36 +++++++++++++++++++
 .../hooks/post-install-hook-copy-files.sh     | 13 +++++++
 ...-install-hook-deploy-configuration.sh.tmpl | 11 ++++++
 .../post-install-hook-install-ece-install.sh  | 15 ++++++++
 .../hooks/post-install-hook-install-java.sh   | 17 +++++++++
 .../post-install-hook-restart-tomcats.sh      |  8 +++++
 .../post-install-hook-set-hostname.sh.tmpl    | 13 +++++++
 7 files changed, 113 insertions(+)
 create mode 100755 usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-apply-patch.sh
 create mode 100755 usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-copy-files.sh
 create mode 100755 usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-deploy-configuration.sh.tmpl
 create mode 100755 usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-ece-install.sh
 create mode 100755 usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-java.sh
 create mode 100755 usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-restart-tomcats.sh
 create mode 100755 usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-set-hostname.sh.tmpl

diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-apply-patch.sh b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-apply-patch.sh
new file mode 100755
index 00000000..91180652
--- /dev/null
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-apply-patch.sh
@@ -0,0 +1,36 @@
+#!/bin/bash -e
+
+echo "--- START : post install hook - apply patch ---"
+
+# copy all patch files
+scp -F $2/ssh.conf -r $1/patch/* root@guest:/
+
+# enable tomcat manager on engine1 
+ssh -F $2/ssh.conf root@guest  \
+   cp -R /opt/tomcat/webapps/manager /opt/tomcat-engine1/webapps/.
+
+# enable tomcat mamanger on search1
+ssh -F $2/ssh.conf root@guest  \
+   cp -R /opt/tomcat/webapps/manager /opt/tomcat-search1/webapps/.
+
+# cleanup all jar files not needed to run solr and analysis engine
+ssh -F $2/ssh.conf root@guest  \
+   'find /opt/tomcat-search1/escenic/lib/ -type f ! \( \
+-name 'common-nursery-*' \
+-o -name 'commons-codec-*' \
+-o -name 'commons-httpclient-*' \
+-o -name 'commons-io-*' \
+-o -name 'commons-lang-*' \
+-o -name 'commons-logging-*' \
+-o -name 'common-util-*' \
+-o -name 'log4j-*' \
+-o -name 'twelvemonkeys-core-*' \
+-o -name 'xom-*' \
+\) -exec rm -rf {} \;'
+
+# change ownership just to be sure
+ssh -F $2/ssh.conf root@guest  \
+   chown -R escenic: /opt/tomcat-*
+
+echo "--- END : post install hook - apply patch ---"
+
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-copy-files.sh b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-copy-files.sh
new file mode 100755
index 00000000..f6cb5234
--- /dev/null
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-copy-files.sh
@@ -0,0 +1,13 @@
+#!/bin/bash -e
+
+echo "--- START : post install hook - copy files ---"
+
+src_dir=files
+
+# copy everything under files into the images
+if [[ -d $1/$src_dir && \
+  $(find $1/$src_dir -maxdepth 1 | wc -l) -gt 1 ]]; then
+    scp -F $2/ssh.conf -rv $1/$src_dir/* root@guest:/tmp/.
+fi
+
+echo "--- END : post install hook - copy files ---"
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-deploy-configuration.sh.tmpl b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-deploy-configuration.sh.tmpl
new file mode 100755
index 00000000..8d964f30
--- /dev/null
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-deploy-configuration.sh.tmpl
@@ -0,0 +1,11 @@
+#!/bin/bash -e
+
+echo "--- START : post install hook - deploy configuration ---"
+
+# fetch latest .deb package from url
+ssh -F \$2/ssh.conf root@guest 'wget --http-user=$FAI_BUILDER_HTTP_USER --http-password=$FAI_BUILDER_HTTP_PASSWORD --quiet --inet4-only $HOOKS_LATEST_CONF_DEB -O conf.deb'
+
+# apply .deb package and force overwrites
+ssh -F \$2/ssh.conf root@guest 'dpkg -i --force-confnew conf.deb'
+
+echo "--- END : post install hook - deploy configuration ---"
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-ece-install.sh b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-ece-install.sh
new file mode 100755
index 00000000..bf429535
--- /dev/null
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-ece-install.sh
@@ -0,0 +1,15 @@
+#!/bin/bash -e
+
+echo "--- START : post install hook - install ece install ---"
+
+# add archive key for apt.vizrt.com
+curl -s http://apt.vizrt.com/archive.key | ssh -F $2/ssh.conf guest 'sudo apt-key add -'
+
+# add repo to sources list
+echo "deb http://apt.vizrt.com unstable main" | ssh -F $2/ssh.conf guest 'sudo tee > /dev/null /etc/apt/sources.list.d/vizrt.list'
+
+# install escenic scripts
+ssh -F $2/ssh.conf guest 'sudo apt-get update && sudo apt-get -y install escenic-content-engine-installer'
+ssh -F $2/ssh.conf guest 'sudo apt-get update && sudo apt-get -y install escenic-content-engine-scripts'
+
+echo "--- END : post install hook - install ece install ---"
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-java.sh b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-java.sh
new file mode 100755
index 00000000..27741637
--- /dev/null
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-java.sh
@@ -0,0 +1,17 @@
+#!/bin/bash -e
+
+echo "--- START : post install hook - install java ---"
+
+# copy .deb packages for java to the image
+scp -F $2/ssh.conf /usr/share/java-debs/*.deb root@guest:/tmp
+
+# install java dependencies
+ssh -F $2/ssh.conf guest 'sudo apt-get -y install unixodbc defoma java-common'
+
+# install .deb packages for java
+ssh -F $2/ssh.conf guest 'sudo dpkg -i /tmp/*.deb'
+
+# clean up
+ssh -F $2/ssh.conf guest 'sudo rm /tmp/*.deb'
+
+echo "--- END : post install hook - install java ---"
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-restart-tomcats.sh b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-restart-tomcats.sh
new file mode 100755
index 00000000..99b703d4
--- /dev/null
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-restart-tomcats.sh
@@ -0,0 +1,8 @@
+#!/bin/bash -e
+
+echo "--- START : post install hook - restart tomcats ---"
+
+ssh -F $2/ssh.conf ubuntu@guest  \
+   sudo service ece restart
+
+echo "--- END : post install hook - restart tomcats ---"
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-set-hostname.sh.tmpl b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-set-hostname.sh.tmpl
new file mode 100755
index 00000000..79576489
--- /dev/null
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-set-hostname.sh.tmpl
@@ -0,0 +1,13 @@
+#!/bin/bash -e
+
+echo \"--- START : post install hook - set hostname ---\"
+
+# set dev image hostame
+ssh -F \$2/ssh.conf root@guest 'echo $IMAGE_HOSTNAME > /etc/hostname'
+ssh -F \$2/ssh.conf root@guest 'hostname $IMAGE_HOSTNAME'
+ssh -F \$2/ssh.conf root@guest 'hostname'
+
+# add hostname to /etc/hosts
+ssh -F \$2/ssh.conf root@guest 'echo \"127.0.0.1	$IMAGE_HOSTNAME\" >> /etc/hosts'
+
+echo \"--- END : post install hook - set hostname ---\"

From 39757e9668cd5ac0bcccdd6cf5fefbaa87ed42c7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 12 Dec 2012 12:30:16 +0100
Subject: [PATCH 1788/2585] - hardening to common-bashing::run, try to touch
 the $log, or else   fail -> fail fast && graceful handling of misconfigured
 systems.

- added hardening to ece-deploy when we're running it on a system
  which doesn't contain any ece-installed ECEs.
---
 usr/sbin/ece-deploy                             | 7 ++++++-
 usr/share/escenic/ece-scripts/common-bashing.sh | 7 +++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
index bf12b495..758e0795 100755
--- a/usr/sbin/ece-deploy
+++ b/usr/sbin/ece-deploy
@@ -60,11 +60,16 @@ function bootstrap_thyself() {
   # kills the process
   trap common_bashing_exit_hook EXIT
   trap ece_deploy_cancel_hook SIGINT SIGHUP
+
+  source /etc/default/ece 2>/dev/null || {
+    print "There's no /etc/default/ece on $HOSTNAME" \
+      "this means there's no ece-installed ECE here, I will exit"
+    exit 1
+  }
 }
 
 bootstrap_thyself
 
-run source /etc/default/ece
 
 function deploy_ear() {
   local proxy_setings=""
diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index dd44a187..e4d7a715 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -132,6 +132,13 @@ function exit_on_error() {
 }
 
 function run() {
+  if [ ! -e $log ]; then
+    touch $log || {
+      echo "Couldn't create $log"
+      kill $BASHPID
+    }
+  fi
+  
   "${@}" 1>>$log 2>>$log
   exit_on_error $@
 }

From 4c9899753a3de96e66fb82cadb1009ecc2062163 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 12 Dec 2012 12:51:52 +0100
Subject: [PATCH 1789/2585] - common-bashing:blue, yellow, green & blue will no
 longer produce   coloured output when running in non-interactive shells.

  This means that output in log files no longer should contain BASH
  colour escapes.

- updated the technet and WF download lists, they now include ECE 5.5
  and all related plugins, as well as WF 2.0.x

- hardened ece-install, if the common-bashing library cannot be found
  and thereby the registered traps (error handlers). Now, ece-install
  first registers traps once the initial bootstrapping of the libraries
  has been done.

- ece-install now logs to /var/log/escenic/ece-install.log instead of
  /var/log/ece-install.log

- If ece-build failed in anyway, it would leave the PID file alone so
  that any consecutive runs of ece-build would fail. This has been
  fixed now by registering traps on exit and cancelled user/process
  events.

- renamed pid_file with ece_build_pid_file to not come in conflict
  with the PID set in common-bashing

- spell checking: plattform => platform

- made use of the create_pid method and exit traps/hooks in
  common-bashing, removed PID handling in ece-build.

- changed a debug message in system out to be logged instead
---
 usr/sbin/ece-install                          | 53 +++++++++++--------
 usr/share/escenic/build-scripts/ece-build     | 38 +++++--------
 .../escenic/ece-scripts/common-bashing.sh     | 26 +++++++--
 3 files changed, 66 insertions(+), 51 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 5a9eb2dc..f9a34e23 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -51,7 +51,7 @@ ece_scripts_version="straight-from-github"
 #####################################################################
 
 download_dir=/var/cache/$(basename $0)
-log=/var/log/$(basename $0).log
+log=/var/log/escenic/$(basename $0).log
 conf_file=$HOME/ece-install.conf
 ece_scripts_git_source=https://github.com/vizrt/ece-scripts.git
 maven_opts="--batch-mode"
@@ -78,26 +78,25 @@ force_packages=0
 ece_software_setup_completed=0
 
 ############################################################################
-# For ECE 5.3
+# For ECE 5.5
 ############################################################################
 technet_download_list="
-http://technet.escenic.com/downloads/assemblytool-2.0.2.zip
-http://technet.escenic.com/downloads/release/53/analysis-engine-2.3.7.0.zip
-http://technet.escenic.com/downloads/release/53/community-engine-3.6.2.124119.zip
-http://technet.escenic.com/downloads/release/53/dashboard-1.1.1.124124.zip
-http://technet.escenic.com/downloads/release/53/engine-5.3.7.126916.zip
-http://technet.escenic.com/downloads/release/53/forum-3.0.1.124096.zip
-http://technet.escenic.com/downloads/release/53/geocode-dist-2.3.1.0.zip
-http://technet.escenic.com/downloads/release/53/inpage-2.0.0.0.zip
-http://technet.escenic.com/downloads/release/53/lucy-dist-4.1.6.0.zip
-http://technet.escenic.com/downloads/release/53/menu-editor-dist-2.0.6.0.zip
-http://technet.escenic.com/downloads/release/53/poll-2.1.3.0.zip
-http://technet.escenic.com/downloads/release/53/section-feed-dist-2.0.4.0.zip
-http://technet.escenic.com/downloads/release/53/xml-editor-dist-2.1.0.0.zip
+  http://technet.escenic.com/downloads/release/55/analysis-engine-2.5.0.131590.zip
+  http://technet.escenic.com/downloads/release/55/assemblytool-2.0.4.jar
+  http://technet.escenic.com/downloads/release/55/community-engine-3.8.1.132399.zip
+  http://technet.escenic.com/downloads/release/55/engine-5.5.0.131978.zip
+  http://technet.escenic.com/downloads/release/55/forum-3.2.1.132293.zip
+  http://technet.escenic.com/downloads/release/55/geocode-2.4.1.130693.zip
+  http://technet.escenic.com/downloads/release/55/lucy-4.2.1.129603.zip
+  http://technet.escenic.com/downloads/release/55/menu-editor-2.1.1.128528.zip
+  http://technet.escenic.com/downloads/release/55/online-graphics-1.0.1.133123.zip
+  http://technet.escenic.com/downloads/release/55/poll-2.3.0.128547.zip
+  http://technet.escenic.com/downloads/release/55/vcpeditor-1.0.0.132434.zip
+  http://technet.escenic.com/downloads/release/55/video-1.2.1.132710.zip
 "
 wf_download_list="
-http://technet.escenic.com/downloads/widget-framework/widget-framework-core-1.10.0.0.zip
-http://technet.escenic.com/downloads/widget-framework/widget-framework-community-1.10.0.0.zip
+  http://technet.escenic.com/downloads/release/55/framework-dist-2.0.2.131581.zip
+  http://technet.escenic.com/downloads/release/55/framework-community-dist-2.0.2.131581.zip
 "
 ############################################################################
 
@@ -109,16 +108,21 @@ escenic_sources=/etc/apt/sources.list.d/escenic.list
 # prepare the pre-requisites.
 dry_run=0
 
-# hooks for when the scirpt exits cleanly and when a user or someone
-# kills the process
-trap common_bashing_exit_hook EXIT
-trap common_bashing_user_cancelled_hook SIGINT SIGHUP
-
 ## Bootstrapping, load files from /usr/share/escenic/ece-scripts The
 ## method will first try to be smart, in case the user has copied the
 ## ece-scripts somewhere else., e.g.: moved everything to ~/ece-scrpts
 ## or /opt/escenic/ece-scripts, this should also work.
 function init() {
+  # before doing anything else, be sure that the directory of the log
+  # file exists.
+  local dir=$(dirname $log)
+  if [ ! -d $dir ]; then
+    mkdir $(dirname $log) 2>/dev/null || {
+      echo "Couldn't create $(dirname $log)"
+      exit 1
+    }
+  fi
+  
   # first, try to be nice
   local dir=$(dirname $0)/../share/escenic/ece-scripts
 
@@ -143,6 +147,11 @@ function init() {
     echo "I cannot find $(basename $0)'s dependencies, exiting :-("
     exit 1
   fi
+  
+  # hooks for when the scirpt exits cleanly and when a user or someone
+  # kills the process
+  trap common_bashing_exit_hook EXIT
+  trap common_bashing_user_cancelled_hook SIGINT SIGHUP
 }
 
 function download_escenic_components()
diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 54f73e96..43c6d6a6 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -9,7 +9,6 @@
 # Common variables
 ece_scripts_version="straight-from-github"
 log=~/ece-build.log
-pid_file=~/ece-build.pid
 build_date=`date +%F_%H%M`
 builder_root_dir=/home/builder
 builder_engine_dir=$builder_root_dir/engine
@@ -60,16 +59,6 @@ mvn
 unzip
 wget"
 
-##
-function set_pid {
-  if [ -e $pid_file ]; then
-    echo "Instance of $(basename $0) already running!"
-    exit 1
-  else
-    echo $BASHPID > $pid_file
-  fi
-}
-
 ##
 function init
 {
@@ -91,6 +80,12 @@ function init
     echo "$error_message"
     exit 1
   fi
+
+  pid_file=~/ece-build.pid
+  create_pid
+  
+  trap common_bashing_exit_hook EXIT
+  trap common_bashing_user_cancelled_hook SIGINT SIGHUP
 }
 
 ##
@@ -248,7 +243,8 @@ function add_global_libs
     remove_pid_and_exit_in_error
   fi
   local engine_version=`readlink $engine_root_dir`
-  echo "$engine_version" | grep "engine-5.3"
+  log engine_version="$engine_version"
+  
   if [ $? = 0 ]; then
     if [ -e $builder_root_dir/lib/engine-backport-1.0-SNAPSHOT.jar ]; then
       run ln -s $builder_root_dir/lib/engine-backport-1.0-SNAPSHOT.jar $assemblytool_lib_dir/
@@ -306,14 +302,14 @@ function verify_requested_versions
   verification_failed=0
   if [ ! -d $engine_root_dir ]; then
     broken_link=`readlink $engine_root_dir`
-    print_and_log "The requested engine $broken_link does not exist on the plattform and must be added!"
+    print_and_log "The requested engine $broken_link does not exist on the platform and must be added!"
     verification_failed=1
   fi
   for f in $(ls -d $plugin_dir/*);
   do
     if [ ! -d $f ]; then
       broken_link=`readlink $f`
-      print_and_log "The requested plugin $broken_link does not exist on the plattform and must be added!"
+      print_and_log "The requested plugin $broken_link does not exist on the platform and must be added!"
       verification_failed=1
     fi
   done
@@ -400,7 +396,7 @@ function generate_publication_properties
 context-root:/${f%.war}" > $assemblytool_pub_dir/${f%.war}.properties
   done
   if [ -d ${plugins/dashboard} ]; then
-    print_and_log "Adding an assembly descriptor for Dashboard ..."
+    log "Adding an assembly descriptor for Dashboard ..."
     echo "source-war: ../../plugins/dashboard/wars/dashboard-webapp.war
 context-root: /dashboard" > $assemblytool_pub_dir/dashboard.properties
   fi
@@ -444,19 +440,13 @@ function print_result
   fi
 }
 
-##
-function common_post_build {
-  run rm $pid_file
-}
-
 ##
 function phase_startup {
-  set_pid
   init
 }
 
 ##
-function phase_verify_plattform
+function phase_verify_platform
 {
   verify_dependencies
   verify_java
@@ -666,7 +656,7 @@ function phase_release
 ##
 function phase_shutdown
 {
-  common_post_build
+  echo nothing > /dev/null
 }
 
 ## ece-build execution
@@ -674,7 +664,7 @@ phase_startup
 get_user_options $@
 print_and_log "Starting release creation! @ $(date)"
 print_and_log "Additional output can be found in $log"
-phase_verify_plattform
+phase_verify_platform
 phase_verify_user
 phase_clean_up
 phase_verify_project
diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index e4d7a715..b5369a05 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -196,26 +196,42 @@ function get_perl_escaped() {
 ##
 ## $1: input string
 function red() {
-  echo -e "\E[37;31m\033[1m${@}\033[0m"
+  if [[ -t "0" || -p /dev/stdin ]]; then
+    echo -e "\E[37;31m\033[1m${@}\033[0m"
+  else
+    echo "$@"
+  fi
 }
 
 ## Returns the inputted string(s) as green
 ##
 ## $1: input string
 function green() {
-  echo -e "\E[37;32m\033[1m${@}\033[0m"
+  if [[ -t "0" || -p /dev/stdin ]]; then
+    echo -e "\E[37;32m\033[1m${@}\033[0m"
+  else
+    echo "$@"
+  fi
 }
 
 ## Returns the inputted string(s) as yellow
 ##
 ## $1: input string
 function yellow() {
-  echo -e "\E[37;33m\033[1m${@}\033[0m"
+  if [[ -t "0" || -p /dev/stdin ]]; then
+    echo -e "\E[37;33m\033[1m${@}\033[0m"
+  else
+    echo "$@"
+  fi
 }
 
 function blue() {
-  echo -e "\E[37;34m\033[1m${@}\033[0m";
-};
+  if [[ -t "0" || -p /dev/stdin ]]; then
+    echo -e "\E[37;34m\033[1m${@}\033[0m";
+  else
+    echo "$@"
+  fi
+}
 
 ## $1: full path to the file.
 function get_base_dir_from_bundle()

From 1cfff8e41a2ad623d80d11555c981add32956872 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 12 Dec 2012 16:58:19 +0100
Subject: [PATCH 1790/2585] - /usr/bin/generate-changelog is now included in
 the   escenic-common-scripts package.

---
 usr/share/escenic/package-scripts/create-packages | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 8d68a680..811b3038 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -170,6 +170,7 @@ function set_up_escenic-common-scripts() {
   # system-info is useful for all packages, hence goes to
   # escenic-common-scripts.
   cp -r ../../../bin/system-info $target_dir/usr/bin/
+  cp -r ../../../bin/generate-changelog $target_dir/usr/bin/
   cp -r ../../escenic/ece-scripts/system-info.d \
     $target_dir/usr/share/escenic/ece-scripts/
   cp ../../../../etc/default/system-info $target_dir/etc/default/

From 58a3cd7efe4cedc7ed0705d2a967cc98a2450f86 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 12 Dec 2012 17:11:46 +0100
Subject: [PATCH 1791/2585] - ece-build now calls generate-changelog to get a
 changelog of what's   changed since the last build.

- TODO still work to do, both on ece-build and generate-changelog
  side, but at it's progressing nicely :)
---
 usr/share/escenic/build-scripts/ece-build | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 43c6d6a6..e33e0c5c 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -477,6 +477,22 @@ function phase_verify_project
   add_global_libs
 }
 
+function generate_new_changelog_if_does_not_exist() {
+  local dir=$HOME/.$(basename $0)/changelog
+  make_dir $dir
+
+  local file=${dir}/${revision}.changelog
+  if [ -e $file ]; then
+    return
+  fi
+
+  print_and_log "Generating change log for revision $revision" ...
+  (
+    cd ${svn_src_dir}
+    generate-changelog --from PREV --to $revision > $file
+  )
+}
+
 ## creates DEB and RPM packages with the server configuration for all
 ## of the machines available in <project>/server-admin/<machine
 ## instance>
@@ -491,6 +507,8 @@ function create_machine_conf_packages() {
     return
   fi
 
+  generate_new_changelog_if_does_not_exist
+
   local machine_list=$(
     find $conf_dir -maxdepth 1 -type d | \
       egrep -v "common|.svn" | \

From acc7a0e2033215e61865311c7ce9ba9c4b51ee47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=F6n?= <oschoen@vizrt.com>
Date: Thu, 13 Dec 2012 01:01:00 +0100
Subject: [PATCH 1792/2585] vosa - adding more skeleton-dev templates

---
 .../generated-servers/skeleton-dev/boot.conf  |  3 +
 .../skeleton-dev/ece-install.conf.tmpl        | 73 +++++++++++++++++++
 .../post-install-hook-set-password.sh.tmpl    | 11 +++
 .../skeleton-dev/install.conf.tmpl            | 27 +++++++
 .../skeleton-dev/patch/etc/default/ece        | 25 +++++++
 .../patch/etc/escenic/ece-engine1.conf.tmpl   | 53 ++++++++++++++
 .../patch/etc/escenic/ece-search1.conf.tmpl   | 51 +++++++++++++
 .../skeleton-dev/patch/etc/hosts.tmpl         |  9 +++
 .../patch/etc/issue.template.tmpl             |  8 ++
 .../patch/etc/network/if-up.d/update-issue    | 19 +++++
 .../skeleton-dev/patch/etc/shells             |  9 +++
 .../tomcat-engine1/conf/tomcat-users.xml.tmpl |  5 ++
 .../patch/opt/tomcat-search1/conf/context.xml | 44 +++++++++++
 .../tomcat-search1/conf/tomcat-users.xml.tmpl |  5 ++
 .../patch/usr/local/bin/escenic-top           |  5 ++
 .../patch/usr/local/bin/get-ip-address        |  2 +
 16 files changed, 349 insertions(+)
 create mode 100644 usr/share/vizrt/vosa/generated-servers/skeleton-dev/boot.conf
 create mode 100644 usr/share/vizrt/vosa/generated-servers/skeleton-dev/ece-install.conf.tmpl
 create mode 100755 usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-set-password.sh.tmpl
 create mode 100644 usr/share/vizrt/vosa/generated-servers/skeleton-dev/install.conf.tmpl
 create mode 100644 usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/etc/default/ece
 create mode 100644 usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/etc/escenic/ece-engine1.conf.tmpl
 create mode 100644 usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/etc/escenic/ece-search1.conf.tmpl
 create mode 100644 usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/etc/hosts.tmpl
 create mode 100644 usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/etc/issue.template.tmpl
 create mode 100755 usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/etc/network/if-up.d/update-issue
 create mode 100644 usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/etc/shells
 create mode 100644 usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/opt/tomcat-engine1/conf/tomcat-users.xml.tmpl
 create mode 100644 usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/opt/tomcat-search1/conf/context.xml
 create mode 100644 usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/opt/tomcat-search1/conf/tomcat-users.xml.tmpl
 create mode 100755 usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/usr/local/bin/escenic-top
 create mode 100755 usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/usr/local/bin/get-ip-address

diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/boot.conf b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/boot.conf
new file mode 100644
index 00000000..24cecf6f
--- /dev/null
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/boot.conf
@@ -0,0 +1,3 @@
+# memory allocation for RAM
+memory 2048
+
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/ece-install.conf.tmpl b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/ece-install.conf.tmpl
new file mode 100644
index 00000000..f0679c78
--- /dev/null
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/ece-install.conf.tmpl
@@ -0,0 +1,73 @@
+# technet credentials
+technet_user=$TECHNET_USER
+technet_password=$TECHNET_PASSWORD
+
+# technet download list
+technet_download_list=$TECHNET_DOWNLOAD_LIST
+
+# TODO - not sure if these are needed
+nop=
+wf_download_list=
+
+# FAI enabled
+fai_enabled=1
+
+# add tomcat instance for search + analysis engine
+fai_search_install=1
+fai_search_port=8180
+fai_search_shutdown=8105
+fai_search_redirect=8143
+fai_search_name=search1
+fai_search_indexer_ws_uri=http://localhost:8080/indexer-webservice/index/
+fai_search_ear=$FAI_SEARCH_EAR
+fai_search_for_editor=0
+fai_search_host=localhost
+fai_search_stop_and_clear=1
+
+# install analysis engine on the search instance 
+fai_analysis_install=1
+fai_analysis_port=\$fai_search_port
+fai_analysis_shutdown=\$fai_search_shutdown
+fai_analysis_redirect=\$fai_search_redirect
+fai_analysis_name=\$fai_search_name
+
+# add the db schema for analysis engine
+fai_analysis_db_install=1
+fai_analysis_db_schema=analysisdb
+fai_analysis_db_user=analysisdbuser
+fai_analysis_db_password=$FAI_ANALYSIS_DB_PASSWORD
+
+# do not setup the db as content will be recovered from .tar package
+fai_db_install=1
+
+# create the publications
+fai_publication_create=1
+fai_publication_war_remove_file_list=\"
+ META-INF/escenic/publication-resources/escenic/plugin/menu
+ META-INF/escenic/publication-resources/0/escenic/section-parameter
+ META-INF/escenic/resources/escenic/content
+\"
+
+# restore content from .tar package
+fai_restore_from_backup=0
+fai_db_drop_old_db_first=0
+fai_restore_db=0
+fai_restore_from_file=$FAI_RESTORE_FROM_FILE
+
+# install the cache profile
+fai_cache_install=1
+
+# skip monitoring
+fai_monitoring_node_nagios_skip=1
+fai_monitoring_node_munin_skip=1
+
+# configure the presentation profile
+fai_builder_http_user=$FAI_BUILDER_HTTP_USER
+fai_builder_http_password=$FAI_BUILDER_HTTP_PASSWORD
+fai_presentation_install=1
+fai_publication_environment=dev
+fai_presentation_ear=$FAI_PRESENTATION_EAR
+fai_publication_ear=$FAI_PRESENTATION_EAR
+fai_presentation_name=engine1
+fai_publication_domain_mapping_list=$FAI_PUBLICATION_DOMAIN_MAPPING_LIST
+fai_presentation_deploy_white_list=$FAI_PRESENTATION_DEPLOY_WHITE_LIST
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-set-password.sh.tmpl b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-set-password.sh.tmpl
new file mode 100755
index 00000000..cc6dc19d
--- /dev/null
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-set-password.sh.tmpl
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+echo \"--- START : post install hook - set password ---\"
+
+# set dev image passwords
+(
+  echo 'escenic:$HOOKS_ESCENIC_USER_PASSWORD'
+  echo 'ubuntu:$HOOKS_UBUNTU_USER_PASSWORD'
+) | ssh -F \$2/ssh.conf guest 'sudo chpasswd'
+
+echo \"--- END : post install hook - set password ---\"
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/install.conf.tmpl b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/install.conf.tmpl
new file mode 100644
index 00000000..b07ecdac
--- /dev/null
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/install.conf.tmpl
@@ -0,0 +1,27 @@
+macaddr $MAC_ADDRESS
+ip_address $IP_ADDRESS
+netmask $NETMASK
+gateway $GATEWAY
+
+original_image /var/lib/vizrt/vosa/uec-images/current/disk.img
+kernel /var/lib/vizrt/vosa/uec-images/current/vmlinuz
+initial_disk_size 15
+overlay /etc/vizrt/vosa/overlay/common
+timezone Europe/Oslo
+
+postinstall wait-for-ssh.sh
+postinstall permit-root-login.sh
+postinstall make-a-motd.sh
+
+postinstall ./hooks/post-install-hook-set-hostname.sh
+postinstall ./hooks/post-install-hook-set-password.sh
+postinstall ./hooks/post-install-hook-copy-files.sh
+postinstall ./hooks/post-install-hook-install-java.sh
+postinstall ./hooks/post-install-hook-install-ece-install.sh
+
+postinstall install-engine.sh
+
+postinstall ./hooks/post-install-hook-set-password.sh
+postinstall ./hooks/post-install-hook-apply-patch.sh
+postinstall ./hooks/post-install-hook-deploy-configuration.sh
+postinstall ./hooks/post-install-hook-restart-tomcats.sh
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/etc/default/ece b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/etc/default/ece
new file mode 100644
index 00000000..0d32fdf1
--- /dev/null
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/etc/default/ece
@@ -0,0 +1,25 @@
+# Configuration for the /etc/init.d/ece script     -*- conf -*-
+
+# Space separated lists of instance names for ECE instances and search
+# instances. If you only have one # instance, use "default" as its
+# name. If you don't have any instances of that type on this host,
+# then just set the variable to an empty string.
+engine_instance_list="engine1"
+search_instance_list="search1"
+analysis_instance_list=""
+
+# You only need one hub in an ECE cluster, so only set this one to
+# true on one host. 1 means on, 0 means off.
+enable_rmi_hub=0
+
+# The location of the ece script, default is /usr/bin/ece
+ece_script=/usr/bin/ece
+
+# Default Unix user that will run the processes, default is escenic
+# for both of these.
+ece_unix_group="escenic"
+ece_unix_user="escenic"
+
+# Do you want cron to remove (5 days) old log files every day?
+# (default is yes, i.e. 1. Set 0 to turn this off)
+remove_old_log_files=1
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/etc/escenic/ece-engine1.conf.tmpl b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/etc/escenic/ece-engine1.conf.tmpl
new file mode 100644
index 00000000..ea74b594
--- /dev/null
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/etc/escenic/ece-engine1.conf.tmpl
@@ -0,0 +1,53 @@
+tomcat_base=\"/opt/tomcat-engine1\"
+tomcat_home=\"/opt/tomcat\"
+appserver_port=\"8080\"
+deploy_webapp_white_list=$DEPLOY_WEBAPP_WHITE_LIST
+
+#########################################################################
+# JVM related (the Java Virtual Machine)
+#########################################################################
+
+#########################################################################
+# The minimum and maximum heap sizes for the Java process
+#########################################################################
+min_heap_size=1024m
+max_heap_size=1024m
+
+#########################################################################
+# The permgen size is the amount of memory the JVM sets aside to class
+# defintions. If you are experiencing constant OutOfMemory
+# exceptions/errors and are using EAR deployment, you may want to
+# increase these.
+#########################################################################
+min_permgen_size=128m
+max_permgen_size=128m
+
+enable_remote_debugging=1
+
+ece_environment=dev
+
+builder_http_user=$FAI_BUILDER_HTTP_USER
+builder_http_password=$FAI_BUILDER_HTTP_PASSWORD
+
+#########################################################################
+# Settings related to the JVM garbage collection, don't touch these if
+# you're not sure of what you're doing and have tested your changes
+# properly. Note that ece takes care of the GC logging, so you don't
+# have to cater for that here.
+#########################################################################
+jvm_gc_settings=\"
+-XX:+CMSClassUnloadingEnabled
+-XX:+CMSIncrementalPacing
+-XX:+CMSPermGenSweepingEnabled
+-XX:+ExplicitGCInvokesConcurrent
+-XX:+UseCMSInitiatingOccupancyOnly
+-XX:+UseConcMarkSweepGC
+-XX:CMSInitiatingOccupancyFraction=65
+-XX:InitialCodeCacheSize=50m
+-XX:MaxNewSize=256m
+-XX:NewSize=256m
+-XX:ParallelGCThreads=1
+-XX:ReservedCodeCacheSize=50m
+-XX:SurvivorRatio=1
+\"
+
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/etc/escenic/ece-search1.conf.tmpl b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/etc/escenic/ece-search1.conf.tmpl
new file mode 100644
index 00000000..526b9759
--- /dev/null
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/etc/escenic/ece-search1.conf.tmpl
@@ -0,0 +1,51 @@
+tomcat_base=\"/opt/tomcat-search1\"
+tomcat_home=\"/opt/tomcat\"
+appserver_port=\"8180\"
+deploy_webapp_white_list=\"solr indexer-webapp\"
+
+#########################################################################
+# JVM related (the Java Virtual Machine)
+#########################################################################
+
+#########################################################################
+# The minimum and maximum heap sizes for the Java process
+#########################################################################
+min_heap_size=256m
+max_heap_size=256m
+
+#########################################################################
+# The permgen size is the amount of memory the JVM sets aside to class
+# defintions. If you are experiencing constant OutOfMemory
+# exceptions/errors and are using EAR deployment, you may want to
+# increase these.
+#########################################################################
+min_permgen_size=64m
+max_permgen_size=64m
+
+enable_remote_debugging=0
+
+builder_http_user=$FAI_BUILDER_HTTP_USER
+builder_http_password=$FAI_BUILDER_HTTP_PASSWORD
+
+#########################################################################
+# Settings related to the JVM garbage collection, don't touch these if
+# you're not sure of what you're doing and have tested your changes
+# properly. Note that ece takes care of the GC logging, so you don't
+# have to cater for that here.
+#########################################################################
+jvm_gc_settings=\"
+-XX:+CMSClassUnloadingEnabled
+-XX:+CMSIncrementalPacing
+-XX:+CMSPermGenSweepingEnabled
+-XX:+ExplicitGCInvokesConcurrent
+-XX:+UseCMSInitiatingOccupancyOnly
+-XX:+UseConcMarkSweepGC
+-XX:CMSInitiatingOccupancyFraction=65
+-XX:InitialCodeCacheSize=50m
+-XX:MaxNewSize=50m
+-XX:NewSize=50m
+-XX:ParallelGCThreads=1
+-XX:ReservedCodeCacheSize=50m
+-XX:SurvivorRatio=1
+\"
+
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/etc/hosts.tmpl b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/etc/hosts.tmpl
new file mode 100644
index 00000000..7c538a4a
--- /dev/null
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/etc/hosts.tmpl
@@ -0,0 +1,9 @@
+127.0.0.1 localhost $IMAGE_HOST_MAPPINGS
+
+# The following lines are desirable for IPv6 capable hosts
+::1 ip6-localhost ip6-loopback
+fe00::0 ip6-localnet
+ff00::0 ip6-mcastprefix
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters
+ff02::3 ip6-allhosts
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/etc/issue.template.tmpl b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/etc/issue.template.tmpl
new file mode 100644
index 00000000..386b04de
--- /dev/null
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/etc/issue.template.tmpl
@@ -0,0 +1,8 @@
+Welcome to the $HOOKS_PROJECT_NAME development environment.
+
+My IP address when accessing the internet: \$(curl -s ifconfig.me)
+My local eth0 address: \$(/usr/local/bin/get-ip-address eth0)
+My local eth1 address: \$(/usr/local/bin/get-ip-address eth1)
+
+Log in as the \"escenic\" user (password: $HOOKS_ESCENIC_USER_PASSWORD)
+Log in as the \"top\" user (no password) for \"escenic top\"
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/etc/network/if-up.d/update-issue b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/etc/network/if-up.d/update-issue
new file mode 100755
index 00000000..ece003a6
--- /dev/null
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/etc/network/if-up.d/update-issue
@@ -0,0 +1,19 @@
+#!/bin/bash -e
+
+if [ "$METHOD" = loopback ]; then
+    exit 0
+fi
+
+# Only run from ifup.
+if [ "$MODE" != start ]; then
+    exit 0
+fi
+
+for a in /var/lib/ece-install/*.trail ; do
+  if [ -r "$a" ] ; then
+    eval "$(< "$a")"
+  fi
+done
+
+eval "echo \"$(</etc/issue.template)\"" 2> /dev/null > /etc/issue
+
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/etc/shells b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/etc/shells
new file mode 100644
index 00000000..8b16ef4c
--- /dev/null
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/etc/shells
@@ -0,0 +1,9 @@
+# /etc/shells: valid login shells
+/bin/sh
+/bin/dash
+/bin/bash
+/bin/rbash
+/usr/bin/tmux
+/usr/bin/screen
+/usr/local/bin/escenic-top
+
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/opt/tomcat-engine1/conf/tomcat-users.xml.tmpl b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/opt/tomcat-engine1/conf/tomcat-users.xml.tmpl
new file mode 100644
index 00000000..f492d95b
--- /dev/null
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/opt/tomcat-engine1/conf/tomcat-users.xml.tmpl
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='utf-8'?>
+<tomcat-users>
+  <role rolename=\"manager\"/>
+  <user username=\"$HOOKS_TOMCAT_MANAGER_USER\" password=\"$HOOKS_TOMCAT_MANAGER_PASSWORD\" roles=\"tomcat,manager\"/>
+</tomcat-users>
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/opt/tomcat-search1/conf/context.xml b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/opt/tomcat-search1/conf/context.xml
new file mode 100644
index 00000000..fcf1dad5
--- /dev/null
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/opt/tomcat-search1/conf/context.xml
@@ -0,0 +1,44 @@
+<?xml version='1.0' encoding='utf-8'?>
+<Context>
+  <WatchedResource>WEB-INF/web.xml</WatchedResource>
+  <ResourceLink
+      global="jdbc/eae-logger/logger"
+      name="jdbc/eae-logger/logger"
+      type="javax.sql.DataSource"
+  />
+  <ResourceLink
+      global="jdbc/eae-qs/qs"
+      name="jdbc/eae-qs/qs"
+      type="javax.sql.DataSource"
+  />
+  <Environment
+      name="escenic/solr-base-uri"
+      value="http://localhost:8180/solr/"
+      type="java.lang.String"
+      override="false"
+  />
+  <Environment
+      name="escenic/indexer-webservice"
+      value="http://localhost:8080/indexer-webservice/index/"
+      type="java.lang.String"
+      override="false"
+  />
+  <Environment
+      name="escenic/index-update-uri"
+      value="http://localhost:8180/solr/update/"
+      type="java.lang.String"
+      override="false"
+  />
+  <Environment
+      name="escenic/head-tail-storage-file"
+      value="/var/lib/escenic/engine/head-tail.index"
+      type="java.lang.String"
+      override="false"
+  />
+  <Environment
+      name="escenic/failing-documents-storage-file"
+      value="/var/lib/escenic/engine/failures.index"
+      type="java.lang.String"
+      override="false"
+  />
+</Context>
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/opt/tomcat-search1/conf/tomcat-users.xml.tmpl b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/opt/tomcat-search1/conf/tomcat-users.xml.tmpl
new file mode 100644
index 00000000..f492d95b
--- /dev/null
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/opt/tomcat-search1/conf/tomcat-users.xml.tmpl
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='utf-8'?>
+<tomcat-users>
+  <role rolename=\"manager\"/>
+  <user username=\"$HOOKS_TOMCAT_MANAGER_USER\" password=\"$HOOKS_TOMCAT_MANAGER_PASSWORD\" roles=\"tomcat,manager\"/>
+</tomcat-users>
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/usr/local/bin/escenic-top b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/usr/local/bin/escenic-top
new file mode 100755
index 00000000..64461347
--- /dev/null
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/usr/local/bin/escenic-top
@@ -0,0 +1,5 @@
+#!/bin/sh -e
+
+watch --no-title 'echo "Hit [ctrl]+C to stop top.        $(date --rfc-3339=seconds)"; echo; curl 2>/dev/null -s http://localhost:8080/escenic-admin/top'
+
+
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/usr/local/bin/get-ip-address b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/usr/local/bin/get-ip-address
new file mode 100755
index 00000000..6c1d57a8
--- /dev/null
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/usr/local/bin/get-ip-address
@@ -0,0 +1,2 @@
+/sbin/ifconfig $1 | grep "inet addr" | grep -v "127.0.0.1" | head -n 1 | awk '{ print $2 }' | awk -F: '{ print $2 }'
+

From 9685350accaf6f601a3fced503c6cf88cb9c6048 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 13 Dec 2012 14:34:27 +0100
Subject: [PATCH 1793/2585] Fixed problem of stop not stopping kvm instances
 ... (!)

---
 usr/bin/vosa | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index a8306bdc..ff15075f 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -1026,7 +1026,7 @@ function do_stop() {
       echo "$instance_name is not installed, it's ${status[2]}. I can't stop it."
       exit 1
     fi
-    if [ "${status[3]}" == "running" ] ; then
+    if [ "${status[3]}" == "alive" -o "${status[3]}" == "running" ] ; then
       shutdown "${status[0]}"
       # should now be "dead" if we asked it.
     fi

From faeea25c38e6d92a4842da7f24c44c7fa7fe4497 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 13 Dec 2012 14:46:06 +0100
Subject: [PATCH 1794/2585] Fixed shutdown of kvm to also remove pidfile after
 successful shutdown.

---
 usr/bin/vosa | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index ff15075f..2cc1256d 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -1042,8 +1042,10 @@ function do_stop() {
 
 # Performs a graceful shutdown of the guest
 function shutdown_kvm() {
-  local pid=$(<$(echo_rundir_of $1)/$1.pid)
+  local pidfile="$(echo_rundir_of $1)/$1.pid"
+  local pid=$(<$$pidfile)
   if [ -z "$pid" ] ; then
+    rm $pidfile
     return 0
   fi
   ps > /dev/null $pid && {
@@ -1058,6 +1060,7 @@ function shutdown_kvm() {
     sleep 1
     ps > /dev/null $pid || {
       echo;
+      rm $pidfile
       return 0;
     }
   done
@@ -1073,6 +1076,7 @@ function shutdown_kvm() {
     sleep 1
     ps > /dev/null $pid || {
       echo;
+      rm $pidfile
       return 0;
     }
   done
@@ -1085,11 +1089,12 @@ function shutdown_kvm() {
     sleep 1
     ps > /dev/null $pid || {
       echo;
+      rm $pidfile
       return 0;
     }
   done
   ps > /dev/null $pid && {
-    echo "guest did not respond to kill.  Killing with -9."
+    echo "guest did not respond to kill.  Killing with -9. Leaving pidfile alone."
     kill -9 "${status[4]}"
   }
 }

From 683608ae166cf6a9b5b6e268a3666a300f8c31d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Thu, 13 Dec 2012 03:45:07 +0100
Subject: [PATCH 1795/2585] vosa - updated comment

---
 usr/share/vizrt/vosa/generated-servers/skeleton-dev/boot.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/boot.conf b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/boot.conf
index 24cecf6f..a7795def 100644
--- a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/boot.conf
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/boot.conf
@@ -1,3 +1,3 @@
-# memory allocation for RAM
+# memory allocation for dev server
 memory 2048
 

From 502de4cb3434abe3446fb2dfd63fceacf59796e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Thu, 13 Dec 2012 04:11:10 +0100
Subject: [PATCH 1796/2585] vosa - add type of memory to comment

---
 usr/share/vizrt/vosa/generated-servers/skeleton-dev/boot.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/boot.conf b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/boot.conf
index a7795def..a359bf91 100644
--- a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/boot.conf
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/boot.conf
@@ -1,3 +1,3 @@
-# memory allocation for dev server
+# memory allocation for dev server RAM
 memory 2048
 

From e1e1a769f897cf99f4d8395368f20d39c440ad84 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torsteinkrausework@gmail.com>
Date: Thu, 13 Dec 2012 11:27:23 +0100
Subject: [PATCH 1797/2585] - wee grammar & language correction

---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index 4b19a576..bc65f68e 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 ===============
 Read this first
 ===============
-The development of ece-scripts have now (2012-12-11) been moved to
+The development of ece-scripts has of 2012-12-11 been moved to
 Vizrt's github space: https://github.com/vizrt/ece-scripts, so go here
 for the latest code and issue tracking.
 

From 1331296388b1c872b4df5896ec36386a1de08b76 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Fri, 14 Dec 2012 12:18:41 +0100
Subject: [PATCH 1798/2585] Changed hugin-node packages so that files are in
 different locations...

---
 usr/share/escenic/package-scripts/create-packages | 15 +++++++++------
 .../hugin/{ => plugins}/publication-resources     |  0
 usr/share/hugin/{ => plugins}/system-info         |  0
 3 files changed, 9 insertions(+), 6 deletions(-)
 rename usr/share/hugin/{ => plugins}/publication-resources (100%)
 rename usr/share/hugin/{ => plugins}/system-info (100%)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 811b3038..c7c350a7 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -216,8 +216,9 @@ function set_up_escenic-munin-plugins() {
 }
 
 function set_up_hugin-node() {
-  mkdir -p $target_dir/etc/{hugin.often,hugin.hourly,hugin.daily,hugin.weekly,cron.d}
-  mkdir -p $target_dir/usr/{bin,sbin,share/doc/hugin,share/hugin}
+  mkdir -p $target_dir/etc/hugin/{hugin.often,hugin.hourly,hugin.daily,hugin.weekly}
+  mkdir -p $target_dir/etc/{cron.d,sudoers.d}
+  mkdir -p $target_dir/usr/{bin,share/doc/hugin,share/hugin/plugins,share/hugin/helpers}
   mkdir -p $target_dir/var/lib/hugin
   
   local dir=$(mktemp -d)
@@ -226,11 +227,13 @@ function set_up_hugin-node() {
     wget $wget_opts https://bitbucket.org/mogsie/hugin/get/default.tar.gz
     tar xzf default.tar.gz
     cp $dir/mogsie-hugin-*/bin/* $target_dir/usr/bin
-    cp $dir/mogsie-hugin-*/sbin/* $target_dir/usr/sbin
-    cp $dir/mogsie-hugin-*/etc/* $target_dir/etc
+    cp $dir/mogsie-hugin-*/helpers/* $target_dir/usr/share/hugin/helpers/
+    cp $dir/mogsie-hugin-*/etc/* $target_dir/etc/hugin/
+    cp $dir/mogsie-hugin-*/sudoers/* $target_dir/etc/sudoers.d/
     cp $dir/mogsie-hugin-*/cron/* $target_dir/etc/cron.d/
-    cp $dir/mogsie-hugin-*/checks/* $target_dir/usr/share/hugin/
-    cp $dir/mogsie-hugin-*/README.md $target_dir/usr/share/doc/hugin
+    cp $dir/mogsie-hugin-*/checks/* $target_dir/usr/share/hugin/plugins/
+    cp $dir/mogsie-hugin-*/*.md $target_dir/usr/share/doc/hugin
+    cp $dir/mogsie-hugin-*/LICENSE $target_dir/usr/share/doc/hugin
 
     # chmod 755 $file $target_dir/usr/bin/*
   )
diff --git a/usr/share/hugin/publication-resources b/usr/share/hugin/plugins/publication-resources
similarity index 100%
rename from usr/share/hugin/publication-resources
rename to usr/share/hugin/plugins/publication-resources
diff --git a/usr/share/hugin/system-info b/usr/share/hugin/plugins/system-info
similarity index 100%
rename from usr/share/hugin/system-info
rename to usr/share/hugin/plugins/system-info

From ecf5021165932a34166a11154c59c511761dfc68 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 13 Dec 2012 11:14:09 +0100
Subject: [PATCH 1799/2585] - added more elaborate explanation of what's being
 crawled.

---
 usr/sbin/ece-deploy | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
index 758e0795..a2d46fd8 100755
--- a/usr/sbin/ece-deploy
+++ b/usr/sbin/ece-deploy
@@ -529,7 +529,8 @@ function crawl_a_wee_bit() {
     )
 
     for ele in $virtual_hosts; do
-      print_and_log "Crawling $ele ..."
+      print_and_log "Crawling the front page (including JS, CSS, pictures) " \
+        "of $ele ..."
       wget \
         --quiet \
         --page-requisites \

From b803cb4a49ff04aaeb56892ff0d504119d668ca1 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 13 Dec 2012 11:42:26 +0100
Subject: [PATCH 1800/2585] - added cron script written by @Mogsie for removing
 old image (and   other multimedia) cache files. These are the images that ECE
   generates whenever someone requests an image version (often refereed   to
 as ALTERNATE int the URL & content-type)

---
 etc/cron.daily/remove-old-escenic-cache-files | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100755 etc/cron.daily/remove-old-escenic-cache-files

diff --git a/etc/cron.daily/remove-old-escenic-cache-files b/etc/cron.daily/remove-old-escenic-cache-files
new file mode 100755
index 00000000..07e2b5e6
--- /dev/null
+++ b/etc/cron.daily/remove-old-escenic-cache-files
@@ -0,0 +1,12 @@
+#! /usr/bin/env bash
+
+# cron script to remove old cache files. These are the images that ECE
+# generates whenever someone requests an image version (often refereed
+# to as ALTERNATE int the URL & content-type).
+
+dir=/var/cache/escenic/engine/binary
+
+if [ -d $dir  ] ; then
+  nice find $dir -type f -daystart -atime +15 -delete
+  nice find $dir -type d -empty -delete 
+fi

From 0f1fc2e8c8dfda92517f498632fb68e02888520a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 14 Dec 2012 14:15:38 +0100
Subject: [PATCH 1801/2585] - generate-changelog now keeps a local archive
 which is specific both   to the project and to the trunk branch that it's
 requested on. Each   run of it is stored in two files, a .report and a .diff:

  ~/.generate-changelog/myproject/trunk/from-5401-to-5856.diff
  ~/.generate-changelog/myproject/trunk/from-5401-to-5856.report

- generate-changelog will no re-generate the same diff & report for
  the combination of from, to, project & branch. The exception being
  when using the PREV and COMITTED Subversion keywords, in which case
  generate-changelog will re-generate the report every time.

  Example usage:
  $ generate-changelog --project MYPROJECT --from 5401 --to 5856
---
 usr/bin/generate-changelog | 99 +++++++++++++++++++++++++-------------
 1 file changed, 65 insertions(+), 34 deletions(-)

diff --git a/usr/bin/generate-changelog b/usr/bin/generate-changelog
index 4a121e7e..dfd21a19 100755
--- a/usr/bin/generate-changelog
+++ b/usr/bin/generate-changelog
@@ -1,6 +1,7 @@
 #! /usr/bin/env bash
 
 log=$HOME/.$(basename $0).log
+archive_base_dir=$HOME/.$(basename $0)
 
 function bootstrap_thyself() {
   # first, try to be nice, then check the standard location
@@ -21,6 +22,7 @@ function bootstrap_thyself() {
       exit 1
     }
   done
+
 }
 
 function read_user_settings() {
@@ -29,16 +31,12 @@ function read_user_settings() {
 }
 
 function get_header_from_jira() {
-  local body=$(curl -s https://${user}:${password}@${jira_host}/browse/${1})
+  local body=$(curl -u ${user}:${password} -s ${jira_base_url}/browse/${1})
   echo "$body" | grep '<title>' | sed -e 's/<title>//g' -e 's/<\/title>//g'
 }
 
 function get_to_revision() {
-  if [ -n "${to}" ]; then
-    echo "${to}"
-  else
-    svn info | grep ^'Last Changed Rev' | awk '{ print $4 }'
-  fi
+  echo ${to-COMMITTED}
 }
 
 function get_from_revision() {
@@ -72,32 +70,32 @@ function get_user_input() {
   done
 }
 
+function should_regenerate() {
+  if [[ $(is_number $(get_from_revision)) -eq 1 && \
+    $(is_number $(get_to_revision)) ]]; then
+    echo 0
+    return
+  fi
+
+  echo 1
+}
+
 function get_commit_information_from_vcs() {
-  local suffix=-${project_code}-from-$(get_from_revision)-to-$(get_to_revision).diff
-  local tmp_diff=$(mktemp --suffix "${suffix}")
-  svn diff -r $(get_from_revision):$(get_to_revision) > $tmp_diff
-  exit_on_error "svn diff -r $(get_from_revision):$(get_to_revision)"
+  local the_diff=$(get_archive_dir)/from-$(get_from_revision)-to-$(get_to_revision).diff
+
+  if [[ ! -e $the_diff || $(should_regenerate) -eq 1 ]]; then
+    svn diff -r $(get_from_revision):$(get_to_revision) > $the_diff
+    exit_on_error "svn diff -r $(get_from_revision):$(get_to_revision)"
+  fi
+
   if [ ${full_listing-0} -eq 1 ]; then
-    cat $tmp_diff
+    cat $the_diff
   else
-    echo "A full overview of all" $(egrep '^(\+|\-) ' $tmp_diff | wc -l) \
-      "changes can be viewed here:" $tmp_diff | fmt
+    echo "A full overview of all" $(egrep '^(\+|\-) ' $the_diff | wc -l) \
+      "changes can be viewed here:" $the_diff | fmt
   fi
 }
 
-function get_related_issue_overview() {
-  local commit_log=$(svn log -r $(get_from_revision):$(get_to_revision))
-  echo "$commit_log" | \
-    grep ${project_code}-[0-9]* | \
-    sed "s#.*\(${project_code}-[0-9]*\).*#\1#g" | \
-    sort | \
-    uniq | while read f; do
-    echo "   *" $(get_header_from_jira $f) | fmt
-    echo "   URL: https://$jira_host}/browse/${1}"
-    echo ""
-  done
-}
-
 ## $@ :: svn revision number or tag name
 function get_date_from_svn_log() {
   echo $(svn log -r "$@" | sed -n '2p' | cut -d'|' -f3)
@@ -107,12 +105,29 @@ function get_svn_location() {
   svn info | grep URL | cut -d':' -f2-
 }
 
-function get_header() {
-  cat <<EOF
-Changes in $(get_svn_location)
-From: revision $(get_from_revision) @ $(get_date_from_svn_log $(get_from_revision))
-To  : revision $(get_to_revision) @ $(get_date_from_svn_log $(get_to_revision))
-EOF
+function get_info_from_jira() {
+  local the_report=$(get_archive_dir)/from-$(get_from_revision)-to-$(get_to_revision).report
+  
+  if [[ ! -e $the_report || $(should_regenerate) -eq 1 ]]; then
+    echo "Changes in $(get_svn_location)" > $the_report
+    echo "From: revision $(get_from_revision) @" \
+      $(get_date_from_svn_log $(get_from_revision)) >> $the_report
+    echo "To  : revision $(get_to_revision) @" \
+      $(get_date_from_svn_log $(get_to_revision)) >> $the_report
+
+    local commit_log=$(svn log -r $(get_from_revision):$(get_to_revision))
+    echo "$commit_log" | \
+      grep ${project_code}-[0-9]* | \
+      sed "s#.*\(${project_code}-[0-9]*\).*#\1#g" | \
+      sort | \
+      uniq | while read f; do
+      echo "   *" $(get_header_from_jira $f) | fmt >> $the_report
+      echo "   URL: ${jira_base_url}/browse/$(basename $f)" >> $the_report
+      echo "" >> $the_report
+    done
+  fi
+  
+  cat $the_report
 }
 
 function sanity_check() {
@@ -123,10 +138,26 @@ function sanity_check() {
   fi
 }
 
+function get_project() {
+  echo ${project_code} | tr [A-Z] [a-z]
+}
+
+function get_archive_dir() {
+  local project_context=$(get_svn_location | \
+    sed -e  "s#${svn_base_url}/##g" -e 's#[ ]*##g' | \
+    tr [A-Z] [a-z]
+  )
+  
+  local dir=${archive_base_dir}/${project_context}
+  make_dir $dir
+  echo $dir
+}
+
 bootstrap_thyself
 read_user_settings
 get_user_input "$@"
 sanity_check
-get_header
-get_related_issue_overview
+get_info_from_jira
 get_commit_information_from_vcs
+
+

From e23a2ab369bb784b368da99418351513fd0db13f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 14 Dec 2012 14:31:50 +0100
Subject: [PATCH 1802/2585] - removed  
 http://technet.escenic.com/downloads/release/55/analysis-engine-2.5.0.131590.zip
  as this currently isn't available on Technet (bug filed in the Vizrt  bug
 tracker).

---
 usr/sbin/ece-install | 1 -
 1 file changed, 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index f9a34e23..617553d5 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -81,7 +81,6 @@ ece_software_setup_completed=0
 # For ECE 5.5
 ############################################################################
 technet_download_list="
-  http://technet.escenic.com/downloads/release/55/analysis-engine-2.5.0.131590.zip
   http://technet.escenic.com/downloads/release/55/assemblytool-2.0.4.jar
   http://technet.escenic.com/downloads/release/55/community-engine-3.8.1.132399.zip
   http://technet.escenic.com/downloads/release/55/engine-5.5.0.131978.zip

From e4d626353b1294c3f1e0b4e7cc8e6027803a131b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 14 Dec 2012 15:12:49 +0100
Subject: [PATCH 1803/2585] - added a number of switches so that
 generate-changelog can be called   from e.g. ece-build re-using most of the
 same .conf settings, only   requiring two lines in .generate-changelog.conf:

  jira_base_url=https://jira.mycompany.com
  svn_base_url=http://vcs.mycompany.com/svn
---
 usr/bin/generate-changelog | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/usr/bin/generate-changelog b/usr/bin/generate-changelog
index dfd21a19..4d6a0e7e 100755
--- a/usr/bin/generate-changelog
+++ b/usr/bin/generate-changelog
@@ -47,10 +47,16 @@ function get_user_input() {
   local next_is_from=0
   local next_is_to=0
   local next_is_project=0
+  local next_is_user=0
+  local next_is_password=0
   
   for el in "$@"; do
     if [[ "$el" == "-s" || "$el" == "--from" ]]; then
       next_is_from=1
+    elif [[ "$el" == "-u" || "$el" == "--user" ]]; then
+      next_is_user=1
+    elif [[ "$el" == "-p" || "$el" == "--password" ]]; then
+      next_is_password=1
     elif [[ "$el" == "-t" || "$el" == "--to" ]]; then
       next_is_to=1
     elif [[ "$el" == "-p" || "$el" == "--project" ]]; then
@@ -60,6 +66,12 @@ function get_user_input() {
     elif [ ${next_is_from-0} -eq 1 ]; then
       from=$el
       next_is_from=0
+    elif [ ${next_is_user-0} -eq 1 ]; then
+      user=$el
+      next_is_user=0
+    elif [ ${next_is_password-0} -eq 1 ]; then
+      password=$el
+      next_is_password=0
     elif [ ${next_is_to-0} -eq 1 ]; then
       to=$el
       next_is_to=0
@@ -136,6 +148,14 @@ function sanity_check() {
       "does not contain a working version control checkout."
     exit 1
   fi
+
+  conf_file=$HOME/.$(basename $0).conf
+  ensure_variable_is_set \
+    project_code \
+    user \
+    password \
+    jira_base_url \
+    svn_base_url
 }
 
 function get_project() {

From 742a973db378d2d092673e350994860626ec5ab4 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 14 Dec 2012 15:25:28 +0100
Subject: [PATCH 1804/2585] - removed the ece-build specific archive for the
 changelog generation   as generate-changelog keeps its own archive that
 ece-build can use

- passed most variables from ece-build's own configuration on to
  generate-changelog
---
 usr/share/escenic/build-scripts/ece-build | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index e33e0c5c..272b8794 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -477,19 +477,17 @@ function phase_verify_project
   add_global_libs
 }
 
-function generate_new_changelog_if_does_not_exist() {
-  local dir=$HOME/.$(basename $0)/changelog
-  make_dir $dir
-
-  local file=${dir}/${revision}.changelog
-  if [ -e $file ]; then
-    return
-  fi
-
+function generate_new_changelog() {
   print_and_log "Generating change log for revision $revision" ...
   (
     cd ${svn_src_dir}
-    generate-changelog --from PREV --to $revision > $file
+    # TODO, get the previous revision built instead of PREV
+    run generate-changelog \
+      --project $customer \
+      --user $svn_user \
+      --password $svn_password \
+      --from PREV \
+      --to $revision
   )
 }
 
@@ -507,7 +505,7 @@ function create_machine_conf_packages() {
     return
   fi
 
-  generate_new_changelog_if_does_not_exist
+  generate_new_changelog
 
   local machine_list=$(
     find $conf_dir -maxdepth 1 -type d | \

From a2e112b7dd0d91dea0a7276f212de129d8d2c1e8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 14 Dec 2012 16:01:33 +0100
Subject: [PATCH 1805/2585] - ece-build now generates the change log from the
 revision at the   previous build to the latest revision on the
 trunk/tag/branch being   built and includes this branch, trunk or tag's
 change logs inside   each of the machine's configuration packages under:

  /usr/share/doc/vizrt/vosa-conf-<machine>/*.diff
  /usr/share/doc/vizrt/vosa-conf-<machine>/*.report

- now, ece-build figures out the previous revision by itself

- and now it's Julebord, YEAH!
---
 usr/share/escenic/build-scripts/ece-build | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 272b8794..8803052f 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -481,12 +481,19 @@ function generate_new_changelog() {
   print_and_log "Generating change log for revision $revision" ...
   (
     cd ${svn_src_dir}
-    # TODO, get the previous revision built instead of PREV
+    local previous_revision=PREV
+    previous_revision=$(
+      ls $release_dir/*.deb | \
+        grep -v latest | \
+        sed 's/.*r\([0-9]*\).deb/\1/g' | \
+        sort | \
+        uniq
+    )
     run generate-changelog \
       --project $customer \
       --user $svn_user \
       --password $svn_password \
-      --from PREV \
+      --from $previous_revision \
       --to $revision
   )
 }
@@ -568,6 +575,15 @@ Description: Server configuration for ${machine}
   directory in the ${USER} user's Version Control System.
 EOF
 
+    # changelogs
+    local package_changelog_dir=${target_dir}/usr/share/doc/vizrt/$package_name
+    make_dir $package_changelog_dir
+    local change_log_dir=$HOME/.generate-changelog/${customer}/${svn_path}
+    if [ -d  $change_log_dir ]; then
+      run cp ${change_log_dir}/* $package_changelog_dir
+    fi
+
+    # build the package
     if [ ! -x /usr/bin/dpkg-deb ]; then
       print_and_log "You must have dpkg-deb installed to create packages :-("
       return

From 364f3a4802b29004b9aa15f5edf6425820ff143f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 14 Dec 2012 16:09:27 +0100
Subject: [PATCH 1806/2585] - added colours to the 'ece status' command. Should
 help tired UNIX   admins working with ECE far into the night.

---
 usr/bin/ece | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 22009be9..eb22c484 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -707,7 +707,7 @@ function set_id() {
 
 function get_status() {
     if [ -z "$type_pid" ]; then
-        echo "DOWN"
+        echo "$(red DOWN)"
         exit 0
     elif [ -r $pid_file ]; then
         
@@ -733,7 +733,7 @@ function get_status() {
     minutes=$(( seconds_left / 60 ))
     seconds_left=$(( seconds_left - $minutes * 60 ))
 
-    echo "UP" ${days}d ${hours}h ${minutes}m ${seconds_left}s
+    echo "$(green UP)" ${days}d ${hours}h ${minutes}m ${seconds_left}s
 }
 
 function read_rc_file_if_present() {

From 6dcb6bb225776e951847b75bc718ce3e82b47179 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 17 Dec 2012 10:06:06 +0100
Subject: [PATCH 1807/2585] - no need for /etc/escenic to be included at all
 for the   escenic-content-engine-scripts package.

- removed /etc/escenic/ece.conf from the debian conffile descriptor
---
 usr/share/escenic/package-scripts/create-packages | 1 -
 1 file changed, 1 deletion(-)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index c7c350a7..1b88b48c 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -121,7 +121,6 @@ function set_up_escenic-content-engine-scripts() {
   cp ../../../sbin/ece-deploy $target_dir/usr/sbin/
 
   # conf
-  cp -r ../../../../etc/escenic/ $target_dir/etc/
   cp -r ../../../../etc/bash_completion.d/ece \
     $target_dir/etc/bash_completion.d
   # we don't include /etc/default/ece as this file often is also

From 1f0adce29aefdff6dfd7e37b15624193532e1be9 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 17 Dec 2012 10:07:21 +0100
Subject: [PATCH 1808/2585] - fix in getting the previous version

---
 usr/share/escenic/build-scripts/ece-build | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 8803052f..ede7dbfb 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -487,7 +487,8 @@ function generate_new_changelog() {
         grep -v latest | \
         sed 's/.*r\([0-9]*\).deb/\1/g' | \
         sort | \
-        uniq
+        uniq | \
+        tail -1
     )
     run generate-changelog \
       --project $customer \

From 7f773d28ed828cd62027912a6d20da495dd2acaf Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 17 Dec 2012 10:19:00 +0100
Subject: [PATCH 1809/2585] - removed ece.conf from the conffiles descriptor

---
 .../debian/escenic-content-engine-scripts/conffiles              | 1 -
 1 file changed, 1 deletion(-)

diff --git a/usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/conffiles b/usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/conffiles
index 6350ab5c..20399bfb 100644
--- a/usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/conffiles
+++ b/usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/conffiles
@@ -1,2 +1 @@
-/etc/escenic/ece.conf
 /etc/cron.daily/remove-old-escenic-log-files

From a8f633a34cb59a4172ca79cffbefe48d13f157cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Mon, 17 Dec 2012 12:08:40 +0100
Subject: [PATCH 1810/2585] vosa - added skeleton files for amazon test server

---
 .../skeleton-amazon/ece-install.conf.tmpl     | 73 +++++++++++++++++++
 .../hooks/post-install-hook-apply-patch.sh    | 36 +++++++++
 .../hooks/post-install-hook-copy-files.sh     | 13 ++++
 ...-install-hook-deploy-configuration.sh.tmpl | 11 +++
 .../post-install-hook-install-ece-install.sh  | 15 ++++
 .../hooks/post-install-hook-install-java.sh   | 20 +++++
 .../skeleton-amazon/install.conf              | 13 ++++
 .../skeleton-amazon/patch/etc/default/ece     | 25 +++++++
 .../patch/etc/escenic/ece-engine1.conf.tmpl   | 53 ++++++++++++++
 .../patch/etc/escenic/ece-search1.conf.tmpl   | 53 ++++++++++++++
 .../tomcat-engine1/conf/tomcat-users.xml.tmpl |  5 ++
 .../patch/opt/tomcat-search1/conf/context.xml | 44 +++++++++++
 .../tomcat-search1/conf/tomcat-users.xml.tmpl |  5 ++
 13 files changed, 366 insertions(+)
 create mode 100644 usr/share/vizrt/vosa/generated-servers/skeleton-amazon/ece-install.conf.tmpl
 create mode 100755 usr/share/vizrt/vosa/generated-servers/skeleton-amazon/hooks/post-install-hook-apply-patch.sh
 create mode 100755 usr/share/vizrt/vosa/generated-servers/skeleton-amazon/hooks/post-install-hook-copy-files.sh
 create mode 100755 usr/share/vizrt/vosa/generated-servers/skeleton-amazon/hooks/post-install-hook-deploy-configuration.sh.tmpl
 create mode 100755 usr/share/vizrt/vosa/generated-servers/skeleton-amazon/hooks/post-install-hook-install-ece-install.sh
 create mode 100755 usr/share/vizrt/vosa/generated-servers/skeleton-amazon/hooks/post-install-hook-install-java.sh
 create mode 100644 usr/share/vizrt/vosa/generated-servers/skeleton-amazon/install.conf
 create mode 100644 usr/share/vizrt/vosa/generated-servers/skeleton-amazon/patch/etc/default/ece
 create mode 100644 usr/share/vizrt/vosa/generated-servers/skeleton-amazon/patch/etc/escenic/ece-engine1.conf.tmpl
 create mode 100644 usr/share/vizrt/vosa/generated-servers/skeleton-amazon/patch/etc/escenic/ece-search1.conf.tmpl
 create mode 100644 usr/share/vizrt/vosa/generated-servers/skeleton-amazon/patch/opt/tomcat-engine1/conf/tomcat-users.xml.tmpl
 create mode 100644 usr/share/vizrt/vosa/generated-servers/skeleton-amazon/patch/opt/tomcat-search1/conf/context.xml
 create mode 100644 usr/share/vizrt/vosa/generated-servers/skeleton-amazon/patch/opt/tomcat-search1/conf/tomcat-users.xml.tmpl

diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/ece-install.conf.tmpl b/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/ece-install.conf.tmpl
new file mode 100644
index 00000000..532be81a
--- /dev/null
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/ece-install.conf.tmpl
@@ -0,0 +1,73 @@
+# technet credentials
+technet_user=$TECHNET_USER
+technet_password=$TECHNET_PASSWORD
+
+# technet download list
+technet_download_list=$TECHNET_DOWNLOAD_LIST
+
+# TODO - not sure if these are needed
+nop=
+wf_download_list=
+
+# FAI enabled
+fai_enabled=1
+
+# add tomcat instance for search + analysis engine
+fai_search_install=1
+fai_search_port=8180
+fai_search_shutdown=8105
+fai_search_redirect=8143
+fai_search_name=search1
+fai_search_indexer_ws_uri=http://localhost:8080/indexer-webservice/index/
+fai_search_ear=$FAI_SEARCH_EAR
+fai_search_for_editor=0
+fai_search_host=localhost
+fai_search_stop_and_clear=1
+
+# install analysis engine on the search instance 
+fai_analysis_install=1
+fai_analysis_port=\$fai_search_port
+fai_analysis_shutdown=\$fai_search_shutdown
+fai_analysis_redirect=\$fai_search_redirect
+fai_analysis_name=\$fai_search_name
+
+# add the db schema for analysis engine
+fai_analysis_db_install=1
+fai_analysis_db_schema=analysisdb
+fai_analysis_db_user=analysisdbuser
+fai_analysis_db_password=$FAI_ANALYSIS_DB_PASSWORD
+
+# do not setup the db as content will be recovered from .tar package
+fai_db_install=1
+
+# create the publications
+fai_publication_create=1
+fai_publication_war_remove_file_list=\"
+ META-INF/escenic/publication-resources/escenic/plugin/menu
+ META-INF/escenic/publication-resources/0/escenic/section-parameter
+ META-INF/escenic/resources/escenic/content
+\"
+
+# restore content from .tar package
+fai_restore_from_backup=0
+fai_db_drop_old_db_first=0
+fai_restore_db=0
+fai_restore_from_file=$FAI_RESTORE_FROM_FILE
+
+# install the cache profile
+fai_cache_install=1
+
+# skip monitoring
+fai_monitoring_node_nagios_skip=1
+fai_monitoring_node_munin_skip=1
+
+# configure the presentation profile
+fai_builder_http_user=$FAI_BUILDER_HTTP_USER
+fai_builder_http_password=$FAI_BUILDER_HTTP_PASSWORD
+fai_presentation_install=1
+fai_publication_environment=test
+fai_presentation_ear=$FAI_PRESENTATION_EAR
+fai_publication_ear=$FAI_PRESENTATION_EAR
+fai_presentation_name=engine1
+fai_publication_domain_mapping_list=$FAI_PUBLICATION_DOMAIN_MAPPING_LIST
+fai_presentation_deploy_white_list=$FAI_PRESENTATION_DEPLOY_WHITE_LIST
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/hooks/post-install-hook-apply-patch.sh b/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/hooks/post-install-hook-apply-patch.sh
new file mode 100755
index 00000000..91180652
--- /dev/null
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/hooks/post-install-hook-apply-patch.sh
@@ -0,0 +1,36 @@
+#!/bin/bash -e
+
+echo "--- START : post install hook - apply patch ---"
+
+# copy all patch files
+scp -F $2/ssh.conf -r $1/patch/* root@guest:/
+
+# enable tomcat manager on engine1 
+ssh -F $2/ssh.conf root@guest  \
+   cp -R /opt/tomcat/webapps/manager /opt/tomcat-engine1/webapps/.
+
+# enable tomcat mamanger on search1
+ssh -F $2/ssh.conf root@guest  \
+   cp -R /opt/tomcat/webapps/manager /opt/tomcat-search1/webapps/.
+
+# cleanup all jar files not needed to run solr and analysis engine
+ssh -F $2/ssh.conf root@guest  \
+   'find /opt/tomcat-search1/escenic/lib/ -type f ! \( \
+-name 'common-nursery-*' \
+-o -name 'commons-codec-*' \
+-o -name 'commons-httpclient-*' \
+-o -name 'commons-io-*' \
+-o -name 'commons-lang-*' \
+-o -name 'commons-logging-*' \
+-o -name 'common-util-*' \
+-o -name 'log4j-*' \
+-o -name 'twelvemonkeys-core-*' \
+-o -name 'xom-*' \
+\) -exec rm -rf {} \;'
+
+# change ownership just to be sure
+ssh -F $2/ssh.conf root@guest  \
+   chown -R escenic: /opt/tomcat-*
+
+echo "--- END : post install hook - apply patch ---"
+
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/hooks/post-install-hook-copy-files.sh b/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/hooks/post-install-hook-copy-files.sh
new file mode 100755
index 00000000..f6cb5234
--- /dev/null
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/hooks/post-install-hook-copy-files.sh
@@ -0,0 +1,13 @@
+#!/bin/bash -e
+
+echo "--- START : post install hook - copy files ---"
+
+src_dir=files
+
+# copy everything under files into the images
+if [[ -d $1/$src_dir && \
+  $(find $1/$src_dir -maxdepth 1 | wc -l) -gt 1 ]]; then
+    scp -F $2/ssh.conf -rv $1/$src_dir/* root@guest:/tmp/.
+fi
+
+echo "--- END : post install hook - copy files ---"
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/hooks/post-install-hook-deploy-configuration.sh.tmpl b/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/hooks/post-install-hook-deploy-configuration.sh.tmpl
new file mode 100755
index 00000000..8d964f30
--- /dev/null
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/hooks/post-install-hook-deploy-configuration.sh.tmpl
@@ -0,0 +1,11 @@
+#!/bin/bash -e
+
+echo "--- START : post install hook - deploy configuration ---"
+
+# fetch latest .deb package from url
+ssh -F \$2/ssh.conf root@guest 'wget --http-user=$FAI_BUILDER_HTTP_USER --http-password=$FAI_BUILDER_HTTP_PASSWORD --quiet --inet4-only $HOOKS_LATEST_CONF_DEB -O conf.deb'
+
+# apply .deb package and force overwrites
+ssh -F \$2/ssh.conf root@guest 'dpkg -i --force-confnew conf.deb'
+
+echo "--- END : post install hook - deploy configuration ---"
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/hooks/post-install-hook-install-ece-install.sh b/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/hooks/post-install-hook-install-ece-install.sh
new file mode 100755
index 00000000..bf429535
--- /dev/null
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/hooks/post-install-hook-install-ece-install.sh
@@ -0,0 +1,15 @@
+#!/bin/bash -e
+
+echo "--- START : post install hook - install ece install ---"
+
+# add archive key for apt.vizrt.com
+curl -s http://apt.vizrt.com/archive.key | ssh -F $2/ssh.conf guest 'sudo apt-key add -'
+
+# add repo to sources list
+echo "deb http://apt.vizrt.com unstable main" | ssh -F $2/ssh.conf guest 'sudo tee > /dev/null /etc/apt/sources.list.d/vizrt.list'
+
+# install escenic scripts
+ssh -F $2/ssh.conf guest 'sudo apt-get update && sudo apt-get -y install escenic-content-engine-installer'
+ssh -F $2/ssh.conf guest 'sudo apt-get update && sudo apt-get -y install escenic-content-engine-scripts'
+
+echo "--- END : post install hook - install ece install ---"
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/hooks/post-install-hook-install-java.sh b/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/hooks/post-install-hook-install-java.sh
new file mode 100755
index 00000000..4a8fa263
--- /dev/null
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/hooks/post-install-hook-install-java.sh
@@ -0,0 +1,20 @@
+#!/bin/bash -e
+
+echo "--- START : post install hook - install java ---"
+
+# check if java exists
+ssh -F $2/ssh.conf guest which > /dev/null java && exit 0
+
+# copy .deb packages for java to the image
+scp -F $2/ssh.conf /var/local/oab/deb/sun-java6*precise*.deb guest:/tmp
+
+# install java dependencies
+ssh -F $2/ssh.conf guest 'sudo apt-get -y install unixodbc defoma java-common'
+
+# install .deb packages for java
+ssh -F $2/ssh.conf guest 'sudo dpkg -i /tmp/*.deb'
+
+# clean up
+ssh -F $2/ssh.conf guest 'sudo rm /tmp/*.deb'
+
+echo "--- END : post install hook - install java ---"
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/install.conf b/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/install.conf
new file mode 100644
index 00000000..ba3404da
--- /dev/null
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/install.conf
@@ -0,0 +1,13 @@
+postinstall wait-for-ssh.sh
+postinstall permit-root-login.sh
+postinstall make-a-motd.sh
+
+#postinstall ./hooks/post-install-hook-apt-get-update.sh
+
+postinstall ./hooks/post-install-hook-copy-files.sh
+postinstall ./hooks/post-install-hook-install-java.sh
+postinstall ./hooks/post-install-hook-install-ece-install.sh
+
+postinstall install-engine.sh
+
+postinstall ./hooks/post-install-hook-apply-patch.sh
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/patch/etc/default/ece b/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/patch/etc/default/ece
new file mode 100644
index 00000000..0d32fdf1
--- /dev/null
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/patch/etc/default/ece
@@ -0,0 +1,25 @@
+# Configuration for the /etc/init.d/ece script     -*- conf -*-
+
+# Space separated lists of instance names for ECE instances and search
+# instances. If you only have one # instance, use "default" as its
+# name. If you don't have any instances of that type on this host,
+# then just set the variable to an empty string.
+engine_instance_list="engine1"
+search_instance_list="search1"
+analysis_instance_list=""
+
+# You only need one hub in an ECE cluster, so only set this one to
+# true on one host. 1 means on, 0 means off.
+enable_rmi_hub=0
+
+# The location of the ece script, default is /usr/bin/ece
+ece_script=/usr/bin/ece
+
+# Default Unix user that will run the processes, default is escenic
+# for both of these.
+ece_unix_group="escenic"
+ece_unix_user="escenic"
+
+# Do you want cron to remove (5 days) old log files every day?
+# (default is yes, i.e. 1. Set 0 to turn this off)
+remove_old_log_files=1
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/patch/etc/escenic/ece-engine1.conf.tmpl b/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/patch/etc/escenic/ece-engine1.conf.tmpl
new file mode 100644
index 00000000..bb303908
--- /dev/null
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/patch/etc/escenic/ece-engine1.conf.tmpl
@@ -0,0 +1,53 @@
+tomcat_base=\"/opt/tomcat-engine1\"
+tomcat_home=\"/opt/tomcat\"
+appserver_port=\"8080\"
+deploy_webapp_white_list=$DEPLOY_WEBAPP_WHITE_LIST
+
+#########################################################################
+# JVM related (the Java Virtual Machine)
+#########################################################################
+
+#########################################################################
+# The minimum and maximum heap sizes for the Java process
+#########################################################################
+min_heap_size=1024m
+max_heap_size=1024m
+
+#########################################################################
+# The permgen size is the amount of memory the JVM sets aside to class
+# defintions. If you are experiencing constant OutOfMemory
+# exceptions/errors and are using EAR deployment, you may want to
+# increase these.
+#########################################################################
+min_permgen_size=128m
+max_permgen_size=128m
+
+enable_remote_debugging=0
+
+ece_environment=test
+
+builder_http_user=$FAI_BUILDER_HTTP_USER
+builder_http_password=$FAI_BUILDER_HTTP_PASSWORD
+
+#########################################################################
+# Settings related to the JVM garbage collection, don't touch these if
+# you're not sure of what you're doing and have tested your changes
+# properly. Note that ece takes care of the GC logging, so you don't
+# have to cater for that here.
+#########################################################################
+jvm_gc_settings=\"
+-XX:+CMSClassUnloadingEnabled
+-XX:+CMSIncrementalPacing
+-XX:+CMSPermGenSweepingEnabled
+-XX:+ExplicitGCInvokesConcurrent
+-XX:+UseCMSInitiatingOccupancyOnly
+-XX:+UseConcMarkSweepGC
+-XX:CMSInitiatingOccupancyFraction=65
+-XX:InitialCodeCacheSize=50m
+-XX:MaxNewSize=256m
+-XX:NewSize=256m
+-XX:ParallelGCThreads=1
+-XX:ReservedCodeCacheSize=50m
+-XX:SurvivorRatio=1
+\"
+
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/patch/etc/escenic/ece-search1.conf.tmpl b/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/patch/etc/escenic/ece-search1.conf.tmpl
new file mode 100644
index 00000000..e96dd9a4
--- /dev/null
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/patch/etc/escenic/ece-search1.conf.tmpl
@@ -0,0 +1,53 @@
+tomcat_base=\"/opt/tomcat-search1\"
+tomcat_home=\"/opt/tomcat\"
+appserver_port=\"8180\"
+deploy_webapp_white_list=\"solr indexer-webapp\"
+
+#########################################################################
+# JVM related (the Java Virtual Machine)
+#########################################################################
+
+#########################################################################
+# The minimum and maximum heap sizes for the Java process
+#########################################################################
+min_heap_size=256m
+max_heap_size=256m
+
+#########################################################################
+# The permgen size is the amount of memory the JVM sets aside to class
+# defintions. If you are experiencing constant OutOfMemory
+# exceptions/errors and are using EAR deployment, you may want to
+# increase these.
+#########################################################################
+min_permgen_size=64m
+max_permgen_size=64m
+
+enable_remote_debugging=0
+
+ece_environment=test
+
+builder_http_user=$FAI_BUILDER_HTTP_USER
+builder_http_password=$FAI_BUILDER_HTTP_PASSWORD
+
+#########################################################################
+# Settings related to the JVM garbage collection, don't touch these if
+# you're not sure of what you're doing and have tested your changes
+# properly. Note that ece takes care of the GC logging, so you don't
+# have to cater for that here.
+#########################################################################
+jvm_gc_settings=\"
+-XX:+CMSClassUnloadingEnabled
+-XX:+CMSIncrementalPacing
+-XX:+CMSPermGenSweepingEnabled
+-XX:+ExplicitGCInvokesConcurrent
+-XX:+UseCMSInitiatingOccupancyOnly
+-XX:+UseConcMarkSweepGC
+-XX:CMSInitiatingOccupancyFraction=65
+-XX:InitialCodeCacheSize=50m
+-XX:MaxNewSize=50m
+-XX:NewSize=50m
+-XX:ParallelGCThreads=1
+-XX:ReservedCodeCacheSize=50m
+-XX:SurvivorRatio=1
+\"
+
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/patch/opt/tomcat-engine1/conf/tomcat-users.xml.tmpl b/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/patch/opt/tomcat-engine1/conf/tomcat-users.xml.tmpl
new file mode 100644
index 00000000..f492d95b
--- /dev/null
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/patch/opt/tomcat-engine1/conf/tomcat-users.xml.tmpl
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='utf-8'?>
+<tomcat-users>
+  <role rolename=\"manager\"/>
+  <user username=\"$HOOKS_TOMCAT_MANAGER_USER\" password=\"$HOOKS_TOMCAT_MANAGER_PASSWORD\" roles=\"tomcat,manager\"/>
+</tomcat-users>
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/patch/opt/tomcat-search1/conf/context.xml b/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/patch/opt/tomcat-search1/conf/context.xml
new file mode 100644
index 00000000..fcf1dad5
--- /dev/null
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/patch/opt/tomcat-search1/conf/context.xml
@@ -0,0 +1,44 @@
+<?xml version='1.0' encoding='utf-8'?>
+<Context>
+  <WatchedResource>WEB-INF/web.xml</WatchedResource>
+  <ResourceLink
+      global="jdbc/eae-logger/logger"
+      name="jdbc/eae-logger/logger"
+      type="javax.sql.DataSource"
+  />
+  <ResourceLink
+      global="jdbc/eae-qs/qs"
+      name="jdbc/eae-qs/qs"
+      type="javax.sql.DataSource"
+  />
+  <Environment
+      name="escenic/solr-base-uri"
+      value="http://localhost:8180/solr/"
+      type="java.lang.String"
+      override="false"
+  />
+  <Environment
+      name="escenic/indexer-webservice"
+      value="http://localhost:8080/indexer-webservice/index/"
+      type="java.lang.String"
+      override="false"
+  />
+  <Environment
+      name="escenic/index-update-uri"
+      value="http://localhost:8180/solr/update/"
+      type="java.lang.String"
+      override="false"
+  />
+  <Environment
+      name="escenic/head-tail-storage-file"
+      value="/var/lib/escenic/engine/head-tail.index"
+      type="java.lang.String"
+      override="false"
+  />
+  <Environment
+      name="escenic/failing-documents-storage-file"
+      value="/var/lib/escenic/engine/failures.index"
+      type="java.lang.String"
+      override="false"
+  />
+</Context>
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/patch/opt/tomcat-search1/conf/tomcat-users.xml.tmpl b/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/patch/opt/tomcat-search1/conf/tomcat-users.xml.tmpl
new file mode 100644
index 00000000..f492d95b
--- /dev/null
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/patch/opt/tomcat-search1/conf/tomcat-users.xml.tmpl
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='utf-8'?>
+<tomcat-users>
+  <role rolename=\"manager\"/>
+  <user username=\"$HOOKS_TOMCAT_MANAGER_USER\" password=\"$HOOKS_TOMCAT_MANAGER_PASSWORD\" roles=\"tomcat,manager\"/>
+</tomcat-users>

From 81770827320a83c60b007c71fa315ee852b09def Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 17 Dec 2012 10:48:46 +0100
Subject: [PATCH 1811/2585] - generate-changelog will now default to using
 Atlassian on Demand for   JIRA and Subvesrion. This means that
 generate-changelog doesn't need   its configuration file
 .generate-changelog.conf for projects using   Atlassian on Demand. It will
 give an INFO message about the   missing .conf file in the log.

---
 usr/bin/generate-changelog | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/usr/bin/generate-changelog b/usr/bin/generate-changelog
index 4d6a0e7e..fe46da68 100755
--- a/usr/bin/generate-changelog
+++ b/usr/bin/generate-changelog
@@ -27,7 +27,11 @@ function bootstrap_thyself() {
 
 function read_user_settings() {
   local file=$HOME/.$(basename $0).conf
-  run source $file
+  if [ -r $file ]; then
+    run source $file
+  else
+    log $(blue INFO) $file "doesn't exist, will default to Atlassian on Demand"
+  fi
 }
 
 function get_header_from_jira() {
@@ -149,6 +153,14 @@ function sanity_check() {
     exit 1
   fi
 
+  # defaulting to Atlassian on demand
+  jira_base_url=${jira_base_url-https://vizrtcustomers.jira.com}
+  if [ -z "$svn_base_url" ]; then
+    # bash default string substitution terminates with slashes, hence
+    # have to set this manually here.
+    svn_base_url=${jira_base_url}/svn
+  fi
+
   conf_file=$HOME/.$(basename $0).conf
   ensure_variable_is_set \
     project_code \

From 1a6b13cc7398f19c5871527fa31a1edd2eb9c020 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 17 Dec 2012 11:13:08 +0100
Subject: [PATCH 1812/2585] - ece-build would add the changelog of projects
 where the customer   ID was different from the SVN ID

---
 usr/share/escenic/build-scripts/ece-build | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index ede7dbfb..64e92666 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -579,7 +579,8 @@ EOF
     # changelogs
     local package_changelog_dir=${target_dir}/usr/share/doc/vizrt/$package_name
     make_dir $package_changelog_dir
-    local change_log_dir=$HOME/.generate-changelog/${customer}/${svn_path}
+    local svn_base_dir=$(dirname $svn_base)
+    local change_log_dir=$HOME/.generate-changelog/${svn_base_dir}/${svn_path}
     if [ -d  $change_log_dir ]; then
       run cp ${change_log_dir}/* $package_changelog_dir
     fi

From 95183c6ee499f1e18237055f51cf855fff5e6c5a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 17 Dec 2012 12:44:52 +0100
Subject: [PATCH 1813/2585] - in case we don't have any previous builds, we
 don't pass anything in   the from parameters.

---
 usr/share/escenic/build-scripts/ece-build | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 64e92666..4fc1f22a 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -483,18 +483,26 @@ function generate_new_changelog() {
     cd ${svn_src_dir}
     local previous_revision=PREV
     previous_revision=$(
-      ls $release_dir/*.deb | \
+      ls $release_dir/*.deb 2>/dev/null | \
         grep -v latest | \
         sed 's/.*r\([0-9]*\).deb/\1/g' | \
         sort | \
         uniq | \
         tail -1
     )
+
+    # in case we don't have any previous builds, we don't pass
+    # anything in the from parameters.
+    local from_option=""
+    if [ -n "${previous_revision}" ]; then
+      from_option="--from $previous_revision"
+    fi
+    
     run generate-changelog \
-      --project $customer \
+      --project $(basename $svn_base) \
       --user $svn_user \
       --password $svn_password \
-      --from $previous_revision \
+      ${from_option} \
       --to $revision
   )
 }
@@ -579,8 +587,9 @@ EOF
     # changelogs
     local package_changelog_dir=${target_dir}/usr/share/doc/vizrt/$package_name
     make_dir $package_changelog_dir
-    local svn_base_dir=$(dirname $svn_base)
+    local svn_base_dir=$(lowercase $(basename $svn_base))
     local change_log_dir=$HOME/.generate-changelog/${svn_base_dir}/${svn_path}
+    
     if [ -d  $change_log_dir ]; then
       run cp ${change_log_dir}/* $package_changelog_dir
     fi

From d2757bbeca75ed6b25587f1cbcd070171ddc0a2d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 17 Dec 2012 12:45:28 +0100
Subject: [PATCH 1814/2585] - if both from and to revision is the same,
 generate-changelog will   not create anything, but just exit with a status
 code of 0.

---
 usr/bin/generate-changelog | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/usr/bin/generate-changelog b/usr/bin/generate-changelog
index fe46da68..a4f1c207 100755
--- a/usr/bin/generate-changelog
+++ b/usr/bin/generate-changelog
@@ -168,16 +168,21 @@ function sanity_check() {
     password \
     jira_base_url \
     svn_base_url
+
+  if [[ "$(get_from_revision)" == "$(get_to_revision)" ]]; then
+    print_and_log "From and to revision are the same," \
+      "will no create any change log"
+    exit 0
+  fi
 }
 
 function get_project() {
-  echo ${project_code} | tr [A-Z] [a-z]
+  echo $(lowercase ${project_code})
 }
 
 function get_archive_dir() {
-  local project_context=$(get_svn_location | \
-    sed -e  "s#${svn_base_url}/##g" -e 's#[ ]*##g' | \
-    tr [A-Z] [a-z]
+  local project_context=$(lowercase $(get_svn_location | \
+    sed -e  "s#${svn_base_url}/##g" -e 's#[ ]*##g')
   )
   
   local dir=${archive_base_dir}/${project_context}

From a3081915785fa4be62aa1ba0b6f8251a6bda6c5f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 17 Dec 2012 12:45:44 +0100
Subject: [PATCH 1815/2585] - added common-bashing::lowercase

---
 usr/share/escenic/ece-scripts/common-bashing.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index b5369a05..9ed5c8b6 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -499,3 +499,9 @@ function common_bashing_user_cancelled_hook() {
   common_bashing_exit_hook
 }
 
+## Returns the string passed where all letters are lower cased.
+##
+## $@ :: as many strings as you like.
+function lowercase() {
+  echo "$@" | tr [A-Z] [a-z]
+}

From 466df4aa51697d02504e8faa9c05fbc706817660 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 17 Dec 2012 14:18:22 +0100
Subject: [PATCH 1816/2585] - the ECE log4j is now
 /var/log/escenic/<instance>-messages and not   (anymore)
 /var/log/escenic/<host>-<instance>-messages

---
 .../ece-scripts/system-info.d/11-list-ece-overview.sh       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh b/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
index f5c09ab0..d1b330bb 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
@@ -63,7 +63,7 @@ function create_ece_overview() {
 
 ## $1 :: the instance name
 function list_error_overview_for_instance() {
-  local file=/var/log/escenic/${HOSTNAME}-${1}-messages
+  local file=/var/log/escenic/${1}-messages
   if [ ! -r $file ]; then
     return
   fi
@@ -131,7 +131,7 @@ function check_picture_file() {
 
 ## $1 is thefile
 function list_sax_errors() {
-  local file=/var/log/escenic/${HOSTNAME}-${1}-messages
+  local file=/var/log/escenic/${1}-messages
   local result="$(grep ^'Caused by: org.xml.sax.SAXParseException:' $file | sort | uniq)"
   
   if [ -z $result ]; then
@@ -148,7 +148,7 @@ function list_import_overview_for_instance() {
     return
   fi
   
-  local file=/var/log/escenic/${HOSTNAME}-${1}-messages
+  local file=/var/log/escenic/${1}-messages
   
   if [ ! -e $file ]; then
     return

From fe0ecf58290e465ffcca51186ad21e79b4ab8398 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 17 Dec 2012 14:19:50 +0100
Subject: [PATCH 1817/2585] - only copy change logs for the current
 trunk/branch/tags

---
 usr/share/escenic/build-scripts/ece-build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 4fc1f22a..376395a0 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -483,7 +483,7 @@ function generate_new_changelog() {
     cd ${svn_src_dir}
     local previous_revision=PREV
     previous_revision=$(
-      ls $release_dir/*.deb 2>/dev/null | \
+      ls $release_dir/vosa-conf-*-${release_label}-*.deb 2>/dev/null | \
         grep -v latest | \
         sed 's/.*r\([0-9]*\).deb/\1/g' | \
         sort | \

From fa254138fddbd391820b4016b347360538e4129a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 17 Dec 2012 14:27:18 +0100
Subject: [PATCH 1818/2585] - added the deployment log to the quiet 'ece info'
 output

---
 usr/share/escenic/ece-scripts/ece.d/logs.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/ece-scripts/ece.d/logs.sh b/usr/share/escenic/ece-scripts/ece.d/logs.sh
index a1453a15..04de8e31 100644
--- a/usr/share/escenic/ece-scripts/ece.d/logs.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/logs.sh
@@ -82,6 +82,7 @@ function show_all_log_paths() {
     echo $(get_log4j_log)
     echo $(get_gc_log)
     echo $log
+    echo $(get_deployment_log)
   fi
 }
 

From d4cdcc64c19a6f3c9b079d3635044d0d521a2276 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 17 Dec 2012 14:45:14 +0100
Subject: [PATCH 1819/2585] - grammatical fix

---
 usr/share/escenic/ece-scripts/ece-install.d/app-server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 86fc4dc3..6898988f 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -466,7 +466,7 @@ function set_appropriate_jvm_heap_sizes() {
   local total_size=$(get_total_memory_in_mega_bytes)
 
   if [ $total_size -lt $heap_size ]; then
-    print_and_log "$(yellow WARNING) $HOSTNAME only has $total_size MBs of" \
+    print_and_log "$(yellow WARNING) $HOSTNAME has only $total_size MBs of" \
       "memory, I will use ${percent}% of this for the JVM heap sizes, but you" \
       "should really consider adding more RAM so that" \
       "the $instance_name instance gets at least 2GBs"

From 8173a07638ae404a3172224d420a96cd7180d0f0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 17 Dec 2012 14:53:35 +0100
Subject: [PATCH 1820/2585] - fix to the listing of distribution information
 (regression).

---
 .../escenic/ece-scripts/system-info.d/66-list-os-info.sh      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
index 2d232816..7e2d8965 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
@@ -8,8 +8,8 @@ print_h3_header "Kernel"
 print_pre_text $(uname -a)
 
 print_h3_header "Distribution"
-if [[ -n $(which lsb_release > /dev/null 2>/dev/null) ]]; then
-  print_pre_text "$(lsb_release -a)"
+if [[ "$(which lsb_release)x" != "x" ]]; then
+  print_pre_text "$(lsb_release -a 2>/dev/null)"
 elif [ -e /etc/redhat-release ]; then
   print_pre_text "$(cat /etc/redhat-release)"
 fi

From 2f91eddc9ebe20e2656145d044df48b13e62cdc4 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 17 Dec 2012 14:55:13 +0100
Subject: [PATCH 1821/2585] - now lists the deployment log also when running
 'ece info --quiet'   (in quiet mode).

---
 usr/share/escenic/ece-scripts/ece.d/info.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/ece-scripts/ece.d/info.sh b/usr/share/escenic/ece-scripts/ece.d/info.sh
index 09274a1e..fd23b240 100644
--- a/usr/share/escenic/ece-scripts/ece.d/info.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/info.sh
@@ -65,6 +65,7 @@ function print_deployment_state() {
   print "|-> EAR used:" $(grep ^ear_used $file | cut -d'=' -f2-)
   print "|-> MD5 sum:" $(grep ^md5_sum $file | cut -d'=' -f2-)
   print "|-> Deployment date:" $(grep ^deployed_date $file | cut -d'=' -f2-)
+  print "|-> Deployment log:" 
 }
 
 ## $1: tomcat dir

From 7bed05825ab86c3bc5f31d9e414df7eb85095008 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 17 Dec 2012 14:56:28 +0100
Subject: [PATCH 1822/2585] - fixed regression bug because of Assemblyttool all
 of a sudden is   distributed as a JAR file and not as a ZIP archive as all
 the other   Escenic artifacts.

---
 usr/sbin/ece-install                                          | 4 ++--
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 617553d5..4b45910a 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -398,12 +398,12 @@ function check_for_required_downloads()
   local some_is_missing=0
   
   for el in $required_escenic_packages; do
-    if [ $(ls $download_dir/$el*.zip 2>/dev/null | wc -l) -lt 1 ]; then
+    if [ $(ls $download_dir/$el*.{zip,jar} 2>/dev/null | wc -l) -lt 1 ]; then
       print_and_log "-> $el is missing"
       some_is_missing=1
     else
       # want the newest one if there are several
-      local file=$(ls $download_dir/$el*.zip | tail -1)
+      local file=$(ls $download_dir/$el*.{zip,jar} 2>/dev/null | tail -1)
       unzip -t $file > /dev/null 2>&1
 
       if [ $? -ne 0 ]; then
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 4a198a75..e46f4cb2 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -184,13 +184,15 @@ function set_up_engine_and_plugins() {
 }
 
 function set_up_assembly_tool() {
-  log "Setting up the Assembly Tool ..."
+  print_and_log "Setting up the Assembly Tool ..."
 
   make_dir $escenic_root_dir/assemblytool/
   cd $escenic_root_dir/assemblytool/
 
   if [ -e $download_dir/assemblytool*zip ]; then
     run unzip -q -u -o $download_dir/assemblytool*zip
+  elif [ -e $download_dir/assemblytool*jar ]; then
+    run unzip -q -u -o $download_dir/assemblytool*jar
   fi
 
   # adding an instance layer to the Nursery configuration

From 130ed92411ed3ac233737ff9bcb0df4faa2e0c50 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 17 Dec 2012 16:57:29 +0100
Subject: [PATCH 1823/2585] - added the deployment log to the log file listing

- removed it from the deployment state section
---
 usr/share/escenic/ece-scripts/ece.d/info.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/info.sh b/usr/share/escenic/ece-scripts/ece.d/info.sh
index fd23b240..321084c4 100644
--- a/usr/share/escenic/ece-scripts/ece.d/info.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/info.sh
@@ -18,6 +18,7 @@ function get_info_for_type() {
   print "|-> App server log:" $(get_app_log)
   print "|-> Log4j log:     " $(get_log4j_log)
   print "|-> GC log:        " $(get_gc_log)
+  print "|-> Deployment log:" $(get_deployment_log)
 
   if [ -n "${appserver}" ]; then
     print "Application server:"
@@ -65,7 +66,6 @@ function print_deployment_state() {
   print "|-> EAR used:" $(grep ^ear_used $file | cut -d'=' -f2-)
   print "|-> MD5 sum:" $(grep ^md5_sum $file | cut -d'=' -f2-)
   print "|-> Deployment date:" $(grep ^deployed_date $file | cut -d'=' -f2-)
-  print "|-> Deployment log:" 
 }
 
 ## $1: tomcat dir

From e46157372a62cd17a35f75b7542a8877008679b3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 18 Dec 2012 12:14:04 +0100
Subject: [PATCH 1824/2585] - increased the wait for EAE to come up from 15 to
 25 seconds.

---
 usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh
index 1e51c30a..4b44ca14 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh
@@ -28,7 +28,7 @@ function install_analysis_server() {
   su - $ece_user -c "$ece_command" 1>>$log 2>>$log
   exit_on_error "su - $ece_user -c \"$ece_command\""
 
-  local seconds=15
+  local seconds=25
   print_and_log "Waiting ${seconds} seconds for EAE to come up ..."
   sleep $seconds
   

From 8801af2a8abe0bc42ae21550767449ede09ad091 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 18 Dec 2012 14:01:14 +0100
Subject: [PATCH 1825/2585] - optimised monitoring::install_system_info when
 setting up the   various directories that can be viewed through the :5689 web
   interface.

- now, the deployment log (and other state files) can be viewed from
  system-info on :5789
---
 .../ece-scripts/ece-install.d/monitoring.sh   | 59 ++++++++-----------
 1 file changed, 23 insertions(+), 36 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index d507d917..f9e5b9a9 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -556,45 +556,32 @@ function install_system_info() {
   # creating symlinks like:
   # /var/www/system-info/var/log/escenic -> /var/log/escenic
   # /var/www/system-info/etc/escenic -> /etc/escenic
-  make_dir ${dir}/$(dirname $escenic_log_dir)
-  local target=${dir}/$(dirname ${escenic_log_dir})/$(basename ${escenic_log_dir})
-  if [ ! -h $target ]; then
-    run ln -s ${escenic_log_dir} $target
-  fi
-
-  make_dir ${dir}/$(dirname $escenic_conf_dir)
-  target=${dir}/$(dirname $escenic_conf_dir)/$(basename $escenic_conf_dir)
-  if [ ! -h $target ]; then
-    run ln -s ${escenic_conf_dir} $target
-  fi
-
-  make_dir ${dir}/$tomcat_base
-  target=${dir}/$tomcat_base/logs
-  if [ ! -h $target ]; then
-    run ln -s $tomcat_base/logs $target
-  fi
-
-  # thttpd doesn't serve files if they've got the execution bit set
-  # (it then think it's a misnamed CGI script). Hence, we must ensure
-  # the execute bit is set.
-  if [ -d $escenic_log_dir ]; then
-    find $escenic_log_dir -type f | egrep ".log$|.out$" | while read f; do
-      run chmod 644 $f
-    done
-  fi
-
-  if [ -d $escenic_conf_dir ]; then
-    find $escenic_conf_dir -type f | \
-      egrep ".conf$|.properties$" | while read f; do
-      run chmod 644 $f
-    done
-  fi
+  local dir_list="
+    $escenic_log_dir
+    $escenic_conf_dir
+    $escenic_data_dir
+    $tomcat_base/logs
+  "
+  for source_dir in $dir_list; do
+    if [ ! -d $source_dir ]; then
+      continue
+    fi
 
-  if [ -d  $tomcat_base/logs ]; then
-    find $tomcat_base/logs -type f | egrep ".log$" | while read f; do
+    local target_dir=$dir/$source_dir
+    make_dir $(dirname $target_dir)
+    
+    if [ ! -h $target_dir ]; then
+      run ln -s $source_dir $target_dir
+    fi
+    
+    # thttpd doesn't serve files if they've got the execution bit set
+    # (it then think it's a misnamed CGI script). Hence, we must
+    # ensure the execute bit is not set.
+    find $source_dir -type f | egrep ".(conf|properties|log|diff|report|out)$" | \
+      while read f; do
       run chmod 644 $f
     done
-  fi
+  done
 
   add_next_step "Always up to date system info: http://$HOSTNAME:$port/" \
     "you can also see system-info in the shell, type: system-info"

From f0e63bc80f389c71c0ea7b0f4f157eab0f780f1c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 18 Dec 2012 14:01:30 +0100
Subject: [PATCH 1826/2585] - clarified debug in database.

---
 usr/share/escenic/ece-scripts/ece-install.d/database.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index f3e2353e..bb0259e5 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -167,7 +167,7 @@ function set_ecedb_conf() {
 }
 
 function set_up_ecedb() {
-  print_and_log "Setting up the ECE database schema ..."
+  print_and_log "Setting up the ${db_schema} database schema ..."
 
   set_ecedb_conf
   pre_install_new_ecedb

From ba7aa664fca3d9b9bb4d4d5b27fa4e78a8fd44e8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 18 Dec 2012 14:03:07 +0100
Subject: [PATCH 1827/2585] - fix of bug introduced with 641abf2a, making both
 the db_install and   analysis_db_install profiles to be run when the user had
 only   selected to run the db_install profile.

---
 usr/sbin/ece-install | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 4b45910a..02a558ff 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -986,8 +986,7 @@ if [ ${fai_enabled-0} -eq 1 ]; then
         no_fai_profile=0
     fi
     
-    if [[ ${fai_db_install-0} -eq 1 ||
-          ${fai_analysis_db_install-0} -eq 1 ]]; then
+    if [ ${fai_db_install-0} -eq 1 ]; then
         install_profile_number=$PROFILE_DB_SERVER
         install_database_server
         no_fai_profile=0

From 59601589bc436e3ba9ae53ca28c1bee99e382b63 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 18 Dec 2012 14:03:52 +0100
Subject: [PATCH 1828/2585] - fix in ece::logs for listing the deployment log,
 which is a   data/state file and not a log per se.

---
 usr/share/escenic/ece-scripts/ece.d/logs.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/logs.sh b/usr/share/escenic/ece-scripts/ece.d/logs.sh
index 04de8e31..27af2814 100644
--- a/usr/share/escenic/ece-scripts/ece.d/logs.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/logs.sh
@@ -5,8 +5,8 @@ function get_gc_log() {
 }
 
 function get_deployment_log() {
-  if [ -r $log_dir/${instance}-deployment.log ]; then
-    echo $log_dir/${instance}-deployment.log
+  if [ -r $data_dir/${instance}-deployment.log ]; then
+    echo $data_dir/${instance}-deployment.log
   fi
 }
 
@@ -30,8 +30,8 @@ function tail_messages_log() {
 function tail_out_log() {
   tail_list=$log
 
-    # if needs be, we can add more system out logs here. For now,
-    # we're sticking with the default one.
+  # if needs be, we can add more system out logs here. For now,
+  # we're sticking with the default one.
   
   print "Tailing the system out log $tail_list"
   tail -f $tail_list

From 6e844986df15892cfc7d80305c974e532f65ef62 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 18 Dec 2012 14:15:26 +0100
Subject: [PATCH 1829/2585] - removed user feedback message which would print
 the that ece-install   was setting up the default DB schema, even though a
 different one   was specified in ece-install.conf

  This was very confusing and has been remedied now.
---
 usr/share/escenic/ece-scripts/ece-install.d/database.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index bb0259e5..df9251f8 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -167,8 +167,6 @@ function set_ecedb_conf() {
 }
 
 function set_up_ecedb() {
-  print_and_log "Setting up the ${db_schema} database schema ..."
-
   set_ecedb_conf
   pre_install_new_ecedb
   create_ecedb

From 735dcd1571aa6a8c73ad31e7c196e72efdaaca80 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 18 Dec 2012 14:46:10 +0100
Subject: [PATCH 1830/2585] - fixed a subtle bug introduced in 235fe6aa

---
 usr/share/escenic/ece-scripts/ece-install.d/database.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index df9251f8..6584988a 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -182,7 +182,7 @@ function set_db_settings_from_fai_conf()
   # if the analysis or analysis DB profile is selected, these are the
   # only ones that care about analysis specific DB settings.
   if [[ $install_profile_number -eq $PROFILE_ANALYSIS_DB_SERVER ||
-        $install_analysis_server -eq $PROFILE_ANALYSIS_SERVER ]]; then
+        $install_profile_number -eq $PROFILE_ANALYSIS_SERVER ]]; then
     # order of precedence:
     # 1) fai_analysis_db_*
     # 2) default_db_*

From b3ae9fe3d39102600dc7b87a09e72e81efecaf4e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 18 Dec 2012 16:23:24 +0100
Subject: [PATCH 1831/2585] - improved & updated the section "Build from the
 command line on your   build server" to include information about the
 configuration   packages++

---
 .../doc/vizrt/vosa-handbook/deployment.org    | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/deployment.org b/usr/share/doc/vizrt/vosa-handbook/deployment.org
index 607a6f07..6eee28b9 100644
--- a/usr/share/doc/vizrt/vosa-handbook/deployment.org
+++ b/usr/share/doc/vizrt/vosa-handbook/deployment.org
@@ -24,7 +24,7 @@ the chat room. This is the URI you use for the 'ece deploy' command below.
 
 In future you will also be able to deploy an ear to staging in the chatroom.
 
-*** Build from the command line on your builder
+*** Build from the command line on your build server
 Log on to the build server as the user for the given habitat and run
 the build script:
 
@@ -48,8 +48,25 @@ To build trunk:
 $ ece-build -b <branchname>
 #+END_SRC
 
-Once the build is done, the URI of the finished EAR file is printed in
-the shell. This is the URI you use for the 'ece deploy' command below.
+Once the build is done, the URI of the finished EAR file and the
+corresponding configuration packages for all the machines in your
+environment are printed out in the shell:
+#+BEGIN_SRC text
+[ece-build-0] Starting release creation! @ <%= trail_today_date %>
+[ece-build-0] Additional output can be found in /home/<%= trail_builder_user %>/ece-build.log
+[ece-build-477] Generating change log for revision 6307 ...
+[ece-build-515] Configuration packages available here:
+[ece-build-515] http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/vosa-conf-${HOSTNAME}-1-<%= trail_builder_user %>-trunk-r6307.deb
+[ece-build-515] Replace '${HOSTNAME}' with any of: [ <%= trail_presentation_host_list %>
+[ece-build-515] <%= trail_editor_host %> <%= trail_staging_editor_host %> ] for the other machines' conf packages.
+[ece-build-515] BUILD SUCCESSFUL! @ <%= trail_today_date %>
+[ece-build-515] You'll find the release here:
+[ece-build-515] http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev4331-<%= trail_today_date %>_1225.ear
+#+END_SRC
+
+The EAR URI can be used the 'ece deploy' command below, and the conf
+package(s) can be used with the =ece-deploy= command, or downloaded
+manually.
 
 ** Deploying a new EAR file
 In the examples here, we have a build server on <%= trail_builder_host %>

From 2309bb5d36fd10e5b2aaa3aa9b14d252139d7fe1 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 18 Dec 2012 16:37:45 +0100
Subject: [PATCH 1832/2585] - updated section on updating the publication
 resources and deploying   the configuration packages. Man, things have gotten
 SO much easier   now with the ece-deploy command!

---
 .../doc/vizrt/vosa-handbook/deployment.org    | 96 ++++---------------
 1 file changed, 21 insertions(+), 75 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/deployment.org b/usr/share/doc/vizrt/vosa-handbook/deployment.org
index 6eee28b9..dede7e10 100644
--- a/usr/share/doc/vizrt/vosa-handbook/deployment.org
+++ b/usr/share/doc/vizrt/vosa-handbook/deployment.org
@@ -110,7 +110,6 @@ $ sudo ssh escenic@<%= trail_presentation_host %> ece -i engine1 info
 [ece#engine-engine1] |-> MD5 sum: 58638b16efc7f4cebd8d0acb4eecfb40
 #+END_SRC
 
-
 If anything goes wrong in [[Deploying%20a%20new%20EAR%20file%20for%20an%20ECE%0Ainstance][Deploying a new EAR file for an ECE
 instance]], you can just repeat the deployment steps with the URL of the
 previous EAR.
@@ -163,68 +162,18 @@ torstein@control:~$ sudo ssh escenic@<%= trail_presentation_host %> ece
 
 
 ** Updating Publication Resources
-This section describes how you update publication resources. Here, we
-use content-type as an example.
-
-The content type publication resource is special because it's merged
-by WF and you thus must take it from the EAR the build server built
-for you. Other publication resources could be taken directly from the
-SCM, but for consistency, you can just follow the guide below for
-these as well (layout, layout-group, menu, community/security and so
-on).
-
-First, make sure you have already done the deployment on the
-<%= trail_presentation_host %> server. Login to one of the presentation
-servers. From <%= trail_control_host %>, do:
-#+BEGIN_SRC sh
-$ sudo ssh root@<%= trail_presentation_host %>
-#+END_SRC
-
-Then, change to the user running the ECE user
-#+BEGIN_SRC sh
-# su - escenic
-#+END_SRC
-
-After this, download current content-type so that we can keep a backup
-of it.
-#+BEGIN_SRC sh
-$ mkdir ~/backup
-$ wget -O ~/backup/content-type-$(date --iso)-before-deployment \
-       http://localhost:8080/escenic-admin/publication-resources/<%= trail_publication_name %>/escenic/content-type
-#+END_SRC
-
-The next step is to locate the new content-type definition.  Go to the
-new new content-type from your latest deployment
-
-#+BEGIN_SRC sh
-$ cd /opt/tomcat-engine1/webapps/<%= trail_webapp_name %>/META-INF/escenic/publication-resources/escenic/
-#+END_SRC
-
-Then, confirm the changes using diff:
-#+BEGIN_SRC sh
-$ diff -w ~/backup/content-type-$(date --iso)-before-deployment content-type
-#+END_SRC
-
-Now, upload the new content-type to ECE.  The command below assumes
-that there is a file called the same as the publication resource in
-the current directory.
-#+BEGIN_SRC sh
-$ ece -i engine1 -p <%= trail_publication_name %> -r content-type update
-#+END_SRC
-
-To confirm our changes, we now download the resource again to check if
-all the changes are the way we want them:
-#+BEGIN_SRC sh
-$ wget -O ~/backup/content-type-$(date --iso)-after-deployment \
-       http://localhost:8080/escenic-admin/publication-resources/<%= trail_publication_name %>/escenic/content-type
-#+END_SRC
-
-Finally, run diff again to see that the changes are correct:
+Updating the publication resources is only a matter of passing the
+=--update-publication-resources= to the =ece-deploy= command:
 #+BEGIN_SRC sh
-$ diff -w ~/backup/content-type-$(date --iso)-before-deployment \
-          ~/backup/content-type-$(date --iso)-after-deployment
+$ sudo ece-deploy \
+   --ear http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev4121-<%= trail_today_date %>_1524.ear \
+   --update-publication-resources
 #+END_SRC
 
+The list of publications will be pull down from the =/escenic-admin=
+web application mounted on all Content Engines running on the host
+you're logged into and the publication resources will be located on
+the file system under the app server deployment path.
 
 ** Updating Server Configuration
 *** Make changes to the =server-admin= tree
@@ -288,30 +237,27 @@ packages for all of the machines you've defined in your =server-admin=
 directory tree.
 
 #+BEGIN_SRC text
-<%= trail_builder_user %>@<%= trail_builder_host %>:~$ ./build.sh release
-[build.sh-0] Starting building @ <%= trail_today_date_full %>
-[build.sh-256] Adding an assembly descriptor for Dashboard ...
-[build.sh-374] Build SUCCESSFUL! @ <%= trail_today_date_full %>
-[build.sh-374] You'll find the release here: http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev4121-<%= trail_today_date_full %>_1524.ear
-[build.sh-407] Conf packages available: http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/vosa-conf-<%= trail_presentation_host %>-1-<%= trail_builder_user %>-trunk-r4899.deb
-[build.sh-407] Replace '<%= trail_presentation_host %>' with any of: [ <%= trail_editor_host %> <%= trail_db_master_host %> <%= trail_db_slave_host %> <%= trail_import_host %> <%= trail_analysis_host %> <%= trail_presentation_host_list %> ] for the other machines' conf packages.
+<%= trail_builder_user %>@<%= trail_builder_host %>:~$ ece-build
+[ece-build-0] Starting building @ <%= trail_today_date_full %>
+[ece-build-256] Adding an assembly descriptor for Dashboard ...
+[ece-build-374] Build SUCCESSFUL! @ <%= trail_today_date_full %>
+[ece-build-374] You'll find the release here: http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev4121-<%= trail_today_date_full %>_1524.ear
+[ece-build-407] Conf packages available: http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/vosa-conf-<%= trail_presentation_host %>-1-<%= trail_builder_user %>-trunk-r4899.deb
+[ece-build-407] Replace '<%= trail_presentation_host %>' with any of: [ <%= trail_editor_host %> <%= trail_db_master_host %> <%= trail_db_slave_host %> <%= trail_import_host %> <%= trail_analysis_host %> <%= trail_presentation_host_list %> ] for the other machines' conf packages.
 <%= trail_builder_user %>@<%= trail_builder_host %>:~$
 #+END_SRC
 
 *** Deploying the Configuration Packages
-Log on to the different hosts, download their DEB package and install
-it using =dpkg=. Here, we use <%= trail_presentation_host %> as an
+Log on to the different hosts and call =ece-deploy= with the =--conf=
+parameter to install the package (you normally do this together with
+the EAR file, but for the sake of the example, you /can/ just deploy
+the conf package): Here, we use <%= trail_presentation_host %> as an
 example:
 
 #+BEGIN_SRC text
 <%= trail_control_host %>$ ssh <%= trail_presentation_host %>
-<%= trail_presentation_host %>$ cd /tmp
-<%= trail_presentation_host %>$ wget \
-  --quiet \
-  --http-user <%= trail_builder_http_user %> \
-  --http-password <%= trail_builder_http_password %> \
+<%= trail_presentation_host %>$ sudo ece-insatll --conf \
   http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/vosa-conf-<%= trail_presentation_host %>-1-<%= trail_builder_user %>-trunk-r4899.deb
-<%= trail_presentation_host %>$ sudo -i vosa-conf-<%= trail_presentation_host %>-1-<%= trail_builder_user %>-trunk-r4899.deb
 #+END_SRC
 
 Because of the mighty =dpkg= and the =DEB= package format, you'll get

From bf1683231cae0560f87624b04af2973ff92dabb0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 19 Dec 2012 15:40:27 +0100
Subject: [PATCH 1833/2585] - if there's no ece.conf on the system, we assume
 it's a clean   system and we use the ece.conf from the examples directory.

---
 .../ece-scripts/ece-install.d/ece-scripts.sh  | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh b/usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh
index 07b8cf31..98dbb51b 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh
@@ -45,8 +45,25 @@ function set_up_ece_scripts()
   else
     install_ece_scripts_with_git
   fi
-  
+
   local file=${escenic_conf_dir}/ece.conf
+  local example_ece_conf=/usr/share/doc/escenic/escenic-content-engine-scripts/examples/etc/ece.conf
+
+  # if there's no ece.conf on the system, we assume it's a clean
+  # system and we use the ece.conf from the examples directory.
+  if [ ! -e $file ]; then
+    if [ -e $example_ece_conf ]; then
+      print_and_log "The common conf file for /usr/bin/ece," \
+        $file "didn't exist on" $HOSTNAME \
+        "(I assume a fresh system), copying the one from" $example_ece_conf "..."
+      run cp $example_ece_conf $file
+    else
+      print_and_log $(yellow WARNING) $file "couldn't be found" \
+        "and neither could" $example_ece_conf ", you'll have to" \
+        "provide a valid ece.conf yourself, e.g. with a conf package"
+    fi
+  fi
+  
   set_conf_file_value assemblytool_home ${escenic_root_dir}/assemblytool $file
   set_conf_file_value backup_dir ${escenic_backups_dir} $file
   set_conf_file_value cache_dir ${escenic_cache_dir} ${file}

From ac8322e5b0d9eba941aa3770ea6eda25ef9d68f6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 19 Dec 2012 15:41:34 +0100
Subject: [PATCH 1834/2585] - use the HTTP authentication of the builder when
 creating   publication(s) from an EAR file in  
 ece-install::create-publication::create_publication

---
 .../escenic/ece-scripts/ece-install.d/create-publication.sh      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
index e461500c..19175f4e 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
@@ -33,6 +33,7 @@ function create_publication() {
       
       ensure_variable_is_set fai_publication_domain_mapping_list
       local the_tmp_dir=$(mktemp -d)
+      wget_auth=$wget_builder_auth
       download_uri_target_to_dir $fai_publication_ear $download_dir
       (
         run cd $the_tmp_dir

From ec7a1db74f991cc52c53e25860faeac828d590e0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 19 Dec 2012 16:17:21 +0100
Subject: [PATCH 1835/2585]  we're using the builder HTTP crendentials, if set,
 for  downloading the EAR (the wget_builder_auth isn't set in ece-install 
 context, only in ece context), hence 
 ac8322e5b0d9eba941aa3770ea6eda25ef9d68f6 didn't work).

---
 .../ece-scripts/ece-install.d/create-publication.sh   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
index 19175f4e..20e58ce7 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
@@ -33,7 +33,16 @@ function create_publication() {
       
       ensure_variable_is_set fai_publication_domain_mapping_list
       local the_tmp_dir=$(mktemp -d)
-      wget_auth=$wget_builder_auth
+
+      # we're using the builder HTTP crendentials, if set, for
+      # downloading the EAR.
+      if [[ -n "${fai_builder_http_user}" && \
+        -n "${fai_builder_http_password}" ]]; then
+        wget_auth="
+          --http-user $fai_builder_http_user
+          --http-password $fai_builder_http_password
+        "
+      fi
       download_uri_target_to_dir $fai_publication_ear $download_dir
       (
         run cd $the_tmp_dir

From 77489aa46c1e8faddea2f558fe9b747719ba84cf Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 19 Dec 2012 16:48:40 +0100
Subject: [PATCH 1836/2585] - now adds a risk assessment score to the changelog
 report:

    $ generate-changelog
    Report: /home/torstein/.generate-changelog/nie/trunk/from-PREV-to-COMMITTED.report
    Full diff of all 2 changes: /home/torstein/.generate-changelog/nie/trunk/from-PREV-to-COMMITTED.diff
    Risk assessment score:  6
---
 usr/bin/generate-changelog | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/usr/bin/generate-changelog b/usr/bin/generate-changelog
index a4f1c207..5550cd81 100755
--- a/usr/bin/generate-changelog
+++ b/usr/bin/generate-changelog
@@ -107,8 +107,8 @@ function get_commit_information_from_vcs() {
   if [ ${full_listing-0} -eq 1 ]; then
     cat $the_diff
   else
-    echo "A full overview of all" $(egrep '^(\+|\-) ' $the_diff | wc -l) \
-      "changes can be viewed here:" $the_diff | fmt
+    echo "Full diff of all" $(egrep '^(\+|\-) ' $the_diff | wc -l) \
+      "changes:" $the_diff | fmt
   fi
 }
 
@@ -122,7 +122,7 @@ function get_svn_location() {
 }
 
 function get_info_from_jira() {
-  local the_report=$(get_archive_dir)/from-$(get_from_revision)-to-$(get_to_revision).report
+  the_report=$(get_archive_dir)/from-$(get_from_revision)-to-$(get_to_revision).report
   
   if [[ ! -e $the_report || $(should_regenerate) -eq 1 ]]; then
     echo "Changes in $(get_svn_location)" > $the_report
@@ -142,8 +142,8 @@ function get_info_from_jira() {
       echo "" >> $the_report
     done
   fi
-  
-  cat $the_report
+
+  echo "Report:" $the_report
 }
 
 function sanity_check() {
@@ -190,11 +190,18 @@ function get_archive_dir() {
   echo $dir
 }
 
+function add_risk_assemsment_to_report() {
+  echo "Risk assessment score: " \
+    $(wc -l $the_report 2>/dev/null | cut -d' ' -f1) | \
+    tee --append $the_report
+}
+
 bootstrap_thyself
 read_user_settings
 get_user_input "$@"
 sanity_check
 get_info_from_jira
 get_commit_information_from_vcs
+add_risk_assemsment_to_report
 
 

From f247114c084142f9f53c413570cc113efa45a6b4 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 19 Dec 2012 16:55:57 +0100
Subject: [PATCH 1837/2585] - moved the adding of the risk assesment up into
 get_info_from_jira so   that it's not added each time generate-changelog is
 run for the same   from/to combination.

---
 usr/bin/generate-changelog | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/bin/generate-changelog b/usr/bin/generate-changelog
index 5550cd81..72c4ba62 100755
--- a/usr/bin/generate-changelog
+++ b/usr/bin/generate-changelog
@@ -141,6 +141,8 @@ function get_info_from_jira() {
       echo "   URL: ${jira_base_url}/browse/$(basename $f)" >> $the_report
       echo "" >> $the_report
     done
+
+    add_risk_assemsment_to_report
   fi
 
   echo "Report:" $the_report
@@ -202,6 +204,5 @@ get_user_input "$@"
 sanity_check
 get_info_from_jira
 get_commit_information_from_vcs
-add_risk_assemsment_to_report
 
 

From 559ed920f59def3785c37130eadd36bbf20ee810 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 19 Dec 2012 17:01:22 +0100
Subject: [PATCH 1838/2585] - no need to output the risk assessment in the
 shell, it's already in   the report. - must make the_diff public

---
 usr/bin/generate-changelog | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/usr/bin/generate-changelog b/usr/bin/generate-changelog
index 72c4ba62..1929d160 100755
--- a/usr/bin/generate-changelog
+++ b/usr/bin/generate-changelog
@@ -97,7 +97,7 @@ function should_regenerate() {
 }
 
 function get_commit_information_from_vcs() {
-  local the_diff=$(get_archive_dir)/from-$(get_from_revision)-to-$(get_to_revision).diff
+  the_diff=$(get_archive_dir)/from-$(get_from_revision)-to-$(get_to_revision).diff
 
   if [[ ! -e $the_diff || $(should_regenerate) -eq 1 ]]; then
     svn diff -r $(get_from_revision):$(get_to_revision) > $the_diff
@@ -194,15 +194,15 @@ function get_archive_dir() {
 
 function add_risk_assemsment_to_report() {
   echo "Risk assessment score: " \
-    $(wc -l $the_report 2>/dev/null | cut -d' ' -f1) | \
-    tee --append $the_report
+    $(wc -l $the_diff 2>/dev/null | cut -d' ' -f1) \
+    >> $the_report
 }
 
 bootstrap_thyself
 read_user_settings
 get_user_input "$@"
 sanity_check
-get_info_from_jira
 get_commit_information_from_vcs
+get_info_from_jira
 
 

From a222c80d703ccaa39925208d8409822f09cfc6d6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 20 Dec 2012 12:13:14 +0100
Subject: [PATCH 1839/2585] - added ece -i <instance> list-deployments which
 will list the   instance's deployments. e.g.:

     $ ece -i engine1 list-deployments
     [ece#engine-engine1] These are all the deployments made on engine1:
     Mon Dec 17 21:47:29 CST 2012 engine.ear 089091c0a948f357c74fae3f2cddcb15
     Wed Dec 19 23:03:37 CST 2012 myproject-trunk-rev6284-2012-12-14_1451.ear 7007f66d3032982e7e159749210e8d72
     Wed Dec 19 23:11:20 CST 2012 myproject-trunk-rev6284-2012-12-14_1451.ear 7007f66d3032982e7e159749210e8d72
---
 etc/bash_completion.d/ece |  1 +
 usr/bin/ece               | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/etc/bash_completion.d/ece b/etc/bash_completion.d/ece
index 69993a72..6e5d8bf8 100644
--- a/etc/bash_completion.d/ece
+++ b/etc/bash_completion.d/ece
@@ -16,6 +16,7 @@ _ece_commands()
       help
       info
       kill
+      list-deployments
       list-instances
       list-logs
       list-publications
diff --git a/usr/bin/ece b/usr/bin/ece
index eb22c484..e6de3318 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -755,6 +755,14 @@ function show_all_publications() {
   get_publication_list ${port}
 }  
 
+function show_all_deployments() {
+  print "These are all the deployments made on ${instance}:"
+  local log=$(get_deployment_log)
+  if [ -r $log ]; then
+    cat $log
+  fi
+}  
+
 init
 read_rc_file_if_present
 set_type_command_and_instance $@
@@ -790,6 +798,9 @@ for el in $command; do
         list-publications)
             show_all_publications
             ;;
+        list-deployments)
+            show_all_deployments
+            ;;
         outlog)
             tail_out_log
             ;;

From ed212bfca835df65fdb60dfb6f139bb8e65ef906 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 20 Dec 2012 14:15:31 +0100
Subject: [PATCH 1840/2585] - if the escenic user doesn't have the EDITOR
 variable set, set it as   having the EDITOR variable set is requirement for
 several commmands,   including running.

---
 usr/sbin/ece-install | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 02a558ff..891b74c7 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -433,6 +433,14 @@ if [ -e /etc/bash_completion.d/ece ]; then
 fi
 EOF
   fi
+
+  # Having the EDITOR variable set is requirement for several
+  # commmands, including running:
+  # 
+  # 'ece -i <instance> -p <publication> -r <resource> edit'
+  if [ $(grep EDITOR ${bashrc} 2>/dev/null | wc -l) -lt 1 ]; then
+    echo "export EDITOR=vi" >> ${bashrc}
+  fi
   
   if [ $(grep ECE_CONF_LOCATIONS ${bashrc} | wc -l) -eq 0 ]; then
     echo "export ECE_CONF_LOCATIONS=\"$escenic_conf_dir\"" >> ${bashrc}

From 60fa6d00188bd8440cd0ac48c451080d37c01f9b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 20 Dec 2012 15:02:26 +0100
Subject: [PATCH 1841/2585] - changed the URL used when editing the root
 section's publication   resources. This has been successfully been tested
 with ECE   5.3.7.129272

  Example usage:

      $ ece -i engine1 -p nie -r root-section-parameters edit
---
 usr/share/escenic/ece-scripts/ece.d/publication-resources.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/publication-resources.sh b/usr/share/escenic/ece-scripts/ece.d/publication-resources.sh
index 294469eb..0f96e4bd 100644
--- a/usr/share/escenic/ece-scripts/ece.d/publication-resources.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/publication-resources.sh
@@ -53,7 +53,7 @@ function update_publication_resources() {
     root-section-parameters)
       do_put=true
       url=$(get_escenic_admin_url)
-      url=${url}/section-parameters-declared/${publication}
+      url=${url}/publication-resources/${publication}/0/escenic/section-parameter
       ;;
     *)
       print "Invalid resource: $(basename $resource) :-("

From 95d5cc57761b954fd0a67396cd8b6d8d87452682 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 20 Dec 2012 16:25:18 +0100
Subject: [PATCH 1842/2585] - ece-deploy can now update publication resources
 for publications   with a different name than the war file

- hardening of the  --update-publication-resources feature/switch

- updating resources as a part of a roll back now works!

TODO: better feedback on roll back (deployment state is not there),
more testing, some tidying up of the user feedback. It's starting to
look good!
---
 usr/sbin/ece-deploy | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
index a2d46fd8..546c7cc9 100755
--- a/usr/sbin/ece-deploy
+++ b/usr/sbin/ece-deploy
@@ -27,7 +27,7 @@ function create_pretty_printed_file_if_xml() {
   fi
   
   if [ $(looks_like_xml ${1}) -eq 1 ]; then
-    xml_pp ${1} | xmllint --format - > ${1}.xml
+    xml_pp ${1} | xmllint --noblanks --format - > ${1}.xml
   fi
 }
 
@@ -309,23 +309,40 @@ function update_publication_resources() {
     print_and_log "$el doesn't have any publications" \
       "so there's no publication resources to update ;-)"
     continue
+  else
+    print_and_log "${el}@${HOSTNAME} has the following publications:" \
+      $publication_list
   fi
 
   for publication in $publication_list; do
+    publication=$publication
+    
     # this means a regular deployment
     if [[ "$1" == "$tomcat_base" ]]; then
-      local publication_resources_dir=$tomcat_base/webapps-${publication}/${publication}/META-INF/escenic/publication-resources
+      local publication_resources_dir="/tmp/no/thing"
+      # must search for the right context in defaults.properties as
+      # the WAR file can differ from the publication name.
+      for el in $(find $tomcat_base/webapps-* -name defaults.properties); do
+        if [ $(grep "^publication-name=${publication}$" $el | wc -l) -gt 0 ]; then
+          local base_dir=${el%/WEB-INF/localconfig/defaults.properties}
+          publication_resources_dir=${base_dir}/META-INF/escenic/publication-resources
+          # we're happy, so break out of the loop
+          break
+        fi
+      done
+    # this means a roll back
     else
-      # this means roll back
-      local publication_resources_dir=${1}/${publication}/old
+      local publication_resources_dir=${1}/${publication}
     fi
 
+    print publication_resources_dir=$publication_resources_dir
+    
     if [ ! -d $publication_resources_dir ]; then
       continue
     fi
 
     print_and_log "Updating resources for publication" $publication "..."
-    # we gep away .xml and .diff file shere as these will be present
+    # we grep away .xml and .diff file shere as these will be present
     # when rolling back a deployment.
     for publication_resource in \
       $(find $publication_resources_dir -type f | egrep -v ".(xml|diff)$"); do

From 6ebd974671ef28e95309cd2f0bc6c2e62a4ddd1d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 21 Dec 2012 09:23:05 +0100
Subject: [PATCH 1843/2585] - removed the notice of moving the project to
 github/vizrt, as this is   only need on skybert/ece-scriprts.

---
 README | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/README b/README
index 547a6d2d..4f336859 100644
--- a/README
+++ b/README
@@ -1,16 +1,3 @@
-===============
-Read this first
-===============
-The development of ece-scripts have now (2012-12-11) been moved to
-Vizrt's github space: https://github.com/vizrt/ece-scripts, so go here
-for the latest code and issue tracking.
-
-The APT archive is the same as before: http://apt.vizrt.com
-
-Cheers,
-
--Torstein
-
 ========
 Overview
 ========

From 65b696bbdcc6a275dfbbfe1490ddc939219f4a03 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 21 Dec 2012 12:54:36 +0100
Subject: [PATCH 1844/2585] - now remembers/added state files after a
 successful roll back

- removed redundant call to remember_state

- fixed user feedback to list correct paths when rolling back
---
 usr/sbin/ece-deploy | 43 ++++++++++++++++++++-----------------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
index 546c7cc9..3fa47142 100755
--- a/usr/sbin/ece-deploy
+++ b/usr/sbin/ece-deploy
@@ -77,14 +77,6 @@ function deploy_ear() {
     proxy_settings="http_proxy=$http_proxy"
   fi
 
-  print_and_log "Remembering the old deployment states for all instances ..."
-  for el in $engine_instance_list $search_instance_list; do
-    local file=/var/lib/escenic/${el}.state
-    if [ -e $file ]; then
-      run cp $file $(get_publication_old_dir)
-    fi
-  done
-    
   for el in $engine_instance_list; do
     su - $ece_unix_user -c \
       "${proxy_settings} ece -i $el stop deploy clean start --uri $ear_uri"
@@ -335,8 +327,6 @@ function update_publication_resources() {
       local publication_resources_dir=${1}/${publication}
     fi
 
-    print publication_resources_dir=$publication_resources_dir
-    
     if [ ! -d $publication_resources_dir ]; then
       continue
     fi
@@ -418,16 +408,16 @@ function roll_back_everything_to_version() {
     "from" $(date --date @$(echo ${roll_back_to_version} | cut -d'-' -f2)) \
     "..."
 
-  local old_ece_deploy_data_dir=$ece_deploy_data_dir/${roll_back_to_version}/old
-  if [ ! -d $old_ece_deploy_data_dir ]; then
+  local new_ece_deploy_data_dir=$ece_deploy_data_dir/${roll_back_to_version}/new
+  if [ ! -d $new_ece_deploy_data_dir ]; then
     print_and_log "I cannot find ${roll_back_to_version}'s files," \
-      "they should have been here:" $old_ece_deploy_data_dir
+      "they should have been here:" $new_ece_deploy_data_dir
     exit 1
   else
-    print_and_log "Using data in" $old_ece_deploy_data_dir "to perform the rollback"
+    print_and_log "Using data in" $new_ece_deploy_data_dir "to perform the rollback"
   fi
 
-  local package_version_file=$ece_deploy_data_dir/${roll_back_to_version}/new/vosa-conf-${HOSTNAME}.version
+  local package_version_file=$new_ece_deploy_data_dir/vosa-conf-${HOSTNAME}.version
   if [ -e $package_version_file ]; then
     local deb_file=$ece_deploy_download_dir/vosa-conf-$HOSTNAME-$(cat $package_version_file).deb
     if [ -e $deb_file ]; then
@@ -441,17 +431,17 @@ function roll_back_everything_to_version() {
         "I couldn't find it in" $deb_file
     fi
   else
-    print_and_log "Couldn't find the previous version for vosa-conf-$HOSTNAME" \
+    print_and_log $(yellow WARNING) \
+      "Couldn't find the previous version for vosa-conf-$HOSTNAME" \
       "you must get a hold of the latest/approriate one yourself."
   fi
 
   for el in $engine_instance_list; do
-    local file=$ece_deploy_data_dir/${roll_back_to_version}/new/${el}.state
+    local file=$new_ece_deploy_data_dir/${el}.state
     if [ ! -e $file ]; then
       continue
     fi
 
-    # we source the state file to get the 'ear_used' value
     local old_ear=$(grep ear_used $file | cut -d'=' -f2)
     print_and_log "Rolling back ${el}'s EAR to ${old_ear} ..."
     ear_uri=${old_ear}
@@ -459,11 +449,12 @@ function roll_back_everything_to_version() {
   done
 }
 
-## $1 :: dir, can be the patht to the new or old directory of this
+## $1 :: dir, can be the path to the new or old directory of this
 ## deployment
 function remember_state() {
   make_dir $1
   
+  print_and_log "Remembering the deployment states for all instances ..."
   for el in $engine_instance_list $search_instance_list; do
     local file=/var/lib/escenic/${el}.state
     if [ -e $file ]; then
@@ -471,7 +462,7 @@ function remember_state() {
     fi
   done
 
-  if [ $(dpkg -l vosa-conf-$HOSTNAME | wc -l) -eq 0 ]; then
+  if [ $(dpkg -l vosa-conf-$HOSTNAME 2>/dev/null | wc -l) -eq 0 ]; then
     return
   fi
   
@@ -499,7 +490,6 @@ function remember_state() {
 }
 
 function print_summary() {
-  print_and_log "Finished @ $(date)"
   for el in $engine_instance_list $search_instance_list; do
     for ele in ${el}.state vosa-conf-$HOSTNAME.version; do
       if [[ -e $(get_deployment_dir)/old/${ele} && \
@@ -511,7 +501,7 @@ function print_summary() {
     done
   done
   
-  if [[ $(dpkg -l vosa-conf-$HOSTNAME | wc -l) -gt 0 && \
+  if [[ $(dpkg -l vosa-conf-$HOSTNAME 2>/dev/null | wc -l) -gt 0 && \
     -d $(get_deployment_dir)/old/vosa-conf-$HOSTNAME && \
     -d $(get_deployment_dir)/new/vosa-conf-$HOSTNAME ]]; then
     diff --recursive --ignore-all-space \
@@ -520,7 +510,10 @@ function print_summary() {
       > $(get_deployment_dir)/new/vosa-conf-${HOSTNAME}.diff
   fi
   
-  local diff_files=$(find $(get_deployment_dir) -name "*.diff")
+  local diff_files=$(
+    find $(get_deployment_dir) -name "*.diff" | \
+    grep -v 'usr/share/doc/escenic'
+  )
   if [ $(echo "$diff_files" | wc -c) -gt 2 ]; then
     print_and_log "Here are the diffs of all publication resources" \
       "and files that were changed:"
@@ -531,6 +524,7 @@ function print_summary() {
     done
   fi
 
+  print_and_log "Finished @ $(date)"
 }
 
 function crawl_a_wee_bit() {
@@ -596,6 +590,8 @@ fi
 
 if [ ${roll_back-0} -eq 1 ]; then
   make_dir $(get_deployment_dir)/old $(get_deployment_dir)/new
+  remember_state $(get_deployment_dir)/old
+  
   roll_back_everything_to_version
 
   if [ ${update_the_publication_resources-0} -eq 1 ]; then
@@ -605,6 +601,7 @@ if [ ${roll_back-0} -eq 1 ]; then
     done
   fi
   
+  remember_state $(get_deployment_dir)/new
   print_and_log "You have now rolled back to deployment ${roll_back_to_version}"
 fi
 

From e06dd60c4046512fef5a645cd94b13da69b4340a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 21 Dec 2012 14:40:09 +0100
Subject: [PATCH 1845/2585] - removed dead code

---
 usr/sbin/ece-deploy | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
index 3fa47142..22c8df50 100755
--- a/usr/sbin/ece-deploy
+++ b/usr/sbin/ece-deploy
@@ -307,8 +307,6 @@ function update_publication_resources() {
   fi
 
   for publication in $publication_list; do
-    publication=$publication
-    
     # this means a regular deployment
     if [[ "$1" == "$tomcat_base" ]]; then
       local publication_resources_dir="/tmp/no/thing"
@@ -571,7 +569,7 @@ if [ ${make_deployment-1} -eq 1 ]; then
   if [ -n "$conf_package_uri" ]; then
     deploy_conf
   fi
-  
+
   if [ ${update_the_publication_resources-0} -eq 1 ]; then
     for el in $engine_instance_list; do
       run source /etc/escenic/ece-${el}.conf

From 638f13cb3b568117489ba583e6ff2eacfff16cb5 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Fri, 28 Dec 2012 11:06:59 +0100
Subject: [PATCH 1846/2585] Removed pipefail, not needed anymore as hugin now
 does this.

---
 usr/share/hugin/plugins/publication-resources | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/usr/share/hugin/plugins/publication-resources b/usr/share/hugin/plugins/publication-resources
index 735a0a7a..dab73db7 100755
--- a/usr/share/hugin/plugins/publication-resources
+++ b/usr/share/hugin/plugins/publication-resources
@@ -27,17 +27,18 @@ text_resources="
 
 . /etc/vosa-service-declaration.conf 
 
+# TODO: grab port number from somewhere
 pubs=( $trail_publication_domain_mapping_list )
 for pub in "${pubs[@]/\#*/}" ; do
   for resource in $xml_resources ; do
     name=${resource//[\/]/-}
-    echo "escenic-publication-${pub}$name" "set -o pipefail; curl -s http://localhost:8080/escenic-admin/publication-resources/$pub$resource | xmllint --encode UTF-8 --format -"
+    echo "escenic-publication-${pub}$name" "curl -s http://localhost:8080/escenic-admin/publication-resources/$pub$resource | xml_pp -e UTF-8"
   done
   for resource in $text_resources ; do
     name=${resource//[\/]/-}
     echo "escenic-publication-${pub}$name" "curl -s http://localhost:8080/escenic-admin/publication-resources/$pub$resource"
   done
-  echo "escenic-publication-${pub}-section-parameters" "set -o pipefail; curl -s http://localhost:8080/escenic-admin/section-parameters/$pub/ | grep -v ^# | sort -n"
+  echo "escenic-publication-${pub}-section-parameters" "curl -s http://localhost:8080/escenic-admin/section-parameters/$pub/ | grep -v ^# | sort -n"
 done
 
 

From 30bd16d2eb71c452bd6abe6b63d812b5817073ca Mon Sep 17 00:00:00 2001
From: Erik Mogensen <erik@mogensoft.net>
Date: Wed, 2 Jan 2013 13:29:32 +0100
Subject: [PATCH 1847/2585] Typos in deployment.org

---
 usr/share/doc/vizrt/vosa-handbook/deployment.org | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/deployment.org b/usr/share/doc/vizrt/vosa-handbook/deployment.org
index dede7e10..bb53d643 100644
--- a/usr/share/doc/vizrt/vosa-handbook/deployment.org
+++ b/usr/share/doc/vizrt/vosa-handbook/deployment.org
@@ -74,20 +74,20 @@ where we build EARs for the the <%= trail_builder_user %> website.
 
 *** Preparing to deploy to production
 If you have changes to be deployed to production you should follow the next checklist:
-1. Find out whitch EAR is running in production today.
+1. Find out which EAR is running in production today.
 2. Ensure that your EAR is running on staging and a smoketest has been performed.
 2. Make release notes:
   1. Collect all subversion changes that have made it into the EAR that you want to deploy by reviewing all Subversion commits since the last deploy.
   2. List all the Jira from those Subversion commits.
   3. Ensure that all those Jira issues are tested on staging and closed. If you cannot close one, make a new issue for the resulting work and close it anyway.
 3. Copy and paste the list of Jira issues in a support case (by email or otherwise) and make sure that the subject contains the name of the EAR file.
-4. Expect the support team to perform the deploy within 24 hours or call the support phonnumber ask ask them to do it earlier.
-5. If you are a support engineer yourself ask one of your colleagues to deploy to production and follow the checklist there. You shoud not prepare a deploy and than go ahead and deploy it yourself :-).
+4. Expect the support team to perform the deploy within 24 hours or call the support phone number and ask them to do it earlier.
+5. If you are a support engineer yourself ask one of your colleagues to deploy to production and follow the checklist there. You shoud not prepare a deploy and then go ahead and deploy it yourself :-).
 
 *** Deploying to a production system
 Deployments to production are only done by operators in the Support group of Vizrt Online in Dhaka or Oslo.
-If you are getting ready to depoy to a production system you have to follow the next checklist:
-0. Verify that you are not the same person who did the changes to the codes :-)
+If you are getting ready to deploy to a production system you have to follow the next checklist:
+0. Verify that you are not the same person who did the changes to the code :-)
 1. Has the EAR been properly release tested?
 1. Has the EAR been properly smoke tested?
 2. Do the release notes match the changes made to the codes and do they make sense?

From c83a9a28e031285d3c8f2682096fd7de32b6b707 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 2 Jan 2013 12:30:22 +0100
Subject: [PATCH 1848/2585] - moved the download dir from
 /var/cache/ece-install to   /var/cache/escenic/ece-install to keep it in sync
 with the other   directories.

---
 usr/sbin/ece-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 891b74c7..56eb89e5 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -50,7 +50,7 @@ ece_scripts_version="straight-from-github"
 
 #####################################################################
 
-download_dir=/var/cache/$(basename $0)
+download_dir=/var/cache/escenic/$(basename $0)
 log=/var/log/escenic/$(basename $0).log
 conf_file=$HOME/ece-install.conf
 ece_scripts_git_source=https://github.com/vizrt/ece-scripts.git

From 935eb85051197bfdfb7159aef1e166756f798b83 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 2 Jan 2013 13:06:10 +0100
Subject: [PATCH 1849/2585] - use the escenic_log_dir and escenic_cache_dir
 when setting the   ece-install specific log and download dir fields.

---
 usr/sbin/ece-install | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 56eb89e5..b9d2b5a2 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -50,8 +50,8 @@ ece_scripts_version="straight-from-github"
 
 #####################################################################
 
-download_dir=/var/cache/escenic/$(basename $0)
-log=/var/log/escenic/$(basename $0).log
+download_dir=${escenic_cache_dir}/$(basename $0)
+log=${escenic_log_dir}/$(basename $0).log
 conf_file=$HOME/ece-install.conf
 ece_scripts_git_source=https://github.com/vizrt/ece-scripts.git
 maven_opts="--batch-mode"
@@ -60,7 +60,7 @@ apt_opts="--no-install-recommends"
 curl_opts="--silent"
 
 # hook scripts
-ece_install_scripts_dir=$HOME/ece-install.d
+ece_install_scripts_dir=$HOME/$(basename $0).d
 
 # globals will be set to correct values in run-time.
 appserver_host=localhost

From 3e5ceb70a44613dcd848e8cdface857abc8e4332 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 2 Jan 2013 13:15:48 +0100
Subject: [PATCH 1850/2585] - ece-deloy will now exit with code 1 if no
 parameters are passed to   it (in addition to other sanity checks).

---
 usr/sbin/ece-deploy | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
index 22c8df50..2e306c6e 100755
--- a/usr/sbin/ece-deploy
+++ b/usr/sbin/ece-deploy
@@ -70,7 +70,6 @@ function bootstrap_thyself() {
 
 bootstrap_thyself
 
-
 function deploy_ear() {
   local proxy_setings=""
   if [ -n "$http_proxy" ]; then
@@ -210,6 +209,13 @@ function verify_user_input() {
     errors=1
   fi
 
+  if [[ ${roll_back-0} -eq 0 && \
+    ${list_the_revious_deployments-0} -eq 0 && \
+    ${deploy_an_ear_file-0} -eq 0 && \
+    ${deploy_a_conf_file-0} -eq 0 ]]; then
+    errors=1
+  fi
+
   if [ $errors -eq 1 ]; then
     exit 1
   fi

From f1ca745c1807e62d3e0d9c397615c2ef041dbbeb Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 2 Jan 2013 13:31:18 +0100
Subject: [PATCH 1851/2585] - ece-import now uses
 common-os:assert_commands_available instead of   its local function
 check_pre_requisites. DRY here we come!

---
 usr/bin/ece-import | 26 +++-----------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

diff --git a/usr/bin/ece-import b/usr/bin/ece-import
index 6c11b209..feb13e5b 100755
--- a/usr/bin/ece-import
+++ b/usr/bin/ece-import
@@ -18,6 +18,7 @@ function bootstrap_thyself() {
   local common_libraries="
     common-bashing.sh
     common-io.sh
+    common-os.sh
   "
 
   for el in $common_libraries; do
@@ -174,28 +175,6 @@ function get_user_input() {
   fi
 }
 
-function check_pre_requisites() {
-  local required_command_list="
-    xsltproc
-    xmllint
-    xml_grep
-  "
-
-  local some_missing=0
-  
-  for el in $required_command_list; do
-    which $el > /dev/null 2>/dev/null
-    if [ $? -gt 0 ]; then
-      print_and_log "$(basename $0) needs the command $el to be installed"
-      some_missing=1
-    fi
-  done
-
-  if [ $some_missing -eq 1 ]; then
-    remove_pid_and_exit_in_error
-  fi
-}
-
 ## $1 :: the transformer (file name, relative or absoulte)
 function is_trannsformer_supported() {
   if [ -z $1 ]; then
@@ -380,7 +359,8 @@ function print_report() {
   fi
 }
 
-check_pre_requisites
+
+assert_commands_available  xsltproc xmllint xml_grep
 get_user_input $@
 
 function run_import() {

From d4c8bb9c78db4ee429b74542d998c58d3f780479 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 2 Jan 2013 13:36:27 +0100
Subject: [PATCH 1852/2585] - added BASH auto completion for ece-deploy,
 ece-import and ece-install

- included the BASH auto completion of ece-deploy and ece-import in
  the escenic-content-engine-scripts package

- included the BASH auto completion of ece-install in the
  escenic-content-engine-installer package
---
 etc/bash_completion.d/ece-deploy              | 22 +++++++++++++
 etc/bash_completion.d/ece-import              | 32 +++++++++++++++++++
 etc/bash_completion.d/ece-install             | 24 ++++++++++++++
 .../escenic/package-scripts/create-packages   |  5 ++-
 4 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 etc/bash_completion.d/ece-deploy
 create mode 100644 etc/bash_completion.d/ece-import
 create mode 100644 etc/bash_completion.d/ece-install

diff --git a/etc/bash_completion.d/ece-deploy b/etc/bash_completion.d/ece-deploy
new file mode 100644
index 00000000..4d16f59c
--- /dev/null
+++ b/etc/bash_completion.d/ece-deploy
@@ -0,0 +1,22 @@
+# auto completion for the ece-deploy command.                    -*- sh -*-
+
+_ece-deploy_commands()
+{
+    local cur=${COMP_WORDS[COMP_CWORD]}
+    local prev=${COMP_WORDS[COMP_CWORD-1]}
+
+    options="
+      --conf
+      --ear
+      --list-deployments
+      --update-publication-resources
+    "
+    
+    # default completions is the list of options
+    completions="$options"
+
+    COMPREPLY=( $(compgen -W "$completions" -- $cur) )
+}
+
+complete -o default -F _ece-deploy_commands ece-deploy
+
diff --git a/etc/bash_completion.d/ece-import b/etc/bash_completion.d/ece-import
new file mode 100644
index 00000000..4ff3eafc
--- /dev/null
+++ b/etc/bash_completion.d/ece-import
@@ -0,0 +1,32 @@
+# auto completion for the ece-import command.                    -*- sh -*-
+
+_ece-import_commands()
+{
+    local cur=${COMP_WORDS[COMP_CWORD]}
+    local prev=${COMP_WORDS[COMP_CWORD-1]}
+
+    options="
+      --directories-only
+      --escenic-group
+      --escenic-user
+      --import-archive
+      --name
+      --password
+      --publication
+      --uri
+      --user
+      --version
+      -V
+      -f
+      -n
+      -p
+    "
+    
+    # default completions is the list of options
+    completions="$options"
+
+    COMPREPLY=( $(compgen -W "$completions" -- $cur) )
+}
+
+complete -o default -F _ece-import_commands ece-import
+
diff --git a/etc/bash_completion.d/ece-install b/etc/bash_completion.d/ece-install
new file mode 100644
index 00000000..7ce24308
--- /dev/null
+++ b/etc/bash_completion.d/ece-install
@@ -0,0 +1,24 @@
+# auto completion for the ece-install command.                    -*- sh -*-
+
+_ece-install_commands()
+{
+    local cur=${COMP_WORDS[COMP_CWORD]}
+    local prev=${COMP_WORDS[COMP_CWORD-1]}
+
+    options="
+      --conf-file
+      --verbose
+      --version
+      -V
+      -f
+      -v
+    "
+    
+    # default completions is the list of options
+    completions="$options"
+
+    COMPREPLY=( $(compgen -W "$completions" -- $cur) )
+}
+
+complete -o default -F _ece-install_commands ece-install
+
diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 1b88b48c..813756f8 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -83,7 +83,10 @@ function set_up_escenic-content-engine-installer() {
   mkdir -p $target_dir/usr/{bin,sbin,share/doc}
   mkdir -p $target_dir/usr/share/doc/escenic/examples
   mkdir -p $target_dir/usr/share/escenic/ece-scripts
+  mkdir -p $target_dir/etc/bash_completion.d
   
+  cp ../../../../etc/bash_completion.d/ece-install \
+    $target_dir/etc/bash_completion.d/
   cp -r ../../../sbin/ece-install $target_dir/usr/sbin/
   cp -r ../../escenic/ece-scripts/ece-install.d/ \
     $target_dir/usr/share/escenic/ece-scripts/
@@ -121,7 +124,7 @@ function set_up_escenic-content-engine-scripts() {
   cp ../../../sbin/ece-deploy $target_dir/usr/sbin/
 
   # conf
-  cp -r ../../../../etc/bash_completion.d/ece \
+  cp ../../../../etc/bash_completion.d/{ece,ece-import,ece-deploy} \
     $target_dir/etc/bash_completion.d
   # we don't include /etc/default/ece as this file often is also
   # included in the conf packages.

From 74a490ee25636ee3eade9abf2ece49c29b963252 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 2 Jan 2013 13:45:01 +0100
Subject: [PATCH 1853/2585] - when auto completing ece-deploy commands, the
 user will get   'http://' as the auto completion if he/she does TAB TAB after
   --conf and/or --ear

---
 etc/bash_completion.d/ece-deploy | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/etc/bash_completion.d/ece-deploy b/etc/bash_completion.d/ece-deploy
index 4d16f59c..51d44992 100644
--- a/etc/bash_completion.d/ece-deploy
+++ b/etc/bash_completion.d/ece-deploy
@@ -13,8 +13,18 @@ _ece-deploy_commands()
     "
     
     # default completions is the list of options
-    completions="$options"
-
+    case "$prev" in
+        --conf)
+        completions="http://"
+        ;;
+        --ear)
+        completions="http://"
+        ;;
+      *)
+        completions="$options"
+        ;;
+    esac
+    
     COMPREPLY=( $(compgen -W "$completions" -- $cur) )
 }
 

From 42be7e2568bd5fb2eab75f4d359e8a5f6c9e8624 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 2 Jan 2013 14:05:58 +0100
Subject: [PATCH 1854/2585] - fixed a wee error in ece-deploy where you'd get
 errors if there were   no publication specific web app contexts.

---
 usr/sbin/ece-deploy | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
index 2e306c6e..dfce7957 100755
--- a/usr/sbin/ece-deploy
+++ b/usr/sbin/ece-deploy
@@ -318,7 +318,8 @@ function update_publication_resources() {
       local publication_resources_dir="/tmp/no/thing"
       # must search for the right context in defaults.properties as
       # the WAR file can differ from the publication name.
-      for el in $(find $tomcat_base/webapps-* -name defaults.properties); do
+      for el in $(find $tomcat_base/webapps-* \
+        -name defaults.properties 2>/dev/null); do
         if [ $(grep "^publication-name=${publication}$" $el | wc -l) -gt 0 ]; then
           local base_dir=${el%/WEB-INF/localconfig/defaults.properties}
           publication_resources_dir=${base_dir}/META-INF/escenic/publication-resources

From 25ca80ed6646325f28a03a8cb80a05314597c3dd Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 2 Jan 2013 17:00:18 +0100
Subject: [PATCH 1855/2585] - added notice on why we're skipping publication
 resource update

---
 usr/sbin/ece-deploy | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
index dfce7957..e9f2ac56 100755
--- a/usr/sbin/ece-deploy
+++ b/usr/sbin/ece-deploy
@@ -333,6 +333,8 @@ function update_publication_resources() {
     fi
 
     if [ ! -d $publication_resources_dir ]; then
+      print_and_log "Couldn't find the publication resource dir for" \
+        "publication" $publication ", I will not update its resources."
       continue
     fi
 

From 92be7fc13f6520e3ff8f97b4d32247883ded82a0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torsteinkrausework@gmail.com>
Date: Wed, 2 Jan 2013 17:05:04 +0100
Subject: [PATCH 1856/2585] Updated copyright notice to include 2012 & 2013

---
 COPYING | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/COPYING b/COPYING
index d71ac74c..649d546d 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-   Copyright 2011 Vizrt
+   Copyright 2011-2013 Vizrt
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

From 153ce5ec2647bbeb4ad72139b06b8acab28ddd13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Thu, 3 Jan 2013 10:00:27 +0100
Subject: [PATCH 1857/2585] ece-build - fixed regression bug in the addition of
 engine-backport-1.0-SNAPSHOT.jar

---
 usr/share/escenic/build-scripts/ece-build | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 376395a0..fef6523e 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -243,9 +243,7 @@ function add_global_libs
     remove_pid_and_exit_in_error
   fi
   local engine_version=`readlink $engine_root_dir`
-  log engine_version="$engine_version"
-  
-  if [ $? = 0 ]; then
+  if [ $(echo "$engine_version" | grep "engine-5.3" | wc -l) -gt 0 ]; then
     if [ -e $builder_root_dir/lib/engine-backport-1.0-SNAPSHOT.jar ]; then
       run ln -s $builder_root_dir/lib/engine-backport-1.0-SNAPSHOT.jar $assemblytool_lib_dir/
     else

From 4356be5ebb8b47219008266e60f98e186d7e7196 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 3 Jan 2013 10:01:19 +0100
Subject: [PATCH 1858/2585] - removed unused list, publication_resource_list.

---
 usr/sbin/ece-deploy | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
index e9f2ac56..a3968487 100755
--- a/usr/sbin/ece-deploy
+++ b/usr/sbin/ece-deploy
@@ -237,18 +237,6 @@ function list_previous_deployments() {
   done
 }
 
-publication_resource_list="
-  0/escenic/section-parameter
-  escenic/content-type
-  escenic/feature
-  escenic/image-version
-  escenic/layout
-  escenic/layout-group
-  escenic/plugin/community/security
-  escenic/plugin/menu
-  escenic/teaser-type
-"
-
 function looks_like_xml() {
   if [ -z "$1" ]; then
     echo 0

From 726444330bb5c377f3300421a005676e2447afb1 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 3 Jan 2013 12:23:55 +0100
Subject: [PATCH 1859/2585] - added the --force option

---
 etc/bash_completion.d/ece-deploy | 1 +
 1 file changed, 1 insertion(+)

diff --git a/etc/bash_completion.d/ece-deploy b/etc/bash_completion.d/ece-deploy
index 51d44992..d1b7395f 100644
--- a/etc/bash_completion.d/ece-deploy
+++ b/etc/bash_completion.d/ece-deploy
@@ -8,6 +8,7 @@ _ece-deploy_commands()
     options="
       --conf
       --ear
+      --force
       --list-deployments
       --update-publication-resources
     "

From 316ffabddf017cdf7085965974697f7cca88f5bc Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 3 Jan 2013 12:31:41 +0100
Subject: [PATCH 1860/2585] - added another force option to dpkg when calling
 ece-deploy with --force. - added a warning message when the user passes
 --force:

    [ece-deploy-34] WARNING using force as you requested installing
    [ece-deploy-34] vosa-conf-ubiquitous-1-nie-branch-5.5-r5906.deb using these
    [ece-deploy-34] flags: --force-overwrite --force-confnew
---
 usr/sbin/ece-deploy | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
index a3968487..d02a6969 100755
--- a/usr/sbin/ece-deploy
+++ b/usr/sbin/ece-deploy
@@ -118,10 +118,10 @@ function set_builder_user_and_password() {
       file_list="$file_list /etc/escenic/ece-${el}.conf"
     done
     print_and_log \
-      "You need to set builder_http_user & and builder_http_password" \
-      "in one of these files:" \
-      $file_list
-    exit 1
+      "You haven't set builder_http_user & and builder_http_password" \
+      "in neither of these files:" \
+      $file_list \
+      "I assume the downloads are not password protected"
   fi
 }
 
@@ -145,7 +145,10 @@ function deploy_conf() {
 
   print "Installing" $(basename $conf_package_uri) "..."
   if [ ${force_everything-0} -eq 1 ]; then
-    dpkg_opts="--force-overwrite"
+    dpkg_opts="--force-overwrite --force-confnew"
+    print_and_log $(yellow WARNING) "using force as you requested" \
+      "installing" $(basename $conf_package_uri) "using these flags:" \
+      $dpkg_opts
   fi
 
   dpkg \

From 43889ce8e2195cc93dfdb43e018ab37f81f1ae2a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 3 Jan 2013 13:25:20 +0100
Subject: [PATCH 1861/2585] - fix to --list-deployments, it should sort the 20
 _last_ deployments   ...

---
 usr/sbin/ece-deploy | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
index d02a6969..77d492c3 100755
--- a/usr/sbin/ece-deploy
+++ b/usr/sbin/ece-deploy
@@ -232,7 +232,7 @@ function list_previous_deployments() {
   for el in $(find $ece_deploy_data_dir -maxdepth 1 -type d | \
     sed "s#${ece_deploy_data_dir}##g" | \
     sort -nr | \
-    head -20); do
+    tail -20); do
     local id=$(basename $el)
     echo "   - Deployment" ${id} \
       "was made @" \
@@ -240,6 +240,7 @@ function list_previous_deployments() {
   done
 }
 
+## $1 :: file that you want to see if it's XML or not
 function looks_like_xml() {
   if [ -z "$1" ]; then
     echo 0
@@ -510,7 +511,7 @@ function print_summary() {
   
   local diff_files=$(
     find $(get_deployment_dir) -name "*.diff" | \
-    grep -v 'usr/share/doc/escenic'
+    grep -v 'usr/share/doc'
   )
   if [ $(echo "$diff_files" | wc -c) -gt 2 ]; then
     print_and_log "Here are the diffs of all publication resources" \

From 210d0ee9d04272b8e619c4311ff516ef8f308bc9 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 7 Jan 2013 17:03:26 +0100
Subject: [PATCH 1862/2585] - made all scripts (more) Mac OSX compatible as the
 Mac OS version of   the format command doesn't support the long option
 switches like --width.

- now, generate-changelog works on OSX

- white space cleanup
---
 usr/bin/generate-changelog                      | 1 -
 usr/share/escenic/ece-scripts/common-bashing.sh | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/bin/generate-changelog b/usr/bin/generate-changelog
index 1929d160..8aba219f 100755
--- a/usr/bin/generate-changelog
+++ b/usr/bin/generate-changelog
@@ -22,7 +22,6 @@ function bootstrap_thyself() {
       exit 1
     }
   done
-
 }
 
 function read_user_settings() {
diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index 9ed5c8b6..3c40709f 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -58,7 +58,7 @@ function print() {
   # we break the text early to have space for the ID.
   local id="$(get_id) "
   local text_width=$(( 80 - $(echo $id | wc -c) ))
-  echo $@ | fmt --width $text_width | sed "s~^~${id}~g"
+  echo $@ | fmt -w $text_width | sed "s~^~${id}~g"
 }
 
 function printne() {
@@ -212,6 +212,7 @@ function green() {
   else
     echo "$@"
   fi
+  tput clear
 }
 
 ## Returns the inputted string(s) as yellow

From f4137e3a19182d345537294558019f6e599cbe86 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 7 Jan 2013 17:23:56 +0100
Subject: [PATCH 1863/2585] - fixed bug in
 generate-changelog::get_info_from_jira where diffs with   no leading
 whitespace would get counted in the overall diff count   (although they'd be
 included in the diff report).

---
 usr/bin/generate-changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/bin/generate-changelog b/usr/bin/generate-changelog
index 8aba219f..99fc980e 100755
--- a/usr/bin/generate-changelog
+++ b/usr/bin/generate-changelog
@@ -106,7 +106,7 @@ function get_commit_information_from_vcs() {
   if [ ${full_listing-0} -eq 1 ]; then
     cat $the_diff
   else
-    echo "Full diff of all" $(egrep '^(\+|\-) ' $the_diff | wc -l) \
+    echo "Full diff of all" $(egrep '^(\+|\-)' $the_diff | wc -l) \
       "changes:" $the_diff | fmt
   fi
 }

From e47b1cb4109eb6244f8f41be69878585b45d8cdf Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 8 Jan 2013 13:18:54 +0100
Subject: [PATCH 1864/2585] - wrote a lot on the deployment chapter

- big changes, not finished yet, but need to move my work to a
  different server because BASH on Mac is a joke, so the documentation
  build will not fly.
---
 .../doc/vizrt/vosa-handbook/deployment.org    | 79 ++++++++++++++++---
 1 file changed, 66 insertions(+), 13 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/deployment.org b/usr/share/doc/vizrt/vosa-handbook/deployment.org
index bb53d643..3df852ac 100644
--- a/usr/share/doc/vizrt/vosa-handbook/deployment.org
+++ b/usr/share/doc/vizrt/vosa-handbook/deployment.org
@@ -33,17 +33,17 @@ To log onto the builder:
 $ ssh <%= trail_builder_user %>@<%= trail_builder_host %>
 #+END_SRC
 
-To build trunk:
+To build the trunk:
 #+BEGIN_SRC sh
 $ ece-build
 #+END_SRC
 
-To build from a tag in subversion:
+To build from a tag in Subversion you do:
 #+BEGIN_SRC sh
 $ ece-build -t <tagname>
 #+END_SRC
 
-To build trunk:
+To build a branch you can use the =-b= parameter:
 #+BEGIN_SRC sh
 $ ece-build -b <branchname>
 #+END_SRC
@@ -61,7 +61,7 @@ environment are printed out in the shell:
 [ece-build-515] <%= trail_editor_host %> <%= trail_staging_editor_host %> ] for the other machines' conf packages.
 [ece-build-515] BUILD SUCCESSFUL! @ <%= trail_today_date %>
 [ece-build-515] You'll find the release here:
-[ece-build-515] http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev4331-<%= trail_today_date %>_1225.ear
+[ece-build-515] http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev6307-<%= trail_today_date %>_1225.ear
 #+END_SRC
 
 The EAR URI can be used the 'ece deploy' command below, and the conf
@@ -73,14 +73,66 @@ In the examples here, we have a build server on <%= trail_builder_host %>
 where we build EARs for the the <%= trail_builder_user %> website.
 
 *** Preparing to deploy to production
-If you have changes to be deployed to production you should follow the next checklist:
-1. Find out which EAR is running in production today.
-2. Ensure that your EAR is running on staging and a smoketest has been performed.
-2. Make release notes:
-  1. Collect all subversion changes that have made it into the EAR that you want to deploy by reviewing all Subversion commits since the last deploy.
-  2. List all the Jira from those Subversion commits.
-  3. Ensure that all those Jira issues are tested on staging and closed. If you cannot close one, make a new issue for the resulting work and close it anyway.
-3. Copy and paste the list of Jira issues in a support case (by email or otherwise) and make sure that the subject contains the name of the EAR file.
+
+**** Get the current version of the EAR and conf package
+First, we need to know which is the currently deployed EAR (to see all the deployments
+remove the pipe to =tail -1=):
+#+BEGIN_SRC text
+$ ece -i engine1 list-deployments | tail -1
+Thu Dec 13 15:05:41 IST 2012 <%= trail_customer_shortname-trunk-rev6260-2012-12-12_1401.ear c6c762523db66ae21cdf7f7f00016f7f
+#+END_SRC
+
+Also, confirm that the =vosa-conf= configruation package correspond to
+the EAR version:
+#+BEGIN_SRC text
+$ dpkg -l vosa-conf-<%= trail_presentation_host %> | grep ^ii
+ii  vosa-conf-<%= trail_presentation_host %> 1-<%=trail_customer_acronym%>-trunk-r6260  Server configuration for <%= trail_presentation_host %>
+#+END_SRC 
+
+**** Read through the change log and code diff
+Second, read through the change log and code diff for the new EAR
+and conf packages. These are present as one =.report= and one =.diff=
+file for each build that the builder makes for your project. If you're
+working on trunk, you'll find all these under http://<%= trail_builder_host %>/<%= trail_builder_user %>/changelogs/trunk. 
+Replace =trunk= with =branches/<branch>= if you're working on a branch.
+
+You will see a number of files e.g.:
+#+BEGIN_SRC text
+from-6100-to-6200.report
+from-6100-to-6200.diff
+from-6200-to-6250.report
+from-6200-to-6250.diff
+from-6250-to-6255.report
+from-6250-to-6255.diff
+#+END_SRC
+
+Now, if the new EAR you built in [[Build new EAR]] has revision =6255= and
+the current deployed EAR has revision =6200=, you must look at the
+files which contains the changes in between, namely:
+=from-6200-to-6250.report=, =from-6200-to-6250.diff=,
+=from-6250-to-6255.report= and =from-6250-to-6255.diff=.
+
+**** Deploy & test on staging
+Log on to <%= trail_staging_editor_host %> and make the deployment:
+#+BEGIN_SRC text
+$ ssh <%= trail_staging_editor_host %>
+$ sudo ece-deploy \
+  --ear  http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev6307-<%= trail_today_date %>_1225.ear \
+  --conf http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/vosa-conf-${HOSTNAME}-1-<%= trail_builder_user %>-trunk-r6307.deb \
+  --update-publication-resources
+#+END_SRC
+
+Ensure that your EAR is running on staging and a smoketest has been performed.
+
+Ensure that all those Jira issues are tested on <%=
+trail_staging_editor_host %> and closed. If you cannot close one, make
+a new issue for the resulting work and close it anyway.
+
+**** Update support cases
+Copy and paste the list of Jira issues in a support case (by email or
+otherwise) and make sure that the subject contains the name of the EAR
+file.
+
 4. Expect the support team to perform the deploy within 24 hours or call the support phone number and ask them to do it earlier.
 5. If you are a support engineer yourself ask one of your colleagues to deploy to production and follow the checklist there. You shoud not prepare a deploy and then go ahead and deploy it yourself :-).
 
@@ -90,7 +142,7 @@ If you are getting ready to deploy to a production system you have to follow the
 0. Verify that you are not the same person who did the changes to the code :-)
 1. Has the EAR been properly release tested?
 1. Has the EAR been properly smoke tested?
-2. Do the release notes match the changes made to the codes and do they make sense?
+2. Do the release notes match the changes made to the code and do they make sense?
 3. Are the changes in the EAR causing you to feel that the service will fail after deploy?
 4. Is there a valid rollback scenario after deploying the change?
 5. Is someone you trust available to help you if you run into trouble rolling back?
@@ -114,6 +166,7 @@ If anything goes wrong in [[Deploying%20a%20new%20EAR%20file%20for%20an%20ECE%0A
 instance]], you can just repeat the deployment steps with the URL of the
 previous EAR.
 
+
 ** Deploying a new EAR file for an ECE instance
 All the commands in this section is written to be executed on
 <%= trail_control_host %> (but you could of course also first log on to each

From c1785c4b5e40681eda82d6159e5fac27a30c0b74 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 8 Jan 2013 14:20:56 +0100
Subject: [PATCH 1865/2585] - 'go to' is two words.

---
 usr/share/doc/vizrt/vosa-handbook/deployment.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/deployment.org b/usr/share/doc/vizrt/vosa-handbook/deployment.org
index 3df852ac..1ca72a4c 100644
--- a/usr/share/doc/vizrt/vosa-handbook/deployment.org
+++ b/usr/share/doc/vizrt/vosa-handbook/deployment.org
@@ -6,7 +6,7 @@ where we build EARs for the the <%= trail_builder_user %> website.
 *** Build from from your Hipchat room
 You can start a build right from your chatroom!
 
-Go to the <%= trail_customer_shortname %> Hipchat room named: <%= trail_customer_hipchat_room_name %> or goto Hipchat in your [[https://vizrtcustomers.hipchat.com/chat][browser]].
+Go to the <%= trail_customer_shortname %> Hipchat room named: <%= trail_customer_hipchat_room_name %> or go to Hipchat in your [[https://vizrtcustomers.hipchat.com/chat][browser]].
 
 when you are in the chatroom type:
 #+BEGIN_SRC sh

From 59e1fc26dd35b49d43c0731dc6f52e70ab9e323a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 8 Jan 2013 20:05:52 +0100
Subject: [PATCH 1866/2585] - re-wrote great parts of the deployment chapter
 using ece-deploy   instead of 'ece deploy'

- explained the ece-deploy roll back mechanism

- explained rationale behind the ece-deploy IDs and deployment log
---
 .../doc/vizrt/vosa-handbook/deployment.org    | 243 +++++++++++-------
 1 file changed, 150 insertions(+), 93 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/deployment.org b/usr/share/doc/vizrt/vosa-handbook/deployment.org
index 1ca72a4c..1c467977 100644
--- a/usr/share/doc/vizrt/vosa-handbook/deployment.org
+++ b/usr/share/doc/vizrt/vosa-handbook/deployment.org
@@ -1,14 +1,13 @@
 * Deployment
-** Building a new EAR file
-In the examples here, we have a build server on <%= trail_builder_host %>
-where we build EARs for the the <%= trail_builder_user %> website.
+** Building a new EAR file and configuration packages
+For a full deployment, two artifacts are needed: an EAR file and a
+configuration package for each of the machines. The build server
+provides you with both.
 
 *** Build from from your Hipchat room
-You can start a build right from your chatroom!
+You can start a build right from your chatroom! Go to the <%= trail_customer_shortname %> Hipchat room named: <%= trail_customer_hipchat_room_name %> or go to Hipchat in your [[https://vizrtcustomers.hipchat.com/chat][browser]].
 
-Go to the <%= trail_customer_shortname %> Hipchat room named: <%= trail_customer_hipchat_room_name %> or go to Hipchat in your [[https://vizrtcustomers.hipchat.com/chat][browser]].
-
-when you are in the chatroom type:
+When you are in the chatroom type:
 #+BEGIN_SRC sh
 guru: build trunk
 #+END_SRC
@@ -20,30 +19,26 @@ guru: jobs
 #+END_SRC
 
 Once the build is done, the URI of the finished EAR file is printed in
-the chat room. This is the URI you use for the 'ece deploy' command below.
+the chat room. This is the URI you use for the =ece deploy= command below.
 
-In future you will also be able to deploy an ear to staging in the chatroom.
+In future you will also be able to deploy an EAR to staging in the chatroom.
 
 *** Build from the command line on your build server
 Log on to the build server as the user for the given habitat and run
 the build script:
 
-To log onto the builder:
 #+BEGIN_SRC sh
 $ ssh <%= trail_builder_user %>@<%= trail_builder_host %>
-#+END_SRC
-
-To build the trunk:
-#+BEGIN_SRC sh
 $ ece-build
 #+END_SRC
+This will build from trunk. 
 
-To build from a tag in Subversion you do:
+If you wish to build from a tag in Subversion you do:
 #+BEGIN_SRC sh
 $ ece-build -t <tagname>
 #+END_SRC
 
-To build a branch you can use the =-b= parameter:
+And to build a branch you can use the =-b= parameter instead:
 #+BEGIN_SRC sh
 $ ece-build -b <branchname>
 #+END_SRC
@@ -64,9 +59,7 @@ environment are printed out in the shell:
 [ece-build-515] http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev6307-<%= trail_today_date %>_1225.ear
 #+END_SRC
 
-The EAR URI can be used the 'ece deploy' command below, and the conf
-package(s) can be used with the =ece-deploy= command, or downloaded
-manually.
+The EAR and configuration package URIs can be used the =ece deploy= command below.
 
 ** Deploying a new EAR file
 In the examples here, we have a build server on <%= trail_builder_host %>
@@ -79,15 +72,16 @@ First, we need to know which is the currently deployed EAR (to see all the deplo
 remove the pipe to =tail -1=):
 #+BEGIN_SRC text
 $ ece -i engine1 list-deployments | tail -1
-Thu Dec 13 15:05:41 IST 2012 <%= trail_customer_shortname-trunk-rev6260-2012-12-12_1401.ear c6c762523db66ae21cdf7f7f00016f7f
+Thu Dec 13 15:05:41 IST 2012 <%= trail_customer_acronym %>-trunk-rev6260-2012-12-12_1401.ear c6c762523db66ae21cdf7f7f00016f7f
 #+END_SRC
 
 Also, confirm that the =vosa-conf= configruation package correspond to
 the EAR version:
 #+BEGIN_SRC text
 $ dpkg -l vosa-conf-<%= trail_presentation_host %> | grep ^ii
-ii  vosa-conf-<%= trail_presentation_host %> 1-<%=trail_customer_acronym%>-trunk-r6260  Server configuration for <%= trail_presentation_host %>
+ii  vosa-conf-<%= trail_presentation_host %> 1-<%=trail_customer_acronym %>-trunk-r6260  Server configuration for <%= trail_presentation_host %>
 #+END_SRC 
+If the version of the EAR and vosa-conf package differ, you must find out why (ask your colleagues) or if there are any notable changes that has been skipped (this is normally the case, that someone has updated the EAR without updating the conf package. However, this *should* never happen if everyone always uses =ece-deploy=.
 
 **** Read through the change log and code diff
 Second, read through the change log and code diff for the new EAR
@@ -109,9 +103,15 @@ from-6250-to-6255.diff
 Now, if the new EAR you built in [[Build new EAR]] has revision =6255= and
 the current deployed EAR has revision =6200=, you must look at the
 files which contains the changes in between, namely:
-=from-6200-to-6250.report=, =from-6200-to-6250.diff=,
+=from-6200-to-6250.report=, 
+=from-6200-to-6250.diff=,
 =from-6250-to-6255.report= and =from-6250-to-6255.diff=.
 
+The report files contain a generated summary of the related JIRA
+issues that have been worked on with this build, as well as a
+*risk assesment scrore*. This score is calculated from the code diffs and
+diff contexts.
+
 **** Deploy & test on staging
 Log on to <%= trail_staging_editor_host %> and make the deployment:
 #+BEGIN_SRC text
@@ -122,111 +122,167 @@ $ sudo ece-deploy \
   --update-publication-resources
 #+END_SRC
 
-Ensure that your EAR is running on staging and a smoketest has been performed.
+This will deploy the new configuration, update all the publication
+resources of all your publications and update all ECEs, search
+instances and EAEs you have on your machine. =ece-deploy= looks in
+=/etc/default/ece= to determine which instances to deploy to, just
+like how =/etc/init.d/ece= decides which instances to start and stop.
 
-Ensure that all those Jira issues are tested on <%=
-trail_staging_editor_host %> and closed. If you cannot close one, make
-a new issue for the resulting work and close it anyway.
+Ensure that your ECE, Search and EAE instances are running:
+#+BEGIN_SRC text
+$ sudo /etc/init.d/ece status
+[ece#engine-engine1] UP 0d 0h 1m 53s
+[ece#search-search1] UP 0d 0h 1m 53s
+[ece#analysis-analysis1] UP 0d 0h 1m 53s
+#+END_SRC
+
+Perform a smoke test. The command below will call the local ECE with
+=Host= header set and output the amount of bytes returned. If this
+number is less than a few thousand, you should immediately investigate
+why. Also, we check that there's a =<title/>= element returned from
+the front page of each of the domains:
+#+BEGIN_SRC text
+$ for host in <%= trail_virtual_host_list %>; do \
+    echo "${host}'s title:" 
+    curl --silent --header "Host: $host" http://localhost:8080/ | grep -A 1 '<title>'; \
+    echo "${host}'s front page bytes:"; \
+    curl --silent --header "Host: $host" http://localhost:8080/ | wc -c; \
+  done
+#+END_SRC
+
+**** Confirm that all related JIRA issues are fixed
+Ensure that all the listed JIRA issues in the report are tested on <%= trail_uat_url %> and closed. If you cannot close one, make a new issue for the
+resulting work and close it anyway.
 
 **** Update support cases
 Copy and paste the list of Jira issues in a support case (by email or
 otherwise) and make sure that the subject contains the name of the EAR
 file.
 
-4. Expect the support team to perform the deploy within 24 hours or call the support phone number and ask them to do it earlier.
-5. If you are a support engineer yourself ask one of your colleagues to deploy to production and follow the checklist there. You shoud not prepare a deploy and then go ahead and deploy it yourself :-).
-
 *** Deploying to a production system
 Deployments to production are only done by operators in the Support group of Vizrt Online in Dhaka or Oslo.
 If you are getting ready to deploy to a production system you have to follow the next checklist:
 0. Verify that you are not the same person who did the changes to the code :-)
-1. Has the EAR been properly release tested?
-1. Has the EAR been properly smoke tested?
+1. Has the EAR & configuration package been properly _release_ tested?
+1. Has the EAR & configuration package been properly _smoke_ tested?
 2. Do the release notes match the changes made to the code and do they make sense?
 3. Are the changes in the EAR causing you to feel that the service will fail after deploy?
-4. Is there a valid rollback scenario after deploying the change?
 5. Is someone you trust available to help you if you run into trouble rolling back?
 6. Does the site on staging show the differences expected when reading the release notes?
-If any of these prerequisites is not in place you should refuse the deploy request and notify the user how they can convince you to perform the deploy.
 
+If any of these prerequisites is not in place you should refuse the deploy request and notify the user how they can convince you to perform the deploy.
 
-** Make sure you can roll back
-Before deploying a new EAR, take note of the previously deployed EAR
-so that you can easily roll back:
+If, on the other hand, you can answer yes to all of the above, you can
+go ahead and deploy on production. The steps are pretty much the same
+as described in [[Deploy & test on staging]], with the exception that you
+also must:
+
+1. First, [[Schedule downtime]] of each machine you Update
+2. If the machine you're updating, you must remove it from the load
+   balancer (<%= trail_lb_host %>) that receives the incoming web
+   traffic.
+3. Log on to the machine and use =ece-deploy= to deploy the new EAR
+   and configuration package.
+4. Remove the scheduled downtime of the machine from
+   http://<%= trail_monitoring_host %>/icinga
+
+** Schedule downtime
+You can either schedule down time of a particular machine by using the
+web interface at http://<%= trail_monitoring_host %>/icinga or by
+logging on to <%= trail_control_host %> and use the command
+=downtime=:
 
 #+BEGIN_SRC sh
-$ sudo ssh escenic@<%= trail_presentation_host %> ece -i engine1 info
-[ece#engine-engine1] Deployment state:
-[ece#engine-engine1] |-> Version: <%= trail_builder_user %>-trunk-rev4331-<%= trail_today_date %>_1225
-[ece#engine-engine1] |-> EAR used: http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev4331-<%= trail_today_date %>_1225.ear
-[ece#engine-engine1] |-> MD5 sum: 58638b16efc7f4cebd8d0acb4eecfb40
+$ ssh <%= trail_control_host %>
+$ echo "Upgrading <%= trail_presentation_host %> to fix caching problem" | \
+  downtime -i <%= trail_presentation_host %> 1 hours
 #+END_SRC
 
-If anything goes wrong in [[Deploying%20a%20new%20EAR%20file%20for%20an%20ECE%0Ainstance][Deploying a new EAR file for an ECE
-instance]], you can just repeat the deployment steps with the URL of the
-previous EAR.
-
-
-** Deploying a new EAR file for an ECE instance
-All the commands in this section is written to be executed on
-<%= trail_control_host %> (but you could of course also first log on to each
-of the servers and run the commands locally there).
-
+** Rolling back to a previous version
+You can roll back to any previous deployment you've done using
+=ece-deploy=. To get a list of all previous deployments done with
+=ece-deploy=, you do:
 #+BEGIN_SRC sh
-$ sudo ssh escenic@<%= trail_presentation_host %> ece -i engine1 --uri http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev4121-<%= trail_today_date %>_1524.ear deploy
-[ece#engine-engine1] Deploying http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev4121-<%= trail_today_date %>_1524.ear on engine1 ...
-[ece#engine-engine1] Deploying /var/cache/escenic/<%= trail_builder_user %>-trunk-rev4121-<%= trail_today_date %>_1524.ear on tomcat ...
-[ece#engine-engine1] Deployment white list active, only deploying: <%= trail_webapp_name %> escenic-admin indexer-webservice
-[ece#engine-engine1] Deployment state file updated: /var/lib/escenic/engine1.state
+$ ssh <%= trail_presentation_host %>
+$ sudo ece-deploy --list-deployments
+   - Deployment <%= trail_presentation_host %>-1355390454 was made @ Thu Dec 13 14:50:54 IST 2012
+   - Deployment <%= trail_presentation_host %>-1355320868 was made @ Wed Dec 12 19:31:08 IST 2012
+   - Deployment <%= trail_presentation_host %>-1355319440 was made @ Wed Dec 12 19:07:20 IST 2012
+   - Deployment <%= trail_presentation_host %>-1354621048 was made @ Tue Dec 4 17:07:28 IST 2012
+   - Deployment <%= trail_presentation_host %>-1354540403 was made @ Mon Dec 3 18:43:23 IST 2012
 #+END_SRC
 
-We can now restart the ECE:
+Normally, the previous one will be the right one to roll back to, but
+if you've played a lot back and forth If you don't know which one to
+choose, then pick the one that's fairly recent and has been running
+for a long time, i.e., there's a long span between that deployment and
+the next one. 
 
+From the output above, we see that the one from the 4th of December
+has been running the longest, so we roll back to that one with a
+simple command:
 #+BEGIN_SRC sh
-$ sudo ssh root@<%= trail_presentation_host %> /etc/init.d/ece restart
-[ece#engine-engine1] Stopping the engine1 instance of engine on <%= trail_presentation_host %>...
-[ece#engine-engine1] Starting the engine1 instance of engine on <%= trail_presentation_host %>...
-[ece#search-search1] Stopping the search1 instance of search on <%= trail_presentation_host %>...
-[ece#search-search1] Starting the search1 instance of search on <%= trail_presentation_host %>...
+$ sudo ece-deploy --rollback <%= trail_presentation_host %>-1354621048 --update-publication-resources
 #+END_SRC
 
-To confirm see that the ECE instance came up again, do:
+The reason why =ece-deploy= has its own deployment ID and doesn't use
+the version of the EAR & configuration package, is that it's possible
+to make several deployments of the same EAR/configuration package,
+even on the same host. Furthermore, =ece-deploy= deploys on several
+instances, not only one. And lastly, it's even possible to choose
+whether or not to update the publication resources. Hence,
+=ece-deploy= has its own IDs and database of its deployments to make
+everything reproduce-able.
+
+In this connection, it should also be noted that each of the ECE
+instances also have their own [[Instance deployment log]]
+
+** Manually deploying a new EAR file to an ECE instance
+We strongly recommend that you use =ece-deploy= to deploy a new EAR
+file. If you only want to deploy the EAR and not the configuration
+package, you can just call =ece-deploy= without the =--conf=
+parameter.
+
+However, if you for some reason, perhaps you don't have root privileges on the machine, and want to deploy an EAR to a specific instance, you can use =ece deploy= (note that =ece-deploy= is different from =ece deploy=):
 
 #+BEGIN_SRC sh
-$ sudo ssh root@<%= trail_presentation_host %> /etc/init.d/ece status
-[ece#engine-engine1] UP 0d 0h 11m 45s
-[ece#search-search1] UP 0d 0h 11m 42s
+$ ece -i engine1 \
+      --uri http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev4121-<%= trail_today_date %>_1524.ear \
+      deploy \
+      restart
 #+END_SRC
 
-** Deploying a new EAR file for a search instance
-The search instance is special in that you have to specify the type
-parameter. Apart from this, the command is identical. You'll see that
-the search instance has a different deployment white list than that of
-the ECE instance above.
+You can confirm that the instance came up again by querying =ece -i
+engine1 info= and looking in the [[Instance deployment log]] to see that
+the new EAR has been deployed.
+
+** Manually deploying a new EAR file to a search instance
+Again, we recommend you using =ece-deploy= for this, but if you really
+want to do it explicitly for a search instance, this is the same as
+[[Manually deploying a new EAR file to an ECE instance]] except that you
+must add =-type search= to the =ece= command:
 
 #+BEGIN_SRC sh
-torstein@control:~$ sudo ssh escenic@<%= trail_presentation_host %> ece
--i search1 -t search --uri http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev4121-<%= trail_today_date %>_1524.ear deploy
-[ece#search-search1] Deploying http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev4121-<%= trail_today_date %>_1524.ear on search1 ...
-[ece#search-search1] Deploying /var/cache/escenic/<%= trail_builder_user %>-trunk-rev4121-<%= trail_today_date %>_1524.ear on tomcat ...
-[ece#search-search1] Deployment white list active, only deploying: escenic-admin solr indexer-webapp
-[ece#search-search1] Deployment state file updated: /var/lib/escenic/search1.state
+$ ece -i search1 \
+      -t search \
+      --uri http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev4121-<%= trail_today_date %>_1524.ear \
+      deploy \
+      restart
 #+END_SRC
 
-
-** Updating Publication Resources
-Updating the publication resources is only a matter of passing the
-=--update-publication-resources= to the =ece-deploy= command:
+** Instance deployment log
+Each of the ECE, EAE and search instances also have their own
+deployment log where the EAR used whenever running
+=ece -i <%= trail_presentation_host %> deploy= along with its MD5 sum and the date
+of deployment is available:
 #+BEGIN_SRC sh
-$ sudo ece-deploy \
-   --ear http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev4121-<%= trail_today_date %>_1524.ear \
-   --update-publication-resources
+$ ece -i engine1 list-deployments 
+[ece#engine-engine1] These are all the deployments made on engine1:
+Wed Dec 12 19:11:39 IST 2012 nie-trunk-rev6259-2012-10-12_1322.ear c6c7643234asdfasdfdf7f7f0001612e
+Wed Dec 12 19:31:35 IST 2012 nie-trunk-rev6260-2012-12-12_1401.ear c6c762523db66ae21cdf7f7f00016f7f
 #+END_SRC
+This log file is automatically updated when you use the =ece-deploy= command.
 
-The list of publications will be pull down from the =/escenic-admin=
-web application mounted on all Content Engines running on the host
-you're logged into and the publication resources will be located on
-the file system under the app server deployment path.
 
 ** Updating Server Configuration
 *** Make changes to the =server-admin= tree
@@ -272,13 +328,14 @@ checked out <%= trail_builder_user %> source code and edit the file
 that you're running with the defaults set up by =ece-install=):
 
 #+BEGIN_SRC text
-my-machine $ vi ~/src/<%= trail_builder_user %>/server-admin/<%= trail_presentation_host %>/etc/escenic/ece-engine1.conf
+$ vi ~/src/<%= trail_builder_user %>/server-admin/<%= trail_presentation_host %>/etc/escenic/ece-engine1.conf
 #+END_SRC
 
 Make your changes and then commit them using an appropriate ticked ID
 in the log message, e.g.:
-#+BEGIN_SRC text
-my-machine $ svn ci ~/src/<%= trail_builder_user %>/server-admin/<%= trail_presentation_host %>/etc/escenic/ece-engine1.conf -m "<%= trail_builder_user %>-344: increased the max and min heap sizes to 4GB because we've got so many objects"
+#+BEGIN_SRC sh
+$ svn ci ~/src/<%= trail_builder_user %>/server-admin/<%= trail_presentation_host %>/etc/escenic/ece-engine1.conf \
+      -m "<%= trail_builder_user %>-344: increased the max and min heap sizes to 4GB because we've got so many objects"
 #+END_SRC
 
 That's it, you're now ready to [[Build New Configuration Packages]]!
@@ -287,7 +344,7 @@ That's it, you're now ready to [[Build New Configuration Packages]]!
 Log on to the build server, just as you did in [[Building a new EAR file]]
 When you've issued a build, you'll see that builder also have created
 packages for all of the machines you've defined in your =server-admin=
-directory tree.
+directory tree:
 
 #+BEGIN_SRC text
 <%= trail_builder_user %>@<%= trail_builder_host %>:~$ ece-build
@@ -309,7 +366,7 @@ example:
 
 #+BEGIN_SRC text
 <%= trail_control_host %>$ ssh <%= trail_presentation_host %>
-<%= trail_presentation_host %>$ sudo ece-insatll --conf \
+<%= trail_presentation_host %>$ sudo ece-deploy --conf \
   http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/vosa-conf-<%= trail_presentation_host %>-1-<%= trail_builder_user %>-trunk-r4899.deb
 #+END_SRC
 

From f1c345b9f1906862e01428df1238a535575a8056 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 8 Jan 2013 20:07:33 +0100
Subject: [PATCH 1867/2585] - create-handbook.sh now creates a variable,
 trail_virtual_host_list,   from the trail_publication_domain_mapping_list.
 This way, the users   only need to list the domain names once.

  The trail_virtual_host_list can be used in the documentation
  whereever you need to list all the domains that the servers are
  delivering.
---
 .../doc/vizrt/vosa-handbook/create-handbook.sh     | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 68a9cfd3..c4708238 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -69,7 +69,16 @@ function set_customer_specific_variables() {
     trail_website_name=$first_website
   fi
 
-  expand_all_variables_in_org_files
+  if [ -n "${trail_publication_domain_mapping_list}" ]; then
+    # create a list of all virtual hosts
+    
+    for el in $trail_publication_domain_mapping_list; do
+      IFS='#' read ece_pub fqdn alias <<< "$el"
+      trail_virtual_host_list="${trail_virtual_host_list} ${fqdn}"
+    done
+  
+    expand_all_variables_in_org_files
+  fi
 }
 
 function set_defaults_if_the_trails_are_not_set() {
@@ -767,7 +776,6 @@ function get_user_input() {
   conf_file=$(basename $0 .sh).conf
 
   for el in $@; do
-    # -s as in input
     if [[ "$el" == "--doc-dir" || "$el" == "-i" ]]; then
       customer_doc_dir_is_next=1
     elif [[ "$el" == "--conf-file" || "$el" == "-f" ]]; then
@@ -782,7 +790,7 @@ function get_user_input() {
   done
 }
 
-echo "building $trail_customer_shortname VOSA Guide"
+echo "Building the $trail_customer_shortname VOSA Guide"
 get_user_input $@
 set_up_build_directory
 set_customer_specific_variables

From cf3022e1b60ac15a9b1c350ec25d11eff3fe0988 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 8 Jan 2013 20:12:46 +0100
Subject: [PATCH 1868/2585] - moved expand_all_variables_in_org_files out last
 inside   set_customer_specific_variables, as it was before.

---
 usr/share/doc/vizrt/vosa-handbook/create-handbook.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index c4708238..a00f24f9 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -77,8 +77,9 @@ function set_customer_specific_variables() {
       trail_virtual_host_list="${trail_virtual_host_list} ${fqdn}"
     done
   
-    expand_all_variables_in_org_files
   fi
+  
+  expand_all_variables_in_org_files
 }
 
 function set_defaults_if_the_trails_are_not_set() {

From 4c21bd4b607b1653355fcae9b4dd9ef184ca95e5 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 9 Jan 2013 13:19:07 +0100
Subject: [PATCH 1869/2585] - don't reverse the output of --list-deployments,
 that's just confusing.

---
 usr/sbin/ece-deploy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
index 77d492c3..a790bddc 100755
--- a/usr/sbin/ece-deploy
+++ b/usr/sbin/ece-deploy
@@ -231,7 +231,7 @@ function list_previous_deployments() {
 
   for el in $(find $ece_deploy_data_dir -maxdepth 1 -type d | \
     sed "s#${ece_deploy_data_dir}##g" | \
-    sort -nr | \
+    sort -n | \
     tail -20); do
     local id=$(basename $el)
     echo "   - Deployment" ${id} \

From 9f43090aa634fd654ecf781f74a7607302b55a1d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 9 Jan 2013 15:57:29 +0100
Subject: [PATCH 1870/2585] - made all sections that are useful in more than
 one context their own   level two section.

- more re-writes and new sections regarding deployment. deployments,
  building of EARs & conf packages, browsing change logs and rolling
  back is all now pretty well described.

- removed some now redundant sections.
---
 .../doc/vizrt/vosa-handbook/deployment.org    | 296 ++++++++++--------
 1 file changed, 157 insertions(+), 139 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/deployment.org b/usr/share/doc/vizrt/vosa-handbook/deployment.org
index 1c467977..33998ee4 100644
--- a/usr/share/doc/vizrt/vosa-handbook/deployment.org
+++ b/usr/share/doc/vizrt/vosa-handbook/deployment.org
@@ -1,5 +1,5 @@
 * Deployment
-** Building a new EAR file and configuration packages
+** Building a New EAR File and Configuration Packages
 For a full deployment, two artifacts are needed: an EAR file and a
 configuration package for each of the machines. The build server
 provides you with both.
@@ -59,36 +59,21 @@ environment are printed out in the shell:
 [ece-build-515] http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev6307-<%= trail_today_date %>_1225.ear
 #+END_SRC
 
-The EAR and configuration package URIs can be used the =ece deploy= command below.
+The EAR and configuration package URIs can be used by the =ece deploy= command [[Making a full deployment][as described below]].
 
-** Deploying a new EAR file
-In the examples here, we have a build server on <%= trail_builder_host %>
-where we build EARs for the the <%= trail_builder_user %> website.
+** Preparing to Deploy to Production
+The first thing you need to do, is to [[Get the current version of the
+EAR and configuration packages]]
 
-*** Preparing to deploy to production
+If the version of the EAR and vosa-conf package differ, you must find
+out why (ask your colleagues) or if there are any notable changes that
+has been skipped (this is normally the case, that someone has updated
+the EAR without updating the conf package. However, this *should*
+never happen if everyone always uses =ece-deploy=.
 
-**** Get the current version of the EAR and conf package
-First, we need to know which is the currently deployed EAR (to see all the deployments
-remove the pipe to =tail -1=):
-#+BEGIN_SRC text
-$ ece -i engine1 list-deployments | tail -1
-Thu Dec 13 15:05:41 IST 2012 <%= trail_customer_acronym %>-trunk-rev6260-2012-12-12_1401.ear c6c762523db66ae21cdf7f7f00016f7f
-#+END_SRC
-
-Also, confirm that the =vosa-conf= configruation package correspond to
-the EAR version:
-#+BEGIN_SRC text
-$ dpkg -l vosa-conf-<%= trail_presentation_host %> | grep ^ii
-ii  vosa-conf-<%= trail_presentation_host %> 1-<%=trail_customer_acronym %>-trunk-r6260  Server configuration for <%= trail_presentation_host %>
-#+END_SRC 
-If the version of the EAR and vosa-conf package differ, you must find out why (ask your colleagues) or if there are any notable changes that has been skipped (this is normally the case, that someone has updated the EAR without updating the conf package. However, this *should* never happen if everyone always uses =ece-deploy=.
-
-**** Read through the change log and code diff
-Second, read through the change log and code diff for the new EAR
-and conf packages. These are present as one =.report= and one =.diff=
-file for each build that the builder makes for your project. If you're
-working on trunk, you'll find all these under http://<%= trail_builder_host %>/<%= trail_builder_user %>/changelogs/trunk. 
-Replace =trunk= with =branches/<branch>= if you're working on a branch.
+*** Read Through the Change Log and Code Diff
+Second, read through [[Build changelogs][all the change logs and code diffs]] for the new EAR
+and conf packages. 
 
 You will see a number of files e.g.:
 #+BEGIN_SRC text
@@ -100,67 +85,36 @@ from-6250-to-6255.report
 from-6250-to-6255.diff
 #+END_SRC
 
-Now, if the new EAR you built in [[Build new EAR]] has revision =6255= and
+Now, if the new EAR you  [[Build new EAR][built on the build server]] has revision =6255= and
 the current deployed EAR has revision =6200=, you must look at the
 files which contains the changes in between, namely:
 =from-6200-to-6250.report=, 
 =from-6200-to-6250.diff=,
 =from-6250-to-6255.report= and =from-6250-to-6255.diff=.
 
-The report files contain a generated summary of the related JIRA
-issues that have been worked on with this build, as well as a
-*risk assesment scrore*. This score is calculated from the code diffs and
-diff contexts.
-
-**** Deploy & test on staging
-Log on to <%= trail_staging_editor_host %> and make the deployment:
-#+BEGIN_SRC text
-$ ssh <%= trail_staging_editor_host %>
-$ sudo ece-deploy \
-  --ear  http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev6307-<%= trail_today_date %>_1225.ear \
-  --conf http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/vosa-conf-${HOSTNAME}-1-<%= trail_builder_user %>-trunk-r6307.deb \
-  --update-publication-resources
-#+END_SRC
-
-This will deploy the new configuration, update all the publication
-resources of all your publications and update all ECEs, search
-instances and EAEs you have on your machine. =ece-deploy= looks in
-=/etc/default/ece= to determine which instances to deploy to, just
-like how =/etc/init.d/ece= decides which instances to start and stop.
+It's important that you confirm that all JIRA issues found in the
+report files are fixed.
 
-Ensure that your ECE, Search and EAE instances are running:
-#+BEGIN_SRC text
-$ sudo /etc/init.d/ece status
-[ece#engine-engine1] UP 0d 0h 1m 53s
-[ece#search-search1] UP 0d 0h 1m 53s
-[ece#analysis-analysis1] UP 0d 0h 1m 53s
-#+END_SRC
+*** Deploy & test on staging
+Log on to <%= trail_staging_editor_host %>, [[Making a full deployment][make a full deployment]] and 
+[[Seeing the status of all instances][ensure that your ECE, Search and EAE instances are running]]
 
-Perform a smoke test. The command below will call the local ECE with
-=Host= header set and output the amount of bytes returned. If this
-number is less than a few thousand, you should immediately investigate
-why. Also, we check that there's a =<title/>= element returned from
-the front page of each of the domains:
-#+BEGIN_SRC text
-$ for host in <%= trail_virtual_host_list %>; do \
-    echo "${host}'s title:" 
-    curl --silent --header "Host: $host" http://localhost:8080/ | grep -A 1 '<title>'; \
-    echo "${host}'s front page bytes:"; \
-    curl --silent --header "Host: $host" http://localhost:8080/ | wc -c; \
-  done
-#+END_SRC
+Once this is through, you then need to [[Performing a smoke test][perform a smoke test]] to see
+that the site(s) are still basically working.
 
-**** Confirm that all related JIRA issues are fixed
-Ensure that all the listed JIRA issues in the report are tested on <%= trail_uat_url %> and closed. If you cannot close one, make a new issue for the
-resulting work and close it anyway.
+Once this is done, ensure that all the listed JIRA issues in the
+report files are tested on <%= trail_uat_url %> and closed. If you cannot
+close one, make a new issue for the resulting work and close it
+anyway.
 
-**** Update support cases
-Copy and paste the list of Jira issues in a support case (by email or
-otherwise) and make sure that the subject contains the name of the EAR
-file.
+To make a link to this deployment into the CRM, copy and paste the
+list of Jira issues in a support case (by email or otherwise) and make
+sure that the subject contains the name of the EAR file.
 
-*** Deploying to a production system
+** Deploying to a production system
 Deployments to production are only done by operators in the Support group of Vizrt Online in Dhaka or Oslo.
+
+*** Check list before you start
 If you are getting ready to deploy to a production system you have to follow the next checklist:
 0. Verify that you are not the same person who did the changes to the code :-)
 1. Has the EAR & configuration package been properly _release_ tested?
@@ -172,6 +126,7 @@ If you are getting ready to deploy to a production system you have to follow the
 
 If any of these prerequisites is not in place you should refuse the deploy request and notify the user how they can convince you to perform the deploy.
 
+*** Steps to make the deployment
 If, on the other hand, you can answer yes to all of the above, you can
 go ahead and deploy on production. The steps are pretty much the same
 as described in [[Deploy & test on staging]], with the exception that you
@@ -181,23 +136,58 @@ also must:
 2. If the machine you're updating, you must remove it from the load
    balancer (<%= trail_lb_host %>) that receives the incoming web
    traffic.
-3. Log on to the machine and use =ece-deploy= to deploy the new EAR
-   and configuration package.
+3. Log on to the machine and [[Making a full deployment][make the deployment]]
 4. Remove the scheduled downtime of the machine from
-   http://<%= trail_monitoring_host %>/icinga
+   http://<%= trail_monitoring_host %>.<%= trail_network_name %>/icinga
 
-** Schedule downtime
-You can either schedule down time of a particular machine by using the
-web interface at http://<%= trail_monitoring_host %>/icinga or by
-logging on to <%= trail_control_host %> and use the command
-=downtime=:
+** Seeing the status of all instances
+This will show the status of all ECEs, EAEs, search instances &
+RMI-hub on the machine:
 
-#+BEGIN_SRC sh
-$ ssh <%= trail_control_host %>
-$ echo "Upgrading <%= trail_presentation_host %> to fix caching problem" | \
-  downtime -i <%= trail_presentation_host %> 1 hours
+#+BEGIN_SRC text
+$ sudo /etc/init.d/ece status
+[ece#engine-engine1] UP 0d 0h 1m 53s
+[ece#search-search1] UP 0d 0h 1m 53s
+[ece#analysis-analysis1] UP 0d 0h 1m 53s
 #+END_SRC
 
+** Build changelogs
+Each time <%= trail_builder_host %> builds a new EAR and configuration
+packages, it also creates two files which describe all the changes
+between the previous build and the current one. For each build, there
+are two files: one report file with excerpts from all JIRA issues
+mentioned in the commit messages and one diff file with all the code
+changes.
+
+You can access these changelogs under http://<%= trail_builder_host %>/<%= trail_builder_user %>/changelogs 
+As you will see, it keeps changelogs for trunk and the different branches in separate
+directories under.
+
+The report files contain a generated summary of the related JIRA
+issues that have been worked on with this build, as well as a _risk
+assessment score_. This score is calculated from the code diffs and
+diff contexts.
+
+** Making a full deployment
+Log on to the machine you want to make deployment on and use
+=ece-deploy= to deploy everything:
+
+#+BEGIN_SRC text
+$ sudo ece-deploy \
+  --ear  http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev6307-<%= trail_today_date %>_1225.ear \
+  --conf http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/vosa-conf-${HOSTNAME}-1-<%= trail_builder_user %>-trunk-r6307.deb \
+  --update-publication-resources
+#+END_SRC
+The EAR and DEB file is what [[Building a New EAR File and Configuration Packages][you got from the build server]]
+
+This will deploy the new configuration, update all the publication
+resources of all your publications and update all ECEs, search
+instances and EAEs you have on your machine. =ece-deploy= looks in
+=/etc/default/ece= to determine which instances to deploy to, just
+like how =/etc/init.d/ece= decides which instances to start and stop.
+
+If anything goes wrong, you can just [[Rolling back to a previous version][roll back to a previous version]]
+
 ** Rolling back to a previous version
 You can roll back to any previous deployment you've done using
 =ece-deploy=. To get a list of all previous deployments done with
@@ -205,11 +195,11 @@ You can roll back to any previous deployment you've done using
 #+BEGIN_SRC sh
 $ ssh <%= trail_presentation_host %>
 $ sudo ece-deploy --list-deployments
-   - Deployment <%= trail_presentation_host %>-1355390454 was made @ Thu Dec 13 14:50:54 IST 2012
-   - Deployment <%= trail_presentation_host %>-1355320868 was made @ Wed Dec 12 19:31:08 IST 2012
-   - Deployment <%= trail_presentation_host %>-1355319440 was made @ Wed Dec 12 19:07:20 IST 2012
-   - Deployment <%= trail_presentation_host %>-1354621048 was made @ Tue Dec 4 17:07:28 IST 2012
    - Deployment <%= trail_presentation_host %>-1354540403 was made @ Mon Dec 3 18:43:23 IST 2012
+   - Deployment <%= trail_presentation_host %>-1354621048 was made @ Tue Dec 4 17:07:28 IST 2012
+   - Deployment <%= trail_presentation_host %>-1355319440 was made @ Wed Dec 12 19:07:20 IST 2012
+   - Deployment <%= trail_presentation_host %>-1355320868 was made @ Wed Dec 12 19:31:08 IST 2012
+   - Deployment <%= trail_presentation_host %>-1355390454 was made @ Thu Dec 13 14:50:54 IST 2012
 #+END_SRC
 
 Normally, the previous one will be the right one to roll back to, but
@@ -222,7 +212,9 @@ From the output above, we see that the one from the 4th of December
 has been running the longest, so we roll back to that one with a
 simple command:
 #+BEGIN_SRC sh
-$ sudo ece-deploy --rollback <%= trail_presentation_host %>-1354621048 --update-publication-resources
+$ sudo ece-deploy \
+    --rollback <%= trail_presentation_host %>-1354621048 \
+    --update-publication-resources
 #+END_SRC
 
 The reason why =ece-deploy= has its own deployment ID and doesn't use
@@ -237,9 +229,24 @@ everything reproduce-able.
 In this connection, it should also be noted that each of the ECE
 instances also have their own [[Instance deployment log]]
 
+** Performing a smoke test
+The command below will call the local ECE with
+=Host= header set and output the amount of bytes returned. If this
+number is less than a few thousand, you should immediately investigate
+why. Also, we check that there's a =<title/>= element returned from
+the front page of each of the domains:
+#+BEGIN_SRC text
+$ for host in <%= trail_virtual_host_list %>; do \
+    echo "${host}'s title:" 
+    curl --silent --header "Host: $host" http://localhost:8080/ | grep -A 1 '<title>'; \
+    echo "${host}'s front page bytes:"; \
+    curl --silent --header "Host: $host" http://localhost:8080/ | wc -c; \
+  done
+#+END_SRC
+
 ** Manually deploying a new EAR file to an ECE instance
-We strongly recommend that you use =ece-deploy= to deploy a new EAR
-file. If you only want to deploy the EAR and not the configuration
+We strongly recommend that you [[Making a full deployment][use ece-deploy to deploy a new EAR
+file]]. If you only want to deploy the EAR and not the configuration
 package, you can just call =ece-deploy= without the =--conf=
 parameter.
 
@@ -247,14 +254,14 @@ However, if you for some reason, perhaps you don't have root privileges on the m
 
 #+BEGIN_SRC sh
 $ ece -i engine1 \
-      --uri http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev4121-<%= trail_today_date %>_1524.ear \
-      deploy \
-      restart
+    --uri http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev4121-<%= trail_today_date %>_1524.ear \
+    deploy \
+    restart
 #+END_SRC
 
 You can confirm that the instance came up again by querying =ece -i
-engine1 info= and looking in the [[Instance deployment log]] to see that
-the new EAR has been deployed.
+engine1 info | grep -i EAR= or looking in the [[Instance deployment log][deployment log for the instance]]
+to see that the new EAR has been deployed.
 
 ** Manually deploying a new EAR file to a search instance
 Again, we recommend you using =ece-deploy= for this, but if you really
@@ -264,10 +271,10 @@ must add =-type search= to the =ece= command:
 
 #+BEGIN_SRC sh
 $ ece -i search1 \
-      -t search \
-      --uri http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev4121-<%= trail_today_date %>_1524.ear \
-      deploy \
-      restart
+    -t search \
+    --uri http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev4121-<%= trail_today_date %>_1524.ear \
+    deploy \
+    restart
 #+END_SRC
 
 ** Instance deployment log
@@ -278,12 +285,11 @@ of deployment is available:
 #+BEGIN_SRC sh
 $ ece -i engine1 list-deployments 
 [ece#engine-engine1] These are all the deployments made on engine1:
-Wed Dec 12 19:11:39 IST 2012 nie-trunk-rev6259-2012-10-12_1322.ear c6c7643234asdfasdfdf7f7f0001612e
-Wed Dec 12 19:31:35 IST 2012 nie-trunk-rev6260-2012-12-12_1401.ear c6c762523db66ae21cdf7f7f00016f7f
+Wed Dec 12 19:11:39 IST 2012 <%= trail_customer_acronym %>-trunk-rev6259-2012-10-12_1322.ear c6c7643234asdfasdfdf7f7f0001612e
+Wed Dec 12 19:31:35 IST 2012 <%= trail_customer_acronym %>-trunk-rev6260-2012-12-12_1401.ear c6c762523db66ae21cdf7f7f00016f7f
 #+END_SRC
 This log file is automatically updated when you use the =ece-deploy= command.
 
-
 ** Updating Server Configuration
 *** Make changes to the =server-admin= tree
 In the <%= trail_builder_user %> source tree, there is a directory
@@ -305,7 +311,7 @@ this file tree:
 | Path | Description                                                                             |
 |------+-----------------------------------------------------------------------------------------|
 | (1)  | Common files for all machines.                                                          |
-| (2)  | Files that together generate the =/etc/hosts= when you [[Build New Configuration Packages]] |
+| (2)  | Files that together generate the =/etc/hosts= when you [[Building new configuration packages]] |
 | (3)  | The =/etc/escenic/ece-engine1.conf= specific for <%= trail_presentation_host %>         |
 | (4)  | The =/etc/mysql/my.cnf= specificf for the <%= trail_db_master_host %> machine.          |
 |------+-----------------------------------------------------------------------------------------|
@@ -338,26 +344,10 @@ $ svn ci ~/src/<%= trail_builder_user %>/server-admin/<%= trail_presentation_hos
       -m "<%= trail_builder_user %>-344: increased the max and min heap sizes to 4GB because we've got so many objects"
 #+END_SRC
 
-That's it, you're now ready to [[Build New Configuration Packages]]!
-
-*** Build New Configuration Packages
-Log on to the build server, just as you did in [[Building a new EAR file]]
-When you've issued a build, you'll see that builder also have created
-packages for all of the machines you've defined in your =server-admin=
-directory tree:
-
-#+BEGIN_SRC text
-<%= trail_builder_user %>@<%= trail_builder_host %>:~$ ece-build
-[ece-build-0] Starting building @ <%= trail_today_date_full %>
-[ece-build-256] Adding an assembly descriptor for Dashboard ...
-[ece-build-374] Build SUCCESSFUL! @ <%= trail_today_date_full %>
-[ece-build-374] You'll find the release here: http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev4121-<%= trail_today_date_full %>_1524.ear
-[ece-build-407] Conf packages available: http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/vosa-conf-<%= trail_presentation_host %>-1-<%= trail_builder_user %>-trunk-r4899.deb
-[ece-build-407] Replace '<%= trail_presentation_host %>' with any of: [ <%= trail_editor_host %> <%= trail_db_master_host %> <%= trail_db_slave_host %> <%= trail_import_host %> <%= trail_analysis_host %> <%= trail_presentation_host_list %> ] for the other machines' conf packages.
-<%= trail_builder_user %>@<%= trail_builder_host %>:~$
-#+END_SRC
+That's it, your changes will be included in all the relevant
+configuration packages when you [[Building a New EAR File and Configuration Packages][issue a new build]].
 
-*** Deploying the Configuration Packages
+*** Deploying a Configuration Package
 Log on to the different hosts and call =ece-deploy= with the =--conf=
 parameter to install the package (you normally do this together with
 the EAR file, but for the sake of the example, you /can/ just deploy
@@ -365,9 +355,9 @@ the conf package): Here, we use <%= trail_presentation_host %> as an
 example:
 
 #+BEGIN_SRC text
-<%= trail_control_host %>$ ssh <%= trail_presentation_host %>
-<%= trail_presentation_host %>$ sudo ece-deploy --conf \
-  http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/vosa-conf-<%= trail_presentation_host %>-1-<%= trail_builder_user %>-trunk-r4899.deb
+$ ssh <%= trail_presentation_host %>
+$ sudo ece-deploy \
+         --conf http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/vosa-conf-<%= trail_presentation_host %>-1-<%= trail_builder_user %>-trunk-r4899.deb
 #+END_SRC
 
 Because of the mighty =dpkg= and the =DEB= package format, you'll get
@@ -376,17 +366,45 @@ conf package files locally since you last updated the package, if
 you've got other, conflicting configuration packages installed on so
 on.
 
-Now, you have full control over your configuration being in sync with your EAR deployment. You can easily confirm that you're running the configuration corresponding to your EAR by these two commands:
+Now, you have full control over your configuration being in sync with your EAR deployment. You can easily confirm this, see
+[[Get the current version of the EAR and configuration package]]
+
+** Get the current version of the EAR and configuration package
+There are two ways to see which EAR file is currently deployed, the easiest is:
 #+BEGIN_SRC text
-<%= trail_presentation_host %>$ -l vosa-conf-<%= trail_presentation_host %> | grep ^ii
-ii   vosa-conf-<%= trail_presentation_host %>   1-<%= trail_builder_user%>-trunk-r4899    Server configuration for <%= trail_presentation_host %>
+$ ece -i engine1 list-deployments | tail -1
+Thu Dec 13 15:05:41 IST 2012 <%= trail_customer_acronym %>-trunk-rev6260-2012-12-12_1401.ear c6c762523db66ae21cdf7f7f00016f7f
 #+END_SRC
+The second way, is to search in the output from the =ece info= command:
 #+BEGIN_SRC text
-<%= trail_presentation_host %>$ ece -i engine1 info | grep EAR
+$ ece -i engine1 info | grep -A 1 EAR
 [ece#engine-engine1] |-> EAR used: http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev4899-<%= trail_today_date %>_1524.ear
 #+END_SRC
 
-As you can see, both the EAR and configuration are from revision
-=4899= of =trunk=. We can now roll back and forth between the various
-EAR & configuration builds with confidence that these two always are
-in sync.
+
+To see which version of the system configuration is deployed on the machine, do:
+#+BEGIN_SRC text
+$ dpkg -l vosa-conf-<%= trail_presentation_host %> | grep ^ii
+ii  vosa-conf-<%= trail_presentation_host %> 1-<%=trail_customer_acronym %>-trunk-r6260  Server configuration for <%= trail_presentation_host %>
+#+END_SRC 
+This version should correspond to the EAR version. If not, you should
+ask around to the other operators to find out why these
+differ. Normally, these two should always be in sync.
+** Schedule downtime
+Whenever you're going to make changes that you know or fear will
+disrupt services so that you'll activate the monitoring system's
+checks, you should schedule the downtime so that the monitoring server
+is on your team and doesn't [[http://en.wikipedia.org/wiki/Cry_Wolf][cry wolf]].
+
+You can either schedule down time of a particular machine by using the
+web interface at http://<%= trail_monitoring_host %>.<%= trail_network_name %>/icinga or by
+logging on to <%= trail_control_host %> and use the command
+=downtime=:
+
+#+BEGIN_SRC sh
+$ ssh <%= trail_control_host %>
+$ echo "Upgrading <%= trail_presentation_host %> to fix caching problem" | \
+  downtime -i <%= trail_presentation_host %> 1 hours
+#+END_SRC
+
+

From 2c5ee8971e816abb529cc8db7493e03032b5b8ae Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 10 Jan 2013 10:20:03 +0100
Subject: [PATCH 1871/2585] - replaced 'script' with 'command' as people tend
 to think less of the   former.

---
 usr/share/doc/escenic/ece-guide.org        | 56 +++++++++++-----------
 usr/share/doc/escenic/ece-import-guide.org | 16 +++----
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/usr/share/doc/escenic/ece-guide.org b/usr/share/doc/escenic/ece-guide.org
index 76530609..49edbdd5 100644
--- a/usr/share/doc/escenic/ece-guide.org
+++ b/usr/share/doc/escenic/ece-guide.org
@@ -1,9 +1,9 @@
-#+TITLE: User Guide for the ece Script
+#+TITLE: User Guide for the ece Command
 #+AUTHOR: Vizrt Online / The SaaS Team
 #+OPTIONS: H:6 num:5 toc:2 
 
 * TAB completion
-The ece script offers TAB completion, given that your version of BASH
+The ece command offers TAB completion, given that your version of BASH
 supports this and that you have enabled it (some distributions hasn't
 turned on BASH completion per default).
 
@@ -18,14 +18,14 @@ clean       kill        restart     stop        versions
 #+END_SRC
 The commands are all described in detail in "ece help"
 
-** Completing types of servers the ece scripts can operate on
+** Completing types of servers the ece commands can operate on
 #+BEGIN_SRC text
 $ ece -t TAB TAB
 analysis  engine    rmi-hub   search 
 #+END_SRC
 
 ** Completing the publication resources available
-The ece script can update the publication resources for a given
+The ece command can update the publication resources for a given
 publication.
 
 To help selecting the correct publication resource, you can make ece
@@ -40,7 +40,7 @@ feature        layout         menu
 $ ece help
 Usage: /home/torstein/bin/ece [-t <type>] [-i <instance>] <command>
 
-DESCRIPTION
+DECOMMANDION
  -t --type <type>
       The following types are available:
       engine  -  The Escenic Content Engine, this is the default
@@ -72,7 +72,7 @@ The following commands are available:
    help       prints this help screen
    kill       uses force to stop the type
    log        the type's Log4J log
-   outlog     the [ece#engine] script log (system out log)
+   outlog     the [ece#engine] command log (system out log)
    restart    restarts the type
    start      starts the type
    status     checks if the type is running
@@ -85,11 +85,11 @@ The following commands are available:
 #+END_SRC
 
 * Tailing log files
-The script has a number of options to let you keep track of what's
+The command has a number of options to let you keep track of what's
 going on on your system.
 
 ** Getting an overview of the log files
-The ece script will be more than happy to tell you about the log files
+The ece command will be more than happy to tell you about the log files
 on your system that are of interest to your instance:
 #+BEGIN_SRC text
 $ ece -i dev1 loglist
@@ -129,12 +129,12 @@ $ ece -i dev1 -q loglist | xargs tail -f
 #+END_SRC
 
 * Assembling a new EAR
-The script will quite happily assemble your EAR file. Please note that
+The command will quite happily assemble your EAR file. Please note that
 you need to run 
 #+BEGIN_SRC text
 $ ece -i clean assemble
 #+END_SRC
-whenever you've upgraded either ECE or one of its plugins. The script
+whenever you've upgraded either ECE or one of its plugins. The command
 will try to take care of you though and warn you of such duplication:
 #+BEGIN_SRC text
 [ece#engine] Multiple versions of ECE and/or 3rd party libraries found.
@@ -193,7 +193,7 @@ to its deployment state file: /var/lib/escenic/<instance>.state, which
 again will be reported by the "ece info" command.
 
 * Updating the Publication Resources
-It's easy to update the publication resources using the ece script. If
+It's easy to update the publication resources using the ece command. If
 you have all these publication resources in your current directory,
 you can update them just by:
 #+BEGIN_SRC text
@@ -249,16 +249,16 @@ $ ece -i engine1 info
 #+END_SRC
 
 * Installation
-The ece script and ece.conf may be used on any Unix like system that
+The ece command and ece.conf may be used on any Unix like system that
 has a fairly recent version of BASH installed.
 
-** Overview of File Paths Used by the ece script
-These are recommended files and locations for using the ece script:
+** Overview of File Paths Used by the ece command
+These are recommended files and locations for using the ece command:
 
 |------------------------------------+----------------------------------|
 | Path                               | Explanation                      |
 |------------------------------------+----------------------------------|
-| ~/usr/bin/ece~                     | The script itself                |
+| ~/usr/bin/ece~                     | The command itself                |
 | ~/etc/escenic/ece.conf~            | The main configuration file      |
 | ~/etc/escenic/ece-<instance>.conf~ | Instance specific settings       |
 | ~/var/cache/escenic~               | Directory of assembled EAR files |
@@ -271,7 +271,7 @@ server files. The defaults all follow the File Hierarchy Standard, but
 you may of course change these to your liking.
 
 If you wish to put the .conf files in other places, you may like to know
-that the ece script has preset list of locations where it looks for
+that the ece command has preset list of locations where it looks for
 the .conf files mentioned above, namely:
 
 - current working directory
@@ -293,20 +293,20 @@ consultants, partners and customers have requested these locations to
 fit their systems. As you can see, fitting everyone's fancy adds up
 over time :-)
 
-* Running the ece script
+* Running the ece command
 ** You must run it as a non-privileged user
-You must be normal user to run the ece script, otherwise it will
+You must be normal user to run the ece command, otherwise it will
 complain:
 #+BEGIN_SRC text
 [ece#engine] Sorry, you cannot be root when running ece
 [ece#engine] The root user can only use /etc/init.d/ece
 #+END_SRC
 
-As it mentions, the root user may use the init.d script and the
+As it mentions, the root user may use the init.d command and the
 accompanying /etc/default/ece to command the different ECE, EAE and
 RMI hub instances on your system.
 ** Specifying the instance
-The script is made for being easy to use with multiple instances on
+The command is made for being easy to use with multiple instances on
 the same host. You specify the instance you want to operate on using
 the -i parameter. E.g. to assemble and deploy the editor1 instance, you'd
 do:
@@ -314,26 +314,26 @@ do:
 $ ece -i editor1 assemble deploy restart
 #+END_SRC
 
-The script's TAB completion will also help you with completing the
+The command's TAB completion will also help you with completing the
 available instances on your system, so you can just type:
 #+BEGIN_SRC text
 $ ece -i TAB TAB
 mypub myotherpub
 #+END_SRC
 
-For this to work, the script assumes that you have installed the
+For this to work, the command assumes that you have installed the
 instance specific configuration in /etc/escenic/engine/instance, as is
 described in the Escenic Content Engine Installation Guide.
 
 If you only have one instance installed, you may omit
 the --instance/-i parameter. However, if you're running ece from another
-script (e.g. an init.d or a deployment script), we recommend you to
+command (e.g. an init.d or a deployment command), we recommend you to
 always specify the --instance/-i parameter to make sure that future
-additions of instances don't break your old scripts which assumed that
+additions of instances don't break your old commands which assumed that
 only one instance was installed.
 
 ** TAB completion
-The ece script offers TAB completion of all commands, options and
+The ece command offers TAB completion of all commands, options and
 option values. For this to work, you need the completion file loaded
 from your ~.bashrc~. 
 
@@ -348,9 +348,9 @@ following line to your ~.bashrc~:
 #+END_SRC
 Naturally, the ~bash_comletion.d~ needs to be in the above location :-)
 * Backup
-One of the many features of the ece script, is that you can take a
+One of the many features of the ece command, is that you can take a
 snapshot of your current running system, which can then be restored
-using the /usr/sbin/ece-install script. 
+using the /usr/sbin/ece-install command. 
 
 The backup will include the database, the Nursery configuration, the
 DB configuration, the Varnish configuration, the nginx congiguration,
@@ -395,7 +395,7 @@ $ ece -i engine1 backup
 [ece#engine-engine1] - All app servers in /opt
 [ece#engine-engine1] - All Escenic software binaries in /opt/escenic/engine
 [ece#engine-engine1] - All configuration in /etc/escenic and /etc/default/ece
-[ece#engine-engine1] - All bootstrap scripts from /etc/init.d
+[ece#engine-engine1] - All bootstrap commands from /etc/init.d
 [ece#engine-engine1] - All state files in /var/lib/escenic
 [ece#engine-engine1] Enjoy!
 #+END_SRC
diff --git a/usr/share/doc/escenic/ece-import-guide.org b/usr/share/doc/escenic/ece-import-guide.org
index 5b5e6903..5e9ab78c 100644
--- a/usr/share/doc/escenic/ece-import-guide.org
+++ b/usr/share/doc/escenic/ece-import-guide.org
@@ -1,9 +1,9 @@
-#+TITLE: User Guide for the ece-import Script
+#+TITLE: User Guide for the ece-import Command
 #+AUTHOR: Vizrt Online / The SaaS Team
 #+OPTIONS: H:6 num:5 toc:2 
 
 * Introduction
-The =ece-import= script will help you with the following tasks:
+The =ece-import= command will help you with the following tasks:
 
 - Setting up imports, either [[From an import archive]] or [[Without an import archive]]
 - [[Getting raw import data from HTTP or FTP servers]]
@@ -92,8 +92,8 @@ following directory structure is required:
 #+BEGIN_SRC text
 <publication>/<import name>
 <publication>/<import name>/transformers/<number>-<transformer task>.xsl
-<publication>/<import name>/cron.hourly/<cron job script>
-<publication>/<import name>/cron.every.five.minutes/<cron job script>
+<publication>/<import name>/cron.hourly/<cron job command>
+<publication>/<import name>/cron.every.five.minutes/<cron job command>
 #+END_SRC
 
 - publication name :: the name of the publication for which the import
@@ -111,11 +111,11 @@ following directory structure is required:
                   argument, namely the input XML data. Each
                   transformer is responsible to write changes back to
                   the file.
-- cron.hourly :: scripts to be run every our. These will be put in
+- cron.hourly :: commands to be run every our. These will be put in
                  =/etc/cron.hourly= on the import server. Be sure to
                  set the execute bit on the file and note that as with
                  all cron jobs, the file cannot have a file suffix.
-- cron.every.five.minutes :: scripts to run every five minutes.
+- cron.every.five.minutes :: commands to run every five minutes.
 
 We're calling the import configuration =moo= since we're
 setting up an import feed from our imaginary content provider, "Moo
@@ -162,13 +162,13 @@ file:
 #+BEGIN_SRC sh
 #! /usr/bin/env bash
 
-# Script which will download all thumbnails listed in the XML exported
+# Command which will download all thumbnails listed in the XML exported
 # from VMEO.
 #
 # It is normally called from ece-import, but can also be called
 # directly (when debugging).
 
-xpath_to_get_thumbnail_urls="/didl:DIDL/didl:Item/didl:Component/didl:Descriptor/didl:Statement/mpeg7:Mpeg7/mpeg7:Description/mpeg7:Summarization/mpeg7:Summary/mpeg7:VisualSummaryComponent/mpeg7:ImageLocator/mpeg7:MediaUri"
+xpath_to_get_thumbnail_urls="/didl:DIDL/didl:Item/didl:Component/didl:Decommandor/didl:Statement/mpeg7:Mpeg7/mpeg7:Decommandion/mpeg7:Summarization/mpeg7:Summary/mpeg7:VisualSummaryComponent/mpeg7:ImageLocator/mpeg7:MediaUri"
 
 # $1 is the raw XML
 cat "$1" | \

From 4e09c8bff37d6c8da0da2ef763212b30982fe7f0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 10 Jan 2013 13:02:27 +0100
Subject: [PATCH 1872/2585] - re-wrote the 'Get ece-install' chapter to use APT
 and RPM instead of   pulling ece-install from Git. Man, we *have* really
 gotten somewhere   over the months!

---
 usr/share/doc/escenic/ece-install-guide.org | 34 ++++++++++-----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 0aaa1f66..ecc275c0 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -13,7 +13,7 @@ Escenic-based sites, such as:
  - Tomcat application server
  - MySQL/Percona database server
  - Varnish cache server
- - Munin monitoring server
+ - Icinga & Munin monitoring server
  - NFS server and clients
  - Memcached distributed memory cache
 
@@ -37,7 +37,6 @@ these components for you.
 however, work on any Unix-like system that provides a BASH command
 shell (version 4.2 or later). 
 
-
 Here is an overview of the situation on some of the most popular
 platforms:
 
@@ -127,20 +126,20 @@ is as follows:
        profile (see Run ece-install).
 
 ** <<<Get ece-install>>>
-Use =git= to get the ece-install script. Type this in
-your shell:
-
-#+BEGIN_SRC text
-$ git clone https://github.com/vizrt/ece-scripts.git
-#+END_SRC
-
-The reason why we want you to use git to download ece-install, is that
-you later easily can get the latest changes (for instance after we fix
-one of your reported issues), by doing "git pull" inside the
-ece-scripts directory.
-
-If you have problems installing git, you can also download a ZIP
-archive here: https://github.com/vizrt/ece-scripts/zipball/master
+On Debian based systems, such as Ubuntu, you can use the [[http://apt.vizrt.com][Vizrt APT
+repository]] and install the package =escenic-content-engine-installer=
+to get the =ece-install= command.
+
+On RedHat based systems, such as CentOS, you can use the RPMs
+available from http://yum.vizrt.com/rpm and install the RPM
+=escenic-common-scripts= and =escenic-content-engine-installer= to
+get the =ece-install= command.
+ 
+If you have any problems installing using the DEB or RPM packages, or
+if you're system is neither Debian nor RedHat based, you can also
+download a ZIP archive of all the =ece-scripts=, which =ece-install=
+is a part of, here:
+https://github.com/vizrt/ece-scripts/zipball/master
 
 ** <<<Become Root>>>
 You must be the root user to run =ece-install=. If you try to run it as
@@ -161,7 +160,8 @@ $ su -
 
 #+BEGIN_QUOTE
 Note that using =sudo= to run =ece-install= (that is, entering  "=sudo
-ece-install=") may not work. You should actually become the root user.
+ece-install=") may not work. You should actually become the root user
+before running =ece-install=.
 #+END_QUOTE
 
 ** <<<Create a Configuration File>>>

From 0dc818315fa8f2b6fc69db1ba6007acd93c3feac Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 10 Jan 2013 15:54:38 +0100
Subject: [PATCH 1873/2585] - clarified a number of sections, elaborated
 wherever it made sense. - added example of creating multiple publications
 based on the   supplied EAR file. - added reference to the ece-install.conf
 examples. - removed section that didn't make any sense (Modifying Existing
 ...)

TODO: not finished, stopped at the "Overview of File Paths Used by the
ece-install script" section.
---
 usr/share/doc/escenic/ece-install-guide.org | 174 +++++++++++---------
 1 file changed, 94 insertions(+), 80 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index ecc275c0..67bfc826 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -1,6 +1,6 @@
 #+TITLE: Escenic Installer User Guide
 #+AUTHOR: Vizrt Online / The SaaS Team
-#+OPTIONS: H:6 num:5 toc:2 
+#+OPTIONS: H:6 num:5 toc:2
 
 * Introduction
 The Escenic Content Engine Installer, =ece-install=  is a command line
@@ -23,7 +23,7 @@ Unix-like operating systems, but the level of support varies between
 platforms. On a fully-supported operating system (for example Debian 6.0),
 =ece-install= can both install and configure all required
 components, so that the entire process is reduced to a simple sequence
-of =ece-install= commands. 
+of =ece-install= commands.
 
 On less well-supported platforms, =ece-install= may not be able to
 automatically install some third-party components. You will then need to
@@ -35,7 +35,7 @@ these components for you.
 ** Supported Operating Systems
 =ece-install= works best on Debian 6.0 (Squeeze) or later. It should,
 however, work on any Unix-like system that provides a BASH command
-shell (version 4.2 or later). 
+shell (version 4.2 or later).
 
 Here is an overview of the situation on some of the most popular
 platforms:
@@ -112,7 +112,7 @@ function it will perform. The set of components installed on a
 particular server is called its *profile*.
 
 The overall procedure for installing Escenic on a cluster of machines
-is as follows: 
+is as follows:
 
  1. Determine the profile of each server in the cluster. For
     descriptions of all available profiles, see Server Profiles.
@@ -134,7 +134,7 @@ On RedHat based systems, such as CentOS, you can use the RPMs
 available from http://yum.vizrt.com/rpm and install the RPM
 =escenic-common-scripts= and =escenic-content-engine-installer= to
 get the =ece-install= command.
- 
+
 If you have any problems installing using the DEB or RPM packages, or
 if you're system is neither Debian nor RedHat based, you can also
 download a ZIP archive of all the =ece-scripts=, which =ece-install=
@@ -167,7 +167,9 @@ before running =ece-install=.
 ** <<<Create a Configuration File>>>
 =ece-install= expects to find a configuration file called
 =ece-install.conf= in the root user's home directory, which is usually
-=/root=.
+=/root=. If you wish to call your configuration file something else,
+you need to specify it with the =-f= parameter, e.g. =ece-install -f
+ece-install-db-master.conf=.
 
 If you forget to provide such a file before running =ece-install=,
 then =ece-install= will complain:
@@ -203,9 +205,9 @@ If the configuration file does not contain these settings then
 Depending on what components you are installing on the server, you may
 need to include other configuration parameters in the file. If you are
 installing the Widget Framework, for example, you will need to specify
-additional download credentials (see ??). In most cases, however,
-parameters have default settings that enable =ece-install= to complete
-installation with very few settings.
+additional download credentials (see [[fai_wf_install]]). In most cases,
+however, parameters have default settings that enable =ece-install= to
+complete installation with very few settings.
 
 ****** Interactive Mode
 The setting =fai_enabled=1= tells =ece-install= to run in *fully
@@ -227,7 +229,7 @@ interactively instead. You are, however, *strongly advised* not to run
 ** <<<Run ece-install>>>
 To run =ece-install=, enter:
 #+BEGIN_SRC text
-# bash ece-install <options>
+# ece-install <options>
 #+END_SRC
 
 The following options may be specified with the command:
@@ -260,10 +262,8 @@ Doing this lets you see everything that BASH does while executing the
 script - how wild card variables are  expanded and so on.
 
 =ece-install= displays a series of progress messages during the
-installation process.
-
-You can redirect standard output to a log file for easy reading later
-on as follows:
+installation process. you can redirect standard output to a log file
+for easy reading of these messages later:
 #+BEGIN_SRC text
 # bash ece-install > ece-install.out
 #+END_SRC
@@ -291,13 +291,13 @@ created for you by =ece-install=). To do this enter:
 The =escenic= user is the user you will need to use for most
 escenic-related purposes.
 
-** Preventing accidental execution of ece-install 
+** Preventing accidental execution of ece-install
 You can ensure that =ece-install= is not executed accidentally by
 creating a *lock file*. Simply create a file with this path:
 #+BEGIN_SRC text
 /var/lock/ece-install.lock
 #+END_SRC
-    
+
 If this file is present then =ece-install= will fail fast as follows:
 #+BEGIN_SRC text
 The lock file is present: /var/lock/ece-install.lock and ece-install
@@ -412,7 +412,7 @@ adding this setting to =ece-install.conf= before you run =ece-install=:
 fai_db_drop_old_db_first=1
 #+END_SRC
 
-Given that the mysqld is installed, this profile will download all the
+Given that =mysqld= is installed, this profile will download all the
 Escenic components and install the ECE database schema based from the
 SQL files contained inside the distribution bundles specified with in
 the =technet_download_list= and =wf_dowload_list= variables. The
@@ -454,7 +454,8 @@ fai_db_master_log_position=106
 
 =ece-install= uses internal defaults to create a replication user and
 credentials. You can override these defaults by setting additional
-parameters in =ece-install.conf=. For details, see ??.
+parameters in =ece-install.conf=. For details, see [[Overview of All FAI
+Parameters]].
 
 ** <<<fai_cache_install>>>
 To use this profile, add =fai_cache_install=1= to your
@@ -476,20 +477,22 @@ typical requirements of an Escenic site:
    so that you can access these applications without needing to
    manually edit the ACL or disable security.
  * Sets up sticky sessions/session binding
- * Sets up a back-end cluster and allows the user?? to enter the
-   various backend servers that will serve the web site.
- * Sets up a configuration that strips cookies from static  resources,
+ * Sets up a back-end cluster for balancing web site requests to the
+   cache server.
+ * Sets up configuration that strips cookies from static  resources,
    such as CSS files, JS files and images.
  * Installs the =nginx= web server for serving static content and
    configures Varnish accordingly. This is particularly useful for
    installations where VME Online servers need to access content.
 
+#+BEGIN_COMMENT
 TBD:
 - If run on a Linux platform, the script will tweak the kernel
   parameters for optimal TCP handling for a web facing server.
 - let the /munin run through on port 80, requiring the connecting IPs
   to be in the staff network ACL, defined in the Varnish
-  configuration. 
+  configuration.
+#+END_COMMENT
 
 ** <<<fai_search_install>>>
 To use this profile, add =fai_search_install=1= to your
@@ -502,17 +505,16 @@ This profile installs search components (Apache Solr plus the Escenic
 To use this profile, add =fai_rmi_install=1= to your
 =ece-install.conf= file.
 
-This profile installs an RMI hub.
+This profile installs an RMI hub. This is only necessary on systems
+using ECE < 5.3
 
 ** <<<fai_monitoring_install>>>
 To use this profile, add =fai_monitoring_install=1= to your
 =ece-install.conf= file.
 
-This profile installs a Munin gatherer plus a web server for providing
-access to the reports Munin generates.
-
-TBD: This profile will also install the Nagios interface for
-monitoring the different nodes. 
+This profile installs a Munin gatherer, a Icinga (an enhanced Nagios)
+server plus a web server for providing access to Icinga and the
+reports Munin generates.
 
 ** <<<fai_publication_create>>>
 To use this profile, add =fai_publication_create=1= to your
@@ -524,7 +526,23 @@ presentation profile.
 
 If the Widget Framework is installed on the machine, then the
 create publication is based on the Widget Framework. Otherwise the
-publication is based on the clean demo WAR supplied with the Content Engine.
+publication is based on the clean demo WAR supplied with the Content
+Engine.
+
+=ece-install= will create publication of all publication WAR files you
+have in your EAR file if you also define
+=fai_publication_domain_mapping_list= and =fai_publication_ear=.
+#+BEGIN_SRC text
+fai_publication_create=1
+fai_publication_ear=/var/cache/escenic/stoppok-trunk-rev6195-2012-12-04_1134.ear
+fai_publication_domain_mapping_list="
+  stoppok,st.war#stoppok.example.com#newindian.example.com
+  helden#dinamani.example.com#helden.example.com
+"
+#+END_SRC
+
+See [[Overview of All FAI Parameters]] for further details on the format
+of the domain mapping list.
 
 ** <<<fai_all_install>>>
 To use this profile, add =fai_all_install=1= to your
@@ -581,7 +599,7 @@ specify what you want to restore are:
 | =fai_restore_data_files=        |       0 | Restore the Solr and Content Engine data files            |
 | =fai_restore_configuration=     |       0 | Restore the Solr and content Engine configuration files   |
 | =fai_restore_software_binaries= |       0 | Restore the Escenic and Apache Tomcat software            |
-| =fai_restore_from_file=         |      "" | The .tar.gz produced by =ece -i <instance> backup=        |
+| =fai_restore_from_file=         |      "" | The =.tar= file produced by =ece -i <instance> backup=    |
 |---------------------------------+---------+-----------------------------------------------------------|
 
 So to restore everything in a specified backup file, you would need
@@ -590,7 +608,7 @@ something like this in your =ece-install.conf= file:
 fai_enabled=1
 fai_restore_from_backup=1
 fai_restore_all=1
-fai_restore_from_file=/var/backups/escenic/engine-dev1-backup-2011-10-10.tar.gz
+fai_restore_from_file=/var/backups/escenic/engine-dev1-backup-2011-10-10.tar
 #+END_SRC
 
 =ece-install= can also remove unwanted files from an existing
@@ -646,15 +664,16 @@ To use this profile, add =fai_nfs_client_install=1= to your
 =ece-install.conf= file.
 
 This profile installs an NFS client, creates the client mount points
-and mounts them on the host.
+and mounts them on the host. Per default, all network drives are
+mount under =/mnt=.
 
-The following example shows the ece-install.conf settings required to 
+The following example shows the ece-install.conf settings required to
 mount the Escenic multimedia archive on the NFS server:
 #+BEGIN_SRC conf
 fai_enabled=1
 fai_nfs_client_install=1
 fai_nfs_server_address=192.168.1.200
-fai_nfs_export_list="/var/exports/multimedia"  
+fai_nfs_export_list="/var/exports/multimedia"
 #+END_SRC
 
 ** <<<fai_vip_install>>>
@@ -666,8 +685,9 @@ To use this profile, add =fai_vip_install=1= to your
 This profile is usually used in combination with one of the other
 =ece-install= profiles. It makes a host capable of providing the
 services it offers on specified virtual IP addresses (VIPs). This
-makes it possible to provide fail-over for for all single points of failure ([[http://en.wikipedia.org/wiki/Single_point_of_failure][SPOFs)]] in
-your installation, such as the file server or database.
+makes it possible to provide fail-over for all single points of
+failure ([[http://en.wikipedia.org/wiki/Single_point_of_failure][SPOFs)]] in your installation, such as the file server or
+database.
 
 You might, for example, in order to provide a robust file
 server, install both an NFS server and a VIP provider on two hosts:
@@ -701,7 +721,8 @@ fai_vip_install=1
 fai_vip_service_list="nfs-kernel-server"
 fai_vip_primary_node_name=ubiquitous
 fai_vip_primary_node_ip=192.168.1.112
-fai_vip_primary_node_auth_key=d41d8cd98f00b204e9800998ecf8427efai_vip_secondary_node_name=ubiquitous-lts
+fai_vip_primary_node_auth_key=d41d8cd98f00b204e9800998ecf8427e
+fai_vip_secondary_node_name=ubiquitous-lts
 fai_vip_secondary_node_ip=192.168.1.111
 fai_vip_address=192.168.1.200
 fai_vip_sibling_ip=$fai_vip_secondary_node_ip
@@ -726,7 +747,7 @@ You can generate the key as follows:
 #+BEGIN_SRC sh
 $ dd if=/dev/urandom bs=512 count=1 | \
     openssl md5 | \
-    cut -d' ' -f2   
+    cut -d' ' -f2
 #+END_SRC
 
 ** Installing from EARs instead of Binaries
@@ -736,7 +757,7 @@ Escenic Content Engine and plugins.
 
 The EAR to provide is the one you generate with:
 #+BEGIN_SRC text
-$ ece -i <instance> assemble 
+$ ece -i <instance> assemble
 #+END_SRC
 Normally, the EAR will then be available in:
 #+BEGIN_SRC conf
@@ -763,9 +784,9 @@ assembly environment set up and then do:
 $ cd /opt/escenic
 $ tar czf /tmp/nursery-skeleton-solr-and-security.tar.gz \
   engine/security \
-  engine/siteconfig/config-skeleton/ \
+  engine/siteconfig/config-skeleton \
   engine/solr/conf \
-  engine/siteconfig/bootstrap-skeleton/
+  engine/siteconfig/bootstrap-skeleton
 #+END_SRC
 
 =/tmp/nursery-skeleton-solr-and-security.tar.gz= should now have everything
@@ -782,7 +803,7 @@ profiles, see the table below.
 
 The inclusion of the engine/solr directory makes it easy for users to
 provide their own, optimised Solr configuration. In this context, also
-note that a post install hook, set_up_solr.postinst, is available.
+note that a post install hook, =set_up_solr.postinst=, is available.
 
 If you wish to provide Nursery configuration for the plugins, you
 simply put them in engine/siteconfig/config-skeleton inside your
@@ -860,11 +881,11 @@ Now, the =appBase= and =docBase= values will become =webapps-fire= and
 As you can see, there's a third optional option to the
 =fai_publication_domain_mapping_list= which can be specified as a
 comma separated list of host aliases to be added to the app server host
-configuration. 
+configuration.
 
 Furthermore, if these host names are  not resolvable to your local
 host (neither localhost or the IP of your $HOSTNAME), ece-install will
-add entries for these domains in the machine's /etc/hosts:
+add entries for these domains to the machine's =/etc/hosts= file:
 #+BEGIN_SRC conf
 # added by ece-install @ Wed Feb  8 19:21:49 CST 2012
 127.0.1.1 fire.escenic.com
@@ -873,8 +894,8 @@ add entries for these domains in the machine's /etc/hosts:
 127.0.1.1 ild.escenic.com
 #+END_SRC
 
-If you do not want ece-install to touch your /etc/hosts, you can set
-fai_keep_off_etc_hosts=1 in your ece-install.conf
+If you do not want ece-install to touch your =/etc/hosts=, you can set
+=fai_keep_off_etc_hosts=1= in your =ece-install.conf=.
 
 ** Overview of All FAI Parameters
 The ece-install script understands the following settings in the
@@ -883,7 +904,7 @@ $HOME/ece-install.conf file of the root user:
 |----------------------------------------+--------------------------------------------------------------+-------------------------------------------------------------------------------------------------------|
 | Parameter                              | Default                                                      | Description                                                                                           |
 |----------------------------------------+--------------------------------------------------------------+-------------------------------------------------------------------------------------------------------|
-| =fai_all_conf_archive=                 | ""                                                           | conf.tar.gz to use for Nursery & JAAS configuration                                                   |
+| =fai_all_conf_archive=                 | ""                                                           | =conf.tar.gz= to use for Nursery & JAAS configuration                                                 |
 | =fai_all_ear=                          | ""                                                           | EAR to use instead of the Escenic binaries                                                            |
 | =fai_all_install=                      | 0                                                            | Install all components on your server.                                                                |
 | =fai_all_stop_and_clear=               | 0                                                            | After installation, stop the instance and clear its work & log files.                                 |
@@ -910,7 +931,7 @@ $HOME/ece-install.conf file of the root user:
 | =fai_db_schema=                        | ece5db                                                       | Useful for DB installation profile                                                                    |
 | =fai_db_user=                          | ece5user                                                     | Useful for DB installation profile                                                                    |
 | =fai_dry_run=                          | 0                                                            | ece-install will download Escenic archives and install OS packages, but will not configure anything.  |
-| =fai_editor_conf_archive=              | ""                                                           | conf.tar.gz to use for Nursery & JAAS configuration                                                   |
+| =fai_editor_conf_archive=              | ""                                                           | =conf.tar.gz= to use for Nursery & JAAS configuration                                                 |
 | =fai_editor_deploy_white_list=         | "escenic-admin escenic studio indexer-webservice webservice" | The list of WARs to be deployed on this instance.                                                     |
 | =fai_editor_ear=                       | ""                                                           | EAR to use instead of the Escenic binaries                                                            |
 | =fai_editor_install=                   | 0                                                            | Install the editorial profile                                                                         |
@@ -927,13 +948,13 @@ $HOME/ece-install.conf file of the root user:
 | =fai_monitoring_munin_node_list=       | ""                                                           | Set this to a whitespace separated list of nodes that munin should monitor                            |
 | =fai_monitoring_search_host_list=      | ""                                                           | Hosts running search instance(s) (Solr + indexer)                                                     |
 | =fai_monitoring_server_ip=             | 127.0.0.1                                                    | The IP of the monitoring server.                                                                      |
-| =fai_nfs_allowed_client_network=       | ""                                                           | IP/netmwask of allowed NFS clients, example: 192.168.1.0/255.255.255.0                                |
+| =fai_nfs_allowed_client_network=       | ""                                                           | IP/netmask of allowed NFS clients, example: 192.168.1.0/255.255.255.0                                 |
 | =fai_nfs_client_install=               | 0                                                            | Installs an NFS client                                                                                |
 | =fai_nfs_client_mount_point_parent=    | /mnt                                                         | Mount point parent directory                                                                          |
 | =fai_nfs_export_list=                  | ""                                                           | Space separated list of NFS export directories, full paths as seen on the NFS server.                 |
 | =fai_nfs_server_address=               | ""                                                           | Address of the NFS server, useful for the NFS client profile                                          |
 | =fai_nfs_server_install=               | 0                                                            | Install an NFS server                                                                                 |
-| =fai_presentation_conf_archive=        | ""                                                           | conf.tar.gz to use for Nursery & JAAS configuration                                                   |
+| =fai_presentation_conf_archive=        | ""                                                           | =conf.tar.gz= to use for Nursery & JAAS configuration                                                 |
 | =fai_presentation_ear=                 | ""                                                           | EAR to use instead of the Escenic binaries                                                            |
 | =fai_presentation_install=             | 0                                                            | Install the presentation server profile                                                               |
 | =fai_presentation_name=                | engine1                                                      | Name of the presentation server instance                                                              |
@@ -951,11 +972,11 @@ $HOME/ece-install.conf file of the root user:
 | =fai_publication_war=                  | "WF or ECE demo WAR"                                         | WAR to base the new publication on                                                                    |
 | =fai_publication_war_remove_file_list= | ""                                                           | File list that should be removed from all WARs inside =fai_publication_ear= or =fai_publication_war=  |
 | =fai_publication_war_uri_list=         | ""                                                           | Publication WARs used for setting up Assembly tool.                                                   |
-| =fai_rmi_install=                      | 0                                                            | Install RMI hub profile                                                                               |
-| =fai_search_conf_archive=              | ""                                                           | conf.tar.gz to use for Nursery & JAAS configuration                                                   |
+| =fai_rmi_install=                      | 0                                                            | Install the RMI hub profile                                                                           |
+| =fai_search_conf_archive=              | ""                                                           | =conf.tar.gz= to use for Nursery & JAAS configuration                                                 |
 | =fai_search_deploy_white_list=         | "solr indexer-webapp"                                        | The list of WARs to be deployed on this instance.                                                     |
 | =fai_search_ear=                       | ""                                                           | EAR to use instead of the Escenic binaries                                                            |
-| =fai_search_for_editor=                | 0                                                            | If 1 (true), will configure Solr for use with an editorial server, if not for presentation servers.   |
+| =fai_search_for_editor=                | 0                                                            | If 1, will configure Solr for use with an editorial server, if not for presentation servers.          |
 | =fai_search_indexer_ws_uri=            | http://${HOSTNAME}:8080/indexer-webservice/index/            | URI of the indexer-webservice that the search instance shall use for knowing what to index.           |
 | =fai_search_install=                   | 0                                                            | Install the search server profile (Solr + indexer)                                                    |
 | =fai_search_name=                      | search1                                                      | Name of the search instance                                                                           |
@@ -972,12 +993,15 @@ $HOME/ece-install.conf file of the root user:
 | =fai_vip_sibling_ip=                   | ""                                                           | The IP of the other node offering the VIP                                                             |
 | =fai_wf_install=                       | 0                                                            | Install Widget Framework profile                                                                      |
 |----------------------------------------+--------------------------------------------------------------+-------------------------------------------------------------------------------------------------------|
-#+TBLFM: $1=fai_publication_war=
+#+TBLFM: $1=fai_publication_war=::$3=conf.tar.gz= to use for Nursery & JAAS configuration
 
 0 means "false" and 1 means "true".
 
 ** Example Configurations
-Here are a few simple example configurations:
+Here are a few simple example configurations, you can find more under
+=/usr/share/doc/escenic/examples= if you've got the
+=escenic-content-engine-installer= package installed or you can
+[[https://github.com/vizrt/ece-scripts/tree/master/usr/share/doc/escenic/examples][browse them online]].
 
 ****** Install an Editorial Server and Create a Publication
 To automatically install an editorial server and create a publication
@@ -997,7 +1021,7 @@ To install two presentation servers called =engine1= and
 fai_enabled=1
 fai_presentation_install=1
 fai_presentation_name=engine1
-#+END_SRC 
+#+END_SRC
 
 Then run it a second time with the following settings:
 #+BEGIN_SRC conf
@@ -1022,26 +1046,26 @@ it will abort:
 #+END_SRC
 
 * Re-running ece-install (and How To Speed It Up)
-Although the initial thought behind ece-install, is to run it on a
-clean system to get up and running as soon as possible. However, you
-may want to re-run ece-install on the same host, for instance to add
-another instance of ECE, set up Widget Framework or create another
+The initial thought behind ece-install, is to run it on a clean system
+to get up and running as soon as possible. However, you may want to
+re-run ece-install on the same host, for instance to add another
+instance of ECE, set up Widget Framework or create another
 publication.
 
-ece-install has a number of features which will try to minimise the
-time it takes to run it on consecutive runs. If running on Debian
-based systems, it will check if you already have installed
-pre-requisite 3rd party libraries and only if any are missing will it
-ask the package manager to fetch it.
+=ece-install= has a number of features which will try to minimise the
+time it takes to run it on consecutive runs. For instance, it will
+check if you already have installed pre-requisite 3rd party libraries
+and only if any are missing will it ask the package manager to fetch
+it.
 
-Likewise, ece-install will see if the Escenic artifacts or application
-server that you need are already present in the
+Likewise, =ece-install= will see if the Escenic artifacts or
+application server that you need are already present in the
 =/var/cache/ece-install= folder, and only download the missing ones
 (if any).
 
 To get a list of the artifacts it'll pull from
 http://technet.escenic.com and http://tomcat.apache.org search for the
-following variables:
+following variables inside =/usr/sbin/ece-install=:
 - =technet_download_list=
 - =wf_download_list=
 - =tomcat_download=
@@ -1050,17 +1074,8 @@ Two other ways of speeding up the installation is (of course) to use
 the backup/restore feature or install from a EAR and configuration
 bundle, see the FAI section.
 
-* Modifying installed versions
-Given that the mysqld is installed, this profile will download all the
-Escenic components and install the ECE database schema based from the
-SQL files contained inside the distribution bundles specified with in
-the =technet_download_list= and =wf_dowload_list= variables. The
-defaults are inside the =ece-install= script itself, but you can
-overrides these in your =ece-install.conf= if you wish different minor
-versions of the ECE and plugins.
-
 * Using a Custom Configuration File for ece-install
-You can specify a different configuration by using the -f parameter: 
+You can specify a different configuration by using the -f parameter:
 #+BEGIN_SRC text
 $ ece-install -f ece-install-presentation-server.conf
 #+END_SRC
@@ -1183,7 +1198,7 @@ You trigger this by setting the following in your ece-install.conf
 fai_un_install_everything=1
 #+END_SRC
 
-    
+
 ece-install will then prompt the user to type a confirmation
 sentence. Once the un-installation is done, a summary is printed to
 the user.
@@ -1213,4 +1228,3 @@ I know what I'm doing, please do as I say.
 [ece-install-11] Everything (well, most) set up by ece-install should now
 [ece-install-11] have been removed from raven.
 #+END_SRC
-

From 37d330786072b1fae9a036ed606969344f455e8e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 11 Jan 2013 10:01:05 +0100
Subject: [PATCH 1874/2585] - added another use case why you may want to run
 two versions of ECEs   in parallel.

---
 usr/share/doc/escenic/ece-install-guide.org | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 67bfc826..e27f57d2 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -1138,7 +1138,9 @@ appserver_parent_dir=/opt
 Note, this is only needed if you are running two completely separate
 environments on the same host. A use case is if you're setting up a
 test environment and want to separate stacks of Escenic Content Engine
-and plugins.
+and plugins. Another usecase is if you want to test out a new minor
+version of ECE, e.g. you're currently running 5.4, but want to try
+out 5.5 in parallel on the same boxes.
 
 * Extending ece-install by Writing Hooks
 ece-install  has a number of hooks on which you can hook on your own
@@ -1156,12 +1158,12 @@ install_analysis_server.preinst
 #+END_SRC
 
 Will be run before the body of the hook, just the corresponding
-.postinst hook will be run after.
+=.postinst= hook will be run after.
 
 ** Accessing ece-install variables
 Before running the hook, ece-install will make all its local variables
-available in /var/run/escenic/ece-install.env, which can then be used
-by the hook scripts.
+available in =/var/run/escenic/ece-install.env=, which can then be
+used by the hook scripts.
 
 ** Example hook
 Here is an example hook which will be run after the EAE is installed.
@@ -1187,11 +1189,13 @@ set_up_solr.postinst
 #+END_SRC
 
 * Uninstalling Everything that the ece-install Set Up
+#+BEGIN_QUOTE
 WARNING: this is potentially dangerous as some of these components may
 be used by other pieces of software you have running on your
 host. However, this may be useful if you're installing a clean
 environment and want to e.g. undo your previous install to install a
 different profile.
+#+END_QUOTE
 
 You trigger this by setting the following in your ece-install.conf
 #+BEGIN_SRC conf

From b1cbf3d9a823a01d774e76aa13a3505c5c0487a1 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 11 Jan 2013 10:18:43 +0100
Subject: [PATCH 1875/2585] - corrected the feedback on

   $ ece -i engine1 info | grep -A 1 EAR
---
 .../doc/vizrt/vosa-handbook/deployment.org    | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/deployment.org b/usr/share/doc/vizrt/vosa-handbook/deployment.org
index 33998ee4..e1b7aa33 100644
--- a/usr/share/doc/vizrt/vosa-handbook/deployment.org
+++ b/usr/share/doc/vizrt/vosa-handbook/deployment.org
@@ -31,7 +31,7 @@ the build script:
 $ ssh <%= trail_builder_user %>@<%= trail_builder_host %>
 $ ece-build
 #+END_SRC
-This will build from trunk. 
+This will build from trunk.
 
 If you wish to build from a tag in Subversion you do:
 #+BEGIN_SRC sh
@@ -73,7 +73,7 @@ never happen if everyone always uses =ece-deploy=.
 
 *** Read Through the Change Log and Code Diff
 Second, read through [[Build changelogs][all the change logs and code diffs]] for the new EAR
-and conf packages. 
+and conf packages.
 
 You will see a number of files e.g.:
 #+BEGIN_SRC text
@@ -88,7 +88,7 @@ from-6250-to-6255.diff
 Now, if the new EAR you  [[Build new EAR][built on the build server]] has revision =6255= and
 the current deployed EAR has revision =6200=, you must look at the
 files which contains the changes in between, namely:
-=from-6200-to-6250.report=, 
+=from-6200-to-6250.report=,
 =from-6200-to-6250.diff=,
 =from-6250-to-6255.report= and =from-6250-to-6255.diff=.
 
@@ -96,7 +96,7 @@ It's important that you confirm that all JIRA issues found in the
 report files are fixed.
 
 *** Deploy & test on staging
-Log on to <%= trail_staging_editor_host %>, [[Making a full deployment][make a full deployment]] and 
+Log on to <%= trail_staging_editor_host %>, [[Making a full deployment][make a full deployment]] and
 [[Seeing the status of all instances][ensure that your ECE, Search and EAE instances are running]]
 
 Once this is through, you then need to [[Performing a smoke test][perform a smoke test]] to see
@@ -159,7 +159,7 @@ are two files: one report file with excerpts from all JIRA issues
 mentioned in the commit messages and one diff file with all the code
 changes.
 
-You can access these changelogs under http://<%= trail_builder_host %>/<%= trail_builder_user %>/changelogs 
+You can access these changelogs under http://<%= trail_builder_host %>/<%= trail_builder_user %>/changelogs
 As you will see, it keeps changelogs for trunk and the different branches in separate
 directories under.
 
@@ -206,7 +206,7 @@ Normally, the previous one will be the right one to roll back to, but
 if you've played a lot back and forth If you don't know which one to
 choose, then pick the one that's fairly recent and has been running
 for a long time, i.e., there's a long span between that deployment and
-the next one. 
+the next one.
 
 From the output above, we see that the one from the 4th of December
 has been running the longest, so we roll back to that one with a
@@ -237,7 +237,7 @@ why. Also, we check that there's a =<title/>= element returned from
 the front page of each of the domains:
 #+BEGIN_SRC text
 $ for host in <%= trail_virtual_host_list %>; do \
-    echo "${host}'s title:" 
+    echo "${host}'s title:"
     curl --silent --header "Host: $host" http://localhost:8080/ | grep -A 1 '<title>'; \
     echo "${host}'s front page bytes:"; \
     curl --silent --header "Host: $host" http://localhost:8080/ | wc -c; \
@@ -283,7 +283,7 @@ deployment log where the EAR used whenever running
 =ece -i <%= trail_presentation_host %> deploy= along with its MD5 sum and the date
 of deployment is available:
 #+BEGIN_SRC sh
-$ ece -i engine1 list-deployments 
+$ ece -i engine1 list-deployments
 [ece#engine-engine1] These are all the deployments made on engine1:
 Wed Dec 12 19:11:39 IST 2012 <%= trail_customer_acronym %>-trunk-rev6259-2012-10-12_1322.ear c6c7643234asdfasdfdf7f7f0001612e
 Wed Dec 12 19:31:35 IST 2012 <%= trail_customer_acronym %>-trunk-rev6260-2012-12-12_1401.ear c6c762523db66ae21cdf7f7f00016f7f
@@ -378,7 +378,8 @@ Thu Dec 13 15:05:41 IST 2012 <%= trail_customer_acronym %>-trunk-rev6260-2012-12
 The second way, is to search in the output from the =ece info= command:
 #+BEGIN_SRC text
 $ ece -i engine1 info | grep -A 1 EAR
-[ece#engine-engine1] |-> EAR used: http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev4899-<%= trail_today_date %>_1524.ear
+[ece#engine-engine1] |-> EAR used:
+[ece#engine-engine1] http://<%= trail_builder_host %>/<%= trail_builder_user %>/releases/<%= trail_builder_user %>-trunk-rev4899-<%= trail_today_date %>_1524.ear
 #+END_SRC
 
 
@@ -386,7 +387,7 @@ To see which version of the system configuration is deployed on the machine, do:
 #+BEGIN_SRC text
 $ dpkg -l vosa-conf-<%= trail_presentation_host %> | grep ^ii
 ii  vosa-conf-<%= trail_presentation_host %> 1-<%=trail_customer_acronym %>-trunk-r6260  Server configuration for <%= trail_presentation_host %>
-#+END_SRC 
+#+END_SRC
 This version should correspond to the EAR version. If not, you should
 ask around to the other operators to find out why these
 differ. Normally, these two should always be in sync.
@@ -406,5 +407,3 @@ $ ssh <%= trail_control_host %>
 $ echo "Upgrading <%= trail_presentation_host %> to fix caching problem" | \
   downtime -i <%= trail_presentation_host %> 1 hours
 #+END_SRC
-
-

From 2523c892c689063bb230b46eac197e9fdbad9c03 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 11 Jan 2013 10:46:50 +0100
Subject: [PATCH 1876/2585] - added ece-deploy-guide which supplements the VOSA
 guide, as well as   providing a reference for people wanting to jump straight
 in   without having a VOSA handbook.

---
 usr/share/doc/escenic/ece-deploy-guide.org | 104 +++++++++++++++++++++
 1 file changed, 104 insertions(+)
 create mode 100644 usr/share/doc/escenic/ece-deploy-guide.org

diff --git a/usr/share/doc/escenic/ece-deploy-guide.org b/usr/share/doc/escenic/ece-deploy-guide.org
new file mode 100644
index 00000000..6fff9f84
--- /dev/null
+++ b/usr/share/doc/escenic/ece-deploy-guide.org
@@ -0,0 +1,104 @@
+#+TITLE: User Guide for the ece-deploy Command
+#+AUTHOR: Vizrt Online / The SaaS Team
+#+OPTIONS: H:6 num:5 toc:2
+
+* Introduction
+The =ece-deploy= command will help you with the following tasks:
+
+- [[Deploying a new EAR file]]
+- [[Deploying a new configuration package]]
+- [[Updating publication resources]] of all publications
+- [[Rollback to a previous deployment]]
+- [[Get an overview of all deployments]] by =ece-deploy=
+
+* Background
+As you may know, there's already a nice way of deploying an EAR file
+to an ECE, EAE or search instance by the way of =ece -i <instance>
+--uri http://server/my-site.ear=. The problem with this, however is
+that:
+1. it only deploys on one instance. Normally, production systems have
+   at least two, one ECE and one search instance. Since people
+   generally only are interested in the changes on the ECE instance,
+   they forget to deploy to the search instance. Over time, the
+   version of the ECE binaries running on these two instance drift
+   apart.
+2. it doesn't update the publication resources, so that operators must
+   also do a =ece -i <instance> -r <resource> -p <publication> update=
+   for each of the publication resources that the developers say have
+   changed. Again, people only do the minimum of what they need to do
+   and often the necessary publication resources are not updated, or
+   only =content-type= is updated and the rest is left out. Again,
+   things start to drift apart.
+3. it doesn't update the system configuration. A new EAR deployment
+   works in tandem with a DEB or RPM configuration package. Again,
+   operators would need to update the system configurations after
+   running =ece deploy=.
+
+=ece-deploy= addresses all these issues, not be re-implementing the
+functionality already in place in =ece deploy= but by building upon it
+while adding features such as the capability to roll back and provide
+full diffs of everything that was changed.
+
+The reason why =ece-deploy= has its own deployment ID and doesn't use
+the version of the EAR & configuration package, is that it's possible
+to make several deployments of the same EAR/configuration package,
+even on the same host. Furthermore, =ece-deploy= deploys on several
+instances, not only one. And lastly, it's even possible to choose
+whether or not to update the publication resources. Hence,
+=ece-deploy= has its own IDs and database of its deployments to make
+everything reproduce-able.
+
+* Deploying a new EAR file
+#+BEGIN_SRC sh
+# ece-deploy --ear http://my.builder.com/snow/releases/snow-trunk-rev5233-2012-10-04_1608.ear
+#+END_SRC
+
+* Deploying a new configuration package
+#+BEGIN_SRC sh
+# ece-deploy --conf http://my.builder.com/snow/releases/vosa-conf-pres1-1-r5233.deb
+#+END_SRC
+
+* Updating publication resources
+#+BEGIN_SRC sh
+# ece-deploy --ear http://my.builder.com/snow/releases/snow-trunk-rev5233-2012-10-04_1608.ear \
+   --update-publication-resources
+#+END_SRC
+
+* Deploying everything with one command
+It's of course possible to deploy both the EAR and DEB at the same
+time and also update the publication resources with one call to
+=ece-deploy=:
+
+#+BEGIN_SRC sh
+# ece-deploy --ear http://my.builder.com/snow/releases/snow-trunk-rev5233-2012-10-04_1608.ear \
+   --conf http://my.builder.com/snow/releases/vosa-conf-pres1-1-r5233.deb \
+   --update-publication-resources
+#+END_SRC
+
+* Rollback to a previous deployment
+Perhaps the coolest feature of =ece-deploy=, is that it can roll back
+to any of the previous deployments that you have done with
+=ece-deploy=. First, get hold of the deployment ID you want from the [[Get an overview of all
+ deployments][list of all previous deployments]] and then pass this ID to the
+=--rollback= switch:
+
+#+BEGIN_SRC sh
+# ece-deploy --rollback pres1-1356015120 --update-publication-resources
+#+END_SRC
+
+As before, the =--update-publication-resource= is optional.
+
+* Get an overview of all deployments
+#+BEGIN_SRC sh
+# ece-deploy --list-deployments
+   - Deployment pres1-1354540403 was made @ Mon Dec 3 18:43:23 IST 2012
+   - Deployment pres1-1354621048 was made @ Tue Dec 4 17:07:28 IST 2012
+   - Deployment pres1-1355319440 was made @ Wed Dec 12 19:07:20 IST 2012
+   - Deployment pres1-1355320868 was made @ Wed Dec 12 19:31:08 IST 2012
+   - Deployment pres1-1355390454 was made @ Thu Dec 13 14:50:54 IST 2012
+#+END_SRC
+
+Having the ID, let's you [[Rollback to a previous version][roll back to that version]] and it lets you
+examine the state of the system before that deployment was made, what
+the state was afterwards and view full diffs of all configuration
+files that were changed as a part of that deployment.

From f093c95894d5c767380c9cb24d0cf7e994b08804 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 11 Jan 2013 10:48:30 +0100
Subject: [PATCH 1877/2585] - added the path of the deployment files

---
 usr/share/doc/escenic/ece-deploy-guide.org | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/usr/share/doc/escenic/ece-deploy-guide.org b/usr/share/doc/escenic/ece-deploy-guide.org
index 6fff9f84..a33fdcd5 100644
--- a/usr/share/doc/escenic/ece-deploy-guide.org
+++ b/usr/share/doc/escenic/ece-deploy-guide.org
@@ -102,3 +102,6 @@ Having the ID, let's you [[Rollback to a previous version][roll back to that ver
 examine the state of the system before that deployment was made, what
 the state was afterwards and view full diffs of all configuration
 files that were changed as a part of that deployment.
+
+All the deployment history is easily browsable under:
+=/var/lib/escenic/ece-deploy/<deployment-id>=

From 0ff6c292b95aa7bca98649717f82c60602f3a39e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 11 Jan 2013 10:57:21 +0100
Subject: [PATCH 1878/2585] - added chapter on requirements - added better
 examples - changed the layout of the background chapter so that it renders
 well   in spite of the Github/Ruby org file rendering bug(s).

---
 usr/share/doc/escenic/ece-deploy-guide.org | 35 ++++++++++++++++------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/usr/share/doc/escenic/ece-deploy-guide.org b/usr/share/doc/escenic/ece-deploy-guide.org
index a33fdcd5..487c710d 100644
--- a/usr/share/doc/escenic/ece-deploy-guide.org
+++ b/usr/share/doc/escenic/ece-deploy-guide.org
@@ -13,26 +13,32 @@ The =ece-deploy= command will help you with the following tasks:
 
 * Background
 As you may know, there's already a nice way of deploying an EAR file
-to an ECE, EAE or search instance by the way of =ece -i <instance>
---uri http://server/my-site.ear=. The problem with this, however is
-that:
-1. it only deploys on one instance. Normally, production systems have
+to an ECE, EAE or search instance by the way of:
+#+BEGIN_SRC sh
+$ ece -i <instance> --uri http://my.builder.com/snow/releases/snow-trunk-rev5233-2012-10-04_1608.ear
+#+END_SRC
+
+This approach has some limitations, however:
+
+1. It only deploys on one instance. Normally, production systems have
    at least two, one ECE and one search instance. Since people
    generally only are interested in the changes on the ECE instance,
    they forget to deploy to the search instance. Over time, the
    version of the ECE binaries running on these two instance drift
    apart.
-2. it doesn't update the publication resources, so that operators must
+2. It doesn't update the publication resources, so that operators must
    also do a =ece -i <instance> -r <resource> -p <publication> update=
    for each of the publication resources that the developers say have
    changed. Again, people only do the minimum of what they need to do
    and often the necessary publication resources are not updated, or
    only =content-type= is updated and the rest is left out. Again,
    things start to drift apart.
-3. it doesn't update the system configuration. A new EAR deployment
-   works in tandem with a DEB or RPM configuration package. Again,
-   operators would need to update the system configurations after
-   running =ece deploy=.
+3. It doesn't update the system configuration. A new EAR deployment
+   works in tandem with a DEB or RPM configuration package. Often, a
+   new feature or bug fix on your website requires also changes to the
+   configuration of some of the components outside of the JSPs and CSS
+   style sheets. Again, operators would need to update the system
+   configurations after running =ece deploy --uri <uri>=.
 
 =ece-deploy= addresses all these issues, not be re-implementing the
 functionality already in place in =ece deploy= but by building upon it
@@ -48,6 +54,17 @@ whether or not to update the publication resources. Hence,
 =ece-deploy= has its own IDs and database of its deployments to make
 everything reproduce-able.
 
+* Requirements
+As you can see from the code examples (they all start with a =#=),
+=ece-deploy= must be run as =root= or with =sudo=.
+
+Furthermore, it requires the system to be set up with =ece-install=
+or have corresponding structure. Among other things, this means that
+all the instances to deploy to are listed correctly in
+=/etc/default/ece= and information on how to access the build and app
+servers is present in =/etc/escenic/ece.conf= and
+=/etc/escenic/ece-<instance>.conf=.
+
 * Deploying a new EAR file
 #+BEGIN_SRC sh
 # ece-deploy --ear http://my.builder.com/snow/releases/snow-trunk-rev5233-2012-10-04_1608.ear

From 5d821d5264e43253d6ee65c59fd18011d8f6dedc Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 11 Jan 2013 10:59:23 +0100
Subject: [PATCH 1879/2585] - wee change

---
 usr/share/doc/escenic/ece-deploy-guide.org | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/usr/share/doc/escenic/ece-deploy-guide.org b/usr/share/doc/escenic/ece-deploy-guide.org
index 487c710d..9f5080ff 100644
--- a/usr/share/doc/escenic/ece-deploy-guide.org
+++ b/usr/share/doc/escenic/ece-deploy-guide.org
@@ -40,10 +40,11 @@ This approach has some limitations, however:
    style sheets. Again, operators would need to update the system
    configurations after running =ece deploy --uri <uri>=.
 
-=ece-deploy= addresses all these issues, not be re-implementing the
-functionality already in place in =ece deploy= but by building upon it
-while adding features such as the capability to roll back and provide
-full diffs of everything that was changed.
+The =ece-deploy= command addresses all these issues. It doesn't
+re-implement anything of the functionality which is already in place
+in =ece deploy= but builds upon it and adds new features such as the
+capability to roll back and provide full diffs of everything that was
+changed.
 
 The reason why =ece-deploy= has its own deployment ID and doesn't use
 the version of the EAR & configuration package, is that it's possible

From 6ba2fee36fc11b79bc451c61a86efa3d3860e7e6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 11 Jan 2013 11:01:53 +0100
Subject: [PATCH 1880/2585] - more clarification

---
 usr/share/doc/escenic/ece-deploy-guide.org | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/usr/share/doc/escenic/ece-deploy-guide.org b/usr/share/doc/escenic/ece-deploy-guide.org
index 9f5080ff..78d39d2c 100644
--- a/usr/share/doc/escenic/ece-deploy-guide.org
+++ b/usr/share/doc/escenic/ece-deploy-guide.org
@@ -46,14 +46,14 @@ in =ece deploy= but builds upon it and adds new features such as the
 capability to roll back and provide full diffs of everything that was
 changed.
 
-The reason why =ece-deploy= has its own deployment ID and doesn't use
-the version of the EAR & configuration package, is that it's possible
-to make several deployments of the same EAR/configuration package,
-even on the same host. Furthermore, =ece-deploy= deploys on several
-instances, not only one. And lastly, it's even possible to choose
-whether or not to update the publication resources. Hence,
-=ece-deploy= has its own IDs and database of its deployments to make
-everything reproduce-able.
+As you see in this guide, each deployment gets its own ID. The reason
+why =ece-deploy= has its own deployment ID and doesn't use the version
+of the EAR & configuration package, is that it's possible to make
+several deployments of the same EAR/configuration package, even on the
+same host. Furthermore, =ece-deploy= deploys on several instances, not
+only one. And lastly, it's even possible to choose whether or not to
+update the publication resources. Hence, =ece-deploy= has its own IDs
+and database of its deployments to make everything reproduce-able.
 
 * Requirements
 As you can see from the code examples (they all start with a =#=),

From 170df21aa9bb0d7e76306846a4c6f0f5e861a325 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 11 Jan 2013 12:48:51 +0100
Subject: [PATCH 1881/2585] - added guide for generate-changelog. The command
 can be run   standalone for any project, but is already integrated with the  
 ece-build script, so if you're using the VOSA builder, you already   have
 these change logs generated for every build.

---
 .../doc/escenic/generate-changelog-guide.org  | 82 +++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 usr/share/doc/escenic/generate-changelog-guide.org

diff --git a/usr/share/doc/escenic/generate-changelog-guide.org b/usr/share/doc/escenic/generate-changelog-guide.org
new file mode 100644
index 00000000..6bc9747b
--- /dev/null
+++ b/usr/share/doc/escenic/generate-changelog-guide.org
@@ -0,0 +1,82 @@
+#+TITLE: User Guide for the generate-changelog Command
+#+AUTHOR: Vizrt Online / The SaaS Team
+#+OPTIONS: H:6 num:5 toc:2
+
+* Introduction
+The =generate-changelog= command will help you with the following tasks:
+
+- [[Getting an overview of all the JIRA]] issues that have been worked on
+  in the list of commits.
+
+- [[Getting a full code diff]] of all changes in the current build.
+
+- [[Getting a risk assessment]] score for this build of the source code.
+
+* Configuration
+The =generate-changelog= command requires a configuration file in the
+user's home directory: =.generate-changelog.conf=:
+#+BEGIN_SRC text
+jira_base_url=https://jira.mycompany.com
+svn_base_url=${jira_base_url}/svn
+
+# optional parameters, may be passed on the command line
+project_code=my-jira-project
+user=my-jira-user-name
+password=my-jira-password
+#+END_SRC
+
+* Getting a risk assessment
+[[Getting an overview of all the JIRA][The report]] also contains a risk assessment score. This score is
+calculated on the number of lines in the code diff. This means the
+number of lines changed + the diff context. Hence, a one line change
+in a two line file will have a lower risk score than a one line
+change in a 100 line big file.
+
+The risk assessment score is just an indicator, it doesn't (as of
+yet) have more logic than what's mentioned above, but in future, it
+might have some logic that counts some code changes less (or more)
+risky than others.
+
+* Getting an overview of all the JIRA
+Each run of =generate-changelog= will create a full code diff
+available in:
+#+BEGIN_SRC text
+~/.generate-changelog/<project>/trunk/from-<from>-to-<to>.diff
+#+END_SRC
+For instance, if you run =generate-changelog= as this:
+#+BEGIN_SRC text
+$ generate-changelog --from 5401 --to 5856 --project toy
+#+END_SRC
+and have this  =svn_base_url= in your =~/.generate-changelog.conf=:
+#+BEGIN_SRC text
+svn_base_url=http://svn.mycompany/svn
+#+END_SRC
+
+Once you've run =generate-changelog= you'll find an overview of all
+the JIRA issues that have been mentioned in commit messages. The
+issue titles have been pulled from JIRA, so is reporter information
+and some other bits and pieces.
+
+#+BEGIN_SRC text
+~/.generate-changelog/myproject/trunk/from-5401-to-5856.report
+#+END_SRC
+
+* Getting a full code diff
+If you've run =generate-changelog= like what's described in [[Gettingan overview of all the JIRA][getting
+the JIRA overview]], you will see your diff in:
+#+BEGIN_SRC text
+~/.generate-changelog/myproject/trunk/from-5401-to-5856.diff
+#+END_SRC
+
+* Running generate-changelog
+Go into the directory where you've got the trunk or branch of your poject checked
+out and issue =generate-changelog= with the =--from=  and optionall
+=--to== parameters to specify which revision you want to create a
+change log for:
+#+BEGIN_SRC sh
+$ cd ~/src/my-project/trunk
+$ generate-changelog --from 2342
+#+END_SRC
+
+If you don't specify =--to=, you will get the report up until the
+latest committed change.

From 50f467ae8b98b66e081dadf2686f7c14d86805f3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 11 Jan 2013 12:52:28 +0100
Subject: [PATCH 1882/2585] - some speling corrections

---
 usr/share/doc/escenic/generate-changelog-guide.org | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/usr/share/doc/escenic/generate-changelog-guide.org b/usr/share/doc/escenic/generate-changelog-guide.org
index 6bc9747b..b5a0ddac 100644
--- a/usr/share/doc/escenic/generate-changelog-guide.org
+++ b/usr/share/doc/escenic/generate-changelog-guide.org
@@ -69,10 +69,10 @@ the JIRA overview]], you will see your diff in:
 #+END_SRC
 
 * Running generate-changelog
-Go into the directory where you've got the trunk or branch of your poject checked
-out and issue =generate-changelog= with the =--from=  and optionall
-=--to== parameters to specify which revision you want to create a
-change log for:
+Go into the directory where you've got the trunk or branch of your
+project checked out and issue =generate-changelog= with the =--from=
+and optional =--to== parameters to specify which revision you want to
+create a change log for:
 #+BEGIN_SRC sh
 $ cd ~/src/my-project/trunk
 $ generate-changelog --from 2342

From ed6e1eb11c6bc4e06e28ce58c2a02679e43fa68c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 11 Jan 2013 13:48:41 +0100
Subject: [PATCH 1883/2585] - implemented user agent buckets for striking a
 balance between   performance and device adapted content.

  The buckets implemented are: one for all iPhones, one for all iPads,
  one for each Android device (this might cause big caches, but so far
  it looks good), one for all Opera Minis and one for all other
  devices.

  This has been tested both with device dependent video from VMEO an
  an Escenic Content Engine backend with Mobiletech device detection
  and has so far proved to work well for four production web sites,
  hence providing this set up out of the box with ece-install.

  We do appreciate that scalable device detection is really, really
  hard to get right and it will always be a compromise. The current
  configuration provided here with ece-install is something we've
  found to work well on four sites and we believe will serve others
  well too. That's not to say that for many, these settings will be
  inadequate and more tuning will be needed.

- removed trailing white spaces
---
 .../ece-scripts/ece-install.d/cache-server.sh | 70 ++++++++++++++-----
 1 file changed, 53 insertions(+), 17 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
index 9a3a990a..ad10e788 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
@@ -24,7 +24,7 @@ function install_varnish_software() {
         1>>$log 2>>$log
       run apt-get update
     fi
-    
+
     local code_name=$(lsb_release -s -c)
     local supported_code_name=0
     local supported_list="$(get_supported_varnish_dist_list)"
@@ -44,7 +44,7 @@ function install_varnish_software() {
         "by the Varnish repositories. I'll use version Varnish from your" \
         "distribution's repositories instead"
     fi
-    
+
   elif [[ $on_redhat_or_derivative -eq 1 &&
         $(rpm -qa | grep varnish-release | wc -l) -lt 1 ]]; then
     print "Installing the Varnish repository RPM"
@@ -61,7 +61,7 @@ function install_varnish_software() {
   else
     install_packages_if_missing varnish
   fi
-  
+
   assert_commands_available varnishd
 }
 
@@ -69,7 +69,7 @@ function install_cache_server() {
   print_and_log "Installing a caching server on $HOSTNAME ..."
 
   install_varnish_software
-  
+
   if [ $fai_enabled -eq 0 ]; then
     print "You must now list your backend servers."
     print "These must be host names (not IPs) and must all be resolvable"
@@ -90,13 +90,13 @@ function install_cache_server() {
 
   set_up_varnish $backend_servers
   leave_cache_trails
-  
+
   add_next_step "Cache server is up and running at http://${HOSTNAME}:${cache_port}/"
 }
 
 function set_varnish_port() {
   log "Setting Varnish to listen on port" ${cache_port} "..."
-  
+
   local file=/etc/default/varnish
   if [ $on_redhat_or_derivative -eq 1 ]; then
     file=/etc/sysconfig/varnish
@@ -141,7 +141,7 @@ EOF
 }
 
 function create_varnish_conf_backends() {
-  
+
   local file=${varnish_conf_dir}/backends.vcl
   echo > $file
 
@@ -180,7 +180,7 @@ director webdirector client {
 EOF
 
   for (( i=0 ; i < ${#backend_servers[@]}; i++ )); do
-	  appserver_id=$(echo ${backend_servers[$i]} | cut -d':' -f1 | sed 's/-/_/g')        
+	  appserver_id=$(echo ${backend_servers[$i]} | cut -d':' -f1 | sed 's/-/_/g')
     cat >> $file <<EOF
   {
      .backend = ${appserver_id}${i};
@@ -205,7 +205,7 @@ EOF
   }
 EOF
   fi
-  
+
   echo "}" >> $file
 }
 
@@ -234,7 +234,35 @@ function create_varnish_conf_request_cleaning() {
   local file=${varnish_conf_dir}/request-cleaning.vcl
   cat > $file <<EOF
 sub vcl_recv {
-  /* Normalize the User-Agent headers here (if you want) */
+  /* Normalizing all user agents so that we can support both caching
+   * and (partial) device detection on backend servers like
+   * VMEO/Adactus and Mobiletech .
+   *
+   * All iPhones are treated as the same one, all iPads as the same
+   * iPad, all Opera Mini as the same one and all Android. If the
+   * client (browser) is neither of the above, a common UA string is
+   * set. */
+
+  if (req.http.User-Agent ~ "iPhone") {
+    set req.http.User-Agent = "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_3_3 like Mac OS X; en_us) AppleWebKit/525.18.1 (KHTML, like Gecko)";
+  }
+  else if (req.http.User-Agent ~ "iPad") {
+    set req.http.User-Agent = "Mozilla/5.0 (iPad; U; CPU OS 4_3_2 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8H7 Safari/6533.18.5";
+  }
+  else if (req.http.User-Agent ~ "Android") {
+    // we don't do anything for Android devices right now since there
+    // are just too many different ones.
+    //
+    // We could cache two versions, one mobile, one table for each
+    // Android 2.0-2.4, however, we try to leave it be right now and
+    // see how big the cache gets.
+  }
+  else if (req.http.User-Agent ~ "Opera Mini") {
+    set req.http.User-Agent = "Opera/9.80 (J2ME/MIDP; Opera Mini/4.0.10031/28.3392; U; en) Presto/2.8.119 Version/11.10";
+  }
+  else {
+    set req.http.User-Agent = "Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; VOSA 1.0)";
+  }
 }
 EOF
 }
@@ -242,10 +270,11 @@ EOF
 function create_varnish_conf_cache_key() {
   local file=${varnish_conf_dir}/cache-key.vcl
   cat > $file <<EOF
+/* Manipulate the cache keys in this method. */
 sub vcl_hash {
-
-  /* Manipulate the cache keys here, e.g. if you've normalised the UA
-   * strings and want to inclue the UA string in the hash */
+  /* We've normalised the UA string in request-cleaning.vcl so we can
+   * include the UA in the hash */
+  hash_data(req.http.User-Agent);
 }
 EOF
 }
@@ -392,6 +421,13 @@ sub vcl_deliver {
            resp.status == 200) {
     set resp.http.Cache-Control = "public, max-age=7200";
   }
+
+  /* Since we're normalising the UA, we include it in the Vary header
+   * so that itermiediary proxies get all the information they need to
+   * create desired behaviour. We also add a debug header to show
+   * which UA we've used to produce the response. */
+  set resp.http.X-UA = req.http.User-Agent;
+  set resp.http.Vary = "Accept-Encoding,User-Agent";
 }
 EOF
 
@@ -434,7 +470,7 @@ function create_varnish_conf_redirects() {
       IFS=$old_ifs
 
       local from_domain=$(get_from_domain $publication_domain)
-      
+
       cat >> $file <<EOF
   if (req.http.host == "${from_domain}") {
     error 301 "Moved Temporarily";
@@ -449,7 +485,7 @@ sub vcl_error {
   /* We want both web sites to be identified by one URL, hence we make
    * an HTTP re-direct here. See vcl_recv for how these 301 error
    * directives.
-   */ 
+   */
 EOF
     for el in $fai_publication_domain_mapping_list; do
       local old_ifs=$IFS
@@ -458,7 +494,7 @@ EOF
       IFS=$old_ifs
 
       local from_domain=$(get_from_domain $publication_domain)
-      
+
       cat >> $file <<EOF
   if (obj.status == 301 && req.http.host == "${from_domain}") {
     set obj.http.Location = "http://${publication_domain}" + req.url;
@@ -466,7 +502,7 @@ EOF
   }
 EOF
     done
-    
+
     echo "}" >> $file
   fi
 }

From ed15a2b7e524935ce3628275ad89d012963d23e4 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 11 Jan 2013 14:38:21 +0100
Subject: [PATCH 1884/2585] - ece-install will now set up a cron job for
 deleting old thumbnail   cache files.

  The reason for this being inside ece-install::content-engine and not
  in a file (removed from the git tree in this commit), is that the
  directory is set depending on the fai_ parameters (with a sane
  default good for most folks set, of course).

  This cron job assumes that the ECE
  com.escenic.presentation.servlet.multimedia.CacheFilter servlet
  filter has been configrued to write to the path below in (each of
  the publication webapp's) web.xml

- removed etc/cron.d/remove-old-escenic-cache-files from git tree, see
  above.
---
 etc/cron.daily/remove-old-escenic-cache-files | 12 -------
 .../ece-install.d/content-engine.sh           | 34 +++++++++++++++++++
 2 files changed, 34 insertions(+), 12 deletions(-)
 delete mode 100755 etc/cron.daily/remove-old-escenic-cache-files

diff --git a/etc/cron.daily/remove-old-escenic-cache-files b/etc/cron.daily/remove-old-escenic-cache-files
deleted file mode 100755
index 07e2b5e6..00000000
--- a/etc/cron.daily/remove-old-escenic-cache-files
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /usr/bin/env bash
-
-# cron script to remove old cache files. These are the images that ECE
-# generates whenever someone requests an image version (often refereed
-# to as ALTERNATE int the URL & content-type).
-
-dir=/var/cache/escenic/engine/binary
-
-if [ -d $dir  ] ; then
-  nice find $dir -type f -daystart -atime +15 -delete
-  nice find $dir -type d -empty -delete 
-fi
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index e46f4cb2..82b60a84 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -117,6 +117,7 @@ function install_ece_instance() {
 
   if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER -a \
     $install_profile_number -ne $PROFILE_SEARCH_SERVER ]; then
+    set_up_content_engine_cron_jobs
     install_memory_cache
     assemble_deploy_and_restart_type
   fi
@@ -721,3 +722,36 @@ function set_up_search_client_nursery_conf() {
   echo "solrURI=http://${search_host}:${search_port}/solr" \
     >> $dir/SearchEngine.properties
 }
+
+function set_up_content_engine_cron_jobs() {
+  local file=/etc/cron.daily/remove-old-escenic-cache-files
+
+  if [ -e $file ]; then
+    return
+  fi
+
+  print_and_log "Setting up cron job $file ..."
+  cat > $file <<EOF
+#! /usr/bin/env bash
+
+# Created by $(basename $0) @ $(date)
+#
+# cron script to remove old cache files. These are the images that ECE
+# generates whenever someone requests an image version (often refereed
+# to as ALTERNATE int the URL & content-type).
+#
+# This cron job assumes that the ECE
+# com.escenic.presentation.servlet.multimedia.CacheFilter servlet
+# filter has been configrued to write to the path below in (each of
+# the publication webapp's) web.xml
+
+dir=${escenic_cache_dir}/engine/binary
+
+if [ -d $dir  ] ; then
+  nice find $dir -type f -daystart -atime +15 -delete
+  nice find $dir -type d -empty -delete
+fi
+EOF
+
+  run chmod +x $file
+}

From 4c1954f7f70abdf2b5ce5e5a5e4c2b6446f13b94 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 11 Jan 2013 14:53:14 +0100
Subject: [PATCH 1885/2585] - improved the example of running
 generate-changelog

- shuffled the chapters around to get to the most interesting part
  sooner!
---
 .../doc/escenic/generate-changelog-guide.org  | 45 +++++++++----------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/usr/share/doc/escenic/generate-changelog-guide.org b/usr/share/doc/escenic/generate-changelog-guide.org
index b5a0ddac..33a48b08 100644
--- a/usr/share/doc/escenic/generate-changelog-guide.org
+++ b/usr/share/doc/escenic/generate-changelog-guide.org
@@ -5,7 +5,7 @@
 * Introduction
 The =generate-changelog= command will help you with the following tasks:
 
-- [[Getting an overview of all the JIRA]] issues that have been worked on
+- [[Getting an overview of all the JIRA issues]] that have been worked on
   in the list of commits.
 
 - [[Getting a full code diff]] of all changes in the current build.
@@ -25,6 +25,23 @@ user=my-jira-user-name
 password=my-jira-password
 #+END_SRC
 
+* Running generate-changelog
+Go into the directory where you've got the trunk or branch of your
+project checked out and issue =generate-changelog= with the =--from=
+and optional =--to== parameters to specify which revision you want to
+create a change log for:
+
+#+BEGIN_SRC sh
+$ cd ~/src/my-project/branches/5.5
+$ generate-changelog --from 2342
+Full diff of all 7 changes:
+/home/torstein/.generate-changelog/my-project/branches/5.5/from-242-to-COMMITTED.diff
+Report: /home/torstein/.generate-changelog/my-project/branches/5.5/from-2342-to-COMMITTED.report
+#+END_SRC
+
+If you don't specify =--to=, you will get the report up until the
+latest committed change.
+
 * Getting a risk assessment
 [[Getting an overview of all the JIRA][The report]] also contains a risk assessment score. This score is
 calculated on the number of lines in the code diff. This means the
@@ -37,7 +54,7 @@ yet) have more logic than what's mentioned above, but in future, it
 might have some logic that counts some code changes less (or more)
 risky than others.
 
-* Getting an overview of all the JIRA
+* Getting an overview of all the JIRA issues
 Each run of =generate-changelog= will create a full code diff
 available in:
 #+BEGIN_SRC text
@@ -47,15 +64,10 @@ For instance, if you run =generate-changelog= as this:
 #+BEGIN_SRC text
 $ generate-changelog --from 5401 --to 5856 --project toy
 #+END_SRC
-and have this  =svn_base_url= in your =~/.generate-changelog.conf=:
-#+BEGIN_SRC text
-svn_base_url=http://svn.mycompany/svn
-#+END_SRC
 
-Once you've run =generate-changelog= you'll find an overview of all
-the JIRA issues that have been mentioned in commit messages. The
-issue titles have been pulled from JIRA, so is reporter information
-and some other bits and pieces.
+you will find an overview of all the JIRA issues that have been
+mentioned in commit messages. The issue titles have been pulled from
+JIRA, so is reporter information and some other bits and pieces.
 
 #+BEGIN_SRC text
 ~/.generate-changelog/myproject/trunk/from-5401-to-5856.report
@@ -67,16 +79,3 @@ the JIRA overview]], you will see your diff in:
 #+BEGIN_SRC text
 ~/.generate-changelog/myproject/trunk/from-5401-to-5856.diff
 #+END_SRC
-
-* Running generate-changelog
-Go into the directory where you've got the trunk or branch of your
-project checked out and issue =generate-changelog= with the =--from=
-and optional =--to== parameters to specify which revision you want to
-create a change log for:
-#+BEGIN_SRC sh
-$ cd ~/src/my-project/trunk
-$ generate-changelog --from 2342
-#+END_SRC
-
-If you don't specify =--to=, you will get the report up until the
-latest committed change.

From 7e6d0fee6b22ad964783b89f9c1c85ed3ff15668 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 11 Jan 2013 14:54:00 +0100
Subject: [PATCH 1886/2585] - corrected example

---
 usr/share/doc/escenic/generate-changelog-guide.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/escenic/generate-changelog-guide.org b/usr/share/doc/escenic/generate-changelog-guide.org
index 33a48b08..6d30d69b 100644
--- a/usr/share/doc/escenic/generate-changelog-guide.org
+++ b/usr/share/doc/escenic/generate-changelog-guide.org
@@ -35,7 +35,7 @@ create a change log for:
 $ cd ~/src/my-project/branches/5.5
 $ generate-changelog --from 2342
 Full diff of all 7 changes:
-/home/torstein/.generate-changelog/my-project/branches/5.5/from-242-to-COMMITTED.diff
+/home/torstein/.generate-changelog/my-project/branches/5.5/from-2342-to-COMMITTED.diff
 Report: /home/torstein/.generate-changelog/my-project/branches/5.5/from-2342-to-COMMITTED.report
 #+END_SRC
 

From 80662809e7cfe05b92fe1b15de3b9d690ae76c34 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 14 Jan 2013 14:02:34 +0100
Subject: [PATCH 1887/2585] - added support for having the EAE .cfg
 configuration files in a   different directory than inside the exploded EAE
 webapps (!) that   was the only way up until EAE version 2.1.7

- the default location of the EAE configuration is now
  /etc/escenic/analysis

- The ece command now relates to run_dir like all the other commands,
  and not pid_dir as previously.

- Removed trailing white space
---
 etc/escenic/ece.conf                          |  22 ++-
 usr/bin/ece                                   | 137 ++++++++++--------
 .../ece-scripts/ece-install.d/ece-scripts.sh  |   8 +-
 3 files changed, 97 insertions(+), 70 deletions(-)

diff --git a/etc/escenic/ece.conf b/etc/escenic/ece.conf
index 3d0882bc..4f523aec 100644
--- a/etc/escenic/ece.conf
+++ b/etc/escenic/ece.conf
@@ -57,13 +57,27 @@ appserver_port=8080
 #########################################################################
 assemblytool_home=/opt/escenic/assemblytool
 cache_dir=/var/cache/escenic
+
+#########################################################################
+# Configuration directories
+#########################################################################
 # The root of all Escenic configuration files (not only ECE)
 escenic_conf_dir=/etc/escenic
+
+# The directory for the Escenic Analysis Engine/Stats' configuration
+# files. Note that this is different from the EAE plugin for Content
+# Studio, which has its configuration with the other ECE Nursery
+# components.
+analysis_conf_dir=$escenic_conf_dir/analysis
 ece_security_configuration_dir=${escenic_conf_dir}/engine/common/security
+rmi_hub_conf=${escenic_conf_dir}/rmi-hub
+
+#########################################################################
+# Other important directories
+#########################################################################
 data_dir=/var/lib/escenic
 log_dir=/var/log/escenic
-pid_dir=/var/run/escenic
-rmi_hub_conf=${escenic_conf_dir}/rmi-hub
+run_dir=/var/run/escenic
 rmi_hub_home=$ece_home/contrib/rmi-hub
 solr_home=/var/lib/escenic/solr
 tmp_dir=/tmp
@@ -82,7 +96,7 @@ tmp_dir=/tmp
 # webapps listed here, will be deployed.
 #
 # Note: this is currently only supported when appserver=tomcat.
-# 
+#
 # deploy_webapp_white_list="escenic-admin pbe"
 
 #########################################################################
@@ -199,7 +213,7 @@ jvm_connection_settings="
 force_ipv4=0
 
 ######################################################################
-# Ask the JVM to create a heap dump when/if it crashes. 
+# Ask the JVM to create a heap dump when/if it crashes.
 ######################################################################
 enable_heap_dump=1
 heap_dump_dir=/var/crash/escenic
diff --git a/usr/bin/ece b/usr/bin/ece
index 22009be9..ca504d60 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -6,6 +6,15 @@
 #
 # echo comments and suggestions > tkj@vizrt.com
 
+######################################################################
+# Needs to be here to bootstrap the ece script itself when it looks
+# for the ece[-[a-z0-9]*].conf files.
+#
+# There is one to avoid this bootstrap dependency, and that is to set
+# the ECE_CONF_LOCATIONS environment variable, however this is quite
+# uncommon and generally speaking not recommended.
+######################################################################
+escenic_conf_dir=/etc/escenic
 
 ######################################################################
 # Script defaults, my be overriden in any of the configration files
@@ -13,7 +22,6 @@
 force_ipv4=0
 quiet=0
 everything_but_the_kitchen_sink=0
-escenic_conf_dir=/etc/escenic
 
 ######################################################################
 # Dear user, don't touch anyting in this script, especially below this
@@ -60,7 +68,7 @@ enable_remote_monitoring
 java_home
 solr_home
 log_dir
-pid_dir
+run_dir
 tmp_dir
 "
 
@@ -96,7 +104,7 @@ function init() {
     for el in $common_libraries; do
       source $dir/${el}
     done
-    
+
     # load ece-install modules
     for el in $dir/ece.d/*.sh; do
       source $el
@@ -113,12 +121,12 @@ function init() {
 ####################################################################
 function ensure_that_required_fields_are_set() {
     requirements_failed=0
-    
+
     for el in $@; do
         if [ -n "$(eval echo $`echo $el`)" ]; then
             continue
         fi
-        
+
         print "You need to specifiy '$el' in one of ${ece_conf_files_read[@]}"
         requirements_failed=1
     done
@@ -148,16 +156,16 @@ function get_instance_list() {
     local allowed_types="engine analysis changelogd search rmi-hub"
     instance_list=""
     for el in $(\ls /etc/escenic/ece-*.conf 2>/dev/null); do
-      
+
       local instance=$(basename $el .conf)
       instance=${instance##ece-}
-      
+
       for ele in $allowed_types; do
         if [[ $instance == $ele ]]; then
           instance=""
           continue
         fi
-        
+
         local away="${ele}-"
         instance=${instance##${away}}
       done
@@ -186,11 +194,11 @@ function set_common_settings() {
 
     # main configuration file, may be overridden in the type and
     # instance specific ones.
-    read_conf_file `basename $0`.conf
+    read_conf_file $(basename $0).conf
 
     log=$log_dir/$instance.out
-    pid_file=$pid_dir/$instance.pid
-    
+    pid_file=$run_dir/$instance.pid
+
     gc_log=${log_dir}/${instance}-gc.log
 
     log4j_file_list="
@@ -205,7 +213,7 @@ function set_common_settings() {
 function set_type_settings() {
     # optional: possible to have type specific conf file,
     # will take precedences over the common one.
-    read_conf_file `basename $0`-$type.conf
+    read_conf_file $(basename $0)-$type.conf
 }
 
 function set_type_pid() {
@@ -214,7 +222,7 @@ function set_type_pid() {
     else
         ps_options="-ef"
     fi
-    
+
     # Get a hold of the PID of the process. Although we've got the PID
     # file, we stil get the PID from the OS here as we used it for
     # sanity checking later on, see stop_type().
@@ -265,8 +273,8 @@ function set_type_port() {
 function set_instance_settings() {
     # optional: possible to have instance specific conf files,
     # these will take precedence over the other two
-    read_conf_file `basename $0`-$instance.conf
-    read_conf_file `basename $0`-$type-$instance.conf
+    read_conf_file $(basename $0)-$instance.conf
+    read_conf_file $(basename $0)-$type-$instance.conf
 
     # at this point in the script flow, we have now read all the
     # possible combinations of conf files (common, type and instance)
@@ -277,6 +285,8 @@ function set_instance_settings() {
         ensure_that_required_fields_are_set $search_required_fields
     elif [ "$type" == "engine" ]; then
         ensure_that_required_fields_are_set $engine_required_fields
+    elif [ "$type" == "analysis" ]; then
+        ensure_that_required_fields_are_set $analysis_required_fields
     fi
 
     # We respect ece_server if it's set in any of the configuration
@@ -290,7 +300,7 @@ function set_instance_settings() {
     fi
 
     set_type_pid
-   
+
     # if type is rmi-hub, we don't' need more configuration.
     if [ "$type" == "rmi-hub" ]; then
         return
@@ -321,11 +331,11 @@ function set_instance_settings() {
     if [ "$jvm_gc_settings" ]; then
       ece_args=$ece_args" "$jvm_gc_settings
     fi
-    
+
     if [ "$jvm_proxy_settings" ]; then
       ece_args=$ece_args" "$jvm_proxy_settings
     fi
-    
+
     if [ "$jvm_connection_settings" ]; then
       ece_args=$ece_args" "$jvm_connection_settings
     fi
@@ -361,22 +371,26 @@ function set_instance_settings() {
     if [ "$max_permgen_size" ]; then
         ece_args=$ece_args" -XX:MaxPermSize=$max_permgen_size"
     fi
-    
+
     if [ "$jvm_encoding" ]; then
         ece_args=$ece_args" -Dsun.jnu.encoding=$jvm_encoding"
         ece_args=$ece_args" -Dfile.encoding=$jvm_encoding"
     fi
 
+    if [ "$analysis_conf_dir" ]; then
+      ece_args=$ece_args" -Dcom.escenic.eae.config=${analysis_conf_dir}"
+    fi
+
     if [ "$enable_remote_debugging" -eq 1 ]; then
         ece_args=$ece_args" -Xdebug -Xnoagent -Djava.compiler=NONE \
                             -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=$remote_debugging_port"
-    fi          
+    fi
 
     if [ "$enable_remote_monitoring" -eq 1 ]; then
         ece_args=$ece_args" -Dcom.sun.management.jmxremote"
         ece_args=$ece_args" -Dcom.sun.management.jmxremote.authenticate=false"
         ece_args=$ece_args" -Dcom.sun.management.jmxremote.ssl=false"
-        ece_args=$ece_args" -Dcom.sun.management.jmxremote.port=$remote_monitoring_port" 
+        ece_args=$ece_args" -Dcom.sun.management.jmxremote.port=$remote_monitoring_port"
     fi
 
     if [ "$enable_heap_dump" -eq 1 ]; then
@@ -387,7 +401,7 @@ function set_instance_settings() {
     if [ "$force_ipv4" -eq 1 ]; then
         ece_args=$ece_args" -Djava.net.preferIPv4Stack=true"
     fi
-    
+
     if [[ -n "$escenic_admin_http_user" && -n "$escenic_admin_http_password" ]]; then
       wget_appserver_auth="
         --http-user $escenic_admin_http_user
@@ -395,17 +409,17 @@ function set_instance_settings() {
       "
       curl_appserver_auth="-u ${escenic_admin_http_user}:${escenic_admin_http_password}"
     fi
-    
+
     if [[ -n "$builder_http_user" && -n "$builder_http_password" ]]; then
       wget_builder_auth="
         --http-user $builder_http_user
         --http-password $builder_http_password
       "
     fi
-    
+
     # Resin needs some more arguments as its XML parser is not
     # compatible with ECE.
-    if [ "$appserver" == "resin" ]; then
+    if [[ "$appserver" == "resin" ]]; then
         ece_args="$ece_args\
            -Dorg.xml.sax.driver=org.apache.xerces.parsers.SAXParser
            -Djavax.xml.stream.XMLInputFactory=com.sun.xml.stream.ZephyrParserFactory
@@ -427,7 +441,7 @@ function set_instance_settings() {
     export ECE_HOME=$ece_home
     export JAVA_OPTS="$JAVA_OPTS $ece_args"
     export JAVA_HOME=$java_home
-    
+
     debug ECE_HOME=$ECE_HOME
     debug JAVA_HOME=$JAVA_HOME
     debug JAVA_OPTS=$JAVA_OPTS
@@ -439,7 +453,7 @@ function sanity_check() {
         print "The root user can only use /etc/init.d/ece"
         exit 1
     fi
-    
+
     if [ "$(echo $command)" == "list-instances" ]; then
       return
     fi
@@ -480,7 +494,7 @@ function sanity_check() {
       print "Instance '$instance' doesn't exist on $HOSTNAME"
       exit 1
     fi
-    
+
     # verifies that java_home exists and has the java executable
     if [ ! -d $java_home ]; then
         print "java_home $java_home doesn't exist"
@@ -512,7 +526,7 @@ function get_actual_file() {
         # preserve the cwd, therefore, we're doing the "cd /" in a
         # subshell.
         real_file=$(
-            cd / 
+            cd /
             if [ ! -e ${real_file} ]; then
                 real_file=${dir}/${real_file}
             fi
@@ -523,7 +537,7 @@ function get_actual_file() {
     else
         real_file=${1}
     fi
-    
+
     echo ${real_file}
 }
 
@@ -535,13 +549,13 @@ function set_type_command_and_instance() {
     local next_is_http_user=0
     local next_is_http_password=0
     local next_is_file=0
-    
+
     for el in $@; do
         if [ "$el" == "-v" -o "$el" == "--verbose" ]; then
             debug=1
             continue
         fi
-        
+
         if [ "$el" == "--full" ]; then
             everything_but_the_kitchen_sink=1
             continue
@@ -556,7 +570,7 @@ function set_type_command_and_instance() {
             quiet=1
             continue
         fi
-        
+
         if [ "$el" == "--help" ]; then
             command=help
             continue
@@ -567,43 +581,43 @@ function set_type_command_and_instance() {
           next_is_file=0
           continue
         fi
-        
+
         if [ "$next_is_type" -eq 1 ]; then
             type=$el
             next_is_type=0
             continue
         fi
-        
+
         if [ "$next_is_http_user" -eq 1 ]; then
             http_user=$el
             next_is_http_user=0
             continue
         fi
-        
+
         if [ "$next_is_http_password" -eq 1 ]; then
             http_password=$el
             next_is_http_password=0
             continue
         fi
-        
+
         if [ "$next_is_instance" -eq 1 ]; then
             instance=$el
             next_is_instance=0
             continue
         fi
-        
+
         if [ "$next_is_publication" -eq 1 ]; then
             publication=$el
             next_is_publication=0
             continue
         fi
-        
+
         if [ "$next_is_resource" -eq 1 ]; then
             resource=$el
             next_is_resource=0
             continue
         fi
-        
+
         if [ "$el" == "-t" -o "$el"  == "--type" ]; then
             next_is_type=1
             continue
@@ -624,21 +638,21 @@ function set_type_command_and_instance() {
         else
             next_is_publication=0
         fi
-        
+
         if [ "$el" == "-r" -o "$el" == "--publication-resource" ]; then
             next_is_resource=1
             continue
         else
             next_is_resource=0
         fi
-        
+
         if [ "$el" == "-u" -o "$el" == "--user" ]; then
             next_is_http_user=1
             continue
         else
             next_is_http_user=0
         fi
-        
+
         if [ "$el" == "-w" -o "$el" == "--password" ]; then
             next_is_http_password=1
             continue
@@ -671,7 +685,7 @@ function set_type_command_and_instance() {
              echo "Version:" $ece_scripts_version
              exit 0
         fi
-        
+
         # the only thing left at this point, is the command
         command="$command $el"
     done
@@ -682,7 +696,7 @@ function set_type_command_and_instance() {
     if [ "$instance" == "default" ]; then
         debug "Trying to determine instance name"
         local instance_list=$(get_instance_list)
-        
+
         if [ $(echo $instance_list | grep ' ' | wc -l) -eq 0 ]; then
             instance=$instance_list
             if [ -z "$instance" ] ; then
@@ -695,11 +709,11 @@ function set_type_command_and_instance() {
 
 function set_id() {
     if [ "$instance" == "default" ]; then
-        id="["`basename $0`"#${type}]"
+        id="["$(basename $0)"#${type}]"
     else
-        id="["`basename $0`"#${type}-${instance}]"
+        id="["$(basename $0)"#${type}-${instance}]"
     fi
-    
+
     debug type is $type \
         and command is $command \
         and instance is $instance
@@ -710,28 +724,28 @@ function get_status() {
         echo "DOWN"
         exit 0
     elif [ -r $pid_file ]; then
-        
+
         if [ "$type_pid" != `cat $pid_file` ]; then
-            echo "Is running, but was not started with `basename $0`"
+            echo "Is running, but was not started with $(basename $0)"
             echo "system PID $ece_id differs from the PID in $pid_file"
             exit 1
         fi
     else
         echo $pid_file "did not exist, "
         echo "the ${instance} instance of ${type} is running with PID $type_pid"
-        echo "but hasn't been started properly with `basename $0`"
+        echo "but hasn't been started properly with $(basename $0)"
         exit 1
     fi
 
-    now=`date +%s`
-    started=`stat -c %Y $pid_file`
-    seconds=$(( now - started ))
-    days=$(( seconds / ( 60 * 60 * 24 ) ))
-    seconds_left=$(( seconds - ( $days * 60 * 60 * 24 ) ))
-    hours=$(( seconds_left / ( 60 * 60 ) ))
-    seconds_left=$(( seconds_left - ( $hours * 60 * 60 ) ))
-    minutes=$(( seconds_left / 60 ))
-    seconds_left=$(( seconds_left - $minutes * 60 ))
+    local now=`date +%s`
+    local started=`stat -c %Y $pid_file`
+    local seconds=$(( now - started ))
+    local days=$(( seconds / ( 60 * 60 * 24 ) ))
+    local seconds_left=$(( seconds - ( $days * 60 * 60 * 24 ) ))
+    local hours=$(( seconds_left / ( 60 * 60 ) ))
+    local seconds_left=$(( seconds_left - ( $hours * 60 * 60 ) ))
+    local minutes=$(( seconds_left / 60 ))
+    local seconds_left=$(( seconds_left - $minutes * 60 ))
 
     echo "UP" ${days}d ${hours}h ${minutes}m ${seconds_left}s
 }
@@ -753,7 +767,7 @@ function show_all_publications() {
   set_type_port
   print "These are all the publications on ${instance}:"
   get_publication_list ${port}
-}  
+}
 
 init
 read_rc_file_if_present
@@ -849,4 +863,3 @@ for el in $command; do
 done
 
 exit 0
-
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh b/usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh
index 07b8cf31..6a4b6de1 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh
@@ -12,7 +12,7 @@ function install_ece_scripts_with_git() {
   else
     run git clone $ece_scripts_git_source
   fi
-  
+
   run cp -r ece-scripts/usr/* /usr/
   run cp -r ece-scripts/etc/bash_completion.d/ece /etc/bash_completion.d/
   run cp -r ece-scripts/etc/init.d/* /etc/init.d/
@@ -25,7 +25,7 @@ function install_ece_scripts_with_git() {
     fi
     run cp $el /etc/default/
   done
-  
+
   for el in ece-scripts/etc/escenic/*; do
     local file=/etc/escenic/$(basename $el)
     if [ -e $file ]; then
@@ -45,7 +45,7 @@ function set_up_ece_scripts()
   else
     install_ece_scripts_with_git
   fi
-  
+
   local file=${escenic_conf_dir}/ece.conf
   set_conf_file_value assemblytool_home ${escenic_root_dir}/assemblytool $file
   set_conf_file_value backup_dir ${escenic_backups_dir} $file
@@ -56,7 +56,7 @@ function set_up_ece_scripts()
   set_conf_file_value heap_dump_dir ${escenic_crash_dir} ${file}
   set_conf_file_value java_home ${java_home} ${file}
   set_conf_file_value log_dir ${escenic_log_dir} ${file}
-  set_conf_file_value pid_dir ${escenic_run_dir} ${file}
+  set_conf_file_value run_dir ${escenic_run_dir} ${file}
   set_conf_file_value rmi_hub_conf ${escenic_conf_dir}/rmi-hub ${file}
   set_conf_file_value solr_home ${escenic_data_dir}/solr ${file}
   set_conf_file_value ece_security_configuration_dir \

From 643bddb15de0185d1a8a8bf09016c68be4d292a7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 14 Jan 2013 14:03:41 +0100
Subject: [PATCH 1888/2585] - added support for having the EAE .cfg
 configuration files in a   different directory than inside the exploded EAE
 webapps (!) that   was the only way up until EAE version 2.1.7

- the default location of the EAE configuration is now
  /etc/escenic/analysis

- before, ece-install::install_analysis_server copied the WARs twice
  for no reason. This has now been fixed.

- removed trailing white space.
---
 .../ece-install.d/analysis-engine.sh          | 81 ++++++++++++-------
 1 file changed, 51 insertions(+), 30 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh
index 1e51c30a..bcaf6a90 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh
@@ -1,15 +1,9 @@
-# ece-install module for installing EAE
+# ece-install module for installing Escenic Analysis Engine (EAE),
+# also known as "Stats".
 
 function install_analysis_server() {
   run_hook install_analysis_server.preinst
-  
   print_and_log "Installing an analysis server on $HOSTNAME ..."
-  type=analysis
-  
-  install_ece_instance "analysis1"
-
-  run cp ${escenic_root_dir}/analysis-engine-*/wars/*.war \
-    ${tomcat_base}/webapps
 
   if [ -n "${fai_analysis_host}" ]; then
     appserver_host=${fai_analysis_host}
@@ -17,32 +11,68 @@ function install_analysis_server() {
   if [ -n "${fai_analysis_port}" ]; then
     appserver_port=${fai_analysis_port}
   fi
-  
+
+  type=analysis
+  install_ece_instance "analysis1"
+
   # deploy the EAE WARs
   run cp ${escenic_root_dir}/analysis-engine-*/wars/*.war \
     ${tomcat_base}/webapps
 
   set_correct_permissions
-  
-  local ece_command="ece -i ${instance_name} -t ${type} restart"
-  su - $ece_user -c "$ece_command" 1>>$log 2>>$log
-  exit_on_error "su - $ece_user -c \"$ece_command\""
-
-  local seconds=15
-  print_and_log "Waiting ${seconds} seconds for EAE to come up ..."
-  sleep $seconds
-  
+  set_up_analysis_conf
+  set_up_analysis_plugin_nursery_conf
+
+  run su - $ece_user -c "ece -i ${instance_name} -t ${type} restart"
+  run_hook install_analysis_server.postinst
+}
+
+## $1 :: WAR
+## $2 :: path to file inside WAR
+## $3 :: target file
+function extract_path_from_war_if_target_file_doesnt_exist() {
+  local war=$1
+  local path=$2
+  local file=$3
+
+  if [ ! -e $file ]; then
+    make_dir $(dirname $file)
+    (
+      run cd $(dirname $file)
+      run jar xf $war $path
+      run mv $path $file
+      run rmdir $(dirname $path)
+      run rmdir $(dirname $(dirname $path))
+    )
+  fi
+}
+
+## This is EAE's own configuration, not the ECE plugin part, see
+## set_up_analysis_plugin_nursery_conf
+function set_up_analysis_conf() {
+
   # EAE cannot handle .cfg files with quotes values (!)
   dont_quote_conf_values=1
-  
+
+  # First, configure EAE reports
   print_and_log "Configuring EAE Reports ..."
-  local file=${tomcat_base}/webapps/analysis-reports/WEB-INF/config/reports.cfg
+  # extract cfg files if the don't exist already
+  local file=${escenic_conf_dir}/analysis/reports.cfg
+  local path=WEB-INF/config/reports.cfg
+  local war=${escenic_root_dir}/analysis-engine-*/wars/analysis-reports.war
+  extract_path_from_war_if_target_file_doesnt_exist $war $path $file
+
   set_conf_file_value queryServiceUrl \
     http://${appserver_host}:${appserver_port}/analysis-qs/QueryService \
     ${file}
 
+  # Second, configure EAE Logger
   print_and_log "Configuring EAE Logger ..."
-  local file=${tomcat_base}/webapps/analysis-logger/WEB-INF/config/logger.cfg
+  local war=${escenic_root_dir}/analysis-engine-*/wars/analysis-logger.war
+  local path=WEB-INF/config/logger.cfg
+  local file=${escenic_conf_dir}/analysis/logger.cfg
+  extract_path_from_war_if_target_file_doesnt_exist $war $path $file
+
   set_conf_file_value databaseQueueManager.reinsertcount \
     6 \
     ${file}
@@ -58,14 +88,6 @@ function install_analysis_server() {
   # important to turn this off here, it's only for the EAE .cfg
   # files, see above.
   dont_quote_conf_values=0
-
-  # touching web.xml to trigger a re-deploy of the EAE Reports
-  # application.
-  run touch ${tomcat_base}/webapps/analysis-reports/WEB-INF/web.xml
-
-  set_up_analysis_plugin_nursery_conf
-  
-  run_hook install_analysis_server.postinst
 }
 
 function set_up_analysis_plugin_nursery_conf() {
@@ -82,4 +104,3 @@ EOF
 
   print_and_log "EAE Nursery component configured in $file"
 }
-

From 8380953c0fb76b19e30a54cf3a4f104775947f17 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 14 Jan 2013 16:28:09 +0100
Subject: [PATCH 1889/2585] - added support for having the EAE .cfg
 configuration files in a   different directory than inside the exploded EAE
 webapps (!) that   was the only way up until EAE version 2.1.7

- the default location of the EAE configuration is now
  /etc/escenic/analysis

- The ece command now relates to run_dir like all the other commands,
  and not pid_dir as previously.

- Removed trailing white space
---
 etc/escenic/ece.conf |  22 +++++--
 usr/bin/ece          | 152 ++++++++++++++++++++++---------------------
 2 files changed, 95 insertions(+), 79 deletions(-)

diff --git a/etc/escenic/ece.conf b/etc/escenic/ece.conf
index 3d0882bc..4f523aec 100644
--- a/etc/escenic/ece.conf
+++ b/etc/escenic/ece.conf
@@ -57,13 +57,27 @@ appserver_port=8080
 #########################################################################
 assemblytool_home=/opt/escenic/assemblytool
 cache_dir=/var/cache/escenic
+
+#########################################################################
+# Configuration directories
+#########################################################################
 # The root of all Escenic configuration files (not only ECE)
 escenic_conf_dir=/etc/escenic
+
+# The directory for the Escenic Analysis Engine/Stats' configuration
+# files. Note that this is different from the EAE plugin for Content
+# Studio, which has its configuration with the other ECE Nursery
+# components.
+analysis_conf_dir=$escenic_conf_dir/analysis
 ece_security_configuration_dir=${escenic_conf_dir}/engine/common/security
+rmi_hub_conf=${escenic_conf_dir}/rmi-hub
+
+#########################################################################
+# Other important directories
+#########################################################################
 data_dir=/var/lib/escenic
 log_dir=/var/log/escenic
-pid_dir=/var/run/escenic
-rmi_hub_conf=${escenic_conf_dir}/rmi-hub
+run_dir=/var/run/escenic
 rmi_hub_home=$ece_home/contrib/rmi-hub
 solr_home=/var/lib/escenic/solr
 tmp_dir=/tmp
@@ -82,7 +96,7 @@ tmp_dir=/tmp
 # webapps listed here, will be deployed.
 #
 # Note: this is currently only supported when appserver=tomcat.
-# 
+#
 # deploy_webapp_white_list="escenic-admin pbe"
 
 #########################################################################
@@ -199,7 +213,7 @@ jvm_connection_settings="
 force_ipv4=0
 
 ######################################################################
-# Ask the JVM to create a heap dump when/if it crashes. 
+# Ask the JVM to create a heap dump when/if it crashes.
 ######################################################################
 enable_heap_dump=1
 heap_dump_dir=/var/crash/escenic
diff --git a/usr/bin/ece b/usr/bin/ece
index e6de3318..ca504d60 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -6,6 +6,15 @@
 #
 # echo comments and suggestions > tkj@vizrt.com
 
+######################################################################
+# Needs to be here to bootstrap the ece script itself when it looks
+# for the ece[-[a-z0-9]*].conf files.
+#
+# There is one to avoid this bootstrap dependency, and that is to set
+# the ECE_CONF_LOCATIONS environment variable, however this is quite
+# uncommon and generally speaking not recommended.
+######################################################################
+escenic_conf_dir=/etc/escenic
 
 ######################################################################
 # Script defaults, my be overriden in any of the configration files
@@ -13,7 +22,6 @@
 force_ipv4=0
 quiet=0
 everything_but_the_kitchen_sink=0
-escenic_conf_dir=/etc/escenic
 
 ######################################################################
 # Dear user, don't touch anyting in this script, especially below this
@@ -60,7 +68,7 @@ enable_remote_monitoring
 java_home
 solr_home
 log_dir
-pid_dir
+run_dir
 tmp_dir
 "
 
@@ -96,7 +104,7 @@ function init() {
     for el in $common_libraries; do
       source $dir/${el}
     done
-    
+
     # load ece-install modules
     for el in $dir/ece.d/*.sh; do
       source $el
@@ -113,12 +121,12 @@ function init() {
 ####################################################################
 function ensure_that_required_fields_are_set() {
     requirements_failed=0
-    
+
     for el in $@; do
         if [ -n "$(eval echo $`echo $el`)" ]; then
             continue
         fi
-        
+
         print "You need to specifiy '$el' in one of ${ece_conf_files_read[@]}"
         requirements_failed=1
     done
@@ -148,16 +156,16 @@ function get_instance_list() {
     local allowed_types="engine analysis changelogd search rmi-hub"
     instance_list=""
     for el in $(\ls /etc/escenic/ece-*.conf 2>/dev/null); do
-      
+
       local instance=$(basename $el .conf)
       instance=${instance##ece-}
-      
+
       for ele in $allowed_types; do
         if [[ $instance == $ele ]]; then
           instance=""
           continue
         fi
-        
+
         local away="${ele}-"
         instance=${instance##${away}}
       done
@@ -186,11 +194,11 @@ function set_common_settings() {
 
     # main configuration file, may be overridden in the type and
     # instance specific ones.
-    read_conf_file `basename $0`.conf
+    read_conf_file $(basename $0).conf
 
     log=$log_dir/$instance.out
-    pid_file=$pid_dir/$instance.pid
-    
+    pid_file=$run_dir/$instance.pid
+
     gc_log=${log_dir}/${instance}-gc.log
 
     log4j_file_list="
@@ -205,7 +213,7 @@ function set_common_settings() {
 function set_type_settings() {
     # optional: possible to have type specific conf file,
     # will take precedences over the common one.
-    read_conf_file `basename $0`-$type.conf
+    read_conf_file $(basename $0)-$type.conf
 }
 
 function set_type_pid() {
@@ -214,7 +222,7 @@ function set_type_pid() {
     else
         ps_options="-ef"
     fi
-    
+
     # Get a hold of the PID of the process. Although we've got the PID
     # file, we stil get the PID from the OS here as we used it for
     # sanity checking later on, see stop_type().
@@ -265,8 +273,8 @@ function set_type_port() {
 function set_instance_settings() {
     # optional: possible to have instance specific conf files,
     # these will take precedence over the other two
-    read_conf_file `basename $0`-$instance.conf
-    read_conf_file `basename $0`-$type-$instance.conf
+    read_conf_file $(basename $0)-$instance.conf
+    read_conf_file $(basename $0)-$type-$instance.conf
 
     # at this point in the script flow, we have now read all the
     # possible combinations of conf files (common, type and instance)
@@ -277,6 +285,8 @@ function set_instance_settings() {
         ensure_that_required_fields_are_set $search_required_fields
     elif [ "$type" == "engine" ]; then
         ensure_that_required_fields_are_set $engine_required_fields
+    elif [ "$type" == "analysis" ]; then
+        ensure_that_required_fields_are_set $analysis_required_fields
     fi
 
     # We respect ece_server if it's set in any of the configuration
@@ -290,7 +300,7 @@ function set_instance_settings() {
     fi
 
     set_type_pid
-   
+
     # if type is rmi-hub, we don't' need more configuration.
     if [ "$type" == "rmi-hub" ]; then
         return
@@ -321,11 +331,11 @@ function set_instance_settings() {
     if [ "$jvm_gc_settings" ]; then
       ece_args=$ece_args" "$jvm_gc_settings
     fi
-    
+
     if [ "$jvm_proxy_settings" ]; then
       ece_args=$ece_args" "$jvm_proxy_settings
     fi
-    
+
     if [ "$jvm_connection_settings" ]; then
       ece_args=$ece_args" "$jvm_connection_settings
     fi
@@ -361,22 +371,26 @@ function set_instance_settings() {
     if [ "$max_permgen_size" ]; then
         ece_args=$ece_args" -XX:MaxPermSize=$max_permgen_size"
     fi
-    
+
     if [ "$jvm_encoding" ]; then
         ece_args=$ece_args" -Dsun.jnu.encoding=$jvm_encoding"
         ece_args=$ece_args" -Dfile.encoding=$jvm_encoding"
     fi
 
+    if [ "$analysis_conf_dir" ]; then
+      ece_args=$ece_args" -Dcom.escenic.eae.config=${analysis_conf_dir}"
+    fi
+
     if [ "$enable_remote_debugging" -eq 1 ]; then
         ece_args=$ece_args" -Xdebug -Xnoagent -Djava.compiler=NONE \
                             -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=$remote_debugging_port"
-    fi          
+    fi
 
     if [ "$enable_remote_monitoring" -eq 1 ]; then
         ece_args=$ece_args" -Dcom.sun.management.jmxremote"
         ece_args=$ece_args" -Dcom.sun.management.jmxremote.authenticate=false"
         ece_args=$ece_args" -Dcom.sun.management.jmxremote.ssl=false"
-        ece_args=$ece_args" -Dcom.sun.management.jmxremote.port=$remote_monitoring_port" 
+        ece_args=$ece_args" -Dcom.sun.management.jmxremote.port=$remote_monitoring_port"
     fi
 
     if [ "$enable_heap_dump" -eq 1 ]; then
@@ -387,7 +401,7 @@ function set_instance_settings() {
     if [ "$force_ipv4" -eq 1 ]; then
         ece_args=$ece_args" -Djava.net.preferIPv4Stack=true"
     fi
-    
+
     if [[ -n "$escenic_admin_http_user" && -n "$escenic_admin_http_password" ]]; then
       wget_appserver_auth="
         --http-user $escenic_admin_http_user
@@ -395,17 +409,17 @@ function set_instance_settings() {
       "
       curl_appserver_auth="-u ${escenic_admin_http_user}:${escenic_admin_http_password}"
     fi
-    
+
     if [[ -n "$builder_http_user" && -n "$builder_http_password" ]]; then
       wget_builder_auth="
         --http-user $builder_http_user
         --http-password $builder_http_password
       "
     fi
-    
+
     # Resin needs some more arguments as its XML parser is not
     # compatible with ECE.
-    if [ "$appserver" == "resin" ]; then
+    if [[ "$appserver" == "resin" ]]; then
         ece_args="$ece_args\
            -Dorg.xml.sax.driver=org.apache.xerces.parsers.SAXParser
            -Djavax.xml.stream.XMLInputFactory=com.sun.xml.stream.ZephyrParserFactory
@@ -427,7 +441,7 @@ function set_instance_settings() {
     export ECE_HOME=$ece_home
     export JAVA_OPTS="$JAVA_OPTS $ece_args"
     export JAVA_HOME=$java_home
-    
+
     debug ECE_HOME=$ECE_HOME
     debug JAVA_HOME=$JAVA_HOME
     debug JAVA_OPTS=$JAVA_OPTS
@@ -439,7 +453,7 @@ function sanity_check() {
         print "The root user can only use /etc/init.d/ece"
         exit 1
     fi
-    
+
     if [ "$(echo $command)" == "list-instances" ]; then
       return
     fi
@@ -480,7 +494,7 @@ function sanity_check() {
       print "Instance '$instance' doesn't exist on $HOSTNAME"
       exit 1
     fi
-    
+
     # verifies that java_home exists and has the java executable
     if [ ! -d $java_home ]; then
         print "java_home $java_home doesn't exist"
@@ -512,7 +526,7 @@ function get_actual_file() {
         # preserve the cwd, therefore, we're doing the "cd /" in a
         # subshell.
         real_file=$(
-            cd / 
+            cd /
             if [ ! -e ${real_file} ]; then
                 real_file=${dir}/${real_file}
             fi
@@ -523,7 +537,7 @@ function get_actual_file() {
     else
         real_file=${1}
     fi
-    
+
     echo ${real_file}
 }
 
@@ -535,13 +549,13 @@ function set_type_command_and_instance() {
     local next_is_http_user=0
     local next_is_http_password=0
     local next_is_file=0
-    
+
     for el in $@; do
         if [ "$el" == "-v" -o "$el" == "--verbose" ]; then
             debug=1
             continue
         fi
-        
+
         if [ "$el" == "--full" ]; then
             everything_but_the_kitchen_sink=1
             continue
@@ -556,7 +570,7 @@ function set_type_command_and_instance() {
             quiet=1
             continue
         fi
-        
+
         if [ "$el" == "--help" ]; then
             command=help
             continue
@@ -567,43 +581,43 @@ function set_type_command_and_instance() {
           next_is_file=0
           continue
         fi
-        
+
         if [ "$next_is_type" -eq 1 ]; then
             type=$el
             next_is_type=0
             continue
         fi
-        
+
         if [ "$next_is_http_user" -eq 1 ]; then
             http_user=$el
             next_is_http_user=0
             continue
         fi
-        
+
         if [ "$next_is_http_password" -eq 1 ]; then
             http_password=$el
             next_is_http_password=0
             continue
         fi
-        
+
         if [ "$next_is_instance" -eq 1 ]; then
             instance=$el
             next_is_instance=0
             continue
         fi
-        
+
         if [ "$next_is_publication" -eq 1 ]; then
             publication=$el
             next_is_publication=0
             continue
         fi
-        
+
         if [ "$next_is_resource" -eq 1 ]; then
             resource=$el
             next_is_resource=0
             continue
         fi
-        
+
         if [ "$el" == "-t" -o "$el"  == "--type" ]; then
             next_is_type=1
             continue
@@ -624,21 +638,21 @@ function set_type_command_and_instance() {
         else
             next_is_publication=0
         fi
-        
+
         if [ "$el" == "-r" -o "$el" == "--publication-resource" ]; then
             next_is_resource=1
             continue
         else
             next_is_resource=0
         fi
-        
+
         if [ "$el" == "-u" -o "$el" == "--user" ]; then
             next_is_http_user=1
             continue
         else
             next_is_http_user=0
         fi
-        
+
         if [ "$el" == "-w" -o "$el" == "--password" ]; then
             next_is_http_password=1
             continue
@@ -671,7 +685,7 @@ function set_type_command_and_instance() {
              echo "Version:" $ece_scripts_version
              exit 0
         fi
-        
+
         # the only thing left at this point, is the command
         command="$command $el"
     done
@@ -682,7 +696,7 @@ function set_type_command_and_instance() {
     if [ "$instance" == "default" ]; then
         debug "Trying to determine instance name"
         local instance_list=$(get_instance_list)
-        
+
         if [ $(echo $instance_list | grep ' ' | wc -l) -eq 0 ]; then
             instance=$instance_list
             if [ -z "$instance" ] ; then
@@ -695,11 +709,11 @@ function set_type_command_and_instance() {
 
 function set_id() {
     if [ "$instance" == "default" ]; then
-        id="["`basename $0`"#${type}]"
+        id="["$(basename $0)"#${type}]"
     else
-        id="["`basename $0`"#${type}-${instance}]"
+        id="["$(basename $0)"#${type}-${instance}]"
     fi
-    
+
     debug type is $type \
         and command is $command \
         and instance is $instance
@@ -707,33 +721,33 @@ function set_id() {
 
 function get_status() {
     if [ -z "$type_pid" ]; then
-        echo "$(red DOWN)"
+        echo "DOWN"
         exit 0
     elif [ -r $pid_file ]; then
-        
+
         if [ "$type_pid" != `cat $pid_file` ]; then
-            echo "Is running, but was not started with `basename $0`"
+            echo "Is running, but was not started with $(basename $0)"
             echo "system PID $ece_id differs from the PID in $pid_file"
             exit 1
         fi
     else
         echo $pid_file "did not exist, "
         echo "the ${instance} instance of ${type} is running with PID $type_pid"
-        echo "but hasn't been started properly with `basename $0`"
+        echo "but hasn't been started properly with $(basename $0)"
         exit 1
     fi
 
-    now=`date +%s`
-    started=`stat -c %Y $pid_file`
-    seconds=$(( now - started ))
-    days=$(( seconds / ( 60 * 60 * 24 ) ))
-    seconds_left=$(( seconds - ( $days * 60 * 60 * 24 ) ))
-    hours=$(( seconds_left / ( 60 * 60 ) ))
-    seconds_left=$(( seconds_left - ( $hours * 60 * 60 ) ))
-    minutes=$(( seconds_left / 60 ))
-    seconds_left=$(( seconds_left - $minutes * 60 ))
+    local now=`date +%s`
+    local started=`stat -c %Y $pid_file`
+    local seconds=$(( now - started ))
+    local days=$(( seconds / ( 60 * 60 * 24 ) ))
+    local seconds_left=$(( seconds - ( $days * 60 * 60 * 24 ) ))
+    local hours=$(( seconds_left / ( 60 * 60 ) ))
+    local seconds_left=$(( seconds_left - ( $hours * 60 * 60 ) ))
+    local minutes=$(( seconds_left / 60 ))
+    local seconds_left=$(( seconds_left - $minutes * 60 ))
 
-    echo "$(green UP)" ${days}d ${hours}h ${minutes}m ${seconds_left}s
+    echo "UP" ${days}d ${hours}h ${minutes}m ${seconds_left}s
 }
 
 function read_rc_file_if_present() {
@@ -753,15 +767,7 @@ function show_all_publications() {
   set_type_port
   print "These are all the publications on ${instance}:"
   get_publication_list ${port}
-}  
-
-function show_all_deployments() {
-  print "These are all the deployments made on ${instance}:"
-  local log=$(get_deployment_log)
-  if [ -r $log ]; then
-    cat $log
-  fi
-}  
+}
 
 init
 read_rc_file_if_present
@@ -798,9 +804,6 @@ for el in $command; do
         list-publications)
             show_all_publications
             ;;
-        list-deployments)
-            show_all_deployments
-            ;;
         outlog)
             tail_out_log
             ;;
@@ -860,4 +863,3 @@ for el in $command; do
 done
 
 exit 0
-

From c90bd2d531187de342e92f53b98c1b7ceb787c19 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 14 Jan 2013 16:31:35 +0100
Subject: [PATCH 1890/2585] - added support for having the EAE .cfg
 configuration files in a   different directory than inside the exploded EAE
 webapps (!) that   was the only way up until EAE version 2.1.7

- the default location of the EAE configuration is now
  /etc/escenic/analysis

- before, ece-install::install_analysis_server copied the WARs twice
  for no reason. This has now been fixed.

- removed trailing white space.
---
 .../ece-install.d/analysis-engine.sh          | 81 ++++++++++++-------
 1 file changed, 51 insertions(+), 30 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh
index 4b44ca14..bcaf6a90 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh
@@ -1,15 +1,9 @@
-# ece-install module for installing EAE
+# ece-install module for installing Escenic Analysis Engine (EAE),
+# also known as "Stats".
 
 function install_analysis_server() {
   run_hook install_analysis_server.preinst
-  
   print_and_log "Installing an analysis server on $HOSTNAME ..."
-  type=analysis
-  
-  install_ece_instance "analysis1"
-
-  run cp ${escenic_root_dir}/analysis-engine-*/wars/*.war \
-    ${tomcat_base}/webapps
 
   if [ -n "${fai_analysis_host}" ]; then
     appserver_host=${fai_analysis_host}
@@ -17,32 +11,68 @@ function install_analysis_server() {
   if [ -n "${fai_analysis_port}" ]; then
     appserver_port=${fai_analysis_port}
   fi
-  
+
+  type=analysis
+  install_ece_instance "analysis1"
+
   # deploy the EAE WARs
   run cp ${escenic_root_dir}/analysis-engine-*/wars/*.war \
     ${tomcat_base}/webapps
 
   set_correct_permissions
-  
-  local ece_command="ece -i ${instance_name} -t ${type} restart"
-  su - $ece_user -c "$ece_command" 1>>$log 2>>$log
-  exit_on_error "su - $ece_user -c \"$ece_command\""
-
-  local seconds=25
-  print_and_log "Waiting ${seconds} seconds for EAE to come up ..."
-  sleep $seconds
-  
+  set_up_analysis_conf
+  set_up_analysis_plugin_nursery_conf
+
+  run su - $ece_user -c "ece -i ${instance_name} -t ${type} restart"
+  run_hook install_analysis_server.postinst
+}
+
+## $1 :: WAR
+## $2 :: path to file inside WAR
+## $3 :: target file
+function extract_path_from_war_if_target_file_doesnt_exist() {
+  local war=$1
+  local path=$2
+  local file=$3
+
+  if [ ! -e $file ]; then
+    make_dir $(dirname $file)
+    (
+      run cd $(dirname $file)
+      run jar xf $war $path
+      run mv $path $file
+      run rmdir $(dirname $path)
+      run rmdir $(dirname $(dirname $path))
+    )
+  fi
+}
+
+## This is EAE's own configuration, not the ECE plugin part, see
+## set_up_analysis_plugin_nursery_conf
+function set_up_analysis_conf() {
+
   # EAE cannot handle .cfg files with quotes values (!)
   dont_quote_conf_values=1
-  
+
+  # First, configure EAE reports
   print_and_log "Configuring EAE Reports ..."
-  local file=${tomcat_base}/webapps/analysis-reports/WEB-INF/config/reports.cfg
+  # extract cfg files if the don't exist already
+  local file=${escenic_conf_dir}/analysis/reports.cfg
+  local path=WEB-INF/config/reports.cfg
+  local war=${escenic_root_dir}/analysis-engine-*/wars/analysis-reports.war
+  extract_path_from_war_if_target_file_doesnt_exist $war $path $file
+
   set_conf_file_value queryServiceUrl \
     http://${appserver_host}:${appserver_port}/analysis-qs/QueryService \
     ${file}
 
+  # Second, configure EAE Logger
   print_and_log "Configuring EAE Logger ..."
-  local file=${tomcat_base}/webapps/analysis-logger/WEB-INF/config/logger.cfg
+  local war=${escenic_root_dir}/analysis-engine-*/wars/analysis-logger.war
+  local path=WEB-INF/config/logger.cfg
+  local file=${escenic_conf_dir}/analysis/logger.cfg
+  extract_path_from_war_if_target_file_doesnt_exist $war $path $file
+
   set_conf_file_value databaseQueueManager.reinsertcount \
     6 \
     ${file}
@@ -58,14 +88,6 @@ function install_analysis_server() {
   # important to turn this off here, it's only for the EAE .cfg
   # files, see above.
   dont_quote_conf_values=0
-
-  # touching web.xml to trigger a re-deploy of the EAE Reports
-  # application.
-  run touch ${tomcat_base}/webapps/analysis-reports/WEB-INF/web.xml
-
-  set_up_analysis_plugin_nursery_conf
-  
-  run_hook install_analysis_server.postinst
 }
 
 function set_up_analysis_plugin_nursery_conf() {
@@ -82,4 +104,3 @@ EOF
 
   print_and_log "EAE Nursery component configured in $file"
 }
-

From 53a721ae9f458f1c291ec052ef90b5ff35ee9439 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Mon, 14 Jan 2013 17:37:07 +0100
Subject: [PATCH 1891/2585] - fixed an error in the fai_un_install_everything
 profile where, where   it would complain because it would try to create the
 log file when   the parent log directories was already removed.

- removed trailing white space
---
 usr/sbin/ece-install | 132 +++++++++++++++++++++----------------------
 1 file changed, 66 insertions(+), 66 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index b9d2b5a2..d68382d1 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -121,7 +121,7 @@ function init() {
       exit 1
     }
   fi
-  
+
   # first, try to be nice
   local dir=$(dirname $0)/../share/escenic/ece-scripts
 
@@ -146,7 +146,7 @@ function init() {
     echo "I cannot find $(basename $0)'s dependencies, exiting :-("
     exit 1
   fi
-  
+
   # hooks for when the scirpt exits cleanly and when a user or someone
   # kills the process
   trap common_bashing_exit_hook EXIT
@@ -161,7 +161,7 @@ function download_escenic_components()
 
     print_and_log "Downloading software from technet.escenic.com ..."
     run cd $download_dir
-    
+
     for el in $technet_download_list $wf_download_list; do
       if [ -e $(basename $el) ]; then
         continue
@@ -171,23 +171,23 @@ function download_escenic_components()
       run wget $wget_opts \
         --http-user $technet_user \
         --http-password $technet_password \
-        $el 
+        $el
     done
 }
 
 # we need to do one apt-get update to be sure the package list is
 # fresh. However, we don't want to do this in a common method, since
-# it *might* be that all pre-requisite packages already are present. 
+# it *might* be that all pre-requisite packages already are present.
 one_time_apt_update_done=0
 
 # Will install the passed packages if these are not installed from
 # before.
 #
 # parameters:
-# $1 : space separated string of package names 
+# $1 : space separated string of package names
 function install_packages_if_missing() {
   log "Installing package(s) [$@] if missing ..."
-  
+
   if [ $on_debian_or_derivative -eq 1 ]; then
     some_are_missing=0
     for el in $@; do
@@ -198,7 +198,7 @@ function install_packages_if_missing() {
         some_are_missing=1
       fi
     done
-    
+
     if [ $some_are_missing -eq 0 ]; then
       return
     elif [ $one_time_apt_update_done -eq 0 ]; then
@@ -225,7 +225,7 @@ function install_common_os_packages()
   print_and_log "Installing common OS packages ..."
   local packages="curl wget unzip bc ca-certificates"
   local git_package=git
-  
+
   if [ $on_debian_or_derivative -eq 1 ]; then
     # Ubuntu doesn't have git (!) but only git-core.
     if [ $on_ubuntu -eq 1 ]; then
@@ -233,7 +233,7 @@ function install_common_os_packages()
     fi
     packages="${packages} bind9-host"
   fi
-  
+
   install_packages_if_missing $packages $git_package
   assert_commands_available lsb_release curl host wget git unzip
 
@@ -250,7 +250,7 @@ function install_common_os_packages()
     fi
     install_packages_if_missing escenic-common-scripts
   fi
-  
+
 }
 
 # don't quote values when setting conf file values with
@@ -278,7 +278,7 @@ function ensure_domain_is_known_to_local_host() {
   if [ -z "$1" ]; then
     return 1
   fi
-  
+
   local hostname_ip=$(ping -c 1 $HOSTNAME 2>/dev/null | \
     head -1 | \
     cut -d'(' -f2 | \
@@ -309,7 +309,7 @@ EOF
   fi
 }
 
-# last, give the control back to the ECE user & group 
+# last, give the control back to the ECE user & group
 function set_correct_permissions()
 {
   log "Setting correct permissions on ECE related directories ..."
@@ -318,7 +318,7 @@ function set_correct_permissions()
     if [ ! -d $el ]; then
       continue
     fi
-    
+
     if [ ${el} = ${escenic_data_dir} ]; then
       local correct_permission=$(find ${el} \
         -maxdepth 0 \
@@ -388,15 +388,15 @@ function check_for_required_downloads()
   if [ $ece_software_setup_completed -eq 1 ]; then
     return
   fi
-  
+
   print_and_log "Asserting that required downloads succeeded ..."
   local required_escenic_packages="engine assemblytool"
   if [ $install_profile_number -eq $PROFILE_ANALYSIS_SERVER ]; then
     required_escenic_packages="analysis-engine"
   fi
-  
+
   local some_is_missing=0
-  
+
   for el in $required_escenic_packages; do
     if [ $(ls $download_dir/$el*.{zip,jar} 2>/dev/null | wc -l) -lt 1 ]; then
       print_and_log "-> $el is missing"
@@ -424,7 +424,7 @@ function check_for_required_downloads()
 function set_up_user_environment()
 {
   local bashrc=$(get_user_home_directory $ece_user)/.bashrc
-  
+
   if [ $(grep bash_completion.d/ece ${bashrc} 2>/dev/null | \
     wc -l) -lt 1 ]; then
     cat >> ${bashrc} <<EOF
@@ -436,12 +436,12 @@ EOF
 
   # Having the EDITOR variable set is requirement for several
   # commmands, including running:
-  # 
+  #
   # 'ece -i <instance> -p <publication> -r <resource> edit'
   if [ $(grep EDITOR ${bashrc} 2>/dev/null | wc -l) -lt 1 ]; then
     echo "export EDITOR=vi" >> ${bashrc}
   fi
-  
+
   if [ $(grep ECE_CONF_LOCATIONS ${bashrc} | wc -l) -eq 0 ]; then
     echo "export ECE_CONF_LOCATIONS=\"$escenic_conf_dir\"" >> ${bashrc}
     run chown ${ece_user}:${ece_group} ${bashrc}
@@ -465,7 +465,7 @@ function read_user_input()
 "$PROFILE_RESTORE_FROM_BACKUP - Restore from backup"\
 " (DB, data files, binaries, conf & publications)"
     )
-    
+
     echo "Hi, which server profile do you wish to install?"$'\n'
 
     for (( i = 0; i < ${#installation_profiles[@]}; i++ )); do
@@ -475,7 +475,7 @@ function read_user_input()
     echo $'\n'"Select 1-${#installation_profiles[@]} and press ENTER"
     echo -n "Your choice [1]> "
     read install_profile_number
-    
+
     if [ -z "$install_profile_number" ]; then
         install_profile_number=$PROFILE_ALL_IN_ONE
     fi
@@ -496,7 +496,7 @@ function assert_correct_runtime_environment()
     create_pid
     started=`stat -c %Y $pid_file`
     create_lock
-    
+
     if [ ! -e "$conf_file" ]; then
       print_and_log $conf_file "doesn't exist." \
         "I cannot live without it, so I'm exiting :-("
@@ -514,9 +514,9 @@ function check_software_credentials() {
   if [ ${fai_offline_mode-0} -eq 1 ]; then
     return
   fi
-  
+
   print_and_log "Verifying that Technet credentials are OK ..."
-  
+
   local url=http://technet.escenic.com
   local notok=$(
     is_unauthorized_to_access_url \
@@ -537,7 +537,7 @@ function check_software_credentials() {
 
   # if the WF credentials are set, we check to see if they're OK
   if [ -n "${wf_user}" -a -n "${wf_password}" ]; then
-    print_and_log "Verifying that Widget Framework credentials are OK ..." 
+    print_and_log "Verifying that Widget Framework credentials are OK ..."
     local url=http://repo.escenic.com
     local notok=$(
       is_unauthorized_to_access_url \
@@ -569,7 +569,7 @@ function common_pre_install()
     # These variables are placed here as all the directories can be
     # overridden in ece-install.conf
     common_nursery_dir=$escenic_conf_dir/engine/common
-    
+
     # Because of issue VF-3559, we also create the default family and
     # host directories (fixed in 5.4.0.x).
     engine_dir_list="
@@ -598,7 +598,7 @@ function common_pre_install()
     if [ -e /etc/debian_version -a -x /usr/bin/dpkg ]; then
         on_debian_or_derivative=1
         export DEBIAN_FRONTEND=noninteractive
-        
+
       # chicken and the egg problem, we need lsb_release to install the
       # packages later on, hence as soon as we know we've got a Debian
       # based platform, we install lsb-release. Also note, the
@@ -618,7 +618,7 @@ function common_pre_install()
 
     check_software_credentials
     assert_commands_available lsb_release
-    
+
     if [ $(lsb_release -i | grep Ubuntu | wc -l) -gt 0 ]; then
         on_ubuntu=1
     elif [ $(lsb_release -i | grep Debian | wc -l) -gt 0 ]; then
@@ -629,7 +629,7 @@ function common_pre_install()
     # installed. As this happens on RedHat/CentOS 5.7, we turn it off
     # here.
     export GIT_SSL_NO_VERIFY=true
-    
+
     make_dir $download_dir
     install_common_os_packages
     create_user_and_group_if_not_present $ece_user $ece_group
@@ -763,7 +763,7 @@ function run_hook()
         # or may not be useful. Furthermore, we filter out upper case
         # variables as these are environment variables.
         set | grep ^[a-z] | grep \= > ${ece_install_env}
-        
+
         print_and_log "Started hook  $1 ..."
         bash ${ece_install_scripts_dir}/${1}
         print_and_log "Finished hook $1 ..."
@@ -815,9 +815,9 @@ function add_server_to_runlevels()
     print_and_log "Adding the ece init.d script to the default run levels ..."
     run update-rc.d ece defaults
   elif [ $on_redhat_or_derivative -eq 1 ]; then
-    run chkconfig --level 35 ece on      
+    run chkconfig --level 35 ece on
   else
-    add_next_step "Remember to add /etc/init.d/ece to the desired run levels." 
+    add_next_step "Remember to add /etc/init.d/ece to the desired run levels."
     # TODO add init.d to the default runlevels, for other
     # distributions too:
     # - Gentoo: rc-update add ece default
@@ -848,7 +848,7 @@ function common_post_install() {
 
   install_system_info
   set_correct_permissions
-  
+
   print_status_and_next_steps
 }
 
@@ -870,10 +870,10 @@ function un_install_everything() {
     munin-plugins-extra
     munin-java-extra
     nginx
-    percona-server-client                
-    percona-server-client-5.5            
-    percona-server-common-5.5            
-    percona-server-server                
+    percona-server-client
+    percona-server-client-5.5
+    percona-server-common-5.5
+    percona-server-server
     percona-server-server-5.5
     varnish
     sun-java6-jdk
@@ -911,25 +911,26 @@ function un_install_everything() {
   fi
 
   for el in $file_to_remove_list; do
-    run rm -rf $el
+    fail_safe_run rm -rf $el
   done
 
   for el in $key_to_remove_list; do
     if [ $(apt-key list | grep $el | wc -l) -gt 0 ]; then
-      run apt-key remove $el
+      fail_safe_run apt-key remove $el
     fi
   done
-  
+
   for el in $remove_package_list; do
     if [ $(dpkg -l $el | grep ^ii | wc -l) -gt 0 ]; then
-      run apt-get --yes --purge remove $el
+      fail_safe_run apt-get --yes --purge remove $el
     fi
   done
 
-  run apt-get clean
+  fail_safe_run apt-get clean
 
-  print_and_log "Everything set up by $(basename $0) should now"
-  print_and_log "have been removed from ${HOSTNAME}."
+  # cannot log since we've removed the log and its directory too.
+  print "Everything set up by $(basename $0) should now"
+  print "have been removed from ${HOSTNAME}."
 }
 
 ece_install_trail_file=/var/lib/$(basename $0)/$(date +%s)-$(basename $0).trail
@@ -957,7 +958,7 @@ for el in $@; do
                 conf_file=$(pwd)/${conf_file}
                 ;;
         esac
-        
+
         next_is_conf_file=0
     fi
 done
@@ -968,10 +969,10 @@ assert_correct_runtime_environment
 if [ ${fai_enabled-0} -eq 1 ]; then
     print_and_log "Full Automatic Install (FAI) enabled."
     print_and_log "All user input will be read from $conf_file"
-    
+
     common_pre_install
     perform_dry_run_if_applicable
-    
+
     no_fai_profile=1
 
     if [ ${fai_un_install_everything-0} -eq 1 ]; then
@@ -993,62 +994,62 @@ if [ ${fai_enabled-0} -eq 1 ]; then
         install_all_in_one_environment
         no_fai_profile=0
     fi
-    
+
     if [ ${fai_db_install-0} -eq 1 ]; then
         install_profile_number=$PROFILE_DB_SERVER
         install_database_server
         no_fai_profile=0
     fi
-    
+
     if [ ${fai_editor_install-0} -eq 1 ]; then
         install_profile_number=$PROFILE_EDITORIAL_SERVER
         install_editorial_server
         no_fai_profile=0
     fi
-    
+
     if [ ${fai_search_install-0} -eq 1 ]; then
         install_profile_number=$PROFILE_SEARCH_SERVER
         install_search_server
         no_fai_profile=0
     fi
-    
+
     if [ ${fai_wf_install-0} -eq 1 ]; then
         install_profile_number=$PROFILE_WIDGET_FRAMEWORK
         install_widget_framework
         no_fai_profile=0
     fi
-    
+
     if [ ${fai_presentation_install-0} -eq 1 ]; then
         install_profile_number=$PROFILE_PRESENTATION_SERVER
         install_presentation_server
         no_fai_profile=0
     fi
-    
+
     if [ ${fai_cache_install-0} -eq 1 ]; then
         install_profile_number=$PROFILE_CACHE_SERVER
         install_cache_server
         install_web_server 0
         no_fai_profile=0
     fi
-    
+
     if [ ${fai_publication_create-0} -eq 1 ]; then
         install_profile_number=$PROFILE_CREATE_PUBLICATION
         create_publication
         no_fai_profile=0
     fi
-    
+
     if [ ${fai_monitoring_install-0} -eq 1 ]; then
         install_profile_number=$PROFILE_MONITORING_SERVER
         install_monitoring_server
         no_fai_profile=0
     fi
-    
+
     if [ ${fai_restore_from_backup-0} -eq 1 ]; then
         install_profile_number=$PROFILE_RESTORE_FROM_BACKUP
         restore_from_backup
         no_fai_profile=0
     fi
-    
+
     if [ ${fai_rmi_install-0} -eq 1 ]; then
         install_profile_number=$PROFILE_RMI_HUB
         install_rmi_hub
@@ -1061,7 +1062,7 @@ if [ ${fai_enabled-0} -eq 1 ]; then
       install_database_server
       no_fai_profile=0
     fi
-    
+
     # Important that the EAE is installed after all, editor and
     # presentation in case it's running on the same host as any of
     # them. This because it configures the EAE ECE plugin, which the
@@ -1072,13 +1073,13 @@ if [ ${fai_enabled-0} -eq 1 ]; then
         install_analysis_server
         no_fai_profile=0
     fi
-    
+
     if [ ${fai_nfs_server_install-0} -eq 1 ]; then
       install_profile_number=$PROFILE_NFS_SERVER
       install_nfs_server
       no_fai_profile=0
     fi
-    
+
     # checking for VIP profile last so that ece-install can (if so
     # configured in the ece-install.con) install all dependent
     # services first.
@@ -1087,7 +1088,7 @@ if [ ${fai_enabled-0} -eq 1 ]; then
       install_vip_provider
       no_fai_profile=0
     fi
-    
+
     if [ ${fai_db_daily_backup-0} -eq 1 ]; then
       install_profile_number=$PROFILE_DB_BACKUP_SERVER
       install_db_backup_server
@@ -1100,18 +1101,18 @@ if [ ${fai_enabled-0} -eq 1 ]; then
       # in the common_post_install function.
       no_fai_profile=0
     fi
-    
+
     if [ $no_fai_profile -eq 1 ]; then
         print_and_log "No install profile selected, be sure to have one of the "
         print_and_log "fai_<profile>_install=1 in your $conf_file"
         remove_pid_and_exit_in_error
     fi
-    
+
     common_post_install
 else
     read_user_input
     common_pre_install
-    
+
     case $install_profile_number in
         $PROFILE_ALL_IN_ONE)
             install_all_in_one_environment
@@ -1163,4 +1164,3 @@ else
 fi
 
 exit 0
-

From 010b872d6c9176769dd969af70b3dcf225cd2793 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 15 Jan 2013 15:40:41 +0100
Subject: [PATCH 1892/2585] - ece list-deployments now displays all the
 deployments for the given   ECE instance.

---
 usr/bin/ece | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/usr/bin/ece b/usr/bin/ece
index ca504d60..6c51c93b 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -769,6 +769,11 @@ function show_all_publications() {
   get_publication_list ${port}
 }
 
+function show_all_deployments() {
+  print "These are all the publications on ${instance}:"
+  cat $(get_deployment_log)
+}
+
 init
 read_rc_file_if_present
 set_type_command_and_instance $@
@@ -804,6 +809,9 @@ for el in $command; do
         list-publications)
             show_all_publications
             ;;
+        list-deployments)
+            show_all_deployments
+            ;;
         outlog)
             tail_out_log
             ;;

From 864c08e98caf67614f00afb01dcea3208d3e275f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 15 Jan 2013 15:50:41 +0100
Subject: [PATCH 1893/2585] - added significant cleaning of the HTTP headers
 before Varnish hits   the backend (i.e. ECE):

 We now remove all request headers before hitting the backend, except:

   - Host
   - User-Agent
   - X-Forwarded-For
   - Referer
   - Accept
   - X-OperaMini-Phone-UA

 The reason for this, is that we're optimising the device detection
 through the use of buckets. Hence, we must remove all headers that
 backend software (such as Mobiletech) may use to determine the client
 and by that deliver web content.
---
 .../ece-scripts/ece-install.d/cache-server.sh | 116 ++++++++++++++++++
 1 file changed, 116 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
index ad10e788..92fff030 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
@@ -264,6 +264,122 @@ sub vcl_recv {
     set req.http.User-Agent = "Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; VOSA 1.0)";
   }
 }
+
+/* We remove all request headers before hitting the backend, except:
+ * - Host
+ * - User-Agent
+ * - X-Forwarded-For
+ * - Referer
+ * - Accept
+ * - X-OperaMini-Phone-UA
+ *
+ * The reason for this, is that we're optimising the device detection
+ * through the use of buckets. Hence, we must remove all headers that
+ * backend software (such as Mobiletech) may use to determine the
+ * client and by that deliver web content. */
+sub vcl_miss {
+  remove bereq.http.accept-charset;
+  remove bereq.http.accept-encoding;
+  remove bereq.http.accept-language;
+  remove bereq.http.accept-ranges;
+  remove bereq.http.accounting-session-id;
+  remove bereq.http.apn;
+  remove bereq.http.authorization;
+  remove bereq.http.bearer-type;
+  remove bereq.http.cache-control;
+  remove bereq.http.charging-characteristics;
+  remove bereq.http.clientip;
+  remove bereq.http.client-ip;
+  remove bereq.http.connection;
+  remove bereq.http.content-disposition;
+  remove bereq.http.content-length;
+  remove bereq.http.content-range;
+  remove bereq.http.content-type;
+  remove bereq.http.cookie;
+  remove bereq.http.cookie2;
+  remove bereq.http.cuda_cliip;
+  remove bereq.http.date;
+  remove bereq.http.device-stock-ua;
+  remove bereq.http.dnt;
+  remove bereq.http.drm-version;
+  remove bereq.http.etag;
+  remove bereq.http.expires;
+  remove bereq.http.from;
+  remove bereq.http.if-modified-since;
+  remove bereq.http.if-none-match;
+  remove bereq.http.if-range;
+  remove bereq.http.ip-address;
+  remove bereq.http.last-modified;
+  remove bereq.http.location;
+  remove bereq.http.msisdn;
+  remove bereq.http.mt-proxy-id;
+  remove bereq.http.nas-ip-address;
+  remove bereq.http.origin;
+  remove bereq.http.pnp;
+  remove bereq.http.pragma;
+  remove bereq.http.proxy-connection;
+  remove bereq.http.range;
+  remove bereq.http.server;
+  remove bereq.http.set-cookie;
+  remove bereq.http.sgsn-ip-address;
+  remove bereq.http.transfer-encoding;
+  remove bereq.http.ua-cpu;
+  remove bereq.http.unless-modified-since;
+  remove bereq.http.vary;
+  remove bereq.http.via;
+  remove bereq.http.wap-connection;
+  remove bereq.http.x-amz-cf-id;
+  remove bereq.http.x-att-deviceid;
+  remove bereq.http.x-bluecoat-via;
+  remove bereq.http.x-cnection;
+  remove bereq.http.x-country-code;
+  remove bereq.http.x-d-forwarder;
+  remove bereq.http.x-ebo-ua;
+  remove bereq.http.x-ee-brand-id;
+  remove bereq.http.x-ee-client-ip;
+  remove bereq.http.x-flash-version;
+  remove bereq.http.x-forwarded-port;
+  remove bereq.http.x-forwarded-proto;
+  remove bereq.http.x-imforwards;
+  remove bereq.http.x-mcproxyfilter;
+  remove bereq.http.x-mobile-gateway;
+  remove bereq.http.x-network-type;
+  remove bereq.http.x-nokia-bearer;
+  remove bereq.http.x-nokiabrowser-features;
+  remove bereq.http.x-nokia-device-type;
+  remove bereq.http.x-nokia-ipaddress;
+  remove bereq.http.x-nokia-musicshop-bearer;
+  remove bereq.http.x-nokia-musicshop-version;
+  remove bereq.http.x-nokia-upgradeid;
+  remove bereq.http.x-ob;
+  remove bereq.http.x-online-host;
+  remove bereq.http.x-opera-id;
+  remove bereq.http.x-opera-info;
+  remove bereq.http.x-operamini-features;
+  remove bereq.http.x-operamini-phone;
+  remove bereq.http.x-operamini-route;
+  remove bereq.http.x-operator-domain;
+  remove bereq.http.x-orange-rat;
+  remove bereq.http.x-orange-roaming;
+  remove bereq.http.x-p2p-peerdist;
+  remove bereq.http.x-p2p-peerdistex;
+  remove bereq.http.x-piper-id;
+  remove bereq.http.x-powered-by;
+  remove bereq.http.x-proxy-id;
+  remove bereq.http.x-proxyuser-ip;
+  remove bereq.http.x-purpose;
+  remove bereq.http.x-rbt-optimized-by;
+  remove bereq.http.x-requested-with;
+  remove bereq.http.x-ucbrowser-phone;
+  remove bereq.http.x-ucbrowser-phone-ua;
+  remove bereq.http.x-ucbrowser-ua;
+  remove bereq.http.x-up-calling-line-id;
+  remove bereq.http.x-up_devcap-screendepth;
+  remove bereq.http.x-view-mode;
+  remove bereq.http.x-wap-network-client-msisdn;
+  remove bereq.http.x-wap-profile;
+  remove bereq.http.x-wap-profile-diff;
+}
 EOF
 }
 

From ce5ffad19ac99a6a45f77fa3a16e98c94ff665b2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 15 Jan 2013 15:54:47 +0100
Subject: [PATCH 1894/2585] - fixed a bug in common-bashing::green where the
 screen would be   cleared at the end of each call (the background for the
 bummer, was   to reset the SHELL environment after issuing BASH escapes).

- introduced more local variables in
  ece-install::print_status_and_next_steps to "bleed" less variables.
---
 usr/sbin/ece-install                          |  6 +--
 .../escenic/ece-scripts/common-bashing.sh     | 41 +++++++++----------
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index d68382d1..c5ced289 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -364,11 +364,11 @@ function print_status_and_next_steps()
     local seconds_left=$(( seconds_left - $minutes * 60 ))
 
     if [ $install_profile_number -ne $PROFILE_RESTORE_FROM_BACKUP ]; then
-        s="The installation is now $(green complete)!"
+      local message="The installation is now $(green complete)!"
     else
-        s="The restore is now complete!"
+      local message="The restore is now $(green complete)!"
     fi
-    print_and_log $s" It took" ${days}d ${hours}h ${minutes}m ${seconds_left}s
+    print_and_log "${message} It took" ${days}d ${hours}h ${minutes}m ${seconds_left}s
 
     if [ $install_profile_number -ne $PROFILE_RESTORE_FROM_BACKUP -a \
         $install_profile_number -ne $PROFILE_CACHE_SERVER -a \
diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index 3c40709f..2e9a3ba6 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -23,13 +23,13 @@ function common_bashing_is_loaded() {
 
 function get_seconds_since_start() {
   local seconds="n/a"
-  
+
   if [ -n "$pid_file" -a -r "$pid_file" ]; then
     now=`date +%s`
     started=`stat -c %Y $pid_file`
     seconds=$(( now - started ))
   fi
-  
+
   echo "$seconds"
 }
 
@@ -38,7 +38,7 @@ function get_id() {
     echo $id
     return
   fi
-  
+
   local timestamp=$(get_seconds_since_start)
   echo "[$(basename $0)-${timestamp}]"
 }
@@ -116,7 +116,7 @@ function remove_pid_and_exit_in_error() {
   if [ -w $log ]; then
     log_call_stack
   fi
-  
+
   kill $$
 }
 
@@ -138,7 +138,7 @@ function run() {
       kill $BASHPID
     }
   fi
-  
+
   "${@}" 1>>$log 2>>$log
   exit_on_error $@
 }
@@ -163,7 +163,7 @@ function is_number() {
       return
     fi
   done
-  
+
   echo 1
 }
 
@@ -181,7 +181,7 @@ function get_escaped_bash_string() {
 
 # Munin nodes need the IP of the munin gatherer to be escaped. Hence
 # this function.
-# 
+#
 # Parameters:
 #
 # $1 : the IP
@@ -212,7 +212,6 @@ function green() {
   else
     echo "$@"
   fi
-  tput clear
 }
 
 ## Returns the inputted string(s) as yellow
@@ -239,7 +238,7 @@ function get_base_dir_from_bundle()
 {
     local file_name=$(basename $1)
     suffix=${file_name##*.}
-    
+
     if [ ${suffix} = "zip" ]; then
         # we'll look inside the archive to determine the base_dir
         file_name=$(
@@ -264,22 +263,22 @@ function get_base_dir_from_bundle()
 
 ## Will assert that all the passed variable names are set, if not, it
 ## will exit in error.
-## 
+##
 ## $@ : a list of variable names
 ##
 ## Requires $conf_file to be set.
 function ensure_variable_is_set() {
   local requirements_failed=0
-  
+
   for el in $@; do
     if [ -n "$(eval echo $`echo $el`)" ]; then
       continue
     fi
-    
+
     print_and_log "You need to specifiy '$el' in your $conf_file"
     requirements_failed=1
   done
-  
+
   if [ $requirements_failed -eq 1 ]; then
     remove_pid_and_exit_in_error
   fi
@@ -295,7 +294,7 @@ function is_archive_healthy() {
     echo 0
     return
   fi
-  
+
   if [ $? -eq 0 ]; then
     echo 1
   else
@@ -336,7 +335,7 @@ next_steps=()
 function add_next_step() {
   next_steps[${#next_steps[@]}]="$@"
   return
-  
+
   if [ -n "$next_steps" ]; then
     next_steps=${next_steps}$'\n'"[$(basename $0)] "${1}
   else
@@ -386,10 +385,10 @@ function split_string() {
   if [[ -z $1 || -z $2 ]]; then
     return
   fi
-  
+
   local delimeter=$1
   shift;
-  
+
   local old_ifs=$IFS
   IFS=$delimeter
   read splitted_string <<< $@
@@ -406,8 +405,8 @@ function create_file_if_doesnt_exist() {
     return
   elif [ -e $1 ]; then
     return
-  fi    
-  
+  fi
+
   local dir=$(dirname $1)
 
   # since this method can be called really early in scripts, we cannot
@@ -422,7 +421,7 @@ function remove_file_if_exists() {
   elif [ ! -e $1 ]; then
     return
   fi
-  
+
   fail_safe_run rm $1
 }
 
@@ -492,7 +491,7 @@ function common_bashing_exit_hook() {
 ## Put this in your script to have it exit whenever the user hits the
 ## user pressing Ctrl+c or by someone sending a regular kill <PID>
 ## signal to it.
-## 
+##
 ## Usage:
 ## trap common_bashing_user_cancelled_hook SIGHUP SIGINT
 function common_bashing_user_cancelled_hook() {

From 1390d54e2b180df67197c14a05c2985375218c0d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 16 Jan 2013 09:32:55 +0100
Subject: [PATCH 1895/2585] - when creating the user agent buckets, we now
 check for Opera Mini   before Android as some user agents contain both.

---
 .../ece-scripts/ece-install.d/cache-server.sh    | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
index 92fff030..bf46f0ec 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
@@ -241,14 +241,23 @@ sub vcl_recv {
    * All iPhones are treated as the same one, all iPads as the same
    * iPad, all Opera Mini as the same one and all Android. If the
    * client (browser) is neither of the above, a common UA string is
-   * set. */
-
+   * set.
+   *
+   * We check for Opera Mini before Android as some user agents
+   * contain both.
+   */
   if (req.http.User-Agent ~ "iPhone") {
     set req.http.User-Agent = "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_3_3 like Mac OS X; en_us) AppleWebKit/525.18.1 (KHTML, like Gecko)";
   }
   else if (req.http.User-Agent ~ "iPad") {
     set req.http.User-Agent = "Mozilla/5.0 (iPad; U; CPU OS 4_3_2 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8H7 Safari/6533.18.5";
   }
+  else if (req.http.User-Agent ~ "Opera Mini" ||
+           req.http.User-Agent ~ "Opera Mobi") {
+    set req.http.User-Agent = "Opera/9.80 (J2ME/MIDP; Opera Mini/4.0.10031/28.3392; U; en) Presto/2.8.119 Version/11.10";
+    set req.http.X-OperaMini-Phone-UA = "NokiaX2-00/5.0 (08.35) Profile/MIDP-2.1 Configuration/CLDC-1.1 Mozilla/5.0 AppleWebKit/420+ (KHTML, like Gecko)
+Safari/420+";
+  }
   else if (req.http.User-Agent ~ "Android") {
     // we don't do anything for Android devices right now since there
     // are just too many different ones.
@@ -257,9 +266,6 @@ sub vcl_recv {
     // Android 2.0-2.4, however, we try to leave it be right now and
     // see how big the cache gets.
   }
-  else if (req.http.User-Agent ~ "Opera Mini") {
-    set req.http.User-Agent = "Opera/9.80 (J2ME/MIDP; Opera Mini/4.0.10031/28.3392; U; en) Presto/2.8.119 Version/11.10";
-  }
   else {
     set req.http.User-Agent = "Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; VOSA 1.0)";
   }

From d4ab5246314f4a88d3358acdd19cda518d206197 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Wed, 16 Jan 2013 11:32:49 +0100
Subject: [PATCH 1896/2585] vosa - added spore hook to dev image setup

---
 ...stall-hook-install-and-apply-spore.sh.tpml | 20 +++++++++++++++++++
 .../skeleton-dev/install.conf.tmpl            |  1 +
 2 files changed, 21 insertions(+)
 create mode 100755 usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-and-apply-spore.sh.tpml

diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-and-apply-spore.sh.tpml b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-and-apply-spore.sh.tpml
new file mode 100755
index 00000000..9937183c
--- /dev/null
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-and-apply-spore.sh.tpml
@@ -0,0 +1,20 @@
+#!/bin/bash -e
+
+echo "--- START : post install hook - install and apply spore ---"
+
+# import spores.key
+ssh -F \$2/ssh.conf root@guest 'curl http://apt.vizrt.com/spores.key | gpg --import'
+
+# install spore
+ssh -F \$2/ssh.conf root@guest 'apt-get install spore'
+
+# generate spore conf file
+ssh -F \$2/ssh.conf root@guest 'echo "spore_uri=$HOOKS_SPORE_URL" > /etc/spore-cronjob.conf'
+ssh -F \$2/ssh.conf root@guest 'echo "http_user=$FAI_BUILDER_HTTP_USER" >> /etc/spore-cronjob.conf'
+ssh -F \$2/ssh.conf root@guest 'echo "http_passwd=$FAI_BUILDER_HTTP_PASSWORD" >> /etc/spore-cronjob.conf'
+ssh -F \$2/ssh.conf root@guest 'echo "spore_signee=$HOOKS_SPORE_SIGNEE" >> /etc/spore-cronjob.conf'
+
+# apply spore
+ssh -F \$2/ssh.conf root@guest 'spore-download-and-apply'
+
+echo "--- END : post install hook - install and apply spore ---"
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/install.conf.tmpl b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/install.conf.tmpl
index b07ecdac..44654931 100644
--- a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/install.conf.tmpl
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/install.conf.tmpl
@@ -15,6 +15,7 @@ postinstall make-a-motd.sh
 
 postinstall ./hooks/post-install-hook-set-hostname.sh
 postinstall ./hooks/post-install-hook-set-password.sh
+postinstall ./hooks/post-install-hook-install-and-apply-spore.sh
 postinstall ./hooks/post-install-hook-copy-files.sh
 postinstall ./hooks/post-install-hook-install-java.sh
 postinstall ./hooks/post-install-hook-install-ece-install.sh

From f20c31a45ea8fc78777862fb353f72ff2d60d2c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Wed, 16 Jan 2013 11:38:29 +0100
Subject: [PATCH 1897/2585] vosa - fix for problem in apply patch hook

---
 .../skeleton-dev/hooks/post-install-hook-apply-patch.sh      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-apply-patch.sh b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-apply-patch.sh
index 91180652..13ae2992 100755
--- a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-apply-patch.sh
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-apply-patch.sh
@@ -30,7 +30,10 @@ ssh -F $2/ssh.conf root@guest  \
 
 # change ownership just to be sure
 ssh -F $2/ssh.conf root@guest  \
-   chown -R escenic: /opt/tomcat-*
+   chown -R escenic: /opt/tomcat-engine1
+
+ssh -F $2/ssh.conf root@guest  \
+   chown -R escenic: /opt/tomcat-search1
 
 echo "--- END : post install hook - apply patch ---"
 

From ee6abaa13c23ca98ad01ca61c2c0fd5c6287c881 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Wed, 16 Jan 2013 13:55:31 +0100
Subject: [PATCH 1898/2585] vosa - fix naming misstake

---
 ...stall-hook-install-and-apply-spore.sh.tmpl | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100755 usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-and-apply-spore.sh.tmpl

diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-and-apply-spore.sh.tmpl b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-and-apply-spore.sh.tmpl
new file mode 100755
index 00000000..9937183c
--- /dev/null
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-and-apply-spore.sh.tmpl
@@ -0,0 +1,20 @@
+#!/bin/bash -e
+
+echo "--- START : post install hook - install and apply spore ---"
+
+# import spores.key
+ssh -F \$2/ssh.conf root@guest 'curl http://apt.vizrt.com/spores.key | gpg --import'
+
+# install spore
+ssh -F \$2/ssh.conf root@guest 'apt-get install spore'
+
+# generate spore conf file
+ssh -F \$2/ssh.conf root@guest 'echo "spore_uri=$HOOKS_SPORE_URL" > /etc/spore-cronjob.conf'
+ssh -F \$2/ssh.conf root@guest 'echo "http_user=$FAI_BUILDER_HTTP_USER" >> /etc/spore-cronjob.conf'
+ssh -F \$2/ssh.conf root@guest 'echo "http_passwd=$FAI_BUILDER_HTTP_PASSWORD" >> /etc/spore-cronjob.conf'
+ssh -F \$2/ssh.conf root@guest 'echo "spore_signee=$HOOKS_SPORE_SIGNEE" >> /etc/spore-cronjob.conf'
+
+# apply spore
+ssh -F \$2/ssh.conf root@guest 'spore-download-and-apply'
+
+echo "--- END : post install hook - install and apply spore ---"

From 955ffee955b47077af8bb9898e0803062a4e3f66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Wed, 16 Jan 2013 14:20:08 +0100
Subject: [PATCH 1899/2585] vosa - clean up file rename

---
 ...stall-hook-install-and-apply-spore.sh.tpml | 20 -------------------
 1 file changed, 20 deletions(-)
 delete mode 100755 usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-and-apply-spore.sh.tpml

diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-and-apply-spore.sh.tpml b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-and-apply-spore.sh.tpml
deleted file mode 100755
index 9937183c..00000000
--- a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-and-apply-spore.sh.tpml
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash -e
-
-echo "--- START : post install hook - install and apply spore ---"
-
-# import spores.key
-ssh -F \$2/ssh.conf root@guest 'curl http://apt.vizrt.com/spores.key | gpg --import'
-
-# install spore
-ssh -F \$2/ssh.conf root@guest 'apt-get install spore'
-
-# generate spore conf file
-ssh -F \$2/ssh.conf root@guest 'echo "spore_uri=$HOOKS_SPORE_URL" > /etc/spore-cronjob.conf'
-ssh -F \$2/ssh.conf root@guest 'echo "http_user=$FAI_BUILDER_HTTP_USER" >> /etc/spore-cronjob.conf'
-ssh -F \$2/ssh.conf root@guest 'echo "http_passwd=$FAI_BUILDER_HTTP_PASSWORD" >> /etc/spore-cronjob.conf'
-ssh -F \$2/ssh.conf root@guest 'echo "spore_signee=$HOOKS_SPORE_SIGNEE" >> /etc/spore-cronjob.conf'
-
-# apply spore
-ssh -F \$2/ssh.conf root@guest 'spore-download-and-apply'
-
-echo "--- END : post install hook - install and apply spore ---"

From 76cc4c231c6cd07fd145434437a9334b46316c1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Wed, 16 Jan 2013 14:23:05 +0100
Subject: [PATCH 1900/2585] vosa - spore hook will now do apt-get update

---
 .../hooks/post-install-hook-install-and-apply-spore.sh.tmpl      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-and-apply-spore.sh.tmpl b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-and-apply-spore.sh.tmpl
index 9937183c..bc5233c5 100755
--- a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-and-apply-spore.sh.tmpl
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-and-apply-spore.sh.tmpl
@@ -6,6 +6,7 @@ echo "--- START : post install hook - install and apply spore ---"
 ssh -F \$2/ssh.conf root@guest 'curl http://apt.vizrt.com/spores.key | gpg --import'
 
 # install spore
+ssh -F \$2/ssh.conf root@guest 'apt-get update'
 ssh -F \$2/ssh.conf root@guest 'apt-get install spore'
 
 # generate spore conf file

From cb7efc376b3bf9bcb78dc5828ad3b99543eaf305 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Wed, 16 Jan 2013 14:43:39 +0100
Subject: [PATCH 1901/2585] Fixed $$ typo

---
 usr/bin/vosa | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 2cc1256d..4bc1bb21 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -1043,7 +1043,7 @@ function do_stop() {
 # Performs a graceful shutdown of the guest
 function shutdown_kvm() {
   local pidfile="$(echo_rundir_of $1)/$1.pid"
-  local pid=$(<$$pidfile)
+  local pid=$(<$pidfile)
   if [ -z "$pid" ] ; then
     rm $pidfile
     return 0

From 39c8eef16ba38e52fafc843557e3e7df9d502639 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 16 Jan 2013 11:10:35 +0100
Subject: [PATCH 1902/2585] - fixed long standing, obfuscated problem with the
 ece script   sometimes not being added to the default run levels. This was a 
  problem sometimes when running multiple installation profiles from   the
 same ece-install.conf.

  This caused two problems: the ECEs, EAE, search instances were not
  automatically started at boot time and various directories with
  wrong permissions didn't get fixed before the user ran the
  /etc/init.d/ece manually.

  We're now adding the ece script to the run levels regardless of the
  installation profile, since it's possible to install several
  profiles from the same run of ece-install and then it's not sure the
  test for a profile that needs the ece init.d script will succeed.

- argh, breaking lines. Fixed small bug in varnish VCL generation
---
 usr/sbin/ece-install                          | 23 ++++++-------------
 .../ece-scripts/ece-install.d/cache-server.sh |  3 +--
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index c5ced289..2d02da6d 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -801,16 +801,12 @@ function install_all_in_one_environment()
     create_publication
 }
 
-function add_server_to_runlevels()
-{
-  # no need to add init.d scripts to the runlevel(s) for these
-  # profiles
-  if [ $install_profile_number -eq $PROFILE_WIDGET_FRAMEWORK -o \
-    $install_profile_number -eq $PROFILE_DB_SERVER -o \
-    $install_profile_number -eq $PROFILE_CACHE_SERVER ]; then
-    return
-  fi
-
+## We're adding the ece script to the run levels regardless of the
+## installation profile, since it's possible to install several
+## profiles from the same run of ece-install and then it's not sure
+## the test for a profile that needs the ece init.d script will
+## succeed.
+function add_ece_init_to_runlevels() {
   if [ $on_debian_or_derivative -eq 1 ]; then
     print_and_log "Adding the ece init.d script to the default run levels ..."
     run update-rc.d ece defaults
@@ -825,12 +821,7 @@ function add_server_to_runlevels()
 }
 
 function common_post_install() {
-  if [ $install_profile_number -eq $PROFILE_ALL_IN_ONE -o \
-    $install_profile_number -eq $PROFILE_PRESENTATION_SERVER -o \
-    $install_profile_number -eq $PROFILE_RMI_HUB -o \
-    $install_profile_number -eq $PROFILE_EDITORIAL_SERVER ]; then
-    add_server_to_runlevels
-  fi
+  add_ece_init_to_runlevels
 
   if [ $install_profile_number -ne $PROFILE_WIDGET_FRAMEWORK -a \
     $install_profile_number -ne $PROFILE_CREATE_PUBLICATION -a \
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
index bf46f0ec..5cf1f2ca 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
@@ -255,8 +255,7 @@ sub vcl_recv {
   else if (req.http.User-Agent ~ "Opera Mini" ||
            req.http.User-Agent ~ "Opera Mobi") {
     set req.http.User-Agent = "Opera/9.80 (J2ME/MIDP; Opera Mini/4.0.10031/28.3392; U; en) Presto/2.8.119 Version/11.10";
-    set req.http.X-OperaMini-Phone-UA = "NokiaX2-00/5.0 (08.35) Profile/MIDP-2.1 Configuration/CLDC-1.1 Mozilla/5.0 AppleWebKit/420+ (KHTML, like Gecko)
-Safari/420+";
+    set req.http.X-OperaMini-Phone-UA = "NokiaX2-00/5.0 (08.35) Profile/MIDP-2.1 Configuration/CLDC-1.1 Mozilla/5.0 AppleWebKit/420+ (KHTML, like Gecko) Safari/420+";
   }
   else if (req.http.User-Agent ~ "Android") {
     // we don't do anything for Android devices right now since there

From d47480515901cc3e0f745e315e897da01fcf96ab Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 16 Jan 2013 13:14:50 +0100
Subject: [PATCH 1903/2585] - removed ece-install::get_instance_list as we now
 have   common-ece::get_instance_list, which also is better.

  Code re-use FTW!
---
 usr/sbin/ece-install | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 2d02da6d..5368f65b 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -731,20 +731,6 @@ function install_presentation_server()
     install_ece_instance $default_ece_intance_name $PROFILE_PRESENTATION_SERVER
 }
 
-# If the system is installed using the recommended paths, the method
-# will return a list of the instances configured in
-# ${escenic_conf_dir}/engine/instance
-function get_instance_list()
-{
-    local instance_list=""
-
-    if [ -r ${escenic_conf_dir}/engine/instance ]; then
-        instance_list=$(ls ${escenic_conf_dir}/engine/instance)
-    fi
-
-    echo $instance_list
-}
-
 function install_editorial_server()
 {
     print_and_log "Installing an editorial server on $HOSTNAME ..."
@@ -802,11 +788,15 @@ function install_all_in_one_environment()
 }
 
 ## We're adding the ece script to the run levels regardless of the
-## installation profile, since it's possible to install several
-## profiles from the same run of ece-install and then it's not sure
-## the test for a profile that needs the ece init.d script will
-## succeed.
+## installation profile (as long as the init.d script exists) since
+## it's possible to install several profiles from the same run of
+## ece-install and then it's not sure the test for a profile that
+## needs the ece init.d script will succeed.
 function add_ece_init_to_runlevels() {
+  if [ ! -x /etc/init.d/ece ]; then
+    return
+  fi
+
   if [ $on_debian_or_derivative -eq 1 ]; then
     print_and_log "Adding the ece init.d script to the default run levels ..."
     run update-rc.d ece defaults

From c0406a812c9c1f37a1fd30554d30fc55dbe02eae Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 16 Jan 2013 13:16:48 +0100
Subject: [PATCH 1904/2585] - rewrote the system-info-guide so that it can be
 exported to a UNIX   man page!

  I use contrib/org-e-man for this:

     (require 'org-e-man)

  And then M-x org-e-man-export-to-man

- fixed system-info so that it doesn't throw errors if the ece command
  cannot be found because of a dangling /etc/default/ece

- added common-ece::get_instance_enabled_list, as a complement to
  common-ece::get_instance_list which returns all the installed
  instances on the system.

- removed unused parsing and setting of instance

- clarified header (no TODO anymore, this is done in ece-install, now
  more informational).
---
 usr/bin/system-info                           |  28 ++---
 usr/share/doc/escenic/system-info-guide.org   | 116 +++++++-----------
 usr/share/escenic/ece-scripts/common-ece.sh   |  37 +++++-
 .../system-info.d/11-list-ece-overview.sh     |  51 +++-----
 4 files changed, 111 insertions(+), 121 deletions(-)

diff --git a/usr/bin/system-info b/usr/bin/system-info
index 9e71b012..bc1297c0 100755
--- a/usr/bin/system-info
+++ b/usr/bin/system-info
@@ -5,8 +5,9 @@
 ##
 ## $ system-info -i engine1 | xmllint --format - > /var/www/engine1.html
 ##
-## TODO:
-## Add this to /etc/cronttab
+## Add this to /etc/cronttab if you want it to create an HTML report
+## every minute:
+##
 ## echo '* *     * * *   root    system-info -f html > /var/www/index.html' >> /etc/crontab
 
 ece_user=""
@@ -27,7 +28,7 @@ log=$HOME/.$(basename $0).log
 function init() {
   # first, try to be nice
   ece_scripts_dir=$(dirname $0)/../share/escenic/ece-scripts
-  
+
   # then check the standard location
   if [ ! -d $ece_scripts_dir  ]; then
     ece_scripts_dir=/usr/share/escenic/ece-scripts
@@ -66,7 +67,7 @@ function get_indent() {
   else
     local number_of_indents=$current_indent_level
   fi
-  
+
   for (( i = 0; i < $number_of_indents; i++ )); do
     result="${INDENT}$result"
   done
@@ -76,7 +77,7 @@ function get_indent() {
 
 function create_header() {
   local title="Overview of $HOSTNAME"
-  
+
   if [ $format == "html" ]; then
 cat <<EOF
 
@@ -133,7 +134,7 @@ EOF
 
 function wrap_in_anchor_if_applicable() {
   local result=""
-  
+
   if [ $format == "html" ]; then
     for el in "$@"; do
       if [[ $el == "/"* || $el == "http://"* || $el == "mysql://"* ]]; then
@@ -192,12 +193,12 @@ function print_list_item() {
 function json_escape_string() {
   echo "$@" | sed 's/\"/\\"/g'
 }
- 
+
 function print_pre_text() {
   if [ $format == "org" ]; then
     cat <<EOF
 #+BEGIN_SRC sh
-$@  
+$@
 #+END_SRC
 EOF
   elif [ $format == "html" ]; then
@@ -317,7 +318,7 @@ EOF
     local LINE_WRAP=72
     local line=""
     text=""
-    
+
     for el in $@; do
       local tmp_line="${line} ${el}"
       # wrap the line when it becomes too long
@@ -345,12 +346,9 @@ function get_user_options() {
       exit 0
     fi
   done
-  
+
   while getopts ":d:o:i:f:u:mvst" opt; do
     case $opt in
-      i)
-        instance=${OPTARG}
-        ;;
       v)
         verbose=1
         ;;
@@ -386,7 +384,7 @@ function get_user_options() {
         ;;
     esac
   done
-  
+
 }
 
 init
@@ -394,5 +392,3 @@ get_user_options $@
 create_header
 run_system_info_modules
 create_footer
-
-
diff --git a/usr/share/doc/escenic/system-info-guide.org b/usr/share/doc/escenic/system-info-guide.org
index 4eff23f7..6be4d50d 100644
--- a/usr/share/doc/escenic/system-info-guide.org
+++ b/usr/share/doc/escenic/system-info-guide.org
@@ -1,82 +1,60 @@
-Welcome to the /usr/bin/system-info Guide
+#+TITLE: The system-info Guide
+#+AUTHOR: Vizrt Online / The SaaS Team
 
-This wee script gives a overview of your system, especially useful
-when contacting Vizrt Online/Escenic Support.
+* NAME
+system-info
 
-#+BEGIN_SRC sh
-$ system-info
-#+END_SRC
-
-The script will default wise produce a plain text report, but if you
-pass -c or --confluence to it, it will generate Confluence Wiki markup
-instead.
+* SYNOPSIS
+system-info [[[-o output-file]]] [[[-u user]]] [[[-t]]] [[[-m]]] [[[-s]]] [[[-v]]] [[[-V]] | [[-V][--version]]]
 
-* Example
-Here you can see an example of the output generated from system-info:
+* DESCRIPTION
+system-info is a command that creates an overview of your system,
+specially crafted for Escenic installations, but also of great value
+for any UNIX or GNU/Linux system.
 
-#+BEGIN_SRC text
-#########################################################################
-System details for quanah
-#########################################################################
+** -t
+Report an import job overview
 
-#########################################################################
-Kernel version
-#########################################################################
-Linux quanah 3.0.0-1-amd64 #1 SMP Sat Aug 27 16:21:11 UTC 2011 x86_64 GNU/Linux
+** -m
+Output one report file per module.
 
-#########################################################################
-Distribution information
-#########################################################################
-Debian or derivate, version wheezy/sid
+** -o output-file
+The file to output the report t
 
-#########################################################################
-Database details
-#########################################################################
-/usr/sbin/mysqld  Ver 5.1.58-1 for debian-linux-gnu on x86_64 ((Debian))
+** -u user
+The user to run the ece commands. This is required when running
+system-info as root.
 
-#########################################################################
-Java version
-#########################################################################
-java version "1.6.0_26"
-Java(TM) SE Runtime Environment (build 1.6.0_26-b03)
-Java HotSpot(TM) 64-Bit Server VM (build 20.1-b02, mixed mode)
+* -s
+Do not show temporaries, i.e. values that change often, like dates
+and uptime.
 
-#########################################################################
-Important packages
-#########################################################################
-ant                                      1.8.2-4                              Java based build tool like make
-libapr1                                  1.4.5-1                              Apache Portable Runtime Library
-libmysql-java                            5.1.16-2                             Java database (JDBC) driver for MySQL
-libtcnative-1                            1.1.22-1                             Tomcat native library using the apache portable runtime
-maven2                                   2.2.1-10                             Java software project management and comprehension tool
-mysql-server                             5.1.58-1                             MySQL database server (metapackage depending on the latest version)
-nginx                                    1.1.4-2                              small, but very powerful and efficient web server and mail proxy
-sun-java6-jdk                            6.26-3                               Sun Java(TM) Development Kit (JDK) 6
-sun-java6-jre                            6.26-3                               Sun Java(TM) Runtime Environment (JRE) 6 (architecture independent files)
-tomcat6-user                             6.0.32-6                             Servlet and JSP engine -- tools to create user instances
-varnish                                  3.0.1-1~squeeze1                     state of the art, high-performance web accelerator
+* -v
+Verbose
 
-#########################################################################
-Processors
-#########################################################################
-Processor type:  Intel(R) Core(TM)2 Duo CPU P8600 @ 2.40GHz
-Number of processors/cores: 1
+* -V
+Shows the version of system-info
 
-#########################################################################
-Memory
-#########################################################################
-Total memory:  3792504 kB
-Free memory:  339096 kB
+* Running as a regular user
+Running as a regular user, creating an HTML report:
+#+BEGIN_SRC sh
+$ system-info -f html > report.html
+#+END_SRC
 
-#########################################################################
-Disk Storage
-#########################################################################
-Filesystem     Type     Size  Used Avail Use% Mounted on
-/dev/sda3      ext3     141G  127G  7.2G  95% /
-tmpfs          tmpfs    5.0M  8.0K  5.0M   1% /lib/init/rw
-tmpfs          tmpfs    371M  812K  370M   1% /run
-udev           tmpfs    1.9G     0  1.9G   0% /dev
-tmpfs          tmpfs    741M  420K  741M   1% /run/shm
-shmfs          tmpfs    1.9G   12K  1.9G   1% /lib/init/rw/splashy
-/dev/sda2      hfsplus   96G   89G  6.3G  94% /mnt/mac
+* Running as the root user
+When running system-info as the root user, more OS information
+will be printed. When running as root, you must specify the user to
+run the queries to ece as:
+#+BEGIN_SRC sh
+# system-info -u escenic -f html \\
+  > /var/www/system-info/report.html
 #+END_SRC
+
+* COPYRIGHT
+Copyright 2011-2013 Vizrt
+
+Licensed under the Apache License, Version 2.0, see
+https://github.com/vizrt/ece-scripts/COPYING for further details.
+
+* AUTHOR
+Torstein Krause Johansen
diff --git a/usr/share/escenic/ece-scripts/common-ece.sh b/usr/share/escenic/ece-scripts/common-ece.sh
index c45002ff..cef97c29 100644
--- a/usr/share/escenic/ece-scripts/common-ece.sh
+++ b/usr/share/escenic/ece-scripts/common-ece.sh
@@ -28,6 +28,39 @@ function get_instance_list() {
   echo $instance_list
 }
 
+function get_instance_enabled_list() {
+  if [ ! -r /etc/default/ece ]; then
+    return
+  fi
+
+  echo ${engine_instance_list} \
+    ${search_instance_list} \
+    ${analysis_instance_list}
+}
+
+## $1 :: the instance you want to check which type it is.
+function get_instance_type() {
+  local type="engine"
+
+  if [ -e /etc/default/ece ]; then
+    source /etc/default/ece
+
+    for el in "$analysis_instance_list"; do
+      if [[ "$(ltrim $el)" == "$1" ]]; then
+        type=analysis
+      fi
+    done
+
+    for el in "$search_instance_list"; do
+      if [[ "$(ltrim $el)" == "$1" ]]; then
+        type=search
+      fi
+    done
+  fi
+
+  echo $type
+}
+
 webapps_in_standard_webapps_list="
   dashboard
   escenic
@@ -73,13 +106,13 @@ function get_app_base() {
 }
 
 ## Returns a list of publications on the local host
-## 
+##
 ## $1 :: app server port. Optional, default is 8080.
 function get_publication_list() {
   if [ $(which curl | wc -l) -lt 1 ]; then
     return ""
   fi
-  
+
   curl --silent \
     --connect-timeout 20 \
     http://localhost:${1-8080}/escenic-admin/pages/publication/list.jsp | \
diff --git a/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh b/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
index d1b330bb..b202f8ca 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
@@ -1,31 +1,16 @@
 #! /usr/bin/env bash
 
 # by tkj@vizrt.com
-function get_instance_type() {
-  local type="engine"
-
-  if [ -e /etc/default/ece ]; then
-    source /etc/default/ece
-
-    for el in "$analysis_instance_list"; do
-      if [[ "$(ltrim $el)" == "$1" ]]; then
-        type=analysis
-      fi
-    done
-  fi
-  
-  echo $type
-}
 
 ## $1 is the instance name
 function create_ece_overview() {
   local type=$(get_instance_type $1)
-  
+
   if [ $(whoami) == "root" ]; then
     if [ -n "$ece_user" ]; then
       local command="ece -q -i $1 info -t $type"
       local data="$(su - $ece_user -c " $command ")"$'\n'
-      
+
       command="ece -q -i $1 status"
       if [ "UP" == "$(su - $ece_user -c "$command" | cut -d' ' -f1)" ]; then
         command="ece -q -i $1 -t $type versions"
@@ -34,13 +19,13 @@ function create_ece_overview() {
     fi
   else
     local data="$(ece -q -i $1 info)"$'\n'
-    
+
     if [ "UP" == "$(ece -q -i $1 status -t $type | cut -d' ' -f1)" ]; then
       data="$data $(ece -q -i $1 versions -t $type | cut -d'*' -f2-)"
     fi
   fi
-  
-  
+
+
   echo "$data" | while read line; do
     if [[ $line == "|->"* ]]; then
       print_list_item $(wrap_in_anchor_if_applicable ${line:3})
@@ -52,7 +37,7 @@ function create_ece_overview() {
       print_un_ordered_list_start
     fi
   done
-  
+
   print_un_ordered_list_end
 
   if [ ${temporaries-1} -eq 1 ]; then
@@ -79,8 +64,7 @@ function list_error_overview_for_instance() {
 }
 
 function get_overview_of_all_instances() {
-  local instance_list=$(get_instance_list)
-
+  local instance_list=$(get_instance_enabled_list)
   if [ -z "$instance_list" ]; then
     return
   fi
@@ -101,9 +85,9 @@ function check_picture_file() {
 
   if [ ! -e $1 ]; then
     print_p_text "Picture file doesn't exist: $1"
-    return 
+    return
   fi
-  
+
   local alternative=$(find $dir -maxdepth 1 | grep -i "$file_name")
 
   # first check if the image is size=0
@@ -133,29 +117,29 @@ function check_picture_file() {
 function list_sax_errors() {
   local file=/var/log/escenic/${1}-messages
   local result="$(grep ^'Caused by: org.xml.sax.SAXParseException:' $file | sort | uniq)"
-  
+
   if [ -z $result ]; then
     return
   fi
-  
+
   print_p_text "There are illegal elements, attributes" \
     "and/or contents in the XML:"
   print_pre_text "$result"
-}  
+}
 
 function list_import_overview_for_instance() {
   if [ ${generate_import_job_overview-0} -eq 0 ]; then
     return
   fi
-  
+
   local file=/var/log/escenic/${1}-messages
-  
+
   if [ ! -e $file ]; then
     return
   fi
-  
+
   print_h4_header "Overview of ${1}'s import jobs"
-  
+
   grep "Invalid image file" $file | \
     grep ^java.io.IOException | \
     cut -d' ' -f5 | \
@@ -165,9 +149,8 @@ function list_import_overview_for_instance() {
     while read picture_path; do
     check_picture_file "$picture_path"
   done
-  
+
   list_sax_errors "$1"
 }
 
 get_overview_of_all_instances
-

From 585556c601802856c67dde269ceebceaae0294c2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 16 Jan 2013 15:19:06 +0100
Subject: [PATCH 1905/2585] - work in prorgess, turning this into a man page

---
 usr/share/doc/escenic/ece-guide.org | 148 ++++++++++++++++------------
 1 file changed, 86 insertions(+), 62 deletions(-)

diff --git a/usr/share/doc/escenic/ece-guide.org b/usr/share/doc/escenic/ece-guide.org
index 49edbdd5..1870017b 100644
--- a/usr/share/doc/escenic/ece-guide.org
+++ b/usr/share/doc/escenic/ece-guide.org
@@ -1,6 +1,65 @@
 #+TITLE: User Guide for the ece Command
 #+AUTHOR: Vizrt Online / The SaaS Team
-#+OPTIONS: H:6 num:5 toc:2 
+#+OPTIONS: H:6 num:5 toc:2
+
+* NAME
+ece - command for managing your Escenic Content Engine, Escenic
+Analysis Engine and search instances.
+
+* SYNOPSIS
+ece OPTIONS COMMANDS
+* Description
+** OPTIONS
+*** -t --type type
+      The following types are available:
+      engine  -  The Escenic Content Engine, this is the default
+                 and is the assumed type if none is specified.
+      search  -  A standalone search indexer and solr instance
+      rmi-hub -  The RMI hub responsible for the internal
+                 communication between the ECE instances.
+      analysis - The Escenic Analysis Engine also knows as 'Stats'
+
+*** -i --instance instance
+The type instance, such as editor1, engine1 or search1
+*** -p --publication publication
+Needed only for updating publication resources
+*** -r --resource resource
+Used for updating publication resources.  Must be one of:
+content-type, feature, layout, layout-group image-version, menu
+*** -v --verbose
+Prints out debug statements, useful for debugging.
+** COMMANDS
+*** applog
+The type's app server log
+*** assemble
+Runs the Assembly Tool.
+*** clean
+Removes temporary files created by /home/torstein/bin/ece *)
+*** deploy
+Deploys the assembled EAR if the type is engine
+*** help
+Prints this help screen
+*** kill
+Uses force to stop the type
+*** log
+The type's Log4J log
+*** outlog
+The [ece#engine] command log (system out log)
+*** restart
+Restarts the type
+*** start
+Starts the type
+*** status
+Checks if the type is running
+*** stop
+Stops the type
+*** threaddump
+Write a thread dump to standard out (system out log)
+*** update
+Update publication resources
+*** versions
+Lists the ECE component versions
+
 
 * TAB completion
 The ece command offers TAB completion, given that your version of BASH
@@ -12,16 +71,16 @@ You will find yourself using this regularly, both for speed, but also
 to remember all the different options and their correct wording:
 #+BEGIN_SRC text
 $ ece TAB TAB
-applog      deploy      log         start       threaddump  
-assemble    help        outlog      status      update      
-clean       kill        restart     stop        versions 
+applog      deploy      log         start       threaddump
+assemble    help        outlog      status      update
+clean       kill        restart     stop        versions
 #+END_SRC
 The commands are all described in detail in "ece help"
 
 ** Completing types of servers the ece commands can operate on
 #+BEGIN_SRC text
 $ ece -t TAB TAB
-analysis  engine    rmi-hub   search 
+analysis  engine    rmi-hub   search
 #+END_SRC
 
 ** Completing the publication resources available
@@ -32,57 +91,14 @@ To help selecting the correct publication resource, you can make ece
 list and complete the available resource names:
 #+BEGIN_SRC text
 $ ece -p mypub -r TAB TAB
-content-type   image-version  layout-group   
+content-type   image-version  layout-group
 feature        layout         menu
 #+END_SRC
-* Getting an overview of all available options
+
 #+BEGIN_SRC text
 $ ece help
 Usage: /home/torstein/bin/ece [-t <type>] [-i <instance>] <command>
 
-DECOMMANDION
- -t --type <type>
-      The following types are available:
-      engine  -  The Escenic Content Engine, this is the default
-                 and is the assumed type if none is specified.
-      search  -  A standalone search indexer and solr instance
-      rmi-hub -  The RMI hub responsible for the internal 
-                 communication between the ECE instances.
-      analysis - The Escenic Analysis Engine also knows as 'Stats'
-
- -i --instance <instance>
-      The type instance, such as editor1, engine1 or search1
-
- -p --publication <publication>
-      Needed only for updating publication resources
-
- -r --resource <resource>
-      Used for updating publication resources.
-      Must be one of: content-type, feature, layout, layout-group
-                      image-version, menu
-
- -v --verbose
-      Prints out debug statements, useful for debugging.
-
-The following commands are available:
-   applog     the type's app server log
-   assemble   runs the Assembly Tool *)
-   clean      removes temporary files created by /home/torstein/bin/ece *)
-   deploy     deploys the assembled EAR *)
-   help       prints this help screen
-   kill       uses force to stop the type
-   log        the type's Log4J log
-   outlog     the [ece#engine] command log (system out log)
-   restart    restarts the type
-   start      starts the type
-   status     checks if the type is running
-   stop       stops the type
-   threaddump write a thread dump to standard out (system out log)
-   update     update publication resources
-   versions   lists the ECE component versions
-
-*) only applicable if type is 'engine'
-#+END_SRC
 
 * Tailing log files
 The command has a number of options to let you keep track of what's
@@ -102,7 +118,7 @@ $ ece -i dev1 loglist
 There are three different logs, which ece will let you tail. When
 tailing the log file, ece will also first print out where the file is
 located on the file system so you can open it later for further
-inspection. 
+inspection.
 
 #+BEGIN_SRC text
 $ ece -i dev1 outlog
@@ -111,7 +127,7 @@ $ ece -i dev1 outlog
 
 The available log file commands are:
 - outlog :: the system out log
-- applog :: the app server log 
+- applog :: the app server log
 - log :: the log4j log
 
 ** Piping the log files to another command
@@ -123,14 +139,14 @@ $ ece -i dev1 -q loglist | xargs grep IllegalArgumentException
 #+END_SRC
 
 This approach is also useful if you wish to tail all the log files at
-once: 
+once:
 #+BEGIN_SRC text
 $ ece -i dev1 -q loglist | xargs tail -f
 #+END_SRC
 
 * Assembling a new EAR
 The command will quite happily assemble your EAR file. Please note that
-you need to run 
+you need to run
 #+BEGIN_SRC text
 $ ece -i clean assemble
 #+END_SRC
@@ -197,9 +213,9 @@ It's easy to update the publication resources using the ece command. If
 you have all these publication resources in your current directory,
 you can update them just by:
 #+BEGIN_SRC text
-$ for el in layout* feature teaser-type content-type ; do 
-  ece -i myinstance -p mypub -r $el update; 
-done  
+$ for el in layout* feature teaser-type content-type ; do
+  ece -i myinstance -p mypub -r $el update;
+done
 #+END_SRC
 
 In this connection, it might be of your interest to also flush all the
@@ -245,7 +261,7 @@ $ ece -i engine1 info
 [ece#engine-engine1] |-> Version: mysite.com-1.2.3
 [ece#engine-engine1] |-> EAR used: http://my.build.server.com/engine-mysite.com-1.2.3.ear
 [ece#engine-engine1] |-> MD5 sum: 5881d1895c09c7b35a032806c6249433
-[ece#engine-engine1] |-> Deployment date: Wed Mar 28 18:29:58 CST 2012  
+[ece#engine-engine1] |-> Deployment date: Wed Mar 28 18:29:58 CST 2012
 #+END_SRC
 
 * Installation
@@ -285,7 +301,7 @@ the .conf files mentioned above, namely:
 You may override this list of locations by setting the
 this environment variable in your ~.bashrc~ or similar:
 #+BEGIN_SRC text
-ECE_CONF_LOCATIONS 
+ECE_CONF_LOCATIONS
 #+END_SRC
 
 The reason for having so many options is because various Escenic
@@ -335,7 +351,7 @@ only one instance was installed.
 ** TAB completion
 The ece command offers TAB completion of all commands, options and
 option values. For this to work, you need the completion file loaded
-from your ~.bashrc~. 
+from your ~.bashrc~.
 
 This can either be done by enabling all BASH completions on your
 system (some systems have this set up per default), refer to your OS
@@ -350,7 +366,7 @@ Naturally, the ~bash_comletion.d~ needs to be in the above location :-)
 * Backup
 One of the many features of the ece command, is that you can take a
 snapshot of your current running system, which can then be restored
-using the /usr/sbin/ece-install command. 
+using the /usr/sbin/ece-install command.
 
 The backup will include the database, the Nursery configuration, the
 DB configuration, the Varnish configuration, the nginx congiguration,
@@ -362,7 +378,7 @@ To create the backup, you'll simply do:
 $ ece -i editor1 backup
 #+END_SRC
 
-It will then create tarball with everything and put it in 
+It will then create tarball with everything and put it in
 #+BEGIN_SRC text
 /var/backups/escenic
 #+END_SRC
@@ -405,3 +421,11 @@ $ ece -i engine1 backup
 
 
 
+* COPYRIGHT
+Copyright 2011-2013 Vizrt
+
+Licensed under the Apache License, Version 2.0, see
+https://github.com/vizrt/ece-scripts/COPYING for further details.
+
+* AUTHOR
+Torstein Krause Johansen

From 74f61845d9127377128344ed7b0af94eb38d670b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 16 Jan 2013 15:19:49 +0100
Subject: [PATCH 1906/2585] - fixed section levels

---
 usr/share/doc/escenic/system-info-guide.org | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/usr/share/doc/escenic/system-info-guide.org b/usr/share/doc/escenic/system-info-guide.org
index 6be4d50d..ed7b0f14 100644
--- a/usr/share/doc/escenic/system-info-guide.org
+++ b/usr/share/doc/escenic/system-info-guide.org
@@ -5,7 +5,7 @@
 system-info
 
 * SYNOPSIS
-system-info [[[-o output-file]]] [[[-u user]]] [[[-t]]] [[[-m]]] [[[-s]]] [[[-v]]] [[[-V]] | [[-V][--version]]]
+system-info [[[-o output-file]]] [[[-u user]]] [[[-t]]] [[[-m]]] [[[-s]]] [[[-v]]] [[[-V]]] [[[-V][--version]]]
 
 * DESCRIPTION
 system-info is a command that creates an overview of your system,
@@ -25,14 +25,14 @@ The file to output the report t
 The user to run the ece commands. This is required when running
 system-info as root.
 
-* -s
+** -s
 Do not show temporaries, i.e. values that change often, like dates
 and uptime.
 
-* -v
+** -v
 Verbose
 
-* -V
+** -V
 Shows the version of system-info
 
 * Running as a regular user

From 6dedb45a8f4a7f1237161a9df11a643d81defd89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Wed, 16 Jan 2013 15:56:52 +0100
Subject: [PATCH 1907/2585] vosa - cleaning up hook structure

---
 .../hooks/post-install-hook-add-vizrt-repo.sh         | 11 +++++++++++
 .../post-install-hook-install-and-apply-spore.sh.tmpl |  1 -
 .../hooks/post-install-hook-install-ece-install.sh    |  6 ------
 .../generated-servers/skeleton-dev/install.conf.tmpl  |  1 +
 4 files changed, 12 insertions(+), 7 deletions(-)
 create mode 100755 usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-add-vizrt-repo.sh

diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-add-vizrt-repo.sh b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-add-vizrt-repo.sh
new file mode 100755
index 00000000..fdee1c57
--- /dev/null
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-add-vizrt-repo.sh
@@ -0,0 +1,11 @@
+#!/bin/bash -e
+
+echo "--- START : post install hook - add vizrt repo ---"
+
+# add archive key for apt.vizrt.com
+curl -s http://apt.vizrt.com/archive.key | ssh -F $2/ssh.conf guest 'sudo apt-key add -'
+
+# add repo to sources list
+echo "deb http://apt.vizrt.com unstable main" | ssh -F $2/ssh.conf guest 'sudo tee > /dev/null /etc/apt/sources.list.d/vizrt.list'
+
+echo "--- END : post install hook - add vizrt repo ---"
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-and-apply-spore.sh.tmpl b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-and-apply-spore.sh.tmpl
index bc5233c5..9937183c 100755
--- a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-and-apply-spore.sh.tmpl
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-and-apply-spore.sh.tmpl
@@ -6,7 +6,6 @@ echo "--- START : post install hook - install and apply spore ---"
 ssh -F \$2/ssh.conf root@guest 'curl http://apt.vizrt.com/spores.key | gpg --import'
 
 # install spore
-ssh -F \$2/ssh.conf root@guest 'apt-get update'
 ssh -F \$2/ssh.conf root@guest 'apt-get install spore'
 
 # generate spore conf file
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-ece-install.sh b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-ece-install.sh
index bf429535..b02290fd 100755
--- a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-ece-install.sh
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-ece-install.sh
@@ -2,12 +2,6 @@
 
 echo "--- START : post install hook - install ece install ---"
 
-# add archive key for apt.vizrt.com
-curl -s http://apt.vizrt.com/archive.key | ssh -F $2/ssh.conf guest 'sudo apt-key add -'
-
-# add repo to sources list
-echo "deb http://apt.vizrt.com unstable main" | ssh -F $2/ssh.conf guest 'sudo tee > /dev/null /etc/apt/sources.list.d/vizrt.list'
-
 # install escenic scripts
 ssh -F $2/ssh.conf guest 'sudo apt-get update && sudo apt-get -y install escenic-content-engine-installer'
 ssh -F $2/ssh.conf guest 'sudo apt-get update && sudo apt-get -y install escenic-content-engine-scripts'
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/install.conf.tmpl b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/install.conf.tmpl
index 44654931..19185094 100644
--- a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/install.conf.tmpl
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/install.conf.tmpl
@@ -15,6 +15,7 @@ postinstall make-a-motd.sh
 
 postinstall ./hooks/post-install-hook-set-hostname.sh
 postinstall ./hooks/post-install-hook-set-password.sh
+postinstall ./hooks/post-install-hook-add-vizrt-repo.sh
 postinstall ./hooks/post-install-hook-install-and-apply-spore.sh
 postinstall ./hooks/post-install-hook-copy-files.sh
 postinstall ./hooks/post-install-hook-install-java.sh

From 8c9ecc170dd70b44b71e06791271d8d0c7d5f3be Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 16 Jan 2013 16:49:59 +0100
Subject: [PATCH 1908/2585] - re-wrote the ece-guide into a man page

- the troff export with org-e-man works flawlessly now

- added several chapters and improved a number of sections.
---
 usr/share/doc/escenic/ece-guide.org | 522 ++++++++--------------------
 1 file changed, 142 insertions(+), 380 deletions(-)

diff --git a/usr/share/doc/escenic/ece-guide.org b/usr/share/doc/escenic/ece-guide.org
index 1870017b..05e057c1 100644
--- a/usr/share/doc/escenic/ece-guide.org
+++ b/usr/share/doc/escenic/ece-guide.org
@@ -1,425 +1,187 @@
-#+TITLE: User Guide for the ece Command
+#+TITLE: ece
 #+AUTHOR: Vizrt Online / The SaaS Team
 #+OPTIONS: H:6 num:5 toc:2
 
 * NAME
-ece - command for managing your Escenic Content Engine, Escenic
-Analysis Engine and search instances.
+ece - command for managing your Escenic instances.
 
 * SYNOPSIS
-ece OPTIONS COMMANDS
-* Description
-** OPTIONS
-*** -t --type type
-      The following types are available:
-      engine  -  The Escenic Content Engine, this is the default
-                 and is the assumed type if none is specified.
-      search  -  A standalone search indexer and solr instance
-      rmi-hub -  The RMI hub responsible for the internal
-                 communication between the ECE instances.
-      analysis - The Escenic Analysis Engine also knows as 'Stats'
-
-*** -i --instance instance
+ece [[-i --instance instance]] [[[-t --type type]]] [[[-p --publication
+publication]]] [[[--uri ear-to-deploy]]] COMMAND
+
+* DESCRIPTION
+Command which will let you manage your Escenic Content Engine, Escenic
+Analysis Engine and search instances with ease. The script does
+everything from starting & stopping the instance to building &
+deploying EAR files and detailed information about the running
+instances.
+
+* OPTIONS
+** -t --type type
+The following types are available:
+- engine: The Escenic Content Engine, this is the default and is the assumed type if none is specified.
+- search: A standalone search indexer and solr instance
+- rmi-hub: The RMI hub responsible for the internal communication between the ECE instances.
+- analysis: The Escenic Analysis Engine also knows as 'Stats'
+
+** -i --instance instance
 The type instance, such as editor1, engine1 or search1
-*** -p --publication publication
+** -p --publication publication
 Needed only for updating publication resources
-*** -r --resource resource
+** -r --resource resource
 Used for updating publication resources.  Must be one of:
 content-type, feature, layout, layout-group image-version, menu
-*** -v --verbose
+** -v --verbose
 Prints out debug statements, useful for debugging.
-** COMMANDS
-*** applog
+
+* COMMANDS
+You can specify one or more commands. The commands are executed in
+the same order that you pass them to the ece command.
+** applog
 The type's app server log
-*** assemble
+** assemble
 Runs the Assembly Tool.
-*** clean
-Removes temporary files created by /home/torstein/bin/ece *)
-*** deploy
-Deploys the assembled EAR if the type is engine
-*** help
+** backup
+Allows you to create backup of your entire Escenic installation, or
+just specific parts of it. Without any additional options, ece
+backup, will create a backup with:
+- Solar & Nursery configuration (everything in /etc/escenic)
+- DB dump
+- Solar index
+- Multimedia files
+- The entire app server
+- init.d script and its configuration
+- state files
+
+You may exclude any parts you don't want:
+
+| Backup specific option | Explanation          |
+|------------------------+----------------------|
+| --exclude-binaries     | No software binaries |
+| --exclude-solr         | No Solar index       |
+| --exclude-multimedia   | No multimedia files  |
+| --exclude-init         | No init files        |
+| --exclude-state        | No state files       |
+
+** clean
+Clears the temporary files from the instance's application server as
+well as Assembly Tool work files (if available).
+** deploy
+Deploys the locally assembled EAR, available in
+/var/cache/escenic/engine.ear.
+
+Optionally, you can specify an EAR on a remote server by passing the
+--uri parameter. If the server is password protected, you can either
+set builder_http_user and  builder_http_password in ece.conf or pass
+it on the command line:
+
+| Deploy specific option | Explanation                        |
+|------------------------+------------------------------------|
+| --file                 | Local EAR file to deploy           |
+| --uri                  | URI to the EAR to deploy           |
+| --user                 | HTTP User which may access the URI |
+| --password             | HTTP password to the user above.   |
+
+** edit
+Edit a publication resources. This command requires you to specify
+both the publication and the resource which you wish to edit:
+#+BEGIN_SRC sh
+$ ece -i engine1 -p my-pub -r content-type edit
+#+END_SRC
+If you don't change anything, ece will not change the publication
+resource.
+
+** flush
+Clear all the ECE caches of the given instance.
+** help
 Prints this help screen
-*** kill
+** info
+Get information about the instance.
+** kill
 Uses force to stop the type
-*** log
+** list-deployments
+Lists all the deployments done on this instance (granted that you've
+used the ece script to make the deployment).
+** list-instances
+List the instances installed on your machine.
+** list-logs
+List all the log files for a given instance
+** log
 The type's Log4J log
-*** outlog
+** outlog
 The [ece#engine] command log (system out log)
-*** restart
+** restart
 Restarts the type
-*** start
+** start
 Starts the type
-*** status
+** status
 Checks if the type is running
-*** stop
+** stop
 Stops the type
-*** threaddump
+** threaddump
 Write a thread dump to standard out (system out log)
-*** update
-Update publication resources
-*** versions
-Lists the ECE component versions
-
+** top
+Watch the JSP top on your instance. Here, you can watch which JSPs
+are consuming the most CPU time.
 
+** update
+Update publication resources
+** versions
+Lists the version of the ECE and all the plugins.
 * TAB completion
 The ece command offers TAB completion, given that your version of BASH
 supports this and that you have enabled it (some distributions hasn't
 turned on BASH completion per default).
 
-** Completing ece commands
-You will find yourself using this regularly, both for speed, but also
-to remember all the different options and their correct wording:
-#+BEGIN_SRC text
-$ ece TAB TAB
-applog      deploy      log         start       threaddump
-assemble    help        outlog      status      update
-clean       kill        restart     stop        versions
-#+END_SRC
-The commands are all described in detail in "ece help"
-
-** Completing types of servers the ece commands can operate on
-#+BEGIN_SRC text
-$ ece -t TAB TAB
-analysis  engine    rmi-hub   search
-#+END_SRC
-
-** Completing the publication resources available
-The ece command can update the publication resources for a given
-publication.
-
-To help selecting the correct publication resource, you can make ece
-list and complete the available resource names:
-#+BEGIN_SRC text
-$ ece -p mypub -r TAB TAB
-content-type   image-version  layout-group
-feature        layout         menu
-#+END_SRC
-
-#+BEGIN_SRC text
-$ ece help
-Usage: /home/torstein/bin/ece [-t <type>] [-i <instance>] <command>
-
-
-* Tailing log files
-The command has a number of options to let you keep track of what's
-going on on your system.
-
-** Getting an overview of the log files
-The ece command will be more than happy to tell you about the log files
-on your system that are of interest to your instance:
-#+BEGIN_SRC text
-$ ece -i dev1 loglist
-[ece#engine-dev1] System out log: /var/log/escenic/engine-dev1.out
-[ece#engine-dev1] App server log: /opt/tomcat-dev1/logs/localhost.2011-09-20.log
-[ece#engine-dev1] log4j log: /var/log/escenic/messages
-#+END_SRC
-
-** Commands for tailing the log files
-There are three different logs, which ece will let you tail. When
-tailing the log file, ece will also first print out where the file is
-located on the file system so you can open it later for further
-inspection.
-
-#+BEGIN_SRC text
-$ ece -i dev1 outlog
-[ece#engine-dev1] Tailing the system out log /var/log/escenic/engine-dev1.out
-#+END_SRC
-
-The available log file commands are:
-- outlog :: the system out log
-- applog :: the app server log
-- log :: the log4j log
-
-** Piping the log files to another command
-If you wish to pass the log files onto another pipe, for instance to
-grep all the log files for a certain exception or error message, you
-will find the -q parameter useful:
-#+BEGIN_SRC text
-$ ece -i dev1 -q loglist | xargs grep IllegalArgumentException
-#+END_SRC
-
-This approach is also useful if you wish to tail all the log files at
-once:
-#+BEGIN_SRC text
-$ ece -i dev1 -q loglist | xargs tail -f
-#+END_SRC
-
-* Assembling a new EAR
-The command will quite happily assemble your EAR file. Please note that
-you need to run
-#+BEGIN_SRC text
-$ ece -i clean assemble
-#+END_SRC
-whenever you've upgraded either ECE or one of its plugins. The command
-will try to take care of you though and warn you of such duplication:
-#+BEGIN_SRC text
-[ece#engine] Multiple versions of ECE and/or 3rd party libraries found.
-[ece#engine] Remember, you need to run 'ece clean assemble' when
-[ece#engine] upgrading either ECE or one of the plugins.
-[ece#engine] I will now clean it up for you and re-run the assembly.
-[ece#engine] Cleaning up generated files in /opt/escenic/assemblytool ...
-[ece#engine] Assembling your EAR file ...
-#+END_SRC
-
-If you're just re-running the assembly after just adding a new plugin
-or want to re-build your publications after template changes, you can
-omit the clean command and just run:
-#+BEGIN_SRC text
-$ ece assembly
-#+END_SRC
-
-The EAR produced is now ready to be deployed with
-#+BEGIN_SRC text
-$ ece [-i <instance>] deploy
-#+END_SRC
-
-* Deployment
-ece will default wise attempt to deploy the EAR which "ece assemble"
-produces and resides in:
-
-#+BEGIN_SRC text
-/var/cache/escenic/engine.ear
-#+END_SRC
-
-It is also possible to deploy an EAR directly from a local or remote
-URI. This is especially useful where you have a build server and you
-want the ECEs deploy this EAR directly, you can then do:
-#+BEGIN_SRC text
-$ ece -i myinstance deploy --uri http://my.build.server.com/engine-mysite.com-2.314.ear
-#+END_SRC
-
-The following URIs are supported:
-- http://my.build.server.com/engine-mysite.com-2.314.ear
-- https://my.build.server.com/engine-mysite.com-2.314.ear
-- file:///var/cache/escenic/engine-mysite.com-2.314.ear
-
-It is also possible to deploy a local file without the URI protocol
-prefix using the -f (file) parameter:
-#+BEGIN_SRC text
-$ ece -i myinstance deploy -f /tmp/engine-mysite.com-2.314.ear
-#+END_SRC
-
-The URI of the EAR file is completely up to you, but if use the
-pattern
-#+BEGIN_SRC text
-engine-<a string>-<a number>.ear
-#+END_SRC
-ece will understand this as version: mysite.com-2.314 and write this
-to its deployment state file: /var/lib/escenic/<instance>.state, which
-again will be reported by the "ece info" command.
-
-* Updating the Publication Resources
-It's easy to update the publication resources using the ece command. If
-you have all these publication resources in your current directory,
-you can update them just by:
-#+BEGIN_SRC text
-$ for el in layout* feature teaser-type content-type ; do
-  ece -i myinstance -p mypub -r $el update;
-done
-#+END_SRC
-
-In this connection, it might be of your interest to also flush all the
-ECE caches on all the instances, this you can easily do with:
-#+BEGIN_SRC text
-$ ece -i myinstance flush
-#+END_SRC
-
-* Getting information about the ECE instance
-The "ece info" command will give you a lot of useful information about
-the current instance:
-#+BEGIN_SRC text
-$ ece -i engine1 info
-[ece#engine-engine1] Current instance: engine1
-[ece#engine-engine1] Instances available on myhost: engine1
-[ece#engine-engine1] Conf files parsed: /etc/escenic/ece-engine1.conf /etc/escenic/ece.conf
-[ece#engine-engine1] ECE location: /opt/escenic/engine
-[ece#engine-engine1] Assembly Tool location: /opt/escenic/assemblytool
-[ece#engine-engine1] Java location: /usr/lib/jvm/java-6-sun
-[ece#engine-engine1] Log files:
-[ece#engine-engine1] |-> System out log: /var/log/escenic/engine-engine1.out
-[ece#engine-engine1] |-> App server log: /opt/tomcat-engine1/logs/localhost.2012-04-02.log
-[ece#engine-engine1] |-> Log4j log: /var/log/escenic/ece-engine1-messages
-[ece#engine-engine1] |-> GC log: /var/log/escenic/engine-engine1-gc.log
-[ece#engine-engine1] Application server:
-[ece#engine-engine1] |-> Status: DOWN
-[ece#engine-engine1] |-> Port: 8080
-[ece#engine-engine1] |-> Type: tomcat
-[ece#engine-engine1] |-> Tomcat home: /opt/tomcat
-[ece#engine-engine1] |-> Tomcat base: /opt/tomcat-engine1
-[ece#engine-engine1] Application server resources:
-[ece#engine-engine1] |-> escenic/solr-base-uri: http://mysearch:8080/solr/
-[ece#engine-engine1] Database:
-[ece#engine-engine1] |-> name: jdbc/ECE_READ_DS
-[ece#engine-engine1] |-> url: mysql://mydb:3306/ece5db?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;characterSetResults=UTF-8
-[ece#engine-engine1] |-> username: ece5user
-[ece#engine-engine1] |-> name: jdbc/ECE_UPDATE_DS
-[ece#engine-engine1] |-> url: mysql://mydb:3306/ece5db?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;characterSetResults=UTF-8
-[ece#engine-engine1] |-> username: ece5user
-[ece#engine-engine1] Deployed web applications:
-[ece#engine-engine1] |-> http://myhost:8080/escenic-admin
-[ece#engine-engine1] Deployment state:
-[ece#engine-engine1] |-> Version: mysite.com-1.2.3
-[ece#engine-engine1] |-> EAR used: http://my.build.server.com/engine-mysite.com-1.2.3.ear
-[ece#engine-engine1] |-> MD5 sum: 5881d1895c09c7b35a032806c6249433
-[ece#engine-engine1] |-> Deployment date: Wed Mar 28 18:29:58 CST 2012
-#+END_SRC
-
-* Installation
-The ece command and ece.conf may be used on any Unix like system that
-has a fairly recent version of BASH installed.
-
-** Overview of File Paths Used by the ece command
-These are recommended files and locations for using the ece command:
-
-|------------------------------------+----------------------------------|
-| Path                               | Explanation                      |
-|------------------------------------+----------------------------------|
-| ~/usr/bin/ece~                     | The command itself                |
-| ~/etc/escenic/ece.conf~            | The main configuration file      |
-| ~/etc/escenic/ece-<instance>.conf~ | Instance specific settings       |
-| ~/var/cache/escenic~               | Directory of assembled EAR files |
-| ~/tmp~                             | Directory for temporary files    |
-|------------------------------------+----------------------------------|
-
-As you can see in ece.conf, there are a number of default locations
-dealing with log files, pid files, crash files as well as application
-server files. The defaults all follow the File Hierarchy Standard, but
-you may of course change these to your liking.
+You can auto complete all options and commands, as well as the
+instance names, publication names and resources types.
 
-If you wish to put the .conf files in other places, you may like to know
-that the ece command has preset list of locations where it looks for
-the .conf files mentioned above, namely:
-
-- current working directory
-- ~/etc/escenic/<type>/instance/<instance name>~
-- ~/etc/escenic/<type>/host/<hostname>~
-- ~/etc/escenic/<type>/common~
-- ~/etc/escenic/<type>~
-- ~/etc/escenic~
-- ~<current working direcotry>/../etc~
-
-You may override this list of locations by setting the
-this environment variable in your ~.bashrc~ or similar:
-#+BEGIN_SRC text
-ECE_CONF_LOCATIONS
+* Log files
+There are a number of log files associated with the different
+instances. To get an overview of all the log files for a particular
+instance, do:
+#+BEGIN_SRC sh
+$ ece -i engine1 list-logs
 #+END_SRC
 
-The reason for having so many options is because various Escenic
-consultants, partners and customers have requested these locations to
-fit their systems. As you can see, fitting everyone's fancy adds up
-over time :-)
-
-* Running the ece command
-** You must run it as a non-privileged user
-You must be normal user to run the ece command, otherwise it will
-complain:
-#+BEGIN_SRC text
-[ece#engine] Sorry, you cannot be root when running ece
-[ece#engine] The root user can only use /etc/init.d/ece
+To tail all of these, pass the -q parameter and pipe it to tail:
+#+BEGIN_SRC sh
+$ ece -i engine1 -q list-logs | xargs tail -f
 #+END_SRC
 
-As it mentions, the root user may use the init.d command and the
-accompanying /etc/default/ece to command the different ECE, EAE and
-RMI hub instances on your system.
-** Specifying the instance
-The command is made for being easy to use with multiple instances on
-the same host. You specify the instance you want to operate on using
-the -i parameter. E.g. to assemble and deploy the editor1 instance, you'd
-do:
-#+BEGIN_SRC text
-$ ece -i editor1 assemble deploy restart
-#+END_SRC
+* Configuration files
+| Path                             | Explanation                 |
+|----------------------------------+-----------------------------|
+| /etc/escenic/ece.conf            | The main configuration file |
+| /etc/escenic/ece-<instance>.conf | Instance specific settings  |
+| $HOME/.ecerc                     | User specific settings.     |
 
-The command's TAB completion will also help you with completing the
-available instances on your system, so you can just type:
-#+BEGIN_SRC text
-$ ece -i TAB TAB
-mypub myotherpub
+* Examples
+Starting an instance:
+#+BEGIN_SRC sh
+$ ece -i engine1 start
 #+END_SRC
 
-For this to work, the command assumes that you have installed the
-instance specific configuration in /etc/escenic/engine/instance, as is
-described in the Escenic Content Engine Installation Guide.
-
-If you only have one instance installed, you may omit
-the --instance/-i parameter. However, if you're running ece from another
-command (e.g. an init.d or a deployment command), we recommend you to
-always specify the --instance/-i parameter to make sure that future
-additions of instances don't break your old commands which assumed that
-only one instance was installed.
-
-** TAB completion
-The ece command offers TAB completion of all commands, options and
-option values. For this to work, you need the completion file loaded
-from your ~.bashrc~.
-
-This can either be done by enabling all BASH completions on your
-system (some systems have this set up per default), refer to your OS
-documentation for this.
-
-Alternatively, to just enable the ece completion, simply add the
-following line to your ~.bashrc~:
-#+BEGIN_SRC text
-. /etc/bash_completion.d/ece
+Creating a thread dump from an instance:
+#+BEGIN_SRC sh
+$ ece -i engine1 threaddump
 #+END_SRC
-Naturally, the ~bash_comletion.d~ needs to be in the above location :-)
-* Backup
-One of the many features of the ece command, is that you can take a
-snapshot of your current running system, which can then be restored
-using the /usr/sbin/ece-install command.
-
-The backup will include the database, the Nursery configuration, the
-DB configuration, the Varnish configuration, the nginx congiguration,
-all the Escenic software binaries, your publication and your
-application servers.
 
-To create the backup, you'll simply do:
-#+BEGIN_SRC text
-$ ece -i editor1 backup
+Building a new EAR file using the a locally available Assembly Tool,
+deploy this new EAR and restart the instance:
+#+BEGIN_SRC sh
+$ ece -i engine1 assemble deploy restart
 #+END_SRC
 
-It will then create tarball with everything and put it in
-#+BEGIN_SRC text
-/var/backups/escenic
+Stop the instance, deploy an EAR from the build server, clean all app
+server temporary files including the JSP compilation directory and
+start the instance again:
+#+BEGIN_SRC sh
+$ ece -i engine1 \\
+      --uri http://builder.example.com/myproject-1.2.ear \\
+      stop clean deploy start
 #+END_SRC
 
-Sometimes, you only want to take a backup of the data files and are
-not so concerned with the Escenic and application server binaries as
-these are easily installed from elsewhere. If so, you may do the
-following:
-#+BEGIN_SRC text
-$ ece -i editor1 backup --exclude-binaries
-#+END_SRC
-
-When running in a production environment, it's advised to first stop
-the search instance which runs the Solr indexer, so that the Solr
-index isn't corrupted:
-#+BEGIN_SRC text
-$ ece -i search1 stop
-$ ece -i engine1 backup
-[ece#engine-engine1] Backing up the engine1 instance of engine on raven ...
-[ece#engine-engine1] Cleaning up generated files in /opt/escenic/assemblytool ...
-[ece#engine-engine1] Cleaning up engine1's work directory in /opt/tomcat-engine1/work ...
-[ece#engine-engine1] Cleaning up engine1's temp directory in /opt/tomcat-engine1/temp ...
-[ece#engine-engine1] Database dumped: /var/backups/escenic/ece5db-2012-08-17.sql.gz
-[ece#engine-engine1] Creating snapshot ... (this may take a while)
-[ece#engine-engine1] Backup ready: /var/backups/escenic/engine-engine1-backup-2012-08-17.tar size: 62M
-[ece#engine-engine1] The backup arhcive includes:
-[ece#engine-engine1] - Database snapshot
-[ece#engine-engine1] - All Solr in /var/lib/escenic/solr
-[ece#engine-engine1] - All Escenic data files in /var/lib/escenic/engine
-[ece#engine-engine1] - All app servers in /opt
-[ece#engine-engine1] - All Escenic software binaries in /opt/escenic/engine
-[ece#engine-engine1] - All configuration in /etc/escenic and /etc/default/ece
-[ece#engine-engine1] - All bootstrap commands from /etc/init.d
-[ece#engine-engine1] - All state files in /var/lib/escenic
-[ece#engine-engine1] Enjoy!
-#+END_SRC
-
-
-
-
-
 
 * COPYRIGHT
 Copyright 2011-2013 Vizrt

From ec75656b834c7b3073bb07e2bb167a10946c33bb Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 16 Jan 2013 17:48:05 +0100
Subject: [PATCH 1909/2585] - made the ece-deploy-guide man-ised.

- the man export runs smoothly now, looking good in a standard
  terminal.
---
 usr/share/doc/escenic/ece-deploy-guide.org | 142 ++++++++++++++-------
 1 file changed, 94 insertions(+), 48 deletions(-)

diff --git a/usr/share/doc/escenic/ece-deploy-guide.org b/usr/share/doc/escenic/ece-deploy-guide.org
index 78d39d2c..223c17e8 100644
--- a/usr/share/doc/escenic/ece-deploy-guide.org
+++ b/usr/share/doc/escenic/ece-deploy-guide.org
@@ -1,21 +1,56 @@
-#+TITLE: User Guide for the ece-deploy Command
+#+TITLE: ece-deploy
 #+AUTHOR: Vizrt Online / The SaaS Team
+#+MAN_CLASS_OPTIONS: section-id:8
 #+OPTIONS: H:6 num:5 toc:2
 
-* Introduction
-The =ece-deploy= command will help you with the following tasks:
+* NAME
+ece-deploy
+
+* SYNOPSIS
+ece-deploy [[[--ear uri-to-ear]]] [[[--conf uri-to-conf]]] [[[--force]]]
+[[[--update-publication-resources]]] [[[--list-deployments]]]
+[[[--rollback deployment-id]]]
+
+* DESCRIPTION
+The ece-deploy command will help you with the following tasks:
 
 - [[Deploying a new EAR file]]
 - [[Deploying a new configuration package]]
 - [[Updating publication resources]] of all publications
 - [[Rollback to a previous deployment]]
-- [[Get an overview of all deployments]] by =ece-deploy=
+- [[Get an overview of all deployments]] by ece-deploy
+
+* OPTIONS
+** --ear uri-to-ear
+The URI to the EAR file to use for the deployment, typically, this
+will be a file on a build server.
+
+** --conf uri-to-conf
+The URI to the configuration package to use for the deployment on this
+machine, typically, this will be a file on a build server.
+
+** --force
+Use force whenever necessary to get an automatic deployment. This is
+typically for forcing various parts of the configuration package when
+the package manager would chose a more cautious solution (typically to
+keep the local version of configuration files that differ).
+
+** --update-publication-resources
+Update all the publication resources for all the publications
+found inside the EAR file.
+
+** --list-deployments
+List all the deployments previously done on this machine.
+
+** --rollback deployment-id
+Rollback to the deployment ID specified.
 
 * Background
 As you may know, there's already a nice way of deploying an EAR file
 to an ECE, EAE or search instance by the way of:
 #+BEGIN_SRC sh
-$ ece -i <instance> --uri http://my.builder.com/snow/releases/snow-trunk-rev5233-2012-10-04_1608.ear
+$ ece -i <instance> \\
+  --uri http://my.builder.com/snow-2.3.ear
 #+END_SRC
 
 This approach has some limitations, however:
@@ -27,93 +62,81 @@ This approach has some limitations, however:
    version of the ECE binaries running on these two instance drift
    apart.
 2. It doesn't update the publication resources, so that operators must
-   also do a =ece -i <instance> -r <resource> -p <publication> update=
+   also do a ece -i <instance> -r <resource> -p <publication> update
    for each of the publication resources that the developers say have
    changed. Again, people only do the minimum of what they need to do
    and often the necessary publication resources are not updated, or
-   only =content-type= is updated and the rest is left out. Again,
+   only content-type is updated and the rest is left out. Again,
    things start to drift apart.
 3. It doesn't update the system configuration. A new EAR deployment
    works in tandem with a DEB or RPM configuration package. Often, a
    new feature or bug fix on your website requires also changes to the
    configuration of some of the components outside of the JSPs and CSS
    style sheets. Again, operators would need to update the system
-   configurations after running =ece deploy --uri <uri>=.
+   configurations after running ece deploy --uri <uri>.
 
-The =ece-deploy= command addresses all these issues. It doesn't
+The ece-deploy command addresses all these issues. It doesn't
 re-implement anything of the functionality which is already in place
-in =ece deploy= but builds upon it and adds new features such as the
+in ece deploy but builds upon it and adds new features such as the
 capability to roll back and provide full diffs of everything that was
 changed.
 
 As you see in this guide, each deployment gets its own ID. The reason
-why =ece-deploy= has its own deployment ID and doesn't use the version
+why ece-deploy has its own deployment ID and doesn't use the version
 of the EAR & configuration package, is that it's possible to make
 several deployments of the same EAR/configuration package, even on the
-same host. Furthermore, =ece-deploy= deploys on several instances, not
+same host. Furthermore, ece-deploy deploys on several instances, not
 only one. And lastly, it's even possible to choose whether or not to
-update the publication resources. Hence, =ece-deploy= has its own IDs
+update the publication resources. Hence, ece-deploy has its own IDs
 and database of its deployments to make everything reproduce-able.
 
-* Requirements
-As you can see from the code examples (they all start with a =#=),
-=ece-deploy= must be run as =root= or with =sudo=.
-
-Furthermore, it requires the system to be set up with =ece-install=
-or have corresponding structure. Among other things, this means that
-all the instances to deploy to are listed correctly in
-=/etc/default/ece= and information on how to access the build and app
-servers is present in =/etc/escenic/ece.conf= and
-=/etc/escenic/ece-<instance>.conf=.
-
-* Deploying a new EAR file
+* Examples
+** Deploying a new EAR file
 #+BEGIN_SRC sh
-# ece-deploy --ear http://my.builder.com/snow/releases/snow-trunk-rev5233-2012-10-04_1608.ear
+# ece-deploy --ear http://my.builder.com/snow-2.3.ear
 #+END_SRC
 
-* Deploying a new configuration package
+** Deploying a new configuration package
 #+BEGIN_SRC sh
-# ece-deploy --conf http://my.builder.com/snow/releases/vosa-conf-pres1-1-r5233.deb
+# ece-deploy --conf http://my.builder.com/vosa-conf-pres1-2.3.deb
 #+END_SRC
 
-* Updating publication resources
+** Updating publication resources
 #+BEGIN_SRC sh
-# ece-deploy --ear http://my.builder.com/snow/releases/snow-trunk-rev5233-2012-10-04_1608.ear \
+# ece-deploy --ear http://my.builder.com/snow-2.3.ear \\
    --update-publication-resources
 #+END_SRC
 
-* Deploying everything with one command
+** Deploying everything with one command
 It's of course possible to deploy both the EAR and DEB at the same
 time and also update the publication resources with one call to
-=ece-deploy=:
+ece-deploy:
 
 #+BEGIN_SRC sh
-# ece-deploy --ear http://my.builder.com/snow/releases/snow-trunk-rev5233-2012-10-04_1608.ear \
-   --conf http://my.builder.com/snow/releases/vosa-conf-pres1-1-r5233.deb \
+# ece-deploy --ear http://my.builder.com/snow-2.3.ear \\
+   --conf http://my.builder.com/vosa-conf-pres1-2.3.deb \\
    --update-publication-resources
 #+END_SRC
 
-* Rollback to a previous deployment
-Perhaps the coolest feature of =ece-deploy=, is that it can roll back
-to any of the previous deployments that you have done with
-=ece-deploy=. First, get hold of the deployment ID you want from the [[Get an overview of all
+** Rollback to a previous deployment
+Perhaps the coolest feature of ece-deploy, is that it can roll back to
+any of the previous deployments that you have done with
+ece-deploy. First, get hold of the deployment ID you want from the [[Get an overview of all
  deployments][list of all previous deployments]] and then pass this ID to the
-=--rollback= switch:
+--rollback switch:
 
 #+BEGIN_SRC sh
-# ece-deploy --rollback pres1-1356015120 --update-publication-resources
+# ece-deploy --rollback pres1-1356015120 \\
+    --update-publication-resources
 #+END_SRC
 
-As before, the =--update-publication-resource= is optional.
+As before, the --update-publication-resource is optional.
 
-* Get an overview of all deployments
+** Get an overview of all deployments
 #+BEGIN_SRC sh
 # ece-deploy --list-deployments
-   - Deployment pres1-1354540403 was made @ Mon Dec 3 18:43:23 IST 2012
-   - Deployment pres1-1354621048 was made @ Tue Dec 4 17:07:28 IST 2012
-   - Deployment pres1-1355319440 was made @ Wed Dec 12 19:07:20 IST 2012
-   - Deployment pres1-1355320868 was made @ Wed Dec 12 19:31:08 IST 2012
-   - Deployment pres1-1355390454 was made @ Thu Dec 13 14:50:54 IST 2012
+- Deployment pres1-320868 was made @ Wed Dec 12 19:31:08 IST 2012
+- Deployment pres1-390454 was made @ Thu Dec 13 14:50:54 IST 2012
 #+END_SRC
 
 Having the ID, let's you [[Rollback to a previous version][roll back to that version]] and it lets you
@@ -122,4 +145,27 @@ the state was afterwards and view full diffs of all configuration
 files that were changed as a part of that deployment.
 
 All the deployment history is easily browsable under:
-=/var/lib/escenic/ece-deploy/<deployment-id>=
+#+BEGIN_SRC sh
+/var/lib/escenic/ece-deploy/<deployment-id>
+#+END_SRC
+
+* Requirements
+As you can see from the code examples (they all start with a #),
+ece-deploy must be run as root or with sudo.
+
+Furthermore, it requires the system to be set up with ece-install
+or have corresponding structure. Among other things, this means that
+all the instances to deploy to are listed correctly in
+/etc/default/ece and information on how to access the build and app
+servers is present in /etc/escenic/ece.conf and
+/etc/escenic/ece-<instance>.conf.
+
+
+* COPYRIGHT
+Copyright 2011-2013 Vizrt
+
+Licensed under the Apache License, Version 2.0, see
+https://github.com/vizrt/ece-scripts/COPYING for further details.
+
+* AUTHOR
+Torstein Krause Johansen

From 43eaa20c060a7b118492e03354c76befbd6c0b2e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 16 Jan 2013 18:01:13 +0100
Subject: [PATCH 1910/2585] - made the ece-imoprt guide man-generate-able.

- added a number of sections.
---
 usr/share/doc/escenic/ece-import-guide.org | 193 ++++++++++++---------
 1 file changed, 110 insertions(+), 83 deletions(-)

diff --git a/usr/share/doc/escenic/ece-import-guide.org b/usr/share/doc/escenic/ece-import-guide.org
index 5e9ab78c..0a76c3b0 100644
--- a/usr/share/doc/escenic/ece-import-guide.org
+++ b/usr/share/doc/escenic/ece-import-guide.org
@@ -1,21 +1,40 @@
-#+TITLE: User Guide for the ece-import Command
+#+TITLE: ece-import
 #+AUTHOR: Vizrt Online / The SaaS Team
-#+OPTIONS: H:6 num:5 toc:2 
+#+OPTIONS: H:6 num:5 toc:2
 
-* Introduction
-The =ece-import= command will help you with the following tasks:
+* NAME
+ece-import
 
-- Setting up imports, either [[From an import archive]] or [[Without an import archive]]
+* SYNOPSIS
+ece-import [[[--name]]] [[[--publication]]] [[[--user]]] [[[--password]]] COMMAND
+
+* DESCRIPTION
+The ece-import command will help you with the following tasks:
+
+- [[create][Setting up imports]], either from an import archive or without an import archive.
 - [[Getting raw import data from HTTP or FTP servers]]
 - Running an import job, taking the raw XML from a 3rd party system,
   applying all defined transformations on it and dumping it in the
   designed import spool for Escenic Content Engine to pick it up and
   import it into its CMS. This is typically set up from a cron job,
-  but [[Running an import job manually]] is easy with =ece-import=.
-
-* Setting up a new import job
-
-** From an import archive
+  but [[Running an import job manually]] is easy with ece-import.
+
+* OPTIONS
+** --name
+The name of the import job
+** --publication
+The publication name that this job belongs to.
+** --user user
+The HTTP user to access the download data (optional). This option only
+applies when running the [[download-import-data]] command.
+** --password password
+The HTTP password to access the download data. This option only
+applies when running the [[download-import-data]] command.
+
+* COMMANDS
+** create
+ece-import will happily set up a new import job for you.
+From an import archive:
 The preferred way is to use an import archive, which you typically get
 from the web site developers who've created the XSL files and so on.
 #+BEGIN_SRC text
@@ -25,64 +44,65 @@ from the web site developers who've created the XSL files and so on.
 See [[Structure of an import archive]] for a detailed specification on how
 to create such an archive yourself.
 
-** Without an import archive
+You can also set up an import job without an import archive:
 #+BEGIN_SRC text
-# ece-import \
-  --name streaming-video \
-  --publication mypub \
+# ece-import \\
+  --name streaming-video \\
+  --publication mypub \\
   create
 #+END_SRC
 
-Here, =ece-import= will set up the file structure for your import job,
+Here, ece-import will set up the file structure for your import job,
 but you'll have to either put your transformers & cron jobs on the
 system yourself, or make sure that the XML you want import already is
 in the [[http://documentation.vizrt.com/ece-syndication-ref/5.4/escenic_syndication.html][Escenic Syndication XML format]].
 
-* Getting raw import data from HTTP or FTP servers
-There's built-in support for this in =ece-import=:
+
+** download-import-data
+There's built-in support for this in ece-import:
 #+BEGIN_SRC text
-$ ece-import \
-  --name streaming-video \
-  --publication mypub \
-  --user my-ftp-user \
-  --password my-ftp-password \
-  --uri http://news-feed.com/my-import-job-feed
+$ ece-import \\
+  --name streaming-video \\
+  --publication mypub \\
+  --user my-ftp-user \\
+  --password my-ftp-password \\
+  --uri http://news-feed.com/my-import-job-feed \\
   download-import-data
-[ece-import-0] Started @ Mon Nov 5 09:30:39 UTC 2012, I'm logging to
-[ece-import-0] /var/log/escenic/ece-import-root.log
-[ece-import-1] 12.xml has already been downloaded, skipping to the next one
-[ece-import-1] 19.xml has already been downloaded, skipping to the next one
-[ece-import-1] Downloading http://news-feed.com/my-import-job-feed/20.xml ...
-[ece-import-1] Downloading http://news-feed.com/my-import-job-feed/21.xml ...
-[ece-import-2] Downloading http://news-feed.com/my-import-job-feed/22.xml ...
-[ece-import-3] Downloading http://news-feed.com/my-import-job-feed/23.xml ...
-[ece-import-3] Downloading http://news-feed.com/my-import-job-feed/24.xml ...
-[ece-import-4] Downloading http://news-feed.com/my-import-job-feed/25.xml ...
-[ece-import-5] Downloading http://news-feed.com/my-import-job-feed/26.xml ...
-[ece-import-6] Finished @ Mon Nov 5 09:30:45 UTC 2012
+Started @ Mon Nov 5 09:30:39 UTC 2012, I'm logging to
+/var/log/escenic/ece-import-root.log
+12.xml has already been downloaded, skipping to the next one
+19.xml has already been downloaded, skipping to the next one
+Downloading http://news-feed.com/my-import-job-feed/20.xml ...
+Downloading http://news-feed.com/my-import-job-feed/21.xml ...
+Downloading http://news-feed.com/my-import-job-feed/22.xml ...
+Downloading http://news-feed.com/my-import-job-feed/23.xml ...
+Downloading http://news-feed.com/my-import-job-feed/24.xml ...
+Downloading http://news-feed.com/my-import-job-feed/25.xml ...
+Downloading http://news-feed.com/my-import-job-feed/26.xml ...
+Finished @ Mon Nov 5 09:30:45 UTC 2012
 #+END_SRC
 
-You can safely re-run this as many times as you wish, =ece-import=
+You can safely re-run this as many times as you wish, ece-import
 will keep track of previously downloaded files. If you ever need to
 re-download third party data, you can remove the corresponding
-resource from =/var/lib/escenic/raw/mypub/streaming-video/download.state=
+resource from /var/lib/escenic/raw/mypub/streaming-video/download.state
 
-* Running an import job manually
+** Running an import job manually
 #+BEGIN_SRC text
-$ ece-import \
-  --name streaming-video \
+$ ece-import \\
+  --name streaming-video \\
   --publication mypub
-[ece-import-0] Started @ Mon Nov 5 09:36:33 UTC 2012, I'm logging to
-[ece-import-0] /var/log/escenic/ece-import-root.log
-[ece-import-0] Publication: mypub
-[ece-import-0] Import configuration: streaming-video
-[ece-import-0] Importing raw XML #1: 21.xml ...
-[ece-import-0] Importing raw XML #2: 26.xml ...
-[ece-import-1] Importing raw XML #3: 24.xml ...
-[ece-import-4] Number of raw XML files processed: 3
-[ece-import-4] Number of raw XML successes: 3
-[ece-import-4] Number of raw XML errors: 0
-[ece-import-4] Finished @ Mon Nov 5 09:36:37 UTC 2012, enjoy thyself!
+Started @ Mon Nov 5 09:36:33 UTC 2012, I'm logging to
+/var/log/escenic/ece-import-root.log
+Publication: mypub
+Import configuration: streaming-video
+Importing raw XML #1: 21.xml ...
+Importing raw XML #2: 26.xml ...
+Importing raw XML #3: 24.xml ...
+Number of raw XML files processed: 3
+Number of raw XML successes: 3
+Number of raw XML errors: 0
+Finished @ Mon Nov 5 09:36:37 UTC 2012, enjoy thyself!
 #+END_SRC
 
 * Structure of an import archive
@@ -90,36 +110,36 @@ When creating a new import configuration for your project, the
 following directory structure is required:
 
 #+BEGIN_SRC text
-<publication>/<import name>
-<publication>/<import name>/transformers/<number>-<transformer task>.xsl
-<publication>/<import name>/cron.hourly/<cron job command>
-<publication>/<import name>/cron.every.five.minutes/<cron job command>
+<pub>/<import name>
+<pub>/<import name>/transformers/<number>-<transformer task>.xsl
+<pub>/<import name>/cron.hourly/<cron job command>
+<pub>/<import name>/cron.every.five.minutes/<cron job command>
 #+END_SRC
 
 - publication name :: the name of the publication for which the import
      job(s) are defined. You can have more than one publication in
-     each =zip= archive.
+     each zip archive.
 - import job name :: lowercase with hyphens between words (if more
      than one)
-- transformers :: directory with files prefixed with =<number>-=, indicating
+- transformers :: directory with files prefixed with <number>-, indicating
                   the order of transformation to apply to your import job. If
-                  this is a =xsl= file, the escenic importer will run
-                  =xsltproc= on the file, whereas =.sh= files will be
-                  run in a =bash= wrapper.
+                  this is a xsl file, the escenic importer will run
+                  xsltproc on the file, whereas .sh files will be
+                  run in a bash wrapper.
 
                   Each of the transformers will be called with one
                   argument, namely the input XML data. Each
                   transformer is responsible to write changes back to
                   the file.
 - cron.hourly :: commands to be run every our. These will be put in
-                 =/etc/cron.hourly= on the import server. Be sure to
+                 /etc/cron.hourly on the import server. Be sure to
                  set the execute bit on the file and note that as with
                  all cron jobs, the file cannot have a file suffix.
 - cron.every.five.minutes :: commands to run every five minutes.
 
-We're calling the import configuration =moo= since we're
+We're calling the import configuration moo since we're
 setting up an import feed from our imaginary content provider, "Moo
-Cool Videos" and our publication is the ubiquitous =mypub=.
+Cool Videos" and our publication is the ubiquitous mypub.
 
 #+BEGIN_SRC text
 $ unzip -t my-great-import-archive.zip.zip
@@ -132,53 +152,60 @@ otherpub/foo/transformers/01-convert-from-foo-to-escenic-xml.xsl
 #+END_SRC
 
 As you can guess from the file names, the
-=02-convert-all-cows-to-ducks.xsl= stylesheet will be first applied to
+02-convert-all-cows-to-ducks.xsl stylesheet will be first applied to
 the incoming data (normally XML) and the
-=02-convert-duck-to-escenic-xml.xsl= will be applied next before the
+02-convert-duck-to-escenic-xml.xsl will be applied next before the
 resulting Escenic XML will be imported into the Escenic Content
 Engine.
 
-
-
 * Creating your own transformers
 You can write a transformer in either XSL, Perl, Python or BASH. You
-put it in =<publication>/<import name>/transformers/<number>-<transformer task>.<{xsl,pl,py,sh}>=
-and specify the order in which it should run by setting the =<number>=
+put it in <publication>/<import name>/transformers/<number>-<transformer task>.<{xsl,pl,py,sh}>
+and specify the order in which it should run by setting the <number>
 before/after your other transformers (if any, many folks only have one
 transformer which is an XSL file).
 
-All transformers are run by the =ece-import= command and they get one
+All transformers are run by the ece-import command and they get one
 argument, namely the raw XML file from the 3rd party system. All
 transformers work on the same XML file, so that changes done in
-e.g. =01-first.sh= are passed on to =02-second.pl=. Each transformer
+e.g. 01-first.sh are passed on to 02-second.pl. Each transformer
 must read the file and write to the same file. That's the contract.
 
 Here's an example of a transformer that downloads all the pictures
-mentioned in the raw XML. =ece-import= will copy any multimedia files
+mentioned in the raw XML. ece-import will copy any multimedia files
 to the ECE import spool for you, so the transformer only needs to
 worry about downloading these to the directory of the incoming XML
-file: 
+file:
 
 #+BEGIN_SRC sh
 #! /usr/bin/env bash
 
-# Command which will download all thumbnails listed in the XML exported
-# from VMEO.
+# Command which will download all thumbnails listed in the XML
+# exported from VMEO.
 #
 # It is normally called from ece-import, but can also be called
 # directly (when debugging).
 
-xpath_to_get_thumbnail_urls="/didl:DIDL/didl:Item/didl:Component/didl:Decommandor/didl:Statement/mpeg7:Mpeg7/mpeg7:Decommandion/mpeg7:Summarization/mpeg7:Summary/mpeg7:VisualSummaryComponent/mpeg7:ImageLocator/mpeg7:MediaUri"
+xpath_to_get_thumbnail_urls"/didl:DIDL/didl:Item/didl:Component/didl:Decommandor/didl:Statement/mpeg7:Mpeg7/mpeg7:Decommandion/mpeg7:Summarization/mpeg7:Summary/mpeg7:VisualSummaryComponent/mpeg7:ImageLocator/mpeg7:MediaUri"
 
 # $1 is the raw XML
-cat "$1" | \
-  xml_grep --nowrap --cond $xpath_to_get_thumbnail_urls | \
-  sed 's/></>\n</g' | \
+cat "$1" | \\
+  xml_grep --nowrap --cond $xpath_to_get_thumbnail_urls | \\
+  sed 's/></>\n</g' | \\
   sed "s#.*>\(.*\)<.*#\1#g" | while read url; do
-  wget \
-    --quiet \
-    --continue \
-    --output-document $(dirname $1)/$(basename $url) \
+  wget \\
+    --quiet \\
+    --continue \\
+    --output-document $(dirname $1)/$(basename $url) \\
     $url;
 done
 #+END_SRC
+
+* COPYRIGHT
+Copyright 2011-2013 Vizrt
+
+Licensed under the Apache License, Version 2.0, see
+https://github.com/vizrt/ece-scripts/COPYING for further details.
+
+* AUTHOR
+Torstein Krause Johansen

From 089ee28bf2ff15ccb000ee65752d7a753915865f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 17 Jan 2013 11:31:50 +0100
Subject: [PATCH 1911/2585] - work in progress: started to man-ify
 ece-install-guide

---
 usr/share/doc/escenic/ece-install-guide.org | 852 +++++++++++---------
 1 file changed, 466 insertions(+), 386 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index e27f57d2..64738bcc 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -2,10 +2,29 @@
 #+AUTHOR: Vizrt Online / The SaaS Team
 #+OPTIONS: H:6 num:5 toc:2
 
-* Introduction
-The Escenic Content Engine Installer, =ece-install=  is a command line
+* NAME
+ece-install - command for installing any server in a single- or
+multi-server environment, with or without Escenic software.
+
+* SYNOPSIS
+ece-install [-f|--file conf-file] [-V|--version] [-v|--verbose]
+
+* OPTIONS
+** -f|--file conf-file
+Instructs *ece-install* to read configuration data from the specified
+file.
+
+** -v|--verbose
+Requests verbose output from *ece-install*.
+
+** -V|--version
+Prints the version of *ece-install*
+
+
+* DESCRIPTION
+The Escenic Content Engine Installer, *ece-install*  is a command line
 utility for installing the Escenic Content Engine. In addition to
-installing the Content Engine itself, =ece-install= also automates the
+installing the Content Engine itself, *ece-install* also automates the
 installation and configuration of other commonly-used components of
 Escenic-based sites, such as:
 
@@ -17,23 +36,23 @@ Escenic-based sites, such as:
  - NFS server and clients
  - Memcached distributed memory cache
 
-You can use =ece-install= to install The Content Engine and related
+You can use *ece-install* to install The Content Engine and related
 components on a wide range of GNU Linux distributions and Unix or
 Unix-like operating systems, but the level of support varies between
 platforms. On a fully-supported operating system (for example Debian 6.0),
-=ece-install= can both install and configure all required
+*ece-install* can both install and configure all required
 components, so that the entire process is reduced to a simple sequence
-of =ece-install= commands.
+of *ece-install* commands.
 
-On less well-supported platforms, =ece-install= may not be able to
+On less well-supported platforms, *ece-install* may not be able to
 automatically install some third-party components. You will then need to
 manually install some components. However, the process is very
-straightforward, since =ece-install= tells you which components you
+straightforward, since *ece-install* tells you which components you
 need to install manually, and it still handles the configuration of
 these components for you.
 
 ** Supported Operating Systems
-=ece-install= works best on Debian 6.0 (Squeeze) or later. It should,
+*ece-install* works best on Debian 6.0 (Squeeze) or later. It should,
 however, work on any Unix-like system that provides a BASH command
 shell (version 4.2 or later).
 
@@ -41,54 +60,54 @@ Here is an overview of the situation on some of the most popular
 platforms:
 
  - Debian-based operating systems :: On Debian 6.0 or later,
-     installation is fully automated. =ece-install= installs and
+     installation is fully automated. *ece-install* installs and
      configures all required components. This may also be the case on
      some Debian-based distributions. On recent Ubuntu distributions,
      however, you will need to manually install some components. For
       details, see Tested Operating Systems.
 
- - RedHat-based operating systems :: =ece-install= support for
+ - RedHat-based operating systems :: *ece-install* support for
       RedHat-based operating systems is constantly improving. However,
       since the public RedHat software repositories are significantly smaller
       than the Debian ones, it may often be necessary to manually
       install some components. For
       details, see Tested Operating Systems.
 
- - Other GNU/Linux and Unix systems :: =ece-install= does not currently support
+ - Other GNU/Linux and Unix systems :: *ece-install* does not currently support
       automated installation of third-party components on these
       platforms, so you will need to install them manually. It will,
       of course, tell you which components you need to install, and
       configure them for you.
 
-** ece-install Requirements
+** Requirements
 Whichever operating system(s) you will be installing on, you must ensure
 that the following requirements are met:
 
  - Sufficient memory :: The precise amount of memory required by
-      =ece-install= depends on what components are to be installed. To
+      *ece-install* depends on what components are to be installed. To
       successfully install a complete software stack on one machine,
       you need at least 3GB of RAM. If you are installing on a
       virtual machine it is important to remember this requirement
       when creating the virtual machine.
 
- - Internet connection :: =ece-install= needs an Internet
+ - Internet connection :: *ece-install* needs an Internet
       connection. Ideally it should be a fast connection, since it
       will need to download several hundred megabytes of data.
 
- - Firewall rules :: Your firewall settings must allow  =ece-install=
+ - Firewall rules :: Your firewall settings must allow  *ece-install*
                      to make outgoing connections from the machine on
                      which it is running to the following ports:
     - 80 (standard HTTP)
     - 443 (HTTPS)
 
 ****** On non-GNU/Linux systems
-=ece-install= relies on the GNU versions of various tools such as =find=, =cp=
-and =tar=. If you use =ece-install= on any system which provides different
+*ece-install* relies on the GNU versions of various tools such as *find*, *cp*
+and *tar*. If you use *ece-install* on any system which provides different
 versions of these tools by default, then you must make sure that:
 
- - The GNU tools are installed on the system
- - That the GNU tools take precedence in the command PATH offered to
-   =ece-install=.
+- The GNU tools are installed on the system
+- That the GNU tools take precedence in the command PATH offered
+  to *ece-install*.
 
 Platforms on which you will need to do this include:
 
@@ -96,13 +115,13 @@ Platforms on which you will need to do this include:
  - Solaris
 
 ** <<<Tested Operating Systems>>>
-| Operating system     | Status                                              | Date updated     |
-|----------------------+-----------------------------------------------------+------------------|
-| CentOS 6.2           | HA, APR & monitoring are not automatic              | 2012-03-07 13:42 |
-| Debian 6.0 (squeeze) | Everything is 100% automatic                        | 2012-02-27 13:18 |
-| Ubuntu 11.10         | Everything except Tomcat/APR wrappers are automatic | 2012-02-27 13:19 |
-| Ubuntu LTS 10.04     | Everything except Tomcat/APR wrappers are automatic | 2012-02-27 13:19 |
-| Ubuntu LTS 12.04     | Everything except Tomcat/APR wrappers are automatic | 2012-07-27 03:27 |
+| Operating system     | Status                                     |
+|----------------------+--------------------------------------------|
+| CentOS 6.2           | HA, APR & monitoring are not automatic     |
+| Debian 6.0 (squeeze) | Everything is 100% automatic               |
+| Ubuntu 11.10         | Everything except Tomcat/APR are automatic |
+| Ubuntu LTS 10.04     | Everything except Tomcat/APR are automatic |
+| Ubuntu LTS 12.04     | Everything except Tomcat/APR are automatic |
 
 * Using ece-install
 The various software components required to run an Escenic-powered web
@@ -114,35 +133,35 @@ particular server is called its *profile*.
 The overall procedure for installing Escenic on a cluster of machines
 is as follows:
 
- 1. Determine the profile of each server in the cluster. For
+ - Determine the profile of each server in the cluster. For
     descriptions of all available profiles, see Server Profiles.
- 1. For each server:
-    1. Log on to the server.
-    1. Install the =ece-install= script (see Get ece-install).
-    1. Become the root user (see Become Root).
-    1. Create an =ece-install= configuration file (see Create a
+ - For each server:
+    * Log on to the server.
+    * Install the *ece-install* script (see Get ece-install).
+    * Become the root user (see Become Root).
+    * Create an *ece-install* configuration file (see Create a
        Configuration File).
-    1. Run the =ece-install= script, specifying the appropriate
-       profile (see Run ece-install).
+    * Run the *ece-install* script, specifying the appropriate
+      profile (see Run ece-install).
 
 ** <<<Get ece-install>>>
 On Debian based systems, such as Ubuntu, you can use the [[http://apt.vizrt.com][Vizrt APT
-repository]] and install the package =escenic-content-engine-installer=
-to get the =ece-install= command.
+repository]] and install the package *escenic-content-engine-installer*
+to get the *ece-install* command.
 
 On RedHat based systems, such as CentOS, you can use the RPMs
 available from http://yum.vizrt.com/rpm and install the RPM
-=escenic-common-scripts= and =escenic-content-engine-installer= to
-get the =ece-install= command.
+*escenic-common-scripts* and *escenic-content-engine-installer* to
+get the *ece-install* command.
 
 If you have any problems installing using the DEB or RPM packages, or
 if you're system is neither Debian nor RedHat based, you can also
-download a ZIP archive of all the =ece-scripts=, which =ece-install=
+download a ZIP archive of all the *ece-scripts*, which *ece-install*
 is a part of, here:
 https://github.com/vizrt/ece-scripts/zipball/master
 
 ** <<<Become Root>>>
-You must be the root user to run =ece-install=. If you try to run it as
+You must be the root user to run *ece-install*. If you try to run it as
 an ordinary user, it will complain:
 #+BEGIN_SRC text
 [ece-install] You must be root when running ece-install
@@ -159,31 +178,32 @@ $ su -
 #+END_SRC
 
 #+BEGIN_QUOTE
-Note that using =sudo= to run =ece-install= (that is, entering  "=sudo
-ece-install=") may not work. You should actually become the root user
-before running =ece-install=.
+Note that using *sudo* to run *ece-install* (that is, entering  "*sudo
+ece-install*") may not work. You should actually become the root user
+before running *ece-install*.
 #+END_QUOTE
 
 ** <<<Create a Configuration File>>>
-=ece-install= expects to find a configuration file called
-=ece-install.conf= in the root user's home directory, which is usually
-=/root=. If you wish to call your configuration file something else,
-you need to specify it with the =-f= parameter, e.g. =ece-install -f
+*ece-install* expects to find a configuration file called
+*ece-install.conf* in the root user's home directory, which is usually
+*/root*. If you wish to call your configuration file something else,
+you need to specify it with the *-f* parameter, e.g. *ece-install -f
 ece-install-db-master.conf=.
 
-If you forget to provide such a file before running =ece-install=,
-then =ece-install= will complain:
+If you forget to provide such a file before running *ece-install*,
+then *ece-install* will complain:
 #+BEGIN_SRC text
-[ece-install] /root/ece-install.conf doesn't exist, I cannot live without it :-(
+[ece-install] /root/ece-install.conf doesn't exist,
+I cannot live without it :-(
 #+END_SRC
 
-=/root/ece-install.conf=. may contain a large number of configuration
+*/root/ece-install.conf*. may contain a large number of configuration
 parameters, but the minimum requirement is that it contains:
 
  * A user name and password for downloading software from Escenic
    Technet.
- * The parameter =fai_enabled=1=.
- * A parameter of the form =fai_<profile>_install=1= where =<profile>=
+ * The parameter *fai\_enabled=1*.
+ * A parameter of the form *fai\_<profile>\_install=1* where *<profile>*
    is the name of the *profile* you want to install (see Server
    Profiles for information about profiles).
 
@@ -196,7 +216,7 @@ fai_<profile>_install=1
 #+END_SRC
 
 If the configuration file does not contain these settings then
-=ece-install= will complain. For example:
+*ece-install* will complain. For example:
 #+BEGIN_SRC text
 [ece-install] Be sure to set technet_user and technet_password
 [ece-install] in /root/ece-install.conf
@@ -206,20 +226,20 @@ Depending on what components you are installing on the server, you may
 need to include other configuration parameters in the file. If you are
 installing the Widget Framework, for example, you will need to specify
 additional download credentials (see [[fai_wf_install]]). In most cases,
-however, parameters have default settings that enable =ece-install= to
+however, parameters have default settings that enable *ece-install* to
 complete installation with very few settings.
 
 ****** Interactive Mode
-The setting =fai_enabled=1= tells =ece-install= to run in *fully
-automated install (FAI)* mode. In this mode =ece-install= reads
-parameters from =ece-install.conf=. If it cannot find all the
+The setting *fai\_enabled=1* tells *ece-install* to run in *fully
+automated install (FAI)* mode. In this mode *ece-install* reads
+parameters from *ece-install.conf*. If it cannot find all the
 parameters it needs in the configuration file, then it fails. This is
-the recommended way to use =ece-install=.
+the recommended way to use *ece-install*.
 
-If you omit this parameter then =ece-install= will not read any
-=fai_???= parameters from =ece-install.conf= and will prompt for them
+If you omit this parameter then *ece-install* will not read any
+*fai\_???* parameters from *ece-install.conf* and will prompt for them
 interactively instead. You are, however, *strongly advised* not to run
-=ece-install= in interactive mode:
+*ece-install* in interactive mode:
 
  * Interactive mode is much less flexible than FAI mode.
  * Interactive mode is not actively maintained and may therefore be
@@ -227,27 +247,20 @@ interactively instead. You are, however, *strongly advised* not to run
  * Use of interactive mode is therefore not supported.
 
 ** <<<Run ece-install>>>
-To run =ece-install=, enter:
+To run *ece-install*, enter:
 #+BEGIN_SRC text
 # ece-install <options>
 #+END_SRC
 
-The following options may be specified with the command:
-
- - =[-v|--verbose]= :: Requests verbose output from =ece-install=.
-
- - =[-f|--file] <conf-file-path>= :: Instructs =ece-install= to read
-      configuration data from the specified file.
-
-=ece-install= writes a log file located at
-=/var/log/ece-install.log=. All output generated by all the commands
-it executes is written to this file. You can use =tail= to keep an eye
+*ece-install* writes a log file located at
+*/var/log/ece-install.log*. All output generated by all the commands
+it executes is written to this file. You can use *tail* to keep an eye
 on what is being written to the log.
 
-=ece-install= tries to "fail fast", exiting as soon as it detects an
+*ece-install* tries to "fail fast", exiting as soon as it detects an
 error and reporting the failure. For example:
 #+BEGIN_SRC text
-[ece-install-1] The command [cd /does/not/exist] FAILED, exiting :-(
+[ece-install-1] The command [cd /not/there] FAILED, exiting :-(
 [ece-install-1] See /var/log/ece-install.log for further details.
 #+END_SRC
 
@@ -261,7 +274,7 @@ the BASH interpreter with the -x flag:
 Doing this lets you see everything that BASH does while executing the
 script - how wild card variables are  expanded and so on.
 
-=ece-install= displays a series of progress messages during the
+*ece-install* displays a series of progress messages during the
 installation process. you can redirect standard output to a log file
 for easy reading of these messages later:
 #+BEGIN_SRC text
@@ -269,8 +282,8 @@ for easy reading of these messages later:
 #+END_SRC
 
 If you are logged into the host via SSH, you can make it possible to
-log out and leave =ece-install= running in the background by adding
-=nohup= at the start of the command and an ampersand at the end, as follows:
+log out and leave *ece-install* running in the background by adding
+*nohup* at the start of the command and an ampersand at the end, as follows:
 #+BEGIN_SRC text
 # nohup bash ece-install > ece-install.out &
 #+END_SRC
@@ -281,87 +294,87 @@ displayed. This contains important information about what you
 should do next, plus references to where you can find useful
 information, so you should read it carefully.
 
-You should now set a password for the user =escenic= (which has been
-created for you by =ece-install=). To do this enter:
+You should now set a password for the user *escenic* (which has been
+created for you by *ece-install*). To do this enter:
 
 #+BEGIN_SRC text
 # passwd escenic
 #+END_SRC
 
-The =escenic= user is the user you will need to use for most
+The *escenic* user is the user you will need to use for most
 escenic-related purposes.
 
 ** Preventing accidental execution of ece-install
-You can ensure that =ece-install= is not executed accidentally by
+You can ensure that *ece-install* is not executed accidentally by
 creating a *lock file*. Simply create a file with this path:
 #+BEGIN_SRC text
 /var/lock/ece-install.lock
 #+END_SRC
 
-If this file is present then =ece-install= will fail fast as follows:
+If this file is present then *ece-install* will fail fast as follows:
 #+BEGIN_SRC text
-The lock file is present: /var/lock/ece-install.lock and ece-install
-will therefore refuse to run.
+The lock file is present: /var/lock/ece-install.lock and
+ece-install will therefore refuse to run.
 #+END_SRC
 
 The lock file does not need to contain anything, it just needs to exist.
 
 * <<<Server Profiles>>>
 
-=ece-install= installs *profiles*. A profile is a pre-defined set of
+*ece-install* installs *profiles*. A profile is a pre-defined set of
 software components that enables a host computer to play a specific
 role in an Escenic installation.
 
-The profile to be installed by =ece-install= is determined by setting
-one of the following parameters in =ece-install.conf=:
+The profile to be installed by *ece-install* is determined by setting
+one of the following parameters in *ece-install.conf*:
 
- - =fai_editor_install=1= :: Installs all the components that need to
+ - *fai\_editor\_install=1* :: Installs all the components that need to
       be installed to create an Escenic *editorial server*.
- - =fai_presentation_install=1= :: Installs all the components that
+ - *fai\_presentation\_install=1* :: Installs all the components that
       need to be installed to create an Escenic *presentation server*.
- - =fai_wf_install=1= :: Installs the Widget Framework on an editorial
+ - *fai\_wf\_install=1* :: Installs the Widget Framework on an editorial
       or presentation server.
- - =fai_db_install=1= :: Installs a Database Server.
- - =fai_cache_install=1= :: Installs a Cache Server.
- - =fai_search_install=1= :: Installs a Search Server.
- - =fai_rmi_install=1= :: Installs an RMI Hub.
- - =fai_monitoring_install=1= :: Installs a Monitoring Server.
- - =fai_publication_create=1= :: Creates an Escenic publication.
- - =fai_all_install=1= :: Installs all of the above on one host
+ - *fai\_db\_install=1* :: Installs a Database Server.
+ - *fai\_cache\_install=1* :: Installs a Cache Server.
+ - *fai\_search\_install=1* :: Installs a Search Server.
+ - *fai\_rmi\_install=1* :: Installs an RMI Hub.
+ - *fai\_monitoring\_install=1* :: Installs a Monitoring Server.
+ - *fai\_publication\_create=1* :: Creates an Escenic publication.
+ - *fai\_all\_install=1* :: Installs all of the above on one host
       machine.
- - =fai_restore_from_backup=1= :: Restores a backup created with =ece=.
- - =fai_analysis_install=1= :: Installs and configures an Escenic Analysis Engine.
- - =fai_nfs_server_install=1= :: Installs an NFS server.
- - =fai_nfs_client_install=1= :: Installs an NFS client.
- - =fai_vip_install=1= :: Installs virtual IP (VIP) providers.
+ - *fai\_restore\_from\_backup=1* :: Restores a backup created with *ece*.
+ - *fai\_analysis\_install=1* :: Installs and configures an Escenic Analysis Engine.
+ - *fai\_nfs\_server\_install=1* :: Installs an NFS server.
+ - *fai\_nfs\_client\_install=1* :: Installs an NFS client.
+ - *fai\_vip\_install=1* :: Installs virtual IP (VIP) providers.
 
 There are a number of common components that are included in all or
 most of the profiles. These are described below.
 
-** <<<fai_editor_install>>>
-To use this profile add =fai_editor_install=1= to your
-=ece-install.conf= file.
+** <<<fai\_editor\_install>>>
+To use this profile add *fai\_editor\_install=1* to your
+*ece-install.conf* file.
 
 This profile contains all the components that need to be installed to
 create an Escenic *editorial server*. An editorial server (sometimes
 also called a publication server) hosts a Content Engine used for editorial
 purposes (primarily Content Studio sessions).
 
-** <<<fai_presentation_install>>>
-To use this profile, add =fai_presentation_install=1= to your
-=ece-install.conf= file.
+** <<<fai\_presentation\_install>>>
+To use this profile, add *fai\_presentation\_install=1* to your
+*ece-install.conf* file.
 
 This profile contains all the components that need to be installed to
 create an Escenic *presentation server*. A presentation server hosts a
 Content Engine used for serving publications to web site
 users. Differences between this and an editorial server include:
 
- * Only the Escenic administration web-app =escenic-admin= and publications are
+ * Only the Escenic administration web-app *escenic-admin* and publications are
    deployed. Other editorial web-apps such as Web Studio are not
    required.
  * Memcached, the distributed memory cache is installed.
 
-** <<<fai_wf_install>>>
+** <<<fai\_wf\_install>>>
 To use this profile, add the following settings:
 #+BEGIN_SRC text
 fai_wf_install=1
@@ -369,9 +382,9 @@ wf_user=<user-name>
 wf_password=<password>
 #+END_SRC
 
-to your =ece-install.conf= file.
+to your *ece-install.conf* file.
 
-=wf_user= and =wf_password= must contain your Widget Framework Maven
+*wf\_user* and *wf\_password* must contain your Widget Framework Maven
 repository credentials (supplied when you purchased the Widget
 Framework). If you do not have these credentials, please contact
 support@escenic.com.
@@ -381,50 +394,51 @@ installed on a machine where you have already installed either an
 editorial or presentation profile. Exactly which machines you install
 the Widget Framework on depends on your deployment strategy.
 
-** <<<fai_db_install>>>
-To use this profile, add =fai_db_install=1= to your
-=ece-install.conf= file.
+** <<<fai\_db\_install>>>
+To use this profile, add *fai\_db\_install=1* to your
+*ece-install.conf* file.
 
 When this profile is used on a supported version of Debian or Ubuntu,
-=ece-install= installs all the components needed to create an Escenic
+*ece-install* installs all the components needed to create an Escenic
 database, based on the Percona distribution of MySQL. On any other
 platform you must install either Percona or a standard MySQL
-distribution yourself before running =ece-install=.
+distribution yourself before running *ece-install*.
 
 Otherwise, this profile contains all the Escenic components needed on
 a database server plus the correct database schema for the Content
 Engine version and plug-in versions you are installing.
 
 If an Escenic database has already been installed on the machine, then
-=ece-install= will fail and display an information message:
+*ece-install* will fail and display an information message:
 
 #+BEGIN_SRC text
 [ece-install] Setting up the ECE database schema ...
-ERROR 1007 (HY000) at line 1: Can't create database 'ece5db'; database exists
+ERROR 1007 (HY000) at line 1: Can't create database 'ece5db';
+database exists
 ERROR 1050 (42S01) at line 2: Table 'DBChangeLog' already exists
 [ece-install] running tables FAILED, exiting :-(
 #+END_SRC
 
 If you actually want to re-install the database you can do so by
-adding this setting to =ece-install.conf= before you run =ece-install=:
+adding this setting to *ece-install.conf* before you run *ece-install*:
 
 #+BEGIN_SRC conf
 fai_db_drop_old_db_first=1
 #+END_SRC
 
-Given that =mysqld= is installed, this profile will download all the
+Given that *mysqld* is installed, this profile will download all the
 Escenic components and install the ECE database schema based from the
 SQL files contained inside the distribution bundles specified with in
-the =technet_download_list= and =wf_dowload_list= variables. The
-defaults are inside the =ece-install= script itself, but you can
-overrides these in your =ece-install.conf= if you wish different minor
+the *technet\_download\_list* and *wf\_dowload\_list* variables. The
+defaults are inside the *ece-install* script itself, but you can
+overrides these in your *ece-install.conf* if you wish different minor
 versions of the ECE and plugins.
 
 *** Master & slave setup
-You can easily use =ece-install= to set up master and slave databases
+You can easily use *ece-install* to set up master and slave databases
 on different hosts.
 
-First create the master database using these =ece-install.conf= settings:
+First create the master database using these *ece-install.conf* settings:
 #+BEGIN_SRC conf
 fai_enabled=1
 fai_db_install=1
@@ -432,7 +446,7 @@ fai_db_master=1
 fai_db_replication=1
 #+END_SRC
 
-When you run =ece-install= with these settings, the output log
+When you run *ece-install* with these settings, the output log
 messages will include information that you need for creating the slave database:
 #+BEGIN_SRC text
 [ece-install-35] - DB is now set up on localhost:3306
@@ -441,7 +455,7 @@ messages will include information that you need for creating the slave database:
 #+END_SRC
 
 On the slave database host you can then use these values in your
-=ece-install.conf= file as follows:
+*ece-install.conf* file as follows:
 #+BEGIN_SRC conf
 fai_enabled=1
 fai_db_install=1
@@ -452,27 +466,27 @@ fai_db_master_log_file=mysql-bin.000013
 fai_db_master_log_position=106
 #+END_SRC
 
-=ece-install= uses internal defaults to create a replication user and
+*ece-install* uses internal defaults to create a replication user and
 credentials. You can override these defaults by setting additional
-parameters in =ece-install.conf=. For details, see [[Overview of All FAI
+parameters in *ece-install.conf*. For details, see [[Overview of All FAI
 Parameters]].
 
-** <<<fai_cache_install>>>
-To use this profile, add =fai_cache_install=1= to your
-=ece-install.conf= file.
+** <<<fai\_cache\_install>>>
+To use this profile, add *fai\_cache\_install=1* to your
+*ece-install.conf* file.
 
 When this profile is used on a supported version of Debian or Ubuntu,
-=ece-install= installs the latest Varnish 3.x caching server from the
+*ece-install* installs the latest Varnish 3.x caching server from the
 Varnish APT repository. On any other platform you must install Varnish 3.x
-yourself before running =ece-install=.
+yourself before running *ece-install*.
 
-Once Varnish is installed, =ece-install= configures it to suit the
+Once Varnish is installed, *ece-install* configures it to suit the
 typical requirements of an Escenic site:
 
  * Sets up the cache server on port 80
  * Creates an access control list (ACL) of IP addresses allowed to access
-   privileged web applications such as =/escenic-admin=, =/escenic= and
-   =/webservice=. If you are running =ece-install= in an SSH session,
+   privileged web applications such as */escenic-admin*, */escenic* and
+   */webservice*. If you are running *ece-install* in an SSH session,
    then it includes the IP address from which you connected in the ACL
    so that you can access these applications without needing to
    manually edit the ACL or disable security.
@@ -481,7 +495,7 @@ typical requirements of an Escenic site:
    cache server.
  * Sets up configuration that strips cookies from static  resources,
    such as CSS files, JS files and images.
- * Installs the =nginx= web server for serving static content and
+ * Installs the *nginx* web server for serving static content and
    configures Varnish accordingly. This is particularly useful for
    installations where VME Online servers need to access content.
 
@@ -494,31 +508,31 @@ TBD:
   configuration.
 #+END_COMMENT
 
-** <<<fai_search_install>>>
-To use this profile, add =fai_search_install=1= to your
-=ece-install.conf= file.
+** <<<fai\_search\_install>>>
+To use this profile, add *fai\_search\_install=1* to your
+*ece-install.conf* file.
 
 This profile installs search components (Apache Solr plus the Escenic
-=indexer= web app.
+*indexer* web app.
 
-** <<<fai_rmi_install>>>
-To use this profile, add =fai_rmi_install=1= to your
-=ece-install.conf= file.
+** <<<fai\_rmi\_install>>>
+To use this profile, add *fai\_rmi\_install=1* to your
+*ece-install.conf* file.
 
 This profile installs an RMI hub. This is only necessary on systems
 using ECE < 5.3
 
-** <<<fai_monitoring_install>>>
-To use this profile, add =fai_monitoring_install=1= to your
-=ece-install.conf= file.
+** <<<fai\_monitoring\_install>>>
+To use this profile, add *fai\_monitoring\_install=1* to your
+*ece-install.conf* file.
 
 This profile installs a Munin gatherer, a Icinga (an enhanced Nagios)
 server plus a web server for providing access to Icinga and the
 reports Munin generates.
 
-** <<<fai_publication_create>>>
-To use this profile, add =fai_publication_create=1= to your
-=ece-install.conf= file.
+** <<<fai\_publication\_create>>>
+To use this profile, add *fai\_publication\_create=1* to your
+*ece-install.conf* file.
 
 This profile creates a publication for you. It should be used on a
 machine where you have already installed either an editorial or
@@ -529,12 +543,12 @@ create publication is based on the Widget Framework. Otherwise the
 publication is based on the clean demo WAR supplied with the Content
 Engine.
 
-=ece-install= will create publication of all publication WAR files you
+*ece-install* will create publication of all publication WAR files you
 have in your EAR file if you also define
-=fai_publication_domain_mapping_list= and =fai_publication_ear=.
+*fai\_publication\_domain\_mapping\_list* and *fai\_publication\_ear*.
 #+BEGIN_SRC text
 fai_publication_create=1
-fai_publication_ear=/var/cache/escenic/stoppok-trunk-rev6195-2012-12-04_1134.ear
+fai_publication_ear=/tmp/stoppok-trunk-rev6195-2012-12-04_1134.ear
 fai_publication_domain_mapping_list="
   stoppok,st.war#stoppok.example.com#newindian.example.com
   helden#dinamani.example.com#helden.example.com
@@ -544,9 +558,9 @@ fai_publication_domain_mapping_list="
 See [[Overview of All FAI Parameters]] for further details on the format
 of the domain mapping list.
 
-** <<<fai_all_install>>>
-To use this profile, add =fai_all_install=1= to your
-=ece-install.conf= file.
+** <<<fai\_all\_install>>>
+To use this profile, add *fai\_all\_install=1* to your
+*ece-install.conf* file.
 
 This profile is primarily intended for use by developers and system
 administrators as a test environment. It is *not* considered suitable
@@ -555,13 +569,13 @@ server, application server, Escenic Content Engine, assembly host,
 database and Widget Framework is installed. In addition, a publication
 is created.
 
-** <<<fai_restore_from_backup>>
-To use this profile, add =fai_restore_from_backup=1= to your
-=ece-install.conf= file.
+** <<<fai\_restore\_from\_backup>>>
+To use this profile, add *fai\_restore\_from\_backup=1* to your
+*ece-install.conf* file.
 
 Unlike all the other profiles, this profile does not install anything
 or create anything new. Instead, it restores a backup you have
-previously created using the =ece= script - like this, for example:
+previously created using the *ece* script - like this, for example:
 #+BEGIN_SRC text
 $ ece -i <instance> backup
 #+END_SRC
@@ -584,67 +598,78 @@ You can use this profile in two ways:
  * To install a copy of some other installation on a "clean" host.
 
 In order to use this profile you have to set some additional
-parameters in =ece-install.conf= in order to specify the location of
+parameters in *ece-install.conf* in order to specify the location of
 the backup file you want to restore and the specific items you want to
 restore from the file.
 
-The parameters you can use together with  =fai_restore_from_backup= to
-specify what you want to restore are:
+The parameters you can use together with *fai\_restore\_from\_backup*
+to specify what you want to restore are:
+
+- *fai\_restore\_all* :: Restore all backup items. Requires a full
+     backup tarball. Default is 1.
+
+- *fai\_restore\_db* :: Install the database server and restore its
+     contents. Default is 0
 
-|---------------------------------+---------+-----------------------------------------------------------|
-| Parameter                       | Default | Description                                               |
-|---------------------------------+---------+-----------------------------------------------------------|
-| ~fai_restore_all~               |       0 | Restore all backup items. Requires a full backup tarball. |
-| =fai_restore_db=                |       0 | Install the database server and restore its contents      |
-| =fai_restore_data_files=        |       0 | Restore the Solr and Content Engine data files            |
-| =fai_restore_configuration=     |       0 | Restore the Solr and content Engine configuration files   |
-| =fai_restore_software_binaries= |       0 | Restore the Escenic and Apache Tomcat software            |
-| =fai_restore_from_file=         |      "" | The =.tar= file produced by =ece -i <instance> backup=    |
-|---------------------------------+---------+-----------------------------------------------------------|
+- *fai\_restore\_data\_files* :: Restore the Solr and Content Engine
+     data files. Default is 0
+
+- *fai\_restore\_configuration* :: Restore the Solr and content Engine
+     configuration files. Default is 0.
+- *fai\_restore\_software\_binaries* :: Restore the Escenic and Apache
+     Tomcat software. Default is 0.
+
+- *fai\_restore\_from\_file* :: The *.tar* file produced by *ece -i
+     <instance> backup*. Default is "".
 
 So to restore everything in a specified backup file, you would need
-something like this in your =ece-install.conf= file:
+something like this in your *ece-install.conf* file:
 #+BEGIN_SRC conf
 fai_enabled=1
 fai_restore_from_backup=1
 fai_restore_all=1
-fai_restore_from_file=/var/backups/escenic/engine-dev1-backup-2011-10-10.tar
+fai_restore_from_file=/var/backups/escenic/backup-2011-10-10.tar
 #+END_SRC
 
-=ece-install= can also remove unwanted files from an existing
+*ece-install* can also remove unwanted files from an existing
 installation prior to restoring from a backup. You can specify the
 files you would like to remove using the following parameters:
 
-|------------------------------+---------+-----------------------------------|
-| Parameter                    | Default | Description                       |
-|------------------------------+---------+-----------------------------------|
-| =fai_restore_pre_wipe_all=   |       0 | Remove all data/state & log files |
-| =fai_restore_pre_wipe_cache= |       0 | Remove the cache files            |
-| =fai_restore_pre_wipe_crash= |       0 | Remove the crash files            |
-| =fai_restore_pre_wipe_logs=  |       0 | Remove all log files              |
-| =fai_restore_pre_wipe_solr=  |       0 | Remove the solr data/state files  |
-|------------------------------+---------+-----------------------------------|
+- *fai\_restore\_pre\_wipe\_all* :: Remove all data/state & log
+     files. Default is 0.
+- *fai\_restore\_pre\_wipe\_cache* :: Remove the cache files. Default
+     is 0.
+- *fai\_restore\_pre\_wipe\_crash* :: Remove the crash files. Default
+     is 0.
+- *fai\_restore\_pre\_wipe\_logs*  :: Remove all log files. Default
+     is 0.
+- *fai\_restore\_pre\_wipe\_solr*  :: Remove the solr data/state
+     files. Default is 0.
 
 *** Data security
 You must be careful when restoring backups that you don't
 inadvertently restore the backup over a system that actually contains
-valuable data. =ece-install= incorporates some safeguards, but
+valuable data. *ece-install* incorporates some safeguards, but
 ultimately cannot prevent you from making such mistakes.
 
 If you try to restore the DB and the ECE schema already exists, the
 restore will fail as follows:
 #+BEGIN_SRC text
 [ece-install-8] Restoring the database contents on ubiquitous ...
-[ece-install-24] Selecting the most recent database dump ece5db-2011-10-10.sql.gz
-ERROR 1007 (HY000) at line 1: Can't create database 'ece5db'; database exists
-ERROR 1050 (42S01) at line 25: Table '`ece5db`.`AccessControlList`' already exists
-[ece-install-24] The command [restoring from var/backups/escenic/ece5db-2011-10-10.sql.gz] FAILED, exiting :-(
+[ece-install-24] Selecting the most recent database dump
+ece5db-2011-10-10.sql.gz
+ERROR 1007 (HY000) at line 1: Can't create database 'ece5db';
+database exists
+ERROR 1050 (42S01) at line 25: Table
+'`ece5db`.`AccessControlList`' already exists
+[ece-install-24] The command [restoring from
+/var/backups/escenic/ece5db-2011-10-10.sql.gz] FAILED, exiting :-(
 [ece-install-24] See /var/log/ece-install.log for further details.
 #+END_SRC
 
-** <<<fai_analysis_install>>>
-To use this profile, add =fai_analysis_install=1= to your
-=ece-install.conf= file.
+** <<<fai\_analysis\_install>>>
+To use this profile, add *fai\_analysis\_install=1* to your
+*ece-install.conf* file.
 
 This profile installs the Escenic Analysis Engine, and configures it
 for production use with a sensible set of defaults.
@@ -653,19 +678,19 @@ The Analysis Engine uses a database to store statistics. You must not
 use the same database as is used by the Content Engine for storing
 publication contents.
 
-** <<<fai_nfs_server_install>>>
-To use this profile, add =fai_nfs_server_install=1= to your
-=ece-install.conf= file.
+** <<<fai\_nfs\_server\_install>>>
+To use this profile, add *fai\_nfs\_server\_install=1* to your
+*ece-install.conf* file.
 
 This profile installs an NFS server.
 
-** <<<fai_nfs_client_install>>>
-To use this profile, add =fai_nfs_client_install=1= to your
-=ece-install.conf= file.
+** <<<fai\_nfs\_client\_install>>>
+To use this profile, add *fai\_nfs\_client\_install=1* to your
+*ece-install.conf* file.
 
 This profile installs an NFS client, creates the client mount points
 and mounts them on the host. Per default, all network drives are
-mount under =/mnt=.
+mount under */mnt*.
 
 The following example shows the ece-install.conf settings required to
 mount the Escenic multimedia archive on the NFS server:
@@ -676,14 +701,14 @@ fai_nfs_server_address=192.168.1.200
 fai_nfs_export_list="/var/exports/multimedia"
 #+END_SRC
 
-** <<<fai_vip_install>>>
+** <<<fai\_vip\_install>>>
 [[file:images/nfs-vip.png]]
 
-To use this profile, add =fai_vip_install=1= to your
-=ece-install.conf= file.
+To use this profile, add *fai\_vip\_install=1* to your
+*ece-install.conf* file.
 
 This profile is usually used in combination with one of the other
-=ece-install= profiles. It makes a host capable of providing the
+*ece-install* profiles. It makes a host capable of providing the
 services it offers on specified virtual IP addresses (VIPs). This
 makes it possible to provide fail-over for all single points of
 failure ([[http://en.wikipedia.org/wiki/Single_point_of_failure][SPOFs)]] in your installation, such as the file server or
@@ -696,11 +721,11 @@ server, install both an NFS server and a VIP provider on two hosts:
  *  The secondary NFS server that takes over if the primary one fails
     on the other.
 
-Installing VIP providers with the =fai_vip_install= profile
+Installing VIP providers with the *fai\_vip\_install* profile
 allows both servers to be accessed via the same virtual IP address, so
 that a fail-over is invisible to users of the service.
 
-The following =ece-install.conf= settings installs an NFS server and
+The following *ece-install.conf* settings installs an NFS server and
 configures two VIP providers:
 
  * The primary node (this host) at 192.168.1.112
@@ -728,30 +753,30 @@ fai_vip_address=192.168.1.200
 fai_vip_sibling_ip=$fai_vip_secondary_node_ip
 #+END_SRC
 
-The setting =fai_vip_sibling_ip=$fai_vip_secondary_node_ip= says that
+The setting *fai\_vip\_sibling\_ip*$fai\_vip\_secondary\_node\_ip* says that
 the secondary node is this node's sibling, and therefore implicitly
 defines this node as the primary node.
 
 The secondary node can therefore be defined using an almost identical
-configuration - only =fai_vip_sibling_ip= needs to be set differently:
+configuration - only *fai\_vip\_sibling\_ip* needs to be set differently:
 #+BEGIN_SRC conf
 fai_vip_sibling_ip=$fai_vip_primary_node_ip
 #+END_SRC
 
-The =fai_vip_primary_node_auth_key= setting is optional. If you do not
+The *fai\_vip\_primary\_node\_auth\_key* setting is optional. If you do not
 set it, ece-install will generate it for you. However, you will then have to
-add the generated key to =ece-install.conf= when installing the secondary
+add the generated key to *ece-install.conf* when installing the secondary
 node.
 
 You can generate the key as follows:
 #+BEGIN_SRC sh
-$ dd if=/dev/urandom bs=512 count=1 | \
-    openssl md5 | \
+$ dd if=/dev/urandom bs=512 count=1 | \\
+    openssl md5 | \\
     cut -d' ' -f2
 #+END_SRC
 
 ** Installing from EARs instead of Binaries
-It is possible to get =ece-install= to use a supplied EAR and
+It is possible to get *ece-install* to use a supplied EAR and
 configuration archive instead of using the files provided with the
 Escenic Content Engine and plugins.
 
@@ -782,20 +807,20 @@ assembly environment set up and then do:
 
 #+BEGIN_SRC text
 $ cd /opt/escenic
-$ tar czf /tmp/nursery-skeleton-solr-and-security.tar.gz \
-  engine/security \
-  engine/siteconfig/config-skeleton \
-  engine/solr/conf \
+$ tar czf /tmp/config-skeleton.tar.gz \\
+  engine/security \\
+  engine/siteconfig/config-skeleton \\
+  engine/solr/conf \\
   engine/siteconfig/bootstrap-skeleton
 #+END_SRC
 
-=/tmp/nursery-skeleton-solr-and-security.tar.gz= should now have everything
+*/tmp/nursery-skeleton-solr-and-security.tar.gz* should now have everything
 you need. You can now configure your FAI installation to use these by,
 e.g.:
 
 #+BEGIN_SRC conf
 fai_presentation_ear=/tmp/engine.ear
-fai_presentation_conf_archive=/tmp/nursery-skeleton-solr-and-security.tar.gz
+fai_presentation_conf_archive=/tmp/config-skeleton.tar.gz
 #+END_SRC
 
 Corresponding configuration options are available for the other server
@@ -803,19 +828,19 @@ profiles, see the table below.
 
 The inclusion of the engine/solr directory makes it easy for users to
 provide their own, optimised Solr configuration. In this context, also
-note that a post install hook, =set_up_solr.postinst=, is available.
+note that a post install hook, *set\_up\_solr.postinst*, is available.
 
 If you wish to provide Nursery configuration for the plugins, you
 simply put them in engine/siteconfig/config-skeleton inside your
 tarball, together with the other Nursery configuration files.
 
-The =fai_presentation_conf_archive= and =fai_presentation_ear= variables
+The *fai\_presentation\_conf\_archive* and *fai\_presentation\_ear* variables
 both accept the following types of value (here using the value of
-=fai_presentation_ear= as an example):
-- =http://build.server/stable/engine-mysite.com-1.2.3.ear=
-- =https://build.server/stable/engine-mysite.com-1.2.3.ear=
-- =file:///var/lib/build/stable/engine-mysite.com-1.2.3.ear=
-- =/var/lib/build/stable/engine-mysite.com-1.2.3.ear=
+*fai\_presentation\_ear* as an example):
+- *http://build.server/stable/engine-mysite.com-1.2.3.ear*
+- *https://build.server/stable/engine-mysite.com-1.2.3.ear*
+- *file:///var/lib/build/stable/engine-mysite.com-1.2.3.ear*
+- */var/lib/build/stable/engine-mysite.com-1.2.3.ear*
 
 ** Setting up virtual hosts
 Setting up virtual host definitions in the application server makes a
@@ -823,8 +848,8 @@ some things easier, such as ECE plugins which set cookies based on
 information they get from the app server.
 
 ece-install can set up the virtual hosts configuration for Tomcat
-application servers if the profile is =editor=, =all= or
-=presentation=.
+application servers if the profile is *editor*, *all* or
+*presentation*.
 
 To use this feature, you must define one domain for each publication
 in the following FAI parameter:
@@ -835,7 +860,7 @@ fai_publication_domain_mapping_list="
 "
 #+END_SRC
 
-This will produce the following stanzas in =server.xml=:
+This will produce the following stanzas in *server.xml*:
 
 #+BEGIN_SRC nxml
 <Host
@@ -863,29 +888,29 @@ This will produce the following stanzas in =server.xml=:
 *** Having WAR files with a different name than the publication
 Nine out of ten times (probably a lot more too), the WAR file matches
 the name of the publication, e.g. if your publication is called
-=sports=, your WAR is called =sports.war=.
+*sports*, your WAR is called *sports.war*.
 
 However, if you for some reason have a WAR with a different name, you
 can add this as an addition to the first element of the
-=fai_publication_domain_mapping_list= entry:
+*fai\_publication\_domain\_mapping\_list* entry:
 #+BEGIN_SRC text
 fai_publication_domain_mapping_list="
   firepub,fire.war#fire.escenic.com
 "
 #+END_SRC
 
-Now, the =appBase= and =docBase= values will become =webapps-fire= and
-=fire= respectively.
+Now, the *appBase* and *docBase* values will become *webapps-fire* and
+*fire* respectively.
 
 *** Host name aliases
 As you can see, there's a third optional option to the
-=fai_publication_domain_mapping_list= which can be specified as a
+*fai\_publication\_domain\_mapping\_list* which can be specified as a
 comma separated list of host aliases to be added to the app server host
 configuration.
 
 Furthermore, if these host names are  not resolvable to your local
 host (neither localhost or the IP of your $HOSTNAME), ece-install will
-add entries for these domains to the machine's =/etc/hosts= file:
+add entries for these domains to the machine's */etc/hosts* file:
 #+BEGIN_SRC conf
 # added by ece-install @ Wed Feb  8 19:21:49 CST 2012
 127.0.1.1 fire.escenic.com
@@ -894,118 +919,116 @@ add entries for these domains to the machine's =/etc/hosts= file:
 127.0.1.1 ild.escenic.com
 #+END_SRC
 
-If you do not want ece-install to touch your =/etc/hosts=, you can set
-=fai_keep_off_etc_hosts=1= in your =ece-install.conf=.
+If you do not want ece-install to touch your */etc/hosts*, you can set
+*fai\_keep\_off\_etc\_hosts=1* in your *ece-install.conf*.
 
 ** Overview of All FAI Parameters
 The ece-install script understands the following settings in the
 $HOME/ece-install.conf file of the root user:
 
-|----------------------------------------+--------------------------------------------------------------+-------------------------------------------------------------------------------------------------------|
-| Parameter                              | Default                                                      | Description                                                                                           |
-|----------------------------------------+--------------------------------------------------------------+-------------------------------------------------------------------------------------------------------|
-| =fai_all_conf_archive=                 | ""                                                           | =conf.tar.gz= to use for Nursery & JAAS configuration                                                 |
-| =fai_all_ear=                          | ""                                                           | EAR to use instead of the Escenic binaries                                                            |
-| =fai_all_install=                      | 0                                                            | Install all components on your server.                                                                |
-| =fai_all_stop_and_clear=               | 0                                                            | After installation, stop the instance and clear its work & log files.                                 |
-| =fai_analysis_db_host=                 | localhost                                                    | For the EAE DB (different from ECE's)                                                                 |
-| =fai_analysis_db_install=              | 0                                                            | Install DB profile                                                                                    |
-| =fai_analysis_db_password=             | read-the-source-luke                                         | For the EAE DB (different from ECE's)                                                                 |
-| =fai_analysis_db_port=                 | 3306                                                         | For the EAE DB (different from ECE's)                                                                 |
-| =fai_analysis_db_schema=               | ece5db                                                       | For the EAE DB (different from ECE's)                                                                 |
-| =fai_analysis_db_user=                 | ece5user                                                     | For the EAE DB (different from ECE's)                                                                 |
-| =fai_analysis_install=                 | 0                                                            | Will install the Escenic Analysis Engine, aka Stats, EAE.                                             |
-| =fai_analysis_name=                    | analysis1                                                    | EAE instance name                                                                                     |
-| =fai_analysis_port=                    | 8080                                                         | Port of the EAE                                                                                       |
-| =fai_analysis_shutdown=                | 8005                                                         | Shutdown port for the EAE app server                                                                  |
-| =fai_analysis_stop_and_clear=          | 0                                                            | After installation, stop the instances and clear its work & log files                                 |
-| =fai_apt_vizrt_pool=                   | stable                                                       | Which package pool in the Vizrt APT to install package from.                                          |
-| =fai_cache_backends=                   | ${HOSTNAME}:8080                                             | Space separated, e.g. "app1:8080 app2:8080"                                                           |
-| =fai_cache_install=                    | 0                                                            | Install cache server profile                                                                          |
-| =fai_db_daily_backup=                  | 0                                                            | Sets up daily backup of the DB.                                                                       |
-| =fai_db_drop_old_db_first=             | 0                                                            | Warning: this will drop the old database before installing a new one                                  |
-| =fai_db_host=                          | $HOSTNAME                                                    | Useful for editor & presentation profiles                                                             |
-| =fai_db_install=                       | 0                                                            | Install db profile                                                                                    |
-| =fai_db_password=                      | read-the-source-luke                                         | Useful for DB installation profile                                                                    |
-| =fai_db_port=                          | 3306                                                         | Useful for editor & presentation profiles                                                             |
-| =fai_db_schema=                        | ece5db                                                       | Useful for DB installation profile                                                                    |
-| =fai_db_user=                          | ece5user                                                     | Useful for DB installation profile                                                                    |
-| =fai_dry_run=                          | 0                                                            | ece-install will download Escenic archives and install OS packages, but will not configure anything.  |
-| =fai_editor_conf_archive=              | ""                                                           | =conf.tar.gz= to use for Nursery & JAAS configuration                                                 |
-| =fai_editor_deploy_white_list=         | "escenic-admin escenic studio indexer-webservice webservice" | The list of WARs to be deployed on this instance.                                                     |
-| =fai_editor_ear=                       | ""                                                           | EAR to use instead of the Escenic binaries                                                            |
-| =fai_editor_install=                   | 0                                                            | Install the editorial profile                                                                         |
-| =fai_editor_name=                      | editor1                                                      | Name of the editor instance                                                                           |
-| =fai_editor_port=                      | 8080                                                         | HTTP port of the editor instance                                                                      |
-| =fai_editor_shutdown=                  | 8005                                                         | Shutdown port of the editor instance                                                                  |
-| =fai_editor_stop_and_clear=            | 0                                                            | After installation, stop the instances and clear its work & log files                                 |
-| =fai_enabled=                          | 0                                                            | Whether or not to run ece-install in FAI mode                                                         |
-| =fai_keep_off_etc_hosts=               | 0                                                            | Set this to 1 if you don't want ece-install adding entries to /etc/hosts                              |
-| =fai_monitoring_admin_password=        | No telling you here ;-)                                      | The admin password of the web interface(s). Currenlty only set for Icinga.                            |
-| =fai_monitoring_ece_host_list=         | ""                                                           | Hosts running one or more ECE instance                                                                |
-| =fai_monitoring_host_list=             | ""                                                           | Quoted, space separated list of <host>#<ip> pairs, e.g.: "pres1#10.72.227.250 pres2#10.72.227.251"    |
-| =fai_monitoring_install=               | 0                                                            | Install the monitoring server profile.                                                                |
-| =fai_monitoring_munin_node_list=       | ""                                                           | Set this to a whitespace separated list of nodes that munin should monitor                            |
-| =fai_monitoring_search_host_list=      | ""                                                           | Hosts running search instance(s) (Solr + indexer)                                                     |
-| =fai_monitoring_server_ip=             | 127.0.0.1                                                    | The IP of the monitoring server.                                                                      |
-| =fai_nfs_allowed_client_network=       | ""                                                           | IP/netmask of allowed NFS clients, example: 192.168.1.0/255.255.255.0                                 |
-| =fai_nfs_client_install=               | 0                                                            | Installs an NFS client                                                                                |
-| =fai_nfs_client_mount_point_parent=    | /mnt                                                         | Mount point parent directory                                                                          |
-| =fai_nfs_export_list=                  | ""                                                           | Space separated list of NFS export directories, full paths as seen on the NFS server.                 |
-| =fai_nfs_server_address=               | ""                                                           | Address of the NFS server, useful for the NFS client profile                                          |
-| =fai_nfs_server_install=               | 0                                                            | Install an NFS server                                                                                 |
-| =fai_presentation_conf_archive=        | ""                                                           | =conf.tar.gz= to use for Nursery & JAAS configuration                                                 |
-| =fai_presentation_ear=                 | ""                                                           | EAR to use instead of the Escenic binaries                                                            |
-| =fai_presentation_install=             | 0                                                            | Install the presentation server profile                                                               |
-| =fai_presentation_name=                | engine1                                                      | Name of the presentation server instance                                                              |
-| =fai_presentation_port=                | 8080                                                         | HTTP port of the presentation server instance                                                         |
-| =fai_presentation_deploy_white_list=   | "escenic-admin <assemblytool/publications/*>"                | The list of WARs to be deployed on this instance.                                                     |
-| =fai_presentation_shutdown=            | 8005                                                         | Shutdown port of the presentation instance                                                            |
-| =fai_presentation_stop_and_clear=      | 0                                                            | After installation, stop the instances and clear its work & log files                                 |
-| =fai_public_host_name=                 | ${HOSTNAME}:8080                                             | The public address for your website                                                                   |
-| =fai_publication_create=               | 0                                                            | Create a new publication                                                                              |
-| =fai_publication_domain_mapping_list=  | ""                                                           | Mapping between publications and domains: "<pub>[,pub.war]#<domain>[#,<alias1>,<alias2>]"             |
-| =fai_publication_ear=                  | ""                                                           | All publications WARs inside will be used for publication creation (assumes =fai_publication_create=) |
-| =fai_publication_environment=          | "production"                                                 | The kind of environment/habitat. Typical values are: production, staging, testing, development.       |
-| =fai_publication_name=                 | mypub                                                        | Name of the publication                                                                               |
-| =fai_publication_use_instance=         | dev1                                                         | Name of local instance to use for creation                                                            |
-| =fai_publication_war=                  | "WF or ECE demo WAR"                                         | WAR to base the new publication on                                                                    |
-| =fai_publication_war_remove_file_list= | ""                                                           | File list that should be removed from all WARs inside =fai_publication_ear= or =fai_publication_war=  |
-| =fai_publication_war_uri_list=         | ""                                                           | Publication WARs used for setting up Assembly tool.                                                   |
-| =fai_rmi_install=                      | 0                                                            | Install the RMI hub profile                                                                           |
-| =fai_search_conf_archive=              | ""                                                           | =conf.tar.gz= to use for Nursery & JAAS configuration                                                 |
-| =fai_search_deploy_white_list=         | "solr indexer-webapp"                                        | The list of WARs to be deployed on this instance.                                                     |
-| =fai_search_ear=                       | ""                                                           | EAR to use instead of the Escenic binaries                                                            |
-| =fai_search_for_editor=                | 0                                                            | If 1, will configure Solr for use with an editorial server, if not for presentation servers.          |
-| =fai_search_indexer_ws_uri=            | http://${HOSTNAME}:8080/indexer-webservice/index/            | URI of the indexer-webservice that the search instance shall use for knowing what to index.           |
-| =fai_search_install=                   | 0                                                            | Install the search server profile (Solr + indexer)                                                    |
-| =fai_search_name=                      | search1                                                      | Name of the search instance                                                                           |
-| =fai_search_port=                      | 8080                                                         | HTTP port of the search instance                                                                      |
-| =fai_search_shutdown=                  | 8005                                                         | Shutdown port of the search instance                                                                  |
-| =fai_vip_address=                      | ""                                                           | The virtual IP the provider will claim                                                                |
-| =fai_vip_install=                      | 0                                                            | Install a VIP provider                                                                                |
-| =fai_vip_primary_node_auth_key=        | ""                                                           | Optional, but useful to set to make conf files consistent. Will be generated if not set               |
-| =fai_vip_primary_node_ip=              | ""                                                           | Primary node IP                                                                                       |
-| =fai_vip_primary_node_name=            | ""                                                           | Primary node name, must be what $(uname -n) returns                                                   |
-| =fai_vip_secondary_node_ip=            | ""                                                           | Secondary node IP                                                                                     |
-| =fai_vip_secondary_node_name=          | ""                                                           | Secondary node name, must be what $(uname -n) returns                                                 |
-| =fai_vip_service_list=                 | ""                                                           | List of init.d scripts to invoke when the VIP is acclaimed/revoked, script must support start & stop  |
-| =fai_vip_sibling_ip=                   | ""                                                           | The IP of the other node offering the VIP                                                             |
-| =fai_wf_install=                       | 0                                                            | Install Widget Framework profile                                                                      |
-|----------------------------------------+--------------------------------------------------------------+-------------------------------------------------------------------------------------------------------|
-#+TBLFM: $1=fai_publication_war=::$3=conf.tar.gz= to use for Nursery & JAAS configuration
+| Parameter                                   | Default                                                      | Description                                                                                              |
+|---------------------------------------------+--------------------------------------------------------------+----------------------------------------------------------------------------------------------------------|
+| *fai\_all\_conf\_archive*                   | ""                                                           | *conf.tar.gz* to use for Nursery & JAAS configuration                                                    |
+| *fai\_all\_ear*                             | ""                                                           | EAR to use instead of the Escenic binaries                                                               |
+| *fai\_all\_install*                         | 0                                                            | Install all components on your server.                                                                   |
+| *fai\_all\_stop\_and\_clear*                | 0                                                            | After installation, stop the instance and clear its work & log files.                                    |
+| *fai\_analysis\_db\_host*                   | localhost                                                    | For the EAE DB (different from ECE's)                                                                    |
+| *fai\_analysis\_db\_install*                | 0                                                            | Install DB profile                                                                                       |
+| *fai\_analysis\_db\_password*               | read-the-source-luke                                         | For the EAE DB (different from ECE's)                                                                    |
+| *fai\_analysis\_db\_port*                   | 3306                                                         | For the EAE DB (different from ECE's)                                                                    |
+| *fai\_analysis\_db\_schema*                 | ece5db                                                       | For the EAE DB (different from ECE's)                                                                    |
+| *fai\_analysis\_db\_user*                   | ece5user                                                     | For the EAE DB (different from ECE's)                                                                    |
+| *fai\_analysis\_install*                    | 0                                                            | Will install the Escenic Analysis Engine, aka Stats, EAE.                                                |
+| *fai\_analysis\_name*                       | analysis1                                                    | EAE instance name                                                                                        |
+| *fai\_analysis\_port*                       | 8080                                                         | Port of the EAE                                                                                          |
+| *fai\_analysis\_shutdown*                   | 8005                                                         | Shutdown port for the EAE app server                                                                     |
+| *fai\_analysis\_stop\_and\_clear*           | 0                                                            | After installation, stop the instances and clear its work & log files                                    |
+| *fai\_apt\_vizrt\_pool*                     | stable                                                       | Which package pool in the Vizrt APT to install package from.                                             |
+| *fai\_cache\_backends*                      | ${HOSTNAME}:8080                                             | Space separated, e.g. "app1:8080 app2:8080"                                                              |
+| *fai\_cache\_install*                       | 0                                                            | Install cache server profile                                                                             |
+| *fai\_db\_daily\_backup*                    | 0                                                            | Sets up daily backup of the DB.                                                                          |
+| *fai\_db\_drop\_old\_db\_first*             | 0                                                            | Warning: this will drop the old database before installing a new one                                     |
+| *fai\_db\_host*                             | $HOSTNAME                                                    | Useful for editor & presentation profiles                                                                |
+| *fai\_db\_install*                          | 0                                                            | Install db profile                                                                                       |
+| *fai\_db\_password*                         | read-the-source-luke                                         | Useful for DB installation profile                                                                       |
+| *fai\_db\_port*                             | 3306                                                         | Useful for editor & presentation profiles                                                                |
+| *fai\_db\_schema*                           | ece5db                                                       | Useful for DB installation profile                                                                       |
+| *fai\_db\_user*                             | ece5user                                                     | Useful for DB installation profile                                                                       |
+| *fai\_dry\_run*                             | 0                                                            | ece-install will download Escenic archives and install OS packages, but will not configure anything.     |
+| *fai\_editor\_conf\_archive*                | ""                                                           | *conf.tar.gz* to use for Nursery & JAAS configuration                                                    |
+| *fai\_editor\_deploy\_white\_list*          | "escenic-admin escenic studio indexer-webservice webservice" | The list of WARs to be deployed on this instance.                                                        |
+| *fai\_editor\_ear*                          | ""                                                           | EAR to use instead of the Escenic binaries                                                               |
+| *fai\_editor\_install*                      | 0                                                            | Install the editorial profile                                                                            |
+| *fai\_editor\_name*                         | editor1                                                      | Name of the editor instance                                                                              |
+| *fai\_editor\_port*                         | 8080                                                         | HTTP port of the editor instance                                                                         |
+| *fai\_editor\_shutdown*                     | 8005                                                         | Shutdown port of the editor instance                                                                     |
+| *fai\_editor\_stop\_and\_clear*             | 0                                                            | After installation, stop the instances and clear its work & log files                                    |
+| *fai\_enabled*                              | 0                                                            | Whether or not to run ece-install in FAI mode                                                            |
+| *fai\_keep\_off\_etc\_hosts*                | 0                                                            | Set this to 1 if you don't want ece-install adding entries to /etc/hosts                                 |
+| *fai\_monitoring\_admin\_password*          | No telling you here ;-)                                      | The admin password of the web interface(s). Currenlty only set for Icinga.                               |
+| *fai\_monitoring\_ece\_host\_list*          | ""                                                           | Hosts running one or more ECE instance                                                                   |
+| *fai\_monitoring\_host\_list*               | ""                                                           | Quoted, space separated list of <host>#<ip> pairs, e.g.: "pres1#10.72.227.250 pres2#10.72.227.251"       |
+| *fai\_monitoring\_install*                  | 0                                                            | Install the monitoring server profile.                                                                   |
+| *fai\_monitoring\_munin\_node\_list*        | ""                                                           | Set this to a whitespace separated list of nodes that munin should monitor                               |
+| *fai\_monitoring\_search\_host\_list*       | ""                                                           | Hosts running search instance(s) (Solr + indexer)                                                        |
+| *fai\_monitoring\_server\_ip*               | 127.0.0.1                                                    | The IP of the monitoring server.                                                                         |
+| *fai\_nfs\_allowed\_client\_network*        | ""                                                           | IP/netmask of allowed NFS clients, example: 192.168.1.0/255.255.255.0                                    |
+| *fai\_nfs\_client\_install*                 | 0                                                            | Installs an NFS client                                                                                   |
+| *fai\_nfs\_client\_mount\_point\_parent*    | /mnt                                                         | Mount point parent directory                                                                             |
+| *fai\_nfs\_export\_list*                    | ""                                                           | Space separated list of NFS export directories, full paths as seen on the NFS server.                    |
+| *fai\_nfs\_server\_address*                 | ""                                                           | Address of the NFS server, useful for the NFS client profile                                             |
+| *fai\_nfs\_server\_install*                 | 0                                                            | Install an NFS server                                                                                    |
+| *fai\_presentation\_conf\_archive*          | ""                                                           | *conf.tar.gz* to use for Nursery & JAAS configuration                                                    |
+| *fai\_presentation\_ear*                    | ""                                                           | EAR to use instead of the Escenic binaries                                                               |
+| *fai\_presentation\_install*                | 0                                                            | Install the presentation server profile                                                                  |
+| *fai\_presentation\_name*                   | engine1                                                      | Name of the presentation server instance                                                                 |
+| *fai\_presentation\_port*                   | 8080                                                         | HTTP port of the presentation server instance                                                            |
+| *fai\_presentation\_deploy\_white\_list*    | "escenic-admin <assemblytool/publications/*>"                | The list of WARs to be deployed on this instance.                                                        |
+| *fai\_presentation\_shutdown*               | 8005                                                         | Shutdown port of the presentation instance                                                               |
+| *fai\_presentation\_stop\_and\_clear*       | 0                                                            | After installation, stop the instances and clear its work & log files                                    |
+| *fai\_public\_host\_name*                   | ${HOSTNAME}:8080                                             | The public address for your website                                                                      |
+| *fai\_publication\_create*                  | 0                                                            | Create a new publication                                                                                 |
+| *fai\_publication\_domain\_mapping\_list*   | ""                                                           | Mapping between publications and domains: "<pub>[,pub.war]#<domain>[#,<alias1>,<alias2>]"                |
+| *fai\_publication\_ear*                     | ""                                                           | All publications WARs inside will be used for publication creation (assumes *fai\_publication\_create*)  |
+| *fai\_publication\_environment*             | "production"                                                 | The kind of environment/habitat. Typical values are: production, staging, testing, development.          |
+| *fai\_publication\_name*                    | mypub                                                        | Name of the publication                                                                                  |
+| *fai\_publication\_use\_instance*           | dev1                                                         | Name of local instance to use for creation                                                               |
+| *fai\_publication\_war*                     | "WF or ECE demo WAR"                                         | WAR to base the new publication on                                                                       |
+| *fai\_publication\_war\_remove\_file\_list* | ""                                                           | File list that should be removed from all WARs inside *fai\_publication\_ear* or *fai\_publication\_war* |
+| *fai\_publication\_war\_uri\_list*          | ""                                                           | Publication WARs used for setting up Assembly tool.                                                      |
+| *fai\_rmi\_install*                         | 0                                                            | Install the RMI hub profile                                                                              |
+| *fai\_search\_conf\_archive*                | ""                                                           | *conf.tar.gz* to use for Nursery & JAAS configuration                                                    |
+| *fai\_search\_deploy\_white\_list*          | "solr indexer-webapp"                                        | The list of WARs to be deployed on this instance.                                                        |
+| *fai\_search\_ear*                          | ""                                                           | EAR to use instead of the Escenic binaries                                                               |
+| *fai\_search\_for\_editor*                  | 0                                                            | If 1, will configure Solr for use with an editorial server, if not for presentation servers.             |
+| *fai\_search\_indexer\_ws\_uri*             | http://${HOSTNAME}:8080/indexer-webservice/index/            | URI of the indexer-webservice that the search instance shall use for knowing what to index.              |
+| *fai\_search\_install*                      | 0                                                            | Install the search server profile (Solr + indexer)                                                       |
+| *fai\_search\_name*                         | search1                                                      | Name of the search instance                                                                              |
+| *fai\_search\_port*                         | 8080                                                         | HTTP port of the search instance                                                                         |
+| *fai\_search\_shutdown*                     | 8005                                                         | Shutdown port of the search instance                                                                     |
+| *fai\_vip\_address*                         | ""                                                           | The virtual IP the provider will claim                                                                   |
+| *fai\_vip\_install*                         | 0                                                            | Install a VIP provider                                                                                   |
+| *fai\_vip\_primary\_node\_auth\_key*        | ""                                                           | Optional, but useful to set to make conf files consistent. Will be generated if not set                  |
+| *fai\_vip\_primary\_node\_ip*               | ""                                                           | Primary node IP                                                                                          |
+| *fai\_vip\_primary\_node\_name*             | ""                                                           | Primary node name, must be what $(uname -n) returns                                                      |
+| *fai\_vip\_secondary\_node\_ip*             | ""                                                           | Secondary node IP                                                                                        |
+| *fai\_vip\_secondary\_node\_name*           | ""                                                           | Secondary node name, must be what $(uname -n) returns                                                    |
+| *fai\_vip\_service\_list*                   | ""                                                           | List of init.d scripts to invoke when the VIP is acclaimed/revoked, script must support start & stop     |
+| *fai\_vip\_sibling\_ip*                     | ""                                                           | The IP of the other node offering the VIP                                                                |
+| *fai\_wf\_install*                          | 0                                                            | Install Widget Framework profile                                                                         |
+#+TBLFM: $1*fai\_publication\_war*::$3*conf.tar.gz* to use for Nursery & JAAS configuration
 
 0 means "false" and 1 means "true".
 
 ** Example Configurations
 Here are a few simple example configurations, you can find more under
-=/usr/share/doc/escenic/examples= if you've got the
-=escenic-content-engine-installer= package installed or you can
+*/usr/share/doc/escenic/examples* if you've got the
+*escenic-content-engine-installer* package installed or you can
 [[https://github.com/vizrt/ece-scripts/tree/master/usr/share/doc/escenic/examples][browse them online]].
 
 ****** Install an Editorial Server and Create a Publication
 To automatically install an editorial server and create a publication
-called "jollygood", run =ece-install= with the following settings:
+called "jollygood", run *ece-install* with the following settings:
 
 #+BEGIN_SRC conf
 fai_enabled=1
@@ -1015,8 +1038,8 @@ fai_publication_name=jollygood
 #+END_SRC
 
 ****** Install Two Presentation Servers On a Single Host
-To install two presentation servers called =engine1= and
-=engine2= on the same host,  first run =ece-install= with the following settings:
+To install two presentation servers called *engine1* and
+*engine2* on the same host,  first run *ece-install* with the following settings:
 #+BEGIN_SRC conf
 fai_enabled=1
 fai_presentation_install=1
@@ -1052,23 +1075,23 @@ re-run ece-install on the same host, for instance to add another
 instance of ECE, set up Widget Framework or create another
 publication.
 
-=ece-install= has a number of features which will try to minimise the
+*ece-install* has a number of features which will try to minimise the
 time it takes to run it on consecutive runs. For instance, it will
 check if you already have installed pre-requisite 3rd party libraries
 and only if any are missing will it ask the package manager to fetch
 it.
 
-Likewise, =ece-install= will see if the Escenic artifacts or
+Likewise, *ece-install* will see if the Escenic artifacts or
 application server that you need are already present in the
-=/var/cache/ece-install= folder, and only download the missing ones
+*/var/cache/ece-install* folder, and only download the missing ones
 (if any).
 
 To get a list of the artifacts it'll pull from
 http://technet.escenic.com and http://tomcat.apache.org search for the
-following variables inside =/usr/sbin/ece-install=:
-- =technet_download_list=
-- =wf_download_list=
-- =tomcat_download=
+following variables inside */usr/sbin/ece-install*:
+- *technet\_download\_list*
+- *wf\_download\_list*
+- *tomcat\_download*
 
 Two other ways of speeding up the installation is (of course) to use
 the backup/restore feature or install from a EAR and configuration
@@ -1084,35 +1107,69 @@ $ ece-install -f ece-install-presentation-server.conf
 There are of course other paths involved when setting up your system,
 but these should be the most interesting ones.
 
-|-----------------------------------------------+------------------------------------------------------------------|
-| Path                                          | Explanation                                                      |
-|-----------------------------------------------+------------------------------------------------------------------|
-| =/etc/apt/sources.list.d/escenic.list=        | 3rd party APT repositories added by ece-install *)               |
-| =/etc/default/ece=                            | The configuration file for the ece init.d script                 |
-| =/etc/escenic/ece-<instance>.conf=            | Instance specific settings for =/usr/bin/ece=                    |
-| =/etc/escenic/ece.conf=                       | Common ece.conf file for =/usr/bin/ece=                          |
-| =/etc/escenic/engine/common=                  | Common Nursery configuration layer                               |
-| =/etc/escenic/engine/common/security=         | Common security configuration for all ECE instances.             |
-| =/etc/escenic/engine/common/trace.properties= | Log4j configuration, produces instance specific log files.       |
-| =/etc/escenic/engine/instance/<instance>=     | Instance specific Nursery configuration                          |
-| =/etc/escenic/solr=                           | ECE specific Solr configuration                                  |
-| =/etc/init.d/mysql[d]=                        | For starting and stopping MySQL/Percona                          |
-| =/etc/init.d/varnish=                         | For starting and stopping Varnish                                |
-| =/etc/intit.d/ece=                            | The init.d script managing _all_ the ECE instances on your host. |
-| =/etc/varnish/default.vcl=                    | The Varnish configuration                                        |
-| =/opt/escenic=                                | All ECE components can be found here                             |
-| =/opt/escenic/assemblytool=                   | The assembly tool                                                |
-| =/opt/escenic/assemblytool/plugins=           | Contains symlinks to all plugins in =/opt/escenic=               |
-| =/opt/escenic/engine=                         | Symlink pointing to the current ECE                              |
-| =/opt/tomcat=                                 | Symlink pointing to the install Apache Tomcat (=catalina_home=)  |
-| =/opt/tomcat-<instance>=                      | Instance specific Tomcat files (=catalina_base=)                 |
-| =/usr/bin/ece=                                | Script for operating all ECE instances + RMI hub and EAE         |
-| =/usr/sbin/ece-install=                       | The installation script described in this guide                  |
-| =/var/log/escenic/<type>-<instance>.log=      | The instance's log4j log                                         |
-| =/var/log/escenic/<type>-<instance>.out=      | The instance system out log                                      |
-| =/var/log/escenic/solr.<date>.log=            | The Solr log (not in standard out!)                              |
-| =/var/run/escenic/<type>-<instance>.pid=      | The instance's  PID file                                         |
-|-----------------------------------------------+------------------------------------------------------------------|
+- */etc/apt/sources.list.d/escenic.list* :: 3rd party APT repositories
+     added by ece-install *)
+
+- */etc/default/ece* :: The configuration file for the ece init.d
+     script.
+
+- */etc/escenic/ece-<instance>.conf* :: Instance specific settings
+     for */usr/bin/ece*
+
+- */etc/escenic/ece.conf* :: Common ece.conf file for */usr/bin/ece*
+
+- */etc/escenic/engine/common* :: Common Nursery configuration layer
+
+- */etc/escenic/engine/common/security* :: Common security
+     configuration for all ECE instances.
+
+- */etc/escenic/engine/common/trace.properties* :: Log4j
+     configuration, produces instance specific log files.
+
+- */etc/escenic/engine/instance/<instance>* :: Instance specific
+     Nursery configuration
+
+- */etc/escenic/solr* :: ECE specific Solr configuration
+
+- */etc/init.d/mysql[d]* :: For starting and stopping MySQL/Percona
+
+- */etc/init.d/varnish* :: For starting and stopping Varnish
+
+- */etc/intit.d/ece* :: The init.d script managing \_all\_ the ECE
+     instances on your host.
+
+- */etc/varnish/default.vcl* :: The Varnish configuration
+
+- */opt/escenic* :: All ECE components can be found here
+
+- */opt/escenic/assemblytool* :: The assembly tool
+
+- */opt/escenic/assemblytool/plugins* :: Contains symlinks to all
+     plugins in */opt/escenic*
+
+- */opt/escenic/engine* :: Symlink pointing to the current ECE
+
+- */opt/tomcat* :: Symlink pointing to the install Apache Tomcat
+                   (*catalina\_home*)
+
+- */opt/tomcat-<instance>* :: Instance specific Tomcat files
+     (*catalina\_base*)
+
+- */usr/bin/ece* :: Script for operating all ECE instances + RMI hub
+                    and EAE
+
+- */usr/sbin/ece-install* :: The installation script described in this
+     guide
+
+- */var/log/escenic/<type>-<instance>.log* :: The instance's log4j log
+
+- */var/log/escenic/<type>-<instance>.out* :: The instance system out
+     log
+
+- */var/log/escenic/solr.<date>.log* :: The Solr log (not in standard
+     out!)
+
+- */var/run/escenic/<type>-<instance>.pid* :: The instance's PID file
 
 *) Applies only to Debian based systems.
 
@@ -1158,24 +1215,26 @@ install_analysis_server.preinst
 #+END_SRC
 
 Will be run before the body of the hook, just the corresponding
-=.postinst= hook will be run after.
+*.postinst* hook will be run after.
 
 ** Accessing ece-install variables
 Before running the hook, ece-install will make all its local variables
-available in =/var/run/escenic/ece-install.env=, which can then be
+available in */var/run/escenic/ece-install.env*, which can then be
 used by the hook scripts.
 
 ** Example hook
 Here is an example hook which will be run after the EAE is installed.
 
 #+BEGIN_SRC sh
-# Put this in is $HOME/ece-install.d/install_analysis_server.postinst
+# Put this in your
+# $HOME/ece-install.d/install_analysis_server.postinst
 
 # read ece-install's current variables
 source /var/run/escenic/ece-install.env
 
 # do something useful
-echo "Hello from $0, EAE is installed in ${tomcat_base}" > /tmp/hello.txt
+echo "Hello from $0, EAE is installed in ${tomcat_base}" \\
+  > /tmp/hello.txt
 #+END_SRC
 
 ** Available hooks
@@ -1219,16 +1278,37 @@ fai_presentation_install=1
 
 The output will be similar to:
 #+BEGIN_SRC text
-[ece-install-5] You have set fai_un_install_everything=1 in your /root/ece-install.conf
+[ece-install-5] You have set fai_un_install_everything=1 in your
+ /root/ece-install.conf
 [ece-install-5] This will uninstall the following on raven:
-[ece-install-5] Packages to be removed: ant ant-contrib ant-optional escenic-content-engine-scripts escenic-munin-plugins escenic-munin-plugins libmysql-java maven2 memcached munin munin-node munin-plugins-extra munin-java-extra nginx percona-server-client percona-server-client-5.5 percona-server-common-5.5 percona-server-server percona-server-server-5.5 varnish sun-java6-jdk
-[ece-install-5] Files & directories to be removed: /etc/escenic /opt/*tomcat* /opt/escenic /var/lib/escenic /var/run/escenic /etc/escenic /var/log/escenic /etc/apt/sources.list.d/escenic.list
+
+[ece-install-5] Packages to be removed: ant ant-contrib
+ant-optional escenic-content-engine-scripts
+escenic-munin-plugins escenic-munin-plugins libmysql-java maven2
+memcached munin munin-node munin-plugins-extra
+munin-java-extra nginx percona-server-client
+percona-server-client-5.5 percona-server-common-5.5
+percona-server-server percona-server-server-5.5
+varnish sun-java6-jdk
+
+[ece-install-5] Files & directories to be removed: /etc/escenic
+/opt/*tomcat* /opt/escenic /var/lib/escenic /var/run/escenic
+/etc/escenic /var/log/escenic /etc/apt/sources.list.d/escenic.list
 [ece-install-5] APT keys to be removed: C4DEFFEB CD2EFD2A
 [ece-install-5] If you're absolutely sure about this, type:
 [ece-install-5] I know what I'm doing, please do as I say.
 I know what I'm doing, please do as I say.
 [ece-install-11] OK, I'll do as you wish:
-[ece-install-11] I will uninstall everything set up by ece-install
-[ece-install-11] Everything (well, most) set up by ece-install should now
-[ece-install-11] have been removed from raven.
+[ece-install-11] I will uninstall everything from ece-install
+[ece-install-11] Everything (well, most) set up by ece-install
+[ece-install-11] should now have been removed from raven.
 #+END_SRC
+
+* COPYRIGHT
+Copyright 2011-2013 Vizrt
+
+Licensed under the Apache License, Version 2.0, see
+https://github.com/vizrt/ece-scripts/COPYING for further details.
+
+* AUTHOR
+Torstein Krause Johansen, Erik Mogsensen

From ea6b47632e50765563632dadfbced8f2d6b4ff77 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 17 Jan 2013 11:33:02 +0100
Subject: [PATCH 1912/2585] - wee, but crucial fix. Since the cron job was
 created with <<EOF, the   '$' of the cron script variable disappeared.

  Thanks to Andreas Grumheden for reporting this.
---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 82b60a84..f3f4af9c 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -747,7 +747,7 @@ function set_up_content_engine_cron_jobs() {
 
 dir=${escenic_cache_dir}/engine/binary
 
-if [ -d $dir  ] ; then
+if [ -d \$dir  ] ; then
   nice find $dir -type f -daystart -atime +15 -delete
   nice find $dir -type d -empty -delete
 fi

From 4df56a36d634a8e60369e7537e30be89ef01d7b6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 17 Jan 2013 12:02:44 +0100
Subject: [PATCH 1913/2585] - fixed a bug in
 common-os::assert_commands_available where it would   report the first passed
 command as the one missing, no matter which   one in the passed list it
 actually was. This was rather confusing to   say the least ;-)

---
 usr/share/escenic/ece-scripts/common-os.sh | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index 3aa3d1f9..bb333433 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -1,7 +1,7 @@
 #! /usr/bin/env bash
 
 # Platform/OS specific methods.
-# 
+#
 # by tkj@vizrt.com
 
 # depends on common-bashing
@@ -58,7 +58,7 @@ function has_sun_java_installed() {
 function create_user_and_group_if_not_present() {
   local user=$1
   local group=$1
-  
+
   if [ $(grep $user /etc/passwd | wc -l) -lt 1 ]; then
     print_and_log "Creating UNIX user $user ..."
 
@@ -67,16 +67,16 @@ function create_user_and_group_if_not_present() {
         --disabled-password \
         --gecos "Escenic-user,Room,Work,Home,Other"
     fi
-    
+
     if [ $on_redhat_or_derivative -eq 1 ]; then
       run useradd $user \
         --comment "Escenic-user,Room,Work,Home,Other"
     fi
-    
+
     add_next_step "I created a new UNIX user called $user"
     add_next_step "and you must set a password using: passwd $user"
   fi
-  
+
   if [ $(grep $group /etc/group | wc -l) -lt 1 ]; then
     print_and_log "Creating UNIX group $group ..."
     run addgroup $group
@@ -85,14 +85,14 @@ function create_user_and_group_if_not_present() {
 
 ## Will return the IP of the host name. If not found, the host name
 ## passed to the function will be returned.
-## 
+##
 ## Parameters: $1 the host name
 function get_ip() {
   local ip=$(ping -c 1 $1 2>/dev/null | \
     grep "bytes from" | \
     cut -d'(' -f2 | \
     cut -d ')' -f1)
-  
+
   if [ -z "$ip" ]; then
     echo $1
   fi
@@ -109,7 +109,7 @@ function assert_commands_available() {
   local errors_found=0
   for el in $@; do
     if [ $(which ${el} 2>/dev/null | wc -l) -lt 1 ]; then
-      print_and_log "Please install $1 and then run $(basename $0) again."
+      print_and_log "Please install $el and then run $(basename $0) again."
       errors_found=1
     fi
   done
@@ -141,7 +141,7 @@ function get_tomcat_download_url() {
 ## $1: target directory
 function download_tomcat() {
   local url=$(get_tomcat_download_url)
-  
+
   print_and_log "Downloading Tomcat from $url ..."
   run cd $1
   run wget $wget_opts $url
@@ -224,5 +224,3 @@ function get_memory_summary_of_pid() {
 
   echo "${size} (peaked at: $peak)"
 }
-
-

From cb4f476f9cd52a19efee12c9fe7b9512804c7708 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 17 Jan 2013 12:50:12 +0100
Subject: [PATCH 1914/2585] - two more backslashes.  This is not my day.

---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index f3f4af9c..1bb201ca 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -748,8 +748,8 @@ function set_up_content_engine_cron_jobs() {
 dir=${escenic_cache_dir}/engine/binary
 
 if [ -d \$dir  ] ; then
-  nice find $dir -type f -daystart -atime +15 -delete
-  nice find $dir -type d -empty -delete
+  nice find \$dir -type f -daystart -atime +15 -delete
+  nice find \$dir -type d -empty -delete
 fi
 EOF
 

From 51b657ae28a1826799ca6192b437dda4604eaf29 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 17 Jan 2013 14:19:40 +0100
Subject: [PATCH 1915/2585] - the user feedback after creating an import job
 now takes an educated   guess at the path of the current machine's (host's)
 XML import   server Nursery component.

---
 .../ece-scripts/ece-import.d/create-job.sh    | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh b/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh
index e76441b9..a3128076 100644
--- a/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh
+++ b/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh
@@ -7,7 +7,7 @@ function create_import_directories() {
     $(dirname $log)
     $escenic_spool_base_dir/$1/$2/archive
     $escenic_spool_base_dir/$1/$2/error
-    $escenic_spool_base_dir/$1/$2/new 
+    $escenic_spool_base_dir/$1/$2/new
     $raw_spool_base_dir/$1/$2
     $raw_state_base_dir/$1/$2
     $raw_transformation_base_dir/$1/$2 \
@@ -26,7 +26,7 @@ function create_import_directories() {
 function create_import_configuration() {
   local publication_name=$1
   local job_name=$2
-  
+
   print_and_log "Creating import job configuration '${job_name}' for" \
     "publication '${publication_name}' ..."
 
@@ -69,7 +69,7 @@ function apply_import_archive() {
       "and fix your archive structure"
     remove_pid_and_exit_in_error
   fi
-  
+
   for el in $publication_list; do
     local import_job_list=$(
       find $tmp_dir/$el -maxdepth 1 -type d | sed "s#${tmp_dir}/$el##g" | \
@@ -81,7 +81,7 @@ function apply_import_archive() {
         "specification, so I'll exit :-('"
       remove_pid_and_exit_in_error
     fi
-    
+
     for ele in $import_job_list; do
       print_and_log "Setting up import job '$ele' for publication '$el' ..."
       create_import_configuration $el $ele
@@ -115,7 +115,7 @@ function create_import_cron_jobs() {
 
   local file=/etc/cron.d/$1-$2-cron
   echo > $file
-  
+
   # first, set up an y cron.hourly
   find $3 \
     -maxdepth 1 \
@@ -124,13 +124,13 @@ function create_import_cron_jobs() {
     target_dir=$transformers_base_dir/$1/$2
     make_dir $target_dir
     run cp -r $f $target_dir
-    
-    
+
+
     for dir in $f; do
       local type_of_cron=$(basename $dir)
       print_and_log "Setting up ${type_of_cron} for " \
         "import job $2 on publication $1"
-      
+
       if [[ $type_of_cron == "cron.hourly" ]]; then
         cron_pattern='0 * * * *'
       elif [[ $type_of_cron == "cron.daily" ]]; then
@@ -165,22 +165,20 @@ function print_manual_steps() {
   if [ -z "${import_configuration_list}" ]; then
     return
   fi
-    
+
   print_and_log "You must now add your new Nursery components: " \
 
   for el in $import_configuration_list; do
     print_and_log "$(green ADD) /${el}"
   done
-  
+
   print_and_log "to the $(blue importConfigurations) variable in " \
     "your ECE instance's" \
     "/com/escenic/syndication/xml/XMLImportService e.g.:" \
-    "/etc/escenic/engine/server/edit2-engine1/com/escenic/syndication/xml/XMLImportService.properties"
+    "/etc/escenic/engine/server/${HOSTNAME}-engine1/com/escenic/syndication/xml/XMLImportService.properties"
 
   print_and_log "The final step is to add the Nursery service " \
     "service.9.9-xml-import-service=/com/escenic/syndication/xml/XMLImportSchedule" \
     "to your instance's Initial component, e.g.:" \
-    /etc/escenic/engine/server/edit2-engine1/Initial.properties
+    /etc/escenic/engine/server/${HOSTNAME}-engine1/Initial.properties
 }
-
-

From 18ea1cbe6a2bafcf6d1896c824dce21706f290b7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 17 Jan 2013 14:39:57 +0100
Subject: [PATCH 1916/2585] - fixed bug in
 ece-imoprt::create-job::apply_import_archive where the   a loop variable bled
 over from a different method, causing wrong   paths to be passed around
 (wrong publication name, creating wrong   paths++).

---
 .../ece-scripts/ece-import.d/create-job.sh    | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh b/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh
index a3128076..fa6da4eb 100644
--- a/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh
+++ b/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh
@@ -70,32 +70,33 @@ function apply_import_archive() {
     remove_pid_and_exit_in_error
   fi
 
-  for el in $publication_list; do
+  for the_publication in $publication_list; do
     local import_job_list=$(
-      find $tmp_dir/$el -maxdepth 1 -type d | sed "s#${tmp_dir}/$el##g" | \
+      find $tmp_dir/$the_publication -maxdepth 1 -type d | \
+        sed "s#${tmp_dir}/$the_publication##g" | \
         sed 's#^/##g'
     )
     if [ -z "$import_job_list" ]; then
       print_and_log "$(red ERROR) No import jobs were defined for publication" \
-        "$el. The import archive isn't in accordance with the import archive" \
-        "specification, so I'll exit :-('"
+        "$the_publication. The import archive isn't in accordance with the " \
+        " import archive specification, so I'll exit :-('"
       remove_pid_and_exit_in_error
     fi
 
     for ele in $import_job_list; do
-      print_and_log "Setting up import job '$ele' for publication '$el' ..."
-      create_import_configuration $el $ele
+      print_and_log "Setting up import job '$ele' for publication '$the_publication' ..."
+      create_import_configuration $the_publication $ele
 
-      local src_dir=$tmp_dir/$el/$ele/transformers
-      local target_dir=$transformers_base_dir/$el/$ele/transformers
+      local src_dir=$tmp_dir/$the_publication/$ele/transformers
+      local target_dir=$transformers_base_dir/$the_publication/$ele/transformers
       if [ -d $src_dir ]; then
         print_and_log "Copying transformers to $target_dir"
         make_dir $target_dir
         run cp $src_dir/[0-9]* $target_dir
       fi
 
-      create_import_cron_jobs $el $ele $tmp_dir/$el/$ele
-      create_import_directories $el $ele
+      create_import_cron_jobs $the_publication $ele $tmp_dir/$the_publication/$ele
+      create_import_directories $the_publication $ele
     done
   done
 

From 5beaa3ebb8cfa00073f2c0afebe647daaab8a835 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 17 Jan 2013 15:23:11 +0100
Subject: [PATCH 1917/2585] - added known issues file - added today's
 ece-install/cron job known issue.

---
 known-issues.org | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 known-issues.org

diff --git a/known-issues.org b/known-issues.org
new file mode 100644
index 00000000..3154a2b6
--- /dev/null
+++ b/known-issues.org
@@ -0,0 +1,25 @@
+#+TITLE: Known Issues
+#+AUTHOR: Vizrt Online / The SaaS Team
+
+* ece-install
+** 2013-01-17 cron script removes all 15 day old files on the system
+- *Fixed in Version* :: 1.0-2013-01-17-468
+
+- *Versions affected* :: 1.0-2013-01-12-x => 1.0-2013-01-17-x
+
+If you have installed and run =ece-install= between *2013-01-12*
+and *2013-01-17*, you have encountered this issue.
+
+If you have =escenic-content-engine-installer= of any of the versions
+affected, first remove the cron job if it's present:
+#+BEGIN_SRC sh
+# rm /etc/cron.daily/remove-old-escenic-cache-files
+#+END_SRC
+
+Then upgrade to the latest version of =ece-install= so that you're
+sure new runs of it will set up a proper cron job.  If you're using
+our APT repository at apt.vizrt.com, this as easy as:
+#+BEGIN_SRC sh
+# apt-get update
+# apt-get install escenic-content-engine-scripts
+#+END_SRC

From d9ec9618d85695a35864cadef81f89f619ce74fb Mon Sep 17 00:00:00 2001
From: Thomas <tvelthoven@vizrt.com>
Date: Fri, 18 Jan 2013 10:50:47 +0100
Subject: [PATCH 1918/2585] added a "Torstein is moving on" line

---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index 4f336859..ad8d6edf 100644
--- a/README
+++ b/README
@@ -40,4 +40,4 @@ Hope you enjoy the ece /usr/bin and intit.d scripts. All feedback,
 come hither!
 
 tkj@vizrt.com
-
+(From February 2013 Torstein will/has move(d) on and you can send email to thv@vizrt.com untill we do the impossible and find a suitable replacement for Torstein)

From 0e838c19575b757133d234c58a8c74e6041ed1f8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 17 Jan 2013 15:25:04 +0100
Subject: [PATCH 1919/2585] - clarified which profiles that may have triggered
 this issue

---
 known-issues.org | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/known-issues.org b/known-issues.org
index 3154a2b6..3e6ce79a 100644
--- a/known-issues.org
+++ b/known-issues.org
@@ -7,7 +7,8 @@
 
 - *Versions affected* :: 1.0-2013-01-12-x => 1.0-2013-01-17-x
 
-If you have installed and run =ece-install= between *2013-01-12*
+If you have installed and run either the =ece-install= all-in-one,
+presentation or editorial profile between *2013-01-12*
 and *2013-01-17*, you have encountered this issue.
 
 If you have =escenic-content-engine-installer= of any of the versions

From cc588ccdb14ef654587cb2c6632bcea409f9902a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 17 Jan 2013 16:14:16 +0100
Subject: [PATCH 1920/2585] - added a lot of hardening to  
 ece-install::content-engine::set_up_engine_cron_jobs:

  * now runs all find/delete commands as the ${ece_user}
  * added dedicated methods with self-declaring names of tests if the
    ${ece_user} owns the thumbnail directory, if its not, the cron
    script will exit.
  * added logging for all decisions the cron script does
---
 .../ece-install.d/content-engine.sh           | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 1bb201ca..60485e09 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -746,11 +746,31 @@ function set_up_content_engine_cron_jobs() {
 # the publication webapp's) web.xml
 
 dir=${escenic_cache_dir}/engine/binary
+log=/var/log/\$(basename \$0).log
 
-if [ -d \$dir  ] ; then
-  nice find \$dir -type f -daystart -atime +15 -delete
-  nice find \$dir -type d -empty -delete
-fi
+function exit_if_dir_doesnt_exist() {
+  if [ ! -d \${dir} ]; then
+    echo \$dir "doesn't exist" >> \${log}
+    exit 0
+  fi
+}
+
+function exit_if_user_doesnt_own_dir() {
+  local user_id=\$(id -u ${ece_user})
+  local dir_owner_id=\$(stat -c "%u" \${dir})
+
+  if [[ \${user_id} != \${dir_owner_id} ]]; then
+    echo ${ece_user} "doesn't own \${dir} skipping \$(basename \$0)" >> \${log}
+    exit 0
+  fi
+}
+
+exit_if_dir_doesnt_exist
+exit_if_user_doesnt_own_dir
+
+echo "Running \$(basename \$0) @ \$(date)" >> \${log}
+su - ${ece_user} -c "nice find \${dir} -type f -daystart -atime +15 -delete"
+su - ${ece_user} -c "nice find \${dir} -type d -empty -delete"
 EOF
 
   run chmod +x $file

From 8a70663f2765b4e4a9eccda3f5c3aa24e5c76c11 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 18 Jan 2013 09:53:26 +0100
Subject: [PATCH 1921/2585] - added note on checking the known issues to the
 postinst script of   escenic-content-engine-install.er

---
 .../debian/escenic-content-engine-installer/postinst     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/usr/share/escenic/package-scripts/debian/escenic-content-engine-installer/postinst b/usr/share/escenic/package-scripts/debian/escenic-content-engine-installer/postinst
index 762aa6a0..878501ee 100755
--- a/usr/share/escenic/package-scripts/debian/escenic-content-engine-installer/postinst
+++ b/usr/share/escenic/package-scripts/debian/escenic-content-engine-installer/postinst
@@ -5,13 +5,14 @@ chmod +x /usr/sbin/ece-install
 
 cat <<EOF
 Thank you for installing ece-install. This is currently un-supported
-software as it's undergoing heavy development. Report any issues to
-https://github.com/vizrt/ece-scripts/issues
+software as it's undergoing heavy development. Be sure to check out
+known issues at
+https://github.com/vizrt/ece-scripts/blob/master/known-issues.org and
+report any issues to https://github.com/vizrt/ece-scripts/issues
 
 Have fun!
 
--Vizrt Online 
+-Vizrt Online
 EOF
 
 exit 0
-

From 47f5d7300e9926aa00d99315f4deac9a897aefcd Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 18 Jan 2013 11:42:19 +0100
Subject: [PATCH 1922/2585] - the guide is starting to look pretty good as a
 man page

---
 usr/share/doc/escenic/ece-install-guide.org | 375 ++++++++++++++------
 1 file changed, 272 insertions(+), 103 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 64738bcc..1281726a 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -447,11 +447,14 @@ fai_db_replication=1
 #+END_SRC
 
 When you run *ece-install* with these settings, the output log
-messages will include information that you need for creating the slave database:
+messages will include information that you need for creating the slave
+database:
 #+BEGIN_SRC text
 [ece-install-35] - DB is now set up on localhost:3306
-[ece-install-35] - ece-install.conf for slave: fai_db_master_log_file=mysql-bin.000013
-[ece-install-35] - ece-install.conf for slave: fai_db_master_log_position=106
+[ece-install-35] - ece-install.conf for slave:
+                   fai_db_master_log_file=mysql-bin.000013
+[ece-install-35] - ece-install.conf for slave:
+                   fai_db_master_log_position=106
 #+END_SRC
 
 On the slave database host you can then use these values in your
@@ -923,102 +926,268 @@ If you do not want ece-install to touch your */etc/hosts*, you can set
 *fai\_keep\_off\_etc\_hosts=1* in your *ece-install.conf*.
 
 ** Overview of All FAI Parameters
-The ece-install script understands the following settings in the
-$HOME/ece-install.conf file of the root user:
-
-| Parameter                                   | Default                                                      | Description                                                                                              |
-|---------------------------------------------+--------------------------------------------------------------+----------------------------------------------------------------------------------------------------------|
-| *fai\_all\_conf\_archive*                   | ""                                                           | *conf.tar.gz* to use for Nursery & JAAS configuration                                                    |
-| *fai\_all\_ear*                             | ""                                                           | EAR to use instead of the Escenic binaries                                                               |
-| *fai\_all\_install*                         | 0                                                            | Install all components on your server.                                                                   |
-| *fai\_all\_stop\_and\_clear*                | 0                                                            | After installation, stop the instance and clear its work & log files.                                    |
-| *fai\_analysis\_db\_host*                   | localhost                                                    | For the EAE DB (different from ECE's)                                                                    |
-| *fai\_analysis\_db\_install*                | 0                                                            | Install DB profile                                                                                       |
-| *fai\_analysis\_db\_password*               | read-the-source-luke                                         | For the EAE DB (different from ECE's)                                                                    |
-| *fai\_analysis\_db\_port*                   | 3306                                                         | For the EAE DB (different from ECE's)                                                                    |
-| *fai\_analysis\_db\_schema*                 | ece5db                                                       | For the EAE DB (different from ECE's)                                                                    |
-| *fai\_analysis\_db\_user*                   | ece5user                                                     | For the EAE DB (different from ECE's)                                                                    |
-| *fai\_analysis\_install*                    | 0                                                            | Will install the Escenic Analysis Engine, aka Stats, EAE.                                                |
-| *fai\_analysis\_name*                       | analysis1                                                    | EAE instance name                                                                                        |
-| *fai\_analysis\_port*                       | 8080                                                         | Port of the EAE                                                                                          |
-| *fai\_analysis\_shutdown*                   | 8005                                                         | Shutdown port for the EAE app server                                                                     |
-| *fai\_analysis\_stop\_and\_clear*           | 0                                                            | After installation, stop the instances and clear its work & log files                                    |
-| *fai\_apt\_vizrt\_pool*                     | stable                                                       | Which package pool in the Vizrt APT to install package from.                                             |
-| *fai\_cache\_backends*                      | ${HOSTNAME}:8080                                             | Space separated, e.g. "app1:8080 app2:8080"                                                              |
-| *fai\_cache\_install*                       | 0                                                            | Install cache server profile                                                                             |
-| *fai\_db\_daily\_backup*                    | 0                                                            | Sets up daily backup of the DB.                                                                          |
-| *fai\_db\_drop\_old\_db\_first*             | 0                                                            | Warning: this will drop the old database before installing a new one                                     |
-| *fai\_db\_host*                             | $HOSTNAME                                                    | Useful for editor & presentation profiles                                                                |
-| *fai\_db\_install*                          | 0                                                            | Install db profile                                                                                       |
-| *fai\_db\_password*                         | read-the-source-luke                                         | Useful for DB installation profile                                                                       |
-| *fai\_db\_port*                             | 3306                                                         | Useful for editor & presentation profiles                                                                |
-| *fai\_db\_schema*                           | ece5db                                                       | Useful for DB installation profile                                                                       |
-| *fai\_db\_user*                             | ece5user                                                     | Useful for DB installation profile                                                                       |
-| *fai\_dry\_run*                             | 0                                                            | ece-install will download Escenic archives and install OS packages, but will not configure anything.     |
-| *fai\_editor\_conf\_archive*                | ""                                                           | *conf.tar.gz* to use for Nursery & JAAS configuration                                                    |
-| *fai\_editor\_deploy\_white\_list*          | "escenic-admin escenic studio indexer-webservice webservice" | The list of WARs to be deployed on this instance.                                                        |
-| *fai\_editor\_ear*                          | ""                                                           | EAR to use instead of the Escenic binaries                                                               |
-| *fai\_editor\_install*                      | 0                                                            | Install the editorial profile                                                                            |
-| *fai\_editor\_name*                         | editor1                                                      | Name of the editor instance                                                                              |
-| *fai\_editor\_port*                         | 8080                                                         | HTTP port of the editor instance                                                                         |
-| *fai\_editor\_shutdown*                     | 8005                                                         | Shutdown port of the editor instance                                                                     |
-| *fai\_editor\_stop\_and\_clear*             | 0                                                            | After installation, stop the instances and clear its work & log files                                    |
-| *fai\_enabled*                              | 0                                                            | Whether or not to run ece-install in FAI mode                                                            |
-| *fai\_keep\_off\_etc\_hosts*                | 0                                                            | Set this to 1 if you don't want ece-install adding entries to /etc/hosts                                 |
-| *fai\_monitoring\_admin\_password*          | No telling you here ;-)                                      | The admin password of the web interface(s). Currenlty only set for Icinga.                               |
-| *fai\_monitoring\_ece\_host\_list*          | ""                                                           | Hosts running one or more ECE instance                                                                   |
-| *fai\_monitoring\_host\_list*               | ""                                                           | Quoted, space separated list of <host>#<ip> pairs, e.g.: "pres1#10.72.227.250 pres2#10.72.227.251"       |
-| *fai\_monitoring\_install*                  | 0                                                            | Install the monitoring server profile.                                                                   |
-| *fai\_monitoring\_munin\_node\_list*        | ""                                                           | Set this to a whitespace separated list of nodes that munin should monitor                               |
-| *fai\_monitoring\_search\_host\_list*       | ""                                                           | Hosts running search instance(s) (Solr + indexer)                                                        |
-| *fai\_monitoring\_server\_ip*               | 127.0.0.1                                                    | The IP of the monitoring server.                                                                         |
-| *fai\_nfs\_allowed\_client\_network*        | ""                                                           | IP/netmask of allowed NFS clients, example: 192.168.1.0/255.255.255.0                                    |
-| *fai\_nfs\_client\_install*                 | 0                                                            | Installs an NFS client                                                                                   |
-| *fai\_nfs\_client\_mount\_point\_parent*    | /mnt                                                         | Mount point parent directory                                                                             |
-| *fai\_nfs\_export\_list*                    | ""                                                           | Space separated list of NFS export directories, full paths as seen on the NFS server.                    |
-| *fai\_nfs\_server\_address*                 | ""                                                           | Address of the NFS server, useful for the NFS client profile                                             |
-| *fai\_nfs\_server\_install*                 | 0                                                            | Install an NFS server                                                                                    |
-| *fai\_presentation\_conf\_archive*          | ""                                                           | *conf.tar.gz* to use for Nursery & JAAS configuration                                                    |
-| *fai\_presentation\_ear*                    | ""                                                           | EAR to use instead of the Escenic binaries                                                               |
-| *fai\_presentation\_install*                | 0                                                            | Install the presentation server profile                                                                  |
-| *fai\_presentation\_name*                   | engine1                                                      | Name of the presentation server instance                                                                 |
-| *fai\_presentation\_port*                   | 8080                                                         | HTTP port of the presentation server instance                                                            |
-| *fai\_presentation\_deploy\_white\_list*    | "escenic-admin <assemblytool/publications/*>"                | The list of WARs to be deployed on this instance.                                                        |
-| *fai\_presentation\_shutdown*               | 8005                                                         | Shutdown port of the presentation instance                                                               |
-| *fai\_presentation\_stop\_and\_clear*       | 0                                                            | After installation, stop the instances and clear its work & log files                                    |
-| *fai\_public\_host\_name*                   | ${HOSTNAME}:8080                                             | The public address for your website                                                                      |
-| *fai\_publication\_create*                  | 0                                                            | Create a new publication                                                                                 |
-| *fai\_publication\_domain\_mapping\_list*   | ""                                                           | Mapping between publications and domains: "<pub>[,pub.war]#<domain>[#,<alias1>,<alias2>]"                |
-| *fai\_publication\_ear*                     | ""                                                           | All publications WARs inside will be used for publication creation (assumes *fai\_publication\_create*)  |
-| *fai\_publication\_environment*             | "production"                                                 | The kind of environment/habitat. Typical values are: production, staging, testing, development.          |
-| *fai\_publication\_name*                    | mypub                                                        | Name of the publication                                                                                  |
-| *fai\_publication\_use\_instance*           | dev1                                                         | Name of local instance to use for creation                                                               |
-| *fai\_publication\_war*                     | "WF or ECE demo WAR"                                         | WAR to base the new publication on                                                                       |
-| *fai\_publication\_war\_remove\_file\_list* | ""                                                           | File list that should be removed from all WARs inside *fai\_publication\_ear* or *fai\_publication\_war* |
-| *fai\_publication\_war\_uri\_list*          | ""                                                           | Publication WARs used for setting up Assembly tool.                                                      |
-| *fai\_rmi\_install*                         | 0                                                            | Install the RMI hub profile                                                                              |
-| *fai\_search\_conf\_archive*                | ""                                                           | *conf.tar.gz* to use for Nursery & JAAS configuration                                                    |
-| *fai\_search\_deploy\_white\_list*          | "solr indexer-webapp"                                        | The list of WARs to be deployed on this instance.                                                        |
-| *fai\_search\_ear*                          | ""                                                           | EAR to use instead of the Escenic binaries                                                               |
-| *fai\_search\_for\_editor*                  | 0                                                            | If 1, will configure Solr for use with an editorial server, if not for presentation servers.             |
-| *fai\_search\_indexer\_ws\_uri*             | http://${HOSTNAME}:8080/indexer-webservice/index/            | URI of the indexer-webservice that the search instance shall use for knowing what to index.              |
-| *fai\_search\_install*                      | 0                                                            | Install the search server profile (Solr + indexer)                                                       |
-| *fai\_search\_name*                         | search1                                                      | Name of the search instance                                                                              |
-| *fai\_search\_port*                         | 8080                                                         | HTTP port of the search instance                                                                         |
-| *fai\_search\_shutdown*                     | 8005                                                         | Shutdown port of the search instance                                                                     |
-| *fai\_vip\_address*                         | ""                                                           | The virtual IP the provider will claim                                                                   |
-| *fai\_vip\_install*                         | 0                                                            | Install a VIP provider                                                                                   |
-| *fai\_vip\_primary\_node\_auth\_key*        | ""                                                           | Optional, but useful to set to make conf files consistent. Will be generated if not set                  |
-| *fai\_vip\_primary\_node\_ip*               | ""                                                           | Primary node IP                                                                                          |
-| *fai\_vip\_primary\_node\_name*             | ""                                                           | Primary node name, must be what $(uname -n) returns                                                      |
-| *fai\_vip\_secondary\_node\_ip*             | ""                                                           | Secondary node IP                                                                                        |
-| *fai\_vip\_secondary\_node\_name*           | ""                                                           | Secondary node name, must be what $(uname -n) returns                                                    |
-| *fai\_vip\_service\_list*                   | ""                                                           | List of init.d scripts to invoke when the VIP is acclaimed/revoked, script must support start & stop     |
-| *fai\_vip\_sibling\_ip*                     | ""                                                           | The IP of the other node offering the VIP                                                                |
-| *fai\_wf\_install*                          | 0                                                            | Install Widget Framework profile                                                                         |
-#+TBLFM: $1*fai\_publication\_war*::$3*conf.tar.gz* to use for Nursery & JAAS configuration
-
-0 means "false" and 1 means "true".
+The ece-install script understands the following settings in
+the *ece-install.conf*:
+
+- *fai\_all\_conf\_archive* *conf.tar.gz* to use for Nursery & JAAS
+  configuration. Default is "".
+
+- *fai\_all\_ear* EAR to use instead of the Escenic binaries. Default
+  is "".
+
+- *fai\_all\_install* Install all components on your server.. Default
+  is 0.
+
+- *fai\_all\_stop\_and\_clear* After installation, stop the instance
+  and clear its work & log files.. Default is 0.
+
+- *fai\_analysis\_db\_host* For the EAE DB (different from
+  ECE's). Default is localhost.
+
+- *fai\_analysis\_db\_install* Install DB profile. Default is 0.
+
+- *fai\_analysis\_db\_password* For the EAE DB (different from
+  ECE's). Default is read-the-source-luke.
+
+- *fai\_analysis\_db\_port* For the EAE DB (different from
+  ECE's). Default is 3306.
+
+- *fai\_analysis\_db\_schema* For the EAE DB (different from
+  ECE's). Default is ece5db.
+
+- *fai\_analysis\_db\_user* For the EAE DB (different from
+  ECE's). Default is ece5user.
+
+- *fai\_analysis\_install* Will install the Escenic Analysis Engine,
+  aka Stats, EAE.. Default is 0.
+
+- *fai\_analysis\_name* EAE instance name. Default is analysis1.
+
+- *fai\_analysis\_port* Port of the EAE. Default is 8080.
+
+- *fai\_analysis\_shutdown* Shutdown port for the EAE app
+  server. Default is 8005.
+
+- *fai\_analysis\_stop\_and\_clear* After installation, stop the
+  instances and clear its work & log files. Default is 0.
+
+- *fai\_apt\_vizrt\_pool* Which package pool in the Vizrt APT to
+  install package from.. Default is stable.
+
+- *fai\_cache\_backends* Space separated, e.g. "app1:8080
+  app2:8080". Default is ${HOSTNAME}:8080.
+
+- *fai\_cache\_install* Install cache server profile. Default is 0.
+
+- *fai\_db\_daily\_backup* Sets up daily backup of the DB.. Default
+  is 0.
+
+- *fai\_db\_drop\_old\_db\_first* Warning: this will drop the old
+  database before installing a new one. Default is 0.
+
+- *fai\_db\_host* Useful for editor & presentation profiles. Default
+  is $HOSTNAME.
+
+- *fai\_db\_install* Install db profile. Default is 0.
+
+- *fai\_db\_password* Useful for DB installation profile. Default is
+  read-the-source-luke.
+
+- *fai\_db\_port* Useful for editor & presentation profiles. Default
+  is 3306.
+
+- *fai\_db\_schema* Useful for DB installation profile. Default is
+  ece5db.
+
+- *fai\_db\_user* Useful for DB installation profile. Default is
+  ece5user.
+
+- *fai\_dry\_run* ece-install will download Escenic archives and
+  install OS packages, but will not configure anything.. Default is 0.
+
+- *fai\_editor\_conf\_archive* *conf.tar.gz* to use for Nursery & JAAS
+  configuration. Default is "".
+
+- *fai\_editor\_deploy\_white\_list* The list of WARs to be deployed
+  on this instance.. Default is "escenic-admin escenic studio
+  indexer-webservice webservice".
+
+- *fai\_editor\_ear* EAR to use instead of the Escenic
+  binaries. Default is "".
+
+- *fai\_editor\_install* Install the editorial profile. Default is 0.
+
+- *fai\_editor\_name* Name of the editor instance. Default is editor1.
+
+- *fai\_editor\_port* HTTP port of the editor instance. Default
+  is 8080.
+
+- *fai\_editor\_shutdown* Shutdown port of the editor
+  instance. Default is 8005.
+
+- *fai\_editor\_stop\_and\_clear* After installation, stop the
+  instances and clear its work & log files. Default is 0.
+
+- *fai\_enabled* Whether or not to run ece-install in FAI
+  mode. Default is 0.
+
+- *fai\_keep\_off\_etc\_hosts* Set this to 1 if you don't want
+  ece-install adding entries to /etc/hosts. Default is 0.
+
+- *fai\_monitoring\_admin\_password* The admin password of the web
+  interface(s). Currenlty only set for Icinga.. Default is No telling
+  you here ;-).
+
+- *fai\_monitoring\_ece\_host\_list* Hosts running one or more ECE
+  instance. Default is "".
+
+- *fai\_monitoring\_host\_list* Quoted, space separated list of
+  <host>#<ip> pairs, e.g.: "pres1#10.72.227.250
+  pres2#10.72.227.251". Default is "".
+
+- *fai\_monitoring\_install* Install the monitoring server
+  profile.. Default is 0.
+
+- *fai\_monitoring\_munin\_node\_list* Set this to a whitespace
+  separated list of nodes that munin should monitor. Default is "".
+
+- *fai\_monitoring\_search\_host\_list* Hosts running search
+  instance(s) (Solr + indexer). Default is "".
+
+- *fai\_monitoring\_server\_ip* The IP of the monitoring
+  server.. Default is 127.0.0.1.
+
+- *fai\_nfs\_allowed\_client\_network* IP/netmask of allowed NFS
+  clients, example: 192.168.1.0/255.255.255.0. Default is "".
+
+- *fai\_nfs\_client\_install* Installs an NFS client. Default is 0.
+
+- *fai\_nfs\_client\_mount\_point\_parent* Mount point parent
+  directory. Default is /mnt.
+
+- *fai\_nfs\_export\_list* Space separated list of NFS export
+  directories, full paths as seen on the NFS server.. Default is "".
+
+- *fai\_nfs\_server\_address* Address of the NFS server, useful for
+  the NFS client profile. Default is "".
+
+- *fai\_nfs\_server\_install* Install an NFS server. Default is 0.
+
+- *fai\_presentation\_conf\_archive* *conf.tar.gz* to use for Nursery
+  & JAAS configuration. Default is "".
+
+- *fai\_presentation\_ear* EAR to use instead of the Escenic
+  binaries. Default is "".
+
+- *fai\_presentation\_install* Install the presentation server
+  profile. Default is 0.
+
+- *fai\_presentation\_name* Name of the presentation server
+  instance. Default is engine1.
+
+- *fai\_presentation\_port* HTTP port of the presentation server
+  instance. Default is 8080.
+
+- *fai\_presentation\_deploy\_white\_list* The list of WARs to be
+  deployed on this instance.. Default is "escenic-admin
+  <assemblytool/publications/*>".
+
+- *fai\_presentation\_shutdown* Shutdown port of the presentation
+  instance. Default is 8005.
+
+- *fai\_presentation\_stop\_and\_clear* After installation, stop the
+  instances and clear its work & log files. Default is 0.
+
+- *fai\_public\_host\_name* The public address for your
+  website. Default is ${HOSTNAME}:8080.
+
+- *fai\_publication\_create* Create a new publication. Default is 0.
+
+- *fai\_publication\_domain\_mapping\_list* Mapping between
+  publications and domains:
+  "<pub>[,pub.war]#<domain>[#,<alias1>,<alias2>]". Default is "".
+
+- *fai\_publication\_ear* All publications WARs inside will be used
+  for publication creation
+  (assumes *fai\_publication\_create*). Default is "".
+
+- *fai\_publication\_environment* The kind of
+  environment/habitat. Typical values are: production, staging,
+  testing, development.. Default is "production".
+
+- *fai\_publication\_name* Name of the publication. Default is mypub.
+
+- *fai\_publication\_use\_instance* Name of local instance to use for
+  creation. Default is dev1.
+
+- *fai\_publication\_war* WAR to base the new publication on. Default
+  is "WF or ECE demo WAR".
+
+- *fai\_publication\_war\_remove\_file\_list* File list that should be
+  removed from all WARs inside *fai\_publication\_ear*
+  or *fai\_publication\_war*. Default is "".
+
+- *fai\_publication\_war\_uri\_list* Publication WARs used for setting
+  up Assembly tool.. Default is "".
+
+- *fai\_rmi\_install* Install the RMI hub profile. Default is 0.
+
+- *fai\_search\_conf\_archive* *conf.tar.gz* to use for Nursery & JAAS
+  configuration. Default is "".
+
+- *fai\_search\_deploy\_white\_list* The list of WARs to be deployed
+  on this instance.. Default is "solr indexer-webapp".
+
+- *fai\_search\_ear* EAR to use instead of the Escenic
+  binaries. Default is "".
+
+- *fai\_search\_for\_editor* If 1, will configure Solr for use with an
+  editorial server, if not for presentation servers.. Default is 0.
+
+- *fai\_search\_indexer\_ws\_uri* URI of the indexer-webservice that
+  the search instance shall use for knowing what to index.. Default is
+  http://${HOSTNAME}:8080/indexer-webservice/index/.
+
+- *fai\_search\_install* Install the search server profile (Solr +
+  indexer). Default is 0.
+
+- *fai\_search\_name* Name of the search instance. Default is search1.
+
+- *fai\_search\_port* HTTP port of the search instance. Default
+  is 8080.
+
+- *fai\_search\_shutdown* Shutdown port of the search
+  instance. Default is 8005.
+
+- *fai\_vip\_address* The virtual IP the provider will claim. Default
+  is "".
+
+- *fai\_vip\_install* Install a VIP provider. Default is 0.
+
+- *fai\_vip\_primary\_node\_auth\_key* Optional, but useful to set to
+  make conf files consistent. Will be generated if not set. Default is
+  "".
+
+- *fai\_vip\_primary\_node\_ip* Primary node IP. Default is "".
+
+- *fai\_vip\_primary\_node\_name* Primary node name, must be what
+  $(uname -n) returns. Default is "".
+
+- *fai\_vip\_secondary\_node\_ip* Secondary node IP. Default is "".
+
+- *fai\_vip\_secondary\_node\_name* Secondary node name, must be what
+  $(uname -n) returns. Default is "".
+
+- *fai\_vip\_service\_list* List of init.d scripts to invoke when the
+  VIP is acclaimed/revoked, script must support start & stop. Default
+  is "".
+
+- *fai\_vip\_sibling\_ip* The IP of the other node offering the
+  VIP. Default is "".
+
+- *fai\_wf\_install* Install Widget Framework profile. Default is 0.
+
+As you've probably already found out, *0* means "false" and *1* means "true".
 
 ** Example Configurations
 Here are a few simple example configurations, you can find more under
@@ -1062,10 +1231,10 @@ defaults to ensure that the second server gets different values.
 If the script believes there's already an ece-intall process running,
 it will abort:
 #+BEGIN_SRC text
-[ece-install] There's already one ece-install process running. If you believe
-[ece-install] this is wrong, e.g. if a previous run of ece-install was aborted
-[ece-install] before it completed, you may delete /var/run/ece-install.pid and
-[ece-install] run ece-install again.
+There's already one ece-install process running. If you believe
+this is wrong, e.g. if a previous run of ece-install was aborted
+before it completed, you may delete /var/run/ece-install.pid and
+run ece-install again.
 #+END_SRC
 
 * Re-running ece-install (and How To Speed It Up)

From d6e5531b81873209d9bdefc233ab017093baf8bf Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 18 Jan 2013 11:42:56 +0100
Subject: [PATCH 1923/2585] - added more hardening to the cron job generated
 from   ece-install::constants::set_up_content_engine_cron_jobs

---
 .../ece-install.d/content-engine.sh           | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 60485e09..ec856d25 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -730,25 +730,35 @@ function set_up_content_engine_cron_jobs() {
     return
   fi
 
+  # paranoid, if someone/thing has unset this internal, ece-install
+  # variable, we fail here
+  if [ -z "${escenic_cache_dir}" ]; then
+    remove_pid_and_exit_in_error \
+      "Something is serously wrong, escenic_cache_dir is unset"
+  fi
+
   print_and_log "Setting up cron job $file ..."
   cat > $file <<EOF
-#! /usr/bin/env bash
+#! /bin/bash -e
 
 # Created by $(basename $0) @ $(date)
 #
 # cron script to remove old cache files. These are the images that ECE
-# generates whenever someone requests an image version (often refereed
-# to as ALTERNATE int the URL & content-type).
-#
-# This cron job assumes that the ECE
-# com.escenic.presentation.servlet.multimedia.CacheFilter servlet
-# filter has been configrued to write to the path below in (each of
-# the publication webapp's) web.xml
+# generates whenever someone requests an image version (often referred
+# to as ALTERNATE in the URL & content-type).
 
+# This directory should correspond to the path which the
+# com.escenic.presentation.servlet.multimedia.CacheFilter servlet
+# filter writes to. (This needs to be set in each of the publication
+# webapp's web.xml).
 dir=${escenic_cache_dir}/engine/binary
 log=/var/log/\$(basename \$0).log
 
-function exit_if_dir_doesnt_exist() {
+function exit_if_dir_is_unset_or_doesnt_exist() {
+  if [ -z "\${dir}" ]; then
+    echo "The dir varialbe is unset :-(" >> \${log}
+    exit 1
+  fi
   if [ ! -d \${dir} ]; then
     echo \$dir "doesn't exist" >> \${log}
     exit 0
@@ -757,6 +767,7 @@ function exit_if_dir_doesnt_exist() {
 
 function exit_if_user_doesnt_own_dir() {
   local user_id=\$(id -u ${ece_user})
+  # This (stac -c) is Linux specific
   local dir_owner_id=\$(stat -c "%u" \${dir})
 
   if [[ \${user_id} != \${dir_owner_id} ]]; then
@@ -765,7 +776,7 @@ function exit_if_user_doesnt_own_dir() {
   fi
 }
 
-exit_if_dir_doesnt_exist
+exit_if_dir_is_unset_or_doesnt_exist
 exit_if_user_doesnt_own_dir
 
 echo "Running \$(basename \$0) @ \$(date)" >> \${log}

From f1defc548e55afa44c1389b58959e59fae5883a7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 18 Jan 2013 11:44:08 +0100
Subject: [PATCH 1924/2585] - re-added the EAE download bunlde to
 technet_download_list as it's   now (for 5.5) available on Technet again.

- fai_analysis_install=1 now puts the qs.cfg out with the others in
  /etc/escenic/analysis
---
 usr/sbin/ece-install                                       | 1 +
 .../escenic/ece-scripts/ece-install.d/analysis-engine.sh   | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 5368f65b..6cdb1712 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -81,6 +81,7 @@ ece_software_setup_completed=0
 # For ECE 5.5
 ############################################################################
 technet_download_list="
+  http://technet.escenic.com/downloads/release/55/analysis-engine-2.5.0.131590.zip
   http://technet.escenic.com/downloads/release/55/assemblytool-2.0.4.jar
   http://technet.escenic.com/downloads/release/55/community-engine-3.8.1.132399.zip
   http://technet.escenic.com/downloads/release/55/engine-5.5.0.131978.zip
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh
index bcaf6a90..52d142b3 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh
@@ -85,6 +85,13 @@ function set_up_analysis_conf() {
   set_conf_file_value pageview.aggr.hour.older.than.hours 2 $file
   set_conf_file_value pageview.maintenance.older.than.days 0 $file
 
+  # Third, configure the EAE query service
+  print_and_log "Configuring EAE query service ..."
+  local war=${escenic_root_dir}/analysis-engine-*/wars/analysis-qs.war
+  local path=WEB-INF/config/qs.cfg
+  local file=${escenic_conf_dir}/analysis/qs.cfg
+  extract_path_from_war_if_target_file_doesnt_exist $war $path $file
+
   # important to turn this off here, it's only for the EAE .cfg
   # files, see above.
   dont_quote_conf_values=0

From c59ab936a436371408c5e8424487bcd09fa74c6e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 18 Jan 2013 13:07:26 +0100
Subject: [PATCH 1925/2585] - fixed regression,
 ece-imort::http-and-ftp::download_files_if_desired   somehow got  a derived
 variable, instead of its loop local variable.

---
 .../ece-scripts/ece-import.d/http-and-ftp.sh   | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh b/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh
index e7e2bbb1..ee09d327 100644
--- a/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh
+++ b/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh
@@ -39,23 +39,23 @@ function download_latest_files() {
 
 ## Will only download files which are newer than max_file_age and
 ## which haven't been downloaded before.
-## 
+##
 ## $@ :: list of URIs
 function download_files_if_desired() {
-  for el in $list_of_files; do
-    if [ $(is_already_downloaded $uri/$el) -eq 1 ]; then
+  for the_file in $list_of_files; do
+    if [ $(is_already_downloaded $uri/$the_file) -eq 1 ]; then
       # not logging anything here as this will create log files in
       # production.
       continue
     fi
-    print_and_log "Downloading" $uri/$el "..."
+    print_and_log "Downloading" $uri/$the_file "..."
     download_uri_target_to_dir \
-      $uri/$el \
+      $uri/$the_file \
       $raw_spool_base_dir/$publication_name/$job_name/
-    local result=$raw_spool_base_dir/$publication_name/$job_name/$(basename $el)
+    local result=$raw_spool_base_dir/$publication_name/$job_name/$(basename $the_file)
 
-    log "Downloaded" $(basename $el) "to" $result
-    echo $uri/$el >> $(get_state_file)
+    log "Downloaded" $(basename $the_file) "to" $result
+    echo $uri/$the_file >> $(get_state_file)
   done
 }
 
@@ -76,5 +76,3 @@ function is_already_downloaded() {
 function get_state_file() {
   echo $raw_state_base_dir/$publication_name/$job_name/download.state
 }
-
-

From 2b366607f6bffd152dfd7464f6ce2989f76b64f9 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 18 Jan 2013 13:56:34 +0100
Subject: [PATCH 1926/2585] - added basic HTTP proxy support to ece-import (for
 use cases were the   user cannot/doesn't want to set the http_proxy
 environment   variable).

  You can now specify an HTTP proxy with the new --http-proxy
  parameter.

     ece-import --http-proxy proxyserver:3128 download-import-data

- moved method is_escenic_xml_ok from ece-import to common-ece as this
  might prove useful for other modules too.

- added common-ece to the ece-import dependency list
---
 usr/bin/ece-import                            | 56 ++++++-------------
 usr/share/escenic/ece-scripts/common-ece.sh   | 26 +++++++++
 .../ece-scripts/ece-import.d/http-and-ftp.sh  |  8 ++-
 3 files changed, 50 insertions(+), 40 deletions(-)

diff --git a/usr/bin/ece-import b/usr/bin/ece-import
index feb13e5b..6df833a5 100755
--- a/usr/bin/ece-import
+++ b/usr/bin/ece-import
@@ -17,6 +17,7 @@ function bootstrap_thyself() {
 
   local common_libraries="
     common-bashing.sh
+    common-ece.sh
     common-io.sh
     common-os.sh
   "
@@ -28,7 +29,7 @@ function bootstrap_thyself() {
       exit 1
     }
   done
-  
+
   for el in $dir/$(basename $0).d/*.sh; do
     source $el 2>/dev/null || {
       echo "$(basename $0): Could not load the library $el," \
@@ -73,6 +74,7 @@ function get_user_input() {
   local next_is_user=0
   local next_is_password=0
   local next_is_uri=0
+  local next_is_http_proxy=0
 
   for el in $@; do
     if [[ "$el" == "-n" || "$el" == "--name" ]]; then
@@ -95,6 +97,8 @@ function get_user_input() {
       next_is_uri=1
     elif [[ "$el" == "--directories-only" ]]; then
       directories_only=1
+    elif [[ "$el" == "--http-proxy" ]]; then
+      next_is_http_proxy=1
     elif [ "$el" == "--version" -o "$el" == "-V" ]; then
       echo "Version:" $ece_scripts_version
       exit 0
@@ -125,6 +129,9 @@ function get_user_input() {
     elif [ $next_is_uri -eq 1 ]; then
       uri=$el
       next_is_uri=0
+    elif [ $next_is_http_proxy -eq 1 ]; then
+      set_http_proxy "$el"
+      next_is_http_proxy=0
     else
       if [[ "$el" == "create" ]]; then
         command=$COMMAND_CREATE_IMPORT_CONFIGURATION
@@ -145,13 +152,13 @@ function get_user_input() {
     print_and_log "E.g.: $(basename $0) --publication mypub"
     errors=1
   fi
-  
+
   if [ -n "${import_archive}" -a ! -r "${import_archive}" ]; then
     print_and_log "You have specified an import job archive file" \
       "but it doesn't exist :-("
     errors=1
   fi
-  
+
   if [ $command -eq $COMMAND_DOWNLOAD_RAW_DATA ]; then
     if [ -z "$user" ]; then
       print_and_log "You must specify the the user"
@@ -169,14 +176,14 @@ function get_user_input() {
       errors=1
     fi
   fi
-  
+
   if [ $errors -eq 1 ]; then
     remove_pid_and_exit_in_error
   fi
 }
 
 ## $1 :: the transformer (file name, relative or absoulte)
-function is_trannsformer_supported() {
+function is_transformer_supported() {
   if [ -z $1 ]; then
     return
   fi
@@ -195,7 +202,7 @@ function is_trannsformer_supported() {
 ## $1 :: file
 function perform_transformations() {
   for el in $transformers_base_dir/$publication_name/$job_name/transformers/[0-9]*; do
-    if [ $(is_trannsformer_supported $el) -eq 0 ]; then
+    if [ $(is_transformer_supported $el) -eq 0 ]; then
       log "$(yellow WARNING) The transformer $el isn't supported by $(basename $0)"
       continue
     fi
@@ -295,32 +302,6 @@ function import_raw_files() {
   done
 }
 
-## $1 :: the XML
-function is_escenic_xml_ok() {
-  if [ ! -e $1 ]; then
-    echo 0
-    return
-  fi
-
-  # first, check for well formed-ness
-  xmllint --format $1 > /dev/null 2>&1
-  if [ $? -gt 0 ]; then
-    echo 0
-    return
-  fi
-
-  # check for an <escenic/> root element
-  local element_count=$(
-    xml_grep --cond /escenic $1 | wc -l 2>/dev/null
-  )
-  if [ $element_count -gt 0 ]; then
-    echo 1
-    return
-  fi
-
-  echo 0
-}
-
 function verify_import_job_configuration() {
   verify_writable_dir_list \
     $raw_spool_base_dir/$publication_name/$job_name \
@@ -359,15 +340,14 @@ function print_report() {
   fi
 }
 
-
-assert_commands_available  xsltproc xmllint xml_grep
+assert_commands_available xsltproc xmllint xml_grep
 get_user_input $@
 
 function run_import() {
   pid_file=${pid_file/%.pid/-run-import.pid}
   lock_file=${lock_file/%.lock/-run-import.lock}
   common_pre_run
-  
+
   verify_import_job_configuration
   import_raw_files
   common_post_run
@@ -377,7 +357,7 @@ function run_create_import_configuration() {
   pid_file=${pid_file/%.pid/-create.pid}
   lock_file=${lock_file/%.lock/-create.lock}
   common_pre_run
-  
+
   if [ -z $import_archive ]; then
     if [ ${directories_only-0} -eq 0 ]; then
       create_import_configuration $publication_name $job_name
@@ -409,7 +389,7 @@ function common_pre_run() {
 function common_post_run() {
   print_manual_steps
   print_report
-  
+
   print_and_log "Finished @ $(date), enjoy thyself!"
   remove_pid
   remove_lock
@@ -422,5 +402,3 @@ elif [[ "$command" == $COMMAND_CREATE_IMPORT_CONFIGURATION ]]; then
 elif [[ "$command" == $COMMAND_DOWNLOAD_RAW_DATA  ]]; then
   run_download_raw_data
 fi
-
-
diff --git a/usr/share/escenic/ece-scripts/common-ece.sh b/usr/share/escenic/ece-scripts/common-ece.sh
index cef97c29..671daba0 100644
--- a/usr/share/escenic/ece-scripts/common-ece.sh
+++ b/usr/share/escenic/ece-scripts/common-ece.sh
@@ -119,3 +119,29 @@ function get_publication_list() {
     grep '/escenic-admin/pages/publication/view.jsp' | \
     sed 's/.*name=\(.*\)".*/\1/g'
 }
+
+## $1 :: the XML
+function is_escenic_xml_ok() {
+  if [ ! -e $1 ]; then
+    echo 0
+    return
+  fi
+
+  # first, check for well formed-ness
+  xmllint --format $1 > /dev/null 2>&1
+  if [ $? -gt 0 ]; then
+    echo 0
+    return
+  fi
+
+  # check for an <escenic/> root element
+  local element_count=$(
+    xml_grep --cond /escenic $1 | wc -l 2>/dev/null
+  )
+  if [ $element_count -gt 0 ]; then
+    echo 1
+    return
+  fi
+
+  echo 0
+}
diff --git a/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh b/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh
index ee09d327..7b93fec5 100644
--- a/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh
+++ b/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh
@@ -22,7 +22,7 @@ function download_latest_files() {
   # long sed from
   # http://stackoverflow.com/questions/1881237/easiest-way-to-extract-the-urls-from-an-html-page-using-sed-or-awk-only
   local list_of_files=$(
-    wget $user_and_password \
+    $(get_proxy_settings_if_applicable) wget $user_and_password \
       --quiet \
       --output-document \
       - $uri | \
@@ -37,6 +37,12 @@ function download_latest_files() {
   download_files_if_desired $list_of_files
 }
 
+function get_proxy_settings_if_applicable() {
+  if [ -n "${the_http_proxy}" ]; then
+    echo http_proxy=${the_http_proxy}
+  fi
+}
+
 ## Will only download files which are newer than max_file_age and
 ## which haven't been downloaded before.
 ##

From c42e693373434e6a0cc81bea64af5ff226d26db8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 18 Jan 2013 14:35:11 +0100
Subject: [PATCH 1927/2585] - now sets the proxy variable, ece-import.

---
 usr/bin/ece-import | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/bin/ece-import b/usr/bin/ece-import
index 6df833a5..84470be5 100755
--- a/usr/bin/ece-import
+++ b/usr/bin/ece-import
@@ -130,7 +130,7 @@ function get_user_input() {
       uri=$el
       next_is_uri=0
     elif [ $next_is_http_proxy -eq 1 ]; then
-      set_http_proxy "$el"
+      the_http_proxy="$el"
       next_is_http_proxy=0
     else
       if [[ "$el" == "create" ]]; then

From 0aadd0f70380420c577de5de4eabf6b63721a5a8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 18 Jan 2013 16:12:41 +0100
Subject: [PATCH 1928/2585] - added emacs settings for batch processing of org
 files into man   pages

---
 .../escenic/package-scripts/emacs/org-export-setup.el      | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 usr/share/escenic/package-scripts/emacs/org-export-setup.el

diff --git a/usr/share/escenic/package-scripts/emacs/org-export-setup.el b/usr/share/escenic/package-scripts/emacs/org-export-setup.el
new file mode 100644
index 00000000..a8e2d54f
--- /dev/null
+++ b/usr/share/escenic/package-scripts/emacs/org-export-setup.el
@@ -0,0 +1,7 @@
+(setq load-path
+      (append (list "~/.emacs.d/org-7.9.3d/lisp"
+                    "~/.emacs.d/org-7.9.3d/contrib/lisp")
+              load-path))
+(require 'org)
+(require 'org-export)
+(require 'org-e-man)

From cc1b5cb83da7000e5aa23b843f7cc8b53954d1d8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 18 Jan 2013 16:23:07 +0100
Subject: [PATCH 1929/2585] - added create-packages:create_man_pages which runs
 Emacs in batch   mode to generate the man(ual) pages from the org files

- the ece-install guide is now generated as a man page and included as
  man page in the deb file

- handles it gracefully if the man pages couldn't  be generated
  (doesn't make the build fail)

- TODO:
  * add mandb update to the postinst script(s)
  * add the man page generation for the other packages too
  * set up Emacs + new org mode on Hudson
---
 .../escenic/package-scripts/create-packages   | 53 ++++++++++++++-----
 1 file changed, 40 insertions(+), 13 deletions(-)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 813756f8..dcf67f43 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -11,6 +11,7 @@ package_version=$(date +%Y-%m-%d.%H%M%S)
 default_maintainer_name="Torstein Krause Johansen"
 default_maintainer_email=tkj@vizrt.com
 wget_opts="--continue --inet4-only --quiet"
+log=$HOME/.$(basename $0).log
 
 function clean_up() {
   rm -rf $target_dir
@@ -49,7 +50,7 @@ function get_user_options() {
         ;;
     esac
   done
-  
+
 }
 
 function create_target_directory() {
@@ -78,13 +79,36 @@ function create_target_directory() {
   cp debian/${package_name}/* $debian_dir
 }
 
+## $1 :: the org file from which to generate man pages.
+## $2 :: target file of then man page (before gzip-ed)
+function create_man_pages() {
+  local org_file=$1
+  local target_man=$2
+  echo "Converting" $(basename $org_file) to "man ..."
+  emacs --batch \
+    --load emacs/org-export-setup.el \
+    --file ${org_file} \
+    --funcall org-e-man-export-to-man 2&>>$log
+
+  local dot_man_file=$(dirname $org_file)/$(basename $org_file .org).man
+  if [ ! -e $dot_man_file ]; then
+    echo "Man generation failed, see ${log} and run" \
+      "[ bash -x" $(basename $0) "] from the command prompt to figure out why."
+    return
+  fi
+
+  mkdir -p $(dirname ${target_man})
+  mv ${dot_man_file} ${target_man}
+  gzip ${target_man}
+}
+
 function set_up_escenic-content-engine-installer() {
   mkdir -p $target_dir/{etc,usr,/etc/default}
   mkdir -p $target_dir/usr/{bin,sbin,share/doc}
   mkdir -p $target_dir/usr/share/doc/escenic/examples
   mkdir -p $target_dir/usr/share/escenic/ece-scripts
   mkdir -p $target_dir/etc/bash_completion.d
-  
+
   cp ../../../../etc/bash_completion.d/ece-install \
     $target_dir/etc/bash_completion.d/
   cp -r ../../../sbin/ece-install $target_dir/usr/sbin/
@@ -94,6 +118,9 @@ function set_up_escenic-content-engine-installer() {
     $target_dir/usr/share/doc/escenic
   cp -r ../../doc/escenic/examples/ece-install-*.conf \
     $target_dir/usr/share/doc/escenic/examples/
+
+  create_man_pages ../../doc/escenic/ece-install-guide.org \
+    $target_dir/usr/share/man/man1/ece-install.1
 }
 
 function set_up_escenic-build-scripts() {
@@ -137,7 +164,7 @@ function set_up_escenic-content-engine-scripts() {
   mkdir -p $examples_dir
   cp ../../../../etc/default/ece $examples_dir
   cp ../../../../etc/escenic/ece.conf $doc_dir/examples/etc
-  
+
   # cron
   cp -r ../../../../etc/cron.daily/remove-old-escenic-log-files \
     $target_dir/etc/cron.daily/
@@ -153,7 +180,7 @@ function set_up_vosa() {
   mkdir -p $target_dir/usr/share/doc/vosa
   mkdir -p $target_dir/etc/bash_completion.d
   mkdir -p $target_dir/etc/init.d
-  
+
   cp -r ../../../bin/vosa $target_dir/usr/bin/
   cp -r ../../../bin/vosa-push $target_dir/usr/bin/
   cp -r ../../vizrt/ $target_dir/usr/share/
@@ -168,7 +195,7 @@ function set_up_escenic-common-scripts() {
   mkdir -p $target_dir/usr/{bin,sbin,share/doc}
   mkdir -p $target_dir/usr/share/doc/escenic
   mkdir -p $target_dir/usr/share/escenic/ece-scripts
-  
+
   # system-info is useful for all packages, hence goes to
   # escenic-common-scripts.
   cp -r ../../../bin/system-info $target_dir/usr/bin/
@@ -178,7 +205,7 @@ function set_up_escenic-common-scripts() {
   cp ../../../../etc/default/system-info $target_dir/etc/default/
   cp -r ../../doc/escenic/system-info-guide.org \
     $target_dir/usr/share/doc/escenic
-  
+
   # both the installer and ece-scripts use the common scripts and
   # web resources.
   cp -r ../../escenic/ece-scripts/common* \
@@ -211,7 +238,7 @@ function set_up_escenic-munin-plugins() {
     cp $dir/mogsie-escenic-munin*/*_ $target_dir/usr/share/munin/plugins
     cp $dir/mogsie-escenic-munin*/README.md $doc_dir
     cp $dir/mogsie-escenic-munin*/site/* $doc_dir
-    
+
     chmod 755 $file $target_dir/usr/share/munin/plugins
   )
   rm -rf $dir
@@ -222,7 +249,7 @@ function set_up_hugin-node() {
   mkdir -p $target_dir/etc/{cron.d,sudoers.d}
   mkdir -p $target_dir/usr/{bin,share/doc/hugin,share/hugin/plugins,share/hugin/helpers}
   mkdir -p $target_dir/var/lib/hugin
-  
+
   local dir=$(mktemp -d)
   (
     cd $dir
@@ -249,7 +276,7 @@ function set_up_spore() {
   local dir=$(mktemp -d)
   (
     cd $dir
-    wget $wget_opts https://github.com/vizrt/spore/archive/master.tar.gz 
+    wget $wget_opts https://github.com/vizrt/spore/archive/master.tar.gz
     tar xzf master.tar.gz
     cp $dir/spore-master/bin/* $target_dir/usr/bin
     cp $dir/spore-master/sbin/* $target_dir/usr/sbin
@@ -275,12 +302,12 @@ function create_packages() {
     sed -i "s#^ece_scripts_version=.*#ece_scripts_version=${package_version}#g" \
       $f
   done
-  
+
   # fix permissions
   if [ -e $debian_dir/postinst ]; then
     chmod 755 $debian_dir/postinst
   fi
-  
+
   if [ ! -x /usr/bin/dpkg-deb ]; then
     echo "You must have dpkg-deb installed :-("
     exit 1
@@ -289,7 +316,7 @@ function create_packages() {
   fakeroot dpkg-deb --build $target_dir \
     2>&1 > /dev/null
   mv ${target_dir}.deb $target_dir/${package_name}-${package_version}.deb
-  
+
   if [[ -x /usr/bin/alien && -x /usr/bin/fakeroot ]]; then
     (
       cd $target_dir
@@ -301,7 +328,7 @@ function create_packages() {
     echo "You must have 'alien' and 'fakeroot' installed to create RPMs"
     exit 1
   fi
-}  
+}
 
 function list_packages() {
   echo "Sir, the packages are now ready:"

From 070538d03b007d2566904e045367d87d4ef5bd30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Thu, 17 Jan 2013 23:41:00 +0100
Subject: [PATCH 1930/2585] ece-dev-image - brand new script initiated for dev
 image generation

---
 usr/share/escenic/build-scripts/ece-dev-image | 179 ++++++++++++++++++
 1 file changed, 179 insertions(+)
 create mode 100755 usr/share/escenic/build-scripts/ece-dev-image

diff --git a/usr/share/escenic/build-scripts/ece-dev-image b/usr/share/escenic/build-scripts/ece-dev-image
new file mode 100755
index 00000000..5a524b65
--- /dev/null
+++ b/usr/share/escenic/build-scripts/ece-dev-image
@@ -0,0 +1,179 @@
+#! /usr/bin/env bash
+
+# common variables
+ece_scripts_version="straight-from-github"
+ece_scripts_home=/usr/share/escenic/ece-scripts
+dir_suffix=escenic
+escenic_log_dir=/var/log/${dir_suffix}
+log=${escenic_log_dir}/$(basename $0).log
+
+# defaults for configuration
+default_builder=builder.vizrtsaas.com
+
+##
+function init
+{
+  # verify initial startup requirements
+  if [ $(whoami) != "root" ]; then
+    echo "You must be root when running $(basename $0)!"
+    exit 1
+  elif [ ! -d $ece_scripts_home ]; then
+    echo "The directory for ece-scripts $ece_scripts_home does not exist, exiting!"
+    exit 1
+  elif [ ! -e $ece_scripts_home/common-bashing.sh ]; then
+    echo "The script $ece_scripts_home/common-bashing.sh does not exist, exiting!"
+    exit 1
+  elif [ ! -e $ece_scripts_home/common-io.sh ]; then
+    echo "The script $ece_scripts_home/common-io.sh does not exist, exiting!"
+    exit 1
+  fi
+  
+  source $ece_scripts_home/common-bashing.sh
+  source $ece_scripts_home/common-io.sh
+
+  # set pid
+  if [ -e $pid_file ]; then
+    echo "Instance of $(basename $0) already running!"
+    exit 1
+  else
+    create_pid
+  fi
+  
+  # shutdown hooks
+  trap common_bashing_exit_hook EXIT
+  trap common_bashing_user_cancelled_hook SIGINT SIGHUP
+}
+
+##
+function process_user_options
+{
+  local argument_requested=0
+  for arg in "$@"; do
+    if [[ "${arg:0:1}" == "-" ]]; then
+      if [ $argument_requested -eq 1 ]; then
+        print_and_log "Invalid argument '$arg' for option '$previous_option'"
+        exit 1
+      else
+        case "$arg" in
+          -v|--verbose)
+            debug=1
+            ;;
+          -V|--version)
+            echo "Version $ece_scripts_version"
+            exit 0
+            ;;
+          -f|--conf-file)
+            local argument_requested=1
+            ;;
+          *)
+            print_and_log "Invalid option '$arg'"
+            exit 1
+        esac
+      fi
+      local previous_option="$arg"
+    elif [ $argument_requested -eq 0 ]; then
+      print_and_log "Invalid input '$arg'"
+      exit 1
+    else
+      case "$previous_option" in
+        -f|--conf-file)
+          if [ -e "$arg" ]; then
+            conf_file=$(readlink -f $arg)
+          else
+            print_and_log "The provided configuration file '$arg' does not exist!"
+            exit 1
+          fi
+          ;;
+        *)
+          print_and_log "The option '$previous_option' received argument '$arg', but something went wrong, exiting!"
+          exit 1
+      esac
+      local argument_requested=0
+    fi
+  done
+  if [ $argument_requested -eq 1 ]; then
+    print_and_log "Option '$previous_option' requires an argument!"
+    exit 1
+  fi
+}
+
+##
+function verify_configuration
+{
+  # source configuration file
+  run source $conf_file
+
+  # mandatory variables
+  ensure_variable_is_set project_key  
+
+  ensure_variable_is_set technet_download_list
+  
+  ensure_variable_is_set technet_user
+  ensure_variable_is_set technet_password
+  
+  ensure_variable_is_set builder_http_user
+  ensure_variable_is_set builder_http_password
+  
+  ensure_variable_is_set escenic_user_password
+  ensure_variable_is_set ubuntu_user_password
+
+  ensure_variable_is_set tomcat_manager_user
+  ensure_variable_is_set tomcat_manager_password
+
+  ensure_variable_is_set analysis_db_password
+ 
+  ensure_variable_is_set spore_signee
+
+  ensure_variable_is_set publication_domain_mapping_list
+  ensure_variable_is_set main_instance_deploy_white_list
+  ensure_variable_is_set secondary_instance_deploy_white_list
+ 
+  # optional variables with defaults
+  project_builder=${project_builder-$default_builder}
+  ensure_variable_is_set project_builder
+  
+  conf_package_deb=${conf_package_deb-http://$project_builder/$project_key/releases/vosa-conf-dev-latest.dev}
+  ensure_variable_is_set conf_package_deb
+  
+  spore_package=${spore_package-http://$project_builder/$project_key/releases/spore-$project_key-development.tar.gz}
+  ensure_variable_is_set spore_package
+
+  project_ear=${project_ear-http://$project_builder/$project_key/releases/latest.ear}
+  ensure_variable_is_set project_ear
+
+  image_hostname=${image_hostname-$project_key-dev}
+  ensure_variable_is_set image_hostname
+}
+
+##
+function phase_startup 
+{
+  init
+  process_user_options "${@}"
+}
+
+##
+function phase_pre_execution
+{
+  verify_configuration
+}
+
+##
+function phase_execution 
+{
+  :
+}
+
+##
+function phase_post_execution 
+{
+  :
+}
+
+## order of execution
+phase_startup "${@}"
+phase_pre_execution
+phase_execution
+phase_post_execution
+
+exit 0

From c3d0bb63b399fd1498ef7dab234d4fd5df008fcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Fri, 18 Jan 2013 23:45:39 +0100
Subject: [PATCH 1931/2585] ece-dev-image - hardening the generation of conf
 files

---
 usr/share/escenic/build-scripts/ece-dev-image | 48 ++++++++++++++++++-
 .../skeleton-dev/ece-install.conf.tmpl        | 23 +++++----
 ...-install-hook-deploy-configuration.sh.tmpl |  2 +-
 ...stall-hook-install-and-apply-spore.sh.tmpl |  8 ++--
 .../post-install-hook-set-hostname.sh.tmpl    |  6 +--
 .../post-install-hook-set-password.sh.tmpl    |  4 +-
 .../patch/etc/escenic/ece-engine1.conf.tmpl   |  6 +--
 .../patch/etc/escenic/ece-search1.conf.tmpl   |  6 +--
 .../patch/etc/issue.template.tmpl             |  4 +-
 .../tomcat-engine1/conf/tomcat-users.xml.tmpl |  2 +-
 .../tomcat-search1/conf/tomcat-users.xml.tmpl |  2 +-
 11 files changed, 77 insertions(+), 34 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-dev-image b/usr/share/escenic/build-scripts/ece-dev-image
index 5a524b65..6e7e4f5f 100755
--- a/usr/share/escenic/build-scripts/ece-dev-image
+++ b/usr/share/escenic/build-scripts/ece-dev-image
@@ -7,6 +7,9 @@ dir_suffix=escenic
 escenic_log_dir=/var/log/${dir_suffix}
 log=${escenic_log_dir}/$(basename $0).log
 
+image_config_root=/etc/vizrt/vosa/available.d
+image_config_source=/usr/share/vizrt/vosa/generated-servers/skeleton-dev
+
 # defaults for configuration
 default_builder=builder.vizrtsaas.com
 
@@ -97,6 +100,20 @@ function process_user_options
   fi
 }
 
+##
+function verify_host_system_configuration
+{
+  :
+}
+
+##
+function aquire_and_lock_image_pipeline
+{
+  for pipeline in $pipelines; do
+    :
+  done
+}
+
 ##
 function verify_configuration
 {
@@ -126,7 +143,6 @@ function verify_configuration
 
   ensure_variable_is_set publication_domain_mapping_list
   ensure_variable_is_set main_instance_deploy_white_list
-  ensure_variable_is_set secondary_instance_deploy_white_list
  
   # optional variables with defaults
   project_builder=${project_builder-$default_builder}
@@ -145,6 +161,32 @@ function verify_configuration
   ensure_variable_is_set image_hostname
 }
 
+##
+function generate_image_configuration
+{
+  if [ ! -d $image_config_root ]; then
+    print_and_log "The target directory for image configuration '$image_config_root' does not exist, exiting!"
+    exit 1  
+  elif [ ! -d $image_config_source ]; then
+    print_and_log "The source directory for image configuration '$image_config_source' does not exist, exiting!"
+  else
+    if [ -d $image_config_root/$image_hostname ]; then
+      run rm -rf $image_config_root/$image_hostname
+    fi
+    run mkdir -p $image_config_root/$image_hostname
+    run cp -r $image_config_source/* $image_config_root/$image_hostname/. 
+
+    for f in `find $image_config_root/$image_hostname/. -type f | grep .tmpl`; do
+      echo "$f"
+      echo "$(eval "echo \"$(cat $f)\"")" > ${f%.*}
+      if [[ "${f%.*}" == *.sh ]]; then
+        chmod +x ${f%.*}
+      fi
+      rm -f $f
+    done
+  fi
+}
+
 ##
 function phase_startup 
 {
@@ -155,13 +197,15 @@ function phase_startup
 ##
 function phase_pre_execution
 {
+  verify_host_system_configuration
+  aquire_and_lock_image_pipeline
   verify_configuration
 }
 
 ##
 function phase_execution 
 {
-  :
+  generate_image_configuration
 }
 
 ##
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/ece-install.conf.tmpl b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/ece-install.conf.tmpl
index f0679c78..e5204c78 100644
--- a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/ece-install.conf.tmpl
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/ece-install.conf.tmpl
@@ -1,9 +1,9 @@
 # technet credentials
-technet_user=$TECHNET_USER
-technet_password=$TECHNET_PASSWORD
+technet_user=$technet_user
+technet_password=$technet_password
 
 # technet download list
-technet_download_list=$TECHNET_DOWNLOAD_LIST
+technet_download_list=\"$technet_download_list\"
 
 # TODO - not sure if these are needed
 nop=
@@ -19,7 +19,7 @@ fai_search_shutdown=8105
 fai_search_redirect=8143
 fai_search_name=search1
 fai_search_indexer_ws_uri=http://localhost:8080/indexer-webservice/index/
-fai_search_ear=$FAI_SEARCH_EAR
+fai_search_ear=$project_ear
 fai_search_for_editor=0
 fai_search_host=localhost
 fai_search_stop_and_clear=1
@@ -35,7 +35,7 @@ fai_analysis_name=\$fai_search_name
 fai_analysis_db_install=1
 fai_analysis_db_schema=analysisdb
 fai_analysis_db_user=analysisdbuser
-fai_analysis_db_password=$FAI_ANALYSIS_DB_PASSWORD
+fai_analysis_db_password=$analysis_db_password
 
 # do not setup the db as content will be recovered from .tar package
 fai_db_install=1
@@ -52,7 +52,6 @@ fai_publication_war_remove_file_list=\"
 fai_restore_from_backup=0
 fai_db_drop_old_db_first=0
 fai_restore_db=0
-fai_restore_from_file=$FAI_RESTORE_FROM_FILE
 
 # install the cache profile
 fai_cache_install=1
@@ -62,12 +61,12 @@ fai_monitoring_node_nagios_skip=1
 fai_monitoring_node_munin_skip=1
 
 # configure the presentation profile
-fai_builder_http_user=$FAI_BUILDER_HTTP_USER
-fai_builder_http_password=$FAI_BUILDER_HTTP_PASSWORD
+fai_builder_http_user=$builder_http_user
+fai_builder_http_password=$builder_http_password
 fai_presentation_install=1
 fai_publication_environment=dev
-fai_presentation_ear=$FAI_PRESENTATION_EAR
-fai_publication_ear=$FAI_PRESENTATION_EAR
+fai_presentation_ear=$project_ear
+fai_publication_ear=$project_ear
 fai_presentation_name=engine1
-fai_publication_domain_mapping_list=$FAI_PUBLICATION_DOMAIN_MAPPING_LIST
-fai_presentation_deploy_white_list=$FAI_PRESENTATION_DEPLOY_WHITE_LIST
+fai_publication_domain_mapping_list=\"$publication_domain_mapping_list\"
+fai_presentation_deploy_white_list=\"$main_instance_deploy_white_list\"
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-deploy-configuration.sh.tmpl b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-deploy-configuration.sh.tmpl
index 8d964f30..6080db5d 100755
--- a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-deploy-configuration.sh.tmpl
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-deploy-configuration.sh.tmpl
@@ -3,7 +3,7 @@
 echo "--- START : post install hook - deploy configuration ---"
 
 # fetch latest .deb package from url
-ssh -F \$2/ssh.conf root@guest 'wget --http-user=$FAI_BUILDER_HTTP_USER --http-password=$FAI_BUILDER_HTTP_PASSWORD --quiet --inet4-only $HOOKS_LATEST_CONF_DEB -O conf.deb'
+ssh -F \$2/ssh.conf root@guest 'wget --http-user=$builder_http_user --http-password=$builder_http_password --quiet --inet4-only $conf_package_deb -O conf.deb'
 
 # apply .deb package and force overwrites
 ssh -F \$2/ssh.conf root@guest 'dpkg -i --force-confnew conf.deb'
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-and-apply-spore.sh.tmpl b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-and-apply-spore.sh.tmpl
index 9937183c..471ee2eb 100755
--- a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-and-apply-spore.sh.tmpl
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-and-apply-spore.sh.tmpl
@@ -9,10 +9,10 @@ ssh -F \$2/ssh.conf root@guest 'curl http://apt.vizrt.com/spores.key | gpg --imp
 ssh -F \$2/ssh.conf root@guest 'apt-get install spore'
 
 # generate spore conf file
-ssh -F \$2/ssh.conf root@guest 'echo "spore_uri=$HOOKS_SPORE_URL" > /etc/spore-cronjob.conf'
-ssh -F \$2/ssh.conf root@guest 'echo "http_user=$FAI_BUILDER_HTTP_USER" >> /etc/spore-cronjob.conf'
-ssh -F \$2/ssh.conf root@guest 'echo "http_passwd=$FAI_BUILDER_HTTP_PASSWORD" >> /etc/spore-cronjob.conf'
-ssh -F \$2/ssh.conf root@guest 'echo "spore_signee=$HOOKS_SPORE_SIGNEE" >> /etc/spore-cronjob.conf'
+ssh -F \$2/ssh.conf root@guest 'echo \"spore_uri=$spore_package\" > /etc/spore-cronjob.conf'
+ssh -F \$2/ssh.conf root@guest 'echo \"http_user=$builder_http_user\" >> /etc/spore-cronjob.conf'
+ssh -F \$2/ssh.conf root@guest 'echo \"http_passwd=$builder_http_password\" >> /etc/spore-cronjob.conf'
+ssh -F \$2/ssh.conf root@guest 'echo \"spore_signee=$spore_signee\" >> /etc/spore-cronjob.conf'
 
 # apply spore
 ssh -F \$2/ssh.conf root@guest 'spore-download-and-apply'
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-set-hostname.sh.tmpl b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-set-hostname.sh.tmpl
index 79576489..c557a536 100755
--- a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-set-hostname.sh.tmpl
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-set-hostname.sh.tmpl
@@ -3,11 +3,11 @@
 echo \"--- START : post install hook - set hostname ---\"
 
 # set dev image hostame
-ssh -F \$2/ssh.conf root@guest 'echo $IMAGE_HOSTNAME > /etc/hostname'
-ssh -F \$2/ssh.conf root@guest 'hostname $IMAGE_HOSTNAME'
+ssh -F \$2/ssh.conf root@guest 'echo $image_hostname > /etc/hostname'
+ssh -F \$2/ssh.conf root@guest 'hostname $image_hostname'
 ssh -F \$2/ssh.conf root@guest 'hostname'
 
 # add hostname to /etc/hosts
-ssh -F \$2/ssh.conf root@guest 'echo \"127.0.0.1	$IMAGE_HOSTNAME\" >> /etc/hosts'
+ssh -F \$2/ssh.conf root@guest 'echo \"127.0.0.1	$image_hostname\" >> /etc/hosts'
 
 echo \"--- END : post install hook - set hostname ---\"
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-set-password.sh.tmpl b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-set-password.sh.tmpl
index cc6dc19d..f4e2d414 100755
--- a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-set-password.sh.tmpl
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-set-password.sh.tmpl
@@ -4,8 +4,8 @@ echo \"--- START : post install hook - set password ---\"
 
 # set dev image passwords
 (
-  echo 'escenic:$HOOKS_ESCENIC_USER_PASSWORD'
-  echo 'ubuntu:$HOOKS_UBUNTU_USER_PASSWORD'
+  echo 'escenic:$escenic_user_password'
+  echo 'ubuntu:$ubuntu_user_password'
 ) | ssh -F \$2/ssh.conf guest 'sudo chpasswd'
 
 echo \"--- END : post install hook - set password ---\"
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/etc/escenic/ece-engine1.conf.tmpl b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/etc/escenic/ece-engine1.conf.tmpl
index ea74b594..014b52ee 100644
--- a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/etc/escenic/ece-engine1.conf.tmpl
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/etc/escenic/ece-engine1.conf.tmpl
@@ -1,7 +1,7 @@
 tomcat_base=\"/opt/tomcat-engine1\"
 tomcat_home=\"/opt/tomcat\"
 appserver_port=\"8080\"
-deploy_webapp_white_list=$DEPLOY_WEBAPP_WHITE_LIST
+deploy_webapp_white_list=\"$main_instance_deploy_white_list\"
 
 #########################################################################
 # JVM related (the Java Virtual Machine)
@@ -26,8 +26,8 @@ enable_remote_debugging=1
 
 ece_environment=dev
 
-builder_http_user=$FAI_BUILDER_HTTP_USER
-builder_http_password=$FAI_BUILDER_HTTP_PASSWORD
+builder_http_user=$builder_http_user
+builder_http_password=$builder_http_password
 
 #########################################################################
 # Settings related to the JVM garbage collection, don't touch these if
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/etc/escenic/ece-search1.conf.tmpl b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/etc/escenic/ece-search1.conf.tmpl
index 526b9759..7047b832 100644
--- a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/etc/escenic/ece-search1.conf.tmpl
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/etc/escenic/ece-search1.conf.tmpl
@@ -1,7 +1,7 @@
 tomcat_base=\"/opt/tomcat-search1\"
 tomcat_home=\"/opt/tomcat\"
 appserver_port=\"8180\"
-deploy_webapp_white_list=\"solr indexer-webapp\"
+deploy_webapp_white_list=\"solr indexer-webapp analysis-logger analysis-qs analysis-reports\"
 
 #########################################################################
 # JVM related (the Java Virtual Machine)
@@ -24,8 +24,8 @@ max_permgen_size=64m
 
 enable_remote_debugging=0
 
-builder_http_user=$FAI_BUILDER_HTTP_USER
-builder_http_password=$FAI_BUILDER_HTTP_PASSWORD
+builder_http_user=$builder_http_user
+builder_http_password=$builder_http_password
 
 #########################################################################
 # Settings related to the JVM garbage collection, don't touch these if
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/etc/issue.template.tmpl b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/etc/issue.template.tmpl
index 386b04de..f0b27990 100644
--- a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/etc/issue.template.tmpl
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/etc/issue.template.tmpl
@@ -1,8 +1,8 @@
-Welcome to the $HOOKS_PROJECT_NAME development environment.
+Welcome to the $project_name development environment.
 
 My IP address when accessing the internet: \$(curl -s ifconfig.me)
 My local eth0 address: \$(/usr/local/bin/get-ip-address eth0)
 My local eth1 address: \$(/usr/local/bin/get-ip-address eth1)
 
-Log in as the \"escenic\" user (password: $HOOKS_ESCENIC_USER_PASSWORD)
+Log in as the \"escenic\" user (password: $escenic_user_password)
 Log in as the \"top\" user (no password) for \"escenic top\"
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/opt/tomcat-engine1/conf/tomcat-users.xml.tmpl b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/opt/tomcat-engine1/conf/tomcat-users.xml.tmpl
index f492d95b..366d7125 100644
--- a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/opt/tomcat-engine1/conf/tomcat-users.xml.tmpl
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/opt/tomcat-engine1/conf/tomcat-users.xml.tmpl
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <tomcat-users>
   <role rolename=\"manager\"/>
-  <user username=\"$HOOKS_TOMCAT_MANAGER_USER\" password=\"$HOOKS_TOMCAT_MANAGER_PASSWORD\" roles=\"tomcat,manager\"/>
+  <user username=\"$tomcat_manager_user\" password=\"$tomcat_manager_password\" roles=\"tomcat,manager\"/>
 </tomcat-users>
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/opt/tomcat-search1/conf/tomcat-users.xml.tmpl b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/opt/tomcat-search1/conf/tomcat-users.xml.tmpl
index f492d95b..366d7125 100644
--- a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/opt/tomcat-search1/conf/tomcat-users.xml.tmpl
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/opt/tomcat-search1/conf/tomcat-users.xml.tmpl
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <tomcat-users>
   <role rolename=\"manager\"/>
-  <user username=\"$HOOKS_TOMCAT_MANAGER_USER\" password=\"$HOOKS_TOMCAT_MANAGER_PASSWORD\" roles=\"tomcat,manager\"/>
+  <user username=\"$tomcat_manager_user\" password=\"$tomcat_manager_password\" roles=\"tomcat,manager\"/>
 </tomcat-users>

From fed9b1a7a607747fe77f1b4450341325bd8d8844 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Fri, 18 Jan 2013 16:24:58 +0100
Subject: [PATCH 1932/2585] - escenic-content-engine-installer's postinst
 script now runs mandb

---
 .../debian/escenic-content-engine-installer/postinst           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/package-scripts/debian/escenic-content-engine-installer/postinst b/usr/share/escenic/package-scripts/debian/escenic-content-engine-installer/postinst
index 878501ee..1c3a5dad 100755
--- a/usr/share/escenic/package-scripts/debian/escenic-content-engine-installer/postinst
+++ b/usr/share/escenic/package-scripts/debian/escenic-content-engine-installer/postinst
@@ -2,7 +2,8 @@
 # set -e
 
 chmod +x /usr/sbin/ece-install
-
+echo "Updating mandb ..."
+mandb -q
 cat <<EOF
 Thank you for installing ece-install. This is currently un-supported
 software as it's undergoing heavy development. Be sure to check out

From cece348cbe912039f697f1a69f0eaabb71f7a3d2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 21 Jan 2013 14:00:32 +0100
Subject: [PATCH 1933/2585] - fix to http-and-ftp::download_latest_files when
 running with   proxies.

---
 .../ece-scripts/ece-import.d/http-and-ftp.sh       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh b/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh
index 7b93fec5..1612823a 100644
--- a/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh
+++ b/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh
@@ -19,10 +19,16 @@ function download_latest_files() {
   # common-io::download_uri_target_to_dir respects.
   wget_opts="${user_and_password} ${wget_opts}"
 
+  # the the_http_proxy comes from the parameter passed to ece-import,
+  # with --http-proxy. If it's not set, http_proxy will be exported to
+  # an empty string here, which in effect will disable the HTTP proxy
+  # setting in the shell.
+  export http_proxy=${the_http_proxy}
+
   # long sed from
   # http://stackoverflow.com/questions/1881237/easiest-way-to-extract-the-urls-from-an-html-page-using-sed-or-awk-only
   local list_of_files=$(
-    $(get_proxy_settings_if_applicable) wget $user_and_password \
+    wget $user_and_password \
       --quiet \
       --output-document \
       - $uri | \
@@ -37,12 +43,6 @@ function download_latest_files() {
   download_files_if_desired $list_of_files
 }
 
-function get_proxy_settings_if_applicable() {
-  if [ -n "${the_http_proxy}" ]; then
-    echo http_proxy=${the_http_proxy}
-  fi
-}
-
 ## Will only download files which are newer than max_file_age and
 ## which haven't been downloaded before.
 ##

From 2d2b03de97051196b71b84b321e17a656302c520 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 21 Jan 2013 14:01:58 +0100
Subject: [PATCH 1934/2585] - create-packages is now seriously hardened with
 the use of   command-bashing and friends using run wrappers. It also gets 
 proper   logging as a bonus.

- started to make the man creation more generic
---
 .../escenic/package-scripts/create-packages   | 287 ++++++++++--------
 1 file changed, 165 insertions(+), 122 deletions(-)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index dcf67f43..9f3b9655 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -10,7 +10,6 @@ package_name=escenic-content-engine-installer
 package_version=$(date +%Y-%m-%d.%H%M%S)
 default_maintainer_name="Torstein Krause Johansen"
 default_maintainer_email=tkj@vizrt.com
-wget_opts="--continue --inet4-only --quiet"
 log=$HOME/.$(basename $0).log
 
 function clean_up() {
@@ -75,169 +74,176 @@ function create_target_directory() {
   fi
 
   debian_dir=$target_dir/DEBIAN
-  mkdir -p $debian_dir
-  cp debian/${package_name}/* $debian_dir
+  make_dir $debian_dir
+  run cp debian/${package_name}/* $debian_dir
 }
 
-## $1 :: the org file from which to generate man pages.
+## $1 :: the directory that holds the org files, from which to
+## generate man pages.
+
 ## $2 :: target file of then man page (before gzip-ed)
 function create_man_pages() {
-  local org_file=$1
-  local target_man=$2
-  echo "Converting" $(basename $org_file) to "man ..."
-  emacs --batch \
-    --load emacs/org-export-setup.el \
-    --file ${org_file} \
-    --funcall org-e-man-export-to-man 2&>>$log
-
-  local dot_man_file=$(dirname $org_file)/$(basename $org_file .org).man
-  if [ ! -e $dot_man_file ]; then
-    echo "Man generation failed, see ${log} and run" \
-      "[ bash -x" $(basename $0) "] from the command prompt to figure out why."
+  if [ ! -d $1 ]; then
     return
   fi
 
-  mkdir -p $(dirname ${target_man})
-  mv ${dot_man_file} ${target_man}
-  gzip ${target_man}
+  for org_file in $(find $1 -name "*-guide.org"); do
+    local org_file=$1
+    local target_man=$2
+    print_and_log "Converting" $(basename $org_file) to "man ..."
+    run emacs --batch \
+      --load emacs/org-export-setup.el \
+      --file ${org_file} \
+      --funcall org-e-man-export-to-man
+
+    local dot_man_file=$(dirname $org_file)/$(basename $org_file .org).man
+    if [ ! -e $dot_man_file ]; then
+      print_and_log "Man generation failed, see ${log} and run" \
+        "[ bash -x" $(basename $0) "] from the command prompt to figure out why."
+      return
+    fi
+
+    make_dir $(dirname ${target_man})
+    run mv ${dot_man_file} ${target_man}
+    run gzip ${target_man}
+  done
 }
 
 function set_up_escenic-content-engine-installer() {
-  mkdir -p $target_dir/{etc,usr,/etc/default}
-  mkdir -p $target_dir/usr/{bin,sbin,share/doc}
-  mkdir -p $target_dir/usr/share/doc/escenic/examples
-  mkdir -p $target_dir/usr/share/escenic/ece-scripts
-  mkdir -p $target_dir/etc/bash_completion.d
+  make_dir $target_dir/{etc,usr,/etc/default}
+  make_dir $target_dir/usr/{bin,sbin,share/doc}
+  make_dir $target_dir/usr/share/doc/escenic/examples
+  make_dir $target_dir/usr/share/escenic/ece-scripts
+  make_dir $target_dir/etc/bash_completion.d
 
-  cp ../../../../etc/bash_completion.d/ece-install \
+  run cp ../../../../etc/bash_completion.d/ece-install \
     $target_dir/etc/bash_completion.d/
-  cp -r ../../../sbin/ece-install $target_dir/usr/sbin/
-  cp -r ../../escenic/ece-scripts/ece-install.d/ \
+  run cp -r ../../../sbin/ece-install $target_dir/usr/sbin/
+  run cp -r ../../escenic/ece-scripts/ece-install.d/ \
     $target_dir/usr/share/escenic/ece-scripts/
-  cp -r ../../doc/escenic/ece-install-guide.org \
+  run cp -r ../../doc/escenic/ece-install-guide.org \
     $target_dir/usr/share/doc/escenic
-  cp -r ../../doc/escenic/examples/ece-install-*.conf \
+  run cp -r ../../doc/escenic/examples/ece-install-*.conf \
     $target_dir/usr/share/doc/escenic/examples/
-
-  create_man_pages ../../doc/escenic/ece-install-guide.org \
-    $target_dir/usr/share/man/man1/ece-install.1
 }
 
 function set_up_escenic-build-scripts() {
-  mkdir -p $target_dir/usr/bin
-  cp ../build-scripts/ece-build $target_dir/usr/bin/ece-build
-  cp ../build-scripts/ece-builder $target_dir/usr/bin/ece-builder
+  make_dir $target_dir/usr/bin
+  run cp ../build-scripts/ece-build $target_dir/usr/bin/ece-build
+  run cp ../build-scripts/ece-builder $target_dir/usr/bin/ece-builder
 }
 
 function set_up_escenic-content-engine-scripts() {
   local doc_dir=$target_dir/usr/share/doc/escenic/escenic-content-engine-scripts
-  mkdir -p $target_dir/etc/bash_completion.d
-  mkdir -p $target_dir/etc/cron.daily/
-  mkdir -p $target_dir/etc/init.d
-  mkdir -p $doc_dir
-  mkdir -p $target_dir/usr/share/escenic/ece-scripts
-  mkdir -p $target_dir/usr/{bin,sbin,share/doc}
-  mkdir -p $target_dir/{etc,usr,/etc/default}
+  make_dir $target_dir/etc/bash_completion.d
+  make_dir $target_dir/etc/cron.daily/
+  make_dir $target_dir/etc/init.d
+  make_dir $doc_dir
+  make_dir $target_dir/usr/share/escenic/ece-scripts
+  make_dir $target_dir/usr/{bin,sbin,share/doc}
+  make_dir $target_dir/{etc,usr,/etc/default}
 
   # bin
   local bin_list='ece ece-import'
   for el in $bin_list; do
-    cp -r ../../../bin/$el $target_dir/usr/bin/
-    cp -r ../../escenic/ece-scripts/${el}.d/ \
+    run cp -r ../../../bin/$el $target_dir/usr/bin/
+    run cp -r ../../escenic/ece-scripts/${el}.d/ \
       $target_dir/usr/share/escenic/ece-scripts/
   done
 
   # sbin
-  cp ../../../sbin/ece-deploy $target_dir/usr/sbin/
+  run cp ../../../sbin/ece-deploy $target_dir/usr/sbin/
 
   # conf
-  cp ../../../../etc/bash_completion.d/{ece,ece-import,ece-deploy} \
+  run cp ../../../../etc/bash_completion.d/{ece,ece-import,ece-deploy} \
     $target_dir/etc/bash_completion.d
   # we don't include /etc/default/ece as this file often is also
   # included in the conf packages.
-  # cp -r ../../../../etc/default/ece $target_dir/etc/default/
-  cp -r ../../../../etc/init.d/ece $target_dir/etc/init.d/
+  # run cp -r ../../../../etc/default/ece $target_dir/etc/default/
+  run cp -r ../../../../etc/init.d/ece $target_dir/etc/init.d/
 
   # doc
-  cp ../../doc/escenic/ece-guide.org $doc_dir/
+  run cp ../../doc/escenic/ece-guide.org $doc_dir/
   local examples_dir=$doc_dir/examples/etc/default
-  mkdir -p $examples_dir
-  cp ../../../../etc/default/ece $examples_dir
-  cp ../../../../etc/escenic/ece.conf $doc_dir/examples/etc
+  make_dir $examples_dir
+  run cp ../../../../etc/default/ece $examples_dir
+  run cp ../../../../etc/escenic/ece.conf $doc_dir/examples/etc
 
   # cron
-  cp -r ../../../../etc/cron.daily/remove-old-escenic-log-files \
+  run cp -r ../../../../etc/cron.daily/remove-old-escenic-log-files \
     $target_dir/etc/cron.daily/
 
   # hugin
-  cp -r ../../../../usr/share/hugin \
+  run cp -r ../../../../usr/share/hugin \
     $target_dir/usr/share/
 }
 
 function set_up_vosa() {
-  mkdir -p $target_dir/{etc,usr,/etc/default}
-  mkdir -p $target_dir/usr/{bin,sbin,share/doc}
-  mkdir -p $target_dir/usr/share/doc/vosa
-  mkdir -p $target_dir/etc/bash_completion.d
-  mkdir -p $target_dir/etc/init.d
-
-  cp -r ../../../bin/vosa $target_dir/usr/bin/
-  cp -r ../../../bin/vosa-push $target_dir/usr/bin/
-  cp -r ../../vizrt/ $target_dir/usr/share/
-  cp -r ../../doc/vizrt/*.org $target_dir/usr/share/doc/vosa/
-  cp -r ../../../../etc/bash_completion.d/vosa \
+  make_dir $target_dir/{etc,usr,/etc/default}
+  make_dir $target_dir/usr/{bin,sbin,share/doc}
+  make_dir $target_dir/usr/share/doc/vosa
+  make_dir $target_dir/etc/bash_completion.d
+  make_dir $target_dir/etc/init.d
+
+  run cp -r ../../../bin/vosa $target_dir/usr/bin/
+  run cp -r ../../../bin/vosa-push $target_dir/usr/bin/
+  run cp -r ../../vizrt/ $target_dir/usr/share/
+  run cp -r ../../doc/vizrt/*.org $target_dir/usr/share/doc/vosa/
+  run cp -r ../../../../etc/bash_completion.d/vosa \
     $target_dir/etc/bash_completion.d/
-  cp -r ../../../../etc/init.d/vosa $target_dir/etc/init.d/
+  run cp -r ../../../../etc/init.d/vosa $target_dir/etc/init.d/
 }
 
 function set_up_escenic-common-scripts() {
-  mkdir -p $target_dir/{etc,usr,/etc/default}
-  mkdir -p $target_dir/usr/{bin,sbin,share/doc}
-  mkdir -p $target_dir/usr/share/doc/escenic
-  mkdir -p $target_dir/usr/share/escenic/ece-scripts
+  make_dir $target_dir/{etc,usr,/etc/default}
+  make_dir $target_dir/usr/{bin,sbin,share/doc}
+  make_dir $target_dir/usr/share/doc/escenic
+  make_dir $target_dir/usr/share/escenic/ece-scripts
 
   # system-info is useful for all packages, hence goes to
   # escenic-common-scripts.
-  cp -r ../../../bin/system-info $target_dir/usr/bin/
-  cp -r ../../../bin/generate-changelog $target_dir/usr/bin/
-  cp -r ../../escenic/ece-scripts/system-info.d \
+  run cp -r ../../../bin/system-info $target_dir/usr/bin/
+  run cp -r ../../../bin/generate-changelog $target_dir/usr/bin/
+  run cp -r ../../escenic/ece-scripts/system-info.d \
     $target_dir/usr/share/escenic/ece-scripts/
-  cp ../../../../etc/default/system-info $target_dir/etc/default/
-  cp -r ../../doc/escenic/system-info-guide.org \
+  run cp ../../../../etc/default/system-info $target_dir/etc/default/
+  run cp -r ../../doc/escenic/system-info-guide.org \
     $target_dir/usr/share/doc/escenic
 
   # both the installer and ece-scripts use the common scripts and
   # web resources.
-  cp -r ../../escenic/ece-scripts/common* \
+  run cp -r ../../escenic/ece-scripts/common* \
     $target_dir/usr/share/escenic/ece-scripts/
-  cp -r ../../escenic/ece-scripts/*.css \
+  run cp -r ../../escenic/ece-scripts/*.css \
     $target_dir/usr/share/escenic/ece-scripts/
-  cp -r ../../escenic/ece-scripts/*.html \
+  run cp -r ../../escenic/ece-scripts/*.html \
     $target_dir/usr/share/escenic/ece-scripts/
 
   # everyone can need some network syncing
-  cp -r ../../../bin/sync-network-drive $target_dir/usr/bin/
+  run cp -r ../../../bin/sync-network-drive $target_dir/usr/bin/
 }
 
 function set_up_escenic-check-mk-plugins() {
-  mkdir -p $target_dir/usr/lib/check_mk_agent/local
-  cp -r ../../../lib/check_mk_agent/local/* \
+  make_dir $target_dir/usr/lib/check_mk_agent/local
+  run cp -r ../../../lib/check_mk_agent/local/* \
     $target_dir/usr/lib/check_mk_agent/local/
 }
 
 function set_up_escenic-munin-plugins() {
-  mkdir -p $target_dir/usr/share/munin/plugins
+  make_dir $target_dir/usr/share/munin/plugins
   local doc_dir=$target_dir/usr/share/doc/escenic/escenic-munin-plugin
-  mkdir -p $doc_dir
+  make_dir $doc_dir
 
   local dir=$(mktemp -d)
   (
+    run download_uri_target_to_dir \
+      https://github.com/mogsie/escenic-munin/tarball/master \
+      $dir
     cd $dir
-    wget $wget_opts https://github.com/mogsie/escenic-munin/tarball/master
     tar xzf master
-    cp $dir/mogsie-escenic-munin*/*_ $target_dir/usr/share/munin/plugins
-    cp $dir/mogsie-escenic-munin*/README.md $doc_dir
-    cp $dir/mogsie-escenic-munin*/site/* $doc_dir
+    run cp $dir/mogsie-escenic-munin*/*_ $target_dir/usr/share/munin/plugins
+    run cp $dir/mogsie-escenic-munin*/README.md $doc_dir
+    run cp $dir/mogsie-escenic-munin*/site/* $doc_dir
 
     chmod 755 $file $target_dir/usr/share/munin/plugins
   )
@@ -245,45 +251,49 @@ function set_up_escenic-munin-plugins() {
 }
 
 function set_up_hugin-node() {
-  mkdir -p $target_dir/etc/hugin/{hugin.often,hugin.hourly,hugin.daily,hugin.weekly}
-  mkdir -p $target_dir/etc/{cron.d,sudoers.d}
-  mkdir -p $target_dir/usr/{bin,share/doc/hugin,share/hugin/plugins,share/hugin/helpers}
-  mkdir -p $target_dir/var/lib/hugin
+  make_dir $target_dir/etc/hugin/{hugin.often,hugin.hourly,hugin.daily,hugin.weekly}
+  make_dir $target_dir/etc/{cron.d,sudoers.d}
+  make_dir $target_dir/usr/{bin,share/doc/hugin,share/hugin/plugins,share/hugin/helpers}
+  make_dir $target_dir/var/lib/hugin
 
   local dir=$(mktemp -d)
   (
+    download_uri_target_to_dir \
+      https://bitbucket.org/mogsie/hugin/get/default.tar.gz \
+      $dir
     cd $dir
-    wget $wget_opts https://bitbucket.org/mogsie/hugin/get/default.tar.gz
-    tar xzf default.tar.gz
-    cp $dir/mogsie-hugin-*/bin/* $target_dir/usr/bin
-    cp $dir/mogsie-hugin-*/helpers/* $target_dir/usr/share/hugin/helpers/
-    cp $dir/mogsie-hugin-*/etc/* $target_dir/etc/hugin/
-    cp $dir/mogsie-hugin-*/sudoers/* $target_dir/etc/sudoers.d/
-    cp $dir/mogsie-hugin-*/cron/* $target_dir/etc/cron.d/
-    cp $dir/mogsie-hugin-*/checks/* $target_dir/usr/share/hugin/plugins/
-    cp $dir/mogsie-hugin-*/*.md $target_dir/usr/share/doc/hugin
-    cp $dir/mogsie-hugin-*/LICENSE $target_dir/usr/share/doc/hugin
+    run tar xzf default.tar.gz
+    run cp $dir/mogsie-hugin-*/bin/* $target_dir/usr/bin
+    run cp $dir/mogsie-hugin-*/helpers/* $target_dir/usr/share/hugin/helpers/
+    run cp $dir/mogsie-hugin-*/etc/* $target_dir/etc/hugin/
+    run cp $dir/mogsie-hugin-*/sudoers/* $target_dir/etc/sudoers.d/
+    run cp $dir/mogsie-hugin-*/cron/* $target_dir/etc/cron.d/
+    run cp $dir/mogsie-hugin-*/checks/* $target_dir/usr/share/hugin/plugins/
+    run cp $dir/mogsie-hugin-*/*.md $target_dir/usr/share/doc/hugin
+    run cp $dir/mogsie-hugin-*/LICENSE $target_dir/usr/share/doc/hugin
 
     # chmod 755 $file $target_dir/usr/bin/*
   )
-  rm -rf $dir
+  run rm -rf $dir
 }
 
 function set_up_spore() {
-  mkdir -p $target_dir/usr/{bin,sbin} \
-           $target_dir/usr/share/doc/spore
+  make_dir $target_dir/usr/{bin,sbin} \
+    $target_dir/usr/share/doc/spore
 
   local dir=$(mktemp -d)
   (
+    download_uri_target_to_dir \
+      https://github.com/vizrt/spore/archive/master.tar.gz \
+      $dir
     cd $dir
-    wget $wget_opts https://github.com/vizrt/spore/archive/master.tar.gz
-    tar xzf master.tar.gz
-    cp $dir/spore-master/bin/* $target_dir/usr/bin
-    cp $dir/spore-master/sbin/* $target_dir/usr/sbin
-    cp $dir/spore-master/README.md $target_dir/usr/share/doc/spore
-    cp -r $dir/spore-master/examples $target_dir/usr/share/doc/spore/examples
+    run tar xzf master.tar.gz
+    run cp $dir/spore-master/bin/* $target_dir/usr/bin
+    run cp $dir/spore-master/sbin/* $target_dir/usr/sbin
+    run cp $dir/spore-master/README.md $target_dir/usr/share/doc/spore
+    run cp -r $dir/spore-master/examples $target_dir/usr/share/doc/spore/examples
   )
-  rm -rf $dir
+  run rm -rf $dir
 }
 
 function get_name() {
@@ -295,9 +305,9 @@ function get_email() {
 }
 
 function create_packages() {
-  sed -i "s#VERSION#${package_version}#g" $debian_dir/control
-  sed -i "s#MAINTAINER_NAME#$(get_name)#g" $debian_dir/control
-  sed -i "s#MAINTAINER_EMAIL#$(get_email)#g" $debian_dir/control
+  run sed -i "s#VERSION#${package_version}#g" $debian_dir/control
+  run sed -i "s#MAINTAINER_NAME#$(get_name)#g" $debian_dir/control
+  run sed -i "s#MAINTAINER_EMAIL#$(get_email)#g" $debian_dir/control
   find ${target_dir}/usr/{bin,sbin}/ -type f 2>/dev/null | while read f; do
     sed -i "s#^ece_scripts_version=.*#ece_scripts_version=${package_version}#g" \
       $f
@@ -305,11 +315,11 @@ function create_packages() {
 
   # fix permissions
   if [ -e $debian_dir/postinst ]; then
-    chmod 755 $debian_dir/postinst
+    run chmod 755 $debian_dir/postinst
   fi
 
   if [ ! -x /usr/bin/dpkg-deb ]; then
-    echo "You must have dpkg-deb installed :-("
+    print_and_log "You must have dpkg-deb installed :-("
     exit 1
   fi
 
@@ -320,23 +330,56 @@ function create_packages() {
   if [[ -x /usr/bin/alien && -x /usr/bin/fakeroot ]]; then
     (
       cd $target_dir
-      fakeroot alien --keep-version --to-rpm --scripts \
-        ${package_name}-${package_version}.deb \
-        2>&1 > /dev/null
+      run fakeroot alien --keep-version --to-rpm --scripts \
+        ${package_name}-${package_version}.deb
     )
   else
-    echo "You must have 'alien' and 'fakeroot' installed to create RPMs"
+    print_and_log "You must have 'alien' and 'fakeroot' installed to create RPMs"
     exit 1
   fi
 }
 
 function list_packages() {
-  echo "Sir, the packages are now ready:"
-  echo $target_dir/*.{deb,rpm}
+  print_and_log "Sir, the packages are now ready:" \
+    $target_dir/*.{deb,rpm}
+}
+
+function bootstrap_thyself() {
+  # first, try to be nice, then check the standard location
+  local dir=$(dirname $0)/../share/escenic/ece-scripts
+  if [ ! -d $dir  ]; then
+    dir=/usr/share/escenic/ece-scripts
+  fi
+
+  local common_libraries="
+    common-bashing.sh
+    common-io.sh
+    common-os.sh
+    common-ece.sh
+  "
+
+  for el in $common_libraries; do
+    source $dir/$el 2>/dev/null || {
+      echo "$(basename $0): Could not load the library $el," \
+        "and I can't live without it :-(" | fmt
+      exit 1
+    }
+  done
+
+  create_pid
+  create_lock
+
+  # hooks for when the scirpt exits cleanly and when a user or someone
+  # kills the process
+  trap common_bashing_exit_hook EXIT
+  trap common_bashing_user_cancelled_hook SIGINT SIGHUP
+
 }
 
+bootstrap_thyself
 clean_up
 get_user_options $@
 create_target_directory
+create_man_pages
 create_packages
 list_packages

From 623165a34e36c828c9c8a4d4e5fc3a01c0030889 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 21 Jan 2013 14:08:38 +0100
Subject: [PATCH 1935/2585] - fixed bootstrap method in create-packages so that
 it finds the   common libraries

---
 usr/share/escenic/package-scripts/create-packages | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 9f3b9655..f5663415 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -346,7 +346,7 @@ function list_packages() {
 
 function bootstrap_thyself() {
   # first, try to be nice, then check the standard location
-  local dir=$(dirname $0)/../share/escenic/ece-scripts
+  local dir=$(dirname $0)/../ece-scripts
   if [ ! -d $dir  ]; then
     dir=/usr/share/escenic/ece-scripts
   fi

From 0212c351469c3e4a9be41ecd85e6b3bcfe8fa3ca Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 21 Jan 2013 14:17:07 +0100
Subject: [PATCH 1936/2585] - fix in create-packages: override the default pid
 file location so    that create-packages can be run as an unprivileged user

---
 usr/share/escenic/package-scripts/create-packages | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index f5663415..ff21b198 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -366,8 +366,10 @@ function bootstrap_thyself() {
     }
   done
 
+  # override the default pid file location so that create-packages can
+  # be run as an unprivileged user
+  pid_file=$HOME/.$(basename $0).pid
   create_pid
-  create_lock
 
   # hooks for when the scirpt exits cleanly and when a user or someone
   # kills the process

From 33790fb725df49b7a7d7b96756dad5f6a125271b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 21 Jan 2013 14:48:12 +0100
Subject: [PATCH 1937/2585] - made the generation of man pages more generic.
 Now, if the   set_up_<package> method copies out a <command>-guide.org to the
   usr/share/doc tree under target_dir, man pages will automatically be  
 generated by the create-packages command.

  Once the man pages have successfully bee generated, the org file is
  removed from the package. If the Man page creation fails, this is
  logged as well as communicated to the user and the org file is
  included in the package instead. This way, the DEB/RPM packages
  always includes the man pages, even if the build environment for the
  packages don't support man page generation (which in turns depend on
  Emacs, a recent version of Org, as well as some contributed, Org
  exporter.

- the user guides for ece-deploy and ece-import are not included in
  the escenic-content-engine-scripts package.

- the generate-changelog guide is now included in the
  escenic-common-scripts package.
---
 .../escenic/package-scripts/create-packages   | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index ff21b198..bdb1f012 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -83,29 +83,31 @@ function create_target_directory() {
 
 ## $2 :: target file of then man page (before gzip-ed)
 function create_man_pages() {
-  if [ ! -d $1 ]; then
-    return
-  fi
+  for org_file in $(find $target_dir -name "*-guide.org"); do
+    local target_man=$(basename ${org_file})
+    target_man=${target_dir}/usr/share/man/man1/${target_man%-guide.org}.1
+
+    print_and_log "Generating man pages from" $(basename ${org_file}) "..."
 
-  for org_file in $(find $1 -name "*-guide.org"); do
-    local org_file=$1
-    local target_man=$2
-    print_and_log "Converting" $(basename $org_file) to "man ..."
-    run emacs --batch \
+    emacs --batch \
       --load emacs/org-export-setup.el \
       --file ${org_file} \
-      --funcall org-e-man-export-to-man
+      --funcall org-e-man-export-to-man \
+      >> $log \
+      2>> $log
 
     local dot_man_file=$(dirname $org_file)/$(basename $org_file .org).man
     if [ ! -e $dot_man_file ]; then
-      print_and_log "Man generation failed, see ${log} and run" \
+      print_and_log "Man generation $(red failed), see ${log} and run" \
         "[ bash -x" $(basename $0) "] from the command prompt to figure out why."
-      return
+      continue
     fi
 
     make_dir $(dirname ${target_man})
     run mv ${dot_man_file} ${target_man}
     run gzip ${target_man}
+
+    run rm $org_file
   done
 }
 
@@ -164,6 +166,8 @@ function set_up_escenic-content-engine-scripts() {
 
   # doc
   run cp ../../doc/escenic/ece-guide.org $doc_dir/
+  run cp ../../doc/escenic/ece-deploy-guide.org $doc_dir/
+  run cp ../../doc/escenic/ece-import-guide.org $doc_dir/
   local examples_dir=$doc_dir/examples/etc/default
   make_dir $examples_dir
   run cp ../../../../etc/default/ece $examples_dir
@@ -207,7 +211,9 @@ function set_up_escenic-common-scripts() {
   run cp -r ../../escenic/ece-scripts/system-info.d \
     $target_dir/usr/share/escenic/ece-scripts/
   run cp ../../../../etc/default/system-info $target_dir/etc/default/
-  run cp -r ../../doc/escenic/system-info-guide.org \
+  run cp ../../doc/escenic/system-info-guide.org \
+    $target_dir/usr/share/doc/escenic
+  run cp ../../doc/escenic/generate-changelog-guide.org \
     $target_dir/usr/share/doc/escenic
 
   # both the installer and ece-scripts use the common scripts and

From 78c0bb224855dff7a62f1eeed6b798178d7f2a82 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 21 Jan 2013 14:57:39 +0100
Subject: [PATCH 1938/2585] - made the method create_target_directory
 completely dynamic to make   it easy to add more packages.

  Fails fast if the package name doesn't exist.
---
 .../escenic/package-scripts/create-packages   | 24 ++++---------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index bdb1f012..e9447d68 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -53,25 +53,11 @@ function get_user_options() {
 }
 
 function create_target_directory() {
-  if [[ $package_name == "escenic-content-engine-installer" ]]; then
-    set_up_escenic-content-engine-installer
-  elif [[ $package_name == "escenic-content-engine-scripts" ]]; then
-    set_up_escenic-content-engine-scripts
-  elif [[ $package_name == "vosa" ]]; then
-    set_up_vosa
-  elif [[ $package_name == "escenic-build-scripts" ]]; then
-    set_up_escenic-build-scripts
-  elif [[ $package_name == "escenic-common-scripts" ]]; then
-    set_up_escenic-common-scripts
-  elif [[ $package_name == "escenic-munin-plugins" ]]; then
-    set_up_escenic-munin-plugins
-  elif [[ $package_name == "escenic-check-mk-plugins" ]]; then
-    set_up_escenic-check-mk-plugins
-  elif [[ $package_name == "hugin-node" ]]; then
-    set_up_hugin-node
-  elif [[ $package_name == "spore" ]]; then
-    set_up_spore
-  fi
+  print_and_log "Creating package" $package_name "..."
+  set_up_${package_name} 2>/dev/null|| {
+    print_and_log "I don't know how to create package" $package_name ":-("
+    exit 1
+  }
 
   debian_dir=$target_dir/DEBIAN
   make_dir $debian_dir

From 1426134292d792519987dcd6c103b1dcbd5e2996 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 21 Jan 2013 15:03:14 +0100
Subject: [PATCH 1939/2585] - now updates the man DB in the postinst hook.

---
 .../debian/escenic-content-engine-scripts/postinst           | 3 ++-
 usr/share/escenic/package-scripts/debian/vosa/postinst       | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/postinst b/usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/postinst
index cc6f2bb3..cfeb05f1 100755
--- a/usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/postinst
+++ b/usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/postinst
@@ -2,6 +2,7 @@
 # set -e
 
 chmod +x /usr/bin/{ece,system-info}
+echo "Updating mandb ..."
+mandb -q
 
 exit 0
-
diff --git a/usr/share/escenic/package-scripts/debian/vosa/postinst b/usr/share/escenic/package-scripts/debian/vosa/postinst
index 13b844e2..e20420aa 100644
--- a/usr/share/escenic/package-scripts/debian/vosa/postinst
+++ b/usr/share/escenic/package-scripts/debian/vosa/postinst
@@ -2,6 +2,8 @@
 # set -e
 
 chmod +x /usr/bin/vosa
+echo "Updating mandb ..."
+mandb -q
 
 cat <<EOF
 Thank you for installing the vosa package. This is currently
@@ -10,8 +12,7 @@ issues to https://github.com/vizrt/ece-scripts/issues
 
 Have fun!
 
--Vizrt Online 
+-Vizrt Online
 EOF
 
 exit 0
-

From 50d14f664eaed28e862aff2f04c464f2d2d1a86b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 21 Jan 2013 15:13:12 +0100
Subject: [PATCH 1940/2585] - dpkg is so smart: it detects that there is a man
 page in the DEB and   runs mandb if you haven't defined it in your postinst
 script. If you   have defined it, dpkg will not run man db for you.

  Impressive work by Debian!
---
 .../debian/escenic-content-engine-installer/postinst           | 2 --
 .../debian/escenic-content-engine-scripts/postinst             | 3 ---
 usr/share/escenic/package-scripts/debian/vosa/postinst         | 3 ---
 3 files changed, 8 deletions(-)

diff --git a/usr/share/escenic/package-scripts/debian/escenic-content-engine-installer/postinst b/usr/share/escenic/package-scripts/debian/escenic-content-engine-installer/postinst
index 1c3a5dad..88833e16 100755
--- a/usr/share/escenic/package-scripts/debian/escenic-content-engine-installer/postinst
+++ b/usr/share/escenic/package-scripts/debian/escenic-content-engine-installer/postinst
@@ -2,8 +2,6 @@
 # set -e
 
 chmod +x /usr/sbin/ece-install
-echo "Updating mandb ..."
-mandb -q
 cat <<EOF
 Thank you for installing ece-install. This is currently un-supported
 software as it's undergoing heavy development. Be sure to check out
diff --git a/usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/postinst b/usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/postinst
index cfeb05f1..09843a73 100755
--- a/usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/postinst
+++ b/usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/postinst
@@ -2,7 +2,4 @@
 # set -e
 
 chmod +x /usr/bin/{ece,system-info}
-echo "Updating mandb ..."
-mandb -q
-
 exit 0
diff --git a/usr/share/escenic/package-scripts/debian/vosa/postinst b/usr/share/escenic/package-scripts/debian/vosa/postinst
index e20420aa..fdddba31 100644
--- a/usr/share/escenic/package-scripts/debian/vosa/postinst
+++ b/usr/share/escenic/package-scripts/debian/vosa/postinst
@@ -2,9 +2,6 @@
 # set -e
 
 chmod +x /usr/bin/vosa
-echo "Updating mandb ..."
-mandb -q
-
 cat <<EOF
 Thank you for installing the vosa package. This is currently
 un-supported software as it's undergoing heavy development. Report any

From 19736539664fe0f246a39eecdf6ca3db7651cdae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Sat, 19 Jan 2013 00:08:11 +0100
Subject: [PATCH 1941/2585] vosa - added ece-dev-image to vosa package

---
 usr/share/escenic/package-scripts/create-packages | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index e9447d68..6dc1619c 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -182,6 +182,10 @@ function set_up_vosa() {
   run cp -r ../../../../etc/bash_completion.d/vosa \
     $target_dir/etc/bash_completion.d/
   run cp -r ../../../../etc/init.d/vosa $target_dir/etc/init.d/
+
+  # dev image script
+  run cp ../build-scripts/ece-dev-image $target_dir/usr/bin/ece-dev-image
+
 }
 
 function set_up_escenic-common-scripts() {

From 2c1c2b7ccc1c66811ed22b73e4a84ebb904d7a72 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 22 Jan 2013 09:22:34 +0100
Subject: [PATCH 1942/2585] - went through the guide and made it render well as
 a man page - added several sections needed for a man page, like NAME,
 SYNOPSIS, - COMMAND, OPTIONS, COPYRIGHT and AUTHOR.

---
 usr/share/doc/vizrt/vosa-guide.org | 95 ++++++++++++++++++++++++------
 1 file changed, 76 insertions(+), 19 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-guide.org b/usr/share/doc/vizrt/vosa-guide.org
index 341008e6..05011e90 100644
--- a/usr/share/doc/vizrt/vosa-guide.org
+++ b/usr/share/doc/vizrt/vosa-guide.org
@@ -1,3 +1,45 @@
+#+TITLE: The VOSA Guide
+#+AUTHOR: Vizrt Online / The SaaS Team
+#+OPTIONS: H:6 num:5 toc:2
+
+* NAME
+vosa - command to manage KVM and Amazon instances that typically form
+a cluster of servers serving one or more Escenic based web sites.
+
+* SYNOPSIS
+vosa [-i instance-dir] [-v uec-version] [-V] [-d] [-h] COMMAND
+
+* OPTIONS
+** -i instance-dir
+Most [[COMMANDS]] require the *-i* parameter to be set. You pass it the
+path to your VM's configuration like this:
+#+BEGIN_SRC sh
+# vosa -i /etc/vizrt/vosa/available.d/vm03 enable
+#+END_SRC
+** -v uec-version
+Let's you specify the UEC version to use
+** -d
+Make *vosa* more verbose. The more *-d* switches you specify, the
+more verbose it gets.
+** -V
+Print the *vosa* version and exit
+** -h
+Print usage help and exit.
+
+* COMMANDS
+** enable
+Enable a specific VM.
+** disable
+Disable a specific VM.
+** install
+Creates a new disk image etc.
+** uninstall
+Removes the disk image etc.
+** start
+Starts (boots) the VM.
+** status
+Tells you about the VM, if it's enabled, running, alive, its uptime.
+
 * What is VOSA?
 
 Vosa is short for Vizrt Online System Administration, a set of tools
@@ -135,7 +177,10 @@ To make vosa usable, you need to initialize it:
 This will create the /etc/vizrt/vosa directory structure, and a
 skeleton of a virtual machine definition.
 
-   : sudo cp -r /etc/vizrt/vosa/skeleton-amazon /etc/vizrt/vosa/available.d/my-first-vosa
+#+BEGIN_SRC sh
+$ sudo cp -r /etc/vizrt/vosa/skeleton-amazon \\
+  /etc/vizrt/vosa/available.d/my-first-vosa
+#+END_SRC
 
 Configure the my-first-vosa/amazon.conf file as you see fit.  This would include:
 
@@ -154,7 +199,7 @@ things it will
 - create 10 tap interfaces (an arbitrary number, really, see below
   for an explanation).
 - create the same number of "tap*.availablenetwork" files in
-  /var/run/vizrt/vosa/ each one signifying the names of the tap
+  */var/run/vizrt/vosa/* each one signifying the names of the tap
   interfaces that can be used.
 
 So without further ado, let's get started.  First of all, we need to
@@ -194,14 +239,16 @@ doing this temporarily (ca 10 seconds) makes the network go
 completely dark, and so shouldn't happen whenever any virtual
 machines are running.
 
-   : for i in $(seq 1 10) ; do
-   :   tap=$(tunctl -b)
-   :   touch /var/run/vizrt/vosa/$tap.availablenetwork
-   :   brctl addif br0 $tap
-   :   ifconfig $tap up 0.0.0.0
-   : done
+#+BEGIN_SRC sh
+for i in $(seq 1 10) ; do
+  tap=$(tunctl -b)
+  touch /var/run/vizrt/vosa/$tap.availablenetwork
+  brctl addif br0 $tap
+  ifconfig $tap up 0.0.0.0
+done
+#+END_SRC
 
-tunctl creates the tap interface, and we create a file with the name
+*tunctl* creates the tap interface, and we create a file with the name
 of the created tap interface in a directory.  This little snippet
 needs to run every time the host machine boots.
 
@@ -218,12 +265,15 @@ in Amazon EC2, and also in a Eucalyptus private cloud.  This means
 that vosa will be able to control Amazon EC2 images in the same way.
 
 Defining a virtual machine means creating two files (boot.conf and
-install.conf) in a directory.  "vosa init" has already created a
+install.conf) in a directory.  *vosa init* has already created a
 documented skeleton which you can customize as you see fit.
 
-   : mkdir /etc/vizrt/vosa/available.d/my-first-vm &&
-   : cp /etc/vizrt/vosa/skeleton-kvm/* /etc/vizrt/vosa/available.d/my-first-vm/
-   : vi /etc/vizrt/vosa/available.d/my-first-vm/*
+#+BEGIN_SRC sh
+mkdir /etc/vizrt/vosa/available.d/my-first-vm && \\
+cp /etc/vizrt/vosa/skeleton-kvm/* \\
+  /etc/vizrt/vosa/available.d/my-first-vm/
+vi /etc/vizrt/vosa/available.d/my-first-vm/*
+#+END_SRC
 
 Note that the name you choose ("my-first-vm") must be a valid
 internet host name with no domain part.  I.e. only lowercase
@@ -250,11 +300,11 @@ To install the machine, just issue the "install" command:
 
    : vosa -i my-first-vm install
 
-This will copy the disk image to /var/lib/vizrt/vosa/images/my-first-vm/
-and put some more files in there (like the SSH private key), and
-finally it will boot up the image and use the UEC's cloud-init
-support to prime the image and execute any post-installation hooks
-you defined.
+This will copy the disk image
+to */var/lib/vizrt/vosa/images/my-first-vm/* and put some more files
+in there (like the SSH private key), and finally it will boot up the
+image and use the UEC's cloud-init support to prime the image and
+execute any post-installation hooks you defined.
 
 The host name (as the machine sees it, at least) will be the same as
 the name of the virtual machine; in this case "my-first-vm"
@@ -278,7 +328,7 @@ To make this possible, vosa supplies a post-install hook. This hook:
   having to sign or auto-sign the puppets, since that is problematic
   when a machine is re-installed)
 - creates vosa post-installation hook to set up a pre-authenticated
-  puppet in /etc/vizrt/vosa/puppet/<puppetmaster-name>-client.sh
+  puppet in */etc/vizrt/vosa/puppet/<puppetmaster-name>-client.sh*
 
 This makes it possible to define more virtual machines that
 automatically dance to the puppet master's tune.
@@ -287,4 +337,11 @@ Making this useful of course means pushing your puppet configuration
 into the puppet master, but that's outside the scope of this
 document.
 
+* COPYRIGHT
+Copyright 2011-2013 Vizrt
+
+Licensed under the Apache License, Version 2.0, see
+https://github.com/vizrt/ece-scripts/COPYING for further details.
 
+* AUTHOR
+Erik Mogsensen

From 3b499e6fdb23e5322ee6d7d7d05c5aa5812ea402 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <ola@builder.(none)>
Date: Tue, 22 Jan 2013 11:02:32 +0100
Subject: [PATCH 1943/2585] ece-dev-image - fixed misspelled package

---
 usr/share/escenic/build-scripts/ece-dev-image | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/ece-dev-image b/usr/share/escenic/build-scripts/ece-dev-image
index 6e7e4f5f..389717b2 100755
--- a/usr/share/escenic/build-scripts/ece-dev-image
+++ b/usr/share/escenic/build-scripts/ece-dev-image
@@ -148,7 +148,7 @@ function verify_configuration
   project_builder=${project_builder-$default_builder}
   ensure_variable_is_set project_builder
   
-  conf_package_deb=${conf_package_deb-http://$project_builder/$project_key/releases/vosa-conf-dev-latest.dev}
+  conf_package_deb=${conf_package_deb-http://$project_builder/$project_key/releases/vosa-conf-dev-latest.deb}
   ensure_variable_is_set conf_package_deb
   
   spore_package=${spore_package-http://$project_builder/$project_key/releases/spore-$project_key-development.tar.gz}

From 072f1205b7ba8659d76f514988faf7e4e54efaf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n=20=28oschoen=40vizrt=2Ecom=29?=
 <oschoen@vizrt.com>
Date: Tue, 22 Jan 2013 11:21:55 +0100
Subject: [PATCH 1944/2585] vosa - visrt repo hook will now do apt-get update

---
 .../skeleton-dev/hooks/post-install-hook-add-vizrt-repo.sh     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-add-vizrt-repo.sh b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-add-vizrt-repo.sh
index fdee1c57..c4c3ef99 100755
--- a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-add-vizrt-repo.sh
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-add-vizrt-repo.sh
@@ -8,4 +8,7 @@ curl -s http://apt.vizrt.com/archive.key | ssh -F $2/ssh.conf guest 'sudo apt-ke
 # add repo to sources list
 echo "deb http://apt.vizrt.com unstable main" | ssh -F $2/ssh.conf guest 'sudo tee > /dev/null /etc/apt/sources.list.d/vizrt.list'
 
+# update package lists
+ssh -F $2/ssh.conf guest 'sudo apt-get update'
+
 echo "--- END : post install hook - add vizrt repo ---"

From 8fa8082a5c5087e759b3b07d432253501f598ac4 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 22 Jan 2013 11:15:11 +0100
Subject: [PATCH 1945/2585] - improved the (man) formatting of the OPTIONS::-t
 <type>   documentation.

---
 usr/share/doc/escenic/ece-guide.org | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/usr/share/doc/escenic/ece-guide.org b/usr/share/doc/escenic/ece-guide.org
index 05e057c1..eeb3d626 100644
--- a/usr/share/doc/escenic/ece-guide.org
+++ b/usr/share/doc/escenic/ece-guide.org
@@ -19,10 +19,16 @@ instances.
 * OPTIONS
 ** -t --type type
 The following types are available:
-- engine: The Escenic Content Engine, this is the default and is the assumed type if none is specified.
-- search: A standalone search indexer and solr instance
-- rmi-hub: The RMI hub responsible for the internal communication between the ECE instances.
-- analysis: The Escenic Analysis Engine also knows as 'Stats'
+- engine :: The Escenic Content Engine, this is the default and is the
+            assumed type if none is specified.
+
+- search :: A standalone search indexer and solr instance
+
+- analysis :: The Escenic Analysis Engine also knows as 'Stats'
+
+- rmi-hub :: The RMI hub responsible for the internal communication
+             between the ECE instances. This is not needed for ECE >=
+             5.3.
 
 ** -i --instance instance
 The type instance, such as editor1, engine1 or search1

From 59f9573e97a7e2e4610d6fd9ed3e0b2041659505 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein.k.johansen@gmail.com>
Date: Tue, 22 Jan 2013 16:37:37 +0100
Subject: [PATCH 1946/2585] - massive re-write of the ece-import guide - added
 several new sections including detailed DESCRIPTION,   BACKGROUND explaining
 implementation motivation and choices, as well   as FILES

---
 usr/share/doc/escenic/ece-import-guide.org | 356 ++++++++++++++++-----
 1 file changed, 273 insertions(+), 83 deletions(-)

diff --git a/usr/share/doc/escenic/ece-import-guide.org b/usr/share/doc/escenic/ece-import-guide.org
index 0a76c3b0..0e78081a 100644
--- a/usr/share/doc/escenic/ece-import-guide.org
+++ b/usr/share/doc/escenic/ece-import-guide.org
@@ -1,28 +1,18 @@
-#+TITLE: ece-import
+#+TITLE: The ece-import Guide
 #+AUTHOR: Vizrt Online / The SaaS Team
 #+OPTIONS: H:6 num:5 toc:2
 
 * NAME
-ece-import
+ece-import - command for managing integration with and imports of
+external content into the Escenic Content Engine (ECE).
 
 * SYNOPSIS
-ece-import [[[--name]]] [[[--publication]]] [[[--user]]] [[[--password]]] COMMAND
-
-* DESCRIPTION
-The ece-import command will help you with the following tasks:
-
-- [[create][Setting up imports]], either from an import archive or without an import archive.
-- [[Getting raw import data from HTTP or FTP servers]]
-- Running an import job, taking the raw XML from a 3rd party system,
-  applying all defined transformations on it and dumping it in the
-  designed import spool for Escenic Content Engine to pick it up and
-  import it into its CMS. This is typically set up from a cron job,
-  but [[Running an import job manually]] is easy with ece-import.
+ece-import [[[--name name]]] [[[--publication publication]]] [[[--user user]]] [[[--password password]]] COMMAND
 
 * OPTIONS
-** --name
+** --name name
 The name of the import job
-** --publication
+** --publication publication
 The publication name that this job belongs to.
 ** --user user
 The HTTP user to access the download data (optional). This option only
@@ -34,77 +24,122 @@ applies when running the [[download-import-data]] command.
 * COMMANDS
 ** create
 ece-import will happily set up a new import job for you.
-From an import archive:
 The preferred way is to use an import archive, which you typically get
-from the web site developers who've created the XSL files and so on.
+from the web site developers who've created the XSL files and so
+on. When you have such an import archive, you apply it like this:
 #+BEGIN_SRC text
-# ece-import --import-archive /tmp/import-archive.zip create
+# ece-import --import-archive import-archive.zip create
 #+END_SRC
 
 See [[Structure of an import archive]] for a detailed specification on how
 to create such an archive yourself.
 
-You can also set up an import job without an import archive:
+Alternatively, you can set up an import job without an import archive:
 #+BEGIN_SRC text
 # ece-import \\
-  --name streaming-video \\
+  --name myjob \\
   --publication mypub \\
   create
 #+END_SRC
 
-Here, ece-import will set up the file structure for your import job,
-but you'll have to either put your transformers & cron jobs on the
-system yourself, or make sure that the XML you want import already is
-in the [[http://documentation.vizrt.com/ece-syndication-ref/5.4/escenic_syndication.html][Escenic Syndication XML format]].
-
+In both cases, *ece-import* will set up the file structure for your
+import job. If you're not using an import archive you'll have to
+either put your transformers & [[cron]] jobs on the system yourself, or
+make sure that the XML you want import already is in the Escenic
+Syndication XML format.
 
 ** download-import-data
-There's built-in support for this in ece-import:
+There's built-in support in *ece-import* for downloading files from
+any FTP or HTTP server. Everything it needs to run this, is passed
+from the command line:
 #+BEGIN_SRC text
 $ ece-import \\
-  --name streaming-video \\
+  --name myjob \\
   --publication mypub \\
   --user my-ftp-user \\
   --password my-ftp-password \\
   --uri http://news-feed.com/my-import-job-feed \\
   download-import-data
-Started @ Mon Nov 5 09:30:39 UTC 2012, I'm logging to
-/var/log/escenic/ece-import-root.log
-12.xml has already been downloaded, skipping to the next one
-19.xml has already been downloaded, skipping to the next one
-Downloading http://news-feed.com/my-import-job-feed/20.xml ...
-Downloading http://news-feed.com/my-import-job-feed/21.xml ...
-Downloading http://news-feed.com/my-import-job-feed/22.xml ...
-Downloading http://news-feed.com/my-import-job-feed/23.xml ...
-Downloading http://news-feed.com/my-import-job-feed/24.xml ...
-Downloading http://news-feed.com/my-import-job-feed/25.xml ...
-Downloading http://news-feed.com/my-import-job-feed/26.xml ...
-Finished @ Mon Nov 5 09:30:45 UTC 2012
 #+END_SRC
 
-You can safely re-run this as many times as you wish, ece-import
-will keep track of previously downloaded files. If you ever need to
+You can safely re-run this as many times as you wish, *ece-import*
+will keep track of previously downloaded files and will not allow you
+to run parallel processes to download date. If you ever need to
 re-download third party data, you can remove the corresponding
-resource from /var/lib/escenic/raw/mypub/streaming-video/download.state
+resource from */var/lib/escenic/raw/mypub/myjob/download.state*
+
+** Running an import job
+This is the standard command/operation of *ece-import*, to take 3rd
+party XML present in the raw spool, apply all transformations on it
+and move the finished XML to the Escenic import spool.
 
-** Running an import job manually
+When running it, you just need to pass the import job name and
+publication name:
 #+BEGIN_SRC text
 $ ece-import \\
-  --name streaming-video \\
+  --name myjob \\
   --publication mypub
-Started @ Mon Nov 5 09:36:33 UTC 2012, I'm logging to
-/var/log/escenic/ece-import-root.log
-Publication: mypub
-Import configuration: streaming-video
-Importing raw XML #1: 21.xml ...
-Importing raw XML #2: 26.xml ...
-Importing raw XML #3: 24.xml ...
-Number of raw XML files processed: 3
-Number of raw XML successes: 3
-Number of raw XML errors: 0
-Finished @ Mon Nov 5 09:36:37 UTC 2012, enjoy thyself!
 #+END_SRC
 
+* DESCRIPTION
+*ece-import* is the center piece of your infrastructure when
+integrating and importing third party content with ECE. Here follows
+is a quick run through of how it all fits together.
+
+#+BEGIN_SRC text
+(1) ece-import create
+      → new directories
+      → new Nursery configuration files
+      → instructions on how to add the new job to ECE
+      → new cron jobs
+
+(2) cron → ece-import download-import-data
+      → /var/spool/escenic/raw/mypub/myjob/1.xml
+
+(3) cron → ece-import →
+      transformers/01-download-images-referenced-in-xml.sh →
+      transformers/02-fix-image-colour-spaces.pl →
+      transformers/03-tidy-up-xml.py →
+      transformers/04-convert-to-escenic-xml.xsl
+      → /var/spool/escenic/import/mypub/myjob/1.xml
+
+(4) ECE/XMLImportSchedule → imports article into ECE
+#+END_SRC
+
+** (1)
+Call *ece-import create* with or with an import archive to set up all
+the necessary directories, Nursery configuration files, [[cron]] jobs
+and so on for a new job.
+
+** (2)
+Cron calls *ece-import download-import-data* which downloads any new
+XML (or other) file to */var/spool/escenic/raw/mypub/myjob*.
+
+** (3)
+Again, [[cron]] (this can be the same cron script, which runs after a
+successful run of (2)) runs *ece-import*, this time without a
+command. This task will iterate through all the transformers
+inside */usr/share/escenic/import/mypub/myjob/transformers* and pass
+the *1.xml* file to each of them.
+
+Once this is done, *ece-import* checks if the resulting file is a well
+formed XML file and that it looks like the Escenic syndication XML
+format.
+
+If it passes these tests, *ece-import* moves the *1.xml* to the spool
+directory for the ECE Import service to notice it. The file is now
+in */var/spool/escenic/import/mypub/myjob/1.xml*
+
+** (4)
+The standard ECE Import service detects that there is a new XML file
+for it in the Escenic Syndication XML format and imports it into
+ECE. Users should now see the fresh article in e.g. Escenic Content
+Studio.
+
+** Further reading
+For further explanation of why *ece-import* was created and rationale
+for how it was implemented, see the [[BACKGROUND]] section.
+
 * Structure of an import archive
 When creating a new import configuration for your project, the
 following directory structure is required:
@@ -121,46 +156,158 @@ following directory structure is required:
      each zip archive.
 - import job name :: lowercase with hyphens between words (if more
      than one)
-- transformers :: directory with files prefixed with <number>-, indicating
-                  the order of transformation to apply to your import job. If
-                  this is a xsl file, the escenic importer will run
-                  xsltproc on the file, whereas .sh files will be
-                  run in a bash wrapper.
+- transformers :: directory with files prefixed with *<number>-*,
+                  indicating the order of transformation to apply to
+                  your import job. If this is a xsl file, *ece-import*
+                  will run *xsltproc* on the file, whereas .sh files
+                  will be run in a bash wrapper.
 
                   Each of the transformers will be called with one
                   argument, namely the input XML data. Each
                   transformer is responsible to write changes back to
                   the file.
-- cron.hourly :: commands to be run every our. These will be put in
-                 /etc/cron.hourly on the import server. Be sure to
-                 set the execute bit on the file and note that as with
-                 all cron jobs, the file cannot have a file suffix.
+- cron.hourly :: commands to be run every our. These will be put
+                 in */etc/cron.hourly* on the import server. Be sure
+                 to set the execute bit on the file and note that as
+                 with all cron jobs, the file cannot have a file
+                 suffix.
 - cron.every.five.minutes :: commands to run every five minutes.
 
-We're calling the import configuration moo since we're
-setting up an import feed from our imaginary content provider, "Moo
-Cool Videos" and our publication is the ubiquitous mypub.
+Here, you see we have one publication called *mypub* with one import
+job called *myjob* and a second publication with the name *otherpub*
+which has the import job *otherjob*.
 
 #+BEGIN_SRC text
 $ unzip -t my-great-import-archive.zip.zip
-mypub/moo/transformers/01-fix-encoding.sh
-mypub/moo/transformers/02-convert-all-cows-to-ducks.xsl
-mypub/moo/transformers/02-convert-duck-to-escenic-xml.xsl
-mypub/moo/cron.hourly/get-files-from-moo-ftp
-mypub/moo/cron.every.five.minutes/ask-for-public-ip
-otherpub/foo/transformers/01-convert-from-foo-to-escenic-xml.xsl
+mypub/myjob/transformers/01-fix-encoding.sh
+mypub/myjob/transformers/02-convert-all-cows-to-ducks.xsl
+mypub/myjob/transformers/02-convert-duck-to-escenic-xml.xsl
+mypub/myjob/cron.hourly/get-files-from-myjob-ftp
+mypub/myjob/cron.every.five.minutes/ask-for-public-ip
+otherpub/otherjob/transformers/01-from-other-to-escenic-xml.xsl
 #+END_SRC
 
-As you can guess from the file names, the
-02-convert-all-cows-to-ducks.xsl stylesheet will be first applied to
-the incoming data (normally XML) and the
-02-convert-duck-to-escenic-xml.xsl will be applied next before the
-resulting Escenic XML will be imported into the Escenic Content
+As you can guess from the file names,
+the *02-convert-all-cows-to-ducks.xsl* stylesheet will be first
+applied to the incoming data (normally XML) and
+the *02-convert-duck-to-escenic-xml.xsl* will be applied next before
+the resulting Escenic XML will be imported into the Escenic Content
 Engine.
 
-* Creating your own transformers
+* BACKGROUND
+The motivation for creating *ece-import* was to tackle a number of
+problems we have seen over and over again in countless projects
+related to importing third party content into ECE.
+
+** Easy to set up new import jobs
+Integrating ECE with external systems to get the external data into
+ECE has always been a challenging task. First off, it's the setting up
+of an ECE import job, which demands several *.properties* files to be
+written, put in the correct path on the file system, and added to the
+correct *Initial.properties* to be bootstrapped.
+
+Another problem we've seen over and over again, is that all the
+relevant directories either were not present, had the wrong
+permissions or the import directories were created under the wrong
+paths. All of which made the ECE import fail.
+
+Using ece-import [[create]], you don't have to worry about creating the
+relevant Nursery components, create sufficient directory structure
+with correct permissions or what the new stanza
+in *Initial.properties* must look like to load your new import job
+Nursery component.
+
+** Easier to make error free import data
+But this is just the start of problems so many projects have faced up
+through the years. The transformation of the external data, say a feed
+from a new agency or video meta data from a streaming video service,
+is another challenge. To transform these external formats, often a
+different XML format, which sadly very often neither validates, has
+the correct file encoding or is not even well formed (!). The related
+images are also often faulty, having the wrong colour space or has
+file names containing non-printable characters, which again are
+impossible, or difficult to refer to in an error free way from the XML
+files.
+
+All of the above make the ECE import fail.  Since such errors easily
+drowns in the other ECE log errors and are time consuming to replay,
+we wanted to move the complexity of the import job away from the ECE
+XML import framework so that the Escenic import configuration could be
+as simple as possible, only relating to the standard Escenic XML
+syndication format.
+
+By using *ece-import* it is really easy for you to write simple, small
+BASH, Python or Perl scripts which can perform small "massaging" tasks
+that you'd otherwise would have to do in a manual step prior to
+feeding the external data to the ECE importer. For instance, to change
+the encoding on the incoming XML files from ISO-8859-1 to UTF-8, you
+could write create a new transformer
+called *01-convert-from-iso-8859-1-to-utf-8.sh* like this:
+#+BEGIN_SRC text
+#! /usr/bin/env bash
+iconv --from-code "iso-8859-1" --to-code "utf-8" $1
+#+END_SRC
+and put it
+in */usr/share/escenic/import/mypub/myjob/transformers*. Now, this
+script would be called once for each new XML file.
+
+Before, all of these "massaging scripts" were called manually on a
+fresh batch of imports (or say migration data), before the data was
+passed on to the ECE import job. Now, all of these scripts can be
+incorporated into the main import process, having a clear structure,
+order of execution, error handling and logging.
+
+** Easy to debug transformations
+In a standard ECE import job setup, you will have one or more import
+filters which in turn run an XSL sheet. If something goes wrong with
+one of them, most Escenic engineers and consultants (and probably
+customer admins too), would test the transformation using a command
+line tool such as *xsltproc*
+#+BEGIN_SRC text
+$ xsltproc from-reuters-to-escenic.xsl some-reuters-article.xml
+#+END_SRC
+
+The reason that most people use this approach as this is far easier
+than re-configuring the import job to use the ECE import job debug
+filter, which involves editing *.properties* file(s), turning on debug
+in the running app server log configuration and peeking in the correct
+log file.
+
+By using *ece-import*, everything is set up to be easy to retry
+manually. The whole concept is that it should be easy to take just one
+step and execute it from the command line. *ece-import* provides
+extensive messages about everything it's doing
+in */var/log/escenic/ece-import.log* and you should have no problems
+checking each of the transformation steps by yourself by reading it.
+
+** Easy to download data from FTP and HTTP sources
+Downloading data from external sources via FTP or HTTP has been done
+so many times, often with buggy shell code, leaving the scripts
+running multiple times in paralell, re-downloading the same files
+over and over again, or failing because the output of the directory index
+listing has changed.
+
+By using [[download-import-data][ece-import download-import-data]] you get tried and tested code
+for doing this which addresses all of the above problems:
+- Works with all web servers and all FTP servers
+- Doesn't depend on the directory listing format, the locale of the
+  web server or any other, non-standard pre-requisite.
+- Keeps track of the state of previous runs/downloads for the
+  different import jobs
+- Ensures that only one instance of the download job is running at
+  any given time.
+- Runs on any Linux or UNIX system, using standard BASH and cron
+  building blocks.
+
+** No additional configuration
+There are enough configuration files on a production system, so
+the *ece-import* itself doesn't have any configuration files to add
+to that burden. Everything it needs is read from the command line
+options or from configuration files already present on the system.
+
+* CREATING TRANSFORMERS
 You can write a transformer in either XSL, Perl, Python or BASH. You
-put it in <publication>/<import name>/transformers/<number>-<transformer task>.<{xsl,pl,py,sh}>
+put it in *<pub>/<job>/transformers/<number>-<transformer task>.<{xsl,pl,py,sh}>*
 and specify the order in which it should run by setting the <number>
 before/after your other transformers (if any, many folks only have one
 transformer which is an XSL file).
@@ -168,7 +315,7 @@ transformer which is an XSL file).
 All transformers are run by the ece-import command and they get one
 argument, namely the raw XML file from the 3rd party system. All
 transformers work on the same XML file, so that changes done in
-e.g. 01-first.sh are passed on to 02-second.pl. Each transformer
+e.g. *01-first.sh* are passed on to *02-second.pl*. Each transformer
 must read the file and write to the same file. That's the contract.
 
 Here's an example of a transformer that downloads all the pictures
@@ -201,8 +348,51 @@ cat "$1" | \\
 done
 #+END_SRC
 
+* FILES
+- /usr/share/escenic/import/<pub>/<job> :: Directory holding
+     the [[cron]] scripts and transformers of the import job. Normally,
+     set up by the *ece-import* [[create]] command.
+
+- /var/spool/escenic/raw/<pub>/<job> :: The *ece-import*
+     [[download-import-data]] command will download files to this
+     directory and when *ece-import* is invoked with the standard
+     operation, it will look in here for new 3rd party XML files.
+
+- /var/spool/escenic/import/<pub>/<job> :: Once *ece-import* has
+     applied all the transformations on the 3rd party XML and it has
+     been checked to be valid Escenic XML, the file is put in
+     here. The ECE XML Import Service looks in this directory for new
+     files to import.
+
+- /var/cache/escenic/import/<pub>/<job>/<file> :: This is the work
+     directory of *ece-import* where raw 3rd party XML files are put
+     while being processed by the transformers.
+
+- /var/backups/escenic/import/<pub>/<job>/succeeded/<file>.gz :: When
+     3rd party XML has been successfully transformed, the original
+     XML is compressed with [[gzip]] and put here.
+
+- /var/backups/escenic/import/<pub>/<job>/failed/<file> :: When
+     3rd party XML fails to be transformed, the original
+     XML is moved here. It's not compressed to make it as easy as
+     possible to retry it.
+
+- /var/log/escenic/ece-import.log :: *ece-import* writes detailed
+     transcripts of everything it does to this file making it easy
+     for you to replay any of the steps.
+
+- /var/run/escenic/ece-import-<command>.lock :: *ece-import* will
+     create different lock files depending on the three
+     commands/operations it supports. I.e. a long running download of
+     3rd party data (*ece-import download-import-data*) will not stop a
+     regular import to run (*ece-import*).
+
+- /var/lib/escenic/raw/<pub>/<job>/download.state :: State file
+     holding all the URLs (HTTP or FTP) that *ece-import* has
+     downloaded before.
+
 * COPYRIGHT
-Copyright 2011-2013 Vizrt
+Copyright 2012-2013 Vizrt
 
 Licensed under the Apache License, Version 2.0, see
 https://github.com/vizrt/ece-scripts/COPYING for further details.

From 4dd4853439f49429caff0483300d4b8e783d1c24 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Tue, 22 Jan 2013 22:41:07 +0100
Subject: [PATCH 1947/2585] xml_pp now used. no need to check for xmllint...

---
 usr/share/hugin/plugins/publication-resources | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/share/hugin/plugins/publication-resources b/usr/share/hugin/plugins/publication-resources
index dab73db7..3c0dba80 100755
--- a/usr/share/hugin/plugins/publication-resources
+++ b/usr/share/hugin/plugins/publication-resources
@@ -2,9 +2,9 @@
 
 # Hugin script to tell hugin how to collect publication resources
 
-# xmllint is needed for this
-if ! which xmllint > /dev/null ; then
-  echo 'xmllint not installed'
+# xml_pp is needed for this
+if ! which xml_pp > /dev/null ; then
+  echo 'xml_pp not installed'
   exit 1
 fi
 

From 7e1c21d599fd3a2953df71f6d12bd63d0b6a75dc Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Tue, 22 Jan 2013 22:48:05 +0100
Subject: [PATCH 1948/2585] Added support for formatters and a manpage!

---
 usr/share/escenic/package-scripts/create-packages | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 6dc1619c..9da7f29f 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -249,7 +249,7 @@ function set_up_escenic-munin-plugins() {
 function set_up_hugin-node() {
   make_dir $target_dir/etc/hugin/{hugin.often,hugin.hourly,hugin.daily,hugin.weekly}
   make_dir $target_dir/etc/{cron.d,sudoers.d}
-  make_dir $target_dir/usr/{bin,share/doc/hugin,share/hugin/plugins,share/hugin/helpers}
+  make_dir $target_dir/usr/{bin,share/doc/hugin,share/hugin/{plugins,helpers,formatters}}
   make_dir $target_dir/var/lib/hugin
 
   local dir=$(mktemp -d)
@@ -265,7 +265,9 @@ function set_up_hugin-node() {
     run cp $dir/mogsie-hugin-*/sudoers/* $target_dir/etc/sudoers.d/
     run cp $dir/mogsie-hugin-*/cron/* $target_dir/etc/cron.d/
     run cp $dir/mogsie-hugin-*/checks/* $target_dir/usr/share/hugin/plugins/
+    run cp $dir/mogsie-hugin-*/formatters/* $target_dir/usr/share/hugin/formatters/
     run cp $dir/mogsie-hugin-*/*.md $target_dir/usr/share/doc/hugin
+    run cp $dir/mogsie-hugin-*/*.org $target_dir/usr/share/doc/hugin
     run cp $dir/mogsie-hugin-*/LICENSE $target_dir/usr/share/doc/hugin
 
     # chmod 755 $file $target_dir/usr/bin/*

From 19fbc301bc278c7fc2702c8de086b7e497db2036 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 23 Jan 2013 14:45:06 +0100
Subject: [PATCH 1949/2585] - added GOALS & DESIGN CHOICES - added HISTORY

---
 usr/share/doc/escenic/ece-install-guide.org | 581 ++++++++++++--------
 1 file changed, 356 insertions(+), 225 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 1281726a..8ca75f7f 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -7,7 +7,7 @@ ece-install - command for installing any server in a single- or
 multi-server environment, with or without Escenic software.
 
 * SYNOPSIS
-ece-install [-f|--file conf-file] [-V|--version] [-v|--verbose]
+ece-install [[[-f|--file conf-file]]] [[[-V|--version]]] [[[-v|--verbose]]]
 
 * OPTIONS
 ** -f|--file conf-file
@@ -37,8 +37,8 @@ Escenic-based sites, such as:
  - Memcached distributed memory cache
 
 You can use *ece-install* to install The Content Engine and related
-components on a wide range of GNU Linux distributions and Unix or
-Unix-like operating systems, but the level of support varies between
+components on a wide range of GNU Linux distributions and UNIX or
+UNIX-like operating systems, but the level of support varies between
 platforms. On a fully-supported operating system (for example Debian 6.0),
 *ece-install* can both install and configure all required
 components, so that the entire process is reduced to a simple sequence
@@ -53,7 +53,7 @@ these components for you.
 
 ** Supported Operating Systems
 *ece-install* works best on Debian 6.0 (Squeeze) or later. It should,
-however, work on any Unix-like system that provides a BASH command
+however, work on any UNIX-like system that provides a BASH command
 shell (version 4.2 or later).
 
 Here is an overview of the situation on some of the most popular
@@ -73,7 +73,7 @@ platforms:
       install some components. For
       details, see Tested Operating Systems.
 
- - Other GNU/Linux and Unix systems :: *ece-install* does not currently support
+ - Other GNU/Linux and UNIX systems :: *ece-install* does not currently support
       automated installation of third-party components on these
       platforms, so you will need to install them manually. It will,
       of course, tell you which components you need to install, and
@@ -172,7 +172,7 @@ To become root on Ubuntu-based systems and Mac OS X, enter:
 $ sudo su
 #+END_SRC
 
-On all other Unix-like system, enter:
+On all other UNIX-like system, enter:
 #+BEGIN_SRC text
 $ su -
 #+END_SRC
@@ -253,7 +253,7 @@ To run *ece-install*, enter:
 #+END_SRC
 
 *ece-install* writes a log file located at
-*/var/log/ece-install.log*. All output generated by all the commands
+*/var/log/escenic/ece-install.log*. All output generated by all the commands
 it executes is written to this file. You can use *tail* to keep an eye
 on what is being written to the log.
 
@@ -261,7 +261,7 @@ on what is being written to the log.
 error and reporting the failure. For example:
 #+BEGIN_SRC text
 [ece-install-1] The command [cd /not/there] FAILED, exiting :-(
-[ece-install-1] See /var/log/ece-install.log for further details.
+[ece-install-1] See /var/log/escenic/ece-install.log for further details.
 #+END_SRC
 
 If you run into problems and the log file does not provide enough
@@ -328,25 +328,25 @@ role in an Escenic installation.
 The profile to be installed by *ece-install* is determined by setting
 one of the following parameters in *ece-install.conf*:
 
- - *fai\_editor\_install=1* :: Installs all the components that need to
-      be installed to create an Escenic *editorial server*.
- - *fai\_presentation\_install=1* :: Installs all the components that
-      need to be installed to create an Escenic *presentation server*.
- - *fai\_wf\_install=1* :: Installs the Widget Framework on an editorial
-      or presentation server.
- - *fai\_db\_install=1* :: Installs a Database Server.
- - *fai\_cache\_install=1* :: Installs a Cache Server.
- - *fai\_search\_install=1* :: Installs a Search Server.
- - *fai\_rmi\_install=1* :: Installs an RMI Hub.
- - *fai\_monitoring\_install=1* :: Installs a Monitoring Server.
- - *fai\_publication\_create=1* :: Creates an Escenic publication.
- - *fai\_all\_install=1* :: Installs all of the above on one host
-      machine.
- - *fai\_restore\_from\_backup=1* :: Restores a backup created with *ece*.
- - *fai\_analysis\_install=1* :: Installs and configures an Escenic Analysis Engine.
- - *fai\_nfs\_server\_install=1* :: Installs an NFS server.
- - *fai\_nfs\_client\_install=1* :: Installs an NFS client.
- - *fai\_vip\_install=1* :: Installs virtual IP (VIP) providers.
+- *fai\_editor\_install=1* :: Installs all the components that need to
+     be installed to create an Escenic *editorial server*.
+- *fai\_presentation\_install=1* :: Installs all the components that
+     need to be installed to create an Escenic *presentation server*.
+- *fai\_wf\_install=1* :: Installs the Widget Framework on an editorial
+     or presentation server.
+- *fai\_db\_install=1* :: Installs a Database Server.
+- *fai\_cache\_install=1* :: Installs a Cache Server.
+- *fai\_search\_install=1* :: Installs a Search Server.
+- *fai\_rmi\_install=1* :: Installs an RMI Hub.
+- *fai\_monitoring\_install=1* :: Installs a Monitoring Server.
+- *fai\_publication\_create=1* :: Creates an Escenic publication.
+- *fai\_all\_install=1* :: Installs all of the above on one host
+     machine.
+- *fai\_restore\_from\_backup=1* :: Restores a backup created with *ece*.
+- *fai\_analysis\_install=1* :: Installs and configures an Escenic Analysis Engine.
+- *fai\_nfs\_server\_install=1* :: Installs an NFS server.
+- *fai\_nfs\_client\_install=1* :: Installs an NFS client.
+- *fai\_vip\_install=1* :: Installs virtual IP (VIP) providers.
 
 There are a number of common components that are included in all or
 most of the profiles. These are described below.
@@ -413,9 +413,10 @@ If an Escenic database has already been installed on the machine, then
 
 #+BEGIN_SRC text
 [ece-install] Setting up the ECE database schema ...
-ERROR 1007 (HY000) at line 1: Can't create database 'ece5db';
-database exists
-ERROR 1050 (42S01) at line 2: Table 'DBChangeLog' already exists
+  ERROR 1007 (HY000) at line 1: Can't create database 'ece5db';
+  database exists
+  ERROR 1050 (42S01) at line 2: Table 'DBChangeLog' already
+  exists
 [ece-install] running tables FAILED, exiting :-(
 #+END_SRC
 
@@ -660,14 +661,16 @@ restore will fail as follows:
 #+BEGIN_SRC text
 [ece-install-8] Restoring the database contents on ubiquitous ...
 [ece-install-24] Selecting the most recent database dump
-ece5db-2011-10-10.sql.gz
-ERROR 1007 (HY000) at line 1: Can't create database 'ece5db';
-database exists
-ERROR 1050 (42S01) at line 25: Table
-'`ece5db`.`AccessControlList`' already exists
+  ece5db-2011-10-10.sql.gz
+  ERROR 1007 (HY000) at line 1: Can't create database 'ece5db';
+  database exists
+  ERROR 1050 (42S01) at line 25: Table
+  '`ece5db`.`AccessControlList`' already exists
 [ece-install-24] The command [restoring from
-/var/backups/escenic/ece5db-2011-10-10.sql.gz] FAILED, exiting :-(
-[ece-install-24] See /var/log/ece-install.log for further details.
+  /var/backups/escenic/ece5db-2011-10-10.sql.gz] FAILED,
+  exiting :-(
+[ece-install-24] See /var/log/escenic/ece-install.log for further
+  details.
 #+END_SRC
 
 ** <<<fai\_analysis\_install>>>
@@ -929,271 +932,285 @@ If you do not want ece-install to touch your */etc/hosts*, you can set
 The ece-install script understands the following settings in
 the *ece-install.conf*:
 
-- *fai\_all\_conf\_archive* *conf.tar.gz* to use for Nursery & JAAS
-  configuration. Default is "".
+- *fai\_all\_conf\_archive* :: *conf.tar.gz* to use for Nursery & JAAS
+     configuration. Default is "".
 
-- *fai\_all\_ear* EAR to use instead of the Escenic binaries. Default
-  is "".
+- *fai\_all\_ear* :: EAR to use instead of the Escenic
+     binaries. Default is "".
 
-- *fai\_all\_install* Install all components on your server.. Default
-  is 0.
+- *fai\_all\_install* :: Install all components on your
+     server.. Default is 0.
 
-- *fai\_all\_stop\_and\_clear* After installation, stop the instance
-  and clear its work & log files.. Default is 0.
+- *fai\_all\_stop\_and\_clear* :: After installation, stop the
+     instance and clear its work & log files.. Default is 0.
 
-- *fai\_analysis\_db\_host* For the EAE DB (different from
-  ECE's). Default is localhost.
+- *fai\_analysis\_db\_host* :: For the EAE DB (different from
+     ECE's). Default is localhost.
 
-- *fai\_analysis\_db\_install* Install DB profile. Default is 0.
+- *fai\_analysis\_db\_install* :: Install DB profile. Default is 0.
 
-- *fai\_analysis\_db\_password* For the EAE DB (different from
-  ECE's). Default is read-the-source-luke.
+- *fai\_analysis\_db\_password* :: For the EAE DB (different from
+     ECE's). Default is read-the-source-luke.
 
-- *fai\_analysis\_db\_port* For the EAE DB (different from
-  ECE's). Default is 3306.
+- *fai\_analysis\_db\_port* :: For the EAE DB (different from
+     ECE's). Default is 3306.
 
-- *fai\_analysis\_db\_schema* For the EAE DB (different from
-  ECE's). Default is ece5db.
+- *fai\_analysis\_db\_schema* :: For the EAE DB (different from
+     ECE's). Default is ece5db.
 
-- *fai\_analysis\_db\_user* For the EAE DB (different from
-  ECE's). Default is ece5user.
+- *fai\_analysis\_db\_user* :: For the EAE DB (different from
+     ECE's). Default is ece5user.
 
-- *fai\_analysis\_install* Will install the Escenic Analysis Engine,
-  aka Stats, EAE.. Default is 0.
+- *fai\_analysis\_install* :: Will install the Escenic Analysis
+     Engine, aka Stats, EAE.. Default is 0.
 
-- *fai\_analysis\_name* EAE instance name. Default is analysis1.
+- *fai\_analysis\_name* :: EAE instance name. Default is analysis1.
 
-- *fai\_analysis\_port* Port of the EAE. Default is 8080.
+- *fai\_analysis\_port* :: Port of the EAE. Default is 8080.
 
-- *fai\_analysis\_shutdown* Shutdown port for the EAE app
-  server. Default is 8005.
+- *fai\_analysis\_shutdown* :: Shutdown port for the EAE app
+     server. Default is 8005.
 
-- *fai\_analysis\_stop\_and\_clear* After installation, stop the
-  instances and clear its work & log files. Default is 0.
+- *fai\_analysis\_stop\_and\_clear* :: After installation, stop the
+     instances and clear its work & log files. Default is 0.
 
-- *fai\_apt\_vizrt\_pool* Which package pool in the Vizrt APT to
-  install package from.. Default is stable.
+- *fai\_apt\_vizrt\_pool* :: Which package pool in the Vizrt APT to
+     install package from.. Default is stable.
 
-- *fai\_cache\_backends* Space separated, e.g. "app1:8080
-  app2:8080". Default is ${HOSTNAME}:8080.
+- *fai\_cache\_backends* :: Space separated, e.g. "app1:8080
+     app2:8080". Default is ${HOSTNAME}:8080.
 
-- *fai\_cache\_install* Install cache server profile. Default is 0.
+- *fai\_cache\_install* :: Install cache server profile. Default is 0.
 
-- *fai\_db\_daily\_backup* Sets up daily backup of the DB.. Default
-  is 0.
+- *fai\_db\_daily\_backup* :: Sets up daily backup of the DB.. Default
+     is 0.
 
-- *fai\_db\_drop\_old\_db\_first* Warning: this will drop the old
-  database before installing a new one. Default is 0.
+- *fai\_db\_drop\_old\_db\_first* :: Warning: this will drop the old
+     database before installing a new one. Default is 0.
 
-- *fai\_db\_host* Useful for editor & presentation profiles. Default
-  is $HOSTNAME.
+- *fai\_db\_host* :: Useful for editor & presentation
+     profiles. Default is *$HOSTNAME*.
 
-- *fai\_db\_install* Install db profile. Default is 0.
+- *fai\_db\_install* :: Install db profile. Default is 0.
 
-- *fai\_db\_password* Useful for DB installation profile. Default is
-  read-the-source-luke.
+- *fai\_db\_password* :: Useful for DB installation profile. Default
+     is read-the-source-luke.
 
-- *fai\_db\_port* Useful for editor & presentation profiles. Default
-  is 3306.
+- *fai\_db\_port* :: Useful for editor & presentation
+     profiles. Default is 3306.
 
-- *fai\_db\_schema* Useful for DB installation profile. Default is
-  ece5db.
+- *fai\_db\_schema* :: Useful for DB installation profile. Default is
+     ece5db.
 
-- *fai\_db\_user* Useful for DB installation profile. Default is
-  ece5user.
+- *fai\_db\_user* :: Useful for DB installation profile. Default is
+     ece5user.
 
-- *fai\_dry\_run* ece-install will download Escenic archives and
-  install OS packages, but will not configure anything.. Default is 0.
+- *fai\_dry\_run* :: ece-install will download Escenic archives and
+     install OS packages, but will not configure anything.. Default
+     is 0.
 
-- *fai\_editor\_conf\_archive* *conf.tar.gz* to use for Nursery & JAAS
-  configuration. Default is "".
+- *fai\_editor\_conf\_archive* :: *conf.tar.gz* :: to use for Nursery
+     & JAAS configuration. Default is "".
 
-- *fai\_editor\_deploy\_white\_list* The list of WARs to be deployed
-  on this instance.. Default is "escenic-admin escenic studio
-  indexer-webservice webservice".
+- *fai\_editor\_deploy\_white\_list* :: The list of WARs to be
+     deployed on this instance.. Default is "escenic-admin escenic
+     studio indexer-webservice webservice".
 
-- *fai\_editor\_ear* EAR to use instead of the Escenic
-  binaries. Default is "".
+- *fai\_editor\_ear* :: EAR to use instead of the Escenic
+     binaries. Default is "".
 
-- *fai\_editor\_install* Install the editorial profile. Default is 0.
+- *fai\_editor\_install* :: Install the editorial profile. Default
+     is 0.
 
-- *fai\_editor\_name* Name of the editor instance. Default is editor1.
+- *fai\_editor\_name* :: Name of the editor instance. Default is
+     editor1.
 
-- *fai\_editor\_port* HTTP port of the editor instance. Default
-  is 8080.
+- *fai\_editor\_port* :: HTTP port of the editor instance. Default
+     is 8080.
 
-- *fai\_editor\_shutdown* Shutdown port of the editor
-  instance. Default is 8005.
+- *fai\_editor\_shutdown* :: Shutdown port of the editor
+     instance. Default is 8005.
 
-- *fai\_editor\_stop\_and\_clear* After installation, stop the
-  instances and clear its work & log files. Default is 0.
+- *fai\_editor\_stop\_and\_clear* :: After installation, stop the
+     instances and clear its work & log files. Default is 0.
 
-- *fai\_enabled* Whether or not to run ece-install in FAI
-  mode. Default is 0.
+- *fai\_enabled* :: Whether or not to run ece-install in FAI
+                    mode. Default is 0.
 
-- *fai\_keep\_off\_etc\_hosts* Set this to 1 if you don't want
-  ece-install adding entries to /etc/hosts. Default is 0.
+- *fai\_keep\_off\_etc\_hosts* :: Set this to 1 if you don't
+     want *ece-install* adding entries to */etc/hosts*. Default is 0.
 
-- *fai\_monitoring\_admin\_password* The admin password of the web
-  interface(s). Currenlty only set for Icinga.. Default is No telling
-  you here ;-).
+- *fai\_monitoring\_admin\_password* :: The admin password of the web
+     interface(s). Currenlty only set for Icinga.. Default is No
+     telling you here ;-).
 
-- *fai\_monitoring\_ece\_host\_list* Hosts running one or more ECE
-  instance. Default is "".
+- *fai\_monitoring\_ece\_host\_list* :: Hosts running one or more ECE
+     instance. Default is "".
 
-- *fai\_monitoring\_host\_list* Quoted, space separated list of
-  <host>#<ip> pairs, e.g.: "pres1#10.72.227.250
-  pres2#10.72.227.251". Default is "".
+- *fai\_monitoring\_host\_list* :: Quoted, space separated list of
+     <host>#<ip> pairs, e.g.:
+     #+BEGIN_SRC text
+     pres1#10.72.227.250
+     pres2#10.72.227.251.
+     #+END_SRC
+     Default is "".
 
-- *fai\_monitoring\_install* Install the monitoring server
-  profile.. Default is 0.
+- *fai\_monitoring\_install* :: Install the monitoring server
+     profile.. Default is 0.
 
-- *fai\_monitoring\_munin\_node\_list* Set this to a whitespace
-  separated list of nodes that munin should monitor. Default is "".
+- *fai\_monitoring\_munin\_node\_list* :: Set this to a whitespace
+     separated list of nodes that munin should monitor. Default is "".
 
-- *fai\_monitoring\_search\_host\_list* Hosts running search
-  instance(s) (Solr + indexer). Default is "".
+- *fai\_monitoring\_search\_host\_list* :: Hosts running search
+     instance(s) (Solr + indexer). Default is "".
 
-- *fai\_monitoring\_server\_ip* The IP of the monitoring
-  server.. Default is 127.0.0.1.
+- *fai\_monitoring\_server\_ip* :: The IP of the monitoring
+     server.. Default is *127.0.0.1*.
 
-- *fai\_nfs\_allowed\_client\_network* IP/netmask of allowed NFS
-  clients, example: 192.168.1.0/255.255.255.0. Default is "".
+- *fai\_nfs\_allowed\_client\_network* :: IP/netmask of allowed NFS
+     clients, example: *192.168.1.0/255.255.255.0*. Default is "".
 
-- *fai\_nfs\_client\_install* Installs an NFS client. Default is 0.
+- *fai\_nfs\_client\_install* :: Installs an NFS client. Default is 0.
 
-- *fai\_nfs\_client\_mount\_point\_parent* Mount point parent
-  directory. Default is /mnt.
+- *fai\_nfs\_client\_mount\_point\_parent* :: Mount point parent
+     directory. Default is */mnt*.
 
-- *fai\_nfs\_export\_list* Space separated list of NFS export
-  directories, full paths as seen on the NFS server.. Default is "".
+- *fai\_nfs\_export\_list* :: Space separated list of NFS export
+     directories, full paths as seen on the NFS server.. Default is
+     "".
 
-- *fai\_nfs\_server\_address* Address of the NFS server, useful for
-  the NFS client profile. Default is "".
+- *fai\_nfs\_server\_address* :: Address of the NFS server, useful for
+     the NFS client profile. Default is "".
 
-- *fai\_nfs\_server\_install* Install an NFS server. Default is 0.
+- *fai\_nfs\_server\_install* :: Install an NFS server. Default is 0.
 
-- *fai\_presentation\_conf\_archive* *conf.tar.gz* to use for Nursery
-  & JAAS configuration. Default is "".
+- *fai\_presentation\_conf\_archive* :: *conf.tar.gz* :: to use for
+     Nursery & JAAS configuration. Default is "".
 
-- *fai\_presentation\_ear* EAR to use instead of the Escenic
-  binaries. Default is "".
+- *fai\_presentation\_ear* :: EAR to use instead of the Escenic
+     binaries. Default is "".
 
-- *fai\_presentation\_install* Install the presentation server
-  profile. Default is 0.
+- *fai\_presentation\_install* :: Install the presentation server
+     profile. Default is 0.
 
-- *fai\_presentation\_name* Name of the presentation server
-  instance. Default is engine1.
+- *fai\_presentation\_name* :: Name of the presentation server
+     instance. Default is engine1.
 
-- *fai\_presentation\_port* HTTP port of the presentation server
-  instance. Default is 8080.
+- *fai\_presentation\_port* :: HTTP port of the presentation server
+     instance. Default is 8080.
 
-- *fai\_presentation\_deploy\_white\_list* The list of WARs to be
-  deployed on this instance.. Default is "escenic-admin
-  <assemblytool/publications/*>".
+- *fai\_presentation\_deploy\_white\_list* :: The list of WARs to be
+     deployed on this instance.. Default is "escenic-admin".
 
-- *fai\_presentation\_shutdown* Shutdown port of the presentation
-  instance. Default is 8005.
+- *fai\_presentation\_shutdown* :: Shutdown port of the presentation
+     instance. Default is 8005.
 
-- *fai\_presentation\_stop\_and\_clear* After installation, stop the
-  instances and clear its work & log files. Default is 0.
+- *fai\_presentation\_stop\_and\_clear* :: After installation, stop
+     the instances and clear its work & log files. Default is 0.
 
-- *fai\_public\_host\_name* The public address for your
-  website. Default is ${HOSTNAME}:8080.
+- *fai\_public\_host\_name* :: The public address for your
+     website. Default is *${HOSTNAME}:8080*.
 
-- *fai\_publication\_create* Create a new publication. Default is 0.
+- *fai\_publication\_create* :: Create a new publication. Default
+     is 0.
 
-- *fai\_publication\_domain\_mapping\_list* Mapping between
-  publications and domains:
-  "<pub>[,pub.war]#<domain>[#,<alias1>,<alias2>]". Default is "".
+- *fai\_publication\_domain\_mapping\_list* :: Mapping between
+     publications and domains:
+     #+BEGIN_SRC text
+     "<pub>[,pub.war]#<domain>[#,<alias1>,<alias2>]"
+     #+END_SRC
+     Default is "".
 
-- *fai\_publication\_ear* All publications WARs inside will be used
-  for publication creation
-  (assumes *fai\_publication\_create*). Default is "".
+- *fai\_publication\_ear* :: All publications WARs inside will be used
+     for publication creation
+     (assumes *fai\_publication\_create*). Default is "".
 
-- *fai\_publication\_environment* The kind of
-  environment/habitat. Typical values are: production, staging,
-  testing, development.. Default is "production".
+- *fai\_publication\_environment* :: The kind of
+     environment/habitat. Typical values are: production, staging,
+     testing, development.. Default is "production".
 
-- *fai\_publication\_name* Name of the publication. Default is mypub.
+- *fai\_publication\_name* :: Name of the publication. Default is
+     *mypub*.
 
-- *fai\_publication\_use\_instance* Name of local instance to use for
-  creation. Default is dev1.
+- *fai\_publication\_use\_instance* :: Name of local instance to use
+     for creation. Default is dev1.
 
-- *fai\_publication\_war* WAR to base the new publication on. Default
-  is "WF or ECE demo WAR".
+- *fai\_publication\_war* :: WAR to base the new publication
+     on. Default is "WF or ECE demo WAR".
 
-- *fai\_publication\_war\_remove\_file\_list* File list that should be
-  removed from all WARs inside *fai\_publication\_ear*
-  or *fai\_publication\_war*. Default is "".
+- *fai\_publication\_war\_remove\_file\_list* :: File list that should
+     be removed from all WARs inside *fai\_publication\_ear*
+     or *fai\_publication\_war*. Default is "".
 
-- *fai\_publication\_war\_uri\_list* Publication WARs used for setting
-  up Assembly tool.. Default is "".
+- *fai\_publication\_war\_uri\_list* :: Publication WARs used for
+     setting up Assembly tool.. Default is "".
 
-- *fai\_rmi\_install* Install the RMI hub profile. Default is 0.
+- *fai\_rmi\_install* :: Install the RMI hub profile. Default is 0.
 
-- *fai\_search\_conf\_archive* *conf.tar.gz* to use for Nursery & JAAS
-  configuration. Default is "".
+- *fai\_search\_conf\_archive* :: *conf.tar.gz* :: to use for Nursery
+     & JAAS configuration. Default is "".
 
-- *fai\_search\_deploy\_white\_list* The list of WARs to be deployed
-  on this instance.. Default is "solr indexer-webapp".
+- *fai\_search\_deploy\_white\_list* :: The list of WARs to be
+     deployed on this instance.. Default is "solr indexer-webapp".
 
-- *fai\_search\_ear* EAR to use instead of the Escenic
-  binaries. Default is "".
+- *fai\_search\_ear* :: EAR to use instead of the Escenic
+     binaries. Default is "".
 
-- *fai\_search\_for\_editor* If 1, will configure Solr for use with an
-  editorial server, if not for presentation servers.. Default is 0.
+- *fai\_search\_for\_editor* :: If 1, will configure Solr for use with
+     an editorial server, if not for presentation servers.. Default
+     is 0.
 
-- *fai\_search\_indexer\_ws\_uri* URI of the indexer-webservice that
-  the search instance shall use for knowing what to index.. Default is
-  http://${HOSTNAME}:8080/indexer-webservice/index/.
+- *fai\_search\_indexer\_ws\_uri* :: URI of the indexer-webservice
+     that the search instance shall use for knowing what to
+     index.. Default is
+     http://${HOSTNAME}:8080/indexer-webservice/index/.
 
-- *fai\_search\_install* Install the search server profile (Solr +
-  indexer). Default is 0.
+- *fai\_search\_install* :: Install the search server profile (Solr +
+     indexer). Default is 0.
 
-- *fai\_search\_name* Name of the search instance. Default is search1.
+- *fai\_search\_name* :: Name of the search instance. Default is
+     search1.
 
-- *fai\_search\_port* HTTP port of the search instance. Default
+- *fai\_search\_port* :: HTTP port of the search instance. Default
   is 8080.
 
-- *fai\_search\_shutdown* Shutdown port of the search
+- *fai\_search\_shutdown* :: Shutdown port of the search
   instance. Default is 8005.
 
-- *fai\_vip\_address* The virtual IP the provider will claim. Default
-  is "".
+- *fai\_vip\_address* :: The virtual IP the provider will
+     claim. Default is "".
 
-- *fai\_vip\_install* Install a VIP provider. Default is 0.
+- *fai\_vip\_install* :: Install a VIP provider. Default is 0.
 
-- *fai\_vip\_primary\_node\_auth\_key* Optional, but useful to set to
-  make conf files consistent. Will be generated if not set. Default is
-  "".
+- *fai\_vip\_primary\_node\_auth\_key* :: Optional, but useful to set
+     to make conf files consistent. Will be generated if not
+     set. Default is "".
 
-- *fai\_vip\_primary\_node\_ip* Primary node IP. Default is "".
+- *fai\_vip\_primary\_node\_ip* :: Primary node IP. Default is "".
 
-- *fai\_vip\_primary\_node\_name* Primary node name, must be what
-  $(uname -n) returns. Default is "".
+- *fai\_vip\_primary\_node\_name* :: Primary node name, must be what
+     $(uname -n) returns. Default is "".
 
-- *fai\_vip\_secondary\_node\_ip* Secondary node IP. Default is "".
+- *fai\_vip\_secondary\_node\_ip* :: Secondary node IP. Default is "".
 
-- *fai\_vip\_secondary\_node\_name* Secondary node name, must be what
-  $(uname -n) returns. Default is "".
+- *fai\_vip\_secondary\_node\_name* :: Secondary node name, must be
+     what $(uname -n) returns. Default is "".
 
-- *fai\_vip\_service\_list* List of init.d scripts to invoke when the
-  VIP is acclaimed/revoked, script must support start & stop. Default
-  is "".
+- *fai\_vip\_service\_list* :: List of init.d scripts to invoke when
+     the VIP is acclaimed/revoked, script must support start &
+     stop. Default is "".
 
-- *fai\_vip\_sibling\_ip* The IP of the other node offering the
+- *fai\_vip\_sibling\_ip* :: The IP of the other node offering the
   VIP. Default is "".
 
-- *fai\_wf\_install* Install Widget Framework profile. Default is 0.
+- *fai\_wf\_install* :: Install Widget Framework profile. Default is 0.
 
 As you've probably already found out, *0* means "false" and *1* means "true".
 
 ** Example Configurations
 Here are a few simple example configurations, you can find more under
 */usr/share/doc/escenic/examples* if you've got the
-*escenic-content-engine-installer* package installed or you can
-[[https://github.com/vizrt/ece-scripts/tree/master/usr/share/doc/escenic/examples][browse them online]].
+*escenic-content-engine-installer* package installed.
 
 ****** Install an Editorial Server and Create a Publication
 To automatically install an editorial server and create a publication
@@ -1269,7 +1286,7 @@ bundle, see the FAI section.
 * Using a Custom Configuration File for ece-install
 You can specify a different configuration by using the -f parameter:
 #+BEGIN_SRC text
-$ ece-install -f ece-install-presentation-server.conf
+# ece-install -f ece-install-presentation-server.conf
 #+END_SRC
 
 * Overview of File Paths Used by the ece-install script
@@ -1425,17 +1442,16 @@ environment and want to e.g. undo your previous install to install a
 different profile.
 #+END_QUOTE
 
-You trigger this by setting the following in your ece-install.conf
+You trigger this by setting the following in your *ece-install.conf*:
 #+BEGIN_SRC conf
 fai_un_install_everything=1
 #+END_SRC
 
-
-ece-install will then prompt the user to type a confirmation
+*ece-install* will then prompt the user to type a confirmation
 sentence. Once the un-installation is done, a summary is printed to
 the user.
 
-ece-install will then continue with the other tasks and installation
+*ece-install* will then continue with the other tasks and installation
 profiles if so defined. The fai_un_install_everything=1 is processed
 before any other FAI profile, hence, on a system where you want to
 wipe the slate clean before starting over, you can for instance do:
@@ -1448,20 +1464,18 @@ fai_presentation_install=1
 The output will be similar to:
 #+BEGIN_SRC text
 [ece-install-5] You have set fai_un_install_everything=1 in your
- /root/ece-install.conf
+  /root/ece-install.conf
 [ece-install-5] This will uninstall the following on raven:
-
 [ece-install-5] Packages to be removed: ant ant-contrib
-ant-optional escenic-content-engine-scripts
-escenic-munin-plugins escenic-munin-plugins libmysql-java maven2
-memcached munin munin-node munin-plugins-extra
-munin-java-extra nginx percona-server-client
-percona-server-client-5.5 percona-server-common-5.5
-percona-server-server percona-server-server-5.5
-varnish sun-java6-jdk
-
+  ant-optional escenic-content-engine-scripts
+  escenic-munin-plugins escenic-munin-plugins libmysql-java maven2
+  memcached munin munin-node munin-plugins-extra
+  munin-java-extra nginx percona-server-client
+  percona-server-client-5.5 percona-server-common-5.5
+  percona-server-server percona-server-server-5.5
+  varnish sun-java6-jdk
 [ece-install-5] Files & directories to be removed: /etc/escenic
-/opt/*tomcat* /opt/escenic /var/lib/escenic /var/run/escenic
+  /opt/*tomcat* /opt/escenic /var/lib/escenic /var/run/escenic
 /etc/escenic /var/log/escenic /etc/apt/sources.list.d/escenic.list
 [ece-install-5] APT keys to be removed: C4DEFFEB CD2EFD2A
 [ece-install-5] If you're absolutely sure about this, type:
@@ -1473,11 +1487,128 @@ I know what I'm doing, please do as I say.
 [ece-install-11] should now have been removed from raven.
 #+END_SRC
 
+* GOALS & DESIGN CHOICES
+These are some of the most important goals and design choices
+of *ece-install*:
+
+** As few prerequisites as possible
+The only pre-requisite should be having a Debian or RedHat based
+machine with a good internet connection set up, as well
+as *ece-install* itself and an *ece-install.conf* configuration file
+of course. No other prerequisite is needed. No Java, no app server, no
+database, no nothing.
+
+** Run on the latest stable releases of Debian, Ubuntu and RedHat
+It should run on the latest stable release of Debian, Ubuntu LTS and
+RedHat. This means for instance not features only found in BASH 4.x as
+this wasn't available in the latest RedHat/CentOS version at the time.
+
+This also means not depending on (newer) software packages that
+only exist in e.g. the regular Ubuntu release or Debian testing.
+
+** Make it possible to run ece-install on other UNIX systems too
+Whenever possible, do not assume the system to be Linux, making it
+possible to use it on other unices like FreeBSD, Solaris and OSX too.
+
+** Require as little input as possible
+An important design goal is to install a system with so many best
+practises applied as possible. Hence, *ece-install* goes to great
+lengths to provide sane defaults that will work for most
+users.
+
+However, there will always be cases were the defaults are not
+sufficient and this is where the myriad of *fai_* configuration
+options have arisen.
+
+** Fail as fast as possible
+Great heed has been taken to detect errors as fast as possible and
+bail out with a detailed stack trace of where the error occured.
+
+One of the implications of this, is that all commands are executed
+within a wrapper (called *run), which checks the return code of the
+called command and makes *ece-install* fail if any of its called
+commands failed. Both standard out and error are logged
+to */var/log/escenic/ece-install.log* and a stack trace is provided
+to aid the error hunting.
+
+** Take care of the user
+Take care of the user: speak clear English in full sentences when
+giving feedback. Write technical details to the log and keep the user
+feedback in standard out as "pleasant" as possible.
+
+** Modularisation
+The script consists on ~20 modules, ~5 common libraries and the main
+executable:
+- /usr/sbin/ece-install :: Responsible for parsing of arguments and
+                 configuration and sending the request off to the
+                 right sub module(s).
+- /usr/share/escenic/ece-scripts/ece-install.d/* :: Roughly speaking,
+     there exists one module per *ece-install* profile, but more
+     precisely, this division follows along the lines of the
+     technology involved. For instance, all database related code
+     resides in *database.sh*, even though there are three profiles
+     that deal with databases (fai_all_install=1,
+     fai_restore_from_backup=1 and fai_db_install)
+- /usr/share/escenic/ece-scripts/common-*.sh :: common libraries with
+     code shared between the different ece-scripts commands (such
+     as *ece*, *system-info*, *ece-build* & *vosa*).
+
+** Interactive and automatic installations
+*ece-install* started out as a purely interactive command, where the
+user was prompted for all the choices on what to install (most of
+which he/she could just hit ENTER to complete). Once this the
+interactive command was shown to customers and Vizrt employees, the
+need for a fully automatic version became apparent and *ece-install*
+got the *fai_enabled* parameter to make the switch.
+
+For this reason, the *ece-install.conf* options which have a *fai_*
+prefix only applies when running *ece-install* in non-interactive
+mode, whereas the ones without any such prefix (like *technet\_user*
+and *technet\_download\_list*) applies to both ways of
+running *ece-install*.
+
+As the complexity of *ece-install* and its profiles have grown, some
+of the profiles have not been implemented for the interactive mode.
+
+The term "fully automatic install" (FAI) is inspired by
+http://fai-project.org
+
+
+** Possible to run ece-install from anywhere
+For easy testing and flexible deployment, it should be possible to
+run *ece-install* from a checked out or extracted copy of the source
+code. This means that no absolute paths to the *ece-install* and
+common modules should be assumed when extending the command.
+
+* HISTORY
+Installing a full Escenic production environment has historically
+taken at least a week, with another few to tune all the settings for
+high performance. In the middle of 2011, Torstein Krause Johansen set
+out to remedy this and created *ece-install* as a personal side
+project. From February 2012, he joined the Vizrt Online SaaS team and
+was allowed to work on *ece-install* full time. The command has since
+then been used to install several full scale production environments,
+as well as being used for full scale automatic integration tests,
+development machines, test servers and staging
+environments. *ece-install* is now the preferred way of installing new
+Escenic systems. From February 2013, it has been maintained by Erik
+Mogensen.
+
+* BUGS
+Report any bugs found on https://github.com/vizrt/ece-scripts/issues.
+and be sure to check
+https://github.com/vizrt/ece-scripts/known-issues.org before
+using *ece-install*.
+
+* SEE ALSO
+[[varnishd]], [[vcl]], [[nginx]], [[memcached]], [[java]], [[lighthttpd]], [[munin]], [[icinga]],
+[[heartbeat]], [[haproxy]], [[mysqld]]
+
+* AUTHOR
+Torstein Krause Johansen, Erik Mogsensen
+
 * COPYRIGHT
 Copyright 2011-2013 Vizrt
 
 Licensed under the Apache License, Version 2.0, see
 https://github.com/vizrt/ece-scripts/COPYING for further details.
-
-* AUTHOR
-Torstein Krause Johansen, Erik Mogsensen

From 97c10c6f46510a21babcc7fd6e8c8d4092fcc080 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 23 Jan 2013 15:53:39 +0100
Subject: [PATCH 1950/2585] - added design note on the production ready-ness of
 all the   ece-install features.

- minor changes here and there to make the text read better.
---
 usr/share/doc/escenic/ece-install-guide.org | 75 ++++++++++++++++-----
 1 file changed, 58 insertions(+), 17 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 8ca75f7f..802feb8b 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -1488,8 +1488,9 @@ I know what I'm doing, please do as I say.
 #+END_SRC
 
 * GOALS & DESIGN CHOICES
-These are some of the most important goals and design choices
-of *ece-install*:
+If you are a power user of *ece-install*, if you're just curious or
+indeed wish to extend it, you will find it interesting to read this
+section explaining some of its goals and design choices.
 
 ** As few prerequisites as possible
 The only pre-requisite should be having a Debian or RedHat based
@@ -1500,11 +1501,15 @@ database, no nothing.
 
 ** Run on the latest stable releases of Debian, Ubuntu and RedHat
 It should run on the latest stable release of Debian, Ubuntu LTS and
-RedHat. This means for instance not features only found in BASH 4.x as
-this wasn't available in the latest RedHat/CentOS version at the time.
+RedHat.
 
-This also means not depending on (newer) software packages that
-only exist in e.g. the regular Ubuntu release or Debian testing.
+This applies for instance not features only found in BASH 4.x as this
+wasn't available in the latest RedHat/CentOS version when the bulk
+of *ece-install* was written.
+
+Another implications, is the *ece-install* cannot depend on (newer)
+software packages that only exist in e.g. the regular Ubuntu release,
+Fedora or Debian testing.
 
 ** Make it possible to run ece-install on other UNIX systems too
 Whenever possible, do not assume the system to be Linux, making it
@@ -1520,22 +1525,56 @@ However, there will always be cases were the defaults are not
 sufficient and this is where the myriad of *fai_* configuration
 options have arisen.
 
+** Production ready
+A lot of choices in *ece-install* are made to ensure that
+an *ece-install*-ed machine is production ready, or at the very least
+production "like" (for instance if the machine has too little memory,
+there's no way it'll be production "ready", although it will still be
+set up "like" production).
+
+This means for instance that the application server configuration is
+way more advanced than what you'll find on a regular developer's or
+test system, the same goes for the cache configuration, the JVM
+parameters, the logging configuration, the monitoring setup and many,
+many more things. They are all set up to be ready to go into
+production.
+
+This drive has also another purpose, namely to educate everyone
+involved with the site development, including template & Java
+developers, of the different components that a production environment
+are comprised of. We believe that by having components like monitoring
+and caching servers in place from day one on all systems (also the
+developer's machine and the test servers), the finished web site will
+reach a successful production state faster and more reliably.
+
 ** Fail as fast as possible
 Great heed has been taken to detect errors as fast as possible and
 bail out with a detailed stack trace of where the error occured.
 
 One of the implications of this, is that all commands are executed
-within a wrapper (called *run), which checks the return code of the
+within a wrapper (called *run*), which checks the return code of the
 called command and makes *ece-install* fail if any of its called
 commands failed. Both standard out and error are logged
-to */var/log/escenic/ece-install.log* and a stack trace is provided
-to aid the error hunting.
+to */var/log/escenic/ece-install.log* and a stack trace is provided to
+aid the error hunting.
 
 ** Take care of the user
 Take care of the user: speak clear English in full sentences when
 giving feedback. Write technical details to the log and keep the user
 feedback in standard out as "pleasant" as possible.
 
+** Safe to re-run
+All *ece-install* modules have been written to ensure that it's safe
+to re-run *ece-install* with the same *ece-install.conf*
+file. Anything which may harm your data (that being two things: the
+database data files and the ECE multimedia archive (the Solr index can
+be re-generated, so that's not protected in the same way)) will not
+be run with a second run of *ece-install*.
+
+For the cases were the user really wants this (like wiping out a
+database when re-running an integration test), options are provided
+to override the default behaviour.
+
 ** Modularisation
 The script consists on ~20 modules, ~5 common libraries and the main
 executable:
@@ -1585,14 +1624,16 @@ Installing a full Escenic production environment has historically
 taken at least a week, with another few to tune all the settings for
 high performance. In the middle of 2011, Torstein Krause Johansen set
 out to remedy this and created *ece-install* as a personal side
-project. From February 2012, he joined the Vizrt Online SaaS team and
-was allowed to work on *ece-install* full time. The command has since
-then been used to install several full scale production environments,
-as well as being used for full scale automatic integration tests,
-development machines, test servers and staging
-environments. *ece-install* is now the preferred way of installing new
-Escenic systems. From February 2013, it has been maintained by Erik
-Mogensen.
+project.
+
+In February 2012, he joined the Vizrt Online SaaS team and was allowed
+to work on *ece-install* full time. The command has since then been
+used to install several full scale production environments, as well as
+being used for full scale automatic integration tests, development
+machines, test servers and staging environments. *ece-install* is now
+the preferred way of installing new Escenic systems.
+
+From February 2013, it has been maintained by Erik Mogensen.
 
 * BUGS
 Report any bugs found on https://github.com/vizrt/ece-scripts/issues.

From ba69c296f67165501009ec2630582bfe8809f81d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Wed, 23 Jan 2013 16:12:31 +0100
Subject: [PATCH 1951/2585] ece-install - added configuration to always pick
 packages from percona if possible

---
 .../escenic/ece-scripts/ece-install.d/database.sh    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 6584988a..9a01b97e 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -61,6 +61,18 @@ function set_up_percona_repository_if_possible() {
       fi
 
       add_apt_source "deb http://repo.percona.com/apt ${code_name} main"
+
+      # prefer packages from the percona repo if it exists
+      local pin_percona_conf_file=/etc/apt/preferences.d/20prefer-percona-packages.conf
+      if [ ! -e $pin_percona_conf_file ]; then
+        cat > $pin_percona_conf_file <<EOF
+# Created by $(basename $0) @ $(date)
+Package: *
+Pin: origin repo.percona.com
+Pin-Priority: 600
+EOF
+      fi
+
       run apt-get update
       mysql_server_packages="percona-server-server"
       mysql_client_packages="percona-server-client"

From 1fc4637842042c4a06ef60585cd7d79cbd0ab591 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Wed, 23 Jan 2013 16:13:50 +0100
Subject: [PATCH 1952/2585] ece-install - fixed spelling error

---
 usr/share/escenic/ece-scripts/ece-install.d/database.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 9a01b97e..5556e5df 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -90,7 +90,7 @@ EOF
       leave_trail "trail_db_vendor=mysql"
     fi
   elif [ $on_redhat_or_derivative -eq 1 ]; then
-    print_and_log "Settnig up the Percona repository ..."
+    print_and_log "Setting up the Percona repository ..."
 
     if [ $(rpm -qa | grep $percona_rpm_release_package_name | wc -l) -lt 1 ]; then
       run rpm -Uhv $percona_rpm_release_url

From d6736f3159b8e8cb4ef6901c2a51306533c3aff6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Wed, 23 Jan 2013 16:17:04 +0100
Subject: [PATCH 1953/2585] ece-dev-image - added vmdk and .ova export
 procedures

---
 usr/share/escenic/build-scripts/ece-dev-image | 305 +++++++++++++++++-
 1 file changed, 301 insertions(+), 4 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-dev-image b/usr/share/escenic/build-scripts/ece-dev-image
index 6e7e4f5f..0d29acdc 100755
--- a/usr/share/escenic/build-scripts/ece-dev-image
+++ b/usr/share/escenic/build-scripts/ece-dev-image
@@ -13,6 +13,13 @@ image_config_source=/usr/share/vizrt/vosa/generated-servers/skeleton-dev
 # defaults for configuration
 default_builder=builder.vizrtsaas.com
 
+# options for partial execution
+interactive=0
+skip_install=0
+skip_vmdk=0
+skip_ova=0
+
+
 ##
 function init
 {
@@ -68,6 +75,18 @@ function process_user_options
           -f|--conf-file)
             local argument_requested=1
             ;;
+          --skip-install)
+            skip_install=1
+            ;;
+          --skip-vmdk)
+            skip_vmdk=1
+            ;;
+          --skip-ova)
+            skip_ova=1
+            ;;
+          --interactive)
+            interactive=1
+            ;;
           *)
             print_and_log "Invalid option '$arg'"
             exit 1
@@ -148,7 +167,7 @@ function verify_configuration
   project_builder=${project_builder-$default_builder}
   ensure_variable_is_set project_builder
   
-  conf_package_deb=${conf_package_deb-http://$project_builder/$project_key/releases/vosa-conf-dev-latest.dev}
+  conf_package_deb=${conf_package_deb-http://$project_builder/$project_key/releases/vosa-conf-dev-latest.deb}
   ensure_variable_is_set conf_package_deb
   
   spore_package=${spore_package-http://$project_builder/$project_key/releases/spore-$project_key-development.tar.gz}
@@ -169,7 +188,9 @@ function generate_image_configuration
     exit 1  
   elif [ ! -d $image_config_source ]; then
     print_and_log "The source directory for image configuration '$image_config_source' does not exist, exiting!"
+    exit 1
   else
+    print_and_log "Generating configuration for $image_hostname based on $image_config_source using configuration file $conf_file."
     if [ -d $image_config_root/$image_hostname ]; then
       run rm -rf $image_config_root/$image_hostname
     fi
@@ -177,16 +198,245 @@ function generate_image_configuration
     run cp -r $image_config_source/* $image_config_root/$image_hostname/. 
 
     for f in `find $image_config_root/$image_hostname/. -type f | grep .tmpl`; do
-      echo "$f"
+      debug "Processing config template $f"
       echo "$(eval "echo \"$(cat $f)\"")" > ${f%.*}
       if [[ "${f%.*}" == *.sh ]]; then
-        chmod +x ${f%.*}
+        run chmod +x ${f%.*}
       fi
-      rm -f $f
+      run rm -f $f
     done
   fi
 }
 
+##
+function install_image
+{
+  print_and_log "Initiating installation of $image_hostname using 'vosa' command ..."
+  run vosa -i $image_hostname stop destroy create install
+  print_and_log "Installation finished successfully!"
+}
+
+##
+function process_raw_image
+{
+  image_host="ssh -F /var/lib/vizrt/vosa/images/$image_hostname/ssh.conf guest"
+  chroot_image_host="chroot /var/lib/vizrt/vosa/images/$image_hostname/small"
+  vboxmanage_output_dir=/var/www/html/dev
+  
+  cleanup_image_runtime
+  shutdown_image
+
+  create_and_mount_sparse
+  modify_sparse_and_unmount
+
+  export_zerofree_vmdk
+
+}
+
+##
+function cleanup_image_runtime
+{
+  print_and_log "Initiating runtime image cleanup ..."
+  $image_host sudo rm -rf /tmp/ece-downloads
+  $image_host sudo rm -rf /opt/escenic
+  $image_host sudo rm -rf /var/cache/escenic/*
+  $image_host sudo rm -rf /var/cache/ece-install/*
+  print_and_log "Image cleanup done!"
+}
+
+##
+function shutdown_image
+{
+  print_and_log "Shutting down image $image_hostname ..."
+  $image_host sudo shutdown -h now
+  sleep 5;
+  print_and_log "Waiting for image $image_hostname to stop ..."
+  while [ 1 ] ; do
+    local image_dead=$(vosa -i $image_hostname status | awk '{print $4}')
+    [[ "$image_dead" == "dead" ]] && break;
+    sleep 2;
+    echo -n .
+  done
+  print_and_log "Image $image_hostname has been stopped." 
+}
+
+##
+function create_and_mount_sparse
+{
+  print_and_log "Creating sparse copy of the original image ..."
+  run cp --sparse=always /var/lib/vizrt/vosa/images/$image_hostname/disk.img /var/lib/vizrt/vosa/images/$image_hostname/small.img
+  print_and_log "Mounting sparse copy under /var/lib/vizrt/vosa/images/$image_hostname/small ..."
+  run mkdir /var/lib/vizrt/vosa/images/$image_hostname/small
+  run mount -o loop /var/lib/vizrt/vosa/images/$image_hostname/small.img /var/lib/vizrt/vosa/images/$image_hostname/small
+}
+
+##
+function modify_sparse_and_unmount
+{
+  run $chroot_image_host cat /etc/hosts
+  $chroot_image_host <<END_OF_CHROOT
+rm /etc/udev/rules.d/70-persistent-net.rules
+sed -i '/^iface eth0/ s/static/dhcp/p; /^iface eth0/,/^[a-z]/d' /etc/network/interfaces
+(echo; echo '# eth1 is a host-only network'; echo 'auto eth1'; echo 'iface eth1 inet dhcp') | tee > /dev/null -a /etc/network/interfaces
+useradd -d /nonexistent -M --no-user-group --system --shell /usr/local/bin/escenic-top top
+passwd --delete top
+rm -rf /var/lib/puppet/
+apt-get -y remove puppet ruby x11-common
+apt-get -y remove cloud-init
+mkdir -p /usr/lib/cloud-init/
+(echo '#!/bin/sh'; echo 'exec /sbin/init "$@";') |
+tee /usr/lib/cloud-init/uncloud-init
+chmod +x /usr/lib/cloud-init/uncloud-init
+apt-get -y autoremove
+apt-get -y clean
+apt-get -y autoclean
+sync
+END_OF_CHROOT
+
+  run mkdir /var/lib/vizrt/vosa/images/$image_hostname/small/extlinux/
+  run extlinux --install /var/lib/vizrt/vosa/images/$image_hostname/small/extlinux/
+(
+cat <<EOF
+DEFAULT /vmlinuz
+APPEND root=/dev/sda noapic init=/usr/lib/cloud-init/uncloud-init ubuntu-pass=ubuntu ds=nocloud
+EOF
+) |
+tee /var/lib/vizrt/vosa/images/$image_hostname/small/extlinux/extlinux.conf
+
+  run umount /var/lib/vizrt/vosa/images/$image_hostname/small
+  run rm -rf /var/lib/vizrt/vosa/images/$image_hostname/small
+}
+
+##
+function export_zerofree_vmdk
+{
+  run mkdir -p $vboxmanage_output_dir
+  run rm -f $vboxmanage_output_dir/$image_hostname.vmdk
+  local size=$(ls -l /var/lib/vizrt/vosa/images/$image_hostname/small.img | awk '{print $5}')
+  run zerofree /var/lib/vizrt/vosa/images/$image_hostname/small.img
+  cat /var/lib/vizrt/vosa/images/$image_hostname/small.img | $pv vboxmanage convertfromraw stdin $vboxmanage_output_dir/$image_hostname.vmdk $size --format VMDK
+
+}
+
+##
+function export_as_ova
+{
+  if [ ! -e "/var/www/html/dev/$image_hostname.vmdk" ] ; then
+    echo "sparse image /var/www/html/dev/$image_hostname.vmdk does not exist"
+    exit 1
+  fi
+
+  local options=$(cat <<EOF | grep ^[^#]
+--name $image_hostname
+--ostype Ubuntu_64
+--memory 2048
+# --pagefusion on|off
+# --vram <vramsize in MB>
+--acpi on
+#--pciattach 03:04.0
+#--pciattach 03:04.0@02:01.0
+#--pcidetach 03:04.0
+--ioapic on
+--pae on
+#--hpet on|off
+#--hwvirtex on|off
+#--hwvirtexexcl on|off
+#--nestedpaging on|off
+#--largepages on|off
+#--nestedpaging on|off
+#--largepages on|off
+#--vtxvpid on|off
+--synthcpu off
+#--cpuidset <leaf> <eax> <ebx> <ecx> <edx>
+#--cpuidremove <leaf>
+#--cpuidremoveall
+#--hardwareuuid <uuid>
+--cpus 2
+#--cpuhotplug on|off
+#--plugcpu <id>
+#--unplugcpu <id>
+#--cpuexecutioncap <1-100>
+#--rtcuseutc on|off
+#--monitorcount <number>
+#--accelerate3d on|off
+#--accelerate2dvideo on|off
+#--firmware bios|efi|efi32|efi64
+#--chipset ich9|piix3
+#--bioslogofadein on|off
+#--bioslogofadeout on|off
+#--bioslogodisplaytime <msec>
+#--bioslogoimagepath <imagepath>
+#--biosbootmenu disabled|menuonly|messageandmenu
+#--biossystemtimeoffset <msec>
+#--biospxedebug on|off
+--boot1 dvd
+--boot2 disk
+--boot3 none
+--boot4 none
+
+# NIC 1, NAT, for outbound traffic
+--nic1 nat
+--nictype1 virtio
+--cableconnected1 on
+--macaddress1 auto
+
+# NIC 2, Host Only, for inbound connections
+--nic2 hostonly
+--hostonlyadapter2 vboxnet0
+--nictype2 virtio
+--cableconnected2 on
+--macaddress2 auto
+
+--audio none
+--clipboard disabled
+--vrde off
+--usb off
+EOF
+)
+  run vboxmanage createvm --name $image_hostname --basefolder /tmp/$image_hostname --ostype Ubuntu_64 --register
+  
+  run vboxmanage modifyvm $image_hostname $options
+  
+  run vboxmanage storagectl $image_hostname \
+    --name "IDE Controller" \
+    --add ide \
+    --controller PIIX4 \
+    --hostiocache on \
+    --bootable on
+  
+  run vboxmanage storageattach $image_hostname \
+    --storagectl "IDE Controller" \
+    --port 0 \
+    --storagectl "IDE Controller" \
+    --port 0 \
+    --device 0 \
+    --type hdd \
+    --medium /var/www/html/dev/$image_hostname.vmdk
+
+  if [ -e /var/www/html/dev/$image_hostname.ova ]; then
+    run rm -f /var/www/html/dev/$image_hostname.ova
+  fi
+
+  run vboxmanage export $image_hostname \
+     --output /var/www/html/dev/$image_hostname.ova \
+     --vsys 0 \
+     --product "Vizrt Online Development Image" \
+     --producturl "http://www.vizrt.com/" \
+     --eula "You solemnly swear that you are a Vizrt Employee, or have a license agreement with Vizrt."
+#    [--vendor <vendor name>]
+#    [--vendorurl <vendor url>]
+#    [--version <version info>]
+#    [--eulafile <filename>]
+
+  run chmod +r /var/www/html/dev/$image_hostname.ova
+  (cd /var/www/html/dev/; md5sum $image_hostname.ova > $image_hostname.ova.md5)
+  run vboxmanage unregistervm $image_hostname
+  run rm -rf /tmp/$image_hostname
+  if [ -e /var/www/html/dev/$image_hostname.vmdk ]; then
+    run rm -f /var/www/html/dev/$image_hostname.vmdk 
+  fi
+}
+
 ##
 function phase_startup 
 {
@@ -206,6 +456,53 @@ function phase_pre_execution
 function phase_execution 
 {
   generate_image_configuration
+  install_image
+  if [ $interactive -eq 1 ]; then
+    while [ 1 ]; do
+      echo -n "Do you want to prepare the $image_hostname image for .ova creation? [y/N]:"
+      read input
+      shopt -s nocasematch
+      case "$input" in
+        y|yes)
+          skip_vmdk=0
+          break
+          ;;
+        n|no)
+          skip_vmdk=1
+          break
+          ;;
+        *)
+          echo "Invalid input! Try again."
+          ;;
+        esac
+    done
+  fi 
+  if [ $skip_vmdk -ne 1 ]; then 
+    process_raw_image
+  fi
+  if [ $interactive -eq 1 ]; then
+    while [ 1 ]; do
+      echo -n "Do you want to export $image_hostname as an .ova? [y/N]:"
+      read input
+      shopt -s nocasematch
+      case "$input" in
+        y|yes)
+          skip_ova=0
+          break
+          ;;
+        n|no)
+          skip_ova=1
+          break
+          ;;
+        *)
+          echo "Invalid input! Try again."
+          ;;
+        esac
+    done
+  fi
+  if [ $skip_ova -ne 1 ]; then
+    export_as_ova
+  fi
 }
 
 ##

From 94432949e3f6a86918855ef4d2a28e624c45201f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Wed, 23 Jan 2013 16:57:27 +0100
Subject: [PATCH 1954/2585] ece-install - adjusted file extension for percona
 apt preference

---
 usr/share/escenic/ece-scripts/ece-install.d/database.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 5556e5df..3650a962 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -63,7 +63,7 @@ function set_up_percona_repository_if_possible() {
       add_apt_source "deb http://repo.percona.com/apt ${code_name} main"
 
       # prefer packages from the percona repo if it exists
-      local pin_percona_conf_file=/etc/apt/preferences.d/20prefer-percona-packages.conf
+      local pin_percona_conf_file=/etc/apt/preferences.d/20prefer-percona-packages
       if [ ! -e $pin_percona_conf_file ]; then
         cat > $pin_percona_conf_file <<EOF
 # Created by $(basename $0) @ $(date)

From 409fe60969d8569fc74b3c23636532e0396bdbf5 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 24 Jan 2013 11:42:46 +0100
Subject: [PATCH 1955/2585] Made permanent that only 503 causes varnish to
 invoke saintmode; not e.g. 500 (internal server errors)

---
 usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
index 5cf1f2ca..b407b848 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
@@ -434,7 +434,7 @@ sub vcl_fetch {
   if (beresp.status == 200) {
     set beresp.grace = 1h;
   }
-  else if (beresp.status >= 500) {
+  else if (beresp.status == 503) {
     /* For this URL, don't ask the backend again for this amount of
      * time. */
     set beresp.saintmode = 60s;

From 6e2528961b18cee1001c4611c7ff3e1b17f5209d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Fri, 25 Jan 2013 09:58:46 +0100
Subject: [PATCH 1956/2585] ece-dev-image - refactoring commands to make output
 more clean

---
 usr/share/escenic/build-scripts/ece-dev-image | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-dev-image b/usr/share/escenic/build-scripts/ece-dev-image
index 0d29acdc..8b4ab06b 100755
--- a/usr/share/escenic/build-scripts/ece-dev-image
+++ b/usr/share/escenic/build-scripts/ece-dev-image
@@ -220,7 +220,6 @@ function install_image
 function process_raw_image
 {
   image_host="ssh -F /var/lib/vizrt/vosa/images/$image_hostname/ssh.conf guest"
-  chroot_image_host="chroot /var/lib/vizrt/vosa/images/$image_hostname/small"
   vboxmanage_output_dir=/var/www/html/dev
   
   cleanup_image_runtime
@@ -273,8 +272,12 @@ function create_and_mount_sparse
 ##
 function modify_sparse_and_unmount
 {
-  run $chroot_image_host cat /etc/hosts
-  $chroot_image_host <<END_OF_CHROOT
+  
+  # perform image adjustments with chroot
+  debug "Initiating 'chroot' driven adjustments ..."
+  local chroot_image_host="chroot /var/lib/vizrt/vosa/images/$image_hostname/small"
+(
+cat <<END_OF_CHROOT
 rm /etc/udev/rules.d/70-persistent-net.rules
 sed -i '/^iface eth0/ s/static/dhcp/p; /^iface eth0/,/^[a-z]/d' /etc/network/interfaces
 (echo; echo '# eth1 is a host-only network'; echo 'auto eth1'; echo 'iface eth1 inet dhcp') | tee > /dev/null -a /etc/network/interfaces
@@ -292,7 +295,11 @@ apt-get -y clean
 apt-get -y autoclean
 sync
 END_OF_CHROOT
+) | run $chroot_image_host
+  debug "'chroot' driven adjustments done!"
 
+  # perform extlinux adjustments
+  debug "Initiating 'extlinux' adjustments ..."
   run mkdir /var/lib/vizrt/vosa/images/$image_hostname/small/extlinux/
   run extlinux --install /var/lib/vizrt/vosa/images/$image_hostname/small/extlinux/
 (
@@ -300,11 +307,16 @@ cat <<EOF
 DEFAULT /vmlinuz
 APPEND root=/dev/sda noapic init=/usr/lib/cloud-init/uncloud-init ubuntu-pass=ubuntu ds=nocloud
 EOF
-) |
-tee /var/lib/vizrt/vosa/images/$image_hostname/small/extlinux/extlinux.conf
+) | run tee /var/lib/vizrt/vosa/images/$image_hostname/small/extlinux/extlinux.conf
+  debug "'extlinux' adjustments done!"
 
+  # unmount .img
+  debug "Unmounting .img ..." 
   run umount /var/lib/vizrt/vosa/images/$image_hostname/small
-  run rm -rf /var/lib/vizrt/vosa/images/$image_hostname/small
+  
+  # delete mount target directory
+  debug "Removing mount point ..."
+  run rm -r /var/lib/vizrt/vosa/images/$image_hostname/small
 }
 
 ##

From 558c09a4ab2ff46cf95de554cebe3397d6d1735a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Fri, 25 Jan 2013 14:03:10 +0100
Subject: [PATCH 1957/2585] ece-install - Fixed usage of wrong variable that
 left trail_virtual_host_<publication_name> un-sourceable in trails file. This
 closes issue #11

---
 usr/share/escenic/ece-scripts/ece-install.d/app-server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 6898988f..6186ffbc 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -357,7 +357,7 @@ EOF
         />
       </Host>
 EOF
-      leave_trail "trail_virtual_host_${publication}=${domain}:${appserver_port}"
+      leave_trail "trail_virtual_host_${publication_name}=${domain}:${appserver_port}"
     done
   fi
 

From aca6690ef84c2e6b78a9c8d4b05ebbcd4cf84cda Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 28 Jan 2013 12:50:15 +0100
Subject: [PATCH 1958/2585] - clarified the fai_publication_ear prerequisites.
 - changed the use of 'script' with 'command' where this makes sense.

---
 usr/share/doc/escenic/ece-install-guide.org | 28 ++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 802feb8b..76dadaee 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -137,11 +137,11 @@ is as follows:
     descriptions of all available profiles, see Server Profiles.
  - For each server:
     * Log on to the server.
-    * Install the *ece-install* script (see Get ece-install).
+    * Install the *ece-install* command (see Get ece-install).
     * Become the root user (see Become Root).
     * Create an *ece-install* configuration file (see Create a
        Configuration File).
-    * Run the *ece-install* script, specifying the appropriate
+    * Run the *ece-install* command, specifying the appropriate
       profile (see Run ece-install).
 
 ** <<<Get ece-install>>>
@@ -272,7 +272,7 @@ the BASH interpreter with the -x flag:
 #+END_SRC
 
 Doing this lets you see everything that BASH does while executing the
-script - how wild card variables are  expanded and so on.
+command - how wild card variables are  expanded and so on.
 
 *ece-install* displays a series of progress messages during the
 installation process. you can redirect standard output to a log file
@@ -431,7 +431,7 @@ Given that *mysqld* is installed, this profile will download all the
 Escenic components and install the ECE database schema based from the
 SQL files contained inside the distribution bundles specified with in
 the *technet\_download\_list* and *wf\_dowload\_list* variables. The
-defaults are inside the *ece-install* script itself, but you can
+defaults are inside the *ece-install* command itself, but you can
 overrides these in your *ece-install.conf* if you wish different minor
 versions of the ECE and plugins.
 
@@ -505,7 +505,7 @@ typical requirements of an Escenic site:
 
 #+BEGIN_COMMENT
 TBD:
-- If run on a Linux platform, the script will tweak the kernel
+- If run on a Linux platform, the command will tweak the kernel
   parameters for optimal TCP handling for a web facing server.
 - let the /munin run through on port 80, requiring the connecting IPs
   to be in the staff network ACL, defined in the Varnish
@@ -579,7 +579,7 @@ To use this profile, add *fai\_restore\_from\_backup=1* to your
 
 Unlike all the other profiles, this profile does not install anything
 or create anything new. Instead, it restores a backup you have
-previously created using the *ece* script - like this, for example:
+previously created using the *ece* command - like this, for example:
 #+BEGIN_SRC text
 $ ece -i <instance> backup
 #+END_SRC
@@ -929,7 +929,7 @@ If you do not want ece-install to touch your */etc/hosts*, you can set
 *fai\_keep\_off\_etc\_hosts=1* in your *ece-install.conf*.
 
 ** Overview of All FAI Parameters
-The ece-install script understands the following settings in
+The *ece-install* command understands the following settings in
 the *ece-install.conf*:
 
 - *fai\_all\_conf\_archive* :: *conf.tar.gz* to use for Nursery & JAAS
@@ -1123,7 +1123,7 @@ the *ece-install.conf*:
 
 - *fai\_publication\_ear* :: All publications WARs inside will be used
      for publication creation
-     (assumes *fai\_publication\_create*). Default is "".
+     (requires that *fai\_publication\_create* is 1). Default is "".
 
 - *fai\_publication\_environment* :: The kind of
      environment/habitat. Typical values are: production, staging,
@@ -1245,7 +1245,7 @@ defaults could be used, but the second time you need to override the
 defaults to ensure that the second server gets different values.
 
 * Running More Than One Installation Process
-If the script believes there's already an ece-intall process running,
+If the command believes there's already an ece-intall process running,
 it will abort:
 #+BEGIN_SRC text
 There's already one ece-install process running. If you believe
@@ -1289,7 +1289,7 @@ You can specify a different configuration by using the -f parameter:
 # ece-install -f ece-install-presentation-server.conf
 #+END_SRC
 
-* Overview of File Paths Used by the ece-install script
+* Overview of File Paths Used by the ece-install command
 There are of course other paths involved when setting up your system,
 but these should be the most interesting ones.
 
@@ -1341,10 +1341,10 @@ but these should be the most interesting ones.
 - */opt/tomcat-<instance>* :: Instance specific Tomcat files
      (*catalina\_base*)
 
-- */usr/bin/ece* :: Script for operating all ECE instances + RMI hub
+- */usr/bin/ece* :: Command for operating all ECE instances + RMI hub
                     and EAE
 
-- */usr/sbin/ece-install* :: The installation script described in this
+- */usr/sbin/ece-install* :: The installation command described in this
      guide
 
 - */var/log/escenic/<type>-<instance>.log* :: The instance's log4j log
@@ -1576,8 +1576,8 @@ database when re-running an integration test), options are provided
 to override the default behaviour.
 
 ** Modularisation
-The script consists on ~20 modules, ~5 common libraries and the main
-executable:
+The command consists of around 20 modules, 5 common libraries and the
+main executable:
 - /usr/sbin/ece-install :: Responsible for parsing of arguments and
                  configuration and sending the request off to the
                  right sub module(s).

From 4b3577c858cef8f921edd2c06a5e2c53b6ef54f8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 28 Jan 2013 15:24:58 +0100
Subject: [PATCH 1959/2585] - fixed bug in fai_wf_install=1 when running as the
 only ece-install   profile. It will now set up the WF software binaries in
 /opt/escenic   even if there's no other ece-install profile that installs an
 ECE.

- fixed bug in fai_wf_install=1 where the links to the WF software
  binaries would be wrong if the directory inside the archive was
  different from the of the name of the archive bundle itself. This is
  to workaround a bug in WF itself, see EWF-1166, but it's
  nevertheless sane hardening.

- ece-install::common_pre_install now uses
  common-bashing::ensure_variable_is_set instead of having this code
  itself. This slims off a few lines of code
---
 usr/sbin/ece-install                          | 11 +--
 .../escenic/ece-scripts/common-bashing.sh     |  2 +-
 .../ece-install.d/widget-framework.sh         | 67 +++++++++++--------
 3 files changed, 44 insertions(+), 36 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 6cdb1712..7afb2596 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -561,8 +561,7 @@ function check_software_credentials() {
   fi
 }
 
-function common_pre_install()
-{
+function common_pre_install() {
     print "I'm logging to $log"
 
     run source $conf_file
@@ -589,12 +588,8 @@ function common_pre_install()
       $escenic_spool_dir/import
     "
     ece_install_env=${escenic_run_dir}/$(basename $0).env
-
-    if [ -z "$technet_user" -o -z "$technet_password" ]; then
-        print_and_log "Be sure to set technet_user and technet_password "
-        print_and_log "in $conf_file"
-        remove_pid_and_exit_in_error
-    fi
+    ensure_variable_is_set technet_user technet_password
+    wget_auth="--http-user ${technet_user} --http-password ${technet_password}"
 
     if [ -e /etc/debian_version -a -x /usr/bin/dpkg ]; then
         on_debian_or_derivative=1
diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index 2e9a3ba6..2dda48b2 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -275,7 +275,7 @@ function ensure_variable_is_set() {
       continue
     fi
 
-    print_and_log "You need to specifiy '$el' in your $conf_file"
+    print_and_log "You need to specifiy '$el' in $conf_file"
     requirements_failed=1
   done
 
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh b/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
index c8efe896..dac693ed 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
@@ -1,12 +1,20 @@
-function install_widget_framework()
-{
-  print_and_log "Installing Widget Framework on $HOSTNAME ..."
-  # TODO java.lang.NoClassDefFoundError:
-  # Lcom/escenic/framework/captcha/ReCaptchaConfig;
-  
-  local wf_user=$(get_conf_value wf_user)
-  local wf_password=$(get_conf_value wf_password)
+function download_and_extract_wf_archives_if_necessary() {
+  for el in $wf_download_list; do
+    # functions bleed even locally scoped variables, so we save a copy
+    # of it here in archive.
+    local archive=$el
+    download_uri_target_to_dir $archive $download_dir
+    local dir=$(get_base_dir_from_bundle $download_dir/$(basename $archive))
+
+    if [ ! -e $escenic_root_dir/$dir ]; then
+      run run unzip -q -u -o \
+        -d $escenic_root_dir \
+        $download_dir/$(basename $archive)
+    fi
+  done
+}
 
+function create_maven_settings_file() {
   print_and_log "Creating a Maven settings file: $HOME/.m2/settings.xml ..."
   make_dir $HOME/.m2
   cat > $HOME/.m2/settings.xml <<EOF
@@ -43,14 +51,6 @@ function install_widget_framework()
 $(get_proxy_conf_if_set)
 </settings>
 EOF
-
-  install_wf_1_if_present
-  install_wf_2_if_present
-  
-  set_up_wf_nursery_config
-
-  add_next_step "Widget Framework has been installed into your " \
-    " Maven repo"
 }
 
 ## Will add Maven HTTP(s) proxy configuration if either of the
@@ -65,7 +65,7 @@ function get_proxy_conf_if_set() {
   <proxies>
 EOF
   fi
-  
+
   if [ -n "$http_proxy" ]; then
     local proxy_host=$(echo $http_proxy | sed 's#http://##g' | cut -d':' -f1)
     local proxy_port=$(echo $http_proxy | sed 's#http://##g' | cut -d':' -f2)
@@ -78,7 +78,7 @@ EOF
     </proxy>
 EOF
   fi
-  
+
   if [ -n "$https_proxy" ]; then
     local proxy_host=$(echo $https_proxy | sed 's#https://##g' | cut -d':' -f1)
     local proxy_port=$(echo $https_proxy | sed 's#https://##g' | cut -d':' -f2)
@@ -91,7 +91,7 @@ EOF
     </proxy>
 EOF
   fi
-  
+
   if [[ -n "$http_proxy" || -n "$https_proxy" ]]; then
     cat <<EOF
   </proxies>
@@ -100,6 +100,20 @@ EOF
   fi
 }
 
+function install_widget_framework() {
+  print_and_log "Installing Widget Framework on $HOSTNAME ..."
+
+  ensure_variable_is_set wf_user wf_password
+  download_and_extract_wf_archives_if_necessary
+  create_maven_settings_file
+
+  install_wf_1_if_present
+  install_wf_2_if_present
+
+  set_up_wf_nursery_config
+
+  add_next_step "Widget Framework has been installed into your Maven repo"
+}
 
 function set_up_wf_nursery_config() {
   for el in $wf_download_list; do
@@ -118,15 +132,15 @@ function set_up_wf_nursery_config() {
 function install_wf_1_if_present() {
   for el in $wf_download_list; do
     local wf_dist_dir=$(basename $el .zip)
-    
+
     if [[ $wf_dist_dir != "widget-framework-[a-z]*-1.1*" ]]; then
       return
     fi
-    
+
     install_packages_if_missing "maven2"
     assert_commands_available mvn
     export JAVA_HOME=$java_home
-    
+
     print_and_log "Installing Widget Framework into your Maven repository ..."
     local wf_maven_dir=$escenic_root_dir/$wf_dist_dir/maven
     run cd $wf_maven_dir
@@ -136,8 +150,8 @@ function install_wf_1_if_present() {
 
 function install_wf_2_if_present() {
   for el in $wf_download_list; do
-    local wf_dist_dir=$(basename $el .zip)
-    
+    local wf_dist_dir=$(get_base_dir_from_bundle $download_dir/$(basename $el))
+
     if [[ $wf_dist_dir == "widget-framework-[a-z]*-1.1*" ]]; then
       return
     fi
@@ -145,12 +159,11 @@ function install_wf_2_if_present() {
     if [ ! -d $escenic_root_dir/assemblytool/plugins ]; then
       return
     fi
-        
+
     run cd $escenic_root_dir/assemblytool/plugins
-    
+
     if [ ! -h $wf_dist_dir ]; then
       ln -s $escenic_root_dir/$wf_dist_dir
     fi
   done
 }
-

From c519f2050149816c8ecd1988a52fbe508157e1cb Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 28 Jan 2013 15:46:46 +0100
Subject: [PATCH 1960/2585] - removed obsolete method
 ece-install::get_conf_value

---
 usr/sbin/ece-install | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 7afb2596..8e49d085 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -752,22 +752,6 @@ function run_hook()
     fi
 }
 
-# reads the value of the desired setting from $conf_file
-#
-# parameters: $1 : the conf key, see ece-install-guide.txt for an
-# overview of the available keys.
-function get_conf_value()
-{
-    if [ ! -e "$conf_file" ]; then
-        print_and_log $conf_file "doesn't exist."
-        remove_pid_and_exit_in_error
-    fi
-
-    if [ $(grep $1 $conf_file | grep -v ^# | sort | uniq | wc -l) -gt 0 ]; then
-        echo $(grep $1 $conf_file | grep -v ^# | cut -d'=' -f2)
-    fi
-}
-
 # useful for development and test environments.
 function install_all_in_one_environment()
 {

From 73e5b470777b2fd1aeb40272b2843fc2d171ddbd Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 28 Jan 2013 15:52:05 +0100
Subject: [PATCH 1961/2585] - moved parsing of user input into its own method -
 hardened it a wee bit

---
 usr/sbin/ece-install | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 8e49d085..89e58c81 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -902,28 +902,31 @@ function leave_trail() {
   echo "$@" >> $ece_install_trail_file
 }
 
-for el in $@; do
+function read_user_input() {
+  for el in "$@"; do
     if [ $el = "-v" -o $el = "--verbose" ]; then
-        debug=1
+      debug=1
     elif [ $el = "-V" -o $el = "--version" ]; then
       echo "Version:" $ece_scripts_version
       exit 0
     elif [ $el = "-f" -o $el = "--conf-file" ]; then
-        next_is_conf_file=1
+      next_is_conf_file=1
     elif [[ -n $next_is_conf_file && $next_is_conf_file -eq 1 ]]; then
-        conf_file=$el
-        case ${conf_file} in
-            /*)
-                ;;
-            *)
-                conf_file=$(pwd)/${conf_file}
-                ;;
-        esac
-
-        next_is_conf_file=0
+      conf_file=$el
+      case ${conf_file} in
+        /*)
+          ;;
+        *)
+          conf_file=$(pwd)/${conf_file}
+          ;;
+      esac
+
+      next_is_conf_file=0
     fi
-done
+  done
+}
 
+read_user_input "$@"
 init
 assert_correct_runtime_environment
 

From 1931eef5e32926be7edd41a4abceecaed56ab733 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 28 Jan 2013 16:02:34 +0100
Subject: [PATCH 1962/2585] - changed ece-install::leave_trail to produce
 trails in   escenic_data_dir, i.e. /var/lib/escenic/ece-install/ instead of  
 /var/lib/ece-install so that it's in sync with the rest of the   locations
 where ece-install writes its things.

- added trail of the newly generated Maven settings file.
---
 usr/sbin/ece-install                                   |  2 +-
 .../ece-scripts/ece-install.d/widget-framework.sh      | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 89e58c81..c1de8015 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -894,7 +894,7 @@ function un_install_everything() {
   print "have been removed from ${HOSTNAME}."
 }
 
-ece_install_trail_file=/var/lib/$(basename $0)/$(date +%s)-$(basename $0).trail
+ece_install_trail_file=${escenic_data_dir}/$(basename $0)/$(date +%s)-$(basename $0).trail
 ## $@ add this trail
 function leave_trail() {
   local dir=$(dirname $ece_install_trail_file)
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh b/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
index dac693ed..3edff9e6 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
@@ -15,9 +15,10 @@ function download_and_extract_wf_archives_if_necessary() {
 }
 
 function create_maven_settings_file() {
-  print_and_log "Creating a Maven settings file: $HOME/.m2/settings.xml ..."
-  make_dir $HOME/.m2
-  cat > $HOME/.m2/settings.xml <<EOF
+  local file=$HOME/.m2/settings.xml
+  print_and_log "Creating a Maven settings file: $file ..."
+  make_dir $(dirname $file)
+  cat > $file <<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <settings xmlns="http://maven.apache.org/settings/1.0.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -51,6 +52,8 @@ function create_maven_settings_file() {
 $(get_proxy_conf_if_set)
 </settings>
 EOF
+
+  leave_trail trail_wf_maven_settings_file=$file
 }
 
 ## Will add Maven HTTP(s) proxy configuration if either of the
@@ -95,7 +98,6 @@ EOF
   if [[ -n "$http_proxy" || -n "$https_proxy" ]]; then
     cat <<EOF
   </proxies>
-
 EOF
   fi
 }

From 375c2cdd507086f59c50bb059cd3db738d29d1ab Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Mon, 28 Jan 2013 16:06:24 +0100
Subject: [PATCH 1963/2585] - fai_wf_install=1 will no longer overwrite an
 existing settings.xml   if present in root's home directory.

- cleaned up widget-framework::create_maven_settings_file a wee bit.
---
 .../escenic/ece-scripts/ece-install.d/widget-framework.sh   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh b/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
index 3edff9e6..2ae4a32f 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/widget-framework.sh
@@ -16,6 +16,12 @@ function download_and_extract_wf_archives_if_necessary() {
 
 function create_maven_settings_file() {
   local file=$HOME/.m2/settings.xml
+  if [ -e $file ]; then
+    print_and_log "Maven settings file $file already exists," \
+      "not touching it."
+    return
+  fi
+
   print_and_log "Creating a Maven settings file: $file ..."
   make_dir $(dirname $file)
   cat > $file <<EOF

From 6ad95eed4b727b02b75f9d3187eb75ee6a5bb545 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 29 Jan 2013 11:50:49 +0100
Subject: [PATCH 1964/2585] - added documentation for technet_user,
 technet_password, wf_user &   wf_password.

---
 usr/share/doc/escenic/ece-install-guide.org | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 76dadaee..6b075b4d 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -1,3 +1,4 @@
+
 #+TITLE: Escenic Installer User Guide
 #+AUTHOR: Vizrt Online / The SaaS Team
 #+OPTIONS: H:6 num:5 toc:2
@@ -559,7 +560,7 @@ fai_publication_domain_mapping_list="
 "
 #+END_SRC
 
-See [[Overview of All FAI Parameters]] for further details on the format
+See [[Overview of All Configuration Parameters]] for further details on the format
 of the domain mapping list.
 
 ** <<<fai\_all\_install>>>
@@ -928,10 +929,16 @@ add entries for these domains to the machine's */etc/hosts* file:
 If you do not want ece-install to touch your */etc/hosts*, you can set
 *fai\_keep\_off\_etc\_hosts=1* in your *ece-install.conf*.
 
-** Overview of All FAI Parameters
+** Overview of All Configuration Parameters
 The *ece-install* command understands the following settings in
 the *ece-install.conf*:
 
+- *technet\_user* and *technet\_password* The user name and password
+  used to access Technet for downloading Escenic software.
+
+- *wf\_user* and *wf\_password* The user name and password used for
+  downloading the Widget Framework.
+
 - *fai\_all\_conf\_archive* :: *conf.tar.gz* to use for Nursery & JAAS
      configuration. Default is "".
 

From ed55328d857c33c9b00b6e100ce1ddc75e21815e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 29 Jan 2013 11:53:20 +0100
Subject: [PATCH 1965/2585] - common-os::download_tomcat now uses  
 common-io:download_uri_target_to_dir

---
 usr/share/escenic/ece-scripts/common-os.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index bb333433..75092fae 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -10,8 +10,6 @@ common_bashing_is_loaded > /dev/null 2>&1 || source $(pwd)/common-bashing.sh
 ## Only used if the Tomcat download mirror couldn't be determined
 fallback_tomcat_url="http://apache.komsys.org/tomcat/tomcat-6/v6.0.36/bin/apache-tomcat-6.0.36.tar.gz"
 
-wget_opts="--continue --inet4-only --quiet"
-
 # Can be used like this:
 # common_io_os_loaded 2>/dev/null || source common-os.sh
 function common_os_is_loaded() {
@@ -143,8 +141,7 @@ function download_tomcat() {
   local url=$(get_tomcat_download_url)
 
   print_and_log "Downloading Tomcat from $url ..."
-  run cd $1
-  run wget $wget_opts $url
+  download_uri_target_to_dir $url $1
 }
 
 function get_free_memory_in_mega_bytes() {

From d8735a7189d63654ddb5daa90e52e51071c6505e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 29 Jan 2013 11:54:27 +0100
Subject: [PATCH 1966/2585] - Introduced new feature: Whenever using wget to
 download software,   ece-install will add something to the UA string of wget
 so that it's   possible to identify what the command downloads.

  If you wish to turn this feature off, set keep_off_wget_user_agent to
  0.
---
 usr/sbin/ece-install                        | 6 ++++++
 usr/share/doc/escenic/ece-install-guide.org | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index c1de8015..f1ac4339 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -630,6 +630,12 @@ function common_pre_install() {
     install_common_os_packages
     create_user_and_group_if_not_present $ece_user $ece_group
     set_up_user_environment
+
+    if [ ${keep_off_wget_user_agent-0} -eq 0 ]; then
+      wget_opts="${wget_opts}
+        --header User-Agent:wget/$(basename $0)-${ece_scripts_version}
+      "
+    fi
 }
 
 # $1 is the default instance name, the calee is responsible for
diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 6b075b4d..600a9e83 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -939,6 +939,11 @@ the *ece-install.conf*:
 - *wf\_user* and *wf\_password* The user name and password used for
   downloading the Widget Framework.
 
+- *keep\_off\_wget\_user\_agent* Whenever using *wget* to download
+  software, ece-install will add something to the UA string of *wget*
+  so that it's possible to identify what the command downloads. If
+  you wish to turn this feature off, set this to *0*.
+
 - *fai\_all\_conf\_archive* :: *conf.tar.gz* to use for Nursery & JAAS
      configuration. Default is "".
 

From 3fef65ced771820c4054b92e4d1f37409e5fa6cd Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Wed, 30 Jan 2013 10:26:00 +0100
Subject: [PATCH 1967/2585] Stop will remove pidfile if the image is dead.

---
 usr/bin/vosa | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 4bc1bb21..f49ef3b8 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -1026,6 +1026,10 @@ function do_stop() {
       echo "$instance_name is not installed, it's ${status[2]}. I can't stop it."
       exit 1
     fi
+    if [ "${status[3]}" == "dead" ] ; then
+      local pidfile=$(echo_rundir_of ${status[0]})/${status[0]}.pid
+      rm -f $pidfile
+    fi
     if [ "${status[3]}" == "alive" -o "${status[3]}" == "running" ] ; then
       shutdown "${status[0]}"
       # should now be "dead" if we asked it.

From 70ea8d99273e51437872ce1ea38002aedbd1328a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 29 Jan 2013 13:12:43 +0100
Subject: [PATCH 1968/2585] - removed shebang as this is a module and not a
 standalone command.

---
 .../escenic/ece-scripts/ece.d/remove-old-log-files.sh      | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/remove-old-log-files.sh b/usr/share/escenic/ece-scripts/ece.d/remove-old-log-files.sh
index 65cf6e96..35b9d143 100644
--- a/usr/share/escenic/ece-scripts/ece.d/remove-old-log-files.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/remove-old-log-files.sh
@@ -1,5 +1,3 @@
-#! /usr/bin/env bash
-
 # removes log files older than <numbber> days
 old_log_file_max_age_in_days=5
 
@@ -16,7 +14,7 @@ function get_log_file_dir_list() {
 
 function remove_old_logs_if_exist() {
   debug "Looking for old log files in $1 ..."
-  
+
   local old_log_files="$(
     find -L $1 -mtime +${old_log_file_max_age_in_days} -type f
   )"
@@ -25,7 +23,8 @@ function remove_old_logs_if_exist() {
     return
   fi
 
-  print_and_log "Deleting" $(echo "$old_log_files" | wc -l) \
+  print_and_log "Deleting" \
+    $(echo "$old_log_files" | wc -l) \
     "log files in $1" \
     "older than ${old_log_file_max_age_in_days} days"
   run rm $old_log_files

From 524367868c40959667c1020bc1032e9610dbdb79 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 29 Jan 2013 15:32:57 +0100
Subject: [PATCH 1969/2585] - updated the ece-install cache directory

---
 usr/share/doc/escenic/ece-install-guide.org | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 600a9e83..1558d756 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -1280,9 +1280,9 @@ and only if any are missing will it ask the package manager to fetch
 it.
 
 Likewise, *ece-install* will see if the Escenic artifacts or
-application server that you need are already present in the
-*/var/cache/ece-install* folder, and only download the missing ones
-(if any).
+application server that you need are already present in
+the */var/cache/escenic/ece-install* folder, and only download the
+missing ones (if any).
 
 To get a list of the artifacts it'll pull from
 http://technet.escenic.com and http://tomcat.apache.org search for the

From d4918a3d64084266afb7b3563f9113dc95735cef Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Tue, 29 Jan 2013 15:43:42 +0100
Subject: [PATCH 1970/2585] - improved the wording in the
 fai_publication_create section.

---
 usr/share/doc/escenic/ece-install-guide.org | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 1558d756..c588235c 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -548,12 +548,13 @@ create publication is based on the Widget Framework. Otherwise the
 publication is based on the clean demo WAR supplied with the Content
 Engine.
 
-*ece-install* will create publication of all publication WAR files you
-have in your EAR file if you also define
-*fai\_publication\_domain\_mapping\_list* and *fai\_publication\_ear*.
+*ece-install* will create publications of all the publication WAR
+files in your EAR file if you also
+define *fai\_publication\_domain\_mapping\_list*
+and *fai\_publication\_ear*.
 #+BEGIN_SRC text
 fai_publication_create=1
-fai_publication_ear=/tmp/stoppok-trunk-rev6195-2012-12-04_1134.ear
+fai_publication_ear=/tmp/stoppok-rev6195-2012-12-04_1134.ear
 fai_publication_domain_mapping_list="
   stoppok,st.war#stoppok.example.com#newindian.example.com
   helden#dinamani.example.com#helden.example.com

From d9633cb2c228a422143756f7dd93e33b6112bb05 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 30 Jan 2013 13:39:50 +0100
Subject: [PATCH 1971/2585] - updated the default value of
 fai_publication_use_instance

---
 usr/share/doc/escenic/ece-install-guide.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index c588235c..f6d675eb 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -1146,7 +1146,7 @@ the *ece-install.conf*:
      *mypub*.
 
 - *fai\_publication\_use\_instance* :: Name of local instance to use
-     for creation. Default is dev1.
+     for creation. Default is *engine1*.
 
 - *fai\_publication\_war* :: WAR to base the new publication
      on. Default is "WF or ECE demo WAR".

From 5cec7b7e489aee85607e0109f145e9b3f6b03853 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 30 Jan 2013 13:41:34 +0100
Subject: [PATCH 1972/2585] - updated documentation

- made it better parse-able
---
 .../escenic/ece-scripts/common-bashing.sh     | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index 2dda48b2..0f27dcfb 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -10,11 +10,11 @@
 
 debug=0
 
-## basename $0 will resolve to the file name of the calling script,
-## not common-bashing itself.
+# basename $0 will resolve to the file name of the calling script,
+# not common-bashing itself.
 lock_file=/var/run/escenic/$(basename $0 .sh).lock
 
-## Same comment as for the lock file :-)
+# Same comment as for the lock file :-)
 pid_file=/var/run/escenic/$(basename $0 .sh).pid
 
 function common_bashing_is_loaded() {
@@ -155,6 +155,7 @@ function fail_safe_run() {
 }
 
 ## Returns 1 if the passed argument is a number, 0 if not.
+##
 ## $1: the value you wish to test.
 function is_number() {
   for (( i = 0; i < ${#1}; i++ )); do
@@ -182,8 +183,6 @@ function get_escaped_bash_string() {
 # Munin nodes need the IP of the munin gatherer to be escaped. Hence
 # this function.
 #
-# Parameters:
-#
 # $1 : the IP
 function get_perl_escaped() {
   local escaped_input=$(
@@ -262,11 +261,10 @@ function get_base_dir_from_bundle()
 }
 
 ## Will assert that all the passed variable names are set, if not, it
-## will exit in error.
+## Requires $conf_file to be set.  will exit in error.
 ##
 ## $@ : a list of variable names
 ##
-## Requires $conf_file to be set.
 function ensure_variable_is_set() {
   local requirements_failed=0
 
@@ -302,6 +300,8 @@ function is_archive_healthy() {
   fi
 }
 
+## Extracts any of the following archives: tar.gz, tgz, zip, tar.bz2
+##
 ## $1 :: the archive
 ## $2 :: optionally, the target directory
 function extract_archive() {
@@ -330,7 +330,9 @@ function extract_archive() {
 # components.
 next_steps=()
 
-## Parameters:
+## Adds a next step for the user to do after finishing running your
+## command.
+##
 ## $1 : your added line
 function add_next_step() {
   next_steps[${#next_steps[@]}]="$@"
@@ -351,6 +353,7 @@ function print_next_step_list() {
 
 ## Method will return 1 if the user/pass is unauthorized to access the
 ## URL in question. Hence, a 0 means that the user CAN access the URL.
+##
 ## $1 user
 ## $2 pass
 ## $3 URL
@@ -362,6 +365,7 @@ function is_unauthorized_to_access_url() {
 }
 
 ## Will return 1 if the user can access the URL.
+##
 ## $1 user
 ## $2 pass
 ## $3 URL
@@ -378,6 +382,9 @@ function ltrim() {
   echo $1 | sed 's/^[ ]*//g'
 }
 
+## Splits a string based on a delimter, just like you're used to from
+## Python, Java++
+##
 ## $1    : the character on to wich to split it
 ## $@[1] : the rest of the arguments is the string(s) you want to have
 ##         splitted.

From 7f44af8c094dcb22ba80e4b03c9e4886abff2345 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 30 Jan 2013 13:43:09 +0100
Subject: [PATCH 1973/2585] - added support for jar file sto
 common-bashing::is_archive_healthy

---
 usr/share/escenic/ece-scripts/common-bashing.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index 0f27dcfb..0f95a70b 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -284,7 +284,7 @@ function ensure_variable_is_set() {
 
 ## $1 : the archive to check, must be a local file
 function is_archive_healthy() {
-  if [[ "$1" == *".ear" || "$1" == *".zip" ]]; then
+  if [[ "$1" == *".ear" || "$1" == *".zip" || "$1" == *".jar" ]]; then
     unzip -t $1 2>/dev/null 1>/dev/null
   elif [[ "$1" == *".tar.gz" ]]; then
     tar tzf $1 2>&1 > /dev/null

From 50d7b6b8a0079054db8b3524aa13ad5a4241ce34 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 30 Jan 2013 14:18:23 +0100
Subject: [PATCH 1974/2585] - clarified documentation for
 keep_off_wget_user_agent

---
 usr/share/doc/escenic/ece-install-guide.org | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index f6d675eb..335d86a4 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -940,10 +940,11 @@ the *ece-install.conf*:
 - *wf\_user* and *wf\_password* The user name and password used for
   downloading the Widget Framework.
 
-- *keep\_off\_wget\_user\_agent* Whenever using *wget* to download
-  software, ece-install will add something to the UA string of *wget*
-  so that it's possible to identify what the command downloads. If
-  you wish to turn this feature off, set this to *0*.
+- *keep\_off\_wget\_user\_agent* Whenever *ece-install* uses *wget* to
+  download software, *ece-install* will add something to the user
+  agent string of *wget* so that it's possible to identify what
+  the *ece-install* command downloads. If you wish to turn this
+  feature off, set this to *0*.
 
 - *fai\_all\_conf\_archive* :: *conf.tar.gz* to use for Nursery & JAAS
      configuration. Default is "".

From 3311e43b46aab3ed871a653e8df393ce5ae478eb Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Wed, 30 Jan 2013 14:54:29 +0100
Subject: [PATCH 1975/2585] - Added example ece-install.conf which will:

   * set up a presentation server, downloading ECE & plugins + Assembly
     Tool from Technet.

   * Make the above presentation profile use a provided WAR file for
     creating a publication definition in the abovementioned
     assemblytool, which again will be deployed on the new
     presentation server.

   * Make sure the above presentation server gets the correct host
     context defintion for your publication.

- added more hints to the listing of fai_publication_name and _war
  in the mange page; what these parameters can be used for.

- added feature to content-engine::set_up_assembly_tool:
  it will now  set up a publication definition based on the
  fai_publication_name and _war settings.

  We only support one publication for now as it's becoming more and
  more seldom to set up AT with ece-install. Instead, more and more
  folks are using pre-built EARs to make the deployment as a part of
  the ece-install process). Future enhancement would be to support
  fai_publication_domain_mapping_list and
  fai_<presentation|editor>_ear for creating publication definitions
  and WARs.

- removed support for fai_publication_war_uri_list as this is obsolete
  now that we've got the fai_<profile>_ear parameter.
---
 usr/share/doc/escenic/ece-install-guide.org   | 17 +++++---
 ...resentation-server-with-assembly-tool.conf | 21 ++++++++++
 .../ece-install.d/content-engine.sh           | 42 +++++++++----------
 3 files changed, 51 insertions(+), 29 deletions(-)
 create mode 100644 usr/share/doc/escenic/examples/ece-install-presentation-server-with-assembly-tool.conf

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 335d86a4..6cda2bda 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -1143,22 +1143,27 @@ the *ece-install.conf*:
      environment/habitat. Typical values are: production, staging,
      testing, development.. Default is "production".
 
-- *fai\_publication\_name* :: Name of the publication. Default is
-     *mypub*.
+- *fai\_publication\_name* :: Name of the publication. Default
+     is *mypub*. When installing an editorial or presentation server
+     and not using an EAR, you can specify *fai\_publication\_name*
+     and *fai\_publication\_war* to have *ece-install* set up the
+     correct publication definition for your Assembly Tool
+     environment.
 
 - *fai\_publication\_use\_instance* :: Name of local instance to use
      for creation. Default is *engine1*.
 
 - *fai\_publication\_war* :: WAR to base the new publication
-     on. Default is "WF or ECE demo WAR".
+     on. Default is WF demo WAR (if present) or the ECE demo
+     WAR. When installing an editorial or presentation server and
+     not using an EAR, you can specify *fai\_publication\_name*
+     and *fai\_publication\_war* to have *ece-install* set up the
+     correct publication definition for your Assembly Tool environment.
 
 - *fai\_publication\_war\_remove\_file\_list* :: File list that should
      be removed from all WARs inside *fai\_publication\_ear*
      or *fai\_publication\_war*. Default is "".
 
-- *fai\_publication\_war\_uri\_list* :: Publication WARs used for
-     setting up Assembly tool.. Default is "".
-
 - *fai\_rmi\_install* :: Install the RMI hub profile. Default is 0.
 
 - *fai\_search\_conf\_archive* :: *conf.tar.gz* :: to use for Nursery
diff --git a/usr/share/doc/escenic/examples/ece-install-presentation-server-with-assembly-tool.conf b/usr/share/doc/escenic/examples/ece-install-presentation-server-with-assembly-tool.conf
new file mode 100644
index 00000000..a899d84e
--- /dev/null
+++ b/usr/share/doc/escenic/examples/ece-install-presentation-server-with-assembly-tool.conf
@@ -0,0 +1,21 @@
+technet_user=
+technet_password=
+wf_user=
+wf_password=
+
+fai_enabled=1
+
+# This will set up a presentation server, downloading ECE & plugins +
+# Assembly Tool from Technet.
+fai_presentation_install=1
+
+# This will make the above presentation profile use a provided WAR
+# file for creating a publication definition in the abovementioned
+# assemblytool, which again will be deployed on the new presentation
+# server.
+fai_publication_name=mypub
+fai_publication_war=/tmp/mypub.war
+
+# This will make sure the above presentation server gets the correct
+# host context defintion for your publication.
+fai_publication_domain_mapping_list="mypub#mypub.example.com"
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index ec856d25..702da622 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -302,30 +302,26 @@ EOF
 
   make_dir $escenic_root_dir/assemblytool/publications
 
-  # set up user publication definitions
-  if [ -n "${fai_publication_war_uri_list}" ]; then
-    run cd $escenic_root_dir/assemblytool/publications
-
-    wget_auth=$wget_builder_auth
-    for el in ${fai_publication_war_uri_list}; do
-      download_uri_target_to_dir \
-        $el \
-        $escenic_root_dir/assemblytool/publications
-      local download_file=$escenic_root_dir/assemblytool/publications/$(basename $el)
-
-      if [ ! -e $(basename $el) ]; then
-        print_and_log "Failed to get user publication $el." \
-          "I will skip it and continue to the next one."
-        continue
-      fi
-
-      local short_name=$(basename $el .war)
-      cat > ${short_name}.properties <<EOF
-name: ${short_name}
-source-war: ${short_name}.war
-context-root: ${short_name}
+  # Set up a publication definition
+  #
+  # We only support one publication for now as it's becoming more and
+  # more seldom to set up AT with ece-install. Instead, more and more
+  # folks are using pre-built EARs to make the deployment as a part of
+  # the ece-install process). Future enhancement would be to support
+  # fai_publication_domain_mapping_list and
+  # fai_<presentation|editor>_ear for creating publication definitions
+  # and WARs.
+  if [[ -n "${fai_publication_name}" && -n "${fai_publication_war}" ]]; then
+    local file=$escenic_root_dir/assemblytool/publications/${fai_publication_name}.properties
+    print_and_log "Creating a publication definition for publication" \
+      $fai_publication_name "..."
+    run cp ${fai_publication_war} \
+      $escenic_root_dir/assemblytool/publications/${fai_publication_name}.war
+    cat > $file <<EOF
+name: ${fai_publication_name}
+source-war: ${fai_publication_name}.war
+context-root: ${fai_publication_name}
 EOF
-    done
   fi
 }
 

From 95c57c30d2078c2b5be39cc470b8676c1d509a79 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 31 Jan 2013 11:05:13 +0100
Subject: [PATCH 1976/2585] - regression fix in  
 create-publication::ensure_that_instance_is_running which now   (again)
 ensure that the ECE is bootstrapped and can answer fast   enough to cookie
 and publication creation, even on slow/low   resourced virtual machines.

---
 .../ece-install.d/create-publication.sh       | 37 ++++++++++---------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
index 20e58ce7..061687f2 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
@@ -30,7 +30,7 @@ function create_publication() {
     if [ -n "${fai_publication_ear}" ]; then
       print_and_log "I will create all publications in" \
         $fai_publication_ear "using the the domain mapping list ..."
-      
+
       ensure_variable_is_set fai_publication_domain_mapping_list
       local the_tmp_dir=$(mktemp -d)
 
@@ -48,7 +48,7 @@ function create_publication() {
         run cd $the_tmp_dir
         run jar xf $download_dir/$(basename $fai_publication_ear)
       )
-      
+
       for el in ${fai_publication_domain_mapping_list}; do
         local old_ifs=$IFS
         # the entries in the fai_publication_domain_mapping_list are on
@@ -62,7 +62,7 @@ function create_publication() {
         if [ -z "${publication_war}" ]; then
           publication_war=${publication_name}.war
         fi
-        
+
         create_the_publication $publication_name $the_tmp_dir/$publication_war
       done
 
@@ -70,7 +70,7 @@ function create_publication() {
       run rm -rf $the_tmp_dir
     else
       local publication_name=${fai_publication_name-mypub}
-      
+
       if [ -z "${fai_publication_war}" ]; then
         # if the user hasn't set the fai_publication_war, see if the
         # demo-clean.war is available on the system.
@@ -97,7 +97,7 @@ function create_publication() {
 function create_the_publication() {
   local publication_name=$1
   local publication_war=$2
-  
+
   print_and_log "Creating a publication with name" $publication_name \
     "using the publication resources from" $(basename $publication_war)
 
@@ -118,11 +118,11 @@ function create_the_publication() {
 function add_publication_to_deployment_lists() {
   run source /etc/default/ece
   local please_add=1
-  
+
   for el in $engine_instance_list; do
     local file=/etc/escenic/ece-${el}.conf
     run source $file
-    
+
     for ele in $deploy_webapp_white_list; do
       if [[ "$ele" == "$1" ]]; then
         please_add=0
@@ -134,7 +134,7 @@ function add_publication_to_deployment_lists() {
         "instance" $el
       deploy_webapp_white_list="$deploy_webapp_white_list $1"
     fi
-    
+
     set_conf_file_value \
       deploy_webapp_white_list \
       $deploy_webapp_white_list \
@@ -144,37 +144,40 @@ function add_publication_to_deployment_lists() {
 
 ## $1 :: the instance name
 function ensure_that_instance_is_running() {
-  return
-  
   local ece_command="ece -i $1 -t $type status"
   if [ $(su - $ece_user -c "$ece_command" | grep UP | wc -l) -lt 1 ]; then
     ece_command="ece -i $1 -t $type start"
     su - $ece_user -c "$ece_command" 1>>$log 2>>$log
-    # TODO improve this by adding a timed while loop
-    sleep 60
   fi
+
+  # This is a hack, but this ensures that the ECE is bootstrapped
+  # properly and can respond fast enough to the session setup for the
+  # publication creation.
+  ece_command="ece -i $1 -t $type versions"
+  su - $ece_user -c "$ece_command" 1>>$log 2>>$log
+  sleep 60
 }
 
 ## $1 :: publication name
 ## $2 :: publication war
 ## $3 :: instance name
-## 
+##
 ## Based on Erik Mogensen's work:
 ## //depot/branches/personal/mogsie/fromscratch/create-publication.sh
 function create_publication_in_db() {
   local publication_name=$1
   local publication_war=$2
   local instance_name=$3
-  
+
   print_and_log "Creating publication" ${publication_name} \
     "using instance" $instance_name "..."
-  
+
   # sourcing the instance's ECE configuration to get the app server
   # port.
   run source /etc/escenic/ece-${instance_name}.conf
 
   local ece_admin_uri=http://localhost:${appserver_port}/escenic-admin
-  
+
   local cookie=$(curl ${curl_opts} -I ${ece_admin_uri}/ | \
     grep -i "^Set-Cookie" | \
     sed s/.*'JSESSIONID=\([^;]*\).*'/'\1'/)
@@ -189,7 +192,7 @@ function create_publication_in_db() {
     -F "resourceFile=@${publication_war}" \
     --cookie JSESSIONID="$cookie" \
     "${ece_admin_uri}/do/publication/resource"
-  
+
   run curl ${curl_opts}  \
     -F "name=${publication_name}" \
     -F "publisherName=Escenic" \

From 291e798f8d8c63f41a165fd0ba10c5119dcd3e6b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 31 Jan 2013 12:53:18 +0100
Subject: [PATCH 1977/2585] - new feature: you can now specify the JVM heap
 size for the different   app server profiles:

  fai_presentation_heap_size
  fai_editor_heap_size
  fai_analysis_heap_size
  fai_search_host

  If these are not specified, ece-install will use the
  default_app_server_heap_size, which is 2048MBs.

- added constant for the default app server JVM size

- added documentation of fai_presentation_heap_size
  fai_editor_heap_size fai_analysis_heap_size fai_search_host to the
  ece-install man page.
---
 usr/share/doc/escenic/ece-install-guide.org     | 12 ++++++++++++
 .../ece-scripts/ece-install.d/app-server.sh     | 17 ++++++++++++++---
 .../ece-scripts/ece-install.d/constants.sh      |  1 +
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 6cda2bda..8974b35a 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -975,6 +975,9 @@ the *ece-install.conf*:
 - *fai\_analysis\_db\_user* :: For the EAE DB (different from
      ECE's). Default is ece5user.
 
+- *fai\_analysis\_heap\_size* :: The JVM heap size in megabytes. The
+     default is *2048*.
+
 - *fai\_analysis\_install* :: Will install the Escenic Analysis
      Engine, aka Stats, EAE.. Default is 0.
 
@@ -1033,6 +1036,9 @@ the *ece-install.conf*:
 - *fai\_editor\_ear* :: EAR to use instead of the Escenic
      binaries. Default is "".
 
+- *fai\_editor\_heap\_size* :: The JVM heap size in megabytes. The
+     default is *2048*.
+
 - *fai\_editor\_install* :: Install the editorial profile. Default
      is 0.
 
@@ -1104,6 +1110,9 @@ the *ece-install.conf*:
 - *fai\_presentation\_ear* :: EAR to use instead of the Escenic
      binaries. Default is "".
 
+- *fai\_presentation\_heap\_size* :: The JVM heap size in megabytes. The
+     default is *2048*.
+
 - *fai\_presentation\_install* :: Install the presentation server
      profile. Default is 0.
 
@@ -1179,6 +1188,9 @@ the *ece-install.conf*:
      an editorial server, if not for presentation servers.. Default
      is 0.
 
+- *fai\_search\_heap\_size* :: The JVM heap size in megabytes. The
+     default is *2048*.
+
 - *fai\_search\_indexer\_ws\_uri* :: URI of the indexer-webservice
      that the search instance shall use for knowing what to
      index.. Default is
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 6186ffbc..4dd7dec8 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -457,11 +457,22 @@ function set_up_logging() {
   log4j_download_the_tomcat_juli_libraries_and_copy_these_to_cl
   log4j_ensure_java_util_logging_is_not_doing_anything
   log4j_create_configuration_file
-}  
+}
 
 function set_appropriate_jvm_heap_sizes() {
   # in MB
-  local heap_size=2048
+  local heap_size=${default_app_server_heap_size}
+
+  if [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ]; then
+    heap_size=${fai_presentation_heap_size-${default_app_server_heap_size}}
+  elif [ $install_profile_number -eq $PROFILE_EDITORIAL_SERVER ]; then
+    heap_size=${fai_editor_heap_size-${default_app_server_heap_size}}
+  elif [ $install_profile_number -eq $PROFILE_ANALYSIS_DB_SERVER ]; then
+    heap_size=${fai_analysis_heap_size-${default_app_server_heap_size}}
+  elif [ $install_profile_number -eq $PROFILE_SEARCH_SERVER ]; then
+    heap_size=${fai_search_heap_size-${default_app_server_heap_size}}
+  fi
+
   local percent=70
   local total_size=$(get_total_memory_in_mega_bytes)
 
@@ -505,7 +516,7 @@ function set_http_auth_credentials_if_needed() {
 
 function log4j_create_configuration_file() {
   print_and_log "Setting up proper log4j & Java logging configuration ..."
-  
+
   cat > $common_nursery_dir/trace.properties <<EOF
 # generated by $(basename $0) @ $(date --iso)
 
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/constants.sh b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
index c5049977..ba14f6ab 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
@@ -32,6 +32,7 @@ default_db_schema=ece5db
 default_app_server_port=8080
 default_app_server_shutdown=8005
 default_app_server_redirect=8443
+default_app_server_heap_size=2048
 
 # cache server constants
 default_cache_port=80

From 3f19f8406b8f5d5c2a2a655dda0115e863027cf7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <tkj@vizrt.com>
Date: Thu, 31 Jan 2013 15:38:35 +0100
Subject: [PATCH 1978/2585] - made documentation possible to parse with sed -
 added more documentation of common libraries

---
 .../escenic/ece-scripts/common-bashing.sh     | 127 ++++++++++++++----
 usr/share/escenic/ece-scripts/common-ece.sh   |   8 ++
 usr/share/escenic/ece-scripts/common-io.sh    |  87 +++++++-----
 usr/share/escenic/ece-scripts/common-os.sh    |  43 ++++--
 usr/share/escenic/ece-scripts/common-pulse.sh |  12 +-
 5 files changed, 198 insertions(+), 79 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index 0f95a70b..ac55a141 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -21,6 +21,8 @@ function common_bashing_is_loaded() {
   echo 1
 }
 
+### get_seconds_since_start
+## Returns the seconds since the command was started
 function get_seconds_since_start() {
   local seconds="n/a"
 
@@ -33,6 +35,9 @@ function get_seconds_since_start() {
   echo "$seconds"
 }
 
+### get_id
+## Returns the ID string to be printed in the prompt from this
+## command.
 function get_id() {
   if [ -n "$id" ]; then
     echo $id
@@ -43,12 +48,21 @@ function get_id() {
   echo "[$(basename $0)-${timestamp}]"
 }
 
+### debug
+## Your code can call this method to print debug messages if the debug
+## flag has been turned on (debug=1).
+##
+## $@ :: as many strings as you want
 function debug() {
   if [ $debug -eq 1 ]; then
     echo "[$(basename $0)-debug]" "$@"
   fi
 }
 
+### print
+## Output your messgae with command ID prompt.
+##
+## $@ :: as many strings as you want
 function print() {
   if [[ "$quiet" == 1 ]]; then
     echo $@ | fmt
@@ -65,6 +79,7 @@ function printne() {
   echo -ne $(get_id) $@
 }
 
+### log
 ## Will log all messages past to it.
 ##
 ## - If the parent directory of the log file doesn't exist, the method
@@ -84,11 +99,19 @@ function log() {
   echo $(get_id) $@ >> $log
 }
 
+### print_and_log
+## Write input both to standard out with proper prompt & wrapping +
+## log the same message without wrapping.
+##
+## $@ :: list of strings
 function print_and_log() {
   print "$@"
   log "$@"
 }
 
+### log_call_stack
+## Logs the stack trace/call tree of the last error. This works pretty
+## much exactly like stack traces in Java.
 function log_call_stack() {
   log "Call stack (top most is the last one, main is the first):"
 
@@ -105,6 +128,9 @@ function log_call_stack() {
   done
 }
 
+### remove_pid_and_exit_in_error
+## Remove the command PID, log a stack trace and then exit the command
+## in error ($? -ne 0).
 function remove_pid_and_exit_in_error() {
   if [[ -z $pid_file && -e $pid_file ]]; then
     rm $pid_file
@@ -120,6 +146,9 @@ function remove_pid_and_exit_in_error() {
   kill $$
 }
 
+### exit_on_error
+## Will exit in error if, and only if, the last command was
+## unsuccessful.
 function exit_on_error() {
   local code=$?
   if [ ${code} -gt 0 ]; then
@@ -131,6 +160,14 @@ function exit_on_error() {
   fi
 }
 
+### run
+## Runs the passed command & arguments and log both standard error and
+## standard out. If the command exits cleanly, the calling code will
+## continue, however, if the commadn you passed to run failed, the run
+## wrapper will log the call stack and exit in error.
+##
+## $@ :: list of strings making up your command. Everything except
+##       pipes can be bassed
 function run() {
   if [ ! -e $log ]; then
     touch $log || {
@@ -143,6 +180,11 @@ function run() {
   exit_on_error $@
 }
 
+### fail_safe_run
+## Same as run, but will not fail if logging fails.
+##
+## $@ :: list of strings making up your command. Everything except
+##       pipes can be bassed.
 function fail_safe_run() {
   "${@}"
   if [ $? -gt 0 ]; then
@@ -154,6 +196,7 @@ function fail_safe_run() {
   fi
 }
 
+### is_number
 ## Returns 1 if the passed argument is a number, 0 if not.
 ##
 ## $1: the value you wish to test.
@@ -168,9 +211,10 @@ function is_number() {
   echo 1
 }
 
+### get_escaped_bash_string
 ## Returns an escaped string useful for sed and other BASH commands.
 ##
-## $1 : the string
+## $1 :: the string
 function get_escaped_bash_string() {
   local result=$(echo $1 | \
     sed -e 's/\$/\\$/g' \
@@ -180,10 +224,11 @@ function get_escaped_bash_string() {
   echo $result
 }
 
-# Munin nodes need the IP of the munin gatherer to be escaped. Hence
-# this function.
-#
-# $1 : the IP
+### get_perl_escaped
+## Munin nodes need the IP of the munin gatherer to be escaped. Hence
+## this function.
+##
+## $1 :: the IP
 function get_perl_escaped() {
   local escaped_input=$(
     echo $1 | sed 's/\./\\./g'
@@ -191,9 +236,10 @@ function get_perl_escaped() {
   echo "^${escaped_input}$"
 }
 
+### red
 ## Returns the inputted string(s) as red
 ##
-## $1: input string
+## $1 :: input string
 function red() {
   if [[ -t "0" || -p /dev/stdin ]]; then
     echo -e "\E[37;31m\033[1m${@}\033[0m"
@@ -202,9 +248,10 @@ function red() {
   fi
 }
 
+### green
 ## Returns the inputted string(s) as green
 ##
-## $1: input string
+## $1 :: input string
 function green() {
   if [[ -t "0" || -p /dev/stdin ]]; then
     echo -e "\E[37;32m\033[1m${@}\033[0m"
@@ -213,9 +260,10 @@ function green() {
   fi
 }
 
+### yellow
 ## Returns the inputted string(s) as yellow
 ##
-## $1: input string
+## $1 :: input string
 function yellow() {
   if [[ -t "0" || -p /dev/stdin ]]; then
     echo -e "\E[37;33m\033[1m${@}\033[0m"
@@ -224,6 +272,10 @@ function yellow() {
   fi
 }
 
+### blue
+## Returns the inputted string(s) as blue
+##
+## $1 :: input string
 function blue() {
   if [[ -t "0" || -p /dev/stdin ]]; then
     echo -e "\E[37;34m\033[1m${@}\033[0m";
@@ -232,9 +284,12 @@ function blue() {
   fi
 }
 
+### get_base_dir_from_bundle
+## Allows you to peek inside any archive to see which base directory
+## that archive will produce once extracted.
+##
 ## $1: full path to the file.
-function get_base_dir_from_bundle()
-{
+function get_base_dir_from_bundle() {
     local file_name=$(basename $1)
     suffix=${file_name##*.}
 
@@ -260,11 +315,11 @@ function get_base_dir_from_bundle()
     echo $file_name
 }
 
+### ensure_variable_is_set
 ## Will assert that all the passed variable names are set, if not, it
 ## Requires $conf_file to be set.  will exit in error.
 ##
-## $@ : a list of variable names
-##
+## $@ :: a list of variable names
 function ensure_variable_is_set() {
   local requirements_failed=0
 
@@ -282,7 +337,8 @@ function ensure_variable_is_set() {
   fi
 }
 
-## $1 : the archive to check, must be a local file
+### is_archive_healthy
+## $1 :: the archive to check, must be a local file
 function is_archive_healthy() {
   if [[ "$1" == *".ear" || "$1" == *".zip" || "$1" == *".jar" ]]; then
     unzip -t $1 2>/dev/null 1>/dev/null
@@ -300,6 +356,7 @@ function is_archive_healthy() {
   fi
 }
 
+### extract_archive
 ## Extracts any of the following archives: tar.gz, tgz, zip, tar.bz2
 ##
 ## $1 :: the archive
@@ -333,7 +390,7 @@ next_steps=()
 ## Adds a next step for the user to do after finishing running your
 ## command.
 ##
-## $1 : your added line
+## $1 :: your added line
 function add_next_step() {
   next_steps[${#next_steps[@]}]="$@"
   return
@@ -351,12 +408,13 @@ function print_next_step_list() {
   done
 }
 
+### is_unauthorized_to_access_url
 ## Method will return 1 if the user/pass is unauthorized to access the
 ## URL in question. Hence, a 0 means that the user CAN access the URL.
 ##
-## $1 user
-## $2 pass
-## $3 URL
+## $1 :: user
+## $2 :: pass
+## $3 :: URL
 function is_unauthorized_to_access_url() {
   curl --silent --connect-timeout 20 --head  --user ${1}:${2} ${3} | \
     head -1 | \
@@ -364,11 +422,12 @@ function is_unauthorized_to_access_url() {
     wc -l
 }
 
+### is_authorized_to_access_url
 ## Will return 1 if the user can access the URL.
 ##
-## $1 user
-## $2 pass
-## $3 URL
+## $1 :: user
+## $2 :: pass
+## $3 :: URL
 function is_authorized_to_access_url() {
   curl --silent --connect-timeout 20 --head --user ${1}:${2} ${3} | \
     head -1 | \
@@ -376,18 +435,19 @@ function is_authorized_to_access_url() {
     wc -l
 }
 
-
-## $1 the string to which you want to remove any leading white spaces.
+### ltrim
+## $1 :: the string to which you want to remove any leading white
+##       spaces.
 function ltrim() {
   echo $1 | sed 's/^[ ]*//g'
 }
 
+### split_string
 ## Splits a string based on a delimter, just like you're used to from
 ## Python, Java++
 ##
-## $1    : the character on to wich to split it
-## $@[1] : the rest of the arguments is the string(s) you want to have
-##         splitted.
+## $1    :: the character on to wich to split it
+## $2 .. $n :: the rest of the arguments is the string(s) to split.
 function split_string() {
   if [[ -z $1 || -z $2 ]]; then
     return
@@ -404,6 +464,7 @@ function split_string() {
   echo $splitted_string
 }
 
+### create_file_if_doesnt_exist
 ## Creates $1 file if possible
 ##
 ## $1 :: the file, typically a PID or lock file.
@@ -422,6 +483,9 @@ function create_file_if_doesnt_exist() {
   fail_safe_run touch $1
 }
 
+### remove_file_if_exists
+##
+## $1 :: the file
 function remove_file_if_exists() {
   if [ -z $1 ]; then
     return
@@ -432,6 +496,7 @@ function remove_file_if_exists() {
   fail_safe_run rm $1
 }
 
+### create_lock
 ## Will create a lock (and the lock's directory) for the caller. If
 ## the lock already exists, this function will NOT cause your program
 ## to fail. If you want to it to fail, use create_lock_or_fail
@@ -448,6 +513,7 @@ function create_lock() {
   fi
 }
 
+### create_lock_or_fail
 ## Does the same as create_lock with the difference that it will make
 ## your program fail if the lock already exists and it will print the
 ## error to standard out as well as in the log.
@@ -463,7 +529,7 @@ function create_lock_or_fail() {
   fi
 }
 
-## $1 :: the lock file
+### remove_lock
 function remove_lock() {
   if [ ! -e $lock_file ]; then
     return
@@ -472,40 +538,49 @@ function remove_lock() {
   fail_safe_run rm $lock_file
 }
 
+### create_pid
 function create_pid() {
   fail_safe_run mkdir -p $(dirname $pid_file)
   echo $$ > $pid_file
 }
 
+### remove_pid
 function remove_pid() {
   if [ -e $pid_file ]; then
     fail_safe_run rm $pid_file
   fi
 }
 
+### common_bashing_exit_hook
 ## To make your script call this whenever it does a controlled exit,
 ## either by running through the script, call this hook.
 ##
 ## Put this line at the start of your script:
 ##
 ## trap common_bashing_exit_hook EXIT
+##
+## $@ :: signal
 function common_bashing_exit_hook() {
   remove_pid
   remove_lock
   kill $$
 }
 
+### common_bashing_user_cancelled_hook
 ## Put this in your script to have it exit whenever the user hits the
 ## user pressing Ctrl+c or by someone sending a regular kill <PID>
 ## signal to it.
 ##
 ## Usage:
 ## trap common_bashing_user_cancelled_hook SIGHUP SIGINT
+##
+## $@ :: signal
 function common_bashing_user_cancelled_hook() {
   print "User cancelled $(basename $0), cleaning up after me ..."
   common_bashing_exit_hook
 }
 
+### lowercase
 ## Returns the string passed where all letters are lower cased.
 ##
 ## $@ :: as many strings as you like.
diff --git a/usr/share/escenic/ece-scripts/common-ece.sh b/usr/share/escenic/ece-scripts/common-ece.sh
index 671daba0..223940ec 100644
--- a/usr/share/escenic/ece-scripts/common-ece.sh
+++ b/usr/share/escenic/ece-scripts/common-ece.sh
@@ -2,6 +2,7 @@
 
 # by tkj@vizrt.com
 
+### get_instance_list
 ## If the system is installed using the recommended paths, the method
 ## will return a list of the instances configured in
 ## ${escenic_conf_dir}/ece-*.conf
@@ -28,6 +29,7 @@ function get_instance_list() {
   echo $instance_list
 }
 
+### get_instance_enabled_list
 function get_instance_enabled_list() {
   if [ ! -r /etc/default/ece ]; then
     return
@@ -38,6 +40,7 @@ function get_instance_enabled_list() {
     ${analysis_instance_list}
 }
 
+### get_instance_tpe
 ## $1 :: the instance you want to check which type it is.
 function get_instance_type() {
   local type="engine"
@@ -73,6 +76,7 @@ webapps_in_standard_webapps_list="
   webservice
 "
 
+### is_webapp_a_publication
 ## $1 :: the war file (or just the name of the war file, without the
 ##       file suffix)
 function is_webapp_a_publication() {
@@ -86,6 +90,7 @@ function is_webapp_a_publication() {
   echo 1
 }
 
+### get_app_base
 ## Will return the app base for the passwed WAR name.
 ##
 ## $1 :: the name of the war file
@@ -105,6 +110,7 @@ function get_app_base() {
   echo webapps-${war}
 }
 
+### get_publication_list
 ## Returns a list of publications on the local host
 ##
 ## $1 :: app server port. Optional, default is 8080.
@@ -120,6 +126,8 @@ function get_publication_list() {
     sed 's/.*name=\(.*\)".*/\1/g'
 }
 
+### is_escenic_xml_ok
+##
 ## $1 :: the XML
 function is_escenic_xml_ok() {
   if [ ! -e $1 ]; then
diff --git a/usr/share/escenic/ece-scripts/common-io.sh b/usr/share/escenic/ece-scripts/common-io.sh
index 1816fe06..94288de5 100644
--- a/usr/share/escenic/ece-scripts/common-io.sh
+++ b/usr/share/escenic/ece-scripts/common-io.sh
@@ -11,21 +11,16 @@ function common_io_is_loaded() {
   echo 1
 }
 
-## Parameters:
-## $1 is the property
-## $2 ... to the (last - 1) is the value
-## $n -1: The last argument is the file
+### set_conf_file_value
 ##
-## e.g.:
-## set_conf_file_value \
-##   mykey \
-##   myvalue1 myvalue2 myvalue3 \
-##   /etc/myfile.conf
+## $1 :: is the property
+## $2 ... :: to the (last - 1) is the value
+## $n -1 :: The last argument is the file
 function set_conf_file_value() {
   if [ $# -lt 3 ]; then
     return
   fi
-  
+
   local file=${@:${#@}}
   local key=${@:1:1}
   local value_end_index=$(( $# - 2 ))
@@ -36,21 +31,21 @@ function set_conf_file_value() {
     print ${parent_dir} "doesn't exist, something is wrong :-("
     remove_pid_and_exit_in_error
   fi
-  
+
   if [ -r $file ]; then
     if [ $(grep ^$1 $file | wc -l) -gt 0 ]; then
       if [ $dont_quote_conf_values -eq 0 ]; then
         sed -i "s~$key=.*~$key=\"$value\"~g" $file
       else
         sed -i "s~$key=.*~$key=$value~g" $file
-      fi    
+      fi
     else
       if [ $dont_quote_conf_values -eq 0 ]; then
         echo "$key=\"$value\"" >> $file
       else
         echo "$key=$value" >> $file
       fi
-      
+
     fi
   else
     if [ $dont_quote_conf_values -eq 0 ]; then
@@ -61,6 +56,12 @@ function set_conf_file_value() {
   fi
 }
 
+### make_dir
+## Will create the directory/directories if they don't already
+## exist. If the calling user doesn't have access rights to create the
+## directory(ies), this function will make your script fail.
+##
+## $@ :: a list of directories
 function make_dir() {
   for el in $@; do
     if [ ! -d $el ]; then
@@ -69,12 +70,23 @@ function make_dir() {
   done
 }
 
+### remove_dir
+## Will remove the directory if it exists. Safe to call if the
+## directory doesn't exist.
+##
+## $1 :: the dir
 function remove_dir() {
   if [ -d $1 ]; then
     run rmdir $1
   fi
 }
 
+### make_ln
+## Will create the symbolic, if the target exists. If not, the command
+## will make your command exist in error.
+##
+## $1 :: target (or, if $2 is specified, $1 is the source)
+## $2 :: the target, optional.
 function make_ln() {
   if [ $2 ]; then
     if [ -e $1 -a ! -h $2 ]; then
@@ -93,18 +105,20 @@ function make_ln() {
   fi
 }
 
-## $1 : the URI, can be file:///tmp/file, http://server/file or
+### download_uri_target_to_dir
+## Returns the local, downloaded file with absolute path.
+##
+## $1 :: the URI, can be file:///tmp/file, http://server/file or
 ##      https://file. If $1 is a local file reference, it's used as it
 ##      is.
-## $2 : the target dir
-## returns : the local, downloaded file with absolute path
+## $2 :: the target dir
 function download_uri_target_to_dir() {
   local uri=$1
   local target_dir=$2
   make_dir $target_dir
-  
+
   if [[ $uri == "http://"* || $uri == "https://"* ]]; then
-    log "Downloading" $uri "to" $target_dir "..." 
+    log "Downloading" $uri "to" $target_dir "..."
     run cd $target_dir
     run wget \
       $wget_opts \
@@ -122,6 +136,7 @@ function download_uri_target_to_dir() {
   fi
 }
 
+### verify_that_archive_is_ok
 ## Will verify that the archive passed to the function is ok. If it's
 ## not, the function will terminate the calling script, exiting in
 ## error.
@@ -137,24 +152,26 @@ function verify_that_archive_is_ok() {
     remove_pid_and_exit_in_error
   fi
 
-  if [[ $1 == *.zip ]]; then
+  if [[ $1 == *.zip || $1 == *.jar || $1 == *.ear ]]; then
     unzip -t $1 > /dev/null 2>&1
   elif [[ $1 == *.tar.gz || $1 == *.tgz ]]; then
     tar tzf $1 > /dev/null 2>&1
   fi
-  
+
   if [ $? -gt 0 ]; then
     print_and_log $1 "is a corrupt archive :-("
     remove_pid_and_exit_in_error
   fi
 }
 
-# verifies that the passed file(s) exist and are readable, depends on
-# set_archive_files_depending_on_profile
+## verifies that the passed file(s) exist and are readable, depends on
+## set_archive_files_depending_on_profile
+##
+## $@ :: a list of files
 function verify_that_files_exist_and_are_readable()
 {
   debug "Verifying that the file(s) exist(s) and are readable: $@"
-  
+
   for el in $@; do
     if [[ $el == http* ]]; then
       if [ $(curl -s -I $el | wc -l) -gt 0 ]; then
@@ -162,9 +179,9 @@ function verify_that_files_exist_and_are_readable()
       else
         print_and_log "The URI $el doesn't exist, I will exit now."
         remove_pid_and_exit_in_error
-      fi  
+      fi
     fi
-    
+
     if [ ! -e $el ]; then
       print_and_log "The file" $el "doesn't exist. I will exit now."
       remove_pid_and_exit_in_error
@@ -175,6 +192,9 @@ function verify_that_files_exist_and_are_readable()
   done
 }
 
+## Verifies that both the file and its parent directory are writeable.
+##
+## $@ :: the file
 function verify_that_directory_and_file_are_writeable() {
   local dir=`dirname $1`
   if [ ! -e $dir ]; then
@@ -195,8 +215,10 @@ function verify_that_directory_and_file_are_writeable() {
   fi
 }
 
+### get_file_age_in_seconds
 ## Returns the number of seconds since the file was changed.
-## $1 the file
+##
+## $1 :: the file
 function get_file_age_in_seconds() {
   if [ ! $1 ]; then
     return
@@ -206,35 +228,36 @@ function get_file_age_in_seconds() {
 
   local changed=$(stat -c %Y "$1")
   local now=$(date +%s)
-  
+
   echo $(( now - changed ))
 }
 
+### verify_writable_dir_list
 ## Verifies that the passed list of directories exist and are
 ## writeable by $USER. If not, the program will exit.
 ##
-## $@ : a list of directories
+## $@ :: a list of directories
 function verify_writable_dir_list() {
   for dir in "$@"; do
     if [ ! -w $dir ]; then
       print_and_log "The directory $dir must exist and be writable by" \
-        "by $USER for $(basename $0) to work" 
+        "by $USER for $(basename $0) to work"
       remove_pid_and_exit_in_error
     fi
   done
 }
 
+### verify_readable_dir_list
 ## Verifies that the passed list of directories exist and are
 ## readable by $USER. If not, the program will exit.
 ##
-## $@ : a list of directories
+## $@ :: a list of directories
 function verify_readable_dir_list() {
   for dir in "$@"; do
     if [ ! -r $dir ]; then
       print_and_log "The directory $dir must exist and be readable by" \
-        "by $USER for $(basename $0) to work" 
+        "by $USER for $(basename $0) to work"
       remove_pid_and_exit_in_error
     fi
   done
 }
-
diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index 75092fae..3b46d012 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -16,19 +16,19 @@ function common_os_is_loaded() {
   echo 1
 }
 
+### get_user_home_directory
 ## Method which will try its best to find the home diretory of
 ## existing users and probable home directories of new users.
 ##
-## (1) On Darwin/Mac OS X, it will return /Users/<user>
-## (2) On systems using /etc/passwd, it will search there to find the
-##     home dir of existing users.
-## (3) For new users, it will check the configuration of adduser (if
-##     present).
-## (4) If all of thes above fails, it will return /home/<user>
+## - On Darwin/Mac OS X, it will return /Users/<user>
+## - On systems using /etc/passwd, it will search there to find the
+##   home dir of existing users.
+## - For new users, it will check the configuration of adduser (if
+##   present).
+## - If all of thes above fails, it will return /home/<user>
 ##
-## Arguments:
-## $1 : the user name, can either be an existing user or a non-yet
-## created user.
+## $1 :: the user name, can either be an existing user or a non-yet
+##       created user.
 function get_user_home_directory() {
   if [ $(uname -s) = "Darwin" ]; then
     echo /Users/$1
@@ -42,6 +42,8 @@ function get_user_home_directory() {
   fi
 }
 
+### has_sun_java_installed
+## Will return 1 if the system has Sun/Oracle Java installed.
 function has_sun_java_installed() {
   if [[ -x /usr/lib/jvm/java-6-sun/bin/java || \
     $(java -version 2>&1 > /dev/null | grep HotSpot | wc -l) -gt 0 ]]; then
@@ -51,8 +53,9 @@ function has_sun_java_installed() {
   fi
 }
 
-## $1 user name
-## $2 group name
+### create_user_and_group_if_not_present
+## $1 :: user name
+## $2 :: group name
 function create_user_and_group_if_not_present() {
   local user=$1
   local group=$1
@@ -81,10 +84,11 @@ function create_user_and_group_if_not_present() {
   fi
 }
 
+### get_ip
 ## Will return the IP of the host name. If not found, the host name
 ## passed to the function will be returned.
 ##
-## Parameters: $1 the host name
+## $1 :: the host name
 function get_ip() {
   local ip=$(ping -c 1 $1 2>/dev/null | \
     grep "bytes from" | \
@@ -98,11 +102,12 @@ function get_ip() {
   echo $ip
 }
 
+### assert_commands_available
 ## Asserts that the passed command/program is indeed accessible in the
 ## current context. If it is not, the program aborts and removes the
 ## PID.
 ##
-## $@: a list of the binary/executable/program
+## $@ :: a list of the binary/executable/program
 function assert_commands_available() {
   local errors_found=0
   for el in $@; do
@@ -134,9 +139,10 @@ function get_tomcat_download_url() {
 }
 
 
+### download_tomcat
 ## Downloads Tomcat from the regional mirror
 ##
-## $1: target directory
+## $1 :: target directory
 function download_tomcat() {
   local url=$(get_tomcat_download_url)
 
@@ -144,6 +150,7 @@ function download_tomcat() {
   download_uri_target_to_dir $url $1
 }
 
+### get_free_memory_in_mega_bytes
 function get_free_memory_in_mega_bytes() {
   if [ $(uname -s) == "Linux" ]; then
     local free_in_kb=$(
@@ -156,6 +163,7 @@ function get_free_memory_in_mega_bytes() {
   fi
 }
 
+### get_total_memory_in_mega_bytes
 function get_total_memory_in_mega_bytes() {
   if [ $(uname -s) == "Linux" ]; then
     local total_in_kb=$(
@@ -168,6 +176,9 @@ function get_total_memory_in_mega_bytes() {
   fi
 }
 
+### add_apt_source
+##
+## $@ :: the apt line to be added if it's not already present.
 function add_apt_source() {
   # first, check that the base URL in the sources list returns 200,
   # only allow 20 seconds for this test. If the URL doesn't return
@@ -195,6 +206,8 @@ function add_apt_source() {
   fi
 }
 
+### get_memory_usage_of_pid
+## Only works on Linux
 function get_memory_usage_of_pid() {
   local file=/proc/$1/status
   if [ ! -e $file ]; then
@@ -205,6 +218,8 @@ function get_memory_usage_of_pid() {
   grep VmSize $file | cut -d ":" -f2 | sed 's/^[ \t]*//g'
 }
 
+### get_memory_usage_of_pid
+## Only works on Linux
 function get_memory_summary_of_pid() {
   local file=/proc/$1/status
   if [ ! -e $file ]; then
diff --git a/usr/share/escenic/ece-scripts/common-pulse.sh b/usr/share/escenic/ece-scripts/common-pulse.sh
index bc198d06..a8cdeab9 100644
--- a/usr/share/escenic/ece-scripts/common-pulse.sh
+++ b/usr/share/escenic/ece-scripts/common-pulse.sh
@@ -1,5 +1,3 @@
-#! /usr/bin/env bash
-
 # by tkj@vizrt.com
 
 # depends on common-bashing
@@ -17,11 +15,12 @@ function pulse() {
   echo -ne "\b${pulse_bits: i++ % ${#pulse_bits}: 1}"
 }
 
-## $1:     the PID of the process on which you want to view the pulse.
-## $2...n: Strings to display while the pulse is running.
+### show_pulse
+## $1 :: the PID of the process on which you want to view the pulse.
+## $2 .. $n :: Strings to display while the pulse is running.
 function show_pulse() {
   printne "${@: 2: $(( $# - 1 ))} ...."
-  
+
   local pulse_pid=$1
   while true; do
     kill -0 $pulse_pid 2>/dev/null
@@ -43,9 +42,8 @@ function show_pulse() {
         # terminate the main ece script process.
         kill $$ 2>/dev/null
       fi
-      
+
       break
     fi
   done
 }
-

From 89444ad80ac0acb3dcbd29733d5534d6fd79ce7a Mon Sep 17 00:00:00 2001
From: Rune Bremnes <rune@bremnes.name>
Date: Fri, 15 Feb 2013 15:38:01 +0100
Subject: [PATCH 1979/2585] Added support for MariaDB. To install MariaDB, add
 fai_db_vendor=mariadb to ece-install.conf.

---
 .../ece-scripts/ece-install.d/database.sh     | 184 ++++++++++++------
 1 file changed, 123 insertions(+), 61 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 3650a962..59ac21ab 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -8,78 +8,147 @@ if [[ $(uname -m) != "x86_64" ]]; then
   percona_rpm_release_url=http://www.percona.com/downloads/percona-release/$percona_rpm_release_package_name.i386.rpm
 fi
 
+percona_ubuntu_gpg_key=1C4CBDCDCD2EFD2A
+mariadb_ubuntu_gpg_key=CBCB082A1BB943DB
+
+function get_ubuntu_supported_list() {
+  local url=$1
+  curl -s $url | \
+      grep "DIR" | \
+      sed -e 's#.*href=\"\(.*\)\">.*</a>.*#\1#' -e 's#/##g' | \
+      grep -v apt
+}
+
 function get_percona_supported_list() {
-  curl -s http://repo.percona.com/apt/dists/ | \
-    grep "DIR" | \
-    sed -e 's#.*href=\"\(.*\)\">.*</a>.*#\1#' -e 's#/##g' | \
-    grep -v apt
+  get_ubuntu_supported_list "http://repo.percona.com/apt/dists/";
 }
 
-function set_up_percona_repository_if_possible() {
-  if [ $on_debian_or_derivative -eq 1 -a ${fai_db_sql_only-0} -eq 0 ]; then
-    local code_name=$(lsb_release -s -c)
-    local supported_code_name=0
-    local supported_list=$(get_percona_supported_list)
-    
-    for el in $supported_list; do
-      if [[ $code_name == $el ]]; then
-        supported_code_name=1
-      fi
-    done
+function get_mariadb_supported_list() {
+  get_ubuntu_supported_list "http://ftp.heanet.ie/mirrors/mariadb/repo/5.5/ubuntu/dists/";
+}
 
-    # some how, this is to install Percona 5.5
-    if [ -e /var/lib/mysql/debian-*.flag ]; then
-      run rm /var/lib/mysql/debian-*.flag
-    fi
+function set_up_redhat_repository_if_possible() {
+  print_and_log "Setting up the Percona repository ..."
+  
+  if [ $(rpm -qa | grep $percona_rpm_release_package_name | wc -l) -lt 1 ]; then
+    run rpm -Uhv $percona_rpm_release_url
+  fi
+  
+  mysql_server_packages="Percona-Server-server-55 Percona-Server-shared-compat"
+  mysql_client_packages="Percona-Server-client-55 Percona-Server-shared-compat"
+}
 
-    if [ $supported_code_name -eq 1 ]; then
-      print_and_log "Setting Up the Percona Repository ..."
+function is_supported() {
+  local code_name=$1
+  local supported_code_name=1
+  local supported_list=""
+  
+  if [ $db_vendor = "mariadb" ]; then
+    supported_list=$(get_mariadb_supported_list)
+  else
+    supported_list=$(get_percona_supported_list)
+  fi
+  
+  for el in $supported_list; do
+    if [[ $code_name == $el ]]; then
+      supported_code_name=0
+    fi
+  done
+  return $supported_code_name
+}
 
-      if [ $(apt-key list| grep CD2EFD2A | wc -l) -lt 1 ]; then
+function add_gpg_key() {
+  local key=$percona_ubuntu_gpg_key
+  if [ $db_vendor = "mariadb" ]; then
+    key=$mariadb_ubuntu_gpg_key
+  fi
+  if [ $(apt-key list| grep ${key: -8} | wc -l) -lt 1 ]; then
         # this CANNOT be run in the run wrapper since it often fails,
         # see comment below.
-        gpg --keyserver hkp://keys.gnupg.net:80 \
-          --recv-keys 1C4CBDCDCD2EFD2A \
-          1>>$log 2>>$log
-
+    gpg --keyserver hkp://keys.gnupg.net:80 \
+        --recv-keys $key \
+        1>>$log 2>>$log
+    
         # There has been three times now, during six months, that the
         # key cannot be retrieved from keys.gnupg.net. Therefore,
         # we're checking if it failed and if yes, force the package
         # installation.
-        if [ $? -gt 0 ]; then
-          print_and_log "Failed retrieving the Percona key from keys.gnupg.net" \
-            "Will install the Percona packages without the GPG key"
-          force_packages=1
-        else
-          gpg --armor \
-            -a \
-            --export 1C4CBDCDCD2EFD2A | \
-            apt-key add - \
-            1>>$log 2>>$log
-        fi
-
-      fi
-
-      add_apt_source "deb http://repo.percona.com/apt ${code_name} main"
+    if [ $? -gt 0 ]; then
+      print_and_log "Failed retrieving the gpg key for $db_vendor from keys.gnupg.net." \
+          "Will install the database packages without the GPG key"
+      force_packages=1
+    else
+      gpg --armor \
+          -a \
+          --export $key | \
+          apt-key add - \
+          1>>$log 2>>$log
+    fi
+    
+  fi
+}
 
-      # prefer packages from the percona repo if it exists
-      local pin_percona_conf_file=/etc/apt/preferences.d/20prefer-percona-packages
-      if [ ! -e $pin_percona_conf_file ]; then
-        cat > $pin_percona_conf_file <<EOF
+function pin_percona() {
+  # prefer packages from the percona repo if it exists
+  local pin_percona_conf_file=/etc/apt/preferences.d/20prefer-percona-packages
+  if [ ! -e $pin_percona_conf_file ]; then
+    cat > $pin_percona_conf_file <<EOF
 # Created by $(basename $0) @ $(date)
 Package: *
 Pin: origin repo.percona.com
 Pin-Priority: 600
 EOF
+  fi
+}
+
+function pin_mariadb() {
+  # prefer packages from the mariadb repo if it exists
+  local pin_mariadb_conf_file=/etc/apt/preferences.d/20prefer-mariadb-packages
+  if [ ! -e $pin_mariadb_conf_file ]; then
+    cat > $pin_mariadb_conf_file <<EOF
+# Created by $(basename $0) @ $(date)
+Package: *
+Pin: origin ftp.heanet.ie
+Pin-Priority: 600
+EOF
+  fi
+}
+
+function set_up_repository_if_possible() {
+  db_vendor=${fai_db_vendor:-percona}
+  if [ $on_debian_or_derivative -eq 1 -a ${fai_db_sql_only-0} -eq 0 ]; then
+    
+    local code_name=$(lsb_release -s -c)
+
+    # some how, this is to install Percona 5.5
+    if [ -e /var/lib/mysql/debian-*.flag ]; then
+      run rm /var/lib/mysql/debian-*.flag
+    fi
+
+    if is_supported $code_name; then
+      print_and_log "Setting Up the $db_vendor Repository ..."
+      add_gpg_key
+
+      if [ $db_vendor = "mariadb" ]; then
+        add_apt_source "deb http://ftp.heanet.ie/mirrors/mariadb/repo/5.5/ubuntu ${code_name} main"
+        pin_mariadb
+      else
+        add_apt_source "deb http://repo.percona.com/apt ${code_name} main"
+        pin_percona
       fi
 
       run apt-get update
-      mysql_server_packages="percona-server-server"
-      mysql_client_packages="percona-server-client"
-      
-      leave_trail "trail_db_vendor=percona"
-    else
-      print_and_log "The Percona APT repsository doesn't have packages" \
+      if [ $db_vendor = "mariadb" ]; then
+        mysql_server_packages="mariadb-server"
+        mysql_client_packages="mariadb-client"
+        leave_trail "trail_db_vendor=mariadb"
+      else 
+        mysql_server_packages="percona-server-server"
+        mysql_client_packages="percona-server-client"
+        leave_trail "trail_db_vendor=percona"
+      fi
+    elif [ -z $fai_db_vendor ]; then
+      print_and_log "The $fai_db_vendor APT repsository doesn't have packages" \
         "for your Debian (or derivative) version with code" \
         "name $code_name. " \
         "I will use vanilla MySQL instead."
@@ -90,19 +159,12 @@ EOF
       leave_trail "trail_db_vendor=mysql"
     fi
   elif [ $on_redhat_or_derivative -eq 1 ]; then
-    print_and_log "Setting up the Percona repository ..."
-
-    if [ $(rpm -qa | grep $percona_rpm_release_package_name | wc -l) -lt 1 ]; then
-      run rpm -Uhv $percona_rpm_release_url
-    fi
-
-    mysql_server_packages="Percona-Server-server-55 Percona-Server-shared-compat"
-    mysql_client_packages="Percona-Server-client-55 Percona-Server-shared-compat"
+    set_up_redhat_repository_if_possible
   fi
 }
 
 function install_mysql_server_software() {
-  set_up_percona_repository_if_possible
+  set_up_repository_if_possible
 
   if [ ${fai_db_sql_only-0} -eq 0 ]; then
     install_packages_if_missing $mysql_server_packages
@@ -122,7 +184,7 @@ function install_mysql_server_software() {
 }
 
 function install_mysql_client_software() {
-  set_up_percona_repository_if_possible
+  set_up_repository_if_possible
   install_packages_if_missing $mysql_client_packages
   assert_commands_available mysql
 }

From a2237bd867b53b43e0bfcac450b1572b2ba72e06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Mon, 18 Feb 2013 13:37:16 +0100
Subject: [PATCH 1980/2585] ece-install - switch back to original oab-java6
 script to resolve issue with Oracle download. This closes #12

---
 usr/share/escenic/ece-scripts/ece-install.d/java.sh | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/java.sh b/usr/share/escenic/ece-scripts/ece-install.d/java.sh
index 89bb98b8..c218558c 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/java.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/java.sh
@@ -11,13 +11,7 @@ function create_java_deb_packages_and_repo() {
   
   local tmp_dir=$(mktemp -d)
   run cd $tmp_dir
-  # TODO 2012-09-10 At the moment, this fork fixes a problem that
-  # https://github.com/flexiondotorg/oab-java6.git doesn't.
-  #
-  # Once this issue has been closed,
-  # https://github.com/flexiondotorg/oab-java6/issues/55, revert to
-  # using the upstream flexiondotorg repository.
-  run git clone https://github.com/madkinder/oab-java6.git
+  run git clone https://github.com/flexiondotorg/oab-java6.git
   run cd oab-java6
 
   # oab fails regularly, every 2-3 months or so, so we must take extra

From 85666fab8fdd3c37e1215e37fd56b15477536097 Mon Sep 17 00:00:00 2001
From: Rune Bremnes <rune@bremnes.name>
Date: Mon, 18 Feb 2013 14:37:36 +0100
Subject: [PATCH 1981/2585] Make sure to use jar in java_home.

---
 usr/share/escenic/ece-scripts/ece.d/deploy.sh  | 4 ++--
 usr/share/escenic/ece-scripts/ece.d/package.sh | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/deploy.sh b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
index 077aa965..1677dd58 100644
--- a/usr/share/escenic/ece-scripts/ece.d/deploy.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
@@ -93,7 +93,7 @@ function deploy() {
   (
     run mkdir -p $dir
     run cd $dir
-    run jar xf $ear
+    run $java_home/bin/jar xf $ear
   )
 
   print "Deploying $ear on $appserver ..."
@@ -162,7 +162,7 @@ function deploy() {
 
         make_dir $tomcat_base/$app_base/$name
         run cd $tomcat_base/$app_base/$name
-        run jar xf $war
+        run $java_home/bin/jar xf $war
 
         if [ ${enable_memcached_support-1} -eq 1 ]; then
           add_memcached_support $tomcat_base/$app_base/$name
diff --git a/usr/share/escenic/ece-scripts/ece.d/package.sh b/usr/share/escenic/ece-scripts/ece.d/package.sh
index de80e58b..6b13d482 100644
--- a/usr/share/escenic/ece-scripts/ece.d/package.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/package.sh
@@ -46,7 +46,7 @@ EOF
             # lib
       run mkdir -p ${tomcat_escenic_dir}
       run cd ${tomcat_escenic_dir}
-      run jar xf ${ear} lib
+      run $java_home/bin/jar xf ${ear} lib
 
             # war
       run mkdir -p ${tomcat_base_dir}/webapps
@@ -55,11 +55,11 @@ EOF
         if [ -n "${deploy_webapp_white_list}" ]; then
           for ele in $deploy_webapp_white_list; do
             if [ ${el} == ${ele}.war ]; then
-              run jar xf ${ear} ${el}
+              run $java_home/bin/jar xf ${ear} ${el}
             fi
           done
         else
-          run jar xf ${ear} ${el}
+          run $java_home/bin/jar xf ${ear} ${el}
         fi
       done
 

From f3238ad3f8fe1ac660dd319f0d7944f281ff3c53 Mon Sep 17 00:00:00 2001
From: Rune Bremnes <rune@bremnes.name>
Date: Mon, 18 Feb 2013 15:49:17 +0100
Subject: [PATCH 1982/2585] Make sure to use jar from java_home set in
 ece.conf.

---
 usr/share/escenic/ece-scripts/ece.d/package.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/package.sh b/usr/share/escenic/ece-scripts/ece.d/package.sh
index 6b13d482..14a9b2c1 100644
--- a/usr/share/escenic/ece-scripts/ece.d/package.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/package.sh
@@ -51,7 +51,7 @@ EOF
             # war
       run mkdir -p ${tomcat_base_dir}/webapps
       run cd ${tomcat_base_dir}/webapps
-      for el in $(jar tf ${ear} | grep .war$); do
+      for el in $($java_home/bin/jar tf ${ear} | grep .war$); do
         if [ -n "${deploy_webapp_white_list}" ]; then
           for ele in $deploy_webapp_white_list; do
             if [ ${el} == ${ele}.war ]; then

From 32a4d06629a3cf4d3a226ae2dfb534998328a21c Mon Sep 17 00:00:00 2001
From: Rune Bremnes <rune@bremnes.name>
Date: Mon, 18 Feb 2013 15:52:13 +0100
Subject: [PATCH 1983/2585] Do not set jdbc_driver variable by default and made
 it possible to override java_home by setting the environment variable
 JAVA_HOME.

---
 usr/sbin/ece-install | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index f1ac4339..b8ed5f7f 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -19,7 +19,13 @@
 #####################################################################
 ece_user=escenic
 ece_group=escenic
-jdbc_driver=/usr/share/java/mysql-connector-java.jar
+
+#Specify the jdbc_driver variable if you want to use something else
+#than the default. For MySQL and Percona the default is
+#/usr/share/java/mysql-connector-java.jar from the libmysql-java
+#package. For MariaDB the driver is downloaded from
+#downloads.mariadb.org.
+#jdbc_driver=/usr/share/java/mysql-connector-java.jar
 debug=0
 
 # These variables govern where software is installed and data and run
@@ -108,6 +114,10 @@ escenic_sources=/etc/apt/sources.list.d/escenic.list
 # prepare the pre-requisites.
 dry_run=0
 
+if [ -n $JAVA_HOME ]; then
+  java_home=$JAVA_HOME
+fi
+
 ## Bootstrapping, load files from /usr/share/escenic/ece-scripts The
 ## method will first try to be smart, in case the user has copied the
 ## ece-scripts somewhere else., e.g.: moved everything to ~/ece-scrpts

From 8555967686caf2320d0c4e6936da37d33ffacd07 Mon Sep 17 00:00:00 2001
From: Rune Bremnes <rune@bremnes.name>
Date: Mon, 18 Feb 2013 15:54:43 +0100
Subject: [PATCH 1984/2585] Moved the location for the jdbc driver from
 tomcat/lib to assemblytool/lib. It will now be located in
 {TOMCAT}/escenic/lib after deploy.

ece-install will now use the mariadb jdbc driver if fai_db_vendor is set
to mariadb.
---
 .../ece-scripts/ece-install.d/app-server.sh    | 14 +++++++++-----
 .../ece-install.d/content-engine.sh            | 18 ++++++++++++++++++
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 4dd7dec8..56306a1d 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -139,7 +139,6 @@ function set_up_app_server() {
   set_http_auth_credentials_if_needed
 
   run cd $tomcat_base/lib
-  make_ln $jdbc_driver
 
   # it's important to append (and not pre-pend) the ECE libraries so
   # that things put it in the standard loader behaves as expected,
@@ -152,6 +151,11 @@ function set_up_app_server() {
   new=${escaped_common_loader}$(get_escaped_bash_string ${escenic_loader})
   run sed -i "s#${old}#${new}#g" $file
 
+  local jdbc_package_name=com.mysql.jdbc.Driver
+  if [ $fai_db_vendor = "mariadb" ]; then
+    jdbc_package_name=org.mariadb.jdbc.Driver
+  fi
+  
   cat > $tomcat_base/conf/server.xml <<EOF
 <?xml version='1.0' encoding='utf-8'?>
 <Server port="$shutdown_port" shutdown="SHUTDOWN">
@@ -183,7 +187,7 @@ EOF
         initialSize="20"
         username="${db_user}"
         password="${db_password}"
-        driverClassName="com.mysql.jdbc.Driver"
+        driverClassName="${jdbc_package_name}"
         url="jdbc:mysql://${db_host}:${db_port}/${db_schema}?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;characterSetResults=UTF-8"
         removeAbandoned="true"
         removeAbandonedTimeout="120"
@@ -206,7 +210,7 @@ EOF
         initialSize="20"
         username="${db_user}"
         password="${db_password}"
-        driverClassName="com.mysql.jdbc.Driver"
+        driverClassName="${jdbc_package_name}"
         url="jdbc:mysql://${db_host}:${db_port}/${db_schema}?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;characterSetResults=UTF-8"
         removeAbandoned="true"
         removeAbandonedTimeout="120"
@@ -232,7 +236,7 @@ EOF
         initialSize="20"
         username="${db_user}"
         password="${db_password}"
-        driverClassName="com.mysql.jdbc.Driver"
+        driverClassName="${jdbc_package_name}"
         url="jdbc:mysql://${db_host}:${db_port}/${db_schema}?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;characterSetResults=UTF-8"
         removeAbandoned="true"
         removeAbandonedTimeout="120"
@@ -255,7 +259,7 @@ EOF
         initialSize="20"
         username="${db_user}"
         password="${db_password}"
-        driverClassName="com.mysql.jdbc.Driver"
+        driverClassName="${jdbc_package_name}"
         url="jdbc:mysql://${db_host}:${db_port}/${db_schema}?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;characterSetResults=UTF-8"
         removeAbandoned="true"
         removeAbandonedTimeout="120"
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 702da622..e472aeae 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -184,10 +184,28 @@ function set_up_engine_and_plugins() {
   ece_software_setup_completed=1
 }
 
+function set_up_jdbc_library() {
+  print_and_log "Setting up the jdbc driver"
+  make_dir $escenic_root_dir/assemblytool/lib
+  cd $escenic_root_dir/assemblytool/lib
+  if [ -n "$jdbc_driver" -a -e "$jdbc_driver" ]; then
+    make_ln $jdbc_driver
+  elif [ $fai_db_vendor = "mariadb" ]; then
+    print_and_log "Downloading MariaDB jdbc driver."
+    download_uri_target_to_dir \
+        https://downloads.mariadb.org/f/mariadb-java-client-1.1.0/mariadb-java-client-1.1.0.jar/from/http:/ftp.heanet.ie/mirrors/mariadb \
+        .
+    mv mariadb mariadb-java-client-1.1.0.jar
+  else
+    make_ln /usr/share/java/mysql-connector-java.jar      
+  fi
+}
+
 function set_up_assembly_tool() {
   print_and_log "Setting up the Assembly Tool ..."
 
   make_dir $escenic_root_dir/assemblytool/
+  set_up_jdbc_library
   cd $escenic_root_dir/assemblytool/
 
   if [ -e $download_dir/assemblytool*zip ]; then

From d503a7ad5fb71db68a106f9bbc6646b4fbc946f4 Mon Sep 17 00:00:00 2001
From: Rune Bremnes <rune@bremnes.name>
Date: Tue, 19 Feb 2013 12:07:27 +0100
Subject: [PATCH 1985/2585] Added aupport for MariaDB on Debian.

---
 .../escenic/ece-scripts/ece-install.d/database.sh      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 59ac21ab..60102a7c 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -20,11 +20,12 @@ function get_ubuntu_supported_list() {
 }
 
 function get_percona_supported_list() {
-  get_ubuntu_supported_list "http://repo.percona.com/apt/dists/";
+  get_ubuntu_supported_list "http://repo.percona.com/apt/dists/"
 }
 
 function get_mariadb_supported_list() {
-  get_ubuntu_supported_list "http://ftp.heanet.ie/mirrors/mariadb/repo/5.5/ubuntu/dists/";
+  local distributor=$(lsb_release -i -s | tr '[A-Z]' '[a-z]')
+  get_ubuntu_supported_list "http://ftp.heanet.ie/mirrors/mariadb/repo/5.5/$distributor/dists/"
 }
 
 function set_up_redhat_repository_if_possible() {
@@ -117,7 +118,7 @@ EOF
 function set_up_repository_if_possible() {
   db_vendor=${fai_db_vendor:-percona}
   if [ $on_debian_or_derivative -eq 1 -a ${fai_db_sql_only-0} -eq 0 ]; then
-    
+
     local code_name=$(lsb_release -s -c)
 
     # some how, this is to install Percona 5.5
@@ -130,7 +131,8 @@ function set_up_repository_if_possible() {
       add_gpg_key
 
       if [ $db_vendor = "mariadb" ]; then
-        add_apt_source "deb http://ftp.heanet.ie/mirrors/mariadb/repo/5.5/ubuntu ${code_name} main"
+        local distributor=$(lsb_release -i -s | tr '[A-Z]' '[a-z]')
+        add_apt_source "deb http://ftp.heanet.ie/mirrors/mariadb/repo/5.5/$distributor ${code_name} main"
         pin_mariadb
       else
         add_apt_source "deb http://repo.percona.com/apt ${code_name} main"

From e67ae2df4800f5f813797c09ef77fb4a3ddf36d5 Mon Sep 17 00:00:00 2001
From: Rune Bremnes <rune@bremnes.name>
Date: Tue, 19 Feb 2013 15:05:26 +0100
Subject: [PATCH 1986/2585] Added bind-utils as common OS package on redhat or
 derivative to provide the host command.

---
 usr/sbin/ece-install | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index b8ed5f7f..00ec44d7 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -243,6 +243,8 @@ function install_common_os_packages()
       git_package=git-core
     fi
     packages="${packages} bind9-host"
+  elif [ $on_redhat_or_derivative -eq 1 ]; then
+    packages="${packages} bind-utils"
   fi
 
   install_packages_if_missing $packages $git_package

From f75482b0e05bf456e8424c2388f957140a61f806 Mon Sep 17 00:00:00 2001
From: Rune Bremnes <rune@bremnes.name>
Date: Tue, 19 Feb 2013 15:06:41 +0100
Subject: [PATCH 1987/2585] Added support for MariaDB on redhat or derivative.
 Only tested on CentOS 6.3.

---
 .../ece-scripts/ece-install.d/database.sh     | 45 ++++++++++++++++---
 1 file changed, 38 insertions(+), 7 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 60102a7c..ee23dceb 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -28,15 +28,46 @@ function get_mariadb_supported_list() {
   get_ubuntu_supported_list "http://ftp.heanet.ie/mirrors/mariadb/repo/5.5/$distributor/dists/"
 }
 
-function set_up_redhat_repository_if_possible() {
-  print_and_log "Setting up the Percona repository ..."
-  
-  if [ $(rpm -qa | grep $percona_rpm_release_package_name | wc -l) -lt 1 ]; then
-    run rpm -Uhv $percona_rpm_release_url
+function set_up_mariadb_yum_repo() {
+  local maria_db_repo=/etc/yum.repos.d/mariadb.repo
+  if [ ! -e $maria_db_repo ]; then
+    print_and_log "Setting up the MariaDB repository ..."
+    local distributor=$(lsb_release -i -s | tr '[A-Z]' '[a-z]')
+    local release=$(lsb_release -r -s | sed -e 's/\([0-9]*\).*/\1/')
+    local arch=amd64
+    if [[ $(uname -m) != "x86_64" ]]; then
+      arch=x86
+    fi  
+    if [ $distributor = "redhatenterpriseserver" ]; then
+      $distributor=rhel
+    fi
+    local yum_url=http://yum.mariadb.org/5.5/${distributor}${release}-${arch}
+    cat > $maria_db_repo <<EOF
+# Created by $(basename $0) @ $(date)
+# http://downloads.mariadb.org/mariadb/repositories/
+[mariadb]
+name = MariaDB
+baseurl = ${yum_url}
+gpgkey=https://yum.mariadb.org/RPM-GPG-KEY-MariaDB
+gpgcheck=1
+EOF
   fi
+}
+
+function set_up_redhat_repository_if_possible() {
+  if [ $db_vendor = "mariadb" ]; then
+    set_up_mariadb_yum_repo  
+    mysql_server_packages="MariaDB-server"
+    mysql_client_packages="MariaDB-client"
+  else
+    print_and_log "Setting up the Percona repository ..."
   
-  mysql_server_packages="Percona-Server-server-55 Percona-Server-shared-compat"
-  mysql_client_packages="Percona-Server-client-55 Percona-Server-shared-compat"
+    if [ $(rpm -qa | grep $percona_rpm_release_package_name | wc -l) -lt 1 ]; then
+      run rpm -Uhv $percona_rpm_release_url
+    fi
+    mysql_server_packages="Percona-Server-server-55 Percona-Server-shared-compat"
+    mysql_client_packages="Percona-Server-client-55 Percona-Server-shared-compat"
+  fi  
 }
 
 function is_supported() {

From 7812f7f7c23fa5fc9af9db0654bcc61a8a979a8a Mon Sep 17 00:00:00 2001
From: Rune Bremnes <rune@bremnes.name>
Date: Tue, 19 Feb 2013 16:38:15 +0100
Subject: [PATCH 1988/2585] Updated java url to latest version and added wget
 parameters to actually download the file.

---
 .../escenic/ece-scripts/ece-install.d/java.sh    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/java.sh b/usr/share/escenic/ece-scripts/ece-install.d/java.sh
index c218558c..9e563a14 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/java.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/java.sh
@@ -1,6 +1,6 @@
-sun_java_bin_url=http://download.oracle.com/otn-pub/java/jdk/6u31-b04/jdk-6u31-linux-i586.bin
+sun_java_bin_url=http://download.oracle.com/otn-pub/java/jdk/6u39-b04/jdk-6u39-linux-i586.bin
 if [[ $(uname -m) == "x86_64" ]]; then
-  sun_java_bin_url=http://download.oracle.com/otn-pub/java/jdk/6u31-b04/jdk-6u31-linux-x64.bin
+  sun_java_bin_url=http://download.oracle.com/otn-pub/java/jdk/6u39-b04/jdk-6u39-linux-x64.bin
 fi
   
 function create_java_deb_packages_and_repo() {
@@ -43,18 +43,18 @@ function install_sun_java_on_redhat() {
   
   print_and_log "Downloading Sun Java from download.oracle.com ..."
   run cd $download_dir
-  run wget $wget_opts $sun_java_bin_url
+  local file_name=$(basename $sun_java_bin_url)
+  run wget --no-cookies --header "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com" -O $file_name $wget_opts $sun_java_bin_url
 
   # calculating start and stop offset from where to extract the zip
   # from the java data blob. calculation taken from
   # git://github.com/rraptorr/sun-java6.git
   local tmp_jdk=jdk-tmp.zip
-  local file_name=$(basename $sun_java_bin_url)
   local binsize=$(wc -c $file_name | awk '{print $1}');
-	local zipstart=$(unzip -ql $file_name 2>&1 >/dev/null | \
-    sed -n -e 's/.* \([0-9][0-9]*\) extra bytes.*/\1/p');
-	tail -c $(expr $binsize - $zipstart) $file_name > $tmp_jdk
-
+  local zipstart=$(unzip -ql $file_name 2>&1 >/dev/null | \
+      sed -n -e 's/.* \([0-9][0-9]*\) extra bytes.*/\1/p');
+  tail -c $(expr $binsize - $zipstart) $file_name > $tmp_jdk
+  
   run cd /opt
   run unzip -q -o $download_dir/$tmp_jdk
   local latest_jdk=$(find . -maxdepth 1 -type d -name "jdk*" | sort -r | head -1)

From 5adcaa74c9f522d9ae77ae22d9fd338c9455b5d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Wed, 20 Feb 2013 01:44:52 +0100
Subject: [PATCH 1989/2585] ece-install - fixed missing = in app-server.sh

---
 usr/share/escenic/ece-scripts/ece-install.d/app-server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 56306a1d..4ff9b461 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -152,7 +152,7 @@ function set_up_app_server() {
   run sed -i "s#${old}#${new}#g" $file
 
   local jdbc_package_name=com.mysql.jdbc.Driver
-  if [ $fai_db_vendor = "mariadb" ]; then
+  if [ $fai_db_vendor == "mariadb" ]; then
     jdbc_package_name=org.mariadb.jdbc.Driver
   fi
   

From bd11a849e5cdd6a6a2204ce9a233291c0b4acde9 Mon Sep 17 00:00:00 2001
From: Debashis Paul <Dpaul@vizrt.com>
Date: Wed, 20 Feb 2013 14:57:10 +0100
Subject: [PATCH 1990/2585] amazon related chapter added

---
 usr/share/doc/vizrt/vosa-handbook/amazon.org | 42 ++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/amazon.org

diff --git a/usr/share/doc/vizrt/vosa-handbook/amazon.org b/usr/share/doc/vizrt/vosa-handbook/amazon.org
new file mode 100644
index 00000000..1fe17fb8
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/amazon.org
@@ -0,0 +1,42 @@
+* Amazon Instance
+(Ignore this chapter for if you have KVM implementation)
+
+This chapter tells you about dealing with amazon instances in your installation.
+
+** Resize disk (EBS Volume) in an Amazon instance
+
+To resize an EBS Volume using the AWS GUI console
+
+1. Shut down the machine/instance.
+2. Detach it from the instance, while detaching NOTE DOWN the exact device name where the volume had been attached 
+3. Take a snapshot of the EBS Volume
+4. Go to your snapshots listing and detect your newly created snapshot and create a new volume of your desired size from the snapshot 
+5. You have now successfully re-sized your volume.
+6. Now attach it to your instances, while attaching use the exact device name you noted while detaching, this is important while you are resizing the root device
+7. Start the machine and associate elastic ip (if it had one before)
+8. You will still see you volume with the previous size. You have to run resize2fs on the device to get the new size effective
+     #+BEGIN_SRC
+      $ sudo resize2fs /dev/xvda1
+     #+END_SRC
+
+
+** Add a new EBS volume in a Amazon machine instance:
+
+From Amazon EC2 Management Console
+1. Create the volume of desired size
+2. Attach the volume as device with the desired instance (same zone as the volume)
+
+From the ec2 instance
+1. ssh into it as root
+2. format the device
+     #+BEGIN_SRC
+      $ mkfs.ext4 /dev/xvdf
+     #+END_SRC
+3. Put the mount entry in /etc/fstab
+     #+BEGIN_SRC
+      /dev/xvdf  /var/exports auto    defaults,nobootwait,comment=cloudconfig 0 2
+     #+END_SRC
+4. Then mount it
+     #+BEGIN_SRC
+      $ mount -a    
+     #+END_SRC

From 56f5e976289c40a0f2d6d30b06fa950a548b1487 Mon Sep 17 00:00:00 2001
From: Debashis Paul <Dpaul@vizrt.com>
Date: Wed, 20 Feb 2013 14:58:41 +0100
Subject: [PATCH 1991/2585] amazon related chapter added

---
 usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
index 9ac816a3..9125ca45 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
+++ b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
@@ -20,3 +20,4 @@
 #+INCLUDE: "privatekeys.org"
 #+INCLUDE: "host-naming.org"
 #+INCLUDE: "development-process.org"
+#+INCLUDE: "amazon.org"

From 37d667998e75dd960e87a9edbac49178444bff6c Mon Sep 17 00:00:00 2001
From: Debashis Paul <Dpaul@vizrt.com>
Date: Wed, 20 Feb 2013 15:20:45 +0100
Subject: [PATCH 1992/2585] srouce declaration problem fixed

---
 usr/share/doc/vizrt/vosa-handbook/amazon.org | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/amazon.org b/usr/share/doc/vizrt/vosa-handbook/amazon.org
index 1fe17fb8..efa04795 100644
--- a/usr/share/doc/vizrt/vosa-handbook/amazon.org
+++ b/usr/share/doc/vizrt/vosa-handbook/amazon.org
@@ -15,7 +15,7 @@ To resize an EBS Volume using the AWS GUI console
 6. Now attach it to your instances, while attaching use the exact device name you noted while detaching, this is important while you are resizing the root device
 7. Start the machine and associate elastic ip (if it had one before)
 8. You will still see you volume with the previous size. You have to run resize2fs on the device to get the new size effective
-     #+BEGIN_SRC
+     #+BEGIN_SRC text
       $ sudo resize2fs /dev/xvda1
      #+END_SRC
 
@@ -29,14 +29,14 @@ From Amazon EC2 Management Console
 From the ec2 instance
 1. ssh into it as root
 2. format the device
-     #+BEGIN_SRC
+     #+BEGIN_SRC text
       $ mkfs.ext4 /dev/xvdf
      #+END_SRC
 3. Put the mount entry in /etc/fstab
-     #+BEGIN_SRC
+     #+BEGIN_SRC text
       /dev/xvdf  /var/exports auto    defaults,nobootwait,comment=cloudconfig 0 2
      #+END_SRC
 4. Then mount it
-     #+BEGIN_SRC
+     #+BEGIN_SRC text
       $ mount -a    
      #+END_SRC

From 75989b29bfbe3b6ffdb6f1554641d39d449f1846 Mon Sep 17 00:00:00 2001
From: Rune Bremnes <rune@bremnes.name>
Date: Wed, 20 Feb 2013 15:44:44 +0100
Subject: [PATCH 1993/2585] Added support for tomcat download url override
 (change provided by Imran).

---
 usr/share/escenic/ece-scripts/common-os.sh | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index 3b46d012..f35e1821 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -123,12 +123,16 @@ function assert_commands_available() {
 }
 
 function get_tomcat_download_url() {
-  local url=$(
-    curl -s http://tomcat.apache.org/download-60.cgi | \
-      grep tar.gz | \
-      head -1 | \
-      cut -d'"' -f2
-  )
+  if [ -n $tomcat_download ]; then  [15:28]
+    local url=$tomcat_download
+  else
+    local url=$(
+        curl -s http://tomcat.apache.org/download-60.cgi | \
+            grep tar.gz | \
+            head -1 | \
+            cut -d'"' -f2
+    )
+  fi
 
   if [ -z $url ]; then
     url=$fallback_tomcat_url

From a6d9759f31d6bc1723d92b190fa4de1930a53618 Mon Sep 17 00:00:00 2001
From: Rune Bremnes <rune@bremnes.name>
Date: Wed, 20 Feb 2013 15:53:11 +0100
Subject: [PATCH 1994/2585] Fix copy and paste error.

---
 usr/share/escenic/ece-scripts/common-os.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index f35e1821..ab515335 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -123,7 +123,7 @@ function assert_commands_available() {
 }
 
 function get_tomcat_download_url() {
-  if [ -n $tomcat_download ]; then  [15:28]
+  if [ -n $tomcat_download ]; then
     local url=$tomcat_download
   else
     local url=$(

From 38661a697c9f6d51d41d874298cd84241c4ade68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Wed, 20 Feb 2013 16:34:51 +0100
Subject: [PATCH 1995/2585] ece-install - second attempt at fixing
 app-server.sh failure on empty variable

---
 usr/share/escenic/ece-scripts/ece-install.d/app-server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 4ff9b461..c976ecf1 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -152,7 +152,7 @@ function set_up_app_server() {
   run sed -i "s#${old}#${new}#g" $file
 
   local jdbc_package_name=com.mysql.jdbc.Driver
-  if [ $fai_db_vendor == "mariadb" ]; then
+  if [ ! -z $fai_db_vendor ] && [ $fai_db_vendor = "mariadb" ]; then
     jdbc_package_name=org.mariadb.jdbc.Driver
   fi
   

From 58bb1626d48d8663afdef1e852c2af1d15ca7e9d Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Thu, 21 Feb 2013 10:50:22 +0000
Subject: [PATCH 1996/2585] added instructions to use pac

---
 usr/share/doc/vizrt/vosa-handbook/admin-pac.org | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/admin-pac.org

diff --git a/usr/share/doc/vizrt/vosa-handbook/admin-pac.org b/usr/share/doc/vizrt/vosa-handbook/admin-pac.org
new file mode 100644
index 00000000..b6c10ddc
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/admin-pac.org
@@ -0,0 +1,5 @@
+* Proxy auto-config for admin pages
+Users access our servers on well known ports like 80 or 443. These ports are usually shared with the Internet without any filter.
+We also use webbrowsers to view admin userinterfaces on strange ports like 8080 and 5678. To make this possible in a reasonably secure way we make use of a proxy.
+Vizrt maintains an "Automatic proxy confuguration URL". As you can only have one such URL in your browser, Vizrt maintains a "PAC" resource on the Internet that contains valid settings for many of her customers. This pac URL is http://vizrtsaas.com/gk.pac. 
+The proxy for <%=trail_customer_shortname%> requires a password that you can see [[http://secrets.vizrtsaas.com/solartv/proxy.ini.asc][here]]

From 8924b667dc694593164cc9032f54dc3b19caead0 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Thu, 21 Feb 2013 10:51:13 +0000
Subject: [PATCH 1997/2585] added instrauctions to use pac

---
 usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
index 9125ca45..a1dbf594 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
+++ b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
@@ -7,6 +7,7 @@
 #+TEXT: <%= trail_service_header_org %>
 #+TEXT: [TABLE-OF-CONTENTS]
 #+INCLUDE: "overview.org"
+#+INCLUDE: "admin-pac.org"
 #+INCLUDE: "operating-system-maintenance.org" 
 #+INCLUDE: "deployment.org"
 #+INCLUDE: "content-engine.org"

From c7cd18dd0fd1950d0a0bdee2327bf4abda399904 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Thu, 21 Feb 2013 10:53:54 +0000
Subject: [PATCH 1998/2585] made the utrl to the proxy dynamic

---
 usr/share/doc/vizrt/vosa-handbook/admin-pac.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/admin-pac.org b/usr/share/doc/vizrt/vosa-handbook/admin-pac.org
index b6c10ddc..2d994226 100644
--- a/usr/share/doc/vizrt/vosa-handbook/admin-pac.org
+++ b/usr/share/doc/vizrt/vosa-handbook/admin-pac.org
@@ -2,4 +2,4 @@
 Users access our servers on well known ports like 80 or 443. These ports are usually shared with the Internet without any filter.
 We also use webbrowsers to view admin userinterfaces on strange ports like 8080 and 5678. To make this possible in a reasonably secure way we make use of a proxy.
 Vizrt maintains an "Automatic proxy confuguration URL". As you can only have one such URL in your browser, Vizrt maintains a "PAC" resource on the Internet that contains valid settings for many of her customers. This pac URL is http://vizrtsaas.com/gk.pac. 
-The proxy for <%=trail_customer_shortname%> requires a password that you can see [[http://secrets.vizrtsaas.com/solartv/proxy.ini.asc][here]]
+The proxy for <%=trail_customer_shortname%> requires a password that you can see [[http://secrets.vizrtsaas.com/<%25%3Dtrail_customer_acronym%25>/proxy.ini.asc][here]]

From 8bac61d2629555ae5c3d47f021b86137806a42be Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Thu, 21 Feb 2013 11:41:54 +0000
Subject: [PATCH 1999/2585] made the secret flexible

---
 usr/share/doc/vizrt/vosa-handbook/admin-pac.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/admin-pac.org b/usr/share/doc/vizrt/vosa-handbook/admin-pac.org
index 2d994226..88077eaa 100644
--- a/usr/share/doc/vizrt/vosa-handbook/admin-pac.org
+++ b/usr/share/doc/vizrt/vosa-handbook/admin-pac.org
@@ -2,4 +2,4 @@
 Users access our servers on well known ports like 80 or 443. These ports are usually shared with the Internet without any filter.
 We also use webbrowsers to view admin userinterfaces on strange ports like 8080 and 5678. To make this possible in a reasonably secure way we make use of a proxy.
 Vizrt maintains an "Automatic proxy confuguration URL". As you can only have one such URL in your browser, Vizrt maintains a "PAC" resource on the Internet that contains valid settings for many of her customers. This pac URL is http://vizrtsaas.com/gk.pac. 
-The proxy for <%=trail_customer_shortname%> requires a password that you can see [[http://secrets.vizrtsaas.com/<%25%3Dtrail_customer_acronym%25>/proxy.ini.asc][here]]
+The proxy for <%=trail_customer_shortname%> requires a password that you can see [[<%25%3Dtrail_secret_adminproxy%25>][here]]

From 835c64ced0b01281e7ba660b563b3b738c34860c Mon Sep 17 00:00:00 2001
From: Rune Bremnes <rune@bremnes.name>
Date: Thu, 21 Feb 2013 14:33:09 +0100
Subject: [PATCH 2000/2585] Switch the default database from Percona to
 MariaDB. Set "db_vendor=percona" in ece-install.conf to keep using Percona.

---
 usr/sbin/ece-install                          | 17 ++++---
 .../ece-scripts/ece-install.d/app-server.sh   |  2 +-
 .../ece-install.d/content-engine.sh           |  2 +-
 .../ece-scripts/ece-install.d/database.sh     | 45 +++++++------------
 4 files changed, 29 insertions(+), 37 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 00ec44d7..ecaaac59 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -54,6 +54,9 @@ java_home=/usr/lib/jvm/java-6-sun
 # This variable is updated by the package build scripts.
 ece_scripts_version="straight-from-github"
 
+#Set the default database vendor. Possible values are mariadb and percona
+db_vendor=mariadb
+
 #####################################################################
 
 download_dir=${escenic_cache_dir}/$(basename $0)
@@ -114,10 +117,6 @@ escenic_sources=/etc/apt/sources.list.d/escenic.list
 # prepare the pre-requisites.
 dry_run=0
 
-if [ -n $JAVA_HOME ]; then
-  java_home=$JAVA_HOME
-fi
-
 ## Bootstrapping, load files from /usr/share/escenic/ece-scripts The
 ## method will first try to be smart, in case the user has copied the
 ## ece-scripts somewhere else., e.g.: moved everything to ~/ece-scrpts
@@ -856,6 +855,13 @@ function un_install_everything() {
     percona-server-server-5.5
     varnish
     sun-java6-jdk
+    mariadb-client
+    mariadb-client-5.5
+    mariadb-client-core-5.5
+    mariadb-server
+    mariadb-server-5.5
+    mariadb-server-core-5.5
+    mariadb-common
   "
   local file_to_remove_list="
     $escenic_conf_dir
@@ -870,8 +876,9 @@ function un_install_everything() {
   local key_to_remove_list="
     C4DEFFEB
     CD2EFD2A
+    1BB943DB
   "
-  print_and_log "You have set fai_un_install_everything=1 in your ${conf_file}"
+print_and_log "You have set fai_un_install_everything=1 in your ${conf_file}"
   print_and_log "This will $(red uninstall the following on $HOSTNAME):"
   print_and_log "Packages to be removed:" $(echo $package_to_remove_list)
   print_and_log "Files & directories to be removed:" $file_to_remove_list
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index c976ecf1..42bf66d5 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -152,7 +152,7 @@ function set_up_app_server() {
   run sed -i "s#${old}#${new}#g" $file
 
   local jdbc_package_name=com.mysql.jdbc.Driver
-  if [ ! -z $fai_db_vendor ] && [ $fai_db_vendor = "mariadb" ]; then
+  if [ ! -z $db_vendor ] && [ $db_vendor = "mariadb" ]; then
     jdbc_package_name=org.mariadb.jdbc.Driver
   fi
   
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index e472aeae..233978c8 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -190,7 +190,7 @@ function set_up_jdbc_library() {
   cd $escenic_root_dir/assemblytool/lib
   if [ -n "$jdbc_driver" -a -e "$jdbc_driver" ]; then
     make_ln $jdbc_driver
-  elif [ $fai_db_vendor = "mariadb" ]; then
+  elif [ $db_vendor = "mariadb" ]; then
     print_and_log "Downloading MariaDB jdbc driver."
     download_uri_target_to_dir \
         https://downloads.mariadb.org/f/mariadb-java-client-1.1.0/mariadb-java-client-1.1.0.jar/from/http:/ftp.heanet.ie/mirrors/mariadb \
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index ee23dceb..ef657433 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -120,34 +120,24 @@ function add_gpg_key() {
   fi
 }
 
-function pin_percona() {
-  # prefer packages from the percona repo if it exists
-  local pin_percona_conf_file=/etc/apt/preferences.d/20prefer-percona-packages
-  if [ ! -e $pin_percona_conf_file ]; then
-    cat > $pin_percona_conf_file <<EOF
-# Created by $(basename $0) @ $(date)
-Package: *
-Pin: origin repo.percona.com
-Pin-Priority: 600
-EOF
+function pin() {
+  local origin=ftp.heanet.ie
+  if [ $db_vendor = "percona" ]; then
+    local origin=repo.percona.com
   fi
-}
-
-function pin_mariadb() {
-  # prefer packages from the mariadb repo if it exists
-  local pin_mariadb_conf_file=/etc/apt/preferences.d/20prefer-mariadb-packages
-  if [ ! -e $pin_mariadb_conf_file ]; then
-    cat > $pin_mariadb_conf_file <<EOF
+  # prefer packages from the percona repo if it exists
+  local pin_conf_file=/etc/apt/preferences.d/20prefer-${db_vendor}-packages
+  if [ ! -e $pin_conf_file ]; then
+    cat > $pin_conf_file <<EOF
 # Created by $(basename $0) @ $(date)
 Package: *
-Pin: origin ftp.heanet.ie
+Pin: origin ${origin}
 Pin-Priority: 600
 EOF
   fi
 }
 
 function set_up_repository_if_possible() {
-  db_vendor=${fai_db_vendor:-percona}
   if [ $on_debian_or_derivative -eq 1 -a ${fai_db_sql_only-0} -eq 0 ]; then
 
     local code_name=$(lsb_release -s -c)
@@ -164,24 +154,19 @@ function set_up_repository_if_possible() {
       if [ $db_vendor = "mariadb" ]; then
         local distributor=$(lsb_release -i -s | tr '[A-Z]' '[a-z]')
         add_apt_source "deb http://ftp.heanet.ie/mirrors/mariadb/repo/5.5/$distributor ${code_name} main"
-        pin_mariadb
-      else
-        add_apt_source "deb http://repo.percona.com/apt ${code_name} main"
-        pin_percona
-      fi
-
-      run apt-get update
-      if [ $db_vendor = "mariadb" ]; then
         mysql_server_packages="mariadb-server"
         mysql_client_packages="mariadb-client"
         leave_trail "trail_db_vendor=mariadb"
-      else 
+      else
+        add_apt_source "deb http://repo.percona.com/apt ${code_name} main"
         mysql_server_packages="percona-server-server"
         mysql_client_packages="percona-server-client"
         leave_trail "trail_db_vendor=percona"
       fi
-    elif [ -z $fai_db_vendor ]; then
-      print_and_log "The $fai_db_vendor APT repsository doesn't have packages" \
+      pin
+      run apt-get update
+    else
+      print_and_log "The $db_vendor APT repsository doesn't have packages" \
         "for your Debian (or derivative) version with code" \
         "name $code_name. " \
         "I will use vanilla MySQL instead."

From fc0f3680f6399c52b70a10dbbfb41aa97c5aa36c Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Thu, 21 Feb 2013 15:00:25 +0000
Subject: [PATCH 2001/2585] trial and error :-(

---
 usr/share/doc/vizrt/vosa-handbook/admin-pac.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/admin-pac.org b/usr/share/doc/vizrt/vosa-handbook/admin-pac.org
index 88077eaa..772d92c7 100644
--- a/usr/share/doc/vizrt/vosa-handbook/admin-pac.org
+++ b/usr/share/doc/vizrt/vosa-handbook/admin-pac.org
@@ -2,4 +2,4 @@
 Users access our servers on well known ports like 80 or 443. These ports are usually shared with the Internet without any filter.
 We also use webbrowsers to view admin userinterfaces on strange ports like 8080 and 5678. To make this possible in a reasonably secure way we make use of a proxy.
 Vizrt maintains an "Automatic proxy confuguration URL". As you can only have one such URL in your browser, Vizrt maintains a "PAC" resource on the Internet that contains valid settings for many of her customers. This pac URL is http://vizrtsaas.com/gk.pac. 
-The proxy for <%=trail_customer_shortname%> requires a password that you can see [[<%25%3Dtrail_secret_adminproxy%25>][here]]
+The proxy for <%=trail_customer_shortname%> requires a password that you can see <%=trail_secret_adminproxy%>

From 670caa6d5bc028385d1d60ca0f390f29af2c38a2 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Thu, 21 Feb 2013 15:05:15 +0000
Subject: [PATCH 2002/2585] typo

---
 usr/share/doc/vizrt/vosa-handbook/admin-pac.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/admin-pac.org b/usr/share/doc/vizrt/vosa-handbook/admin-pac.org
index 772d92c7..82608331 100644
--- a/usr/share/doc/vizrt/vosa-handbook/admin-pac.org
+++ b/usr/share/doc/vizrt/vosa-handbook/admin-pac.org
@@ -2,4 +2,4 @@
 Users access our servers on well known ports like 80 or 443. These ports are usually shared with the Internet without any filter.
 We also use webbrowsers to view admin userinterfaces on strange ports like 8080 and 5678. To make this possible in a reasonably secure way we make use of a proxy.
 Vizrt maintains an "Automatic proxy confuguration URL". As you can only have one such URL in your browser, Vizrt maintains a "PAC" resource on the Internet that contains valid settings for many of her customers. This pac URL is http://vizrtsaas.com/gk.pac. 
-The proxy for <%=trail_customer_shortname%> requires a password that you can see <%=trail_secret_adminproxy%>
+The proxy for <%=trail_customer_shortname%> requires a password that you can see here <%=trail_secret_adminproxy%>

From e560a57f3d60a8d92fbc90bff04d453fc57370a3 Mon Sep 17 00:00:00 2001
From: imranc <ich@vizrt.com>
Date: Thu, 21 Feb 2013 16:07:50 +0100
Subject: [PATCH 2003/2585] Tomcat removed ServerLifecycleListener from tomcat
 7. So we don't need to concat that anymore.

---
 usr/share/escenic/ece-scripts/ece-install.d/app-server.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 42bf66d5..62201b08 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -162,7 +162,6 @@ function set_up_app_server() {
   <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
   <Listener className="org.apache.catalina.core.JasperListener" />
   <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
-  <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
   <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
 
   <GlobalNamingResources>

From 66ab640e4e6734837159f056d94ff6e5b9f1763c Mon Sep 17 00:00:00 2001
From: Rune Bremnes <rune@bremnes.name>
Date: Thu, 21 Feb 2013 16:19:43 +0100
Subject: [PATCH 2004/2585] Small changes to the documentation to include
 MariaDB.

---
 usr/share/doc/escenic/ece-install-guide.org | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 8974b35a..03dd45a0 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -31,7 +31,7 @@ Escenic-based sites, such as:
 
  - Java
  - Tomcat application server
- - MySQL/Percona database server
+ - MariaDB/MySQL/Percona database server
  - Varnish cache server
  - Icinga & Munin monitoring server
  - NFS server and clients
@@ -401,9 +401,17 @@ To use this profile, add *fai\_db\_install=1* to your
 
 When this profile is used on a supported version of Debian or Ubuntu,
 *ece-install* installs all the components needed to create an Escenic
-database, based on the Percona distribution of MySQL. On any other
-platform you must install either Percona or a standard MySQL
-distribution yourself before running *ece-install*.
+database, based on the MariaDB fork of MySQL or the Percona
+distribution of MySQL. On any other platform you must install either
+MariaDB, Percona or a standard MySQL distribution yourself before running
+*ece-install*.
+
+The default is to install MariaDB unless this setting is added to to
+*ece-install.conf* before you run *ece-install*.
+
+#+BEGIN_SRC conf
+db_vendor=percona
+#+END_SRC
 
 Otherwise, this profile contains all the Escenic components needed on
 a database server plus the correct database schema for the Content
@@ -1348,7 +1356,7 @@ but these should be the most interesting ones.
 
 - */etc/escenic/solr* :: ECE specific Solr configuration
 
-- */etc/init.d/mysql[d]* :: For starting and stopping MySQL/Percona
+- */etc/init.d/mysql[d]* :: For starting and stopping MariaDB/MySQL/Percona
 
 - */etc/init.d/varnish* :: For starting and stopping Varnish
 

From 9213b4ec31b3dbc0743510f32988f281d21cafc3 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Thu, 21 Feb 2013 15:08:20 +0000
Subject: [PATCH 2005/2585] added a nice link

---
 usr/share/doc/vizrt/vosa-handbook/admin-pac.org | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/admin-pac.org b/usr/share/doc/vizrt/vosa-handbook/admin-pac.org
index 82608331..29eb7527 100644
--- a/usr/share/doc/vizrt/vosa-handbook/admin-pac.org
+++ b/usr/share/doc/vizrt/vosa-handbook/admin-pac.org
@@ -1,5 +1,7 @@
 * Proxy auto-config for admin pages
 Users access our servers on well known ports like 80 or 443. These ports are usually shared with the Internet without any filter.
-We also use webbrowsers to view admin userinterfaces on strange ports like 8080 and 5678. To make this possible in a reasonably secure way we make use of a proxy.
+We also use webbrowsers to view admin userinterfaces on strange ports like port 5678. To make this possible in a reasonably secure way we make use of a proxy.
 Vizrt maintains an "Automatic proxy confuguration URL". As you can only have one such URL in your browser, Vizrt maintains a "PAC" resource on the Internet that contains valid settings for many of her customers. This pac URL is http://vizrtsaas.com/gk.pac. 
 The proxy for <%=trail_customer_shortname%> requires a password that you can see here <%=trail_secret_adminproxy%>
+
+See [[http://en.wikipedia.org/wiki/Proxy_auto-config][WikipediA: Proxy auto-config]] for more information on PAC.

From f3a592b895c6826ef14c3f3d71b87bf95ae04e42 Mon Sep 17 00:00:00 2001
From: Debashis Paul <Dpaul@vizrt.com>
Date: Wed, 27 Feb 2013 12:24:59 +0100
Subject: [PATCH 2006/2585] Customer specific chapter overriding was not
 working. To fix this I had to uncomment the copying chapter overrides and had
 to move the add_customer_chapters function call before calling all
 generate_xxx functions.

---
 usr/share/doc/vizrt/vosa-handbook/create-handbook.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index a00f24f9..7d5af12e 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -663,7 +663,7 @@ function add_customer_chapters() {
     grep .org$ | \
     wc -l) -gt 0 ]; then
     echo "Applying customer overrides ..."
-#    cp $target_dir/customer/*.org $target_dir
+    cp $target_dir/customer/*.org $target_dir
   fi
 
   if [ $(ls $target_dir/customer/extra-chapters/ 2>/dev/null | \
@@ -795,6 +795,7 @@ echo "Building the $trail_customer_shortname VOSA Guide"
 get_user_input $@
 set_up_build_directory
 set_customer_specific_variables
+add_customer_chapters
 generate_architecture_diagram
 generate_overview_org
 generate_content_engine_org
@@ -804,7 +805,6 @@ generate_nfs_org
 generate_backup_org
 generate_virtualization_overview_org
 generate_aws_overview_org
-add_customer_chapters
 generate_html_from_org
 generate_svg_from_blockdiag
 echo "done: http://start.vizrtsaas.com/${trail_customer_acronym}/" 

From d3adc8f89f3ca1f90576899e6fd7ec7700a94df4 Mon Sep 17 00:00:00 2001
From: Debashis Paul <Dpaul@vizrt.com>
Date: Thu, 28 Feb 2013 15:36:31 +0100
Subject: [PATCH 2007/2585] fixing problem in get_instance_enabled_list by
 sourcing the /etc/default/ece file locally

---
 usr/share/escenic/ece-scripts/common-ece.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/common-ece.sh b/usr/share/escenic/ece-scripts/common-ece.sh
index 223940ec..c1dd3003 100644
--- a/usr/share/escenic/ece-scripts/common-ece.sh
+++ b/usr/share/escenic/ece-scripts/common-ece.sh
@@ -35,6 +35,11 @@ function get_instance_enabled_list() {
     return
   fi
 
+  eval "$(
+    source /etc/default/ece &> /dev/null
+    declare -p engine_instance_list search_instance_list analysis_instance_list
+  )"
+
   echo ${engine_instance_list} \
     ${search_instance_list} \
     ${analysis_instance_list}

From d05fffa68acd72644cb755fc29494d95c842cacf Mon Sep 17 00:00:00 2001
From: Debashis Paul <Dpaul@vizrt.com>
Date: Thu, 28 Feb 2013 17:15:48 +0100
Subject: [PATCH 2008/2585] Fixing problem caused by error messages in log
 which contains html in it, the problem was happening for the VMEO error
 messages, those message even had html embedded style codes. We used another
 sed operation to remove html codes while parsing the log files.

---
 .../escenic/ece-scripts/system-info.d/11-list-ece-overview.sh   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh b/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
index b202f8ca..2274457c 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
@@ -55,7 +55,7 @@ function list_error_overview_for_instance() {
 
   print_h4_header "Overview of ${1}'s errors"
   # listing the top 50 errors with indiviual count
-  local errors="$(grep ERROR ${file} | cut -d' ' -f6- | sort | uniq -c | sort -n -r | sed 's/^[ ]*//g' | head -n 50)"
+  local errors="$(grep ERROR ${file} | cut -d' ' -f6- | sort | uniq -c | sort -n -r | sed 's/^[ ]*//g' | sed 's/<[^>]*>//g' | head -n 50)"
   if [ $(echo "$errors" | wc -c) -lt 5 ]; then
       print_pre_text "There are no errors in today's log ($file)"
   else

From 0e11fb9c1bdacb8424b2a67ac6543b7bf80930e1 Mon Sep 17 00:00:00 2001
From: Rune Bremnes <rune@bremnes.name>
Date: Fri, 1 Mar 2013 12:17:49 +0100
Subject: [PATCH 2009/2585] Moved the jdbc driver library back to app-server
 lib to make it work as before when doing an ear install without assembly
 tool.

---
 .../ece-scripts/ece-install.d/app-server.sh    | 17 +++++++++++++++++
 .../ece-install.d/content-engine.sh            | 18 ------------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 62201b08..069e5c86 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -1,3 +1,18 @@
+function set_up_jdbc_library() {
+  print_and_log "Setting up the jdbc driver"
+  if [ -n "$jdbc_driver" -a -e "$jdbc_driver" ]; then
+    make_ln $jdbc_driver
+  elif [ $db_vendor = "mariadb" ]; then
+    print_and_log "Downloading MariaDB jdbc driver."
+    download_uri_target_to_dir \
+        https://downloads.mariadb.org/f/mariadb-java-client-1.1.0/mariadb-java-client-1.1.0.jar/from/http:/ftp.heanet.ie/mirrors/mariadb \
+        .
+    mv mariadb mariadb-java-client-1.1.0.jar
+  else
+    make_ln /usr/share/java/mysql-connector-java.jar      
+  fi
+}
+
 function set_up_app_server() {
   print_and_log "Setting up the application server ..."
 
@@ -140,6 +155,8 @@ function set_up_app_server() {
 
   run cd $tomcat_base/lib
 
+  set_up_jdbc_library
+
   # it's important to append (and not pre-pend) the ECE libraries so
   # that things put it in the standard loader behaves as expected,
   # such as log4j configuration put in ${tomcat.base}/lib.
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 233978c8..702da622 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -184,28 +184,10 @@ function set_up_engine_and_plugins() {
   ece_software_setup_completed=1
 }
 
-function set_up_jdbc_library() {
-  print_and_log "Setting up the jdbc driver"
-  make_dir $escenic_root_dir/assemblytool/lib
-  cd $escenic_root_dir/assemblytool/lib
-  if [ -n "$jdbc_driver" -a -e "$jdbc_driver" ]; then
-    make_ln $jdbc_driver
-  elif [ $db_vendor = "mariadb" ]; then
-    print_and_log "Downloading MariaDB jdbc driver."
-    download_uri_target_to_dir \
-        https://downloads.mariadb.org/f/mariadb-java-client-1.1.0/mariadb-java-client-1.1.0.jar/from/http:/ftp.heanet.ie/mirrors/mariadb \
-        .
-    mv mariadb mariadb-java-client-1.1.0.jar
-  else
-    make_ln /usr/share/java/mysql-connector-java.jar      
-  fi
-}
-
 function set_up_assembly_tool() {
   print_and_log "Setting up the Assembly Tool ..."
 
   make_dir $escenic_root_dir/assemblytool/
-  set_up_jdbc_library
   cd $escenic_root_dir/assemblytool/
 
   if [ -e $download_dir/assemblytool*zip ]; then

From d70e403d47c2ccc30788f4442aa121347302861c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Fri, 1 Mar 2013 14:05:34 +0100
Subject: [PATCH 2010/2585] ece-builder - changed to default use of pid file

---
 usr/share/escenic/build-scripts/ece-builder | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-builder b/usr/share/escenic/build-scripts/ece-builder
index 3f5a3a35..43353c58 100755
--- a/usr/share/escenic/build-scripts/ece-builder
+++ b/usr/share/escenic/build-scripts/ece-builder
@@ -9,7 +9,6 @@
 ece_scripts_version="straight-from-github"
 ece_scripts_home=/usr/share/escenic/ece-scripts
 log=/var/log/ece-builder.log
-pid_file=/var/run/ece-builder.pid
 
 # script dependencies
 dependencies="tar
@@ -63,11 +62,12 @@ function verify_root_privilege
 ##
 function set_pid 
 {
+  # set pid
   if [ -e $pid_file ]; then
     echo "Instance of $(basename $0) already running!"
     exit 1
   else
-    echo $BASHPID > $pid_file
+    create_pid
   fi
 }
 

From 1129a57bf57357dee7ccb54ec855134f98299d42 Mon Sep 17 00:00:00 2001
From: Debashis Paul <Dpaul@vizrt.com>
Date: Fri, 1 Mar 2013 15:48:29 +0100
Subject: [PATCH 2011/2585] Changing location of HUGIN from control to
 monitoring machine

---
 .../doc/vizrt/vosa-handbook/create-handbook.sh  | 17 +++++++++--------
 .../doc/vizrt/vosa-handbook/monitoring.org      |  2 +-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 7d5af12e..29808c98 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -342,15 +342,16 @@ EOF
 | $(get_fqdn $trail_monitoring_host) | \
   [[$(get_link ${trail_monitoring_host}):${trail_monitoring_port-80}/munin/][munin]] \
   [[$(get_link ${trail_monitoring_host}):${trail_monitoring_port-80}/icinga/][icinga]] \
+  [[$(get_link ${trail_monitoring_host}):${trail_monitoring_port-5679}][hugin]] \
 |
-EOF
-  fi
-  
-  if [ -n "${trail_control_host}" ]; then
-    cat <<EOF 
-| $(get_fqdn $trail_control_host) | \
-  [[$(get_link $trail_control_host):5679][hugin]] \
-|
+#EOF
+#  fi
+#  
+#  if [ -n "${trail_control_host}" ]; then
+#    cat <<EOF 
+#| $(get_fqdn $trail_control_host) | \
+#  [[$(get_link $trail_control_host):5679][hugin]] \
+#|
 EOF
   fi
 
diff --git a/usr/share/doc/vizrt/vosa-handbook/monitoring.org b/usr/share/doc/vizrt/vosa-handbook/monitoring.org
index 46012023..9929bdfa 100644
--- a/usr/share/doc/vizrt/vosa-handbook/monitoring.org
+++ b/usr/share/doc/vizrt/vosa-handbook/monitoring.org
@@ -27,7 +27,7 @@ produce a system-info report in YAML and check the files into a
 version repository.
 
 When browsing the Hugin web interface at
-http://<%= trail_control_host %>.<%= trail_network_name %>:5679/ you can quickly 
+http://<%= trail_monitoring_host %>.<%= trail_network_name %>:5679/ you can quickly 
 see all changes on the various servers. A change could be a new
 service which is all of a sudden listening on a new port or that the
 version of a installed package has changed. Nothing escapes Hugin's

From 2f5ef671c8cddffe4d5732cba3cc63af845ab822 Mon Sep 17 00:00:00 2001
From: Debashis Paul <Dpaul@vizrt.com>
Date: Fri, 1 Mar 2013 16:11:17 +0100
Subject: [PATCH 2012/2585] Hugin port corrected

---
 usr/share/doc/vizrt/vosa-handbook/create-handbook.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 29808c98..78739730 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -342,7 +342,7 @@ EOF
 | $(get_fqdn $trail_monitoring_host) | \
   [[$(get_link ${trail_monitoring_host}):${trail_monitoring_port-80}/munin/][munin]] \
   [[$(get_link ${trail_monitoring_host}):${trail_monitoring_port-80}/icinga/][icinga]] \
-  [[$(get_link ${trail_monitoring_host}):${trail_monitoring_port-5679}][hugin]] \
+  [[$(get_link ${trail_monitoring_host}):5679][hugin]] \
 |
 #EOF
 #  fi

From 30d46f2728081234c8ed9ace13c1dcc1d8c8e1ab Mon Sep 17 00:00:00 2001
From: Debashis Paul <Dpaul@vizrt.com>
Date: Tue, 5 Mar 2013 15:49:58 +0100
Subject: [PATCH 2013/2585] Added a new file to show the fancy Content Studio
 links

---
 usr/share/doc/vizrt/vosa-handbook/content-studio.org | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/content-studio.org

diff --git a/usr/share/doc/vizrt/vosa-handbook/content-studio.org b/usr/share/doc/vizrt/vosa-handbook/content-studio.org
new file mode 100644
index 00000000..3e5867f5
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/content-studio.org
@@ -0,0 +1,12 @@
+* Content Studio
+Content Studio service is special because -
+1. It usually requires to run on port 80 or 443
+2. It usually requires to have a nice hostname aliasing
+3. It does not run over a proxy server
+
+We strongly recommend to setup SSL with authorized certificate for this service.
+
+Content Studio is being served from the following locations: 
+Production: <%=trail_production_studio%>
+Staging: <%=trail_staging_studio%>
+Test: <%=trail_test_studio%>

From f9ba231b3b653026807e150a4899864a32874822 Mon Sep 17 00:00:00 2001
From: Debashis Paul <Dpaul@vizrt.com>
Date: Tue, 5 Mar 2013 16:34:09 +0100
Subject: [PATCH 2014/2585] Added content-studio org file in the vosa handbook

---
 usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
index a1dbf594..76f12244 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
+++ b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
@@ -7,6 +7,7 @@
 #+TEXT: <%= trail_service_header_org %>
 #+TEXT: [TABLE-OF-CONTENTS]
 #+INCLUDE: "overview.org"
+#+INCLUDE: "content-studio.org"
 #+INCLUDE: "admin-pac.org"
 #+INCLUDE: "operating-system-maintenance.org" 
 #+INCLUDE: "deployment.org"

From 979a5f8945229de716785119e7b0a4d2ea99fbac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Tue, 5 Mar 2013 11:39:46 +0100
Subject: [PATCH 2015/2585] ece-scripts - Added a 5.6 transition note to README

---
 README | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README b/README
index ad8d6edf..997a7f3f 100644
--- a/README
+++ b/README
@@ -1,3 +1,8 @@
+========
+Note!
+========
+This version of ece-scripts is currently being modified to support java7, tomcat7 and content engine 5.6. During this transition the latest version of ece-scripts will not work correctly for previously released engine versions.
+
 ========
 Overview
 ========

From 3f0339b358d0cae05eb4e5963e9cea5ebec30702 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Tue, 5 Mar 2013 11:43:35 +0100
Subject: [PATCH 2016/2585] ece-builder - Standard use of pid file and improved
 support for adding releases

---
 usr/share/escenic/build-scripts/ece-builder | 48 ++++++++++++---------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-builder b/usr/share/escenic/build-scripts/ece-builder
index 43353c58..2be196da 100755
--- a/usr/share/escenic/build-scripts/ece-builder
+++ b/usr/share/escenic/build-scripts/ece-builder
@@ -59,18 +59,6 @@ function verify_root_privilege
   fi
 }
 
-##
-function set_pid 
-{
-  # set pid
-  if [ -e $pid_file ]; then
-    echo "Instance of $(basename $0) already running!"
-    exit 1
-  else
-    create_pid
-  fi
-}
-
 ##
 function init
 {
@@ -92,6 +80,18 @@ function init
     echo "$error_message"
     exit 1
   fi
+
+  # set pid
+  if [ -e $pid_file ]; then
+    echo "Instance of $(basename $0) already running!"
+    exit 1
+  else
+    create_pid
+  fi
+
+  # shutdown hooks
+  trap common_bashing_exit_hook EXIT
+  trap common_bashing_user_cancelled_hook SIGINT SIGHUP
 }
 
 ##
@@ -415,8 +415,8 @@ function add_artifact
   engine_found=0
   plugin_found=0
   unsupported_plugin_found=0
-  artifact_version=`echo $artifact_path | sed "s/.*-\(.*\)\.[a-zA-Z0-9]\{3\}$/\1/"`
-  duplicate_found=0  
+  artifact_version=`echo $artifact_path | sed -n "s/.*-.*\([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/p"`
+  duplicate_found=0
 
   if [ ! -d $builder_engine_dir ]; then
     run mkdir $builder_engine_dir
@@ -446,6 +446,14 @@ function add_artifact
     if [[ "$artifact_path" == *$f* ]]; then
       plugin_found=1
       plugin_pattern=$f
+      # Workaround for widget-framework naming convention
+      if [[ $plugin_pattern == "framework-dist" ]]; then
+        plugin_pattern=widget-framework-core
+      elif [[ $plugin_pattern == "framework-community-dist" ]]; then
+        plugin_pattern=widget-framework-community
+      elif [[ $plugin_pattern == "framework-mobile-dist" ]]; then
+        plugin_pattern=widget-framework-mobile
+      fi
     fi
   done
 
@@ -477,6 +485,7 @@ function add_artifact
 ##
 function process_artifact
 {
+  echo $plugin_pattern
   # identify type
   if [ $engine_found -eq 1 ]; then
     artifact_pattern=engine
@@ -498,19 +507,19 @@ function process_artifact
     artifact_filename=$(basename "$f")
     echo "$artifact_filename" | grep '[0-9]' | grep -q "$artifact_pattern"
     if [ $? = 0 ]; then
-      log "The resulting directory contains numbers and \"$artifact_pattern\" so it is most likely valid."
+      print_and_log "The resulting directory contains numbers and \"$artifact_pattern\" so it is most likely valid."
     else
       echo "$artifact_filename" | grep -q "$artifact_pattern"
       if [ $? = 0 ]; then
-        log "$artifact_path was identified as $artifact_pattern, but failed the naming convention test after being unpacked, trying to recover..."
+        print_and_log "$artifact_path was identified as $artifact_pattern, but failed the naming convention test after being unpacked, trying to recover..."
         if [ ! -d $target_path/$artifact_pattern-$artifact_version ]; then
-          log "$artifact_path was recovered as a $artifact_pattern and will be added as $artifact_pattern-$artifact_version"
+          print_and_log "$artifact_path was recovered as a $artifact_pattern and will be added as $artifact_pattern-$artifact_version"
         else
-          log "$artifact_path was identified as $artifact_pattern, but $artifact_pattern-$artifact_version already exists so it will not be added."
+          print_and_log "$artifact_path was identified as $artifact_pattern, but $artifact_pattern-$artifact_version already exists so it will not be added."
           skip_artifact=1
         fi
       else
-        log "$f is not a valid artifact, ignoring."
+        print_and_log "$f is not a valid artifact, ignoring."
         skip_artifact=1
       fi
     fi
@@ -560,7 +569,6 @@ function common_post_build {
 ##
 function phase_startup {
   verify_root_privilege
-  set_pid
   init
   verify_dependencies
 }

From 32edf0c4ecdd33027f2623aa42558c067ddb4c2c Mon Sep 17 00:00:00 2001
From: Thomas <tvelthoven@vizrt.com>
Date: Wed, 6 Mar 2013 11:18:19 +0100
Subject: [PATCH 2017/2585] Commits to this repo will also show in our vosa
 hipchat room

---
 README | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README b/README
index 997a7f3f..579da524 100644
--- a/README
+++ b/README
@@ -46,3 +46,5 @@ come hither!
 
 tkj@vizrt.com
 (From February 2013 Torstein will/has move(d) on and you can send email to thv@vizrt.com untill we do the impossible and find a suitable replacement for Torstein)
+
+Commits to this repo will also show in our vosa hipchat room

From 1709e036f56fbddf5d936503712197304d5b4d54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Tue, 5 Mar 2013 12:23:54 +0100
Subject: [PATCH 2018/2585] ece-install - Added fix for missing solr.xml file
 when installing engine 5.6. This will closes #13

---
 .../ece-scripts/ece-install.d/search-server.sh      | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
index 20bc85fa..a00ab7e8 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
@@ -32,6 +32,12 @@ function set_up_solr() {
       run cd $a_tmp_dir
       run tar xzf $(basename $ece_instance_conf_archive) engine/solr/conf
       run cp -r engine/solr/conf $escenic_conf_dir/solr
+
+      # ECE 5.6 has one additional configuration file!
+      if [ -e engine/solr/solr.xml ]; then
+        run cp -r engine/solr/solr.xml $escenic_conf_dir/. 
+      fi
+
       run rm -r $a_tmp_dir
     else
       print_and_log "Installing default Solr conf shipped with ECE ..."
@@ -47,6 +53,13 @@ function set_up_solr() {
     run ln -s $escenic_conf_dir/solr conf
   fi
 
+  # ECE 5.6 has one additional configuration file!
+  if  [ ! -h solr.xml ]; then
+    if [ -e $escenic_conf_dir/solr/solr.xml ]; then
+      run ln -s $escenic_conf_dir/solr/solr.xml solr.xml
+    fi
+  fi
+
   local editorial_search_instance=${fai_search_for_editor-0}
   local file=$escenic_conf_dir/solr/solrconfig.xml
   if [ $editorial_search_instance -eq 1 ]; then

From c2ca8a5138782c53f77cc97a1e03d4c7f43b172e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Tue, 5 Mar 2013 13:42:38 +0100
Subject: [PATCH 2019/2585] ece-install - added property fai_studio_jre to
 allow 1.7 override for CS jre requirement

---
 .../ece-scripts/ece-install.d/content-engine.sh       | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 702da622..82ba059e 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -417,9 +417,16 @@ EOF
   fi
 
   file=$common_nursery_dir/com/escenic/webstart/StudioConfig.properties
+  
+  # As of engine 5.6 we set this to 1.7
+  local studio_jre=1.6
+  if [ -n $fai_studio_jre ] && [ "$fai_studio_jre" == "1.7" ]; then
+    local studio_jre=$fai_studio_jre
+  fi  
+
   cat >> $file <<EOF
-# Currently (2012-08-15), ECS insists on JRE = 1.6.
-jreRequirement=1.6
+# As of engine 5.6 we set this to 1.7. For versions <5.6 ECS insists on JRE = 1.6.
+jreRequirement=$studio_jre
 
 # We set this to get around a missing feature in Varnish, see:
 # https://www.varnish-cache.org/trac/wiki/Future_Feature#Chunkedencodingclientrequests

From 6ad10da6bca9006a45672f19dff4a2d67ddca3c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Tue, 5 Mar 2013 14:47:16 +0100
Subject: [PATCH 2020/2585] ece-install - adjustment to solr.xml placement

---
 .../ece-scripts/ece-install.d/search-server.sh    | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
index a00ab7e8..9eb366d8 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
@@ -33,15 +33,16 @@ function set_up_solr() {
       run tar xzf $(basename $ece_instance_conf_archive) engine/solr/conf
       run cp -r engine/solr/conf $escenic_conf_dir/solr
 
-      # ECE 5.6 has one additional configuration file!
-      if [ -e engine/solr/solr.xml ]; then
-        run cp -r engine/solr/solr.xml $escenic_conf_dir/. 
-      fi
-
       run rm -r $a_tmp_dir
     else
       print_and_log "Installing default Solr conf shipped with ECE ..."
       run cp -r $escenic_root_dir/engine/solr/conf $escenic_conf_dir/solr
+      
+      # ECE 5.6 has one additional configuration file!
+      if [ -e $escenic_root_dir/engine/solr/solr.xml ]; then
+        run cp -r $escenic_root_dir/engine/solr/solr.xml $escenic_conf_dir/. 
+      fi
+
     fi
   else
     print_and_log "$escenic_conf_dir/solr already exists, not touching it."
@@ -55,8 +56,8 @@ function set_up_solr() {
 
   # ECE 5.6 has one additional configuration file!
   if  [ ! -h solr.xml ]; then
-    if [ -e $escenic_conf_dir/solr/solr.xml ]; then
-      run ln -s $escenic_conf_dir/solr/solr.xml solr.xml
+    if [ -e $escenic_conf_dir/solr.xml ]; then
+      run ln -s $escenic_conf_dir/solr.xml solr.xml
     fi
   fi
 

From 8773955ac5e9b712b155edb76120943ff0327d2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Tue, 5 Mar 2013 15:36:32 +0100
Subject: [PATCH 2021/2585] ece-install - changed 1.7 to 1.7+ for studio jre
 engine version 5.6 and above

---
 .../escenic/ece-scripts/ece-install.d/content-engine.sh     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 82ba059e..46c080b5 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -418,14 +418,14 @@ EOF
 
   file=$common_nursery_dir/com/escenic/webstart/StudioConfig.properties
   
-  # As of engine 5.6 we set this to 1.7
+  # As of engine 5.6 we set this to 1.7+
   local studio_jre=1.6
-  if [ -n $fai_studio_jre ] && [ "$fai_studio_jre" == "1.7" ]; then
+  if [ -n $fai_studio_jre ] && [ "$fai_studio_jre" == "1.7+" ]; then
     local studio_jre=$fai_studio_jre
   fi  
 
   cat >> $file <<EOF
-# As of engine 5.6 we set this to 1.7. For versions <5.6 ECS insists on JRE = 1.6.
+# As of engine 5.6 we set this to 1.7+. For versions <5.6 ECS insists on JRE = 1.6.
 jreRequirement=$studio_jre
 
 # We set this to get around a missing feature in Varnish, see:

From 2b862e7562aa2ca1b89ff67ae24bd8f6ffdc1ee4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Tue, 5 Mar 2013 15:51:56 +0100
Subject: [PATCH 2022/2585] ece-install - the patch for setting jre requirement
 for CS has been removed since no releases of content engine after october
 2012 needs this patch

---
 .../escenic/ece-scripts/ece-install.d/content-engine.sh  | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 46c080b5..791f20cd 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -418,16 +418,7 @@ EOF
 
   file=$common_nursery_dir/com/escenic/webstart/StudioConfig.properties
   
-  # As of engine 5.6 we set this to 1.7+
-  local studio_jre=1.6
-  if [ -n $fai_studio_jre ] && [ "$fai_studio_jre" == "1.7+" ]; then
-    local studio_jre=$fai_studio_jre
-  fi  
-
   cat >> $file <<EOF
-# As of engine 5.6 we set this to 1.7+. For versions <5.6 ECS insists on JRE = 1.6.
-jreRequirement=$studio_jre
-
 # We set this to get around a missing feature in Varnish, see:
 # https://www.varnish-cache.org/trac/wiki/Future_Feature#Chunkedencodingclientrequests
 # For Escenic-ites, see: VF-3480

From 342fe05dfbaf51fc5a644cdf2ebe3b9ef83cd3c1 Mon Sep 17 00:00:00 2001
From: Debashis Paul <Dpaul@vizrt.com>
Date: Wed, 6 Mar 2013 15:29:03 +0100
Subject: [PATCH 2023/2585] Vizrt SaaS Services added in vosa guide

---
 .../vizrt/vosa-handbook/content-studio.org    | 12 ---------
 .../vizrt/vosa-handbook/create-handbook.sh    |  9 ++-----
 .../vizrt/vosa-handbook/vizrt-services.org    | 25 +++++++++++++++++++
 .../doc/vizrt/vosa-handbook/vosa-handbook.org |  2 +-
 4 files changed, 28 insertions(+), 20 deletions(-)
 delete mode 100644 usr/share/doc/vizrt/vosa-handbook/content-studio.org
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/vizrt-services.org

diff --git a/usr/share/doc/vizrt/vosa-handbook/content-studio.org b/usr/share/doc/vizrt/vosa-handbook/content-studio.org
deleted file mode 100644
index 3e5867f5..00000000
--- a/usr/share/doc/vizrt/vosa-handbook/content-studio.org
+++ /dev/null
@@ -1,12 +0,0 @@
-* Content Studio
-Content Studio service is special because -
-1. It usually requires to run on port 80 or 443
-2. It usually requires to have a nice hostname aliasing
-3. It does not run over a proxy server
-
-We strongly recommend to setup SSL with authorized certificate for this service.
-
-Content Studio is being served from the following locations: 
-Production: <%=trail_production_studio%>
-Staging: <%=trail_staging_studio%>
-Test: <%=trail_test_studio%>
diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 78739730..08a315f3 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -334,7 +334,7 @@ function get_link() {
 
 function get_generated_overview() {
   cat <<EOF
-** Production Habitat :: Machines & Their Services
+** Machines & Their Services
 EOF
   get_machine_matrix_header
   if [ -n "${trail_monitoring_host}" ]; then
@@ -404,19 +404,14 @@ EOF
       get_simple_host_overview $el
     )
   done
-  get_machine_matrix_footer
 
   if [ -n "$trail_staging_editor_host" ]; then
-    cat <<EOF 
-** Staging Habitat :: Machines & Their Services
-EOF
-    get_machine_matrix_header
     echo $(get_editor_host_overview \
       $trail_staging_editor_host \
       $trail_staging_editor_port
     )
-    get_machine_matrix_footer
   fi
+
 }
 
 function get_machine_matrix_header() {
diff --git a/usr/share/doc/vizrt/vosa-handbook/vizrt-services.org b/usr/share/doc/vizrt/vosa-handbook/vizrt-services.org
new file mode 100644
index 00000000..19794f3a
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/vizrt-services.org
@@ -0,0 +1,25 @@
+* Vizrt SaaS Services
+
+|----------------+---------------------------------+-----------------------------+--------------------------|
+| Service        | Production                      | Staging                     | Test                     |
+|----------------+---------------------------------+-----------------------------+--------------------------|
+| Website        | <%=trail_production_websites %> | <%=trail_staging_websites%> | <%=trail_test_websites%> |
+|----------------+---------------------------------+-----------------------------+--------------------------|
+| Content Studio | <%=trail_production_studio%>    | <%=trail_staging_studio%>   | <%=trail_test_studio%>   |
+|----------------+---------------------------------+-----------------------------+--------------------------|
+| Jira           | https://vizrtcustomers.jira.com/browse/<%=trail_vizrtcustomer_jira_name%>                |
+|----------------+------------------------------------------------------------------------------------------|
+| SVN            | https://vizrtcustomers.jira.com/svn/<%=trail_vizrtcustomer_jira_name%>                   |
+|----------------+------------------------------------------------------------------------------------------|
+| Hipchat        | https://vizrtcustomers.hipchat.com/chat                                                  |
+|----------------+------------------------------------------------------------------------------------------|
+| Dev Image      | <%=trail_dev_image_location%>                                                            |
+|----------------+------------------------------------------------------------------------------------------|
+
+Content Studio service is special because -
+1. It usually requires to run on port 80 or 443
+2. It usually requires to have a nice hostname aliasing
+3. It does not run over a proxy server
+
+We strongly recommend to setup SSL with authorized certificate for this service.
+
diff --git a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
index 76f12244..d3a12210 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
+++ b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
@@ -7,7 +7,7 @@
 #+TEXT: <%= trail_service_header_org %>
 #+TEXT: [TABLE-OF-CONTENTS]
 #+INCLUDE: "overview.org"
-#+INCLUDE: "content-studio.org"
+#+INCLUDE: "vizrt-services.org"
 #+INCLUDE: "admin-pac.org"
 #+INCLUDE: "operating-system-maintenance.org" 
 #+INCLUDE: "deployment.org"

From 4a901daf3172193554984597801b0bcfa446f50b Mon Sep 17 00:00:00 2001
From: Debashis Paul <Dpaul@vizrt.com>
Date: Wed, 6 Mar 2013 17:19:51 +0100
Subject: [PATCH 2024/2585] Table reformatted for SaaS services and Order of
 staging changed in Machines and Their Services

---
 .../doc/vizrt/vosa-handbook/create-handbook.sh   | 16 ++++++++--------
 .../doc/vizrt/vosa-handbook/vizrt-services.org   |  6 +-----
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index 08a315f3..aff25785 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -337,6 +337,14 @@ function get_generated_overview() {
 ** Machines & Their Services
 EOF
   get_machine_matrix_header
+
+  if [ -n "$trail_staging_editor_host" ]; then
+    echo $(get_editor_host_overview \
+      $trail_staging_editor_host \
+      $trail_staging_editor_port
+    )
+  fi
+
   if [ -n "${trail_monitoring_host}" ]; then
     cat <<EOF 
 | $(get_fqdn $trail_monitoring_host) | \
@@ -404,14 +412,6 @@ EOF
       get_simple_host_overview $el
     )
   done
-
-  if [ -n "$trail_staging_editor_host" ]; then
-    echo $(get_editor_host_overview \
-      $trail_staging_editor_host \
-      $trail_staging_editor_port
-    )
-  fi
-
 }
 
 function get_machine_matrix_header() {
diff --git a/usr/share/doc/vizrt/vosa-handbook/vizrt-services.org b/usr/share/doc/vizrt/vosa-handbook/vizrt-services.org
index 19794f3a..d00ca307 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vizrt-services.org
+++ b/usr/share/doc/vizrt/vosa-handbook/vizrt-services.org
@@ -4,15 +4,11 @@
 | Service        | Production                      | Staging                     | Test                     |
 |----------------+---------------------------------+-----------------------------+--------------------------|
 | Website        | <%=trail_production_websites %> | <%=trail_staging_websites%> | <%=trail_test_websites%> |
-|----------------+---------------------------------+-----------------------------+--------------------------|
 | Content Studio | <%=trail_production_studio%>    | <%=trail_staging_studio%>   | <%=trail_test_studio%>   |
-|----------------+---------------------------------+-----------------------------+--------------------------|
+
 | Jira           | https://vizrtcustomers.jira.com/browse/<%=trail_vizrtcustomer_jira_name%>                |
-|----------------+------------------------------------------------------------------------------------------|
 | SVN            | https://vizrtcustomers.jira.com/svn/<%=trail_vizrtcustomer_jira_name%>                   |
-|----------------+------------------------------------------------------------------------------------------|
 | Hipchat        | https://vizrtcustomers.hipchat.com/chat                                                  |
-|----------------+------------------------------------------------------------------------------------------|
 | Dev Image      | <%=trail_dev_image_location%>                                                            |
 |----------------+------------------------------------------------------------------------------------------|
 

From 360329866145239ea80e469750c51761b66a24e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Sat, 9 Mar 2013 11:49:00 +0100
Subject: [PATCH 2025/2585] ece-build - hardened the verification process for
 maven user repo access

---
 usr/share/escenic/build-scripts/ece-build | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index fef6523e..72ce10cf 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -322,8 +322,25 @@ function verify_requested_versions
 function verify_maven_proxy
 {
   if [ -e $maven_conf_file ]; then
-    maven_user=`sed "/<username>/!d;s/ *<\/\?username> *//g" $maven_conf_file | tr -d $'\r' `
-    maven_password=`sed "/<password>/!d;s/ *<\/\?password> *//g" $maven_conf_file | tr -d $'\r' `
+    maven_credentials=`xml2 < $maven_conf_file | grep '^/settings/servers'`
+    stable=vizrt-repo
+    process=0
+    for f in $maven_credentials; do
+      if [[ "$f" == *id=* ]]; then
+        local server=`echo $f | sed -n -e 's,.*id=,,p'`
+        if [[ "$server" == "$stable" ]]; then
+          process=1
+        else
+          process=0
+        fi
+      elif [ $process -eq 1 ]; then
+        if [[ "$f" == *username=* ]]; then
+          maven_user=`echo $f | sed -n -e 's,.*username=,,p'`
+        elif [[ "$f" == *password=* ]]; then
+          maven_password=`echo $f | sed -n -e 's,.*password=,,p'`
+        fi
+      fi
+    done
     if [[ $maven_user = "" ]] || [[ $maven_password = "" ]]; then
       print_and_log "Your $maven_conf_file is missing the username and/or the password for the maven proxy, exiting!"
       remove_pid_and_exit_in_error

From 8e673423fd727eef66d6253662d72aa9de798150 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Sat, 9 Mar 2013 11:59:10 +0100
Subject: [PATCH 2026/2585] ece-build - xml2 is now a requirement for ece-build

---
 usr/share/escenic/build-scripts/ece-build | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 72ce10cf..771450ea 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -57,7 +57,8 @@ ant
 svn
 mvn
 unzip
-wget"
+wget
+xml2"
 
 ##
 function init

From 8f1106c5384b530ca0a20ea95609f9ac56740b72 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Tue, 12 Mar 2013 17:53:02 +0100
Subject: [PATCH 2027/2585] Made an empty nursery directory in case no Content
 Engine is in the technet_download_list

---
 .../escenic/ece-scripts/ece-install.d/content-engine.sh     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 791f20cd..333716af 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -365,12 +365,16 @@ function set_up_basic_nursery_configuration() {
     fi
 
     run cp -r engine/siteconfig/config-skeleton/* $common_nursery_dir/
-  else
+  elif [ -d $escenic_root_dir/engine/siteconfig/config-skeleton ] ; then
     print_and_log "I'm using Nursery & JAAS configuration (skeleton) " \
       "from $escenic_root_dir/engine"
     run cp -r $escenic_root_dir/engine/siteconfig/config-skeleton/* \
       $common_nursery_dir/
     run cp -r $escenic_root_dir/engine/security/ $common_nursery_dir/
+  else
+    print_and_log "I'm creating an empty config tree for you, since" \
+      "no content engine was downloaded."
+    run mkdir -p $common_nursery_dir
   fi
 
   if [ -n "${a_tmp_dir}" ]; then

From 68e5e2ecfda300f4a94bc41f5e9b958d131a5d7f Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 14 Mar 2013 12:24:01 +0100
Subject: [PATCH 2028/2585] Added scaffolding to retrieve maven coordinates
 from the effective pom. This is only donw if the effective pom has any
 <escenic.xxx.distribution> properties set anywhere.  They need to be maven
 "coordinates" so to speak.

---
 .../ece-install.d/content-engine.sh           | 68 +++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 333716af..97612283 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -82,6 +82,8 @@ function install_ece_instance() {
 
   set_archive_files_depending_on_profile
 
+  create_ear_download_list
+
   download_escenic_components
   check_for_required_downloads
   set_up_engine_and_plugins
@@ -139,6 +141,72 @@ function install_ece_instance() {
   add_next_step "/etc/default/ece lists all instances started at boot time"
 }
 
+function create_ear_download_list() {
+  # sane default
+  ear_download_list=
+
+  if [ $(is_installing_from_ear) -eq 0 ]; then
+    return;
+  fi
+
+  if [[ -n "${fai_builder_http_user}" && \
+      -n "${fai_builder_http_password}" ]]; then
+      local wget_auth="
+          --http-user $fai_builder_http_user
+          --http-password $fai_builder_http_password
+        "
+  fi
+
+  # TODO: do I need to make this here?  Shouldn't it be here already?
+  if [ ! -d $escenic_cache_dir ] ; then
+    mkdir -p $escenic_cache_dir
+  fi
+
+  local ear_file=$escenic_cache_dir/$(basename $ece_instance_ear_file)
+
+  if [ ! -s $ear_file ] ; then
+    run wget $wget_auth $wget_opts $ece_instance_ear_file \
+      -O $ear_file
+  fi
+
+  if [ ! -s $ear_file ] ; then
+    rm $ear_file
+    print_and_log "Unable to download EAR file $ece_instance_ear_file," \
+      "aborting."
+    remove_pid_and_exit_in_error
+  fi
+
+  effective_pom=META-INF/effective-pom.xml
+
+  # Verify that the ZIP file has an effective-pom.xml file
+  run unzip -t -q $ear_file
+
+  if ! unzip -t -q $ear_file $effective_pom ; then
+    print_and_log "EAR file is missing $effective_pom. Not resolving artifacts."
+    return 0
+  fi
+
+  local props=$(unzip -qc $ear_file $effective_pom |
+    xmlstarlet sel -N "pom=http://maven.apache.org/POM/4.0.0" \
+      -t -m '/projects/pom:project/pom:properties/*' \
+      -v 'concat(name(), " ", text())' -nl)
+  if [ $? != 0 ] ; then
+    print_and_log "Unable to understand the effective pom"
+    return 0
+  fi
+
+  local gavs=$(sort <<< "$props" -u | grep '^escenic\.[^\.]*\.distribution ' | cut -d ' ' -f 2 )
+  if [ $? != 0 ] ; then
+    print_and_log "EAR's effective pom had no escenic.xxx.distribution properties.  Ignoring."
+    return 0
+  fi
+
+  local coordinate
+  for coordinate in $gavs; do
+    # populate ear_download_list with URLs
+  done
+}
+
 function set_up_engine_and_plugins() {
   if [ $ece_software_setup_completed -eq 1 ]; then
     return

From bedf358bf960f72ad5badd4d3788634263c223de Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 14 Mar 2013 15:47:28 +0100
Subject: [PATCH 2029/2585] Made it possible to run ece-install with no
 "technet download list".

The list of artifacts needed for installation of a machine can be
specified by the EAR file.  The EAR file should contain an "effective
pom" with normal <properties> in a specific form.  ece-install looks
through the repositories specified by fai_maven_repositories for the
artifacts and downloads them in addition to wf_download_list and
technet_download_list (which may be empty).

Assemblytool is no longer required to run ece-install with an EAR.
---
 usr/sbin/ece-install                          | 17 +++-
 usr/share/doc/escenic/ece-install-guide.org   | 81 +++++++++++++++++++
 .../ece-install.d/content-engine.sh           | 79 +++++++++++++++---
 3 files changed, 163 insertions(+), 14 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index ecaaac59..d65eb653 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -183,6 +183,20 @@ function download_escenic_components()
         --http-password $technet_password \
         $el
     done
+
+    for el in $ear_download_list ; do
+      if [ -s $(basename $el) ]; then
+        continue;
+      fi
+      local repo
+      for repo in $fai_maven_repositories; do
+        if curl -s -I $repo/$el | grep -q '^HTTP[^ ]* 200' ; then
+          log "Downloading $(basename $el) ..."
+          run wget $wget_opts $repo/$el
+          break
+        fi
+      done
+    done
 }
 
 # we need to do one apt-get update to be sure the package list is
@@ -402,7 +416,8 @@ function check_for_required_downloads()
   fi
 
   print_and_log "Asserting that required downloads succeeded ..."
-  local required_escenic_packages="engine assemblytool"
+  local required_escenic_packages="engine"
+  # TODO: make assembly tool required if not using an EAR.
   if [ $install_profile_number -eq $PROFILE_ANALYSIS_SERVER ]; then
     required_escenic_packages="analysis-engine"
   fi
diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 03dd45a0..7c2da005 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -846,6 +846,87 @@ The inclusion of the engine/solr directory makes it easy for users to
 provide their own, optimised Solr configuration. In this context, also
 note that a post install hook, *set\_up\_solr.postinst*, is available.
 
+If you use maven to build your projects, you can put an effective pom
+into the /META-INF/effective-pom.xml file of your EAR, with properties
+that signal to ece-install what files to download, by specifying the
+maven coordinates of the artifact.
+
+Include these coordinates as properties that start with *escenic.* and
+end with *.distribution* to get ece-install to download them from a
+maven repository.
+
+#+BEGIN_SRC nxml
+<properties>
+  <escenic.engine.distribution>com.escenic:engine-dist:zip:bin:${engine-version}</escenic.engine.distribution>
+  <escenic.someplugin.distribution>com.escenic.plugins.someplugin:someplugin-dist:zip:${someplugin-version}</escenic.someplugin.distribution>
+</properties>
+#+END_SRC
+
+In your ece-install.conf file, specify *fai_maven_repositories* as a
+whitespace separated list of repositories that may hold these binaries,
+and ece-install will try each repository in order to download the arifacts.
+
+#+BEGIN_SRC conf
+fai_maven_repositories="
+  http://example.org/nexus/content/groups/trunk/
+  http://mybuildserver/
+"
+#+END_SRC
+
+If you wish to provide Nursery configuration for the plugins, you
+simply put them in engine/siteconfig/config-skeleton inside your
+tarball, together with the other Nursery configuration files.
+
+The *fai\_presentation\_conf\_archive* and *fai\_presentation\_ear* variables
+both accept the following types of value (here using the value of
+*fai\_presentation\_ear* as an example):
+- *http://build.server/stable/engine-mysite.com-1.2.3.ear*
+- *https://build.server/stable/engine-mysite.com-1.2.3.ear*
+- *file:///var/lib/build/stable/engine-mysite.com-1.2.3.ear*
+- */var/lib/build/stable/engine-mysite.com-1.2.3.ear*
+
+** Setting up virtual hosts
+Setting up virtual host definitions in the application server makes a
+some things easier, such as ECE plugins which set cookies based on
+information they get from the app server.
+
+ece-install can set up the virtual hosts configuration for Tomcat
+application servers if the profile is *editor*, *all* or
+*presentation*.
+
+To use this feature, you must define one domain for each publication
+in the following FAI parameter:
+#+BEGIN_SRC conf
+fai_publication_domain_mapping_list="
+  firepub#fire.escenic.com
+  ildpub#ild.escenic.com#feuer.escenic.com,fuego.escenic.com
+"
+#+END_SRC
+
+This will produce the following stanzas in *server.xml*:
+
+#+BEGIN_SRC nxml
+<Host
+  name="fire.escenic.com"
+  appBase="webapps-fire"
+  autoDeploy="false">
+  <Context displayName="fire.escenic.com"
+           docBase="firepub"
+           path=""
+  />
+</Host>
+<Host
+  name="ild.escenic.com"
+  appBase="webapps-ildpub"
+  autoDeploy="false">
+  <Alias>feuer.escenic.com</Alias>
+  <Alias>fuego.escenic.com</Alias>
+  <Context displayName="ild.escenic.com"
+           docBase="ildpub"
+           path=""
+  />
+</Host>
+#+END_SRC
 If you wish to provide Nursery configuration for the plugins, you
 simply put them in engine/siteconfig/config-skeleton inside your
 tarball, together with the other Nursery configuration files.
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 97612283..b2a04ace 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -164,7 +164,10 @@ function create_ear_download_list() {
 
   local ear_file=$escenic_cache_dir/$(basename $ece_instance_ear_file)
 
-  if [ ! -s $ear_file ] ; then
+  if [ -s $ear_file ] ; then
+    print_and_log "Using previously downloaded EAR file $ear_file"
+  else
+    print_and_log "Downloading $ece_instance_ear_file to $ear_file"
     run wget $wget_auth $wget_opts $ece_instance_ear_file \
       -O $ear_file
   fi
@@ -176,34 +179,79 @@ function create_ear_download_list() {
     remove_pid_and_exit_in_error
   fi
 
-  effective_pom=META-INF/effective-pom.xml
+  local effective_pom=META-INF/effective-pom.xml
 
   # Verify that the ZIP file has an effective-pom.xml file
   run unzip -t -q $ear_file
+  log "$ear_file was a valid ZIP file"
 
-  if ! unzip -t -q $ear_file $effective_pom ; then
+  if ! unzip &> /dev/null -t -q $ear_file $effective_pom ; then
     print_and_log "EAR file is missing $effective_pom. Not resolving artifacts."
     return 0
   fi
 
   local props=$(unzip -qc $ear_file $effective_pom |
     xmlstarlet sel -N "pom=http://maven.apache.org/POM/4.0.0" \
-      -t -m '/projects/pom:project/pom:properties/*' \
-      -v 'concat(name(), " ", text())' -nl)
+      -t -m '/pom:project/pom:properties/*|/projects/pom:project/pom:properties/*' \
+      -v 'concat(name(), " ", text())' \
+      -nl)
   if [ $? != 0 ] ; then
     print_and_log "Unable to understand the effective pom"
     return 0
   fi
 
   local gavs=$(sort <<< "$props" -u | grep '^escenic\.[^\.]*\.distribution ' | cut -d ' ' -f 2 )
-  if [ $? != 0 ] ; then
+  if ! grep -q . <<< "$gavs" ; then
     print_and_log "EAR's effective pom had no escenic.xxx.distribution properties.  Ignoring."
+    log props=$props
     return 0
   fi
 
+  log "Found these artifacts: " $gavs
+
   local coordinate
   for coordinate in $gavs; do
-    # populate ear_download_list with URLs
+    local groupid
+    local artifactid
+    local version
+    local packaging
+    local classifier
+    # coordinate is e.g. com.escenic:engine-dist:zip:bin:5.5.2.137014
+    # or com.escenic.plugins.forum:forum:zip:3.2.1.132293
+    # groupid:artifactid:[packaging:[classifier:]]version
+
+    # chomp groupid: --> artifactid:[packaging:[classifier:]]version 
+    groupid=${coordinate/:*}
+    coordinate=${coordinate#${groupid}:}
+
+    # chomp artifactid: --> [packaging:[classifier:]]version
+    artifactid=${coordinate/:*}
+    coordinate=${coordinate#${artifactid}:}
+
+    # chomp version --> [packaging[:classifier]]
+    version=${coordinate/*:}
+    coordinate=${coordinate%${version}}
+    coordinate=${coordinate%:}
+
+    classifier=
+    packaging=
+
+    if [ ! -z "$coordinate" ] ; then
+      # chomp packaging --> [classifier]
+      packaging=${coordinate/:*}
+      coordinate=${coordinate#${packaging}}
+      coordinate=${coordinate#:}
+    fi
+
+    if [ ! -z "$coordinate" ] ; then
+      # chomp classifier
+      classifier=$coordinate
+      coordinate=
+    fi
+
+    ear_download_list="$ear_download_list \
+       ${groupid//.//}/${artifactid}/$version/${artifactid}-${version}${classifier:+-${classifier}}.$packaging"
+
   done
 }
 
@@ -216,14 +264,15 @@ function set_up_engine_and_plugins() {
   make_dir $escenic_root_dir
   run cd $escenic_root_dir/
 
-  for el in $technet_download_list; do
-    verify_that_archive_is_ok $download_dir/$(basename $el)
+  for el in $technet_download_list $ear_download_list; do
+    local file=$(basename $el)
+    verify_that_archive_is_ok $download_dir/$file
 
-    if [ $(basename $el | \
+    if [ $(echo $file | \
       grep -E "^engine-[0-9]|^engine-trunk-SNAPSHOT|^engine-dist" | \
       wc -l) -gt 0 ]; then
-      engine_dir=$(get_base_dir_from_bundle $download_dir/$(basename $el))
-      engine_file=$(basename $el)
+      engine_dir=$(get_base_dir_from_bundle $download_dir/$file)
+      engine_file=$file
     fi
   done
 
@@ -241,8 +290,10 @@ function set_up_engine_and_plugins() {
   # we now extract all the plugins. We extract them in $escenic_root_dir
   # as we want to re-use them between minor updates of ECE.
   run cd $escenic_root_dir/
-  for el in $technet_download_list $wf_download_list; do
+  for el in $technet_download_list $wf_download_list $ear_download_list; do
     local file=$(basename $el)
+    # FIXME el will never be engine-* because it's the technet download list.  Should
+    # this be [[ "$file" == ....
     if [[ "$el" == engine-* ]]; then
       continue
     fi
@@ -625,6 +676,7 @@ function install_ece_third_party_packages
       memcached
       xml-twig-tools
       wget
+      xmlstarlet
     "
   elif [ $on_redhat_or_derivative -eq 1 ]; then
     packages="
@@ -635,6 +687,7 @@ function install_ece_third_party_packages
       memcached
       mysql-connector-java
       wget
+      xmlstarlet
     "
 
     # TODO no tomcat APR wrappers in official repositories

From a49655f1b3442fd6e426e6aad9d127d5daf725ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Fri, 15 Mar 2013 09:29:54 +0100
Subject: [PATCH 2030/2585] ece-build - configuration file will now be read
 right after init

---
 usr/share/escenic/build-scripts/ece-build | 24 +++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 771450ea..793952ae 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -89,6 +89,17 @@ function init
   trap common_bashing_user_cancelled_hook SIGINT SIGHUP
 }
 
+##
+function fetch_configuration
+{
+  if [ -e $conf_file ]; then
+    source $conf_file
+  else
+    print_and_log "Your user is missing the $conf_file, exiting!"
+    remove_pid_and_exit_in_error
+  fi 
+}
+
 ##
 function enforce_variable
 {
@@ -121,17 +132,6 @@ function verify_dependencies
   done
 }
 
-##
-function fetch_configuration
-{
-  if [ -e $conf_file ]; then
-    source $conf_file
-  else
-    print_and_log "Your user is missing the $conf_file, exiting!"
-    remove_pid_and_exit_in_error
-  fi 
-}
-
 ##
 function verify_configuration {
   enforce_variable customer "Your $conf_file is missing the variable 'customer', exiting!"
@@ -459,6 +459,7 @@ function print_result
 ##
 function phase_startup {
   init
+  fetch_configuration
 }
 
 ##
@@ -472,7 +473,6 @@ function phase_verify_platform
 function phase_verify_user
 {
   verify_maven_proxy
-  fetch_configuration
   verify_configuration
   verify_assemblytool
 }

From 032b35cfacbe7a2fa2ec92e40fa7c4aaf6f16c5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Fri, 15 Mar 2013 09:36:14 +0100
Subject: [PATCH 2031/2585] ece-build - moved debian configuration package
 creation to better reflect the order of execution

---
 usr/share/escenic/build-scripts/ece-build | 157 +++++++++++-----------
 1 file changed, 79 insertions(+), 78 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 793952ae..2d8a4fe4 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -445,84 +445,6 @@ function publish_ear
   fi
 }
 
-##
-function print_result
-{
-  print_and_log "BUILD SUCCESSFUL! @ $(date)"
-  if [ $skip_ear -eq 1 ]; then
-    print_and_log "Only configuration packages has been created in this release!"
-  else
-    print_and_log "You'll find the release here: http://builder.vizrtsaas.com/$customer/releases/$resulting_ear"
-  fi
-}
-
-##
-function phase_startup {
-  init
-  fetch_configuration
-}
-
-##
-function phase_verify_platform
-{
-  verify_dependencies
-  verify_java
-}
-
-##
-function phase_verify_user
-{
-  verify_maven_proxy
-  verify_configuration
-  verify_assemblytool
-}
-
-##
-function phase_clean_up
-{
-  clean_customer_home
-}
-
-##
-function phase_verify_project
-{
-  svn_fail_early
-  svn_verify_assembly
-  symlink_ece_components
-  verify_requested_versions
-  add_global_libs
-}
-
-function generate_new_changelog() {
-  print_and_log "Generating change log for revision $revision" ...
-  (
-    cd ${svn_src_dir}
-    local previous_revision=PREV
-    previous_revision=$(
-      ls $release_dir/vosa-conf-*-${release_label}-*.deb 2>/dev/null | \
-        grep -v latest | \
-        sed 's/.*r\([0-9]*\).deb/\1/g' | \
-        sort | \
-        uniq | \
-        tail -1
-    )
-
-    # in case we don't have any previous builds, we don't pass
-    # anything in the from parameters.
-    local from_option=""
-    if [ -n "${previous_revision}" ]; then
-      from_option="--from $previous_revision"
-    fi
-    
-    run generate-changelog \
-      --project $(basename $svn_base) \
-      --user $svn_user \
-      --password $svn_password \
-      ${from_option} \
-      --to $revision
-  )
-}
-
 ## creates DEB and RPM packages with the server configuration for all
 ## of the machines available in <project>/server-admin/<machine
 ## instance>
@@ -646,6 +568,37 @@ EOF
     $machine_list "] for the other machines' conf packages."
 }
 
+##
+function generate_new_changelog() {
+  print_and_log "Generating change log for revision $revision" ...
+  (
+    cd ${svn_src_dir}
+    local previous_revision=PREV
+    previous_revision=$(
+      ls $release_dir/vosa-conf-*-${release_label}-*.deb 2>/dev/null | \
+        grep -v latest | \
+        sed 's/.*r\([0-9]*\).deb/\1/g' | \
+        sort | \
+        uniq | \
+        tail -1
+    )
+
+    # in case we don't have any previous builds, we don't pass
+    # anything in the from parameters.
+    local from_option=""
+    if [ -n "${previous_revision}" ]; then
+      from_option="--from $previous_revision"
+    fi
+    
+    run generate-changelog \
+      --project $(basename $svn_base) \
+      --user $svn_user \
+      --password $svn_password \
+      ${from_option} \
+      --to $revision
+  )
+}
+
 ## Generates the /etc/hosts file for the given machine.
 ## 
 ## $1 :: the machine name
@@ -695,6 +648,54 @@ EOF
   done
 }
 
+##
+function print_result
+{
+  print_and_log "BUILD SUCCESSFUL! @ $(date)"
+  if [ $skip_ear -eq 1 ]; then
+    print_and_log "Only configuration packages has been created in this release!"
+  else
+    print_and_log "You'll find the release here: http://builder.vizrtsaas.com/$customer/releases/$resulting_ear"
+  fi
+}
+
+##
+function phase_startup {
+  init
+  fetch_configuration
+}
+
+##
+function phase_verify_platform
+{
+  verify_dependencies
+  verify_java
+}
+
+##
+function phase_verify_user
+{
+  verify_maven_proxy
+  verify_configuration
+  verify_assemblytool
+}
+
+##
+function phase_clean_up
+{
+  clean_customer_home
+}
+
+##
+function phase_verify_project
+{
+  svn_fail_early
+  svn_verify_assembly
+  symlink_ece_components
+  verify_requested_versions
+  add_global_libs
+}
+
 ##
 function phase_release
 {

From dfd11b4cce76b568269c67a97eed022dbce4850c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Fri, 15 Mar 2013 09:42:29 +0100
Subject: [PATCH 2032/2585] ece-build - refactored the order of function
 definitions to better reflect the order of execution

---
 usr/share/escenic/build-scripts/ece-build | 33 +++++++++--------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 2d8a4fe4..58d6be5a 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -100,6 +100,16 @@ function fetch_configuration
   fi 
 }
 
+##
+function verify_configuration {
+  enforce_variable customer "Your $conf_file is missing the variable 'customer', exiting!"
+  enforce_variable svn_base "Your $conf_file is missing the variable 'svn_base', exiting!"
+  enforce_variable svn_user "Your $conf_file is missing the variable 'svn_base', exiting!"
+  enforce_variable svn_password "Your $conf_file is missing the variable 'svn_password', exiting!"
+  # append a / to svn_base if not present
+  [[ $svn_base != */ ]] && svn_base="$svn_base"/
+}
+
 ##
 function enforce_variable
 {
@@ -109,11 +119,6 @@ function enforce_variable
   fi
 }
 
-##
-function verify_command {
-  command -v $1 >/dev/null 2>&1 || { print >&2 "I require $1 but it's not installed, exiting!"; remove_pid_and_exit_in_error; }
-}
-
 ##
 function verify_java 
 {
@@ -124,22 +129,8 @@ function verify_java
 }
 
 ##
-function verify_dependencies
-{
-  for f in $dependencies
-  do
-    verify_command $f
-  done
-}
-
-##
-function verify_configuration {
-  enforce_variable customer "Your $conf_file is missing the variable 'customer', exiting!"
-  enforce_variable svn_base "Your $conf_file is missing the variable 'svn_base', exiting!"
-  enforce_variable svn_user "Your $conf_file is missing the variable 'svn_base', exiting!"
-  enforce_variable svn_password "Your $conf_file is missing the variable 'svn_password', exiting!"
-  # append a / to svn_base if not present
-  [[ $svn_base != */ ]] && svn_base="$svn_base"/
+function verify_command {
+  command -v $1 >/dev/null 2>&1 || { print >&2 "I require $1 but it's not installed, exiting!"; remove_pid_and_exit_in_error; }
 }
 
 ##

From 62d3b5a74d836d64029718aac7577d0951f0ff1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Fri, 15 Mar 2013 09:53:53 +0100
Subject: [PATCH 2033/2585] ece-build - all usages of
 remove_pid_and_exit_in_error has been replaced with exit 1

---
 usr/share/escenic/build-scripts/ece-build | 36 +++++++++++------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 58d6be5a..5757fc7f 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -96,7 +96,7 @@ function fetch_configuration
     source $conf_file
   else
     print_and_log "Your user is missing the $conf_file, exiting!"
-    remove_pid_and_exit_in_error
+    exit 1
   fi 
 }
 
@@ -115,7 +115,7 @@ function enforce_variable
 {
   if [ ! -n "$(eval echo $`echo $1`)" ]; then
     print_and_log "$2"
-    remove_pid_and_exit_in_error
+    exit 1
   fi
 }
 
@@ -124,13 +124,13 @@ function verify_java
 {
   if !dpkg-query -W sun-java6-jdk > /dev/null 2>&1; then
     print_and_log "Required package sun-java6-jdk is not installed, exiting!"
-    remove_pid_and_exit_in_error
+    exit 1
   fi
 }
 
 ##
 function verify_command {
-  command -v $1 >/dev/null 2>&1 || { print >&2 "I require $1 but it's not installed, exiting!"; remove_pid_and_exit_in_error; }
+  command -v $1 >/dev/null 2>&1 || { print >&2 "I require $1 but it's not installed, exiting!"; exit 1; }
 }
 
 ##
@@ -161,15 +161,14 @@ function get_user_options
         ;;
       \?)
         print "Invalid option: -$OPTARG" >&2
-        remove_pid_and_exit_in_error
+        exit 1
         ;;
       :)
         print "Option -$OPTARG requires an argument." >&2
-        remove_pid_and_exit_in_error
+        exit 1
         ;;
     esac
   done
-
 }
 
 ##
@@ -177,7 +176,7 @@ function verify_assemblytool
 {
   if [ ! -d $assemblytool_root_dir ]; then
     print_and_log "$assemblytool_root_dir is required, but it doesn't exist!"
-    remove_pid_and_exit_in_error
+    exit 1
   fi
   if [ ! -d $assemblytool_pub_dir ]; then
     make_dir $assemblytool_pub_dir
@@ -232,7 +231,7 @@ function add_global_libs
     run ln -s $builder_root_dir/lib/java_memcached-release_2.0.1.jar $assemblytool_lib_dir/
   else
     print_and_log "The global library $builder_root_dir/lib/java_memcached-release_2.0.1.jar is missing, exiting!"
-    remove_pid_and_exit_in_error
+    exit 1
   fi
   local engine_version=`readlink $engine_root_dir`
   if [ $(echo "$engine_version" | grep "engine-5.3" | wc -l) -gt 0 ]; then
@@ -240,7 +239,7 @@ function add_global_libs
       run ln -s $builder_root_dir/lib/engine-backport-1.0-SNAPSHOT.jar $assemblytool_lib_dir/
     else
       print_and_log "The global library $builder_root_dir/lib/engine-backport-1.0-SNAPSHOT.jar is missing, exiting!"
-      remove_pid_and_exit_in_error
+      exit 1
     fi
   fi
 }
@@ -263,10 +262,10 @@ function svn_verify_assembly
   run svn update --non-interactive --set-depth infinity $svn_src_dir/pom.xml $svn_src_dir/project-assembly 
   if [ ! -d $project_assembly_dir ]; then
     print_and_log "Your project does not contain the project-assembly module and is thereby not certified to use the ece-builder, exiting!"
-    remove_pid_and_exit_in_error
+    exit 1
   elif [ ! -e $project_assembly_dir/src/main/assembly/assembly.xml ]; then
     print_and_log "Your project does not have a $project_assembly_dir/src/main/assembly/assembly.xml and is thereby not certified to use the ece-builder, exiting!"
-    remove_pid_and_exit_in_error
+    exit 1
   fi
 }
 
@@ -306,7 +305,7 @@ function verify_requested_versions
   if [ $verification_failed -eq 1 ]; then
     print_and_log "You have broken symlinks indicating that some requested version(s) of engine and/or plugins are missing!"
     print_and_log "BUILD FAILED!"
-    remove_pid_and_exit_in_error
+    exit 1
   fi
 }
 
@@ -335,7 +334,7 @@ function verify_maven_proxy
     done
     if [[ $maven_user = "" ]] || [[ $maven_password = "" ]]; then
       print_and_log "Your $maven_conf_file is missing the username and/or the password for the maven proxy, exiting!"
-      remove_pid_and_exit_in_error
+      exit 1
     else
       if [ $maven_build_offline -eq 1 ]; then
         print_and_log "Skipping maven proxy verification as you've chosen offline mode!"
@@ -344,25 +343,24 @@ function verify_maven_proxy
         RETVAL=$?
         if [ $RETVAL -ne 0 ]; then
           print_and_log "Your user can't reach http://maven.vizrt.com, exiting!"
-          remove_pid_and_exit_in_error
+          exit 1
         fi
       fi
     fi
   else
     print_and_log "Your user does not have a ~/.m2/settings.xml, exiting!"
-    remove_pid_and_exit_in_error
+    exit 1
   fi
 }
 
 ## 
 function svn_checkout
 {
-  #run svn update --non-interactive --set-depth infinity $svn_src_dir
   run svn checkout --non-interactive --depth infinity --username $svn_user  --password $svn_password $svn_base$svn_path $svn_src_dir/.
   revision=`svn info $svn_src_dir | grep -i Revision | awk '{print $2}'`
   if [[ $revision = "" ]]; then    
     print_and_log "Failed to fetch current revision number, exiting!"
-    remove_pid_and_exit_in_error
+    exit 1
   fi
 }
 
@@ -432,7 +430,7 @@ function publish_ear
     run ln -fs $release_dir/$resulting_ear $release_dir/latest.ear
   else
     print_and_log "I'm done, but the .ear is still missing, exiting!"
-    remove_pid_and_exit_in_error
+    exit 1
   fi
 }
 

From 1d44e79a3d79acab881327c334dbb78ba624a2ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Fri, 15 Mar 2013 10:05:32 +0100
Subject: [PATCH 2034/2585] ece-build - refactored execution phases for better
 overview

---
 usr/share/escenic/build-scripts/ece-build | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 5757fc7f..a409916a 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -652,6 +652,7 @@ function print_result
 function phase_startup {
   init
   fetch_configuration
+  get_user_options "${@}"
 }
 
 ##
@@ -688,6 +689,8 @@ function phase_verify_project
 ##
 function phase_release
 {
+  print_and_log "Starting release creation! @ $(date)"
+  print_and_log "Additional output can be found in $log"
   svn_checkout
   if [ $skip_ear -eq 0 ]; then
     maven_build
@@ -705,14 +708,11 @@ function phase_release
 ##
 function phase_shutdown
 {
-  echo nothing > /dev/null
+  :
 }
 
 ## ece-build execution
-phase_startup
-get_user_options $@
-print_and_log "Starting release creation! @ $(date)"
-print_and_log "Additional output can be found in $log"
+phase_startup "${@}"
 phase_verify_platform
 phase_verify_user
 phase_clean_up

From c92d66b1e488780eeeb9981d93af51dbf4a0ce96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Fri, 15 Mar 2013 13:58:05 +0100
Subject: [PATCH 2035/2585] ece-build - refactored ece-build to support pom.xml
 defined assembytool versions

---
 usr/share/escenic/build-scripts/ece-build | 166 ++++++++++++++++------
 1 file changed, 122 insertions(+), 44 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index a409916a..d700ba51 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -6,23 +6,29 @@
 #
 ################################################################################
 
-# Common variables
+# common variables
 ece_scripts_version="straight-from-github"
+ece_scripts_home=/usr/share/escenic/ece-scripts
 log=~/ece-build.log
+
+# build related variables
 build_date=`date +%F_%H%M`
-builder_root_dir=/home/builder
-builder_engine_dir=$builder_root_dir/engine
-builder_plugins_dir=$builder_root_dir/plugins
-assemblytool_root_dir=~/assemblytool
-assemblytool_pub_dir=$assemblytool_root_dir/publications
-assemblytool_lib_dir=$assemblytool_root_dir/lib
-svn_src_dir=~/src
-maven_conf_file=~/.m2/settings.xml
 maven_build_offline=0
 maven_opts="clean install"
 skip_ear=0
-project_assembly_dir=$svn_src_dir/project-assembly
-project_assembly_target_dir=$project_assembly_dir/target
+project_pom_versions=""
+
+# ece-build platform dependencies
+dependencies="tar
+sed
+ant
+svn
+mvn
+unzip
+wget
+xml2"
+
+# plugins available for inclusion in project build
 escenic_identifiers="engine
 community-engine
 forum
@@ -46,19 +52,27 @@ widget-framework-community
 widget-framework-syndication
 mobile-expansion
 "
+
+# root folders for engine and plugin distributions
+builder_root_dir=/home/builder
+builder_engine_dir=$builder_root_dir/engine
+builder_plugins_dir=$builder_root_dir/plugins
+builder_assemblytool_dir=$builder_root_dir/assemblytool
+
+# assemblytool root folders
+assemblytool_root_dir=~/assemblytool
+assemblytool_pub_dir=$assemblytool_root_dir/publications
+assemblytool_lib_dir=$assemblytool_root_dir/lib
+
+# user specific variables
+conf_file=~/.build/build.conf
+maven_conf_file=~/.m2/settings.xml
+svn_src_dir=~/src
+project_assembly_dir=$svn_src_dir/project-assembly
+project_assembly_target_dir=$project_assembly_dir/target
 release_dir=~/releases
 plugin_dir=~/plugins
 engine_root_dir=~/engine
-ece_scripts_home=/usr/share/escenic/ece-scripts
-conf_file=~/.build/build.conf
-dependencies="tar
-sed
-ant
-svn
-mvn
-unzip
-wget
-xml2"
 
 ##
 function init
@@ -172,12 +186,72 @@ function get_user_options
 }
 
 ##
-function verify_assemblytool
+function symlink_assemblytool
 {
-  if [ ! -d $assemblytool_root_dir ]; then
-    print_and_log "$assemblytool_root_dir is required, but it doesn't exist!"
-    exit 1
+  # try and retrieve assemblytool version from project
+  for f in $project_pom_versions; do
+    if [[ $f == assemblytool=* ]]; then
+      local assemblytool_link_target=`echo $f | sed 's/=/-/g'`
+      break
+    fi
+  done
+  
+  # differenciate between the old and new setup of assemblytool on builder  
+  if [ -d $assemblytool_root_dir ] && [ ! -h $assemblytool_root_dir ]; then
+ 
+    # identify and migrate projects still using the old assemblytool setup
+    if [ -z $assemblytool_link_target ]; then
+      print_and_log "Your project should start using <escenic.assemblytool.version> in your pom.xml to be compatible with newer versions of Escenic Content Engine!"
+    else
+      run rm -rf $assemblytool_root_dir
+    fi
+
+  else
+    
+    # remove assemblytool symlink if present
+    if [ -h $assemblytool_root_dir ]; then
+      run rm -f $assemblytool_root_dir
+    fi
+
+    # fail if assemblytool version has not been specified in pom.xml
+    if [ -z $assemblytool_link_target ]; then
+      print_and_log "You need to specify the <escenic.assemblytool.version> in your pom.xml, exiting!"
+      exit 1
+    elif [ ! -d $assemblytool_link_target ];
+      print_and_log "Your project requires $assemblytool_link_target, but it's not present in your home directory, I will try to fetch it from builder..."
+      if [ -d $builder_assemblytool_dir/$assemblytool_link_target ]; then
+        run cp -r $builder_assemblytool_dir/$assemblytool_link_target ~/.
+        print_and_log "The request $assemblytool_link_target has been added to your users home directory."
+      else
+        print_and_log "The requested $assemblytool_link_target does not exist on the platform and needs to be added by an operator, exiting!"
+        exit 1
+      fi
+    else
+      run ln -s $assemblytool_link_target assemblytool      
+    fi
+  fi
+}
+
+##
+function clean_assemblytool
+{
+  if [ -e "$assemblytool_pub_dir" ]; then
+    run rm -f $assemblytool_pub_dir/*
+  fi
+  if [ ! -d $assemblytool_pub_dir ]; then
+    make_dir $assemblytool_pub_dir
+  fi
+  if [ -e "$assemblytool_lib_dir" ]; then
+    run rm -f $assemblytool_lib_dir/*
   fi
+  if [ ! -d $assemblytool_lib_dir ]; then
+    make_dir $assemblytool_lib_dir
+  fi
+}
+
+##
+function verify_assemblytool
+{
   if [ ! -d $assemblytool_pub_dir ]; then
     make_dir $assemblytool_pub_dir
     print_and_log "$assemblytool_pub_dir did not exist so it has been created."
@@ -195,31 +269,22 @@ function verify_assemblytool
 ## 
 function clean_customer_home
 {
+  # clean up plugin directory if it exists
   if [ -d "$plugin_dir" ]; then
     run rm -f $plugin_dir/*
-  fi
-  if [ ! -d $plugin_dir ]; then
+  else
     make_dir $plugin_dir
   fi
+
+  # remove engine symlink if it exists 
   if [ -h "$engine_root_dir" ]; then
     run rm -f $engine_root_dir
   fi
-  if [ -e "$assemblytool_pub_dir" ]; then
-    run rm -f $assemblytool_pub_dir/*
-  fi
-  if [ ! -d $assemblytool_pub_dir ]; then
-    make_dir $assemblytool_pub_dir
-  fi
-  if [ -e "$assemblytool_lib_dir" ]; then
-    run rm -f $assemblytool_lib_dir/*
-  fi
-  if [ ! -d $assemblytool_lib_dir ]; then
-    make_dir $assemblytool_lib_dir
-  fi
-  if [ -e "$svn_src_dir" ]; then
+
+  # drop and recreate svn src directory if it exists
+  if [ -d "$svn_src_dir" ]; then
     run rm -rf $svn_src_dir
-  fi
-  if [ ! -d $svn_src_dir ]; then
+  else
     make_dir $svn_src_dir
   fi
 }
@@ -269,6 +334,17 @@ function svn_verify_assembly
   fi
 }
 
+##
+function retrieve_project_pom_versions
+{
+  if [ -e $svn_src_dir/pom.xml ];then
+    project_pom_versions=`xml2 < src/pom.xml | grep '^/project/properties/escenic\.' | sed -n -e 's,.*properties/escenic\.,,' -e 's,\.version,,p'`
+  else
+    print_and_log "Your projects pom.xml is missing, exiting!"
+    exit 1
+  fi
+}
+
 ##
 function symlink_ece_components
 {
@@ -302,7 +378,7 @@ function verify_requested_versions
       verification_failed=1
     fi
   done
-  if [ $verification_failed -eq 1 ]; then
+  if [ $verification_failed -eq 1 ]; thevn_src_dir/pom.xml
     print_and_log "You have broken symlinks indicating that some requested version(s) of engine and/or plugins are missing!"
     print_and_log "BUILD FAILED!"
     exit 1
@@ -667,7 +743,6 @@ function phase_verify_user
 {
   verify_maven_proxy
   verify_configuration
-  verify_assemblytool
 }
 
 ##
@@ -681,6 +756,9 @@ function phase_verify_project
 {
   svn_fail_early
   svn_verify_assembly
+  symlink_assemblytool
+  clean_assemblytool
+  verify_assemblytool
   symlink_ece_components
   verify_requested_versions
   add_global_libs

From 2758876914f58e831af373356e8a2d68bf8dd794 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Fri, 15 Mar 2013 14:15:25 +0100
Subject: [PATCH 2036/2585] ece-build - fixed a few misstakes

---
 usr/share/escenic/build-scripts/ece-build | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index d700ba51..2199430d 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -134,12 +134,12 @@ function enforce_variable
 }
 
 ##
-function verify_java 
+function verify_dependencies
 {
-  if !dpkg-query -W sun-java6-jdk > /dev/null 2>&1; then
-    print_and_log "Required package sun-java6-jdk is not installed, exiting!"
-    exit 1
-  fi
+  for f in $dependencies
+  do
+    verify_command $f
+  done
 }
 
 ##
@@ -147,6 +147,15 @@ function verify_command {
   command -v $1 >/dev/null 2>&1 || { print >&2 "I require $1 but it's not installed, exiting!"; exit 1; }
 }
 
+##
+function verify_java 
+{
+  if !dpkg-query -W sun-java6-jdk > /dev/null 2>&1; then
+    print_and_log "Required package sun-java6-jdk is not installed, exiting!"
+    exit 1
+  fi
+}
+
 ##
 function get_user_options
 {
@@ -217,7 +226,7 @@ function symlink_assemblytool
     if [ -z $assemblytool_link_target ]; then
       print_and_log "You need to specify the <escenic.assemblytool.version> in your pom.xml, exiting!"
       exit 1
-    elif [ ! -d $assemblytool_link_target ];
+    elif [ ! -d $assemblytool_link_target ]; then
       print_and_log "Your project requires $assemblytool_link_target, but it's not present in your home directory, I will try to fetch it from builder..."
       if [ -d $builder_assemblytool_dir/$assemblytool_link_target ]; then
         run cp -r $builder_assemblytool_dir/$assemblytool_link_target ~/.
@@ -378,7 +387,7 @@ function verify_requested_versions
       verification_failed=1
     fi
   done
-  if [ $verification_failed -eq 1 ]; thevn_src_dir/pom.xml
+  if [ $verification_failed -eq 1 ]; then
     print_and_log "You have broken symlinks indicating that some requested version(s) of engine and/or plugins are missing!"
     print_and_log "BUILD FAILED!"
     exit 1

From d355b2703493d743c2b6e75f0cca9be345446eed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Fri, 15 Mar 2013 14:39:03 +0100
Subject: [PATCH 2037/2585] ece-build - added xml2 version of pom version
 retrieval

---
 usr/share/escenic/build-scripts/ece-build | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 2199430d..e32b90fb 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -765,6 +765,7 @@ function phase_verify_project
 {
   svn_fail_early
   svn_verify_assembly
+  retrieve_project_pom_versions
   symlink_assemblytool
   clean_assemblytool
   verify_assemblytool

From bd77ead910e0b066a7d25f741286ea9cb27ffb68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Fri, 15 Mar 2013 15:50:14 +0100
Subject: [PATCH 2038/2585] ece-build - fixed a bug in the assemblytool version
 selection support

---
 usr/share/escenic/build-scripts/ece-build | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index e32b90fb..7e6c4385 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -197,6 +197,7 @@ function get_user_options
 ##
 function symlink_assemblytool
 {
+
   # try and retrieve assemblytool version from project
   for f in $project_pom_versions; do
     if [[ $f == assemblytool=* ]]; then
@@ -206,22 +207,20 @@ function symlink_assemblytool
   done
   
   # differenciate between the old and new setup of assemblytool on builder  
-  if [ -d $assemblytool_root_dir ] && [ ! -h $assemblytool_root_dir ]; then
- 
+  if [ -d $assemblytool_root_dir ] && [ ! -h $assemblytool_root_dir ]; then 
     # identify and migrate projects still using the old assemblytool setup
     if [ -z $assemblytool_link_target ]; then
       print_and_log "Your project should start using <escenic.assemblytool.version> in your pom.xml to be compatible with newer versions of Escenic Content Engine!"
     else
       run rm -rf $assemblytool_root_dir
     fi
-
-  else
-    
+  elif [ -h $assemblytool_root_dir ]; then
     # remove assemblytool symlink if present
-    if [ -h $assemblytool_root_dir ]; then
-      run rm -f $assemblytool_root_dir
-    fi
-
+    run rm -f $assemblytool_root_dir
+  fi
+  
+  # standard execution with the assemblytool directory link not yet present
+  if [ ! -d $assemblytool_root_dir ]; then
     # fail if assemblytool version has not been specified in pom.xml
     if [ -z $assemblytool_link_target ]; then
       print_and_log "You need to specify the <escenic.assemblytool.version> in your pom.xml, exiting!"
@@ -235,9 +234,9 @@ function symlink_assemblytool
         print_and_log "The requested $assemblytool_link_target does not exist on the platform and needs to be added by an operator, exiting!"
         exit 1
       fi
-    else
-      run ln -s $assemblytool_link_target assemblytool      
     fi
+    # create assemblytool symlink based on the request project version
+    run ln -s $assemblytool_link_target assemblytool      
   fi
 }
 

From 602a723b05379e52aaa35a97295279745b1d64be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Sun, 17 Mar 2013 00:32:21 +0100
Subject: [PATCH 2039/2585] ece-build - added support for java version
 selection based on maven-compiler-plugin configuration

---
 usr/share/escenic/build-scripts/ece-build | 33 ++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 7e6c4385..34d52fb2 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -18,6 +18,10 @@ maven_opts="clean install"
 skip_ear=0
 project_pom_versions=""
 
+# standard java locations
+java_6_sun=/usr/lib/jvm/java-6-sun
+java_7_oracle=/usr/lib/jvm/java-7-oracle
+
 # ece-build platform dependencies
 dependencies="tar
 sed
@@ -346,13 +350,39 @@ function svn_verify_assembly
 function retrieve_project_pom_versions
 {
   if [ -e $svn_src_dir/pom.xml ];then
-    project_pom_versions=`xml2 < src/pom.xml | grep '^/project/properties/escenic\.' | sed -n -e 's,.*properties/escenic\.,,' -e 's,\.version,,p'`
+    project_pom_versions=`xml2 < $svn_src_dir/pom.xml | grep '^/project/properties/escenic\.' | sed -n -e 's,.*properties/escenic\.,,' -e 's,\.version,,p'`
   else
     print_and_log "Your projects pom.xml is missing, exiting!"
     exit 1
   fi
 }
 
+##
+function set_java_home
+{
+  project_java_version=`xml2 < $svn_src_dir/pom.xml | grep '^/project/build/plugins/plugin/configuration/target=' | sed -n -e 's,.*project/build/plugins/plugin/configuration/target=,,p'`
+  if [ -z $project_java_version ]; then
+    print_and_log "You need to specify the java taget version for the maven-compiler-plugin in your pom.xml as this is used by this script to determine which java to use, exiting!"
+    exit 1
+  elif [[ $project_java_version == "1.6" ]]; then
+    if [ -d $java_6_sun ]; then
+      export JAVA_HOME=$java_6_sun
+    else
+      print_and_log "The expected home directory, $java_6_sun, for you requested java version does not exist on the platform and needs to be added, exiting!"
+      exit 1
+    fi
+  elif [[ $project_java_version == "1.7" ]]; then
+    if [ -d $java_7_oracle ]; then
+      export JAVA_HOME=$java_7_oracle
+    else
+      print_and_log "The expected home directory, $java_7_oracle, for you requested java version does not exist on the platform and needs to be added, exiting!"
+      exit 1
+    fi
+  else
+    print_and_log "The requested java version $project_java_version is not supported or has been specified using an incorrect format, exiting!"
+  fi
+}
+
 ##
 function symlink_ece_components
 {
@@ -765,6 +795,7 @@ function phase_verify_project
   svn_fail_early
   svn_verify_assembly
   retrieve_project_pom_versions
+  set_java_home
   symlink_assemblytool
   clean_assemblytool
   verify_assemblytool

From 56a9a689f57b265eae8812fe1e031de5965d701a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Sun, 17 Mar 2013 04:43:00 +0100
Subject: [PATCH 2040/2585] ece-build - fixed problem with directory location
 dependent code

---
 usr/share/escenic/build-scripts/ece-build | 27 ++++++++++++-----------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 34d52fb2..f517eaa6 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -205,15 +205,16 @@ function symlink_assemblytool
   # try and retrieve assemblytool version from project
   for f in $project_pom_versions; do
     if [[ $f == assemblytool=* ]]; then
-      local assemblytool_link_target=`echo $f | sed 's/=/-/g'`
+      local assemblytool_release=`echo $f | sed 's/=/-/g'`
+      local assemblytool_link_target=~/$assemblytool_release
       break
     fi
   done
-  
-  # differenciate between the old and new setup of assemblytool on builder  
-  if [ -d $assemblytool_root_dir ] && [ ! -h $assemblytool_root_dir ]; then 
+
+  # differentiate between the old and new setup of assemblytool on builder
+  if [ -d $assemblytool_root_dir ] && [ ! -h $assemblytool_root_dir ]; then
     # identify and migrate projects still using the old assemblytool setup
-    if [ -z $assemblytool_link_target ]; then
+    if [ -z $assemblytool_release ]; then
       print_and_log "Your project should start using <escenic.assemblytool.version> in your pom.xml to be compatible with newer versions of Escenic Content Engine!"
     else
       run rm -rf $assemblytool_root_dir
@@ -222,25 +223,25 @@ function symlink_assemblytool
     # remove assemblytool symlink if present
     run rm -f $assemblytool_root_dir
   fi
-  
+
   # standard execution with the assemblytool directory link not yet present
   if [ ! -d $assemblytool_root_dir ]; then
     # fail if assemblytool version has not been specified in pom.xml
-    if [ -z $assemblytool_link_target ]; then
+    if [ -z $assemblytool_release ]; then
       print_and_log "You need to specify the <escenic.assemblytool.version> in your pom.xml, exiting!"
       exit 1
     elif [ ! -d $assemblytool_link_target ]; then
-      print_and_log "Your project requires $assemblytool_link_target, but it's not present in your home directory, I will try to fetch it from builder..."
-      if [ -d $builder_assemblytool_dir/$assemblytool_link_target ]; then
-        run cp -r $builder_assemblytool_dir/$assemblytool_link_target ~/.
-        print_and_log "The request $assemblytool_link_target has been added to your users home directory."
+      print_and_log "Your project requires $assemblytool_release, but it's not present in your home directory, I will try to fetch it from builder..."
+      if [ -d $builder_assemblytool_dir/$assemblytool_release ]; then
+        run cp -r $builder_assemblytool_dir/$assemblytool_release ~/.
+        print_and_log "The request $assemblytool_release has been added to your users home directory."
       else
-        print_and_log "The requested $assemblytool_link_target does not exist on the platform and needs to be added by an operator, exiting!"
+        print_and_log "The requested $assemblytool_release does not exist on the platform and needs to be added by an operator, exiting!"
         exit 1
       fi
     fi
     # create assemblytool symlink based on the request project version
-    run ln -s $assemblytool_link_target assemblytool      
+    run ln -s $assemblytool_link_target $assemblytool_root_dir
   fi
 }
 

From 3e6dbc0d46f538e64f1424fbaea2319ad5aa4674 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Sun, 17 Mar 2013 04:44:13 +0100
Subject: [PATCH 2041/2585] ece-build - changed location of script startup
 message

---
 usr/share/escenic/build-scripts/ece-build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index f517eaa6..50cdaca8 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -766,6 +766,8 @@ function print_result
 ##
 function phase_startup {
   init
+  print_and_log "Starting release creation! @ $(date)"
+  print_and_log "Additional output can be found in $log"
   fetch_configuration
   get_user_options "${@}"
 }
@@ -808,8 +810,6 @@ function phase_verify_project
 ##
 function phase_release
 {
-  print_and_log "Starting release creation! @ $(date)"
-  print_and_log "Additional output can be found in $log"
   svn_checkout
   if [ $skip_ear -eq 0 ]; then
     maven_build

From 5067a862950dfe9133ae93296e1123b3b932e037 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Thu, 21 Mar 2013 16:03:22 +0100
Subject: [PATCH 2042/2585] ece-deploy - now uses unzip instead of jar for
 unpacking and will not download the same ear twice

---
 usr/share/escenic/ece-scripts/ece.d/deploy.sh | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/deploy.sh b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
index 1677dd58..723f1bf2 100644
--- a/usr/share/escenic/ece-scripts/ece.d/deploy.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
@@ -64,12 +64,16 @@ function deploy() {
 
   if [ -n "$file" ]; then
     print_and_log "Deploying $file on $instance ..."
-
+    
     # wget_auth is needed for download_uri_target_to_dir
     wget_auth=$wget_builder_auth
-    download_uri_target_to_dir $file $cache_dir
     ear=$cache_dir/$(basename $file)
-    
+    if [ -e "$ear" ] && [ $(is_archive_healthy $ear) -eq 1 ]; then
+      print_and_log "If found a healthy $ear locally so I will not fetch it again."
+    else
+      download_uri_target_to_dir $file $cache_dir
+    fi
+
     if [ ! -e "$ear" ]; then
       print_and_log "The EAR $ear_uri specified in $file could" \
         "not be retrieved. I will exit now. :-("
@@ -93,7 +97,7 @@ function deploy() {
   (
     run mkdir -p $dir
     run cd $dir
-    run $java_home/bin/jar xf $ear
+    run unzip $ear
   )
 
   print "Deploying $ear on $appserver ..."
@@ -162,7 +166,7 @@ function deploy() {
 
         make_dir $tomcat_base/$app_base/$name
         run cd $tomcat_base/$app_base/$name
-        run $java_home/bin/jar xf $war
+        run unzip $war
 
         if [ ${enable_memcached_support-1} -eq 1 ]; then
           add_memcached_support $tomcat_base/$app_base/$name

From 6d5aad4568bc491927e83f1bf2c118baa3b31594 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Thu, 21 Mar 2013 16:27:21 +0100
Subject: [PATCH 2043/2585] ece-deploy - unzip now runs quiet

---
 usr/share/escenic/ece-scripts/ece.d/deploy.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/deploy.sh b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
index 723f1bf2..55bf78f8 100644
--- a/usr/share/escenic/ece-scripts/ece.d/deploy.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
@@ -97,7 +97,7 @@ function deploy() {
   (
     run mkdir -p $dir
     run cd $dir
-    run unzip $ear
+    run unzip -q $ear
   )
 
   print "Deploying $ear on $appserver ..."
@@ -166,7 +166,7 @@ function deploy() {
 
         make_dir $tomcat_base/$app_base/$name
         run cd $tomcat_base/$app_base/$name
-        run unzip $war
+        run unzip -q $war
 
         if [ ${enable_memcached_support-1} -eq 1 ]; then
           add_memcached_support $tomcat_base/$app_base/$name

From 1bdd05839310e66be3980162dde62bad2f6e47d0 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Fri, 22 Mar 2013 13:56:29 +0100
Subject: [PATCH 2044/2585] Removed effective pom parsing from ece-install.

Instead, use a file called META-INF/escenc-distributions.txt listing
the maven coordinates for any maven artifacts that should be
considered to be installed as part of the deployment environment.
---
 .../ece-install.d/content-engine.sh           | 20 +++++--------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index b2a04ace..eae6227d 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -179,30 +179,20 @@ function create_ear_download_list() {
     remove_pid_and_exit_in_error
   fi
 
-  local effective_pom=META-INF/effective-pom.xml
+  local distributions_txt=META-INF/escenic-distributions.txt
 
   # Verify that the ZIP file has an effective-pom.xml file
   run unzip -t -q $ear_file
   log "$ear_file was a valid ZIP file"
 
-  if ! unzip &> /dev/null -t -q $ear_file $effective_pom ; then
-    print_and_log "EAR file is missing $effective_pom. Not resolving artifacts."
+  if ! unzip &> /dev/null -t -q $ear_file $distributions_txt; then
+    print_and_log "EAR file is missing $distributions_txt. Not resolving artifacts."
     return 0
   fi
 
-  local props=$(unzip -qc $ear_file $effective_pom |
-    xmlstarlet sel -N "pom=http://maven.apache.org/POM/4.0.0" \
-      -t -m '/pom:project/pom:properties/*|/projects/pom:project/pom:properties/*' \
-      -v 'concat(name(), " ", text())' \
-      -nl)
-  if [ $? != 0 ] ; then
-    print_and_log "Unable to understand the effective pom"
-    return 0
-  fi
-
-  local gavs=$(sort <<< "$props" -u | grep '^escenic\.[^\.]*\.distribution ' | cut -d ' ' -f 2 )
+  local gavs=$(unzip -qc $ear_file $distributions_txt | grep '^[a-z]')
   if ! grep -q . <<< "$gavs" ; then
-    print_and_log "EAR's effective pom had no escenic.xxx.distribution properties.  Ignoring."
+    print_and_log "EAR's $distributions_txt had no maven artifacts in it properties.  Ignoring."
     log props=$props
     return 0
   fi

From 0da685f18ccdb0240d60b83e58a84dfbe51302ed Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Fri, 22 Mar 2013 14:01:15 +0100
Subject: [PATCH 2045/2585] Added documentation on the
 META-INF/escenic-distributions.txt

---
 usr/share/doc/escenic/ece-install-guide.org | 29 +++++++++------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 7c2da005..81d8f6af 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -846,30 +846,25 @@ The inclusion of the engine/solr directory makes it easy for users to
 provide their own, optimised Solr configuration. In this context, also
 note that a post install hook, *set\_up\_solr.postinst*, is available.
 
-If you use maven to build your projects, you can put an effective pom
-into the /META-INF/effective-pom.xml file of your EAR, with properties
-that signal to ece-install what files to download, by specifying the
-maven coordinates of the artifact.
+If you want the EAR file to dictate the production environment, set up
+the build environment to create a file META-INF/distributions.txt in
+your EAR, and put the maven coordinates needed by the run-time in it.
+This will tell ece-install what files to download.
 
-Include these coordinates as properties that start with *escenic.* and
-end with *.distribution* to get ece-install to download them from a
-maven repository.
-
-#+BEGIN_SRC nxml
-<properties>
-  <escenic.engine.distribution>com.escenic:engine-dist:zip:bin:${engine-version}</escenic.engine.distribution>
-  <escenic.someplugin.distribution>com.escenic.plugins.someplugin:someplugin-dist:zip:${someplugin-version}</escenic.someplugin.distribution>
-</properties>
+#+BEGIN_SRC text
+com.escenic:engine-dist:zip:bin:5.5.2.123456
+com.escenic.plugins.someplugin:someplugin-dist:zip:1.2.134
 #+END_SRC
 
 In your ece-install.conf file, specify *fai_maven_repositories* as a
-whitespace separated list of repositories that may hold these binaries,
-and ece-install will try each repository in order to download the arifacts.
+whitespace separated list of repositories that may hold these artifacts,
+and ece-install will try each repository in order to download the
+arifacts.
 
 #+BEGIN_SRC conf
 fai_maven_repositories="
-  http://example.org/nexus/content/groups/trunk/
-  http://mybuildserver/
+  http://example.org/nexus/content/groups/trunk
+  http://builder:secretpassword@mybuildserver.internal/trunk
 "
 #+END_SRC
 

From 0a2b1151670e796b1fdf1be0855dc517a2c8a02d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Mon, 25 Mar 2013 14:49:38 +0100
Subject: [PATCH 2046/2585] ece-install - Added new webapps to the list of
 standard web applications

---
 usr/share/escenic/ece-scripts/common-ece.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/common-ece.sh b/usr/share/escenic/ece-scripts/common-ece.sh
index c1dd3003..69fe74ea 100644
--- a/usr/share/escenic/ece-scripts/common-ece.sh
+++ b/usr/share/escenic/ece-scripts/common-ece.sh
@@ -79,6 +79,12 @@ webapps_in_standard_webapps_list="
   solr
   studio
   webservice
+  webservice-extensions
+  newsgate-webservice
+  wf-update-service
+  video-webservice
+  video-webservice-extensions
+  poll-ws
 "
 
 ### is_webapp_a_publication

From c97cf17b9472486709f4dbacaf00f8630e08033d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Wed, 27 Mar 2013 14:56:56 +0100
Subject: [PATCH 2047/2585] ece-build - added support for newsgate-webservice

---
 usr/share/escenic/build-scripts/ece-build | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 50cdaca8..c2c8961e 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -47,6 +47,7 @@ lucy
 reporter
 video
 newsroom
+newsgate
 vcpeditor
 online-graphics
 widget-framework-core
@@ -520,6 +521,11 @@ context-root:/${f%.war}" > $assemblytool_pub_dir/${f%.war}.properties
     echo "source-war: ../../plugins/dashboard/wars/dashboard-webapp.war
 context-root: /dashboard" > $assemblytool_pub_dir/dashboard.properties
   fi
+  if [ -d $plugin_dir/newsgate ]; then
+    log "Adding an assembly descriptor for Newsgate Webservice ..."
+    echo "source-war: ../../plugins/newsgate/webapps/newsgate-webservice.war
+context-root: /newsgate-webservice" > $assemblytool_pub_dir/newsgate-webservice.properties
+  fi
 }
 
 ##

From bd2270b65b69f5b3f6966cdd505cbc9ab0c7c5be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Wed, 27 Mar 2013 16:36:58 +0100
Subject: [PATCH 2048/2585] ece-build - added
 META-INF/escenic-distributions.txt to .ear file based of
 escenic.<identifier>.distribution properties

---
 usr/share/escenic/build-scripts/ece-build | 30 +++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index c2c8961e..20eb5199 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -535,6 +535,35 @@ function ant_build
   run ant -q clean ear -DskipRedundancyCheck=true
 }
 
+##
+function add_distributions_to_ear
+{
+  if [ -e $assemblytool_root_dir/dist/engine.ear ]; then
+    if [ -e $assemblytool_root_dir/dist/effective-pom.xml ]; then
+      run rm -f $assemblytool_root_dir/dist/effective-pom.xml
+    fi
+    run cd $svn_src_dir
+    run mvn -Doutput=$assemblytool_root_dir/dist/effective-pom.xml help:effective-pom   
+    local pom_properties=$(cat $assemblytool_root_dir/dist/effective-pom.xml | xmlstarlet sel -N "pom=http://maven.apache.org/POM/4.0.0" \
+      -t -m '/projects/pom:project/pom:properties/*' \
+      -v 'concat(name(), " ", text())' -nl)
+    if [ $? != 0 ] ; then
+      print_and_log "Unable to understand $assemblytool_root_dir/dist/effective-pom.xml, exiting!"
+      return 1
+    fi
+    local pom_distributions=$(sort <<< "$pom_properties" -u | grep '^escenic\.[^\.]*\.distribution ' | cut -d ' ' -f 2 )
+    if [ -z pom_distributions ] ; then
+      log "The projects effective pom had no escenic.xxx.distribution properties, ignoring."
+    else
+      echo "$pom_distributions" >> $assemblytool_root_dir/dist/escenic-distributions.txt
+      run jar uvf $assemblytool_root_dir/dist/engine.ear META-INF/escenic-distributions.txt
+    fi
+  else
+    print_and_log "Assemblytool finished, but the .ear is missing, exiting!"
+    exit 1
+  fi
+}
+
 ##
 function publish_ear 
 {
@@ -822,6 +851,7 @@ function phase_release
     symlink_project_assembly
     generate_publication_properties
     ant_build
+    add_distributions_to_ear
     publish_ear
   else
     print_and_log "Creation of .ear file skipped as requested!"    

From 0c74cfd397ad1891fcb6408a7b91a6785e3f333c Mon Sep 17 00:00:00 2001
From: Rune Bremnes <rune@bremnes.name>
Date: Tue, 2 Apr 2013 15:13:43 +0200
Subject: [PATCH 2049/2585] Changed default database to percona because of bug
 "https://mariadb.atlassian.net/browse/CONJ-31".

---
 usr/sbin/ece-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index ecaaac59..2a2f24b2 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -55,7 +55,7 @@ java_home=/usr/lib/jvm/java-6-sun
 ece_scripts_version="straight-from-github"
 
 #Set the default database vendor. Possible values are mariadb and percona
-db_vendor=mariadb
+db_vendor=percona
 
 #####################################################################
 

From fcf54b702800e861406d2aabd5d8ef256b81b25c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Wed, 3 Apr 2013 09:19:29 +0200
Subject: [PATCH 2050/2585] ece-build - Adjusted escenic distributions feature
 and added cxense as a valid plugin

---
 usr/share/escenic/build-scripts/ece-build | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 20eb5199..39d0330f 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -56,6 +56,7 @@ widget-framework-mobile
 widget-framework-community
 widget-framework-syndication
 mobile-expansion
+semantic-cxense
 "
 
 # root folders for engine and plugin distributions
@@ -555,7 +556,9 @@ function add_distributions_to_ear
     if [ -z pom_distributions ] ; then
       log "The projects effective pom had no escenic.xxx.distribution properties, ignoring."
     else
-      echo "$pom_distributions" >> $assemblytool_root_dir/dist/escenic-distributions.txt
+      run mkdir $assemblytool_root_dir/dist/META-INF
+      echo "$pom_distributions" >> $assemblytool_root_dir/dist/META-INF/escenic-distributions.txt
+      run cd $assemblytool_root_dir/dist
       run jar uvf $assemblytool_root_dir/dist/engine.ear META-INF/escenic-distributions.txt
     fi
   else

From a082d87292af1e174acd166f30c4b42113724acc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Thu, 4 Apr 2013 06:53:36 +0200
Subject: [PATCH 2051/2585] ece-build - fix bug causing dashboard to be
 mandatory

---
 usr/share/escenic/build-scripts/ece-build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 39d0330f..ffea55c1 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -517,7 +517,7 @@ function generate_publication_properties
     echo "source-war:$f
 context-root:/${f%.war}" > $assemblytool_pub_dir/${f%.war}.properties
   done
-  if [ -d ${plugins/dashboard} ]; then
+  if [ -d $plugin_dir/dashboard ]; then
     log "Adding an assembly descriptor for Dashboard ..."
     echo "source-war: ../../plugins/dashboard/wars/dashboard-webapp.war
 context-root: /dashboard" > $assemblytool_pub_dir/dashboard.properties

From f2c5f3e154413a1689e1273218317dbd24c237c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Thu, 4 Apr 2013 14:17:04 +0200
Subject: [PATCH 2052/2585] ece-dev-image - libxml2-utils is a requirement for
 ece-deploy and will now be installed by default

---
 .../skeleton-dev/hooks/post-install-hook-install-ece-install.sh  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-ece-install.sh b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-ece-install.sh
index b02290fd..a7ea5ec9 100755
--- a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-ece-install.sh
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-ece-install.sh
@@ -3,6 +3,7 @@
 echo "--- START : post install hook - install ece install ---"
 
 # install escenic scripts
+ssh -F $2/ssh.conf guest 'sudo apt-get -y install libxml2-utils'
 ssh -F $2/ssh.conf guest 'sudo apt-get update && sudo apt-get -y install escenic-content-engine-installer'
 ssh -F $2/ssh.conf guest 'sudo apt-get update && sudo apt-get -y install escenic-content-engine-scripts'
 

From 7b34c50795ce4a95f3d3e2f78bf8e655e0809d3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Thu, 4 Apr 2013 14:18:34 +0200
Subject: [PATCH 2053/2585] ece-dev-image - removing jar files on solr instance
 to save space is no longer viable

---
 .../hooks/post-install-hook-apply-patch.sh        | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-apply-patch.sh b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-apply-patch.sh
index 13ae2992..ffe17092 100755
--- a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-apply-patch.sh
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-apply-patch.sh
@@ -13,21 +13,6 @@ ssh -F $2/ssh.conf root@guest  \
 ssh -F $2/ssh.conf root@guest  \
    cp -R /opt/tomcat/webapps/manager /opt/tomcat-search1/webapps/.
 
-# cleanup all jar files not needed to run solr and analysis engine
-ssh -F $2/ssh.conf root@guest  \
-   'find /opt/tomcat-search1/escenic/lib/ -type f ! \( \
--name 'common-nursery-*' \
--o -name 'commons-codec-*' \
--o -name 'commons-httpclient-*' \
--o -name 'commons-io-*' \
--o -name 'commons-lang-*' \
--o -name 'commons-logging-*' \
--o -name 'common-util-*' \
--o -name 'log4j-*' \
--o -name 'twelvemonkeys-core-*' \
--o -name 'xom-*' \
-\) -exec rm -rf {} \;'
-
 # change ownership just to be sure
 ssh -F $2/ssh.conf root@guest  \
    chown -R escenic: /opt/tomcat-engine1

From 4b9f4ed504f2688748f50f49adb76d6d3da2f6b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Thu, 4 Apr 2013 14:20:45 +0200
Subject: [PATCH 2054/2585] ece-dev-image - image now uses 50gb max disk size,
 mirror for ubuntu has been pinned and .ear deploy is part of the install
 procedure

---
 .../vosa/generated-servers/skeleton-dev/install.conf.tmpl    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/install.conf.tmpl b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/install.conf.tmpl
index 19185094..2442e733 100644
--- a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/install.conf.tmpl
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/install.conf.tmpl
@@ -3,9 +3,11 @@ ip_address $IP_ADDRESS
 netmask $NETMASK
 gateway $GATEWAY
 
+mirror http://no.archive.ubuntu.com/ubuntu/
+
 original_image /var/lib/vizrt/vosa/uec-images/current/disk.img
 kernel /var/lib/vizrt/vosa/uec-images/current/vmlinuz
-initial_disk_size 15
+initial_disk_size 50
 overlay /etc/vizrt/vosa/overlay/common
 timezone Europe/Oslo
 
@@ -27,3 +29,4 @@ postinstall ./hooks/post-install-hook-set-password.sh
 postinstall ./hooks/post-install-hook-apply-patch.sh
 postinstall ./hooks/post-install-hook-deploy-configuration.sh
 postinstall ./hooks/post-install-hook-restart-tomcats.sh
+postinstall ./hooks/post-install-hook-deploy-ear.sh

From 4c8b4b3831fd4ddfbd94e50eff60fd253658d198 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Thu, 4 Apr 2013 14:23:31 +0200
Subject: [PATCH 2055/2585] ece-dev-image - additional role added since it's
 used on tomcat7

---
 .../patch/opt/tomcat-engine1/conf/tomcat-users.xml.tmpl        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/opt/tomcat-engine1/conf/tomcat-users.xml.tmpl b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/opt/tomcat-engine1/conf/tomcat-users.xml.tmpl
index 366d7125..bb04d65b 100644
--- a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/opt/tomcat-engine1/conf/tomcat-users.xml.tmpl
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/opt/tomcat-engine1/conf/tomcat-users.xml.tmpl
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <tomcat-users>
+  <role rolename=\"manager-gui\"/>
   <role rolename=\"manager\"/>
-  <user username=\"$tomcat_manager_user\" password=\"$tomcat_manager_password\" roles=\"tomcat,manager\"/>
+  <user username=\"$tomcat_manager_user\" password=\"$tomcat_manager_password\" roles=\"tomcat,manager,manager-gui\"/>
 </tomcat-users>

From e628c97ef12fe411508a73ee4e1d1146825b09c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Thu, 4 Apr 2013 14:24:41 +0200
Subject: [PATCH 2056/2585] ece-dev-image - additional role added since it's
 used on tomcat7

---
 .../patch/opt/tomcat-search1/conf/tomcat-users.xml.tmpl        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/opt/tomcat-search1/conf/tomcat-users.xml.tmpl b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/opt/tomcat-search1/conf/tomcat-users.xml.tmpl
index 366d7125..bb04d65b 100644
--- a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/opt/tomcat-search1/conf/tomcat-users.xml.tmpl
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/patch/opt/tomcat-search1/conf/tomcat-users.xml.tmpl
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <tomcat-users>
+  <role rolename=\"manager-gui\"/>
   <role rolename=\"manager\"/>
-  <user username=\"$tomcat_manager_user\" password=\"$tomcat_manager_password\" roles=\"tomcat,manager\"/>
+  <user username=\"$tomcat_manager_user\" password=\"$tomcat_manager_password\" roles=\"tomcat,manager,manager-gui\"/>
 </tomcat-users>

From d089b754b78085d02a89b643e576f60615dde813 Mon Sep 17 00:00:00 2001
From: Thomas <tvelthoven@vizrt.com>
Date: Wed, 10 Apr 2013 15:54:43 +0300
Subject: [PATCH 2057/2585] Create README.org

---
 usr/share/doc/vizrt/README.org | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 usr/share/doc/vizrt/README.org

diff --git a/usr/share/doc/vizrt/README.org b/usr/share/doc/vizrt/README.org
new file mode 100644
index 00000000..6614d27c
--- /dev/null
+++ b/usr/share/doc/vizrt/README.org
@@ -0,0 +1,3 @@
+* Depricated
+
+This code is now maintained in a private repository

From d3deb73bfd8723119f82cdcaefde6fc02bf43c17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Wed, 10 Apr 2013 13:44:14 +0200
Subject: [PATCH 2058/2585] ece-builder - added support for maven.vizrt.com
 urls for new distributions

---
 usr/share/escenic/build-scripts/ece-builder | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/ece-builder b/usr/share/escenic/build-scripts/ece-builder
index 2be196da..edc66d8b 100755
--- a/usr/share/escenic/build-scripts/ece-builder
+++ b/usr/share/escenic/build-scripts/ece-builder
@@ -191,11 +191,18 @@ function verify_builder_conf
 {
   enforce_variable technet_user "Your builder configuration file is missing the variable technet_user, exiting!"
   enforce_variable technet_user "Your builder configuration file is missing the variable technet_password, exiting!"
+  enforce_variable maven_vizrt_user "Your builder configuration file is missing the variable maven_vizrt_user, exiting!"
+  enforce_variable maven_vizrt_password "Your builder configuration file is missing the variable maven_vizrt_password, exiting!"
   wget --http-user $technet_user --http-password $technet_password http://technet.escenic.com/ -qO /dev/null
   if [ $? -ne 0 ]; then
     print_and_log "Your user can't reach http://technet.escenic.com/, exiting!"
     remove_pid_and_exit_in_error
   fi
+  wget --http-user $maven_vizrt_user --http-password $maven_vizrt_password http://maven.vizrt.com/ -qO /dev/null
+  if [ $? -ne 0 ]; then
+    print_and_log "Your user can't reach http://maven.vizrt.com/, exiting!"
+    remove_pid_and_exit_in_error
+  fi
   enforce_variable escenic_plugin_indentifiers "You need to configure a list of supported plugins in you builder configuration file using the variable escenic_plugin_indentifiers, exiting!"
   enforce_variable unsupported_plugin_indentifiers "You need to configure a list of unsupported plugins in you builder configuration file using the variable unsupported_plugin_indentifiers, exiting!" 
 }
@@ -496,7 +503,14 @@ function process_artifact
   fi
 
   # fetch and unpack resource
-  run wget --http-user $technet_user --http-password $technet_password $artifact_path -O $download_dir/unpack/artifact.zip
+  if [[ "${artifact_path}" == *maven.vizrt.com* ]]; then
+    local http_user=$maven_vizrt_user
+    local http_password=$maven_vizrt_password
+  elif [[ "${artifact_path}" == *technet* ]]; then
+    local http_user=$technet_user
+    local http_password=$technet_password
+  fi  
+  run wget --http-user $http_user --http-password $http_password $artifact_path -O $download_dir/unpack/artifact.zip
   run cd $download_dir/unpack
   run unzip $download_dir/unpack/artifact.zip
   

From 6c7189387f73c6587e0dc3b1a7d0767c94227130 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Wed, 10 Apr 2013 15:36:20 +0200
Subject: [PATCH 2059/2585] ece-build - changed run command into run_wrapper
 for correct exit hook usage and log file review

---
 usr/share/escenic/build-scripts/ece-build | 139 +++++++++++++++-------
 1 file changed, 93 insertions(+), 46 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index ffea55c1..81c178f1 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -105,10 +105,57 @@ function init
   pid_file=~/ece-build.pid
   create_pid
   
-  trap common_bashing_exit_hook EXIT
+  trap common_bashing_exit_hook_with_log_recap EXIT
   trap common_bashing_user_cancelled_hook SIGINT SIGHUP
 }
 
+## To make your script call this whenever it does a controlled exit,
+## either by running through the script, call this hook.
+##
+## Put this line at the start of your script:
+##
+## trap common_bashing_exit_hooki_with_log_recap EXIT
+##
+## $@ :: signal
+function common_bashing_exit_hook_with_log_recap() {
+  local RETVAL=$?
+  if [ $RETVAL -ne 0 ]; then
+    print "BUILD FAILED/CANCELED"
+    print "### start tail review of $log ###"
+    tail -n 25 $log
+    print "### end of review ###"
+  fi
+  remove_pid
+  remove_lock
+  kill $$
+}
+
+### run
+## Runs the passed command & arguments and log both standard error and
+## standard out. If the command exits cleanly, the calling code will
+## continue, however, if the command you passed to run failed, the run
+## wrapper will log the call stack and exit in error.
+##
+## $@ :: list of strings making up your command. Everything except
+##       pipes can be bassed
+function run_wrapper() {
+  if [ ! -e $log ]; then
+    touch $log || {
+      echo "Couldn't create $log"
+      exit 1
+    }
+  fi
+
+  "${@}" 1>>$log 2>>$log
+  
+  local RETVAL=$?
+  if [ $RETVAL -ne 0 ]; then
+    print_and_log "The command <${@}> run as user $USER $(red FAILED)" \
+      "(the command exited with code ${code}), I'll exit now :-("
+    exit 1 
+  fi
+}
+
 ##
 function fetch_configuration
 {
@@ -219,11 +266,11 @@ function symlink_assemblytool
     if [ -z $assemblytool_release ]; then
       print_and_log "Your project should start using <escenic.assemblytool.version> in your pom.xml to be compatible with newer versions of Escenic Content Engine!"
     else
-      run rm -rf $assemblytool_root_dir
+      run_wrapper rm -rf $assemblytool_root_dir
     fi
   elif [ -h $assemblytool_root_dir ]; then
     # remove assemblytool symlink if present
-    run rm -f $assemblytool_root_dir
+    run_wrapper rm -f $assemblytool_root_dir
   fi
 
   # standard execution with the assemblytool directory link not yet present
@@ -235,7 +282,7 @@ function symlink_assemblytool
     elif [ ! -d $assemblytool_link_target ]; then
       print_and_log "Your project requires $assemblytool_release, but it's not present in your home directory, I will try to fetch it from builder..."
       if [ -d $builder_assemblytool_dir/$assemblytool_release ]; then
-        run cp -r $builder_assemblytool_dir/$assemblytool_release ~/.
+        run_wrapper cp -r $builder_assemblytool_dir/$assemblytool_release ~/.
         print_and_log "The request $assemblytool_release has been added to your users home directory."
       else
         print_and_log "The requested $assemblytool_release does not exist on the platform and needs to be added by an operator, exiting!"
@@ -243,7 +290,7 @@ function symlink_assemblytool
       fi
     fi
     # create assemblytool symlink based on the request project version
-    run ln -s $assemblytool_link_target $assemblytool_root_dir
+    run_wrapper ln -s $assemblytool_link_target $assemblytool_root_dir
   fi
 }
 
@@ -251,13 +298,13 @@ function symlink_assemblytool
 function clean_assemblytool
 {
   if [ -e "$assemblytool_pub_dir" ]; then
-    run rm -f $assemblytool_pub_dir/*
+    run_wrapper rm -f $assemblytool_pub_dir/*
   fi
   if [ ! -d $assemblytool_pub_dir ]; then
     make_dir $assemblytool_pub_dir
   fi
   if [ -e "$assemblytool_lib_dir" ]; then
-    run rm -f $assemblytool_lib_dir/*
+    run_wrapper rm -f $assemblytool_lib_dir/*
   fi
   if [ ! -d $assemblytool_lib_dir ]; then
     make_dir $assemblytool_lib_dir
@@ -286,19 +333,19 @@ function clean_customer_home
 {
   # clean up plugin directory if it exists
   if [ -d "$plugin_dir" ]; then
-    run rm -f $plugin_dir/*
+    run_wrapper rm -f $plugin_dir/*
   else
     make_dir $plugin_dir
   fi
 
   # remove engine symlink if it exists 
   if [ -h "$engine_root_dir" ]; then
-    run rm -f $engine_root_dir
+    run_wrapper rm -f $engine_root_dir
   fi
 
   # drop and recreate svn src directory if it exists
   if [ -d "$svn_src_dir" ]; then
-    run rm -rf $svn_src_dir
+    run_wrapper rm -rf $svn_src_dir
   else
     make_dir $svn_src_dir
   fi
@@ -308,7 +355,7 @@ function clean_customer_home
 function add_global_libs
 {
   if [ -e $builder_root_dir/lib/java_memcached-release_2.0.1.jar ]; then
-    run ln -s $builder_root_dir/lib/java_memcached-release_2.0.1.jar $assemblytool_lib_dir/
+    run_wrapper ln -s $builder_root_dir/lib/java_memcached-release_2.0.1.jar $assemblytool_lib_dir/
   else
     print_and_log "The global library $builder_root_dir/lib/java_memcached-release_2.0.1.jar is missing, exiting!"
     exit 1
@@ -316,7 +363,7 @@ function add_global_libs
   local engine_version=`readlink $engine_root_dir`
   if [ $(echo "$engine_version" | grep "engine-5.3" | wc -l) -gt 0 ]; then
     if [ -e $builder_root_dir/lib/engine-backport-1.0-SNAPSHOT.jar ]; then
-      run ln -s $builder_root_dir/lib/engine-backport-1.0-SNAPSHOT.jar $assemblytool_lib_dir/
+      run_wrapper ln -s $builder_root_dir/lib/engine-backport-1.0-SNAPSHOT.jar $assemblytool_lib_dir/
     else
       print_and_log "The global library $builder_root_dir/lib/engine-backport-1.0-SNAPSHOT.jar is missing, exiting!"
       exit 1
@@ -333,13 +380,13 @@ function svn_fail_early
     release_label=$svn_path
     log "No svn path chosen, will use 'trunk'."
   fi
-  run svn checkout --non-interactive --depth empty --username $svn_user  --password $svn_password $svn_base$svn_path $svn_src_dir/.
+  run_wrapper svn checkout --non-interactive --depth empty --username $svn_user  --password $svn_password $svn_base$svn_path $svn_src_dir/.
 }
 
 ##
 function svn_verify_assembly
 {
-  run svn update --non-interactive --set-depth infinity $svn_src_dir/pom.xml $svn_src_dir/project-assembly 
+  run_wrapper svn update --non-interactive --set-depth infinity $svn_src_dir/pom.xml $svn_src_dir/project-assembly 
   if [ ! -d $project_assembly_dir ]; then
     print_and_log "Your project does not contain the project-assembly module and is thereby not certified to use the ece-builder, exiting!"
     exit 1
@@ -394,9 +441,9 @@ function symlink_ece_components
     version=`sed "/<escenic.$f.version>/!d;s/ *<\/\?escenic.$f.version> *//g" $svn_src_dir/pom.xml | tr -d $'\r' `
     if [[ ! $version = "" ]]; then
       if [[ "$f" = "engine" ]]; then
-        run ln -s $builder_engine_dir/$f-$version $engine_root_dir 
+        run_wrapper ln -s $builder_engine_dir/$f-$version $engine_root_dir 
       else
-        run ln -s $builder_plugins_dir/$f-$version $plugin_dir/$f 
+        run_wrapper ln -s $builder_plugins_dir/$f-$version $plugin_dir/$f 
       fi
     fi
   done
@@ -473,7 +520,7 @@ function verify_maven_proxy
 ## 
 function svn_checkout
 {
-  run svn checkout --non-interactive --depth infinity --username $svn_user  --password $svn_password $svn_base$svn_path $svn_src_dir/.
+  run_wrapper svn checkout --non-interactive --depth infinity --username $svn_user  --password $svn_password $svn_base$svn_path $svn_src_dir/.
   revision=`svn info $svn_src_dir | grep -i Revision | awk '{print $2}'`
   if [[ $revision = "" ]]; then    
     print_and_log "Failed to fetch current revision number, exiting!"
@@ -484,20 +531,20 @@ function svn_checkout
 ##
 function maven_build
 {
-  run cd $svn_src_dir
-  run mvn $maven_opts
+  run_wrapper cd $svn_src_dir
+  run_wrapper mvn $maven_opts
 }
 
 ##
 function symlink_project_assembly
 {
-  run cd $project_assembly_target_dir
-  run unzip project-assembly.zip
+  run_wrapper cd $project_assembly_target_dir
+  run_wrapper unzip project-assembly.zip
   # global classpath
   if [ -e "$project_assembly_target_dir/lib" ]; then
     for f in $(ls -d $project_assembly_target_dir/lib/* | grep .jar);
     do 
-      run ln -s $f $assemblytool_lib_dir;
+      run_wrapper ln -s $f $assemblytool_lib_dir;
     done
   fi
   # publications
@@ -532,8 +579,8 @@ context-root: /newsgate-webservice" > $assemblytool_pub_dir/newsgate-webservice.
 ##
 function ant_build
 {
-  run cd $assemblytool_root_dir
-  run ant -q clean ear -DskipRedundancyCheck=true
+  run_wrapper cd $assemblytool_root_dir
+  run_wrapper ant -q clean ear -DskipRedundancyCheck=true
 }
 
 ##
@@ -541,10 +588,10 @@ function add_distributions_to_ear
 {
   if [ -e $assemblytool_root_dir/dist/engine.ear ]; then
     if [ -e $assemblytool_root_dir/dist/effective-pom.xml ]; then
-      run rm -f $assemblytool_root_dir/dist/effective-pom.xml
+      run_wrapper rm -f $assemblytool_root_dir/dist/effective-pom.xml
     fi
-    run cd $svn_src_dir
-    run mvn -Doutput=$assemblytool_root_dir/dist/effective-pom.xml help:effective-pom   
+    run_wrapper cd $svn_src_dir
+    run_wrapper mvn -Doutput=$assemblytool_root_dir/dist/effective-pom.xml help:effective-pom   
     local pom_properties=$(cat $assemblytool_root_dir/dist/effective-pom.xml | xmlstarlet sel -N "pom=http://maven.apache.org/POM/4.0.0" \
       -t -m '/projects/pom:project/pom:properties/*' \
       -v 'concat(name(), " ", text())' -nl)
@@ -556,10 +603,10 @@ function add_distributions_to_ear
     if [ -z pom_distributions ] ; then
       log "The projects effective pom had no escenic.xxx.distribution properties, ignoring."
     else
-      run mkdir $assemblytool_root_dir/dist/META-INF
+      run_wrapper mkdir $assemblytool_root_dir/dist/META-INF
       echo "$pom_distributions" >> $assemblytool_root_dir/dist/META-INF/escenic-distributions.txt
-      run cd $assemblytool_root_dir/dist
-      run jar uvf $assemblytool_root_dir/dist/engine.ear META-INF/escenic-distributions.txt
+      run_wrapper cd $assemblytool_root_dir/dist
+      run_wrapper jar uvf $assemblytool_root_dir/dist/engine.ear META-INF/escenic-distributions.txt
     fi
   else
     print_and_log "Assemblytool finished, but the .ear is missing, exiting!"
@@ -572,15 +619,15 @@ function publish_ear
 {
   resulting_ear=$customer-$release_label-rev$revision-$build_date.ear
   if [ -e $assemblytool_root_dir/dist/engine.ear ]; then 
-    run cp $assemblytool_root_dir/dist/engine.ear $release_dir/$resulting_ear
+    run_wrapper cp $assemblytool_root_dir/dist/engine.ear $release_dir/$resulting_ear
     
     # remove old style latest link
     if [ -e $release_dir/latest ]; then
-      run rm -f $release_dir/latest
+      run_wrapper rm -f $release_dir/latest
     fi
     
     # add new latest.ear link
-    run ln -fs $release_dir/$resulting_ear $release_dir/latest.ear
+    run_wrapper ln -fs $release_dir/$resulting_ear $release_dir/latest.ear
   else
     print_and_log "I'm done, but the .ear is still missing, exiting!"
     exit 1
@@ -623,7 +670,7 @@ function create_machine_conf_packages() {
     for el in common ${machine}; do
       if [[ -d $conf_dir/$el && \
         $(find $conf_dir/$el -maxdepth 1 | egrep -v ".git|.svn" | wc -l) -gt 1 ]]; then
-        run cp -rf $conf_dir/$el/* $target_dir/
+        run_wrapper cp -rf $conf_dir/$el/* $target_dir/
       fi
     done
 
@@ -634,13 +681,13 @@ function create_machine_conf_packages() {
     local file=$svn_src_dir/doc/vosa-handbook/create-handbook.conf
     if [ -e $file ]; then
       local dir=$target_dir/etc/vizrt
-      run mkdir -p $dir
-      run cp $file $dir/truth.conf
+      run_wrapper mkdir -p $dir
+      run_wrapper cp $file $dir/truth.conf
     fi
     
     # mark all files as conf files
     local conffiles_file=$target_dir/DEBIAN/conffiles
-    run mkdir -p $(dirname $conffiles_file)
+    run_wrapper mkdir -p $(dirname $conffiles_file)
     find $target_dir -type f | \
       egrep "etc|conf" | \
       egrep -v DEBIAN | \
@@ -671,7 +718,7 @@ EOF
     local change_log_dir=$HOME/.generate-changelog/${svn_base_dir}/${svn_path}
     
     if [ -d  $change_log_dir ]; then
-      run cp ${change_log_dir}/* $package_changelog_dir
+      run_wrapper cp ${change_log_dir}/* $package_changelog_dir
     fi
 
     # build the package
@@ -680,13 +727,13 @@ EOF
       return
     fi
     
-    run dpkg-deb --build $target_dir
+    run_wrapper dpkg-deb --build $target_dir
     mv ${target_dir}.deb $target_dir/${package_name}-${package_version}.deb
     
     if [[ -x /usr/bin/alien && -x /usr/bin/fakeroot ]]; then
       (
-        run cd $target_dir
-        run fakeroot alien --keep-version --to-rpm --scripts \
+        run_wrapper cd $target_dir
+        run_wrapper fakeroot alien --keep-version --to-rpm --scripts \
           ${package_name}-${package_version}.deb
       )
     else
@@ -694,14 +741,14 @@ EOF
     fi
 
     # move the machine's DEB and RPM packges to the release directory
-    run mv $target_dir/*.{deb,rpm} $release_dir/
+    run_wrapper mv $target_dir/*.{deb,rpm} $release_dir/
    
     # adding latest links for conf packages
-    run ln -sf $release_dir/${package_name}-${package_version}.deb $release_dir/${package_name}-latest.deb
-    run ln -sf $release_dir/${package_name}-${package_version}.rpm $release_dir/${package_name}-latest.rpm
+    run_wrapper ln -sf $release_dir/${package_name}-${package_version}.deb $release_dir/${package_name}-latest.deb
+    run_wrapper ln -sf $release_dir/${package_name}-${package_version}.rpm $release_dir/${package_name}-latest.rpm
  
     # remove work directory
-    run rm -rf $target_dir
+    run_wrapper rm -rf $target_dir
   done
 
   print_and_log "Configuration packages available here: " \
@@ -732,7 +779,7 @@ function generate_new_changelog() {
       from_option="--from $previous_revision"
     fi
     
-    run generate-changelog \
+    run_wrapper generate-changelog \
       --project $(basename $svn_base) \
       --user $svn_user \
       --password $svn_password \

From f04532c2a6c10af8927130156cb2e1bb2e22a2cf Mon Sep 17 00:00:00 2001
From: Debashis Paul <Dpaul@vizrt.com>
Date: Fri, 12 Apr 2013 15:46:08 +0200
Subject: [PATCH 2060/2585] Cleanup code added to remove left over files (ear
 files, deb packages etc) in escenic download cache by ece-install and
 ece-deploy

---
 etc/cron.daily/remove-old-escenic-log-files | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/etc/cron.daily/remove-old-escenic-log-files b/etc/cron.daily/remove-old-escenic-log-files
index 6d38d3b0..a37c0563 100755
--- a/etc/cron.daily/remove-old-escenic-log-files
+++ b/etc/cron.daily/remove-old-escenic-log-files
@@ -18,3 +18,16 @@ if [ -r /etc/default/ece ]; then
     remove_old_escenic_log_files
   fi
 fi
+
+# Added to take care of left over ear files in escenic cache by ece-install and ece-deploy
+if [ -r /etc/escenic/ece.conf ]; then
+  source /etc/escenic/ece.conf
+  if [ -d ${cache_dir} ] ; then
+    nice find ${cache_dir} -maxdepth 1 -type f -mtime +5 -delete
+  fi
+
+fi
+
+# Now clean the /tmp directory as well
+nice find /tmp -type f -mtime +3 -delete
+

From c231c0275047e1bd9299c7d6c2e03783d7c212b5 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Sun, 14 Apr 2013 15:28:24 +0200
Subject: [PATCH 2061/2585] trying changes from Intellij

---
 README | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README b/README
index 579da524..059ab03f 100644
--- a/README
+++ b/README
@@ -3,6 +3,7 @@ Note!
 ========
 This version of ece-scripts is currently being modified to support java7, tomcat7 and content engine 5.6. During this transition the latest version of ece-scripts will not work correctly for previously released engine versions.
 
+
 ========
 Overview
 ========

From 999ac394832d780cd86d4134a7490fbc22d11612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Wed, 17 Apr 2013 10:39:47 +0200
Subject: [PATCH 2062/2585] ece-build - .deb packages will no longer contain an
 empty etc/hosts file if no hosts file information has been specified

---
 usr/share/escenic/build-scripts/ece-build | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 81c178f1..896a1391 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -664,7 +664,10 @@ function create_machine_conf_packages() {
 
     # /etc/hosts
     mkdir -p $target_dir/etc
-    echo "$(get_etc_hosts_for_machine ${machine} $conf_dir)" > $target_dir/etc/hosts
+    local hosts_output="$(get_etc_hosts_for_machine ${machine} $conf_dir)"
+    if [ ! -z $hosts_output ]; then
+      echo "$hosts_output" > $target_dir/etc/hosts
+    fi
 
     # copy common and machine specific files
     for el in common ${machine}; do

From f191676d7694b465bd2781aac27c2d74c894d278 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Thu, 18 Apr 2013 14:02:30 +0200
Subject: [PATCH 2063/2585] ece-build - fixed too many arguments exception in
 hosts file generation. This closes #14

---
 usr/share/escenic/build-scripts/ece-build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 896a1391..0da498ab 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -665,7 +665,7 @@ function create_machine_conf_packages() {
     # /etc/hosts
     mkdir -p $target_dir/etc
     local hosts_output="$(get_etc_hosts_for_machine ${machine} $conf_dir)"
-    if [ ! -z $hosts_output ]; then
+    if [ ! -z "$hosts_output" ]; then
       echo "$hosts_output" > $target_dir/etc/hosts
     fi
 

From f34b7f5406844a380369ee916ec46b473a6171a4 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Fri, 19 Apr 2013 12:00:12 +0200
Subject: [PATCH 2064/2585] Added fai_skip_password_checks=0 (default) which
 allows ece-install to skip verifying the technet username/password
 combinations, in case you don't want to access it at all.

---
 usr/sbin/ece-install | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 9b690e09..1a47d200 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -542,6 +542,10 @@ function check_software_credentials() {
     return
   fi
 
+  if [ ${fai_skip_password_checks-0} -eq 1 ]; then
+    return
+  fi
+
   print_and_log "Verifying that Technet credentials are OK ..."
 
   local url=http://technet.escenic.com

From ab74dc37566a444d21b0ea2f67ffef01f2283758 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Fri, 19 Apr 2013 23:33:38 +0200
Subject: [PATCH 2065/2585] ece-build-guide - added first version of
 ece-build-guide

---
 .../escenic/build-scripts/ece-build-guide     | 78 +++++++++++++++++++
 .../escenic/package-scripts/create-packages   |  1 +
 2 files changed, 79 insertions(+)
 create mode 100755 usr/share/escenic/build-scripts/ece-build-guide

diff --git a/usr/share/escenic/build-scripts/ece-build-guide b/usr/share/escenic/build-scripts/ece-build-guide
new file mode 100755
index 00000000..e07eaa47
--- /dev/null
+++ b/usr/share/escenic/build-scripts/ece-build-guide
@@ -0,0 +1,78 @@
+#! /usr/bin/env bash
+
+source /usr/share/escenic/ece-scripts/common-bashing.sh || {
+    echo "Couldn't find common-bashing library"
+    exit 1
+}
+
+log=$HOME/$(basename $0 .sh).log
+log "$USER is building his/her handbook @ $(date)"
+
+source ~/.build/build.conf
+
+# TODO move to the builder itself once this matures, 2012-08-20
+handbook_dir=~/handbook/
+if [ -e $handbook_dir ]; then
+    echo building the guide
+else
+    echo building the guide from scratch
+    run mkdir $handbook_dir
+    echo '/usr/bin/ece-build-guide' > $handbook_dir/create-my-handbook.sh
+    chmod 777 $handbook_dir/create-my-handbook.sh
+fi
+
+handbook_target_dir=/var/www/$USER
+
+svn_sdp_repo=${svn_base}sdp
+svn_sdp_dir=${handbook_dir}sdp
+handbook_conf_file=$svn_sdp_dir/vosa-handbook/create-handbook.conf
+
+svn_handbook_repo=https://vizrtcustomers.jira.com/svn/VIZRTSAAS/trunk/doc
+svn_handbook_dir=${handbook_dir}VIZRTSAAS/doc
+
+
+# set up PROJECT doc scripts and standard content
+if [ -e $svn_sdp_dir ]; then
+    run cd $svn_sdp_dir
+    echo getting latest from $svn_sdp_repo
+    run svn update
+else
+    run cd ${handbook_dir}
+    echo svn checkout $svn_sdp_repo $svn_sdp_dir --username $svn_user
+    run svn checkout $svn_sdp_repo $svn_sdp_dir --username $svn_user
+fi
+
+
+# set up VIZRTSAAS doc scripts and standard content
+if [ -e $svn_handbook_dir ]; then
+    run cd $svn_handbook_dir
+    echo getting latest from $svn_handbook_repo
+    run svn update
+else
+    run cd ${handbook_dir}
+    echo svn checkout $svn_handbook_repo $svn_handbook_dir --username $svn_user
+    run svn checkout $svn_handbook_repo $svn_handbook_dir --username $svn_user
+fi
+
+
+
+# verify that the current project has its trails
+if [ ! -e $handbook_conf_file ]; then
+    echo $handbook_conf_file "doesn't exist :-("
+    exit 1
+fi
+
+(
+    run cd $svn_handbook_dir
+    run bash vosa-handbook/create-handbook.sh \
+	--conf-file $handbook_conf_file \
+	--doc-dir $svn_sdp_dir/vosa-handbook
+
+    find $handbook_target_dir -type d -name ".svn" | xargs rm -rf
+    run cp ~/tmp/create-handbook-$(date --iso)/vosa-handbook.html \
+	$handbook_target_dir/index.html 
+    run cp -r ~/tmp/create-handbook-$(date --iso)/graphics $handbook_target_dir/
+    run cp -r ~/tmp/create-handbook-$(date --iso)/customer $handbook_target_dir/
+)
+
+log "$USER finished building his/her handbook @ $(date)"
diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 9da7f29f..d8428995 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -119,6 +119,7 @@ function set_up_escenic-build-scripts() {
   make_dir $target_dir/usr/bin
   run cp ../build-scripts/ece-build $target_dir/usr/bin/ece-build
   run cp ../build-scripts/ece-builder $target_dir/usr/bin/ece-builder
+  run cp ../build-scripts/ece-build-guide $target_dir/usr/bin/ece-build-guide
 }
 
 function set_up_escenic-content-engine-scripts() {

From 2e8a73872e34c1b9acc8addbd1ce7fc8a9ffd2a3 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Fri, 26 Apr 2013 11:15:03 +0200
Subject: [PATCH 2066/2585] Added support for initrd images.

Initrd images are needed by some centos images.  Changed the
timeout for graceful shutdown to 60 seconds, to avoid corruption.

- Added "media=disk,format=raw" to drive specification
- commented out pupptet in sample conf file created by init.
---
 usr/bin/vosa                                        | 7 ++++---
 usr/share/vizrt/vosa/commands/boot.sh               | 9 ++++++++-
 usr/share/vizrt/vosa/commands/install.sh            | 4 ++++
 usr/share/vizrt/vosa/commands/install_config_parser | 5 +++++
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index f49ef3b8..b2d3f621 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -121,6 +121,7 @@ function do_init() {
 
 original_image /var/lib/vizrt/vosa/uec-images/current/disk.img
 kernel /var/lib/vizrt/vosa/uec-images/current/vmlinuz
+initrd /var/lib/vizrt/vosa/uec-images/current/initrd
 
 # Initial disk size for its own storage, in Gigabytes: Disk will be
 # reized to this size on installation.
@@ -146,7 +147,7 @@ gateway 172.24.1.1
 # address of mirror and/or proxy to use (defaults to mirror://mirrors.ubuntu.com/mirrors.txt)
 # mirror http://no.archive.ubuntu.com/ubuntu
 # proxy http://my-local-proxy:3142/
-user_data /etc/vizrt/vosa/user-data/puppet-client.txt
+# user_data /etc/vizrt/vosa/user-data/puppet-client.txt
 
 # Host name give to the machine. defaults to the name of the vm instance
 # hostname some-vm03
@@ -1056,10 +1057,10 @@ function shutdown_kvm() {
     echo "Sending ACPI shutdown signal to guest ($pid) ($(echo_rundir_of $1)/$1.monitor)"
     echo 'system_powerdown' | nc -U $(echo_rundir_of $1)/$1.monitor
     echo
-    echo -n "Waiting 15 seconds for it to shut down"
+    echo -n "Waiting up to 60 for it to shut down gracefully."
   }
   local a;
-  for a in $(seq 1 15) ; do
+  for a in $(seq 1 60) ; do
     echo -n '.'
     sleep 1
     ps > /dev/null $pid || {
diff --git a/usr/share/vizrt/vosa/commands/boot.sh b/usr/share/vizrt/vosa/commands/boot.sh
index 0bf8b822..00807527 100755
--- a/usr/share/vizrt/vosa/commands/boot.sh
+++ b/usr/share/vizrt/vosa/commands/boot.sh
@@ -188,6 +188,12 @@ function boot_kvm() {
   fi
   kernel=${image}/vmlinuz
   img=${image}/disk.img
+  initrd=${image}/initrd
+  if [ -e $initrd ] ; then
+    initrd="-initrd $initrd"
+  else
+    initrd=""
+  fi
   cloud_param="nocloud;h=${hostname};s=file:///var/lib/cloud/data/cache/nocloud/"
 
   # should _maybe_ be put in some other script?  Needed by e.g. vosa start too.
@@ -204,8 +210,9 @@ function boot_kvm() {
   -enable-kvm
   -monitor unix:${rundir}/${hostname}.monitor,server,nowait
   -balloon "virtio"
-  -drive "file=${img},if=virtio,cache=none"
+  -drive "file=${img},if=virtio,cache=none,media=disk,format=raw"
   -kernel ${kernel}
+  $initrd
   -device "virtio-net-pci,mac=${install_config_macaddr},netdev=net0"
   -netdev "tap,id=net0,ifname=$tapinterface,script=no,downscript=no,vhost=on")
   
diff --git a/usr/share/vizrt/vosa/commands/install.sh b/usr/share/vizrt/vosa/commands/install.sh
index ff3ec5d0..fc1a515e 100755
--- a/usr/share/vizrt/vosa/commands/install.sh
+++ b/usr/share/vizrt/vosa/commands/install.sh
@@ -97,8 +97,12 @@ function copy_original_image() {
   fi
   img="$image/disk.img"
   kernel="$image/vmlinuz"
+  initrd="$image/initrd"
   cp "$install_config_original_image" "$img"
   cp "$install_config_kernel" "$kernel"
+  if [ ! -z "$install_config_initrd" ] && [ -s "$install_config_initrd" ] ; then
+    cp "$install_config_initrd" "$initrd"
+  fi
 }
 
 function resize_original_image() {
diff --git a/usr/share/vizrt/vosa/commands/install_config_parser b/usr/share/vizrt/vosa/commands/install_config_parser
index cbf4597a..3faa504d 100644
--- a/usr/share/vizrt/vosa/commands/install_config_parser
+++ b/usr/share/vizrt/vosa/commands/install_config_parser
@@ -4,6 +4,7 @@
 install_config_ip_address=
 install_config_original_image=/var/lib/vizrt/vosa/uec-images/current/disk.img
 install_config_kernel=/var/lib/vizrt/vosa/uec-images/current/vmlinuz
+install_config_initrd=/var/lib/vizrt/vosa/uec-images/current/initrd
 install_config_initial_disk_size=
 install_config_macaddr=
 install_config_netmask=
@@ -26,6 +27,10 @@ function install_config_kernel() {
   install_config_kernel=$1
 }
 
+function install_config_initrd() {
+  install_config_initrd=$1
+}
+
 function install_config_initial_disk_size() {
   install_config_initial_disk_size=$1
 }

From 1551f0a88046588b090305a6ed09d3c84de5f742 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Fri, 26 Apr 2013 13:04:51 +0200
Subject: [PATCH 2067/2585] vosa: Added support for configuring networking on
 centos and debian based configurations.

---
 usr/share/vizrt/vosa/commands/install.sh | 27 +++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/usr/share/vizrt/vosa/commands/install.sh b/usr/share/vizrt/vosa/commands/install.sh
index fc1a515e..b51c8c4e 100755
--- a/usr/share/vizrt/vosa/commands/install.sh
+++ b/usr/share/vizrt/vosa/commands/install.sh
@@ -177,18 +177,35 @@ EOF
 
   cat > ${tempdir}/overlay/updates.script <<EOF
 # Reset permissions on files created above (might not belong to root etc):
-chown --recursive ubuntu: /home/ubuntu/
+if [ -d /home/ubuntu ] ; then
+  chown --recursive ubuntu: /home/ubuntu/
+fi
 
 # Remove DHCP defaults
-perl -pi -e 's/iface eth0.*//' /etc/network/interfaces
-
-# Add static IP configuration
-cat >> /etc/network/interfaces <<END
+if [ -r /etc/network/interfaces ] ; then
+  perl -pi -e 's/iface eth0.*//' /etc/network/interfaces
+  cat >> /etc/network/interfaces <<END
 iface eth0 inet static
     address ${install_config_ip_address}
     netmask ${install_config_netmask}
     gateway ${install_config_gateway}
 END
+fi
+
+# Add static IP configuration
+if [ -r /etc/sysconfig/network-scripts/ifcfg-eth0 ] ; then
+  cat > /etc/sysconfig/network-scripts/ifcfg-eth0 <<END
+DEVICE="eth0"
+BOOTPROTO="static"
+ONBOOT="yes"
+IPADDR=${install_config_ip_address}
+NETMASK=${install_config_netmask}
+GATEWAY=${install_config_gateway}
+DELAY=0
+END
+fi
+
+
 EOF
 
   chmod 755 ${tempdir}/overlay/updates.script

From bbb4f25cab60bea0c813acf230447bd0bf788812 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Fri, 26 Apr 2013 14:37:07 +0200
Subject: [PATCH 2068/2585] Made the update disk use media=disk to keep some
 centos kernels happy

---
 usr/share/vizrt/vosa/commands/boot.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/vizrt/vosa/commands/boot.sh b/usr/share/vizrt/vosa/commands/boot.sh
index 00807527..78c006aa 100755
--- a/usr/share/vizrt/vosa/commands/boot.sh
+++ b/usr/share/vizrt/vosa/commands/boot.sh
@@ -223,7 +223,7 @@ function boot_kvm() {
 
   updates=${image}/updates.iso
   if [ -r "${updates}" ] ; then
-    startupcmd=("${startupcmd[@]}" -drive "file=${updates},if=virtio")
+    startupcmd=("${startupcmd[@]}" -drive "file=${updates},if=virtio,media=disk")
     xupdate="xupdate=vdb:mnt"
   fi
 

From d78b7fdf97d2295fe70d7f668b103ec72480c9b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Mon, 29 Apr 2013 10:31:35 +0200
Subject: [PATCH 2069/2585] ece-build - Added snapshot the list of known
 plugins

---
 usr/share/escenic/build-scripts/ece-build | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 0da498ab..b4427699 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -57,6 +57,7 @@ widget-framework-community
 widget-framework-syndication
 mobile-expansion
 semantic-cxense
+snapshot
 "
 
 # root folders for engine and plugin distributions

From 0303d5abc8bdaa44d1cb60d21882a0a77d4f2886 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Fri, 3 May 2013 11:35:42 +0200
Subject: [PATCH 2070/2585] Made it possible to specify the EAR when using the
 DB profile (to be able to harvest the downloadable artifacts from the EAR and
 run the db scripts from the EAR and so on).

---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 3 +++
 usr/share/escenic/ece-scripts/ece-install.d/database.sh       | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index eae6227d..23818e13 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -705,6 +705,9 @@ function set_archive_files_depending_on_profile()
   elif [ $install_profile_number -eq $PROFILE_ALL_IN_ONE ]; then
     ece_instance_ear_file=$fai_all_ear
     ece_instance_conf_archive=$fai_all_conf_archive
+  elif [ $install_profile_number -eq $PROFILE_DB_SERVER ]; then
+    ece_instance_ear_file=$fai_db_ear
+    ece_instance_conf_archive=""
   else
     # All other profiles don't have EAR support.
     ece_instance_ear_file=""
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index ef657433..61b805b9 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -232,6 +232,8 @@ function install_database_server() {
   assert_commands_available mysql
 
   if [ -z "$1" ]; then
+    set_archive_files_depending_on_profile
+    create_ear_download_list
     download_escenic_components
     set_up_engine_and_plugins
     set_up_ecedb

From 2d3010210a6c87b992bbe2e087723eab4f8742fc Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Tue, 7 May 2013 11:11:33 +0200
Subject: [PATCH 2071/2585] Removed monitoring profile in the lean branch, as
 this is now handled by vosa-sdp-bootstrapper.

---
 usr/sbin/ece-install                          |  32 --
 .../ece-scripts/ece-install.d/monitoring.sh   | 505 ------------------
 2 files changed, 537 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 1a47d200..fbad74fd 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -487,8 +487,6 @@ function read_user_input()
 "$PROFILE_RMI_HUB - RMI hub"
 "$PROFILE_SEARCH_SERVER - Search server (Solr + indexer-webapp)"
 "$PROFILE_WIDGET_FRAMEWORK - Install Widget Framework."
-"$PROFILE_MONITORING_SERVER - A monitoring server (web server +"\
-" Munin gatherer)"
 "$PROFILE_RESTORE_FROM_BACKUP - Restore from backup"\
 " (DB, data files, binaries, conf & publications)"
     )
@@ -829,19 +827,6 @@ function add_ece_init_to_runlevels() {
 function common_post_install() {
   add_ece_init_to_runlevels
 
-  if [ $install_profile_number -ne $PROFILE_WIDGET_FRAMEWORK -a \
-    $install_profile_number -ne $PROFILE_CREATE_PUBLICATION -a \
-    $install_profile_number -ne $PROFILE_RESTORE_FROM_BACKUP ]; then
-
-    if [[ "${fai_monitoring_node_munin_skip}" != "1" ]]; then
-      install_munin_node
-    fi
-
-    if [[ $install_profile_number != $PROFILE_MONITORING_SERVER &&
-          "${fai_monitoring_node_nagios_skip}" != "1" ]]; then
-      install_nagios_node
-    fi
-  fi
 
   install_system_info
   set_correct_permissions
@@ -1046,12 +1031,6 @@ if [ ${fai_enabled-0} -eq 1 ]; then
         no_fai_profile=0
     fi
 
-    if [ ${fai_monitoring_install-0} -eq 1 ]; then
-        install_profile_number=$PROFILE_MONITORING_SERVER
-        install_monitoring_server
-        no_fai_profile=0
-    fi
-
     if [ ${fai_restore_from_backup-0} -eq 1 ]; then
         install_profile_number=$PROFILE_RESTORE_FROM_BACKUP
         restore_from_backup
@@ -1103,13 +1082,6 @@ if [ ${fai_enabled-0} -eq 1 ]; then
       no_fai_profile=0
     fi
 
-    if [ ${fai_monitoring_node_install-0} -eq 1 ]; then
-      install_profile_number=$PROFILE_MONITORING_NODE
-      # no need to call anything specific here as all the work is done
-      # in the common_post_install function.
-      no_fai_profile=0
-    fi
-
     if [ $no_fai_profile -eq 1 ]; then
         print_and_log "No install profile selected, be sure to have one of the "
         print_and_log "fai_<profile>_install=1 in your $conf_file"
@@ -1150,10 +1122,6 @@ else
         $PROFILE_CREATE_PUBLICATION)
             create_publication
             ;;
-        $PROFILE_MONITORING_SERVER)
-            install_munin_gatherer
-            install_web_server 1
-            ;;
         $PROFILE_RESTORE_FROM_BACKUP)
             restore_from_backup
             ;;
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
index f9e5b9a9..eaa8de2f 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/monitoring.sh
@@ -1,510 +1,5 @@
 # module for installing monitoring software, both server and client side.
 
-MONITORING_VENDOR_NAGIOS=nagios
-MONITORING_VENDOR_ICINGA=icinga
-
-## Installs the Nagios monitoring server.
-## $1 the nagios vendor/falvour, "nagios" and "icinga" are supported.
-function install_nagios_monitoring_server()
-{
-  print "Installing an $1 server on $HOSTNAME ..."
-  local monitoring_vendor=$1
-
-  if [[ $(lsb_release -c -s) == "squeeze" ]]; then
-    # needed for check-mk
-    add_apt_source "deb http://backports.debian.org/debian-backports squeeze-backports main"
-  fi
-  
-  if [ $on_debian_or_derivative -eq 1 ]; then
-    if [[ $monitoring_vendor == $MONITORING_VENDOR_NAGIOS ]]; then
-      install_packages_if_missing \
-        check-mk-server check-mk-config-nagios \
-        apache2 nagios3 nagios-nrpe-plugin
-    else
-      install_packages_if_missing \
-        check-mk-server check-mk-config-icinga \
-        apache2 icinga nagios-nrpe-plugin icinga-doc
-    fi
-
-    # TODO: make it work if check_icmp is in another location?
-    if [ -e /usr/lib/nagios/plugins/check_icmp ] ; then
-      # setuid root for icmp_check to make check_mk's host checks to work...???
-      # see http://lists.mathias-kettner.de/pipermail/checkmk-en/2009-November/000808.html
-      run chmod u+s /usr/lib/nagios/plugins/check_icmp
-    else
-      print_and_log "Unable to setuid root on check_icmp, " \
-        "needed by check_mk's host checks."
-    fi
-
-  fi
-
-  if [[ $monitoring_vendor == $MONITORING_VENDOR_ICINGA ]]; then
-    print "Setting user/pass for icinga admin ..."
-    local file=/etc/icinga/htpasswd.users
-    run htpasswd -b -c $file icingaadmin \
-      ${fai_monitoring_admin_password-admin}
-  fi
-
-  # enable remote commands
-  if [[ $monitoring_vendor == $MONITORING_VENDOR_NAGIOS ]]; then
-    local file=/etc/nagios3/nagios.cfg
-  else
-    local file=/etc/icinga/icinga.cfg
-  fi
-
-  dont_quote_conf_values=1
-  set_conf_file_value check_external_commands 1 $file
-  dont_quote_conf_values=0
-
-  if [ $on_debian_or_derivative -eq 1 ]; then
-    if [[ $monitoring_vendor == $MONITORING_VENDOR_ICINGA ]]; then
-      # see /usr/share/doc/icinga-common/README.Debian we use --force
-      # here so that it doesn't fail if we're re-running this profile.
-      run dpkg-statoverride \
-        --force \
-        --update \
-        --add nagios www-data 2710 /var/lib/icinga/rw
-      run dpkg-statoverride \
-        --force \
-        --update \
-        --add nagios \
-        nagios 751 \
-        /var/lib/icinga
-    fi
-  fi
-
-  set_up_monitoring_host_def $monitoring_vendor $fai_monitoring_host_list;
-
-  if [[ $monitoring_vendor == $MONITORING_VENDOR_NAGIOS ]]; then
-    file=/etc/nagios3/conf.d/hostgroups_nagios2.cfg
-  else
-    file=/etc/icinga/objects/hostgroups_icinga.cfg
-  fi
-
-  set_up_monitoring_host_group \
-    $file \
-    "ece-hosts" \
-    'Hosts running one or more ECE' \
-    ${fai_monitoring_ece_host_list}
-
-  set_up_monitoring_host_group \
-    $file \
-    "search-hosts" \
-    'Hosts running search instance(s) (Solr + indexer)' \
-    ${fai_monitoring_search_host_list}
-
-  if [[ $monitoring_vendor == $MONITORING_VENDOR_NAGIOS ]]; then
-    run /etc/init.d/nagios3 restart
-    add_next_step "Nagios monitoring interface: http://${HOSTNAME}/nagios3"
-  else
-    run /etc/init.d/icinga restart
-    add_next_step "Icinga monitoring interface: http://${HOSTNAME}/icinga"
-  fi
-
-  run /etc/init.d/apache2 reload
-
-}
-
-## Sets up the definition file for a given monitoring host.
-##
-## $1 nagios flavour/vendor
-## $2 <host name>#<ip>, e.g.: fire#192.168.1.100
-## (the trailing #<ip> is ignored for reasons of backward compatibility)
-function set_up_monitoring_host_def()
-{
-  local monitoring_vendor=$1
-  shift;
-  local hosts=
-  local el=
-
-  for el in "${@}" ; do
-    hosts="$hosts '${el%#*}',"
-  done
-  # remove last ","
-  hosts="${hosts%,}"
-
-  make_dir /etc/check_mk
-  cat > /etc/check_mk/main.mk <<EOF
-# Generated by ece-install on $(date)
-all_hosts = [ $hosts ]
-
-filesystem_default_levels = {
-   "levels"         : (90, 95), # levels in percent
-   "magic"          : 0.8,      # Make bigger disks grow to more than 90/95%
-   "trend_range"    : None,     # disable check_mk's trending
-}
-
-service_contactgroups = [
-  ( "admins", ALL_HOSTS, ALL_SERVICES ),
-]
-
-host_contactgroups = [
-  ( "admins", ALL_HOSTS ),
-]
-
-
-extra_service_conf["max_check_attempts"] = [
- # NTP checks can fail for 2 days before they trigger an alert.
- ( "2880", ALL_HOSTS, [ "NTP Time" ]),
-
- # Disk must fill at sustained rate for 45 minutes before issuing a warning
- ( "45", ALL_HOSTS, [ "disk_fill_rate" ]),
-
- # External HTTP, TCP and DNS must fail for 10 minutes
- ( "10", ALL_HOSTS, [ "external_HTTP", "external_TCP", "external_DNS", "external_PING" ]),
-
- # All others get 4 minutes.
- ( "4", ALL_HOSTS, ALL_SERVICES ),
-]
-
-EOF
-
-# specific local checks 
-# Note that these checks are run from the monitoring server itself, which is
-# assumed to have the same connectivity as the other server.
-  cat > /etc/check_mk/mrpe.cfg <<EOF
-# Check that we can access the Internet
-# PING google's DNS server.
-external_PING    /usr/lib/nagios/plugins/check_ping -H 8.8.8.8 -w 20,2% -c 30,2% -p 1 -t 0.5
-
-# Do a nameserver lookup
-external_DNS    /usr/lib/nagios/plugins/check_dns -H www.google.com -s 8.8.8.8 -w 0.3 -c 2 -t 2
-
-# Make a request to Google (this might use a proxy, don't know)
-external_HTTP   /usr/lib/nagios/plugins/check_http -H www.google.com -w 0.8 -c 2 -t 2
-EOF
-
-  run check_mk -I
-  run check_mk -O
-
-}
-
-function install_nagios_node()
-{
-  print "Installing a Nagios client on $HOSTNAME ..."
-  
-  if [[ $(lsb_release -c -s) == "squeeze" ]]; then
-    # needed for check-mk
-    add_apt_source "deb http://backports.debian.org/debian-backports squeeze-backports main"
-    run apt-get update --quiet
-  fi
-  
-  if [ $on_debian_or_derivative -eq 1 ]; then
-    install_packages_if_missing \
-      xinetd \
-      check-mk-agent \
-      escenic-check-mk-plugins \
-      nagios-nrpe-server nagios-plugins
-    if [ -r /etc/xinetd.d/check_mk ] ; then
-      # enable check_mk in xinetd
-      run sed -i 's/\(\s*\)disable\s*=.*/\1disable = no/' /etc/xinetd.d/check_mk
-
-      if [ ! -z "${fai_monitoring_server_ip}" ] ; then
-        # Allow the monitorin gserver IP to access check_mk
-        run sed -i '/^\s*only_from\s*=.*/s/^/#/' /etc/xinetd.d/check_mk
-        run sed -i "/^}$/ i \\\tonly_from = ${fai_monitoring_server_ip}" /etc/xinetd.d/check_mk
-      fi
-      run /etc/init.d/xinetd reload
-    else
-      print_and_log "check_mk might not start automatically, " \
-        "as xinetd.d/check_mk is missing"
-    fi
-  else
-    print_and_log "Nagios node installation not supported on your system," \
-      "you will have to install it manually."
-    return
-  fi
-
-  local file=/etc/nagios/nrpe.cfg
-  dont_quote_conf_values=1
-  set_conf_file_value \
-    allowed_hosts \
-    127.0.0.1,${fai_monitoring_server_ip} \
-    $file
-  dont_quote_conf_values=0
-
-
-  # bug in nagios-nrpe-server, restart fails (sometimes) if the PID
-  # isn't there (!)
-  run touch /var/run/nagios/nrpe.pid
-  run /etc/init.d/nagios-nrpe-server restart
-
-  add_next_step "A Nagios NRPE node and check_mk have been installed" \
-    "on ${HOSTNAME}"
-}
-
-function install_munin_node()
-{
-  print_and_log "Installing a Munin node on $HOSTNAME ..."
-
-    # the IP of the monitoring server
-  local default_ip=127.0.0.1
-  if [ $fai_enabled -eq 1 ]; then
-    if [ -n "fai_monitoring_server_ip" ]; then
-      monitoring_server_ip=${fai_monitoring_server_ip}
-    fi
-  elif [ $install_profile_number -ne $PROFILE_MONITORING_SERVER ]; then
-    print "What is the IP of your monitoring server? If you don't know"
-    print "this, don't worry and just press ENTER"
-    echo -n "Your choice [${default_ip}]> "
-    read user_monitoring_server
-
-    if [ -n "$user_monitoring_server" ]; then
-      monitoring_server_ip=$user_monitoring_server
-    fi
-  fi
-
-  if [ -z "$monitoring_server_ip" ]; then
-    monitoring_server_ip=$default_ip
-  fi
-
-  if [ $on_debian_or_derivative -eq 1 ]; then
-    packages="munin-node munin-plugins-extra"
-    install_packages_if_missing $packages
-  else
-    print_and_log "Munin node installation not supported on your system," \
-      "you will have to install it manually."
-    return
-  fi
-
-  if [ -n "$monitoring_server_ip" ]; then
-    escaped_munin_gather_ip=$(get_perl_escaped ${monitoring_server_ip})
-    file=/etc/munin/munin-node.conf
-    cat >> $file <<EOF
-
-# added by ece-install $(date)
-allow ${escaped_munin_gather_ip}
-EOF
-  fi
-
-  # install the escenic_jstat munin plugin
-  install_escenic_munin_plugins
-
-  if [ $on_debian_or_derivative -eq 1 ]; then
-    run service munin-node restart
-  fi
-
-  add_next_step "A Munin node has been installed on $HOSTNAME"
-}
-
-function install_escenic_munin_plugins() {
-  if [ ! -r /etc/munin/plugin-conf.d/escenic-munin-plugins ] ; then
-    (echo '[escenic_*]'; echo 'user escenic') > \
-      /etc/munin/plugin-conf.d/escenic-munin-plugins
-  fi
-
-  if [ $on_debian_or_derivative -eq 1 ]; then
-    install_packages_if_missing escenic-munin-plugins
-    return
-  fi
-
-  local file=/usr/share/munin/plugins/escenic_jstat_
-  run wget $wget_opts \
-    https://github.com/mogsie/escenic-munin/raw/master/escenic_jstat_ \
-    -O $file
-  run chmod 755 $file
-
-  local instance_list=$(get_instance_list)
-  if [ -z "${instance_list}" ]; then
-    print_and_log "No ECE instances found on $HOSTNAME, so I'm not adding" \
-      "additional Munin configuration"
-
-    if [ $on_debian_or_derivative -eq 1 ]; then
-      run service munin-node restart
-    fi
-
-    add_next_step "A Munin node has been installed on $HOSTNAME"
-    return
-  fi
-
-  local escenic_jstat_modules="_gc _gcoverhead _heap _uptime"
-  for current_instance in $instance_list; do
-    for module in $escenic_jstat_modules; do
-	    cd /usr/share/munin/plugins/
-	    make_ln escenic_jstat_ escenic_jstat_${current_instance}${module}
-    done
-
-    # we need to hack a bit since escenic_jstat_ looks for
-    # instance PIDs in $escenic_run_dir ece-<instance>.pid. It's
-    # now <type>-<instance>.pid
-    file=$escenic_run_dir/$type-${instance_name}.pid
-    if [ ! -e $file ]; then
-      run touch $file
-    fi
-
-    # enabling the instance specific munin entries:
-    for el in /usr/share/munin/plugins/escenic_jstat_[a-z]*; do
-      run cd /etc/munin/plugins
-      make_ln $el
-    done
-  done
-
-    # TODO in which version(s) of munin is this directory called
-    # client-conf.d?
-  file=/etc/munin/plugin-conf.d/munin-node
-  if [ -e $file ]; then
-    cat >> $file <<EOF
-[escenic*]
-user $ece_user
-
-EOF
-  fi
-
-}
-
-function install_munin_gatherer()
-{
-  print_and_log "Installing a Munin gatherer on $HOSTNAME ..."
-  
-  if [ $on_debian_or_derivative -eq 1 ]; then
-    packages="munin"
-    install_packages_if_missing $packages
-  else
-    print_and_log "Munin gatherer installation not supported on your" \
-      "system :-( You will have to install it manually."
-    return
-  fi
-
-  if [ $fai_enabled -eq 0 ]; then
-    print "Which nodes shall this Munin monitor gather from?" \
-      "Separate your hosts with a space, e.g.: 'editor01 db01 web01'"
-    echo -n "Your choice> "
-    read user_munin_nodes
-
-    if [ -n "$user_munin_nodes" ]; then
-      node_list=$user_munin_nodes
-    fi
-  else
-    node_list=${fai_monitoring_munin_node_list}
-  fi
-
-  for el in $node_list; do
-    local file=/etc/munin/munin-conf.d/escenic.conf
-    if [[ -e $file &&  $(grep '\['${el}'\]' $file | wc -l) -gt 0 ]]; then
-      print_and_log "${el} already exists on the ${HOSTNAME} Munin gatherer ..."
-      continue
-    fi
-
-    print_and_log "Adding ${el} to the Munin gatherer on ${HOSTNAME} ..."
-    cat >> $file <<EOF
-[${el}]
-address $(get_ip $el)
-use_node_name yes
-EOF
-  done
-
-  # TODO add the privileged network to the allowed stanza (i.e. the
-  # network wich will do the monitoring of the servers.
-  local file=/etc/apache2/conf.d/munin
-  local privileged_hosts=$(get_privileged_hosts)
-
-  if [ -n "${privileged_hosts}" ]; then
-    # local privileged_hosts=$(
-    #   echo $(get_privileged_hosts) | sed "s#\ #\\\ #g"
-    # )
-    run sed -i "s#[ ]*Allow from .*#        Allow from ${privileged_hosts} localhost 127.0.0.0/8 ::1#g" \
-      $file
-    run /etc/init.d/apache2 reload
-  fi
-
-  add_next_step "Munin gatherer admin interface: http://${HOSTNAME}/munin" \
-    "Make sure all nodes allows its IP to connect to them."
-}
-
-## $1 nagios vendor
-function create_monitoring_server_overview()
-{
-  local file=/var/www/index.html
-  local title="Welcome to the mighty monitoring server @ ${HOSTNAME}"
-
-cat > $file <<EOF
-<html>
-  <head>
-    <title>$title</title>
-    <style type="text/css">
-$(cat $(dirname $BASH_SOURCE)/../vizrt.css)
-    </style>
-  </head>
-  <body>
-$(cat $(dirname $BASH_SOURCE)/../vizrt-logo-svg.html)
-    <h1>$title</h1>
-    <ul>
-EOF
-
-  if [[ $1 == $MONITORING_VENDOR_NAGIOS ]]; then
-    echo '      <li><a href="/nagios3">Nagios</a></li>' >> $file
-  else
-    echo '      <li><a href="/icinga">Icinga</a> (an enhanced Nagios)</li>' \
-      >> $file
-  fi
-  cat >> $file <<EOF
-      <li><a href="/munin">Munin</a></li>
-    </ul>
-  </body>
-</html>
-EOF
-  add_next_step "Start page for all monitoring interfaces: http://${HOSTNAME}/"
-}
-
-function install_monitoring_server()
-{
-  local nagios_flavour=${fai_monitoring_nagios_flavour-$MONITORING_VENDOR_ICINGA}
-
-  if [ "$(lsb_release -s -c 2>/dev/null)" = "lucid" ]; then
-    log "Version $(lsb_release -s -c 2>/dev/null) of" \
-      $(lsb_release -s -c 2>/dev/null) \
-      "doesn't support Icinga, will use vanilla Nagios instead."
-    nagios_flavour=$MONITORING_VENDOR_NAGIOS
-  fi
-
-  install_nagios_monitoring_server $nagios_flavour
-  install_munin_gatherer
-  create_monitoring_server_overview $nagios_flavour
-
-  leave_trail "trail_monitoring_host=$HOSTNAME"
-  leave_trail "trail_monitoring_port=80"
-}
-
-## $1 configuration file name
-## $2 host group name
-## $3 host group alias
-## $4..n host group members
-function set_up_monitoring_host_group()
-{
-  local file=$1
-  local host_group_name=$2
-  local host_group_alias=$3
-  # the remainding arguments passed to the methods is the member
-  # list members
-  local host_group_member_list=${@:4:$(( $# - 3 ))}
-
-  # don't set up host groups for empty node lists, so we exit here if
-  # the member list is empty.
-  if [ -z "${host_group_member_list}" ]; then
-    return
-  fi
-
-  if [ $(grep "hostgroup_name $host_group_name" $file | wc -l) -gt 0 ]; then
-    print "Icinga group member" \
-      $host_group_name \
-      "already defined, skipping it."
-    return
-  fi
-
-  cat >> $file <<EOF
-define hostgroup {
-  hostgroup_name $host_group_name
-  alias $host_group_alias
-EOF
-  echo -n "  members" >> $file
-  for el in $host_group_member_list; do
-    echo -n " ${el}," >> $file
-  done
-  cat >> $file <<EOF
-
-}
-EOF
-}
 
 ## Installs and sets up self-reporting of the current host
 function install_system_info() {

From 985fa77e27c72d3bf99575a3b568afcd6772c508 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Tue, 14 May 2013 12:41:25 +0200
Subject: [PATCH 2072/2585] Removed cleaning up from ece backup to make it less
 intrusive. Just exclude them from the tarball instead.

---
 usr/share/escenic/ece-scripts/ece.d/backup.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/backup.sh b/usr/share/escenic/ece-scripts/ece.d/backup.sh
index 1273c958..c3b3dede 100644
--- a/usr/share/escenic/ece-scripts/ece.d/backup.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/backup.sh
@@ -1,7 +1,6 @@
 function backup_type() {
   local message="Backing up the $instance instance of $type on $HOSTNAME ..."
   print_and_log $message
-  clean_up
 
   if [ "$type" == "rmi-hub" ]; then
     ensure_that_required_fields_are_set $hub_required_fields
@@ -96,7 +95,9 @@ ${tomcat_base}/conf
   
   print "Creating snapshot ... (this may take a while)"
   run tar cf $archive_file \
-    $actual_backup
+    $actual_backup \
+    --exclude $tomcat_base/work \
+    --exclude $tomcat_base/temp
 
   local size=$(du -h $archive_file | cut -d'/' -f1)
   message="Backup ready: $archive_file size: $size"

From 3cc350c2125a2f3169cd4ed9658b73f71aaea4c4 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 16 May 2013 15:11:17 +0200
Subject: [PATCH 2073/2585] Removed web server from cache profile.

---
 usr/sbin/ece-install | 2 --
 1 file changed, 2 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index fbad74fd..02551f44 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -1021,7 +1021,6 @@ if [ ${fai_enabled-0} -eq 1 ]; then
     if [ ${fai_cache_install-0} -eq 1 ]; then
         install_profile_number=$PROFILE_CACHE_SERVER
         install_cache_server
-        install_web_server 0
         no_fai_profile=0
     fi
 
@@ -1099,7 +1098,6 @@ else
             ;;
         $PROFILE_CACHE_SERVER)
             install_cache_server
-            install_web_server 0
             ;;
         $PROFILE_DB_SERVER)
             install_database_server

From 449f6449ea8dd7eabc343cf1de965cd0cb8da633 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Sat, 18 May 2013 15:02:54 +0200
Subject: [PATCH 2074/2585] ece-build - implemented automatic download feature
 for engine and plugins

---
 usr/share/escenic/build-scripts/ece-build | 293 +++++++++++++++++++---
 1 file changed, 263 insertions(+), 30 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index b4427699..c3b04da3 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -60,12 +60,43 @@ semantic-cxense
 snapshot
 "
 
+declare -A project_distributions=()
+
+declare -A maven_coordinates=(
+["assemblytool"]="com.escenic.tools:assemblytool:jar"
+["engine"]="com.escenic:engine-dist:zip:bin"
+["analysis-engine"]="com.escenic.plugins.analysis:analysis-engine:zip"
+["dashboard"]="com.escenic.plugins.dashboard:dashboard:zip"
+["forum"]="com.escenic.plugins.forum:forum:zip"
+["geocode"]="com.escenic.plugins.geocode:geocode-dist:zip"
+["lucy"]="com.escenic.plugins.lucy:lucy-dist:zip"
+["menu-editor"]="com.escenic.plugins.menu-editor:menu-editor-dist:zip"
+["newsroom"]="com.escenic.plugins.newsroom:newsroom-dist:zip"
+["newsgate"]="com.escenic.plugins.newsgate:newsgate:zip"
+["poll"]="com.escenic.plugins.poll:poll:zip"
+["section-feed"]="com.escenic.plugins.section-feed:section-feed-dist:zip"
+["semantic-cxense"]="com.escenic.plugins.semantic:semantic-cxense-dist:zip"
+["snapshot"]="com.escenic.plugins.snapshot:snapshot-dist:zip"
+["community-engine"]="com.escenic.plugins.community-engine:community-engine:zip"
+["online-graphics"]="com.escenic.plugins.online-graphics:online-graphics:zip"
+["video"]="com.escenic.plugins.video:video:zip"
+["xml-editor"]="com.escenic.plugins.xml-editor:xml-editor-dist:zip"
+["vcpeditor"]="com.escenic.plugins.vcpeditor:vcpeditor-dist:zip"
+["widget-framework-core"]="com.escenic.widget-framework:framework-dist:zip"
+["widget-framework-community"]="com.escenic.widget-framework:framework-community-dist:zip"
+["widget-framework-mobile"]="com.escenic.widget-framework:framework-mobile-dist:zip"
+)
+
 # root folders for engine and plugin distributions
 builder_root_dir=/home/builder
 builder_engine_dir=$builder_root_dir/engine
 builder_plugins_dir=$builder_root_dir/plugins
 builder_assemblytool_dir=$builder_root_dir/assemblytool
 
+# local folders for engine and plugin distributions
+dists_root_dir=~/.dists
+dists_tmp_dir=$dists_root_dir/tmp
+
 # assemblytool root folders
 assemblytool_root_dir=~/assemblytool
 assemblytool_pub_dir=$assemblytool_root_dir/publications
@@ -103,8 +134,15 @@ function init
     exit 1
   fi
 
+  # set pid
   pid_file=~/ece-build.pid
-  create_pid
+
+  if [ -e $pid_file ]; then
+    echo "Instance of $(basename $0) already running!"
+    exit 1
+  else
+    create_pid
+  fi
   
   trap common_bashing_exit_hook_with_log_recap EXIT
   trap common_bashing_user_cancelled_hook SIGINT SIGHUP
@@ -381,13 +419,13 @@ function svn_fail_early
     release_label=$svn_path
     log "No svn path chosen, will use 'trunk'."
   fi
-  run_wrapper svn checkout --non-interactive --depth empty --username $svn_user  --password $svn_password $svn_base$svn_path $svn_src_dir/.
+  run_wrapper svn checkout --quiet --non-interactive --depth empty --username $svn_user  --password $svn_password $svn_base$svn_path $svn_src_dir/.
 }
 
 ##
 function svn_verify_assembly
 {
-  run_wrapper svn update --non-interactive --set-depth infinity $svn_src_dir/pom.xml $svn_src_dir/project-assembly 
+  run_wrapper svn update --quiet --non-interactive --set-depth infinity $svn_src_dir/pom.xml $svn_src_dir/project-assembly 
   if [ ! -d $project_assembly_dir ]; then
     print_and_log "Your project does not contain the project-assembly module and is thereby not certified to use the ece-builder, exiting!"
     exit 1
@@ -402,12 +440,70 @@ function retrieve_project_pom_versions
 {
   if [ -e $svn_src_dir/pom.xml ];then
     project_pom_versions=`xml2 < $svn_src_dir/pom.xml | grep '^/project/properties/escenic\.' | sed -n -e 's,.*properties/escenic\.,,' -e 's,\.version,,p'`
+    for f in $project_pom_versions; do
+      for g in $escenic_identifiers; do
+        if [[ $f == $g=* ]]; then
+          project_distributions+=(["$g"]=${f//*=})
+        fi
+      done
+    done
   else
     print_and_log "Your projects pom.xml is missing, exiting!"
     exit 1
   fi
 }
 
+##
+function mvn_coordinate_to_url
+{
+  # url to be returned
+  local url
+
+  # coordinate is e.g. com.escenic:engine-dist:zip:bin:5.5.2.137014
+  # or com.escenic.plugins.forum:forum:zip:3.2.1.132293
+  # groupid:artifactid:[packaging:[classifier:]]version
+  local coordinate=$1
+
+  # local variables parsed from coordinate
+  local groupid
+  local artifactid
+  local version
+  local packaging
+  local classifier
+
+  # chomp groupid: --> artifactid:[packaging:[classifier:]]version
+  groupid=${coordinate/:*}
+  coordinate=${coordinate#${groupid}:}
+
+  # chomp artifactid: --> [packaging:[classifier:]]version
+  artifactid=${coordinate/:*}
+  coordinate=${coordinate#${artifactid}:}
+
+  # chomp version --> [packaging[:classifier]]
+  version=${coordinate/*:}
+  coordinate=${coordinate%${version}}
+  coordinate=${coordinate%:}
+
+  classifier=
+  packaging=
+
+  if [ ! -z "$coordinate" ] ; then
+    # chomp packaging --> [classifier]
+    packaging=${coordinate/:*}
+    coordinate=${coordinate#${packaging}}
+    coordinate=${coordinate#:}
+  fi
+
+  if [ ! -z "$coordinate" ] ; then
+    # chomp classifier
+    classifier=$coordinate
+    coordinate=
+  fi
+
+  echo "${groupid//.//}/${artifactid}/$version/${artifactid}-${version}${classifier:+-${classifier}}.$packaging"
+
+}
+
 ##
 function set_java_home
 {
@@ -434,6 +530,148 @@ function set_java_home
   fi
 }
 
+##
+function fetch_distributions
+{
+  # create $dists_root_dir if needed
+  if [ ! -d $dists_root_dir ]; then
+    run_wrapper mkdir -p $dists_root_dir
+  fi
+  
+  # iterate over all known distribution identifiers
+  for f in $escenic_identifiers
+  do
+
+    # try and fetch the version for the distribution from the pom.xml
+    local dist_version=`sed "/<escenic.$f.version>/!d;s/ *<\/\?escenic.$f.version> *//g" $svn_src_dir/pom.xml | tr -d $'\r' `
+    
+    # check if a version was returned from the pom.xml
+    if [[ ! $dist_version = "" ]]; then
+      
+      # check if the distribution is already present in the local dists directory
+      if [ ! -d $dists_root_dir/$f-$dist_version ]; then
+
+        # create a url from the maven coordinate of the distribution
+        local dist_path=`mvn_coordinate_to_url ${maven_coordinates["$f"]}:$dist_version`
+        local artifact_pattern=$f
+        local artifact_version=$dist_version
+        local target_path=$dists_root_dir
+        
+        # try and add the distribution
+        request_distribution $dist_path
+        if [ -e $dists_tmp_dir/distribution.zip ]; then
+          run_wrapper cd $dists_tmp_dir
+          run_wrapper unzip -q $dists_tmp_dir/distribution.zip
+          run_wrapper rm -f $dists_tmp_dir/distribution.zip
+
+          # analyze unpacked resource
+          for g in $(ls -d $dists_tmp_dir/*);
+          do
+            local skip_artifact=0
+            local artifact_filename=$(basename "$g")
+            echo "$artifact_filename" | grep '[0-9]' | grep -q "$artifact_pattern"
+            if [ $? = 0 ]; then
+              log "The resulting directory contains numbers and \"$artifact_pattern\" so it is most likely valid."
+            else
+              echo "$artifact_filename" | grep -q "$artifact_pattern"
+              if [ $? = 0 ]; then
+                log "$artifact_path was identified as $artifact_pattern, but failed the naming convention test after being unpacked, trying to recover..."
+                if [ ! -d $dists_root_dir/$artifact_pattern-$dist_version ]; then
+                  log "$artifact_path was recovered as a $artifact_pattern and will be added as $artifact_pattern-$dist_version"
+                else
+                  log "$artifact_path was identified as $artifact_pattern, but $artifact_pattern-$dist_version already exists so it will not be added."
+                  skip_artifact=1
+                fi
+              else
+                log "$g is not a valid artifact, ignoring."
+                skip_artifact=1
+              fi
+            fi
+            if [ $skip_artifact -eq 0 ]; then
+              run_wrapper mv $g $target_path/$artifact_pattern-$artifact_version
+              log "Distribution $artifact_pattern-$artifact_version sucessfully added."
+            fi
+          done
+        else
+          log "Download failed! - trying to fallback to old school..."
+          if [ -d $builder_plugins_dir/$artifact_pattern-$artifact_version ]; then
+            run_wrapper cp -R $builder_plugins_dir/$artifact_pattern-$artifact_version $target_path/$artifact_pattern-$artifact_version
+            log "Distribution $artifact_pattern-$artifact_version sucessfully added."
+          elif [ -d $builder_engine_dir/$artifact_pattern-$artifact_version ]; then
+            run_wrapper cp -R $builder_engine_dir/$artifact_pattern-$artifact_version $target_path/$artifact_pattern-$artifact_version
+            log "Distribution $artifact_pattern-$artifact_version sucessfully added."
+          else
+            print_and_log "Download failed! The distribution named $f with relative path - $dist_path could not be found in any of the repositories. This must be handled by an operator."
+            exit 1 
+          fi
+        fi
+      fi
+    fi
+  done
+}
+
+##
+function request_distribution
+{
+  local dist_path=$1
+  if [ ! -z $dist_path ]; then
+    distribution_exists http://maven.vizrt.com/$dist_path  
+    local ret_val=$?
+    if [ $ret_val -eq 0 ]; then
+      download_distribution http://maven.vizrt.com/$dist_path
+    else
+      distribution_exists http://maven.vizrt.com/unstable/$dist_path
+      local ret_val=$?
+      if [ $ret_val -eq 0 ]; then
+        download_distribution http://maven.vizrt.com/unstable/$dist_path
+      fi      
+    fi
+  fi
+}
+
+##
+function distribution_exists
+{
+  local url=$1
+  log "Trying to download - $url"
+  wget --spider -q --http-user $maven_user --http-password $maven_password $url
+}
+
+##
+function download_distribution
+{
+  # url to download
+  local url=$1
+
+  # clean up tmp directory
+  if [ -d $dists_tmp_dir ]; then
+    run_wrapper rm -rf $dists_tmp_dir
+  fi
+ 
+  # re-create tmp directory
+  run_wrapper mkdir -p $dists_tmp_dir
+
+  # download the distribution
+  run_wrapper wget -q --http-user $maven_user --http-password $maven_password $url -O $dists_tmp_dir/distribution.zip
+}
+
+##
+function print_unstable_distributions
+{
+  for f in ${!project_distributions[@]}; do
+    local dist_path=`mvn_coordinate_to_url ${maven_coordinates["$f"]}:${project_distributions["$f"]}`
+    if [ ! -z $dist_path ]; then
+      distribution_exists http://maven.vizrt.com/$dist_path
+      if [ $? -ne 0 ]; then
+        distribution_exists http://maven.vizrt.com/unstable/$dist_path
+        if [ $? -eq 0 ]; then
+          print_and_log "WARNING - $f version ${project_distributions["$f"]} is unstable!"
+        fi
+      fi
+    fi
+  done
+}
+
 ##
 function symlink_ece_components
 {
@@ -442,9 +680,9 @@ function symlink_ece_components
     version=`sed "/<escenic.$f.version>/!d;s/ *<\/\?escenic.$f.version> *//g" $svn_src_dir/pom.xml | tr -d $'\r' `
     if [[ ! $version = "" ]]; then
       if [[ "$f" = "engine" ]]; then
-        run_wrapper ln -s $builder_engine_dir/$f-$version $engine_root_dir 
+        run_wrapper ln -s $dists_root_dir/$f-$version $engine_root_dir 
       else
-        run_wrapper ln -s $builder_plugins_dir/$f-$version $plugin_dir/$f 
+        run_wrapper ln -s $dists_root_dir/$f-$version $plugin_dir/$f 
       fi
     fi
   done
@@ -521,9 +759,9 @@ function verify_maven_proxy
 ## 
 function svn_checkout
 {
-  run_wrapper svn checkout --non-interactive --depth infinity --username $svn_user  --password $svn_password $svn_base$svn_path $svn_src_dir/.
+  run_wrapper svn checkout --quiet --non-interactive --depth infinity --username $svn_user --password $svn_password $svn_base$svn_path $svn_src_dir/.
   revision=`svn info $svn_src_dir | grep -i Revision | awk '{print $2}'`
-  if [[ $revision = "" ]]; then    
+  if [[ $revision = "" ]]; then
     print_and_log "Failed to fetch current revision number, exiting!"
     exit 1
   fi
@@ -533,14 +771,14 @@ function svn_checkout
 function maven_build
 {
   run_wrapper cd $svn_src_dir
-  run_wrapper mvn $maven_opts
+  run_wrapper mvn -q $maven_opts
 }
 
 ##
 function symlink_project_assembly
 {
   run_wrapper cd $project_assembly_target_dir
-  run_wrapper unzip project-assembly.zip
+  run_wrapper unzip -q project-assembly.zip
   # global classpath
   if [ -e "$project_assembly_target_dir/lib" ]; then
     for f in $(ls -d $project_assembly_target_dir/lib/* | grep .jar);
@@ -588,27 +826,20 @@ function ant_build
 function add_distributions_to_ear
 {
   if [ -e $assemblytool_root_dir/dist/engine.ear ]; then
-    if [ -e $assemblytool_root_dir/dist/effective-pom.xml ]; then
-      run_wrapper rm -f $assemblytool_root_dir/dist/effective-pom.xml
-    fi
-    run_wrapper cd $svn_src_dir
-    run_wrapper mvn -Doutput=$assemblytool_root_dir/dist/effective-pom.xml help:effective-pom   
-    local pom_properties=$(cat $assemblytool_root_dir/dist/effective-pom.xml | xmlstarlet sel -N "pom=http://maven.apache.org/POM/4.0.0" \
-      -t -m '/projects/pom:project/pom:properties/*' \
-      -v 'concat(name(), " ", text())' -nl)
-    if [ $? != 0 ] ; then
-      print_and_log "Unable to understand $assemblytool_root_dir/dist/effective-pom.xml, exiting!"
-      return 1
-    fi
-    local pom_distributions=$(sort <<< "$pom_properties" -u | grep '^escenic\.[^\.]*\.distribution ' | cut -d ' ' -f 2 )
-    if [ -z pom_distributions ] ; then
-      log "The projects effective pom had no escenic.xxx.distribution properties, ignoring."
-    else
-      run_wrapper mkdir $assemblytool_root_dir/dist/META-INF
-      echo "$pom_distributions" >> $assemblytool_root_dir/dist/META-INF/escenic-distributions.txt
-      run_wrapper cd $assemblytool_root_dir/dist
-      run_wrapper jar uvf $assemblytool_root_dir/dist/engine.ear META-INF/escenic-distributions.txt
-    fi
+    run_wrapper mkdir $assemblytool_root_dir/dist/META-INF
+    # iterate over all known distribution identifiers
+    for f in $escenic_identifiers
+    do
+      # try and fetch the version for the distribution from the pom.xml
+      local dist_version=`sed "/<escenic.$f.version>/!d;s/ *<\/\?escenic.$f.version> *//g" $svn_src_dir/pom.xml | tr -d $'\r' `
+
+      # check if a version was returned from the pom.xml
+      if [[ ! $dist_version = "" ]]; then
+        echo "${maven_coordinates["$f"]}:$dist_version" >> $assemblytool_root_dir/dist/META-INF/escenic-distributions.txt
+      fi
+    done
+    run_wrapper cd $assemblytool_root_dir/dist
+    run_wrapper jar uvf $assemblytool_root_dir/dist/engine.ear META-INF/escenic-distributions.txt
   else
     print_and_log "Assemblytool finished, but the .ear is missing, exiting!"
     exit 1
@@ -887,10 +1118,12 @@ function phase_verify_project
   svn_fail_early
   svn_verify_assembly
   retrieve_project_pom_versions
+  print_unstable_distributions
   set_java_home
   symlink_assemblytool
   clean_assemblytool
   verify_assemblytool
+  fetch_distributions
   symlink_ece_components
   verify_requested_versions
   add_global_libs

From e64515c07f138d71164c9319f2c02a66264d527f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Sat, 18 May 2013 15:51:01 +0200
Subject: [PATCH 2075/2585] ece-builder - removed debug output

---
 usr/share/escenic/build-scripts/ece-builder | 1 -
 1 file changed, 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/ece-builder b/usr/share/escenic/build-scripts/ece-builder
index edc66d8b..f0b24406 100755
--- a/usr/share/escenic/build-scripts/ece-builder
+++ b/usr/share/escenic/build-scripts/ece-builder
@@ -492,7 +492,6 @@ function add_artifact
 ##
 function process_artifact
 {
-  echo $plugin_pattern
   # identify type
   if [ $engine_found -eq 1 ]; then
     artifact_pattern=engine

From 71b752a24e908976b1370ddb6f216b5106106fe1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Sun, 19 May 2013 01:51:45 +0200
Subject: [PATCH 2076/2585] ece-build - changed phrase unsupported to not
 supported

---
 usr/share/escenic/build-scripts/ece-build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index c3b04da3..1664a718 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -665,7 +665,7 @@ function print_unstable_distributions
       if [ $? -ne 0 ]; then
         distribution_exists http://maven.vizrt.com/unstable/$dist_path
         if [ $? -eq 0 ]; then
-          print_and_log "WARNING - $f version ${project_distributions["$f"]} is unstable!"
+          print_and_log "WARNING - $f version ${project_distributions["$f"]} is not supported!"
         fi
       fi
     fi

From 492d534d139570c25545d02d9f047761be84fc46 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 23 May 2013 16:51:07 +0200
Subject: [PATCH 2077/2585] context.xml is now additive.

This fixes #7 of vizrt/ece-scripts.

Rewrote writing context.xml to use xmlstarlet.
At the moment, this requires the in-place flag of
xmlstarlet; this might need to be fixed to support
older versions of xmlstarlet without in-place
editing support.
---
 .../ece-scripts/ece-install.d/app-server.sh   | 137 +++++++++---------
 1 file changed, 70 insertions(+), 67 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 069e5c86..a4828da3 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -387,86 +387,89 @@ EOF
 </Server>
 EOF
 
-  cat > $tomcat_base/conf/context.xml <<EOF
+  if [ ! -e $tomcat_base/conf/context.xml ] ; then
+    cat > $tomcat_base/conf/context.xml <<EOF
 <?xml version='1.0' encoding='utf-8'?>
-<Context>
-  <WatchedResource>WEB-INF/web.xml</WatchedResource>
+<Context/>
 EOF
 
+  xmlstarlet ed -P -L \
+     -s /Context -t elem -n WatchedResource -v WEB-INF/web.xml \
+     $tomcat_base/conf/context.xml
+
+
   if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER -a \
     $install_profile_number -ne $PROFILE_SEARCH_SERVER ]; then
-    cat >> $tomcat_base/conf/context.xml <<EOF
-  <ResourceLink
-      global="jdbc/ECE_READ_DS"
-      name="jdbc/ECE_READ_DS"
-      type="javax.sql.DataSource"
-  />
-  <ResourceLink
-      global="jdbc/ECE_UPDATE_DS"
-      name="jdbc/ECE_UPDATE_DS"
-      type="javax.sql.DataSource"
-  />
-EOF
+
+    # Insert the ResourceLink element.
+    local el
+    for el in READ UPDATE ; do
+      xmlstarlet ed -P -L \
+       -s /Context -t elem -n TMP -v '' \
+       -i //TMP -t attr -n global -v jdbc/ECE_${el}_DS \
+       -i //TMP -t attr -n name -v jdbc/ECE_${el}_DS \
+       -i //TMP -t attr -n type -v javax.sql.DataSource \
+       -r //TMP -v ResourceLink \
+       $tomcat_base/conf/context.xml
+    done
   fi
 
   if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER ]; then
-    cat >> $tomcat_base/conf/context.xml <<EOF
-  <Environment
-      name="escenic/solr-base-uri"
-      value="http://${search_host}:${search_port}/solr/"
-      type="java.lang.String"
-      override="false"
-  />
-EOF
+    xmlstarlet ed -P -L \
+       -s /Context -t elem -n TMP -v '' \
+       -i //TMP -t attr -n name -v escenic/solr-base-uri \
+       -i //TMP -t attr -n value -v http://${search_host}:${search_port}/solr/ \
+       -i //TMP -t attr -n type -v java.lang.String \
+       -i //TMP -t attr -n override -v false \
+       -r //TMP -v Environment \
+       $tomcat_base/conf/context.xml
+
   fi
 
   if [ $install_profile_number -eq $PROFILE_SEARCH_SERVER -o \
     $install_profile_number -eq $PROFILE_ALL_IN_ONE ]; then
-    cat >> $tomcat_base/conf/context.xml <<EOF
-  <Environment
-      name="escenic/indexer-webservice"
-      value="${indexer_ws_uri}"
-      type="java.lang.String"
-      override="false"
-  />
-  <Environment
-      name="escenic/index-update-uri"
-      value="http://${search_host}:${search_port}/solr/update/"
-      type="java.lang.String"
-      override="false"
-  />
-  <Environment
-      name="escenic/head-tail-storage-file"
-      value="$escenic_data_dir/engine/head-tail.index"
-      type="java.lang.String"
-      override="false"
-  />
-  <Environment
-      name="escenic/failing-documents-storage-file"
-      value="$escenic_data_dir/engine/failures.index"
-      type="java.lang.String"
-      override="false"
-  />
-</Context>
-EOF
+
+    xmlstarlet ed -P -L \
+       -s /Context -t elem -n TMP -v '' \
+       -i /Context/TMP -t attr -n name -v escenic/indexer-webservice \
+       -i /Context/TMP -t attr -n value -v ""${indexer_ws_uri} \
+       -i /Context/TMP -t attr -n type -v java.lang.String \
+       -i /Context/TMP -t attr -n override -v false \
+       -r //TMP -v Environment \
+       -s /Context -t elem -n TMP -v '' \
+       -i /Context/TMP -t attr -n name -v escenic/index-update-uri \
+       -i /Context/TMP -t attr -n value -v http://${search_host}:${search_port}/solr/update/ \
+       -i /Context/TMP -t attr -n type -v java.lang.String \
+       -i /Context/TMP -t attr -n override -v false \
+       -r //TMP -v Environment \
+       -s /Context -t elem -n TMP -v '' \
+       -i /Context/TMP -t attr -n name -v escenic/head-tail-storage-file \
+       -i /Context/TMP -t attr -n value -v $escenic_data_dir/engine/head-tail.index \
+       -i /Context/TMP -t attr -n type -v java.lang.String \
+       -i /Context/TMP -t attr -n override -v false \
+       -r //TMP -v Environment \
+       -s /Context -t elem -n TMP -v '' \
+       -i /Context/TMP -t attr -n name -v escenic/failing-documents-storage-file \
+       -i /Context/TMP -t attr -n value -v $escenic_data_dir/engine/failures.index \
+       -i /Context/TMP -t attr -n type -v java.lang.String \
+       -i /Context/TMP -t attr -n override -v false \
+       -r //TMP -v Environment \
+       $tomcat_base/conf/context.xml
+
+
   elif [ $install_profile_number -eq $PROFILE_ANALYSIS_SERVER ]; then
-    cat >> $tomcat_base/conf/context.xml <<EOF
-  <ResourceLink
-      global="jdbc/eae-logger/logger"
-      name="jdbc/eae-logger/logger"
-      type="javax.sql.DataSource"
-  />
-  <ResourceLink
-      global="jdbc/eae-qs/qs"
-      name="jdbc/eae-qs/qs"
-      type="javax.sql.DataSource"
-  />
-</Context>
-EOF
-  else
-    cat >> $tomcat_base/conf/context.xml <<EOF
-</Context>
-EOF
+    xmlstarlet ed -P -L \
+       -s /Context -t elem -n TMP -v '' \
+       -i /Context/TMP -t attr -n global -v jdbc/eae-logger/logger \
+       -i /Context/TMP -t attr -n name -v jdbc/eae-logger/logger \
+       -i /Context/TMP -t attr -n type -v javax.sql.DataSource \
+       -r //TMP -v ResourceLink \
+       -s /Context -t elem -n TMP -v '' \
+       -i /Context/TMP -t attr -n global -v jdbc/eae-qs/qs \
+       -i /Context/TMP -t attr -n name -v jdbc/eae-qs/qs \
+       -i /Context/TMP -t attr -n type -v javax.sql.DataSource \
+       -r //TMP -v ResourceLink \
+       $tomcat_base/conf/context.xml
   fi
 
   set_up_logging

From cf80ddc6c51a629078f88b13235ce8ce4206e0c2 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 23 May 2013 17:20:28 +0200
Subject: [PATCH 2078/2585] Forgot to close an if statement.

---
 usr/share/escenic/ece-scripts/ece-install.d/app-server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index a4828da3..473d8805 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -396,7 +396,7 @@ EOF
   xmlstarlet ed -P -L \
      -s /Context -t elem -n WatchedResource -v WEB-INF/web.xml \
      $tomcat_base/conf/context.xml
-
+  fi
 
   if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER -a \
     $install_profile_number -ne $PROFILE_SEARCH_SERVER ]; then

From 348175bedf7eebcf62f89eeaece7567b0bdf0adf Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Fri, 24 May 2013 13:43:42 +0200
Subject: [PATCH 2079/2585] Made tomcat not revert the conf directory if a
 tomcat basedir already exists!  Closes #7

---
 usr/share/escenic/ece-scripts/ece-install.d/app-server.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 473d8805..52da8c26 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -140,9 +140,12 @@ function set_up_app_server() {
 
   tomcat_home=${appserver_parent_dir}/tomcat
   tomcat_base=${appserver_parent_dir}/tomcat-${instance_name}
-  make_dir $tomcat_base
 
-  run cp -r ${appserver_parent_dir}/${tomcat_dir}/conf $tomcat_base
+  if [ ! -d $tomcat_base ] ; then
+    make_dir $tomcat_base
+    run cp -r ${appserver_parent_dir}/${tomcat_dir}/conf $tomcat_base
+  fi
+
   for el in bin escenic/lib lib work logs temp webapps; do
     make_dir $tomcat_base/$el
   done

From faef8a931787141e11381a017484cff7f0c40226 Mon Sep 17 00:00:00 2001
From: monzurul <ziku_1984@yahoo.com>
Date: Mon, 27 May 2013 16:40:49 +0600
Subject: [PATCH 2080/2585] Update ece-install-trail

check_mk checks for the number of active TCP connections is too low so, it has been increased.
---
 usr/lib/check_mk_agent/local/ece-install-trail | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/lib/check_mk_agent/local/ece-install-trail b/usr/lib/check_mk_agent/local/ece-install-trail
index 23ab90d8..98a586bd 100755
--- a/usr/lib/check_mk_agent/local/ece-install-trail
+++ b/usr/lib/check_mk_agent/local/ece-install-trail
@@ -11,8 +11,8 @@
 # trail_presentation_port=1234
 # trail_editorial_port=1235
 
-critical=400
-warning=250
+critical=900
+warning=700
 
 function check_trail() {
   for el in /var/lib/ece-install/*.trail ; do

From ef467b6a4f2ae645159fffe9fd25b4b2969b2aee Mon Sep 17 00:00:00 2001
From: Erik Mogensen <erik@mogensoft.net>
Date: Mon, 27 May 2013 22:42:49 +0300
Subject: [PATCH 2081/2585] Update tomcat download URL

Fixes #16 for now ;-)  For future reference, it's possible to override this variable in ece-install.conf:

    fallback_tomcat_url="http://example.org/apache-tomcat-6.0.37.tar.gz"

You can use this to download tomcat 7 instead if you prefer.
---
 usr/share/escenic/ece-scripts/common-os.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index ab515335..beada16b 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -8,7 +8,7 @@
 common_bashing_is_loaded > /dev/null 2>&1 || source $(pwd)/common-bashing.sh
 
 ## Only used if the Tomcat download mirror couldn't be determined
-fallback_tomcat_url="http://apache.komsys.org/tomcat/tomcat-6/v6.0.36/bin/apache-tomcat-6.0.36.tar.gz"
+fallback_tomcat_url="http://apache.komsys.org/tomcat/tomcat-6/v6.0.37/bin/apache-tomcat-6.0.37.tar.gz"
 
 # Can be used like this:
 # common_io_os_loaded 2>/dev/null || source common-os.sh

From 971e31a37aeefcb0162cfb4e5ce592ea371e9d28 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Fri, 31 May 2013 10:48:55 +0200
Subject: [PATCH 2082/2585] Updated Realm to default to use md5 hashed
 passwords, opening up for Digest authentication out-of-the-box.

---
 usr/share/escenic/ece-scripts/ece-install.d/app-server.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 52da8c26..1cd3ce03 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -318,6 +318,7 @@ EOF
              suffix=".log"
              pattern="common"/>
       <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+             digest="md5"
              resourceName="UserDatabase"/>
       <Host name="localhost"
             appBase="webapps"

From c799c7c54ade0b923d7094dd15c81c86f8efec18 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Mon, 3 Jun 2013 10:45:25 +0200
Subject: [PATCH 2083/2585] Made it possible to specify an sql.gz file as the
 file to restore from.

When that happens, ony db restore is supported, obviously. This was added
to make it possible to avoid disk thrashing with tarballs.
---
 .../ece-scripts/ece-install.d/restore-from-backup.sh      | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/restore-from-backup.sh b/usr/share/escenic/ece-scripts/ece-install.d/restore-from-backup.sh
index 215ca8a3..142e2821 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/restore-from-backup.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/restore-from-backup.sh
@@ -146,9 +146,13 @@ function restore_from_backup()
     install_database_server "binaries_only"
     print_and_log "Restoring the database contents on $HOSTNAME ..."
     run cd $dir
-    run tar xf $backup_file --wildcards var/backups/escenic/*.sql.gz
+    if [[ $backup_file == *.sql.gz ]] ; then
+      sql_file=$backup_file
+    else
+      run tar xf $backup_file --wildcards var/backups/escenic/*.sql.gz
         # picking the DB backup file to restore
-    sql_file=$(ls -tra var/backups/escenic/*.sql.gz | tail -1)
+      sql_file=$(ls -tra var/backups/escenic/*.sql.gz | tail -1)
+    fi
     print_and_log "Selecting database dump: $(basename $sql_file)"
 
     # methods in database.sh to set up the database schema & user

From b01bd7895bbe4e342005b2c16baa0708b9466758 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Mon, 3 Jun 2013 10:57:38 +0200
Subject: [PATCH 2084/2585] Made the apt-get update for percona and mariadb
 repositories conditional.

---
 usr/share/escenic/ece-scripts/ece-install.d/database.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 61b805b9..6baf0e45 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -164,7 +164,9 @@ function set_up_repository_if_possible() {
         leave_trail "trail_db_vendor=percona"
       fi
       pin
-      run apt-get update
+      if ! apt-cache > /dev/null show $mysql_server_packages; then
+        run apt-get update
+      fi
     else
       print_and_log "The $db_vendor APT repsository doesn't have packages" \
         "for your Debian (or derivative) version with code" \

From 7700942ee64dddece15606741b8a37c3049a82fa Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Mon, 3 Jun 2013 14:02:08 +0200
Subject: [PATCH 2085/2585] Removed the "Setting up ... repository" if it's
 already set up.

---
 usr/share/escenic/ece-scripts/ece-install.d/database.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 6baf0e45..2ab3b9e2 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -148,7 +148,6 @@ function set_up_repository_if_possible() {
     fi
 
     if is_supported $code_name; then
-      print_and_log "Setting Up the $db_vendor Repository ..."
       add_gpg_key
 
       if [ $db_vendor = "mariadb" ]; then
@@ -165,6 +164,7 @@ function set_up_repository_if_possible() {
       fi
       pin
       if ! apt-cache > /dev/null show $mysql_server_packages; then
+        print_and_log "Setting Up the $db_vendor Repository ..."
         run apt-get update
       fi
     else

From ab51f9e5cf8ccc9f5f3afbed8d329d80a81877be Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Mon, 3 Jun 2013 15:03:40 +0200
Subject: [PATCH 2086/2585] Use fai_environment as environment, if possible

---
 .../escenic/ece-scripts/ece-install.d/content-engine.sh    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 23818e13..df6b0138 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -115,6 +115,13 @@ function install_ece_instance() {
       deploy_webapp_white_list \
       $(get_deploy_white_list) \
       $file
+    if [ ! -z "$fai_environment" ] ; then
+      set_conf_file_value \
+        ece_environment \
+        "$fai_environment" \
+        $file
+      
+    fi
   fi
 
   if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER -a \

From 8141fe1c3bd69b8c5eae84142a5afec31652a1b3 Mon Sep 17 00:00:00 2001
From: Thomas <tvelthoven@vizrt.com>
Date: Sun, 16 Jun 2013 09:04:02 +0300
Subject: [PATCH 2087/2585] Updated the salutation

---
 README | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README b/README
index 059ab03f..b0c813ec 100644
--- a/README
+++ b/README
@@ -45,7 +45,8 @@ Feedback
 Hope you enjoy the ece /usr/bin and intit.d scripts. All feedback,
 come hither!
 
-tkj@vizrt.com
-(From February 2013 Torstein will/has move(d) on and you can send email to thv@vizrt.com untill we do the impossible and find a suitable replacement for Torstein)
+Thomas Velthoven tvelthoven(at)vizrt.com
+
+(The founder of this repo , Torstein, has move(d) on to other challenges)
 
 Commits to this repo will also show in our vosa hipchat room

From d85d45923cb1999e48be8a36444602feeac9efa6 Mon Sep 17 00:00:00 2001
From: Thomas <tvelthoven@vizrt.com>
Date: Sun, 16 Jun 2013 09:36:28 +0300
Subject: [PATCH 2088/2585] added the ece-import guide to the README

---
 README | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README b/README
index b0c813ec..b131d811 100644
--- a/README
+++ b/README
@@ -24,6 +24,11 @@ Features of the /usr/bin/ece script
 ===================================
 https://github.com/vizrt/ece-scripts/blob/master/usr/share/doc/escenic/ece-guide.org
 
+===================================
+Features of the /usr/bin/ece-import script
+===================================
+https://github.com/vizrt/ece-scripts/blob/master/usr/share/doc/escenic/ece-import-guide.org
+
 ============================================
 Features of the /usr/sbin/ece-install script
 ============================================

From 0581a8ebb30147f186855b65228201211c79e6fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Thu, 20 Jun 2013 13:23:10 +0200
Subject: [PATCH 2089/2585] Added support for custom plugins in projects

---
 usr/share/escenic/build-scripts/ece-build | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 1664a718..7a85d5f0 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -372,7 +372,7 @@ function clean_customer_home
 {
   # clean up plugin directory if it exists
   if [ -d "$plugin_dir" ]; then
-    run_wrapper rm -f $plugin_dir/*
+    run_wrapper rm -rf $plugin_dir/*
   else
     make_dir $plugin_dir
   fi
@@ -790,7 +790,14 @@ function symlink_project_assembly
   if [ -e "$project_assembly_target_dir/wars" ]; then
     for f in $(ls -d $project_assembly_target_dir/wars/* | grep .war);
     do
-      ln -s $f $assemblytool_pub_dir;
+      run_wrapper ln -s $f $assemblytool_pub_dir;
+    done
+  fi
+  # custom plugins
+  if [ -e "$project_assembly_target_dir/plugins" ]; then
+    for f in $(ls -d $project_assembly_target_dir/plugins/* | grep .zip);
+    do
+      run_wrapper unzip $f -d $plugin_dir
     done
   fi
 }

From d5d1f6df484af91ca84be33d1e142a88bbb6f9ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Thu, 20 Jun 2013 13:28:29 +0200
Subject: [PATCH 2090/2585] Replaced jar with zip when adding
 escenic-distributions.txt to the .ear

---
 usr/share/escenic/build-scripts/ece-build | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 7a85d5f0..52f67261 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -28,6 +28,7 @@ sed
 ant
 svn
 mvn
+zip
 unzip
 wget
 xml2"
@@ -846,7 +847,7 @@ function add_distributions_to_ear
       fi
     done
     run_wrapper cd $assemblytool_root_dir/dist
-    run_wrapper jar uvf $assemblytool_root_dir/dist/engine.ear META-INF/escenic-distributions.txt
+    run_wrapper zip -u $assemblytool_root_dir/dist/engine.ear META-INF/escenic-distributions.txt
   else
     print_and_log "Assemblytool finished, but the .ear is missing, exiting!"
     exit 1

From 9dba9934b9c76c16bd675c038f4bbdaf2a312e90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Thu, 20 Jun 2013 20:03:34 +0200
Subject: [PATCH 2091/2585] ece-build - permission on releases directory is now
 set to 775 upon creation

---
 usr/share/escenic/build-scripts/ece-build | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 52f67261..1ee8141a 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -364,6 +364,7 @@ function verify_assemblytool
   fi
   if [ ! -d $release_dir ]; then
     make_dir $release_dir
+    run_wrapper chmod 775 $release_dir
     print_and_log "$release_dir did not exist so it has been created."
   fi
 }

From 8de5209c7436bd4ccff4ab872ccc9e0576d0200b Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Wed, 26 Jun 2013 10:29:00 +0200
Subject: [PATCH 2092/2585] Added postinstall hook to run sdp bootstrapper.

---
 .../run-sdp-bootstrapper.sh                   | 164 ++++++++++++++++++
 1 file changed, 164 insertions(+)
 create mode 100755 usr/share/vizrt/vosa/post-install-hooks/run-sdp-bootstrapper.sh

diff --git a/usr/share/vizrt/vosa/post-install-hooks/run-sdp-bootstrapper.sh b/usr/share/vizrt/vosa/post-install-hooks/run-sdp-bootstrapper.sh
new file mode 100755
index 00000000..c0e4b360
--- /dev/null
+++ b/usr/share/vizrt/vosa/post-install-hooks/run-sdp-bootstrapper.sh
@@ -0,0 +1,164 @@
+#!/bin/bash -e
+
+# arguments $1 -- /etc/vizrt/vosa/available.d/imagename
+# arguments $2 -- /var/lib/vizrt/vosa/images/imagename
+
+# mandatory sdp.conf parameter
+#  REALM
+
+# "old style" sdp.conf parameters (going away in the autom 2013)
+#  ROLE        corresponds to sdp-bootstrap-instance --role
+#  PROFILE     corresponds to sdp-bootstrap-instance --profile
+#  NAME        corresponds to sdp-bootstrap-instance --name
+
+# "new style" being introduced later summer 2013
+#  ENVIRONMENT corresponds to sdp-bootstrap-instance --environment
+#  CLUSTER     corresponds to sdp-bootstrap-instance --cluster
+#  MACHINE     corresponds to sdp-bootstrap-instance --machine
+
+
+conf=$1
+data=$2
+# This hook Expects sdp.xml to be present in $conf/
+
+# Seed the image with sdp.xml
+source $1/sdp.conf
+
+
+if [ -z "$REALM" ] ; then
+  echo "realm is not set in $1/sdp.conf. It should be development or production."
+  exit 1
+fi
+
+guest="ssh -F $2/ssh.conf root@guest"
+
+if $guest [ -d /etc/apt/sources.list.d ] ; then
+  $guest tee /etc/apt/sources.list.d/vizrt.list <<EOF
+deb http://apt.vizrt.com/ unstable main non-free
+deb http://apt.vizrt.com/ lean main non-free
+EOF
+
+  $guest tee /etc/apt/preferences.d/30prefer-vizrt-lean-packages <<EOF
+Package: *
+Pin-Priority: 600
+Pin: release a=lean
+EOF
+
+  $guest apt-key add - <<EOF
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+mQENBFB33KEBCACrGwM6J1aCgSfGZvHuxFJ6a4LebpzgSrg+jAQDXSiyWp7aBDpX
+80TCEFWPl5Wps9ARXdF2ciFdYfpmcA9wxErmyLemQ9c+2oKfsGAb0R4b0tRLCL3k
+vK7cf4z2+2CD37ptOSFLlKz5cTAOv4gJIzbL/XDwCxWw720LMz8vzfq4+MtfesZ4
+zTiq5tkA6UxTBWv/eUpLc1we+0P1I5Bm6Q0STydNNul7UuKvoArTfEkS8kV82qVA
+WGF5IH0EukeVZOoojyq5xoiNQyX1pRhfzWmfv9gPr0wXD9drSnTAUIhPVwdNqKeC
+Gb6HChp4cszpCDnd+QqdvegL4nmUBjeyxqALABEBAAG0J1ZpenJ0IE9ubGluZSA8
+c3VwcG9ydC5vbmxpbmVAdml6cnQuY29tPokBOAQTAQIAIgUCUHfcoQIbAwYLCQgH
+AwIGFQgCCQoLBBYCAwECHgECF4AACgkQaNLae4JnuP01+Qf8CFMDnVR26gqqJ7rJ
+d5gc4SMhCVzVVh6qUB90VwJgRqQm3wHEyaJWDHIxxmysNZQCK9MZJ48MkO6jsvxH
+9zNo7wM6NCaNdZs9OM6QlsLTjD/SxlMXbJ3cmi49jUvhV6W0T6cCCKCboSY5GMB/
+ReUjR0B9emjphevctYgl+F7gYTEFGePI3stSuKi2XZ0/TSTJz+zCYonAfFWIOPVa
+TS2o3tdJfysAzqfhlMNhlMPwhdwNzRFwW5M8q51Xw2xrKL6jEygtokusg9bV/eu+
+F+PD2PzksFyH0WDXow+hNuUe8Z9wfveh0N3CWJiESrm6KSfkattBtFYSbR94rFgL
+kahPF7kBDQRQd9yhAQgAsuga6GnvDlsK/fh7dv2zvwqWDN6z5yc2YRV8CY7dlGyR
+Q+C0f3BQ6g8fOO7pARYEVPPDdLL3UPtLpFGnw4aljwb/6h2KBUWTfsnVLKb7N6v5
+BWnUyuI23i0H5JtFGsskvPa4TCKmJBBvXwoBuwfxgyPy4QvRo+3XZCXabY1SQjhk
+hwpJg06TA7+L/je5jNA5VPmMSjCMuIPyL9VEVCt0dK8eTVoojKjjxWnfM0LxxmJD
+0jbzuuOiuuEG0P1yCLRZXu76J+eNua1kIz++n17Kg+kYRoYqWXMZUCZtWtjypyzK
+GCKTYdf16BAlrvE+RkbRiKs7apl40Roml2tUIOMjYQARAQABiQEfBBgBAgAJBQJQ
+d9yhAhsMAAoJEGjS2nuCZ7j9w9cH/R/9wMHy7OoRZsFUbiY2/AFJ9EH8j4akntfR
+O1gA3GHy+ECiHAfjgZce5FjUKpWlDblDCSVHmy3bWQxmVEcVmq+XVIxxXfC1dHnu
+zniOmUu+kNY747KxXxLd3Tn2Oez9XtTj1RVnLlRTLbIN3Q59e2o60RKG6SKG5fd2
+cHcyyxMCLjQgcSqDgwV2UIoV0CaVrrKx6YWOV1mz13OFVA0UJ++5ZY7INMgJImvg
+XeJVJ9CO0rBGbLjPqXw3UzGdGb862SgIOLBXKnoDYN9E4XIz2pMau/O5OqAMss6H
++Ta/zziJw0Den8GrZbIrxJ4zbGG0lapP2vZB44NMJF0qYQH84Yg=
+=yGzl
+-----END PGP PUBLIC KEY BLOCK-----
+EOF
+
+
+$guest apt-get update \
+    -o Dir::Etc::sourcelist="sources.list.d/vizrt.list" \
+    -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0"
+
+$guest apt-get --yes install \
+   escenic-common-scripts \
+   vosa-sdp-bootstrapper \
+   xml2 \
+   python-pip \
+   haveged
+
+fi
+
+
+
+# Centos below this line
+
+if $guest [ -d /etc/yum.repos.d ] ; then
+  $guest tee /etc/yum.repos.d/vizrt.repo <<EOF
+[Vizrt]
+name=Vizrt packages
+baseurl=http://yum.vizrt.com/rpm/
+gpgcheck=0
+EOF
+
+   
+
+  $guest rpm -ivh ftp://ftp.pbone.net/mirror/archive.fedoraproject.org/fedora/linux/updates/14/x86_64/xml2-0.5-1.fc14.x86_64.rpm
+
+  $guest yum -y install \
+   escenic-common-scripts \
+   vosa-sdp-bootstrapper \
+   python-pip \
+   perl-JSON-XS \
+   perl-YAML \
+   haveged
+
+  # Centos comes with an old version of distribute, needed for
+  # installation of jsonpipe. Upgrading it.
+  $guest easy_install -U distribute
+  $guest pip install jsonpipe
+
+fi
+
+# Install pystache (mandatory for vosa-sdp-bootstrapper)
+$guest pip install pystache
+
+
+# ask the instance to bootstrap itself.
+$guest sdp-bootstrap-instance \
+   --state preparation \
+   --verbose \
+   --run-module baseline \
+   --run-module restore-backup || exit $?
+
+echo "System has been prepared."
+
+if [ ! -r $conf/sdp.xml ] ; then
+  echo "No sdp.xml file in $conf so I can't continue."
+  exit 0 
+fi
+
+$guest tee /etc/sdp.xml < $1/sdp.xml
+
+
+# copy private key from host to guest, if present
+if [ -r $1/secret-gpg-key.asc ] ; then
+  $guest gpg --import < $1/secret-gpg-key.asc
+# TODO else create a new private key.
+fi
+
+
+$guest sdp-bootstrap-instance \
+     --state activation \
+     --sdp-file /etc/sdp.xml \
+     ${ROLE+--role $ROLE} \
+     ${REALM+--realm $REALM} \
+     ${PROFILE+--profile $PROFILE} \
+     ${NAME+--name $NAME} \
+     --run-module baseline \
+     --run-module restore-backup \
+     --run-module "backup-set-escenic-database" \
+     --run-module "backup-set-escenic-multimedia" \
+     --verbose

From 691ed7436682bdf83e6af8ee1ceedcee5966ca9b Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Wed, 26 Jun 2013 11:29:42 +0200
Subject: [PATCH 2093/2585] Added ability to replace the sdp bootstrapper code
 from a source tarball instead.

Suppressed sdp.xml output.
---
 .../run-sdp-bootstrapper.sh                   | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/usr/share/vizrt/vosa/post-install-hooks/run-sdp-bootstrapper.sh b/usr/share/vizrt/vosa/post-install-hooks/run-sdp-bootstrapper.sh
index c0e4b360..e6954564 100755
--- a/usr/share/vizrt/vosa/post-install-hooks/run-sdp-bootstrapper.sh
+++ b/usr/share/vizrt/vosa/post-install-hooks/run-sdp-bootstrapper.sh
@@ -4,7 +4,13 @@
 # arguments $2 -- /var/lib/vizrt/vosa/images/imagename
 
 # mandatory sdp.conf parameter
-#  REALM
+#  REALM=development
+
+# optional sdp.conf parameter (default shown below)
+SDP_BOOTSTRAPPER=
+
+# if SDP_BOOTSTRAPPER is set to anything, it is assumed to be the URL
+# from which to download a source tar.gz file.
 
 # "old style" sdp.conf parameters (going away in the autom 2013)
 #  ROLE        corresponds to sdp-bootstrap-instance --role
@@ -125,6 +131,18 @@ fi
 # Install pystache (mandatory for vosa-sdp-bootstrapper)
 $guest pip install pystache
 
+# experimental: remove the vosa-sdp-bootstrapper, then download a
+# source package and use that instead.
+if [ ! -z "${SDP_BOOTSTRAPPER}" ] ; then
+  if $guest [ -d /etc/yum.repos.d ] ; then
+    $guest yum -y remove vosa-sdp-bootstrapper
+  else
+    $guest apt-get -y remove vosa-sdp-bootstrapper
+  fi
+  tmpdir=$($guest mktemp -d)
+  curl -s $SDP_BOOTSTRAPPER | $guest tar xz -C $tmpdir
+  $guest cp -rp $tmpdir/*/usr /
+fi
 
 # ask the instance to bootstrap itself.
 $guest sdp-bootstrap-instance \
@@ -140,7 +158,7 @@ if [ ! -r $conf/sdp.xml ] ; then
   exit 0 
 fi
 
-$guest tee /etc/sdp.xml < $1/sdp.xml
+$guest tee /etc/sdp.xml < $1/sdp.xml > /dev/null
 
 
 # copy private key from host to guest, if present

From c921f83c417d48674b79c683d5378ba85da8eb0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Fri, 28 Jun 2013 19:19:59 +0200
Subject: [PATCH 2094/2585] ece-build - fixed typo in maven coordinate for
 community-engine

---
 usr/share/escenic/build-scripts/ece-build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 1ee8141a..75ca79a6 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -78,7 +78,7 @@ declare -A maven_coordinates=(
 ["section-feed"]="com.escenic.plugins.section-feed:section-feed-dist:zip"
 ["semantic-cxense"]="com.escenic.plugins.semantic:semantic-cxense-dist:zip"
 ["snapshot"]="com.escenic.plugins.snapshot:snapshot-dist:zip"
-["community-engine"]="com.escenic.plugins.community-engine:community-engine:zip"
+["community-engine"]="com.escenic.plugins.community:community-engine:zip"
 ["online-graphics"]="com.escenic.plugins.online-graphics:online-graphics:zip"
 ["video"]="com.escenic.plugins.video:video:zip"
 ["xml-editor"]="com.escenic.plugins.xml-editor:xml-editor-dist:zip"

From d5e93e9d9190323891c309464003b3b00ce3e70c Mon Sep 17 00:00:00 2001
From: harala <harala@gmail.com>
Date: Tue, 23 Jul 2013 09:48:30 +0200
Subject: [PATCH 2095/2585] VIZRTSAAS-189: Removed validity test that fails on
 some platforms or versions of the xml_grep script

xml_grep --cond /escenic /tmp/cision2.xml|wc -l can return up to 19 lines from a valid XML document (version perl-XML-Twig-3.39-2.fc17.noarch)
---
 usr/share/escenic/ece-scripts/common-ece.sh | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/common-ece.sh b/usr/share/escenic/ece-scripts/common-ece.sh
index 69fe74ea..c4463f94 100644
--- a/usr/share/escenic/ece-scripts/common-ece.sh
+++ b/usr/share/escenic/ece-scripts/common-ece.sh
@@ -153,14 +153,5 @@ function is_escenic_xml_ok() {
     return
   fi
 
-  # check for an <escenic/> root element
-  local element_count=$(
-    xml_grep --cond /escenic $1 | wc -l 2>/dev/null
-  )
-  if [ $element_count -gt 0 ]; then
-    echo 1
-    return
-  fi
-
   echo 0
 }

From 3e54b40167bc375af2d983aabaf46ec464b6861a Mon Sep 17 00:00:00 2001
From: harala <harala@gmail.com>
Date: Tue, 23 Jul 2013 14:57:05 +0200
Subject: [PATCH 2096/2585] VIZRTSAAS-200: Fixed spelling error, passing the
 function parameter instead of the global variable $f

---
 usr/bin/ece-import | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/bin/ece-import b/usr/bin/ece-import
index 84470be5..ad594308 100755
--- a/usr/bin/ece-import
+++ b/usr/bin/ece-import
@@ -232,7 +232,7 @@ function perform_transformations() {
         return
       fi
     elif [[ "$el" == *".py" ]]; then
-      python $el $f >> $log 2>> $log
+      python $el $1 >> $log 2>> $log
       if [ $? -gt 0 ]; then
         handle_transformation_error $el $1
         return

From b9c9d1eb78061c542360b70e1a689b6073bfc158 Mon Sep 17 00:00:00 2001
From: Thomas <tvelthoven@vizrt.com>
Date: Fri, 2 Aug 2013 10:24:31 +0200
Subject: [PATCH 2097/2585] adding a first draft on how to add jar files to
 your project

---
 usr/share/doc/vizrt/vosa-handbook/jarfiles.org | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 usr/share/doc/vizrt/vosa-handbook/jarfiles.org

diff --git a/usr/share/doc/vizrt/vosa-handbook/jarfiles.org b/usr/share/doc/vizrt/vosa-handbook/jarfiles.org
new file mode 100644
index 00000000..556b571f
--- /dev/null
+++ b/usr/share/doc/vizrt/vosa-handbook/jarfiles.org
@@ -0,0 +1,16 @@
+* How to add jar files to your project
+First of all there's a pre-requisite for jar files you want to add to a publication .war or to escenic/lib/ and that is that the jar file has to be part of the overall project build. For your own jars this means they need to have a module under i.e. libraries, which is the case for your newsletter plugin, and for third party jars they have to be listed as a dependency.
+ 
+** Case 1 - add a jar file to a publication .war
+ 
+- if you add a dependency, with scope compile or no scope, to the pom.xml of publication x the dependency will go into x.war
+ 
+- if you add a dependency, with scope compile or no scope, to the pom.xml of shared-war the the dependency will go into all .war files depending on shared-war
+ 
+** Case 2 - add my own jar to escenic/lib/
+ 
+- open project-assembly/src/main/assembly/assembly.xml and locate the include statements for jar files, i.e <include>*:some-module-name:jar</include>. if you add another line with the name of your jar, i.e. <include>*:expatliving-newsletter-plugin:jar</include> in both places then the next build on the SaaS builder will include your jar in the .ear file and it will be deployed to escenic/lib when you ece-deploy the .ear file. 
+ 
+** Case 3 - add third-party jars to escenic/lib/
+ 
+- make sure the third-party jar you want to add is present in your project as a dependency with scope provided!!! open project-assembly/src/main/assembly/assembly.xml and locate the include statements for jar files, i.e <include>*:some-module-name:jar</include>. if you add another line with the name of your third-party jar, i.e. <include>*:xmlrpc-server:jar</include> in both places then the next build on the SaaS builder will include your jar in the .ear file and it will be deployed to escenic/lib when you ece-deploy the .ear file.

From 0e6c94520d5f8fae3b5fbddf3799cfb7490d2b4f Mon Sep 17 00:00:00 2001
From: Thomas <tvelthoven@vizrt.com>
Date: Fri, 2 Aug 2013 10:25:38 +0200
Subject: [PATCH 2098/2585] adding jarfiles.org

---
 usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
index d3a12210..b057cfa7 100644
--- a/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
+++ b/usr/share/doc/vizrt/vosa-handbook/vosa-handbook.org
@@ -22,4 +22,5 @@
 #+INCLUDE: "privatekeys.org"
 #+INCLUDE: "host-naming.org"
 #+INCLUDE: "development-process.org"
+#+INCLUDE: "jarfiles.org"
 #+INCLUDE: "amazon.org"

From efda3761e167f228dd52a7cbc3cabdcc04782a7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Tue, 6 Aug 2013 09:41:53 +0200
Subject: [PATCH 2099/2585] vosa-handbook - minor adjustments to jarfiles.org

---
 usr/share/doc/vizrt/vosa-handbook/jarfiles.org | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/jarfiles.org b/usr/share/doc/vizrt/vosa-handbook/jarfiles.org
index 556b571f..e9771c71 100644
--- a/usr/share/doc/vizrt/vosa-handbook/jarfiles.org
+++ b/usr/share/doc/vizrt/vosa-handbook/jarfiles.org
@@ -1,16 +1,17 @@
 * How to add jar files to your project
-First of all there's a pre-requisite for jar files you want to add to a publication .war or to escenic/lib/ and that is that the jar file has to be part of the overall project build. For your own jars this means they need to have a module under i.e. libraries, which is the case for your newsletter plugin, and for third party jars they have to be listed as a dependency.
+
+First of all there is a pre-requisite for all types of jar files you want to add to a publication .war file or to the escenic/lib/ folder which requires the jar file to be part of the overall project build. For jar built within your project this means they need to have a module under i.e. libraries, which is the setup used most frequently, and for third party jars they have to be listed as a dependency.
  
-** Case 1 - add a jar file to a publication .war
+** Case I - how to add a jar file to a publication .war
  
-- if you add a dependency, with scope compile or no scope, to the pom.xml of publication x the dependency will go into x.war
+- if you add a jar dependency, with scope compile or no scope at all, to the pom.xml of the publication x module the jar file will go into x.war
  
-- if you add a dependency, with scope compile or no scope, to the pom.xml of shared-war the the dependency will go into all .war files depending on shared-war
+- if you add a jar dependency, with scope compile or no scope at all, to the pom.xml of the shared-war module the jar file will go into all .war files depending on shared-war
  
-** Case 2 - add my own jar to escenic/lib/
+** Case II - how to add a jar built in the project to escenic/lib/
  
-- open project-assembly/src/main/assembly/assembly.xml and locate the include statements for jar files, i.e <include>*:some-module-name:jar</include>. if you add another line with the name of your jar, i.e. <include>*:expatliving-newsletter-plugin:jar</include> in both places then the next build on the SaaS builder will include your jar in the .ear file and it will be deployed to escenic/lib when you ece-deploy the .ear file. 
+- open project-assembly/src/main/assembly/assembly.xml and locate the include statements for jar files, i.e <include>*:some-module-name:jar</include>. If you add another line with the name of your jar, i.e. <include>*:my-new-plugin:jar</include>, in both places, then the next build on the SaaS builder will include your jar in the .ear file and it will be deployed to escenic/lib when you ece-deploy the .ear file. 
  
-** Case 3 - add third-party jars to escenic/lib/
+** Case III - how to add third-party jars to escenic/lib/
  
-- make sure the third-party jar you want to add is present in your project as a dependency with scope provided!!! open project-assembly/src/main/assembly/assembly.xml and locate the include statements for jar files, i.e <include>*:some-module-name:jar</include>. if you add another line with the name of your third-party jar, i.e. <include>*:xmlrpc-server:jar</include> in both places then the next build on the SaaS builder will include your jar in the .ear file and it will be deployed to escenic/lib when you ece-deploy the .ear file.
+- make sure the third-party jar you want to add is present in your project as a dependency with scope provided!!! Open project-assembly/src/main/assembly/assembly.xml and locate the include statements for jar files, i.e <include>*:some-module-name:jar</include>. If you add another line with the name of your third-party jar, i.e. <include>*:xmlrpc-server:jar</include>, in both places, then the next build on the SaaS builder will include your jar in the .ear file and it will be deployed to escenic/lib when you ece-deploy the .ear file.

From 1e975bea9801b6e536e525844d50c41961658198 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Tue, 6 Aug 2013 12:33:57 +0200
Subject: [PATCH 2100/2585] ece-build - implemented git support

---
 usr/share/escenic/build-scripts/ece-build | 96 ++++++++++++++++-------
 1 file changed, 66 insertions(+), 30 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 75ca79a6..040aa3ec 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -26,6 +26,7 @@ java_7_oracle=/usr/lib/jvm/java-7-oracle
 dependencies="tar
 sed
 ant
+git
 svn
 mvn
 zip
@@ -106,8 +107,8 @@ assemblytool_lib_dir=$assemblytool_root_dir/lib
 # user specific variables
 conf_file=~/.build/build.conf
 maven_conf_file=~/.m2/settings.xml
-svn_src_dir=~/src
-project_assembly_dir=$svn_src_dir/project-assembly
+project_src_dir=~/src
+project_assembly_dir=$project_src_dir/project-assembly
 project_assembly_target_dir=$project_assembly_dir/target
 release_dir=~/releases
 plugin_dir=~/plugins
@@ -210,11 +211,23 @@ function fetch_configuration
 ##
 function verify_configuration {
   enforce_variable customer "Your $conf_file is missing the variable 'customer', exiting!"
-  enforce_variable svn_base "Your $conf_file is missing the variable 'svn_base', exiting!"
-  enforce_variable svn_user "Your $conf_file is missing the variable 'svn_base', exiting!"
-  enforce_variable svn_password "Your $conf_file is missing the variable 'svn_password', exiting!"
-  # append a / to svn_base if not present
-  [[ $svn_base != */ ]] && svn_base="$svn_base"/
+  if [ -z $src_control ]; then
+    log "No source control system chosen, I will assume that you are using subversion."
+    src_control=svn
+    
+    enforce_variable svn_base "Your $conf_file is missing the variable 'svn_base', exiting!"
+    enforce_variable svn_user "Your $conf_file is missing the variable 'svn_base', exiting!"
+    enforce_variable svn_password "Your $conf_file is missing the variable 'svn_password', exiting!"
+    
+    # append a / to svn_base if not present
+    [[ $svn_base != */ ]] && svn_base="$svn_base"/
+  elif [[ "$src_control" = "git" ]]; then
+    enforce_variable git_base "Your $conf_file is missing the variable 'git_base', exiting!"
+    enforce_variable git_user "Your $conf_file is missing the variable 'git_base', exiting!"
+    enforce_variable git_password "Your $conf_file is missing the variable 'git_password', exiting!"  
+  else
+    print_and_log "The chosen source control system $src_control is NOT supported, exiting!"
+  fi
 }
 
 ##
@@ -384,11 +397,11 @@ function clean_customer_home
     run_wrapper rm -f $engine_root_dir
   fi
 
-  # drop and recreate svn src directory if it exists
-  if [ -d "$svn_src_dir" ]; then
-    run_wrapper rm -rf $svn_src_dir
+  # drop and recreate project src directory if it exists
+  if [ -d "$project_src_dir" ]; then
+    run_wrapper rm -rf $project_src_dir
   else
-    make_dir $svn_src_dir
+    make_dir $project_src_dir
   fi
 }
 
@@ -421,13 +434,28 @@ function svn_fail_early
     release_label=$svn_path
     log "No svn path chosen, will use 'trunk'."
   fi
-  run_wrapper svn checkout --quiet --non-interactive --depth empty --username $svn_user  --password $svn_password $svn_base$svn_path $svn_src_dir/.
+  run_wrapper svn checkout --quiet --non-interactive --depth empty --username $svn_user  --password $svn_password $svn_base$svn_path $project_src_dir/.
 }
 
 ##
-function svn_verify_assembly
+function git_checkout
 {
-  run_wrapper svn update --quiet --non-interactive --set-depth infinity $svn_src_dir/pom.xml $svn_src_dir/project-assembly 
+  run_wrapper git clone https://$git_user:$git_password@$git_base $project_src_dir
+  cd $project_src_dir
+  revision=`git describe --always`
+  release_label=git
+  if [[ $revision = "" ]]; then
+    print_and_log "Failed to fetch current revision number, exiting!"
+    exit 1
+  fi
+}
+
+##
+function project_verify_assembly
+{
+  if [[ "$src_control" = "svn" ]]; then
+    run_wrapper svn update --quiet --non-interactive --set-depth infinity $project_src_dir/pom.xml $project_src_dir/project-assembly 
+  fi
   if [ ! -d $project_assembly_dir ]; then
     print_and_log "Your project does not contain the project-assembly module and is thereby not certified to use the ece-builder, exiting!"
     exit 1
@@ -440,8 +468,8 @@ function svn_verify_assembly
 ##
 function retrieve_project_pom_versions
 {
-  if [ -e $svn_src_dir/pom.xml ];then
-    project_pom_versions=`xml2 < $svn_src_dir/pom.xml | grep '^/project/properties/escenic\.' | sed -n -e 's,.*properties/escenic\.,,' -e 's,\.version,,p'`
+  if [ -e $project_src_dir/pom.xml ];then
+    project_pom_versions=`xml2 < $project_src_dir/pom.xml | grep '^/project/properties/escenic\.' | sed -n -e 's,.*properties/escenic\.,,' -e 's,\.version,,p'`
     for f in $project_pom_versions; do
       for g in $escenic_identifiers; do
         if [[ $f == $g=* ]]; then
@@ -509,7 +537,7 @@ function mvn_coordinate_to_url
 ##
 function set_java_home
 {
-  project_java_version=`xml2 < $svn_src_dir/pom.xml | grep '^/project/build/plugins/plugin/configuration/target=' | sed -n -e 's,.*project/build/plugins/plugin/configuration/target=,,p'`
+  project_java_version=`xml2 < $project_src_dir/pom.xml | grep '^/project/build/plugins/plugin/configuration/target=' | sed -n -e 's,.*project/build/plugins/plugin/configuration/target=,,p'`
   if [ -z $project_java_version ]; then
     print_and_log "You need to specify the java taget version for the maven-compiler-plugin in your pom.xml as this is used by this script to determine which java to use, exiting!"
     exit 1
@@ -545,7 +573,7 @@ function fetch_distributions
   do
 
     # try and fetch the version for the distribution from the pom.xml
-    local dist_version=`sed "/<escenic.$f.version>/!d;s/ *<\/\?escenic.$f.version> *//g" $svn_src_dir/pom.xml | tr -d $'\r' `
+    local dist_version=`sed "/<escenic.$f.version>/!d;s/ *<\/\?escenic.$f.version> *//g" $project_src_dir/pom.xml | tr -d $'\r' `
     
     # check if a version was returned from the pom.xml
     if [[ ! $dist_version = "" ]]; then
@@ -679,7 +707,7 @@ function symlink_ece_components
 {
   for f in $escenic_identifiers
   do
-    version=`sed "/<escenic.$f.version>/!d;s/ *<\/\?escenic.$f.version> *//g" $svn_src_dir/pom.xml | tr -d $'\r' `
+    version=`sed "/<escenic.$f.version>/!d;s/ *<\/\?escenic.$f.version> *//g" $project_src_dir/pom.xml | tr -d $'\r' `
     if [[ ! $version = "" ]]; then
       if [[ "$f" = "engine" ]]; then
         run_wrapper ln -s $dists_root_dir/$f-$version $engine_root_dir 
@@ -761,8 +789,8 @@ function verify_maven_proxy
 ## 
 function svn_checkout
 {
-  run_wrapper svn checkout --quiet --non-interactive --depth infinity --username $svn_user --password $svn_password $svn_base$svn_path $svn_src_dir/.
-  revision=`svn info $svn_src_dir | grep -i Revision | awk '{print $2}'`
+  run_wrapper svn checkout --quiet --non-interactive --depth infinity --username $svn_user --password $svn_password $svn_base$svn_path $project_src_dir/.
+  revision=`svn info $project_src_dir | grep -i Revision | awk '{print $2}'`
   if [[ $revision = "" ]]; then
     print_and_log "Failed to fetch current revision number, exiting!"
     exit 1
@@ -772,7 +800,7 @@ function svn_checkout
 ##
 function maven_build
 {
-  run_wrapper cd $svn_src_dir
+  run_wrapper cd $project_src_dir
   run_wrapper mvn -q $maven_opts
 }
 
@@ -840,7 +868,7 @@ function add_distributions_to_ear
     for f in $escenic_identifiers
     do
       # try and fetch the version for the distribution from the pom.xml
-      local dist_version=`sed "/<escenic.$f.version>/!d;s/ *<\/\?escenic.$f.version> *//g" $svn_src_dir/pom.xml | tr -d $'\r' `
+      local dist_version=`sed "/<escenic.$f.version>/!d;s/ *<\/\?escenic.$f.version> *//g" $project_src_dir/pom.xml | tr -d $'\r' `
 
       # check if a version was returned from the pom.xml
       if [[ ! $dist_version = "" ]]; then
@@ -883,13 +911,15 @@ function publish_ear
 ##
 ## If <project>/server-admin doesn't exist, the method simply returns.
 function create_machine_conf_packages() {
-  local conf_dir=$svn_src_dir/server-admin
+  local conf_dir=$project_src_dir/server-admin
   
   if [ ! -d $conf_dir ]; then
     return
   fi
 
-  generate_new_changelog
+  if [[ "$src_control" = svn ]]; then
+    generate_new_changelog
+  fi
 
   local machine_list=$(
     find $conf_dir -maxdepth 1 -type d | \
@@ -922,7 +952,7 @@ function create_machine_conf_packages() {
     find $target_dir -name .svn -type d | xargs rm -rf
 
     # add the truth
-    local file=$svn_src_dir/doc/vosa-handbook/create-handbook.conf
+    local file=$project_src_dir/doc/vosa-handbook/create-handbook.conf
     if [ -e $file ]; then
       local dir=$target_dir/etc/vizrt
       run_wrapper mkdir -p $dir
@@ -1005,7 +1035,7 @@ EOF
 function generate_new_changelog() {
   print_and_log "Generating change log for revision $revision" ...
   (
-    cd ${svn_src_dir}
+    cd ${project_src_dir}
     local previous_revision=PREV
     previous_revision=$(
       ls $release_dir/vosa-conf-*-${release_label}-*.deb 2>/dev/null | \
@@ -1124,8 +1154,12 @@ function phase_clean_up
 ##
 function phase_verify_project
 {
-  svn_fail_early
-  svn_verify_assembly
+  if [[ "$src_control" = "git" ]]; then
+    git_checkout
+  else
+    svn_fail_early
+  fi
+  project_verify_assembly
   retrieve_project_pom_versions
   print_unstable_distributions
   set_java_home
@@ -1141,7 +1175,9 @@ function phase_verify_project
 ##
 function phase_release
 {
-  svn_checkout
+  if [[ "$src_control" = "svn" ]]; then
+    svn_checkout
+  fi
   if [ $skip_ear -eq 0 ]; then
     maven_build
     symlink_project_assembly

From be8789900d0f33d0fc194f9396b00db6364187c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Tue, 6 Aug 2013 14:36:23 +0200
Subject: [PATCH 2101/2585] ece-build - conf package urls are now listed

---
 usr/share/escenic/build-scripts/ece-build | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 040aa3ec..f9c405f0 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -1025,10 +1025,14 @@ EOF
     run_wrapper rm -rf $target_dir
   done
 
-  print_and_log "Configuration packages available here: " \
-    "http://builder.vizrtsaas.com/$customer/releases/vosa-conf-\${HOSTNAME}-${package_version}.deb"
-  print_and_log "Replace '\${HOSTNAME}' with any of: [" \
-    $machine_list "] for the other machines' conf packages."
+  print_and_log "--- .deb configuration packages ---"  
+  for machine in $machine_list; do 
+    print_and_log "http://builder.vizrtsaas.com/$customer/releases/vosa-conf-${machine}-${package_version}.deb"
+  done
+  print_and_log "--- .rpm configuration packages ---"
+  for machine in $machine_list; do
+    print_and_log "http://builder.vizrtsaas.com/$customer/releases/vosa-conf-${machine}-1_${customer}_${release_label}-r${revision}.noarch.rpm"
+  done
 }
 
 ##

From aa71e6e361d407531bede9ce1b2b27a9ffdb79c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Tue, 6 Aug 2013 14:38:59 +0200
Subject: [PATCH 2102/2585] ece-build - removed patch for engine 5.3
 engine-backport-1.0-SNAPSHOT.jar

---
 usr/share/escenic/build-scripts/ece-build | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index f9c405f0..ab32a1af 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -414,15 +414,6 @@ function add_global_libs
     print_and_log "The global library $builder_root_dir/lib/java_memcached-release_2.0.1.jar is missing, exiting!"
     exit 1
   fi
-  local engine_version=`readlink $engine_root_dir`
-  if [ $(echo "$engine_version" | grep "engine-5.3" | wc -l) -gt 0 ]; then
-    if [ -e $builder_root_dir/lib/engine-backport-1.0-SNAPSHOT.jar ]; then
-      run_wrapper ln -s $builder_root_dir/lib/engine-backport-1.0-SNAPSHOT.jar $assemblytool_lib_dir/
-    else
-      print_and_log "The global library $builder_root_dir/lib/engine-backport-1.0-SNAPSHOT.jar is missing, exiting!"
-      exit 1
-    fi
-  fi
 }
 
 

From 3836a49ee01d9ad9fe7a8b820c8f35b9d049af73 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Mon, 15 Jul 2013 09:31:25 +0200
Subject: [PATCH 2103/2585] Made dpkg-deb call use fakeroot to ensure we stop
 stray userids from leaking.

---
 usr/share/escenic/package-scripts/create-conf-packages | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/package-scripts/create-conf-packages b/usr/share/escenic/package-scripts/create-conf-packages
index a636013d..0768d3de 100755
--- a/usr/share/escenic/package-scripts/create-conf-packages
+++ b/usr/share/escenic/package-scripts/create-conf-packages
@@ -115,8 +115,12 @@ EOF
     echo "You must have dpkg-deb installed :-("
     exit 1
   fi
+  if [ ! -x /usr/bin/fakeroot ]; then
+    echo "You must have fakeroot installed :-("
+    exit 1
+  fi
 
-  dpkg-deb --build $conf_package_build_dir 2>&1 > /dev/null
+  fakeroot dpkg-deb --build $conf_package_build_dir 2>&1 > /dev/null
   mv ${conf_package_build_dir}.deb \
     $conf_package_build_dir/${package_name}-${package_version}.deb
   

From 184f4bd005f1bc1aff409c986566c1e36ab135e5 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Mon, 15 Jul 2013 11:57:06 +0200
Subject: [PATCH 2104/2585] Made it possible (indeed recommended) to use AWS
 access keys instead of deprecated signing keys.  Also switched to the much
 quicker python AWS CLI instead of the Java based CLI.

---
 usr/bin/vosa                                  | 179 ++++++++----------
 .../vizrt/vosa/commands/amazon_config_parser  |   8 +
 usr/share/vizrt/vosa/commands/ec2-cmd.sh      |  53 +++++-
 .../vizrt/vosa/commands/ec2-determine-ip.sh   |  22 ++-
 4 files changed, 154 insertions(+), 108 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index b2d3f621..12b92ff2 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 
 # /usr/bin/vosa --- command to manage vizrt on-line system-administration
 # managed instances of virtual machines.
@@ -255,25 +255,17 @@ EOF
 # will be appended in the order they appear in the file.
 
 
-# EC2 SIGNING KEYS --------------------------------------------
-# Private key.  The file should only be readable by the user
-# designated to run the vosa commands.
-#
-# To create a private key, use the following command:
-#   openssl genrsa -out private-key.pem 1024
-#
-key /var/lib/vizrt/vosa/credentials/private-key.pem
+# AWS KEYS --------------------------------------------
+# Access Key ID from Amazon.
+access_key_id ABC123547389245738290
 
-# Public certificate.  The certificate must be uploaded to amazon. All
-# interactions with the server will be signed with the private key; and
-# Amazon will use the certificate to verify that the request is legitimate.
-#
-# To create the certificate, use the following commands:
-#   openssl req -new -key private-key.pem -out certificate-request.pem
-#   openssl x509 -req -in signing-request.pem -signkey private-key.pem
-#            -out certificate.pem
-#
-certificate /var/lib/vizrt/vosa/credentials/certificate.pem
+# Secret Access Key file. The file must contain only the secret access
+# key, and no other information.  The secret access key must
+# correspond to the access key id listed in access_key_id.
+
+# This file should be well protected, and readable only by those who
+# need to run commands against amazon
+secret_access_key_file /var/lib/vizrt/vosa/credentials/secret-access-key.txt
 
 
 # REGION ------------------------------------------------------
@@ -370,63 +362,6 @@ ssh_keypair control-key
 #
 ssh_private_key /var/lib/vizrt/vosa/credentials/ssh-private-key.pem
 
-EOF
-  fi
-  mkdir -p /etc/vizrt/vosa/user-data || exit 2
-  if [ ! -r /etc/vizrt/vosa/user-data/puppetmaster.pp ] ; then
-    cat > /etc/vizrt/vosa/user-data/puppetmaster.pp <<EOF
-#cloud-config
-
-#------------------------------------------------------------------------#
-# This file is a User Data file to set up a puppet master.
-#
-# It installs a base set of packages and configures the puppet master to
-# create a self signed certificate.
-
-manage_etc_hosts: false
-timezone: Europe/Oslo
-
-apt_update: true
-apt_upgrade: true
-apt_mirror: http://no.archive.ubuntu.com/ubuntu
-
-# ACPID installed before puppet, because it ensures clean shutdowns, even if something goes wrong.
-packages:
- - acpid
- - mercurial
- - ruby-activerecord
-
-puppet:
-  conf:
-    master:
-      certname: "puppetmaster"
-      node_name: "facter"
-      storeconfigs: "true"
-
-# Patch the oneiric auth.conf to allow the cert called "generic-puppetmaster-client"
-# to access the guest.
-# Other versions of guests might need a different patch file...
-# Note that dollar-signs need to be escaped.
-runcmd:
- - |
-   apt-get -y install puppetmaster
-   cat > /tmp/auth.patch <<EOF
-   --- /etc/puppet/auth.conf    2011-06-27 16:50:51.000000000 +0200
-   +++ /etc/puppet/auth.conf.orig       2012-02-21 07:26:54.361610001 +0100
-   @@ -51,7 +51,9 @@
-    # allow nodes to retrieve their own catalog (ie their configuration)
-    path ~ ^/catalog/([^/]+)\\$
-    method find
-   -allow \\\$1
-   +#allow \\\$1
-   +# allow the generic cert to retrieve any node's catalog
-   +allow generic-puppetmaster-client
-
-    # allow nodes to retrieve their own node definition
-    path ~ ^/node/([^/]+)\\$
-   EOF
-   patch /etc/puppet/auth.conf < /tmp/auth.patch
-   puppet cert --generate generic-puppetmaster-client
 EOF
   fi
 
@@ -613,9 +548,18 @@ function read_amazon_config() {
   parse_config_file $1 amazon_config_
 
   unset AWS_COMMON_OPTIONS
-  AWS_COMMON_OPTIONS="${AWS_COMMON_OPTIONS} --private-key $amazon_config_key "
-  AWS_COMMON_OPTIONS="${AWS_COMMON_OPTIONS} --cert $amazon_config_certificate "
-  AWS_COMMON_OPTIONS="${AWS_COMMON_OPTIONS} --region $amazon_config_region "
+  if [ ! -z "$amazon_config_key" ] ; then
+    AWS_COMMON_OPTIONS="${AWS_COMMON_OPTIONS} --private-key $amazon_config_key "
+    AWS_COMMON_OPTIONS="${AWS_COMMON_OPTIONS} --cert $amazon_config_certificate "
+    AWS_COMMON_OPTIONS="${AWS_COMMON_OPTIONS} --region $amazon_config_region "
+    export USE_AWS_CLI=false
+  else
+    export AWS_ACCESS_KEY_ID=$amazon_config_access_key_id
+    export AWS_SECRET_ACCESS_KEY="$(cat $amazon_config_secret_access_key_file)"
+    export AWS_DEFAULT_REGION="$amazon_config_region"
+    export USE_AWS_CLI=true
+    AWS_COMMON_OPTIONS="${AWS_COMMON_OPTIONS} --output text "
+  fi
   have_read_amazon_config=1
 }
 
@@ -672,6 +616,9 @@ function really_do_status () {
           if [ -r $bootstatefile ] ; then
             aws_instance=$(awk < "$bootstatefile" -F '\t' '/^INSTANCE/ { print $2 }')
           fi
+          if [ -z $aws_instance ] && [ -r $bootstatefile ] ; then
+            aws_instance=$(cut < "$bootstatefile" -f 6 | grep 'i-')
+          fi
 
           if [ -z "$aws_instance" ] ; then
             output=( ${output[@]} invalid );
@@ -697,17 +644,26 @@ function really_do_status () {
         local rc=0
         # Update the aws statefile
         if [ -w $statefile ] ; then
-          ec2-describe-instances $AWS_COMMON_OPTIONS $aws_instance > $statefile
-          #echo ec2-describe-instances $AWS_COMMON_OPTIONS $aws_instance
+          if $USE_AWS_CLI ; then
+            aws $AWS_COMMON_OPTIONS ec2 describe-instances --instance-ids $aws_instance > $statefile
+          else
+            ec2-describe-instances $AWS_COMMON_OPTIONS $aws_instance > $statefile
+          fi
           local rc=$?
         fi
         if [ ! -r $statefile ] ; then
           statefile=$bootstatefile
           local stale=1
         fi
-        aws_state=$(awk < "$statefile" -F '\t' '/^INSTANCE/ { print $6 }')
-        aws_zone=$(awk < "$statefile" -F '\t' '/^INSTANCE/ { print $12 }')
-        aws_start=$(awk < "$statefile" -F '\t' '/^INSTANCE/ { print $11 }')
+        if $USE_AWS_CLI ; then
+          aws_state=$(awk < "$statefile" -F '\t' '/^STATE/ { print $3 }')
+          aws_zone=$(awk < "$statefile" -F '\t' '/^PLACEMENT/ { print $4 }')
+          aws_start=$(awk < "$statefile" -F '\t' "/$aws_instance/"' { print $4 }')
+        else
+          aws_state=$(awk < "$statefile" -F '\t' '/^INSTANCE/ { print $6 }')
+          aws_zone=$(awk < "$statefile" -F '\t' '/^INSTANCE/ { print $12 }')
+          aws_start=$(awk < "$statefile" -F '\t' '/^INSTANCE/ { print $11 }')
+        fi
         if [ -z "$aws_state" ] ; then
           output=( ${output[@]} unknown $aws_instance )
         else
@@ -826,10 +782,10 @@ function do_destroy() {
       echo "$instance_name is not enabled"
       exit 1
     fi
+    read_amazon_config $instance_dir/amazon.conf
     local status=( $(really_do_status $instance_dir) )
     if [ "${status[3]}" == "alive" -o "${status[3]}" == "running" ] ; then
-      echo "$instance_name is alive. Stop it first. Exiting."
-      exit 1
+      echo "$instance_name is alive. You might want to stop instances before destroying them."
     fi
     if [ "${status[3]}" == "dead" ] ; then
       echo "$instance_name is dead, but supposed to be running. Stop it first. Exiting!"
@@ -842,7 +798,7 @@ function do_destroy() {
       ${commands}/ec2-cmd.sh \
         "$instance_dir" \
         "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" \
-        "terminate-instances" "INSTANCE" || exit $?
+        "terminate-instances" $($USE_AWS_CLI && echo "--instance-ids") "INSTANCE" || exit $?
       # If the terminate-instances command fails, don't remove the instance directory
       # But what if it's terminated twice?
     fi
@@ -889,10 +845,24 @@ function do_create() {
       mkdir "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" || exit 2
       read_amazon_config $instance_dir/amazon.conf
       # TODO: sanitize "required" variables
-      ${commands}/ec2-cmd.sh \
-        "$instance_dir" \
-        "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" \
-        run-instances \
+      if $USE_AWS_CLI ; then
+        opts=( "--image-id" ${amazon_config_image}
+               "--min-count" "1"
+               "--max-count" "1"
+        ${amazon_config_availability_zone/#/--placement availability_zone=}  \
+        ${amazon_config_type/#/--instance-type }  \
+        ${amazon_config_ssh_keypair/#/--key-name }  \
+        ${amazon_config_group[@]/#/--security-groups } \
+        ${amazon_config_subnet/#/--subnet-id }
+      )
+      if [ ! -z ${amazon_config_user_data} ] ; then
+        opts=( "${opts[@]}"
+           --user-data "$(cat $amazon_config_user_data)"
+        )
+      fi
+
+      else
+        opts=(
         ${amazon_config_image} \
         ${amazon_config_availability_zone/#/--availability-zone }  \
         ${amazon_config_type/#/--instance-type }  \
@@ -900,6 +870,15 @@ function do_create() {
         ${amazon_config_group[@]/#/--group } \
         ${amazon_config_user_data/#/--user-data-file } \
         ${amazon_config_subnet/#/--subnet }
+        )
+      fi
+
+
+      ${commands}/ec2-cmd.sh \
+        "$instance_dir" \
+        "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" \
+        run-instances \
+        "${opts[@]}"
 
       if [ ! -z "${amazon_config_ip_address}" ] ; then
         echo "Associating IP $amazon_config_ip_address..."
@@ -907,8 +886,11 @@ function do_create() {
           "$instance_dir" \
           "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" \
           associate-address \
+          $($USE_AWS_CLI && echo "--public-ip") \
           ${amazon_config_ip_address} \
-          --instance INSTANCE
+          $($USE_AWS_CLI && echo "--instance-id") \
+          $($USE_AWS_CLI || echo "--instance") \
+          INSTANCE
       fi
       
       ${commands}/ec2-determine-ip.sh \
@@ -989,7 +971,9 @@ function do_start() {
       ${commands}/ec2-cmd.sh \
         "$instance_dir" \
         "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" \
-        "start-instances" INSTANCE
+        "start-instances" \
+        $($USE_AWS_CLI && echo "--instance-ids") \
+        INSTANCE
 
       if [ ! -z "${amazon_config_ip_address}" ] ; then
         echo "Associating IP $amazon_config_ip_address..."
@@ -997,8 +981,11 @@ function do_start() {
           "$instance_dir" \
           "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" \
           associate-address \
+          $($USE_AWS_CLI && echo "--public-ip") \
           ${amazon_config_ip_address} \
-          --instance INSTANCE
+          $($USE_AWS_CLI && echo "--instance-id") \
+          $($USE_AWS_CLI || echo "--instance") \
+          INSTANCE
       fi
 
       # The word INSTANCE is replaced with the instance.
@@ -1105,7 +1092,9 @@ function shutdown_kvm() {
 }
 
 function shutdown_aws() {
-  ${commands}/ec2-cmd.sh "$instance_dir" "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" "stop-instances" INSTANCE
+  read_amazon_config $instance_dir/amazon.conf
+  ${commands}/ec2-cmd.sh "$instance_dir" "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" "stop-instances" \
+      $($USE_AWS_CLI && echo "--instance-ids") INSTANCE
 }
 
 # Shuts
diff --git a/usr/share/vizrt/vosa/commands/amazon_config_parser b/usr/share/vizrt/vosa/commands/amazon_config_parser
index af74f84a..fd5074ea 100644
--- a/usr/share/vizrt/vosa/commands/amazon_config_parser
+++ b/usr/share/vizrt/vosa/commands/amazon_config_parser
@@ -24,6 +24,14 @@ function amazon_config_certificate() {
   amazon_config_certificate=$1
 }
 
+function amazon_config_access_key_id() {
+  amazon_config_access_key_id=$1
+}
+
+function amazon_config_secret_access_key_file() {
+  amazon_config_secret_access_key_file=$1
+}
+
 function amazon_config_user_data() {
   amazon_config_user_data=$1
 }
diff --git a/usr/share/vizrt/vosa/commands/ec2-cmd.sh b/usr/share/vizrt/vosa/commands/ec2-cmd.sh
index 253a69db..3675bc03 100755
--- a/usr/share/vizrt/vosa/commands/ec2-cmd.sh
+++ b/usr/share/vizrt/vosa/commands/ec2-cmd.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 
 # Boots an amazon instance.
 
@@ -19,14 +19,26 @@ if [ -z "$cmd" ] ; then
   exit 3
 fi
 
-if [ -z "$EC2_BINARY" ] ; then
-  EC2_BINARY=$(which 2>/dev/null ec2-$cmd)
-fi
+if $USE_AWS_CLI ; then
+  if [ -z "$EC2_BINARY" ] ; then
+    EC2_BINARY=$(which 2>/dev/null aws)
+  fi
 
-if [ -z "$EC2_BINARY" -o ! -x "$EC2_BINARY" ] ; then
-  echo "Unable to figure out where ec2-$cmd is installed."
-  echo "export EC2_BINARY to make it work."
-  exit 2
+  if [ -z "$EC2_BINARY" -o ! -x "$EC2_BINARY" ] ; then
+    echo "Unable to figure out where aws is installed."
+    echo "export EC2_BINARY to make it work."
+    exit 2
+  fi
+else
+  if [ -z "$EC2_BINARY" ] ; then
+    EC2_BINARY=$(which 2>/dev/null ec2-$cmd)
+  fi
+
+  if [ -z "$EC2_BINARY" -o ! -x "$EC2_BINARY" ] ; then
+    echo "Unable to figure out where ec2-$cmd is installed."
+    echo "export EC2_BINARY to make it work."
+    exit 2
+  fi
 fi
 
 debug=3
@@ -91,11 +103,29 @@ function read_amazon_config() {
   have_read_amazon_config=1
 }
 
+# Example output from AWS CLI
+cat > /dev/null <<EOF
+390962791497	r-2db4d467
+RESPONSEMETADATA	168ad1ba-8a7a-4419-9c1a-7f85d2d5a466
+default	sg-65258a12
+None	aki-75665e01	False	2013-07-15T08:16:27.000Z	None	i-04e0e849	ami-ab6170df	None	None	m1.small	xen	i386	paravirtual	instance-store	0
+MONITORING	disabled
+STATE	0	pending
+default	sg-65258a12
+PLACEMENT	default	None	eu-west-1a
+STATEREASON	pending	pending
+EOF
+
+
 function get_aws_instance() {
   bootstatefile=$image/amazon.initialstate
   if [ -r $bootstatefile ] ; then
     aws_instance=$(awk < "$bootstatefile" -F '\t' '/^INSTANCE/ { print $2 }')
   fi
+  if [ -z "$aws_instance" ] && [ -r $bootstatefile ] ; then
+    # Hope that the 6th field continues to provide "i-"...
+    aws_instance=$(cut < "$bootstatefile" -f 6 | grep 'i-')
+  fi
 }
 
 
@@ -125,7 +155,12 @@ function invoke_ec2() {
 }
 
 
-read_amazon_config $1/amazon.conf
+if $USE_AWS_CLI ; then
+  AWS_COMMON_OPTIONS="--output text ec2 $cmd"
+else
+  # Assume that the AWS_ACCESS_KEY and SECRET_KEY and REGION are set...
+  read_amazon_config $1/amazon.conf
+fi
 get_aws_instance
 shift
 shift
diff --git a/usr/share/vizrt/vosa/commands/ec2-determine-ip.sh b/usr/share/vizrt/vosa/commands/ec2-determine-ip.sh
index 14db60bb..3c51efd7 100755
--- a/usr/share/vizrt/vosa/commands/ec2-determine-ip.sh
+++ b/usr/share/vizrt/vosa/commands/ec2-determine-ip.sh
@@ -31,6 +31,9 @@ function read_amazon_config() {
 
 read_amazon_config $config/amazon.conf
 
+if $USE_AWS_CLI ; then
+  AWS_COMMON_OPTIONS="--output text ec2"  # ignore other options...
+fi
 
 statefile="${image}/amazon.state"
 
@@ -44,20 +47,31 @@ if [ -r ${statefile} -a ! -w  "${statefile}" ] ; then
   exit 2
 fi
 
+# Try 10 times to get an IP
 for a in 1 2 3 4 5 6 7 8 9 10 ; do
   output="$($(dirname $0)/ec2-cmd.sh \
     "$config" \
     "$image" \
-    "describe-instances" "INSTANCE")"
+    "describe-instances" \
+    $( $USE_AWS_CLI && echo "--instance-ids") \
+    "INSTANCE")"
 
   if [ ! -z "$output" ] ; then
     echo "$output" > "$statefile"
   fi
 
-  if [ "$amazon_config_ssh_access" == "public" ] ; then
-    ip_address=$(awk < "$statefile" -F '\t' '/^INSTANCE/ { print $17 }')
+  if $USE_AWS_CLI ; then
+    if [ "$amazon_config_ssh_access" == "public" ] ; then
+      ip_address=$(grep $'\ti-' $statefile | cut -f 5)
+    else
+      ip_address=$(grep $'\ti-' $statefile | cut -f 6)
+    fi
   else
-    ip_address=$(awk < "$statefile" -F '\t' '/^INSTANCE/ { print $18 }')
+    if [ "$amazon_config_ssh_access" == "public" ] ; then
+      ip_address=$(awk < "$statefile" -F '\t' '/^INSTANCE/ { print $17 }')
+    else
+      ip_address=$(awk < "$statefile" -F '\t' '/^INSTANCE/ { print $18 }')
+    fi
   fi
   if [ ! -z "$ip_address" ] ; then
     break;

From 456874da763a37f339e25eac01823724a4891c45 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Tue, 6 Aug 2013 10:16:11 +0200
Subject: [PATCH 2105/2585] More support for AWS CLI

---
 usr/bin/vosa                             | 31 +++++++++++++--------
 usr/share/vizrt/vosa/commands/ec2-cmd.sh | 35 ++++++++++++++++++------
 2 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 12b92ff2..ddebfc75 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 
 # /usr/bin/vosa --- command to manage vizrt on-line system-administration
 # managed instances of virtual machines.
@@ -619,6 +619,10 @@ function really_do_status () {
           if [ -z $aws_instance ] && [ -r $bootstatefile ] ; then
             aws_instance=$(cut < "$bootstatefile" -f 6 | grep 'i-')
           fi
+          if [ -z "$aws_instance" ] && [ -r $bootstatefile ] ; then
+            # Hope that the 6th field continues to provide "i-"...
+            aws_instance=$(cut < "$bootstatefile" -f 8 | grep 'i-')
+          fi
 
           if [ -z "$aws_instance" ] ; then
             output=( ${output[@]} invalid );
@@ -656,8 +660,8 @@ function really_do_status () {
           local stale=1
         fi
         if $USE_AWS_CLI ; then
-          aws_state=$(awk < "$statefile" -F '\t' '/^STATE/ { print $3 }')
-          aws_zone=$(awk < "$statefile" -F '\t' '/^PLACEMENT/ { print $4 }')
+          aws_state=$(awk < "$statefile" -F '\t' $'/^STATE\t/ { print $3 }')
+          aws_zone=$(awk < "$statefile" -F '\t' $'/^PLACEMENT\t/ { print $4 }')
           aws_start=$(awk < "$statefile" -F '\t' "/$aws_instance/"' { print $4 }')
         else
           aws_state=$(awk < "$statefile" -F '\t' '/^INSTANCE/ { print $6 }')
@@ -882,15 +886,18 @@ function do_create() {
 
       if [ ! -z "${amazon_config_ip_address}" ] ; then
         echo "Associating IP $amazon_config_ip_address..."
-        ${commands}/ec2-cmd.sh \
-          "$instance_dir" \
-          "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" \
-          associate-address \
-          $($USE_AWS_CLI && echo "--public-ip") \
-          ${amazon_config_ip_address} \
-          $($USE_AWS_CLI && echo "--instance-id") \
-          $($USE_AWS_CLI || echo "--instance") \
-          INSTANCE
+        for a in 1 2 3 4 5 6 7 8 9 10; do
+          sleep 4;
+          ${commands}/ec2-cmd.sh \
+            "$instance_dir" \
+            "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" \
+            associate-address \
+            $($USE_AWS_CLI && echo "--public-ip") \
+            ${amazon_config_ip_address} \
+            $($USE_AWS_CLI && echo "--instance-id") \
+            $($USE_AWS_CLI || echo "--instance") \
+            INSTANCE && break
+        done
       fi
       
       ${commands}/ec2-determine-ip.sh \
diff --git a/usr/share/vizrt/vosa/commands/ec2-cmd.sh b/usr/share/vizrt/vosa/commands/ec2-cmd.sh
index 3675bc03..868399da 100755
--- a/usr/share/vizrt/vosa/commands/ec2-cmd.sh
+++ b/usr/share/vizrt/vosa/commands/ec2-cmd.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 
 # Boots an amazon instance.
 
@@ -105,18 +105,33 @@ function read_amazon_config() {
 
 # Example output from AWS CLI
 cat > /dev/null <<EOF
-390962791497	r-2db4d467
-RESPONSEMETADATA	168ad1ba-8a7a-4419-9c1a-7f85d2d5a466
-default	sg-65258a12
-None	aki-75665e01	False	2013-07-15T08:16:27.000Z	None	i-04e0e849	ami-ab6170df	None	None	m1.small	xen	i386	paravirtual	instance-store	0
+390962791497   r-2db4d467
+RESPONSEMETADATA       168ad1ba-8a7a-4419-9c1a-7f85d2d5a466
+default        sg-65258a12
+None   aki-75665e01    False   2013-07-15T08:16:27.000Z        None    i-04e0e849
+MONITORING     disabled
+STATE  0       pending
+default        sg-65258a12
+PLACEMENT      default None    eu-west-1a
+STATEREASON    pending pending
+EOF
+
+# Example output from AWS CLI when booting into a VPC
+cat > /dev/null <<EOF
+866410366134	r-c3284b89
+RESPONSEMETADATA	00ee4d6c-cf38-4ab4-ad4e-32caec6d5659
+None	aki-71665e05	False	2013-07-15T12:13:52.000Z	172.31.34.128	vpc-011dbf6a	None	i-2c1d1661	ami-57b0a223	ip-172-31-34-128.eu-west-1.compute.internal	builder-root	None	subnet-061dbf6d	m1.medium	True	xen	x86_64	paravirtual	instance-store	0
 MONITORING	disabled
 STATE	0	pending
-default	sg-65258a12
-PLACEMENT	default	None	eu-west-1a
+default	sg-923dd0fd
+in-use	True	vpc-011dbf6a	None	eni-cfeb46a4	ip-172-31-34-128.eu-west-1.compute.internal	subnet-061dbf6d	866410366134	172.31.34.128
+ip-172-31-34-128.eu-west-1.compute.internal	True	172.31.34.128
+ATTACHMENT	attaching	0	True	eni-attach-6355ac0b	2013-07-15T12:13:52.000Z
+default	sg-923dd0fd
+PLACEMENT	default	None	eu-west-1b
 STATEREASON	pending	pending
 EOF
 
-
 function get_aws_instance() {
   bootstatefile=$image/amazon.initialstate
   if [ -r $bootstatefile ] ; then
@@ -126,6 +141,10 @@ function get_aws_instance() {
     # Hope that the 6th field continues to provide "i-"...
     aws_instance=$(cut < "$bootstatefile" -f 6 | grep 'i-')
   fi
+  if [ -z "$aws_instance" ] && [ -r $bootstatefile ] ; then
+    # Hope that the 6th field continues to provide "i-"...
+    aws_instance=$(cut < "$bootstatefile" -f 8 | grep 'i-')
+  fi
 }
 
 

From 3c7fab3e1a9f69b4916629e923d3766644291fad Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 8 Aug 2013 14:56:43 +0200
Subject: [PATCH 2106/2585] Added dependency to libxml2-utils, which ece-deploy
 requires.

---
 .../debian/escenic-content-engine-scripts/control             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/control b/usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/control
index f1fa4a1d..14e50fe0 100644
--- a/usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/control
+++ b/usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/control
@@ -1,6 +1,6 @@
 Package: escenic-content-engine-scripts
 Version: VERSION
-Depends: escenic-common-scripts (>= VERSION)
+Depends: escenic-common-scripts (>= VERSION), libxml2-utils
 Section: base
 Priority: optional
 Architecture: all
@@ -13,4 +13,4 @@ Description: Scripts for operating the Escenic Content Engine.
   .
   See the documentation in /usr/share/doc/escenic/ for further
   details.
- 
\ No newline at end of file
+ 

From 8110c24bf3b3aa10371d00965faf96edd4e5a199 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Fri, 9 Aug 2013 12:22:13 +0200
Subject: [PATCH 2107/2585] Hardened the cleanup job; if cache_dir happens to
 be unset, it no longer tries to delete the operating system.

---
 etc/cron.daily/remove-old-escenic-log-files | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/cron.daily/remove-old-escenic-log-files b/etc/cron.daily/remove-old-escenic-log-files
index a37c0563..71d2a483 100755
--- a/etc/cron.daily/remove-old-escenic-log-files
+++ b/etc/cron.daily/remove-old-escenic-log-files
@@ -22,8 +22,8 @@ fi
 # Added to take care of left over ear files in escenic cache by ece-install and ece-deploy
 if [ -r /etc/escenic/ece.conf ]; then
   source /etc/escenic/ece.conf
-  if [ -d ${cache_dir} ] ; then
-    nice find ${cache_dir} -maxdepth 1 -type f -mtime +5 -delete
+  if [ ! -z "${cache_dir}" ] && [ -d "${cache_dir}" ] ; then
+    nice find "${cache_dir}" -maxdepth 1 -type f -mtime +5 -delete
   fi
 
 fi

From d8374516d5c2d2e2de74416e67ae780dbf303468 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Sun, 11 Aug 2013 22:23:29 +0200
Subject: [PATCH 2108/2585] Made cronjobs not necessarily have to be executable
 (happens often when scripts get checked out of version control systems, or
 zipped up in places).

---
 usr/share/escenic/ece-scripts/ece-import.d/create-job.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh b/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh
index fa6da4eb..a7d998e9 100644
--- a/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh
+++ b/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh
@@ -147,7 +147,7 @@ function create_import_cron_jobs() {
       for cron_script in $(find $f -type f); do
         local the_script=$target_dir/$type_of_cron/$(basename $cron_script)
         run chmod +x $the_script
-        echo "$cron_pattern" $the_script \
+        echo "$cron_pattern" bash $the_script \
           '>>' $log_base_dir/$(basename $file).log \
           >> $file
       done

From e6658ec94237207983c38c5b44c5ec6ef522fbe4 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Sun, 11 Aug 2013 22:27:22 +0200
Subject: [PATCH 2109/2585] Made cronjobs not contain periods. See
 http://askubuntu.com/a/111034/20345

---
 usr/share/escenic/ece-scripts/ece-import.d/create-job.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh b/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh
index a7d998e9..6b41ea9f 100644
--- a/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh
+++ b/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh
@@ -114,7 +114,7 @@ function create_import_cron_jobs() {
     return
   fi
 
-  local file=/etc/cron.d/$1-$2-cron
+  local file=/etc/cron.d/${1//./-}-${2//./-}-cron
   echo > $file
 
   # first, set up an y cron.hourly

From 1fee6e20c34a007c9f5445ae8f368d03a5313347 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Sun, 11 Aug 2013 22:29:36 +0200
Subject: [PATCH 2110/2585] Added a comment and a sane SHELL and PATH variables
 for out-of-the-box success.

---
 usr/share/escenic/ece-scripts/ece-import.d/create-job.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh b/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh
index 6b41ea9f..1f2c6bb6 100644
--- a/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh
+++ b/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh
@@ -158,6 +158,7 @@ function create_import_cron_jobs() {
   if [ $(wc -c $file | cut -d' ' -f1) -lt 2 ]; then
     run rm $file
   else
+    sed -i "1i# Crontab installed by ece-import $(date --rfc-2822)\nSHELL=/bin/bash\nPATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin\n" $file
     print_and_log $(green NEW) "cron job(s) set up in $file"
   fi
 }

From 77694a4a9e62abab99c05310b8fd9e96b1e76b50 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Sun, 11 Aug 2013 22:38:37 +0200
Subject: [PATCH 2111/2585] Make the cron job invoke the cron script as the
 escenic user

---
 usr/share/escenic/ece-scripts/ece-import.d/create-job.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh b/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh
index 1f2c6bb6..e854e8b8 100644
--- a/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh
+++ b/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh
@@ -147,7 +147,7 @@ function create_import_cron_jobs() {
       for cron_script in $(find $f -type f); do
         local the_script=$target_dir/$type_of_cron/$(basename $cron_script)
         run chmod +x $the_script
-        echo "$cron_pattern" bash $the_script \
+        echo "$cron_pattern" ${escenic_user} bash $the_script \
           '>>' $log_base_dir/$(basename $file).log \
           >> $file
       done

From 607afbe4ff1ca54ca846854beeb4dc0496ee6c94 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Mon, 12 Aug 2013 11:54:28 +0200
Subject: [PATCH 2112/2585] Removed extraneous whitespace which could cause
 problems for some versions of dpkg.

---
 .../package-scripts/debian/escenic-build-scripts/control        | 2 +-
 .../package-scripts/debian/escenic-common-scripts/control       | 2 +-
 .../debian/escenic-content-engine-installer/control             | 2 +-
 .../debian/escenic-content-engine-scripts/control               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/usr/share/escenic/package-scripts/debian/escenic-build-scripts/control b/usr/share/escenic/package-scripts/debian/escenic-build-scripts/control
index fcf40c9c..4a392c13 100644
--- a/usr/share/escenic/package-scripts/debian/escenic-build-scripts/control
+++ b/usr/share/escenic/package-scripts/debian/escenic-build-scripts/control
@@ -9,4 +9,4 @@ Description: Build scripts used for build servers and/or development
   .
   See the documentation in /usr/share/doc/escenic/ for further
   details.
- 
\ No newline at end of file
+
diff --git a/usr/share/escenic/package-scripts/debian/escenic-common-scripts/control b/usr/share/escenic/package-scripts/debian/escenic-common-scripts/control
index 677b60a9..3df03933 100644
--- a/usr/share/escenic/package-scripts/debian/escenic-common-scripts/control
+++ b/usr/share/escenic/package-scripts/debian/escenic-common-scripts/control
@@ -9,4 +9,4 @@ Description: Common scripts used by the various Escenic and Vizrt
   .
   See the documentation in /usr/share/doc/escenic/ for further
   details.
- 
\ No newline at end of file
+
diff --git a/usr/share/escenic/package-scripts/debian/escenic-content-engine-installer/control b/usr/share/escenic/package-scripts/debian/escenic-content-engine-installer/control
index 6c7a9f26..bf2961a2 100644
--- a/usr/share/escenic/package-scripts/debian/escenic-content-engine-installer/control
+++ b/usr/share/escenic/package-scripts/debian/escenic-content-engine-installer/control
@@ -12,4 +12,4 @@ Description: The Escenic Content Engine Installer.
   .
   The script can run in both interactive or full automatic mode (FAI). See the
   documentation in /usr/share/doc/escenic/ for further details.
- 
\ No newline at end of file
+
diff --git a/usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/control b/usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/control
index 14e50fe0..bfc8a73e 100644
--- a/usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/control
+++ b/usr/share/escenic/package-scripts/debian/escenic-content-engine-scripts/control
@@ -13,4 +13,4 @@ Description: Scripts for operating the Escenic Content Engine.
   .
   See the documentation in /usr/share/doc/escenic/ for further
   details.
- 
+

From f04eca6a0f9a7b3db71442ea5bf6bc961f99dc81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Thu, 8 Aug 2013 05:00:09 +0200
Subject: [PATCH 2113/2585] ece-build - remove quiet mode for mvn command to
 make output more extensive on failure

---
 usr/share/escenic/build-scripts/ece-build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index ab32a1af..52ace42c 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -792,7 +792,7 @@ function svn_checkout
 function maven_build
 {
   run_wrapper cd $project_src_dir
-  run_wrapper mvn -q $maven_opts
+  run_wrapper mvn $maven_opts
 }
 
 ##

From ba00c5893c16456bdf5b793ee1bd02234a731933 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Tue, 13 Aug 2013 14:33:52 +0200
Subject: [PATCH 2114/2585] Made the 'escenic' user own the ece-import log file
 so that imports run as that user can log to this file.

---
 usr/share/escenic/ece-scripts/ece-import.d/create-job.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh b/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh
index e854e8b8..d5623162 100644
--- a/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh
+++ b/usr/share/escenic/ece-scripts/ece-import.d/create-job.sh
@@ -161,6 +161,9 @@ function create_import_cron_jobs() {
     sed -i "1i# Crontab installed by ece-import $(date --rfc-2822)\nSHELL=/bin/bash\nPATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin\n" $file
     print_and_log $(green NEW) "cron job(s) set up in $file"
   fi
+  if [ -f $log_base_dir/ece-import.log ] ; then
+    chown ${escenic_user}: $log_base_dir/ece-import.log
+  fi
 }
 
 function print_manual_steps() {

From c29b4d62071b73dcbec91a75da0cc8011f4cf6d4 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Tue, 13 Aug 2013 18:07:53 +0200
Subject: [PATCH 2115/2585] Fixed "is_escenic_xml_ok" function to sometimes
 return 1

---
 usr/share/escenic/ece-scripts/common-ece.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/common-ece.sh b/usr/share/escenic/ece-scripts/common-ece.sh
index c4463f94..8d30d3c0 100644
--- a/usr/share/escenic/ece-scripts/common-ece.sh
+++ b/usr/share/escenic/ece-scripts/common-ece.sh
@@ -153,5 +153,5 @@ function is_escenic_xml_ok() {
     return
   fi
 
-  echo 0
+  echo 1
 }

From 8df0e4940421fbfa39eb1eaeab0e12cc969937c0 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Wed, 14 Aug 2013 13:42:36 +0200
Subject: [PATCH 2116/2585] Turned off compression; varnish does this a lot
 better.

---
 usr/share/escenic/ece-scripts/ece-install.d/app-server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 1cd3ce03..f2f47646 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -302,7 +302,7 @@ EOF
                protocol="HTTP/1.1"
                connectionTimeout="20000"
                URIEncoding="UTF-8"
-               compression="on"
+               compression="off"
                redirectPort="${redirect_port}"
     />
     <Connector port="${redirect_port}"

From d1040d46aad82f03459388f82966b718e25d1f14 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Wed, 14 Aug 2013 14:11:15 +0200
Subject: [PATCH 2117/2585] Made create database work together with all the
 plug-ins in EAR based commits.

---
 usr/share/escenic/ece-scripts/ece-install.d/database.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 2ab3b9e2..a8e6a746 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -631,7 +631,7 @@ function create_ecedb() {
   run_db_scripts $ece_home/database/$db_product
   
   # ... then, find the plugins and run their SQL scripts
-  for archive in $technet_download_list; do
+  for archive in $technet_download_list $ear_download_list; do
     # don't re-run the engine scripts
     if [[ $(basename ${archive}) == engine* ]]; then
       continue
@@ -643,7 +643,7 @@ function create_ecedb() {
         head -2 | \
         awk '{print $2}' | \
         tail -1 | \
-        cut -d'/' -f1      
+        cut -d'/' -f1
     )
 
     # should always be one

From c0b6f9ffa0b57a2197a3125f683f4ba386d90b7a Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 22 Aug 2013 09:31:35 +0200
Subject: [PATCH 2118/2585] Added webservice-extensions to default blacklist in
 varnish

---
 .../escenic/ece-scripts/ece-install.d/cache-server.sh  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
index b407b848..fbacde5f 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
@@ -220,10 +220,12 @@ acl staff {
 sub vcl_recv {
   if (!client.ip ~ staff &&
       (req.url ~ "^/escenic/" ||
-       req.url ~ "^/studio" ||
-       req.url ~ "^/munin" ||
-       req.url ~ "^/webservice" ||
-       req.url ~ "^/escenic-admin")) {
+       req.url ~ "^/studio/" ||
+       req.url ~ "^/munin/" ||
+       req.url ~ "^/icinga/" ||
+       req.url ~ "^/webservice/" ||
+       req.url ~ "^/webservice-extensions/" ||
+       req.url ~ "^/escenic-admin/")) {
     error 405 "Not allowed.";
   }
 }

From d912ac9b78d33aa04e1c55066c293584b42a2822 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 22 Aug 2013 09:34:39 +0200
Subject: [PATCH 2119/2585] Added webservice-extensions to default deploy
 whitelist for editorial

---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 23818e13..8c9f8913 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -4,7 +4,7 @@ function get_deploy_white_list() {
 
   local deploy_white_list=""
   local presentation_deploy_white_list="escenic-admin $(get_publication_short_name_list)"
-  local editor_deploy_white_list="escenic-admin escenic studio indexer-webservice webservice"
+  local editor_deploy_white_list="escenic-admin escenic studio indexer-webservice webservice webservice-extensions"
   local search_deploy_white_list="solr indexer-webapp"
 
   # user's deploy white list, if present, takes precedence.

From 279a58497af20b58cc640c77874cffc4d7d4fdaa Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Mon, 26 Aug 2013 11:18:12 +0200
Subject: [PATCH 2120/2585] Made vosa start correctly recognise IPs when booted
 in a EC2-VPC environment, but without an EIP.

---
 usr/share/vizrt/vosa/commands/ec2-determine-ip.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/usr/share/vizrt/vosa/commands/ec2-determine-ip.sh b/usr/share/vizrt/vosa/commands/ec2-determine-ip.sh
index 3c51efd7..02e4c70b 100755
--- a/usr/share/vizrt/vosa/commands/ec2-determine-ip.sh
+++ b/usr/share/vizrt/vosa/commands/ec2-determine-ip.sh
@@ -63,6 +63,9 @@ for a in 1 2 3 4 5 6 7 8 9 10 ; do
   if $USE_AWS_CLI ; then
     if [ "$amazon_config_ssh_access" == "public" ] ; then
       ip_address=$(grep $'\ti-' $statefile | cut -f 5)
+      if [[ $ip_address == 172.* ]] || [[ $ip_address == 10.* ]] ; then
+        ip_address=
+      fi
     else
       ip_address=$(grep $'\ti-' $statefile | cut -f 6)
     fi

From 27073fa72d53f9827969dc3f582dfa8d367d5188 Mon Sep 17 00:00:00 2001
From: Debashis Paul <Dpaul@vizrt.com>
Date: Tue, 27 Aug 2013 23:19:10 +0200
Subject: [PATCH 2121/2585] Install oracle java from webupd8. New parameter
 added fai_server_java_version which takes values 1.6 and 1.7. This has been
 added in documentation as well.

---
 usr/sbin/ece-install                          | 38 +++++++++----
 usr/share/doc/escenic/ece-install-guide.org   |  5 ++
 .../ece-install-dev-environment-from-ear.conf |  3 ++
 .../examples/ece-install-editorial.conf       |  3 ++
 usr/share/escenic/ece-scripts/common-os.sh    |  9 ++--
 .../ece-install.d/content-engine.sh           | 14 +----
 .../escenic/ece-scripts/ece-install.d/java.sh | 53 +++++++++----------
 7 files changed, 74 insertions(+), 51 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 1a47d200..08ecf846 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -45,11 +45,7 @@ appserver_parent_dir=/opt
 # country code for selecting the correct (APT) mirror.
 mirror_country_suffix=no
 
-# The script will install the sun-java6-jdk package on Debian based
-# systems and this is the path of the JAVA home with this package. If
-# you're using a different system or have other preferences, change
-# java_home.
-java_home=/usr/lib/jvm/java-6-sun
+java_package_name=""
 
 # This variable is updated by the package build scripts.
 ece_scripts_version="straight-from-github"
@@ -144,13 +140,13 @@ function init() {
     # load common librariees
     common_libraries="common-ece.sh common-bashing.sh common-io.sh common-os.sh"
     for el in $common_libraries; do
-      source $dir/${el}
+      source $dir/${el} || exit $?
     done
 
     # load ece-install modules
     for el in $dir/ece-install.d/*.sh; do
       log "Loading $(basename $0) module:" $(basename $el)
-      source $el
+      source $el || exit $?
     done
   else
     echo "I cannot find $(basename $0)'s dependencies, exiting :-("
@@ -292,7 +288,11 @@ dont_quote_conf_values=0
 # the value already is set, it will replace it with this one.
 function set_ece_instance_conf()
 {
-    instance_conf_file=$escenic_conf_dir/ece-$instance_name.conf
+    if [ -z "$instance_name" ]; then
+      instance_conf_file=$escenic_conf_dir/ece.conf
+    else
+      instance_conf_file=$escenic_conf_dir/ece-$instance_name.conf
+    fi
     set_conf_file_value $1 $2 $instance_conf_file
 }
 
@@ -873,7 +873,7 @@ function un_install_everything() {
     percona-server-server
     percona-server-server-5.5
     varnish
-    sun-java6-jdk
+    ${java_package_name}
     mariadb-client
     mariadb-client-5.5
     mariadb-client-core-5.5
@@ -970,9 +970,29 @@ function read_user_input() {
   done
 }
 
+function get_java_package_name() {
+  # The script will install oracle java installer package on Debian based
+  # systems and this is the path of the JAVA home with this package. If
+  # you're using a different system or have other preferences, change
+  # java_home in your ece-install.conf
+  default_java_version=1.6
+  server_java_version=${fai_server_java_version-${default_java_version}}
+  if [ $server_java_version = "1.6" ]; then
+    java_package_name="oracle-java6-installer"
+  elif [ $server_java_version = "1.7" ]; then
+    java_package_name="oracle-java7-installer"
+  #elif [ $server_java_version = "1.8" ]; then
+  #  java_package_name="oracle-java8-installer"
+  else
+    # Setting it back to default
+    java_package_name=""
+  fi
+}
+
 read_user_input "$@"
 init
 assert_correct_runtime_environment
+get_java_package_name
 
 if [ ${fai_enabled-0} -eq 1 ]; then
     print_and_log "Full Automatic Install (FAI) enabled."
diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 81d8f6af..20e51a85 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -214,6 +214,7 @@ technet_user=<user>
 technet_password=<password>
 fai_enabled=1
 fai_<profile>_install=1
+fai_server_java_version=1.7
 #+END_SRC
 
 If the configuration file does not contain these settings then
@@ -1030,6 +1031,10 @@ the *ece-install.conf*:
   the *ece-install* command downloads. If you wish to turn this
   feature off, set this to *0*.
 
+- *fai\_server\_java\_version* The java version to use. 
+  Only allowable values are 1.6 and 1.7.
+  The default is 1.6
+
 - *fai\_all\_conf\_archive* :: *conf.tar.gz* to use for Nursery & JAAS
      configuration. Default is "".
 
diff --git a/usr/share/doc/escenic/examples/ece-install-dev-environment-from-ear.conf b/usr/share/doc/escenic/examples/ece-install-dev-environment-from-ear.conf
index b0466db2..59b195c4 100644
--- a/usr/share/doc/escenic/examples/ece-install-dev-environment-from-ear.conf
+++ b/usr/share/doc/escenic/examples/ece-install-dev-environment-from-ear.conf
@@ -4,6 +4,9 @@ technet_password=
 wf_user=
 wf_password=
 
+# Java
+fai_server_java_version=1.6
+
 # Download list, as a minimum, you need assemblytool and engine.
 technet_download_list="
   http://technet.escenic.com/downloads/assemblytool-2.0.2.zip
diff --git a/usr/share/doc/escenic/examples/ece-install-editorial.conf b/usr/share/doc/escenic/examples/ece-install-editorial.conf
index 71ec0674..e0598435 100644
--- a/usr/share/doc/escenic/examples/ece-install-editorial.conf
+++ b/usr/share/doc/escenic/examples/ece-install-editorial.conf
@@ -12,6 +12,9 @@ wf_password=
 # FAI enabled
 fai_enabled=1
 
+# Java
+fai_server_java_version=1.6
+
 # Install a seperate search instance making us look cool, just like a
 # production environment.
 fai_search_install=1
diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index beada16b..4c783e76 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -42,10 +42,13 @@ function get_user_home_directory() {
   fi
 }
 
-### has_sun_java_installed
+### has_oracle_java_installed
 ## Will return 1 if the system has Sun/Oracle Java installed.
-function has_sun_java_installed() {
-  if [[ -x /usr/lib/jvm/java-6-sun/bin/java || \
+function has_oracle_java_installed() {
+  if [[ -x /usr/lib/jvm/java-6-oracle/bin/java || \
+    $(java -version 2>&1 > /dev/null | grep HotSpot | wc -l) -gt 0 ]]; then
+    echo 1
+  elif [[ -x /usr/lib/jvm/java-7-oracle/bin/java || \
     $(java -version 2>&1 > /dev/null | grep HotSpot | wc -l) -gt 0 ]]; then
     echo 1
   else
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 8c9f8913..ef3c4534 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -642,18 +642,8 @@ function install_ece_third_party_packages
       local version=$(lsb_release -s -r | sed "s#\.##g")
     fi
 
-    if [ $(has_sun_java_installed) -eq 0 ]; then
-      create_java_deb_packages_and_repo
-
-      # Here, we install sun-java6-jdk first so that ant doesn't pull
-      # down OpenJDK.
-      #
-      # This if guard is in palce to not attempt to install the
-      # package if Sun Java already is installed (typically, manually
-      # installed).
-      echo "sun-java6-jdk shared/accepted-sun-dlj-v1-1 boolean true" | \
-        debconf-set-selections
-      install_packages_if_missing sun-java6-jdk
+    if [ $(has_oracle_java_installed) -eq 0 ]; then
+      install_oracle_java
     fi
 
     local packages="
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/java.sh b/usr/share/escenic/ece-scripts/ece-install.d/java.sh
index 9e563a14..75c80259 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/java.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/java.sh
@@ -1,38 +1,37 @@
+default_java_version=1.6
 sun_java_bin_url=http://download.oracle.com/otn-pub/java/jdk/6u39-b04/jdk-6u39-linux-i586.bin
 if [[ $(uname -m) == "x86_64" ]]; then
   sun_java_bin_url=http://download.oracle.com/otn-pub/java/jdk/6u39-b04/jdk-6u39-linux-x64.bin
 fi
   
-function create_java_deb_packages_and_repo() {
-  print_and_log $(lsb_release -i | cut -d':' -f2) \
-    $(lsb_release -r | cut -d':' -f2) \
-    "doesn't have official Oracle/Sun Java packages,"
-  print_and_log "creating packages & local repo for you ..."
-  
-  local tmp_dir=$(mktemp -d)
-  run cd $tmp_dir
-  run git clone https://github.com/flexiondotorg/oab-java6.git
-  run cd oab-java6
+# Install oracle java from webupd8
+# http://www.webupd8.org/2012/01/install-oracle-java-jdk-7-in-ubuntu-via.html
+function install_oracle_java(){
+  # First get the java version
+  server_java_version=${fai_server_java_version-${default_java_version}}
+  debian_package_name=""
 
-  # oab fails regularly, every 2-3 months or so, so we must take extra
-  # heed here.
-  bash oab-java.sh 1>> $log 2>> $log
-  if [ $? -gt 0 ]; then
-    print_and_log "Creating Oracle/Sun Java packages failed. This is probably" \
-      "because of a 3rd party script, oab-java6, which fails" \
-      "whenever Oracle changes their website. To continue, please" \
-      "go to http://www.oracle.com/technetwork/java/javase/downloads" \
-      "and download the full Java 6 JDK and be sure to add it first" \
-      "in PATH. Then re-run $(basename $0)."
-    remove_pid_and_exit_in_error
+  if [ $server_java_version = "1.6" ]; then
+    debian_package_name="oracle-java6-installer"
+    java_home="/usr/lib/jvm/java-6-oracle"
+  elif [ $server_java_version = "1.7" ]; then
+    debian_package_name="oracle-java7-installer"
+    java_home="/usr/lib/jvm/java-7-oracle"
+  #elif [ $server_java_version = "1.8" ]; then
+  #  debian_package_name="oracle-java8-installer"
+  #  java_home="/usr/lib/jvm/java-8-oracle"
+  else
+    # Error: Invalid java version
+    print_and_log "Unsupported Java version. Cannot proceed. Exiting ...."
+    return 0
   fi
-  run rm -rf $tmp_dir
-    
-  add_next_step "Local APT repository with Sun/Oracle Java packages" \
-    "has been installed at /var/local/oab/deb and added" \
-    "to your APT system with /etc/apt/sources.list.d/oab.list"
-}
 
+  install_packages_if_missing python-software-properties software-properties-common
+  run add-apt-repository -y ppa:webupd8team/java
+  run apt-get update
+  echo "$debian_package_name shared/accepted-oracle-license-v1-1 boolean true" | debconf-set-selections
+  install_packages_if_missing $debian_package_name
+}
 
 function install_sun_java_on_redhat() {
   if [[ $(${java_home}/bin/java -version 2>&1 | \

From 6d54ab8e583db1bb0184786403cd849b736417a0 Mon Sep 17 00:00:00 2001
From: Debashis Paul <Dpaul@vizrt.com>
Date: Wed, 28 Aug 2013 11:43:36 +0200
Subject: [PATCH 2122/2585] Skeleton configuration copying to the configuration
 layer will not override files now. This was causing problem with multiple
 profile installation, changes made by the previous was replaced by the later

---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index ef3c4534..ffb58429 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -473,11 +473,11 @@ function set_up_basic_nursery_configuration() {
       run cp -r $escenic_root_dir/engine/security/ $common_nursery_dir/
     fi
 
-    run cp -r engine/siteconfig/config-skeleton/* $common_nursery_dir/
+    run cp -rn engine/siteconfig/config-skeleton/* $common_nursery_dir/
   elif [ -d $escenic_root_dir/engine/siteconfig/config-skeleton ] ; then
     print_and_log "I'm using Nursery & JAAS configuration (skeleton) " \
       "from $escenic_root_dir/engine"
-    run cp -r $escenic_root_dir/engine/siteconfig/config-skeleton/* \
+    run cp -rn $escenic_root_dir/engine/siteconfig/config-skeleton/* \
       $common_nursery_dir/
     run cp -r $escenic_root_dir/engine/security/ $common_nursery_dir/
   else

From c467576ca6e87130f5cac33095ba9d22ca055463 Mon Sep 17 00:00:00 2001
From: Debashis Paul <Dpaul@vizrt.com>
Date: Wed, 28 Aug 2013 11:56:52 +0200
Subject: [PATCH 2123/2585] FAI parameter fai_all_name added for instance name
 for fai_all_install

---
 usr/sbin/ece-install                        | 2 ++
 usr/share/doc/escenic/ece-install-guide.org | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 08ecf846..ae1920d4 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -684,6 +684,8 @@ function ask_for_instance_name()
             instance_name=${fai_presentation_name-$1}
         elif [ $install_profile_number -eq $PROFILE_SEARCH_SERVER ]; then
             instance_name=${fai_search_name-$1}
+        elif [ $install_profile_number -eq $PROFILE_ALL_IN_ONE ]; then
+            instance_name=${fai_all_name-$1}
         elif [ $install_profile_number -eq $PROFILE_ANALYSIS_SERVER ]; then
             instance_name=${fai_analysis_name-$1}
         fi
diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 20e51a85..c9d6dbf2 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -1044,6 +1044,9 @@ the *ece-install.conf*:
 - *fai\_all\_install* :: Install all components on your
      server.. Default is 0.
 
+- *fai\_all\_name* :: Instance name for the all install
+     server.. Default is engine1.
+
 - *fai\_all\_stop\_and\_clear* :: After installation, stop the
      instance and clear its work & log files.. Default is 0.
 

From 8a65e3bc711afd68ffcf75d67c4e75ad41101cf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Wed, 28 Aug 2013 14:59:41 +0200
Subject: [PATCH 2124/2585] ece-build - added support for multiple maven
 coordinates per artifact and fixed a bug which causes ece-build to crash if
 uncommented xml is present

---
 usr/share/escenic/build-scripts/ece-build | 34 ++++++++++++++---------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 52ace42c..88c59518 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -560,11 +560,11 @@ function fetch_distributions
   fi
   
   # iterate over all known distribution identifiers
-  for f in $escenic_identifiers
+  for f in ${!project_distributions[@]};
   do
 
     # try and fetch the version for the distribution from the pom.xml
-    local dist_version=`sed "/<escenic.$f.version>/!d;s/ *<\/\?escenic.$f.version> *//g" $project_src_dir/pom.xml | tr -d $'\r' `
+    local dist_version=${project_distributions["$f"]}
     
     # check if a version was returned from the pom.xml
     if [[ ! $dist_version = "" ]]; then
@@ -573,13 +573,18 @@ function fetch_distributions
       if [ ! -d $dists_root_dir/$f-$dist_version ]; then
 
         # create a url from the maven coordinate of the distribution
-        local dist_path=`mvn_coordinate_to_url ${maven_coordinates["$f"]}:$dist_version`
         local artifact_pattern=$f
         local artifact_version=$dist_version
         local target_path=$dists_root_dir
         
-        # try and add the distribution
-        request_distribution $dist_path
+        for h in ${maven_coordinates["$f"]};
+        do
+          local dist_path=`mvn_coordinate_to_url ${h}:$dist_version`
+
+          # try and add the distribution
+          request_distribution $dist_path
+        done
+
         if [ -e $dists_tmp_dir/distribution.zip ]; then
           run_wrapper cd $dists_tmp_dir
           run_wrapper unzip -q $dists_tmp_dir/distribution.zip
@@ -680,16 +685,19 @@ function download_distribution
 function print_unstable_distributions
 {
   for f in ${!project_distributions[@]}; do
-    local dist_path=`mvn_coordinate_to_url ${maven_coordinates["$f"]}:${project_distributions["$f"]}`
-    if [ ! -z $dist_path ]; then
-      distribution_exists http://maven.vizrt.com/$dist_path
-      if [ $? -ne 0 ]; then
-        distribution_exists http://maven.vizrt.com/unstable/$dist_path
-        if [ $? -eq 0 ]; then
-          print_and_log "WARNING - $f version ${project_distributions["$f"]} is not supported!"
+    for g in ${maven_coordinates["$f"]}
+    do
+      local dist_path=`mvn_coordinate_to_url ${g}:${project_distributions["$f"]}`
+      if [ ! -z $dist_path ]; then
+        distribution_exists http://maven.vizrt.com/$dist_path
+        if [ $? -ne 0 ]; then
+          distribution_exists http://maven.vizrt.com/unstable/$dist_path
+          if [ $? -eq 0 ]; then
+            print_and_log "WARNING - $f version ${project_distributions["$f"]} is not supported!"
+          fi
         fi
       fi
-    fi
+    done
   done
 }
 

From 66ecb0f1201d7001f409a0534f542d749df63be6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Tue, 3 Sep 2013 07:26:58 +0200
Subject: [PATCH 2125/2585] ece-build - added multiple coordinates for plugins
 and fixed a problem with escenic-distributions.txt

---
 usr/share/escenic/build-scripts/ece-build | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 88c59518..9c93257d 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -64,6 +64,8 @@ snapshot
 
 declare -A project_distributions=()
 
+project_maven_coordinates=""
+
 declare -A maven_coordinates=(
 ["assemblytool"]="com.escenic.tools:assemblytool:jar"
 ["engine"]="com.escenic:engine-dist:zip:bin"
@@ -82,8 +84,10 @@ declare -A maven_coordinates=(
 ["community-engine"]="com.escenic.plugins.community:community-engine:zip"
 ["online-graphics"]="com.escenic.plugins.online-graphics:online-graphics:zip"
 ["video"]="com.escenic.plugins.video:video:zip"
-["xml-editor"]="com.escenic.plugins.xml-editor:xml-editor-dist:zip"
-["vcpeditor"]="com.escenic.plugins.vcpeditor:vcpeditor-dist:zip"
+["xml-editor"]="com.escenic.plugins.xml-editor:xml-editor-dist:zip
+com.escenic.plugins.xml-editor:xml-editor:zip"
+["vcpeditor"]="com.escenic.plugins.vcpeditor:vcpeditor-dist:zip
+com.escenic.plugins.vcpeditor:vcpeditor:zip"
 ["widget-framework-core"]="com.escenic.widget-framework:framework-dist:zip"
 ["widget-framework-community"]="com.escenic.widget-framework:framework-community-dist:zip"
 ["widget-framework-mobile"]="com.escenic.widget-framework:framework-mobile-dist:zip"
@@ -694,7 +698,10 @@ function print_unstable_distributions
           distribution_exists http://maven.vizrt.com/unstable/$dist_path
           if [ $? -eq 0 ]; then
             print_and_log "WARNING - $f version ${project_distributions["$f"]} is not supported!"
+            project_maven_coordinates+="${g}:${project_distributions["$f"]}"$'\n'
           fi
+        else
+          project_maven_coordinates+="${g}:${project_distributions["$f"]}"$'\n'
         fi
       fi
     done
@@ -864,15 +871,9 @@ function add_distributions_to_ear
   if [ -e $assemblytool_root_dir/dist/engine.ear ]; then
     run_wrapper mkdir $assemblytool_root_dir/dist/META-INF
     # iterate over all known distribution identifiers
-    for f in $escenic_identifiers
+    for f in $project_maven_coordinates
     do
-      # try and fetch the version for the distribution from the pom.xml
-      local dist_version=`sed "/<escenic.$f.version>/!d;s/ *<\/\?escenic.$f.version> *//g" $project_src_dir/pom.xml | tr -d $'\r' `
-
-      # check if a version was returned from the pom.xml
-      if [[ ! $dist_version = "" ]]; then
-        echo "${maven_coordinates["$f"]}:$dist_version" >> $assemblytool_root_dir/dist/META-INF/escenic-distributions.txt
-      fi
+      echo "$f" >> $assemblytool_root_dir/dist/META-INF/escenic-distributions.txt
     done
     run_wrapper cd $assemblytool_root_dir/dist
     run_wrapper zip -u $assemblytool_root_dir/dist/engine.ear META-INF/escenic-distributions.txt

From 3c4539fd0b714be307abf00daf5bde3d403ebcab Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Wed, 4 Sep 2013 13:24:45 +0200
Subject: [PATCH 2126/2585] Added support for downloading snapshot releases
 with version numbers in them.

---
 usr/sbin/ece-install | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index ae1920d4..1e60a685 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -186,10 +186,28 @@ function download_escenic_components()
       fi
       local repo
       for repo in $fai_maven_repositories; do
+        # Special handling for snapshots
+        if [[ "$el" == *-SNAPSHOT* ]] ; then
+          # If snapshot file is not available, try to see if there's a maven-metadata file
+          if ! curl -s -I $repo/$el | grep -q '^HTTP[^ ]* 200' ; then
+            if curl -s -I $repo/$(dirname $el)/maven-metadata.xml | grep -q '^HTTP[^ ]* 200' ; then
+              local metadata;
+              local name=$(basename $el)
+              metadata=$(curl -s $repo/$(dirname $el)/maven-metadata.xml)
+              local timestamp=$(xmlstarlet <<< "$metadata" sel -t -m /metadata/versioning/snapshot/timestamp -c 'text()')
+              local buildnumber=$(xmlstarlet <<< "$metadata"  sel -t -m /metadata/versioning/snapshot/buildNumber -c 'text()')
+              log "Found SNAPSHOT with $timestamp-$buildnumber in $el"
+              el=$(dirname $el)/${name/SNAPSHOT/$timestamp-$buildnumber}
+              log "Downloading $el from $repo".
+            fi
+          fi
+        fi
         if curl -s -I $repo/$el | grep -q '^HTTP[^ ]* 200' ; then
           log "Downloading $(basename $el) ..."
           run wget $wget_opts $repo/$el
           break
+        else
+          log "$(basename $el) not found"
         fi
       done
     done

From 7916c2eed5f02191178bb698945e73d7a4ce7a6e Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Wed, 4 Sep 2013 13:26:51 +0200
Subject: [PATCH 2127/2585] Attempt to understand "-dist" and non "-dist"
 artifact names when checking. Not perfect yet.

---
 .../ece-scripts/ece-install.d/content-engine.sh      | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index ffb58429..d2c47340 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -256,6 +256,18 @@ function set_up_engine_and_plugins() {
 
   for el in $technet_download_list $ear_download_list; do
     local file=$(basename $el)
+    if [[ "$file" == *-SNAPSHOT* ]] ; then
+      local el2
+      local elf=${file/-dist}
+      # Pick the first non-SNAPSHOT version.
+      for el2 in $(dirname $file)/${file/SNAPSHOT/*} $(dirname $file)/${elf/SNAPSHOT/*} ; do
+        if [ -r "$el2" ] ; then
+          file=$(basename $el2);
+          break;
+        fi
+      done
+    fi
+
     verify_that_archive_is_ok $download_dir/$file
 
     if [ $(echo $file | \

From fa91520b3b7db06ec1ce9b0331201c83c7f688b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Wed, 4 Sep 2013 15:03:22 +0200
Subject: [PATCH 2128/2585] ece-build - add trunk-SNAPSHOT support against the
 internal repository

---
 usr/share/escenic/build-scripts/ece-build | 184 ++++++++++++++++++----
 1 file changed, 152 insertions(+), 32 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 9c93257d..f744c137 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -66,21 +66,53 @@ declare -A project_distributions=()
 
 project_maven_coordinates=""
 
+declare -A maven_snapshot_coordinates=(
+["assemblytool"]="com.escenic.tools:assemblytool:jar"
+["engine"]="com.escenic:engine-dist:zip:bin"
+["analysis-engine"]="com.escenic.plugins.analysis:analysis-engine:zip"
+["dashboard"]="com.escenic.plugins.dashboard:dashboard:zip"
+["forum"]="com.escenic.plugins.forum:forum:zip"
+["geocode"]="com.escenic.plugins.geocode:geocode:zip"
+["lucy"]="com.escenic.plugins.lucy:lucy:zip"
+["menu-editor"]="com.escenic.plugins.menu-editor:menu-editor:zip"
+["newsroom"]="com.escenic.plugins.newsroom:newsroom:zip"
+["newsgate"]="com.escenic.plugins.newsgate:newsgate:zip"
+["poll"]="com.escenic.plugins.poll:poll:zip"
+["section-feed"]="com.escenic.plugins.section-feed:section-feed:zip"
+["semantic-cxense"]="com.escenic.plugins.semantic:semantic-cxense:zip"
+["snapshot"]="com.escenic.plugins.snapshot:snapshot:zip"
+["community-engine"]="com.escenic.plugins.community:community-engine:zip"
+["online-graphics"]="com.escenic.plugins.online-graphics:online-graphics:zip"
+["video"]="com.escenic.plugins.video:video:zip"
+["xml-editor"]="com.escenic.plugins.xml-editor:xml-editor:zip"
+["vcpeditor"]="com.escenic.plugins.vcpeditor:vcpeditor:zip"
+["widget-framework-core"]="com.escenic.widget-framework:framework-dist:zip"
+["widget-framework-community"]="com.escenic.widget-framework:framework-community-dist:zip"
+["widget-framework-mobile"]="com.escenic.widget-framework:framework-mobile-dist:zip"
+)
+
 declare -A maven_coordinates=(
 ["assemblytool"]="com.escenic.tools:assemblytool:jar"
 ["engine"]="com.escenic:engine-dist:zip:bin"
 ["analysis-engine"]="com.escenic.plugins.analysis:analysis-engine:zip"
 ["dashboard"]="com.escenic.plugins.dashboard:dashboard:zip"
 ["forum"]="com.escenic.plugins.forum:forum:zip"
-["geocode"]="com.escenic.plugins.geocode:geocode-dist:zip"
-["lucy"]="com.escenic.plugins.lucy:lucy-dist:zip"
-["menu-editor"]="com.escenic.plugins.menu-editor:menu-editor-dist:zip"
-["newsroom"]="com.escenic.plugins.newsroom:newsroom-dist:zip"
+["geocode"]="com.escenic.plugins.geocode:geocode-dist:zip
+com.escenic.plugins.geocode:geocode:zip"
+["lucy"]="com.escenic.plugins.lucy:lucy-dist:zip
+com.escenic.plugins.lucy:lucy:zip"
+["menu-editor"]="com.escenic.plugins.menu-editor:menu-editor-dist:zip
+com.escenic.plugins.menu-editor:menu-editor:zip"
+["newsroom"]="com.escenic.plugins.newsroom:newsroom-dist:zip
+com.escenic.plugins.newsroom:newsroom:zip"
 ["newsgate"]="com.escenic.plugins.newsgate:newsgate:zip"
 ["poll"]="com.escenic.plugins.poll:poll:zip"
-["section-feed"]="com.escenic.plugins.section-feed:section-feed-dist:zip"
-["semantic-cxense"]="com.escenic.plugins.semantic:semantic-cxense-dist:zip"
-["snapshot"]="com.escenic.plugins.snapshot:snapshot-dist:zip"
+["section-feed"]="com.escenic.plugins.section-feed:section-feed-dist:zip
+com.escenic.plugins.section-feed:section-feed:zip"
+["semantic-cxense"]="com.escenic.plugins.semantic:semantic-cxense-dist:zip
+com.escenic.plugins.semantic:semantic-cxense:zip"
+["snapshot"]="com.escenic.plugins.snapshot:snapshot-dist:zip
+com.escenic.plugins.snapshot:snapshot:zip"
 ["community-engine"]="com.escenic.plugins.community:community-engine:zip"
 ["online-graphics"]="com.escenic.plugins.online-graphics:online-graphics:zip"
 ["video"]="com.escenic.plugins.video:video:zip"
@@ -529,6 +561,56 @@ function mvn_coordinate_to_url
 
 }
 
+##
+function mvn_coordinate_to_rest_call
+{
+  # url to be returned
+  local url
+
+  # coordinate is e.g. com.escenic:engine-dist:zip:bin:trunk-SNAPSHOT
+  # or com.escenic.plugins.forum:forum:zip:trunk-SNAPSHOT
+  # groupid:artifactid:[packaging:[classifier:]]version
+  local coordinate=$1
+
+  # local variables parsed from coordinate
+  local groupid
+  local artifactid
+  local version
+  local packaging
+  local classifier
+
+  # chomp groupid: --> artifactid:[packaging:[classifier:]]version
+  groupid=${coordinate/:*}
+  coordinate=${coordinate#${groupid}:}
+
+  # chomp artifactid: --> [packaging:[classifier:]]version
+  artifactid=${coordinate/:*}
+  coordinate=${coordinate#${artifactid}:}
+
+  # chomp version --> [packaging[:classifier]]
+  version=${coordinate/*:}
+  coordinate=${coordinate%${version}}
+  coordinate=${coordinate%:}
+
+  classifier=
+  packaging=
+
+  if [ ! -z "$coordinate" ] ; then
+    # chomp packaging --> [classifier]
+    packaging=${coordinate/:*}
+    coordinate=${coordinate#${packaging}}
+    coordinate=${coordinate#:}
+  fi
+
+  if [ ! -z "$coordinate" ] ; then
+    # chomp classifier
+    classifier=$coordinate
+    coordinate=
+  fi
+
+  echo "&g=${groupid}&a=${artifactid}&v=$version&a=${artifactid}&e=${packaging}${classifier:+&c=${classifier}}"
+}
+
 ##
 function set_java_home
 {
@@ -563,16 +645,23 @@ function fetch_distributions
     run_wrapper mkdir -p $dists_root_dir
   fi
   
-  # iterate over all known distribution identifiers
+  # iterate over all distributions in the project
   for f in ${!project_distributions[@]};
   do
 
-    # try and fetch the version for the distribution from the pom.xml
+    # extract the version from the list of project distributions
     local dist_version=${project_distributions["$f"]}
     
-    # check if a version was returned from the pom.xml
+    # double check that the version isn't null
     if [[ ! $dist_version = "" ]]; then
-      
+
+      # remove old trunk-SNAPSHOT if present
+      if [[ $dist_version = "trunk-SNAPSHOT" ]]; then
+        if [ -d $dists_root_dir/$f-$dist_version ]; then
+          rm -rf $dists_root_dir/$f-$dist_version
+        fi
+      fi
+
       # check if the distribution is already present in the local dists directory
       if [ ! -d $dists_root_dir/$f-$dist_version ]; then
 
@@ -580,14 +669,20 @@ function fetch_distributions
         local artifact_pattern=$f
         local artifact_version=$dist_version
         local target_path=$dists_root_dir
-        
-        for h in ${maven_coordinates["$f"]};
-        do
-          local dist_path=`mvn_coordinate_to_url ${h}:$dist_version`
-
-          # try and add the distribution
-          request_distribution $dist_path
-        done
+       
+        if [[ $dist_version = "trunk-SNAPSHOT" ]]; then
+          for h in ${maven_snapshot_coordinates["$f"]};
+          do
+            local dist_path=`mvn_coordinate_to_rest_call ${h}:$dist_version`
+            request_snapshot $dist_path
+          done
+        else
+          for h in ${maven_coordinates["$f"]};
+          do
+            local dist_path=`mvn_coordinate_to_url ${h}:$dist_version`
+            request_distribution $dist_path
+          done
+        fi 
 
         if [ -e $dists_tmp_dir/distribution.zip ]; then
           run_wrapper cd $dists_tmp_dir
@@ -659,6 +754,19 @@ function request_distribution
   fi
 }
 
+##
+function request_snapshot
+{
+  local dist_path=$1
+  if [ ! -z $dist_path ]; then
+    distribution_exists http://repo.dev.escenic.com/service/local/artifact/maven/redirect?r=trunk$dist_path
+    local ret_val=$?
+    if [ $ret_val -eq 0 ]; then
+      download_distribution http://repo.dev.escenic.com/service/local/artifact/maven/redirect?r=trunk$dist_path
+    fi
+  fi
+}
+
 ##
 function distribution_exists
 {
@@ -689,22 +797,34 @@ function download_distribution
 function print_unstable_distributions
 {
   for f in ${!project_distributions[@]}; do
-    for g in ${maven_coordinates["$f"]}
-    do
-      local dist_path=`mvn_coordinate_to_url ${g}:${project_distributions["$f"]}`
-      if [ ! -z $dist_path ]; then
-        distribution_exists http://maven.vizrt.com/$dist_path
-        if [ $? -ne 0 ]; then
-          distribution_exists http://maven.vizrt.com/unstable/$dist_path
-          if [ $? -eq 0 ]; then
-            print_and_log "WARNING - $f version ${project_distributions["$f"]} is not supported!"
+    if [[ ${project_distributions["$f"]} = "trunk-SNAPSHOT" ]]; then
+      for g in ${maven_snapshot_coordinates["$f"]}
+      do
+        local dist_path=`mvn_coordinate_to_rest_call ${g}:${project_distributions["$f"]}`
+        distribution_exists http://repo.dev.escenic.com/service/local/artifact/maven/redirect?r=trunk$dist_path
+        if [ $? -eq 0 ]; then
+          print_and_log "WARNING - $f version ${project_distributions["$f"]} is not supported!"
+          project_maven_coordinates+="${g}:${project_distributions["$f"]}"$'\n'
+        fi
+      done
+    else
+      for g in ${maven_coordinates["$f"]}
+      do
+        local dist_path=`mvn_coordinate_to_url ${g}:${project_distributions["$f"]}`
+        if [ ! -z $dist_path ]; then
+          distribution_exists http://maven.vizrt.com/$dist_path
+          if [ $? -ne 0 ]; then
+            distribution_exists http://maven.vizrt.com/unstable/$dist_path
+            if [ $? -eq 0 ]; then
+              print_and_log "WARNING - $f version ${project_distributions["$f"]} is not supported!"
+              project_maven_coordinates+="${g}:${project_distributions["$f"]}"$'\n'
+            fi
+          else
             project_maven_coordinates+="${g}:${project_distributions["$f"]}"$'\n'
           fi
-        else
-          project_maven_coordinates+="${g}:${project_distributions["$f"]}"$'\n'
         fi
-      fi
-    done
+      done
+    fi
   done
 }
 

From 5890d15a6ddc221dfa95a921212c40b3fe28eea0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Wed, 4 Sep 2013 15:07:08 +0200
Subject: [PATCH 2129/2585] ece-build - added changelog to the list of known
 plugins

---
 usr/share/escenic/build-scripts/ece-build | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index f744c137..6202b2e6 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -60,6 +60,7 @@ widget-framework-syndication
 mobile-expansion
 semantic-cxense
 snapshot
+changelog
 "
 
 declare -A project_distributions=()

From ae9f65946904bf06bcda4b8d3bf731648a3a3aa3 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 5 Sep 2013 10:29:47 +0200
Subject: [PATCH 2130/2585] Forced SNAPSHOT versions to be stored under the
 SNAPSHOT name instead of the file name that it might be in the repo (with
 verioned snapshots). (cherry picked from commit
 dba2c88256c6745f1bbbef80039baebfa4799de6)

---
 usr/sbin/ece-install | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 1e60a685..b1f105ff 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -185,6 +185,7 @@ function download_escenic_components()
         continue;
       fi
       local repo
+      local targetname=$(basename el)
       for repo in $fai_maven_repositories; do
         # Special handling for snapshots
         if [[ "$el" == *-SNAPSHOT* ]] ; then
@@ -204,7 +205,7 @@ function download_escenic_components()
         fi
         if curl -s -I $repo/$el | grep -q '^HTTP[^ ]* 200' ; then
           log "Downloading $(basename $el) ..."
-          run wget $wget_opts $repo/$el
+          run wget $wget_opts $repo/$el -O $targetname
           break
         else
           log "$(basename $el) not found"

From 879ad78b2ac8e3f87dd9b034a049cbe2bc554197 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Wed, 4 Sep 2013 19:22:56 +0200
Subject: [PATCH 2131/2585] ece-install - corrected missing $

---
 usr/sbin/ece-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index b1f105ff..9ea778eb 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -185,7 +185,7 @@ function download_escenic_components()
         continue;
       fi
       local repo
-      local targetname=$(basename el)
+      local targetname=$(basename $el)
       for repo in $fai_maven_repositories; do
         # Special handling for snapshots
         if [[ "$el" == *-SNAPSHOT* ]] ; then

From dba2c88256c6745f1bbbef80039baebfa4799de6 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 5 Sep 2013 10:29:47 +0200
Subject: [PATCH 2132/2585] Forced SNAPSHOT versions to be stored under the
 SNAPSHOT name instead of the file name that it might be in the repo (with
 verioned snapshots).

---
 usr/sbin/ece-install | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 3ce98230..5efdf298 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -185,6 +185,7 @@ function download_escenic_components()
         continue;
       fi
       local repo
+      local targetname=$(basename el)
       for repo in $fai_maven_repositories; do
         # Special handling for snapshots
         if [[ "$el" == *-SNAPSHOT* ]] ; then
@@ -204,7 +205,7 @@ function download_escenic_components()
         fi
         if curl -s -I $repo/$el | grep -q '^HTTP[^ ]* 200' ; then
           log "Downloading $(basename $el) ..."
-          run wget $wget_opts $repo/$el
+          run wget $wget_opts $repo/$el -O $targetname
           break
         else
           log "$(basename $el) not found"

From d63727951403e28d125c4d81c2b6777505023ee7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Wed, 4 Sep 2013 19:22:56 +0200
Subject: [PATCH 2133/2585] ece-install - corrected missing $

---
 usr/sbin/ece-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 5efdf298..ad9e54b6 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -185,7 +185,7 @@ function download_escenic_components()
         continue;
       fi
       local repo
-      local targetname=$(basename el)
+      local targetname=$(basename $el)
       for repo in $fai_maven_repositories; do
         # Special handling for snapshots
         if [[ "$el" == *-SNAPSHOT* ]] ; then

From b774f8a3cdf6df57527750517fa93804ce13407d Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 5 Sep 2013 19:52:44 +0200
Subject: [PATCH 2134/2585] Added support for the DataSource configuration of
 the upcoming ECE release.

- The DataSources have been merged into one, no ECE_READ_DS and _UPDATE_DS
  just the ECE_DS
- same with the ReadConnector and UpdateConnector
- This depends on the presence of the DataConnector.properties file
  in the machine's /etc/escenic/engine/common/connector/  (which is only
  there if it's a 5.7 installation
- CommunityEngine also uses the ECE_DS when it is present.
---
 .../ece-scripts/ece-install.d/app-server.sh   | 32 +++++++++++++++----
 .../ece-install.d/content-engine.sh           | 21 +++++++++---
 2 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index f2f47646..4cbd207b 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -195,7 +195,11 @@ function set_up_app_server() {
 EOF
   if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER \
     -a $install_profile_number -ne $PROFILE_SEARCH_SERVER ]; then
-    cat >> $tomcat_base/conf/server.xml <<EOF
+    # AFTER Content Engine 5.6, the Read and Update connectors are gone
+    # replaced with ReadConnector.  Configure it appropriately based
+    # on the presence of it in the common nursery dir.
+    if [ ! -r $common_nursery_dir/connector/DataConnector.properties ] ; then
+      cat >> $tomcat_base/conf/server.xml <<EOF
     <Resource
         name="jdbc/ECE_READ_DS"
         auth="Container"
@@ -219,11 +223,22 @@ EOF
         testWhileIdle="true"
         validationQuery="select now()"
     />
+EOF
+    fi
+    if [ -r $common_nursery_dir/connector/DataConnector.properties ] ; then
+      local ds=ECE_DS
+      local max=500
+    else
+      local ds=ECE_UPDATE_DS
+      local max=100
+    fi
+
+    cat >> $tomcat_base/conf/server.xml <<EOF
     <Resource
-        name="jdbc/ECE_UPDATE_DS"
+        name="jdbc/$ds"
         auth="Container"
         type="javax.sql.DataSource"
-        maxActive="100"
+        maxActive="$max"
         maxIdle="8"
         maxWait="2000"
         initialSize="20"
@@ -407,11 +422,16 @@ EOF
 
     # Insert the ResourceLink element.
     local el
-    for el in READ UPDATE ; do
+    if [ -r $common_nursery_dir/connector/DataConnector.properties ] ; then
+      local DSs="_"
+    else
+      local DSs="_READ_ _UPDATE_"
+    fi
+    for el in $DSs ; do
       xmlstarlet ed -P -L \
        -s /Context -t elem -n TMP -v '' \
-       -i //TMP -t attr -n global -v jdbc/ECE_${el}_DS \
-       -i //TMP -t attr -n name -v jdbc/ECE_${el}_DS \
+       -i //TMP -t attr -n global -v jdbc/ECE${el}DS \
+       -i //TMP -t attr -n name -v jdbc/ECE${el}DS \
        -i //TMP -t attr -n type -v javax.sql.DataSource \
        -r //TMP -v ResourceLink \
        $tomcat_base/conf/context.xml
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 050990ee..60c52730 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -530,15 +530,28 @@ databaseProductName=MySQL
 filePublicationRoot=$escenic_data_dir/engine/
 webPublicationRoot=http://${public_host_name}/
 EOF
-  cat > $common_nursery_dir/neo/io/managers/ContentManager.properties <<EOF
+  # AFTER Content Engine 5.6, the Read and Update connectors are gone
+  # replaced with ReadConnector.  Configure it appropriately based
+  # on the presence of it in the common nursery dir.
+  if [ -r $common_nursery_dir/connector/DataConnector.properties ] ; then
+    cat > $common_nursery_dir/neo/io/managers/ContentManager.properties <<EOF
+dataConnector=/connector/DataConnector
+EOF
+  else
+    cat > $common_nursery_dir/neo/io/managers/ContentManager.properties <<EOF
 readConnector=/connector/ReadConnector
 updateConnector=/connector/UpdateConnector
 EOF
-
+  fi
   file=$common_nursery_dir/com/escenic/community/CommunityEngine.properties
   if [ -w ${file} ]; then
-    sed -i 's/jdbc\/ecome/jdbc\/ECE_UPDATE_DS/g' $file
-    exit_on_error "sed on $file"
+    if [ -r $common_nursery_dir/connector/DataConnector.properties ] ; then
+      sed -i 's/jdbc\/ecome/jdbc\/ECE_DS/g' $file
+      exit_on_error "sed on $file"
+    else
+      sed -i 's/jdbc\/ecome/jdbc\/ECE_UPDATE_DS/g' $file
+      exit_on_error "sed on $file"
+    fi
   elif [ ! -e ${file} ]; then
     print_and_log "I Could not find an ECOME configuration file," \
       "I assume you have not installed Community Engine."

From ef951c7a0472fe477be8540c59a053b90187565b Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Mon, 9 Sep 2013 14:15:16 +0200
Subject: [PATCH 2135/2585] Changed deprecated repo.escenic.com with
 maven.vizrt.com in the password check.

---
 usr/sbin/ece-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index ad9e54b6..f4c954b0 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -586,7 +586,7 @@ function check_software_credentials() {
   # if the WF credentials are set, we check to see if they're OK
   if [ -n "${wf_user}" -a -n "${wf_password}" ]; then
     print_and_log "Verifying that Widget Framework credentials are OK ..."
-    local url=http://repo.escenic.com
+    local url=http://maven.vizrt.com
     local notok=$(
       is_unauthorized_to_access_url \
         ${wf_user} \

From c1a1b445f61f3f53263c291d11a1702a1cd3eac9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Thu, 12 Sep 2013 09:34:30 +0200
Subject: [PATCH 2136/2585] ece-build - refactored to avoid using sed for xml
 parsing

---
 usr/share/escenic/build-scripts/ece-build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 6202b2e6..0352551c 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -832,9 +832,9 @@ function print_unstable_distributions
 ##
 function symlink_ece_components
 {
-  for f in $escenic_identifiers
+  for f in ${!project_distributions[@]};
   do
-    version=`sed "/<escenic.$f.version>/!d;s/ *<\/\?escenic.$f.version> *//g" $project_src_dir/pom.xml | tr -d $'\r' `
+    version=${project_distributions["$f"]}
     if [[ ! $version = "" ]]; then
       if [[ "$f" = "engine" ]]; then
         run_wrapper ln -s $dists_root_dir/$f-$version $engine_root_dir 

From b32ce6e34dd5bcb984f8c0970aa60d0a89693e0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Thu, 12 Sep 2013 09:53:17 +0200
Subject: [PATCH 2137/2585] ece-build - Adjusted src_control to avoid failure
 when svn is explicitly selected

---
 usr/share/escenic/build-scripts/ece-build | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 0352551c..3fad70ae 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -249,19 +249,26 @@ function fetch_configuration
 function verify_configuration {
   enforce_variable customer "Your $conf_file is missing the variable 'customer', exiting!"
   if [ -z $src_control ]; then
+
     log "No source control system chosen, I will assume that you are using subversion."
     src_control=svn
-    
+
+  fi
+  if [[ "$src_control" = "svn" ]]; then 
+
     enforce_variable svn_base "Your $conf_file is missing the variable 'svn_base', exiting!"
     enforce_variable svn_user "Your $conf_file is missing the variable 'svn_base', exiting!"
     enforce_variable svn_password "Your $conf_file is missing the variable 'svn_password', exiting!"
     
     # append a / to svn_base if not present
     [[ $svn_base != */ ]] && svn_base="$svn_base"/
+
   elif [[ "$src_control" = "git" ]]; then
+
     enforce_variable git_base "Your $conf_file is missing the variable 'git_base', exiting!"
     enforce_variable git_user "Your $conf_file is missing the variable 'git_base', exiting!"
     enforce_variable git_password "Your $conf_file is missing the variable 'git_password', exiting!"  
+
   else
     print_and_log "The chosen source control system $src_control is NOT supported, exiting!"
   fi

From 1473cafadc1f1d877e039d19951aee4470861637 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Thu, 12 Sep 2013 10:09:58 +0200
Subject: [PATCH 2138/2585] ece-build - implemented ssh support for git

---
 usr/share/escenic/build-scripts/ece-build | 33 ++++++++++++++++++-----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 3fad70ae..ca391083 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -250,27 +250,40 @@ function verify_configuration {
   enforce_variable customer "Your $conf_file is missing the variable 'customer', exiting!"
   if [ -z $src_control ]; then
 
-    log "No source control system chosen, I will assume that you are using subversion."
+    log "No source control system chosen, I will assume that you are using subversion!"
     src_control=svn
 
   fi
   if [[ "$src_control" = "svn" ]]; then 
 
     enforce_variable svn_base "Your $conf_file is missing the variable 'svn_base', exiting!"
-    enforce_variable svn_user "Your $conf_file is missing the variable 'svn_base', exiting!"
+    enforce_variable svn_user "Your $conf_file is missing the variable 'svn_user', exiting!"
+    
     enforce_variable svn_password "Your $conf_file is missing the variable 'svn_password', exiting!"
     
     # append a / to svn_base if not present
     [[ $svn_base != */ ]] && svn_base="$svn_base"/
 
   elif [[ "$src_control" = "git" ]]; then
-
+    
+    if [ -z $git_protocol ]; then
+      log "No protocol chosen for git, I will assume that you are using https!"
+      git_protocol=https
+    fi
+    if [[ "$git_protocol" = "https" ]]; then
+      enforce_variable git_password "Your $conf_file is missing the variable 'git_password', exiting!"
+    elif [[ "$git_protocol" = "svn" ]]; then
+      log "SSH protocol chosen for git, I will not use password based authentication!"
+    else
+      print_and_log "The chosen protocol $git_protocol for $src_control is NOT supported, exiting!"
+      exit 1
+    fi    
     enforce_variable git_base "Your $conf_file is missing the variable 'git_base', exiting!"
-    enforce_variable git_user "Your $conf_file is missing the variable 'git_base', exiting!"
-    enforce_variable git_password "Your $conf_file is missing the variable 'git_password', exiting!"  
+    enforce_variable git_user "Your $conf_file is missing the variable 'git_user', exiting!"
 
   else
     print_and_log "The chosen source control system $src_control is NOT supported, exiting!"
+    exit 1
   fi
 }
 
@@ -475,7 +488,15 @@ function svn_fail_early
 ##
 function git_checkout
 {
-  run_wrapper git clone https://$git_user:$git_password@$git_base $project_src_dir
+  if [[ "$git_protocol" = "https" ]]; then
+    run_wrapper git clone https://$git_user:$git_password@$git_base $project_src_dir
+  elif [[ "$git_protocol" = "ssh" ]]; then
+    run_wrapper git clone ssh://$git_user@$git_base $project_src_dir
+  else
+    print_and_log "The chosen protocol $git_protocol for git is NOT supported, exiting!"
+    exit 1
+  fi
+
   cd $project_src_dir
   revision=`git describe --always`
   release_label=git

From f0e95ec6637c154830f053d56b7841133f859787 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Thu, 12 Sep 2013 10:25:38 +0200
Subject: [PATCH 2139/2585] ece-build - corrected typo in git_protocol check

---
 usr/share/escenic/build-scripts/ece-build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index ca391083..caca298e 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -272,7 +272,7 @@ function verify_configuration {
     fi
     if [[ "$git_protocol" = "https" ]]; then
       enforce_variable git_password "Your $conf_file is missing the variable 'git_password', exiting!"
-    elif [[ "$git_protocol" = "svn" ]]; then
+    elif [[ "$git_protocol" = "ssh" ]]; then
       log "SSH protocol chosen for git, I will not use password based authentication!"
     else
       print_and_log "The chosen protocol $git_protocol for $src_control is NOT supported, exiting!"

From fd100a216ea8ffbbfed3772ffc3a49bc3cabec41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Thu, 12 Sep 2013 10:29:43 +0200
Subject: [PATCH 2140/2585] ece-build - added maven coordinates for changelog

---
 usr/share/escenic/build-scripts/ece-build | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index caca298e..a5a7e3ef 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -71,6 +71,7 @@ declare -A maven_snapshot_coordinates=(
 ["assemblytool"]="com.escenic.tools:assemblytool:jar"
 ["engine"]="com.escenic:engine-dist:zip:bin"
 ["analysis-engine"]="com.escenic.plugins.analysis:analysis-engine:zip"
+["changelog"]="com.escenic.plugins.changelog:changelog:zip"
 ["dashboard"]="com.escenic.plugins.dashboard:dashboard:zip"
 ["forum"]="com.escenic.plugins.forum:forum:zip"
 ["geocode"]="com.escenic.plugins.geocode:geocode:zip"
@@ -96,6 +97,7 @@ declare -A maven_coordinates=(
 ["assemblytool"]="com.escenic.tools:assemblytool:jar"
 ["engine"]="com.escenic:engine-dist:zip:bin"
 ["analysis-engine"]="com.escenic.plugins.analysis:analysis-engine:zip"
+["changelog"]="com.escenic.plugins.changelog:changelog:zip"
 ["dashboard"]="com.escenic.plugins.dashboard:dashboard:zip"
 ["forum"]="com.escenic.plugins.forum:forum:zip"
 ["geocode"]="com.escenic.plugins.geocode:geocode-dist:zip

From f84564c52dca51fd73ad579825715034c392e841 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Thu, 12 Sep 2013 10:38:19 +0200
Subject: [PATCH 2141/2585] ece-build - adjusted maven coordinates for
 changelog

---
 usr/share/escenic/build-scripts/ece-build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index a5a7e3ef..139827ec 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -71,7 +71,7 @@ declare -A maven_snapshot_coordinates=(
 ["assemblytool"]="com.escenic.tools:assemblytool:jar"
 ["engine"]="com.escenic:engine-dist:zip:bin"
 ["analysis-engine"]="com.escenic.plugins.analysis:analysis-engine:zip"
-["changelog"]="com.escenic.plugins.changelog:changelog:zip"
+["changelog"]="com.escenic.changelog:changelog:zip"
 ["dashboard"]="com.escenic.plugins.dashboard:dashboard:zip"
 ["forum"]="com.escenic.plugins.forum:forum:zip"
 ["geocode"]="com.escenic.plugins.geocode:geocode:zip"
@@ -97,7 +97,7 @@ declare -A maven_coordinates=(
 ["assemblytool"]="com.escenic.tools:assemblytool:jar"
 ["engine"]="com.escenic:engine-dist:zip:bin"
 ["analysis-engine"]="com.escenic.plugins.analysis:analysis-engine:zip"
-["changelog"]="com.escenic.plugins.changelog:changelog:zip"
+["changelog"]="com.escenic.changelog:changelog:zip"
 ["dashboard"]="com.escenic.plugins.dashboard:dashboard:zip"
 ["forum"]="com.escenic.plugins.forum:forum:zip"
 ["geocode"]="com.escenic.plugins.geocode:geocode-dist:zip

From 6616314bfede1dfc957530b5f8fcd2b799551616 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Mon, 16 Sep 2013 13:14:07 +0200
Subject: [PATCH 2142/2585] ece-build - making latest links to .ear and conf
 usefull

---
 usr/share/escenic/build-scripts/ece-build | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 139827ec..b2acdfdc 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -1047,7 +1047,7 @@ function publish_ear
     fi
     
     # add new latest.ear link
-    run_wrapper ln -fs $release_dir/$resulting_ear $release_dir/latest.ear
+    run_wrapper ln -fs $release_dir/$resulting_ear $release_dir/$customer-$release_label-latest.ear
   else
     print_and_log "I'm done, but the .ear is still missing, exiting!"
     exit 1
@@ -1169,8 +1169,8 @@ EOF
     run_wrapper mv $target_dir/*.{deb,rpm} $release_dir/
    
     # adding latest links for conf packages
-    run_wrapper ln -sf $release_dir/${package_name}-${package_version}.deb $release_dir/${package_name}-latest.deb
-    run_wrapper ln -sf $release_dir/${package_name}-${package_version}.rpm $release_dir/${package_name}-latest.rpm
+    run_wrapper ln -sf $release_dir/vosa-conf-${machine}-${package_version}.deb $release_dir/vosa-conf-${machine}-latest.deb
+    run_wrapper ln -sf $release_dir/vosa-conf-${machine}-1_${customer}_${release_label}-r${revision}.noarch.rpm $release_dir/vosa-conf-${machine}-1_${customer}_${release_label}-latest.noarch.rpm
  
     # remove work directory
     run_wrapper rm -rf $target_dir

From c18e8c95e37ec5aa3035f3737a308ef38445104d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Mon, 16 Sep 2013 15:05:31 +0200
Subject: [PATCH 2143/2585] ece-build - adjusted latest links

---
 usr/share/escenic/build-scripts/ece-build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index b2acdfdc..7b6a404e 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -1169,7 +1169,7 @@ EOF
     run_wrapper mv $target_dir/*.{deb,rpm} $release_dir/
    
     # adding latest links for conf packages
-    run_wrapper ln -sf $release_dir/vosa-conf-${machine}-${package_version}.deb $release_dir/vosa-conf-${machine}-latest.deb
+    run_wrapper ln -sf $release_dir/vosa-conf-${machine}-${package_version}.deb $release_dir/vosa-conf-${machine}-1-${customer}-${release_label}-latest.deb
     run_wrapper ln -sf $release_dir/vosa-conf-${machine}-1_${customer}_${release_label}-r${revision}.noarch.rpm $release_dir/vosa-conf-${machine}-1_${customer}_${release_label}-latest.noarch.rpm
  
     # remove work directory

From 8e58df9d3395714fdc6dc447f58f341baadc16c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Mon, 16 Sep 2013 21:45:14 +0200
Subject: [PATCH 2144/2585] ece-build - added branch support for git

---
 usr/share/escenic/build-scripts/ece-build | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 7b6a404e..2e88adf4 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -328,6 +328,7 @@ function get_user_options
     case $opt in
       b)
         svn_path=branches/${OPTARG}
+        git_path="-b ${OPTARG}"
         release_label=branch-${OPTARG}
         ;;
       t)
@@ -491,13 +492,23 @@ function svn_fail_early
 function git_checkout
 {
   if [[ "$git_protocol" = "https" ]]; then
-    run_wrapper git clone https://$git_user:$git_password@$git_base $project_src_dir
+    local git_repo_uri="https://$git_user:$git_password@$git_base"
   elif [[ "$git_protocol" = "ssh" ]]; then
-    run_wrapper git clone ssh://$git_user@$git_base $project_src_dir
+    local git_repo_uri="ssh://$git_user@$git_base"
   else
     print_and_log "The chosen protocol $git_protocol for git is NOT supported, exiting!"
     exit 1
   fi
+  if [[ "$git_path" != "" ]]; then
+    local exists=$(git ls-remote --heads $git_repo_uri | grep abranch)
+    if [[ "${exists}" = "" ]]; then
+      print_and_log "The request branch $git_path does NOT exist, exiting!"
+      exit 1
+    fi
+  fi
+  
+  # git checkout
+  run_wrapper git clone $git_path $git_repo_uri $project_src_dir
 
   cd $project_src_dir
   revision=`git describe --always`

From 15b4b0bbd93c09f837f77173035f63a49a420a8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Tue, 17 Sep 2013 02:18:55 +0200
Subject: [PATCH 2145/2585] ece-build - do not display empty conf package links

---
 usr/share/escenic/build-scripts/ece-build | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 2e88adf4..7428555b 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -1187,14 +1187,18 @@ EOF
     run_wrapper rm -rf $target_dir
   done
 
-  print_and_log "--- .deb configuration packages ---"  
-  for machine in $machine_list; do 
-    print_and_log "http://builder.vizrtsaas.com/$customer/releases/vosa-conf-${machine}-${package_version}.deb"
-  done
-  print_and_log "--- .rpm configuration packages ---"
-  for machine in $machine_list; do
-    print_and_log "http://builder.vizrtsaas.com/$customer/releases/vosa-conf-${machine}-1_${customer}_${release_label}-r${revision}.noarch.rpm"
-  done
+  if [ -z "$machine_list" ]; then 
+    print_and_log "Your project does not have any folders, except maybe common, under server-admin so no configuration packages will be generated."
+  else
+    print_and_log "--- .deb configuration packages ---"  
+    for machine in $machine_list; do 
+      print_and_log "http://builder.vizrtsaas.com/$customer/releases/vosa-conf-${machine}-${package_version}.deb"
+    done
+    print_and_log "--- .rpm configuration packages ---"
+    for machine in $machine_list; do
+      print_and_log "http://builder.vizrtsaas.com/$customer/releases/vosa-conf-${machine}-1_${customer}_${release_label}-r${revision}.noarch.rpm"
+    done
+  fi
 }
 
 ##

From 6a08ecc7f3b3218b77adf99586ca4cf129fd21aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Tue, 17 Sep 2013 09:44:39 +0200
Subject: [PATCH 2146/2585] ece-build - added new note plugin to list of known
 dists

---
 usr/share/escenic/build-scripts/ece-build | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 7428555b..d87137a4 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -61,7 +61,7 @@ mobile-expansion
 semantic-cxense
 snapshot
 changelog
-"
+note"
 
 declare -A project_distributions=()
 
@@ -79,6 +79,7 @@ declare -A maven_snapshot_coordinates=(
 ["menu-editor"]="com.escenic.plugins.menu-editor:menu-editor:zip"
 ["newsroom"]="com.escenic.plugins.newsroom:newsroom:zip"
 ["newsgate"]="com.escenic.plugins.newsgate:newsgate:zip"
+["note"]="com.escenic.plugins.note:note:zip"
 ["poll"]="com.escenic.plugins.poll:poll:zip"
 ["section-feed"]="com.escenic.plugins.section-feed:section-feed:zip"
 ["semantic-cxense"]="com.escenic.plugins.semantic:semantic-cxense:zip"
@@ -109,6 +110,7 @@ com.escenic.plugins.menu-editor:menu-editor:zip"
 ["newsroom"]="com.escenic.plugins.newsroom:newsroom-dist:zip
 com.escenic.plugins.newsroom:newsroom:zip"
 ["newsgate"]="com.escenic.plugins.newsgate:newsgate:zip"
+["note"]="com.escenic.plugins.note:note:zip"
 ["poll"]="com.escenic.plugins.poll:poll:zip"
 ["section-feed"]="com.escenic.plugins.section-feed:section-feed-dist:zip
 com.escenic.plugins.section-feed:section-feed:zip"

From ea456a5b98dce2cac6cdf7834728afcaf046f9be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Wed, 18 Sep 2013 08:15:57 +0200
Subject: [PATCH 2147/2585] ece-build - Fixed typo in branch check

---
 usr/share/escenic/build-scripts/ece-build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index d87137a4..d685b2dd 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -502,7 +502,7 @@ function git_checkout
     exit 1
   fi
   if [[ "$git_path" != "" ]]; then
-    local exists=$(git ls-remote --heads $git_repo_uri | grep abranch)
+    local exists=$(git ls-remote --heads $git_repo_uri | grep $git_path)
     if [[ "${exists}" = "" ]]; then
       print_and_log "The request branch $git_path does NOT exist, exiting!"
       exit 1

From acc2ab9ae820144edbf411275cf58a3ca7073031 Mon Sep 17 00:00:00 2001
From: Monzurul Hoque Ziku <mhoque@vizrt.com>
Date: Thu, 26 Sep 2013 16:54:48 +0600
Subject: [PATCH 2148/2585] VIZRTSAAS-229: added generate-git-changelog file
 supports git server

---
 usr/bin/generate-git-changelog | 210 +++++++++++++++++++++++++++++++++
 1 file changed, 210 insertions(+)
 create mode 100755 usr/bin/generate-git-changelog

diff --git a/usr/bin/generate-git-changelog b/usr/bin/generate-git-changelog
new file mode 100755
index 00000000..dd43ae66
--- /dev/null
+++ b/usr/bin/generate-git-changelog
@@ -0,0 +1,210 @@
+#! /usr/bin/env bash
+
+log=$HOME/.$(basename $0).log
+archive_base_dir=$HOME/.$(basename $0)
+
+function bootstrap_thyself() {
+  # first, try to be nice, then check the standard location
+  local dir=$(dirname $0)/../share/escenic/ece-scripts
+  if [ ! -d $dir  ]; then
+    dir=/usr/share/escenic/ece-scripts
+  fi
+
+  local common_libraries="
+    common-bashing.sh
+    common-io.sh
+  "
+
+  for el in $common_libraries; do
+    source $dir/$el 2>/dev/null || {
+      echo "$(basename $0): Could not load the library $el," \
+        "and I can't live without it :-(" | fmt
+      exit 1
+    }
+  done
+}
+
+function read_user_settings() {
+  local file=$HOME/.$(basename $0).conf
+  if [ -r $file ]; then
+    run source $file
+  else
+    log $(blue INFO) $file "doesn't exist, will default to Atlassian on Demand"
+  fi
+}
+
+function get_header_from_jira() {
+  local body=$(curl -u ${user}:${password} -s ${jira_base_url}/browse/${1})
+  echo "$body" | grep '<title>' | sed -e 's/<title>//g' -e 's/<\/title>//g'
+}
+
+function get_to_revision() {
+  echo ${to-40acfc9}
+}
+
+function get_from_revision() {
+  echo ${from-PREV}
+}
+
+function get_user_input() {
+  local next_is_from=0
+  local next_is_to=0
+  local next_is_project=0
+  local next_is_user=0
+  local next_is_password=0
+  
+  for el in "$@"; do
+    if [[ "$el" == "-s" || "$el" == "--from" ]]; then
+      next_is_from=1
+    elif [[ "$el" == "-u" || "$el" == "--user" ]]; then
+      next_is_user=1
+    elif [[ "$el" == "-p" || "$el" == "--password" ]]; then
+      next_is_password=1
+    elif [[ "$el" == "-t" || "$el" == "--to" ]]; then
+      next_is_to=1
+    elif [[ "$el" == "-p" || "$el" == "--project" ]]; then
+      next_is_project=1
+    elif [[ "$el" == "-f" || "$el" == "--full" ]]; then
+      full_listing=1
+    elif [ ${next_is_from-0} -eq 1 ]; then
+      from=$el
+      next_is_from=0
+    elif [ ${next_is_user-0} -eq 1 ]; then
+      user=$el
+      next_is_user=0
+    elif [ ${next_is_password-0} -eq 1 ]; then
+      password=$el
+      next_is_password=0
+    elif [ ${next_is_to-0} -eq 1 ]; then
+      to=$el
+      next_is_to=0
+    elif [ ${next_is_project-0} -eq 1 ]; then
+      project_code=$el
+      next_is_project=0
+    fi
+  done
+}
+
+function should_regenerate() {
+  if [[ $(is_number $(get_from_revision)) -eq 1 && \
+    $(is_number $(get_to_revision)) ]]; then
+    echo 0
+    return
+  fi
+
+  echo 1
+}
+
+function get_commit_information_from_vcs() {
+  the_diff=$(get_archive_dir)/from-$(get_from_revision)-to-$(get_to_revision).diff
+
+  if [[ ! -e $the_diff || $(should_regenerate) -eq 1 ]]; then
+    git diff $(get_from_revision) $(get_to_revision) > $the_diff
+    exit_on_error "git diff $(get_from_revision) $(get_to_revision)"
+  fi
+
+  if [ ${full_listing-0} -eq 1 ]; then
+    cat $the_diff
+  else
+    echo "Full diff of all" $(egrep '^(\+|\-)' $the_diff | wc -l) \
+      "changes:" $the_diff | fmt
+  fi
+}
+
+## $@ :: git revision number or tag name
+function get_date_from_svn_log() {
+  echo $(git log -1 --format="%cd")
+}
+
+
+function get_svn_location() {
+  git config --get remote.origin.url
+}
+
+
+function get_info_from_jira() {
+  the_report=$(get_archive_dir)/from-$(get_from_revision)-to-$(get_to_revision).report
+  
+  if [[ ! -e $the_report || $(should_regenerate) -eq 1 ]]; then
+    echo "Changes in $(get_svn_location)" > $the_report  
+    echo "From: revision $(get_from_revision) @" \
+      $(get_date_from_svn_log $(get_from_revision)) >> $the_report
+    echo "To  : revision $(get_to_revision) @" \
+      $(get_date_from_svn_log $(get_to_revision)) >> $the_report
+
+    local commit_log=$(git log $(get_from_revision) $(get_to_revision))
+    echo "$commit_log" | \
+      grep ${project_code}-[0-9]* | \
+      sed "s#.*\(${project_code}-[0-9]*\).*#\1#g" | \
+      sort | \
+      uniq | while read f; do
+      echo "   *" $(get_header_from_jira $f) | fmt >> $the_report
+      echo "   URL: ${jira_base_url}/browse/$(basename $f)" >> $the_report
+      echo "" >> $the_report
+    done
+
+    add_risk_assemsment_to_report
+  fi
+
+  echo "Report:" $the_report
+}
+
+function sanity_check() {
+
+  #if [ ! -e $(pwd)/.git ]; then
+  #  print "This directory, $(pwd), " \
+  #    "does not contain a working version control checkout."
+  #  exit 1
+  #fi
+
+  # defaulting to Atlassian on demand
+  jira_base_url=${jira_base_url-https://vizrtcustomers.jira.com}
+  if [ -z "$git_base_url" ]; then
+    # bash default string substitution terminates with slashes, hence
+    # have to set this manually here.
+    git_base_url="ssh://git@git.vizrtsaas.com"
+  fi
+
+  conf_file=$HOME/.$(basename $0).conf
+  ensure_variable_is_set \
+    project_code \
+    user \
+    password \
+    jira_base_url \
+    git_base_url
+
+  if [[ "$(get_from_revision)" == "$(get_to_revision)" ]]; then
+    print_and_log "From and to revision are the same," \
+      "will no create any change log"
+    exit 0
+  fi
+}
+
+function get_project() {
+  echo $(lowercase ${project_code})
+}
+
+function get_archive_dir() {
+  local project_context=$(lowercase $(get_svn_location | \
+    sed -e  "s#${git_base_url}/##g" -e 's#[ ]*##g')
+  )
+  
+  local dir=${archive_base_dir}/${project_context}
+  make_dir $dir
+  echo $dir
+}
+
+function add_risk_assemsment_to_report() {
+  echo "Risk assessment score: " \
+    $(wc -l $the_diff 2>/dev/null | cut -d' ' -f1) \
+    >> $the_report
+}
+
+bootstrap_thyself
+read_user_settings
+get_user_input "$@"
+sanity_check
+get_commit_information_from_vcs
+get_info_from_jira
+
+

From 870cd87cd94a76e936fb6418af6f0c9eb6ae392e Mon Sep 17 00:00:00 2001
From: Monzurul Hoque Ziku <mhoque@vizrt.com>
Date: Thu, 26 Sep 2013 17:21:33 +0600
Subject: [PATCH 2149/2585] VIZRTSAAS-229: edited generate-git-changelog

---
 usr/bin/generate-git-changelog  |   2 +-
 usr/bin/generate-git-changelog~ | 210 ++++++++++++++++++++++++++++++++
 2 files changed, 211 insertions(+), 1 deletion(-)
 create mode 100755 usr/bin/generate-git-changelog~

diff --git a/usr/bin/generate-git-changelog b/usr/bin/generate-git-changelog
index dd43ae66..7e2a91d8 100755
--- a/usr/bin/generate-git-changelog
+++ b/usr/bin/generate-git-changelog
@@ -39,7 +39,7 @@ function get_header_from_jira() {
 }
 
 function get_to_revision() {
-  echo ${to-40acfc9}
+  echo ${to-COMMITTED}
 }
 
 function get_from_revision() {
diff --git a/usr/bin/generate-git-changelog~ b/usr/bin/generate-git-changelog~
new file mode 100755
index 00000000..dd43ae66
--- /dev/null
+++ b/usr/bin/generate-git-changelog~
@@ -0,0 +1,210 @@
+#! /usr/bin/env bash
+
+log=$HOME/.$(basename $0).log
+archive_base_dir=$HOME/.$(basename $0)
+
+function bootstrap_thyself() {
+  # first, try to be nice, then check the standard location
+  local dir=$(dirname $0)/../share/escenic/ece-scripts
+  if [ ! -d $dir  ]; then
+    dir=/usr/share/escenic/ece-scripts
+  fi
+
+  local common_libraries="
+    common-bashing.sh
+    common-io.sh
+  "
+
+  for el in $common_libraries; do
+    source $dir/$el 2>/dev/null || {
+      echo "$(basename $0): Could not load the library $el," \
+        "and I can't live without it :-(" | fmt
+      exit 1
+    }
+  done
+}
+
+function read_user_settings() {
+  local file=$HOME/.$(basename $0).conf
+  if [ -r $file ]; then
+    run source $file
+  else
+    log $(blue INFO) $file "doesn't exist, will default to Atlassian on Demand"
+  fi
+}
+
+function get_header_from_jira() {
+  local body=$(curl -u ${user}:${password} -s ${jira_base_url}/browse/${1})
+  echo "$body" | grep '<title>' | sed -e 's/<title>//g' -e 's/<\/title>//g'
+}
+
+function get_to_revision() {
+  echo ${to-40acfc9}
+}
+
+function get_from_revision() {
+  echo ${from-PREV}
+}
+
+function get_user_input() {
+  local next_is_from=0
+  local next_is_to=0
+  local next_is_project=0
+  local next_is_user=0
+  local next_is_password=0
+  
+  for el in "$@"; do
+    if [[ "$el" == "-s" || "$el" == "--from" ]]; then
+      next_is_from=1
+    elif [[ "$el" == "-u" || "$el" == "--user" ]]; then
+      next_is_user=1
+    elif [[ "$el" == "-p" || "$el" == "--password" ]]; then
+      next_is_password=1
+    elif [[ "$el" == "-t" || "$el" == "--to" ]]; then
+      next_is_to=1
+    elif [[ "$el" == "-p" || "$el" == "--project" ]]; then
+      next_is_project=1
+    elif [[ "$el" == "-f" || "$el" == "--full" ]]; then
+      full_listing=1
+    elif [ ${next_is_from-0} -eq 1 ]; then
+      from=$el
+      next_is_from=0
+    elif [ ${next_is_user-0} -eq 1 ]; then
+      user=$el
+      next_is_user=0
+    elif [ ${next_is_password-0} -eq 1 ]; then
+      password=$el
+      next_is_password=0
+    elif [ ${next_is_to-0} -eq 1 ]; then
+      to=$el
+      next_is_to=0
+    elif [ ${next_is_project-0} -eq 1 ]; then
+      project_code=$el
+      next_is_project=0
+    fi
+  done
+}
+
+function should_regenerate() {
+  if [[ $(is_number $(get_from_revision)) -eq 1 && \
+    $(is_number $(get_to_revision)) ]]; then
+    echo 0
+    return
+  fi
+
+  echo 1
+}
+
+function get_commit_information_from_vcs() {
+  the_diff=$(get_archive_dir)/from-$(get_from_revision)-to-$(get_to_revision).diff
+
+  if [[ ! -e $the_diff || $(should_regenerate) -eq 1 ]]; then
+    git diff $(get_from_revision) $(get_to_revision) > $the_diff
+    exit_on_error "git diff $(get_from_revision) $(get_to_revision)"
+  fi
+
+  if [ ${full_listing-0} -eq 1 ]; then
+    cat $the_diff
+  else
+    echo "Full diff of all" $(egrep '^(\+|\-)' $the_diff | wc -l) \
+      "changes:" $the_diff | fmt
+  fi
+}
+
+## $@ :: git revision number or tag name
+function get_date_from_svn_log() {
+  echo $(git log -1 --format="%cd")
+}
+
+
+function get_svn_location() {
+  git config --get remote.origin.url
+}
+
+
+function get_info_from_jira() {
+  the_report=$(get_archive_dir)/from-$(get_from_revision)-to-$(get_to_revision).report
+  
+  if [[ ! -e $the_report || $(should_regenerate) -eq 1 ]]; then
+    echo "Changes in $(get_svn_location)" > $the_report  
+    echo "From: revision $(get_from_revision) @" \
+      $(get_date_from_svn_log $(get_from_revision)) >> $the_report
+    echo "To  : revision $(get_to_revision) @" \
+      $(get_date_from_svn_log $(get_to_revision)) >> $the_report
+
+    local commit_log=$(git log $(get_from_revision) $(get_to_revision))
+    echo "$commit_log" | \
+      grep ${project_code}-[0-9]* | \
+      sed "s#.*\(${project_code}-[0-9]*\).*#\1#g" | \
+      sort | \
+      uniq | while read f; do
+      echo "   *" $(get_header_from_jira $f) | fmt >> $the_report
+      echo "   URL: ${jira_base_url}/browse/$(basename $f)" >> $the_report
+      echo "" >> $the_report
+    done
+
+    add_risk_assemsment_to_report
+  fi
+
+  echo "Report:" $the_report
+}
+
+function sanity_check() {
+
+  #if [ ! -e $(pwd)/.git ]; then
+  #  print "This directory, $(pwd), " \
+  #    "does not contain a working version control checkout."
+  #  exit 1
+  #fi
+
+  # defaulting to Atlassian on demand
+  jira_base_url=${jira_base_url-https://vizrtcustomers.jira.com}
+  if [ -z "$git_base_url" ]; then
+    # bash default string substitution terminates with slashes, hence
+    # have to set this manually here.
+    git_base_url="ssh://git@git.vizrtsaas.com"
+  fi
+
+  conf_file=$HOME/.$(basename $0).conf
+  ensure_variable_is_set \
+    project_code \
+    user \
+    password \
+    jira_base_url \
+    git_base_url
+
+  if [[ "$(get_from_revision)" == "$(get_to_revision)" ]]; then
+    print_and_log "From and to revision are the same," \
+      "will no create any change log"
+    exit 0
+  fi
+}
+
+function get_project() {
+  echo $(lowercase ${project_code})
+}
+
+function get_archive_dir() {
+  local project_context=$(lowercase $(get_svn_location | \
+    sed -e  "s#${git_base_url}/##g" -e 's#[ ]*##g')
+  )
+  
+  local dir=${archive_base_dir}/${project_context}
+  make_dir $dir
+  echo $dir
+}
+
+function add_risk_assemsment_to_report() {
+  echo "Risk assessment score: " \
+    $(wc -l $the_diff 2>/dev/null | cut -d' ' -f1) \
+    >> $the_report
+}
+
+bootstrap_thyself
+read_user_settings
+get_user_input "$@"
+sanity_check
+get_commit_information_from_vcs
+get_info_from_jira
+
+

From 549542e17213ce3ca83f177816f7eaf2a2cef1cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Thu, 19 Sep 2013 13:55:46 +0200
Subject: [PATCH 2150/2585] ece-build-guide - major revision adding git support
 and hardening

---
 .../escenic/build-scripts/ece-build-guide     | 289 ++++++++++++++----
 1 file changed, 230 insertions(+), 59 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build-guide b/usr/share/escenic/build-scripts/ece-build-guide
index e07eaa47..89afb0e3 100755
--- a/usr/share/escenic/build-scripts/ece-build-guide
+++ b/usr/share/escenic/build-scripts/ece-build-guide
@@ -1,78 +1,249 @@
 #! /usr/bin/env bash
 
-source /usr/share/escenic/ece-scripts/common-bashing.sh || {
-    echo "Couldn't find common-bashing library"
+ece_scripts_home=/usr/share/escenic/ece-scripts
+log=~/ece-build-guide.log
+conf_file=~/.build/build.conf
+handbook_dir=~/handbook/
+handbook_target_dir=/var/www/$USER
+src_sdp_dir=${handbook_dir}sdp
+
+##
+function init
+{
+  init_failed=0
+  if [ ! -d $ece_scripts_home ]; then
+    init_failed=1
+    error_message="The directory for ece-scripts $ece_scripts_home does not exist, exiting!"
+  elif [ ! -e $ece_scripts_home/common-bashing.sh ]; then
+    init_failed=1
+    error_message="The script $ece_scripts_home/common-bashing.sh does not exist, exiting!"
+  elif [ ! -e $ece_scripts_home/common-io.sh ]; then
+    init_failed=1
+    error_message="The script $ece_scripts_home/common-io.sh does not exist, exiting!"
+  fi
+  if [ $init_failed -eq 0 ]; then
+    source $ece_scripts_home/common-bashing.sh
+    source $ece_scripts_home/common-io.sh
+  else
+    echo "$error_message"
     exit 1
-}
+  fi
 
-log=$HOME/$(basename $0 .sh).log
-log "$USER is building his/her handbook @ $(date)"
-
-source ~/.build/build.conf
-
-# TODO move to the builder itself once this matures, 2012-08-20
-handbook_dir=~/handbook/
-if [ -e $handbook_dir ]; then
-    echo building the guide
-else
-    echo building the guide from scratch
-    run mkdir $handbook_dir
-    echo '/usr/bin/ece-build-guide' > $handbook_dir/create-my-handbook.sh
-    chmod 777 $handbook_dir/create-my-handbook.sh
-fi
+  # set pid
+  pid_file=~/ece-build-guide.pid
 
-handbook_target_dir=/var/www/$USER
+  if [ -e $pid_file ]; then
+    echo "Instance of $(basename $0) already running!"
+    exit 1
+  else
+    create_pid
+  fi
 
-svn_sdp_repo=${svn_base}sdp
-svn_sdp_dir=${handbook_dir}sdp
-handbook_conf_file=$svn_sdp_dir/vosa-handbook/create-handbook.conf
+  trap common_bashing_exit_hook_with_log_recap EXIT
+  trap common_bashing_user_cancelled_hook SIGINT SIGHUP
+}
 
-svn_handbook_repo=https://vizrtcustomers.jira.com/svn/VIZRTSAAS/trunk/doc
-svn_handbook_dir=${handbook_dir}VIZRTSAAS/doc
+## To make your script call this whenever it does a controlled exit,
+## either by running through the script, call this hook.
+##
+## Put this line at the start of your script:
+##
+## trap common_bashing_exit_hooki_with_log_recap EXIT
+##
+## $@ :: signal
+function common_bashing_exit_hook_with_log_recap() {
+  local RETVAL=$?
+  if [ $RETVAL -ne 0 ]; then
+    print "BUILD FAILED/CANCELED"
+    print "### start tail review of $log ###"
+    tail -n 25 $log
+    print "### end of review ###"
+  fi
+  remove_pid
+  remove_lock
+  kill $$
+}
 
+### run
+## Runs the passed command & arguments and log both standard error and
+## standard out. If the command exits cleanly, the calling code will
+## continue, however, if the command you passed to run failed, the run
+## wrapper will log the call stack and exit in error.
+##
+## $@ :: list of strings making up your command. Everything except
+##       pipes can be bassed
+function run_wrapper() {
+  if [ ! -e $log ]; then
+    touch $log || {
+      echo "Couldn't create $log"
+      exit 1
+    }
+  fi
+
+  "${@}" 1>>$log 2>>$log
+
+  local RETVAL=$?
+  if [ $RETVAL -ne 0 ]; then
+    print_and_log "The command <${@}> run as user $USER $(red FAILED)" \
+      "(the command exited with code ${code}), I'll exit now :-("
+    exit 1
+  fi
+}
 
-# set up PROJECT doc scripts and standard content
-if [ -e $svn_sdp_dir ]; then
-    run cd $svn_sdp_dir
-    echo getting latest from $svn_sdp_repo
-    run svn update
-else
-    run cd ${handbook_dir}
-    echo svn checkout $svn_sdp_repo $svn_sdp_dir --username $svn_user
-    run svn checkout $svn_sdp_repo $svn_sdp_dir --username $svn_user
-fi
+##
+function fetch_configuration
+{
+  if [ -e $conf_file ]; then
+    source $conf_file
+  else
+    print_and_log "Your user is missing the $conf_file, exiting!"
+    exit 1
+  fi
+  if [ -z $src_control ]; then
+    print_and_log "No source control system chosen, I will assume that you are using subversion!"
+    src_control=svn
+  fi
+}
 
+##
+function setup_handbook_dir
+{
+  if [ -e $handbook_dir ]; then
+    log "Building the guide."
+  else
+    log "Building the guide from scratch."
+    run_wrapper mkdir $handbook_dir
+    echo '/usr/bin/ece-build-guide' > $handbook_dir/create-my-handbook.sh
+    run_wrapper chmod 777 $handbook_dir/create-my-handbook.sh
+  fi
+}
 
-# set up VIZRTSAAS doc scripts and standard content
-if [ -e $svn_handbook_dir ]; then
-    run cd $svn_handbook_dir
-    echo getting latest from $svn_handbook_repo
-    run svn update
-else
-    run cd ${handbook_dir}
-    echo svn checkout $svn_handbook_repo $svn_handbook_dir --username $svn_user
-    run svn checkout $svn_handbook_repo $svn_handbook_dir --username $svn_user
-fi
+##
+function verify_configuration
+{
+  if [[ "$src_control" = "svn" ]]; then
+    src_sdp_repo=${svn_base}sdp
+    src_handbook_repo=https://vizrtcustomers.jira.com/svn/VIZRTSAAS/trunk/doc
+    src_handbook_dir=${handbook_dir}VIZRTSAAS/doc
+  elif [[ "$src_control" = "git" ]]; then
+    src_handbook_repo=ssh://git@git.vizrtsaas.com/vizrtsaas.git
+    src_handbook_dir=${handbook_dir}VIZRTSAAS
+    if [ -z $git_protocol ]; then
+      log "No protocol chosen for git, I will assume that you are using https!"
+      git_protocol=https
+    fi
+    if [[ "$git_protocol" = "https" ]]; then
+      src_sdp_repo="https://$git_user:$git_password@$git_base"
+      enforce_variable git_password "Your $conf_file is missing the variable 'git_password', exiting!"
+    elif [[ "$git_protocol" = "ssh" ]]; then
+      src_sdp_repo="ssh://$git_user@$git_base"
+      log "SSH protocol chosen for git, I will not use password based authentication!"
+    else
+      print_and_log "The chosen protocol $git_protocol for $src_control is NOT supported, exiting!"
+      exit 1
+    fi
+  else
+    print_and_log "The chosen source control system $src_control is NOT supported, exiting!"
+    exit 1
+  fi
+  handbook_conf_file=$src_sdp_dir/vosa-handbook/create-handbook.conf
+}
 
+##
+function checkout_sdp
+{
+  if [[ "$src_control" = "svn" ]]; then
+    if [ -e $src_sdp_dir ]; then
+      run_wrapper cd $src_sdp_dir
+      log "Getting latest from $src_sdp_repo"
+      run_wrapper svn update
+    else
+      run_wrapper cd ${handbook_dir}
+      run_wrapper svn checkout $src_sdp_repo $src_sdp_dir --username $svn_user
+    fi  
+  elif [[ "$src_control" = "git" ]]; then
+    if [ -e $src_sdp_dir ]; then
+      run_wrapper cd $src_sdp_dir
+      log "Getting latest from $src_sdp_repo"
+      run_wrapper git pull --rebase
+    else
+      run_wrapper cd ${handbook_dir}
+      local sdp_exists=$(git ls-remote --heads $src_sdp_repo | grep sdp)
+      if [[ "${sdp_exists}" = "" ]]; then
+        print_and_log "The request branch sdp does NOT exist in the project, exiting!"
+      fi
+      run_wrapper git clone -b sdp $src_sdp_repo $src_sdp_dir
+    fi
+  else
+    print_and_log "The chosen source control system $src_control is NOT supported, exiting!"
+  fi
+}
 
+##
+function checkout_standard_handbook
+{
+  if [[ "$src_control" = "svn" ]]; then
+    if [ -e $src_handbook_dir ]; then
+      run_wrapper cd $src_handbook_dir
+      log "Getting latest from $src_handbook_repo"
+      run_wrapper svn update
+    else
+      run_wrapper cd ${handbook_dir}
+      run_wrapper svn checkout $src_handbook_repo $src_handbook_dir --username $svn_user
+    fi
+  elif [[ "$src_control" = "git" ]]; then
+    if [ -e $src_handbook_dir ]; then
+      run_wrapper cd $src_handbook_dir
+      log "Getting latest from $src_handbook_repo"
+      run_wrapper git pull --rebase
+    else
+      run_wrapper cd ${handbook_dir}
+      local sdp_exists=$(git ls-remote --heads $src_handbook_repo | grep sdp)
+      if [[ "${sdp_exists}" = "" ]]; then
+        print_and_log "The request branch sdp does NOT exist for the shared handbook, exiting!"
+        exit 1
+      fi
+      run_wrapper git clone -b sdp $src_handbook_repo $src_handbook_dir
+    fi
+  else
+    print_and_log "The chosen source control system $src_control is NOT supported, exiting!"
+  fi
+}
 
-# verify that the current project has its trails
-if [ ! -e $handbook_conf_file ]; then
-    echo $handbook_conf_file "doesn't exist :-("
+##
+function verify_handbook_conf
+{
+  # verify that the current project has its trails
+  if [ ! -e $handbook_conf_file ]; then
+    print_and_log "$handbook_conf_file does NOT exist, exiting!"
     exit 1
-fi
+  fi
+}
 
+##
+function build_guide
+{
 (
-    run cd $svn_handbook_dir
-    run bash vosa-handbook/create-handbook.sh \
-	--conf-file $handbook_conf_file \
-	--doc-dir $svn_sdp_dir/vosa-handbook
-
-    find $handbook_target_dir -type d -name ".svn" | xargs rm -rf
-    run cp ~/tmp/create-handbook-$(date --iso)/vosa-handbook.html \
-	$handbook_target_dir/index.html 
-    run cp -r ~/tmp/create-handbook-$(date --iso)/graphics $handbook_target_dir/
-    run cp -r ~/tmp/create-handbook-$(date --iso)/customer $handbook_target_dir/
+  run_wrapper cd ${handbook_dir}VIZRTSAAS/doc
+  run_wrapper bash vosa-handbook/create-handbook.sh \
+      --conf-file $handbook_conf_file \
+      --doc-dir $src_sdp_dir/vosa-handbook
+  find $handbook_target_dir -type d -name ".svn" | xargs rm -rf
+  run_wrapper cp ~/tmp/create-handbook-$(date --iso)/vosa-handbook.html \
+      $handbook_target_dir/index.html 
+  run_wrapper cp -r ~/tmp/create-handbook-$(date --iso)/graphics $handbook_target_dir/
+  run_wrapper cp -r ~/tmp/create-handbook-$(date --iso)/customer $handbook_target_dir/
 )
+}
 
-log "$USER finished building his/her handbook @ $(date)"
+## ece-build execution
+init
+print_and_log "The user $USER is building the handbook @ $(date)"
+fetch_configuration
+setup_handbook_dir
+verify_configuration
+checkout_sdp
+checkout_standard_handbook
+verify_handbook_conf
+build_guide
+print_and_log "The user $USER finished building the handbook @ $(date)"

From ed39d6a13e66c25855ef4fbc10e3fe02f2567e96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Fri, 20 Sep 2013 09:03:19 +0200
Subject: [PATCH 2151/2585] ece-install - changed jar to zip for publication
 resource filtering

---
 .../ece-scripts/ece-install.d/create-publication.sh        | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
index 061687f2..0ad8722e 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
@@ -7,16 +7,17 @@ function create_publication_prepare_war_file() {
     local the_tmp_dir=$(mktemp -d)
     (
       cd $the_tmp_dir
-      run jar xf $1
+      #run jar xf $1
 
       for el in $fai_publication_war_remove_file_list; do
         if [ -e $el ]; then
           print_and_log "Removing" $el "from" $(basename $1) "..."
-          run rm $el
+          #run rm $el
+          zip -d $1 $el
         fi
       done
 
-      run jar cf $1 .
+      #run jar cf $1 .
     )
   fi
 }

From a2aeeec84aaf5c7df114355fc4b8c100fe5af51c Mon Sep 17 00:00:00 2001
From: saif shams <sshams@vizrt.com>
Date: Fri, 27 Sep 2013 15:18:58 +0200
Subject: [PATCH 2152/2585] VIZRTSAAS-237:amazon.conf now can have
 amazon_config_initial_disk_size variable

---
 usr/bin/vosa                                       | 2 ++
 usr/share/vizrt/vosa/commands/amazon_config_parser | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index ddebfc75..df963061 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -850,6 +850,7 @@ function do_create() {
       read_amazon_config $instance_dir/amazon.conf
       # TODO: sanitize "required" variables
       if $USE_AWS_CLI ; then
+        json="[{\"device_name\":\"/dev/sda1\", \"ebs\":{\"volume_size\":$amazon_config_initial_disk_size} } ]"
         opts=( "--image-id" ${amazon_config_image}
                "--min-count" "1"
                "--max-count" "1"
@@ -857,6 +858,7 @@ function do_create() {
         ${amazon_config_type/#/--instance-type }  \
         ${amazon_config_ssh_keypair/#/--key-name }  \
         ${amazon_config_group[@]/#/--security-groups } \
+         --block-device-mapping "${json}" \
         ${amazon_config_subnet/#/--subnet-id }
       )
       if [ ! -z ${amazon_config_user_data} ] ; then
diff --git a/usr/share/vizrt/vosa/commands/amazon_config_parser b/usr/share/vizrt/vosa/commands/amazon_config_parser
index fd5074ea..3293a254 100644
--- a/usr/share/vizrt/vosa/commands/amazon_config_parser
+++ b/usr/share/vizrt/vosa/commands/amazon_config_parser
@@ -14,6 +14,7 @@ unset amazon_config_ssh_private_key
 unset amazon_config_image
 unset amazon_config_type
 unset amazon_config_subnet
+unset amazon_config_initial_disk_size
 
 
 function amazon_config_key() {
@@ -72,6 +73,10 @@ function amazon_config_subnet() {
   amazon_config_subnet=$1
 }
 
+function amazon_config_initial_disk_size() {
+  amazon_config_initial_disk_size=$1
+}
+
 # Handle arrays
 
 declare -a amazon_config_group
@@ -85,3 +90,4 @@ function amazon_config_group() {
   amazon_config_group=( "${amazon_config_group[@]}" "$1" )
 }
 
+

From 276fb6ddffa7bc6781a8d510a677e8717a947515 Mon Sep 17 00:00:00 2001
From: saif shams <sshams@vizrt.com>
Date: Fri, 27 Sep 2013 15:29:20 +0200
Subject: [PATCH 2153/2585] VIZRTSAAS-237:setting a default value of 8 to
 amazon_config_initial_disk_size

---
 usr/share/vizrt/vosa/commands/amazon_config_parser | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/vizrt/vosa/commands/amazon_config_parser b/usr/share/vizrt/vosa/commands/amazon_config_parser
index 3293a254..e339925e 100644
--- a/usr/share/vizrt/vosa/commands/amazon_config_parser
+++ b/usr/share/vizrt/vosa/commands/amazon_config_parser
@@ -14,7 +14,7 @@ unset amazon_config_ssh_private_key
 unset amazon_config_image
 unset amazon_config_type
 unset amazon_config_subnet
-unset amazon_config_initial_disk_size
+amazon_config_initial_disk_size=8
 
 
 function amazon_config_key() {

From d1c78170733337e0d5ab2a034beb27d638561522 Mon Sep 17 00:00:00 2001
From: Monzurul Hoque Ziku <mhoque@vizrt.com>
Date: Sat, 28 Sep 2013 20:17:06 +0600
Subject: [PATCH 2154/2585] VIZRTSAAS-229: modified generate-git-changelog and
 delete generate-git-changelog~ file

---
 usr/bin/generate-git-changelog  |  60 +++++----
 usr/bin/generate-git-changelog~ | 210 --------------------------------
 2 files changed, 28 insertions(+), 242 deletions(-)
 delete mode 100755 usr/bin/generate-git-changelog~

diff --git a/usr/bin/generate-git-changelog b/usr/bin/generate-git-changelog
index 7e2a91d8..b5091232 100755
--- a/usr/bin/generate-git-changelog
+++ b/usr/bin/generate-git-changelog
@@ -38,10 +38,12 @@ function get_header_from_jira() {
   echo "$body" | grep '<title>' | sed -e 's/<title>//g' -e 's/<\/title>//g'
 }
 
+# --to revision number
 function get_to_revision() {
   echo ${to-COMMITTED}
 }
 
+# --from revision number
 function get_from_revision() {
   echo ${from-PREV}
 }
@@ -98,7 +100,7 @@ function should_regenerate() {
 function get_commit_information_from_vcs() {
   the_diff=$(get_archive_dir)/from-$(get_from_revision)-to-$(get_to_revision).diff
 
-  if [[ ! -e $the_diff || $(should_regenerate) -eq 1 ]]; then
+  if [[ ! -e $the_diff ]]; then
     git diff $(get_from_revision) $(get_to_revision) > $the_diff
     exit_on_error "git diff $(get_from_revision) $(get_to_revision)"
   fi
@@ -111,31 +113,32 @@ function get_commit_information_from_vcs() {
   fi
 }
 
-## $@ :: git revision number or tag name
-function get_date_from_svn_log() {
+## $@ :: git last revision date
+#Fri Sep 27 11:18:05 2013 +0600
+function get_date_from_git_log() {
   echo $(git log -1 --format="%cd")
 }
 
-
-function get_svn_location() {
-  git config --get remote.origin.url
+# e.g. ssh://git@git.vizrtsaas.com/ccipoc
+function get_git_location() {
+  echo $(git config --get remote.origin.url)
 }
 
 
 function get_info_from_jira() {
   the_report=$(get_archive_dir)/from-$(get_from_revision)-to-$(get_to_revision).report
   
-  if [[ ! -e $the_report || $(should_regenerate) -eq 1 ]]; then
-    echo "Changes in $(get_svn_location)" > $the_report  
+  if [[ ! -e $the_report ]]; then
+    echo "Changes in $(get_git_location)" > $the_report  
     echo "From: revision $(get_from_revision) @" \
-      $(get_date_from_svn_log $(get_from_revision)) >> $the_report
+      $(get_date_from_git_log $(get_from_revision)) >> $the_report
     echo "To  : revision $(get_to_revision) @" \
-      $(get_date_from_svn_log $(get_to_revision)) >> $the_report
+      $(get_date_from_git_log $(get_to_revision)) >> $the_report
 
     local commit_log=$(git log $(get_from_revision) $(get_to_revision))
     echo "$commit_log" | \
-      grep ${project_code}-[0-9]* | \
-      sed "s#.*\(${project_code}-[0-9]*\).*#\1#g" | \
+      grep $(get_project_name)-[0-9]* | \
+      sed "s#.*\($(get_project_name)-[0-9]*\).*#\1#g" | \
       sort | \
       uniq | while read f; do
       echo "   *" $(get_header_from_jira $f) | fmt >> $the_report
@@ -150,28 +153,22 @@ function get_info_from_jira() {
 }
 
 function sanity_check() {
-
   #if [ ! -e $(pwd)/.git ]; then
   #  print "This directory, $(pwd), " \
   #    "does not contain a working version control checkout."
-  #  exit 1
+    #exit 1
   #fi
 
   # defaulting to Atlassian on demand
   jira_base_url=${jira_base_url-https://vizrtcustomers.jira.com}
-  if [ -z "$git_base_url" ]; then
-    # bash default string substitution terminates with slashes, hence
-    # have to set this manually here.
-    git_base_url="ssh://git@git.vizrtsaas.com"
-  fi
 
   conf_file=$HOME/.$(basename $0).conf
   ensure_variable_is_set \
     project_code \
     user \
     password \
-    jira_base_url \
-    git_base_url
+    jira_base_url 
+
 
   if [[ "$(get_from_revision)" == "$(get_to_revision)" ]]; then
     print_and_log "From and to revision are the same," \
@@ -180,18 +177,19 @@ function sanity_check() {
   fi
 }
 
-function get_project() {
-  echo $(lowercase ${project_code})
+#e.g. ccipoc.git
+function get_project_name() {
+  echo ${project_code} | awk '{split($0,array,"/")} END{print array[1]}'
+}
+
+function get_project_branch() {
+  echo ${project_code} | awk '{split($0,array,"/")} END{print array[2]}'
 }
 
 function get_archive_dir() {
-  local project_context=$(lowercase $(get_svn_location | \
-    sed -e  "s#${git_base_url}/##g" -e 's#[ ]*##g')
-  )
-  
-  local dir=${archive_base_dir}/${project_context}
-  make_dir $dir
-  echo $dir
+  local directory=${archive_base_dir}/$(get_project_name)/$(get_project_branch)
+  make_dir $directory
+  echo $directory
 }
 
 function add_risk_assemsment_to_report() {
@@ -206,5 +204,3 @@ get_user_input "$@"
 sanity_check
 get_commit_information_from_vcs
 get_info_from_jira
-
-
diff --git a/usr/bin/generate-git-changelog~ b/usr/bin/generate-git-changelog~
deleted file mode 100755
index dd43ae66..00000000
--- a/usr/bin/generate-git-changelog~
+++ /dev/null
@@ -1,210 +0,0 @@
-#! /usr/bin/env bash
-
-log=$HOME/.$(basename $0).log
-archive_base_dir=$HOME/.$(basename $0)
-
-function bootstrap_thyself() {
-  # first, try to be nice, then check the standard location
-  local dir=$(dirname $0)/../share/escenic/ece-scripts
-  if [ ! -d $dir  ]; then
-    dir=/usr/share/escenic/ece-scripts
-  fi
-
-  local common_libraries="
-    common-bashing.sh
-    common-io.sh
-  "
-
-  for el in $common_libraries; do
-    source $dir/$el 2>/dev/null || {
-      echo "$(basename $0): Could not load the library $el," \
-        "and I can't live without it :-(" | fmt
-      exit 1
-    }
-  done
-}
-
-function read_user_settings() {
-  local file=$HOME/.$(basename $0).conf
-  if [ -r $file ]; then
-    run source $file
-  else
-    log $(blue INFO) $file "doesn't exist, will default to Atlassian on Demand"
-  fi
-}
-
-function get_header_from_jira() {
-  local body=$(curl -u ${user}:${password} -s ${jira_base_url}/browse/${1})
-  echo "$body" | grep '<title>' | sed -e 's/<title>//g' -e 's/<\/title>//g'
-}
-
-function get_to_revision() {
-  echo ${to-40acfc9}
-}
-
-function get_from_revision() {
-  echo ${from-PREV}
-}
-
-function get_user_input() {
-  local next_is_from=0
-  local next_is_to=0
-  local next_is_project=0
-  local next_is_user=0
-  local next_is_password=0
-  
-  for el in "$@"; do
-    if [[ "$el" == "-s" || "$el" == "--from" ]]; then
-      next_is_from=1
-    elif [[ "$el" == "-u" || "$el" == "--user" ]]; then
-      next_is_user=1
-    elif [[ "$el" == "-p" || "$el" == "--password" ]]; then
-      next_is_password=1
-    elif [[ "$el" == "-t" || "$el" == "--to" ]]; then
-      next_is_to=1
-    elif [[ "$el" == "-p" || "$el" == "--project" ]]; then
-      next_is_project=1
-    elif [[ "$el" == "-f" || "$el" == "--full" ]]; then
-      full_listing=1
-    elif [ ${next_is_from-0} -eq 1 ]; then
-      from=$el
-      next_is_from=0
-    elif [ ${next_is_user-0} -eq 1 ]; then
-      user=$el
-      next_is_user=0
-    elif [ ${next_is_password-0} -eq 1 ]; then
-      password=$el
-      next_is_password=0
-    elif [ ${next_is_to-0} -eq 1 ]; then
-      to=$el
-      next_is_to=0
-    elif [ ${next_is_project-0} -eq 1 ]; then
-      project_code=$el
-      next_is_project=0
-    fi
-  done
-}
-
-function should_regenerate() {
-  if [[ $(is_number $(get_from_revision)) -eq 1 && \
-    $(is_number $(get_to_revision)) ]]; then
-    echo 0
-    return
-  fi
-
-  echo 1
-}
-
-function get_commit_information_from_vcs() {
-  the_diff=$(get_archive_dir)/from-$(get_from_revision)-to-$(get_to_revision).diff
-
-  if [[ ! -e $the_diff || $(should_regenerate) -eq 1 ]]; then
-    git diff $(get_from_revision) $(get_to_revision) > $the_diff
-    exit_on_error "git diff $(get_from_revision) $(get_to_revision)"
-  fi
-
-  if [ ${full_listing-0} -eq 1 ]; then
-    cat $the_diff
-  else
-    echo "Full diff of all" $(egrep '^(\+|\-)' $the_diff | wc -l) \
-      "changes:" $the_diff | fmt
-  fi
-}
-
-## $@ :: git revision number or tag name
-function get_date_from_svn_log() {
-  echo $(git log -1 --format="%cd")
-}
-
-
-function get_svn_location() {
-  git config --get remote.origin.url
-}
-
-
-function get_info_from_jira() {
-  the_report=$(get_archive_dir)/from-$(get_from_revision)-to-$(get_to_revision).report
-  
-  if [[ ! -e $the_report || $(should_regenerate) -eq 1 ]]; then
-    echo "Changes in $(get_svn_location)" > $the_report  
-    echo "From: revision $(get_from_revision) @" \
-      $(get_date_from_svn_log $(get_from_revision)) >> $the_report
-    echo "To  : revision $(get_to_revision) @" \
-      $(get_date_from_svn_log $(get_to_revision)) >> $the_report
-
-    local commit_log=$(git log $(get_from_revision) $(get_to_revision))
-    echo "$commit_log" | \
-      grep ${project_code}-[0-9]* | \
-      sed "s#.*\(${project_code}-[0-9]*\).*#\1#g" | \
-      sort | \
-      uniq | while read f; do
-      echo "   *" $(get_header_from_jira $f) | fmt >> $the_report
-      echo "   URL: ${jira_base_url}/browse/$(basename $f)" >> $the_report
-      echo "" >> $the_report
-    done
-
-    add_risk_assemsment_to_report
-  fi
-
-  echo "Report:" $the_report
-}
-
-function sanity_check() {
-
-  #if [ ! -e $(pwd)/.git ]; then
-  #  print "This directory, $(pwd), " \
-  #    "does not contain a working version control checkout."
-  #  exit 1
-  #fi
-
-  # defaulting to Atlassian on demand
-  jira_base_url=${jira_base_url-https://vizrtcustomers.jira.com}
-  if [ -z "$git_base_url" ]; then
-    # bash default string substitution terminates with slashes, hence
-    # have to set this manually here.
-    git_base_url="ssh://git@git.vizrtsaas.com"
-  fi
-
-  conf_file=$HOME/.$(basename $0).conf
-  ensure_variable_is_set \
-    project_code \
-    user \
-    password \
-    jira_base_url \
-    git_base_url
-
-  if [[ "$(get_from_revision)" == "$(get_to_revision)" ]]; then
-    print_and_log "From and to revision are the same," \
-      "will no create any change log"
-    exit 0
-  fi
-}
-
-function get_project() {
-  echo $(lowercase ${project_code})
-}
-
-function get_archive_dir() {
-  local project_context=$(lowercase $(get_svn_location | \
-    sed -e  "s#${git_base_url}/##g" -e 's#[ ]*##g')
-  )
-  
-  local dir=${archive_base_dir}/${project_context}
-  make_dir $dir
-  echo $dir
-}
-
-function add_risk_assemsment_to_report() {
-  echo "Risk assessment score: " \
-    $(wc -l $the_diff 2>/dev/null | cut -d' ' -f1) \
-    >> $the_report
-}
-
-bootstrap_thyself
-read_user_settings
-get_user_input "$@"
-sanity_check
-get_commit_information_from_vcs
-get_info_from_jira
-
-

From 788d87be6a80af3ff014a98d98034ba42f5d3d92 Mon Sep 17 00:00:00 2001
From: Monzurul Hoque Ziku <mhoque@vizrt.com>
Date: Mon, 30 Sep 2013 09:33:25 +0600
Subject: [PATCH 2155/2585] VIZRTSAAS-229: added generate-git-changelog script
 related options in ece-build

---
 usr/share/escenic/build-scripts/ece-build | 56 ++++++++++++++++++-----
 1 file changed, 45 insertions(+), 11 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index d685b2dd..62332543 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -284,7 +284,8 @@ function verify_configuration {
     fi    
     enforce_variable git_base "Your $conf_file is missing the variable 'git_base', exiting!"
     enforce_variable git_user "Your $conf_file is missing the variable 'git_user', exiting!"
-
+    enforce_variable jira_user "Your $conf_file is missing the variable 'jira_user', exiting!"
+    enforce_variable jira_password "Your $conf_file is missing the variable 'jira_password', exiting!"
   else
     print_and_log "The chosen source control system $src_control is NOT supported, exiting!"
     exit 1
@@ -1083,6 +1084,8 @@ function create_machine_conf_packages() {
 
   if [[ "$src_control" = svn ]]; then
     generate_new_changelog
+  elif [[ "$src_control" = git ]]; then
+    generate_new_changelog
   fi
 
   local machine_list=$(
@@ -1152,8 +1155,16 @@ EOF
     # changelogs
     local package_changelog_dir=${target_dir}/usr/share/doc/vizrt/$package_name
     make_dir $package_changelog_dir
-    local svn_base_dir=$(lowercase $(basename $svn_base))
-    local change_log_dir=$HOME/.generate-changelog/${svn_base_dir}/${svn_path}
+    if [[ "$src_control" = "svn" ]]; then 
+    	 local svn_base_dir=$(lowercase $(basename $svn_base))
+   	 local change_log_dir=$HOME/.generate-changelog/${svn_base_dir}/${svn_path}
+    elif [[ "$src_control" = "git" ]]; then
+         # get git repo's name
+   	 local git_base_dir=$(lowercase $(basename $git_base))
+	 # get git repo's branch name
+         local git_path_dir=$(echo $git_path | sed 's/-b //g')
+   	 local change_log_dir=$HOME/.generate-git-changelog/${git_base_dir}/${git_path_dir}
+    fi  
     
     if [ -d  $change_log_dir ]; then
       run_wrapper cp ${change_log_dir}/* $package_changelog_dir
@@ -1209,6 +1220,8 @@ function generate_new_changelog() {
   (
     cd ${project_src_dir}
     local previous_revision=PREV
+    
+    if [[ "$src_control" = "svn" ]]; then
     previous_revision=$(
       ls $release_dir/vosa-conf-*-${release_label}-*.deb 2>/dev/null | \
         grep -v latest | \
@@ -1217,20 +1230,41 @@ function generate_new_changelog() {
         uniq | \
         tail -1
     )
+    elif [[ "$src_control" = "git" ]]; then
+    previous_revision=$(
+      ls $release_dir/vosa-conf-*-${release_label}-*.deb 2>/dev/null | \
+        grep -v latest | \
+        sort | \
+        uniq | \
+        tail -1 | \
+        sed 's/.*r\([0-9a-z]*\).deb/\1/g'
+    )
+    fi
 
     # in case we don't have any previous builds, we don't pass
     # anything in the from parameters.
     local from_option=""
     if [ -n "${previous_revision}" ]; then
       from_option="--from $previous_revision"
-    fi
-    
-    run_wrapper generate-changelog \
-      --project $(basename $svn_base) \
-      --user $svn_user \
-      --password $svn_password \
-      ${from_option} \
-      --to $revision
+    fi  
+
+    if [[ "$src_control" = "svn" ]]; then 
+    	run_wrapper generate-changelog \
+    	  --project $(basename $svn_base) \
+    	  --user $svn_user \
+    	  --password $svn_password \
+    	  ${from_option} \
+    	  --to $revision
+    elif [[ "$src_control" = "git" ]]; then
+        # --project git repo name and branch 
+    	run_wrapper generate-git-changelog \
+    	  --project $(basename $git_base)/$(echo $git_path | sed 's/-b //g') \
+    	  --user $jira_user \
+          --password $jira_password \
+    	  ${from_option} \
+    	  --to $revision
+    fi    
+
   )
 }
 

From cafbf16256e704e1807c427362877169bf2d8376 Mon Sep 17 00:00:00 2001
From: Monzurul Hoque Ziku <mhoque@vizrt.com>
Date: Mon, 30 Sep 2013 13:20:18 +0600
Subject: [PATCH 2156/2585] VIZRTSAAS-229: added new generate-git-changelog in
 the create-packages

---
 usr/share/escenic/package-scripts/create-packages | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index d8428995..5411cba5 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -199,6 +199,7 @@ function set_up_escenic-common-scripts() {
   # escenic-common-scripts.
   run cp -r ../../../bin/system-info $target_dir/usr/bin/
   run cp -r ../../../bin/generate-changelog $target_dir/usr/bin/
+  run cp -r ../../../bin/generate-git-changelog $target_dir/usr/bin/
   run cp -r ../../escenic/ece-scripts/system-info.d \
     $target_dir/usr/share/escenic/ece-scripts/
   run cp ../../../../etc/default/system-info $target_dir/etc/default/

From d90cd1930f7ed873b36e72bdb41e2f17ac3931b2 Mon Sep 17 00:00:00 2001
From: Monzurul Hoque Ziku <mhoque@vizrt.com>
Date: Mon, 30 Sep 2013 13:51:23 +0600
Subject: [PATCH 2157/2585] VIZRTSAAS-229: removed unknown characters in the
 beginning of the line with enforce_variable jira_password

---
 usr/share/escenic/build-scripts/ece-build | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 62332543..5bde88df 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -285,7 +285,7 @@ function verify_configuration {
     enforce_variable git_base "Your $conf_file is missing the variable 'git_base', exiting!"
     enforce_variable git_user "Your $conf_file is missing the variable 'git_user', exiting!"
     enforce_variable jira_user "Your $conf_file is missing the variable 'jira_user', exiting!"
-    enforce_variable jira_password "Your $conf_file is missing the variable 'jira_password', exiting!"
+    enforce_variable jira_password "Your $conf_file is missing the variable 'jira_password', exiting!"
   else
     print_and_log "The chosen source control system $src_control is NOT supported, exiting!"
     exit 1
@@ -1082,11 +1082,13 @@ function create_machine_conf_packages() {
     return
   fi
 
-  if [[ "$src_control" = svn ]]; then
-    generate_new_changelog
-  elif [[ "$src_control" = git ]]; then
-    generate_new_changelog
-  fi
+ # As both control run same function
+ #if [[ "$src_control" = svn ]]; then
+    #generate_new_changelog
+ #elif [[ "$src_control" = git ]]; then
+    #generate_new_changelog
+ #fi
+  generate_new_changelog
 
   local machine_list=$(
     find $conf_dir -maxdepth 1 -type d | \

From 33d84034360b6b8a1f54620c0c98c436f7fd51f0 Mon Sep 17 00:00:00 2001
From: Monzurul Hoque Ziku <mhoque@vizrt.com>
Date: Mon, 30 Sep 2013 17:17:07 +0600
Subject: [PATCH 2158/2585] VIZRTSAAS-229: removed enforce variable for jira
 user and password and edited ece-build, generate-git-changelog

---
 usr/bin/generate-git-changelog            | 30 ++++++++++++++++-------
 usr/share/escenic/build-scripts/ece-build | 21 ++++++++++++----
 2 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/usr/bin/generate-git-changelog b/usr/bin/generate-git-changelog
index b5091232..7878fc9a 100755
--- a/usr/bin/generate-git-changelog
+++ b/usr/bin/generate-git-changelog
@@ -54,7 +54,8 @@ function get_user_input() {
   local next_is_project=0
   local next_is_user=0
   local next_is_password=0
-  
+  local next_is_jirabaseurl=0
+
   for el in "$@"; do
     if [[ "$el" == "-s" || "$el" == "--from" ]]; then
       next_is_from=1
@@ -66,6 +67,8 @@ function get_user_input() {
       next_is_to=1
     elif [[ "$el" == "-p" || "$el" == "--project" ]]; then
       next_is_project=1
+    elif [[ "$el" == "-j" || "$el" == "--jirabaseurl" ]]; then
+      next_is_jirabaseurl=1
     elif [[ "$el" == "-f" || "$el" == "--full" ]]; then
       full_listing=1
     elif [ ${next_is_from-0} -eq 1 ]; then
@@ -83,6 +86,9 @@ function get_user_input() {
     elif [ ${next_is_project-0} -eq 1 ]; then
       project_code=$el
       next_is_project=0
+    elif [ ${next_is_jirabaseurl-0} -eq 1 ]; then
+      jirabaseurl=$el
+      next_is_jirabaseurl=0
     fi
   done
 }
@@ -111,6 +117,11 @@ function get_commit_information_from_vcs() {
     echo "Full diff of all" $(egrep '^(\+|\-)' $the_diff | wc -l) \
       "changes:" $the_diff | fmt
   fi
+ 
+  if [[ ! -z $jirabaseurl ]]; then
+    get_info_from_jira
+  fi
+
 }
 
 ## $@ :: git last revision date
@@ -160,14 +171,15 @@ function sanity_check() {
   #fi
 
   # defaulting to Atlassian on demand
-  jira_base_url=${jira_base_url-https://vizrtcustomers.jira.com}
+  jira_base_url=${jirabaseurl}
+  echo $jira_base_url
 
-  conf_file=$HOME/.$(basename $0).conf
-  ensure_variable_is_set \
-    project_code \
-    user \
-    password \
-    jira_base_url 
+  #conf_file=$HOME/.$(basename $0).conf
+  #ensure_variable_is_set \
+  #  project_code
+   # user \
+   # password \
+   # jira_base_url 
 
 
   if [[ "$(get_from_revision)" == "$(get_to_revision)" ]]; then
@@ -203,4 +215,4 @@ read_user_settings
 get_user_input "$@"
 sanity_check
 get_commit_information_from_vcs
-get_info_from_jira
+#get_info_from_jira
diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 5bde88df..37dacaa0 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -281,11 +281,14 @@ function verify_configuration {
     else
       print_and_log "The chosen protocol $git_protocol for $src_control is NOT supported, exiting!"
       exit 1
-    fi    
+    fi
+
     enforce_variable git_base "Your $conf_file is missing the variable 'git_base', exiting!"
     enforce_variable git_user "Your $conf_file is missing the variable 'git_user', exiting!"
-    enforce_variable jira_user "Your $conf_file is missing the variable 'jira_user', exiting!"
-    enforce_variable jira_password "Your $conf_file is missing the variable 'jira_password', exiting!"
+    if [[ ! -z $jira_base_url ]]; then
+      enforce_variable jira_user "Your $conf_file is missing the variable 'jira_user', exiting!"
+      enforce_variable jira_password "Your $conf_file is missing the variable 'jira_password', exiting!"
+    fi    
   else
     print_and_log "The chosen source control system $src_control is NOT supported, exiting!"
     exit 1
@@ -1258,13 +1261,21 @@ function generate_new_changelog() {
     	  ${from_option} \
     	  --to $revision
     elif [[ "$src_control" = "git" ]]; then
-        # --project git repo name and branch 
+        # --project git repo name and branch
+	if [[ ! -z $jira_base_url ]]; then 
     	run_wrapper generate-git-changelog \
     	  --project $(basename $git_base)/$(echo $git_path | sed 's/-b //g') \
     	  --user $jira_user \
           --password $jira_password \
     	  ${from_option} \
-    	  --to $revision
+    	  --to $revision \
+          --jirabaseurl $jira_base_url
+	else
+    	run_wrapper generate-git-changelog \
+    	  --project $(basename $git_base)/$(echo $git_path | sed 's/-b //g') \
+    	  ${from_option} \
+    	  --to $revision 
+	fi
     fi    
 
   )

From 473598eaaa65b3400362b2fe8658d588aa9ae49e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Fri, 20 Sep 2013 09:03:19 +0200
Subject: [PATCH 2159/2585] ece-install - changed jar to zip for publication
 resource filtering

---
 .../ece-scripts/ece-install.d/create-publication.sh        | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
index 061687f2..0ad8722e 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
@@ -7,16 +7,17 @@ function create_publication_prepare_war_file() {
     local the_tmp_dir=$(mktemp -d)
     (
       cd $the_tmp_dir
-      run jar xf $1
+      #run jar xf $1
 
       for el in $fai_publication_war_remove_file_list; do
         if [ -e $el ]; then
           print_and_log "Removing" $el "from" $(basename $1) "..."
-          run rm $el
+          #run rm $el
+          zip -d $1 $el
         fi
       done
 
-      run jar cf $1 .
+      #run jar cf $1 .
     )
   fi
 }

From 4b56914e4c97496e98d0e1f2971cc8307ce7c7d4 Mon Sep 17 00:00:00 2001
From: Monzurul Hoque Ziku <mhoque@vizrt.com>
Date: Tue, 1 Oct 2013 13:22:03 +0600
Subject: [PATCH 2160/2585] VIZRTSAAS-229: added jira_base_url that creates git
 change-log even if customer does not use jira

---
 usr/bin/generate-git-changelog            | 48 ++++++-----------------
 usr/share/escenic/build-scripts/ece-build |  6 ++-
 2 files changed, 17 insertions(+), 37 deletions(-)

diff --git a/usr/bin/generate-git-changelog b/usr/bin/generate-git-changelog
index 7878fc9a..48dabf38 100755
--- a/usr/bin/generate-git-changelog
+++ b/usr/bin/generate-git-changelog
@@ -24,15 +24,6 @@ function bootstrap_thyself() {
   done
 }
 
-function read_user_settings() {
-  local file=$HOME/.$(basename $0).conf
-  if [ -r $file ]; then
-    run source $file
-  else
-    log $(blue INFO) $file "doesn't exist, will default to Atlassian on Demand"
-  fi
-}
-
 function get_header_from_jira() {
   local body=$(curl -u ${user}:${password} -s ${jira_base_url}/browse/${1})
   echo "$body" | grep '<title>' | sed -e 's/<title>//g' -e 's/<\/title>//g'
@@ -93,15 +84,6 @@ function get_user_input() {
   done
 }
 
-function should_regenerate() {
-  if [[ $(is_number $(get_from_revision)) -eq 1 && \
-    $(is_number $(get_to_revision)) ]]; then
-    echo 0
-    return
-  fi
-
-  echo 1
-}
 
 function get_commit_information_from_vcs() {
   the_diff=$(get_archive_dir)/from-$(get_from_revision)-to-$(get_to_revision).diff
@@ -140,16 +122,16 @@ function get_info_from_jira() {
   the_report=$(get_archive_dir)/from-$(get_from_revision)-to-$(get_to_revision).report
   
   if [[ ! -e $the_report ]]; then
-    echo "Changes in $(get_git_location)" > $the_report  
+    echo "Changes in branch:$(get_project_branch) and location:$(get_git_location) " > $the_report  
     echo "From: revision $(get_from_revision) @" \
       $(get_date_from_git_log $(get_from_revision)) >> $the_report
     echo "To  : revision $(get_to_revision) @" \
       $(get_date_from_git_log $(get_to_revision)) >> $the_report
 
-    local commit_log=$(git log $(get_from_revision) $(get_to_revision))
+    local commit_log=$(git log $(get_from_revision)..$(get_to_revision))
     echo "$commit_log" | \
-      grep $(get_project_name)-[0-9]* | \
-      sed "s#.*\($(get_project_name)-[0-9]*\).*#\1#g" | \
+      grep $(get_jira_project_name)-[0-9]* | \
+      sed "s#.*\($(get_jira_project_name)-[0-9]*\).*#\1#g" | \
       sort | \
       uniq | while read f; do
       echo "   *" $(get_header_from_jira $f) | fmt >> $the_report
@@ -164,23 +146,14 @@ function get_info_from_jira() {
 }
 
 function sanity_check() {
-  #if [ ! -e $(pwd)/.git ]; then
-  #  print "This directory, $(pwd), " \
-  #    "does not contain a working version control checkout."
+  #if [ ! -e $(pwd)/src/.git ]; then
+   # print "This directory, $(pwd), " \
+   #   "does not contain a working version control checkout."
     #exit 1
   #fi
 
   # defaulting to Atlassian on demand
   jira_base_url=${jirabaseurl}
-  echo $jira_base_url
-
-  #conf_file=$HOME/.$(basename $0).conf
-  #ensure_variable_is_set \
-  #  project_code
-   # user \
-   # password \
-   # jira_base_url 
-
 
   if [[ "$(get_from_revision)" == "$(get_to_revision)" ]]; then
     print_and_log "From and to revision are the same," \
@@ -194,6 +167,11 @@ function get_project_name() {
   echo ${project_code} | awk '{split($0,array,"/")} END{print array[1]}'
 }
 
+function get_jira_project_name() {
+  echo ${project_code} | awk '{split($0,array,"/")} END{print array[1]}' | sed 's/.git//g' | tr [a-z] [A-Z]
+
+}
+
 function get_project_branch() {
   echo ${project_code} | awk '{split($0,array,"/")} END{print array[2]}'
 }
@@ -211,8 +189,6 @@ function add_risk_assemsment_to_report() {
 }
 
 bootstrap_thyself
-read_user_settings
 get_user_input "$@"
 sanity_check
 get_commit_information_from_vcs
-#get_info_from_jira
diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 37dacaa0..8c4ad43f 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -505,6 +505,7 @@ function git_checkout
     print_and_log "The chosen protocol $git_protocol for git is NOT supported, exiting!"
     exit 1
   fi
+
   if [[ "$git_path" != "" ]]; then
     local exists=$(git ls-remote --heads $git_repo_uri | grep $git_path)
     if [[ "${exists}" = "" ]]; then
@@ -512,7 +513,6 @@ function git_checkout
       exit 1
     fi
   fi
-  
   # git checkout
   run_wrapper git clone $git_path $git_repo_uri $project_src_dir
 
@@ -523,6 +523,10 @@ function git_checkout
     print_and_log "Failed to fetch current revision number, exiting!"
     exit 1
   fi
+
+  if [[ "$git_path" == "" ]]; then
+    git_path="-b master"
+  fi
 }
 
 ##

From c8905ec10983fc5869c2f34ffc493d2e0d8a0d7c Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Tue, 1 Oct 2013 14:57:42 +0200
Subject: [PATCH 2161/2585] Made create publication a lot faster by not
 sleeping one minute per publication.

---
 .../escenic/ece-scripts/ece-install.d/create-publication.sh    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
index 0ad8722e..2a440afb 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
@@ -50,6 +50,7 @@ function create_publication() {
         run jar xf $download_dir/$(basename $fai_publication_ear)
       )
 
+      ensure_that_instance_is_running ${fai_publication_use_instance-$default_ece_intance_name}
       for el in ${fai_publication_domain_mapping_list}; do
         local old_ifs=$IFS
         # the entries in the fai_publication_domain_mapping_list are on
@@ -70,6 +71,7 @@ function create_publication() {
       log "Cleaing up $the_tmp_dir ..."
       run rm -rf $the_tmp_dir
     else
+      ensure_that_instance_is_running ${fai_publication_use_instance-$default_ece_intance_name}
       local publication_name=${fai_publication_name-mypub}
 
       if [ -z "${fai_publication_war}" ]; then
@@ -104,7 +106,6 @@ function create_the_publication() {
 
   create_publication_prepare_war_file $publication_war
   local the_instance=${fai_publication_use_instance-$default_ece_intance_name}
-  ensure_that_instance_is_running $the_instance
   create_publication_in_db $publication_name $publication_war $the_instance
   add_publication_to_deployment_lists $(basename $publication_war .war)
 

From e14bfad520d7b059071ed2c3de617e9122cc8e40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Thu, 10 Oct 2013 12:28:37 +0200
Subject: [PATCH 2162/2585] ece-build - allow legacy projects to use
 escenic-distributions.txt

---
 usr/share/escenic/build-scripts/ece-build | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 8c4ad43f..b4eba687 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -77,10 +77,12 @@ declare -A maven_snapshot_coordinates=(
 ["geocode"]="com.escenic.plugins.geocode:geocode:zip"
 ["lucy"]="com.escenic.plugins.lucy:lucy:zip"
 ["menu-editor"]="com.escenic.plugins.menu-editor:menu-editor:zip"
+["mobile-expansion"]="com.escenic.plugins.mobile-expansion:mobile-expansion-dist:zip"
 ["newsroom"]="com.escenic.plugins.newsroom:newsroom:zip"
 ["newsgate"]="com.escenic.plugins.newsgate:newsgate:zip"
 ["note"]="com.escenic.plugins.note:note:zip"
 ["poll"]="com.escenic.plugins.poll:poll:zip"
+["reporter"]="com.escenic.plugins.reporter:reporter:zip"
 ["section-feed"]="com.escenic.plugins.section-feed:section-feed:zip"
 ["semantic-cxense"]="com.escenic.plugins.semantic:semantic-cxense:zip"
 ["snapshot"]="com.escenic.plugins.snapshot:snapshot:zip"
@@ -107,11 +109,13 @@ com.escenic.plugins.geocode:geocode:zip"
 com.escenic.plugins.lucy:lucy:zip"
 ["menu-editor"]="com.escenic.plugins.menu-editor:menu-editor-dist:zip
 com.escenic.plugins.menu-editor:menu-editor:zip"
+["mobile-expansion"]="com.escenic.plugins.mobile-expansion:mobile-expansion-dist:zip"
 ["newsroom"]="com.escenic.plugins.newsroom:newsroom-dist:zip
 com.escenic.plugins.newsroom:newsroom:zip"
 ["newsgate"]="com.escenic.plugins.newsgate:newsgate:zip"
 ["note"]="com.escenic.plugins.note:note:zip"
 ["poll"]="com.escenic.plugins.poll:poll:zip"
+["reporter"]="com.escenic.plugins.reporter:reporter:zip"
 ["section-feed"]="com.escenic.plugins.section-feed:section-feed-dist:zip
 com.escenic.plugins.section-feed:section-feed:zip"
 ["semantic-cxense"]="com.escenic.plugins.semantic:semantic-cxense-dist:zip
@@ -856,7 +860,8 @@ function print_unstable_distributions
         distribution_exists http://repo.dev.escenic.com/service/local/artifact/maven/redirect?r=trunk$dist_path
         if [ $? -eq 0 ]; then
           print_and_log "WARNING - $f version ${project_distributions["$f"]} is not supported!"
-          project_maven_coordinates+="${g}:${project_distributions["$f"]}"$'\n'
+        else
+          log "WARNING - $f version ${project_distributions["$f"]} is not available in the maven repository! This might cause unpredictable results in your server installations!"
         fi
       done
     else
@@ -869,14 +874,14 @@ function print_unstable_distributions
             distribution_exists http://maven.vizrt.com/unstable/$dist_path
             if [ $? -eq 0 ]; then
               print_and_log "WARNING - $f version ${project_distributions["$f"]} is not supported!"
-              project_maven_coordinates+="${g}:${project_distributions["$f"]}"$'\n'
+            else
+              log "WARNING - $f version ${project_distributions["$f"]} is not available in the maven repository! This might cause unpredictable results in your server installations!"
             fi
-          else
-            project_maven_coordinates+="${g}:${project_distributions["$f"]}"$'\n'
           fi
         fi
       done
     fi
+    project_maven_coordinates+="${g}:${project_distributions["$f"]}"$'\n'
   done
 }
 

From 68339fd4f65c6b2daf91a3b02ce05d6da16d2a2a Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 10 Oct 2013 14:45:36 +0200
Subject: [PATCH 2163/2585] Made sure that the IP is assigned even when
 booting, not just installing.

---
 usr/bin/vosa | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index df963061..7b06d5e9 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -904,7 +904,7 @@ function do_create() {
       
       ${commands}/ec2-determine-ip.sh \
         "$instance_dir" \
-        "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" \
+        "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name"
 
     else 
       ${commands}/install.sh \
@@ -986,18 +986,20 @@ function do_start() {
 
       if [ ! -z "${amazon_config_ip_address}" ] ; then
         echo "Associating IP $amazon_config_ip_address..."
-        ${commands}/ec2-cmd.sh \
-          "$instance_dir" \
-          "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" \
-          associate-address \
-          $($USE_AWS_CLI && echo "--public-ip") \
-          ${amazon_config_ip_address} \
-          $($USE_AWS_CLI && echo "--instance-id") \
-          $($USE_AWS_CLI || echo "--instance") \
-          INSTANCE
+        for a in 1 2 3 4 5 6 7 8 9 10; do
+          sleep 4;
+          ${commands}/ec2-cmd.sh \
+            "$instance_dir" \
+            "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" \
+            associate-address \
+            $($USE_AWS_CLI && echo "--public-ip") \
+            ${amazon_config_ip_address} \
+            $($USE_AWS_CLI && echo "--instance-id") \
+            $($USE_AWS_CLI || echo "--instance") \
+            INSTANCE && break
+        done
       fi
 
-      # The word INSTANCE is replaced with the instance.
       ${commands}/ec2-determine-ip.sh \
         "$instance_dir" \
         "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name"

From 20d36287d9e7a8ddf9306b58a723c87f598a2896 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 10 Oct 2013 15:14:35 +0200
Subject: [PATCH 2164/2585] Made AWS CLI understand ip address "none" to not
 mean a real IP ...

---
 usr/share/vizrt/vosa/commands/ec2-determine-ip.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/vizrt/vosa/commands/ec2-determine-ip.sh b/usr/share/vizrt/vosa/commands/ec2-determine-ip.sh
index 02e4c70b..987e407a 100755
--- a/usr/share/vizrt/vosa/commands/ec2-determine-ip.sh
+++ b/usr/share/vizrt/vosa/commands/ec2-determine-ip.sh
@@ -63,7 +63,7 @@ for a in 1 2 3 4 5 6 7 8 9 10 ; do
   if $USE_AWS_CLI ; then
     if [ "$amazon_config_ssh_access" == "public" ] ; then
       ip_address=$(grep $'\ti-' $statefile | cut -f 5)
-      if [[ $ip_address == 172.* ]] || [[ $ip_address == 10.* ]] ; then
+      if [[ $ip_address == 172.* ]] || [[ $ip_address == 10.* ]] || [ $ip_address == None ] ; then
         ip_address=
       fi
     else

From 002e567992a2b5506a1afb70238b490d8fd21036 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Thu, 10 Oct 2013 22:59:50 +0200
Subject: [PATCH 2165/2585] ece-build - trunk or branch name will now be
 included in .ear links

---
 usr/share/escenic/build-scripts/ece-build | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index b4eba687..2f67ae94 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -338,7 +338,7 @@ function get_user_options
     case $opt in
       b)
         svn_path=branches/${OPTARG}
-        git_path="-b ${OPTARG}"
+        git_path="${OPTARG}"
         release_label=branch-${OPTARG}
         ;;
       t)
@@ -501,6 +501,7 @@ function svn_fail_early
 ##
 function git_checkout
 {
+  release_label=trunk
   if [[ "$git_protocol" = "https" ]]; then
     local git_repo_uri="https://$git_user:$git_password@$git_base"
   elif [[ "$git_protocol" = "ssh" ]]; then
@@ -516,13 +517,15 @@ function git_checkout
       print_and_log "The request branch $git_path does NOT exist, exiting!"
       exit 1
     fi
+    release_label=branch-$git_path
+    git_path="-b $git_path"
   fi
+
   # git checkout
   run_wrapper git clone $git_path $git_repo_uri $project_src_dir
 
   cd $project_src_dir
   revision=`git describe --always`
-  release_label=git
   if [[ $revision = "" ]]; then
     print_and_log "Failed to fetch current revision number, exiting!"
     exit 1

From 10dcd8f5c8b129158daa5af556f0c3bb0f92fada Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Fri, 11 Oct 2013 02:21:14 +0200
Subject: [PATCH 2166/2585] ece-build - minor adjustment to
 escenic-distributions.txt

---
 usr/share/escenic/build-scripts/ece-build | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 2f67ae94..4a7c51cf 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -856,6 +856,7 @@ function download_distribution
 function print_unstable_distributions
 {
   for f in ${!project_distributions[@]}; do
+    local coordinate=
     if [[ ${project_distributions["$f"]} = "trunk-SNAPSHOT" ]]; then
       for g in ${maven_snapshot_coordinates["$f"]}
       do
@@ -863,6 +864,7 @@ function print_unstable_distributions
         distribution_exists http://repo.dev.escenic.com/service/local/artifact/maven/redirect?r=trunk$dist_path
         if [ $? -eq 0 ]; then
           print_and_log "WARNING - $f version ${project_distributions["$f"]} is not supported!"
+          local coordinate=$g
         else
           log "WARNING - $f version ${project_distributions["$f"]} is not available in the maven repository! This might cause unpredictable results in your server installations!"
         fi
@@ -877,14 +879,20 @@ function print_unstable_distributions
             distribution_exists http://maven.vizrt.com/unstable/$dist_path
             if [ $? -eq 0 ]; then
               print_and_log "WARNING - $f version ${project_distributions["$f"]} is not supported!"
+              local coordinate=$g
             else
               log "WARNING - $f version ${project_distributions["$f"]} is not available in the maven repository! This might cause unpredictable results in your server installations!"
             fi
+          else
+            local coordinate=$g
           fi
         fi
       done
     fi
-    project_maven_coordinates+="${g}:${project_distributions["$f"]}"$'\n'
+    if [[ $coordinate = "" ]]; then
+      local coordinate=$g
+    fi
+    project_maven_coordinates+="${coordinate}:${project_distributions["$f"]}"$'\n'
   done
 }
 

From 84b1580fa5f88d1e6639ddf6057797584d99025f Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Sat, 12 Oct 2013 17:48:42 +0200
Subject: [PATCH 2167/2585] ece-build-guide now uses the master branche from
 vizrtsaas instead of the sdp branche of vizrtsaas

---
 usr/share/escenic/build-scripts/ece-build-guide | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build-guide b/usr/share/escenic/build-scripts/ece-build-guide
index 89afb0e3..cfe64c08 100755
--- a/usr/share/escenic/build-scripts/ece-build-guide
+++ b/usr/share/escenic/build-scripts/ece-build-guide
@@ -196,14 +196,15 @@ function checkout_standard_handbook
       run_wrapper cd $src_handbook_dir
       log "Getting latest from $src_handbook_repo"
       run_wrapper git pull --rebase
+      run_wrapper git checkout master
     else
       run_wrapper cd ${handbook_dir}
-      local sdp_exists=$(git ls-remote --heads $src_handbook_repo | grep sdp)
-      if [[ "${sdp_exists}" = "" ]]; then
-        print_and_log "The request branch sdp does NOT exist for the shared handbook, exiting!"
+      local vosahandbook_exists=$(git ls-remote --heads $src_handbook_repo | grep master)
+      if [[ "${vosahandbook_exists}" = "" ]]; then
+        print_and_log "The request branch master does NOT exist for the shared handbook, exiting!"
         exit 1
       fi
-      run_wrapper git clone -b sdp $src_handbook_repo $src_handbook_dir
+      run_wrapper git clone $src_handbook_repo $src_handbook_dir
     fi
   else
     print_and_log "The chosen source control system $src_control is NOT supported, exiting!"

From 0b59f449f9d95f363faec669757ca888f38252f6 Mon Sep 17 00:00:00 2001
From: Debashis Paul <Dpaul@vizrt.com>
Date: Mon, 14 Oct 2013 12:25:28 +0200
Subject: [PATCH 2168/2585] Added jvm parameters for GC log rolling
 VIZRTSAAS-96

---
 usr/bin/ece | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/usr/bin/ece b/usr/bin/ece
index 6c51c93b..cab6ee07 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -332,6 +332,16 @@ function set_instance_settings() {
       ece_args=$ece_args" "$jvm_gc_settings
     fi
 
+    jvm_rolling_gc=${jvm_rolling_gc-1}
+    if [ "$jvm_rolling_gc" == 1 ]; then
+      gc_rolling_args="
+	-XX:+UseGCLogFileRotation
+	-XX:NumberOfGCLogFiles=${number_of_gc_log_files-5}
+	-XX:GCLogFileSize=${gc_log_file_size-5m}
+      "
+      ece_args=$ece_args" "$gc_rolling_args
+    fi
+
     if [ "$jvm_proxy_settings" ]; then
       ece_args=$ece_args" "$jvm_proxy_settings
     fi

From 8b661ef5847127db76e16cf99a345b2f71982a30 Mon Sep 17 00:00:00 2001
From: Debashis Paul <Dpaul@vizrt.com>
Date: Mon, 14 Oct 2013 12:55:41 +0200
Subject: [PATCH 2169/2585] Logrotate for tomcat catalina output VIZRTSAAS-96

---
 usr/share/escenic/package-scripts/create-packages | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 5411cba5..b13639a0 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -164,6 +164,10 @@ function set_up_escenic-content-engine-scripts() {
   run cp -r ../../../../etc/cron.daily/remove-old-escenic-log-files \
     $target_dir/etc/cron.daily/
 
+  # logrotate for tomcat catalina out
+  run cp -r ../../../../etc/logrotate.d/tomcat \
+    $target_dir/etc/logrotate.d/
+
   # hugin
   run cp -r ../../../../usr/share/hugin \
     $target_dir/usr/share/

From 39620036e4f14e8d8e430120597154bf6f4f0a5b Mon Sep 17 00:00:00 2001
From: Debashis Paul <Dpaul@vizrt.com>
Date: Mon, 14 Oct 2013 12:58:49 +0200
Subject: [PATCH 2170/2585] Logrotate for tomcat catalina output VIZRTSAAS-96

---
 etc/logrotate.d/tomcat | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 etc/logrotate.d/tomcat

diff --git a/etc/logrotate.d/tomcat b/etc/logrotate.d/tomcat
new file mode 100644
index 00000000..95e40834
--- /dev/null
+++ b/etc/logrotate.d/tomcat
@@ -0,0 +1,9 @@
+/var/log/escenic/*.out{
+        copytruncate
+        daily
+        rotate 7
+        compress
+        missingok
+        size 5M
+}
+

From 6d1b7d07d552078990cf9a16db4f90ca78f81854 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Mon, 14 Oct 2013 14:53:12 +0200
Subject: [PATCH 2171/2585] Made the local check_mk agent checks now use the
 correct trails.

---
 usr/lib/check_mk_agent/local/ece-install-trail | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/lib/check_mk_agent/local/ece-install-trail b/usr/lib/check_mk_agent/local/ece-install-trail
index 98a586bd..1dca0c99 100755
--- a/usr/lib/check_mk_agent/local/ece-install-trail
+++ b/usr/lib/check_mk_agent/local/ece-install-trail
@@ -15,7 +15,8 @@ critical=900
 warning=700
 
 function check_trail() {
-  for el in /var/lib/ece-install/*.trail ; do
+  for el in /var/lib/escenic/ece-install/*.trail /var/lib/ece-install/*.trail ; do
+    [ -r "$el" ] || continue;
     vars=$(diff <(set -a; unset _; env) <(set -a; unset _;source $el; env) | grep '^>' | sed -e s/^..// -e s/=.*//)
     source $el
     for var in $vars ; do

From daebb195173ebe9232df3afd86b9df045a8110f1 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Tue, 15 Oct 2013 15:48:58 +0200
Subject: [PATCH 2172/2585] Added a filename parameter to
 download_uri_target_to_dir

---
 usr/share/escenic/ece-scripts/common-io.sh | 28 ++++++++++++++++------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/common-io.sh b/usr/share/escenic/ece-scripts/common-io.sh
index 94288de5..7f94ff6a 100644
--- a/usr/share/escenic/ece-scripts/common-io.sh
+++ b/usr/share/escenic/ece-scripts/common-io.sh
@@ -112,27 +112,41 @@ function make_ln() {
 ##      https://file. If $1 is a local file reference, it's used as it
 ##      is.
 ## $2 :: the target dir
+## $3 :: the target filename. If left empty, the bassename of $1 is used
 function download_uri_target_to_dir() {
   local uri=$1
   local target_dir=$2
+  local target_file=$3
   make_dir $target_dir
 
   if [[ $uri == "http://"* || $uri == "https://"* ]]; then
+
+    if [ -z $target_file ] ; then
+      target_file=$(basename $uri)
+    fi
+    
     log "Downloading" $uri "to" $target_dir "..."
     run cd $target_dir
     run wget \
       $wget_opts \
       $wget_auth \
       --server-response \
-      --output-document $(basename $uri) \
+      --output-document "$target_file" \
       $uri
-  elif [[ $uri == "file://"* ]]; then
-      # length of file:// is 7
-    local file=${file:7}
-    run cp $file $target_dir
   else
-    local file=$uri
-    run cp $file $target_dir
+    
+    local file=$uri    
+    if [[ $uri == "file://"* ]] ; then
+      # length of file:// is 7
+      file=${file:7}
+    fi
+
+    if [ -z $target_file ] ; then
+      run cp $file $target_dir
+    else
+      run cp $file $target_dir/$target_file
+    fi
+
   fi
 }
 

From 22de91cb34c97e7bb42bd8a8d4cb7658f1b926e9 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Tue, 15 Oct 2013 16:44:00 +0200
Subject: [PATCH 2173/2585] extracted the logic that translates a file found in
 a scanned directory to a url

---
 .../ece-scripts/ece-import.d/http-and-ftp.sh  | 29 +++++++++++++++----
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh b/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh
index 1612823a..da400857 100644
--- a/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh
+++ b/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh
@@ -49,19 +49,22 @@ function download_latest_files() {
 ## $@ :: list of URIs
 function download_files_if_desired() {
   for the_file in $list_of_files; do
-    if [ $(is_already_downloaded $uri/$the_file) -eq 1 ]; then
+    local url_to_download=$(url_to_download $the_file)
+    
+    if [ $(is_already_downloaded $url_to_download) -eq 1 ]; then
       # not logging anything here as this will create log files in
       # production.
       continue
     fi
-    print_and_log "Downloading" $uri/$the_file "..."
+    print_and_log "Downloading" $url_to_download "..."
     download_uri_target_to_dir \
-      $uri/$the_file \
-      $raw_spool_base_dir/$publication_name/$job_name/
+      $url_to_download \
+      $raw_spool_base_dir/$publication_name/$job_name/ \
+      $(basename $the_file)
     local result=$raw_spool_base_dir/$publication_name/$job_name/$(basename $the_file)
 
-    log "Downloaded" $(basename $the_file) "to" $result
-    echo $uri/$the_file >> $(get_state_file)
+    log "Downloaded" $url_to_download "to" $result
+    echo $url_to_download >> $(get_state_file)
   done
 }
 
@@ -82,3 +85,17 @@ function is_already_downloaded() {
 function get_state_file() {
   echo $raw_state_base_dir/$publication_name/$job_name/download.state
 }
+
+
+function url_to_download() {
+
+local scanned_url=$url
+local filename=$1
+
+local sed_substitution=$(echo "$scanned_url/" | sed -e 's/[]\/()$*.^|[]/\\&/g')
+sed_substitution="$sed_substitution\1"
+local sed_regex="^\\(.*\\)\$"
+local url_to_print=$(echo "$filename" | sed -n "s/$sed_regex/$sed_substitution/p")
+echo "$url_to_print"
+
+}

From 1f106b156e73e44a6400c41e740ceee23d8c5e5a Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Tue, 15 Oct 2013 18:01:36 +0200
Subject: [PATCH 2174/2585] Made it possible to pass in rewrite rules for the
 source url to use for download

---
 usr/bin/ece-import                            | 12 +++++++++
 .../ece-scripts/ece-import.d/http-and-ftp.sh  | 27 ++++++++++++++-----
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/usr/bin/ece-import b/usr/bin/ece-import
index ad594308..1389849c 100755
--- a/usr/bin/ece-import
+++ b/usr/bin/ece-import
@@ -57,6 +57,8 @@ raw_state_base_dir=/var/lib/escenic/raw
 raw_transformation_base_dir=/var/cache/escenic/import
 raw_transformed_base_dir=/var/backups/escenic/import
 transformers_base_dir=/usr/share/escenic/import
+arg_regex_of_file="^(.*)$"
+arg_write_url=""
 
 # available commands/operations for ece-import
 COMMAND_IMPORT=1
@@ -95,6 +97,10 @@ function get_user_input() {
       next_is_password=1
     elif [[ "$el" == "--uri" ]]; then
       next_is_uri=1
+    elif [[ "$el" == "--regex-of-file" ]]; then
+      next_is_regex=1
+    elif [[ "$el" == "--write_url" ]]; then
+      next_is_write_url=1
     elif [[ "$el" == "--directories-only" ]]; then
       directories_only=1
     elif [[ "$el" == "--http-proxy" ]]; then
@@ -129,6 +135,12 @@ function get_user_input() {
     elif [ $next_is_uri -eq 1 ]; then
       uri=$el
       next_is_uri=0
+    elif [ $next_is_regex_of_file -eq 1 ]; then
+      arg_regex_of_file=$el
+      next_is_regex_of_file=0
+    elif [ $next_is_write_url -eq 1 ]; then
+      arg_write_url=$el
+      next_is_write_url=0
     elif [ $next_is_http_proxy -eq 1 ]; then
       the_http_proxy="$el"
       next_is_http_proxy=0
diff --git a/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh b/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh
index da400857..fb86733b 100644
--- a/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh
+++ b/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh
@@ -48,8 +48,13 @@ function download_latest_files() {
 ##
 ## $@ :: list of URIs
 function download_files_if_desired() {
+
+  if [ -z $arg_write_url ] ; then
+    arg_write_url="$uri/\1"
+  fi
+  
   for the_file in $list_of_files; do
-    local url_to_download=$(url_to_download $the_file)
+    local url_to_download=$(url_to_download $the_file $arg_regex_of_file $arg_write_url)
     
     if [ $(is_already_downloaded $url_to_download) -eq 1 ]; then
       # not logging anything here as this will create log files in
@@ -86,16 +91,26 @@ function get_state_file() {
   echo $raw_state_base_dir/$publication_name/$job_name/download.state
 }
 
-
 function url_to_download() {
 
 local scanned_url=$url
 local filename=$1
 
-local sed_substitution=$(echo "$scanned_url/" | sed -e 's/[]\/()$*.^|[]/\\&/g')
-sed_substitution="$sed_substitution\1"
-local sed_regex="^\\(.*\\)\$"
-local url_to_print=$(echo "$filename" | sed -n "s/$sed_regex/$sed_substitution/p")
+local sed_regex_on_filename=$2
+if [ -z $2 ] ; then
+  sed_regex_on_filename="^(.*)$"
+fi
+
+local sed_write_url=$3
+if [ -z $3 ] ; then
+  sed_write_url="$scanned_url/\1"
+fi
+
+local esc_sed_write_url=$(echo $sed_write_url | sed -e 's/[/&]/\\&/g')
+#echo "esc_sed_write_url $esc_sed_write_url"
+local esc_sed_regex_on_filename=$(echo $sed_regex_on_filename | sed -e 's/[]\/()[]/\\&/g')
+#echo "esc_sed_regex_on_filename $esc_sed_regex_on_filename"
+local url_to_print=$(echo "$filename" | sed -n "s/$esc_sed_regex_on_filename/$esc_sed_write_url/p")
 echo "$url_to_print"
 
 }

From 7ab0d06142b3ea310dae96f69cc54415fc077b23 Mon Sep 17 00:00:00 2001
From: Thomas Velthoven <tvelthoven@vizrt.com>
Date: Tue, 15 Oct 2013 18:47:41 +0200
Subject: [PATCH 2175/2585] Corrected forgotten varable declaration

---
 usr/bin/ece-import | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/usr/bin/ece-import b/usr/bin/ece-import
index 1389849c..e32e930b 100755
--- a/usr/bin/ece-import
+++ b/usr/bin/ece-import
@@ -77,6 +77,8 @@ function get_user_input() {
   local next_is_password=0
   local next_is_uri=0
   local next_is_http_proxy=0
+  local next_is_regex_of_file=0
+  local next_is_write_url=0
 
   for el in $@; do
     if [[ "$el" == "-n" || "$el" == "--name" ]]; then

From aea5511c07f963524f00b9d3c10e1c335d5083e4 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Wed, 16 Oct 2013 09:34:08 +0200
Subject: [PATCH 2176/2585] Fixed package scripts bug caused by logrotate.d not
 existing.

---
 usr/share/escenic/package-scripts/create-packages | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index b13639a0..e32bed96 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -165,8 +165,8 @@ function set_up_escenic-content-engine-scripts() {
     $target_dir/etc/cron.daily/
 
   # logrotate for tomcat catalina out
-  run cp -r ../../../../etc/logrotate.d/tomcat \
-    $target_dir/etc/logrotate.d/
+  run cp -r ../../../../etc/logrotate.d \
+    $target_dir/etc/
 
   # hugin
   run cp -r ../../../../usr/share/hugin \

From a8ffd2ec73a5748570813bfb9296557556dfa286 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Fri, 18 Oct 2013 13:10:33 +0200
Subject: [PATCH 2177/2585] Fixed check_mk check to handle IPv6 as well as v4

---
 usr/lib/check_mk_agent/local/ece-install-trail | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/usr/lib/check_mk_agent/local/ece-install-trail b/usr/lib/check_mk_agent/local/ece-install-trail
index 1dca0c99..16fd2aa8 100755
--- a/usr/lib/check_mk_agent/local/ece-install-trail
+++ b/usr/lib/check_mk_agent/local/ece-install-trail
@@ -21,7 +21,7 @@ function check_trail() {
     source $el
     for var in $vars ; do
       if [[ $var =~ ^.*_port$ ]] ; then
-        name=${var#trail_}
+        local name=${var#trail_}
         name=${name%_port}
         check_port_listening $name ${!var}
         check_port_status $name ${!var}
@@ -32,9 +32,9 @@ function check_trail() {
 }
 
 function check_port_listening() { # foo 4040
-  name=$1
-  port=$2
-  listening=$(sudo -n lsof -s TCP:LISTEN -i 4:$port -n | tail -n +2 | wc -l)
+  local name=$1
+  local port=$2
+  local listening=$(sudo -n lsof -s TCP:LISTEN -i 4:$port -i 6:$port -n | tail -n +2 | wc -l)
   if [ $listening -eq 0 ] ; then
     echo "2 port_${name}_${port}_listen - CRITICAL: not listening on $name port $port"
     return;
@@ -44,9 +44,9 @@ function check_port_listening() { # foo 4040
 }
 
 function check_port_status() { # foo 4040
-  name=$1
-  port=$2
-  established=$(sudo -n lsof -s TCP:ESTABLISHED -i 4:$port -n | tail -n +2 | wc -l)
+  local name=$1
+  local port=$2
+  local established=$(sudo -n lsof -s TCP:ESTABLISHED -i 4:$port -i 6:$port -n | tail -n +2 | wc -l)
   if [ $established -gt $critical ] ; then
     echo "2 port_${name}_${port}_established - CRITICAL: $established established connections to on $name port $port"
     return;

From 77cdc599248afdbeb22f4bf840e2787187399925 Mon Sep 17 00:00:00 2001
From: Thomas <tvelthoven@vizrt.com>
Date: Wed, 23 Oct 2013 12:11:23 +0200
Subject: [PATCH 2178/2585] Added some troubleshooting stuff

---
 usr/share/doc/escenic/ece-import-guide.org | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/usr/share/doc/escenic/ece-import-guide.org b/usr/share/doc/escenic/ece-import-guide.org
index 0e78081a..f6256374 100644
--- a/usr/share/doc/escenic/ece-import-guide.org
+++ b/usr/share/doc/escenic/ece-import-guide.org
@@ -391,6 +391,17 @@ done
      holding all the URLs (HTTP or FTP) that *ece-import* has
      downloaded before.
 
+* TROUBLESHOOTING
+
+To trigger a (re)import of an already imported file,
+- edit the /var/lib/escenic/raw/<pub>/<job>/download.state file as the escenic user
+or 
+- use sed '/pattern to match/d' sed /var/lib/escenic/raw/<pub>/<job>/download.state > /var/lib/escenic/raw/<pub>/<job>/download.newstate
+- verify that /var/lib/escenic/raw/<pub>/<job>/download.newstate is good
+- mv /var/lib/escenic/raw/<pub>/<job>/download.newstate /var/lib/escenic/raw/<pub>/<job>/download.state
+
+then wait a while for the import to happen again. or trigger it with the ece-import command.
+
 * COPYRIGHT
 Copyright 2012-2013 Vizrt
 

From c370c3cd409f30778da46c8388f99d9ef932bec2 Mon Sep 17 00:00:00 2001
From: Thomas <tvelthoven@vizrt.com>
Date: Wed, 23 Oct 2013 12:15:47 +0200
Subject: [PATCH 2179/2585] improved the troubleshooting a bit more

---
 usr/share/doc/escenic/ece-import-guide.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/doc/escenic/ece-import-guide.org b/usr/share/doc/escenic/ece-import-guide.org
index f6256374..66a3fe38 100644
--- a/usr/share/doc/escenic/ece-import-guide.org
+++ b/usr/share/doc/escenic/ece-import-guide.org
@@ -394,7 +394,7 @@ done
 * TROUBLESHOOTING
 
 To trigger a (re)import of an already imported file,
-- edit the /var/lib/escenic/raw/<pub>/<job>/download.state file as the escenic user
+- edit the /var/lib/escenic/raw/<pub>/<job>/download.state file as the escenic user and remove the respective filenames 
 or 
 - use sed '/pattern to match/d' sed /var/lib/escenic/raw/<pub>/<job>/download.state > /var/lib/escenic/raw/<pub>/<job>/download.newstate
 - verify that /var/lib/escenic/raw/<pub>/<job>/download.newstate is good

From 36d3fb722a1680304d414da2b2649cb3247c6a16 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Fri, 25 Oct 2013 12:34:25 +0200
Subject: [PATCH 2180/2585] Fixed bug introduced by
 184f4bd005f1bc1aff409c986566c1e36ab135e5

---
 usr/bin/vosa | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 7b06d5e9..3c3c070d 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -786,7 +786,8 @@ function do_destroy() {
       echo "$instance_name is not enabled"
       exit 1
     fi
-    read_amazon_config $instance_dir/amazon.conf
+
+    [ -r "instance_dir/amazon.conf" ] && read_amazon_config $instance_dir/amazon.conf
     local status=( $(really_do_status $instance_dir) )
     if [ "${status[3]}" == "alive" -o "${status[3]}" == "running" ] ; then
       echo "$instance_name is alive. You might want to stop instances before destroying them."

From 333dd72f61f6197f6cbdf51f1f693c7d9f3cf2ad Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Fri, 25 Oct 2013 12:34:25 +0200
Subject: [PATCH 2181/2585] Fixed bug introduced by
 184f4bd005f1bc1aff409c986566c1e36ab135e5

---
 usr/bin/vosa | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 7b06d5e9..3c3c070d 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -786,7 +786,8 @@ function do_destroy() {
       echo "$instance_name is not enabled"
       exit 1
     fi
-    read_amazon_config $instance_dir/amazon.conf
+
+    [ -r "instance_dir/amazon.conf" ] && read_amazon_config $instance_dir/amazon.conf
     local status=( $(really_do_status $instance_dir) )
     if [ "${status[3]}" == "alive" -o "${status[3]}" == "running" ] ; then
       echo "$instance_name is alive. You might want to stop instances before destroying them."

From 80b914239c98d0c8fc9a180f163fd7806030c129 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Mon, 28 Oct 2013 14:51:42 +0100
Subject: [PATCH 2182/2585] Added a "well known" URI to be able to check
 backend health.

---
 usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
index fbacde5f..73322789 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
@@ -196,6 +196,10 @@ sub vcl_recv {
   /* This is the default backend */
   set req.backend = webdirector;
 
+  if (req.url == "/.well-known/backend-health.txt") {
+    error 200 "OK";
+  }
+
 EOF
 
   if [ -n "${fai_analysis_host}" ]; then

From d0ce24fec1781e5a7fee3b9a15481ec18a05bbc1 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Tue, 29 Oct 2013 13:33:44 +0100
Subject: [PATCH 2183/2585] Removed package-script removal of old packages.

---
 .../escenic/package-scripts/sign-and-add-packages-to-apt-repo   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/package-scripts/sign-and-add-packages-to-apt-repo b/usr/share/escenic/package-scripts/sign-and-add-packages-to-apt-repo
index e418d8fb..cec5a26f 100644
--- a/usr/share/escenic/package-scripts/sign-and-add-packages-to-apt-repo
+++ b/usr/share/escenic/package-scripts/sign-and-add-packages-to-apt-repo
@@ -25,7 +25,7 @@ function get_package_name() {
 for el in $dir/*.deb; do
   echo "Signing and adding $(basename $el) to the APT repository ... "
   dpkg-sig --sign builder -k $gpg_key $el
-  reprepro -Vb $apt_repo_dir remove $suite $(get_package_name $el)
+  # reprepro -Vb $apt_repo_dir remove $suite $(get_package_name $el)
 
   if [[ $(basename $(dirname $el)) == "non-free" ]]; then
       component=non-free

From 583f150700e9f812fdf0adbd4b2ef0de1aaa9fed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Mon, 28 Oct 2013 09:24:28 +0100
Subject: [PATCH 2184/2585] ece-install - added more detailed logging for repo
 donwload

---
 usr/sbin/ece-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 9ea778eb..61ef28e2 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -204,7 +204,7 @@ function download_escenic_components()
           fi
         fi
         if curl -s -I $repo/$el | grep -q '^HTTP[^ ]* 200' ; then
-          log "Downloading $(basename $el) ..."
+          log "Downloading $(basename $el) from $repo/$el ..."
           run wget $wget_opts $repo/$el -O $targetname
           break
         else

From 8b4e55029eee3d0252b31b0cbc544ef10cc9b17e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Mon, 28 Oct 2013 09:24:28 +0100
Subject: [PATCH 2185/2585] ece-install - added more detailed logging for repo
 donwload

---
 usr/sbin/ece-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index f4c954b0..48339e88 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -204,7 +204,7 @@ function download_escenic_components()
           fi
         fi
         if curl -s -I $repo/$el | grep -q '^HTTP[^ ]* 200' ; then
-          log "Downloading $(basename $el) ..."
+          log "Downloading $(basename $el) from $repo/$el ..."
           run wget $wget_opts $repo/$el -O $targetname
           break
         else

From 38e038707b13d5ffc5f22eb91f5e225077a04f88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Mon, 28 Oct 2013 09:45:46 +0100
Subject: [PATCH 2186/2585] ece-install - added more detailed logging for repo
 donwload

---
 usr/sbin/ece-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 48339e88..37b1ce7c 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -208,7 +208,7 @@ function download_escenic_components()
           run wget $wget_opts $repo/$el -O $targetname
           break
         else
-          log "$(basename $el) not found"
+          log "$(basename $el) not found using $repo/$el"
         fi
       done
     done

From b906343a4096b22aac6ad5bf2afa5a1da887cb9b Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Wed, 6 Nov 2013 10:10:38 +0100
Subject: [PATCH 2187/2585] Removed traces of pre-VOSA-49 sdp bootstrapping.

---
 .../post-install-hooks/run-sdp-bootstrapper.sh | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/usr/share/vizrt/vosa/post-install-hooks/run-sdp-bootstrapper.sh b/usr/share/vizrt/vosa/post-install-hooks/run-sdp-bootstrapper.sh
index e6954564..8425fb30 100755
--- a/usr/share/vizrt/vosa/post-install-hooks/run-sdp-bootstrapper.sh
+++ b/usr/share/vizrt/vosa/post-install-hooks/run-sdp-bootstrapper.sh
@@ -11,13 +11,6 @@ SDP_BOOTSTRAPPER=
 
 # if SDP_BOOTSTRAPPER is set to anything, it is assumed to be the URL
 # from which to download a source tar.gz file.
-
-# "old style" sdp.conf parameters (going away in the autom 2013)
-#  ROLE        corresponds to sdp-bootstrap-instance --role
-#  PROFILE     corresponds to sdp-bootstrap-instance --profile
-#  NAME        corresponds to sdp-bootstrap-instance --name
-
-# "new style" being introduced later summer 2013
 #  ENVIRONMENT corresponds to sdp-bootstrap-instance --environment
 #  CLUSTER     corresponds to sdp-bootstrap-instance --cluster
 #  MACHINE     corresponds to sdp-bootstrap-instance --machine
@@ -171,12 +164,7 @@ fi
 $guest sdp-bootstrap-instance \
      --state activation \
      --sdp-file /etc/sdp.xml \
-     ${ROLE+--role $ROLE} \
-     ${REALM+--realm $REALM} \
-     ${PROFILE+--profile $PROFILE} \
-     ${NAME+--name $NAME} \
-     --run-module baseline \
-     --run-module restore-backup \
-     --run-module "backup-set-escenic-database" \
-     --run-module "backup-set-escenic-multimedia" \
+     ${ENVIRONMENT+--environment $ENVIRONMENT} \
+     ${CLUSTER+--cluster $CLUSTER} \
+     ${MACHINE+--machine $MACHINE} \
      --verbose

From 6856a6d86487e6df3a87ebe8a1532d1b4d783b0f Mon Sep 17 00:00:00 2001
From: Monzurul Hoque Ziku <mhoque@vizrt.com>
Date: Fri, 8 Nov 2013 08:39:19 +0600
Subject: [PATCH 2188/2585] NIE-1040: Added monitoring the number of open files
 on engine1 (and search1)

---
 usr/lib/check_mk_agent/local/ece | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/usr/lib/check_mk_agent/local/ece b/usr/lib/check_mk_agent/local/ece
index 37bb04fa..127dacf6 100755
--- a/usr/lib/check_mk_agent/local/ece
+++ b/usr/lib/check_mk_agent/local/ece
@@ -35,6 +35,18 @@ function determine_health() {
       continue;
     fi
 
+    nr_open_files=$(ls /proc/$pid/fd | wc -l)
+    limit_open_files=$(cat /proc/$pid/limits | awk '/^Max open files  /{print $4}')
+    if [ $nr_open_files -le 2456 ]; then
+      echo "0 ${basename}_filehandles - OK ${basename} is using $nr_open_files of $limit_open_files file handles"
+    else
+        if [ $nr_open_files -le 3456 ]; then
+          echo "1 ${basename}_filehandles - ${basename} is using $nr_open_files of $limit_open_files file handles (warning at 50%)"
+        else
+          echo "2 ${basename}_filehandles - ${basename} is using $nr_open_files of $limit_open_files file handles (critical 75%)"
+        fi
+    fi
+
     echo "0 ${basename}_up - OK process $pid"
 
   done

From dbaa5f67a42b569c27fac388fe36e7159f13153a Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 21 Nov 2013 21:39:58 +0100
Subject: [PATCH 2189/2585] Changed runlevel to 35 instead of 20, to ensure we
 start after mysql etc.

---
 usr/sbin/ece-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 61ef28e2..ffc36fa9 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -836,7 +836,7 @@ function add_ece_init_to_runlevels() {
 
   if [ $on_debian_or_derivative -eq 1 ]; then
     print_and_log "Adding the ece init.d script to the default run levels ..."
-    run update-rc.d ece defaults
+    run update-rc.d ece defaults 35
   elif [ $on_redhat_or_derivative -eq 1 ]; then
     run chkconfig --level 35 ece on
   else

From 8b972bd3f3a81c317e3742f4b9850abeaa9d27f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Mon, 25 Nov 2013 15:33:11 +0100
Subject: [PATCH 2190/2585] ece-build - build will now use a intermediate
 src_master folder instead of deleting the working copy

---
 usr/share/escenic/build-scripts/ece-build | 40 +++++++++++++++++++++--
 1 file changed, 37 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 4a7c51cf..a1d6e26c 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -14,7 +14,7 @@ log=~/ece-build.log
 # build related variables
 build_date=`date +%F_%H%M`
 maven_build_offline=0
-maven_opts="clean install"
+maven_opts="-U clean install"
 skip_ear=0
 project_pom_versions=""
 
@@ -153,6 +153,7 @@ assemblytool_lib_dir=$assemblytool_root_dir/lib
 conf_file=~/.build/build.conf
 maven_conf_file=~/.m2/settings.xml
 project_src_dir=~/src
+project_src_master_dir=~/src_master
 project_assembly_dir=$project_src_dir/project-assembly
 project_assembly_target_dir=$project_assembly_dir/target
 release_dir=~/releases
@@ -518,11 +519,39 @@ function git_checkout
       exit 1
     fi
     release_label=branch-$git_path
+    branch_name=$git_path
     git_path="-b $git_path"
   fi
 
+  
+  if [ -d $project_src_master_dir ]; then
+    cd $project_src_master_dir
+    git show-ref --quiet --verify "refs/heads/master"
+    if [ ! $? = 0 ]; then
+      run_wrapper rm -rf $project_src_master_dir
+    fi
+  fi
+  if [ ! -d $project_src_master_dir ]; then
+    make_dir $project_src_master_dir
+    run_wrapper git clone $git_repo_uri $project_src_master_dir
+  fi
+    
+  cd $project_src_master_dir
+  run_wrapper git checkout master
+  run_wrapper git clean -d -x -f
+  if [[ "$git_path" != "" ]]; then
+    git show-ref --quiet --verify "refs/heads/$branch_name"
+    if [ $? = 0 ]; then
+      run_wrapper git checkout $branch_name
+    else
+      run_wrapper git checkout -b $branch_name origin/$branch_name  
+    fi
+  fi
+  run_wrapper git pull --rebase
+  run_wrapper git clean -d -x -f
+  
   # git checkout
-  run_wrapper git clone $git_path $git_repo_uri $project_src_dir
+  run_wrapper git clone $git_path $project_src_master_dir $project_src_dir
 
   cd $project_src_dir
   revision=`git describe --always`
@@ -1041,8 +1070,13 @@ context-root: /dashboard" > $assemblytool_pub_dir/dashboard.properties
   fi
   if [ -d $plugin_dir/newsgate ]; then
     log "Adding an assembly descriptor for Newsgate Webservice ..."
-    echo "source-war: ../../plugins/newsgate/webapps/newsgate-webservice.war
+    if [ -e $plugin_dir/newsgate/webapps/newsgate-webservice.war ]; then
+      echo "source-war: ../../plugins/newsgate/webapps/newsgate-webservice.war
 context-root: /newsgate-webservice" > $assemblytool_pub_dir/newsgate-webservice.properties
+    else
+      echo "source-war: ../../plugins/newsgate/wars/newsgate-webservice.war
+context-root: /newsgate-webservice" > $assemblytool_pub_dir/newsgate-webservice.properties
+    fi
   fi
 }
 

From 696e5608b99cc2c5a82b3f5521f96c9c3fadf953 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Mon, 25 Nov 2013 15:33:11 +0100
Subject: [PATCH 2191/2585] ece-build - build will now use a intermediate
 src_master folder instead of deleting the working copy

---
 usr/share/escenic/build-scripts/ece-build | 40 +++++++++++++++++++++--
 1 file changed, 37 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 4a7c51cf..a1d6e26c 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -14,7 +14,7 @@ log=~/ece-build.log
 # build related variables
 build_date=`date +%F_%H%M`
 maven_build_offline=0
-maven_opts="clean install"
+maven_opts="-U clean install"
 skip_ear=0
 project_pom_versions=""
 
@@ -153,6 +153,7 @@ assemblytool_lib_dir=$assemblytool_root_dir/lib
 conf_file=~/.build/build.conf
 maven_conf_file=~/.m2/settings.xml
 project_src_dir=~/src
+project_src_master_dir=~/src_master
 project_assembly_dir=$project_src_dir/project-assembly
 project_assembly_target_dir=$project_assembly_dir/target
 release_dir=~/releases
@@ -518,11 +519,39 @@ function git_checkout
       exit 1
     fi
     release_label=branch-$git_path
+    branch_name=$git_path
     git_path="-b $git_path"
   fi
 
+  
+  if [ -d $project_src_master_dir ]; then
+    cd $project_src_master_dir
+    git show-ref --quiet --verify "refs/heads/master"
+    if [ ! $? = 0 ]; then
+      run_wrapper rm -rf $project_src_master_dir
+    fi
+  fi
+  if [ ! -d $project_src_master_dir ]; then
+    make_dir $project_src_master_dir
+    run_wrapper git clone $git_repo_uri $project_src_master_dir
+  fi
+    
+  cd $project_src_master_dir
+  run_wrapper git checkout master
+  run_wrapper git clean -d -x -f
+  if [[ "$git_path" != "" ]]; then
+    git show-ref --quiet --verify "refs/heads/$branch_name"
+    if [ $? = 0 ]; then
+      run_wrapper git checkout $branch_name
+    else
+      run_wrapper git checkout -b $branch_name origin/$branch_name  
+    fi
+  fi
+  run_wrapper git pull --rebase
+  run_wrapper git clean -d -x -f
+  
   # git checkout
-  run_wrapper git clone $git_path $git_repo_uri $project_src_dir
+  run_wrapper git clone $git_path $project_src_master_dir $project_src_dir
 
   cd $project_src_dir
   revision=`git describe --always`
@@ -1041,8 +1070,13 @@ context-root: /dashboard" > $assemblytool_pub_dir/dashboard.properties
   fi
   if [ -d $plugin_dir/newsgate ]; then
     log "Adding an assembly descriptor for Newsgate Webservice ..."
-    echo "source-war: ../../plugins/newsgate/webapps/newsgate-webservice.war
+    if [ -e $plugin_dir/newsgate/webapps/newsgate-webservice.war ]; then
+      echo "source-war: ../../plugins/newsgate/webapps/newsgate-webservice.war
 context-root: /newsgate-webservice" > $assemblytool_pub_dir/newsgate-webservice.properties
+    else
+      echo "source-war: ../../plugins/newsgate/wars/newsgate-webservice.war
+context-root: /newsgate-webservice" > $assemblytool_pub_dir/newsgate-webservice.properties
+    fi
   fi
 }
 

From 2ff5b68b87e86e53374af05ef87709ae5516427e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Wed, 4 Dec 2013 09:11:59 +0100
Subject: [PATCH 2192/2585] ece-build - added remote update to src_master

---
 usr/share/escenic/build-scripts/ece-build | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index a1d6e26c..91a14b94 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -539,6 +539,8 @@ function git_checkout
   cd $project_src_master_dir
   run_wrapper git checkout master
   run_wrapper git clean -d -x -f
+  run_wrapper git remote update
+  run_wrapper git fetch
   if [[ "$git_path" != "" ]]; then
     git show-ref --quiet --verify "refs/heads/$branch_name"
     if [ $? = 0 ]; then

From e8231f0ceb0c3764457d25ec3a88c7388122f166 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Wed, 4 Dec 2013 09:11:59 +0100
Subject: [PATCH 2193/2585] ece-build - added remote update to src_master

---
 usr/share/escenic/build-scripts/ece-build | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index a1d6e26c..91a14b94 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -539,6 +539,8 @@ function git_checkout
   cd $project_src_master_dir
   run_wrapper git checkout master
   run_wrapper git clean -d -x -f
+  run_wrapper git remote update
+  run_wrapper git fetch
   if [[ "$git_path" != "" ]]; then
     git show-ref --quiet --verify "refs/heads/$branch_name"
     if [ $? = 0 ]; then

From eeefe233510115e1df0254e26a2c007aef50b3c8 Mon Sep 17 00:00:00 2001
From: Debashis Paul <Dpaul@vizrt.com>
Date: Wed, 11 Dec 2013 16:30:14 +0100
Subject: [PATCH 2194/2585] VIZRTSAAS-312: Change varnish configuration to set
 caching time based on content-type instead of file extension. Enable
 compression for javascript

---
 .../escenic/ece-scripts/ece-install.d/cache-server.sh      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
index 73322789..9ac99b73 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
@@ -467,7 +467,8 @@ function create_varnish_conf_compression() {
   local file=${varnish_conf_dir}/compression.vcl
   cat > $file <<EOF
 sub vcl_fetch {
-  if (beresp.http.content-type ~ "^text/") {
+  if (beresp.http.content-type ~ "^text/" || 
+      beresp.http.content-type == "application/javascript") {
     set beresp.do_gzip = true;
   }
 }
@@ -534,14 +535,14 @@ sub vcl_fetch {
 
   /* Remove cookies from these resource types and cache them for a
    * long time */
-  if (req.url ~ "\.(png|gif|jpg|css|js)$" ||
+  if (req.url ~ "\.(png|gif|jpg|css|js)$" || beresp.http.content-type ~ "^image/" ||
       req.url == "/favicon.ico" && beresp.status == 200) {
     set beresp.ttl = 5h;
   }
 }
 
 sub vcl_deliver {
-  if (req.url ~ "\.(png|gif|jpg)$" && resp.status == 200) {
+  if (resp.http.content-type ~ "^image/" && resp.status == 200) {
     set resp.http.Cache-Control = "public, max-age=3600";
   }
   else if ((req.url ~ "\.(css|js)$" || req.url == "/favicon.ico") &&

From 9b7ba0ce5437007a291de3d8f7669ca48e4892da Mon Sep 17 00:00:00 2001
From: Thomas <thomas@velthoven.no>
Date: Tue, 21 Jan 2014 11:20:29 +0100
Subject: [PATCH 2195/2585] Removing my name from README :-)

---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index b131d811..6f81343c 100644
--- a/README
+++ b/README
@@ -50,7 +50,7 @@ Feedback
 Hope you enjoy the ece /usr/bin and intit.d scripts. All feedback,
 come hither!
 
-Thomas Velthoven tvelthoven(at)vizrt.com
+Escenic Support support(at)escenic.com
 
 (The founder of this repo , Torstein, has move(d) on to other challenges)
 

From 3cc1fb2a62fab48b716698dd5e99b9660422d78d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Tue, 21 Jan 2014 12:54:27 +0100
Subject: [PATCH 2196/2585] ece-build - added new package name for
 analysis-engine to support 5.7

---
 usr/share/escenic/build-scripts/ece-build | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 91a14b94..49da7e66 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -70,7 +70,7 @@ project_maven_coordinates=""
 declare -A maven_snapshot_coordinates=(
 ["assemblytool"]="com.escenic.tools:assemblytool:jar"
 ["engine"]="com.escenic:engine-dist:zip:bin"
-["analysis-engine"]="com.escenic.plugins.analysis:analysis-engine:zip"
+["analysis-engine"]="com.escenic.plugins.analysis-engine:analysis-engine:zip"
 ["changelog"]="com.escenic.changelog:changelog:zip"
 ["dashboard"]="com.escenic.plugins.dashboard:dashboard:zip"
 ["forum"]="com.escenic.plugins.forum:forum:zip"
@@ -99,7 +99,8 @@ declare -A maven_snapshot_coordinates=(
 declare -A maven_coordinates=(
 ["assemblytool"]="com.escenic.tools:assemblytool:jar"
 ["engine"]="com.escenic:engine-dist:zip:bin"
-["analysis-engine"]="com.escenic.plugins.analysis:analysis-engine:zip"
+["analysis-engine"]="com.escenic.plugins.analysis:analysis-engine:zip
+com.escenic.plugins.analysis-engine:analysis-engine:zip"
 ["changelog"]="com.escenic.changelog:changelog:zip"
 ["dashboard"]="com.escenic.plugins.dashboard:dashboard:zip"
 ["forum"]="com.escenic.plugins.forum:forum:zip"

From 4ca559538549e116768695534522a8bd848271d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Tue, 21 Jan 2014 12:54:27 +0100
Subject: [PATCH 2197/2585] ece-build - added new package name for
 analysis-engine to support 5.7

---
 usr/share/escenic/build-scripts/ece-build | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 91a14b94..49da7e66 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -70,7 +70,7 @@ project_maven_coordinates=""
 declare -A maven_snapshot_coordinates=(
 ["assemblytool"]="com.escenic.tools:assemblytool:jar"
 ["engine"]="com.escenic:engine-dist:zip:bin"
-["analysis-engine"]="com.escenic.plugins.analysis:analysis-engine:zip"
+["analysis-engine"]="com.escenic.plugins.analysis-engine:analysis-engine:zip"
 ["changelog"]="com.escenic.changelog:changelog:zip"
 ["dashboard"]="com.escenic.plugins.dashboard:dashboard:zip"
 ["forum"]="com.escenic.plugins.forum:forum:zip"
@@ -99,7 +99,8 @@ declare -A maven_snapshot_coordinates=(
 declare -A maven_coordinates=(
 ["assemblytool"]="com.escenic.tools:assemblytool:jar"
 ["engine"]="com.escenic:engine-dist:zip:bin"
-["analysis-engine"]="com.escenic.plugins.analysis:analysis-engine:zip"
+["analysis-engine"]="com.escenic.plugins.analysis:analysis-engine:zip
+com.escenic.plugins.analysis-engine:analysis-engine:zip"
 ["changelog"]="com.escenic.changelog:changelog:zip"
 ["dashboard"]="com.escenic.plugins.dashboard:dashboard:zip"
 ["forum"]="com.escenic.plugins.forum:forum:zip"

From ad025a62ac7f9b5d7d76f1b6c272ce61c8804b6f Mon Sep 17 00:00:00 2001
From: saif shams <sshams@vizrt.com>
Date: Wed, 22 Jan 2014 13:42:33 +0100
Subject: [PATCH 2198/2585] enabled s3cmd get to ece-import. Now we can have a
 ece-import command with uri as s3://mybucket/folder/

---
 usr/share/escenic/ece-scripts/common-io.sh    | 10 ++++++
 .../ece-scripts/ece-import.d/http-and-ftp.sh  | 35 ++++++++++++-------
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/common-io.sh b/usr/share/escenic/ece-scripts/common-io.sh
index 7f94ff6a..4acc6363 100644
--- a/usr/share/escenic/ece-scripts/common-io.sh
+++ b/usr/share/escenic/ece-scripts/common-io.sh
@@ -133,6 +133,16 @@ function download_uri_target_to_dir() {
       --server-response \
       --output-document "$target_file" \
       $uri
+  elif [[ $uri == "s3://"* ]]; then
+
+    if [ -z $target_file ] ; then
+      target_file=$(basename $uri)
+    fi
+
+    log "Downloading" $uri "to" $target_dir "..."
+    run cd $target_dir
+    run s3cmd get $uri $target_file
+
   else
     
     local file=$uri    
diff --git a/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh b/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh
index fb86733b..37570ea3 100644
--- a/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh
+++ b/usr/share/escenic/ece-scripts/ece-import.d/http-and-ftp.sh
@@ -27,18 +27,22 @@ function download_latest_files() {
 
   # long sed from
   # http://stackoverflow.com/questions/1881237/easiest-way-to-extract-the-urls-from-an-html-page-using-sed-or-awk-only
-  local list_of_files=$(
-    wget $user_and_password \
-      --quiet \
-      --output-document \
-      - $uri | \
-      sed -e 's/<a /\n<a /g' | \
-      grep ^'<a href' | \
-      sed -e 's/<a .*href=['"'"'"]//' \
-      -e 's/["'"'"'].*$//' \
-      -e '/^$/ d' | \
-      egrep -i '.(xml|jpg|jpeg|gif|pdf)$'
-  )
+  if [[ $uri == "s3://"* ]]; then
+    local list_of_files=$(s3cmd ls $uri | awk '{print $4}'| egrep -i '.(xml|jpg|jpeg|gif|pdf)$')
+  else
+    local list_of_files=$(
+      wget $user_and_password \
+        --quiet \
+        --output-document \
+        - $uri | \
+        sed -e 's/<a /\n<a /g' | \
+        grep ^'<a href' | \
+        sed -e 's/<a .*href=['"'"'"]//' \
+        -e 's/["'"'"'].*$//' \
+        -e '/^$/ d' | \
+        egrep -i '.(xml|jpg|jpeg|gif|pdf)$'
+    )
+  fi
 
   download_files_if_desired $list_of_files
 }
@@ -54,7 +58,12 @@ function download_files_if_desired() {
   fi
   
   for the_file in $list_of_files; do
-    local url_to_download=$(url_to_download $the_file $arg_regex_of_file $arg_write_url)
+
+    if [[ $the_file == "s3://"* ]]; then
+       local url_to_download=$the_file
+    else
+       local url_to_download=$(url_to_download $the_file $arg_regex_of_file $arg_write_url)
+    fi
     
     if [ $(is_already_downloaded $url_to_download) -eq 1 ]; then
       # not logging anything here as this will create log files in

From e26a4c7e59a1df0afa444c04bd17fd38ea826ffe Mon Sep 17 00:00:00 2001
From: Erik Mogensen <erik@mogensoft.net>
Date: Thu, 13 Feb 2014 13:28:58 +0100
Subject: [PATCH 2199/2585] unzip now fails if it wants to ask questions

For exmample if the disk is full or a disk write error occurs.
---
 usr/share/escenic/ece-scripts/ece.d/deploy.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/deploy.sh b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
index 55bf78f8..efb444fc 100644
--- a/usr/share/escenic/ece-scripts/ece.d/deploy.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
@@ -97,7 +97,7 @@ function deploy() {
   (
     run mkdir -p $dir
     run cd $dir
-    run unzip -q $ear
+    run unzip -q $ear < /dev/null
   )
 
   print "Deploying $ear on $appserver ..."
@@ -166,7 +166,7 @@ function deploy() {
 
         make_dir $tomcat_base/$app_base/$name
         run cd $tomcat_base/$app_base/$name
-        run unzip -q $war
+        run unzip -q $war < /dev/null
 
         if [ ${enable_memcached_support-1} -eq 1 ]; then
           add_memcached_support $tomcat_base/$app_base/$name

From 5b180b2b7a8a2236294f5a814d93dfab66b942b1 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Tue, 11 Mar 2014 13:41:20 +0100
Subject: [PATCH 2200/2585] Added correct configuration for the
 note-webservice.

---
 usr/share/escenic/ece-scripts/common-ece.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/ece-scripts/common-ece.sh b/usr/share/escenic/ece-scripts/common-ece.sh
index 8d30d3c0..5e5f040d 100644
--- a/usr/share/escenic/ece-scripts/common-ece.sh
+++ b/usr/share/escenic/ece-scripts/common-ece.sh
@@ -85,6 +85,7 @@ webapps_in_standard_webapps_list="
   video-webservice
   video-webservice-extensions
   poll-ws
+  note-webservice
 "
 
 ### is_webapp_a_publication

From e6958fb994df4bca262df9e6c09ea6d8ba287076 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 5 Sep 2013 19:52:44 +0200
Subject: [PATCH 2201/2585] Added support for the DataSource configuration of
 the upcoming ECE release.

- The DataSources have been merged into one, no ECE_READ_DS and _UPDATE_DS
  just the ECE_DS
- same with the ReadConnector and UpdateConnector
- This depends on the presence of the DataConnector.properties file
  in the machine's /etc/escenic/engine/common/connector/  (which is only
  there if it's a 5.7 installation
- CommunityEngine also uses the ECE_DS when it is present.

Conflicts:
	usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
---
 .../ece-scripts/ece-install.d/app-server.sh   | 50 +++++++++++++------
 .../ece-install.d/content-engine.sh           | 21 ++++++--
 2 files changed, 52 insertions(+), 19 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 069e5c86..b0b49116 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -192,7 +192,11 @@ function set_up_app_server() {
 EOF
   if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER \
     -a $install_profile_number -ne $PROFILE_SEARCH_SERVER ]; then
-    cat >> $tomcat_base/conf/server.xml <<EOF
+    # AFTER Content Engine 5.6, the Read and Update connectors are gone
+    # replaced with ReadConnector.  Configure it appropriately based
+    # on the presence of it in the common nursery dir.
+    if [ ! -r $common_nursery_dir/connector/DataConnector.properties ] ; then
+      cat >> $tomcat_base/conf/server.xml <<EOF
     <Resource
         name="jdbc/ECE_READ_DS"
         auth="Container"
@@ -216,11 +220,22 @@ EOF
         testWhileIdle="true"
         validationQuery="select now()"
     />
+EOF
+    fi
+    if [ -r $common_nursery_dir/connector/DataConnector.properties ] ; then
+      local ds=ECE_DS
+      local max=500
+    else
+      local ds=ECE_UPDATE_DS
+      local max=100
+    fi
+
+    cat >> $tomcat_base/conf/server.xml <<EOF
     <Resource
-        name="jdbc/ECE_UPDATE_DS"
+        name="jdbc/$ds"
         auth="Container"
         type="javax.sql.DataSource"
-        maxActive="100"
+        maxActive="$max"
         maxIdle="8"
         maxWait="2000"
         initialSize="20"
@@ -395,18 +410,23 @@ EOF
 
   if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER -a \
     $install_profile_number -ne $PROFILE_SEARCH_SERVER ]; then
-    cat >> $tomcat_base/conf/context.xml <<EOF
-  <ResourceLink
-      global="jdbc/ECE_READ_DS"
-      name="jdbc/ECE_READ_DS"
-      type="javax.sql.DataSource"
-  />
-  <ResourceLink
-      global="jdbc/ECE_UPDATE_DS"
-      name="jdbc/ECE_UPDATE_DS"
-      type="javax.sql.DataSource"
-  />
-EOF
+
+    # Insert the ResourceLink element.
+    local el
+    if [ -r $common_nursery_dir/connector/DataConnector.properties ] ; then
+      local DSs="_"
+    else
+      local DSs="_READ_ _UPDATE_"
+    fi
+    for el in $DSs ; do
+      xmlstarlet ed -P -L \
+       -s /Context -t elem -n TMP -v '' \
+       -i //TMP -t attr -n global -v jdbc/ECE${el}DS \
+       -i //TMP -t attr -n name -v jdbc/ECE${el}DS \
+       -i //TMP -t attr -n type -v javax.sql.DataSource \
+       -r //TMP -v ResourceLink \
+       $tomcat_base/conf/context.xml
+    done
   fi
 
   if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER ]; then
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index d2c47340..1e2c9dcb 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -523,15 +523,28 @@ databaseProductName=MySQL
 filePublicationRoot=$escenic_data_dir/engine/
 webPublicationRoot=http://${public_host_name}/
 EOF
-  cat > $common_nursery_dir/neo/io/managers/ContentManager.properties <<EOF
+  # AFTER Content Engine 5.6, the Read and Update connectors are gone
+  # replaced with ReadConnector.  Configure it appropriately based
+  # on the presence of it in the common nursery dir.
+  if [ -r $common_nursery_dir/connector/DataConnector.properties ] ; then
+    cat > $common_nursery_dir/neo/io/managers/ContentManager.properties <<EOF
+dataConnector=/connector/DataConnector
+EOF
+  else
+    cat > $common_nursery_dir/neo/io/managers/ContentManager.properties <<EOF
 readConnector=/connector/ReadConnector
 updateConnector=/connector/UpdateConnector
 EOF
-
+  fi
   file=$common_nursery_dir/com/escenic/community/CommunityEngine.properties
   if [ -w ${file} ]; then
-    sed -i 's/jdbc\/ecome/jdbc\/ECE_UPDATE_DS/g' $file
-    exit_on_error "sed on $file"
+    if [ -r $common_nursery_dir/connector/DataConnector.properties ] ; then
+      sed -i 's/jdbc\/ecome/jdbc\/ECE_DS/g' $file
+      exit_on_error "sed on $file"
+    else
+      sed -i 's/jdbc\/ecome/jdbc\/ECE_UPDATE_DS/g' $file
+      exit_on_error "sed on $file"
+    fi
   elif [ ! -e ${file} ]; then
     print_and_log "I Could not find an ECOME configuration file," \
       "I assume you have not installed Community Engine."

From 072c7165ae118434a4ddf8819726e54ea2f234c6 Mon Sep 17 00:00:00 2001
From: Debashis Paul <Dpaul@vizrt.com>
Date: Mon, 17 Mar 2014 10:27:36 +0100
Subject: [PATCH 2202/2585] app-server.sh file taken from the lean branch to
 accomodated changes for Escenic 5.7

---
 .../ece-scripts/ece-install.d/app-server.sh   | 123 +++++++++---------
 1 file changed, 65 insertions(+), 58 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index b0b49116..4cbd207b 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -140,9 +140,12 @@ function set_up_app_server() {
 
   tomcat_home=${appserver_parent_dir}/tomcat
   tomcat_base=${appserver_parent_dir}/tomcat-${instance_name}
-  make_dir $tomcat_base
 
-  run cp -r ${appserver_parent_dir}/${tomcat_dir}/conf $tomcat_base
+  if [ ! -d $tomcat_base ] ; then
+    make_dir $tomcat_base
+    run cp -r ${appserver_parent_dir}/${tomcat_dir}/conf $tomcat_base
+  fi
+
   for el in bin escenic/lib lib work logs temp webapps; do
     make_dir $tomcat_base/$el
   done
@@ -314,7 +317,7 @@ EOF
                protocol="HTTP/1.1"
                connectionTimeout="20000"
                URIEncoding="UTF-8"
-               compression="on"
+               compression="off"
                redirectPort="${redirect_port}"
     />
     <Connector port="${redirect_port}"
@@ -330,6 +333,7 @@ EOF
              suffix=".log"
              pattern="common"/>
       <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+             digest="md5"
              resourceName="UserDatabase"/>
       <Host name="localhost"
             appBase="webapps"
@@ -402,12 +406,17 @@ EOF
 </Server>
 EOF
 
-  cat > $tomcat_base/conf/context.xml <<EOF
+  if [ ! -e $tomcat_base/conf/context.xml ] ; then
+    cat > $tomcat_base/conf/context.xml <<EOF
 <?xml version='1.0' encoding='utf-8'?>
-<Context>
-  <WatchedResource>WEB-INF/web.xml</WatchedResource>
+<Context/>
 EOF
 
+  xmlstarlet ed -P -L \
+     -s /Context -t elem -n WatchedResource -v WEB-INF/web.xml \
+     $tomcat_base/conf/context.xml
+  fi
+
   if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER -a \
     $install_profile_number -ne $PROFILE_SEARCH_SERVER ]; then
 
@@ -430,63 +439,61 @@ EOF
   fi
 
   if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER ]; then
-    cat >> $tomcat_base/conf/context.xml <<EOF
-  <Environment
-      name="escenic/solr-base-uri"
-      value="http://${search_host}:${search_port}/solr/"
-      type="java.lang.String"
-      override="false"
-  />
-EOF
+    xmlstarlet ed -P -L \
+       -s /Context -t elem -n TMP -v '' \
+       -i //TMP -t attr -n name -v escenic/solr-base-uri \
+       -i //TMP -t attr -n value -v http://${search_host}:${search_port}/solr/ \
+       -i //TMP -t attr -n type -v java.lang.String \
+       -i //TMP -t attr -n override -v false \
+       -r //TMP -v Environment \
+       $tomcat_base/conf/context.xml
+
   fi
 
   if [ $install_profile_number -eq $PROFILE_SEARCH_SERVER -o \
     $install_profile_number -eq $PROFILE_ALL_IN_ONE ]; then
-    cat >> $tomcat_base/conf/context.xml <<EOF
-  <Environment
-      name="escenic/indexer-webservice"
-      value="${indexer_ws_uri}"
-      type="java.lang.String"
-      override="false"
-  />
-  <Environment
-      name="escenic/index-update-uri"
-      value="http://${search_host}:${search_port}/solr/update/"
-      type="java.lang.String"
-      override="false"
-  />
-  <Environment
-      name="escenic/head-tail-storage-file"
-      value="$escenic_data_dir/engine/head-tail.index"
-      type="java.lang.String"
-      override="false"
-  />
-  <Environment
-      name="escenic/failing-documents-storage-file"
-      value="$escenic_data_dir/engine/failures.index"
-      type="java.lang.String"
-      override="false"
-  />
-</Context>
-EOF
+
+    xmlstarlet ed -P -L \
+       -s /Context -t elem -n TMP -v '' \
+       -i /Context/TMP -t attr -n name -v escenic/indexer-webservice \
+       -i /Context/TMP -t attr -n value -v ""${indexer_ws_uri} \
+       -i /Context/TMP -t attr -n type -v java.lang.String \
+       -i /Context/TMP -t attr -n override -v false \
+       -r //TMP -v Environment \
+       -s /Context -t elem -n TMP -v '' \
+       -i /Context/TMP -t attr -n name -v escenic/index-update-uri \
+       -i /Context/TMP -t attr -n value -v http://${search_host}:${search_port}/solr/update/ \
+       -i /Context/TMP -t attr -n type -v java.lang.String \
+       -i /Context/TMP -t attr -n override -v false \
+       -r //TMP -v Environment \
+       -s /Context -t elem -n TMP -v '' \
+       -i /Context/TMP -t attr -n name -v escenic/head-tail-storage-file \
+       -i /Context/TMP -t attr -n value -v $escenic_data_dir/engine/head-tail.index \
+       -i /Context/TMP -t attr -n type -v java.lang.String \
+       -i /Context/TMP -t attr -n override -v false \
+       -r //TMP -v Environment \
+       -s /Context -t elem -n TMP -v '' \
+       -i /Context/TMP -t attr -n name -v escenic/failing-documents-storage-file \
+       -i /Context/TMP -t attr -n value -v $escenic_data_dir/engine/failures.index \
+       -i /Context/TMP -t attr -n type -v java.lang.String \
+       -i /Context/TMP -t attr -n override -v false \
+       -r //TMP -v Environment \
+       $tomcat_base/conf/context.xml
+
+
   elif [ $install_profile_number -eq $PROFILE_ANALYSIS_SERVER ]; then
-    cat >> $tomcat_base/conf/context.xml <<EOF
-  <ResourceLink
-      global="jdbc/eae-logger/logger"
-      name="jdbc/eae-logger/logger"
-      type="javax.sql.DataSource"
-  />
-  <ResourceLink
-      global="jdbc/eae-qs/qs"
-      name="jdbc/eae-qs/qs"
-      type="javax.sql.DataSource"
-  />
-</Context>
-EOF
-  else
-    cat >> $tomcat_base/conf/context.xml <<EOF
-</Context>
-EOF
+    xmlstarlet ed -P -L \
+       -s /Context -t elem -n TMP -v '' \
+       -i /Context/TMP -t attr -n global -v jdbc/eae-logger/logger \
+       -i /Context/TMP -t attr -n name -v jdbc/eae-logger/logger \
+       -i /Context/TMP -t attr -n type -v javax.sql.DataSource \
+       -r //TMP -v ResourceLink \
+       -s /Context -t elem -n TMP -v '' \
+       -i /Context/TMP -t attr -n global -v jdbc/eae-qs/qs \
+       -i /Context/TMP -t attr -n name -v jdbc/eae-qs/qs \
+       -i /Context/TMP -t attr -n type -v javax.sql.DataSource \
+       -r //TMP -v ResourceLink \
+       $tomcat_base/conf/context.xml
   fi
 
   set_up_logging

From fde68569cb538f691a7781c6cf9efd52991803ae Mon Sep 17 00:00:00 2001
From: Debashis Paul <Dpaul@vizrt.com>
Date: Mon, 17 Mar 2014 14:53:41 +0100
Subject: [PATCH 2203/2585] set_up_app_server moved after nursery
 configuration, because set_up_app_server decides about data-source upon the
 existence of DataConnector.properties file in the configuration layer ...
 this is important for version 5.7

---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 1e2c9dcb..6ce0d3e4 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -100,13 +100,13 @@ function install_ece_instance() {
       $ece_instance_conf_archive
   fi
 
-  set_up_app_server
-
   if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER ]; then
     set_up_basic_nursery_configuration
     set_up_instance_specific_nursery_configuration
   fi
 
+  set_up_app_server
+
   # We set a WAR white list for all profiles except all in one
   if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER ]; then
     local file=$escenic_conf_dir/ece-${instance_name}.conf

From d13c7bf9565c7d783589283c91ef3e4c3b5094b1 Mon Sep 17 00:00:00 2001
From: Debashis Paul <Dpaul@vizrt.com>
Date: Mon, 17 Mar 2014 14:59:28 +0100
Subject: [PATCH 2204/2585] Previously widget-framework had been ignored as a
 plugin, because it was downloaded separately and handled in wf_download_list
 param. Now this is just another plugin

---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 6ce0d3e4..942cbd6d 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -391,8 +391,7 @@ EOF
   find ../../ -maxdepth 1 -type d | \
     grep -v assemblytool | \
     while read directory; do
-    if [ $directory = "../../" -o \
-      $(echo $directory | grep widget-framework | wc -l) -gt 0 ]; then
+    if [ $directory = "../../" ]; then
       continue
     fi
 

From fc9aaa28b0f3770a558417aec3c74bef1725f9c6 Mon Sep 17 00:00:00 2001
From: Debashis Paul <Dpaul@vizrt.com>
Date: Mon, 17 Mar 2014 15:55:46 +0100
Subject: [PATCH 2205/2585] Missing property fai_environment handled to create
 ece_environment property in ece conf

---
 .../escenic/ece-scripts/ece-install.d/content-engine.sh     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 942cbd6d..c361a977 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -115,6 +115,12 @@ function install_ece_instance() {
       deploy_webapp_white_list \
       $(get_deploy_white_list) \
       $file
+    if [ ! -z "$fai_environment" ] ; then
+      set_conf_file_value \
+        ece_environment \
+        "$fai_environment" \
+        $file
+    fi
   fi
 
   if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER -a \

From a57146851bff112680dc83e1f8bd67c303ebd9ed Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 20 Mar 2014 15:44:06 +0100
Subject: [PATCH 2206/2585] VOSA-69: updated doc to reflect tap interface
 names.

---
 usr/share/doc/vizrt/vosa-guide.org | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-guide.org b/usr/share/doc/vizrt/vosa-guide.org
index 05011e90..f1f7e09e 100644
--- a/usr/share/doc/vizrt/vosa-guide.org
+++ b/usr/share/doc/vizrt/vosa-guide.org
@@ -240,14 +240,20 @@ completely dark, and so shouldn't happen whenever any virtual
 machines are running.
 
 #+BEGIN_SRC sh
+br=br0
 for i in $(seq 1 10) ; do
   tap=$(tunctl -b)
-  touch /var/run/vizrt/vosa/$tap.availablenetwork
-  brctl addif br0 $tap
+  echo $br > /var/run/vizrt/vosa/$tap.availablenetwork
+  brctl addif $br $tap
   ifconfig $tap up 0.0.0.0
 done
 #+END_SRC
 
+If your machine has multiple network interfaces, talking with different
+physical networks, you need to make several bridges, and create tap
+devices for each bridge, indicating which bridge the tap interface is
+bound to.  The above script uses the *br0* bridge.
+
 *tunctl* creates the tap interface, and we create a file with the name
 of the created tap interface in a directory.  This little snippet
 needs to run every time the host machine boots.

From ad20fa8b38a24456a1d4828054b30f8aea528db0 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 20 Mar 2014 15:44:34 +0100
Subject: [PATCH 2207/2585] VOSA-70: suggest install genisoimage when
 installing vosa.

---
 usr/share/escenic/package-scripts/debian/vosa/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/package-scripts/debian/vosa/control b/usr/share/escenic/package-scripts/debian/vosa/control
index 463d735a..ea4ba3ff 100644
--- a/usr/share/escenic/package-scripts/debian/vosa/control
+++ b/usr/share/escenic/package-scripts/debian/vosa/control
@@ -1,7 +1,7 @@
 Package: vosa
 Version: VERSION
 Depends: gawk
-Suggests: ec2-api-tools
+Suggests: ec2-api-tools, genisoimage
 Section: base
 Priority: optional
 Architecture: all

From f04ff8d0cf45283992c46de47309c4384b476dc2 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 20 Mar 2014 15:47:01 +0100
Subject: [PATCH 2208/2585] VOSA-67: Remind people to create a dir. DOH!

---
 usr/share/doc/vizrt/vosa-guide.org | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/usr/share/doc/vizrt/vosa-guide.org b/usr/share/doc/vizrt/vosa-guide.org
index f1f7e09e..665a62e2 100644
--- a/usr/share/doc/vizrt/vosa-guide.org
+++ b/usr/share/doc/vizrt/vosa-guide.org
@@ -240,6 +240,7 @@ completely dark, and so shouldn't happen whenever any virtual
 machines are running.
 
 #+BEGIN_SRC sh
+mkdir -p /var/run/vizrt/vosa
 br=br0
 for i in $(seq 1 10) ; do
   tap=$(tunctl -b)
@@ -254,6 +255,9 @@ physical networks, you need to make several bridges, and create tap
 devices for each bridge, indicating which bridge the tap interface is
 bound to.  The above script uses the *br0* bridge.
 
+This needs to happen every time you boot, so the script above should be
+copied to e.g. /etc/rc.local or some other system wide boot location.
+
 *tunctl* creates the tap interface, and we create a file with the name
 of the created tap interface in a directory.  This little snippet
 needs to run every time the host machine boots.

From 2db0864f9374c574b8d255f5c926dcf8939afb73 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Thu, 20 Mar 2014 15:50:52 +0100
Subject: [PATCH 2209/2585] VOSA-68: Make the images directory if needed, when
 creating new machines.

---
 usr/bin/vosa | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 3c3c070d..8a0931b1 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -846,6 +846,9 @@ function do_create() {
       echo "$instance_name is not enabled, enable it on this host first"
       exit 1
     fi
+    if [ ! -d "$(dirname $0)/../../var/lib/vizrt/vosa/images" ] ; then
+      mkdir -p "$(dirname $0)/../../var/lib/vizrt/vosa/images"
+    fi
     if [ $aws -eq 1 ] ; then
       mkdir "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" || exit 2
       read_amazon_config $instance_dir/amazon.conf

From 042b406f8d9967d6af082856d2c6343465cef9ed Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Fri, 21 Mar 2014 10:30:45 +0100
Subject: [PATCH 2210/2585] VOSA-71: Removed /etc/hosts from the default
 overlay, as it usually isn't needed, and only causes problems like 127.0.1.1
 being incorrectly copied over.

---
 usr/bin/vosa | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 8a0931b1..03b586de 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -370,9 +370,6 @@ EOF
   if [ ! -r /etc/vizrt/vosa/overlay/common/etc/resolv.conf ] ; then
     ln -s /etc/resolv.conf /etc/vizrt/vosa/overlay/common/etc/resolv.conf || exit 2
   fi
-  if [ ! -r /etc/vizrt/vosa/overlay/common/etc/hosts ] ; then
-    ln -s /etc/resolv.conf /etc/vizrt/vosa/overlay/common/etc/hosts || exit 2
-  fi
   if [ ! -r /etc/vizrt/vosa/global-ssh-keys ] ; then
     touch /etc/vizrt/vosa/global-ssh-keys || exit 2
   fi

From f7c8678820a136cccc44daa5149caca54da323f7 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Fri, 21 Mar 2014 10:30:45 +0100
Subject: [PATCH 2211/2585] VOSA-71: Removed /etc/hosts from the default
 overlay, as it usually isn't needed, and only causes problems like 127.0.1.1
 being incorrectly copied over.

---
 usr/bin/vosa | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 8a0931b1..03b586de 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -370,9 +370,6 @@ EOF
   if [ ! -r /etc/vizrt/vosa/overlay/common/etc/resolv.conf ] ; then
     ln -s /etc/resolv.conf /etc/vizrt/vosa/overlay/common/etc/resolv.conf || exit 2
   fi
-  if [ ! -r /etc/vizrt/vosa/overlay/common/etc/hosts ] ; then
-    ln -s /etc/resolv.conf /etc/vizrt/vosa/overlay/common/etc/hosts || exit 2
-  fi
   if [ ! -r /etc/vizrt/vosa/global-ssh-keys ] ; then
     touch /etc/vizrt/vosa/global-ssh-keys || exit 2
   fi

From 56ec0f500b14196ee26e2863951c10a0152aaccd Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@vizrt.com>
Date: Wed, 9 Apr 2014 14:23:55 +0200
Subject: [PATCH 2212/2585] Removed chunked encoding default, as it does no
 good. Added packEnabled to speed up CS downloads.

---
 .../escenic/ece-scripts/ece-install.d/content-engine.sh   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index c361a977..87edc9f9 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -562,11 +562,6 @@ EOF
   file=$common_nursery_dir/com/escenic/webstart/StudioConfig.properties
   
   cat >> $file <<EOF
-# We set this to get around a missing feature in Varnish, see:
-# https://www.varnish-cache.org/trac/wiki/Future_Feature#Chunkedencodingclientrequests
-# For Escenic-ites, see: VF-3480
-property.com.escenic.client.chunked=false
-
 # This font have been tested and works with (at least): English,
 # Norwegian & Tamil. The font comes with (at least) MS Office and OS X
 # 10.5 and up.
@@ -575,6 +570,9 @@ property.com.escenic.studio.font.linux=Arial Unicode MS
 property.com.escenic.studio.font.windows7=Arial Unicode MS
 property.com.escenic.studio.font.windowsxp=Arial Unicode MS
 property.com.escenic.studio.font.windowsvista=Arial Unicode MS
+
+# We want to speed up downloading studio
+property.jnlp.packEnabled=true
 EOF
 
   set_up_publication_nursery_conf

From dbf6ee21fa9ab4a676f5c0f7256ebac31b9baf5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Thu, 15 May 2014 13:48:09 +0200
Subject: [PATCH 2213/2585] ece-install - adding new webapps mobile-studio and
 preview-editor-ws to list of approved webapps

---
 usr/share/escenic/ece-scripts/common-ece.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/common-ece.sh b/usr/share/escenic/ece-scripts/common-ece.sh
index 5e5f040d..a2e457dd 100644
--- a/usr/share/escenic/ece-scripts/common-ece.sh
+++ b/usr/share/escenic/ece-scripts/common-ece.sh
@@ -86,6 +86,8 @@ webapps_in_standard_webapps_list="
   video-webservice-extensions
   poll-ws
   note-webservice
+  preview-editor-ws
+  mobile-studio
 "
 
 ### is_webapp_a_publication

From 8142da7662cefb4580c564e8b7e7927f78ab511e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Thu, 15 May 2014 13:48:09 +0200
Subject: [PATCH 2214/2585] ece-install - adding new webapps mobile-studio and
 preview-editor-ws to list of approved webapps

---
 usr/share/escenic/ece-scripts/common-ece.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/common-ece.sh b/usr/share/escenic/ece-scripts/common-ece.sh
index 5e5f040d..a2e457dd 100644
--- a/usr/share/escenic/ece-scripts/common-ece.sh
+++ b/usr/share/escenic/ece-scripts/common-ece.sh
@@ -86,6 +86,8 @@ webapps_in_standard_webapps_list="
   video-webservice-extensions
   poll-ws
   note-webservice
+  preview-editor-ws
+  mobile-studio
 "
 
 ### is_webapp_a_publication

From 1dd18fa9a8235056ba38c2a2f10c76136c3d72cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Fri, 16 May 2014 07:51:20 +0200
Subject: [PATCH 2215/2585] ece-install - adding preview-editor-ws to the
 default white list

---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 87edc9f9..bf73c75a 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -4,7 +4,7 @@ function get_deploy_white_list() {
 
   local deploy_white_list=""
   local presentation_deploy_white_list="escenic-admin $(get_publication_short_name_list)"
-  local editor_deploy_white_list="escenic-admin escenic studio indexer-webservice webservice webservice-extensions"
+  local editor_deploy_white_list="escenic-admin escenic studio indexer-webservice webservice webservice-extensions preview-editor-ws"
   local search_deploy_white_list="solr indexer-webapp"
 
   # user's deploy white list, if present, takes precedence.

From 8991bd6324c66ac1989f86bc33ebb1a7750f13d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ola=20Sch=C3=B6n?= <oschoen@vizrt.com>
Date: Fri, 16 May 2014 07:51:20 +0200
Subject: [PATCH 2216/2585] ece-install - adding preview-editor-ws to the
 default white list

---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index c361a977..af82aeee 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -4,7 +4,7 @@ function get_deploy_white_list() {
 
   local deploy_white_list=""
   local presentation_deploy_white_list="escenic-admin $(get_publication_short_name_list)"
-  local editor_deploy_white_list="escenic-admin escenic studio indexer-webservice webservice webservice-extensions"
+  local editor_deploy_white_list="escenic-admin escenic studio indexer-webservice webservice webservice-extensions preview-editor-ws"
   local search_deploy_white_list="solr indexer-webapp"
 
   # user's deploy white list, if present, takes precedence.

From 09416fb26a0aa82bdd42d1263fb4447c1ca8a21f Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul islam <sai@vizrt.com>
Date: Wed, 28 May 2014 18:31:26 +0600
Subject: [PATCH 2217/2585] #VOSA-108 Checked if maven-metadata file exists
 first. Then tried to download the dist.

---
 usr/sbin/ece-install | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 08860584..04a34c0f 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -188,9 +188,7 @@ function download_escenic_components()
       local targetname=$(basename $el)
       for repo in $fai_maven_repositories; do
         # Special handling for snapshots
-        if [[ "$el" == *-SNAPSHOT* ]] ; then
-          # If snapshot file is not available, try to see if there's a maven-metadata file
-          if ! curl -s -I $repo/$el | grep -q '^HTTP[^ ]* 200' ; then
+          # It will try to get the maven-metadata file. If the file exist it will create the proper el and download it later. VOSA-108
             if curl -s -I $repo/$(dirname $el)/maven-metadata.xml | grep -q '^HTTP[^ ]* 200' ; then
               local metadata;
               local name=$(basename $el)
@@ -201,8 +199,6 @@ function download_escenic_components()
               el=$(dirname $el)/${name/SNAPSHOT/$timestamp-$buildnumber}
               log "Downloading $el from $repo".
             fi
-          fi
-        fi
         if curl -s -I $repo/$el | grep -q '^HTTP[^ ]* 200' ; then
           log "Downloading $(basename $el) from $repo/$el ..."
           run wget $wget_opts $repo/$el -O $targetname

From 2408129e12b9a8f3dbecc16399bab09926140fa2 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul islam <sai@vizrt.com>
Date: Thu, 29 May 2014 00:26:30 +0600
Subject: [PATCH 2218/2585] VOSA-108: Fixed problem when maven-metadata.xml
 exits but timestamp and buildnumber is empty with in it

---
 usr/sbin/ece-install | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 04a34c0f..f930bd13 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -189,16 +189,19 @@ function download_escenic_components()
       for repo in $fai_maven_repositories; do
         # Special handling for snapshots
           # It will try to get the maven-metadata file. If the file exist it will create the proper el and download it later. VOSA-108
-            if curl -s -I $repo/$(dirname $el)/maven-metadata.xml | grep -q '^HTTP[^ ]* 200' ; then
-              local metadata;
-              local name=$(basename $el)
-              metadata=$(curl -s $repo/$(dirname $el)/maven-metadata.xml)
-              local timestamp=$(xmlstarlet <<< "$metadata" sel -t -m /metadata/versioning/snapshot/timestamp -c 'text()')
-              local buildnumber=$(xmlstarlet <<< "$metadata"  sel -t -m /metadata/versioning/snapshot/buildNumber -c 'text()')
-              log "Found SNAPSHOT with $timestamp-$buildnumber in $el"
-              el=$(dirname $el)/${name/SNAPSHOT/$timestamp-$buildnumber}
-              log "Downloading $el from $repo".
-            fi
+        if curl -s -I $repo/$(dirname $el)/maven-metadata.xml | grep -q '^HTTP[^ ]* 200' ; then
+          local metadata;
+          local name=$(basename $el)
+          metadata=$(curl -s $repo/$(dirname $el)/maven-metadata.xml)
+          local timestamp=$(xmlstarlet <<< "$metadata" sel -t -m /metadata/versioning/snapshot/timestamp -c 'text()')
+          local buildnumber=$(xmlstarlet <<< "$metadata"  sel -t -m /metadata/versioning/snapshot/buildNumber -c 'text()')
+          #Now Check the the timestamp and buildnumber is not empty. If not then create the dist name with timestamp and buildnumber. 
+          if [[ -n $timestamp ||  -n $buildnumber ]]; then
+          log "Found SNAPSHOT with $timestamp-$buildnumber in $el"
+          el=$(dirname $el)/${name/SNAPSHOT/$timestamp-$buildnumber}
+          fi
+          log "Downloading $el from $repo".
+        fi
         if curl -s -I $repo/$el | grep -q '^HTTP[^ ]* 200' ; then
           log "Downloading $(basename $el) from $repo/$el ..."
           run wget $wget_opts $repo/$el -O $targetname

From cf7255a14e0e537ef982f5ab8610b14667fa5f4b Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul islam <sai@vizrt.com>
Date: Wed, 4 Jun 2014 11:46:57 +0600
Subject: [PATCH 2219/2585] VOSA-108: Hardening the artifact downloads for
 trunk-SNAPSHOT

---
 usr/sbin/ece-install                          |  2 +-
 .../ece-scripts/ece-install.d/app-server.sh   | 25 +++++++++++++++++++
 .../ece-scripts/ece-install.d/cache-server.sh |  2 +-
 .../ece-scripts/ece-install.d/constants.sh    |  1 +
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index f930bd13..73edb0c9 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -196,7 +196,7 @@ function download_escenic_components()
           local timestamp=$(xmlstarlet <<< "$metadata" sel -t -m /metadata/versioning/snapshot/timestamp -c 'text()')
           local buildnumber=$(xmlstarlet <<< "$metadata"  sel -t -m /metadata/versioning/snapshot/buildNumber -c 'text()')
           #Now Check the the timestamp and buildnumber is not empty. If not then create the dist name with timestamp and buildnumber. 
-          if [[ -n $timestamp ||  -n $buildnumber ]]; then
+          if [[ -z $timestamp && -z $buildnumber ]]; then
           log "Found SNAPSHOT with $timestamp-$buildnumber in $el"
           el=$(dirname $el)/${name/SNAPSHOT/$timestamp-$buildnumber}
           fi
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 4cbd207b..2f101e30 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -342,6 +342,8 @@ EOF
             xmlValidation="false"
             xmlNamespaceAware="false">
       </Host>
+    </Engine>
+  </Service>
 EOF
   if [[ ($install_profile_number == $PROFILE_EDITORIAL_SERVER || \
     $install_profile_number == $PROFILE_PRESENTATION_SERVER || \
@@ -376,6 +378,29 @@ EOF
       # publication the WARs belong to, we must use a scheme were it's
       # the WAR file name which determines the webapp context.
       cat >> $file <<EOF
+  <Service name="Catalina">
+    <Connector port="${default_app_server_presentation_port}"
+               protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               URIEncoding="UTF-8"
+               compression="off"
+               redirectPort="${redirect_port}"
+    />
+    <Connector port="${redirect_port}"
+               protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               URIEncoding="UTF-8"
+               proxyPort="443"
+               scheme="https"
+    />
+    <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
+      <Valve className="org.apache.catalina.valves.AccessLogValve"
+             prefix="access."
+             suffix=".log"
+             pattern="common"/>
+      <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+             digest="md5"
+             resourceName="UserDatabase"/>
       <Host
         name="${domain}"
         appBase="$(get_app_base $publication_war)"
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
index 9ac99b73..ced416c8 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
@@ -156,7 +156,7 @@ function create_varnish_conf_backends() {
     cat >> $file <<EOF
 backend ${appserver_id}${i} {
   .host = "$appserver_host";
-  .port = "$appserver_port";
+  .port = "$default_app_server_presentation_port";
 }
 
 EOF
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/constants.sh b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
index ba14f6ab..db28ecde 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
@@ -30,6 +30,7 @@ default_db_schema=ece5db
 
 # app server constants
 default_app_server_port=8080
+default_app_server_presentation_port=8040
 default_app_server_shutdown=8005
 default_app_server_redirect=8443
 default_app_server_heap_size=2048

From 3030447dcab4eb0eb11a4f65537e082487b37278 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul islam <sai@vizrt.com>
Date: Wed, 4 Jun 2014 12:42:33 +0600
Subject: [PATCH 2220/2585] VOSA-108 Fixed typo

---
 usr/sbin/ece-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 73edb0c9..c5a11984 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -196,7 +196,7 @@ function download_escenic_components()
           local timestamp=$(xmlstarlet <<< "$metadata" sel -t -m /metadata/versioning/snapshot/timestamp -c 'text()')
           local buildnumber=$(xmlstarlet <<< "$metadata"  sel -t -m /metadata/versioning/snapshot/buildNumber -c 'text()')
           #Now Check the the timestamp and buildnumber is not empty. If not then create the dist name with timestamp and buildnumber. 
-          if [[ -z $timestamp && -z $buildnumber ]]; then
+          if [[ -n $timestamp && -n $buildnumber ]]; then
           log "Found SNAPSHOT with $timestamp-$buildnumber in $el"
           el=$(dirname $el)/${name/SNAPSHOT/$timestamp-$buildnumber}
           fi

From 702368fc8b8ed80e368fe172c44cdb68e24d28bc Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul islam <sai@vizrt.com>
Date: Wed, 4 Jun 2014 13:59:29 +0600
Subject: [PATCH 2221/2585] VOSA-128 Improved varnish configuration

---
 .../ece-scripts/ece-install.d/app-server.sh   | 46 +++++++++----------
 .../ece-scripts/ece-install.d/cache-server.sh |  2 +-
 .../ece-scripts/ece-install.d/constants.sh    |  2 +-
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 2f101e30..ca2de49f 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -344,6 +344,29 @@ EOF
       </Host>
     </Engine>
   </Service>
+    <Service name="Catalina">
+    <Connector port="${default_app_server_publication_port}"
+               protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               URIEncoding="UTF-8"
+               compression="off"
+               redirectPort="${redirect_port}"
+               />
+    <Connector port="${redirect_port}"
+               protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               URIEncoding="UTF-8"
+               proxyPort="443"
+               scheme="https"/>
+    <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
+      <Valve className="org.apache.catalina.valves.AccessLogValve"
+             prefix="access."
+             suffix=".log"
+             pattern="common"
+             />
+      <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+             digest="md5"
+             resourceName="UserDatabase"/>
 EOF
   if [[ ($install_profile_number == $PROFILE_EDITORIAL_SERVER || \
     $install_profile_number == $PROFILE_PRESENTATION_SERVER || \
@@ -378,29 +401,6 @@ EOF
       # publication the WARs belong to, we must use a scheme were it's
       # the WAR file name which determines the webapp context.
       cat >> $file <<EOF
-  <Service name="Catalina">
-    <Connector port="${default_app_server_presentation_port}"
-               protocol="HTTP/1.1"
-               connectionTimeout="20000"
-               URIEncoding="UTF-8"
-               compression="off"
-               redirectPort="${redirect_port}"
-    />
-    <Connector port="${redirect_port}"
-               protocol="HTTP/1.1"
-               connectionTimeout="20000"
-               URIEncoding="UTF-8"
-               proxyPort="443"
-               scheme="https"
-    />
-    <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
-      <Valve className="org.apache.catalina.valves.AccessLogValve"
-             prefix="access."
-             suffix=".log"
-             pattern="common"/>
-      <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
-             digest="md5"
-             resourceName="UserDatabase"/>
       <Host
         name="${domain}"
         appBase="$(get_app_base $publication_war)"
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
index ced416c8..625fc782 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
@@ -156,7 +156,7 @@ function create_varnish_conf_backends() {
     cat >> $file <<EOF
 backend ${appserver_id}${i} {
   .host = "$appserver_host";
-  .port = "$default_app_server_presentation_port";
+  .port = "$default_app_server_publication_port";
 }
 
 EOF
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/constants.sh b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
index db28ecde..4081d42c 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
@@ -30,7 +30,7 @@ default_db_schema=ece5db
 
 # app server constants
 default_app_server_port=8080
-default_app_server_presentation_port=8040
+default_app_server_publication_port=8040
 default_app_server_shutdown=8005
 default_app_server_redirect=8443
 default_app_server_heap_size=2048

From 9362ece952cb906cd15fa80fd1d0ffab604b6ca2 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul islam <sai@vizrt.com>
Date: Wed, 4 Jun 2014 16:32:10 +0600
Subject: [PATCH 2222/2585] VOSA-128: Fixed redirect configuration.

---
 .../ece-scripts/ece-install.d/app-server.sh   | 19 ++++++++++---------
 .../ece-scripts/ece-install.d/constants.sh    |  1 +
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index ca2de49f..c3be7e23 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -342,17 +342,23 @@ EOF
             xmlValidation="false"
             xmlNamespaceAware="false">
       </Host>
-    </Engine>
+EOF
+  if [[ ($install_profile_number == $PROFILE_EDITORIAL_SERVER || \
+    $install_profile_number == $PROFILE_PRESENTATION_SERVER || \
+    $install_profile_number == $PROFILE_ALL_IN_ONE) && \
+    -n "$fai_publication_domain_mapping_list" ]]; then
+    cat >> $tomcat_base/conf/server.xml <<EOF
+        </Engine>
   </Service>
-    <Service name="Catalina">
+  <Service name="Catalina">
     <Connector port="${default_app_server_publication_port}"
                protocol="HTTP/1.1"
                connectionTimeout="20000"
                URIEncoding="UTF-8"
                compression="off"
-               redirectPort="${redirect_port}"
+               redirectPort="${default_app_server_publication_redirect}"
                />
-    <Connector port="${redirect_port}"
+    <Connector port="${default_app_server_publication_redirect}"
                protocol="HTTP/1.1"
                connectionTimeout="20000"
                URIEncoding="UTF-8"
@@ -368,11 +374,6 @@ EOF
              digest="md5"
              resourceName="UserDatabase"/>
 EOF
-  if [[ ($install_profile_number == $PROFILE_EDITORIAL_SERVER || \
-    $install_profile_number == $PROFILE_PRESENTATION_SERVER || \
-    $install_profile_number == $PROFILE_ALL_IN_ONE) && \
-    -n "$fai_publication_domain_mapping_list" ]]; then
-
     for el in ${fai_publication_domain_mapping_list}; do
       local old_ifs=$IFS
       # the entries in the fai_publication_domain_mapping_list are on
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/constants.sh b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
index 4081d42c..7d31b85f 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
@@ -31,6 +31,7 @@ default_db_schema=ece5db
 # app server constants
 default_app_server_port=8080
 default_app_server_publication_port=8040
+default_app_server_publication_redirect=8444
 default_app_server_shutdown=8005
 default_app_server_redirect=8443
 default_app_server_heap_size=2048

From 84bdd5adfec10dc98cec9d14607c3b0ed7481bc2 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul islam <sai@vizrt.com>
Date: Thu, 5 Jun 2014 21:01:27 +0600
Subject: [PATCH 2223/2585] VOSA-128: Removed https scheme from publicatoin
 connectors

---
 usr/share/escenic/ece-scripts/ece-install.d/app-server.sh | 7 -------
 usr/share/escenic/ece-scripts/ece-install.d/constants.sh  | 1 -
 2 files changed, 8 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index c3be7e23..7824341f 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -356,14 +356,7 @@ EOF
                connectionTimeout="20000"
                URIEncoding="UTF-8"
                compression="off"
-               redirectPort="${default_app_server_publication_redirect}"
                />
-    <Connector port="${default_app_server_publication_redirect}"
-               protocol="HTTP/1.1"
-               connectionTimeout="20000"
-               URIEncoding="UTF-8"
-               proxyPort="443"
-               scheme="https"/>
     <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
       <Valve className="org.apache.catalina.valves.AccessLogValve"
              prefix="access."
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/constants.sh b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
index 7d31b85f..4081d42c 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
@@ -31,7 +31,6 @@ default_db_schema=ece5db
 # app server constants
 default_app_server_port=8080
 default_app_server_publication_port=8040
-default_app_server_publication_redirect=8444
 default_app_server_shutdown=8005
 default_app_server_redirect=8443
 default_app_server_heap_size=2048

From 2c8603b25a8ff77c1b828761ce0911e51102028d Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul islam <sai@vizrt.com>
Date: Fri, 6 Jun 2014 14:47:55 +0600
Subject: [PATCH 2224/2585] VOSA-128 Added redirectport to publication
 connector

---
 usr/share/escenic/ece-scripts/ece-install.d/app-server.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 7824341f..7ed57519 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -356,6 +356,7 @@ EOF
                connectionTimeout="20000"
                URIEncoding="UTF-8"
                compression="off"
+               redirectPort="${redirect_port}"
                />
     <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
       <Valve className="org.apache.catalina.valves.AccessLogValve"

From acac32d201003bc42859667448a9a2f1c8feef14 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul islam <sai@vizrt.com>
Date: Mon, 16 Jun 2014 15:04:42 +0600
Subject: [PATCH 2225/2585] VOSA-132: Added new plugins in ece-build script

---
 usr/share/escenic/build-scripts/ece-build | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 49da7e66..c80b22b6 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -61,7 +61,10 @@ mobile-expansion
 semantic-cxense
 snapshot
 changelog
-note"
+note
+seo
+mobile-studio
+preview-editor"
 
 declare -A project_distributions=()
 
@@ -94,6 +97,9 @@ declare -A maven_snapshot_coordinates=(
 ["widget-framework-core"]="com.escenic.widget-framework:framework-dist:zip"
 ["widget-framework-community"]="com.escenic.widget-framework:framework-community-dist:zip"
 ["widget-framework-mobile"]="com.escenic.widget-framework:framework-mobile-dist:zip"
+["seo"]="com.escenic.plugins.seo:seo:zip"
+["mobile-studio"]="com.escenic.plugins.mobile-studio:mobile-studio:zip"
+["preview-editor"]="com.escenic.plugins.preview-editor:preview-editor:zip"
 )
 
 declare -A maven_coordinates=(
@@ -133,6 +139,9 @@ com.escenic.plugins.vcpeditor:vcpeditor:zip"
 ["widget-framework-core"]="com.escenic.widget-framework:framework-dist:zip"
 ["widget-framework-community"]="com.escenic.widget-framework:framework-community-dist:zip"
 ["widget-framework-mobile"]="com.escenic.widget-framework:framework-mobile-dist:zip"
+["seo"]="com.escenic.plugins.seo:seo:zip"
+["mobile-studio"]="com.escenic.plugins.mobile-studio:mobile-studio:zip"
+["preview-editor"]="com.escenic.plugins.preview-editor:preview-editor:zip"
 )
 
 # root folders for engine and plugin distributions

From 0f76cd8b977712be17d5176941b93372f376945f Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul islam <sai@vizrt.com>
Date: Tue, 24 Jun 2014 21:31:18 +0600
Subject: [PATCH 2226/2585] VOSA-133 Fixed failed download of
 java_memcached-release_2.5.3.jar from github by using curl instead of wget

---
 usr/share/escenic/ece-scripts/common-io.sh    | 28 +++++++++++++++++++
 .../ece-scripts/ece-install.d/memory-cache.sh |  2 +-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/common-io.sh b/usr/share/escenic/ece-scripts/common-io.sh
index 4acc6363..a0cf4ae8 100644
--- a/usr/share/escenic/ece-scripts/common-io.sh
+++ b/usr/share/escenic/ece-scripts/common-io.sh
@@ -160,6 +160,34 @@ function download_uri_target_to_dir() {
   fi
 }
 
+### curl_download_uri_target_to_dir
+## Returns the local, downloaded file with absolute path.
+##
+## $1 :: http://server/file or
+##       https://file. The $1 should only be a http/https url
+## $2 :: the target dir
+## $3 :: the target filename. If left empty, the bassename of $1 is used
+function curl_download_uri_target_to_dir() {
+  local uri=$1
+  local target_dir=$2
+  local target_file=$3
+  make_dir $target_dir
+
+  if [[ $uri == "http://"* || $uri == "https://"* ]]; then
+
+    if [ -z $target_file ] ; then
+      target_file=$(basename $uri)
+    fi
+    
+    log "Downloading" $uri "to" $target_dir "..."
+    run cd $target_dir
+    run curl \
+      -L \
+      --o "$target_file" \
+      $uri
+  fi
+}
+
 ### verify_that_archive_is_ok
 ## Will verify that the archive passed to the function is ok. If it's
 ## not, the function will terminate the calling script, exiting in
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh b/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
index f0cb0cdb..47eeec1a 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
@@ -14,7 +14,7 @@ function install_memory_cache()
   assert_commands_available memcached
 
   print_and_log "Downloading the memcached java library ..."
-  download_uri_target_to_dir $memcached_java_lib_url $download_dir
+  curl_download_uri_target_to_dir $memcached_java_lib_url $download_dir
 
   make_dir ${escenic_root_dir}/assemblytool/lib
   run cp $(basename $memcached_java_lib_url) ${escenic_root_dir}/assemblytool/lib

From 155c8370892021e363e1932f0a4139c632641d36 Mon Sep 17 00:00:00 2001
From: saif shams <sshams@vizrt.com>
Date: Fri, 18 Jul 2014 15:02:46 +0200
Subject: [PATCH 2227/2585] added check_mk package and added
 pre-check_mk_plugin scripts, and cron script for it.

---
 etc/cron.d/periodic-check                     |  4 +++
 usr/lib/periodic-check/main                   | 23 ++++++++++++++
 usr/lib/periodic-check/main.conf              |  4 +++
 usr/lib/periodic-check/script/site_length     | 31 +++++++++++++++++++
 usr/share/check_mk/site_length                | 26 ++++++++++++++++
 .../escenic/package-scripts/create-packages   | 11 +++++++
 6 files changed, 99 insertions(+)
 create mode 100644 etc/cron.d/periodic-check
 create mode 100755 usr/lib/periodic-check/main
 create mode 100644 usr/lib/periodic-check/main.conf
 create mode 100755 usr/lib/periodic-check/script/site_length
 create mode 100644 usr/share/check_mk/site_length

diff --git a/etc/cron.d/periodic-check b/etc/cron.d/periodic-check
new file mode 100644
index 00000000..2e2bbad7
--- /dev/null
+++ b/etc/cron.d/periodic-check
@@ -0,0 +1,4 @@
+MAILTO=root
+
+* * * * *     nagios if [ -x /usr/lib/periodic-check/main ]; then /usr/lib/periodic-check/main; fi
+
diff --git a/usr/lib/periodic-check/main b/usr/lib/periodic-check/main
new file mode 100755
index 00000000..b9a17b64
--- /dev/null
+++ b/usr/lib/periodic-check/main
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+. $(dirname $0)/main.conf
+
+function init {
+ if [ -f "$state_file" ]; then
+   old_pid=$(cat $state_file)
+   if ps &> /dev/null $old_pid ; then
+     exit
+   fi
+ fi
+ echo "$$" > "$state_file"
+}
+
+init
+
+for script in `ls $nagios_lib_dir/script/`; do
+  if [ -f "$nagios_lib_dir/script/$script" -a -x "$nagios_lib_dir/script/$script" ]; then
+    $nagios_lib_dir/script/$script
+  fi
+done
+
+rm "$state_file"
diff --git a/usr/lib/periodic-check/main.conf b/usr/lib/periodic-check/main.conf
new file mode 100644
index 00000000..69e04781
--- /dev/null
+++ b/usr/lib/periodic-check/main.conf
@@ -0,0 +1,4 @@
+nagios_cache_dir="/var/cache/periodic-check"
+nagios_lib_dir="/usr/lib/periodic-check"
+state_file="$nagios_lib_dir/periodic-check.state"
+nagios_data_file="$nagios_cache_dir/$(basename $0)"
diff --git a/usr/lib/periodic-check/script/site_length b/usr/lib/periodic-check/script/site_length
new file mode 100755
index 00000000..50583c08
--- /dev/null
+++ b/usr/lib/periodic-check/script/site_length
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+sites="localhost"
+tomcat_port=8040
+newline="
+"
+this_script=$(basename $0)
+
+function init {
+  . "$(dirname $0)/../main.conf"
+  if [ -f "$(dirname $0)/../conf/$this_script.conf" ]; then
+    . "$(dirname $0)/../conf/$this_script.conf"
+  fi
+}
+
+init
+
+for line in $sites; do
+  before=$(date +"%s.%N")
+  size=$(curl -s http://localhost:$tomcat_port -H "Host:$line"| wc -c)
+  after=$(date +"%s.%N")
+  time_took=$(echo "$after - $before"| bc | cut -c -5)
+  oneline=$(echo "$line $size $time_took")
+  if [ "$all_lines" == "" ]; then
+    all_lines="$oneline"
+  else
+    all_lines="$all_lines$newline$oneline"
+  fi
+done
+
+echo "$all_lines" > "$nagios_data_file"
diff --git a/usr/share/check_mk/site_length b/usr/share/check_mk/site_length
new file mode 100644
index 00000000..bc9788d4
--- /dev/null
+++ b/usr/share/check_mk/site_length
@@ -0,0 +1,26 @@
+def inventory_site_length_status(checkname, info):
+   inventory = []
+   for line in info:
+      munin_name = line[0]   # open_files
+      munin_var = line[1]    # used
+      inventory.append( (munin_name, "", None) )
+   return inventory
+
+def check_site_length_status(item, params, info):
+   for line in info:
+      if line[0] == item:
+         state = "OK"
+   numeric=0
+   length=int(line[1])
+   time=line[2]
+   if length < 10000:
+      numeric = 2
+      state = "Critical"
+   else:
+      numeric = 0
+   return (numeric, "{s}. Downloaded {b} bytes in {c} sec from {a}.".format(s=state, a=item, b=length, c=time))
+
+# declare the check to Check_MK
+check_info['site_length.status'] = \
+      (check_site_length_status, "page_size", 0, inventory_site_length_status)
+
diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index e32bed96..681e54f2 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -225,10 +225,21 @@ function set_up_escenic-common-scripts() {
   run cp -r ../../../bin/sync-network-drive $target_dir/usr/bin/
 }
 
+function set_up_escenic-check-mk() {
+  mkdir_dir $target_dir/usr/share/check_mk
+  run cp -r ../../../../usr/share/check_mk/* \
+    $target_dir/usr/share/check_mk/
+}
+
 function set_up_escenic-check-mk-plugins() {
   make_dir $target_dir/usr/lib/check_mk_agent/local
+  make_dir $target_dir/etc/cron.d $target_dir/usr/lib/periodic-check $target_dir/var/cache/periodic-check
   run cp -r ../../../lib/check_mk_agent/local/* \
     $target_dir/usr/lib/check_mk_agent/local/
+  run cp -r ../../../lib/periodic-check/* \
+    $target_dir/usr/lib/periodic-check/
+  run cp  ../../../../etc/cron.d/periodic-check \
+    $target_dir/etc/cron.d/periodic-check
 }
 
 function set_up_escenic-munin-plugins() {

From 5f4613707499febab5b11c7d43a308c41a26631e Mon Sep 17 00:00:00 2001
From: saif shams <sshams@vizrt.com>
Date: Fri, 18 Jul 2014 16:01:11 +0200
Subject: [PATCH 2228/2585] moved check_mk server plugin to check_mk/checks,
 changed package name from check_mk to check-mk-server-plugin

---
 usr/share/check_mk/{ => checks}/site_length       | 9 ++++-----
 usr/share/escenic/package-scripts/create-packages | 8 ++++----
 2 files changed, 8 insertions(+), 9 deletions(-)
 rename usr/share/check_mk/{ => checks}/site_length (78%)

diff --git a/usr/share/check_mk/site_length b/usr/share/check_mk/checks/site_length
similarity index 78%
rename from usr/share/check_mk/site_length
rename to usr/share/check_mk/checks/site_length
index bc9788d4..0e895623 100644
--- a/usr/share/check_mk/site_length
+++ b/usr/share/check_mk/checks/site_length
@@ -1,18 +1,17 @@
 def inventory_site_length_status(checkname, info):
    inventory = []
    for line in info:
-      munin_name = line[0]   # open_files
-      munin_var = line[1]    # used
-      inventory.append( (munin_name, "", None) )
+      site_name = line[0]   # open_files
+      inventory.append( (site_name, "", None) )
    return inventory
 
 def check_site_length_status(item, params, info):
    for line in info:
       if line[0] == item:
          state = "OK"
+         length=int(line[1])
+         time=line[2]
    numeric=0
-   length=int(line[1])
-   time=line[2]
    if length < 10000:
       numeric = 2
       state = "Critical"
diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 681e54f2..a4eb57ff 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -225,10 +225,10 @@ function set_up_escenic-common-scripts() {
   run cp -r ../../../bin/sync-network-drive $target_dir/usr/bin/
 }
 
-function set_up_escenic-check-mk() {
-  mkdir_dir $target_dir/usr/share/check_mk
-  run cp -r ../../../../usr/share/check_mk/* \
-    $target_dir/usr/share/check_mk/
+function set_up_escenic-check-mk-server-plugins() {
+  mkdir_dir $target_dir/usr/share/check_mk/checks
+  run cp -r ../../../share/check_mk/checks/* \
+    $target_dir/usr/share/check_mk/checks/
 }
 
 function set_up_escenic-check-mk-plugins() {

From 88b51262e43a2cdf0463f5bd56d84c5ab9f54a33 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul islam <sai@vizrt.com>
Date: Mon, 21 Jul 2014 22:05:42 +0600
Subject: [PATCH 2229/2585] VOSA-130: Added support for java 8 version on
 builder

---
 usr/share/escenic/build-scripts/ece-build | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index c80b22b6..a88f82a1 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -19,8 +19,10 @@ skip_ear=0
 project_pom_versions=""
 
 # standard java locations
+#TODO:take java home location dynamically
 java_6_sun=/usr/lib/jvm/java-6-sun
 java_7_oracle=/usr/lib/jvm/java-7-oracle
+java_8_oracle=/usr/lib/jvm/java-8-oracle
 
 # ece-build platform dependencies
 dependencies="tar
@@ -732,6 +734,13 @@ function set_java_home
       print_and_log "The expected home directory, $java_7_oracle, for you requested java version does not exist on the platform and needs to be added, exiting!"
       exit 1
     fi
+  elif [[ $project_java_version == "1.8" ]]; then
+    if [ -d $java_8_oracle ]; then
+      export JAVA_HOME=$java_8_oracle
+    else
+      print_and_log "The expected home directory, $java_8_oracle, for you requested java version does not exist on the platform and needs to be added, exiting!"
+      exit 1
+    fi
   else
     print_and_log "The requested java version $project_java_version is not supported or has been specified using an incorrect format, exiting!"
   fi

From ad4c51f681f4fef2a4b41c17a57a121ec754a7f0 Mon Sep 17 00:00:00 2001
From: Terje Tjervaag <terje@tjervaag.com>
Date: Mon, 25 Aug 2014 12:22:58 +0200
Subject: [PATCH 2230/2585] Add documentation for fallback_tomcat_url config

This further clarifies the fix for issue #16.
---
 usr/share/doc/escenic/ece-install-guide.org | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index c9d6dbf2..f1d1798f 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -1328,6 +1328,10 @@ the *ece-install.conf*:
 
 - *fai\_wf\_install* :: Install Widget Framework profile. Default is 0.
 
+- *fallback\_tomcat\_url* :: Override url used to download Tomcat. As old
+    releases are removed from Tomcat download mirrors this can be used to
+    point to the updated versions. Use the link for the .tar.gz file.
+
 As you've probably already found out, *0* means "false" and *1* means "true".
 
 ** Example Configurations

From bfd1157eaaffe469525ddec14b72cb3e06e1136d Mon Sep 17 00:00:00 2001
From: saif shams <sshams@vizrt.com>
Date: Tue, 26 Aug 2014 11:29:02 +0200
Subject: [PATCH 2231/2585] corrected a spelling mistake in
 check-mk-server-plugin function

---
 usr/share/escenic/package-scripts/create-packages | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index a4eb57ff..e83f69e8 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -226,7 +226,7 @@ function set_up_escenic-common-scripts() {
 }
 
 function set_up_escenic-check-mk-server-plugins() {
-  mkdir_dir $target_dir/usr/share/check_mk/checks
+  make_dir $target_dir/usr/share/check_mk/checks
   run cp -r ../../../share/check_mk/checks/* \
     $target_dir/usr/share/check_mk/checks/
 }

From 59c7d7ce78e90b83d1331951be01f93e3db55ed3 Mon Sep 17 00:00:00 2001
From: saif shams <sshams@vizrt.com>
Date: Tue, 26 Aug 2014 12:58:16 +0200
Subject: [PATCH 2232/2585] added debian control and postinst file for
 check-mk-server-plugins

---
 .../debian/escenic-check-mk-server-plugins/control        | 8 ++++++++
 .../debian/escenic-check-mk-server-plugins/postinst       | 4 ++++
 2 files changed, 12 insertions(+)
 create mode 100644 usr/share/escenic/package-scripts/debian/escenic-check-mk-server-plugins/control
 create mode 100755 usr/share/escenic/package-scripts/debian/escenic-check-mk-server-plugins/postinst

diff --git a/usr/share/escenic/package-scripts/debian/escenic-check-mk-server-plugins/control b/usr/share/escenic/package-scripts/debian/escenic-check-mk-server-plugins/control
new file mode 100644
index 00000000..306d43f4
--- /dev/null
+++ b/usr/share/escenic/package-scripts/debian/escenic-check-mk-server-plugins/control
@@ -0,0 +1,8 @@
+Package: escenic-check-mk-server-plugins
+Version: VERSION
+Recommends: check-mk-server
+Section: base
+Priority: optional
+Architecture: all
+Maintainer: Escenic Operations <operationsbridge@escenic.com>
+Description: check-mk server plugins for the Escenic Content Engine.
diff --git a/usr/share/escenic/package-scripts/debian/escenic-check-mk-server-plugins/postinst b/usr/share/escenic/package-scripts/debian/escenic-check-mk-server-plugins/postinst
new file mode 100755
index 00000000..e15ca1c2
--- /dev/null
+++ b/usr/share/escenic/package-scripts/debian/escenic-check-mk-server-plugins/postinst
@@ -0,0 +1,4 @@
+#! /usr/bin/env bash
+
+exit 0
+

From 815ba1c4cfe6974caed124fdc031309feeea6b96 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Fri, 19 Sep 2014 17:12:26 +0600
Subject: [PATCH 2233/2585] VOSA-144: Fixed empty security group problem by
 coverting it to string variable

---
 usr/bin/vosa                                       |  4 ++--
 usr/share/vizrt/vosa/commands/amazon_config_parser | 11 +++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 03b586de..990b69cf 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -858,7 +858,7 @@ function do_create() {
         ${amazon_config_availability_zone/#/--placement availability_zone=}  \
         ${amazon_config_type/#/--instance-type }  \
         ${amazon_config_ssh_keypair/#/--key-name }  \
-        ${amazon_config_group[@]/#/--security-groups } \
+        ${amazon_config_group/#/--security-groups } \
          --block-device-mapping "${json}" \
         ${amazon_config_subnet/#/--subnet-id }
       )
@@ -874,7 +874,7 @@ function do_create() {
         ${amazon_config_availability_zone/#/--availability-zone }  \
         ${amazon_config_type/#/--instance-type }  \
         ${amazon_config_ssh_keypair/#/--key }  \
-        ${amazon_config_group[@]/#/--group } \
+        ${amazon_config_group/#/--group } \
         ${amazon_config_user_data/#/--user-data-file } \
         ${amazon_config_subnet/#/--subnet }
         )
diff --git a/usr/share/vizrt/vosa/commands/amazon_config_parser b/usr/share/vizrt/vosa/commands/amazon_config_parser
index e339925e..a9024764 100644
--- a/usr/share/vizrt/vosa/commands/amazon_config_parser
+++ b/usr/share/vizrt/vosa/commands/amazon_config_parser
@@ -14,6 +14,7 @@ unset amazon_config_ssh_private_key
 unset amazon_config_image
 unset amazon_config_type
 unset amazon_config_subnet
+unset amazon_config_group
 amazon_config_initial_disk_size=8
 
 
@@ -77,17 +78,15 @@ function amazon_config_initial_disk_size() {
   amazon_config_initial_disk_size=$1
 }
 
+function amazon_config_group() {
+  amazon_config_group+="$1 "
+}
+
 # Handle arrays
 
-declare -a amazon_config_group
 declare -a amazon_config_postinstall
 
 function amazon_config_postinstall() {
   amazon_config_postinstall=( "${amazon_config_postinstall[@]}" "$1" )
 }
 
-function amazon_config_group() {
-  amazon_config_group=( "${amazon_config_group[@]}" "$1" )
-}
-
-

From 3c32dd20cc5e036c76f1e9be6eb92840b1630245 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Tue, 23 Sep 2014 16:38:40 +0600
Subject: [PATCH 2234/2585] VOSA-145: Fixed typo to make destroy command work
 for amazon instances

---
 usr/bin/vosa | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 990b69cf..a33ef941 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -784,7 +784,7 @@ function do_destroy() {
       exit 1
     fi
 
-    [ -r "instance_dir/amazon.conf" ] && read_amazon_config $instance_dir/amazon.conf
+    [ -r "$instance_dir/amazon.conf" ] && read_amazon_config $instance_dir/amazon.conf
     local status=( $(really_do_status $instance_dir) )
     if [ "${status[3]}" == "alive" -o "${status[3]}" == "running" ] ; then
       echo "$instance_name is alive. You might want to stop instances before destroying them."

From 98dcdf095837bf75bbf9cc2b91b5ef63203477dc Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Thu, 23 Oct 2014 19:20:30 +0600
Subject: [PATCH 2235/2585] VOSA-153: Added a local builder to create a builder
 without builder user and other stale configuration

---
 .../escenic/build-scripts/ece-local-builder   | 461 ++++++++++++++++++
 1 file changed, 461 insertions(+)
 create mode 100755 usr/share/escenic/build-scripts/ece-local-builder

diff --git a/usr/share/escenic/build-scripts/ece-local-builder b/usr/share/escenic/build-scripts/ece-local-builder
new file mode 100755
index 00000000..a8bcf4cf
--- /dev/null
+++ b/usr/share/escenic/build-scripts/ece-local-builder
@@ -0,0 +1,461 @@
+#! /usr/bin/env bash
+################################################################################
+#
+# Script for managing "the builder"
+#
+################################################################################
+
+# Common variables
+ece_scripts_version=1.0-2014-06-24-lean-974
+ece_scripts_home=/usr/share/escenic/ece-scripts
+log=/var/log/ece-project-builder.log
+
+# script dependencies
+dependencies="tar
+ant
+sed
+unzip
+wget"
+
+# available commands
+add_customer=0
+add_artifact=0
+add_artifact_list=0
+given_maven_username=0
+given_maven_password=0
+given_git_url=0
+given_skip_user_creation=0
+# Add artifact variables
+list_path=
+artifact_path=
+
+# Add user variables
+builder_system_user=
+customer_name=
+user_maven_username=
+user_maven_password="CHANGE_ME"
+git_url=
+
+# Initialize builder variables
+root_dir=/etc/escenic/builder
+download_dir=$root_dir/.downloads
+builder_engine_dir=$root_dir/engine
+builder_plugins_dir=$root_dir/plugins
+skel_dir=$root_dir/.skel
+subversion_dir=$skel_dir/.subversion
+assemblytool_home=$skel_dir/assemblytool
+m2_home=$skel_dir/.m2
+
+##
+function verify_root_privilege
+{
+  if [ "$(id -u)" != "0" ]; then
+    echo "This script must be run as root!"
+    exit 1
+  fi
+}
+
+function verify_builder_conf
+{
+  if [ ! -e $provided_conf_file ]; then
+    print_and_log "The provided configuration file does not exist, exiting!" >&2
+    remove_pid_and_exit_in_error
+  else
+    provided_conf_file=$(readlink -f $provided_conf_file)
+    run source $provided_conf_file
+  fi
+  enforce_variable customer_name "Your builder configuration file is missing the variable customer_name, exiting!"
+  enforce_variable technet_user "Your builder configuration file is missing the variable technet_user, exiting!"
+  enforce_variable technet_user "Your builder configuration file is missing the variable technet_user, exiting!"
+  enforce_variable technet_user "Your builder configuration file is missing the variable technet_password, exiting!"
+  enforce_variable maven_vizrt_user "Your builder configuration file is missing the variable maven_vizrt_user, exiting!"
+  enforce_variable maven_vizrt_password "Your builder configuration file is missing the variable maven_vizrt_password, exiting!"
+  wget --http-user $technet_user --http-password $technet_password http://technet.escenic.com/ -qO /dev/null
+  if [ $? -ne 0 ]; then
+    print_and_log "Your user can't reach http://technet.escenic.com/, exiting!"
+    remove_pid_and_exit_in_error
+  fi
+  wget --http-user $maven_vizrt_user --http-password $maven_vizrt_password http://maven.vizrt.com/ -qO /dev/null
+  if [ $? -ne 0 ]; then
+    print_and_log "Your user can't reach http://maven.vizrt.com/, exiting!"
+    remove_pid_and_exit_in_error
+  fi
+}
+
+##
+function verify_scripts
+{
+  init_failed=0
+  if [ ! -d $ece_scripts_home ]; then
+    init_failed=1
+    error_message="The directory for ece-scripts $ece_scripts_home does not exist, exiting!"
+  elif [ ! -e $ece_scripts_home/common-bashing.sh ]; then
+    init_failed=1
+    error_message="The script $ece_scripts_home/common-bashing.sh does not exist, exiting!"
+  elif [ ! -e $ece_scripts_home/common-io.sh ]; then
+    init_failed=1
+    error_message="The script $ece_scripts_home/common-io.sh does not exist, exiting!"
+  fi
+  if [ $init_failed -eq 0 ]; then
+    source $ece_scripts_home/common-bashing.sh
+    source $ece_scripts_home/common-io.sh
+  else
+    echo "$error_message"
+    exit 1
+  fi
+
+  # set pid
+  if [ -e $pid_file ]; then
+    echo "Instance of $(basename $0) already running!"
+    exit 1
+  else
+    create_pid
+  fi
+
+  # shutdown hooks
+  trap common_bashing_exit_hook EXIT
+  trap common_bashing_user_cancelled_hook SIGINT SIGHUP
+}
+
+##
+function enforce_variable
+{
+  if [ ! -n "$(eval echo $`echo $1`)" ]; then
+    print_and_log "$2"
+    remove_pid_and_exit_in_error
+  fi
+}
+
+##
+function verify_command {
+  command -v $1 >/dev/null 2>&1 || { print >&2 "I require $1 but it's not installed, exiting!"; remove_pid_and_exit_in_error; }
+}
+
+##
+function verify_dependencies
+{
+  for f in $dependencies
+  do
+    verify_command $f
+  done
+}
+
+function usages(){
+  echo "Usage: ece-project-builder -c <customer-builder-configuration>(require) -s skip system user creation (optional)"
+}
+
+##
+function get_user_options
+{
+  while getopts ":i:c:b:u:p:g:Vs" opt; do
+    case $opt in
+      c)
+        print_and_log "Customer builder configuration is given in ${OPTARG} ..."
+        provided_conf_file=${OPTARG}
+        add_customer=1
+        ;;
+      s)
+        print_and_log "Skip ${OPTARG} user creation ..."
+        given_skip_user_creation=1
+        ;;
+      V)
+        echo "Version:" $ece_scripts_version
+        exit 0
+        ;;
+      \?)
+        print_and_log "Invalid option: -$OPTARG" >&2
+        usages
+        remove_pid_and_exit_in_error
+        ;;
+      :)
+        print_and_log "Option -$OPTARG requires an argument." >&2
+        usages
+        remove_pid_and_exit_in_error
+        ;;
+    esac
+  done
+}
+
+##
+function execute
+{
+    if [ $add_customer -eq 1 ]; then
+      if [ ! -d $root_dir ]; then
+         init
+      else
+        print_and_log "Builder configurations are already generated! So, Going to create the customer  builder ..."
+     fi
+       ensure_no_user_conflict
+       add_customer
+    else
+      print_and_log "No valid action chosen, exiting!" >&2
+      remove_pid_and_exit_in_error
+    fi
+}
+
+
+##
+
+##
+function init
+{
+  # create skel dir for user creation
+  if [ ! -d "$skel_dir" ]; then
+    mkdir -p  $skel_dir
+  fi
+
+  # setup assemblytool skel
+  if [ ! -d "$assemblytool_home" ]; then
+    mkdir $assemblytool_home
+    run wget --http-user=$technet_user --http-password=$technet_password http://technet.escenic.com/downloads/assemblytool-2.0.2.zip -O $assemblytool_home/assemblytool.zip
+    run cd $assemblytool_home
+    run unzip assemblytool.zip
+    run rm -f assemblytool.zip
+    run ant -q initialize
+    echo "engine.root = ../engine/
+plugins = ../plugins" >> $assemblytool_home/assemble.properties
+  fi
+
+  # setup maven settings.xml skel
+  if [ ! -d "$m2_home" ]; then
+    mkdir $m2_home
+    cat>> $m2_home/settings.xml <<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<settings xmlns="http://maven.apache.org/settings/1.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                              http://maven.apache.org/xsd/settings-1.0.0.xsd">
+
+<servers>
+    <server>
+      <id>vizrt-repo</id>
+      <username>edemo-dev</username>
+      <password>strange-preference</password>
+    </server>
+    <server>
+      <id>vizrt-unstable</id>
+      <username>edemo-dev</username>
+      <password>strange-preference</password>
+    </server>
+  </servers>
+  <profiles>
+    <profile>
+      <id>escenic-profile</id>
+      <repositories>
+        <repository>
+          <id>vizrt-repo</id>
+          <name>Vizrt Maven Repository</name>
+          <url>http://maven.vizrt.com</url>
+          <layout>default</layout>
+        </repository>
+      </repositories>
+      <pluginRepositories>
+        <pluginRepository>
+          <id>vizrt-repo</id>
+          <name>Vizrt Maven Repository</name>
+          <url>http://maven.vizrt.com</url>
+          <layout>default</layout>
+        </pluginRepository>
+      </pluginRepositories>
+    </profile>
+    <profile>
+      <id>unstable</id>
+      <repositories>
+        <repository>
+          <id>vizrt-unstable</id>
+          <name>Vizrt Maven Repository</name>
+          <url>http://maven.vizrt.com/unstable</url>
+          <layout>default</layout>
+        </repository>
+      </repositories>
+      <pluginRepositories>
+        <pluginRepository>
+          <id>vizrt-unstable</id>
+          <name>Vizrt Maven Repository</name>
+          <url>http://maven.vizrt.com/unstable</url>
+          <layout>default</layout>
+        </pluginRepository>
+      </pluginRepositories>
+    </profile>
+    <profile>
+      <id>unstable</id>
+      <repositories>
+        <repository>
+          <id>vizrt-unstable</id>
+          <name>Vizrt Maven Repository</name>
+          <url>http://maven.vizrt.com/unstable</url>
+          <layout>default</layout>
+        </repository>
+      </repositories>
+      <pluginRepositories>
+        <pluginRepository>
+          <id>vizrt-unstable</id>
+          <name>Vizrt Maven Repository</name>
+          <url>http://maven.vizrt.com/unstable</url>
+          <layout>default</layout>
+        </pluginRepository>
+      </pluginRepositories>
+    </profile>
+  </profiles>
+  <activeProfiles>
+    <activeProfile>escenic-profile</activeProfile>
+    <activeProfile>unstable</activeProfile>
+    <activeProfile>builder</activeProfile>
+  </activeProfiles>
+</settings>
+EOF
+  fi
+
+  # setup subversion config skel
+  if [ ! -d "$subversion_dir" ]; then
+    run mkdir $subversion_dir
+    echo "[groups]
+
+[global]
+# Password / passphrase caching parameters:
+store-passwords = yes
+store-plaintext-passwords = yes" > $subversion_dir/servers
+  fi
+
+  # setup .vim.rc skel 
+  if [ ! -e "$skel_dir/.vimrc" ]; then
+    echo "set background=dark
+syntax on
+set nocompatible
+set backspace=2" > $skel_dir/.vimrc
+  fi
+}
+
+##
+function verify_builder_exist 
+{
+  if [ ! -d $root_dir ]; then
+    print_and_log "Builder has not been initialized, please run this script with the -i flag and provide a valid config file!"
+    remove_pid_and_exit_in_error
+  fi
+}
+
+##
+function verify_user_options() {
+  if [ $add_customer -eq 1 ]; then
+      if [ -z $builder_system_user ]; then
+         builder_system_user=$customer_name
+      fi
+  else 
+      print_and_log "Don't you want to create customer builder. Missing some required options ..."
+      usages
+      remove_pid_and_exit_in_error
+  fi
+}
+
+##
+function ensure_no_user_conflict
+{
+  if [ $given_skip_user_creation -eq 1 ]; then
+    if [  -z "$(getent passwd $builder_system_user)" ]; then
+      print_and_log "User $builder_system_user does not exist but you want to skip user creation!!!! Are you gone nuts ...."
+      remove_pid_and_exit_in_error
+    fi
+    if [ ! -d /home/$builder_system_user ]; then
+     print_and_log "User $builder_system_user does not exist, but has a home folder!"
+     remove_pid_and_exit_in_error
+   fi
+     print_and_log "I will skipping builder system user creation ..."
+  else 
+
+    if [ ! -z "$(getent passwd $builder_system_user)" ]; then
+      print_and_log "User $builder_system_user already exist!"
+      remove_pid_and_exit_in_error
+    fi
+    if [ -d /home/$builder_system_user ]; then
+     print_and_log "User $builder_system_user does not exist, but has a home folder!"
+     remove_pid_and_exit_in_error
+   fi
+   if [ -d /var/www/$customer_name ]; then
+     print_and_log "Project $customer_name does not exist, but has a web root under /var/www/$customer_name"
+     remove_pid_and_exit_in_error
+   fi
+fi
+}
+
+
+##
+function add_customer
+{
+
+# Check if user want's to skip user creation
+  if [ $given_skip_user_creation -eq 1 ];then
+       print_and_log " Skipping builder system user $builder_system_user creation ..."
+  else
+     run useradd -m -s /bin/bash $builder_system_user
+  fi
+  git_protocol=`echo $git_url | cut -d':' -f1`
+  git_user=`echo $git_url | awk -F"//" '{print $2;}' | cut -d'@' -f1`
+  git_base=`echo $git_url | cut -d'@' -f2`
+  make_dir /home/$builder_system_user/.build
+  echo "customer=$customer_name
+src_control=git
+git_user=$git_user
+git_protocol=$git_protocol
+git_base=$git_base" > /home/$builder_system_user/.build/build.conf
+  run chown $builder_system_user:$builder_system_user /home/$builder_system_user/.build/build.conf
+  run rsync -av $skel_dir/ /home/$builder_system_user
+  run sed -i "s/maven.username/$user_maven_username/" /home/$builder_system_user/.m2/settings.xml
+  run sed -i "s/maven.password/$user_maven_password/" /home/$builder_system_user/.m2/settings.xml
+  run chown -R $builder_system_user:$builder_system_user /home/$builder_system_user
+  if [ ! -d /var/www/$customer_name ]; then
+    make_dir /var/www/$customer_name
+    run chown www-data:www-data /var/www/$customer_name  
+  else
+    print_and_log "Failed to add web root /var/www/$customer_name"
+    remove_pid_and_exit_in_error
+  fi
+  if [ ! -h /var/www/$builder_system_user/releases ]; then
+    run ln -s /home/$builder_system_user/releases /var/www/$customer_name/releases
+  else
+    print_and_log "Failed to add symlink for /var/www/$customer_name/releases"
+    remove_pid_and_exit_in_error
+  fi
+}
+
+
+##
+function common_post_build {
+  run rm $pid_file
+}
+
+##
+function phase_startup {
+  verify_root_privilege
+  verify_scripts
+  verify_dependencies
+}
+
+function pre_setup_verify {
+  verify_builder_conf
+  verify_user_options
+}
+
+##
+function phase_execute
+{
+  execute
+}
+
+##
+function phase_shutdown
+{
+  common_post_build
+}
+
+#####################################################
+# Run commands
+#####################################################
+phase_startup
+get_user_options $@
+pre_setup_verify
+print_and_log "Starting process @ $(date)"
+print_and_log "Additional output can be found in $log"
+phase_execute
+print_and_log "SUCCESS! @ $(date)"
+phase_shutdown

From d81ce2c859dfbbfcd19fb92db2affce6a8445824 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Fri, 24 Oct 2014 09:45:03 +0600
Subject: [PATCH 2236/2585] VOSA-153:Skipped checking for
 java_memcache-release-2.0.1 if the engine version is 57 or above

---
 usr/share/escenic/build-scripts/ece-build | 42 +++++++++++------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index a88f82a1..6c8f6ac2 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -7,7 +7,7 @@
 ################################################################################
 
 # common variables
-ece_scripts_version="straight-from-github"
+ece_scripts_version=1.0-2014-06-24-lean-974
 ece_scripts_home=/usr/share/escenic/ece-scripts
 log=~/ece-build.log
 
@@ -19,10 +19,8 @@ skip_ear=0
 project_pom_versions=""
 
 # standard java locations
-#TODO:take java home location dynamically
 java_6_sun=/usr/lib/jvm/java-6-sun
-java_7_oracle=/usr/lib/jvm/java-7-oracle
-java_8_oracle=/usr/lib/jvm/java-8-oracle
+java_7_oracle=/usr/lib/jvm/jdk-8-oracle-x64
 
 # ece-build platform dependencies
 dependencies="tar
@@ -63,10 +61,7 @@ mobile-expansion
 semantic-cxense
 snapshot
 changelog
-note
-seo
-mobile-studio
-preview-editor"
+note"
 
 declare -A project_distributions=()
 
@@ -99,9 +94,6 @@ declare -A maven_snapshot_coordinates=(
 ["widget-framework-core"]="com.escenic.widget-framework:framework-dist:zip"
 ["widget-framework-community"]="com.escenic.widget-framework:framework-community-dist:zip"
 ["widget-framework-mobile"]="com.escenic.widget-framework:framework-mobile-dist:zip"
-["seo"]="com.escenic.plugins.seo:seo:zip"
-["mobile-studio"]="com.escenic.plugins.mobile-studio:mobile-studio:zip"
-["preview-editor"]="com.escenic.plugins.preview-editor:preview-editor:zip"
 )
 
 declare -A maven_coordinates=(
@@ -141,9 +133,6 @@ com.escenic.plugins.vcpeditor:vcpeditor:zip"
 ["widget-framework-core"]="com.escenic.widget-framework:framework-dist:zip"
 ["widget-framework-community"]="com.escenic.widget-framework:framework-community-dist:zip"
 ["widget-framework-mobile"]="com.escenic.widget-framework:framework-mobile-dist:zip"
-["seo"]="com.escenic.plugins.seo:seo:zip"
-["mobile-studio"]="com.escenic.plugins.mobile-studio:mobile-studio:zip"
-["preview-editor"]="com.escenic.plugins.preview-editor:preview-editor:zip"
 )
 
 # root folders for engine and plugin distributions
@@ -491,12 +480,30 @@ function clean_customer_home
 ##
 function add_global_libs
 {
+local project_engine_version
+local engine_minor_version
+local engine_major_version
+local engine_version
+  for f in $project_pom_versions; do
+    if [[ $f == engine=* ]]; then
+      local project_engine_version=`echo $f | sed 's/=/-/g'`
+      print_and_log " project engine verion $project_engine_version"
+      break
+    fi
+  done
+ engine_major_version=`echo $project_engine_version | cut -d'-' -f2 | cut -d'.' -f1`
+ engine_minor_version=`echo $project_engine_version | cut -d'-' -f2 | cut -d'.' -f2`
+ engine_version=$engine_major_version$engine_minor_version
+ if [ ! $engine_version -ge 57 ] ; then
   if [ -e $builder_root_dir/lib/java_memcached-release_2.0.1.jar ]; then
     run_wrapper ln -s $builder_root_dir/lib/java_memcached-release_2.0.1.jar $assemblytool_lib_dir/
   else
     print_and_log "The global library $builder_root_dir/lib/java_memcached-release_2.0.1.jar is missing, exiting!"
     exit 1
   fi
+ else
+  print_and_log "Skip java_memcache jar cause it is distributed with $project_engine_version"
+ fi
 }
 
 
@@ -734,13 +741,6 @@ function set_java_home
       print_and_log "The expected home directory, $java_7_oracle, for you requested java version does not exist on the platform and needs to be added, exiting!"
       exit 1
     fi
-  elif [[ $project_java_version == "1.8" ]]; then
-    if [ -d $java_8_oracle ]; then
-      export JAVA_HOME=$java_8_oracle
-    else
-      print_and_log "The expected home directory, $java_8_oracle, for you requested java version does not exist on the platform and needs to be added, exiting!"
-      exit 1
-    fi
   else
     print_and_log "The requested java version $project_java_version is not supported or has been specified using an incorrect format, exiting!"
   fi

From 4a0f721268b17fa79343f61a18ec9dcd3881ed89 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Fri, 24 Oct 2014 09:53:09 +0600
Subject: [PATCH 2237/2585] Revert "VOSA-153:Reverting commit
 d81ce2c859dfbbfcd19fb92db2affce6a8445824"

This reverts commit d81ce2c859dfbbfcd19fb92db2affce6a8445824.
---
 usr/share/escenic/build-scripts/ece-build | 42 +++++++++++------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 6c8f6ac2..a88f82a1 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -7,7 +7,7 @@
 ################################################################################
 
 # common variables
-ece_scripts_version=1.0-2014-06-24-lean-974
+ece_scripts_version="straight-from-github"
 ece_scripts_home=/usr/share/escenic/ece-scripts
 log=~/ece-build.log
 
@@ -19,8 +19,10 @@ skip_ear=0
 project_pom_versions=""
 
 # standard java locations
+#TODO:take java home location dynamically
 java_6_sun=/usr/lib/jvm/java-6-sun
-java_7_oracle=/usr/lib/jvm/jdk-8-oracle-x64
+java_7_oracle=/usr/lib/jvm/java-7-oracle
+java_8_oracle=/usr/lib/jvm/java-8-oracle
 
 # ece-build platform dependencies
 dependencies="tar
@@ -61,7 +63,10 @@ mobile-expansion
 semantic-cxense
 snapshot
 changelog
-note"
+note
+seo
+mobile-studio
+preview-editor"
 
 declare -A project_distributions=()
 
@@ -94,6 +99,9 @@ declare -A maven_snapshot_coordinates=(
 ["widget-framework-core"]="com.escenic.widget-framework:framework-dist:zip"
 ["widget-framework-community"]="com.escenic.widget-framework:framework-community-dist:zip"
 ["widget-framework-mobile"]="com.escenic.widget-framework:framework-mobile-dist:zip"
+["seo"]="com.escenic.plugins.seo:seo:zip"
+["mobile-studio"]="com.escenic.plugins.mobile-studio:mobile-studio:zip"
+["preview-editor"]="com.escenic.plugins.preview-editor:preview-editor:zip"
 )
 
 declare -A maven_coordinates=(
@@ -133,6 +141,9 @@ com.escenic.plugins.vcpeditor:vcpeditor:zip"
 ["widget-framework-core"]="com.escenic.widget-framework:framework-dist:zip"
 ["widget-framework-community"]="com.escenic.widget-framework:framework-community-dist:zip"
 ["widget-framework-mobile"]="com.escenic.widget-framework:framework-mobile-dist:zip"
+["seo"]="com.escenic.plugins.seo:seo:zip"
+["mobile-studio"]="com.escenic.plugins.mobile-studio:mobile-studio:zip"
+["preview-editor"]="com.escenic.plugins.preview-editor:preview-editor:zip"
 )
 
 # root folders for engine and plugin distributions
@@ -480,30 +491,12 @@ function clean_customer_home
 ##
 function add_global_libs
 {
-local project_engine_version
-local engine_minor_version
-local engine_major_version
-local engine_version
-  for f in $project_pom_versions; do
-    if [[ $f == engine=* ]]; then
-      local project_engine_version=`echo $f | sed 's/=/-/g'`
-      print_and_log " project engine verion $project_engine_version"
-      break
-    fi
-  done
- engine_major_version=`echo $project_engine_version | cut -d'-' -f2 | cut -d'.' -f1`
- engine_minor_version=`echo $project_engine_version | cut -d'-' -f2 | cut -d'.' -f2`
- engine_version=$engine_major_version$engine_minor_version
- if [ ! $engine_version -ge 57 ] ; then
   if [ -e $builder_root_dir/lib/java_memcached-release_2.0.1.jar ]; then
     run_wrapper ln -s $builder_root_dir/lib/java_memcached-release_2.0.1.jar $assemblytool_lib_dir/
   else
     print_and_log "The global library $builder_root_dir/lib/java_memcached-release_2.0.1.jar is missing, exiting!"
     exit 1
   fi
- else
-  print_and_log "Skip java_memcache jar cause it is distributed with $project_engine_version"
- fi
 }
 
 
@@ -741,6 +734,13 @@ function set_java_home
       print_and_log "The expected home directory, $java_7_oracle, for you requested java version does not exist on the platform and needs to be added, exiting!"
       exit 1
     fi
+  elif [[ $project_java_version == "1.8" ]]; then
+    if [ -d $java_8_oracle ]; then
+      export JAVA_HOME=$java_8_oracle
+    else
+      print_and_log "The expected home directory, $java_8_oracle, for you requested java version does not exist on the platform and needs to be added, exiting!"
+      exit 1
+    fi
   else
     print_and_log "The requested java version $project_java_version is not supported or has been specified using an incorrect format, exiting!"
   fi

From df5699c98f12ec8ab0e59d4c7d641e955e207a8e Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Fri, 24 Oct 2014 09:58:48 +0600
Subject: [PATCH 2238/2585] VOSA-153: Skipped checking for java_memcache jar
 for engine 57 or above. Also change the java_home or java8

---
 usr/share/escenic/build-scripts/ece-build | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index a88f82a1..28267145 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -22,7 +22,7 @@ project_pom_versions=""
 #TODO:take java home location dynamically
 java_6_sun=/usr/lib/jvm/java-6-sun
 java_7_oracle=/usr/lib/jvm/java-7-oracle
-java_8_oracle=/usr/lib/jvm/java-8-oracle
+java_8_oracle=/usr/lib/jvm/jdk-8-oracle-x64
 
 # ece-build platform dependencies
 dependencies="tar
@@ -491,15 +491,32 @@ function clean_customer_home
 ##
 function add_global_libs
 {
+local project_engine_version
+local engine_minor_version
+local engine_major_version
+local engine_version
+  for f in $project_pom_versions; do
+    if [[ $f == engine=* ]]; then
+      local project_engine_version=`echo $f | sed 's/=/-/g'`
+      print_and_log " project engine verion $project_engine_version"
+      break
+    fi
+  done
+ engine_major_version=`echo $project_engine_version | cut -d'-' -f2 | cut -d'.' -f1`
+ engine_minor_version=`echo $project_engine_version | cut -d'-' -f2 | cut -d'.' -f2`
+ engine_version=$engine_major_version$engine_minor_version
+ if [ ! $engine_version -ge 57 ] ; then
   if [ -e $builder_root_dir/lib/java_memcached-release_2.0.1.jar ]; then
     run_wrapper ln -s $builder_root_dir/lib/java_memcached-release_2.0.1.jar $assemblytool_lib_dir/
   else
     print_and_log "The global library $builder_root_dir/lib/java_memcached-release_2.0.1.jar is missing, exiting!"
     exit 1
   fi
+ else
+  print_and_log "Skip java_memcache jar cause it is distributed with $project_engine_version"
+ fi
 }
 
-
 ##
 function svn_fail_early
 {

From 451b7db56a157eddc73536fea71ae551b339b936 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Tue, 28 Oct 2014 14:28:26 +0600
Subject: [PATCH 2239/2585] VOSA-153:Added assemblytool configration layers and
 removed unused code

---
 .../escenic/build-scripts/ece-local-builder   | 340 ++++++++++++++----
 1 file changed, 270 insertions(+), 70 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-local-builder b/usr/share/escenic/build-scripts/ece-local-builder
index a8bcf4cf..82905646 100755
--- a/usr/share/escenic/build-scripts/ece-local-builder
+++ b/usr/share/escenic/build-scripts/ece-local-builder
@@ -19,22 +19,18 @@ wget"
 
 # available commands
 add_customer=0
-add_artifact=0
-add_artifact_list=0
-given_maven_username=0
-given_maven_password=0
-given_git_url=0
 given_skip_user_creation=0
-# Add artifact variables
-list_path=
-artifact_path=
+given_all_system_users=0
 
 # Add user variables
 builder_system_user=
 customer_name=
+technet_user=
+technet_password=
 user_maven_username=
 user_maven_password="CHANGE_ME"
 git_url=
+assemblytool_url=
 
 # Initialize builder variables
 root_dir=/etc/escenic/builder
@@ -43,7 +39,6 @@ builder_engine_dir=$root_dir/engine
 builder_plugins_dir=$root_dir/plugins
 skel_dir=$root_dir/.skel
 subversion_dir=$skel_dir/.subversion
-assemblytool_home=$skel_dir/assemblytool
 m2_home=$skel_dir/.m2
 
 ##
@@ -70,6 +65,7 @@ function verify_builder_conf
   enforce_variable technet_user "Your builder configuration file is missing the variable technet_password, exiting!"
   enforce_variable maven_vizrt_user "Your builder configuration file is missing the variable maven_vizrt_user, exiting!"
   enforce_variable maven_vizrt_password "Your builder configuration file is missing the variable maven_vizrt_password, exiting!"
+  enforce_variable assemblytool_url "Your builder configuration file is missing the variable assemblytool_url, exiting!"
   wget --http-user $technet_user --http-password $technet_password http://technet.escenic.com/ -qO /dev/null
   if [ $? -ne 0 ]; then
     print_and_log "Your user can't reach http://technet.escenic.com/, exiting!"
@@ -147,7 +143,7 @@ function usages(){
 ##
 function get_user_options
 {
-  while getopts ":i:c:b:u:p:g:Vs" opt; do
+  while getopts ":i:c:b:u:p:g:Vsa" opt; do
     case $opt in
       c)
         print_and_log "Customer builder configuration is given in ${OPTARG} ..."
@@ -158,6 +154,10 @@ function get_user_options
         print_and_log "Skip ${OPTARG} user creation ..."
         given_skip_user_creation=1
         ;;
+      a)
+        print_and_log "Adding builder to all system users ..."
+        given_all_system_users=1
+        ;;
       V)
         echo "Version:" $ece_scripts_version
         exit 0
@@ -179,14 +179,24 @@ function get_user_options
 ##
 function execute
 {
+local users
     if [ $add_customer -eq 1 ]; then
       if [ ! -d $root_dir ]; then
          init
       else
         print_and_log "Builder configurations are already generated! So, Going to create the customer  builder ..."
-     fi
-       ensure_no_user_conflict
-       add_customer
+      fi
+      if [ $given_all_system_users -eq 1 ]; then
+        users=`ls -1 /home`
+        for user in $users
+          do
+            ensure_no_user_conflict $user $customer_name
+            add_customer $user $customer_name
+          done
+      else
+       ensure_no_user_conflict $builder_system_user $customer_name
+       add_customer $builder_system_user $customer_name
+      fi
     else
       print_and_log "No valid action chosen, exiting!" >&2
       remove_pid_and_exit_in_error
@@ -199,33 +209,232 @@ function execute
 ##
 function init
 {
+ local assemblytool_dir
+ local assemblytool_home
   # create skel dir for user creation
   if [ ! -d "$skel_dir" ]; then
     mkdir -p  $skel_dir
   fi
 
   # setup assemblytool skel
+  assemblytool_dir=`echo $assemblytool_url | rev | cut -d'/' -f1 | cut -d'.' -f2- | rev`
+  assemblytool_home=$skel_dir/$assemblytool_dir
   if [ ! -d "$assemblytool_home" ]; then
     mkdir $assemblytool_home
-    run wget --http-user=$technet_user --http-password=$technet_password http://technet.escenic.com/downloads/assemblytool-2.0.2.zip -O $assemblytool_home/assemblytool.zip
+    
+    run wget --http-user=$technet_user --http-password=$technet_password $assemblytool_url -O $assemblytool_home/assemblytool.zip
     run cd $assemblytool_home
     run unzip assemblytool.zip
     run rm -f assemblytool.zip
     run ant -q initialize
     echo "engine.root = ../engine/
 plugins = ../plugins" >> $assemblytool_home/assemble.properties
+    if [ ! -d $assemblytool_home/conf ]; then
+       make_dir $assemblytool_home/conf/layers
+    fi
+    echo "######################################################
+# Site Wide Nursery configuration file.
+########################################################
+# The purpose of this file is to set up the nursery,
+# and all of the other configuration layers that are
+# to be used by this configuration.
+#
+# This Nursery component will bootstrap the Nursery.
+#
+# Therefore, it is vital that all files needed to
+# configure the nursery are available in _this_
+# configuration layer.
+#
+# Only after loading the Nursery component, will the
+# other configuration layers be visible to any other
+# Nursery component.
+# 
+# After bootstrapping itself, it will  turn bootstrap
+# the rest of Escenic.
+#
+# It is possible to do System property substitution
+# in all configuration layers, even this configuration
+# layer:
+#   someProperty=\${some.system.property}
+# will expand to the value of the system property
+# called \"some.system.property\".
+#
+# Note: There is only one nursery per Java process.
+########################################################
+
+\$class=neo.nursery.Bootstrapper
+
+########################################################
+# CONFIGURATION LAYERS
+########################################################
+# Each referenced component must have its own
+# properties file; they _must_ reside in this
+# configuration layer.
+#
+# Content Engine ships with three default layers
+# layer.01 = /layers/default/Layer
+# layer.02 = /layers/addon/Layer
+# layer.03 = /layers/common/Layer
+########################################################
+
+
+# ECE :: default layer
+layer.01 = /layers/default/Layer
+
+# ECE :: plugins layer
+layer.02 = /layers/addon/Layer
+
+# VOSA :: common VOSA/SaaS layer
+layer.03 = /layers/vosa/Layer
+
+# Customer :: common layer
+layer.04 = /layers/common/Layer
+
+# Customer :: family/group layer (e.g. presentation, editorial)
+layer.05 = /layers/family/Layer
+
+# Customer :: environment layer (e.g. testing, staging, production)
+layer.06 = /layers/environment/Layer
+
+# Customer :: host specific layer
+layer.07 = /layers/host/Layer
+
+# Customer :: instance specific layer
+layer.08 = /layers/instance/Layer
+
+# Customer :: \"escenic.server\" specific layer
+layer.09 = /layers/server/Layer" > $assemblytool_home/conf/Nursery.properties
+
+   #Update default layer configurations
+   if [ ! -d  $assemblytool_home/conf/layers/default ]; then
+        make_dir $assemblytool_home/conf/layers/default
+        echo "# The Escenic default configuration is read from the classpath with a prefix of com/escenic/configuration/default
+\$class=neo.nursery.ResourceDepot
+prefix=com/escenic/configuration/default" > $assemblytool_home/conf/layers/default/Files.properties
+
+       echo "# This configuration layer consists of properties files
+\$class=neo.nursery.PropertyFileConfigurator
+depot=./Files" > $assemblytool_home/conf/layers/default/Layer.properties
+  else
+       print_and_log "Default layer already exists no need to create again"
+  fi
+  #Update family layer configurations
+    if [ ! -d  $assemblytool_home/conf/layers/family ]; then
+        make_dir $assemblytool_home/conf/layers/family
+        echo "# The family configuration is read from the file system hierarchy standard for configuration
+\$class=neo.nursery.FileSystemDepot
+
+# The files are loaded from a subdirectory of /etc/escenic/engine/host
+#   either from the system property \"com.escenic.config.engine.family\"
+#   or the family name \"default\" if that system property is null
+fileSystemRoot = /etc/escenic/engine/family/\${com.escenic.config.engine.family \"default\"}" > $assemblytool_home/conf/layers/family/Files.properties
+     
+  echo "# This configuration layer consists of properties files
+\$class=neo.nursery.PropertyFileConfigurator
+depot=./Files" > $assemblytool_home/conf/layers/family/Layer.properties  
+    else
+       print_and_log "Default layer already exists no need to create again"
+    fi
+   #Update addon layer configurations
+    if [ ! -d  $assemblytool_home/conf/layers/addon ]; then
+        make_dir $assemblytool_home/conf/layers/addon
+        echo "# The addon configuration is read from the classpath with no prefix
+\$class=neo.nursery.ResourceDepot" > $assemblytool_home/conf/layers/addon/Files.properties
+
+      echo "# This configuration layer consists of properties files
+\$class=neo.nursery.PropertyFileConfigurator
+depot=./Files" > $assemblytool_home/conf/layers/addon/Layer.properties 
+    else
+       print_and_log "Addon layer already exists no need to create again"
+    fi
+   #Update common layer configurations
+    if [ ! -d  $assemblytool_home/conf/layers/common ]; then
+        make_dir $assemblytool_home/conf/layers/common
+        echo "# The common configuration is read from the file system hierarchy standard location for configuration files
+\$class=neo.nursery.FileSystemDepot
+fileSystemRoot = /etc/escenic/engine/common/" > $assemblytool_home/conf/layers/common/Files.properties
+
+       echo "# This configuration layer consists of properties files
+\$class=neo.nursery.PropertyFileConfigurator
+depot=./Files" > $assemblytool_home/conf/layers/common/Layer.properties
+    else
+       print_and_log "Common layer already exists no need to create again"
+    fi
+   #Update host layer configurations
+    if [ ! -d  $assemblytool_home/conf/layers/host ]; then
+        make_dir $assemblytool_home/conf/layers/host
+        echo "# The host configuration is read from the file system hierarchy standard for configuration
+\$class=neo.nursery.FileSystemDepot
+
+# The files are loaded from a subdirectory of /etc/escenic/engine/host
+#   * the system property \"hostname\" if specified
+#   * the environment variable \"HOSTNAME\" or \"COMPUTERNAME\"
+#   otherwise the default value of \"localhost\"
+fileSystemRoot = /etc/escenic/engine/host/\${hostname env:HOSTNAME env:COMPUTERNAME \"localhost\"}/" >  $assemblytool_home/conf/layers/host/Files.properties
+       echo "# This configuration layer consists of properties files
+\$class=neo.nursery.PropertyFileConfigurator
+depot=./Files" > $assemblytool_home/conf/layers/host/Layer.properties
+    else
+       print_and_log "Host layer already exists no need to create again"
+    fi
+   #Update environment layer configuration
+     if [ ! -d $assemblytool_home/conf/layers/environment ]; then
+          make_dir  $assemblytool_home/conf/layers/environment
+          echo "\$class=neo.nursery.FileSystemDepot
+fileSystemRoot = /etc/escenic/engine/environment/\${com.escenic.environment \"unknown\"}/" > $assemblytool_home/conf/layers/environment/Files.properties
+          echo "# This configuration layer consists of properties files
+\$class=neo.nursery.PropertyFileConfigurator
+depot=./Files" > $assemblytool_home/conf/layers/environment/Layer.properties
+     else
+          print_and_log "Envirnoment layer already exists no need to create again"
+     fi
+   #Update instance layer configuration
+    if [ ! -d  $assemblytool_home/conf/layers/instance ]; then
+         make_dir  $assemblytool_home/conf/layers/instance
+         echo "\$class=neo.nursery.FileSystemDepot
+fileSystemRoot = /etc/escenic/engine/instance/\${com.escenic.instance \"default\"}" > $assemblytool_home/conf/layers/instance/Files.properties
+        echo "# This configuration layer consists of properties files
+\$class=neo.nursery.PropertyFileConfigurator
+depot=./Files" > $assemblytool_home/conf/layers/instance/Layer.properties
+   else
+         print_and_log "Instance layer already exists no need to create again"
+   fi
+  #Update server layer configuration
+    if [ ! -d  $assemblytool_home/conf/layers/server ]; then
+         make_dir  $assemblytool_home/conf/layers/server
+         echo "# The host configuration is read from the file system hierarchy standard for configuration
+\$class=neo.nursery.FileSystemDepot
+
+# The files are loaded from a subdirectory of /etc/escenic/engine/host-instance
+#   named after the hostname and instance name it's running as.
+fileSystemRoot = /etc/escenic/engine/server/\${escenic.server \"default\"}/" > $assemblytool_home/conf/layers/server/Files.properties
+        echo "# This configuration layer consists of properties files
+\$class=neo.nursery.PropertyFileConfigurator
+depot=./Files" > $assemblytool_home/conf/layers/server/Layer.properties
+   else
+       print_and_log "Server layer already exists no need to create again"
+   fi
+  #Update vosa layer configuration
+   if [ ! -d   $assemblytool_home/conf/layers/vosa ]; then
+       mkdir  $assemblytool_home/conf/layers/vosa
+       echo "\$class=neo.nursery.FileSystemDepot
+fileSystemRoot = /etc/escenic/engine/vosa/" > $assemblytool_home/conf/layers/vosa/Files.properties
+       echo "# This configuration layer consists of properties files
+\$class=neo.nursery.PropertyFileConfigurator
+depot=./Files" > $assemblytool_home/conf/layers/vosa/Layer.properties
+   else
+       print_and_log "Vosa layer already exists no need to create again"
+   fi
   fi
 
   # setup maven settings.xml skel
   if [ ! -d "$m2_home" ]; then
     mkdir $m2_home
-    cat>> $m2_home/settings.xml <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<settings xmlns="http://maven.apache.org/settings/1.0.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
-                              http://maven.apache.org/xsd/settings-1.0.0.xsd">
-
+    echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+<settings xmlns=\"http://maven.apache.org/settings/1.0.0\"
+          xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"
+          xsi:schemaLocation=\"http://maven.apache.org/SETTINGS/1.0.0
+                              http://maven.apache.org/xsd/settings-1.0.0.xsd\">
 <servers>
     <server>
       <id>vizrt-repo</id>
@@ -277,33 +486,13 @@ plugins = ../plugins" >> $assemblytool_home/assemble.properties
         </pluginRepository>
       </pluginRepositories>
     </profile>
-    <profile>
-      <id>unstable</id>
-      <repositories>
-        <repository>
-          <id>vizrt-unstable</id>
-          <name>Vizrt Maven Repository</name>
-          <url>http://maven.vizrt.com/unstable</url>
-          <layout>default</layout>
-        </repository>
-      </repositories>
-      <pluginRepositories>
-        <pluginRepository>
-          <id>vizrt-unstable</id>
-          <name>Vizrt Maven Repository</name>
-          <url>http://maven.vizrt.com/unstable</url>
-          <layout>default</layout>
-        </pluginRepository>
-      </pluginRepositories>
-    </profile>
   </profiles>
   <activeProfiles>
     <activeProfile>escenic-profile</activeProfile>
     <activeProfile>unstable</activeProfile>
     <activeProfile>builder</activeProfile>
   </activeProfiles>
-</settings>
-EOF
+</settings>" > $m2_home/settings.xml
   fi
 
   # setup subversion config skel
@@ -352,27 +541,27 @@ function verify_user_options() {
 function ensure_no_user_conflict
 {
   if [ $given_skip_user_creation -eq 1 ]; then
-    if [  -z "$(getent passwd $builder_system_user)" ]; then
-      print_and_log "User $builder_system_user does not exist but you want to skip user creation!!!! Are you gone nuts ...."
+    if [  -z "$(getent passwd $1)" ]; then
+      print_and_log "User $1 does not exist but you want to skip user creation!!!! Are you gone nuts ...."
       remove_pid_and_exit_in_error
     fi
-    if [ ! -d /home/$builder_system_user ]; then
-     print_and_log "User $builder_system_user does not exist, but has a home folder!"
+    if [ ! -d /home/$1 ]; then
+     print_and_log "User $1 does not exist, but has a home folder!"
      remove_pid_and_exit_in_error
    fi
      print_and_log "I will skipping builder system user creation ..."
   else 
 
-    if [ ! -z "$(getent passwd $builder_system_user)" ]; then
-      print_and_log "User $builder_system_user already exist!"
+    if [ ! -z "$(getent passwd $1)" ]; then
+      print_and_log "User $1 already exist!"
       remove_pid_and_exit_in_error
     fi
-    if [ -d /home/$builder_system_user ]; then
-     print_and_log "User $builder_system_user does not exist, but has a home folder!"
+    if [ -d /home/$1 ]; then
+     print_and_log "User $1 does not exist, but has a home folder!"
      remove_pid_and_exit_in_error
    fi
-   if [ -d /var/www/$customer_name ]; then
-     print_and_log "Project $customer_name does not exist, but has a web root under /var/www/$customer_name"
+   if [ -d /var/www/$2 ]; then
+     print_and_log "Project $2 does not exist, but has a web root under /var/www/$2"
      remove_pid_and_exit_in_error
    fi
 fi
@@ -385,37 +574,48 @@ function add_customer
 
 # Check if user want's to skip user creation
   if [ $given_skip_user_creation -eq 1 ];then
-       print_and_log " Skipping builder system user $builder_system_user creation ..."
+       print_and_log " Skipping builder system user $1 creation ..."
   else
-     run useradd -m -s /bin/bash $builder_system_user
+     run useradd -m -s /bin/bash $1
   fi
   git_protocol=`echo $git_url | cut -d':' -f1`
   git_user=`echo $git_url | awk -F"//" '{print $2;}' | cut -d'@' -f1`
   git_base=`echo $git_url | cut -d'@' -f2`
-  make_dir /home/$builder_system_user/.build
-  echo "customer=$customer_name
+  make_dir /home/$1/.build
+  echo "customer=$2
 src_control=git
 git_user=$git_user
 git_protocol=$git_protocol
-git_base=$git_base" > /home/$builder_system_user/.build/build.conf
-  run chown $builder_system_user:$builder_system_user /home/$builder_system_user/.build/build.conf
-  run rsync -av $skel_dir/ /home/$builder_system_user
-  run sed -i "s/maven.username/$user_maven_username/" /home/$builder_system_user/.m2/settings.xml
-  run sed -i "s/maven.password/$user_maven_password/" /home/$builder_system_user/.m2/settings.xml
-  run chown -R $builder_system_user:$builder_system_user /home/$builder_system_user
-  if [ ! -d /var/www/$customer_name ]; then
-    make_dir /var/www/$customer_name
-    run chown www-data:www-data /var/www/$customer_name  
+git_base=$git_base" > /home/$1/.build/build.conf
+  run chown $1:$1 /home/$1/.build/build.conf
+  run rsync -av $skel_dir/ /home/$1
+  run sed -i "s/maven.username/$user_maven_username/" /home/$1/.m2/settings.xml
+  run sed -i "s/maven.password/$user_maven_password/" /home/$1/.m2/settings.xml
+  run chown -R $1:$1 /home/$1
+  if [ ! -d /var/www/$1 ]; then
+    make_dir /var/www/$1
+    run chown www-data:www-data /var/www/$1
   else
-    print_and_log "Failed to add web root /var/www/$customer_name"
-    remove_pid_and_exit_in_error
+    print_and_log "Failed to add web root /var/www/$1"
   fi
-  if [ ! -h /var/www/$builder_system_user/releases ]; then
-    run ln -s /home/$builder_system_user/releases /var/www/$customer_name/releases
+  if [ ! -h /var/www/$1/releases ]; then
+    run ln -s /home/$1/releases /var/www/$1/releases
   else
-    print_and_log "Failed to add symlink for /var/www/$customer_name/releases"
+    print_and_log "Failed to add symlink for /var/www/$1/releases"
     remove_pid_and_exit_in_error
   fi
+  setup_nginx $1
+}
+
+function setup_nginx
+{
+  if [ ! -e /etc/nginx/default-site/$1.conf ]; then
+    echo "location /$1/ {
+        alias /var/www/$1/releases/;
+        expires modified +310s;
+}" > /etc/nginx/default-site/$1.conf
+  fi 
+
 }
 
 

From a0d4e4d6258606ecaedb9088175f5e953167ec57 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul islam <sai@vizrt.com>
Date: Wed, 28 May 2014 18:31:26 +0600
Subject: [PATCH 2240/2585] #VOSA-108 Checked if maven-metadata file exists
 first. Then tried to download the dist.

---
 usr/sbin/ece-install | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index ffc36fa9..6b8aa3ae 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -188,9 +188,7 @@ function download_escenic_components()
       local targetname=$(basename $el)
       for repo in $fai_maven_repositories; do
         # Special handling for snapshots
-        if [[ "$el" == *-SNAPSHOT* ]] ; then
-          # If snapshot file is not available, try to see if there's a maven-metadata file
-          if ! curl -s -I $repo/$el | grep -q '^HTTP[^ ]* 200' ; then
+          # It will try to get the maven-metadata file. If the file exist it will create the proper el and download it later. VOSA-108
             if curl -s -I $repo/$(dirname $el)/maven-metadata.xml | grep -q '^HTTP[^ ]* 200' ; then
               local metadata;
               local name=$(basename $el)
@@ -201,8 +199,6 @@ function download_escenic_components()
               el=$(dirname $el)/${name/SNAPSHOT/$timestamp-$buildnumber}
               log "Downloading $el from $repo".
             fi
-          fi
-        fi
         if curl -s -I $repo/$el | grep -q '^HTTP[^ ]* 200' ; then
           log "Downloading $(basename $el) from $repo/$el ..."
           run wget $wget_opts $repo/$el -O $targetname

From 61de224948fc8f651d6716f2c2b2a5d093a84a4c Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul islam <sai@vizrt.com>
Date: Thu, 29 May 2014 00:26:30 +0600
Subject: [PATCH 2241/2585] VOSA-108: Fixed problem when maven-metadata.xml
 exits but timestamp and buildnumber is empty with in it

---
 usr/sbin/ece-install | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 6b8aa3ae..8917748c 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -189,16 +189,19 @@ function download_escenic_components()
       for repo in $fai_maven_repositories; do
         # Special handling for snapshots
           # It will try to get the maven-metadata file. If the file exist it will create the proper el and download it later. VOSA-108
-            if curl -s -I $repo/$(dirname $el)/maven-metadata.xml | grep -q '^HTTP[^ ]* 200' ; then
-              local metadata;
-              local name=$(basename $el)
-              metadata=$(curl -s $repo/$(dirname $el)/maven-metadata.xml)
-              local timestamp=$(xmlstarlet <<< "$metadata" sel -t -m /metadata/versioning/snapshot/timestamp -c 'text()')
-              local buildnumber=$(xmlstarlet <<< "$metadata"  sel -t -m /metadata/versioning/snapshot/buildNumber -c 'text()')
-              log "Found SNAPSHOT with $timestamp-$buildnumber in $el"
-              el=$(dirname $el)/${name/SNAPSHOT/$timestamp-$buildnumber}
-              log "Downloading $el from $repo".
-            fi
+        if curl -s -I $repo/$(dirname $el)/maven-metadata.xml | grep -q '^HTTP[^ ]* 200' ; then
+          local metadata;
+          local name=$(basename $el)
+          metadata=$(curl -s $repo/$(dirname $el)/maven-metadata.xml)
+          local timestamp=$(xmlstarlet <<< "$metadata" sel -t -m /metadata/versioning/snapshot/timestamp -c 'text()')
+          local buildnumber=$(xmlstarlet <<< "$metadata"  sel -t -m /metadata/versioning/snapshot/buildNumber -c 'text()')
+          #Now Check the the timestamp and buildnumber is not empty. If not then create the dist name with timestamp and buildnumber. 
+          if [[ -n $timestamp ||  -n $buildnumber ]]; then
+          log "Found SNAPSHOT with $timestamp-$buildnumber in $el"
+          el=$(dirname $el)/${name/SNAPSHOT/$timestamp-$buildnumber}
+          fi
+          log "Downloading $el from $repo".
+        fi
         if curl -s -I $repo/$el | grep -q '^HTTP[^ ]* 200' ; then
           log "Downloading $(basename $el) from $repo/$el ..."
           run wget $wget_opts $repo/$el -O $targetname

From b35aa74198d9870fa6f3103fdf914b587f581f5d Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul islam <sai@vizrt.com>
Date: Wed, 4 Jun 2014 11:46:57 +0600
Subject: [PATCH 2242/2585] VOSA-108: Hardening the artifact downloads for
 trunk-SNAPSHOT

---
 usr/sbin/ece-install                          |  2 +-
 .../ece-scripts/ece-install.d/app-server.sh   | 25 +++++++++++++++++++
 .../ece-scripts/ece-install.d/cache-server.sh |  2 +-
 .../ece-scripts/ece-install.d/constants.sh    |  1 +
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 8917748c..ff17b4e8 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -196,7 +196,7 @@ function download_escenic_components()
           local timestamp=$(xmlstarlet <<< "$metadata" sel -t -m /metadata/versioning/snapshot/timestamp -c 'text()')
           local buildnumber=$(xmlstarlet <<< "$metadata"  sel -t -m /metadata/versioning/snapshot/buildNumber -c 'text()')
           #Now Check the the timestamp and buildnumber is not empty. If not then create the dist name with timestamp and buildnumber. 
-          if [[ -n $timestamp ||  -n $buildnumber ]]; then
+          if [[ -z $timestamp && -z $buildnumber ]]; then
           log "Found SNAPSHOT with $timestamp-$buildnumber in $el"
           el=$(dirname $el)/${name/SNAPSHOT/$timestamp-$buildnumber}
           fi
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 4cbd207b..2f101e30 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -342,6 +342,8 @@ EOF
             xmlValidation="false"
             xmlNamespaceAware="false">
       </Host>
+    </Engine>
+  </Service>
 EOF
   if [[ ($install_profile_number == $PROFILE_EDITORIAL_SERVER || \
     $install_profile_number == $PROFILE_PRESENTATION_SERVER || \
@@ -376,6 +378,29 @@ EOF
       # publication the WARs belong to, we must use a scheme were it's
       # the WAR file name which determines the webapp context.
       cat >> $file <<EOF
+  <Service name="Catalina">
+    <Connector port="${default_app_server_presentation_port}"
+               protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               URIEncoding="UTF-8"
+               compression="off"
+               redirectPort="${redirect_port}"
+    />
+    <Connector port="${redirect_port}"
+               protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               URIEncoding="UTF-8"
+               proxyPort="443"
+               scheme="https"
+    />
+    <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
+      <Valve className="org.apache.catalina.valves.AccessLogValve"
+             prefix="access."
+             suffix=".log"
+             pattern="common"/>
+      <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+             digest="md5"
+             resourceName="UserDatabase"/>
       <Host
         name="${domain}"
         appBase="$(get_app_base $publication_war)"
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
index 9ac99b73..ced416c8 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
@@ -156,7 +156,7 @@ function create_varnish_conf_backends() {
     cat >> $file <<EOF
 backend ${appserver_id}${i} {
   .host = "$appserver_host";
-  .port = "$appserver_port";
+  .port = "$default_app_server_presentation_port";
 }
 
 EOF
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/constants.sh b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
index ba14f6ab..db28ecde 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
@@ -30,6 +30,7 @@ default_db_schema=ece5db
 
 # app server constants
 default_app_server_port=8080
+default_app_server_presentation_port=8040
 default_app_server_shutdown=8005
 default_app_server_redirect=8443
 default_app_server_heap_size=2048

From 55692b9f3c2c6b7935d6da34403cca883a734664 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul islam <sai@vizrt.com>
Date: Wed, 4 Jun 2014 12:42:33 +0600
Subject: [PATCH 2243/2585] VOSA-108 Fixed typo

---
 usr/sbin/ece-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index ff17b4e8..265a054c 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -196,7 +196,7 @@ function download_escenic_components()
           local timestamp=$(xmlstarlet <<< "$metadata" sel -t -m /metadata/versioning/snapshot/timestamp -c 'text()')
           local buildnumber=$(xmlstarlet <<< "$metadata"  sel -t -m /metadata/versioning/snapshot/buildNumber -c 'text()')
           #Now Check the the timestamp and buildnumber is not empty. If not then create the dist name with timestamp and buildnumber. 
-          if [[ -z $timestamp && -z $buildnumber ]]; then
+          if [[ -n $timestamp && -n $buildnumber ]]; then
           log "Found SNAPSHOT with $timestamp-$buildnumber in $el"
           el=$(dirname $el)/${name/SNAPSHOT/$timestamp-$buildnumber}
           fi

From f90d132c99f471e38f7e5d090d758d19bcd9576c Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul islam <sai@vizrt.com>
Date: Wed, 4 Jun 2014 13:59:29 +0600
Subject: [PATCH 2244/2585] VOSA-128 Improved varnish configuration

---
 .../ece-scripts/ece-install.d/app-server.sh   | 46 +++++++++----------
 .../ece-scripts/ece-install.d/cache-server.sh |  2 +-
 .../ece-scripts/ece-install.d/constants.sh    |  2 +-
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 2f101e30..ca2de49f 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -344,6 +344,29 @@ EOF
       </Host>
     </Engine>
   </Service>
+    <Service name="Catalina">
+    <Connector port="${default_app_server_publication_port}"
+               protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               URIEncoding="UTF-8"
+               compression="off"
+               redirectPort="${redirect_port}"
+               />
+    <Connector port="${redirect_port}"
+               protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               URIEncoding="UTF-8"
+               proxyPort="443"
+               scheme="https"/>
+    <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
+      <Valve className="org.apache.catalina.valves.AccessLogValve"
+             prefix="access."
+             suffix=".log"
+             pattern="common"
+             />
+      <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+             digest="md5"
+             resourceName="UserDatabase"/>
 EOF
   if [[ ($install_profile_number == $PROFILE_EDITORIAL_SERVER || \
     $install_profile_number == $PROFILE_PRESENTATION_SERVER || \
@@ -378,29 +401,6 @@ EOF
       # publication the WARs belong to, we must use a scheme were it's
       # the WAR file name which determines the webapp context.
       cat >> $file <<EOF
-  <Service name="Catalina">
-    <Connector port="${default_app_server_presentation_port}"
-               protocol="HTTP/1.1"
-               connectionTimeout="20000"
-               URIEncoding="UTF-8"
-               compression="off"
-               redirectPort="${redirect_port}"
-    />
-    <Connector port="${redirect_port}"
-               protocol="HTTP/1.1"
-               connectionTimeout="20000"
-               URIEncoding="UTF-8"
-               proxyPort="443"
-               scheme="https"
-    />
-    <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
-      <Valve className="org.apache.catalina.valves.AccessLogValve"
-             prefix="access."
-             suffix=".log"
-             pattern="common"/>
-      <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
-             digest="md5"
-             resourceName="UserDatabase"/>
       <Host
         name="${domain}"
         appBase="$(get_app_base $publication_war)"
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
index ced416c8..625fc782 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
@@ -156,7 +156,7 @@ function create_varnish_conf_backends() {
     cat >> $file <<EOF
 backend ${appserver_id}${i} {
   .host = "$appserver_host";
-  .port = "$default_app_server_presentation_port";
+  .port = "$default_app_server_publication_port";
 }
 
 EOF
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/constants.sh b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
index db28ecde..4081d42c 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
@@ -30,7 +30,7 @@ default_db_schema=ece5db
 
 # app server constants
 default_app_server_port=8080
-default_app_server_presentation_port=8040
+default_app_server_publication_port=8040
 default_app_server_shutdown=8005
 default_app_server_redirect=8443
 default_app_server_heap_size=2048

From bef72b979e08acb4edc2432cfc950285a9f6e25f Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul islam <sai@vizrt.com>
Date: Wed, 4 Jun 2014 16:32:10 +0600
Subject: [PATCH 2245/2585] VOSA-128: Fixed redirect configuration.

---
 .../ece-scripts/ece-install.d/app-server.sh   | 19 ++++++++++---------
 .../ece-scripts/ece-install.d/constants.sh    |  1 +
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index ca2de49f..c3be7e23 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -342,17 +342,23 @@ EOF
             xmlValidation="false"
             xmlNamespaceAware="false">
       </Host>
-    </Engine>
+EOF
+  if [[ ($install_profile_number == $PROFILE_EDITORIAL_SERVER || \
+    $install_profile_number == $PROFILE_PRESENTATION_SERVER || \
+    $install_profile_number == $PROFILE_ALL_IN_ONE) && \
+    -n "$fai_publication_domain_mapping_list" ]]; then
+    cat >> $tomcat_base/conf/server.xml <<EOF
+        </Engine>
   </Service>
-    <Service name="Catalina">
+  <Service name="Catalina">
     <Connector port="${default_app_server_publication_port}"
                protocol="HTTP/1.1"
                connectionTimeout="20000"
                URIEncoding="UTF-8"
                compression="off"
-               redirectPort="${redirect_port}"
+               redirectPort="${default_app_server_publication_redirect}"
                />
-    <Connector port="${redirect_port}"
+    <Connector port="${default_app_server_publication_redirect}"
                protocol="HTTP/1.1"
                connectionTimeout="20000"
                URIEncoding="UTF-8"
@@ -368,11 +374,6 @@ EOF
              digest="md5"
              resourceName="UserDatabase"/>
 EOF
-  if [[ ($install_profile_number == $PROFILE_EDITORIAL_SERVER || \
-    $install_profile_number == $PROFILE_PRESENTATION_SERVER || \
-    $install_profile_number == $PROFILE_ALL_IN_ONE) && \
-    -n "$fai_publication_domain_mapping_list" ]]; then
-
     for el in ${fai_publication_domain_mapping_list}; do
       local old_ifs=$IFS
       # the entries in the fai_publication_domain_mapping_list are on
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/constants.sh b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
index 4081d42c..7d31b85f 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
@@ -31,6 +31,7 @@ default_db_schema=ece5db
 # app server constants
 default_app_server_port=8080
 default_app_server_publication_port=8040
+default_app_server_publication_redirect=8444
 default_app_server_shutdown=8005
 default_app_server_redirect=8443
 default_app_server_heap_size=2048

From ed8dd7196e7cb214d4553228928bf1dd7b8f427e Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul islam <sai@vizrt.com>
Date: Thu, 5 Jun 2014 21:01:27 +0600
Subject: [PATCH 2246/2585] VOSA-128: Removed https scheme from publicatoin
 connectors

---
 usr/share/escenic/ece-scripts/ece-install.d/app-server.sh | 7 -------
 usr/share/escenic/ece-scripts/ece-install.d/constants.sh  | 1 -
 2 files changed, 8 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index c3be7e23..7824341f 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -356,14 +356,7 @@ EOF
                connectionTimeout="20000"
                URIEncoding="UTF-8"
                compression="off"
-               redirectPort="${default_app_server_publication_redirect}"
                />
-    <Connector port="${default_app_server_publication_redirect}"
-               protocol="HTTP/1.1"
-               connectionTimeout="20000"
-               URIEncoding="UTF-8"
-               proxyPort="443"
-               scheme="https"/>
     <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
       <Valve className="org.apache.catalina.valves.AccessLogValve"
              prefix="access."
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/constants.sh b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
index 7d31b85f..4081d42c 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/constants.sh
@@ -31,7 +31,6 @@ default_db_schema=ece5db
 # app server constants
 default_app_server_port=8080
 default_app_server_publication_port=8040
-default_app_server_publication_redirect=8444
 default_app_server_shutdown=8005
 default_app_server_redirect=8443
 default_app_server_heap_size=2048

From cb887ffd61a6743e52a568295677c7f231ad6c29 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul islam <sai@vizrt.com>
Date: Fri, 6 Jun 2014 14:47:55 +0600
Subject: [PATCH 2247/2585] VOSA-128 Added redirectport to publication
 connector

---
 usr/share/escenic/ece-scripts/ece-install.d/app-server.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 7824341f..7ed57519 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -356,6 +356,7 @@ EOF
                connectionTimeout="20000"
                URIEncoding="UTF-8"
                compression="off"
+               redirectPort="${redirect_port}"
                />
     <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
       <Valve className="org.apache.catalina.valves.AccessLogValve"

From 7aba83f8147c03948ce1ff1f2704d7e3aa9bc971 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul islam <sai@vizrt.com>
Date: Tue, 24 Jun 2014 21:31:18 +0600
Subject: [PATCH 2248/2585] VOSA-133 Fixed failed download of
 java_memcached-release_2.5.3.jar from github by using curl instead of wget

---
 usr/share/escenic/ece-scripts/common-io.sh    | 28 +++++++++++++++++++
 .../ece-scripts/ece-install.d/memory-cache.sh |  2 +-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/common-io.sh b/usr/share/escenic/ece-scripts/common-io.sh
index 4acc6363..a0cf4ae8 100644
--- a/usr/share/escenic/ece-scripts/common-io.sh
+++ b/usr/share/escenic/ece-scripts/common-io.sh
@@ -160,6 +160,34 @@ function download_uri_target_to_dir() {
   fi
 }
 
+### curl_download_uri_target_to_dir
+## Returns the local, downloaded file with absolute path.
+##
+## $1 :: http://server/file or
+##       https://file. The $1 should only be a http/https url
+## $2 :: the target dir
+## $3 :: the target filename. If left empty, the bassename of $1 is used
+function curl_download_uri_target_to_dir() {
+  local uri=$1
+  local target_dir=$2
+  local target_file=$3
+  make_dir $target_dir
+
+  if [[ $uri == "http://"* || $uri == "https://"* ]]; then
+
+    if [ -z $target_file ] ; then
+      target_file=$(basename $uri)
+    fi
+    
+    log "Downloading" $uri "to" $target_dir "..."
+    run cd $target_dir
+    run curl \
+      -L \
+      --o "$target_file" \
+      $uri
+  fi
+}
+
 ### verify_that_archive_is_ok
 ## Will verify that the archive passed to the function is ok. If it's
 ## not, the function will terminate the calling script, exiting in
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh b/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
index f0cb0cdb..47eeec1a 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
@@ -14,7 +14,7 @@ function install_memory_cache()
   assert_commands_available memcached
 
   print_and_log "Downloading the memcached java library ..."
-  download_uri_target_to_dir $memcached_java_lib_url $download_dir
+  curl_download_uri_target_to_dir $memcached_java_lib_url $download_dir
 
   make_dir ${escenic_root_dir}/assemblytool/lib
   run cp $(basename $memcached_java_lib_url) ${escenic_root_dir}/assemblytool/lib

From 2a5abe987a3ee7111f600951531b03b0c4f4eb0c Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Tue, 28 Oct 2014 17:54:38 +0600
Subject: [PATCH 2249/2585] VOSA-153: Added ece-local-builder in the debian
 package

---
 usr/share/escenic/package-scripts/create-packages | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index e83f69e8..56ff2f87 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -119,6 +119,7 @@ function set_up_escenic-build-scripts() {
   make_dir $target_dir/usr/bin
   run cp ../build-scripts/ece-build $target_dir/usr/bin/ece-build
   run cp ../build-scripts/ece-builder $target_dir/usr/bin/ece-builder
+  run cp ../build-scripts/ece-local-builder $target_dir/usr/bin/ece-local-builder
   run cp ../build-scripts/ece-build-guide $target_dir/usr/bin/ece-build-guide
 }
 

From 711c0a6634b4d8ac3b7b54767fecae652a8e9e33 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Wed, 29 Oct 2014 09:52:09 +0600
Subject: [PATCH 2250/2585] VOSA-155: Made ear download base url configurable

---
 usr/share/escenic/build-scripts/ece-build | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 28267145..801d984b 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -17,7 +17,7 @@ maven_build_offline=0
 maven_opts="-U clean install"
 skip_ear=0
 project_pom_versions=""
-
+ear_base_url=http://builder.vizrtsaas.com
 # standard java locations
 #TODO:take java home location dynamically
 java_6_sun=/usr/lib/jvm/java-6-sun
@@ -1302,11 +1302,11 @@ EOF
   else
     print_and_log "--- .deb configuration packages ---"  
     for machine in $machine_list; do 
-      print_and_log "http://builder.vizrtsaas.com/$customer/releases/vosa-conf-${machine}-${package_version}.deb"
+      print_and_log "$ear_base_url/$customer/releases/vosa-conf-${machine}-${package_version}.deb"
     done
     print_and_log "--- .rpm configuration packages ---"
     for machine in $machine_list; do
-      print_and_log "http://builder.vizrtsaas.com/$customer/releases/vosa-conf-${machine}-1_${customer}_${release_label}-r${revision}.noarch.rpm"
+      print_and_log "$ear_base_url/$customer/releases/vosa-conf-${machine}-1_${customer}_${release_label}-r${revision}.noarch.rpm"
     done
   fi
 }
@@ -1429,7 +1429,7 @@ function print_result
   if [ $skip_ear -eq 1 ]; then
     print_and_log "Only configuration packages has been created in this release!"
   else
-    print_and_log "You'll find the release here: http://builder.vizrtsaas.com/$customer/releases/$resulting_ear"
+    print_and_log "You'll find the release here: $ear_base_url/$customer/releases/$resulting_ear"
   fi
 }
 

From 297184dbc14569765a8298d7e05646aebd8c70ac Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Wed, 29 Oct 2014 09:58:41 +0600
Subject: [PATCH 2251/2585] VOSA-155: Added custom ear base url to local build
 script

---
 usr/share/escenic/build-scripts/ece-local-builder | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-local-builder b/usr/share/escenic/build-scripts/ece-local-builder
index 82905646..2a8f192e 100755
--- a/usr/share/escenic/build-scripts/ece-local-builder
+++ b/usr/share/escenic/build-scripts/ece-local-builder
@@ -586,7 +586,8 @@ function add_customer
 src_control=git
 git_user=$git_user
 git_protocol=$git_protocol
-git_base=$git_base" > /home/$1/.build/build.conf
+git_base=$git_base
+ear_base_url=$ear_base_url/$1" > /home/$1/.build/build.conf
   run chown $1:$1 /home/$1/.build/build.conf
   run rsync -av $skel_dir/ /home/$1
   run sed -i "s/maven.username/$user_maven_username/" /home/$1/.m2/settings.xml
@@ -604,13 +605,13 @@ git_base=$git_base" > /home/$1/.build/build.conf
     print_and_log "Failed to add symlink for /var/www/$1/releases"
     remove_pid_and_exit_in_error
   fi
-  setup_nginx $1
+  setup_nginx $1 $2
 }
 
 function setup_nginx
 {
   if [ ! -e /etc/nginx/default-site/$1.conf ]; then
-    echo "location /$1/ {
+    echo "location /$1/$2/releases/ {
         alias /var/www/$1/releases/;
         expires modified +310s;
 }" > /etc/nginx/default-site/$1.conf

From 1158ad7976de56e81cee99399827bca6146b0218 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Thu, 30 Oct 2014 16:07:45 +0600
Subject: [PATCH 2252/2585] VOSA-155:Added false for ece-build support with
 local changes

---
 usr/share/escenic/build-scripts/ece-local-builder | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/ece-local-builder b/usr/share/escenic/build-scripts/ece-local-builder
index 2a8f192e..15ba3d6b 100755
--- a/usr/share/escenic/build-scripts/ece-local-builder
+++ b/usr/share/escenic/build-scripts/ece-local-builder
@@ -587,7 +587,8 @@ src_control=git
 git_user=$git_user
 git_protocol=$git_protocol
 git_base=$git_base
-ear_base_url=$ear_base_url/$1" > /home/$1/.build/build.conf
+ear_base_url=$ear_base_url/$1
+local_mode=true" > /home/$1/.build/build.conf
   run chown $1:$1 /home/$1/.build/build.conf
   run rsync -av $skel_dir/ /home/$1
   run sed -i "s/maven.username/$user_maven_username/" /home/$1/.m2/settings.xml

From 68df3971b29151e91c9aaa080c4b4853c5852cfe Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Thu, 30 Oct 2014 16:13:17 +0600
Subject: [PATCH 2253/2585] VOSA-155: Changed ece-build to build ear with local
 changes, also added options to update and clean local repo

---
 usr/share/escenic/build-scripts/ece-build | 74 ++++++++++++++++-------
 1 file changed, 52 insertions(+), 22 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 801d984b..64c30036 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -7,7 +7,7 @@
 ################################################################################
 
 # common variables
-ece_scripts_version="straight-from-github"
+ece_scripts_version=1.0-2014-10-29-lean-1072
 ece_scripts_home=/usr/share/escenic/ece-scripts
 log=~/ece-build.log
 
@@ -16,8 +16,12 @@ build_date=`date +%F_%H%M`
 maven_build_offline=0
 maven_opts="-U clean install"
 skip_ear=0
+clean_repo=0
+update_repo=0
 project_pom_versions=""
 ear_base_url=http://builder.vizrtsaas.com
+#Mode to use keep git local changes
+local_mode=false
 # standard java locations
 #TODO:take java home location dynamically
 java_6_sun=/usr/lib/jvm/java-6-sun
@@ -347,7 +351,7 @@ function verify_java
 ##
 function get_user_options
 {
-  while getopts ":b:t:osV" opt; do
+  while getopts ":b:t:oscuV" opt; do
     case $opt in
       b)
         svn_path=branches/${OPTARG}
@@ -363,9 +367,13 @@ function get_user_options
         maven_opts="-o $maven_opts"
         print_and_log "Maven offline mode in effect!"
         ;;
-      s)
-        skip_ear=1
-        print_and_log "Skip .ear mode in effect!"
+      c)
+        clean_repo=1
+        print_and_log "Git repository clean up mode in effect!"
+        ;;
+      u)
+        update_repo=1
+        print_and_log "Git repository update  mode in effect!"
         ;;
       V)
         echo "Version:" $ece_scripts_version
@@ -483,8 +491,6 @@ function clean_customer_home
   # drop and recreate project src directory if it exists
   if [ -d "$project_src_dir" ]; then
     run_wrapper rm -rf $project_src_dir
-  else
-    make_dir $project_src_dir
   fi
 }
 
@@ -564,26 +570,28 @@ function git_checkout
     make_dir $project_src_master_dir
     run_wrapper git clone $git_repo_uri $project_src_master_dir
   fi
-    
   cd $project_src_master_dir
+  if [ $local_mode == false ]; then
+  clean_up
   run_wrapper git checkout master
-  run_wrapper git clean -d -x -f
   run_wrapper git remote update
-  run_wrapper git fetch
-  if [[ "$git_path" != "" ]]; then
-    git show-ref --quiet --verify "refs/heads/$branch_name"
-    if [ $? = 0 ]; then
-      run_wrapper git checkout $branch_name
-    else
-      run_wrapper git checkout -b $branch_name origin/$branch_name  
-    fi
-  fi
-  run_wrapper git pull --rebase
-  run_wrapper git clean -d -x -f
-  
+  udpate_repository
+  clean_up
   # git checkout
   run_wrapper git clone $git_path $project_src_master_dir $project_src_dir
-
+  else
+    print_and_log "Switching to local mode. You can use -u to update and -c to clean your local git repo"
+    if [ $clean_repo -eq 1 ]; then
+      clean_up
+    fi
+    if [ $update_repo -eq 1 ]; then
+      if [[ "$git_path" == "" ]]; then
+        run_wrapper git checkout master
+      fi
+      udpate_repository
+    fi 
+    run_wrapper cp -rf $project_src_master_dir $project_src_dir
+ fi
   cd $project_src_dir
   revision=`git describe --always`
   if [[ $revision = "" ]]; then
@@ -595,6 +603,28 @@ function git_checkout
     git_path="-b master"
   fi
 }
+## Git update repository 
+function udpate_repository
+{
+  run_wrapper git fetch
+  if [[ "$git_path" != "" ]]; then
+    git show-ref --quiet --verify "refs/heads/$branch_name"
+    if [ $? = 0 ]; then
+      run_wrapper git checkout $branch_name
+    else
+      run_wrapper git checkout -b $branch_name origin/$branch_name
+    fi
+  fi
+  run_wrapper git pull
+}
+
+
+## Git local repository clean up
+function clean_up
+{
+  run_wrapper git clean -d -x -f
+  run_wrapper git checkout * 
+}
 
 ##
 function project_verify_assembly

From 816a04baf8c0e15f5b80b4d66071f470eceb42af Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Wed, 5 Nov 2014 18:04:06 +0600
Subject: [PATCH 2254/2585] VOSA-155: Allowed branch switching gracefully if it
 running in local mode

---
 usr/share/escenic/build-scripts/ece-build | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 64c30036..c3c79ae2 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -7,7 +7,7 @@
 ################################################################################
 
 # common variables
-ece_scripts_version=1.0-2014-10-29-lean-1072
+ece_scripts_version=1.0-2014-10-30-lean-1074
 ece_scripts_home=/usr/share/escenic/ece-scripts
 log=~/ece-build.log
 
@@ -584,10 +584,12 @@ function git_checkout
     if [ $clean_repo -eq 1 ]; then
       clean_up
     fi
+    if [[ "$git_path" == "" ]]; then
+        branch_name=master
+        git_path="-b master"
+    fi
+    checkout_repo
     if [ $update_repo -eq 1 ]; then
-      if [[ "$git_path" == "" ]]; then
-        run_wrapper git checkout master
-      fi
       udpate_repository
     fi 
     run_wrapper cp -rf $project_src_master_dir $project_src_dir
@@ -607,6 +609,12 @@ function git_checkout
 function udpate_repository
 {
   run_wrapper git fetch
+  checkout_repo
+  run_wrapper git pull
+}
+
+function checkout_repo
+{
   if [[ "$git_path" != "" ]]; then
     git show-ref --quiet --verify "refs/heads/$branch_name"
     if [ $? = 0 ]; then
@@ -615,7 +623,6 @@ function udpate_repository
       run_wrapper git checkout -b $branch_name origin/$branch_name
     fi
   fi
-  run_wrapper git pull
 }
 
 

From 75fb75f631d98bce8820966d296e89b033291986 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Fri, 7 Nov 2014 10:38:36 +0600
Subject: [PATCH 2255/2585] VOSA-155: Included remote update before fetching
 and checking out a branch

---
 usr/share/escenic/build-scripts/ece-build | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index c3c79ae2..444ca833 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -7,7 +7,7 @@
 ################################################################################
 
 # common variables
-ece_scripts_version=1.0-2014-10-30-lean-1074
+ece_scripts_version="straight-from-github"
 ece_scripts_home=/usr/share/escenic/ece-scripts
 log=~/ece-build.log
 
@@ -574,7 +574,6 @@ function git_checkout
   if [ $local_mode == false ]; then
   clean_up
   run_wrapper git checkout master
-  run_wrapper git remote update
   udpate_repository
   clean_up
   # git checkout
@@ -588,10 +587,10 @@ function git_checkout
         branch_name=master
         git_path="-b master"
     fi
-    checkout_repo
     if [ $update_repo -eq 1 ]; then
       udpate_repository
-    fi 
+    fi
+    checkout_repo 
     run_wrapper cp -rf $project_src_master_dir $project_src_dir
  fi
   cd $project_src_dir
@@ -608,6 +607,7 @@ function git_checkout
 ## Git update repository 
 function udpate_repository
 {
+  run_wrapper git remote update
   run_wrapper git fetch
   checkout_repo
   run_wrapper git pull

From 380e133e412d141620cd1f376830fb4422bd9c8b Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Wed, 19 Nov 2014 14:10:05 +0600
Subject: [PATCH 2256/2585] VOSA-158: Added indexer-webapp-presentation context
 and used multicore solr in Environment for search.

---
 .../ece-scripts/ece-install.d/app-server.sh   | 33 +++++++++++++------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 7ed57519..edb6d66d 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -462,44 +462,57 @@ EOF
     xmlstarlet ed -P -L \
        -s /Context -t elem -n TMP -v '' \
        -i //TMP -t attr -n name -v escenic/solr-base-uri \
-       -i //TMP -t attr -n value -v http://${search_host}:${search_port}/solr/ \
+       -i //TMP -t attr -n value -v http://${search_host}:${search_port}/solr/collection1 \
        -i //TMP -t attr -n type -v java.lang.String \
        -i //TMP -t attr -n override -v false \
        -r //TMP -v Environment \
        $tomcat_base/conf/context.xml
-
   fi
 
   if [ $install_profile_number -eq $PROFILE_SEARCH_SERVER -o \
-    $install_profile_number -eq $PROFILE_ALL_IN_ONE ]; then
+       $install_profile_number -eq $PROFILE_ALL_IN_ONE ]; then
 
-    xmlstarlet ed -P -L \
+     xmlstarlet ed -P -L \
        -s /Context -t elem -n TMP -v '' \
        -i /Context/TMP -t attr -n name -v escenic/indexer-webservice \
        -i /Context/TMP -t attr -n value -v ""${indexer_ws_uri} \
        -i /Context/TMP -t attr -n type -v java.lang.String \
-       -i /Context/TMP -t attr -n override -v false \
+       -i /Context/TMP -t attr -n override -v true \
        -r //TMP -v Environment \
        -s /Context -t elem -n TMP -v '' \
        -i /Context/TMP -t attr -n name -v escenic/index-update-uri \
-       -i /Context/TMP -t attr -n value -v http://${search_host}:${search_port}/solr/update/ \
+       -i /Context/TMP -t attr -n value -v http://${search_host}:${search_port}/solr/collection1/update/ \
        -i /Context/TMP -t attr -n type -v java.lang.String \
-       -i /Context/TMP -t attr -n override -v false \
+       -i /Context/TMP -t attr -n override -v true \
        -r //TMP -v Environment \
        -s /Context -t elem -n TMP -v '' \
        -i /Context/TMP -t attr -n name -v escenic/head-tail-storage-file \
        -i /Context/TMP -t attr -n value -v $escenic_data_dir/engine/head-tail.index \
        -i /Context/TMP -t attr -n type -v java.lang.String \
-       -i /Context/TMP -t attr -n override -v false \
+       -i /Context/TMP -t attr -n override -v true \
        -r //TMP -v Environment \
        -s /Context -t elem -n TMP -v '' \
        -i /Context/TMP -t attr -n name -v escenic/failing-documents-storage-file \
        -i /Context/TMP -t attr -n value -v $escenic_data_dir/engine/failures.index \
        -i /Context/TMP -t attr -n type -v java.lang.String \
-       -i /Context/TMP -t attr -n override -v false \
+       -i /Context/TMP -t attr -n override -v true \
        -r //TMP -v Environment \
        $tomcat_base/conf/context.xml
-
+   print_and_log "Finished adding solr configuration for search"
+   print_and_log "Started adding context configuration for indexer-webapp-presentation"
+ 
+     mkdir -p $tomcat_base/conf/Catalina/localhost/
+
+     cat >> $tomcat_base/conf/Catalina/localhost/indexer-webapp-presentation.xml <<EOF
+    <Context docBase="$\\{catalina.base}/webapps/indexer-webapp">
+      <Environment name="escenic/solr-base-uri" value="http://${search_host}:${search_port}/solr/presentation/" type="java.lang.String" override="true"/>
+      <Environment name="escenic/indexer-webservice" value="${indexer_ws_uri}" type="java.lang.String" override="true"/>
+      <Environment name="escenic/index-update-uri" value="http://${search_host}:${search_port}/solr/presentation/update/" type="java.lang.String" override="true"/>
+      <Environment name="escenic/head-tail-storage-file" value=" $escenic_data_dir/engine/head-tail-presentation.index" type="java.lang.String" override="true"/>
+      <Environment name="escenic/failing-documents-storage-file" value=" $escenic_data_dir/engine/failures-presentation.index" type="java.lang.String" override="true"/>
+   </Context>
+EOF
+   print_and_log "Finished adding context for indexer-webapp-presentation"
 
   elif [ $install_profile_number -eq $PROFILE_ANALYSIS_SERVER ]; then
     xmlstarlet ed -P -L \

From 6babbd43f42304212e4e479e989f4e2fc29fa08e Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Wed, 19 Nov 2014 14:15:58 +0600
Subject: [PATCH 2257/2585] VOSA-158: Added multicore solr setup in search1
 instance

---
 .../ece-install.d/search-server.sh            | 82 ++++++++++++++++++-
 1 file changed, 80 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
index 9eb366d8..719731e8 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
@@ -5,11 +5,90 @@ function install_search_server() {
   type=search
   install_ece_instance "search1" 0
   
-  set_up_solr
+  multicore_solr_setup 
   assemble_deploy_and_restart_type
   leave_search_server_trail
 }
 
+function multicore_solr_setup(){
+  run_hook set_up_solr.preinst
+
+  print_and_log "Setting up  Multicore Solr ..."
+  if [ ! -d $escenic_conf_dir/solr ]; then
+    if [ $(is_using_conf_archive) -eq 1 ]; then
+      print_and_log "Using the supplied Solr configuration from" \
+        "bundle: $ece_instance_conf_archive"
+
+      # the conf archive typically resides on the build server, hence
+      # we set its authentication credentials here.
+      wget_auth=$wget_builder_auth
+      print_and_log "ece_instance_conf_archive value is : $ece_instance_conf_archive"
+      local a_tmp_dir=$(mktemp -d)
+      download_uri_target_to_dir \
+        $ece_instance_conf_archive \
+        $a_tmp_dir
+      local file=$a_tmp_dir/$(basename $ece_instance_conf_archive)
+
+      run cd $a_tmp_dir
+      run tar xzf $(basename $ece_instance_conf_archive) engine/solr/conf
+      run cp -r engine/solr/conf $escenic_conf_dir/solr
+
+      run rm -r $a_tmp_dir
+    else
+      print_and_log "Installing default Solr conf shipped with ECE ..."
+      run cp -r $escenic_root_dir/engine/solr/conf $escenic_conf_dir/solr
+      
+      # ECE 5.6 has one additional configuration file!
+      if [ -e $escenic_root_dir/engine/solr/solr.xml ]; then
+        run cp -r $escenic_root_dir/engine/solr/solr.xml $escenic_conf_dir/. 
+      fi
+    fi
+  else
+    print_and_log "$escenic_conf_dir/solr already exists, not touching it."
+  fi
+
+  make_dir $escenic_data_dir/solr/
+  run cd $escenic_data_dir/solr/
+  if  [ ! -h conf ]; then
+    run ln -s $escenic_conf_dir/solr conf
+  fi
+  # ECE 5.6 has one additional configuration file!
+  if  [ ! -h solr.xml ]; then
+    if [ -e $escenic_conf_dir/solr.xml ]; then
+      run ln -s $escenic_conf_dir/solr.xml solr.xml
+    fi
+  fi
+
+  run xmlstarlet ed -L -s //solr/cores -t elem -n CoreTMP -v "" \
+    -i //CoreTMP -t attr -n "name" -v "presentation" \
+    -i //CoreTMP -t attr -n "instanceDir" -v "presentation" \
+    -r //CoreTMP -v core \
+    solr.xml
+  
+  print_and_log "Added presentation solr core configuration directroy"  
+
+  make_dir presentation/conf
+  make_dir presentation/data/index
+  chown -R escenic:escenic presentation/data/
+  run cp -r $escenic_conf_dir/solr/*  presentation/conf/
+
+  run xmlstarlet ed -L -s //config -t elem -n DataTMP -v "$escenic_data_dir/solr/presentation/data" \
+       -r //DataTMP -v dataDir \
+   $escenic_data_dir/solr/presentation/conf/solrconfig.xml
+  print_and_log "Finished adding configuration for multicore solr"
+  
+  local editorial_search_instance=${fai_search_for_editor-0}
+  local file=$escenic_conf_dir/solr/solrconfig.xml
+  if [ $editorial_search_instance -eq 1 ]; then
+    run sed -i "s#<maxTime>[0-9]*</maxTime>#<maxTime>5000</maxTime>#g" $file
+  else
+    run sed -i "s#<maxTime>[0-9]*</maxTime>#<maxTime>60000</maxTime>#g" $file
+  fi
+
+  run_hook set_up_solr.postinst
+
+}
+
 function set_up_solr() {
   run_hook set_up_solr.preinst
   
@@ -22,7 +101,6 @@ function set_up_solr() {
       # the conf archive typically resides on the build server, hence
       # we set its authentication credentials here.
       wget_auth=$wget_builder_auth
-    
       local a_tmp_dir=$(mktemp -d)
       download_uri_target_to_dir \
         $ece_instance_conf_archive \

From 5065e8bd3463207b48d7e00e465cb7dd230c3c5c Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Wed, 19 Nov 2014 14:18:29 +0600
Subject: [PATCH 2258/2585] VOSA-158: Make a copy of indexer-webapp for
 presentation indexer in search1 instance

---
 usr/share/escenic/ece-scripts/ece.d/deploy.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece.d/deploy.sh b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
index efb444fc..fb9096f4 100644
--- a/usr/share/escenic/ece-scripts/ece.d/deploy.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
@@ -172,6 +172,11 @@ function deploy() {
           add_memcached_support $tomcat_base/$app_base/$name
         fi
       done
+      print_and_log "Found instance type : $type"
+      if [ $type == "search" ]; then
+        print_and_log "Type search coping indexer-webapp to indexer-webapp-presenation "
+	run cp -r $tomcat_base/webapps/indexer-webapp $tomcat_base/webapps/indexer-webapp-presentation
+      fi
       ;;
     
     resin)

From 127c15b3a0df277fa04acda5708fa52df33bed1f Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Wed, 19 Nov 2014 14:24:44 +0600
Subject: [PATCH 2259/2585] VOSA-158: Used multicore setup for all in one
 installation

---
 usr/sbin/ece-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index c5a11984..7bcf3deb 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -815,7 +815,7 @@ function install_all_in_one_environment()
     install_ece_instance $default_ece_intance_name 0
     install_cache_server
     install_web_server 2
-    set_up_solr
+    multicore_solr_setup
 
     install_widget_framework
     create_publication

From 1094fdcdd518d2ec635da208488ac80134aa1fb5 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Tue, 25 Nov 2014 17:14:54 +0600
Subject: [PATCH 2260/2585] VOSA-158: Used symlinked instead of copying for
 presentation indexer

---
 usr/share/escenic/ece-scripts/ece.d/deploy.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/deploy.sh b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
index fb9096f4..f74c022a 100644
--- a/usr/share/escenic/ece-scripts/ece.d/deploy.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
@@ -172,10 +172,13 @@ function deploy() {
           add_memcached_support $tomcat_base/$app_base/$name
         fi
       done
-      print_and_log "Found instance type : $type"
       if [ $type == "search" ]; then
-        print_and_log "Type search coping indexer-webapp to indexer-webapp-presenation "
-	run cp -r $tomcat_base/webapps/indexer-webapp $tomcat_base/webapps/indexer-webapp-presentation
+         if [[ -L $tomcat_base/$app_base/indexer-webapp-presentation && -d $tomcat_base/$app_base/indexer-webapp-presentation ]]; then
+            print_and_log "Found $tomcat_base/$app_base/indexer-webapp-presentation so deleting it"
+            rm -rf $tomcat_base/$app_base/indexer-webapp-presentation
+         fi
+        run cd $tomcat_base/$app_base/
+        run ln -s indexer-webapp $tomcat_base/$app_base/indexer-webapp-presentation
       fi
       ;;
     

From 81eaf22fb6229afcccd7677258e98a06bbe2d2a9 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Tue, 25 Nov 2014 17:22:17 +0600
Subject: [PATCH 2261/2585] VOSA-147: Configured seo plugin as special one

---
 .../ece-install.d/special-plugins.sh          | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 usr/share/escenic/ece-scripts/ece-install.d/special-plugins.sh

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/special-plugins.sh b/usr/share/escenic/ece-scripts/ece-install.d/special-plugins.sh
new file mode 100644
index 00000000..ecbabadf
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece-install.d/special-plugins.sh
@@ -0,0 +1,29 @@
+# this script is repsonsible for configuring the special plugins like seo, mobile-studio
+
+function configure_seo(){
+    if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER -a \
+    $install_profile_number -ne $PROFILE_SEARCH_SERVER ]; then
+    print_and_log "Configuring seo plugin ..."
+    xmlstarlet ed -P -L \
+       -s /Context -t elem -n TMP -v '' \
+       -i //TMP -t attr -n name -v escenic/solr-base-uri \
+       -i //TMP -t attr -n value -v http://${search_host}:${search_port}/solr/collection1 \
+       -i //TMP -t attr -n type -v java.lang.String \
+       -i //TMP -t attr -n override -v false \
+       -r //TMP -v Environment \
+       $tomcat_base/conf/context.xml
+   fi
+}
+
+
+function configure_special_plugins(){
+  print_and_log "Checking for special plugins ..."
+  if [[ $type == "engine" && -e $escenic_conf_dir/ece-$instance_name.conf ]]; then
+     source $escenic_conf_dir/ece-$instance_name.conf
+     print_and_log "Found tomcat base : $tomcat_base"
+  
+     if [[ "$ear_download_list" =~ "seo-" ]]; then
+        configure_seo
+     fi
+  fi
+}

From 0ed1bcac9fcd2ec00e4414aa900f3e84b3af63fb Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Tue, 25 Nov 2014 17:55:09 +0600
Subject: [PATCH 2262/2585] VOSA-147: Used configure_special_plugins method
 while creating ece instances

---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index bf73c75a..90b6f7f1 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -128,6 +128,7 @@ function install_ece_instance() {
     set_up_content_engine_cron_jobs
     install_memory_cache
     assemble_deploy_and_restart_type
+    configure_special_plugins
   fi
 
   update_type_instances_to_start_up

From 5756369241a84de5a836831e76270419c4a3ab20 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Tue, 25 Nov 2014 17:58:24 +0600
Subject: [PATCH 2263/2585] VOSA-148: Created symlink of webservice as
 mobile-webservice

---
 .../ece-scripts/ece-install.d/special-plugins.sh       | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/special-plugins.sh b/usr/share/escenic/ece-scripts/ece-install.d/special-plugins.sh
index ecbabadf..38acd483 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/special-plugins.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/special-plugins.sh
@@ -15,6 +15,13 @@ function configure_seo(){
    fi
 }
 
+function configure_mobile_studio(){
+  print_and_log "Configuring mobile-studio ..."
+  if [ -d $tomcat_base/webapps/engine-webservice ]; then
+     cd $tomcat_base/webapps/
+     ln -s webservice $tomcat_base/webapps/mobile-webservice
+  fi
+}
 
 function configure_special_plugins(){
   print_and_log "Checking for special plugins ..."
@@ -25,5 +32,8 @@ function configure_special_plugins(){
      if [[ "$ear_download_list" =~ "seo-" ]]; then
         configure_seo
      fi
+     if [[ "$ear_download_list" =~ "mobile-studio-" ]]; then
+        configure_mobile_studio
+     fi
   fi
 }

From ebc1294f35e812980bce6ca3a081294ea15260c0 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Tue, 25 Nov 2014 23:51:03 +0600
Subject: [PATCH 2264/2585] VOSA-148: Checked for webservice instead of
 engine-webservice

---
 .../escenic/ece-scripts/ece-install.d/special-plugins.sh      | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/special-plugins.sh b/usr/share/escenic/ece-scripts/ece-install.d/special-plugins.sh
index 38acd483..63a06f44 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/special-plugins.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/special-plugins.sh
@@ -17,7 +17,7 @@ function configure_seo(){
 
 function configure_mobile_studio(){
   print_and_log "Configuring mobile-studio ..."
-  if [ -d $tomcat_base/webapps/engine-webservice ]; then
+  if [ -d $tomcat_base/webapps/webservice ]; then
      cd $tomcat_base/webapps/
      ln -s webservice $tomcat_base/webapps/mobile-webservice
   fi
@@ -27,8 +27,6 @@ function configure_special_plugins(){
   print_and_log "Checking for special plugins ..."
   if [[ $type == "engine" && -e $escenic_conf_dir/ece-$instance_name.conf ]]; then
      source $escenic_conf_dir/ece-$instance_name.conf
-     print_and_log "Found tomcat base : $tomcat_base"
-  
      if [[ "$ear_download_list" =~ "seo-" ]]; then
         configure_seo
      fi

From 58802f3e6ed9415cfd2de07f4da290945c2b6009 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Wed, 26 Nov 2014 12:07:18 +0600
Subject: [PATCH 2265/2585] VOSA-147: Fixed tomcat environment variable for seo

---
 .../escenic/ece-scripts/ece-install.d/special-plugins.sh      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/special-plugins.sh b/usr/share/escenic/ece-scripts/ece-install.d/special-plugins.sh
index 63a06f44..1262f219 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/special-plugins.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/special-plugins.sh
@@ -6,8 +6,8 @@ function configure_seo(){
     print_and_log "Configuring seo plugin ..."
     xmlstarlet ed -P -L \
        -s /Context -t elem -n TMP -v '' \
-       -i //TMP -t attr -n name -v escenic/solr-base-uri \
-       -i //TMP -t attr -n value -v http://${search_host}:${search_port}/solr/collection1 \
+       -i //TMP -t attr -n name -v escenic/presentation-solr-base-uri \
+       -i //TMP -t attr -n value -v http://${search_host}:${search_port}/solr/presentation \
        -i //TMP -t attr -n type -v java.lang.String \
        -i //TMP -t attr -n override -v false \
        -r //TMP -v Environment \

From 1fab8afde96c232bb13f77696178cfe507c62f3d Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Mon, 15 Dec 2014 13:25:16 +0100
Subject: [PATCH 2266/2585] database.sh: handle percona correctly Fixed
 database.sh to not rely on the HTML source code but rather look for <a>
 elements with simple hrefs.

---
 usr/share/escenic/ece-scripts/ece-install.d/database.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 61b805b9..ff1b19ac 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -14,9 +14,9 @@ mariadb_ubuntu_gpg_key=CBCB082A1BB943DB
 function get_ubuntu_supported_list() {
   local url=$1
   curl -s $url | \
-      grep "DIR" | \
-      sed -e 's#.*href=\"\(.*\)\">.*</a>.*#\1#' -e 's#/##g' | \
-      grep -v apt
+      html2 | \
+      sed -n '/\/a\/@href=[A-Za-z0-9]*\/$/s/.*=//p' | \
+      sed -n '/\/$/s/\/$//p'
 }
 
 function get_percona_supported_list() {

From 8715f1a50b7c495dbd613c73311e9cb90bd1dc25 Mon Sep 17 00:00:00 2001
From: Erik Mogensen <mogsie@escenic.com>
Date: Mon, 15 Dec 2014 13:26:59 +0100
Subject: [PATCH 2267/2585] Back out version number

---
 usr/share/escenic/build-scripts/ece-build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 64c30036..84b0fdd9 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -7,7 +7,7 @@
 ################################################################################
 
 # common variables
-ece_scripts_version=1.0-2014-10-29-lean-1072
+ece_scripts_version="straight-from-github"
 ece_scripts_home=/usr/share/escenic/ece-scripts
 log=~/ece-build.log
 

From 1860224cf1c422ca45ed00ef6159524e1c659a92 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Wed, 17 Dec 2014 14:31:36 +0600
Subject: [PATCH 2268/2585] VOSA-158: Used presentation indexer uri for
 presentation solr from conf file or user input

---
 .../ece-scripts/ece-install.d/app-server.sh   | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index edb6d66d..64560317 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -100,7 +100,23 @@ function set_up_app_server() {
     indexer_ws_uri=http://${HOSTNAME}:${appserver_port}/indexer-webservice/index/
   fi
 
-  leave_trail "trail_indexer_ws_uri=${indexer_ws_uri}"
+  if [ $fai_enabled -eq 0 ]; then
+    print "Really sorry to bug you again with a similar question:"
+    print "What's the URI to the indexer-webservice for presentation search? (this is typically"
+    print "something like http://editor1/indexer-webservice/presentation-index/)"
+    echo -n "Your choice [http://${HOSTNAME}:${default_app_server_port}/indexer-webservice/presentation-index/]> "
+    read user_presentation_indexer_ws_uri
+  else
+    user_presentation_indexer_ws_uri=${fai_presentation_search_indexer_ws_uri}
+  fi
+
+  if [ -n "$user_presentation_indexer_ws_uri" ]; then
+    presentation_indexer_ws_uri=$user_presentation_indexer_ws_uri
+  else
+    presentation_indexer_ws_uri=http://${HOSTNAME}:${appserver_port}/indexer-webservice/presentation-index/
+  fi
+
+  leave_trail "trail_presentation_indexer_ws_uri=${presentation_indexer_ws_uri}"
 
   if [ $fai_enabled -eq 0 ]; then
     print "Last question, I promise!: Where does the search instance run?"
@@ -506,10 +522,10 @@ EOF
      cat >> $tomcat_base/conf/Catalina/localhost/indexer-webapp-presentation.xml <<EOF
     <Context docBase="$\\{catalina.base}/webapps/indexer-webapp">
       <Environment name="escenic/solr-base-uri" value="http://${search_host}:${search_port}/solr/presentation/" type="java.lang.String" override="true"/>
-      <Environment name="escenic/indexer-webservice" value="${indexer_ws_uri}" type="java.lang.String" override="true"/>
+      <Environment name="escenic/indexer-webservice" value="${presentation_indexer_ws_uri}" type="java.lang.String" override="true"/>
       <Environment name="escenic/index-update-uri" value="http://${search_host}:${search_port}/solr/presentation/update/" type="java.lang.String" override="true"/>
-      <Environment name="escenic/head-tail-storage-file" value=" $escenic_data_dir/engine/head-tail-presentation.index" type="java.lang.String" override="true"/>
-      <Environment name="escenic/failing-documents-storage-file" value=" $escenic_data_dir/engine/failures-presentation.index" type="java.lang.String" override="true"/>
+      <Environment name="escenic/head-tail-storage-file" value="$escenic_data_dir/engine/head-tail-presentation.index" type="java.lang.String" override="true"/>
+      <Environment name="escenic/failing-documents-storage-file" value="$escenic_data_dir/engine/failures-presentation.index" type="java.lang.String" override="true"/>
    </Context>
 EOF
    print_and_log "Finished adding context for indexer-webapp-presentation"

From e7b24e0e0c1a527e71c2eb6a1b2509fae63049da Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Fri, 9 Jan 2015 09:16:45 +0600
Subject: [PATCH 2269/2585] VOSA-64: Added deb configuration package
 installation functionality while installing content engine

---
 .../ece-install.d/content-engine.sh           | 48 ++++++++++++++++++-
 1 file changed, 46 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 90b6f7f1..b8492c07 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -42,7 +42,7 @@ function get_publication_short_name_list() {
   elif [ $install_profile_number -eq $PROFILE_ALL_IN_ONE ]; then
     deploy_white_list=${fai_all_deploy_white_list}
   fi
-
+	
   if [[ -z "$deploy_white_list" && \
     -n "${fai_publication_domain_mapping_list}" ]]; then
     for el in $fai_publication_domain_mapping_list; do
@@ -72,6 +72,50 @@ function get_publication_short_name_list() {
   echo ${short_name_list}
 }
 
+function deploy_conf_package() {
+  if [ -z $fai_conf_url ]; then
+     return;
+  fi
+  local conf_file_url=$fai_conf_url
+
+  if [ ! -d $escenic_cache_dir ] ; then
+    mkdir -p $escenic_cache_dir
+  fi 
+
+  print_and_log "Downloading and installing $conf_file_url ..."
+
+  if [[ -n "${fai_conf_builder_http_user}" && \
+      -n "${fai_conf_builder_http_password}" ]]; then
+      local wget_auth="
+          --http-user $fai_conf_builder_http_user
+          --http-password $fai_conf_builder_http_password
+        "
+  fi
+
+  local conf_file=$escenic_cache_dir/$(basename $conf_file_url)
+
+  if [ -s $conf_file ] ; then
+    print_and_log "Using previously downloaded EAR file $conf_file"
+  else
+    print_and_log "Downloading $conf_file_url to $conf_file"
+    run wget $wget_auth $wget_opts $conf_file_url \
+      -O $conf_file
+  fi
+
+  if [ ! -s $conf_file ] ; then
+    rm $conf_file
+    print_and_log "Unable to download EAR file $conf_file_url," \
+      "aborting."
+    remove_pid_and_exit_in_error
+  fi
+
+  print_and_log "Installing $(basename $conf_file_url) ..."
+  local dpkg_opts=" --force-overwrite  --force-confold "
+  dpkg \
+    $dpkg_opts \
+    --install $conf_file
+}
+
 ## $1=<default instance name>
 function install_ece_instance() {
   install_ece_third_party_packages
@@ -104,7 +148,7 @@ function install_ece_instance() {
     set_up_basic_nursery_configuration
     set_up_instance_specific_nursery_configuration
   fi
-
+  deploy_conf_package
   set_up_app_server
 
   # We set a WAR white list for all profiles except all in one

From bec2ee7bf65f4de2c068091c56bc2bd6b7a6896b Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Sat, 10 Jan 2015 17:44:54 +0600
Subject: [PATCH 2270/2585] VOSA-64: Added recursive (-r) option when deleting
 a directroy

---
 usr/share/escenic/ece-scripts/ece-install.d/app-server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 64560317..917d6e68 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -150,7 +150,7 @@ function set_up_app_server() {
   run tar xzf $download_dir/${tomcat_dir}.tar.gz
 
   if [ -e tomcat ]; then
-    run rm tomcat
+    run rm -r tomcat
   fi
   run ln --symbolic --force ${tomcat_dir} tomcat
 

From 8125f6f3d53a3af8b324f16e3be96fc364728596 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Mon, 12 Jan 2015 14:13:13 +0600
Subject: [PATCH 2271/2585] VOSA-64: Installed the configuration deb package
 after setting up app servers

---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index b8492c07..78f80f50 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -148,8 +148,8 @@ function install_ece_instance() {
     set_up_basic_nursery_configuration
     set_up_instance_specific_nursery_configuration
   fi
-  deploy_conf_package
   set_up_app_server
+  deploy_conf_package
 
   # We set a WAR white list for all profiles except all in one
   if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER ]; then

From 8ef996de270cc60df1e3a0df00aedd8005427ad7 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Tue, 13 Jan 2015 14:50:09 +0600
Subject: [PATCH 2272/2585] VOSA-64: Force to take the new changes and fix log
 message

---
 .../escenic/ece-scripts/ece-install.d/app-server.sh    |  2 ++
 .../ece-scripts/ece-install.d/content-engine.sh        | 10 ++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 917d6e68..1df95b34 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -160,6 +160,8 @@ function set_up_app_server() {
   if [ ! -d $tomcat_base ] ; then
     make_dir $tomcat_base
     run cp -r ${appserver_parent_dir}/${tomcat_dir}/conf $tomcat_base
+  elif [ -d $tomcat_base/conf ]; then 
+    run cp -r ${appserver_parent_dir}/${tomcat_dir}/conf/* $tomcat_base/conf/
   fi
 
   for el in bin escenic/lib lib work logs temp webapps; do
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 78f80f50..394a47e8 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -82,8 +82,6 @@ function deploy_conf_package() {
     mkdir -p $escenic_cache_dir
   fi 
 
-  print_and_log "Downloading and installing $conf_file_url ..."
-
   if [[ -n "${fai_conf_builder_http_user}" && \
       -n "${fai_conf_builder_http_password}" ]]; then
       local wget_auth="
@@ -95,7 +93,7 @@ function deploy_conf_package() {
   local conf_file=$escenic_cache_dir/$(basename $conf_file_url)
 
   if [ -s $conf_file ] ; then
-    print_and_log "Using previously downloaded EAR file $conf_file"
+    print_and_log "Using previously downloaded conf file $conf_file"
   else
     print_and_log "Downloading $conf_file_url to $conf_file"
     run wget $wget_auth $wget_opts $conf_file_url \
@@ -104,14 +102,14 @@ function deploy_conf_package() {
 
   if [ ! -s $conf_file ] ; then
     rm $conf_file
-    print_and_log "Unable to download EAR file $conf_file_url," \
+    print_and_log "Unable to download conf file $conf_file_url," \
       "aborting."
     remove_pid_and_exit_in_error
   fi
 
   print_and_log "Installing $(basename $conf_file_url) ..."
-  local dpkg_opts=" --force-overwrite  --force-confold "
-  dpkg \
+  local dpkg_opts=" --force-overwrite --force-confnew "
+  run dpkg \
     $dpkg_opts \
     --install $conf_file
 }

From 370ae38f190b172b1c8edd89c7b95c97cde5736c Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Mon, 9 Feb 2015 11:54:04 +0600
Subject: [PATCH 2273/2585] VOSA-65: Avoided overwriting existing conf files

---
 usr/share/escenic/ece-scripts/ece-install.d/app-server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 1df95b34..5fab6dfb 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -161,7 +161,7 @@ function set_up_app_server() {
     make_dir $tomcat_base
     run cp -r ${appserver_parent_dir}/${tomcat_dir}/conf $tomcat_base
   elif [ -d $tomcat_base/conf ]; then 
-    run cp -r ${appserver_parent_dir}/${tomcat_dir}/conf/* $tomcat_base/conf/
+    run cp -nr ${appserver_parent_dir}/${tomcat_dir}/conf/* $tomcat_base/conf/
   fi
 
   for el in bin escenic/lib lib work logs temp webapps; do

From 750878c84c920f9aee5852e9ffc0859d9f7b85b8 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Mon, 9 Feb 2015 16:35:19 +0600
Subject: [PATCH 2274/2585] VOSA-65: Updated varnish backend for analysis
 engine

---
 usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
index 625fc782..0ee926dd 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
@@ -167,6 +167,7 @@ EOF
 backend analysis {
   .host = "${fai_analysis_host}";
   .port = "${fai_analysis_port-${default_app_server_port}}";
+  .max_connections = 50;
 }
 
 EOF
@@ -206,6 +207,7 @@ EOF
     cat >> $file <<EOF
   if (req.url ~ "^/analysis-logger/") {
     set req.backend = analysis;
+    return(pass);
   }
 EOF
   fi

From 83784d2dae3be1cb35283df9dad80830f3a0dfee Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Mon, 23 Feb 2015 15:01:05 +0600
Subject: [PATCH 2275/2585] VOSA:65:Added log for EAE backend setup

---
 usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
index 0ee926dd..5b850937 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
@@ -161,7 +161,7 @@ backend ${appserver_id}${i} {
 
 EOF
   done
-
+print_and_log "Found anaysis engine host : $fai_analysis_host"
   if [ -n "${fai_analysis_host}" ]; then
     cat >> $file <<EOF
 backend analysis {

From 2a12f888ec79c24684b6f7fe379b6ceb60e4c9fc Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Wed, 25 Feb 2015 14:33:09 +0600
Subject: [PATCH 2276/2585] VOSA-65: Updated varnish rule for EAE

---
 usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
index 5b850937..befac5a5 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
@@ -205,7 +205,7 @@ EOF
 
   if [ -n "${fai_analysis_host}" ]; then
     cat >> $file <<EOF
-  if (req.url ~ "^/analysis-logger/") {
+  if (req.url ~ "^/analysis-logger/Logger/" || req.url == "/analysis-logger/") {
     set req.backend = analysis;
     return(pass);
   }

From bb8e25bfc9a7ba57aac24a8e676b1c34a2dfa121 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Thu, 26 Feb 2015 15:35:59 +0600
Subject: [PATCH 2277/2585] VOSA-65: Fixed varnish rule for EAE

---
 usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
index befac5a5..f6c79a1a 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
@@ -205,7 +205,7 @@ EOF
 
   if [ -n "${fai_analysis_host}" ]; then
     cat >> $file <<EOF
-  if (req.url ~ "^/analysis-logger/Logger/" || req.url == "/analysis-logger/") {
+  if (req.url ~ "^/analysis-logger/Logger" || req.url == "/analysis-logger/") {
     set req.backend = analysis;
     return(pass);
   }

From 77b23c0e857043000acdc063f49e2e9cf0402a25 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Tue, 3 Mar 2015 23:50:45 +0600
Subject: [PATCH 2278/2585] VOSA-156: Run ece command as escenic user, when the
 logged on user is different. Refactoring

---
 usr/sbin/ece-deploy | 45 ++++++++++++++++++++++++++++++++-------------
 1 file changed, 32 insertions(+), 13 deletions(-)

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
index a790bddc..24679603 100755
--- a/usr/sbin/ece-deploy
+++ b/usr/sbin/ece-deploy
@@ -11,6 +11,7 @@
 ece_deploy_data_dir=/var/lib/escenic/$(basename $0)
 ece_deploy_download_dir=/var/cache/escenic
 log=/var/log/escenic/$(basename $0).log
+proxy_settings=""
 
 function ece_deploy_cancel_hook() {
   local the_dir=$ece_deploy_data_dir/$deployment_id
@@ -70,33 +71,51 @@ function bootstrap_thyself() {
 
 bootstrap_thyself
 
-function deploy_ear() {
-  local proxy_setings=""
-  if [ -n "$http_proxy" ]; then
-    proxy_settings="http_proxy=$http_proxy"
-  fi
-
+function deploy_engine() {
   for el in $engine_instance_list; do
-    su - $ece_unix_user -c \
-      "${proxy_settings} ece -i $el stop deploy clean start --uri $ear_uri"
+    if [ "$USER" != "$ece_unix_user" ]; then
+        su - $ece_unix_user -c \
+        "${proxy_settings} ece -i $el stop deploy clean start --uri $ear_uri"
+    else
+        ${proxy_settings} ece -i $el stop deploy clean start --uri $ear_uri
+    fi
     if [ ${PIPESTATUS[@]} -gt 0 ]; then
       exit 1
     fi
   done
-  
+}
+
+function deploy_search() {
   for el in $search_instance_list; do
-    su - $ece_unix_user -c \
-      "${proxy_settings} ece -i $el -t search stop deploy clean start --uri $ear_uri"
+     if [ "$USER" != "$ece_unix_user" ]; then
+        su - $ece_unix_user -c \
+        "${proxy_settings} ece -i $el -t search stop deploy clean start --uri $ear_uri"
+     else
+        ${proxy_settings} ece -i $el -t search stop deploy clean start --uri $ear_uri
+     fi
     exit_on_error "Running ece deploy as $ece_unix_user"
   done
 }
 
+function deploy_ear() {
+  if [ -n "$http_proxy" ]; then
+    proxy_settings="http_proxy=$http_proxy"
+    print_and_log "HTTP proxy found setting proxy settings to $proxy_settings"
+  fi
+  deploy_engine
+  deploy_search
+}
+
 function start_all_content_engine_instances() {
   for el in $engine_instance_list; do
-    su - $ece_unix_user -c \
+    if [ "$USER" != "$ece_unix_user" ]; then
+      su - $ece_unix_user -c \
       "${proxy_settings} ece -i $el restart"
+    else
+      ${proxy_settings} ece -i $el restart
+    fi
   done
-}  
+}
 
 function set_builder_user_and_password() {
   run source /etc/escenic/ece.conf

From 7a8cb021021d97a17b31fb523a76337195616add Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Fri, 6 Mar 2015 21:47:51 +0600
Subject: [PATCH 2279/2585] VOSA-160: Added auto deploy support for local build

---
 usr/share/escenic/build-scripts/ece-build | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 444ca833..d5a9d6b8 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -22,6 +22,9 @@ project_pom_versions=""
 ear_base_url=http://builder.vizrtsaas.com
 #Mode to use keep git local changes
 local_mode=false
+auto_deploy=false
+deploy_ear=false
+deploy_conf=""
 # standard java locations
 #TODO:take java home location dynamically
 java_6_sun=/usr/lib/jvm/java-6-sun
@@ -1539,6 +1542,24 @@ function phase_release
   create_machine_conf_packages
   print_result
 }
+## Used to deploy ear and conf packages after built
+function automatic_deploy(){
+  if [ $deploy_ear == true ]; then
+    ece-deploy --ear $ear_base_url/$customer/releases/$resulting_ear
+  fi
+
+  if [ "$deploy_conf" == "deb" ]; then
+    ece-deploy --conf $ear_base_url/$customer/releases/vosa-conf-${machine}-1-${customer}-${release_label}-latest.deb
+  fi
+
+  if [ "$deploy_conf" == "rpm" ]; then
+    ece-deploy --conf $ear_base_url/$customer/releases/vosa-conf-${machine}-1_${customer}_${release_label}-latest.noarch.rpm
+  fi
+}
+
+function phase_deploy() {
+  automatic_deploy
+}
 
 ##
 function phase_shutdown

From 10c6d1e5c05165731b24a16f08494e19a98e845e Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Sat, 7 Mar 2015 09:41:43 +0600
Subject: [PATCH 2280/2585] VOSA-160: Enabled auto deploy property by default
 in local builder

---
 usr/share/escenic/build-scripts/ece-local-builder | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/ece-local-builder b/usr/share/escenic/build-scripts/ece-local-builder
index 15ba3d6b..2f4596ee 100755
--- a/usr/share/escenic/build-scripts/ece-local-builder
+++ b/usr/share/escenic/build-scripts/ece-local-builder
@@ -588,7 +588,10 @@ git_user=$git_user
 git_protocol=$git_protocol
 git_base=$git_base
 ear_base_url=$ear_base_url/$1
-local_mode=true" > /home/$1/.build/build.conf
+local_mode=true
+auto_deploy=true
+deploy_ear=true
+deploy_conf=deb" > /home/$1/.build/build.conf
   run chown $1:$1 /home/$1/.build/build.conf
   run rsync -av $skel_dir/ /home/$1
   run sed -i "s/maven.username/$user_maven_username/" /home/$1/.m2/settings.xml

From 113b110f74fa3d7f6655d3744fda6bb435829e2c Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Sat, 7 Mar 2015 12:47:53 +0600
Subject: [PATCH 2281/2585] VOSA-160: Added auto deploy phase after release
 phase

---
 usr/share/escenic/build-scripts/ece-build | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index d5a9d6b8..5eea71ca 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -1574,4 +1574,5 @@ phase_verify_user
 phase_clean_up
 phase_verify_project
 phase_release
+phase_deploy
 phase_shutdown

From ac232670ef1582cfa2f0d2186dadb2c78bb9d96a Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Mon, 9 Mar 2015 16:00:34 +0600
Subject: [PATCH 2282/2585] VOSA-160: Used sudo to install deb packages

---
 usr/sbin/ece-deploy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
index 24679603..7b97618b 100755
--- a/usr/sbin/ece-deploy
+++ b/usr/sbin/ece-deploy
@@ -170,7 +170,7 @@ function deploy_conf() {
       $dpkg_opts
   fi
 
-  dpkg \
+  sudo dpkg \
     $dpkg_opts \
     --install $ece_deploy_download_dir/$(basename $conf_package_uri)
 }

From 451e371eb0b9d830551eeeef3f7e779397b4f41d Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Tue, 31 Mar 2015 15:59:59 +0600
Subject: [PATCH 2283/2585] VOSA-64: Installed configuration package bit later
 when search is done

---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 394a47e8..c95719de 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -147,7 +147,6 @@ function install_ece_instance() {
     set_up_instance_specific_nursery_configuration
   fi
   set_up_app_server
-  deploy_conf_package
 
   # We set a WAR white list for all profiles except all in one
   if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER ]; then
@@ -171,6 +170,7 @@ function install_ece_instance() {
     install_memory_cache
     assemble_deploy_and_restart_type
     configure_special_plugins
+    deploy_conf_package
   fi
 
   update_type_instances_to_start_up

From e208ca26fb72fda7055c71e828a370bce4635e83 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Sun, 17 May 2015 21:11:39 +0600
Subject: [PATCH 2284/2585] VOSA-157: Updated run-bootstrapper to pin cloud
 packages from akita suite and fix for unzip

---
 .../vosa/post-install-hooks/run-sdp-bootstrapper.sh  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/usr/share/vizrt/vosa/post-install-hooks/run-sdp-bootstrapper.sh b/usr/share/vizrt/vosa/post-install-hooks/run-sdp-bootstrapper.sh
index 8425fb30..11c0336b 100755
--- a/usr/share/vizrt/vosa/post-install-hooks/run-sdp-bootstrapper.sh
+++ b/usr/share/vizrt/vosa/post-install-hooks/run-sdp-bootstrapper.sh
@@ -33,14 +33,18 @@ guest="ssh -F $2/ssh.conf root@guest"
 
 if $guest [ -d /etc/apt/sources.list.d ] ; then
   $guest tee /etc/apt/sources.list.d/vizrt.list <<EOF
-deb http://apt.vizrt.com/ unstable main non-free
-deb http://apt.vizrt.com/ lean main non-free
+deb http://apt.vizrt.com/ akita main non-free
 EOF
 
-  $guest tee /etc/apt/preferences.d/30prefer-vizrt-lean-packages <<EOF
+  $guest tee /etc/apt/preferences.d/30prefer-vizrt-akita-packages <<EOF
 Package: *
 Pin-Priority: 600
-Pin: release a=lean
+Pin: release n=akita
+EOF
+ $guest tee /etc/apt/preferences.d/40ubuntu-unzip-package <<EOF
+Package: unzip
+Pin-Priority: 600
+Pin: release v=12.04,o=Ubuntu,a=precise,n=precise,l=Ubuntu,c=main
 EOF
 
   $guest apt-key add - <<EOF

From d41115733dd8562f5dac2dda0b863fa457b1bb4e Mon Sep 17 00:00:00 2001
From: saif shams <saif@escenic.com>
Date: Wed, 27 May 2015 13:44:16 +0200
Subject: [PATCH 2285/2585] implemented periodic check framework and added
 site_length icinga plugin

---
 usr/lib/check_mk_agent/plugins/periodic-check |  13 +++
 usr/lib/periodic-check/conf/site_length       |   4 +
 usr/lib/periodic-check/main                   |   1 -
 usr/lib/periodic-check/script/site_length     |   6 +-
 usr/share/check_mk/checks/site_length         | 102 ++++++++++++++----
 .../escenic/package-scripts/create-packages   |   8 +-
 .../debian/escenic-check-mk-plugins/postinst  |   6 ++
 .../escenic-check-mk-server-plugins/postinst  |   8 ++
 var/cache/periodic-check/site_length          |   0
 9 files changed, 123 insertions(+), 25 deletions(-)
 create mode 100755 usr/lib/check_mk_agent/plugins/periodic-check
 create mode 100644 usr/lib/periodic-check/conf/site_length
 create mode 100644 var/cache/periodic-check/site_length

diff --git a/usr/lib/check_mk_agent/plugins/periodic-check b/usr/lib/check_mk_agent/plugins/periodic-check
new file mode 100755
index 00000000..64cb93b8
--- /dev/null
+++ b/usr/lib/check_mk_agent/plugins/periodic-check
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+dir="/var/cache/periodic-check"
+
+#echo "<<<periodic-check>>>"
+
+for file in `ls $dir`; do
+# echo "hello: $dir/$file"
+  if [ -f "$dir/$file" ]; then
+    echo "<<<$file>>>"
+    cat "$dir/$file"
+  fi
+done
diff --git a/usr/lib/periodic-check/conf/site_length b/usr/lib/periodic-check/conf/site_length
new file mode 100644
index 00000000..41643ac5
--- /dev/null
+++ b/usr/lib/periodic-check/conf/site_length
@@ -0,0 +1,4 @@
+sites="www.escenic.com
+www.escenic.com/incoming"
+tomcat_port="8040"
+host=localhost
diff --git a/usr/lib/periodic-check/main b/usr/lib/periodic-check/main
index b9a17b64..0deec5c6 100755
--- a/usr/lib/periodic-check/main
+++ b/usr/lib/periodic-check/main
@@ -1,5 +1,4 @@
 #!/bin/bash
-
 . $(dirname $0)/main.conf
 
 function init {
diff --git a/usr/lib/periodic-check/script/site_length b/usr/lib/periodic-check/script/site_length
index 50583c08..6edcbc8d 100755
--- a/usr/lib/periodic-check/script/site_length
+++ b/usr/lib/periodic-check/script/site_length
@@ -16,11 +16,15 @@ function init {
 init
 
 for line in $sites; do
+  epoch=$(date +"%s")
   before=$(date +"%s.%N")
   size=$(curl -s http://localhost:$tomcat_port -H "Host:$line"| wc -c)
   after=$(date +"%s.%N")
+  if [ "$size" == "" ]; then 
+    size="0"
+  fi
   time_took=$(echo "$after - $before"| bc | cut -c -5)
-  oneline=$(echo "$line $size $time_took")
+  oneline=$(echo "$epoch $line $size $time_took")
   if [ "$all_lines" == "" ]; then
     all_lines="$oneline"
   else
diff --git a/usr/share/check_mk/checks/site_length b/usr/share/check_mk/checks/site_length
index 0e895623..8ef2ac36 100644
--- a/usr/share/check_mk/checks/site_length
+++ b/usr/share/check_mk/checks/site_length
@@ -1,25 +1,83 @@
-def inventory_site_length_status(checkname, info):
-   inventory = []
-   for line in info:
-      site_name = line[0]   # open_files
-      inventory.append( (site_name, "", None) )
-   return inventory
+#!/usr/bin/python
+# -*- encoding: utf-8; py-indent-offset: 4 -*-
+# +------------------------------------------------------------------+
+# |             ____ _               _        __  __ _  __           |
+# |            / ___| |__   ___  ___| | __   |  \/  | |/ /           |
+# |           | |   | '_ \ / _ \/ __| |/ /   | |\/| | ' /            |
+# |           | |___| | | |  __/ (__|   <    | |  | | . \            |
+# |            \____|_| |_|\___|\___|_|\_\___|_|  |_|_|\_\           |
+# |                                                                  |
+# | Copyright Mathias Kettner 2010             mk@mathias-kettner.de |
+# +------------------------------------------------------------------+
+#
+# This file is part of Check_MK.
+# The official homepage is at http://mathias-kettner.de/check_mk.
+#
+# check_mk is free software;  you can redistribute it and/or modify it
+# under the  terms of the  GNU General Public License  as published by
+# the Free Software Foundation in version 2.  check_mk is  distributed
+# in the hope that it will be useful, but WITHOUT ANY WARRANTY;  with-
+# out even the implied warranty of  MERCHANTABILITY  or  FITNESS FOR A
+# PARTICULAR PURPOSE. See the  GNU General Public License for more de-
+# ails.  You should have  received  a copy of the  GNU  General Public
+# License along with GNU Make; see the file  COPYING.  If  not,  write
+# to the Free Software Foundation, Inc., 51 Franklin St,  Fifth Floor,
+# Boston, MA 02110-1301 USA.
 
-def check_site_length_status(item, params, info):
-   for line in info:
-      if line[0] == item:
-         state = "OK"
-         length=int(line[1])
-         time=line[2]
-   numeric=0
-   if length < 10000:
-      numeric = 2
-      state = "Critical"
-   else:
-      numeric = 0
-   return (numeric, "{s}. Downloaded {b} bytes in {c} sec from {a}.".format(s=state, a=item, b=length, c=time))
+# expected line is
+# <epoch> <site> <site-size in bytes> <time in seconds>
+# 
 
-# declare the check to Check_MK
-check_info['site_length.status'] = \
-      (check_site_length_status, "page_size", 0, inventory_site_length_status)
+import time
 
+def inventory_site_length(info):
+    items = []
+    for line in info:
+        item = "site length of "+line[1]
+        items.append((item, None))
+    return items
+
+
+def check_site_length(item, params, info):
+    for line in info:
+        state=3
+        site="at"
+        size=0.0
+        load_time=0.0
+        msg="No data or site_length check is not working properly." + line[1]
+        result=state, msg
+        if ("site length of " + line[1]) == item:
+#            try:
+            sample_epoch=int(line[0])
+#            except ValueError:              
+#                return state, "Data format is not correct. Expected <epoch> <site> <size> <loading time>"
+            curr_epoch=int(time.time())
+            if (sample_epoch + 90) < curr_epoch:
+                size=0
+                load_time=0
+                state=2             
+                msg="Data is not updated."
+                result=state, msg
+                return result
+            size=float(line[2])/1024
+            load_time=float(line[3])
+            str_size="{:.2f}".format(size)
+            str_time="{:.2f}".format(load_time)
+            #msg=" ".join(str(w) for w in line[2:])
+            if size <= 0:
+                state=2
+                msg="CRITICAL. Webpage is not available from tomcat." 
+            elif size < 50:
+                state=2
+                msg="CRITICAL. Webpage is smaller than 50 KB from tomcat port."
+            else:
+                state=0
+                msg="OK. "+ str_size +" KB in "+ str_time+" sec."
+            result=state, msg
+            return result
+
+check_info['site_length'] = (
+        check_site_length,
+        "%s",
+        1,
+        inventory_site_length)
diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 56ff2f87..0c62566b 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -119,7 +119,6 @@ function set_up_escenic-build-scripts() {
   make_dir $target_dir/usr/bin
   run cp ../build-scripts/ece-build $target_dir/usr/bin/ece-build
   run cp ../build-scripts/ece-builder $target_dir/usr/bin/ece-builder
-  run cp ../build-scripts/ece-local-builder $target_dir/usr/bin/ece-local-builder
   run cp ../build-scripts/ece-build-guide $target_dir/usr/bin/ece-build-guide
 }
 
@@ -234,13 +233,20 @@ function set_up_escenic-check-mk-server-plugins() {
 
 function set_up_escenic-check-mk-plugins() {
   make_dir $target_dir/usr/lib/check_mk_agent/local
+  make_dir $target_dir/usr/lib/check_mk_agent/plugins
   make_dir $target_dir/etc/cron.d $target_dir/usr/lib/periodic-check $target_dir/var/cache/periodic-check
+#  chown nagios:nagios "$target_dir/var/cache/periodic-check"
+#  chown nagios:nagios "$target_dir/usr/lib/periodic-check"
+  run cp -r ../../../lib/check_mk_agent/plugins/* \
+    $target_dir/usr/lib/check_mk_agent/plugins/
   run cp -r ../../../lib/check_mk_agent/local/* \
     $target_dir/usr/lib/check_mk_agent/local/
   run cp -r ../../../lib/periodic-check/* \
     $target_dir/usr/lib/periodic-check/
   run cp  ../../../../etc/cron.d/periodic-check \
     $target_dir/etc/cron.d/periodic-check
+  run cp  ../../../../var/cache/periodic-check/* \
+    $target_dir/var/cache/periodic-check/
 }
 
 function set_up_escenic-munin-plugins() {
diff --git a/usr/share/escenic/package-scripts/debian/escenic-check-mk-plugins/postinst b/usr/share/escenic/package-scripts/debian/escenic-check-mk-plugins/postinst
index e15ca1c2..0b5ac44c 100755
--- a/usr/share/escenic/package-scripts/debian/escenic-check-mk-plugins/postinst
+++ b/usr/share/escenic/package-scripts/debian/escenic-check-mk-plugins/postinst
@@ -1,4 +1,10 @@
 #! /usr/bin/env bash
 
+if ! getent passwd hugin >/dev/null; then
+  adduser --group --system --no-create-home --home /var/lib/nagios nagios
+fi
+
+chown -R nagios:nagios /var/cache/periodic-check
+
 exit 0
 
diff --git a/usr/share/escenic/package-scripts/debian/escenic-check-mk-server-plugins/postinst b/usr/share/escenic/package-scripts/debian/escenic-check-mk-server-plugins/postinst
index e15ca1c2..d117bbf1 100755
--- a/usr/share/escenic/package-scripts/debian/escenic-check-mk-server-plugins/postinst
+++ b/usr/share/escenic/package-scripts/debian/escenic-check-mk-server-plugins/postinst
@@ -1,4 +1,12 @@
 #! /usr/bin/env bash
 
+check_mk -II
+sleep 2
+check_mk -OO
+sleep 2
+service icinga restart
+service icinga reload
+
+
 exit 0
 
diff --git a/var/cache/periodic-check/site_length b/var/cache/periodic-check/site_length
new file mode 100644
index 00000000..e69de29b

From 8625f8257e9d928135dee5ea86b6cffe6a83e8e8 Mon Sep 17 00:00:00 2001
From: saif shams <saif@escenic.com>
Date: Thu, 28 May 2015 07:52:12 +0200
Subject: [PATCH 2286/2585] corrected spelling mistake in postinst and re
 site_length.conf

---
 .../conf/{site_length => site_length.conf}               | 0
 .../debian/escenic-check-mk-plugins/postinst             | 3 ++-
 .../debian/escenic-check-mk-server-plugins/postinst      | 9 ---------
 3 files changed, 2 insertions(+), 10 deletions(-)
 rename usr/lib/periodic-check/conf/{site_length => site_length.conf} (100%)

diff --git a/usr/lib/periodic-check/conf/site_length b/usr/lib/periodic-check/conf/site_length.conf
similarity index 100%
rename from usr/lib/periodic-check/conf/site_length
rename to usr/lib/periodic-check/conf/site_length.conf
diff --git a/usr/share/escenic/package-scripts/debian/escenic-check-mk-plugins/postinst b/usr/share/escenic/package-scripts/debian/escenic-check-mk-plugins/postinst
index 0b5ac44c..99d46161 100755
--- a/usr/share/escenic/package-scripts/debian/escenic-check-mk-plugins/postinst
+++ b/usr/share/escenic/package-scripts/debian/escenic-check-mk-plugins/postinst
@@ -1,10 +1,11 @@
 #! /usr/bin/env bash
 
-if ! getent passwd hugin >/dev/null; then
+if ! getent passwd nagios >/dev/null; then
   adduser --group --system --no-create-home --home /var/lib/nagios nagios
 fi
 
 chown -R nagios:nagios /var/cache/periodic-check
+chown -R nagios:nagios /usr/lib/periodic-check
 
 exit 0
 
diff --git a/usr/share/escenic/package-scripts/debian/escenic-check-mk-server-plugins/postinst b/usr/share/escenic/package-scripts/debian/escenic-check-mk-server-plugins/postinst
index d117bbf1..c708061f 100755
--- a/usr/share/escenic/package-scripts/debian/escenic-check-mk-server-plugins/postinst
+++ b/usr/share/escenic/package-scripts/debian/escenic-check-mk-server-plugins/postinst
@@ -1,12 +1,3 @@
 #! /usr/bin/env bash
-
-check_mk -II
-sleep 2
-check_mk -OO
-sleep 2
-service icinga restart
-service icinga reload
-
-
 exit 0
 

From f1a24b4d88424e25b48c7b696647409d7d8a0c99 Mon Sep 17 00:00:00 2001
From: saif shams <saif@escenic.com>
Date: Thu, 28 May 2015 08:13:21 +0200
Subject: [PATCH 2287/2585] Added a munin graph for site length

---
 .../escenic/package-scripts/create-packages   |  1 +
 usr/share/munin/plugins/site_length           | 52 +++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100755 usr/share/munin/plugins/site_length

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 0c62566b..aa55eb11 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -261,6 +261,7 @@ function set_up_escenic-munin-plugins() {
       $dir
     cd $dir
     tar xzf master
+    run cp ../../munin/plugins/* $target_dir/usr/share/munin/plugins
     run cp $dir/mogsie-escenic-munin*/*_ $target_dir/usr/share/munin/plugins
     run cp $dir/mogsie-escenic-munin*/README.md $doc_dir
     run cp $dir/mogsie-escenic-munin*/site/* $doc_dir
diff --git a/usr/share/munin/plugins/site_length b/usr/share/munin/plugins/site_length
new file mode 100755
index 00000000..2c4ce04b
--- /dev/null
+++ b/usr/share/munin/plugins/site_length
@@ -0,0 +1,52 @@
+#!/bin/bash
+#
+
+#. $MUNIN_LIBDIR/plugins/plugin.sh
+info_file="/var/cache/periodic-check/site_length"
+sites=($(cat $info_file | cut -f 2 -d ' '))
+lengths=($(cat $info_file | cut -f 3 -d ' '))
+
+if [ "$1" = "autoconf" ]; then
+	if [ -r /proc/stat ]; then
+		echo yes
+		exit 0
+	else
+		echo no
+		exit 0
+	fi
+fi
+
+if [ "$1" = "config" ]; then
+
+	echo 'graph_title sites length'
+	echo "graph_order " ${sites[@]//./_}
+	echo "graph_args --base 1000 -r --lower-limit 0 "
+	echo 'graph_vlabel Bytes'
+#	echo 'graph_scale no'
+	echo 'graph_info This graph shows length of different pages.'
+	echo 'graph_category system'
+	echo 'graph_period second'
+        for site in "${sites[@]}"; do
+    	  echo "${site//./_}.label $site"
+	  echo "${site//./_}.draw LINE2"
+	  echo "${site//./_}.min 0"
+	  echo "${site//./_}.type GAUGE"
+	  echo "${site//./_}.info length/size of $site in Bytes" 
+        done
+        exit 0
+fi
+
+# Note: Counters/derive need to report integer values.  Also we need
+# to avoid 10e+09 and the like %.0f should do this.
+
+cur_epoch=$(date +%s)
+sample_epoch=$(cat "$info_file" | head -n 1| cut -f 1 -d ' ')
+#add 90 seconds to compensate freshness.
+sample_epoch=$(echo "$sample_epoch + 90"| bc)
+
+if [ "$sample_epoch" -gt "$cur_epoch" ]; then
+  for i in $(seq 1 ${#sites[@]}); do
+    printf "%s.value %.0f\n" ${sites[$i-1]//./_} ${lengths[$i-1]}
+  done
+fi
+

From 8065a568dab5cfbf2af40aaedc26057f4de9c252 Mon Sep 17 00:00:00 2001
From: saif shams <saif@escenic.com>
Date: Thu, 28 May 2015 12:55:05 +0200
Subject: [PATCH 2288/2585] added -r to the run cp command in escenic-munin

---
 usr/share/escenic/package-scripts/create-packages | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index aa55eb11..35d228db 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -261,7 +261,7 @@ function set_up_escenic-munin-plugins() {
       $dir
     cd $dir
     tar xzf master
-    run cp ../../munin/plugins/* $target_dir/usr/share/munin/plugins
+    run cp -r ../../munin/plugins/* $target_dir/usr/share/munin/plugins
     run cp $dir/mogsie-escenic-munin*/*_ $target_dir/usr/share/munin/plugins
     run cp $dir/mogsie-escenic-munin*/README.md $doc_dir
     run cp $dir/mogsie-escenic-munin*/site/* $doc_dir

From 31d25b7f0f44ed165a369fd73864e1d4aa21d52d Mon Sep 17 00:00:00 2001
From: saif shams <saif@escenic.com>
Date: Thu, 28 May 2015 13:09:20 +0200
Subject: [PATCH 2289/2585] small bug fix regarding site-length plu_length
 plugin  in munin

---
 usr/share/escenic/package-scripts/create-packages | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 35d228db..001334a8 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -256,12 +256,12 @@ function set_up_escenic-munin-plugins() {
 
   local dir=$(mktemp -d)
   (
+    run cp -r ../../munin/plugins/* $target_dir/usr/share/munin/plugins
     run download_uri_target_to_dir \
       https://github.com/mogsie/escenic-munin/tarball/master \
       $dir
     cd $dir
     tar xzf master
-    run cp -r ../../munin/plugins/* $target_dir/usr/share/munin/plugins
     run cp $dir/mogsie-escenic-munin*/*_ $target_dir/usr/share/munin/plugins
     run cp $dir/mogsie-escenic-munin*/README.md $doc_dir
     run cp $dir/mogsie-escenic-munin*/site/* $doc_dir

From 70cde94471ab42d640d4b2ac5d944bfd089ee7b4 Mon Sep 17 00:00:00 2001
From: saif shams <saif@escenic.com>
Date: Thu, 28 May 2015 14:02:43 +0200
Subject: [PATCH 2290/2585] moved site_length plugin to etc/munin/plugins

---
 {usr/share => etc}/munin/plugins/site_length      | 0
 usr/share/escenic/package-scripts/create-packages | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename {usr/share => etc}/munin/plugins/site_length (100%)

diff --git a/usr/share/munin/plugins/site_length b/etc/munin/plugins/site_length
similarity index 100%
rename from usr/share/munin/plugins/site_length
rename to etc/munin/plugins/site_length
diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 001334a8..38872d53 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -256,7 +256,7 @@ function set_up_escenic-munin-plugins() {
 
   local dir=$(mktemp -d)
   (
-    run cp -r ../../munin/plugins/* $target_dir/usr/share/munin/plugins
+    run cp -r ../../../../etc/munin/plugins/* $target_dir/etc/munin/plugins
     run download_uri_target_to_dir \
       https://github.com/mogsie/escenic-munin/tarball/master \
       $dir

From dbcb517ccca11a78396fae361476bcefc99feaef Mon Sep 17 00:00:00 2001
From: saif shams <saif@escenic.com>
Date: Thu, 28 May 2015 14:15:34 +0200
Subject: [PATCH 2291/2585] created target directory

---
 usr/share/escenic/package-scripts/create-packages | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 38872d53..ba50d18f 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -251,6 +251,7 @@ function set_up_escenic-check-mk-plugins() {
 
 function set_up_escenic-munin-plugins() {
   make_dir $target_dir/usr/share/munin/plugins
+  make_dir $target_dir/etc/munin/plugins
   local doc_dir=$target_dir/usr/share/doc/escenic/escenic-munin-plugin
   make_dir $doc_dir
 

From 4d3851bdbc5dc57b8e311b5edc9081150d9f2142 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Fri, 29 May 2015 15:24:14 +0600
Subject: [PATCH 2292/2585] VOSA-64: Changed the ownership of the webapps to
 escenic to make ece-deploy work

---
 usr/sbin/ece-deploy | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
index 7b97618b..bc76b1be 100755
--- a/usr/sbin/ece-deploy
+++ b/usr/sbin/ece-deploy
@@ -12,6 +12,8 @@ ece_deploy_data_dir=/var/lib/escenic/$(basename $0)
 ece_deploy_download_dir=/var/cache/escenic
 log=/var/log/escenic/$(basename $0).log
 proxy_settings=""
+engine1_dir=/opt/tomcat-engine1
+search1_dir=/opt/tomcat-search1
 
 function ece_deploy_cancel_hook() {
   local the_dir=$ece_deploy_data_dir/$deployment_id
@@ -173,6 +175,9 @@ function deploy_conf() {
   sudo dpkg \
     $dpkg_opts \
     --install $ece_deploy_download_dir/$(basename $conf_package_uri)
+  print_and_log "Changing ownership for engine1 and search1 to $ece_unix_user"
+  chown -R $ece_unix_user:$ece_unix_user $engine1_dir
+  chown -R $ece_unix_user:$ece_unix_user $search1_dir
 }
 
 function read_user_input() {

From 4bf7b4da4299017ddbb5a33944a3b1cfcba4610d Mon Sep 17 00:00:00 2001
From: saif shams <saif@escenic.com>
Date: Fri, 29 May 2015 16:35:46 +0200
Subject: [PATCH 2293/2585] improved periodic check, added icinga and munin
 plugins for indexer service

---
 etc/munin/plugins/indexer_running             | 45 +++++++++++
 usr/lib/periodic-check/main                   |  3 +-
 usr/lib/periodic-check/script/indexer_running | 74 ++++++++++++++++++
 usr/lib/periodic-check/script/site_length     |  2 +-
 usr/share/check_mk/checks/indexer_running     | 76 +++++++++++++++++++
 5 files changed, 198 insertions(+), 2 deletions(-)
 create mode 100755 etc/munin/plugins/indexer_running
 create mode 100755 usr/lib/periodic-check/script/indexer_running
 create mode 100755 usr/share/check_mk/checks/indexer_running

diff --git a/etc/munin/plugins/indexer_running b/etc/munin/plugins/indexer_running
new file mode 100755
index 00000000..56ae7c09
--- /dev/null
+++ b/etc/munin/plugins/indexer_running
@@ -0,0 +1,45 @@
+#!/bin/bash
+#
+
+#. $MUNIN_LIBDIR/plugins/plugin.sh
+info_file="/var/cache/periodic-check/indexer_running"
+state=$(cat $info_file | cut -f 3 -d ' ')
+age=$(cat $info_file | cut -f 4 -d ' ')
+
+if [ "$1" = "autoconf" ]; then
+	if [ -r /proc/stat ]; then
+		echo yes
+		exit 0
+	else
+		echo no
+		exit 0
+	fi
+fi
+
+if [ "$1" = "config" ]; then
+	echo 'graph_title indexing delay'
+	echo "graph_args --base 1000 -r --lower-limit 0 "
+	echo 'graph_vlabel Minutes'
+#	echo 'graph_scale no'
+	echo 'graph_info Shows the time to get a document indexed by Escenic search. This is basically time difference between update time of head-tail file and entryUpdated field in SearchIndex table.'
+	echo 'graph_category system'
+	echo 'graph_period second'
+	echo "indexing_delay.label time to index current document"
+	echo "indexing_delay.draw LINE2"
+	echo "indexing_delay.min 0"
+	echo "indexing_delay.type GAUGE"
+	echo "indexing_delay.info time in $site in Bytes" 
+fi
+
+# Note: Counters/derive need to report integer values.  Also we need
+# to avoid 10e+09 and the like %.0f should do this.
+
+cur_epoch=$(date +%s)
+sample_epoch=$(cat "$info_file" | head -n 1| cut -f 1 -d ' ')
+#add 90 seconds to compensate freshness.
+sample_epoch=$(echo "$sample_epoch + 90"| bc)
+
+if [ "$sample_epoch" -gt "$cur_epoch" ] && [ "$state" == "yes" ] && [ "$age" -ge 0 ]; then
+  printf "indexing_delay.value $age\n" 
+fi
+
diff --git a/usr/lib/periodic-check/main b/usr/lib/periodic-check/main
index 0deec5c6..5df65c9f 100755
--- a/usr/lib/periodic-check/main
+++ b/usr/lib/periodic-check/main
@@ -15,7 +15,8 @@ init
 
 for script in `ls $nagios_lib_dir/script/`; do
   if [ -f "$nagios_lib_dir/script/$script" -a -x "$nagios_lib_dir/script/$script" ]; then
-    $nagios_lib_dir/script/$script
+    nagios_data_file="$nagios_cache_dir/$(basename $script)"
+    $nagios_lib_dir/script/$script > $nagios_data_file
   fi
 done
 
diff --git a/usr/lib/periodic-check/script/indexer_running b/usr/lib/periodic-check/script/indexer_running
new file mode 100755
index 00000000..9c9bc552
--- /dev/null
+++ b/usr/lib/periodic-check/script/indexer_running
@@ -0,0 +1,74 @@
+#!/bin/bash
+
+# assumptions: indexer is running if head-tail file has max(documentID) or head-tail file is modified in 5 minutes.
+# if indexer is running, script will check the time difference between the last modification time of the head-tail file and 
+# last modification date mentioned in SearchIndex table for the documentID mentioned as a head in head-tail file
+
+#output
+#<time-stamp-epoch> <indexer_running> <yes/no/NO> <indexing time/age of head-tail file> <head from file> <head from DB> <comment>
+#
+
+head_tail_file="/var/lib/escenic/engine/head-tail.index"
+max_warning_diff=180 #3 minutes
+max_critical_diff=300 #5 minutes
+
+filehead=$(cat $head_tail_file | grep "head="| sed 's/.*head=after\/\([0-9][0-9]*\).*/\1/')
+file_epoch=$(stat --format "%Y" "$head_tail_file")
+
+dbhead=$(curl -isX PUT "http://uat.bjorgu.cust.vizrtsaas.com:8080/escenic-admin/pages/database/query.jsp?query=select%20max(documentID)%20from%20SearchIndex" | grep -A 2 ">max(documentID)"| tail -n 1 | sed 's/.*>\([0-9][-0-9]*\).*/\1/')
+curr_epoch=$(date +%s)
+
+function invalid_diff {
+  #valid difference must be more than 0 
+  re="^[-0-9]+$"
+  if [[ "$1" =~ $re ]] && [[ "$1" -ge 0 ]]; then
+    echo "0"
+    return 0
+  else
+    echo "1"
+    return 1
+  fi
+}
+
+indexer_running=0
+if [ "$filehead" == "$dbhead" ]; then 
+  indexer_running=1
+else
+  diff=$(($curr_epoch - $file_epoch))
+  diff_min=$(($diff / 60))
+  echo "$diff $max_critical_diff"
+  if [ "$diff" -ge "$max_critical_diff" ]; then
+    indexer_running=-2
+  elif [ "$diff" -ge "$max_warning_diff" ]; then
+    indexer_critical=-1
+  else
+    indexer_running=1
+  fi
+fi
+
+if [ "$indexer_running" == 1 ]; then
+
+  #dbdate=$(echo "select entryUpdated from SearchIndex si where documentID=(select max(documentID) from SearchIndex);"| sudo mysql ece5db | tail -n 2| tail -n 1)
+
+  dbdate=$(curl -isX PUT "http://uat.bjorgu.cust.vizrtsaas.com:8080/escenic-admin/pages/database/query.jsp?query=select%20entryUpdated%20from%20SearchIndex%20si%20where%20documentID%3D$filehead" | grep -A 2 ">entryUpdated"| tail -n 1 | sed 's/.*>\([0-9][-0-9 :-]*\).*/\1/')
+
+  db_epoch=$(date --date "$dbdate" +"%s")
+  diff=$(($file_epoch - $db_epoch))
+  diff_min=$(($diff / 60))
+
+  a=$(invalid_diff $diff)
+
+  if [ "$a" == 1 ]; then
+    echo "$curr_epoch indexer_running yes -1 $filehead $dbhead"
+  else
+    echo "$curr_epoch indexer_running yes $diff_min $filehead $dbhead"
+  fi
+elif [ "$indexer_running" == -1 ]; then
+  echo "$curr_epoch indexer_running no $diff_min $filehead $dbhead"
+elif [ "$indexer_running" == -2 ]; then
+  echo "$curr_epoch indexer_running NO $diff_min $filehead $dbhead"
+else
+  echo "indexer_running NO -1 $filehead $dbhead UNKNOWN"
+fi 
+
+
diff --git a/usr/lib/periodic-check/script/site_length b/usr/lib/periodic-check/script/site_length
index 6edcbc8d..73f67617 100755
--- a/usr/lib/periodic-check/script/site_length
+++ b/usr/lib/periodic-check/script/site_length
@@ -32,4 +32,4 @@ for line in $sites; do
   fi
 done
 
-echo "$all_lines" > "$nagios_data_file"
+echo "$all_lines"
diff --git a/usr/share/check_mk/checks/indexer_running b/usr/share/check_mk/checks/indexer_running
new file mode 100755
index 00000000..1cedd84a
--- /dev/null
+++ b/usr/share/check_mk/checks/indexer_running
@@ -0,0 +1,76 @@
+#!/usr/bin/python
+# -*- encoding: utf-8; py-indent-offset: 4 -*-
+# +------------------------------------------------------------------+
+# |             ____ _               _        __  __ _  __           |
+# |            / ___| |__   ___  ___| | __   |  \/  | |/ /           |
+# |           | |   | '_ \ / _ \/ __| |/ /   | |\/| | ' /            |
+# |           | |___| | | |  __/ (__|   <    | |  | | . \            |
+# |            \____|_| |_|\___|\___|_|\_\___|_|  |_|_|\_\           |
+# |                                                                  |
+# | Copyright Mathias Kettner 2010             mk@mathias-kettner.de |
+# +------------------------------------------------------------------+
+#
+# This file is part of Check_MK.
+# The official homepage is at http://mathias-kettner.de/check_mk.
+#
+# check_mk is free software;  you can redistribute it and/or modify it
+# under the  terms of the  GNU General Public License  as published by
+# the Free Software Foundation in version 2.  check_mk is  distributed
+# in the hope that it will be useful, but WITHOUT ANY WARRANTY;  with-
+# out even the implied warranty of  MERCHANTABILITY  or  FITNESS FOR A
+# PARTICULAR PURPOSE. See the  GNU General Public License for more de-
+# ails.  You should have  received  a copy of the  GNU  General Public
+# License along with GNU Make; see the file  COPYING.  If  not,  write
+# to the Free Software Foundation, Inc., 51 Franklin St,  Fifth Floor,
+# Boston, MA 02110-1301 USA.
+
+# expected line is
+#<time-stamp-epoch> indexer_running <yes/no/NO> <indexing time/age of head-tail file> <head from file> <head from DB> <comment>
+# 
+
+import time
+
+def inventory_indexer_running(info):
+    items = []
+    for line in info:
+        item = line[1]
+        items.append((item, None))
+    return items
+
+
+def check_indexer_running(item, params, info):
+    for line in info:
+        state=3
+        msg="No data for " + line[1]
+        result=state, msg
+        if line[1] == item:
+            sample_epoch=int(line[0])
+            running=line[2]
+            age=line[3]
+            filehead=line[4]
+            dbhead=line[5]
+#            comment=line[6:]
+            curr_epoch=int(time.time())
+            if (sample_epoch + 90) < curr_epoch:
+                state=2             
+                msg="Data is not updated."
+                result=state, msg
+                return result
+            #msg=" ".join(str(w) for w in line[2:])
+            if running == "NO":
+                state=2
+                msg="CRITICAL. Stopped for "+ age +" min. Head in file:"+ filehead +" and DB:" + dbhead  
+            elif running == "no":
+                state=1
+                msg="WARNING. Stopped for "+ age +" min. Head in file:"+ filehead +" and DB:" + dbhead
+            else:
+                state=0
+                msg="OK. Last index took "+ age +" min. Head in file:"+ filehead +" and DB:" + dbhead
+            result=state, msg
+            return result
+
+check_info['indexer_running'] = (
+        check_indexer_running,
+        "%s",
+        1,
+        inventory_indexer_running)

From 558913c36e40cd9c7c0411e3a110ef3fa3f279cd Mon Sep 17 00:00:00 2001
From: saif shams <sshams@vizrt.com>
Date: Fri, 29 May 2015 23:59:28 +0200
Subject: [PATCH 2294/2585] removed an unwanted value from a periodic check
 output

---
 usr/lib/periodic-check/script/indexer_running | 1 -
 1 file changed, 1 deletion(-)

diff --git a/usr/lib/periodic-check/script/indexer_running b/usr/lib/periodic-check/script/indexer_running
index 9c9bc552..b36d5f15 100755
--- a/usr/lib/periodic-check/script/indexer_running
+++ b/usr/lib/periodic-check/script/indexer_running
@@ -36,7 +36,6 @@ if [ "$filehead" == "$dbhead" ]; then
 else
   diff=$(($curr_epoch - $file_epoch))
   diff_min=$(($diff / 60))
-  echo "$diff $max_critical_diff"
   if [ "$diff" -ge "$max_critical_diff" ]; then
     indexer_running=-2
   elif [ "$diff" -ge "$max_warning_diff" ]; then

From 7d31542b8e912526c0d2036c42d682fec2f3e1d5 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Mon, 1 Jun 2015 10:52:54 +0600
Subject: [PATCH 2295/2585] VOSA-166: Fixed parsing of instance_id and ip for
 with new awscli using vosa command

---
 usr/bin/vosa                                      | 7 +++----
 usr/share/vizrt/vosa/commands/ec2-cmd.sh          | 2 +-
 usr/share/vizrt/vosa/commands/ec2-determine-ip.sh | 6 +++++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index a33ef941..1600e747 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -611,7 +611,7 @@ function really_do_status () {
         if [ $done -eq 0 ] ; then
           # Parse the statefile and find its instance ID
           if [ -r $bootstatefile ] ; then
-            aws_instance=$(awk < "$bootstatefile" -F '\t' '/^INSTANCE/ { print $2 }')
+            aws_instance=$(awk < "$bootstatefile" -F '\t' '/^INSTANCE/ { print $8 }')
           fi
           if [ -z $aws_instance ] && [ -r $bootstatefile ] ; then
             aws_instance=$(cut < "$bootstatefile" -f 6 | grep 'i-')
@@ -851,10 +851,9 @@ function do_create() {
       read_amazon_config $instance_dir/amazon.conf
       # TODO: sanitize "required" variables
       if $USE_AWS_CLI ; then
-        json="[{\"device_name\":\"/dev/sda1\", \"ebs\":{\"volume_size\":$amazon_config_initial_disk_size} } ]"
+	json="[{\"DeviceName\":\"/dev/sda1\", \"Ebs\":{\"VolumeSize\":$amazon_config_initial_disk_size} } ]"
         opts=( "--image-id" ${amazon_config_image}
-               "--min-count" "1"
-               "--max-count" "1"
+               "count" "1:1"
         ${amazon_config_availability_zone/#/--placement availability_zone=}  \
         ${amazon_config_type/#/--instance-type }  \
         ${amazon_config_ssh_keypair/#/--key-name }  \
diff --git a/usr/share/vizrt/vosa/commands/ec2-cmd.sh b/usr/share/vizrt/vosa/commands/ec2-cmd.sh
index 868399da..f4dfa9ec 100755
--- a/usr/share/vizrt/vosa/commands/ec2-cmd.sh
+++ b/usr/share/vizrt/vosa/commands/ec2-cmd.sh
@@ -135,7 +135,7 @@ EOF
 function get_aws_instance() {
   bootstatefile=$image/amazon.initialstate
   if [ -r $bootstatefile ] ; then
-    aws_instance=$(awk < "$bootstatefile" -F '\t' '/^INSTANCE/ { print $2 }')
+    aws_instance=$(awk < "$bootstatefile" -F '\t' '/^INSTANCE/ { print $8 }')
   fi
   if [ -z "$aws_instance" ] && [ -r $bootstatefile ] ; then
     # Hope that the 6th field continues to provide "i-"...
diff --git a/usr/share/vizrt/vosa/commands/ec2-determine-ip.sh b/usr/share/vizrt/vosa/commands/ec2-determine-ip.sh
index 987e407a..26a3ad56 100755
--- a/usr/share/vizrt/vosa/commands/ec2-determine-ip.sh
+++ b/usr/share/vizrt/vosa/commands/ec2-determine-ip.sh
@@ -63,9 +63,13 @@ for a in 1 2 3 4 5 6 7 8 9 10 ; do
   if $USE_AWS_CLI ; then
     if [ "$amazon_config_ssh_access" == "public" ] ; then
       ip_address=$(grep $'\ti-' $statefile | cut -f 5)
-      if [[ $ip_address == 172.* ]] || [[ $ip_address == 10.* ]] || [ $ip_address == None ] ; then
+      if [[ $ip_address == 172.* ]] || [[ $ip_address == 10.* ]] || [ $ip_address == None ] || [ "$ip_address" == "False" ] ; then
         ip_address=
       fi
+      if [[ $a == 10 ]] && [ -z "$ip_address" ]; then
+        ip_address=$(grep $'\ti-' $statefile | cut -f 16)
+      fi
+
     else
       ip_address=$(grep $'\ti-' $statefile | cut -f 6)
     fi

From 1e81caf54e7bd3d6f15f16be66358d804d20eec7 Mon Sep 17 00:00:00 2001
From: saif shams <saif@escenic.com>
Date: Mon, 1 Jun 2015 08:43:04 +0200
Subject: [PATCH 2296/2585] added timeout to curl command in site_length check

---
 usr/lib/periodic-check/conf/site_length.conf | 2 ++
 usr/lib/periodic-check/script/site_length    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/usr/lib/periodic-check/conf/site_length.conf b/usr/lib/periodic-check/conf/site_length.conf
index 41643ac5..bed8220f 100644
--- a/usr/lib/periodic-check/conf/site_length.conf
+++ b/usr/lib/periodic-check/conf/site_length.conf
@@ -2,3 +2,5 @@ sites="www.escenic.com
 www.escenic.com/incoming"
 tomcat_port="8040"
 host=localhost
+connection_timeout=5
+max_time=30
diff --git a/usr/lib/periodic-check/script/site_length b/usr/lib/periodic-check/script/site_length
index 73f67617..d1293972 100755
--- a/usr/lib/periodic-check/script/site_length
+++ b/usr/lib/periodic-check/script/site_length
@@ -18,7 +18,7 @@ init
 for line in $sites; do
   epoch=$(date +"%s")
   before=$(date +"%s.%N")
-  size=$(curl -s http://localhost:$tomcat_port -H "Host:$line"| wc -c)
+  size=$(curl --connection-timeout $connection_timeout --max-time $max_time -s http://localhost:$tomcat_port -H "Host:$line"| wc -c)
   after=$(date +"%s.%N")
   if [ "$size" == "" ]; then 
     size="0"

From 69b3fd2c76883275d626ef2e2a05bd72b804311d Mon Sep 17 00:00:00 2001
From: saif shams <saif@escenic.com>
Date: Mon, 1 Jun 2015 09:52:34 +0200
Subject: [PATCH 2297/2585] changed hostname in indexer_running check

---
 usr/lib/periodic-check/script/indexer_running | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/lib/periodic-check/script/indexer_running b/usr/lib/periodic-check/script/indexer_running
index b36d5f15..3930f2dc 100755
--- a/usr/lib/periodic-check/script/indexer_running
+++ b/usr/lib/periodic-check/script/indexer_running
@@ -15,7 +15,7 @@ max_critical_diff=300 #5 minutes
 filehead=$(cat $head_tail_file | grep "head="| sed 's/.*head=after\/\([0-9][0-9]*\).*/\1/')
 file_epoch=$(stat --format "%Y" "$head_tail_file")
 
-dbhead=$(curl -isX PUT "http://uat.bjorgu.cust.vizrtsaas.com:8080/escenic-admin/pages/database/query.jsp?query=select%20max(documentID)%20from%20SearchIndex" | grep -A 2 ">max(documentID)"| tail -n 1 | sed 's/.*>\([0-9][-0-9]*\).*/\1/')
+dbhead=$(curl -isX PUT "http://localhost:8080/escenic-admin/pages/database/query.jsp?query=select%20max(documentID)%20from%20SearchIndex" | grep -A 2 ">max(documentID)"| tail -n 1 | sed 's/.*>\([0-9][-0-9]*\).*/\1/')
 curr_epoch=$(date +%s)
 
 function invalid_diff {
@@ -49,7 +49,7 @@ if [ "$indexer_running" == 1 ]; then
 
   #dbdate=$(echo "select entryUpdated from SearchIndex si where documentID=(select max(documentID) from SearchIndex);"| sudo mysql ece5db | tail -n 2| tail -n 1)
 
-  dbdate=$(curl -isX PUT "http://uat.bjorgu.cust.vizrtsaas.com:8080/escenic-admin/pages/database/query.jsp?query=select%20entryUpdated%20from%20SearchIndex%20si%20where%20documentID%3D$filehead" | grep -A 2 ">entryUpdated"| tail -n 1 | sed 's/.*>\([0-9][-0-9 :-]*\).*/\1/')
+  dbdate=$(curl -isX PUT "http://localhost:8080/escenic-admin/pages/database/query.jsp?query=select%20entryUpdated%20from%20SearchIndex%20si%20where%20documentID%3D$filehead" | grep -A 2 ">entryUpdated"| tail -n 1 | sed 's/.*>\([0-9][-0-9 :-]*\).*/\1/')
 
   db_epoch=$(date --date "$dbdate" +"%s")
   diff=$(($file_epoch - $db_epoch))

From c38bd267eb0ad5bb29316215a44bf2d6df7ef62e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Thu, 28 May 2015 14:04:12 +0200
Subject: [PATCH 2298/2585] Bugfix: fai_databse_install=1 would fail if xml2
 isn't installed

- added pre-requsite on the xml2 package

- added command availability check on html2 (which comes from the xml2
  package).

- this regression was introduced in
  1fab8afde96c232bb13f77696178cfe507c62f3d
---
 usr/sbin/ece-install | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 265a054c..7f0cab0c 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -195,7 +195,7 @@ function download_escenic_components()
           metadata=$(curl -s $repo/$(dirname $el)/maven-metadata.xml)
           local timestamp=$(xmlstarlet <<< "$metadata" sel -t -m /metadata/versioning/snapshot/timestamp -c 'text()')
           local buildnumber=$(xmlstarlet <<< "$metadata"  sel -t -m /metadata/versioning/snapshot/buildNumber -c 'text()')
-          #Now Check the the timestamp and buildnumber is not empty. If not then create the dist name with timestamp and buildnumber. 
+          #Now Check the the timestamp and buildnumber is not empty. If not then create the dist name with timestamp and buildnumber.
           if [[ -n $timestamp && -n $buildnumber ]]; then
           log "Found SNAPSHOT with $timestamp-$buildnumber in $el"
           el=$(dirname $el)/${name/SNAPSHOT/$timestamp-$buildnumber}
@@ -261,7 +261,7 @@ function install_packages_if_missing() {
 function install_common_os_packages()
 {
   print_and_log "Installing common OS packages ..."
-  local packages="curl wget unzip bc ca-certificates"
+  local packages="curl wget unzip bc ca-certificates xml2"
   local git_package=git
 
   if [ $on_debian_or_derivative -eq 1 ]; then
@@ -275,7 +275,7 @@ function install_common_os_packages()
   fi
 
   install_packages_if_missing $packages $git_package
-  assert_commands_available lsb_release curl host wget git unzip
+  assert_commands_available lsb_release curl host wget git unzip html2
 
   # all hosts need the system-info package, hence we'll install the
   # escenic-content-engine package here if on a Debian based

From cce62218aaf0a35c381cba2e5eb009d7d8605b2d Mon Sep 17 00:00:00 2001
From: saif shams <saif@escenic.com>
Date: Mon, 1 Jun 2015 14:48:07 +0200
Subject: [PATCH 2299/2585] added timeout and connect-timeout to curl of
 site_length and indexer_running checks

---
 usr/lib/periodic-check/conf/indexer_running.conf | 2 ++
 usr/lib/periodic-check/conf/site_length.conf     | 4 ++--
 usr/lib/periodic-check/main.conf                 | 2 ++
 usr/lib/periodic-check/script/indexer_running    | 4 ++--
 usr/lib/periodic-check/script/site_length        | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 usr/lib/periodic-check/conf/indexer_running.conf

diff --git a/usr/lib/periodic-check/conf/indexer_running.conf b/usr/lib/periodic-check/conf/indexer_running.conf
new file mode 100644
index 00000000..1844f739
--- /dev/null
+++ b/usr/lib/periodic-check/conf/indexer_running.conf
@@ -0,0 +1,2 @@
+connect_timeout=3
+max_time=10
diff --git a/usr/lib/periodic-check/conf/site_length.conf b/usr/lib/periodic-check/conf/site_length.conf
index bed8220f..604c9eef 100644
--- a/usr/lib/periodic-check/conf/site_length.conf
+++ b/usr/lib/periodic-check/conf/site_length.conf
@@ -2,5 +2,5 @@ sites="www.escenic.com
 www.escenic.com/incoming"
 tomcat_port="8040"
 host=localhost
-connection_timeout=5
-max_time=30
+connect_timeout=5
+max_time=15
diff --git a/usr/lib/periodic-check/main.conf b/usr/lib/periodic-check/main.conf
index 69e04781..a8dcb9b3 100644
--- a/usr/lib/periodic-check/main.conf
+++ b/usr/lib/periodic-check/main.conf
@@ -2,3 +2,5 @@ nagios_cache_dir="/var/cache/periodic-check"
 nagios_lib_dir="/usr/lib/periodic-check"
 state_file="$nagios_lib_dir/periodic-check.state"
 nagios_data_file="$nagios_cache_dir/$(basename $0)"
+connect_timeout=5
+max_time=20
diff --git a/usr/lib/periodic-check/script/indexer_running b/usr/lib/periodic-check/script/indexer_running
index 3930f2dc..fa2dc4d6 100755
--- a/usr/lib/periodic-check/script/indexer_running
+++ b/usr/lib/periodic-check/script/indexer_running
@@ -15,7 +15,7 @@ max_critical_diff=300 #5 minutes
 filehead=$(cat $head_tail_file | grep "head="| sed 's/.*head=after\/\([0-9][0-9]*\).*/\1/')
 file_epoch=$(stat --format "%Y" "$head_tail_file")
 
-dbhead=$(curl -isX PUT "http://localhost:8080/escenic-admin/pages/database/query.jsp?query=select%20max(documentID)%20from%20SearchIndex" | grep -A 2 ">max(documentID)"| tail -n 1 | sed 's/.*>\([0-9][-0-9]*\).*/\1/')
+dbhead=$(curl --connect-timeout $connect_timeout --max-time $max_time -isX PUT "http://localhost:8080/escenic-admin/pages/database/query.jsp?query=select%20max(documentID)%20from%20SearchIndex" | grep -A 2 ">max(documentID)"| tail -n 1 | sed 's/.*>\([0-9][-0-9]*\).*/\1/')
 curr_epoch=$(date +%s)
 
 function invalid_diff {
@@ -49,7 +49,7 @@ if [ "$indexer_running" == 1 ]; then
 
   #dbdate=$(echo "select entryUpdated from SearchIndex si where documentID=(select max(documentID) from SearchIndex);"| sudo mysql ece5db | tail -n 2| tail -n 1)
 
-  dbdate=$(curl -isX PUT "http://localhost:8080/escenic-admin/pages/database/query.jsp?query=select%20entryUpdated%20from%20SearchIndex%20si%20where%20documentID%3D$filehead" | grep -A 2 ">entryUpdated"| tail -n 1 | sed 's/.*>\([0-9][-0-9 :-]*\).*/\1/')
+  dbdate=$(curl --connect-timeout $connect_timeout --max-time $max_time -isX PUT "http://localhost:8080/escenic-admin/pages/database/query.jsp?query=select%20entryUpdated%20from%20SearchIndex%20si%20where%20documentID%3D$filehead" | grep -A 2 ">entryUpdated"| tail -n 1 | sed 's/.*>\([0-9][-0-9 :-]*\).*/\1/')
 
   db_epoch=$(date --date "$dbdate" +"%s")
   diff=$(($file_epoch - $db_epoch))
diff --git a/usr/lib/periodic-check/script/site_length b/usr/lib/periodic-check/script/site_length
index d1293972..fcc0d870 100755
--- a/usr/lib/periodic-check/script/site_length
+++ b/usr/lib/periodic-check/script/site_length
@@ -18,7 +18,7 @@ init
 for line in $sites; do
   epoch=$(date +"%s")
   before=$(date +"%s.%N")
-  size=$(curl --connection-timeout $connection_timeout --max-time $max_time -s http://localhost:$tomcat_port -H "Host:$line"| wc -c)
+  size=$(curl --connect-timeout $connect_timeout --max-time $max_time -s http://localhost:$tomcat_port -H "Host:$line"| wc -c)
   after=$(date +"%s.%N")
   if [ "$size" == "" ]; then 
     size="0"

From 2ed1112f815083dc862b6b1aa4df0dd8d923e761 Mon Sep 17 00:00:00 2001
From: saif shams <saif@escenic.com>
Date: Tue, 2 Jun 2015 10:29:10 +0200
Subject: [PATCH 2300/2585] added graph order to a munin plugin named
 indexer_running

---
 etc/munin/plugins/indexer_running | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/etc/munin/plugins/indexer_running b/etc/munin/plugins/indexer_running
index 56ae7c09..eef8b431 100755
--- a/etc/munin/plugins/indexer_running
+++ b/etc/munin/plugins/indexer_running
@@ -20,6 +20,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_title indexing delay'
 	echo "graph_args --base 1000 -r --lower-limit 0 "
 	echo 'graph_vlabel Minutes'
+        echo 'graph_order indexing_delay'
 #	echo 'graph_scale no'
 	echo 'graph_info Shows the time to get a document indexed by Escenic search. This is basically time difference between update time of head-tail file and entryUpdated field in SearchIndex table.'
 	echo 'graph_category system'
@@ -29,6 +30,7 @@ if [ "$1" = "config" ]; then
 	echo "indexing_delay.min 0"
 	echo "indexing_delay.type GAUGE"
 	echo "indexing_delay.info time in $site in Bytes" 
+        exit 0;
 fi
 
 # Note: Counters/derive need to report integer values.  Also we need

From cbf3f91943522d0fbe077324619798fb88b3d14a Mon Sep 17 00:00:00 2001
From: saif shams <saif@escenic.com>
Date: Tue, 2 Jun 2015 10:31:08 +0200
Subject: [PATCH 2301/2585] removed unused code from idexer_running

---
 etc/munin/plugins/indexer_running | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/etc/munin/plugins/indexer_running b/etc/munin/plugins/indexer_running
index eef8b431..405ce9f5 100755
--- a/etc/munin/plugins/indexer_running
+++ b/etc/munin/plugins/indexer_running
@@ -6,16 +6,6 @@ info_file="/var/cache/periodic-check/indexer_running"
 state=$(cat $info_file | cut -f 3 -d ' ')
 age=$(cat $info_file | cut -f 4 -d ' ')
 
-if [ "$1" = "autoconf" ]; then
-	if [ -r /proc/stat ]; then
-		echo yes
-		exit 0
-	else
-		echo no
-		exit 0
-	fi
-fi
-
 if [ "$1" = "config" ]; then
 	echo 'graph_title indexing delay'
 	echo "graph_args --base 1000 -r --lower-limit 0 "

From 0e0b026dbab488aa356f4835ae338d0fe0d0675e Mon Sep 17 00:00:00 2001
From: saif shams <saif@escenic.com>
Date: Tue, 2 Jun 2015 10:47:36 +0200
Subject: [PATCH 2302/2585] added configuration files to indexer_running

---
 usr/lib/periodic-check/script/indexer_running | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/usr/lib/periodic-check/script/indexer_running b/usr/lib/periodic-check/script/indexer_running
index fa2dc4d6..6227309a 100755
--- a/usr/lib/periodic-check/script/indexer_running
+++ b/usr/lib/periodic-check/script/indexer_running
@@ -8,10 +8,22 @@
 #<time-stamp-epoch> <indexer_running> <yes/no/NO> <indexing time/age of head-tail file> <head from file> <head from DB> <comment>
 #
 
+this_script=$(basename $0)
+
+function init {
+  . "$(dirname $0)/../main.conf"
+  if [ -f "$(dirname $0)/../conf/$this_script.conf" ]; then
+    . "$(dirname $0)/../conf/$this_script.conf"
+  fi
+}
+
+
 head_tail_file="/var/lib/escenic/engine/head-tail.index"
 max_warning_diff=180 #3 minutes
 max_critical_diff=300 #5 minutes
 
+init
+
 filehead=$(cat $head_tail_file | grep "head="| sed 's/.*head=after\/\([0-9][0-9]*\).*/\1/')
 file_epoch=$(stat --format "%Y" "$head_tail_file")
 

From 9cd88e775bc199bd04e93cb6dd05d76c5c231010 Mon Sep 17 00:00:00 2001
From: saif shams <saif@escenic.com>
Date: Tue, 2 Jun 2015 12:12:05 +0200
Subject: [PATCH 2303/2585] added a minor change to indexer_running

---
 usr/lib/periodic-check/script/indexer_running | 2 --
 1 file changed, 2 deletions(-)

diff --git a/usr/lib/periodic-check/script/indexer_running b/usr/lib/periodic-check/script/indexer_running
index 6227309a..753b3ebc 100755
--- a/usr/lib/periodic-check/script/indexer_running
+++ b/usr/lib/periodic-check/script/indexer_running
@@ -9,7 +9,6 @@
 #
 
 this_script=$(basename $0)
-
 function init {
   . "$(dirname $0)/../main.conf"
   if [ -f "$(dirname $0)/../conf/$this_script.conf" ]; then
@@ -17,7 +16,6 @@ function init {
   fi
 }
 
-
 head_tail_file="/var/lib/escenic/engine/head-tail.index"
 max_warning_diff=180 #3 minutes
 max_critical_diff=300 #5 minutes

From a4f2790185a1f4553ef73003107fad10d1e461d6 Mon Sep 17 00:00:00 2001
From: saif shams <saif@escenic.com>
Date: Tue, 2 Jun 2015 13:18:06 +0200
Subject: [PATCH 2304/2585] indexing _running plugin is now aware that 5.6 and
 5.7 has different file format for head-tail file

---
 usr/lib/periodic-check/script/indexer_running | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/usr/lib/periodic-check/script/indexer_running b/usr/lib/periodic-check/script/indexer_running
index 753b3ebc..572dfaf0 100755
--- a/usr/lib/periodic-check/script/indexer_running
+++ b/usr/lib/periodic-check/script/indexer_running
@@ -16,13 +16,22 @@ function init {
   fi
 }
 
+head_56pattern=".*head=[0-9-][0-9]*.*"
+head_57pattern=".*head=after/[0-9-]*.*"
 head_tail_file="/var/lib/escenic/engine/head-tail.index"
 max_warning_diff=180 #3 minutes
 max_critical_diff=300 #5 minutes
 
 init
 
-filehead=$(cat $head_tail_file | grep "head="| sed 's/.*head=after\/\([0-9][0-9]*\).*/\1/')
+filehead=$(cat $head_tail_file | grep "head=")
+if [[ $filehead =~ $head_56pattern ]]; then
+  echo "hello"
+  filehead=$(cat $head_tail_file | grep "head="| sed 's/.*head=\([0-9][0-9]*\).*/\1/')
+elif [[ $filehead =~ $head_57pattern ]]; then
+  filehead=$(cat $head_tail_file | grep "head="| sed 's/.*head=after\/\([0-9][0-9]*\).*/\1/')
+fi
+
 file_epoch=$(stat --format "%Y" "$head_tail_file")
 
 dbhead=$(curl --connect-timeout $connect_timeout --max-time $max_time -isX PUT "http://localhost:8080/escenic-admin/pages/database/query.jsp?query=select%20max(documentID)%20from%20SearchIndex" | grep -A 2 ">max(documentID)"| tail -n 1 | sed 's/.*>\([0-9][-0-9]*\).*/\1/')

From 8698f24ab22a142b7090256e8e00d8e272cdc3bb Mon Sep 17 00:00:00 2001
From: saif shams <saif@escenic.com>
Date: Wed, 3 Jun 2015 08:59:48 +0200
Subject: [PATCH 2305/2585] removed a debug message

---
 usr/lib/periodic-check/script/indexer_running | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/usr/lib/periodic-check/script/indexer_running b/usr/lib/periodic-check/script/indexer_running
index 572dfaf0..f59831c1 100755
--- a/usr/lib/periodic-check/script/indexer_running
+++ b/usr/lib/periodic-check/script/indexer_running
@@ -9,29 +9,30 @@
 #
 
 this_script=$(basename $0)
+
 function init {
   . "$(dirname $0)/../main.conf"
   if [ -f "$(dirname $0)/../conf/$this_script.conf" ]; then
     . "$(dirname $0)/../conf/$this_script.conf"
   fi
 }
-
 head_56pattern=".*head=[0-9-][0-9]*.*"
 head_57pattern=".*head=after/[0-9-]*.*"
 head_tail_file="/var/lib/escenic/engine/head-tail.index"
 max_warning_diff=180 #3 minutes
 max_critical_diff=300 #5 minutes
-
 init
 
+#filehead=$(cat $head_tail_file | grep "head="| sed 's/.*head=after\/\([0-9][0-9]*\).*/\1/')
+
 filehead=$(cat $head_tail_file | grep "head=")
 if [[ $filehead =~ $head_56pattern ]]; then
-  echo "hello"
   filehead=$(cat $head_tail_file | grep "head="| sed 's/.*head=\([0-9][0-9]*\).*/\1/')
 elif [[ $filehead =~ $head_57pattern ]]; then
   filehead=$(cat $head_tail_file | grep "head="| sed 's/.*head=after\/\([0-9][0-9]*\).*/\1/')
 fi
 
+
 file_epoch=$(stat --format "%Y" "$head_tail_file")
 
 dbhead=$(curl --connect-timeout $connect_timeout --max-time $max_time -isX PUT "http://localhost:8080/escenic-admin/pages/database/query.jsp?query=select%20max(documentID)%20from%20SearchIndex" | grep -A 2 ">max(documentID)"| tail -n 1 | sed 's/.*>\([0-9][-0-9]*\).*/\1/')
@@ -39,8 +40,8 @@ curr_epoch=$(date +%s)
 
 function invalid_diff {
   #valid difference must be more than 0 
-  re="^[-0-9]+$"
-  if [[ "$1" =~ $re ]] && [[ "$1" -ge 0 ]]; then
+  re="^[-0-9][0-9]*$"
+  if [[ $1 =~ $re ]] && [[ "$1" -ge 0 ]] && [[ $1 -le 10 ]]; then
     echo "0"
     return 0
   else
@@ -69,7 +70,6 @@ if [ "$indexer_running" == 1 ]; then
   #dbdate=$(echo "select entryUpdated from SearchIndex si where documentID=(select max(documentID) from SearchIndex);"| sudo mysql ece5db | tail -n 2| tail -n 1)
 
   dbdate=$(curl --connect-timeout $connect_timeout --max-time $max_time -isX PUT "http://localhost:8080/escenic-admin/pages/database/query.jsp?query=select%20entryUpdated%20from%20SearchIndex%20si%20where%20documentID%3D$filehead" | grep -A 2 ">entryUpdated"| tail -n 1 | sed 's/.*>\([0-9][-0-9 :-]*\).*/\1/')
-
   db_epoch=$(date --date "$dbdate" +"%s")
   diff=$(($file_epoch - $db_epoch))
   diff_min=$(($diff / 60))
@@ -89,4 +89,3 @@ else
   echo "indexer_running NO -1 $filehead $dbhead UNKNOWN"
 fi 
 
-

From 60dcf7c82acc4419b99552f04b2136789b25fcc5 Mon Sep 17 00:00:00 2001
From: saif shams <saif@escenic.com>
Date: Wed, 3 Jun 2015 13:40:56 +0200
Subject: [PATCH 2306/2585] avoided read while writing periodic checks

---
 etc/cron.d/periodic-check   | 2 +-
 usr/lib/periodic-check/main | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/etc/cron.d/periodic-check b/etc/cron.d/periodic-check
index 2e2bbad7..9f3fae0b 100644
--- a/etc/cron.d/periodic-check
+++ b/etc/cron.d/periodic-check
@@ -1,4 +1,4 @@
 MAILTO=root
 
-* * * * *     nagios if [ -x /usr/lib/periodic-check/main ]; then /usr/lib/periodic-check/main; fi
+* * * * *     nagios /bin/sleep 20; if [ -x /usr/lib/periodic-check/main ]; then /usr/lib/periodic-check/main; fi
 
diff --git a/usr/lib/periodic-check/main b/usr/lib/periodic-check/main
index 5df65c9f..495939b6 100755
--- a/usr/lib/periodic-check/main
+++ b/usr/lib/periodic-check/main
@@ -16,7 +16,8 @@ init
 for script in `ls $nagios_lib_dir/script/`; do
   if [ -f "$nagios_lib_dir/script/$script" -a -x "$nagios_lib_dir/script/$script" ]; then
     nagios_data_file="$nagios_cache_dir/$(basename $script)"
-    $nagios_lib_dir/script/$script > $nagios_data_file
+    $nagios_lib_dir/script/$script > .$nagios_data_file.tmp
+    mv .$nagios_data_file.tmp $nagios_data_file
   fi
 done
 

From ffce675501ef238db693b3d64b5362ab542f06aa Mon Sep 17 00:00:00 2001
From: saif shams <saif@escenic.com>
Date: Wed, 3 Jun 2015 15:20:39 +0200
Subject: [PATCH 2307/2585] tuned head-tail file update period and fixed read
 after write issue

---
 usr/lib/periodic-check/conf/indexer_running.conf | 3 +++
 usr/lib/periodic-check/main                      | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/usr/lib/periodic-check/conf/indexer_running.conf b/usr/lib/periodic-check/conf/indexer_running.conf
index 1844f739..f13eccf7 100644
--- a/usr/lib/periodic-check/conf/indexer_running.conf
+++ b/usr/lib/periodic-check/conf/indexer_running.conf
@@ -1,2 +1,5 @@
 connect_timeout=3
 max_time=10
+max_warning_diff=300 #5 minutes
+max_critical_diff=600 #10 minutes
+
diff --git a/usr/lib/periodic-check/main b/usr/lib/periodic-check/main
index 495939b6..d35a22da 100755
--- a/usr/lib/periodic-check/main
+++ b/usr/lib/periodic-check/main
@@ -16,8 +16,10 @@ init
 for script in `ls $nagios_lib_dir/script/`; do
   if [ -f "$nagios_lib_dir/script/$script" -a -x "$nagios_lib_dir/script/$script" ]; then
     nagios_data_file="$nagios_cache_dir/$(basename $script)"
-    $nagios_lib_dir/script/$script > .$nagios_data_file.tmp
-    mv .$nagios_data_file.tmp $nagios_data_file
+    tmp_data_file="$nagios_cache_dir/.$(basename $script).tmp"
+    $nagios_lib_dir/script/$script > $tmp_data_file
+    sleep 1
+    mv $tmp_data_file $nagios_data_file
   fi
 done
 

From 09b5621639a3d0fc994a96db2692e296d755fe32 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Mon, 1 Jun 2015 10:14:44 +0200
Subject: [PATCH 2308/2585] Improved common-os::has_oracle_java_installed

- will no work with any JVM installed with DEB packages, i.e. under
  /usr/lib/jvm

- earlier, it searched for given JVM versions (and directory names),
  using find -maxdepth 3, it'll work with any version of JVM installed
  with DEB packages following the Debian conventions/policies for Java
  packages.
---
 usr/share/escenic/ece-scripts/common-os.sh | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index 4c783e76..6cbe6fb3 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -45,11 +45,19 @@ function get_user_home_directory() {
 ### has_oracle_java_installed
 ## Will return 1 if the system has Sun/Oracle Java installed.
 function has_oracle_java_installed() {
-  if [[ -x /usr/lib/jvm/java-6-oracle/bin/java || \
-    $(java -version 2>&1 > /dev/null | grep HotSpot | wc -l) -gt 0 ]]; then
-    echo 1
-  elif [[ -x /usr/lib/jvm/java-7-oracle/bin/java || \
-    $(java -version 2>&1 > /dev/null | grep HotSpot | wc -l) -gt 0 ]]; then
+  local java_bin_list=$(
+    find /usr/lib/jvm -maxdepth 3 -name java -type f -executable)
+
+  for java_bin in ${java_bin_list}; do
+    local hit=$(${java_bin} -version 2>&1 > /dev/null | grep HotSpot | wc -l)
+    if [ ${hit} -gt 0 ]; then
+        echo 1
+        return
+    fi
+  done
+
+  # fallback
+  if [[ $(java -version 2>&1 > /dev/null | grep HotSpot | wc -l) -gt 0 ]]; then
     echo 1
   else
     echo 0

From 1ef0519444f9512b9562bd32910c7bb8b1fbd555 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Thu, 4 Jun 2015 13:31:27 +0200
Subject: [PATCH 2309/2585] Updated fallback_tomcat_url

---
 usr/share/escenic/ece-scripts/common-os.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index 6cbe6fb3..26a9f735 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -8,7 +8,7 @@
 common_bashing_is_loaded > /dev/null 2>&1 || source $(pwd)/common-bashing.sh
 
 ## Only used if the Tomcat download mirror couldn't be determined
-fallback_tomcat_url="http://apache.komsys.org/tomcat/tomcat-6/v6.0.37/bin/apache-tomcat-6.0.37.tar.gz"
+fallback_tomcat_url="http://apache.uib.no/tomcat/tomcat-7/v7.0.62/bin/apache-tomcat-7.0.62.tar.gz"
 
 # Can be used like this:
 # common_io_os_loaded 2>/dev/null || source common-os.sh

From 3b6d7b368d2e25ca66258c022a36fb6caea15825 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Thu, 4 Jun 2015 13:42:58 +0200
Subject: [PATCH 2310/2585] Fixed bug in curl_download_uri_target_to_dir

- curl has no --o (it has -o, see man curl), regression bug introduced
  in 7aba83f8

- replaced curl short options with long options as they're easier to read.

- removed trailing white space
---
 usr/share/escenic/ece-scripts/common-io.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/common-io.sh b/usr/share/escenic/ece-scripts/common-io.sh
index a0cf4ae8..becc5ea9 100644
--- a/usr/share/escenic/ece-scripts/common-io.sh
+++ b/usr/share/escenic/ece-scripts/common-io.sh
@@ -124,7 +124,7 @@ function download_uri_target_to_dir() {
     if [ -z $target_file ] ; then
       target_file=$(basename $uri)
     fi
-    
+
     log "Downloading" $uri "to" $target_dir "..."
     run cd $target_dir
     run wget \
@@ -144,8 +144,8 @@ function download_uri_target_to_dir() {
     run s3cmd get $uri $target_file
 
   else
-    
-    local file=$uri    
+
+    local file=$uri
     if [[ $uri == "file://"* ]] ; then
       # length of file:// is 7
       file=${file:7}
@@ -178,12 +178,12 @@ function curl_download_uri_target_to_dir() {
     if [ -z $target_file ] ; then
       target_file=$(basename $uri)
     fi
-    
+
     log "Downloading" $uri "to" $target_dir "..."
     run cd $target_dir
     run curl \
-      -L \
-      --o "$target_file" \
+      --location \
+      --output "$target_file" \
       $uri
   fi
 }

From 0c8ff3ed43f144142d461f2c5ef79aa783191b56 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Thu, 4 Jun 2015 13:49:14 +0200
Subject: [PATCH 2311/2585] Updated default value for java_home in ece.conf

- set it to /usr/lib/jvm/jdk-8-oracle-x64 as this is what the package
  'java-package' sets up these days (and we don't have official
  packages of Oracle Java).

  To create this package, download the Java 8 JDK from java.oracle.com
  and run make-jpkg on it (and install it with dpkg -i).
---
 etc/escenic/ece.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/escenic/ece.conf b/etc/escenic/ece.conf
index 4f523aec..46f874b7 100644
--- a/etc/escenic/ece.conf
+++ b/etc/escenic/ece.conf
@@ -33,7 +33,7 @@ ece_home=/opt/escenic/engine
 #########################################################################
 # Setting the java home, yes lowercase is correct ;-)
 #########################################################################
-java_home=/usr/lib/jvm/java-6-sun
+java_home=/usr/lib/jvm/jdk-8-oracle-x64
 
 #########################################################################
 # Possible options are: tomcat, jboss, resin & oc4j

From 522aca4bdc37649554bebd130144918de5d67d45 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Thu, 4 Jun 2015 14:12:53 +0200
Subject: [PATCH 2312/2585] We're Escenic now :-)

- Changed title in ece-install doc: Vizrt -> Escenic

- Changed the signature in the success message given to the user when
  he/she has run ECE.
---
 usr/sbin/ece-install                        | 2 +-
 usr/share/doc/escenic/ece-install-guide.org | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 7f0cab0c..3f7fc082 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -424,7 +424,7 @@ function print_status_and_next_steps()
     print_next_step_list
 
     print $'\n'"Enjoy your time with Escenic Content Engine!"$'\n'
-    print "-$(red Vizrt) Online"
+    print "-$(red Escenic)"
 }
 
 function check_for_required_downloads()
diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index f1d1798f..5f15a03f 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -1,6 +1,6 @@
 
 #+TITLE: Escenic Installer User Guide
-#+AUTHOR: Vizrt Online / The SaaS Team
+#+AUTHOR: Escenic / The SaaS Team
 #+OPTIONS: H:6 num:5 toc:2
 
 * NAME
@@ -1031,7 +1031,7 @@ the *ece-install.conf*:
   the *ece-install* command downloads. If you wish to turn this
   feature off, set this to *0*.
 
-- *fai\_server\_java\_version* The java version to use. 
+- *fai\_server\_java\_version* The java version to use.
   Only allowable values are 1.6 and 1.7.
   The default is 1.6
 

From bb577fb2b7e583a4adb0daf3f76f7471b59d51bc Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 5 Jun 2015 09:43:12 +0200
Subject: [PATCH 2313/2585] Added possibility to skip installing system-info

- new parameter fai_system_info_skip

- default is 0, so system-info (and lighttpd++) will be installed as
  before if the user doesn't set fai_system_info_skip=1 in his/her
  ece-install.conf
---
 usr/sbin/ece-install | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 3f7fc082..4bd1cfb7 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -863,7 +863,9 @@ function common_post_install() {
     fi
   fi
 
-  install_system_info
+  if [ ${fai_system_info_skip-0} -eq 1 ]; then
+      install_system_info
+  fi
   set_correct_permissions
 
   print_status_and_next_steps

From 656c4194808f5a79298d7d30cfc1eb688da01d66 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 5 Jun 2015 14:57:34 +0200
Subject: [PATCH 2314/2585] Fix: assemblytool is no longer extracted in two
 directories

- fix in set_up_engine_and_plugins where AT would be extracted as a
  along with the plugins, which resulted in its contents being
  scattered all over /opt/escenic, leaving quite a mess since AT isn't
  archived with a top directory.

- now, AT is only installed one place, namely
  /opt/escenic/assemblytool :)
---
 .../escenic/ece-scripts/ece-install.d/content-engine.sh   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index bf73c75a..8c148c7c 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -216,7 +216,7 @@ function create_ear_download_list() {
     # or com.escenic.plugins.forum:forum:zip:3.2.1.132293
     # groupid:artifactid:[packaging:[classifier:]]version
 
-    # chomp groupid: --> artifactid:[packaging:[classifier:]]version 
+    # chomp groupid: --> artifactid:[packaging:[classifier:]]version
     groupid=${coordinate/:*}
     coordinate=${coordinate#${groupid}:}
 
@@ -305,6 +305,10 @@ function set_up_engine_and_plugins() {
     if [[ "$el" == engine-* ]]; then
       continue
     fi
+    # We handle AT explicitly in set_up_assembly_tool
+    if [[ ${file} == assemblytool* ]]; then
+      continue
+    fi
     run unzip -q -u -o $download_dir/$file
   done
 
@@ -560,7 +564,7 @@ EOF
   fi
 
   file=$common_nursery_dir/com/escenic/webstart/StudioConfig.properties
-  
+
   cat >> $file <<EOF
 # This font have been tested and works with (at least): English,
 # Norwegian & Tamil. The font comes with (at least) MS Office and OS X

From 8f62c3060ba4a08835fd96d46b1af8ddccc0b827 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Mon, 15 Jun 2015 13:55:37 +0200
Subject: [PATCH 2315/2585] Don't add memcached JAR to assemblytool/lib

- since ECE now ships with memcached JAR in engine/lib, ece-install
  shouldn't download and set it up in AT either as this duplication of
  classes in the classloader leads to errors like these:

  Caused by: java.lang.VerifyError: Bad type on operand stack
  Exception Details:
    Location:
      com/whalin/MemCached/MemCachedClient.<init>(Ljava/lang/String;ZZ)V @26: putfield
    Reason:
      Type 'com/schooner/MemCached/BinaryClient' (current frame, stack[1]) is not assignable to 'com/whalin/MemCached/MemCachedClient'
    Current Frame:
      bci: @26
      flags: { }
      locals: { 'com/whalin/MemCached/MemCachedClient', 'java/lang/String', integer, integer }
      stack: { 'com/whalin/MemCached/MemCachedClient', 'com/schooner/MemCached/BinaryClient' }
    Bytecode:
      0x0000000: 2ab7 0003 2a12 04b6 0005 b500 061d 9900
      0x0000010: 122a bb00 0859 2bb7 0009 b500 01a7 001e
      0x0000020: 2a1c 9900 0ebb 000a 592b b700 0ba7 000b
      0x0000030: bb00 0c59 2bb7 000d b500 01b1
    Stackmap Table:
      full_frame(@32,{Object[#252],Object[#253],Integer,Integer},{})
      same_locals_1_stack_item_frame(@48,Object[#254])
      full_frame(@56,{Object[#252],Object[#253],Integer,Integer},{Object[#254],Object[#252]})
      same_frame(@59)

- change to ECE distribution done in VF-4960, p4 change 140500
---
 .../escenic/ece-scripts/ece-install.d/memory-cache.sh  | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh b/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
index 47eeec1a..bc3ef32d 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
@@ -1,23 +1,15 @@
 # ece-install module for installing the memory cache
 
-memcached_java_lib_url=https://github.com/downloads/gwhalin/Memcached-Java-Client/java_memcached-release_2.5.3.jar
-
 function install_memory_cache()
 {
   print "Installing a distributed memory cache on $HOSTNAME ..."
-  
+
   install_packages_if_missing "memcached"
   if [ $on_redhat_or_derivative -eq 1 ]; then
     run /etc/init.d/memcached restart
   fi
   
   assert_commands_available memcached
-
-  print_and_log "Downloading the memcached java library ..."
-  curl_download_uri_target_to_dir $memcached_java_lib_url $download_dir
-
-  make_dir ${escenic_root_dir}/assemblytool/lib
-  run cp $(basename $memcached_java_lib_url) ${escenic_root_dir}/assemblytool/lib
   memcached_set_up_common_nursery
 
   # ece deploy will set up the necessary in-publication Nursery

From aec211463ce18eed4cfb04f5402afd6a91323d7f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Tue, 16 Jun 2015 11:28:25 +0200
Subject: [PATCH 2316/2585] /etc/init.d/ece is now much faster on large
 installations

- Whenever invoked the init.d script would check to see if a list of
  directories existed and had the correct user and group ownership.

  This is important to do on a regular basis since people might
  start/stop ECE using the wrong UNIX user, causing all the files
  created by ECE to be owned by the wrong user, which again causes all
  kinds of problems.

- For this reason, the init.d script would recursively traverse these
  directories and apply the correct user/group on them and their
  files. However, with large /var/{lib,cache}/escenic directories,
  this would cause a significant slowdown.

  Therefore, the init.d script now only does user/group enforcement on
  the top level directory of /var/lib/escenic and /var/cache/escenic.

  The full enforcement is still applied to the other directories,
  including /varlog/escenic.com.
---
 etc/init.d/ece | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/etc/init.d/ece b/etc/init.d/ece
index 0c358b76..8315cef9 100755
--- a/etc/init.d/ece
+++ b/etc/init.d/ece
@@ -15,7 +15,7 @@
 #################################################################
 # Usage:
 # * copy this script to /etc/init.d/ece
-# 
+#
 # * copy its configuration file to /etc/default/ece (or
 # * /etc/conf.d/ece on Gentoo based disitributions)
 #
@@ -77,10 +77,13 @@ function ensure_dirs_are_ok()
         if [ ! -d $el ]; then
             mkdir -p $el
         fi
-        
-        chown --changes $ece_unix_user:$ece_unix_group $el
-    done
 
+        if [[ ${el} == "/var/cache"* || ${el} == "/var/lib"* ]]; then
+            chown --changes $ece_unix_user:$ece_unix_group $el
+        else
+            chown --recursive --changes $ece_unix_user:$ece_unix_group $el
+        fi
+    done
 }
 
 function ensure_ece_script_is_ok()
@@ -92,7 +95,7 @@ function ensure_ece_script_is_ok()
         echo "$ece_script needs to be executable (do: chmod +x $ece_script)"
         exit 1
     fi
-    
+
 }
 
 function execute_command()
@@ -100,11 +103,11 @@ function execute_command()
     if [ $enable_rmi_hub -eq 1 ]; then
         su - $ece_unix_user -c "$ece_script -t rmi-hub $1"
     fi
-    
+
     for el in $engine_instance_list; do
         su - $ece_unix_user -c "$ece_script -t engine -i $el $1"
     done
-    
+
     for el in $search_instance_list; do
         su - $ece_unix_user -c "$ece_script -t search -i $el $1"
     done

From 8551e6e3f04b9850c67f94b2f381ee1e8a03c2a4 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Thu, 6 Aug 2015 15:46:54 +0200
Subject: [PATCH 2317/2585] Fixed the guide urls with escenic repo

---
 README | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/README b/README
index 6f81343c..665512bb 100644
--- a/README
+++ b/README
@@ -22,27 +22,27 @@ documentational purposes :-)
 ===================================
 Features of the /usr/bin/ece script
 ===================================
-https://github.com/vizrt/ece-scripts/blob/master/usr/share/doc/escenic/ece-guide.org
+https://github.com/escenic/ece-scripts/blob/master/usr/share/doc/escenic/ece-guide.org
 
 ===================================
 Features of the /usr/bin/ece-import script
 ===================================
-https://github.com/vizrt/ece-scripts/blob/master/usr/share/doc/escenic/ece-import-guide.org
+https://github.com/escenic/ece-scripts/blob/master/usr/share/doc/escenic/ece-import-guide.org
 
 ============================================
 Features of the /usr/sbin/ece-install script
 ============================================
-https://github.com/vizrt/ece-scripts/blob/master/usr/share/doc/escenic/ece-install-guide.org
+https://github.com/escenic/ece-scripts/blob/master/usr/share/doc/escenic/ece-install-guide.org
 
 ===========================================
 Features of the /usr/bin/system-info script
 ===========================================
-https://github.com/vizrt/ece-scripts/blob/master/usr/share/doc/escenic/system-info-guide.org
+https://github.com/escenic/ece-scripts/blob/master/usr/share/doc/escenic/system-info-guide.org
 
 ====================================
 Features of the /usr/bin/vosa script
 ====================================
-https://github.com/vizrt/ece-scripts/blob/master/usr/share/doc/vizrt/vosa-guide.org
+https://github.com/escenic/ece-scripts/blob/master/usr/share/doc/vizrt/vosa-guide.org
 
 ========
 Feedback

From 2000e72f43b02346fd675e9e1fc5c3499193fc90 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Thu, 28 May 2015 14:04:12 +0200
Subject: [PATCH 2318/2585] Bugfix: fai_databse_install=1 would fail if xml2
 isn't installed

- added pre-requsite on the xml2 package

- added command availability check on html2 (which comes from the xml2
  package).

- this regression was introduced in
  1fab8afde96c232bb13f77696178cfe507c62f3d
---
 usr/sbin/ece-install | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index c5a11984..8ee62a63 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -195,7 +195,7 @@ function download_escenic_components()
           metadata=$(curl -s $repo/$(dirname $el)/maven-metadata.xml)
           local timestamp=$(xmlstarlet <<< "$metadata" sel -t -m /metadata/versioning/snapshot/timestamp -c 'text()')
           local buildnumber=$(xmlstarlet <<< "$metadata"  sel -t -m /metadata/versioning/snapshot/buildNumber -c 'text()')
-          #Now Check the the timestamp and buildnumber is not empty. If not then create the dist name with timestamp and buildnumber. 
+          #Now Check the the timestamp and buildnumber is not empty. If not then create the dist name with timestamp and buildnumber.
           if [[ -n $timestamp && -n $buildnumber ]]; then
           log "Found SNAPSHOT with $timestamp-$buildnumber in $el"
           el=$(dirname $el)/${name/SNAPSHOT/$timestamp-$buildnumber}
@@ -261,7 +261,7 @@ function install_packages_if_missing() {
 function install_common_os_packages()
 {
   print_and_log "Installing common OS packages ..."
-  local packages="curl wget unzip bc ca-certificates"
+  local packages="curl wget unzip bc ca-certificates xml2"
   local git_package=git
 
   if [ $on_debian_or_derivative -eq 1 ]; then
@@ -275,7 +275,7 @@ function install_common_os_packages()
   fi
 
   install_packages_if_missing $packages $git_package
-  assert_commands_available lsb_release curl host wget git unzip
+  assert_commands_available lsb_release curl host wget git unzip html2
 
   # all hosts need the system-info package, hence we'll install the
   # escenic-content-engine package here if on a Debian based

From 6417f09d80cacf5138991a13638981c1ec89ee1c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Mon, 15 Jun 2015 13:55:37 +0200
Subject: [PATCH 2319/2585] Don't add memcached JAR to assemblytool/lib

- since ECE now ships with memcached JAR in engine/lib, ece-install
  shouldn't download and set it up in AT either as this duplication of
  classes in the classloader leads to errors like these:

  Caused by: java.lang.VerifyError: Bad type on operand stack
  Exception Details:
    Location:
      com/whalin/MemCached/MemCachedClient.<init>(Ljava/lang/String;ZZ)V @26: putfield
    Reason:
      Type 'com/schooner/MemCached/BinaryClient' (current frame, stack[1]) is not assignable to 'com/whalin/MemCached/MemCachedClient'
    Current Frame:
      bci: @26
      flags: { }
      locals: { 'com/whalin/MemCached/MemCachedClient', 'java/lang/String', integer, integer }
      stack: { 'com/whalin/MemCached/MemCachedClient', 'com/schooner/MemCached/BinaryClient' }
    Bytecode:
      0x0000000: 2ab7 0003 2a12 04b6 0005 b500 061d 9900
      0x0000010: 122a bb00 0859 2bb7 0009 b500 01a7 001e
      0x0000020: 2a1c 9900 0ebb 000a 592b b700 0ba7 000b
      0x0000030: bb00 0c59 2bb7 000d b500 01b1
    Stackmap Table:
      full_frame(@32,{Object[#252],Object[#253],Integer,Integer},{})
      same_locals_1_stack_item_frame(@48,Object[#254])
      full_frame(@56,{Object[#252],Object[#253],Integer,Integer},{Object[#254],Object[#252]})
      same_frame(@59)

- change to ECE distribution done in VF-4960, p4 change 140500
---
 .../escenic/ece-scripts/ece-install.d/memory-cache.sh  | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh b/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
index 47eeec1a..bc3ef32d 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
@@ -1,23 +1,15 @@
 # ece-install module for installing the memory cache
 
-memcached_java_lib_url=https://github.com/downloads/gwhalin/Memcached-Java-Client/java_memcached-release_2.5.3.jar
-
 function install_memory_cache()
 {
   print "Installing a distributed memory cache on $HOSTNAME ..."
-  
+
   install_packages_if_missing "memcached"
   if [ $on_redhat_or_derivative -eq 1 ]; then
     run /etc/init.d/memcached restart
   fi
   
   assert_commands_available memcached
-
-  print_and_log "Downloading the memcached java library ..."
-  curl_download_uri_target_to_dir $memcached_java_lib_url $download_dir
-
-  make_dir ${escenic_root_dir}/assemblytool/lib
-  run cp $(basename $memcached_java_lib_url) ${escenic_root_dir}/assemblytool/lib
   memcached_set_up_common_nursery
 
   # ece deploy will set up the necessary in-publication Nursery

From 2aca2467b71000d84c6cd5bacc77641078f6aff6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 5 Jun 2015 14:57:34 +0200
Subject: [PATCH 2320/2585] Fix: assemblytool is no longer extracted in two
 directories

- fix in set_up_engine_and_plugins where AT would be extracted as a
  along with the plugins, which resulted in its contents being
  scattered all over /opt/escenic, leaving quite a mess since AT isn't
  archived with a top directory.

- now, AT is only installed one place, namely
  /opt/escenic/assemblytool :)
---
 .../escenic/ece-scripts/ece-install.d/content-engine.sh   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index bf73c75a..8c148c7c 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -216,7 +216,7 @@ function create_ear_download_list() {
     # or com.escenic.plugins.forum:forum:zip:3.2.1.132293
     # groupid:artifactid:[packaging:[classifier:]]version
 
-    # chomp groupid: --> artifactid:[packaging:[classifier:]]version 
+    # chomp groupid: --> artifactid:[packaging:[classifier:]]version
     groupid=${coordinate/:*}
     coordinate=${coordinate#${groupid}:}
 
@@ -305,6 +305,10 @@ function set_up_engine_and_plugins() {
     if [[ "$el" == engine-* ]]; then
       continue
     fi
+    # We handle AT explicitly in set_up_assembly_tool
+    if [[ ${file} == assemblytool* ]]; then
+      continue
+    fi
     run unzip -q -u -o $download_dir/$file
   done
 
@@ -560,7 +564,7 @@ EOF
   fi
 
   file=$common_nursery_dir/com/escenic/webstart/StudioConfig.properties
-  
+
   cat >> $file <<EOF
 # This font have been tested and works with (at least): English,
 # Norwegian & Tamil. The font comes with (at least) MS Office and OS X

From 4f7ad31e4dcbc3bd5dab7c42b7ddec9915ce0644 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 5 Jun 2015 09:43:12 +0200
Subject: [PATCH 2321/2585] Added possibility to skip installing system-info

- new parameter fai_system_info_skip

- default is 0, so system-info (and lighttpd++) will be installed as
  before if the user doesn't set fai_system_info_skip=1 in his/her
  ece-install.conf
---
 usr/sbin/ece-install | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 8ee62a63..30c74e53 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -848,7 +848,9 @@ function common_post_install() {
   add_ece_init_to_runlevels
 
 
-  install_system_info
+  if [ ${fai_system_info_skip-0} -eq 1 ]; then
+      install_system_info
+  fi
   set_correct_permissions
 
   print_status_and_next_steps

From e45895d477ce6cb3626b4195435b739bac550345 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Thu, 4 Jun 2015 14:12:53 +0200
Subject: [PATCH 2322/2585] We're Escenic now :-)

- Changed title in ece-install doc: Vizrt -> Escenic

- Changed the signature in the success message given to the user when
  he/she has run ECE.
---
 usr/sbin/ece-install                        | 2 +-
 usr/share/doc/escenic/ece-install-guide.org | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 30c74e53..0e8d7e26 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -424,7 +424,7 @@ function print_status_and_next_steps()
     print_next_step_list
 
     print $'\n'"Enjoy your time with Escenic Content Engine!"$'\n'
-    print "-$(red Vizrt) Online"
+    print "-$(red Escenic)"
 }
 
 function check_for_required_downloads()
diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index f1d1798f..5f15a03f 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -1,6 +1,6 @@
 
 #+TITLE: Escenic Installer User Guide
-#+AUTHOR: Vizrt Online / The SaaS Team
+#+AUTHOR: Escenic / The SaaS Team
 #+OPTIONS: H:6 num:5 toc:2
 
 * NAME
@@ -1031,7 +1031,7 @@ the *ece-install.conf*:
   the *ece-install* command downloads. If you wish to turn this
   feature off, set this to *0*.
 
-- *fai\_server\_java\_version* The java version to use. 
+- *fai\_server\_java\_version* The java version to use.
   Only allowable values are 1.6 and 1.7.
   The default is 1.6
 

From 936115232ecf0d24e86c199d6183b433ddca920f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Thu, 4 Jun 2015 13:49:14 +0200
Subject: [PATCH 2323/2585] Updated default value for java_home in ece.conf

- set it to /usr/lib/jvm/jdk-8-oracle-x64 as this is what the package
  'java-package' sets up these days (and we don't have official
  packages of Oracle Java).

  To create this package, download the Java 8 JDK from java.oracle.com
  and run make-jpkg on it (and install it with dpkg -i).
---
 etc/escenic/ece.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/escenic/ece.conf b/etc/escenic/ece.conf
index 4f523aec..46f874b7 100644
--- a/etc/escenic/ece.conf
+++ b/etc/escenic/ece.conf
@@ -33,7 +33,7 @@ ece_home=/opt/escenic/engine
 #########################################################################
 # Setting the java home, yes lowercase is correct ;-)
 #########################################################################
-java_home=/usr/lib/jvm/java-6-sun
+java_home=/usr/lib/jvm/jdk-8-oracle-x64
 
 #########################################################################
 # Possible options are: tomcat, jboss, resin & oc4j

From e758146b80b2a94f5fa14c275fdb0a7f55019a64 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Thu, 4 Jun 2015 13:42:58 +0200
Subject: [PATCH 2324/2585] Fixed bug in curl_download_uri_target_to_dir

- curl has no --o (it has -o, see man curl), regression bug introduced
  in 7aba83f8

- replaced curl short options with long options as they're easier to read.

- removed trailing white space
---
 usr/share/escenic/ece-scripts/common-io.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/common-io.sh b/usr/share/escenic/ece-scripts/common-io.sh
index a0cf4ae8..becc5ea9 100644
--- a/usr/share/escenic/ece-scripts/common-io.sh
+++ b/usr/share/escenic/ece-scripts/common-io.sh
@@ -124,7 +124,7 @@ function download_uri_target_to_dir() {
     if [ -z $target_file ] ; then
       target_file=$(basename $uri)
     fi
-    
+
     log "Downloading" $uri "to" $target_dir "..."
     run cd $target_dir
     run wget \
@@ -144,8 +144,8 @@ function download_uri_target_to_dir() {
     run s3cmd get $uri $target_file
 
   else
-    
-    local file=$uri    
+
+    local file=$uri
     if [[ $uri == "file://"* ]] ; then
       # length of file:// is 7
       file=${file:7}
@@ -178,12 +178,12 @@ function curl_download_uri_target_to_dir() {
     if [ -z $target_file ] ; then
       target_file=$(basename $uri)
     fi
-    
+
     log "Downloading" $uri "to" $target_dir "..."
     run cd $target_dir
     run curl \
-      -L \
-      --o "$target_file" \
+      --location \
+      --output "$target_file" \
       $uri
   fi
 }

From 1dce620335306585c42de47fc9b1294ed85c1db3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Thu, 4 Jun 2015 13:31:27 +0200
Subject: [PATCH 2325/2585] Updated fallback_tomcat_url

---
 usr/share/escenic/ece-scripts/common-os.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index 4c783e76..ecbf6c87 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -8,7 +8,7 @@
 common_bashing_is_loaded > /dev/null 2>&1 || source $(pwd)/common-bashing.sh
 
 ## Only used if the Tomcat download mirror couldn't be determined
-fallback_tomcat_url="http://apache.komsys.org/tomcat/tomcat-6/v6.0.37/bin/apache-tomcat-6.0.37.tar.gz"
+fallback_tomcat_url="http://apache.uib.no/tomcat/tomcat-7/v7.0.62/bin/apache-tomcat-7.0.62.tar.gz"
 
 # Can be used like this:
 # common_io_os_loaded 2>/dev/null || source common-os.sh

From e2039bb4b0cfe0afb54a42b58f9399052fce1fb4 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Mon, 1 Jun 2015 10:14:44 +0200
Subject: [PATCH 2326/2585] Improved common-os::has_oracle_java_installed

- will no work with any JVM installed with DEB packages, i.e. under
  /usr/lib/jvm

- earlier, it searched for given JVM versions (and directory names),
  using find -maxdepth 3, it'll work with any version of JVM installed
  with DEB packages following the Debian conventions/policies for Java
  packages.
---
 usr/share/escenic/ece-scripts/common-os.sh | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index ecbf6c87..26a9f735 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -45,11 +45,19 @@ function get_user_home_directory() {
 ### has_oracle_java_installed
 ## Will return 1 if the system has Sun/Oracle Java installed.
 function has_oracle_java_installed() {
-  if [[ -x /usr/lib/jvm/java-6-oracle/bin/java || \
-    $(java -version 2>&1 > /dev/null | grep HotSpot | wc -l) -gt 0 ]]; then
-    echo 1
-  elif [[ -x /usr/lib/jvm/java-7-oracle/bin/java || \
-    $(java -version 2>&1 > /dev/null | grep HotSpot | wc -l) -gt 0 ]]; then
+  local java_bin_list=$(
+    find /usr/lib/jvm -maxdepth 3 -name java -type f -executable)
+
+  for java_bin in ${java_bin_list}; do
+    local hit=$(${java_bin} -version 2>&1 > /dev/null | grep HotSpot | wc -l)
+    if [ ${hit} -gt 0 ]; then
+        echo 1
+        return
+    fi
+  done
+
+  # fallback
+  if [[ $(java -version 2>&1 > /dev/null | grep HotSpot | wc -l) -gt 0 ]]; then
     echo 1
   else
     echo 0

From 3e4c20e9d9e93066af9a2ddaa9d68af8e777a0b4 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Tue, 16 Jun 2015 11:28:25 +0200
Subject: [PATCH 2327/2585] /etc/init.d/ece is now much faster on large
 installations

- Whenever invoked the init.d script would check to see if a list of
  directories existed and had the correct user and group ownership.

  This is important to do on a regular basis since people might
  start/stop ECE using the wrong UNIX user, causing all the files
  created by ECE to be owned by the wrong user, which again causes all
  kinds of problems.

- For this reason, the init.d script would recursively traverse these
  directories and apply the correct user/group on them and their
  files. However, with large /var/{lib,cache}/escenic directories,
  this would cause a significant slowdown.

  Therefore, the init.d script now only does user/group enforcement on
  the top level directory of /var/lib/escenic and /var/cache/escenic.

  The full enforcement is still applied to the other directories,
  including /varlog/escenic.com.
---
 etc/init.d/ece | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/etc/init.d/ece b/etc/init.d/ece
index 0c358b76..8315cef9 100755
--- a/etc/init.d/ece
+++ b/etc/init.d/ece
@@ -15,7 +15,7 @@
 #################################################################
 # Usage:
 # * copy this script to /etc/init.d/ece
-# 
+#
 # * copy its configuration file to /etc/default/ece (or
 # * /etc/conf.d/ece on Gentoo based disitributions)
 #
@@ -77,10 +77,13 @@ function ensure_dirs_are_ok()
         if [ ! -d $el ]; then
             mkdir -p $el
         fi
-        
-        chown --changes $ece_unix_user:$ece_unix_group $el
-    done
 
+        if [[ ${el} == "/var/cache"* || ${el} == "/var/lib"* ]]; then
+            chown --changes $ece_unix_user:$ece_unix_group $el
+        else
+            chown --recursive --changes $ece_unix_user:$ece_unix_group $el
+        fi
+    done
 }
 
 function ensure_ece_script_is_ok()
@@ -92,7 +95,7 @@ function ensure_ece_script_is_ok()
         echo "$ece_script needs to be executable (do: chmod +x $ece_script)"
         exit 1
     fi
-    
+
 }
 
 function execute_command()
@@ -100,11 +103,11 @@ function execute_command()
     if [ $enable_rmi_hub -eq 1 ]; then
         su - $ece_unix_user -c "$ece_script -t rmi-hub $1"
     fi
-    
+
     for el in $engine_instance_list; do
         su - $ece_unix_user -c "$ece_script -t engine -i $el $1"
     done
-    
+
     for el in $search_instance_list; do
         su - $ece_unix_user -c "$ece_script -t search -i $el $1"
     done

From 46b57db4884e9bdb55961cfc9847a39dcd07a7fb Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Tue, 18 Aug 2015 13:59:16 +0200
Subject: [PATCH 2328/2585] VOSA-171: Made deb and rpm configuration package
 creation configurable machine wise. Now we can use ece-build -b <branch> -m
 <machine>

---
 usr/share/escenic/build-scripts/ece-build | 154 ++++++++++++++--------
 1 file changed, 96 insertions(+), 58 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 5eea71ca..eada898a 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -25,6 +25,7 @@ local_mode=false
 auto_deploy=false
 deploy_ear=false
 deploy_conf=""
+package_for_machine="all"
 # standard java locations
 #TODO:take java home location dynamically
 java_6_sun=/usr/lib/jvm/java-6-sun
@@ -354,7 +355,7 @@ function verify_java
 ##
 function get_user_options
 {
-  while getopts ":b:t:oscuV" opt; do
+  while getopts ":b:t:m:oscuV" opt; do
     case $opt in
       b)
         svn_path=branches/${OPTARG}
@@ -365,6 +366,9 @@ function get_user_options
         svn_path=tags/${OPTARG}
         release_label=tag-${OPTARG}
         ;;
+      m)
+        package_for_machine=${OPTARG}
+        ;;
       o)
         maven_build_offline=1
         maven_opts="-o $maven_opts"
@@ -514,7 +518,7 @@ local engine_version
  engine_major_version=`echo $project_engine_version | cut -d'-' -f2 | cut -d'.' -f1`
  engine_minor_version=`echo $project_engine_version | cut -d'-' -f2 | cut -d'.' -f2`
  engine_version=$engine_major_version$engine_minor_version
- if [ ! $engine_version -ge 57 ] ; then
+ if [[  "$engine_version" -lt "57" ]] ; then
   if [ -e $builder_root_dir/lib/java_memcached-release_2.0.1.jar ]; then
     run_wrapper ln -s $builder_root_dir/lib/java_memcached-release_2.0.1.jar $assemblytool_lib_dir/
   else
@@ -1203,37 +1207,15 @@ function publish_ear
   fi
 }
 
-## creates DEB and RPM packages with the server configuration for all
-## of the machines available in <project>/server-admin/<machine
-## instance>
-##
-## Common files are taken from <project>/server-admin/common.
+## Creates deb and rpm package for machines specified in 
+## <project>/server-admin directory.
 ##
-## If <project>/server-admin doesn't exist, the method simply returns.
-function create_machine_conf_packages() {
-  local conf_dir=$project_src_dir/server-admin
-  
-  if [ ! -d $conf_dir ]; then
-    return
-  fi
-
- # As both control run same function
- #if [[ "$src_control" = svn ]]; then
-    #generate_new_changelog
- #elif [[ "$src_control" = git ]]; then
-    #generate_new_changelog
- #fi
-  generate_new_changelog
-
-  local machine_list=$(
-    find $conf_dir -maxdepth 1 -type d | \
-      egrep -v "common|.svn" | \
-      sed -e "s#$conf_dir##g" -e "s#^/##g" | \
-      sort | \
-      grep [a-z]
-  )
-
-  for machine in $machine_list; do
+## This function takes two parameters. It can be called like below
+## make_conf_package <machine> <project_configuration_directory>
+##  
+function make_conf_package() {
+   local machine=$1
+   local conf_dir=$2
     # work dir
     local target_dir=$(mktemp -d)
 
@@ -1262,7 +1244,7 @@ function create_machine_conf_packages() {
       run_wrapper mkdir -p $dir
       run_wrapper cp $file $dir/truth.conf
     fi
-    
+
     # mark all files as conf files
     local conffiles_file=$target_dir/DEBIAN/conffiles
     run_wrapper mkdir -p $(dirname $conffiles_file)
@@ -1271,7 +1253,7 @@ function create_machine_conf_packages() {
       egrep -v DEBIAN | \
       sed "s#$target_dir##" \
       > $conffiles_file
-    
+
     # debian control file
     local control_file=$target_dir/DEBIAN/control
     local package_name=vosa-conf-${machine}
@@ -1292,17 +1274,17 @@ EOF
     # changelogs
     local package_changelog_dir=${target_dir}/usr/share/doc/vizrt/$package_name
     make_dir $package_changelog_dir
-    if [[ "$src_control" = "svn" ]]; then 
-    	 local svn_base_dir=$(lowercase $(basename $svn_base))
-   	 local change_log_dir=$HOME/.generate-changelog/${svn_base_dir}/${svn_path}
+    if [[ "$src_control" = "svn" ]]; then
+         local svn_base_dir=$(lowercase $(basename $svn_base))
+         local change_log_dir=$HOME/.generate-changelog/${svn_base_dir}/${svn_path}
     elif [[ "$src_control" = "git" ]]; then
          # get git repo's name
-   	 local git_base_dir=$(lowercase $(basename $git_base))
-	 # get git repo's branch name
+         local git_base_dir=$(lowercase $(basename $git_base))
+         # get git repo's branch name
          local git_path_dir=$(echo $git_path | sed 's/-b //g')
-   	 local change_log_dir=$HOME/.generate-git-changelog/${git_base_dir}/${git_path_dir}
-    fi  
-    
+         local change_log_dir=$HOME/.generate-git-changelog/${git_base_dir}/${git_path_dir}
+    fi
+
     if [ -d  $change_log_dir ]; then
       run_wrapper cp ${change_log_dir}/* $package_changelog_dir
     fi
@@ -1312,10 +1294,10 @@ EOF
       print_and_log "You must have dpkg-deb installed to create packages :-("
       return
     fi
-    
+
     run_wrapper dpkg-deb --build $target_dir
     mv ${target_dir}.deb $target_dir/${package_name}-${package_version}.deb
-    
+
     if [[ -x /usr/bin/alien && -x /usr/bin/fakeroot ]]; then
       (
         run_wrapper cd $target_dir
@@ -1328,26 +1310,82 @@ EOF
 
     # move the machine's DEB and RPM packges to the release directory
     run_wrapper mv $target_dir/*.{deb,rpm} $release_dir/
-   
+    local release_version=${package_name}-${package_version}
     # adding latest links for conf packages
-    run_wrapper ln -sf $release_dir/vosa-conf-${machine}-${package_version}.deb $release_dir/vosa-conf-${machine}-1-${customer}-${release_label}-latest.deb
-    run_wrapper ln -sf $release_dir/vosa-conf-${machine}-1_${customer}_${release_label}-r${revision}.noarch.rpm $release_dir/vosa-conf-${machine}-1_${customer}_${release_label}-latest.noarch.rpm
- 
+    run_wrapper ln -sf $release_dir/$release_version.deb $release_dir/vosa-conf-${machine}-1-${customer}-${release_label}-latest.deb
+    run_wrapper ln -sf $release_dir/$release_version.noarch.rpm $release_dir/vosa-conf-${machine}-1-${customer}-${release_label}-latest.noarch.rpm
+
     # remove work directory
     run_wrapper rm -rf $target_dir
-  done
+    
+    #Let´s print the package links 
+}
+## This function prints the debian package links for the given machine
+## Call print_deb_package_link <machine>
+function print_deb_package_link() {
+  local machine=$1
+  print_and_log "--- .deb configuration package for $machine machine  ---"
+  print_and_log "$ear_base_url/$customer/releases/vosa-conf-${machine}-1-${customer}-${release_label}-r${revision}.deb"
+}
+## This function prints the rpm package links for the given machine
+## Call print_rpm_package_link <machine>
+function print_rpm_package_link() {
+  local machine=$1
+  print_and_log "--- .rpm configuration package for $machine machine  ---"
+  print_and_log "$ear_base_url/$customer/releases/vosa-conf-${machine}-1-${customer}-${release_label}-r${revision}.noarch.rpm"
+}
+
+## creates DEB and RPM packages with the server configuration for all
+## of the machines available in <project>/server-admin/<machine
+## instance>
+##
+## Common files are taken from <project>/server-admin/common.
+##
+## If <project>/server-admin doesn't exist, the method simply returns.
+function create_machine_conf_packages() {
+  local conf_dir=$project_src_dir/server-admin
+  
+  if [ ! -d $conf_dir ]; then
+    return
+  fi
+  
+ # As both control run same function
+ #if [[ "$src_control" = svn ]]; then
+    #generate_new_changelog
+ #elif [[ "$src_control" = git ]]; then
+    #generate_new_changelog
+ #fi
+  generate_new_changelog
 
-  if [ -z "$machine_list" ]; then 
+  local machine_list=$(
+    find $conf_dir -maxdepth 1 -type d | \
+      egrep -v "common|.svn" | \
+      sed -e "s#$conf_dir##g" -e "s#^/##g" | \
+      sort | \
+      grep [a-z]
+  )
+  if [ -z "$machine_list" ]; then
     print_and_log "Your project does not have any folders, except maybe common, under server-admin so no configuration packages will be generated."
-  else
-    print_and_log "--- .deb configuration packages ---"  
-    for machine in $machine_list; do 
-      print_and_log "$ear_base_url/$customer/releases/vosa-conf-${machine}-${package_version}.deb"
-    done
-    print_and_log "--- .rpm configuration packages ---"
-    for machine in $machine_list; do
-      print_and_log "$ear_base_url/$customer/releases/vosa-conf-${machine}-1_${customer}_${release_label}-r${revision}.noarch.rpm"
+    return
+  fi
+  if [ -z "$package_for_machine" ] || [ "$package_for_machine" == "all" ]; then
+    print_and_log "The configuration package_for_machine is Empty or set to all!"
+    print_and_log "I will build configuration packages for all the machines."
+   for machine in $machine_list; do
+      #create the package for machine
+      make_conf_package $machine $conf_dir
+      #first print the deb package link for machine
+      print_deb_package_link $machine
+      #second print the rpm package link for the machine
+      print_rpm_package_link $machine
     done
+  elif [[ "$machine_list" =~ "$package_for_machine" ]];then
+    make_conf_package $package_for_machine $conf_dir
+    print_deb_package_link $package_for_machine
+    print_rpm_package_link $package_for_machine
+  else 
+    print_and_log "We have not found any conf directory for the desired machine `$package_for_machine` under $conf_dir ! Please check the machine name is correct"
+    print_and_log "I will not generate any configuration packages then! Please set the package_for_machine correclty!"
   fi
 }
 

From e7bec0f6a36b6c4f4a46ac9cb07d9b98e5d316ba Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Tue, 28 Oct 2014 17:54:38 +0600
Subject: [PATCH 2329/2585] VOSA-153: Added ece-local-builder in the debian
 package

---
 usr/share/escenic/package-scripts/create-packages | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index ba50d18f..7ee3d21a 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -119,6 +119,7 @@ function set_up_escenic-build-scripts() {
   make_dir $target_dir/usr/bin
   run cp ../build-scripts/ece-build $target_dir/usr/bin/ece-build
   run cp ../build-scripts/ece-builder $target_dir/usr/bin/ece-builder
+  run cp ../build-scripts/ece-local-builder $target_dir/usr/bin/ece-local-builder
   run cp ../build-scripts/ece-build-guide $target_dir/usr/bin/ece-build-guide
 }
 

From 7cd07a96f3d3629f1bb3fe3aab96fc4beec3bd93 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Tue, 18 Aug 2015 16:42:51 +0200
Subject: [PATCH 2330/2585] VOSA-171: Skipped generating git changelog by
 default. We can turn it on by the property generate_changelog=1 in
 .build/build.conf file

---
 usr/share/escenic/build-scripts/ece-build | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index eada898a..3aa2e945 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -26,6 +26,7 @@ auto_deploy=false
 deploy_ear=false
 deploy_conf=""
 package_for_machine="all"
+generate_changelog=0
 # standard java locations
 #TODO:take java home location dynamically
 java_6_sun=/usr/lib/jvm/java-6-sun
@@ -1355,8 +1356,9 @@ function create_machine_conf_packages() {
  #elif [[ "$src_control" = git ]]; then
     #generate_new_changelog
  #fi
-  generate_new_changelog
-
+ if [ $generate_changelog -eq 1 ]; then
+    generate_new_changelog
+ fi
   local machine_list=$(
     find $conf_dir -maxdepth 1 -type d | \
       egrep -v "common|.svn" | \

From 25c3aa26bacb4bed8fb209a66b6c71b6a35f6912 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Tue, 18 Aug 2015 17:13:45 +0200
Subject: [PATCH 2331/2585] VOSA-155: Added support for machine specific
 package creation in local builder

---
 usr/share/escenic/build-scripts/ece-local-builder | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/build-scripts/ece-local-builder b/usr/share/escenic/build-scripts/ece-local-builder
index 2f4596ee..a0c6e4a8 100755
--- a/usr/share/escenic/build-scripts/ece-local-builder
+++ b/usr/share/escenic/build-scripts/ece-local-builder
@@ -589,6 +589,7 @@ git_protocol=$git_protocol
 git_base=$git_base
 ear_base_url=$ear_base_url/$1
 local_mode=true
+package_for_machine=$package_for_machine
 auto_deploy=true
 deploy_ear=true
 deploy_conf=deb" > /home/$1/.build/build.conf

From 195acf4f55bd38f01021b4b7e6552eda66b395c2 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Tue, 18 Aug 2015 18:06:33 +0200
Subject: [PATCH 2332/2585] VOSA-171: Fixed auto deploy pacakge url

---
 usr/share/escenic/build-scripts/ece-build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 3aa2e945..cf9aa47d 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -1589,11 +1589,11 @@ function automatic_deploy(){
   fi
 
   if [ "$deploy_conf" == "deb" ]; then
-    ece-deploy --conf $ear_base_url/$customer/releases/vosa-conf-${machine}-1-${customer}-${release_label}-latest.deb
+    ece-deploy --conf $ear_base_url/$customer/releases/vosa-conf-${package_for_machine}-1-${customer}-${release_label}-latest.deb
   fi
 
   if [ "$deploy_conf" == "rpm" ]; then
-    ece-deploy --conf $ear_base_url/$customer/releases/vosa-conf-${machine}-1_${customer}_${release_label}-latest.noarch.rpm
+    ece-deploy --conf $ear_base_url/$customer/releases/vosa-conf-${package_for_machine}-1_${customer}_${release_label}-latest.noarch.rpm
   fi
 }
 

From 80016626255176b4973628bee0988e8774febb78 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Wed, 19 Aug 2015 11:45:49 +0200
Subject: [PATCH 2333/2585] Removed run() from ece, the one in
 common-bashing.sh is better

- ece already includes common-bashing.sh so the run() in that module is
  already available.
---
 usr/bin/ece | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index cab6ee07..74e148fd 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -516,11 +516,6 @@ function sanity_check() {
     fi
 }
 
-function run() {
-  $@ >> $log 2>> $log
-  exit_on_error "$@"
-}
-
 # Returns the file (can be a directory) passed to the function only
 # if it's the actual file/directory and not a link to it. If the
 # passed file is a link, the link target is returned instead.

From e6dc0b155c146c35ebf2b6c3849a3b10ce7ecdb9 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Wed, 19 Aug 2015 12:50:38 +0200
Subject: [PATCH 2334/2585] If debug is enabled, run() prints the commands it
 executes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For instance:

$ ece -v -i engine1 deploy
...
[ece-debug] run() → mkdir -p /tmp/tmp.9TYu7IS6c9
[ece-debug] run() → cd /tmp/tmp.9TYu7IS6c9
[ece-debug] run() → unzip -q /var/cache/escenic/engine.ear
---
 usr/share/escenic/ece-scripts/common-bashing.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index ac55a141..e0e7304b 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -176,6 +176,7 @@ function run() {
     }
   fi
 
+  debug "${FUNCNAME}()" → "$@"
   "${@}" 1>>$log 2>>$log
   exit_on_error $@
 }

From 0fdae435f61d2e58f86bc5e54eebc2f6f6b46e46 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Mon, 24 Aug 2015 16:55:31 +0200
Subject: [PATCH 2335/2585] VOSA-172: Fixed download link for rpms

---
 usr/share/escenic/build-scripts/ece-build | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index cf9aa47d..108b2cab 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -1314,7 +1314,8 @@ EOF
     local release_version=${package_name}-${package_version}
     # adding latest links for conf packages
     run_wrapper ln -sf $release_dir/$release_version.deb $release_dir/vosa-conf-${machine}-1-${customer}-${release_label}-latest.deb
-    run_wrapper ln -sf $release_dir/$release_version.noarch.rpm $release_dir/vosa-conf-${machine}-1-${customer}-${release_label}-latest.noarch.rpm
+    run_wrapper ln -sf $release_dir/vosa-conf-${machine}-1_$(echo $customer | sed -e "s/-/\_/g")_$(echo $release_label | sed -e "s/-/\_/g")-r${revision}.noarch.rpm \
+                       $release_dir/vosa-conf-${machine}-1_$(echo $customer | sed -e "s/-/\_/g")_$(echo $release_label | sed -e "s/-/\_/g")-latest.noarch.rpm
 
     # remove work directory
     run_wrapper rm -rf $target_dir
@@ -1333,7 +1334,7 @@ function print_deb_package_link() {
 function print_rpm_package_link() {
   local machine=$1
   print_and_log "--- .rpm configuration package for $machine machine  ---"
-  print_and_log "$ear_base_url/$customer/releases/vosa-conf-${machine}-1-${customer}-${release_label}-r${revision}.noarch.rpm"
+  print_and_log "$ear_base_url/$customer/releases/vosa-conf-${machine}-1_$(echo $customer | sed -e "s/-/\_/g")_$(echo $release_label | sed -e "s/-/\_/g")-r${revision}.noarch.rpm"
 }
 
 ## creates DEB and RPM packages with the server configuration for all

From f858ea26d8b21a864d565c7726a70f9931db996e Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Mon, 14 Sep 2015 13:21:08 +0200
Subject: [PATCH 2336/2585] VOSA-172: Refactored the conditions to use test
 instead of operators

---
 usr/share/escenic/build-scripts/ece-build | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 108b2cab..d7a387d4 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -554,10 +554,10 @@ function git_checkout
     print_and_log "The chosen protocol $git_protocol for git is NOT supported, exiting!"
     exit 1
   fi
-
-  if [[ "$git_path" != "" ]]; then
+  # Check the remote branch exists for not
+  if [ -n "$git_path" ]; then
     local exists=$(git ls-remote --heads $git_repo_uri | grep $git_path)
-    if [[ "${exists}" = "" ]]; then
+    if [ -z "$exists" ]; then
       print_and_log "The request branch $git_path does NOT exist, exiting!"
       exit 1
     fi
@@ -591,7 +591,7 @@ function git_checkout
     if [ $clean_repo -eq 1 ]; then
       clean_up
     fi
-    if [[ "$git_path" == "" ]]; then
+    if [ -z "$git_path" ]; then
         branch_name=master
         git_path="-b master"
     fi
@@ -600,7 +600,7 @@ function git_checkout
     fi
     checkout_repo 
     run_wrapper cp -rf $project_src_master_dir $project_src_dir
- fi
+  fi
   cd $project_src_dir
   revision=`git describe --always`
   if [[ $revision = "" ]]; then
@@ -608,7 +608,7 @@ function git_checkout
     exit 1
   fi
 
-  if [[ "$git_path" == "" ]]; then
+  if [ -z "$git_path" ]; then
     git_path="-b master"
   fi
 }

From 3e6f05f66311009313c31be07ea2016fef520325 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Tue, 15 Sep 2015 11:44:48 +0200
Subject: [PATCH 2337/2585] VOSA-178: Added live-center plugin.

---
 usr/share/escenic/build-scripts/ece-build   | 8 ++++++--
 usr/share/escenic/ece-scripts/common-ece.sh | 3 +++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index d7a387d4..40767f95 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -75,7 +75,8 @@ changelog
 note
 seo
 mobile-studio
-preview-editor"
+preview-editor
+live-center"
 
 declare -A project_distributions=()
 
@@ -111,6 +112,7 @@ declare -A maven_snapshot_coordinates=(
 ["seo"]="com.escenic.plugins.seo:seo:zip"
 ["mobile-studio"]="com.escenic.plugins.mobile-studio:mobile-studio:zip"
 ["preview-editor"]="com.escenic.plugins.preview-editor:preview-editor:zip"
+["live-center"]="com.escenic.plugins.live-center:live-center:zip"
 )
 
 declare -A maven_coordinates=(
@@ -153,6 +155,7 @@ com.escenic.plugins.vcpeditor:vcpeditor:zip"
 ["seo"]="com.escenic.plugins.seo:seo:zip"
 ["mobile-studio"]="com.escenic.plugins.mobile-studio:mobile-studio:zip"
 ["preview-editor"]="com.escenic.plugins.preview-editor:preview-editor:zip"
+["live-center"]="com.escenic.plugins.live-center:live-center:zip"
 )
 
 # root folders for engine and plugin distributions
@@ -497,7 +500,8 @@ function clean_customer_home
   fi
 
   # drop and recreate project src directory if it exists
-  if [ -d "$project_src_dir" ]; then
+  if [ -d $project_src_dir  ] && [ $clean_repo -eq 1 ]; then
+    print_and_log "You asked for cleaning the $project_src_dir to be removed"
     run_wrapper rm -rf $project_src_dir
   fi
 }
diff --git a/usr/share/escenic/ece-scripts/common-ece.sh b/usr/share/escenic/ece-scripts/common-ece.sh
index a2e457dd..10292cd7 100644
--- a/usr/share/escenic/ece-scripts/common-ece.sh
+++ b/usr/share/escenic/ece-scripts/common-ece.sh
@@ -88,6 +88,9 @@ webapps_in_standard_webapps_list="
   note-webservice
   preview-editor-ws
   mobile-studio
+  live-center-editorial
+  live-center
+  live-center-presentation-webservice
 "
 
 ### is_webapp_a_publication

From 1392c6d06a2c056df3814207da8dd86918a905cc Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Tue, 22 Sep 2015 15:06:43 +0200
Subject: [PATCH 2338/2585] Fixed bug in master db profile where slave conf
 values were left empty

- When installing a master db node, ece-install would create a file
  for the slave profile, called ece-install-db-slave.conf.add which
  contained the file and position of the master DB.

  However, on some systems, the values in this file where empty. The
  reason for this was that on some systems, the output of the mysql -e
  'show master status' command isn't space separated, thus failing the
  cut command.

  Using AWK for field parsing is much more robust as it deals with all
  kinds of whitespace characters and gives us the fields that we wish
  for.
---
 .../ece-scripts/ece-install.d/database.sh     | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 8f760433..49158af4 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -37,7 +37,7 @@ function set_up_mariadb_yum_repo() {
     local arch=amd64
     if [[ $(uname -m) != "x86_64" ]]; then
       arch=x86
-    fi  
+    fi
     if [ $distributor = "redhatenterpriseserver" ]; then
       $distributor=rhel
     fi
@@ -56,31 +56,31 @@ EOF
 
 function set_up_redhat_repository_if_possible() {
   if [ $db_vendor = "mariadb" ]; then
-    set_up_mariadb_yum_repo  
+    set_up_mariadb_yum_repo
     mysql_server_packages="MariaDB-server"
     mysql_client_packages="MariaDB-client"
   else
     print_and_log "Setting up the Percona repository ..."
-  
+
     if [ $(rpm -qa | grep $percona_rpm_release_package_name | wc -l) -lt 1 ]; then
       run rpm -Uhv $percona_rpm_release_url
     fi
     mysql_server_packages="Percona-Server-server-55 Percona-Server-shared-compat"
     mysql_client_packages="Percona-Server-client-55 Percona-Server-shared-compat"
-  fi  
+  fi
 }
 
 function is_supported() {
   local code_name=$1
   local supported_code_name=1
   local supported_list=""
-  
+
   if [ $db_vendor = "mariadb" ]; then
     supported_list=$(get_mariadb_supported_list)
   else
     supported_list=$(get_percona_supported_list)
   fi
-  
+
   for el in $supported_list; do
     if [[ $code_name == $el ]]; then
       supported_code_name=0
@@ -100,7 +100,7 @@ function add_gpg_key() {
     gpg --keyserver hkp://keys.gnupg.net:80 \
         --recv-keys $key \
         1>>$log 2>>$log
-    
+
         # There has been three times now, during six months, that the
         # key cannot be retrieved from keys.gnupg.net. Therefore,
         # we're checking if it failed and if yes, force the package
@@ -116,7 +116,7 @@ function add_gpg_key() {
           apt-key add - \
           1>>$log 2>>$log
     fi
-    
+
   fi
 }
 
@@ -175,7 +175,7 @@ function set_up_repository_if_possible() {
 
       mysql_server_packages="mysql-server libmysqlclient16"
       mysql_client_packages="mysql-client libmysqlclient16"
-      
+
       leave_trail "trail_db_vendor=mysql"
     fi
   elif [ $on_redhat_or_derivative -eq 1 ]; then
@@ -200,7 +200,7 @@ function install_mysql_server_software() {
     # when only running the SQL scripts, typically when using Amazon
     # RDS, we need the mysql-client.
     install_packages_if_missing $mysql_client_packages
-  fi  
+  fi
 }
 
 function install_mysql_client_software() {
@@ -375,7 +375,7 @@ EOF
   fi
 
   set_common_replication_settings $file
-  
+
   # replication log configuration of the master
   if [ $db_master -eq 1 ]; then
     old="#server-id.*=.*1"
@@ -389,8 +389,8 @@ EOF
 
     # report the needed settings for a slave
     local master_status=$(mysql $db_schema -e "show master status" | tail -1)
-    local file=$(echo $master_status | cut -d' ' -f1)
-    local position=$(echo $master_status | cut -d' ' -f2)
+    local file=$(echo $master_status | awk '{ print $1; }')
+    local position=$(echo $master_status | awk '{ print $2; }')
     local slave_conf_file=$HOME/ece-install-db-slave.conf.add
     cat > $slave_conf_file <<EOF
 fai_db_master_log_file=$file
@@ -410,7 +410,7 @@ EOF
     fi
 
   fi
-  
+
   run /etc/init.d/mysql restart
 }
 
@@ -419,7 +419,7 @@ EOF
 ## over to the slave as master (and back again).
 function set_common_replication_settings() {
   local file=$1
-  
+
   local old="bind-address.*= 127.0.0.1"
   local new="# bind-address = 127.0.0.1"
   if [ $(grep ^"${old}" $file | wc -l) -gt 0 ]; then
@@ -442,7 +442,7 @@ function set_common_replication_settings() {
   elif [ $(grep ^"$new" $file | wc -l) -lt 1 ]; then
     echo "$new" >> $file
   fi
-}  
+}
 
 function set_slave_to_replicate_master() {
   print_and_log "Setting slave to replicate master DB @ $db_master_host ..."
@@ -469,10 +469,10 @@ EOF
         "doesn't exist"
       remove_pid_and_exit_in_error
     fi
-    
+
     print_and_log "Setting up slave based on master backup"
     zcat ${fai_db_master_backup} | mysql ${db_schema}
-    
+
     local file_and_pos=$(
       zcat ${fai_db_master_backup} | \
         head -n 30 | \
@@ -495,7 +495,7 @@ start slave;
 EOF
 
   fi
-  
+
   add_next_step "DB on $HOSTNAME replicates master DB @ ${db_master_host}"
 }
 
@@ -626,17 +626,17 @@ function create_ecedb() {
     run_eae_scripts_if_available
     return
   fi
-  
+
   # first the ECE SQL ...
   run_db_scripts $ece_home/database/$db_product
-  
+
   # ... then, find the plugins and run their SQL scripts
   for archive in $technet_download_list $ear_download_list; do
     # don't re-run the engine scripts
     if [[ $(basename ${archive}) == engine* ]]; then
       continue
     fi
-    
+
     # find the top directory inside the archive
     local dir=$(
       unzip -t ${download_dir}/$(basename ${archive}) | \
@@ -669,7 +669,7 @@ function run_eae_scripts_if_available() {
 }
 
 ## Workaround for: https://jira.vizrt.com/browse/STATS-76
-## 
+##
 ## $1 is the SQL file
 function work_around_eae_bug_stats-76() {
   print_and_log "Fixing $1 ..."
@@ -725,7 +725,7 @@ mysqldump \\
   gzip --rsyncable -9 - \\
   > ${escenic_backups_dir}/\${fn}
 
-# (2) make sure the backup went OK 
+# (2) make sure the backup went OK
 # copy of pipe status since it's volatile
 pipe_status=(\${PIPESTATUS[@]})
 

From 7364854705bfb7e4662b0988cc798ebfd338606c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Thu, 24 Sep 2015 13:54:10 +0200
Subject: [PATCH 2339/2585] ece deploy now supports theprox enabled ECE
 instances

- Added ece-extension to webapps_in_standard_webapps_list so that
  ece-extension, apart of the theprox project is deployed with 'ece
  deploy'.
---
 usr/share/escenic/ece-scripts/common-ece.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/ece-scripts/common-ece.sh b/usr/share/escenic/ece-scripts/common-ece.sh
index a2e457dd..c61c7adb 100644
--- a/usr/share/escenic/ece-scripts/common-ece.sh
+++ b/usr/share/escenic/ece-scripts/common-ece.sh
@@ -71,6 +71,7 @@ function get_instance_type() {
 
 webapps_in_standard_webapps_list="
   dashboard
+  ece-extension
   escenic
   escenic-admin
   indexer-webapp

From 62ea9203bb506434ab513dad46f8a8c6b82f9c21 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Mon, 28 Sep 2015 15:05:08 +0200
Subject: [PATCH 2340/2585] VOSA-178: Made solr update frequency 3s instead of
 60s to make index faster.

---
 usr/share/escenic/ece-scripts/ece-install.d/search-server.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
index 719731e8..764db03b 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
@@ -82,7 +82,7 @@ function multicore_solr_setup(){
   if [ $editorial_search_instance -eq 1 ]; then
     run sed -i "s#<maxTime>[0-9]*</maxTime>#<maxTime>5000</maxTime>#g" $file
   else
-    run sed -i "s#<maxTime>[0-9]*</maxTime>#<maxTime>60000</maxTime>#g" $file
+    run sed -i "s#<maxTime>[0-9]*</maxTime>#<maxTime>3000</maxTime>#g" $file
   fi
 
   run_hook set_up_solr.postinst
@@ -144,7 +144,7 @@ function set_up_solr() {
   if [ $editorial_search_instance -eq 1 ]; then
     run sed -i "s#<maxTime>[0-9]*</maxTime>#<maxTime>5000</maxTime>#g" $file
   else
-    run sed -i "s#<maxTime>[0-9]*</maxTime>#<maxTime>60000</maxTime>#g" $file
+    run sed -i "s#<maxTime>[0-9]*</maxTime>#<maxTime>3000</maxTime>#g" $file
   fi
 
   run_hook set_up_solr.postinst

From e0368de788e45014e4049f5bb9dcb8243c0eeee1 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Wed, 30 Sep 2015 09:09:28 +0200
Subject: [PATCH 2341/2585] VOSA-170: Local builder will now deploy the locally
 created ear file.

---
 usr/share/escenic/build-scripts/ece-build     |  3 +--
 usr/share/escenic/ece-scripts/ece.d/deploy.sh | 12 +++++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 40767f95..a07d9001 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -603,7 +603,6 @@ function git_checkout
       udpate_repository
     fi
     checkout_repo 
-    run_wrapper cp -rf $project_src_master_dir $project_src_dir
   fi
   cd $project_src_dir
   revision=`git describe --always`
@@ -1590,7 +1589,7 @@ function phase_release
 ## Used to deploy ear and conf packages after built
 function automatic_deploy(){
   if [ $deploy_ear == true ]; then
-    ece-deploy --ear $ear_base_url/$customer/releases/$resulting_ear
+    ece-deploy --ear ~/releases/$resulting_ear
   fi
 
   if [ "$deploy_conf" == "deb" ]; then
diff --git a/usr/share/escenic/ece-scripts/ece.d/deploy.sh b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
index f74c022a..27d47d39 100644
--- a/usr/share/escenic/ece-scripts/ece.d/deploy.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
@@ -64,13 +64,19 @@ function deploy() {
 
   if [ -n "$file" ]; then
     print_and_log "Deploying $file on $instance ..."
-    
-    # wget_auth is needed for download_uri_target_to_dir
-    wget_auth=$wget_builder_auth
+    #Check if the file is a cached file, then will just install the file.
+    # If it is not cached and a local file then create a symlink of that file in cache directory otherwise
+    #We we wil consider it is a url and will try to download the file.
     ear=$cache_dir/$(basename $file)
     if [ -e "$ear" ] && [ $(is_archive_healthy $ear) -eq 1 ]; then
       print_and_log "If found a healthy $ear locally so I will not fetch it again."
+    elif [ -f "$file" ]; then
+      print_and_log " Found a local ear file $file"
+      log "Creating a symlink of the file $file to $cache_dir"
+      ln -s $file $ear
     else
+      # wget_auth is needed for download_uri_target_to_dir
+      wget_auth=$wget_builder_auth
       download_uri_target_to_dir $file $cache_dir
     fi
 

From 8090586e9102b0d15686f5f4dd7617553e80f5c1 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Wed, 30 Sep 2015 15:24:52 +0200
Subject: [PATCH 2342/2585] VOSA-170: Now ece-deploy support local deb packages
 for installation. - Changed ece-build to use local deb and rpm package for
 local builder auto deploy.

---
 usr/sbin/ece-deploy                       | 31 +++++++++++++----------
 usr/share/escenic/build-scripts/ece-build |  4 +--
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
index bc76b1be..86f35b1c 100755
--- a/usr/sbin/ece-deploy
+++ b/usr/sbin/ece-deploy
@@ -150,19 +150,24 @@ function deploy_conf() {
   if [ ${make_deployment-1} -eq 0 ]; then
     return
   fi
-
-  make_dir $ece_deploy_download_dir
-
-  set_builder_user_and_password
-
-  print "Downloading" $conf_package_uri "..."
-  
-  # common-ece::download_uri_target_to_dir honors wget_auth
-  wget_auth="
-    --http-user $builder_http_user
-    --http-password $builder_http_password
-  "
-  download_uri_target_to_dir $conf_package_uri $ece_deploy_download_dir
+  if [ -n $conf_package_uri ]; then
+    conf_file=$ece_deploy_download_dir/$(basename $conf_package_uri)
+    make_dir $ece_deploy_download_dir
+    if [ -e $conf_file ]; then
+     print_and_log "We found an exact deb file $(basename $conf_package_uri) in our cache so we will not download it again"
+     elif [ -f $conf_package_uri ]; then
+     print_and_log "So, you want to install a local configuration package file. Creating a symlink in our cache directory"
+     ln -s $conf_package_uri $conf_file
+    else
+       set_builder_user_and_password
+       print "Downloading" $conf_package_uri "..."
+      # common-ece::download_uri_target_to_dir honors wget_auth
+      wget_auth="
+      --http-user $builder_http_user
+      --http-password $builder_http_password "
+     download_uri_target_to_dir $conf_package_uri $ece_deploy_download_dir
+    fi
+  fi
 
   print "Installing" $(basename $conf_package_uri) "..."
   if [ ${force_everything-0} -eq 1 ]; then
diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index a07d9001..aab7747b 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -1593,11 +1593,11 @@ function automatic_deploy(){
   fi
 
   if [ "$deploy_conf" == "deb" ]; then
-    ece-deploy --conf $ear_base_url/$customer/releases/vosa-conf-${package_for_machine}-1-${customer}-${release_label}-latest.deb
+    ece-deploy --conf ~/releases/vosa-conf-${package_for_machine}-1-${customer}-${release_label}-latest.deb
   fi
 
   if [ "$deploy_conf" == "rpm" ]; then
-    ece-deploy --conf $ear_base_url/$customer/releases/vosa-conf-${package_for_machine}-1_${customer}_${release_label}-latest.noarch.rpm
+    ece-deploy --conf ~/releases/vosa-conf-${package_for_machine}-1_${customer}_${release_label}-latest.noarch.rpm
   fi
 }
 

From 75b4aa781fbc64858410d2295e170c996adca583 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Wed, 30 Sep 2015 15:44:04 +0200
Subject: [PATCH 2343/2585] VOSA-170: Updated ece-deploy documentation.

---
 usr/share/doc/escenic/ece-deploy-guide.org | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/usr/share/doc/escenic/ece-deploy-guide.org b/usr/share/doc/escenic/ece-deploy-guide.org
index 223c17e8..36b274b4 100644
--- a/usr/share/doc/escenic/ece-deploy-guide.org
+++ b/usr/share/doc/escenic/ece-deploy-guide.org
@@ -27,7 +27,8 @@ will be a file on a build server.
 
 ** --conf uri-to-conf
 The URI to the configuration package to use for the deployment on this
-machine, typically, this will be a file on a build server.
+machine, typically, this will be a file on a build server. This also can
+be a file configuration package file location, which is in this machine.
 
 ** --force
 Use force whenever necessary to get an automatic deployment. This is
@@ -96,11 +97,16 @@ and database of its deployments to make everything reproduce-able.
 # ece-deploy --ear http://my.builder.com/snow-2.3.ear
 #+END_SRC
 
-** Deploying a new configuration package
+** Deploying a new configuration package using uri
 #+BEGIN_SRC sh
 # ece-deploy --conf http://my.builder.com/vosa-conf-pres1-2.3.deb
 #+END_SRC
 
+** Deploying a new configuration package file
+#+BEGIN_SRC sh
+# ece-deploy --conf /path/to/vosa-conf-pres1-2.3.deb
+#+END_SRC
+
 ** Updating publication resources
 #+BEGIN_SRC sh
 # ece-deploy --ear http://my.builder.com/snow-2.3.ear \\

From 8b1f64a99c4faf012b11598c41a87f6d086e101e Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Thu, 1 Oct 2015 13:29:07 +0200
Subject: [PATCH 2344/2585] VOSA-170: Added support for update resource and
 force deploy of conf pacakges in local builder.

---
 usr/share/escenic/build-scripts/ece-build | 27 +++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index aab7747b..3f9555b8 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -27,6 +27,9 @@ deploy_ear=false
 deploy_conf=""
 package_for_machine="all"
 generate_changelog=0
+do_force=0
+deploy_resources=0
+
 # standard java locations
 #TODO:take java home location dynamically
 java_6_sun=/usr/lib/jvm/java-6-sun
@@ -359,7 +362,7 @@ function verify_java
 ##
 function get_user_options
 {
-  while getopts ":b:t:m:oscuV" opt; do
+  while getopts ":b:t:m:osrfcuV" opt; do
     case $opt in
       b)
         svn_path=branches/${OPTARG}
@@ -386,6 +389,14 @@ function get_user_options
         update_repo=1
         print_and_log "Git repository update  mode in effect!"
         ;;
+      f)
+        do_force=1
+        print_and_log "Will use force to deploy configuration package for local deployment as requested"
+        ;;
+      r)
+        deploy_resources=1
+        print_and_log "Will update pulbication resources as requested"
+        ;;
       V)
         echo "Version:" $ece_scripts_version
         exit 0
@@ -1588,16 +1599,24 @@ function phase_release
 }
 ## Used to deploy ear and conf packages after built
 function automatic_deploy(){
+local ear_deploy_opts="--ear"
+local conf_deploy_opts="--conf"
+  if [ $do_force -eq 1 ]; then
+     ear_deploy_opts="--force $conf_deploy_opts"
+  fi
+  if [ $deploy_resources -eq 1 ]; then
+     ear_deploy_opts="--update-publication-resources $ear_deploy_opts"
+  fi
   if [ $deploy_ear == true ]; then
-    ece-deploy --ear ~/releases/$resulting_ear
+    ece-deploy $ear_deploy_opts ~/releases/$resulting_ear
   fi
 
   if [ "$deploy_conf" == "deb" ]; then
-    ece-deploy --conf ~/releases/vosa-conf-${package_for_machine}-1-${customer}-${release_label}-latest.deb
+    ece-deploy $conf_deploy_opts ~/releases/vosa-conf-${package_for_machine}-1-${customer}-${release_label}-latest.deb
   fi
 
   if [ "$deploy_conf" == "rpm" ]; then
-    ece-deploy --conf ~/releases/vosa-conf-${package_for_machine}-1_${customer}_${release_label}-latest.noarch.rpm
+    ece-deploy $conf_deploy_opts ~/releases/vosa-conf-${package_for_machine}-1_${customer}_${release_label}-latest.noarch.rpm
   fi
 }
 

From da3451ee51fddbd659c210ed0c277cf32a4f496d Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Fri, 2 Oct 2015 15:56:57 +0200
Subject: [PATCH 2345/2585] VOSA-170: Added the new options to
 ece-local-builder to add those to .build.conf file during installation.

---
 .../escenic/build-scripts/ece-local-builder   | 54 +++++++++++--------
 1 file changed, 32 insertions(+), 22 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-local-builder b/usr/share/escenic/build-scripts/ece-local-builder
index a0c6e4a8..d3071cb9 100755
--- a/usr/share/escenic/build-scripts/ece-local-builder
+++ b/usr/share/escenic/build-scripts/ece-local-builder
@@ -6,7 +6,7 @@
 ################################################################################
 
 # Common variables
-ece_scripts_version=1.0-2014-06-24-lean-974
+ece_scripts_version="straight-from-github"
 ece_scripts_home=/usr/share/escenic/ece-scripts
 log=/var/log/ece-project-builder.log
 
@@ -27,8 +27,8 @@ builder_system_user=
 customer_name=
 technet_user=
 technet_password=
-user_maven_username=
-user_maven_password="CHANGE_ME"
+maven_user="maven.user"
+maven_password="maven.password"
 git_url=
 assemblytool_url=
 
@@ -41,6 +41,15 @@ skel_dir=$root_dir/.skel
 subversion_dir=$skel_dir/.subversion
 m2_home=$skel_dir/.m2
 
+#local builder related properties
+local_mode=true
+package_for_machine=dev
+auto_deploy=true
+deploy_ear=true
+deploy_conf=deb
+do_force=0
+update_resources=0
+
 ##
 function verify_root_privilege
 {
@@ -63,17 +72,18 @@ function verify_builder_conf
   enforce_variable technet_user "Your builder configuration file is missing the variable technet_user, exiting!"
   enforce_variable technet_user "Your builder configuration file is missing the variable technet_user, exiting!"
   enforce_variable technet_user "Your builder configuration file is missing the variable technet_password, exiting!"
-  enforce_variable maven_vizrt_user "Your builder configuration file is missing the variable maven_vizrt_user, exiting!"
-  enforce_variable maven_vizrt_password "Your builder configuration file is missing the variable maven_vizrt_password, exiting!"
+  enforce_variable maven_user "Your builder configuration file is missing the variable maven_user, exiting!"
+  enforce_variable maven_password "Your builder configuration file is missing the variable maven_password, exiting!"
   enforce_variable assemblytool_url "Your builder configuration file is missing the variable assemblytool_url, exiting!"
+
   wget --http-user $technet_user --http-password $technet_password http://technet.escenic.com/ -qO /dev/null
   if [ $? -ne 0 ]; then
     print_and_log "Your user can't reach http://technet.escenic.com/, exiting!"
     remove_pid_and_exit_in_error
   fi
-  wget --http-user $maven_vizrt_user --http-password $maven_vizrt_password http://maven.vizrt.com/ -qO /dev/null
+  wget --http-user $maven_user --http-password $maven_password http://maven.escenic.com/ -qO /dev/null
   if [ $? -ne 0 ]; then
-    print_and_log "Your user can't reach http://maven.vizrt.com/, exiting!"
+    print_and_log "Your user can't reach http://maven.escenic.com/, exiting!"
     remove_pid_and_exit_in_error
   fi
 }
@@ -116,7 +126,7 @@ function verify_scripts
 ##
 function enforce_variable
 {
-  if [ ! -n "$(eval echo $`echo $1`)" ]; then
+  if [ -z "$(eval echo $`echo $1`)" ]; then
     print_and_log "$2"
     remove_pid_and_exit_in_error
   fi
@@ -438,13 +448,13 @@ depot=./Files" > $assemblytool_home/conf/layers/vosa/Layer.properties
 <servers>
     <server>
       <id>vizrt-repo</id>
-      <username>edemo-dev</username>
-      <password>strange-preference</password>
+      <username>$maven_user</username>
+      <password>$maven_password</password>
     </server>
     <server>
       <id>vizrt-unstable</id>
-      <username>edemo-dev</username>
-      <password>strange-preference</password>
+      <username>$maven_user</username>
+      <password>$maven_password</password>
     </server>
   </servers>
   <profiles>
@@ -454,7 +464,7 @@ depot=./Files" > $assemblytool_home/conf/layers/vosa/Layer.properties
         <repository>
           <id>vizrt-repo</id>
           <name>Vizrt Maven Repository</name>
-          <url>http://maven.vizrt.com</url>
+          <url>http://maven.escenic.com</url>
           <layout>default</layout>
         </repository>
       </repositories>
@@ -462,7 +472,7 @@ depot=./Files" > $assemblytool_home/conf/layers/vosa/Layer.properties
         <pluginRepository>
           <id>vizrt-repo</id>
           <name>Vizrt Maven Repository</name>
-          <url>http://maven.vizrt.com</url>
+          <url>http://maven.escenic.com</url>
           <layout>default</layout>
         </pluginRepository>
       </pluginRepositories>
@@ -473,7 +483,7 @@ depot=./Files" > $assemblytool_home/conf/layers/vosa/Layer.properties
         <repository>
           <id>vizrt-unstable</id>
           <name>Vizrt Maven Repository</name>
-          <url>http://maven.vizrt.com/unstable</url>
+          <url>http://maven.escenic.com/unstable</url>
           <layout>default</layout>
         </repository>
       </repositories>
@@ -481,7 +491,7 @@ depot=./Files" > $assemblytool_home/conf/layers/vosa/Layer.properties
         <pluginRepository>
           <id>vizrt-unstable</id>
           <name>Vizrt Maven Repository</name>
-          <url>http://maven.vizrt.com/unstable</url>
+          <url>http://maven.escenic.com/unstable</url>
           <layout>default</layout>
         </pluginRepository>
       </pluginRepositories>
@@ -588,15 +598,15 @@ git_user=$git_user
 git_protocol=$git_protocol
 git_base=$git_base
 ear_base_url=$ear_base_url/$1
-local_mode=true
+local_mode=$local_mode
 package_for_machine=$package_for_machine
-auto_deploy=true
-deploy_ear=true
-deploy_conf=deb" > /home/$1/.build/build.conf
+auto_deploy=$auto_deploy
+deploy_ear=$deploy_ear
+deploy_conf=$deploy_conf
+update_resources=$update_resources
+do_force=$do_force" > /home/$1/.build/build.conf
   run chown $1:$1 /home/$1/.build/build.conf
   run rsync -av $skel_dir/ /home/$1
-  run sed -i "s/maven.username/$user_maven_username/" /home/$1/.m2/settings.xml
-  run sed -i "s/maven.password/$user_maven_password/" /home/$1/.m2/settings.xml
   run chown -R $1:$1 /home/$1
   if [ ! -d /var/www/$1 ]; then
     make_dir /var/www/$1

From 51be129d55befa85b5b32d852aeacb89f217efb7 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Mon, 5 Oct 2015 15:22:19 +0200
Subject: [PATCH 2346/2585] VOSA-170: Fixed force for conf_package_opts only. -
  Clone from master if the project src is not present.

---
 usr/share/escenic/build-scripts/ece-build | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 3f9555b8..ee9015fd 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -613,7 +613,10 @@ function git_checkout
     if [ $update_repo -eq 1 ]; then
       udpate_repository
     fi
-    checkout_repo 
+    if [ ! -d $project_src_dir ]; then
+       run_wrapper git clone $git_path $project_src_master_dir $project_src_dir
+    fi
+    checkout_repo
   fi
   cd $project_src_dir
   revision=`git describe --always`
@@ -1602,7 +1605,7 @@ function automatic_deploy(){
 local ear_deploy_opts="--ear"
 local conf_deploy_opts="--conf"
   if [ $do_force -eq 1 ]; then
-     ear_deploy_opts="--force $conf_deploy_opts"
+     conf_deploy_opts="--force $conf_deploy_opts"
   fi
   if [ $deploy_resources -eq 1 ]; then
      ear_deploy_opts="--update-publication-resources $ear_deploy_opts"

From aad3882a034b65e385aa07759f400d4a661b61e5 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Mon, 5 Oct 2015 17:13:11 +0200
Subject: [PATCH 2347/2585] VOSA-170: Changed the owner ship of the escenic
 directory after conf package deployment

---
 usr/sbin/ece-deploy | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/usr/sbin/ece-deploy b/usr/sbin/ece-deploy
index 86f35b1c..bfe28be0 100755
--- a/usr/sbin/ece-deploy
+++ b/usr/sbin/ece-deploy
@@ -14,6 +14,7 @@ log=/var/log/escenic/$(basename $0).log
 proxy_settings=""
 engine1_dir=/opt/tomcat-engine1
 search1_dir=/opt/tomcat-search1
+escenic_conf_dir=/etc/escenic
 
 function ece_deploy_cancel_hook() {
   local the_dir=$ece_deploy_data_dir/$deployment_id
@@ -181,8 +182,9 @@ function deploy_conf() {
     $dpkg_opts \
     --install $ece_deploy_download_dir/$(basename $conf_package_uri)
   print_and_log "Changing ownership for engine1 and search1 to $ece_unix_user"
-  chown -R $ece_unix_user:$ece_unix_user $engine1_dir
-  chown -R $ece_unix_user:$ece_unix_user $search1_dir
+  sudo chown -R $ece_unix_user:$ece_unix_user $engine1_dir
+  sudo chown -R $ece_unix_user:$ece_unix_user $search1_dir
+  sudo chown -R $ece_unix_user:$ece_unix_user $escenic_conf_dir
 }
 
 function read_user_input() {

From 660716024a61ed350c9f5d68ff6b60337a0b35e7 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Tue, 6 Oct 2015 14:12:30 +0200
Subject: [PATCH 2348/2585] VOSA-170: Builder should check for
 maven.escenic.com. - Fixed typo

---
 usr/share/doc/escenic/ece-deploy-guide.org  |  2 +-
 usr/share/escenic/build-scripts/ece-builder | 47 +++++++++++++++++----
 2 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/usr/share/doc/escenic/ece-deploy-guide.org b/usr/share/doc/escenic/ece-deploy-guide.org
index 36b274b4..7162ed97 100644
--- a/usr/share/doc/escenic/ece-deploy-guide.org
+++ b/usr/share/doc/escenic/ece-deploy-guide.org
@@ -28,7 +28,7 @@ will be a file on a build server.
 ** --conf uri-to-conf
 The URI to the configuration package to use for the deployment on this
 machine, typically, this will be a file on a build server. This also can
-be a file configuration package file location, which is in this machine.
+be a configuration package file location, which is in this machine.
 
 ** --force
 Use force whenever necessary to get an automatic deployment. This is
diff --git a/usr/share/escenic/build-scripts/ece-builder b/usr/share/escenic/build-scripts/ece-builder
index f0b24406..7f0f3491 100755
--- a/usr/share/escenic/build-scripts/ece-builder
+++ b/usr/share/escenic/build-scripts/ece-builder
@@ -198,9 +198,9 @@ function verify_builder_conf
     print_and_log "Your user can't reach http://technet.escenic.com/, exiting!"
     remove_pid_and_exit_in_error
   fi
-  wget --http-user $maven_vizrt_user --http-password $maven_vizrt_password http://maven.vizrt.com/ -qO /dev/null
+  wget --http-user $maven_vizrt_user --http-password $maven_vizrt_password http://maven.escenic.com/ -qO /dev/null
   if [ $? -ne 0 ]; then
-    print_and_log "Your user can't reach http://maven.vizrt.com/, exiting!"
+    print_and_log "Your user can't reach http://maven.escenic.com/, exiting!"
     remove_pid_and_exit_in_error
   fi
   enforce_variable escenic_plugin_indentifiers "You need to configure a list of supported plugins in you builder configuration file using the variable escenic_plugin_indentifiers, exiting!"
@@ -258,14 +258,18 @@ plugins = ../plugins" >> $assemblytool_home/assemble.properties
           xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"
           xsi:schemaLocation=\"http://maven.apache.org/SETTINGS/1.0.0
                               http://maven.apache.org/xsd/settings-1.0.0.xsd\">
-  <servers>
+<servers>
     <server>
       <id>vizrt-repo</id>
-      <username>maven.username</username>
+      <username>maven.user</username>
+      <password>maven.password</password>
+    </server>
+    <server>
+      <id>vizrt-unstable</id>
+      <username>maven.user</username>
       <password>maven.password</password>
     </server>
   </servers>
-
   <profiles>
     <profile>
       <id>escenic-profile</id>
@@ -273,15 +277,42 @@ plugins = ../plugins" >> $assemblytool_home/assemble.properties
         <repository>
           <id>vizrt-repo</id>
           <name>Vizrt Maven Repository</name>
-          <url>http://maven.vizrt.com</url>
+          <url>http://maven.escenic.com</url>
+          <layout>default</layout>
+        </repository>
+      </repositories>
+      <pluginRepositories>
+        <pluginRepository>
+          <id>vizrt-repo</id>
+          <name>Vizrt Maven Repository</name>
+          <url>http://maven.escenic.com</url>
+          <layout>default</layout>
+        </pluginRepository>
+      </pluginRepositories>
+    </profile>
+    <profile>
+      <id>unstable</id>
+      <repositories>
+        <repository>
+          <id>vizrt-unstable</id>
+          <name>Vizrt Maven Repository</name>
+          <url>http://maven.escenic.com/unstable</url>
           <layout>default</layout>
         </repository>
       </repositories>
+      <pluginRepositories>
+        <pluginRepository>
+          <id>vizrt-unstable</id>
+          <name>Vizrt Maven Repository</name>
+          <url>http://maven.escenic.com/unstable</url>
+          <layout>default</layout>
+        </pluginRepository>
+      </pluginRepositories>
     </profile>
   </profiles>
-
   <activeProfiles>
     <activeProfile>escenic-profile</activeProfile>
+    <activeProfile>unstable</activeProfile>
     <activeProfile>builder</activeProfile>
   </activeProfiles>
 </settings>" > $m2_home/settings.xml
@@ -502,7 +533,7 @@ function process_artifact
   fi
 
   # fetch and unpack resource
-  if [[ "${artifact_path}" == *maven.vizrt.com* ]]; then
+  if [[ "${artifact_path}" == *maven.vizrt.com* ]] || [[ "$artifact_path" =~ "maven.escenic.com" ]] ; then
     local http_user=$maven_vizrt_user
     local http_password=$maven_vizrt_password
   elif [[ "${artifact_path}" == *technet* ]]; then

From de1ef8e18521bb892b1414e300be91dafb014469 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Fri, 9 Oct 2015 10:59:33 +0200
Subject: [PATCH 2349/2585] VOSA-170: Now it is possible to configure branch
 name in the build.conf file, so that we do not need to pass the branch name
 everytime.

- Fix src directory clean problem
---
 usr/share/escenic/build-scripts/ece-build | 44 +++++++++++------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index ee9015fd..df764242 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -366,7 +366,7 @@ function get_user_options
     case $opt in
       b)
         svn_path=branches/${OPTARG}
-        git_path="${OPTARG}"
+        branch_name="${OPTARG}"
         release_label=branch-${OPTARG}
         ;;
       t)
@@ -511,8 +511,8 @@ function clean_customer_home
   fi
 
   # drop and recreate project src directory if it exists
-  if [ -d $project_src_dir  ] && [ $clean_repo -eq 1 ]; then
-    print_and_log "You asked for cleaning the $project_src_dir to be removed"
+  if [ -d $project_src_dir  ] && ([ $clean_repo -eq 1 ] || [ $local_mode == false ]); then
+    print_and_log "Cleaning up project source directroy $project_src_dir"
     run_wrapper rm -rf $project_src_dir
   fi
 }
@@ -570,15 +570,14 @@ function git_checkout
     exit 1
   fi
   # Check the remote branch exists for not
-  if [ -n "$git_path" ]; then
-    local exists=$(git ls-remote --heads $git_repo_uri | grep $git_path)
+  if [ -n "$branch_name" ]; then
+    local exists=$(git ls-remote --heads $git_repo_uri | grep $branch_name)
     if [ -z "$exists" ]; then
-      print_and_log "The request branch $git_path does NOT exist, exiting!"
+      print_and_log "The request branch $branch_name does NOT exist, exiting!"
       exit 1
     fi
-    release_label=branch-$git_path
-    branch_name=$git_path
-    git_path="-b $git_path"
+    release_label=branch-$branch_name
+    git_path="-b $branch_name"
   fi
 
   
@@ -597,7 +596,7 @@ function git_checkout
   if [ $local_mode == false ]; then
   clean_up
   run_wrapper git checkout master
-  udpate_repository
+  update_repository
   clean_up
   # git checkout
   run_wrapper git clone $git_path $project_src_master_dir $project_src_dir
@@ -606,31 +605,31 @@ function git_checkout
     if [ $clean_repo -eq 1 ]; then
       clean_up
     fi
-    if [ -z "$git_path" ]; then
+    if [ -z "$branch_name" ]; then
         branch_name=master
-        git_path="-b master"
+        git_path="-b $branch_name"
     fi
     if [ $update_repo -eq 1 ]; then
-      udpate_repository
+      update_repository
     fi
     if [ ! -d $project_src_dir ]; then
        run_wrapper git clone $git_path $project_src_master_dir $project_src_dir
     fi
-    checkout_repo
+    cd $project_src_dir
+    update_repository
   fi
-  cd $project_src_dir
   revision=`git describe --always`
   if [[ $revision = "" ]]; then
     print_and_log "Failed to fetch current revision number, exiting!"
     exit 1
   fi
 
-  if [ -z "$git_path" ]; then
-    git_path="-b master"
+  if [ -z "$branch_name" ]; then
+    git_path="-b $branch_name"
   fi
 }
 ## Git update repository 
-function udpate_repository
+function update_repository
 {
   run_wrapper git remote update
   run_wrapper git fetch
@@ -640,9 +639,10 @@ function udpate_repository
 
 function checkout_repo
 {
-  if [[ "$git_path" != "" ]]; then
+  if [ -n  "$branch_name" ]; then
     git show-ref --quiet --verify "refs/heads/$branch_name"
     if [ $? = 0 ]; then
+    print_and_log "Checkout src directory to $branch_name"
       run_wrapper git checkout $branch_name
     else
       run_wrapper git checkout -b $branch_name origin/$branch_name
@@ -1299,7 +1299,7 @@ EOF
          # get git repo's name
          local git_base_dir=$(lowercase $(basename $git_base))
          # get git repo's branch name
-         local git_path_dir=$(echo $git_path | sed 's/-b //g')
+         local git_path_dir=$branch_name
          local change_log_dir=$HOME/.generate-git-changelog/${git_base_dir}/${git_path_dir}
     fi
 
@@ -1454,7 +1454,7 @@ function generate_new_changelog() {
         # --project git repo name and branch
 	if [[ ! -z $jira_base_url ]]; then 
     	run_wrapper generate-git-changelog \
-    	  --project $(basename $git_base)/$(echo $git_path | sed 's/-b //g') \
+    	  --project $(basename $git_base)/$branch_name \
     	  --user $jira_user \
           --password $jira_password \
     	  ${from_option} \
@@ -1462,7 +1462,7 @@ function generate_new_changelog() {
           --jirabaseurl $jira_base_url
 	else
     	run_wrapper generate-git-changelog \
-    	  --project $(basename $git_base)/$(echo $git_path | sed 's/-b //g') \
+    	  --project $(basename $git_base)/$branch_name \
     	  ${from_option} \
     	  --to $revision 
 	fi

From 8bd3055fe28582f62c23c1617bc9c266efbbf001 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Mon, 12 Oct 2015 13:09:15 +0200
Subject: [PATCH 2350/2585] VOSA-170: Updated remote before switching to
 branch. - Fixed typo.

---
 usr/share/escenic/build-scripts/ece-build | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index df764242..dfae7c00 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -512,7 +512,7 @@ function clean_customer_home
 
   # drop and recreate project src directory if it exists
   if [ -d $project_src_dir  ] && ([ $clean_repo -eq 1 ] || [ $local_mode == false ]); then
-    print_and_log "Cleaning up project source directroy $project_src_dir"
+    print_and_log "Cleaning up project source directory $project_src_dir"
     run_wrapper rm -rf $project_src_dir
   fi
 }
@@ -593,14 +593,15 @@ function git_checkout
     run_wrapper git clone $git_repo_uri $project_src_master_dir
   fi
   cd $project_src_master_dir
-  if [ $local_mode == false ]; then
   clean_up
   run_wrapper git checkout master
   update_repository
   clean_up
   # git checkout
-  run_wrapper git clone $git_path $project_src_master_dir $project_src_dir
-  else
+  if [ ! -d $project_src_dir ]; then
+    run_wrapper git clone $git_path $project_src_master_dir $project_src_dir
+  fi
+  if [ $local_mode == true ]; then
     print_and_log "Switching to local mode. You can use -u to update and -c to clean your local git repo"
     if [ $clean_repo -eq 1 ]; then
       clean_up
@@ -609,14 +610,13 @@ function git_checkout
         branch_name=master
         git_path="-b $branch_name"
     fi
+    cd $project_src_dir
+    run_wrapper git remote update
+    run_wrapper git fetch
+    checkout_repo
     if [ $update_repo -eq 1 ]; then
       update_repository
     fi
-    if [ ! -d $project_src_dir ]; then
-       run_wrapper git clone $git_path $project_src_master_dir $project_src_dir
-    fi
-    cd $project_src_dir
-    update_repository
   fi
   revision=`git describe --always`
   if [[ $revision = "" ]]; then
@@ -639,7 +639,7 @@ function update_repository
 
 function checkout_repo
 {
-  if [ -n  "$branch_name" ]; then
+  if [ -n "$branch_name" ]; then
     git show-ref --quiet --verify "refs/heads/$branch_name"
     if [ $? = 0 ]; then
     print_and_log "Checkout src directory to $branch_name"

From 666a5c16af7d2bea08e80c5b6e458a72b459decd Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Wed, 21 Oct 2015 18:36:50 +0200
Subject: [PATCH 2351/2585] VOSA-183: Setup maven for local builder.

---
 .../escenic/build-scripts/ece-local-builder   | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-local-builder b/usr/share/escenic/build-scripts/ece-local-builder
index d3071cb9..7c42bae2 100755
--- a/usr/share/escenic/build-scripts/ece-local-builder
+++ b/usr/share/escenic/build-scripts/ece-local-builder
@@ -70,11 +70,11 @@ function verify_builder_conf
   fi
   enforce_variable customer_name "Your builder configuration file is missing the variable customer_name, exiting!"
   enforce_variable technet_user "Your builder configuration file is missing the variable technet_user, exiting!"
-  enforce_variable technet_user "Your builder configuration file is missing the variable technet_user, exiting!"
-  enforce_variable technet_user "Your builder configuration file is missing the variable technet_password, exiting!"
+  enforce_variable technet_password "Your builder configuration file is missing the variable technet_password, exiting!"
   enforce_variable maven_user "Your builder configuration file is missing the variable maven_user, exiting!"
   enforce_variable maven_password "Your builder configuration file is missing the variable maven_password, exiting!"
   enforce_variable assemblytool_url "Your builder configuration file is missing the variable assemblytool_url, exiting!"
+  enforce_variable maven_url "Your builder configuration is missing the variable maven_url, exiting"
 
   wget --http-user $technet_user --http-password $technet_password http://technet.escenic.com/ -qO /dev/null
   if [ $? -ne 0 ]; then
@@ -621,6 +621,7 @@ do_force=$do_force" > /home/$1/.build/build.conf
     remove_pid_and_exit_in_error
   fi
   setup_nginx $1 $2
+  setup_maven
 }
 
 function setup_nginx
@@ -630,10 +631,22 @@ function setup_nginx
         alias /var/www/$1/releases/;
         expires modified +310s;
 }" > /etc/nginx/default-site/$1.conf
-  fi 
-
+  fi
 }
 
+function setup_maven
+{
+local temdir=/tmp
+wget --quite $maven_url -O /tmp/$(basename $maven_url)
+unzip /tmp/$(basename $maven_url) -d /usr/local/maven
+tee /etc/profile.d/envmaven.sh << EOF
+M2_HOME=/usr/local/maven/$(echo "$(basename $maven_url)" | cut -d'-' -f1-3)
+M2=$M2_HOME/bin
+PATH=$M2:$PATH
+EOF
+chmod a+x /etc/profile.d/envmaven.sh
+rm /tmp/$(basename $maven_url)
+}
 
 ##
 function common_post_build {

From bf59d8be93d50d88565c7984ca841c3db9270311 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Wed, 21 Oct 2015 22:41:12 +0200
Subject: [PATCH 2352/2585] VOSA-183: Changed variable name maven_url -->
 maven_download_url

---
 usr/share/escenic/build-scripts/ece-local-builder | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-local-builder b/usr/share/escenic/build-scripts/ece-local-builder
index 7c42bae2..9ef17ebe 100755
--- a/usr/share/escenic/build-scripts/ece-local-builder
+++ b/usr/share/escenic/build-scripts/ece-local-builder
@@ -74,7 +74,7 @@ function verify_builder_conf
   enforce_variable maven_user "Your builder configuration file is missing the variable maven_user, exiting!"
   enforce_variable maven_password "Your builder configuration file is missing the variable maven_password, exiting!"
   enforce_variable assemblytool_url "Your builder configuration file is missing the variable assemblytool_url, exiting!"
-  enforce_variable maven_url "Your builder configuration is missing the variable maven_url, exiting"
+  enforce_variable maven_download_url "Your builder configuration is missing the variable maven_download_url, exiting"
 
   wget --http-user $technet_user --http-password $technet_password http://technet.escenic.com/ -qO /dev/null
   if [ $? -ne 0 ]; then
@@ -637,15 +637,15 @@ function setup_nginx
 function setup_maven
 {
 local temdir=/tmp
-wget --quite $maven_url -O /tmp/$(basename $maven_url)
-unzip /tmp/$(basename $maven_url) -d /usr/local/maven
+wget --quite $maven_download_url -O /tmp/$(basename $maven_download_url)
+unzip /tmp/$(basename $maven_download_url) -d /usr/local/maven
 tee /etc/profile.d/envmaven.sh << EOF
-M2_HOME=/usr/local/maven/$(echo "$(basename $maven_url)" | cut -d'-' -f1-3)
+M2_HOME=/usr/local/maven/$(echo "$(basename $maven_download_url)" | cut -d'-' -f1-3)
 M2=$M2_HOME/bin
 PATH=$M2:$PATH
 EOF
 chmod a+x /etc/profile.d/envmaven.sh
-rm /tmp/$(basename $maven_url)
+rm /tmp/$(basename $maven_download_url)
 }
 
 ##

From fef0ca9b75d4dc2e4341c173f0e9d2ae377fd0fd Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Wed, 21 Oct 2015 23:43:21 +0200
Subject: [PATCH 2353/2585] VOSA-183: Fixed typo in wget options. - Escaped $
 to add path and M2_HOME variable.

---
 usr/share/escenic/build-scripts/ece-local-builder | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-local-builder b/usr/share/escenic/build-scripts/ece-local-builder
index 9ef17ebe..f707df35 100755
--- a/usr/share/escenic/build-scripts/ece-local-builder
+++ b/usr/share/escenic/build-scripts/ece-local-builder
@@ -637,12 +637,12 @@ function setup_nginx
 function setup_maven
 {
 local temdir=/tmp
-wget --quite $maven_download_url -O /tmp/$(basename $maven_download_url)
+wget --quiet $maven_download_url -O /tmp/$(basename $maven_download_url)
 unzip /tmp/$(basename $maven_download_url) -d /usr/local/maven
 tee /etc/profile.d/envmaven.sh << EOF
 M2_HOME=/usr/local/maven/$(echo "$(basename $maven_download_url)" | cut -d'-' -f1-3)
-M2=$M2_HOME/bin
-PATH=$M2:$PATH
+M2=\$M2_HOME/bin
+PATH=\$M2:\$PATH
 EOF
 chmod a+x /etc/profile.d/envmaven.sh
 rm /tmp/$(basename $maven_download_url)

From 33a62844b44cec27a208149eaba91499bc3662e0 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Thu, 22 Oct 2015 01:14:02 +0200
Subject: [PATCH 2354/2585] VOSA-183: Authorized users for local build. -
 Disabled host key checking - Fixed $PATH

---
 .../escenic/build-scripts/ece-local-builder   | 35 +++++++++++++++++--
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-local-builder b/usr/share/escenic/build-scripts/ece-local-builder
index f707df35..8fb2cbaa 100755
--- a/usr/share/escenic/build-scripts/ece-local-builder
+++ b/usr/share/escenic/build-scripts/ece-local-builder
@@ -202,11 +202,15 @@ local users
           do
             ensure_no_user_conflict $user $customer_name
             add_customer $user $customer_name
+            setup_nginx $user $customer_name
           done
       else
        ensure_no_user_conflict $builder_system_user $customer_name
        add_customer $builder_system_user $customer_name
+       setup_nginx $builder_system_user $customer_name
       fi
+      setup_maven
+      authorize_users
     else
       print_and_log "No valid action chosen, exiting!" >&2
       remove_pid_and_exit_in_error
@@ -620,8 +624,6 @@ do_force=$do_force" > /home/$1/.build/build.conf
     print_and_log "Failed to add symlink for /var/www/$1/releases"
     remove_pid_and_exit_in_error
   fi
-  setup_nginx $1 $2
-  setup_maven
 }
 
 function setup_nginx
@@ -634,6 +636,15 @@ function setup_nginx
   fi
 }
 
+function disable_host_key_checking
+{
+local git_host=$(echo "$git_base" | cut -d '/' -f1)
+tee > /home/escenic/.ssh/config << EOF
+Host $git_host
+    StrictHostKeyChecking no
+EOF
+}
+
 function setup_maven
 {
 local temdir=/tmp
@@ -642,12 +653,30 @@ unzip /tmp/$(basename $maven_download_url) -d /usr/local/maven
 tee /etc/profile.d/envmaven.sh << EOF
 M2_HOME=/usr/local/maven/$(echo "$(basename $maven_download_url)" | cut -d'-' -f1-3)
 M2=\$M2_HOME/bin
-PATH=\$M2:\$PATH
+PATH=\$M2:\$PATH:/usr/sbin/bin:/usr/local/sbin:/usr/sbin
 EOF
 chmod a+x /etc/profile.d/envmaven.sh
 rm /tmp/$(basename $maven_download_url)
 }
 
+function authorize_users
+{
+local home_dir=/home
+users=`ls -1 $home_dir`
+  if [ ! -d $home_dir/$builder_system_user/.ssh ];then
+     mkdir -m 700 $home_dir/$builder_system_user/.ssh
+  fi
+   for user in $users
+      do
+        if [ -e $home_dir/$user/.ssh/authorized_keys ]; then
+        cat $home_dir/$user/.ssh/authorized_keys >> $home_dir/$builder_system_user/.ssh/keys
+        fi
+   done
+   cat /root/.ssh/authorized_keys >> $home_dir/$builder_system_user/.ssh/keys
+   mv $home_dir/$builder_system_user/.ssh/keys $home_dir/$builder_system_user/.ssh/authorized_keys
+   chown -R $builder_system_user:$builder_system_user $home_dir/$builder_system_user/.ssh
+}
+
 ##
 function common_post_build {
   run rm $pid_file

From 6237169e5b2b12fcfc2df2d56368b008b30e75f9 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Thu, 22 Oct 2015 01:43:40 +0200
Subject: [PATCH 2355/2585] VOSA-183: Added missing function call.

---
 usr/share/escenic/build-scripts/ece-local-builder | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/build-scripts/ece-local-builder b/usr/share/escenic/build-scripts/ece-local-builder
index 8fb2cbaa..afa33ebd 100755
--- a/usr/share/escenic/build-scripts/ece-local-builder
+++ b/usr/share/escenic/build-scripts/ece-local-builder
@@ -211,6 +211,7 @@ local users
       fi
       setup_maven
       authorize_users
+      disable_host_key_checking
     else
       print_and_log "No valid action chosen, exiting!" >&2
       remove_pid_and_exit_in_error

From 6090c4a54bda66efd45fdb84ff0ad484711b147b Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Thu, 22 Oct 2015 02:05:14 +0200
Subject: [PATCH 2356/2585] VOSA-183: Run ece-build for the first time to
 preload .m2 directory using -b option. - Used wrapper function run to execute
 commands.

---
 .../escenic/build-scripts/ece-local-builder   | 37 ++++++++++++++-----
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-local-builder b/usr/share/escenic/build-scripts/ece-local-builder
index afa33ebd..a417e5bc 100755
--- a/usr/share/escenic/build-scripts/ece-local-builder
+++ b/usr/share/escenic/build-scripts/ece-local-builder
@@ -21,6 +21,7 @@ wget"
 add_customer=0
 given_skip_user_creation=0
 given_all_system_users=0
+first_build=0
 
 # Add user variables
 builder_system_user=
@@ -75,6 +76,7 @@ function verify_builder_conf
   enforce_variable maven_password "Your builder configuration file is missing the variable maven_password, exiting!"
   enforce_variable assemblytool_url "Your builder configuration file is missing the variable assemblytool_url, exiting!"
   enforce_variable maven_download_url "Your builder configuration is missing the variable maven_download_url, exiting"
+  enforce_variable branch_name "Your builder configuration is missing the variable branch_name, exiting"
 
   wget --http-user $technet_user --http-password $technet_password http://technet.escenic.com/ -qO /dev/null
   if [ $? -ne 0 ]; then
@@ -168,6 +170,10 @@ function get_user_options
         print_and_log "Adding builder to all system users ..."
         given_all_system_users=1
         ;;
+      b)
+        print_and_log "I will run ece-build for the first time after builder setup is finised."
+        first_build=1
+        ;;
       V)
         echo "Version:" $ece_scripts_version
         exit 0
@@ -212,6 +218,9 @@ local users
       setup_maven
       authorize_users
       disable_host_key_checking
+      if [ $first_build -eq 1 ]; then
+        run_ece_build
+      fi
     else
       print_and_log "No valid action chosen, exiting!" >&2
       remove_pid_and_exit_in_error
@@ -609,7 +618,8 @@ auto_deploy=$auto_deploy
 deploy_ear=$deploy_ear
 deploy_conf=$deploy_conf
 update_resources=$update_resources
-do_force=$do_force" > /home/$1/.build/build.conf
+do_force=$do_force
+branch_name=$branch_name" > /home/$1/.build/build.conf
   run chown $1:$1 /home/$1/.build/build.conf
   run rsync -av $skel_dir/ /home/$1
   run chown -R $1:$1 /home/$1
@@ -649,15 +659,22 @@ EOF
 function setup_maven
 {
 local temdir=/tmp
-wget --quiet $maven_download_url -O /tmp/$(basename $maven_download_url)
-unzip /tmp/$(basename $maven_download_url) -d /usr/local/maven
+run wget --quiet $maven_download_url -O /tmp/$(basename $maven_download_url)
+run unzip /tmp/$(basename $maven_download_url) -d /usr/local/maven
 tee /etc/profile.d/envmaven.sh << EOF
 M2_HOME=/usr/local/maven/$(echo "$(basename $maven_download_url)" | cut -d'-' -f1-3)
 M2=\$M2_HOME/bin
 PATH=\$M2:\$PATH:/usr/sbin/bin:/usr/local/sbin:/usr/sbin
 EOF
-chmod a+x /etc/profile.d/envmaven.sh
-rm /tmp/$(basename $maven_download_url)
+run chmod a+x /etc/profile.d/envmaven.sh
+run rm /tmp/$(basename $maven_download_url)
+}
+
+function run_ece_build
+{
+run su - $builder_system_user
+run ece-build
+
 }
 
 function authorize_users
@@ -665,17 +682,17 @@ function authorize_users
 local home_dir=/home
 users=`ls -1 $home_dir`
   if [ ! -d $home_dir/$builder_system_user/.ssh ];then
-     mkdir -m 700 $home_dir/$builder_system_user/.ssh
+    run mkdir -m 700 $home_dir/$builder_system_user/.ssh
   fi
    for user in $users
       do
         if [ -e $home_dir/$user/.ssh/authorized_keys ]; then
-        cat $home_dir/$user/.ssh/authorized_keys >> $home_dir/$builder_system_user/.ssh/keys
+        run cat $home_dir/$user/.ssh/authorized_keys >> $home_dir/$builder_system_user/.ssh/keys
         fi
    done
-   cat /root/.ssh/authorized_keys >> $home_dir/$builder_system_user/.ssh/keys
-   mv $home_dir/$builder_system_user/.ssh/keys $home_dir/$builder_system_user/.ssh/authorized_keys
-   chown -R $builder_system_user:$builder_system_user $home_dir/$builder_system_user/.ssh
+  run cat /root/.ssh/authorized_keys >> $home_dir/$builder_system_user/.ssh/keys
+  run  mv $home_dir/$builder_system_user/.ssh/keys $home_dir/$builder_system_user/.ssh/authorized_keys
+  run chown -R $builder_system_user:$builder_system_user $home_dir/$builder_system_user/.ssh
 }
 
 ##

From 5af5693e4e115736ebd6029ade9309ae1c12cf38 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Thu, 22 Oct 2015 11:09:06 +0200
Subject: [PATCH 2357/2585] VOSA-184: A  sample sdp.xml is will be available in
 skeleton-kvm from now.

---
 usr/bin/vosa | 142 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 142 insertions(+)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 1600e747..dc11ceca 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -237,6 +237,148 @@ processor_affinity 0,1,2,3
 # This should only be used to debug boot problems; in production it
 # should not be necessary to vnc to the guests...
 vnc_port none
+EOF
+  fi
+    if [ ! -r /etc/vizrt/vosa/skeleton-kvm/sdp.xml ] ; then
+    cat > /etc/vizrt/vosa/skeleton-kvm/sdp.xml <<EOF
+<?xml version="1.0"?>
+<sdp xmlns="http://www.vizrt.com/types/service-design-package">
+    <global-variables>
+        <!-- Fill in all the following parameters -->
+        <param name="name">NAME</param>
+        <param name="timezone">TIMEZONE</param>
+        <param name="location">LOCATION</param>
+        <param name="shortname">SHORTNAME</param>
+        <param name="realm">REALM</param>
+        <param name="domain">DOMAIN</param>
+    </global-variables>
+
+    <feature type="authentication" revision="1" id="technet-login">
+        <param name="url">http://technet.escenic.com/</param>
+        <!-- Enter your Technet username and password -->
+        <param name="userid">USERNAME</param>
+        <param name="password">PASSWORD</param>
+    </feature>
+
+    <feature type="escenic-publication" revision="1" id="nightly">
+        <param name="name">demopub</param>
+        <param name="webapp">demopub</param>
+        <param name="primary-host">demopub.${domain}</param>
+    </feature>
+
+    <module type="unix-user" revision="1" id="root-user">
+        <param name="username">root</param>
+        <!-- Choose and enter a root password -->
+        <param name="password" scopes="platform">PASSWORD</param>
+    </module>
+
+    <module type="unix-user" revision="1" id="escenic-user">
+        <param name="username">escenic</param>
+        <param name="group" scopes="platform">adm</param>
+        <!-- Choose and enter a password for the escenic user -->
+        <param name="password" scopes="platform">PASSWORD</param>
+    </module>
+
+    <module type="security-policy" revision="1"/>
+
+    <module type="ubuntu-mirror" revision="1">
+        <param name="url">http://no.archive.ubuntu.com/ubuntu/</param>
+    </module>
+
+    <module type="additional-packages" revision="1" id="jdk8">
+        <param name="deb-package">unixodbc</param>
+        <param name="deb-package">defoma</param>
+        <param name="deb-package">java-common</param>
+        <param name="deb-package">xsltproc</param>
+        <param name="deb-package-list">http://secrets.vizrtsaas.com/static/packages/java/8/server.urilist</param>
+        <!-- Enter the Escenic Debian repository passphrase -->
+        <param name="passphrase">PASSPHRASE</param>
+    </module>
+
+    <module type="additional-packages" revision="1" id="python">
+        <param name="deb-package">python-dev</param>
+        <param name="deb-package">libxml2-dev</param>
+        <param name="deb-package">libxslt1-dev</param>
+        <param name="pip-package">lxml</param>
+    </module>
+
+    <module type="branding" revision="1">
+        <param name="name">${name}</param>
+        <param name="timezone">${timezone}</param>
+        <param name="realm">${realm}</param>
+    </module>
+
+    <feature type="escenic-mysql" revision="1" id="escenic-db"/>
+
+    <feature type="escenic-ear" revision="1">
+        <!-- Replace with a correct download URL (see Escenic Cloud Installation Guide) -->
+        <param name="url">http://BUILDER-IP:PORT/escenic/CUSTOMER/releases/CUSTOMER-trunk-latest.ear</param>
+    </feature>
+
+    <feature type="escenic-conf" revision="1">
+        <!-- Replace with a correct download URL (see Escenic Cloud Installation Guide) -->
+        <param name="url">
+            http://BUILDER-IP:PORT/escenic/CUSTOMER/releases/vosa-conf-CUSTOMER-1-CUSTOMER-trunk-latest.deb
+        </param>
+    </feature>
+
+    <feature type="maven-repository" revision="1">
+        <param name="url">http://maven.escenic.com</param>
+        <!-- Enter your Escenic Maven repo username and password -->
+        <param name="userid">MAVEN-USER</param>
+        <param name="password">MAVEN-PASSWORD</param>
+    </feature>
+
+    <feature type="maven-repository" revision="1">
+        <param name="url">http://repo.dev.escenic.com/content/groups/trunk</param>
+    </feature>
+
+    <feature type="maven-repository" revision="1">
+        <param name="url">http://maven.escenic.com/unstable</param>
+        <!-- Enter your Escenic Maven repo username and password -->
+        <param name="userid">MAVEN-USER</param>
+        <param name="password">MAVEN-PASSWORD</param>
+    </feature>
+
+    <module type="escenic-database" revision="1">
+        <use-feature refid="escenic-db"/>
+        <use-feature type="escenic-ear"/>
+        <use-feature type="maven-repository"/>
+    </module>
+
+    <module type="ece-install" revision="4">
+        <use-feature refid="escenic-db"/>
+        <use-feature type="escenic-ear"/>
+        <use-feature type="escenic-conf"/>
+        <use-feature type="maven-repository"/>
+        <param name="tomcat-base-uri" override="tomcat-base-uri">
+            http://ftp.heanet.ie/mirrors/www.apache.org/dist/tomcat/tomcat-7/
+        </param>
+    </module>
+
+    <feature-group name="everything">
+        <ref-feature refid="technet-login"/>
+        <ref-feature refid="escenic-db"/>
+        <ref-feature refid="nightly"/>
+    </feature-group>
+
+    <!-- Enter environment/cluster/machine names and ids (see Escenic Cloud Installation Guide) -->
+    <environment name="ENVIRONMENT-NAME" id="ENVIRONMENT-ID">
+        <cluster name="CLUSTER-NAME">
+            <machine name="MACHINE-NAME">
+                <ref-feature-group name="everything"/>
+                <ref-module refid="root-user"/>
+                <ref-module refid="escenic-user"/>
+                <ref-module type="ece-install"/>
+                <ref-module type="escenic-database"/>
+                <ref-module type="security-policy"/>
+                <ref-module refid="jdk8"/>
+                <ref-module refid="python"/>
+                <ref-module type="branding"/>
+            </machine>
+        </cluster>
+    </environment>
+</sdp>
 EOF
   fi
   # TODO:

From 8ceefa28ec4e9b9909c56c3bf9a13ca143037227 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Thu, 22 Oct 2015 11:13:38 +0200
Subject: [PATCH 2358/2585] VOSA-184: Escaped $ in sample sdp.xml

---
 usr/bin/vosa | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index dc11ceca..80f25cfb 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -263,7 +263,7 @@ EOF
     <feature type="escenic-publication" revision="1" id="nightly">
         <param name="name">demopub</param>
         <param name="webapp">demopub</param>
-        <param name="primary-host">demopub.${domain}</param>
+        <param name="primary-host">demopub.\${domain}</param>
     </feature>
 
     <module type="unix-user" revision="1" id="root-user">
@@ -303,9 +303,9 @@ EOF
     </module>
 
     <module type="branding" revision="1">
-        <param name="name">${name}</param>
-        <param name="timezone">${timezone}</param>
-        <param name="realm">${realm}</param>
+        <param name="name">\${name}</param>
+        <param name="timezone">\${timezone}</param>
+        <param name="realm">\${realm}</param>
     </module>
 
     <feature type="escenic-mysql" revision="1" id="escenic-db"/>

From 1ae6c65126e7aecb79b64b3c13fcc30f11aa2557 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Thu, 22 Oct 2015 11:16:17 +0200
Subject: [PATCH 2359/2585] VOSA-183: Added -b in options list for
 ece-local-builder

---
 usr/share/escenic/build-scripts/ece-local-builder | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/ece-local-builder b/usr/share/escenic/build-scripts/ece-local-builder
index a417e5bc..56a44407 100755
--- a/usr/share/escenic/build-scripts/ece-local-builder
+++ b/usr/share/escenic/build-scripts/ece-local-builder
@@ -155,7 +155,7 @@ function usages(){
 ##
 function get_user_options
 {
-  while getopts ":i:c:b:u:p:g:Vsa" opt; do
+  while getopts ":i:c:b:u:p:g:Vsab" opt; do
     case $opt in
       c)
         print_and_log "Customer builder configuration is given in ${OPTARG} ..."

From 85554fc01dd2a36a3397a914b81d73f89666367a Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Thu, 22 Oct 2015 12:39:20 +0200
Subject: [PATCH 2360/2585] VOSA-183: Removed duplicated options to build for
 the first time

---
 usr/share/escenic/build-scripts/ece-local-builder | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/ece-local-builder b/usr/share/escenic/build-scripts/ece-local-builder
index 56a44407..c358bd22 100755
--- a/usr/share/escenic/build-scripts/ece-local-builder
+++ b/usr/share/escenic/build-scripts/ece-local-builder
@@ -155,7 +155,7 @@ function usages(){
 ##
 function get_user_options
 {
-  while getopts ":i:c:b:u:p:g:Vsab" opt; do
+  while getopts ":i:c:u:p:g:Vsab" opt; do
     case $opt in
       c)
         print_and_log "Customer builder configuration is given in ${OPTARG} ..."

From 0db16285a0bc3f84ceddcc0f23b408c39a31f07a Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Thu, 22 Oct 2015 17:47:56 +0200
Subject: [PATCH 2361/2585] VOSA-183: Optimized authorizing users ssh keys

---
 .../escenic/build-scripts/ece-local-builder   | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-local-builder b/usr/share/escenic/build-scripts/ece-local-builder
index c358bd22..d16d6dac 100755
--- a/usr/share/escenic/build-scripts/ece-local-builder
+++ b/usr/share/escenic/build-scripts/ece-local-builder
@@ -654,6 +654,7 @@ tee > /home/escenic/.ssh/config << EOF
 Host $git_host
     StrictHostKeyChecking no
 EOF
+chown $builder_system_user:$builder_system_user /home/escenic/.ssh/config
 }
 
 function setup_maven
@@ -672,9 +673,7 @@ run rm /tmp/$(basename $maven_download_url)
 
 function run_ece_build
 {
-run su - $builder_system_user
-run ece-build
-
+run su - $builder_system_user -c 'ece-build'
 }
 
 function authorize_users
@@ -683,16 +682,22 @@ local home_dir=/home
 users=`ls -1 $home_dir`
   if [ ! -d $home_dir/$builder_system_user/.ssh ];then
     run mkdir -m 700 $home_dir/$builder_system_user/.ssh
+  fi
+  if [ ! -e $home_dir/$builder_system_user/.ssh/authorized_keys ]; then
+    run touch $home_dir/$builder_system_user/.ssh/authorized_keys
   fi
    for user in $users
       do
+        if [ "$user" == "$builder_system_user" ]; then
+          continue
+        fi
         if [ -e $home_dir/$user/.ssh/authorized_keys ]; then
-        run cat $home_dir/$user/.ssh/authorized_keys >> $home_dir/$builder_system_user/.ssh/keys
+         run  cat $home_dir/$user/.ssh/authorized_keys >> $home_dir/$builder_system_user/.ssh/authorized_keys
         fi
    done
-  run cat /root/.ssh/authorized_keys >> $home_dir/$builder_system_user/.ssh/keys
-  run  mv $home_dir/$builder_system_user/.ssh/keys $home_dir/$builder_system_user/.ssh/authorized_keys
-  run chown -R $builder_system_user:$builder_system_user $home_dir/$builder_system_user/.ssh
+#special handling for the root user authorized keys
+  run  cat /root/.ssh/authorized_keys >> $home_dir/$builder_system_user/.ssh/authorized_keys
+  run chown -R $builder_system_user:$builder_system_user $home_dir/$builder_system_user/.ssh/
 }
 
 ##

From d51c2b3faa3523ca2c23d0cada7682eb4e5b80e9 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Thu, 22 Oct 2015 18:38:57 +0200
Subject: [PATCH 2362/2585] VOSA-183: Get rid of wrapper run for cat operation.

---
 usr/share/escenic/build-scripts/ece-local-builder | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-local-builder b/usr/share/escenic/build-scripts/ece-local-builder
index d16d6dac..a1cf551c 100755
--- a/usr/share/escenic/build-scripts/ece-local-builder
+++ b/usr/share/escenic/build-scripts/ece-local-builder
@@ -692,11 +692,11 @@ users=`ls -1 $home_dir`
           continue
         fi
         if [ -e $home_dir/$user/.ssh/authorized_keys ]; then
-         run  cat $home_dir/$user/.ssh/authorized_keys >> $home_dir/$builder_system_user/.ssh/authorized_keys
+         cat $home_dir/$user/.ssh/authorized_keys >> $home_dir/$builder_system_user/.ssh/authorized_keys
         fi
    done
 #special handling for the root user authorized keys
-  run  cat /root/.ssh/authorized_keys >> $home_dir/$builder_system_user/.ssh/authorized_keys
+  cat /root/.ssh/authorized_keys >> $home_dir/$builder_system_user/.ssh/authorized_keys
   run chown -R $builder_system_user:$builder_system_user $home_dir/$builder_system_user/.ssh/
 }
 

From ca5c779c1c080ffc72a339a6c4cbc937951b4a63 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Fri, 23 Oct 2015 15:19:18 +0200
Subject: [PATCH 2363/2585] VOSA-185: Added sample builder.conf and user.conf
 to be used to setup escenic production builder.

---
 usr/share/escenic/build-scripts/ece-builder | 73 +++++++++++++++++++++
 1 file changed, 73 insertions(+)

diff --git a/usr/share/escenic/build-scripts/ece-builder b/usr/share/escenic/build-scripts/ece-builder
index 7f0f3491..b8c183f7 100755
--- a/usr/share/escenic/build-scripts/ece-builder
+++ b/usr/share/escenic/build-scripts/ece-builder
@@ -22,6 +22,7 @@ setup_builder=0
 add_user=0
 add_artifact=0
 add_artifact_list=0
+do_initialize=0
 
 # Add artifact variables
 list_path=
@@ -120,6 +121,12 @@ function verify_dependencies
 ##
 function get_user_options
 {
+  for el in "$1"; do
+    if [ "$el" == "initialize" ]; then
+       do_initialize=1
+       print_and_log "Initializing builder configuration ..."
+    fi
+  done
   while getopts ":i:u:a:l:c:s:m:p:V" opt; do
     case $opt in
       i)
@@ -161,14 +168,20 @@ function get_user_options
 ##
 function execute
 {
+  if [ $do_initialize -eq 1 ]; then
+     initialize
+     return
+  fi
   if [ $setup_builder -eq 1 ]; then
     verify_setup_builder
     verify_builder_conf
     setup_builder
   else
+    if [ $do_initialize -ne 1 ]; then
     verify_builder_exist
     read_builder_configuration
     verify_builder_conf
+    fi
     if [ $add_user -eq 1 ]; then
       verify_add_user
       ensure_no_user_conflict
@@ -179,6 +192,8 @@ function execute
     elif [ $add_artifact_list -eq 1 ]; then
       verify_add_artifact_list
       add_artifact_list
+    elif [ $do_initialize -eq 1 ]; then
+      initialize
     else
       print_and_log "No valid action chosen, exiting!" >&2
       remove_pid_and_exit_in_error
@@ -227,6 +242,64 @@ function verify_setup_builder
   fi
 }
 
+function initialize
+{
+local configuration_dir=/etc/escenic
+if [ ! -d $configuration_dir ]; then
+   mkdir $configuration_dir
+fi
+#Adding builder.conf file
+local builder_file=/etc/escenic/builder.conf
+tee > $builder_file << EOF
+technet_user=technet-user
+technet_password=technet-pass
+maven_vizrt_user=maven-user
+maven_vizrt_password=maven-pass
+
+# Unsupported plugins
+unsupported_plugin_indentifiers="inpage"
+
+# Supported Plugins
+escenic_plugin_indentifiers="forum
+geocode
+analysis-engine
+xml-editor
+menu-editor
+dashboard
+poll
+reporter
+lucy
+video
+newsroom
+vcpeditor
+online-graphics
+framework-dist
+framework-community-dist
+framework-mobile-dist
+widget-framework-core
+widget-framework-community
+widget-framework-mobile
+community-engine
+newsgate
+live-center
+section-feed
+mobile-expansion
+snapshot"
+EOF
+local user_file=/etc/escenic/user.conf
+print_and_log "Sample builder.conf file is generated successfully"
+#Adding sample user.conf flie
+tee > $user_file <<EOF
+user_name=mycloud
+user_svn_path=https://vizrtcustomers.jira.com/svn/mycloud/
+user_svn_username=mycloud-build-user
+user_svn_password=mycloud-password
+user_maven_username=mycloud-dev
+user_maven_password=adjective-noun
+EOF
+print_and_log "Sample user.conf file is generated successfully"
+}
+
 ##
 function setup_builder
 {

From bc5b789da48604006a771f682ee0569aa2d42bc5 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Mon, 26 Oct 2015 13:48:10 +0100
Subject: [PATCH 2364/2585] VOSA-183: Installed nginx server, if we do not find
 one for single project builder.

---
 .../escenic/build-scripts/ece-local-builder     | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/usr/share/escenic/build-scripts/ece-local-builder b/usr/share/escenic/build-scripts/ece-local-builder
index a1cf551c..76bb5085 100755
--- a/usr/share/escenic/build-scripts/ece-local-builder
+++ b/usr/share/escenic/build-scripts/ece-local-builder
@@ -639,6 +639,23 @@ branch_name=$branch_name" > /home/$1/.build/build.conf
 
 function setup_nginx
 {
+  local exists=$(dpkg -l | grep nginx)
+  if [ -z "$exists" ]; then
+     run apt-get -y install nginx
+  fi
+  if [ ! -d /etc/nginx/default-site ]; then
+    #We are trying to install in a fresh vm with out sdp.xml
+    run mkdir /etc/nginx/default-site
+    run rm /etc/nginx/sites-available/default
+    tee > /etc/nginx/sites-available/default << EOF
+server {
+  listen 81 default;
+  include /etc/nginx/default-site/*.conf;
+}
+
+EOF
+  fi
+
   if [ ! -e /etc/nginx/default-site/$1.conf ]; then
     echo "location /$1/$2/releases/ {
         alias /var/www/$1/releases/;

From 0c75c8291c774f5cc9c826b252f2614753684646 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Mon, 26 Oct 2015 14:08:56 +0100
Subject: [PATCH 2365/2585] VOSA-183: Deploy ear and deb automatically if it is
 turned on.

---
 usr/share/escenic/build-scripts/ece-build | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index dfae7c00..9a46ec56 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -1624,7 +1624,9 @@ local conf_deploy_opts="--conf"
 }
 
 function phase_deploy() {
-  automatic_deploy
+  if [ $auto_deploy == true ]; then
+    automatic_deploy
+  fi
 }
 
 ##

From 52c8d872cfe52cbe9cf6894f08f404a2ecf9abb5 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Mon, 26 Oct 2015 16:53:26 +0100
Subject: [PATCH 2366/2585] VOSA-183: Added initialize command to generate
 builder.conf file. - removed builder_system_user from web root.

---
 .../escenic/build-scripts/ece-local-builder   | 50 ++++++++++++++++---
 1 file changed, 44 insertions(+), 6 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-local-builder b/usr/share/escenic/build-scripts/ece-local-builder
index 76bb5085..a4d6c195 100755
--- a/usr/share/escenic/build-scripts/ece-local-builder
+++ b/usr/share/escenic/build-scripts/ece-local-builder
@@ -22,6 +22,7 @@ add_customer=0
 given_skip_user_creation=0
 given_all_system_users=0
 first_build=0
+do_initialize=0
 
 # Add user variables
 builder_system_user=
@@ -155,6 +156,12 @@ function usages(){
 ##
 function get_user_options
 {
+  for el in "$1"; do
+    if [ "$el" == "initialize" ]; then
+       do_initialize=1
+       print_and_log "Initializing builder configuration ..."
+    fi
+  done
   while getopts ":i:c:u:p:g:Vsab" opt; do
     case $opt in
       c)
@@ -195,6 +202,10 @@ function get_user_options
 ##
 function execute
 {
+  if [ $do_initialize -eq 1 ]; then
+     initialize
+     return
+  else
 local users
     if [ $add_customer -eq 1 ]; then
       if [ ! -d $root_dir ]; then
@@ -217,7 +228,7 @@ local users
       fi
       setup_maven
       authorize_users
-      disable_host_key_checking
+      disable_host_key_checking $builder_system_user
       if [ $first_build -eq 1 ]; then
         run_ece_build
       fi
@@ -225,10 +236,34 @@ local users
       print_and_log "No valid action chosen, exiting!" >&2
       remove_pid_and_exit_in_error
     fi
+  fi
 }
 
 
-##
+function initialize
+{
+local configuration_dir=/etc/escenic
+if [ ! -d $configuration_dir ]; then
+  run mkdir $configuration_dir
+fi
+#Adding builder.conf file
+local builder_file=/etc/escenic/builder.conf
+tee > $builder_file << EOF
+customer_name=mycloud
+technet_user=technet-username
+technet_password=technet-password
+maven_user=maven-username
+maven_password=maven-password
+git_url=ssh://git@git-ip-address/mycloud.git
+assemblytool_url=http://technet.escenic.com/downloads/release/57/assemblytool-2.0.7.zip
+local_mode=false
+auto_deploy=false
+ear_base_url=http://builder-ip-address
+package_for_machine=all
+branch_name=master
+maven_download_url=http://www.eu.apache.org/dist/maven/maven-3/3.3.3/binaries/apache-maven-3.3.3-bin.zip
+EOF
+}
 
 ##
 function init
@@ -611,7 +646,7 @@ src_control=git
 git_user=$git_user
 git_protocol=$git_protocol
 git_base=$git_base
-ear_base_url=$ear_base_url/$1
+ear_base_url=$ear_base_url
 local_mode=$local_mode
 package_for_machine=$package_for_machine
 auto_deploy=$auto_deploy
@@ -657,21 +692,22 @@ EOF
   fi
 
   if [ ! -e /etc/nginx/default-site/$1.conf ]; then
-    echo "location /$1/$2/releases/ {
+    echo "location /$2/releases/ {
         alias /var/www/$1/releases/;
         expires modified +310s;
 }" > /etc/nginx/default-site/$1.conf
   fi
+  service nginx restart
 }
 
 function disable_host_key_checking
 {
 local git_host=$(echo "$git_base" | cut -d '/' -f1)
-tee > /home/escenic/.ssh/config << EOF
+tee > /home/$1/.ssh/config << EOF
 Host $git_host
     StrictHostKeyChecking no
 EOF
-chown $builder_system_user:$builder_system_user /home/escenic/.ssh/config
+chown $builder_system_user:$builder_system_user /home/$1/.ssh/config
 }
 
 function setup_maven
@@ -730,8 +766,10 @@ function phase_startup {
 }
 
 function pre_setup_verify {
+if [ $do_initialize -ne 1 ]; then
   verify_builder_conf
   verify_user_options
+fi
 }
 
 ##

From cc4c83b6bad04a08ad4c3defcf16f1ef0eefe7be Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Tue, 27 Oct 2015 15:39:36 +0100
Subject: [PATCH 2367/2585] VOSA-183: Added the port with ip in ear_base_url in
 sample builder.conf file.

---
 usr/share/escenic/build-scripts/ece-local-builder | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/ece-local-builder b/usr/share/escenic/build-scripts/ece-local-builder
index a4d6c195..d279ee7e 100755
--- a/usr/share/escenic/build-scripts/ece-local-builder
+++ b/usr/share/escenic/build-scripts/ece-local-builder
@@ -258,7 +258,7 @@ git_url=ssh://git@git-ip-address/mycloud.git
 assemblytool_url=http://technet.escenic.com/downloads/release/57/assemblytool-2.0.7.zip
 local_mode=false
 auto_deploy=false
-ear_base_url=http://builder-ip-address
+ear_base_url=http://builder-ip-address:81
 package_for_machine=all
 branch_name=master
 maven_download_url=http://www.eu.apache.org/dist/maven/maven-3/3.3.3/binaries/apache-maven-3.3.3-bin.zip

From 6881591ff993f8c5f203ff03d8d9a8be071d6b3d Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Thu, 29 Oct 2015 11:05:47 +0100
Subject: [PATCH 2368/2585] VOSA-183: Changed ear url for master instead of
 trunk

---
 usr/bin/vosa | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 80f25cfb..c55325b1 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -312,13 +312,13 @@ EOF
 
     <feature type="escenic-ear" revision="1">
         <!-- Replace with a correct download URL (see Escenic Cloud Installation Guide) -->
-        <param name="url">http://BUILDER-IP:PORT/escenic/CUSTOMER/releases/CUSTOMER-trunk-latest.ear</param>
+        <param name="url">http://BUILDER-IP:PORT/escenic/CUSTOMER/releases/CUSTOMER-branch-master-latest.ear</param>
     </feature>
 
     <feature type="escenic-conf" revision="1">
         <!-- Replace with a correct download URL (see Escenic Cloud Installation Guide) -->
         <param name="url">
-            http://BUILDER-IP:PORT/escenic/CUSTOMER/releases/vosa-conf-CUSTOMER-1-CUSTOMER-trunk-latest.deb
+            http://BUILDER-IP:PORT/escenic/CUSTOMER/releases/vosa-conf-CUSTOMER-1-CUSTOMER-branch-master-latest.deb
         </param>
     </feature>
 

From 6a783ef043f15281265c9a7b6c49261452e5e670 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Thu, 29 Oct 2015 12:47:47 +0100
Subject: [PATCH 2369/2585] VOSA-183: Fixed typo

---
 usr/share/escenic/build-scripts/ece-local-builder | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/ece-local-builder b/usr/share/escenic/build-scripts/ece-local-builder
index d279ee7e..022c61f6 100755
--- a/usr/share/escenic/build-scripts/ece-local-builder
+++ b/usr/share/escenic/build-scripts/ece-local-builder
@@ -249,7 +249,7 @@ fi
 #Adding builder.conf file
 local builder_file=/etc/escenic/builder.conf
 tee > $builder_file << EOF
-customer_name=mycloud
+customer_name=customer-name
 technet_user=technet-username
 technet_password=technet-password
 maven_user=maven-username

From 8b4946ee154b6f5fd9c62bc2540ab3c42e005f8c Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Thu, 29 Oct 2015 14:01:00 +0100
Subject: [PATCH 2370/2585] VOSA-183: Commented out escenic-conf optional
 feature from sample sdp.xml to make it more simple.

---
 usr/bin/vosa | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index c55325b1..dacbcd4d 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -315,13 +315,14 @@ EOF
         <param name="url">http://BUILDER-IP:PORT/escenic/CUSTOMER/releases/CUSTOMER-branch-master-latest.ear</param>
     </feature>
 
-    <feature type="escenic-conf" revision="1">
+<!-- This feature is to deploy nursery configuration changes, in the Escenic installation. -->
+<!-- <feature type="escenic-conf" revision="1">
         <!-- Replace with a correct download URL (see Escenic Cloud Installation Guide) -->
         <param name="url">
             http://BUILDER-IP:PORT/escenic/CUSTOMER/releases/vosa-conf-CUSTOMER-1-CUSTOMER-branch-master-latest.deb
         </param>
     </feature>
-
+-->
     <feature type="maven-repository" revision="1">
         <param name="url">http://maven.escenic.com</param>
         <!-- Enter your Escenic Maven repo username and password -->
@@ -349,7 +350,8 @@ EOF
     <module type="ece-install" revision="4">
         <use-feature refid="escenic-db"/>
         <use-feature type="escenic-ear"/>
-        <use-feature type="escenic-conf"/>
+        <!-- Enable escenic-conf feature
+        <!--<use-feature type="escenic-conf"/>-->
         <use-feature type="maven-repository"/>
         <param name="tomcat-base-uri" override="tomcat-base-uri">
             http://ftp.heanet.ie/mirrors/www.apache.org/dist/tomcat/tomcat-7/

From 13a3aa428a048870342f28bfd5bb1ea01e06eba0 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Tue, 3 Nov 2015 15:46:56 +0100
Subject: [PATCH 2371/2585] VOSA-187: Updated copyright information in the all
 guides.

---
 COPYING                                                     | 2 +-
 README                                                      | 2 +-
 known-issues.org                                            | 4 ++--
 usr/share/doc/escenic/ece-deploy-guide.org                  | 6 +++---
 usr/share/doc/escenic/ece-guide.org                         | 6 +++---
 usr/share/doc/escenic/ece-import-guide.org                  | 6 +++---
 usr/share/doc/escenic/ece-install-guide.org                 | 4 ++--
 usr/share/doc/escenic/generate-changelog-guide.org          | 2 +-
 .../presentations/ece-install-introduction/presentation.org | 6 +++---
 usr/share/doc/escenic/system-info-guide.org                 | 6 +++---
 10 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/COPYING b/COPYING
index 649d546d..39789d32 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-   Copyright 2011-2013 Vizrt
+   Copyright 2011-2015 Escenic
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/README b/README
index 665512bb..fbcd9ef3 100644
--- a/README
+++ b/README
@@ -10,7 +10,7 @@ Overview
 These are scripts to help template developers and administrators
 manage various components of the Escenic Content Engine. The scripts
 are experimental and not yet a part of the official distribution of
-Escenic Content Engine from Vizrt Online.
+Escenic Content Engine.
 
 ========================
 Project directory layout
diff --git a/known-issues.org b/known-issues.org
index 3e6ce79a..31c64b2d 100644
--- a/known-issues.org
+++ b/known-issues.org
@@ -1,5 +1,5 @@
 #+TITLE: Known Issues
-#+AUTHOR: Vizrt Online / The SaaS Team
+#+AUTHOR: Escenic Cloud Team
 
 * ece-install
 ** 2013-01-17 cron script removes all 15 day old files on the system
@@ -19,7 +19,7 @@ affected, first remove the cron job if it's present:
 
 Then upgrade to the latest version of =ece-install= so that you're
 sure new runs of it will set up a proper cron job.  If you're using
-our APT repository at apt.vizrt.com, this as easy as:
+our APT repository at apt.escenic.com, this as easy as:
 #+BEGIN_SRC sh
 # apt-get update
 # apt-get install escenic-content-engine-scripts
diff --git a/usr/share/doc/escenic/ece-deploy-guide.org b/usr/share/doc/escenic/ece-deploy-guide.org
index 7162ed97..3db7e0f5 100644
--- a/usr/share/doc/escenic/ece-deploy-guide.org
+++ b/usr/share/doc/escenic/ece-deploy-guide.org
@@ -1,5 +1,5 @@
 #+TITLE: ece-deploy
-#+AUTHOR: Vizrt Online / The SaaS Team
+#+AUTHOR: Escenic Cloud Team
 #+MAN_CLASS_OPTIONS: section-id:8
 #+OPTIONS: H:6 num:5 toc:2
 
@@ -168,10 +168,10 @@ servers is present in /etc/escenic/ece.conf and
 
 
 * COPYRIGHT
-Copyright 2011-2013 Vizrt
+Copyright 2011-2015 Escenic
 
 Licensed under the Apache License, Version 2.0, see
-https://github.com/vizrt/ece-scripts/COPYING for further details.
+https://github.com/escenic/ece-scripts/COPYING for further details.
 
 * AUTHOR
 Torstein Krause Johansen
diff --git a/usr/share/doc/escenic/ece-guide.org b/usr/share/doc/escenic/ece-guide.org
index eeb3d626..104c08d6 100644
--- a/usr/share/doc/escenic/ece-guide.org
+++ b/usr/share/doc/escenic/ece-guide.org
@@ -1,5 +1,5 @@
 #+TITLE: ece
-#+AUTHOR: Vizrt Online / The SaaS Team
+#+AUTHOR: Escenic Cloud Team
 #+OPTIONS: H:6 num:5 toc:2
 
 * NAME
@@ -190,10 +190,10 @@ $ ece -i engine1 \\
 
 
 * COPYRIGHT
-Copyright 2011-2013 Vizrt
+Copyright 2011-2015 Escenic
 
 Licensed under the Apache License, Version 2.0, see
-https://github.com/vizrt/ece-scripts/COPYING for further details.
+https://github.com/escenic/ece-scripts/COPYING for further details.
 
 * AUTHOR
 Torstein Krause Johansen
diff --git a/usr/share/doc/escenic/ece-import-guide.org b/usr/share/doc/escenic/ece-import-guide.org
index 66a3fe38..1fe2a8a9 100644
--- a/usr/share/doc/escenic/ece-import-guide.org
+++ b/usr/share/doc/escenic/ece-import-guide.org
@@ -1,5 +1,5 @@
 #+TITLE: The ece-import Guide
-#+AUTHOR: Vizrt Online / The SaaS Team
+#+AUTHOR: Escenic Cloud Team
 #+OPTIONS: H:6 num:5 toc:2
 
 * NAME
@@ -403,10 +403,10 @@ or
 then wait a while for the import to happen again. or trigger it with the ece-import command.
 
 * COPYRIGHT
-Copyright 2012-2013 Vizrt
+Copyright 2012-2015 Escenic
 
 Licensed under the Apache License, Version 2.0, see
-https://github.com/vizrt/ece-scripts/COPYING for further details.
+https://github.com/escenic/ece-scripts/COPYING for further details.
 
 * AUTHOR
 Torstein Krause Johansen
diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 5f15a03f..3a0a32e6 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -1,6 +1,6 @@
 
 #+TITLE: Escenic Installer User Guide
-#+AUTHOR: Escenic / The SaaS Team
+#+AUTHOR: Escenic Cloud Team
 #+OPTIONS: H:6 num:5 toc:2
 
 * NAME
@@ -1779,4 +1779,4 @@ Torstein Krause Johansen, Erik Mogsensen
 Copyright 2011-2013 Vizrt
 
 Licensed under the Apache License, Version 2.0, see
-https://github.com/vizrt/ece-scripts/COPYING for further details.
+https://github.com/escenic/ece-scripts/COPYING for further details.
diff --git a/usr/share/doc/escenic/generate-changelog-guide.org b/usr/share/doc/escenic/generate-changelog-guide.org
index 6d30d69b..0002aaee 100644
--- a/usr/share/doc/escenic/generate-changelog-guide.org
+++ b/usr/share/doc/escenic/generate-changelog-guide.org
@@ -1,5 +1,5 @@
 #+TITLE: User Guide for the generate-changelog Command
-#+AUTHOR: Vizrt Online / The SaaS Team
+#+AUTHOR: Escenic Cloud Team
 #+OPTIONS: H:6 num:5 toc:2
 
 * Introduction
diff --git a/usr/share/doc/escenic/presentations/ece-install-introduction/presentation.org b/usr/share/doc/escenic/presentations/ece-install-introduction/presentation.org
index ce2382de..676fb6d3 100644
--- a/usr/share/doc/escenic/presentations/ece-install-introduction/presentation.org
+++ b/usr/share/doc/escenic/presentations/ece-install-introduction/presentation.org
@@ -1,6 +1,6 @@
 #+TITLE: BASH all you want: ece-install 
 #+AUTHOR: Torstein Krause Johansen 
-#+EMAIL: tkj@vizrt.com
+#+EMAIL: tkj@escenic.com
 #+DATE: 2012-03-30
 
 * Agenda
@@ -91,7 +91,7 @@ Yes, that's it.
 - QA
 - R & D
 - SaaS / VOSA
-- Escenic/Vizrt Online partners
+- Escenic partners
 - Experienced customers
 
 * Show Me!
@@ -103,7 +103,7 @@ Yes, that's it.
 
 * How?
 
-- git clone https://github.com/vizrt/ece-scripts/ (or zip download)
+- git clone https://github.com/escenic/ece-scripts/ (or zip download)
 - Daily builds of DEB and RPM packages from
   http://hudson.dev.escenic.com
 
diff --git a/usr/share/doc/escenic/system-info-guide.org b/usr/share/doc/escenic/system-info-guide.org
index ed7b0f14..7938fa21 100644
--- a/usr/share/doc/escenic/system-info-guide.org
+++ b/usr/share/doc/escenic/system-info-guide.org
@@ -1,5 +1,5 @@
 #+TITLE: The system-info Guide
-#+AUTHOR: Vizrt Online / The SaaS Team
+#+AUTHOR: Escenic Cloud Team
 
 * NAME
 system-info
@@ -51,10 +51,10 @@ run the queries to ece as:
 #+END_SRC
 
 * COPYRIGHT
-Copyright 2011-2013 Vizrt
+Copyright 2011-2015 Escenic
 
 Licensed under the Apache License, Version 2.0, see
-https://github.com/vizrt/ece-scripts/COPYING for further details.
+https://github.com/escenic/ece-scripts/COPYING for further details.
 
 * AUTHOR
 Torstein Krause Johansen

From f81f54f0dc5ac1ed57f8f6c597c63e4877c92640 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Tue, 3 Nov 2015 15:52:04 +0100
Subject: [PATCH 2372/2585] VOSA-183: Added documentation for ece-build
 command.

---
 usr/share/doc/escenic/ece-build-guide.org | 90 +++++++++++++++++++++++
 1 file changed, 90 insertions(+)
 create mode 100644 usr/share/doc/escenic/ece-build-guide.org

diff --git a/usr/share/doc/escenic/ece-build-guide.org b/usr/share/doc/escenic/ece-build-guide.org
new file mode 100644
index 00000000..84dd1d03
--- /dev/null
+++ b/usr/share/doc/escenic/ece-build-guide.org
@@ -0,0 +1,90 @@
+#+TITLE: The ece-build Guide
+#+AUTHOR: Escenic Cloud Team
+
+* NAME
+ece-build
+
+* SYNOPSIS
+ece-build [[[-b branch-name]]] [[[-t release-tag]]] [[[-m package-for-machine]]] [[[-u]]] [[[-r]]] [[[-f]]]  [[[-o]]] [[[-c]]] [[[-V]]]
+
+* DESCRIPTION
+ece-build is a command to build the ear distribution, that is used to setup Escenic Installation. This command also creates
+Debian and RPM packages with the configuration changes needed for the Installation. Both the ear and configuration (deb or rpm)
+packages are exposed via http server. This ece-build command can be used as a local builder by turning on the local builder mode,
+where it is possible to make local changes in to source code directly without pushing it to remote repository and build an ear
+and configuration package with it. Typical use of the ece-build script as local builder is in the dev images, where this can be
+used with in an Escenic Installation to make changes and deploy it immediately for test purposes.
+
+** -b
+Git project branch name, from where we want to build the ear and configuration package.
+
+** -t
+Release tag to which will be added to the final distributions both ear and
+configuration package name as tag-{release-tag}
+
+** -m
+The machine name for which we want to build the configuration package. This is
+The directory name under ~/server-admin module in git project,which is
+typically a machine name like (dev, test, uat, production). If not set then
+It will build configuration packages for all the machines found under ~/server-admin
+module. For auto deploy we must specify a machine name, for which it will create
+the configuration package and deploy that in to the machine.
+
+** -u
+Used to update of the source code from remote repository, when running
+on local builder builder mode.
+
+** -r
+Used to update the publication resource, when running on local mode
+and auto deploy is on.
+
+** -f
+Use force whenever necessary to get an deployment and it requires
+local mode and auto deploy mode turned on. This is typically for
+forcing various parts of the configuration package when
+the package manager would choose a more cautious solution (typically to
+keep the local version of configuration files that differ).
+
+** -o
+Used to build in offline mode.
+
+** -c
+Clean up local source code changes.
+
+** -V
+Shows the version of ece-build
+
+* Examples
+** Building ear and configuration package from master branch
+#+BEGIN_SRC sh
+# ece-build -b master
+#+END_SRC
+
+** Updating the source code and building ear and configuration package in local mode.
+#+BEGIN_SRC sh
+# ece-build -b master -u
+#+END_SRC
+
+** Cleaning up local source code changes, taking update from remote and building distribution.
+#+BEGIN_SRC sh
+# ece-build -b master -u -c
+#+END_SRC
+
+** Running ece-build in offline mode
+#+BEGIN_SRC sh
+# ece-build -b master -o
+#+END_SRC
+
+** Updating publication resources
+#+BEGIN_SRC sh
+# ece-build -b master -r
+#+END_SRC
+
+* COPYRIGHT
+Copyright 2011-2015 Escenic
+
+Licensed under the Apache License, Version 2.0, see
+https://github.com/escenic/ece-scripts/COPYING for further details.
+
+* AUTHOR
+Sk Mohd Anwarul Islam

From dd2737203b0dbd28875674e2284d98a77e3e7047 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Thu, 5 Nov 2015 15:16:31 +0100
Subject: [PATCH 2373/2585] VOSA-183: Included ece-build-guide.org to generate
 man page in packaging scripts.

---
 usr/share/escenic/package-scripts/create-packages | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 7ee3d21a..30c04f4f 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -116,11 +116,15 @@ function set_up_escenic-content-engine-installer() {
 }
 
 function set_up_escenic-build-scripts() {
+  local doc_dir=$target_dir/usr/share/doc/escenic-build-scripts
   make_dir $target_dir/usr/bin
+  make_dir $doc_dir
   run cp ../build-scripts/ece-build $target_dir/usr/bin/ece-build
   run cp ../build-scripts/ece-builder $target_dir/usr/bin/ece-builder
   run cp ../build-scripts/ece-local-builder $target_dir/usr/bin/ece-local-builder
   run cp ../build-scripts/ece-build-guide $target_dir/usr/bin/ece-build-guide
+
+  run cp -r ../../doc/escenic/ece-build-guide.org $doc_dir
 }
 
 function set_up_escenic-content-engine-scripts() {

From fd971663b6a310132277f5d6b4ba700bde77f101 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Mon, 9 Nov 2015 09:05:33 +0100
Subject: [PATCH 2374/2585] VOSA-186: Added ova conf file parser. - This parse
 and set the user defined configuration for dev image.

---
 .../vizrt/vosa/commands/ova_config_parser     | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 usr/share/vizrt/vosa/commands/ova_config_parser

diff --git a/usr/share/vizrt/vosa/commands/ova_config_parser b/usr/share/vizrt/vosa/commands/ova_config_parser
new file mode 100644
index 00000000..1b38568d
--- /dev/null
+++ b/usr/share/vizrt/vosa/commands/ova_config_parser
@@ -0,0 +1,44 @@
+# bash functions common to the vosa commands
+# specifically functions to aid parsing ova.conf files
+
+ova_config_output_directory=
+ova_config_passphrase=
+ova_config_top_user=
+ova_config_vm_memory=
+ova_config_vm_ubuntu_pass=
+ova_config_vendor=
+ova_config_vendorurl=
+ova_config_eula=
+
+function ova_config_output_directory() {
+  ova_config_output_directory=$1
+}
+
+function ova_config_passphrase() {
+  ova_config_passphrase=$1
+}
+
+function ova_config_top_user() {
+  ova_config_top_user=$1
+}
+
+function ova_config_vm_memory() {
+  ova_config_vm_memory=$1
+}
+
+function ova_config_vm_ubuntu_pass() {
+ ova_config_vm_ubuntu_pass=$1
+}
+
+function ova_config_vendor() {
+  ova_config_vendor=$1
+}
+
+function ova_config_vendorurl() {
+  ova_config_vendorurl=$1
+}
+
+function ova_config_eula() {
+  ova_config_eula=$1
+}
+

From d8bc8751296539bbebe36d4fc7975c99b43e5561 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Mon, 9 Nov 2015 09:06:32 +0100
Subject: [PATCH 2375/2585] VOSA-186: Added make-dev-image.sh helper script to
 generated the vmdk image from the vm disk image.

---
 .../vizrt/vosa/commands/make-dev-image.sh     | 191 ++++++++++++++++++
 1 file changed, 191 insertions(+)
 create mode 100755 usr/share/vizrt/vosa/commands/make-dev-image.sh

diff --git a/usr/share/vizrt/vosa/commands/make-dev-image.sh b/usr/share/vizrt/vosa/commands/make-dev-image.sh
new file mode 100755
index 00000000..cce79726
--- /dev/null
+++ b/usr/share/vizrt/vosa/commands/make-dev-image.sh
@@ -0,0 +1,191 @@
+#!/bin/bash
+
+# This is an helper script to make and vmdk image from the installed machine.
+# It will make a copy of the vm and the do changes there to make it portable to vmdk.
+# This script take three parameters configuration directory i.e. /etc/vizrt/vosa/available.d/instnace-name,
+# image directory i.e. /var/lib/vizrt/vosa/images/instance-name and instance-name respectively.
+
+#########################################
+#Global variables declared here.
+config=$1
+image=$2
+instance=$3
+
+#Reads the ova.conf file and parse it get user defined values.
+function read_dev_image_configuration() {
+if [ ! -e ${config}/ova.conf ]; then
+  print_and_log "There is no ${config}/ova.conf file. Exiting ...!"
+  exit 2
+else
+source $(dirname $0)/functions
+source $(dirname $0)/ova_config_parser
+parse_config_file $config/ova.conf ova_config_
+fi
+}
+
+vboxmanage_output_dir=${ova_output_directory}
+
+function run_on_dev_host() {
+local command=$1
+ssh -F ${image}/ssh.conf guest $command
+}
+
+#This function cleans up unnecessary packages and cached files to make the image size smaller.
+function clean_up_image() {
+echo "Cleaning up the dev image $instance"
+run_on_dev_host "sudo apt-get --yes remove munin-node munin icinga"
+# VirtualBox guest additions...
+run_on_dev_host "sudo apt-get --yes install --no-install-recommends virtualbox-guest-utils virtualbox-guest-dkms"
+run_on_dev_host "sudo rm -rf /tmp/ece-downloads"
+run_on_dev_host "sudo rm -rf /opt/escenic"
+run_on_dev_host "sudo rm -rf /var/cache/escenic/ece-install/*"
+run_on_dev_host "sudo rm -f /var/cache/escenic/\*.ear"
+run_on_dev_host "sudo sed -i -e "/system-info.*escenic/d" /etc/crontab"
+run_on_dev_host "sudo locale-gen en_US.UTF-8"
+
+# workaround to fix ece to start on boot if not so configured by ece-install
+run_on_dev_host "[ -r /etc/init.d/ece ] &&"
+run_on_dev_host "sudo update-rc.d ece defaults 80"
+}
+
+# This function shutdown the vm in a graceful manner.
+function shutdown_guest_machine() {
+run_on_dev_host "sudo shutdown -h now"
+sleep 5;
+echo "Waiting for machine to stop"
+while [ 1 ] ; do
+  dead=$(vosa -i ${instance} status | awk '{print $4}')
+  [ "$dead" == "dead" ] && break;
+  sleep 2;
+  echo -n .
+done
+echo stopped.
+vosa -i ${instance} status
+vosa -i ${instance} stop
+vosa -i ${instance} status
+}
+
+#This function does change root operation on the copied disk image of the vm.
+function make_changes_to_disk() {
+cp --sparse=always ${image}/disk.img ${image}/small.img
+if [ -d ${image}/small ]; then
+  rm -rf ${image}/small
+fi
+mkdir ${image}/small
+mount -o loop ${image}/small.img ${image}/small
+chroot ${image}/small <<END_OF_CHROOT
+rm /etc/udev/rules.d/70-persistent-net.rules
+sed -i '/^iface eth0/ s/static/dhcp/p; /^iface eth0/,/^[a-z]/d' /etc/network/interfaces
+(echo; echo '# eth1 is a host-only network'; echo 'auto eth1'; echo 'iface eth1 inet dhcp') | tee > /dev/null -a /etc/network/interfaces
+(echo; echo "# added to make local hostname resolvable anywhere"; echo "127.0.1.1 ${instance}") | tee > /dev/null -a /etc/hosts
+(echo; echo "enable_remote_debugging=1";
+ echo "enable_remote_monitoring=1") | tee -a > /dev/null /etc/escenic/ece-engine1.conf
+
+# Resize heaps. 128/256 and 256/512.
+sed -i s/min_heap_size=.*// /etc/escenic/ece-*.conf
+sed -i s/max_heap_size=.*// /etc/escenic/ece-*.conf
+echo min_heap_size=256m | tee -a > /dev/null /etc/escenic/ece-engine1.conf
+echo max_heap_size=512m | tee -a > /dev/null /etc/escenic/ece-engine1.conf
+echo min_heap_size=128m | tee -a > /dev/null /etc/escenic/ece-search1.conf
+echo max_heap_size=256m | tee -a > /dev/null /etc/escenic/ece-search1.conf
+echo min_heap_size=128m | tee -a > /dev/null /etc/escenic/ece-analysis1.conf
+echo max_heap_size=256m | tee -a > /dev/null /etc/escenic/ece-analysis1.conf
+
+# remove superflous jvm configuration, to make sure the instances can boot.
+echo jvm_gc_settings= | tee -a > /dev/null /etc/escenic/ece-engine1.conf
+echo jvm_gc_settings= | tee -a > /dev/null /etc/escenic/ece-search1.conf
+echo jvm_gc_settings= | tee -a > /dev/null /etc/escenic/ece-analysis1.conf
+# Make tomcat boot a lot faster!!
+sed -i -e "/org.apache.catalina.startup.ContextConfig.jarsToSkip=/ s/=.*/=*.jar/" /opt/tomcat-*/conf/catalina.properties
+
+# disable analysis instance on boot.
+sed -i s/analysis_instance_list=.*/analysis_instance_list=/ /etc/default/ece
+
+
+# Make a "top" user to show top on tty1 by writing "top"
+useradd -d /nonexistent -M --no-user-group --system --shell /usr/local/bin/escenic-top ${ova_config_top_user}
+passwd --delete ${ova_config_top_user}
+
+rm -rf /var/lib/puppet/
+apt-get -y remove puppet ruby x11-common
+
+# apt-get remove cloud-init
+# mkdir -p /usr/lib/cloud-init/
+# (echo '#!/bin/sh'; echo 'exec /sbin/init "$@";') |
+# tee /usr/lib/cloud-init/uncloud-init
+# chmod +x /usr/lib/cloud-init/uncloud-init
+apt-get --yes autoremove
+apt-get clean
+apt-get autoclean
+rm -f /var/cache/apt/{pkg,srcpkg}cache.bin /var/cache/debconf/*
+sed -i /final-message/d /etc/cloud/cloud.cfg
+sync
+END_OF_CHROOT
+}
+
+function install_extlinux() {
+mkdir ${image}/small/extlinux/
+extlinux --install ${image}/small/extlinux/
+(
+cat <<EOF
+DEFAULT /vmlinuz
+APPEND root=/dev/sda noapic init=/usr/lib/cloud-init/uncloud-init ubuntu-pass=${ova_config_ubuntu_pass} ds=nocloud consoleblank=0
+EOF
+) |
+tee ${image}/small/extlinux/extlinux.conf
+umount ${image}/small
+}
+
+#This function is responsible for creating the vmdk image for the instance.
+function make_vmdk_from_image() {
+if [ ! -d $vboxmanage_output_dir ]; then
+   mkdir -p $vboxmanage_output_dir
+fi
+
+if [ -e $vboxmanage_output_dir/${instance}.vmdk ]; then
+  rm -f $vboxmanage_output_dir/${instance}.vmdk
+fi
+size=$(ls -l ${image}/small.img | awk '{print $5}')
+local pv_options="-s $size -i 5 -e -t -r"
+zerofree ${image}/small.img
+cat ${image}/small.img | pv $pv_options | vboxmanage convertfromraw stdin $vboxmanage_output_dir/${instance}.vmdk $size --format VMDK
+}
+
+#checks dependencies of this script.
+function check_dependencies() {
+   if ! which vboxmanage > /dev/null ; then
+   echo "Please install vboxmange package first by apt-get install virtualbox. Exiting ..."
+   exit 2
+   fi
+   if ! which pv > /dev/null ; then
+   echo "Please install pv package first by apt-get install pv. Exiting ..."
+   exit 2
+   fi
+   if ! which zerofree > /dev/null ; then
+   echo "Please install zerofree package first by apt-get install zerofree. Exiting ..."
+   exit 2
+   fi
+   if ! which extlinux > /dev/null ; then
+   echo "Please install extlinux package first by apt-get install extlinux. Exiting ..."
+   exit 2
+   fi
+}
+
+function check_status_of_machine() {
+local status=$(vosa -i ${instance} status | awk '{print $4}')
+if [ -z "${status}" ] || [ "${status}" == "dead" ]; then
+echo " The machine is not running please start the virtual machine."
+echo "You can start and create ova file in a single command : vosa -i ${instance} start"
+ exit 1
+fi
+}
+
+#Run sequence of this script.
+check_dependencies
+check_status_of_machine
+read_dev_image_configuration
+clean_up_image
+shutdown_guest_machine
+make_changes_to_disk
+install_extlinux
+make_vmdk_from_image
\ No newline at end of file

From 56173e635bbcc6102dba61ad0e41ab4a32416192 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Mon, 9 Nov 2015 09:07:26 +0100
Subject: [PATCH 2376/2585] VOSA-186: Added make-ova.sh to generate ova file
 from generated vmdk image.

---
 usr/share/vizrt/vosa/commands/make-ova.sh | 153 ++++++++++++++++++++++
 1 file changed, 153 insertions(+)
 create mode 100755 usr/share/vizrt/vosa/commands/make-ova.sh

diff --git a/usr/share/vizrt/vosa/commands/make-ova.sh b/usr/share/vizrt/vosa/commands/make-ova.sh
new file mode 100755
index 00000000..a99ca3be
--- /dev/null
+++ b/usr/share/vizrt/vosa/commands/make-ova.sh
@@ -0,0 +1,153 @@
+#!/bin/bash
+
+# This is an helper script to make an ova file from the vmdk image created before using vosa.
+# This script take three parameters configuration directory i.e. /etc/vizrt/vosa/available.d/instnace-name,
+# image directory i.e. /var/lib/vizrt/vosa/images/instance-name and instance-name respectively.
+
+#########################################
+# Global variables are declared here.
+config=$1
+image=$2
+instance=$3
+
+#Reads the configuration file and parses user defined data.
+function read_dev_image_configuration() {
+if [ ! -e ${config}/ova.conf ]; then
+  print_and_log "There is no ${config}/ova.conf file. Exiting ...!"
+  exit 2
+else
+source $(dirname $0)/functions
+source $(dirname $0)/ova_config_parser
+parse_config_file $config/ova.conf ova_config_
+fi
+}
+
+vboxmanage_output_dir=${ova_output_directory}
+
+#Creates ova file from previously generated vmdk file by vosa -i {instance} make command.
+function make_ova_file() {
+if [ ! -e "${vboxmanage_output_dir}/${instance}.vmdk" ] ; then
+  echo "sparse image ${vboxmanage_output_dir}/${instance}.vmdk does not exist"
+  echo "You should first make an vmdk file by running > vosa -i ${instance} make"
+  exit 2
+fi
+#for this will only work with virtualbox version 4. Cause --synthcpu off option is removed from version 5.
+options=$(cat <<EOF | grep ^[^#]
+--name ${instance}
+--ostype Ubuntu_64
+--memory ${ova_config_vm_memory}
+# --pagefusion on|off
+# --vram <vramsize in MB>
+--acpi on
+#--pciattach 03:04.0
+#--pciattach 03:04.0@02:01.0
+#--pcidetach 03:04.0
+--ioapic on
+--pae on
+#--hpet on|off
+#--hwvirtex on|off
+#--hwvirtexexcl on|off
+#--nestedpaging on|off
+#--largepages on|off
+#--vtxvpid on|off
+--synthcpu off
+#--cpuidset <leaf> <eax> <ebx> <ecx> <edx>
+#--cpuidremove <leaf>
+#--cpuidremoveall
+#--hardwareuuid <uuid>
+--cpus 2
+#--cpuhotplug on|off
+#--plugcpu <id>
+#--unplugcpu <id>
+#--cpuexecutioncap <1-100>
+#--rtcuseutc on|off
+#--monitorcount <number>
+#--accelerate3d on|off
+#--accelerate2dvideo on|off
+#--firmware bios|efi|efi32|efi64
+#--chipset ich9|piix3
+#--bioslogofadein on|off
+#--bioslogofadeout on|off
+#--bioslogodisplaytime <msec>
+#--bioslogoimagepath <imagepath>
+#--biosbootmenu disabled|menuonly|messageandmenu
+#--biossystemtimeoffset <msec>
+#--biospxedebug on|off
+--boot1 dvd
+--boot2 disk
+--boot3 none
+--boot4 none
+
+# NIC 1, NAT, for outbound traffic
+--nic1 nat
+--nictype1 virtio
+--cableconnected1 on
+--macaddress1 auto
+
+# NIC 2, Host Only, for inbound connections
+--nic2 hostonly
+--hostonlyadapter2 vboxnet0
+--nictype2 virtio
+--cableconnected2 on
+--macaddress2 auto
+
+--audio none
+--clipboard disabled
+--vrde off
+--usb off
+EOF
+)
+#First create environment
+vboxmanage createvm --name ${instance} --basefolder /tmp/${instance} --ostype Ubuntu_64 --register
+
+#Modified the environment
+vboxmanage modifyvm ${instance} $options
+#
+vboxmanage storagectl ${instance} --name "IDE Controller" --add ide --controller PIIX4 --hostiocache on --bootable on
+
+vboxmanage storageattach ${instance} \
+                            --storagectl "IDE Controller" \
+                            --port 0 \
+                            --device 0 \
+                            --type hdd \
+                            --medium ${vboxmanage_output_dir}/${instance}.vmdk
+
+rm -f ${vboxmanage_output_dir}/${instance}.ova
+vboxmanage export ${instance} --output ${vboxmanage_output_dir}/${instance}-tmp.ova \
+                            --vsys 0 \
+                            --product "Escenic ${instance} Development Image" \
+                            --vendor "${ova_config_vendor}" \
+                            --vendorurl "${ova_config_vendorurl}" \
+                            --eula "${ova_config_eula}"
+#Make a vagrant "box" too
+rm -f ${vboxmanage_output_dir}/${instance}-box.ova
+vboxmanage export ${instance} --output ${vboxmanage_output_dir}/${instance}-box.ova \
+                            --vsys 0 \
+                            --product "Escenic ${instance} Development Image" \
+                            --vendor "${ova_config_vendor}" \
+                            --vendorurl "${ova_config_vendorurl}" \
+
+chmod +r ${vboxmanage_output_dir}/${instance}-tmp.ova
+mv ${vboxmanage_output_dir}/${instance}-tmp.ova ${vboxmanage_output_dir}/${instance}.ova
+chmod +r ${vboxmanage_output_dir}/${instance}-box.ova
+(cd ${vboxmanage_output_dir}/; md5sum ${instance}.ova > ${instance}.ova.md5)
+(cd ${vboxmanage_output_dir}/; md5sum ${instance}-box.ova > ${instance}-box.ova.md5)
+vboxmanage unregistervm ${instance}
+
+rm -rf /tmp/${instance}
+}
+
+#Creates encrypted ova file.
+function make_encrypted_image() {
+mkdir -p ${vboxmanage_output_dir}/$instance/
+mv ${vboxmanage_output_dir}/$instance.* ${vboxmanage_output_dir}/$instance/
+for a in ova vmdk ; do
+  rm -f ${vboxmanage_output_dir}/$instance/$instance.$a.gpg
+  gpg --no-use-agent --batch --symmetric --passphrase "${ova_config_passphrase}"  ${vboxmanage_output_dir}/$instance/$instance.$a
+  chmod +r ${vboxmanage_output_dir}/$instance/$instance.$a ${vboxmanage_output_dir}/$instance/$instance.$a.gpg
+done
+}
+
+read_dev_image_configuration
+make_ova_file
+make_encrypted_image
\ No newline at end of file

From faa5e19eaf593fe27bc1f79dd63a386410f67a8f Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Mon, 9 Nov 2015 09:10:10 +0100
Subject: [PATCH 2377/2585] VOSA-186: Added vosa -i {instance} make ova
 command. - make: this will generated the vmdk image. - ova : will create the
 ova file from the vmdk image (running vosa -i {instance} make first)

---
 usr/bin/vosa | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index dacbcd4d..c30d6ff1 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -1261,12 +1261,39 @@ function shutdown() {
   fi
 }
 
+#Makes vmdk image from the virtual machine disk image.
+function do_make() {
+  if [[ $aws -eq 1 ]]; then
+    echo "The make commad is only for kvm use. Exiting ...."
+    exit 1
+  else
+    make_kvm "${@}"
+  fi
+}
+
+function make_kvm() {
+  ${commands}/make-dev-image.sh "$instance_dir" "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" "$instance_name"|| exit $?
+}
 
 function unknown-argument() {
   echo "Unknown argument $@"
   usage=1
 }
 
+#Creates ova file from vmdk image.
+function do_ova() {
+  if [[ $aws -eq 1 ]]; then
+    echo "The ova command is only for kvm use. Exiting ... "
+    exit 1
+  else
+    ova_for_kvm "${@}"
+  fi
+}
+
+function ova_for_kvm() {
+${commands}/make-ova.sh "$instance_dir" "$(dirname $0)/../../var/lib/vizrt/vosa/images/$instance_name" "$instance_name"|| exit $?
+}
+
 LASTOPTIND=0
 
 function parseopts() {

From 008628a93913f1a21979ab64a39e771adf99a48b Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Mon, 9 Nov 2015 09:47:31 +0100
Subject: [PATCH 2378/2585] VOSA-186:  Added documentation for vosa make and
 ova command.

---
 usr/share/doc/vizrt/vosa-guide.org | 32 ++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/usr/share/doc/vizrt/vosa-guide.org b/usr/share/doc/vizrt/vosa-guide.org
index 665a62e2..85a3fb2d 100644
--- a/usr/share/doc/vizrt/vosa-guide.org
+++ b/usr/share/doc/vizrt/vosa-guide.org
@@ -39,6 +39,10 @@ Removes the disk image etc.
 Starts (boots) the VM.
 ** status
 Tells you about the VM, if it's enabled, running, alive, its uptime.
+** make
+Makes a vmdk image of the vm
+** ova
+Creates a ova file from the vmdk image.
 
 * What is VOSA?
 
@@ -325,6 +329,34 @@ When it's done you can SSH into the system:
 
 Not that you should need to do that, of course.
 
+** Making a development image
+
+Making a development image from the virtual machine is also possible using
+vosa. The main purpose of the development image is to boost the development
+time with in an production like environment. We can create VMDK (Virtual Machine Disk)
+files from the UEC images used to create the virtual machine. It is also possible
+to create a OVA (Open Virtual Archive) file from the generated VMDK image to use
+it out of the box in VirtualBox.
+
+To make a VMDK image we have to run
+#+BEGIN_SRC sh
+vosa -i my-first-vm make
+#+END_SRC
+
+To make a ova file from the VMDK image
+#+BEGIN_SRC sh
+vosa -i my-first-vm ova
+#+END_SRC
+
+We can create a VMDK and ova file with a single command like
+#+BEGIN_SRC sh
+vosa -i my-first-vm make ova
+#+END_SRC
+
+
+
+
+
 * Puppet Master
 
 Setting up a puppet master is also an important piece of vosa.

From 6734d8899792961beaec01171931a56c29fcd291 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Mon, 9 Nov 2015 10:16:21 +0100
Subject: [PATCH 2379/2585] VOSA-186: Fixed comments.

---
 usr/bin/vosa | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index c30d6ff1..d415dd4b 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -1261,7 +1261,7 @@ function shutdown() {
   fi
 }
 
-#Makes vmdk image from the virtual machine disk image.
+## Makes vmdk image from the virtual machine disk image.
 function do_make() {
   if [[ $aws -eq 1 ]]; then
     echo "The make commad is only for kvm use. Exiting ...."
@@ -1280,7 +1280,7 @@ function unknown-argument() {
   usage=1
 }
 
-#Creates ova file from vmdk image.
+## Creates ova file from vmdk image.
 function do_ova() {
   if [[ $aws -eq 1 ]]; then
     echo "The ova command is only for kvm use. Exiting ... "

From 38f0d8432e870623c0701502786e2384d2e69151 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Mon, 9 Nov 2015 11:36:02 +0100
Subject: [PATCH 2380/2585] VOSA-186:  Fixed config properties name. - Called
 parser from global scope instead of from a function to set the configuration
 properties globally.

---
 usr/share/vizrt/vosa/commands/make-dev-image.sh | 7 ++-----
 usr/share/vizrt/vosa/commands/make-ova.sh       | 7 +++----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/usr/share/vizrt/vosa/commands/make-dev-image.sh b/usr/share/vizrt/vosa/commands/make-dev-image.sh
index cce79726..eee72462 100755
--- a/usr/share/vizrt/vosa/commands/make-dev-image.sh
+++ b/usr/share/vizrt/vosa/commands/make-dev-image.sh
@@ -12,7 +12,6 @@ image=$2
 instance=$3
 
 #Reads the ova.conf file and parse it get user defined values.
-function read_dev_image_configuration() {
 if [ ! -e ${config}/ova.conf ]; then
   print_and_log "There is no ${config}/ova.conf file. Exiting ...!"
   exit 2
@@ -21,9 +20,8 @@ source $(dirname $0)/functions
 source $(dirname $0)/ova_config_parser
 parse_config_file $config/ova.conf ova_config_
 fi
-}
 
-vboxmanage_output_dir=${ova_output_directory}
+vboxmanage_output_dir=${ova_config_output_directory}
 
 function run_on_dev_host() {
 local command=$1
@@ -129,7 +127,7 @@ extlinux --install ${image}/small/extlinux/
 (
 cat <<EOF
 DEFAULT /vmlinuz
-APPEND root=/dev/sda noapic init=/usr/lib/cloud-init/uncloud-init ubuntu-pass=${ova_config_ubuntu_pass} ds=nocloud consoleblank=0
+APPEND root=/dev/sda noapic init=/usr/lib/cloud-init/uncloud-init ubuntu-pass=${ova_config_vm_ubuntu_pass} ds=nocloud consoleblank=0
 EOF
 ) |
 tee ${image}/small/extlinux/extlinux.conf
@@ -183,7 +181,6 @@ fi
 #Run sequence of this script.
 check_dependencies
 check_status_of_machine
-read_dev_image_configuration
 clean_up_image
 shutdown_guest_machine
 make_changes_to_disk
diff --git a/usr/share/vizrt/vosa/commands/make-ova.sh b/usr/share/vizrt/vosa/commands/make-ova.sh
index a99ca3be..d3c82a39 100755
--- a/usr/share/vizrt/vosa/commands/make-ova.sh
+++ b/usr/share/vizrt/vosa/commands/make-ova.sh
@@ -11,7 +11,7 @@ image=$2
 instance=$3
 
 #Reads the configuration file and parses user defined data.
-function read_dev_image_configuration() {
+
 if [ ! -e ${config}/ova.conf ]; then
   print_and_log "There is no ${config}/ova.conf file. Exiting ...!"
   exit 2
@@ -20,9 +20,8 @@ source $(dirname $0)/functions
 source $(dirname $0)/ova_config_parser
 parse_config_file $config/ova.conf ova_config_
 fi
-}
 
-vboxmanage_output_dir=${ova_output_directory}
+vboxmanage_output_dir=${ova_config_output_directory}
 
 #Creates ova file from previously generated vmdk file by vosa -i {instance} make command.
 function make_ova_file() {
@@ -148,6 +147,6 @@ for a in ova vmdk ; do
 done
 }
 
-read_dev_image_configuration
+#Execution sequence
 make_ova_file
 make_encrypted_image
\ No newline at end of file

From 67c2ae5c85605ad1978d159a79f6f77e79b04445 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Mon, 9 Nov 2015 17:46:39 +0100
Subject: [PATCH 2381/2585] VOSA-186:  If the passphrase provided in conf file
 then we will create encrypted vmdk and ova file.

---
 usr/share/vizrt/vosa/commands/make-dev-image.sh | 13 ++++++++++++-
 usr/share/vizrt/vosa/commands/make-ova.sh       | 13 +++++++------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/usr/share/vizrt/vosa/commands/make-dev-image.sh b/usr/share/vizrt/vosa/commands/make-dev-image.sh
index eee72462..8abb703b 100755
--- a/usr/share/vizrt/vosa/commands/make-dev-image.sh
+++ b/usr/share/vizrt/vosa/commands/make-dev-image.sh
@@ -178,6 +178,16 @@ echo "You can start and create ova file in a single command : vosa -i ${instance
 fi
 }
 
+function make_encrypted_image() {
+mkdir -p ${vboxmanage_output_dir}/$instance/
+cp  ${vboxmanage_output_dir}/$instance.* ${vboxmanage_output_dir}/$instance/
+rm -f ${vboxmanage_output_dir}/$instance/$instance.vmdk.gpg
+if [ -n "${ova_config_passphrase}"  ]; then
+  gpg --no-use-agent --batch --symmetric --passphrase "${ova_config_passphrase}"  ${vboxmanage_output_dir}/$instance/$instance.vmdk
+  chmod +r ${vboxmanage_output_dir}/$instance/$instance.vmdk ${vboxmanage_output_dir}/$instance/$instance.vmdk.gpg
+fi
+}
+
 #Run sequence of this script.
 check_dependencies
 check_status_of_machine
@@ -185,4 +195,5 @@ clean_up_image
 shutdown_guest_machine
 make_changes_to_disk
 install_extlinux
-make_vmdk_from_image
\ No newline at end of file
+make_vmdk_from_image
+make_encrypted_image
diff --git a/usr/share/vizrt/vosa/commands/make-ova.sh b/usr/share/vizrt/vosa/commands/make-ova.sh
index d3c82a39..098805c7 100755
--- a/usr/share/vizrt/vosa/commands/make-ova.sh
+++ b/usr/share/vizrt/vosa/commands/make-ova.sh
@@ -139,14 +139,15 @@ rm -rf /tmp/${instance}
 #Creates encrypted ova file.
 function make_encrypted_image() {
 mkdir -p ${vboxmanage_output_dir}/$instance/
+#This time we will move both vmdk and ova image to target directory
 mv ${vboxmanage_output_dir}/$instance.* ${vboxmanage_output_dir}/$instance/
-for a in ova vmdk ; do
-  rm -f ${vboxmanage_output_dir}/$instance/$instance.$a.gpg
-  gpg --no-use-agent --batch --symmetric --passphrase "${ova_config_passphrase}"  ${vboxmanage_output_dir}/$instance/$instance.$a
-  chmod +r ${vboxmanage_output_dir}/$instance/$instance.$a ${vboxmanage_output_dir}/$instance/$instance.$a.gpg
-done
+rm -f ${vboxmanage_output_dir}/$instance/$instance.ova.gpg
+if [ -n "${ova_config_passphrase}" ]; then
+  gpg --no-use-agent --batch --symmetric --passphrase "${ova_config_passphrase}"  ${vboxmanage_output_dir}/$instance/$instance.ova
+  chmod +r ${vboxmanage_output_dir}/$instance/$instance.ova ${vboxmanage_output_dir}/$instance/$instance.ova.gpg
+fi
 }
 
 #Execution sequence
 make_ova_file
-make_encrypted_image
\ No newline at end of file
+make_encrypted_image

From 4e7e58cdbead9dd7e0930e2169320a4aa54f4800 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Tue, 10 Nov 2015 09:10:21 +0100
Subject: [PATCH 2382/2585] VOSA-186:  Used echo instead of print_and_log. -
 Cause vosa does not use print_and_log command

---
 usr/share/vizrt/vosa/commands/make-dev-image.sh | 2 +-
 usr/share/vizrt/vosa/commands/make-ova.sh       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/vizrt/vosa/commands/make-dev-image.sh b/usr/share/vizrt/vosa/commands/make-dev-image.sh
index 8abb703b..f5d69ee7 100755
--- a/usr/share/vizrt/vosa/commands/make-dev-image.sh
+++ b/usr/share/vizrt/vosa/commands/make-dev-image.sh
@@ -13,7 +13,7 @@ instance=$3
 
 #Reads the ova.conf file and parse it get user defined values.
 if [ ! -e ${config}/ova.conf ]; then
-  print_and_log "There is no ${config}/ova.conf file. Exiting ...!"
+  echo "There is no ${config}/ova.conf file. Exiting ...!"
   exit 2
 else
 source $(dirname $0)/functions
diff --git a/usr/share/vizrt/vosa/commands/make-ova.sh b/usr/share/vizrt/vosa/commands/make-ova.sh
index 098805c7..6127ebb4 100755
--- a/usr/share/vizrt/vosa/commands/make-ova.sh
+++ b/usr/share/vizrt/vosa/commands/make-ova.sh
@@ -13,7 +13,7 @@ instance=$3
 #Reads the configuration file and parses user defined data.
 
 if [ ! -e ${config}/ova.conf ]; then
-  print_and_log "There is no ${config}/ova.conf file. Exiting ...!"
+  echo "There is no ${config}/ova.conf file. Exiting ...!"
   exit 2
 else
 source $(dirname $0)/functions

From f970688c938a67672875765442894d3a26b65bd6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Tue, 10 Nov 2015 10:00:49 +0100
Subject: [PATCH 2383/2585] Bugfix: ece edit now works with multiple instances
 on the same host

- the call to get_publication_list didn't pass any port and the method
  expected one, falling back to the default if it wasn't provided.

- deleted trailing white space.
---
 .../ece-scripts/ece.d/publication-resources.sh   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/publication-resources.sh b/usr/share/escenic/ece-scripts/ece.d/publication-resources.sh
index 0f96e4bd..4d18ce9d 100644
--- a/usr/share/escenic/ece-scripts/ece.d/publication-resources.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/publication-resources.sh
@@ -10,19 +10,19 @@ function update_publication_resources() {
   fi
 
   local found=0
-  local publication_list=$(get_publication_list)
+  local publication_list=$(get_publication_list ${appserver_port-8080})
   for el in $publication_list; do
     if [[ "$publication" == "$el" ]]; then
       found=1
     fi
   done
-  
+
   if [ $found -eq 0 ]; then
     print "There is no publication called" \
       $publication "(only $publication_list)"
     exit 1
   fi
-  
+
   local url=$(get_escenic_admin_url)/publication-resources
 
   case "$(basename $resource)" in
@@ -58,16 +58,16 @@ function update_publication_resources() {
     *)
       print "Invalid resource: $(basename $resource) :-("
       exit 1
-  esac        
+  esac
 
   local tmp_dir=$(mktemp -d)
-  
+
   if [ $1 ]; then
     if [[ -z "$EDITOR" || ! -x $(which $EDITOR) ]]; then
       print "You must have a valid editor defined in your EDITOR variable"
       exit 1
     fi
-    
+
     run cd $tmp_dir;
 
     # adding auth credentials for the appserver (if set)
@@ -84,10 +84,10 @@ function update_publication_resources() {
       exit 1
     fi
   fi
-  
+
   print "Updating the $(basename $resource) resource for the $publication" \
     "publication ..."
-  
+
   log POSTing $resource to $url
   if [[ -n "$do_put" && "$do_put" == "true" ]]; then
     run curl -T ${resource} \

From 0062995ea7f9a3649b70111d9ea81283dd2fd74b Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Tue, 10 Nov 2015 10:00:59 +0100
Subject: [PATCH 2384/2585] VOSA-183. Added man pages for ece-builder and
 ece-local-builder scripts. - Fixed typo in ece-local-builder log message.

---
 usr/share/doc/escenic/ece-builder-guide.org   | 108 ++++++++++++++++++
 .../doc/escenic/ece-local-builder-guide.org   | 108 ++++++++++++++++++
 .../escenic/build-scripts/ece-local-builder   |   2 +-
 3 files changed, 217 insertions(+), 1 deletion(-)
 create mode 100644 usr/share/doc/escenic/ece-builder-guide.org
 create mode 100644 usr/share/doc/escenic/ece-local-builder-guide.org

diff --git a/usr/share/doc/escenic/ece-builder-guide.org b/usr/share/doc/escenic/ece-builder-guide.org
new file mode 100644
index 00000000..496594c3
--- /dev/null
+++ b/usr/share/doc/escenic/ece-builder-guide.org
@@ -0,0 +1,108 @@
+#+TITLE: The ece-builder Guide
+#+AUTHOR: Escenic Cloud Team
+
+* NAME
+ece-builder
+
+* SYNOPSIS
+ece-builder [[[-i builder-conf-file]]] [[[-u user-conf-file]]] [[[-a artifact-path]]] [[[-l list-of-artifacts]]]  [[[-V]]]
+
+* DESCRIPTION
+The ece-builder is a command the creates Enterprise Archive file (ear)  and configuration packages(deb,rpm)
+to install for Escenic Installation. This command creates an builder user in to the system,
+under which the basic skeleton of the builder is generated. Then for each project or customer it
+creates a separate user, under which ear and configuration packages for that project or customer is built.
+It can also add an artifact or list of artifacts to be used by all the projects or customers.
+
+** -i builder-conf-file
+Creates builder user and setup builder skeleton under it.
+
+** -u user-conf-file
+Creates customer user to build an specific project.
+
+** -a  artifact-path
+Adds an artifact to the builder.
+
+** -l list-of-artifacts
+Adds a list of artifacts to the builder.
+
+** -V
+Shows the version of ece-builder
+
+** Initialize the builder
+To initialize the builder we need to run the following command
+#+BEGIN_SRC sh
+$ ece-builder initialize
+#+END_SRC
+After running this command two configuration files builder.conf and user.conf will be
+generated under /etc/escenic directory. The builder.conf file is needed to setup the builder
+and user.conf file is used to setup customer project builder.
+
+** Setting up builder
+The first task for creating a builder is to setup the builder.
+The ece-builder script require a builder.conf file to setup builder under a user called builder.
+This configuration file is generated with the initialize command and look like following
+
+#+BEGIN_SRC sh
+technet_user=technet-user
+technet_password=technet-pass
+maven_vizrt_user=maven-user
+maven_vizrt_password=maven-pass
+
+# Unsupported plugins
+unsupported_plugin_indentifiers="inpage"
+
+# Supported Plugins
+escenic_plugin_indentifiers="forum
+geocode
+analysis-engine
+xml-editor
+menu-editor
+dashboard
+poll
+reporter
+lucy
+video
+newsroom
+vcpeditor
+online-graphics
+framework-dist
+framework-community-dist
+framework-mobile-dist
+widget-framework-core
+widget-framework-community
+widget-framework-mobile
+community-engine
+newsgate
+live-center
+section-feed
+mobile-expansion
+snapshot"
+#+END_SRC
+
+Here we need to change the credentials for technet to valid one. Also for maven_user and maven_password need to be
+changed to a valid one. Now running the following command will setup the builder.
+#+BEGIN_SRC sh
+$ ece-builder -i /etc/escenic/builder.conf
+#+END_SRC
+
+** Setup up customer project builder
+
+Once when we are done with setting up the builder. Now we can create customer project
+builder by supplying a user.conf file, which is created when the ece-builder initialize command
+was run under /etc/escenic/.
+#+BEGIN_SRC sh
+$ ece-builder -i /etc/escenic/user.conf
+#+END_SRC
+
+Running the above command will create a system user and setup the environment to build customer project
+under that user.
+
+* COPYRIGHT
+Copyright 2011-2013 Vizrt
+
+Licensed under the Apache License, Version 2.0, see
+https://github.com/vizrt/ece-scripts/COPYING for further details.
+
+* AUTHOR
+Sk Mohd Anwarul Islam
diff --git a/usr/share/doc/escenic/ece-local-builder-guide.org b/usr/share/doc/escenic/ece-local-builder-guide.org
new file mode 100644
index 00000000..1fde13ad
--- /dev/null
+++ b/usr/share/doc/escenic/ece-local-builder-guide.org
@@ -0,0 +1,108 @@
+#+TITLE: The ece-local-builder Guide
+#+AUTHOR: Escenic Cloud Team
+
+* NAME
+ece-local-builder
+
+* SYNOPSIS
+ece-local-builder [[[-c builder-conf-file]]] [[[-s]]] [[[-a]]] [[[-b]]] [[[-V]]]
+
+* DESCRIPTION
+ece-local-builder is a command to create a single project builder in a standalone machine or
+setting up local builder with in a Escenic Installation. This command requires an configuration
+file to setup the builder.
+
+** -c builder-conf-file
+Creates a builder under
+
+** -a
+Add builder under all the existing user.
+
+** -s
+Skip creation of the builder_system_user
+
+** -b
+Executes a ece-build operation on given branch in builder.conf file
+
+** -V
+Shows the version of ece-local-builder
+
+** Initialize builder configuration
+To setup builder requires a builder.conf file. A sample builder.conf file can be generated
+under /etc/escenic directory by running the following command
+#+BEGIN_SRC sh
+$ ece-local-builder initialize
+#+END_SRC
+
+** Setting up builder
+Setting up builder is running the ece-local-builder command with the configuration file.
+The sample /etc/escenic/builder.conf file looks like following
+#+BEGIN_SRC sh
+customer_name=customer-name
+technet_user=technet-username
+technet_password=technet-password
+maven_user=maven-username
+maven_password=maven-password
+git_url=ssh://git@git-ip-address/mycloud.git
+assemblytool_url=http://technet.escenic.com/downloads/release/57/assemblytool-2.0.7.zip
+local_mode=false
+auto_deploy=false
+ear_base_url=http://builder-ip-address:81
+package_for_machine=all
+branch_name=master
+maven_download_url=http://www.eu.apache.org/dist/maven/maven-3/3.3.3/binaries/apache-maven-3.3.3-bin.zip
+#+END_SRC
+
+Here are description about the properties in builder.conf file
+* customer_name
+The name of the customer
+*technet_user
+Username for escenic technet to download the distribution
+*technet_password
+Password for the technet user
+*maven_user
+Username for Escenic maven repository
+*maven_password
+Password for Escenic maven repository
+*git_url
+Customer git project url
+*assemblytool_url
+Download url for Escenic Assembly Tool
+*local_mode
+Sets the builder in local mode if value is set to true. Defaule is false
+*auto_deploy
+Sets the builder to automatic deploy of the created ear and configuration package if set to true.
+Default value is false
+*ear_base_url
+The base url for the ear and configuration packages to be exposed to external systems.
+*package_for_machine
+Machine name, for which the configuration will be created and deployed if auto_deploy is set to ture.
+*branch_name
+Customer git project branch name from where the build will be made
+*maven_download_url
+Maven download url. Default value is set to
+http://www.eu.apache.org/dist/maven/maven-3/3.3.3/binaries/apache-maven-3.3.3-bin.zip
+
+Now after preparing the configuration file with valid values for the properties. We can run the following commands
+
+*Examples
+* To setup a builder under the customer_name user
+#+BEGIN_SRC sh
+$ ece-local-builder -c /etc/escenic/builder.conf
+#+END_SRC
+
+* To skip the user creation but setup builder under the existing user
+
+#+BEGIN_SRC sh
+$ ece-local-builder -c /etc/escenic/builder.conf -s
+#+END_SRC
+
+
+* COPYRIGHT
+Copyright 2011-2015 Escenic
+
+Licensed under the Apache License, Version 2.0, see
+https://github.com/escenic/ece-scripts/COPYING for further details.
+
+* AUTHOR
+Sk Mohd Anwarul Islam
diff --git a/usr/share/escenic/build-scripts/ece-local-builder b/usr/share/escenic/build-scripts/ece-local-builder
index 022c61f6..8ff53ef6 100755
--- a/usr/share/escenic/build-scripts/ece-local-builder
+++ b/usr/share/escenic/build-scripts/ece-local-builder
@@ -150,7 +150,7 @@ function verify_dependencies
 }
 
 function usages(){
-  echo "Usage: ece-project-builder -c <customer-builder-configuration>(require) -s skip system user creation (optional)"
+  echo "Usage: ece-local-builder -c <customer-builder-configuration>(require) -s skip system user creation (optional)"
 }
 
 ##

From a73e7942824ecef5686be5219a2c8bb7cc669457 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Tue, 10 Nov 2015 10:03:15 +0100
Subject: [PATCH 2385/2585] VOSA-183. Included ece-builder and
 ece-local-builder org files to generate man pages in package creation script.

---
 usr/share/escenic/package-scripts/create-packages | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 30c04f4f..8e9776f8 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -125,6 +125,8 @@ function set_up_escenic-build-scripts() {
   run cp ../build-scripts/ece-build-guide $target_dir/usr/bin/ece-build-guide
 
   run cp -r ../../doc/escenic/ece-build-guide.org $doc_dir
+  run cp -r ../../doc/escenic/ece-builder-guide.org $doc_dir
+  run cp -r ../../doc/escenic/ece-local-builder-guide.org $doc_dir
 }
 
 function set_up_escenic-content-engine-scripts() {

From f4d974e5ef4c945f68252a975ee7909afc329572 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Tue, 10 Nov 2015 11:22:13 +0100
Subject: [PATCH 2386/2585] VOSA-183. Fixed documentation for ece-local-builder

---
 .../doc/escenic/ece-local-builder-guide.org   | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/usr/share/doc/escenic/ece-local-builder-guide.org b/usr/share/doc/escenic/ece-local-builder-guide.org
index 1fde13ad..d1792b84 100644
--- a/usr/share/doc/escenic/ece-local-builder-guide.org
+++ b/usr/share/doc/escenic/ece-local-builder-guide.org
@@ -13,13 +13,14 @@ setting up local builder with in a Escenic Installation. This command requires a
 file to setup the builder.
 
 ** -c builder-conf-file
-Creates a builder under
+Setup builder under customer_name user provided in the builder.conf file .
+The user creation can be skipped using -s option.
 
 ** -a
 Add builder under all the existing user.
 
 ** -s
-Skip creation of the builder_system_user
+Skip creation of the user.
 
 ** -b
 Executes a ece-build operation on given branch in builder.conf file
@@ -53,39 +54,39 @@ branch_name=master
 maven_download_url=http://www.eu.apache.org/dist/maven/maven-3/3.3.3/binaries/apache-maven-3.3.3-bin.zip
 #+END_SRC
 
-Here are description about the properties in builder.conf file
+The properties of builder.conf file are described here
 * customer_name
 The name of the customer
-*technet_user
+* technet_user
 Username for escenic technet to download the distribution
-*technet_password
+* technet_password
 Password for the technet user
 *maven_user
 Username for Escenic maven repository
-*maven_password
+* maven_password
 Password for Escenic maven repository
-*git_url
+* git_url
 Customer git project url
-*assemblytool_url
+* assemblytool_url
 Download url for Escenic Assembly Tool
-*local_mode
+* local_mode
 Sets the builder in local mode if value is set to true. Defaule is false
-*auto_deploy
+* auto_deploy
 Sets the builder to automatic deploy of the created ear and configuration package if set to true.
 Default value is false
-*ear_base_url
+* ear_base_url
 The base url for the ear and configuration packages to be exposed to external systems.
-*package_for_machine
+* package_for_machine
 Machine name, for which the configuration will be created and deployed if auto_deploy is set to ture.
-*branch_name
+* branch_name
 Customer git project branch name from where the build will be made
-*maven_download_url
+* maven_download_url
 Maven download url. Default value is set to
 http://www.eu.apache.org/dist/maven/maven-3/3.3.3/binaries/apache-maven-3.3.3-bin.zip
 
 Now after preparing the configuration file with valid values for the properties. We can run the following commands
 
-*Examples
+* Examples
 * To setup a builder under the customer_name user
 #+BEGIN_SRC sh
 $ ece-local-builder -c /etc/escenic/builder.conf

From 6fe7ee863313015974920d8e9912d126576a3757 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Tue, 10 Nov 2015 13:43:12 +0100
Subject: [PATCH 2387/2585] VOSA-186: Updated documentation for making dev
 image in vosa guide.

---
 usr/share/doc/vizrt/vosa-guide.org | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-guide.org b/usr/share/doc/vizrt/vosa-guide.org
index 85a3fb2d..0b9f681d 100644
--- a/usr/share/doc/vizrt/vosa-guide.org
+++ b/usr/share/doc/vizrt/vosa-guide.org
@@ -343,20 +343,11 @@ To make a VMDK image we have to run
 vosa -i my-first-vm make
 #+END_SRC
 
-To make a ova file from the VMDK image
-#+BEGIN_SRC sh
-vosa -i my-first-vm ova
-#+END_SRC
-
 We can create a VMDK and ova file with a single command like
 #+BEGIN_SRC sh
 vosa -i my-first-vm make ova
 #+END_SRC
 
-
-
-
-
 * Puppet Master
 
 Setting up a puppet master is also an important piece of vosa.

From 3710bbf7655b405f15efc25b6dc6cc90c58fc6b2 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Tue, 10 Nov 2015 14:05:30 +0100
Subject: [PATCH 2388/2585] VOSA-186: Improved dependency installation
 instruction.

---
 .../vizrt/vosa/commands/make-dev-image.sh     | 26 +++++++------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/usr/share/vizrt/vosa/commands/make-dev-image.sh b/usr/share/vizrt/vosa/commands/make-dev-image.sh
index f5d69ee7..10705d52 100755
--- a/usr/share/vizrt/vosa/commands/make-dev-image.sh
+++ b/usr/share/vizrt/vosa/commands/make-dev-image.sh
@@ -151,22 +151,16 @@ cat ${image}/small.img | pv $pv_options | vboxmanage convertfromraw stdin $vboxm
 
 #checks dependencies of this script.
 function check_dependencies() {
-   if ! which vboxmanage > /dev/null ; then
-   echo "Please install vboxmange package first by apt-get install virtualbox. Exiting ..."
-   exit 2
-   fi
-   if ! which pv > /dev/null ; then
-   echo "Please install pv package first by apt-get install pv. Exiting ..."
-   exit 2
-   fi
-   if ! which zerofree > /dev/null ; then
-   echo "Please install zerofree package first by apt-get install zerofree. Exiting ..."
-   exit 2
-   fi
-   if ! which extlinux > /dev/null ; then
-   echo "Please install extlinux package first by apt-get install extlinux. Exiting ..."
-   exit 2
-   fi
+local missing=
+for d in vboxmanage pv zerofree extlinux; do
+  if ! which $d > /dev/null ; then
+    missing="$d $missing"
+  fi
+done
+if [ -n "$missing" ] ; then
+  echo "Required packages '${missing}' missing. Please install it by apt-get install ${missing}. Exiting ..."
+  exit 2
+fi
 }
 
 function check_status_of_machine() {

From 414a6be4d179c3e5de74877db0005435c7f95b59 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Wed, 11 Nov 2015 10:28:08 +0100
Subject: [PATCH 2389/2585] VOSA-186: Now agreement message is set properly in
 the variable. - Before the first parameter was taken now we are using ${@}
 intead of $1. - Renamed variable name from ova_config_eula ---->
 ova_config_agreement.

---
 usr/share/vizrt/vosa/commands/make-ova.sh       | 2 +-
 usr/share/vizrt/vosa/commands/ova_config_parser | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/usr/share/vizrt/vosa/commands/make-ova.sh b/usr/share/vizrt/vosa/commands/make-ova.sh
index 6127ebb4..22c474fc 100755
--- a/usr/share/vizrt/vosa/commands/make-ova.sh
+++ b/usr/share/vizrt/vosa/commands/make-ova.sh
@@ -117,7 +117,7 @@ vboxmanage export ${instance} --output ${vboxmanage_output_dir}/${instance}-tmp.
                             --product "Escenic ${instance} Development Image" \
                             --vendor "${ova_config_vendor}" \
                             --vendorurl "${ova_config_vendorurl}" \
-                            --eula "${ova_config_eula}"
+                            --eula "${ova_config_agreement}"
 #Make a vagrant "box" too
 rm -f ${vboxmanage_output_dir}/${instance}-box.ova
 vboxmanage export ${instance} --output ${vboxmanage_output_dir}/${instance}-box.ova \
diff --git a/usr/share/vizrt/vosa/commands/ova_config_parser b/usr/share/vizrt/vosa/commands/ova_config_parser
index 1b38568d..954ba8d7 100644
--- a/usr/share/vizrt/vosa/commands/ova_config_parser
+++ b/usr/share/vizrt/vosa/commands/ova_config_parser
@@ -8,7 +8,7 @@ ova_config_vm_memory=
 ova_config_vm_ubuntu_pass=
 ova_config_vendor=
 ova_config_vendorurl=
-ova_config_eula=
+ova_config_agreement=
 
 function ova_config_output_directory() {
   ova_config_output_directory=$1
@@ -31,14 +31,14 @@ function ova_config_vm_ubuntu_pass() {
 }
 
 function ova_config_vendor() {
-  ova_config_vendor=$1
+  ova_config_vendor=${@}
 }
 
 function ova_config_vendorurl() {
   ova_config_vendorurl=$1
 }
 
-function ova_config_eula() {
-  ova_config_eula=$1
+function ova_config_agreement() {
+  ova_config_agreement=${@}
 }
 

From d35452f34cee6ea4d05e7bce457ec8af5a7e5ebe Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Wed, 11 Nov 2015 11:58:49 +0100
Subject: [PATCH 2390/2585] VOSA-186:Made ostype and cpus configurable. - Set
 default values for vendor, vendorurl and agreement.

---
 usr/share/vizrt/vosa/commands/make-ova.sh       |  5 +++--
 usr/share/vizrt/vosa/commands/ova_config_parser | 16 +++++++++++++---
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/usr/share/vizrt/vosa/commands/make-ova.sh b/usr/share/vizrt/vosa/commands/make-ova.sh
index 22c474fc..4fe977b3 100755
--- a/usr/share/vizrt/vosa/commands/make-ova.sh
+++ b/usr/share/vizrt/vosa/commands/make-ova.sh
@@ -30,10 +30,11 @@ if [ ! -e "${vboxmanage_output_dir}/${instance}.vmdk" ] ; then
   echo "You should first make an vmdk file by running > vosa -i ${instance} make"
   exit 2
 fi
+
 #for this will only work with virtualbox version 4. Cause --synthcpu off option is removed from version 5.
 options=$(cat <<EOF | grep ^[^#]
 --name ${instance}
---ostype Ubuntu_64
+--ostype ${ova_config_ostype}
 --memory ${ova_config_vm_memory}
 # --pagefusion on|off
 # --vram <vramsize in MB>
@@ -54,7 +55,7 @@ options=$(cat <<EOF | grep ^[^#]
 #--cpuidremove <leaf>
 #--cpuidremoveall
 #--hardwareuuid <uuid>
---cpus 2
+--cpus ${ova_config_cpus}
 #--cpuhotplug on|off
 #--plugcpu <id>
 #--unplugcpu <id>
diff --git a/usr/share/vizrt/vosa/commands/ova_config_parser b/usr/share/vizrt/vosa/commands/ova_config_parser
index 954ba8d7..f260fd7c 100644
--- a/usr/share/vizrt/vosa/commands/ova_config_parser
+++ b/usr/share/vizrt/vosa/commands/ova_config_parser
@@ -6,9 +6,12 @@ ova_config_passphrase=
 ova_config_top_user=
 ova_config_vm_memory=
 ova_config_vm_ubuntu_pass=
-ova_config_vendor=
-ova_config_vendorurl=
-ova_config_agreement=
+ova_config_vendor="Escenic A/S"
+ova_config_vendorurl="http://www.escenic.com/"
+ova_config_agreement="You solemnly swear that you have a license agreement with Escenic, or that you are an Escenic Employee."
+ova_config_ostype=Ubuntu_64
+ova_config_cpus=2
+
 
 function ova_config_output_directory() {
   ova_config_output_directory=$1
@@ -42,3 +45,10 @@ function ova_config_agreement() {
   ova_config_agreement=${@}
 }
 
+function ova_config_ostype() {
+  ova_config_ostype=$1
+}
+
+function ova_config_cpus() {
+  ova_config_cpus=$1
+}

From 3d91f7fd21383e031de8c702c133c7d11093c9ff Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Wed, 11 Nov 2015 13:41:34 +0100
Subject: [PATCH 2391/2585] VOSA-184: Added escenic-builder  module and it's
 necessary features  in sample sdp.xml

---
 usr/bin/vosa | 50 ++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 44 insertions(+), 6 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index d415dd4b..da53d478 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -260,6 +260,15 @@ EOF
         <param name="password">PASSWORD</param>
     </feature>
 
+    <!-- Uncomment following feature to install a Development Builder -->
+    <!--
+    <feature type="authentication" revision="1" id="technet-login">
+        <param name="url">http://technet.escenic.com/</param>
+        <param name="userid">TECHNET-USERNAME</param>
+        <param name="password">TECHNET-PASSWORD</param>
+    </feature>
+    -->
+
     <feature type="escenic-publication" revision="1" id="nightly">
         <param name="name">demopub</param>
         <param name="webapp">demopub</param>
@@ -302,6 +311,34 @@ EOF
         <param name="pip-package">lxml</param>
     </module>
 
+    <!-- Uncomment following module to install a Development Builder -->
+    <!--
+    <module type="additional-packages" revision="1" id="builder-pack">
+      <param name="deb-package">escenic-build-scripts</param>
+      <param name="deb-package">subversion</param>
+      <param name="deb-package">zip</param>
+      <param name="deb-package">alien</param>
+      <param name="deb-package">fakeroot</param>
+    </module>
+    -->
+
+    <!-- Uncomment following module to install a Development Builder -->
+    <!--
+    <module type="escenic-builder" revision="1">
+      <use-feature refid="escenic-repo"/>
+      <use-feature refid="technet-login"/>
+      <param name="customer">CUSTOMER-NAME</param>
+      <param name="builder-user">escenic</param>
+      <param name="git-url">ssh://GIT-IP-ADDRESS/mycloud.git</param>
+      <param name="assemblytool-url">http://technet.escenic.com/downloads/release/57/assemblytool-2.0.7.zip</param>
+      <param name="ear-base-url">http://LOCAL-IP-ADDRESS:81</param>
+      <param name="machine">MACHINE-NAME</param>
+      <param name="branch">BRANCH-NAME</param>
+      <param name="maven-url">http://www.us.apache.org/dist/maven/maven-3/3.3.3/binaries/apache-maven-3.3.3-bin.zip</param>
+      <param name="private-key" src="/etc/escenic/private-key"/>
+    </module>
+    -->
+
     <module type="branding" revision="1">
         <param name="name">\${name}</param>
         <param name="timezone">\${timezone}</param>
@@ -315,7 +352,7 @@ EOF
         <param name="url">http://BUILDER-IP:PORT/escenic/CUSTOMER/releases/CUSTOMER-branch-master-latest.ear</param>
     </feature>
 
-<!-- This feature is to deploy nursery configuration changes, in the Escenic installation. -->
+<!-- This feature is to deploy nursery configuration changes,in the Escenic installation. -->
 <!-- <feature type="escenic-conf" revision="1">
         <!-- Replace with a correct download URL (see Escenic Cloud Installation Guide) -->
         <param name="url">
@@ -323,17 +360,13 @@ EOF
         </param>
     </feature>
 -->
-    <feature type="maven-repository" revision="1">
+    <feature type="maven-repository" revision="1" id="escenic-repo">
         <param name="url">http://maven.escenic.com</param>
         <!-- Enter your Escenic Maven repo username and password -->
         <param name="userid">MAVEN-USER</param>
         <param name="password">MAVEN-PASSWORD</param>
     </feature>
 
-    <feature type="maven-repository" revision="1">
-        <param name="url">http://repo.dev.escenic.com/content/groups/trunk</param>
-    </feature>
-
     <feature type="maven-repository" revision="1">
         <param name="url">http://maven.escenic.com/unstable</param>
         <!-- Enter your Escenic Maven repo username and password -->
@@ -377,6 +410,11 @@ EOF
                 <ref-module refid="jdk8"/>
                 <ref-module refid="python"/>
                 <ref-module type="branding"/>
+
+                <!-- Uncomment following lines to install a Development Builder -->
+                <!--
+                <ref-module refid="builder-pack"/>
+                <ref-module type="escenic-builder"/>
             </machine>
         </cluster>
     </environment>

From e9c446e75dba557121b270a7cd7a9725bfa76d4b Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Wed, 11 Nov 2015 15:20:06 +0100
Subject: [PATCH 2392/2585] VOSA-186: Made engine and search tomcat heap size
 configurable.

---
 .../vizrt/vosa/commands/make-dev-image.sh     | 10 ++++------
 .../vizrt/vosa/commands/ova_config_parser     | 20 +++++++++++++++++++
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/usr/share/vizrt/vosa/commands/make-dev-image.sh b/usr/share/vizrt/vosa/commands/make-dev-image.sh
index 10705d52..7bdc5751 100755
--- a/usr/share/vizrt/vosa/commands/make-dev-image.sh
+++ b/usr/share/vizrt/vosa/commands/make-dev-image.sh
@@ -82,12 +82,10 @@ sed -i '/^iface eth0/ s/static/dhcp/p; /^iface eth0/,/^[a-z]/d' /etc/network/int
 # Resize heaps. 128/256 and 256/512.
 sed -i s/min_heap_size=.*// /etc/escenic/ece-*.conf
 sed -i s/max_heap_size=.*// /etc/escenic/ece-*.conf
-echo min_heap_size=256m | tee -a > /dev/null /etc/escenic/ece-engine1.conf
-echo max_heap_size=512m | tee -a > /dev/null /etc/escenic/ece-engine1.conf
-echo min_heap_size=128m | tee -a > /dev/null /etc/escenic/ece-search1.conf
-echo max_heap_size=256m | tee -a > /dev/null /etc/escenic/ece-search1.conf
-echo min_heap_size=128m | tee -a > /dev/null /etc/escenic/ece-analysis1.conf
-echo max_heap_size=256m | tee -a > /dev/null /etc/escenic/ece-analysis1.conf
+echo min_heap_size=${ova_config_engine_min_heap}m | tee -a > /dev/null /etc/escenic/ece-engine1.conf
+echo max_heap_size=${ova_config_engine_max_heap}m | tee -a > /dev/null /etc/escenic/ece-engine1.conf
+echo min_heap_size=${ova_config_search_min_heap}m | tee -a > /dev/null /etc/escenic/ece-search1.conf
+echo max_heap_size=${ova_config_search_max_heap}m | tee -a > /dev/null /etc/escenic/ece-search1.conf
 
 # remove superflous jvm configuration, to make sure the instances can boot.
 echo jvm_gc_settings= | tee -a > /dev/null /etc/escenic/ece-engine1.conf
diff --git a/usr/share/vizrt/vosa/commands/ova_config_parser b/usr/share/vizrt/vosa/commands/ova_config_parser
index f260fd7c..c39f0951 100644
--- a/usr/share/vizrt/vosa/commands/ova_config_parser
+++ b/usr/share/vizrt/vosa/commands/ova_config_parser
@@ -11,6 +11,10 @@ ova_config_vendorurl="http://www.escenic.com/"
 ova_config_agreement="You solemnly swear that you have a license agreement with Escenic, or that you are an Escenic Employee."
 ova_config_ostype=Ubuntu_64
 ova_config_cpus=2
+ova_config_engine_max_heap=512
+ova_config_engine_min_heap=256
+ova_config_search_max_heap=256
+ova_config_search_min_heap=128
 
 
 function ova_config_output_directory() {
@@ -52,3 +56,19 @@ function ova_config_ostype() {
 function ova_config_cpus() {
   ova_config_cpus=$1
 }
+
+function ova_config_engine_max_heap() {
+  ova_config_engine_max_heap=$1
+}
+
+function ova_config_engine_min_heap() {
+  ova_config_engine_min_heap=$1
+}
+
+function ova_config_search_max_heap() {
+  ova_config_search_max_heap=$1
+}
+
+function ova_config_search_min_heap() {
+  ova_config_search_min_heap=$1
+}

From f41260060686485806782f8e3cb0cfc18db31ae4 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Wed, 11 Nov 2015 15:46:50 +0100
Subject: [PATCH 2393/2585] VOSA-185: Added sample ova.conf in vosa init.

---
 usr/bin/vosa | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index da53d478..42d4ba70 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -237,6 +237,66 @@ processor_affinity 0,1,2,3
 # This should only be used to debug boot problems; in production it
 # should not be necessary to vnc to the guests...
 vnc_port none
+EOF
+  fi
+
+  if [ ! -r /etc/vizrt/vosa/skeleton-kvm/ova.conf ] ; then
+    cat > /etc/vizrt/vosa/skeleton-kvm/ova.conf <<EOF
+## This is a sample configuration file needed to create a development
+## image of VMDK or OVA format. The properties looks like below
+
+################################################################
+
+## The is the output directory where the VMDK or the OVA file will be
+## generated in a directory created with the instance name.
+output_directory /var/www/html/dev
+
+## Passphrase to create an enrypted VMDK or OVA file. The encrypted file
+## have an extension vmdk.gpg or ova.gpg. Anyone with the passphrase can
+## decrypt the file and use it.
+#passphrase
+
+## A user to use the top command in the development image
+top_user top
+
+## The memory of the development image.
+vm_memory 2048
+
+## The password for the ubuntu user in the development image.
+#vm_ubuntu_pass
+
+## Operating system type to be used.
+## Default value is Ubuntu_64
+#ostype Ubuntu_64
+
+## Number of cpus to be used by the virtual machine
+## Default value is 2
+#cpus 2
+
+## Maximum heap size for engine1 tomcat
+## Default is 512
+#ova_config_engine_max_heap 512
+
+## Minimum heap size for engine1 tomcat
+## Default is 256
+#ova_config_engine_min_heap 256
+
+## Maximum heap size for search1 tomcat
+## Default is 256
+#ova_config_search_max_heap 256
+
+## Minimum heap size for search1 tomcat
+## Default value is 128
+#ova_config_search_min_heap 128
+
+## Vendor name
+#vendor Escenic A/S
+
+## Vendor url for the the vm
+#vendorurl http://www.escenic.com/
+
+## the agreement messasge shown while importing the ova file.
+#agreement You solemnly swear that you have a license agreement with Escenic, or that you are an Escenic Employee.
 EOF
   fi
     if [ ! -r /etc/vizrt/vosa/skeleton-kvm/sdp.xml ] ; then

From 9f5dc261bfdaee528536f54df66c7d78064ef792 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Wed, 11 Nov 2015 16:47:36 +0100
Subject: [PATCH 2394/2585] VOSA-186: Added some validation for the
 ova_config_parse. - Memory, cpus and heap size need to be integer

---
 .../vizrt/vosa/commands/ova_config_parser     | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/usr/share/vizrt/vosa/commands/ova_config_parser b/usr/share/vizrt/vosa/commands/ova_config_parser
index c39f0951..ed3dbd07 100644
--- a/usr/share/vizrt/vosa/commands/ova_config_parser
+++ b/usr/share/vizrt/vosa/commands/ova_config_parser
@@ -16,7 +16,6 @@ ova_config_engine_min_heap=256
 ova_config_search_max_heap=256
 ova_config_search_min_heap=128
 
-
 function ova_config_output_directory() {
   ova_config_output_directory=$1
 }
@@ -30,6 +29,11 @@ function ova_config_top_user() {
 }
 
 function ova_config_vm_memory() {
+validate_number $1 vm_memory
+if [ $1 -lt 1028 ]; then
+   echo "Value of vm_memory should be at least 1028. We found $1. Exiting ..."
+   exit 1
+fi
   ova_config_vm_memory=$1
 }
 
@@ -54,21 +58,34 @@ function ova_config_ostype() {
 }
 
 function ova_config_cpus() {
+  validate_number $1 cpus
   ova_config_cpus=$1
 }
 
 function ova_config_engine_max_heap() {
+  validate_number $1 engine_max_heap
   ova_config_engine_max_heap=$1
 }
 
 function ova_config_engine_min_heap() {
+  validate_number $1 engine_min_heap
   ova_config_engine_min_heap=$1
 }
 
 function ova_config_search_max_heap() {
+  validate_number $1 search_max_heap
   ova_config_search_max_heap=$1
 }
 
 function ova_config_search_min_heap() {
+  validate_number $1 search_min_heap
   ova_config_search_min_heap=$1
 }
+
+function validate_number() {
+local regx='^[0-9]+$'
+if ! [[ $1 =~ $regx ]] ; then
+   echo "Value of $2 should be an integer. We found $1. Exiting ..."
+   exit 1
+fi
+}

From d072b1179b3ec1fa122bb87b48bce8ac53498edc Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Wed, 11 Nov 2015 16:53:00 +0100
Subject: [PATCH 2395/2585] VOSA-185: Fix the variable names in sample ova
 file.

---
 usr/bin/vosa | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/usr/bin/vosa b/usr/bin/vosa
index 42d4ba70..46ca34b0 100755
--- a/usr/bin/vosa
+++ b/usr/bin/vosa
@@ -260,6 +260,7 @@ output_directory /var/www/html/dev
 top_user top
 
 ## The memory of the development image.
+## The value should not be less then 1028 and a valid positive integer.
 vm_memory 2048
 
 ## The password for the ubuntu user in the development image.
@@ -275,19 +276,19 @@ vm_memory 2048
 
 ## Maximum heap size for engine1 tomcat
 ## Default is 512
-#ova_config_engine_max_heap 512
+#engine_max_heap 512
 
 ## Minimum heap size for engine1 tomcat
 ## Default is 256
-#ova_config_engine_min_heap 256
+#engine_min_heap 256
 
 ## Maximum heap size for search1 tomcat
 ## Default is 256
-#ova_config_search_max_heap 256
+#search_max_heap 256
 
 ## Minimum heap size for search1 tomcat
 ## Default value is 128
-#ova_config_search_min_heap 128
+#search_min_heap 128
 
 ## Vendor name
 #vendor Escenic A/S

From 6ec01dc241bd30015ba9e9813cf4c3219d19e4aa Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Tue, 17 Nov 2015 10:06:16 +0100
Subject: [PATCH 2396/2585] VOSA-183: Used builtin replace feature of bash.

---
 usr/share/escenic/build-scripts/ece-build | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 9a46ec56..d33e9776 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -1331,8 +1331,8 @@ EOF
     local release_version=${package_name}-${package_version}
     # adding latest links for conf packages
     run_wrapper ln -sf $release_dir/$release_version.deb $release_dir/vosa-conf-${machine}-1-${customer}-${release_label}-latest.deb
-    run_wrapper ln -sf $release_dir/vosa-conf-${machine}-1_$(echo $customer | sed -e "s/-/\_/g")_$(echo $release_label | sed -e "s/-/\_/g")-r${revision}.noarch.rpm \
-                       $release_dir/vosa-conf-${machine}-1_$(echo $customer | sed -e "s/-/\_/g")_$(echo $release_label | sed -e "s/-/\_/g")-latest.noarch.rpm
+    run_wrapper ln -sf $release_dir/vosa-conf-${machine}-1_${customer//-/_}_${release_label//-/_}-r${revision}.noarch.rpm \
+                       $release_dir/vosa-conf-${machine}-1_${customer//-/_}_${release_label//-/_}-latest.noarch.rpm
 
     # remove work directory
     run_wrapper rm -rf $target_dir
@@ -1351,7 +1351,7 @@ function print_deb_package_link() {
 function print_rpm_package_link() {
   local machine=$1
   print_and_log "--- .rpm configuration package for $machine machine  ---"
-  print_and_log "$ear_base_url/$customer/releases/vosa-conf-${machine}-1_$(echo $customer | sed -e "s/-/\_/g")_$(echo $release_label | sed -e "s/-/\_/g")-r${revision}.noarch.rpm"
+  print_and_log "$ear_base_url/$customer/releases/vosa-conf-${machine}-1_${customer//-/_}_${release_label//-/_}-r${revision}.noarch.rpm"
 }
 
 ## creates DEB and RPM packages with the server configuration for all

From 86392dcaf0f3d5ea70a6ac6f604c8cd301a70454 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Tue, 17 Nov 2015 10:09:17 +0100
Subject: [PATCH 2397/2585] VOSA-187: Updated copy right information for some
 more guides

---
 usr/share/doc/escenic/ece-builder-guide.org | 3 +--
 usr/share/doc/escenic/ece-install-guide.org | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/usr/share/doc/escenic/ece-builder-guide.org b/usr/share/doc/escenic/ece-builder-guide.org
index 496594c3..1743747b 100644
--- a/usr/share/doc/escenic/ece-builder-guide.org
+++ b/usr/share/doc/escenic/ece-builder-guide.org
@@ -99,8 +99,7 @@ Running the above command will create a system user and setup the environment to
 under that user.
 
 * COPYRIGHT
-Copyright 2011-2013 Vizrt
-
+Copyright 2011-2015 Escenic
 Licensed under the Apache License, Version 2.0, see
 https://github.com/vizrt/ece-scripts/COPYING for further details.
 
diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 3a0a32e6..2d60a5a2 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -1776,7 +1776,7 @@ using *ece-install*.
 Torstein Krause Johansen, Erik Mogsensen
 
 * COPYRIGHT
-Copyright 2011-2013 Vizrt
+Copyright 2011-2015 Escenic
 
 Licensed under the Apache License, Version 2.0, see
 https://github.com/escenic/ece-scripts/COPYING for further details.

From ad7999cac69aad176f3d1120987fb072daadc57f Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Mon, 7 Dec 2015 13:02:59 +0100
Subject: [PATCH 2398/2585] VOSA-129: Added publication related webapps to be
 deployed under publication app_base.

---
 .../ece-install.d/content-engine.sh           | 23 ++++++++++-
 usr/share/escenic/ece-scripts/ece.d/deploy.sh | 39 ++++++++++++++-----
 2 files changed, 51 insertions(+), 11 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 09f2c27c..da3d459e 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -30,6 +30,20 @@ function get_deploy_white_list() {
   echo ${deploy_white_list}
 }
 
+function get_publications_webapps_list() {
+
+  local publication_webapps=""
+  # Publication service webapp mappping
+  if [ $fai_enabled -eq 1 ]; then
+    if [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ] || [ $install_profile_number -eq $PROFILE_ALL_IN_ONE ]; then
+      publication_webapps=${fai_publications_webapps-""}
+    else
+      publication_webapps=""
+    fi
+  fi
+  echo ${publication_webapps}
+}
+
 function get_publication_short_name_list() {
   local deploy_white_list=""
 
@@ -163,7 +177,14 @@ function install_ece_instance() {
         $file
     fi
   fi
-
+  if [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ]; then
+    local file=$escenic_conf_dir/ece-${instance_name}.conf
+    print_and_log "Added publications service webapps in $file ..."
+    set_conf_file_value \
+      publications_webapps \
+      $(get_publications_webapps_list) \
+      $file
+  fi
   if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER -a \
     $install_profile_number -ne $PROFILE_SEARCH_SERVER ]; then
     set_up_content_engine_cron_jobs
diff --git a/usr/share/escenic/ece-scripts/ece.d/deploy.sh b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
index 27d47d39..de2c4698 100644
--- a/usr/share/escenic/ece-scripts/ece.d/deploy.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
@@ -131,12 +131,6 @@ function deploy() {
       
       run rm -rf $tomcat_base/work/*
 
-      for war in $dir/*.war ; do
-        if [ -d $tomcat_base/$(get_app_base $war)/$(basename $war .war) ] ; then
-          run rm -rf $tomcat_base/$(get_app_base $war)/$(basename $war .war)
-        fi
-      done
-
       # this scenario is likely when running many minimal instances of
       # tomcat and some of these are not properly initialised.
       if [ ! -d $tomcat_base/webapps ]; then
@@ -155,6 +149,21 @@ function deploy() {
         local name=$(basename $war .war)
 
         local deploy_this_war=1
+        if [ -n "$publications_webapps" ]; then
+         for el in $publications_webapps; do
+           OIFS=$IFS
+           IFS=':' read publication webapps <<< "$el"
+           IFS=','
+           for webapp in $webapps; do
+              if [ "$webapp" == "$name" ]; then
+                deploy_this_war=0
+                deploy_war $tomcat_base/webapps-${publication}/$name $war
+                break
+              fi
+           done
+           IFS=$OIFS
+        done
+      fi
         if [ -n "$deploy_webapp_white_list" ]; then
           local deploy_this_war=0
 
@@ -170,14 +179,12 @@ function deploy() {
           continue
         fi
 
-        make_dir $tomcat_base/$app_base/$name
-        run cd $tomcat_base/$app_base/$name
-        run unzip -q $war < /dev/null
-
+        deploy_war $tomcat_base/$app_base/$name $war
         if [ ${enable_memcached_support-1} -eq 1 ]; then
           add_memcached_support $tomcat_base/$app_base/$name
         fi
       done
+
       if [ $type == "search" ]; then
          if [[ -L $tomcat_base/$app_base/indexer-webapp-presentation && -d $tomcat_base/$app_base/indexer-webapp-presentation ]]; then
             print_and_log "Found $tomcat_base/$app_base/indexer-webapp-presentation so deleting it"
@@ -206,6 +213,18 @@ function deploy() {
   run rm -rf ${dir}
   update_deployment_state_and_log_files $ear
 }
+## $1: webapp directory
+## $2: war file name
+function deploy_war() {
+  local app_dir=$1
+  local war_file=$2
+  if [ -d $app_dir ] ; then
+    run rm -rf $app_dir
+  fi
+  make_dir $app_dir
+  run cd $app_dir
+  run unzip -q $war_file < /dev/null
+}
 
 ## $1 : dir of the webapp 
 function add_memcached_support() {

From 149cf48255a58b843264b380583876960a237614 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Mon, 7 Dec 2015 14:13:28 +0100
Subject: [PATCH 2399/2585] VOSA-129: Pinned to unstable suit for the develop
 branch

---
 usr/share/vizrt/vosa/post-install-hooks/run-sdp-bootstrapper.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/vizrt/vosa/post-install-hooks/run-sdp-bootstrapper.sh b/usr/share/vizrt/vosa/post-install-hooks/run-sdp-bootstrapper.sh
index 11c0336b..bcd33d57 100755
--- a/usr/share/vizrt/vosa/post-install-hooks/run-sdp-bootstrapper.sh
+++ b/usr/share/vizrt/vosa/post-install-hooks/run-sdp-bootstrapper.sh
@@ -39,7 +39,7 @@ EOF
   $guest tee /etc/apt/preferences.d/30prefer-vizrt-akita-packages <<EOF
 Package: *
 Pin-Priority: 600
-Pin: release n=akita
+Pin: release a=unstable
 EOF
  $guest tee /etc/apt/preferences.d/40ubuntu-unzip-package <<EOF
 Package: unzip

From b50352447663849a4debba69c25c933979d6b5be Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Mon, 7 Dec 2015 14:17:47 +0100
Subject: [PATCH 2400/2585] VOSA-129: Added some debug log.

---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index da3d459e..990d5fd3 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -34,6 +34,7 @@ function get_publications_webapps_list() {
 
   local publication_webapps=""
   # Publication service webapp mappping
+  print_and_log "The ece-installation is running for profile $install_profile_number"
   if [ $fai_enabled -eq 1 ]; then
     if [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ] || [ $install_profile_number -eq $PROFILE_ALL_IN_ONE ]; then
       publication_webapps=${fai_publications_webapps-""}
@@ -165,6 +166,7 @@ function install_ece_instance() {
   # We set a WAR white list for all profiles except all in one
   if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER ]; then
     local file=$escenic_conf_dir/ece-${instance_name}.conf
+    print_and_log "The ece-installation is running for profile $install_profile_number"
     print_and_log "Creating deployment white list in $file ..."
     set_conf_file_value \
       deploy_webapp_white_list \
@@ -177,7 +179,7 @@ function install_ece_instance() {
         $file
     fi
   fi
-  if [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ]; then
+  if [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ] || [ $install_profile_number -eq $PROFILE_ALL_IN_ONE ]; then
     local file=$escenic_conf_dir/ece-${instance_name}.conf
     print_and_log "Added publications service webapps in $file ..."
     set_conf_file_value \

From 63f982dd234da3e75918235ef7d6b5e0fd90c016 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Mon, 7 Dec 2015 14:48:10 +0100
Subject: [PATCH 2401/2585] VOSA-129: Removed debug logs.

---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 990d5fd3..bc180651 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -34,7 +34,6 @@ function get_publications_webapps_list() {
 
   local publication_webapps=""
   # Publication service webapp mappping
-  print_and_log "The ece-installation is running for profile $install_profile_number"
   if [ $fai_enabled -eq 1 ]; then
     if [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ] || [ $install_profile_number -eq $PROFILE_ALL_IN_ONE ]; then
       publication_webapps=${fai_publications_webapps-""}
@@ -166,7 +165,6 @@ function install_ece_instance() {
   # We set a WAR white list for all profiles except all in one
   if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER ]; then
     local file=$escenic_conf_dir/ece-${instance_name}.conf
-    print_and_log "The ece-installation is running for profile $install_profile_number"
     print_and_log "Creating deployment white list in $file ..."
     set_conf_file_value \
       deploy_webapp_white_list \

From 0bef2a7cc67bbc78c945f041d64b0e7d002d4b6d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Wed, 13 Jan 2016 11:17:03 +0100
Subject: [PATCH 2402/2585] Documentation fix: root commands are prefixed with
 #

- Regular UNIX documentation convention is to prefix commands
  requiring root privileges (with su or sudo) are prefixed with a '#'
  and commands that can be run as a non-privelged user are prefixed
  with a '$'

  For example:

  $ ls
  # /etc/init.d/ssh restart
---
 usr/share/doc/vizrt/vosa-handbook/amazon.org | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/share/doc/vizrt/vosa-handbook/amazon.org b/usr/share/doc/vizrt/vosa-handbook/amazon.org
index efa04795..5c3dfbdf 100644
--- a/usr/share/doc/vizrt/vosa-handbook/amazon.org
+++ b/usr/share/doc/vizrt/vosa-handbook/amazon.org
@@ -16,7 +16,7 @@ To resize an EBS Volume using the AWS GUI console
 7. Start the machine and associate elastic ip (if it had one before)
 8. You will still see you volume with the previous size. You have to run resize2fs on the device to get the new size effective
      #+BEGIN_SRC text
-      $ sudo resize2fs /dev/xvda1
+      # resize2fs /dev/xvda1
      #+END_SRC
 
 
@@ -30,7 +30,7 @@ From the ec2 instance
 1. ssh into it as root
 2. format the device
      #+BEGIN_SRC text
-      $ mkfs.ext4 /dev/xvdf
+      # mkfs.ext4 /dev/xvdf
      #+END_SRC
 3. Put the mount entry in /etc/fstab
      #+BEGIN_SRC text
@@ -38,5 +38,5 @@ From the ec2 instance
      #+END_SRC
 4. Then mount it
      #+BEGIN_SRC text
-      $ mount -a    
+      # mount -a
      #+END_SRC

From 7f16afd30d28e1801d1b4302b92619d50774159c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Wed, 13 Jan 2016 11:18:47 +0100
Subject: [PATCH 2403/2585] Bugfix in 'ece deploy' for search instances rel to
 indexer-webapp-presentation

- indexer-webapp-presentation should be deployed in regular webapps as
  search instances don't have other host/contexts like engine
  instances have.
---
 usr/share/escenic/ece-scripts/ece.d/deploy.sh | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/deploy.sh b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
index 27d47d39..6512b416 100644
--- a/usr/share/escenic/ece-scripts/ece.d/deploy.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
@@ -17,7 +17,7 @@ function get_version_from_ear_file() {
   if [[ -z "$version" || "$version" == "engine" ]]; then
     version=$(date +%Y%m%d.%H%M)
   fi
-  
+
   echo $version
 }
 
@@ -55,7 +55,7 @@ EOF
     $(basename ${ear_used}) \
     ${ear_md5_sum} \
     >> $(get_deployment_log_file)
-  
+
   print_and_log "Deployment log file updated:" $(get_deployment_log_file)
 }
 
@@ -64,6 +64,7 @@ function deploy() {
 
   if [ -n "$file" ]; then
     print_and_log "Deploying $file on $instance ..."
+
     #Check if the file is a cached file, then will just install the file.
     # If it is not cached and a local file then create a symlink of that file in cache directory otherwise
     #We we wil consider it is a url and will try to download the file.
@@ -86,7 +87,7 @@ function deploy() {
       exit 1
     fi
   fi
-  
+
   if [ ! -e "$ear" ]; then
     print_and_log "$ear does not exist. " \
       "Did you run '"`basename $0`" -i" $instance "assemble'?"
@@ -97,7 +98,7 @@ function deploy() {
     print_and_log "$ear is faulty, I cannot deploy it :-("
     exit 1
   fi
-  
+
   # extract EAR to a temporary area
   local dir=$(mktemp -d)
   (
@@ -107,7 +108,7 @@ function deploy() {
   )
 
   print "Deploying $ear on $appserver ..."
-  
+
   case $appserver in
     tomcat)
       # We do not want the Escenic jars to share the same classloader
@@ -128,7 +129,7 @@ function deploy() {
         print "  contrib/appserver/tomcat/catalina-sample.properties"
         exit 1
       fi
-      
+
       run rm -rf $tomcat_base/work/*
 
       for war in $dir/*.war ; do
@@ -143,13 +144,13 @@ function deploy() {
         print $tomcat_base/webapps "doesn't exist, exiting."
         exit 1
       fi
-      
+
       if [ -n "$deploy_webapp_white_list" ]; then
         deploy_this_war=0
         print_and_log "Deployment white list active, only deploying: " \
           $deploy_webapp_white_list
       fi
-      
+
       for war in $dir/*.war ; do
         local app_base=$(get_app_base $war)
         local name=$(basename $war .war)
@@ -179,15 +180,16 @@ function deploy() {
         fi
       done
       if [ $type == "search" ]; then
-         if [[ -L $tomcat_base/$app_base/indexer-webapp-presentation && -d $tomcat_base/$app_base/indexer-webapp-presentation ]]; then
-            print_and_log "Found $tomcat_base/$app_base/indexer-webapp-presentation so deleting it"
-            rm -rf $tomcat_base/$app_base/indexer-webapp-presentation
-         fi
-        run cd $tomcat_base/$app_base/
-        run ln -s indexer-webapp $tomcat_base/$app_base/indexer-webapp-presentation
+        if [[ -L $tomcat_base/webapps/indexer-webapp-presentation && \
+              -d $tomcat_base/webapps/indexer-webapp-presentation ]]; then
+            print_and_log "Found $tomcat_base/webapps/indexer-webapp-presentation so deleting it"
+            run rm -rf $tomcat_base/webapps/indexer-webapp-presentation
+        fi
+        run cd $tomcat_base/webapps/
+        run ln -s indexer-webapp indexer-webapp-presentation
       fi
       ;;
-    
+
     resin)
       if [ ! -d $resin_home/deploy ]; then
         mkdir -p $resin_home/deploy \
@@ -207,7 +209,7 @@ function deploy() {
   update_deployment_state_and_log_files $ear
 }
 
-## $1 : dir of the webapp 
+## $1 : dir of the webapp
 function add_memcached_support() {
   if [[ "$do_not_add_memcached_support" == "1" ]]; then
     return
@@ -258,7 +260,7 @@ function remove_unwanted_libraries() {
   elif [ $type != "search" ]; then
     return
   fi
-  
+
   log "Removing $1/engine-config-*.jar since this is a search instance"
   run rm $1/engine-config-*.jar
 }

From 9cebd6bf5bc2afcb3ff30f571c9086dfdc68f5c8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Wed, 13 Jan 2016 11:23:57 +0100
Subject: [PATCH 2404/2585] Hardening: always run commands in the run wrapper

---
 usr/share/escenic/ece-scripts/ece.d/deploy.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/deploy.sh b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
index 6512b416..cbb38dd2 100644
--- a/usr/share/escenic/ece-scripts/ece.d/deploy.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
@@ -74,7 +74,7 @@ function deploy() {
     elif [ -f "$file" ]; then
       print_and_log " Found a local ear file $file"
       log "Creating a symlink of the file $file to $cache_dir"
-      ln -s $file $ear
+      run ln -s $file $ear
     else
       # wget_auth is needed for download_uri_target_to_dir
       wget_auth=$wget_builder_auth

From d492de814baaee0b0b7d6f8ca93e092fc21e368c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Wed, 13 Jan 2016 12:09:25 +0100
Subject: [PATCH 2405/2585] Replaced all occurrences of Vizrt with Escenic

---
 .../escenic/package-scripts/html/index.html    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/usr/share/escenic/package-scripts/html/index.html b/usr/share/escenic/package-scripts/html/index.html
index 741b754b..dbc27db8 100644
--- a/usr/share/escenic/package-scripts/html/index.html
+++ b/usr/share/escenic/package-scripts/html/index.html
@@ -4,7 +4,7 @@
 >
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
-    <title>Welcome to the Vizrt APT repository</title>
+    <title>Welcome to the Escenic APT repository</title>
     <style type="text/css">
       h1, a { color: orange; }
       a:decoration { none; }
@@ -21,7 +21,7 @@
   </head>
   <body>
     <svg
-        id="vizrt-logo"
+        id="escenic-logo"
         version="1.1"
         width="138"
         height="84"
@@ -64,12 +64,12 @@
         </g> 
       </g> 
     </svg>    
-    <h1>Welcome to the Vizrt APT repository</h1>
+    <h1>Welcome to the Escenic APT repository</h1>
     <p>
       To use this repository, do:
     </p>
-    <pre># curl -s http://apt.vizrt.com/archive.key | apt-key add -
-# echo "deb http://apt.vizrt.com stable main" > /etc/apt/sources.list.d/vizrt.list
+    <pre># curl -s http://apt.escenic.com/archive.key | apt-key add -
+# echo "deb http://apt.escenic.com stable main" > /etc/apt/sources.list.d/escenic.list
 # apt-get update</pre>
     <p>
       You can now install any packages from this repository with
@@ -89,17 +89,17 @@ <h1>Welcome to the Vizrt APT repository</h1>
       you want to live on the bleeding edge. These packages are
       updated daily so beware. To live on the bleeding edge, replace
       <code> stable </code> with <code> unstable </code> in
-      <code>/etc/apt/sources.list.d/vizrt.list</code>
+      <code>/etc/apt/sources.list.d/escenic.list</code>
     </p>
     <p>
       If you find any issues with these packages, please report this on github:
-      <a href="https://github.com/vizrt/ece-scripts/issues">
-        https://github.com/vizrt/ece-scripts/issues
+      <a href="https://github.com/escenic/ece-scripts/issues">
+        https://github.com/escenic/ece-scripts/issues
       </a>
     </p>
     <p>
       Enjoy!
     </p>
-    <p>-<em>Vizrt Online</em></p>
+    <p>-<em>Escenic</em></p>
   </body>
 </html>

From 897953b2a63da0c778c0f7371dd0e231e1e8a270 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Thu, 4 Feb 2016 14:05:07 +0100
Subject: [PATCH 2406/2585] VOSA-209: Made local builder setup dependent on
 maven repo instead of technet

---
 .../escenic/build-scripts/ece-local-builder   | 745 +++++++++---------
 1 file changed, 367 insertions(+), 378 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-local-builder b/usr/share/escenic/build-scripts/ece-local-builder
index 8ff53ef6..08aae0c4 100755
--- a/usr/share/escenic/build-scripts/ece-local-builder
+++ b/usr/share/escenic/build-scripts/ece-local-builder
@@ -27,8 +27,6 @@ do_initialize=0
 # Add user variables
 builder_system_user=
 customer_name=
-technet_user=
-technet_password=
 maven_user="maven.user"
 maven_password="maven.password"
 git_url=
@@ -55,207 +53,198 @@ update_resources=0
 ##
 function verify_root_privilege
 {
-  if [ "$(id -u)" != "0" ]; then
-    echo "This script must be run as root!"
-    exit 1
-  fi
+    if [ "$(id -u)" != "0" ]; then
+        echo "This script must be run as root!"
+        exit 1
+    fi
 }
 
 function verify_builder_conf
 {
-  if [ ! -e $provided_conf_file ]; then
-    print_and_log "The provided configuration file does not exist, exiting!" >&2
-    remove_pid_and_exit_in_error
-  else
-    provided_conf_file=$(readlink -f $provided_conf_file)
-    run source $provided_conf_file
-  fi
-  enforce_variable customer_name "Your builder configuration file is missing the variable customer_name, exiting!"
-  enforce_variable technet_user "Your builder configuration file is missing the variable technet_user, exiting!"
-  enforce_variable technet_password "Your builder configuration file is missing the variable technet_password, exiting!"
-  enforce_variable maven_user "Your builder configuration file is missing the variable maven_user, exiting!"
-  enforce_variable maven_password "Your builder configuration file is missing the variable maven_password, exiting!"
-  enforce_variable assemblytool_url "Your builder configuration file is missing the variable assemblytool_url, exiting!"
-  enforce_variable maven_download_url "Your builder configuration is missing the variable maven_download_url, exiting"
-  enforce_variable branch_name "Your builder configuration is missing the variable branch_name, exiting"
-
-  wget --http-user $technet_user --http-password $technet_password http://technet.escenic.com/ -qO /dev/null
-  if [ $? -ne 0 ]; then
-    print_and_log "Your user can't reach http://technet.escenic.com/, exiting!"
-    remove_pid_and_exit_in_error
-  fi
-  wget --http-user $maven_user --http-password $maven_password http://maven.escenic.com/ -qO /dev/null
-  if [ $? -ne 0 ]; then
-    print_and_log "Your user can't reach http://maven.escenic.com/, exiting!"
-    remove_pid_and_exit_in_error
-  fi
+    if [ ! -e $provided_conf_file ]; then
+        print_and_log "The provided configuration file does not exist, exiting!" >&2
+        remove_pid_and_exit_in_error
+    else
+        provided_conf_file=$(readlink -f $provided_conf_file)
+        run source $provided_conf_file
+    fi
+    enforce_variable customer_name "Your builder configuration file is missing the variable customer_name, exiting!"
+    enforce_variable maven_user "Your builder configuration file is missing the variable maven_user, exiting!"
+    enforce_variable maven_password "Your builder configuration file is missing the variable maven_password, exiting!"
+    enforce_variable assemblytool_url "Your builder configuration file is missing the variable assemblytool_url, exiting!"
+    enforce_variable maven_download_url "Your builder configuration is missing the variable maven_download_url, exiting"
+    enforce_variable branch_name "Your builder configuration is missing the variable branch_name, exiting"
+
+    wget --http-user $maven_user --http-password $maven_password http://maven.escenic.com/ -qO /dev/null
+    if [ $? -ne 0 ]; then
+        print_and_log "Your user can't reach http://maven.escenic.com/, exiting!"
+        remove_pid_and_exit_in_error
+    fi
 }
 
 ##
 function verify_scripts
 {
-  init_failed=0
-  if [ ! -d $ece_scripts_home ]; then
-    init_failed=1
-    error_message="The directory for ece-scripts $ece_scripts_home does not exist, exiting!"
-  elif [ ! -e $ece_scripts_home/common-bashing.sh ]; then
-    init_failed=1
-    error_message="The script $ece_scripts_home/common-bashing.sh does not exist, exiting!"
-  elif [ ! -e $ece_scripts_home/common-io.sh ]; then
-    init_failed=1
-    error_message="The script $ece_scripts_home/common-io.sh does not exist, exiting!"
-  fi
-  if [ $init_failed -eq 0 ]; then
-    source $ece_scripts_home/common-bashing.sh
-    source $ece_scripts_home/common-io.sh
-  else
-    echo "$error_message"
-    exit 1
-  fi
-
-  # set pid
-  if [ -e $pid_file ]; then
-    echo "Instance of $(basename $0) already running!"
-    exit 1
-  else
-    create_pid
-  fi
-
-  # shutdown hooks
-  trap common_bashing_exit_hook EXIT
-  trap common_bashing_user_cancelled_hook SIGINT SIGHUP
+    init_failed=0
+    if [ ! -d $ece_scripts_home ]; then
+        init_failed=1
+        error_message="The directory for ece-scripts $ece_scripts_home does not exist, exiting!"
+    elif [ ! -e $ece_scripts_home/common-bashing.sh ]; then
+        init_failed=1
+        error_message="The script $ece_scripts_home/common-bashing.sh does not exist, exiting!"
+    elif [ ! -e $ece_scripts_home/common-io.sh ]; then
+        init_failed=1
+        error_message="The script $ece_scripts_home/common-io.sh does not exist, exiting!"
+    fi
+    if [ $init_failed -eq 0 ]; then
+        source $ece_scripts_home/common-bashing.sh
+        source $ece_scripts_home/common-io.sh
+    else
+        echo "$error_message"
+        exit 1
+    fi
+
+    # set pid
+    if [ -e $pid_file ]; then
+        echo "Instance of $(basename $0) already running!"
+        exit 1
+    else
+        create_pid
+    fi
+
+    # shutdown hooks
+    trap common_bashing_exit_hook EXIT
+    trap common_bashing_user_cancelled_hook SIGINT SIGHUP
 }
 
 ##
 function enforce_variable
 {
-  if [ -z "$(eval echo $`echo $1`)" ]; then
-    print_and_log "$2"
-    remove_pid_and_exit_in_error
-  fi
+    if [ -z "$(eval echo $`echo $1`)" ]; then
+        print_and_log "$2"
+        remove_pid_and_exit_in_error
+    fi
 }
 
 ##
 function verify_command {
-  command -v $1 >/dev/null 2>&1 || { print >&2 "I require $1 but it's not installed, exiting!"; remove_pid_and_exit_in_error; }
+    command -v $1 >/dev/null 2>&1 || { print >&2 "I require $1 but it's not installed, exiting!"; remove_pid_and_exit_in_error; }
 }
 
 ##
 function verify_dependencies
 {
-  for f in $dependencies
-  do
-    verify_command $f
-  done
+    for f in $dependencies
+    do
+        verify_command $f
+    done
 }
 
 function usages(){
-  echo "Usage: ece-local-builder -c <customer-builder-configuration>(require) -s skip system user creation (optional)"
+    echo "Usage: ece-local-builder -c <customer-builder-configuration>(require) -s skip system user creation (optional)"
 }
 
 ##
 function get_user_options
 {
-  for el in "$1"; do
-    if [ "$el" == "initialize" ]; then
-       do_initialize=1
-       print_and_log "Initializing builder configuration ..."
-    fi
-  done
-  while getopts ":i:c:u:p:g:Vsab" opt; do
-    case $opt in
-      c)
-        print_and_log "Customer builder configuration is given in ${OPTARG} ..."
-        provided_conf_file=${OPTARG}
-        add_customer=1
-        ;;
-      s)
-        print_and_log "Skip ${OPTARG} user creation ..."
-        given_skip_user_creation=1
-        ;;
-      a)
-        print_and_log "Adding builder to all system users ..."
-        given_all_system_users=1
-        ;;
-      b)
-        print_and_log "I will run ece-build for the first time after builder setup is finised."
-        first_build=1
-        ;;
-      V)
-        echo "Version:" $ece_scripts_version
-        exit 0
-        ;;
-      \?)
-        print_and_log "Invalid option: -$OPTARG" >&2
-        usages
-        remove_pid_and_exit_in_error
-        ;;
-      :)
-        print_and_log "Option -$OPTARG requires an argument." >&2
-        usages
-        remove_pid_and_exit_in_error
-        ;;
-    esac
-  done
+    for el in "$1"; do
+        if [ "$el" == "initialize" ]; then
+            do_initialize=1
+            print_and_log "Initializing builder configuration ..."
+        fi
+    done
+    while getopts ":i:c:u:p:g:Vsab" opt; do
+        case $opt in
+            c)
+                print_and_log "Customer builder configuration is given in ${OPTARG} ..."
+                provided_conf_file=${OPTARG}
+                add_customer=1
+                ;;
+            s)
+                print_and_log "Skip ${OPTARG} user creation ..."
+                given_skip_user_creation=1
+                ;;
+            a)
+                print_and_log "Adding builder to all system users ..."
+                given_all_system_users=1
+                ;;
+            b)
+                print_and_log "I will run ece-build for the first time after builder setup is finised."
+                first_build=1
+                ;;
+            V)
+                echo "Version:" $ece_scripts_version
+                exit 0
+                ;;
+            \?)
+                print_and_log "Invalid option: -$OPTARG" >&2
+                usages
+                remove_pid_and_exit_in_error
+                ;;
+            :)
+                print_and_log "Option -$OPTARG requires an argument." >&2
+                usages
+                remove_pid_and_exit_in_error
+                ;;
+        esac
+    done
 }
 
 ##
 function execute
 {
-  if [ $do_initialize -eq 1 ]; then
-     initialize
-     return
-  else
-local users
-    if [ $add_customer -eq 1 ]; then
-      if [ ! -d $root_dir ]; then
-         init
-      else
-        print_and_log "Builder configurations are already generated! So, Going to create the customer  builder ..."
-      fi
-      if [ $given_all_system_users -eq 1 ]; then
-        users=`ls -1 /home`
-        for user in $users
-          do
-            ensure_no_user_conflict $user $customer_name
-            add_customer $user $customer_name
-            setup_nginx $user $customer_name
-          done
-      else
-       ensure_no_user_conflict $builder_system_user $customer_name
-       add_customer $builder_system_user $customer_name
-       setup_nginx $builder_system_user $customer_name
-      fi
-      setup_maven
-      authorize_users
-      disable_host_key_checking $builder_system_user
-      if [ $first_build -eq 1 ]; then
-        run_ece_build
-      fi
+    if [ $do_initialize -eq 1 ]; then
+        initialize
+        return
     else
-      print_and_log "No valid action chosen, exiting!" >&2
-      remove_pid_and_exit_in_error
+        local users
+        if [ $add_customer -eq 1 ]; then
+            if [ ! -d $root_dir ]; then
+                init
+            else
+                print_and_log "Builder configurations are already generated! So, Going to create the customer  builder ..."
+            fi
+            if [ $given_all_system_users -eq 1 ]; then
+                users=`ls -1 /home`
+                for user in $users
+                do
+                    ensure_no_user_conflict $user $customer_name
+                    add_customer $user $customer_name
+                    setup_nginx $user $customer_name
+                done
+            else
+                ensure_no_user_conflict $builder_system_user $customer_name
+                add_customer $builder_system_user $customer_name
+                setup_nginx $builder_system_user $customer_name
+            fi
+            setup_maven
+            authorize_users
+            disable_host_key_checking $builder_system_user
+            if [ $first_build -eq 1 ]; then
+                run_ece_build
+            fi
+        else
+            print_and_log "No valid action chosen, exiting!" >&2
+            remove_pid_and_exit_in_error
+        fi
     fi
-  fi
 }
 
 
 function initialize
 {
-local configuration_dir=/etc/escenic
-if [ ! -d $configuration_dir ]; then
-  run mkdir $configuration_dir
-fi
-#Adding builder.conf file
-local builder_file=/etc/escenic/builder.conf
-tee > $builder_file << EOF
+    local configuration_dir=/etc/escenic
+    if [ ! -d $configuration_dir ]; then
+        run mkdir $configuration_dir
+    fi
+    #Adding builder.conf file
+    local builder_file=/etc/escenic/builder.conf
+    tee > $builder_file << EOF
 customer_name=customer-name
-technet_user=technet-username
-technet_password=technet-password
 maven_user=maven-username
 maven_password=maven-password
 git_url=ssh://git@git-ip-address/mycloud.git
-assemblytool_url=http://technet.escenic.com/downloads/release/57/assemblytool-2.0.7.zip
+assemblytool_url=http://maven.escenic.com/com/escenic/tools/assemblytool/2.0.7/assemblytool-2.0.7.zip
 local_mode=false
 auto_deploy=false
 ear_base_url=http://builder-ip-address:81
@@ -268,30 +257,30 @@ EOF
 ##
 function init
 {
- local assemblytool_dir
- local assemblytool_home
-  # create skel dir for user creation
-  if [ ! -d "$skel_dir" ]; then
-    mkdir -p  $skel_dir
-  fi
-
-  # setup assemblytool skel
-  assemblytool_dir=`echo $assemblytool_url | rev | cut -d'/' -f1 | cut -d'.' -f2- | rev`
-  assemblytool_home=$skel_dir/$assemblytool_dir
-  if [ ! -d "$assemblytool_home" ]; then
-    mkdir $assemblytool_home
-    
-    run wget --http-user=$technet_user --http-password=$technet_password $assemblytool_url -O $assemblytool_home/assemblytool.zip
-    run cd $assemblytool_home
-    run unzip assemblytool.zip
-    run rm -f assemblytool.zip
-    run ant -q initialize
-    echo "engine.root = ../engine/
-plugins = ../plugins" >> $assemblytool_home/assemble.properties
-    if [ ! -d $assemblytool_home/conf ]; then
-       make_dir $assemblytool_home/conf/layers
+    local assemblytool_dir
+    local assemblytool_home
+    # create skel dir for user creation
+    if [ ! -d "$skel_dir" ]; then
+        mkdir -p  $skel_dir
     fi
-    echo "######################################################
+
+    # setup assemblytool skel
+    assemblytool_dir=`echo $assemblytool_url | rev | cut -d'/' -f1 | cut -d'.' -f2- | rev`
+    assemblytool_home=$skel_dir/$assemblytool_dir
+    if [ ! -d "$assemblytool_home" ]; then
+        mkdir $assemblytool_home
+        
+        run wget --http-user=$maven_user --http-password=$maven_password $assemblytool_url -O $assemblytool_home/assemblytool.zip
+        run cd $assemblytool_home
+        run unzip assemblytool.zip
+        run rm -f assemblytool.zip
+        run ant -q initialize
+        echo "engine.root = ../engine/
+plugins = ../plugins" >> $assemblytool_home/assemble.properties
+        if [ ! -d $assemblytool_home/conf ]; then
+            make_dir $assemblytool_home/conf/layers
+        fi
+        echo "######################################################
 # Site Wide Nursery configuration file.
 ########################################################
 # The purpose of this file is to set up the nursery,
@@ -364,65 +353,65 @@ layer.08 = /layers/instance/Layer
 # Customer :: \"escenic.server\" specific layer
 layer.09 = /layers/server/Layer" > $assemblytool_home/conf/Nursery.properties
 
-   #Update default layer configurations
-   if [ ! -d  $assemblytool_home/conf/layers/default ]; then
-        make_dir $assemblytool_home/conf/layers/default
-        echo "# The Escenic default configuration is read from the classpath with a prefix of com/escenic/configuration/default
+        #Update default layer configurations
+        if [ ! -d  $assemblytool_home/conf/layers/default ]; then
+            make_dir $assemblytool_home/conf/layers/default
+            echo "# The Escenic default configuration is read from the classpath with a prefix of com/escenic/configuration/default
 \$class=neo.nursery.ResourceDepot
 prefix=com/escenic/configuration/default" > $assemblytool_home/conf/layers/default/Files.properties
 
-       echo "# This configuration layer consists of properties files
+            echo "# This configuration layer consists of properties files
 \$class=neo.nursery.PropertyFileConfigurator
 depot=./Files" > $assemblytool_home/conf/layers/default/Layer.properties
-  else
-       print_and_log "Default layer already exists no need to create again"
-  fi
-  #Update family layer configurations
-    if [ ! -d  $assemblytool_home/conf/layers/family ]; then
-        make_dir $assemblytool_home/conf/layers/family
-        echo "# The family configuration is read from the file system hierarchy standard for configuration
+        else
+            print_and_log "Default layer already exists no need to create again"
+        fi
+        #Update family layer configurations
+        if [ ! -d  $assemblytool_home/conf/layers/family ]; then
+            make_dir $assemblytool_home/conf/layers/family
+            echo "# The family configuration is read from the file system hierarchy standard for configuration
 \$class=neo.nursery.FileSystemDepot
 
 # The files are loaded from a subdirectory of /etc/escenic/engine/host
 #   either from the system property \"com.escenic.config.engine.family\"
 #   or the family name \"default\" if that system property is null
 fileSystemRoot = /etc/escenic/engine/family/\${com.escenic.config.engine.family \"default\"}" > $assemblytool_home/conf/layers/family/Files.properties
-     
-  echo "# This configuration layer consists of properties files
+            
+            echo "# This configuration layer consists of properties files
 \$class=neo.nursery.PropertyFileConfigurator
 depot=./Files" > $assemblytool_home/conf/layers/family/Layer.properties  
-    else
-       print_and_log "Default layer already exists no need to create again"
-    fi
-   #Update addon layer configurations
-    if [ ! -d  $assemblytool_home/conf/layers/addon ]; then
-        make_dir $assemblytool_home/conf/layers/addon
-        echo "# The addon configuration is read from the classpath with no prefix
+        else
+            print_and_log "Default layer already exists no need to create again"
+        fi
+        #Update addon layer configurations
+        if [ ! -d  $assemblytool_home/conf/layers/addon ]; then
+            make_dir $assemblytool_home/conf/layers/addon
+            echo "# The addon configuration is read from the classpath with no prefix
 \$class=neo.nursery.ResourceDepot" > $assemblytool_home/conf/layers/addon/Files.properties
 
-      echo "# This configuration layer consists of properties files
+            echo "# This configuration layer consists of properties files
 \$class=neo.nursery.PropertyFileConfigurator
 depot=./Files" > $assemblytool_home/conf/layers/addon/Layer.properties 
-    else
-       print_and_log "Addon layer already exists no need to create again"
-    fi
-   #Update common layer configurations
-    if [ ! -d  $assemblytool_home/conf/layers/common ]; then
-        make_dir $assemblytool_home/conf/layers/common
-        echo "# The common configuration is read from the file system hierarchy standard location for configuration files
+        else
+            print_and_log "Addon layer already exists no need to create again"
+        fi
+        #Update common layer configurations
+        if [ ! -d  $assemblytool_home/conf/layers/common ]; then
+            make_dir $assemblytool_home/conf/layers/common
+            echo "# The common configuration is read from the file system hierarchy standard location for configuration files
 \$class=neo.nursery.FileSystemDepot
 fileSystemRoot = /etc/escenic/engine/common/" > $assemblytool_home/conf/layers/common/Files.properties
 
-       echo "# This configuration layer consists of properties files
+            echo "# This configuration layer consists of properties files
 \$class=neo.nursery.PropertyFileConfigurator
 depot=./Files" > $assemblytool_home/conf/layers/common/Layer.properties
-    else
-       print_and_log "Common layer already exists no need to create again"
-    fi
-   #Update host layer configurations
-    if [ ! -d  $assemblytool_home/conf/layers/host ]; then
-        make_dir $assemblytool_home/conf/layers/host
-        echo "# The host configuration is read from the file system hierarchy standard for configuration
+        else
+            print_and_log "Common layer already exists no need to create again"
+        fi
+        #Update host layer configurations
+        if [ ! -d  $assemblytool_home/conf/layers/host ]; then
+            make_dir $assemblytool_home/conf/layers/host
+            echo "# The host configuration is read from the file system hierarchy standard for configuration
 \$class=neo.nursery.FileSystemDepot
 
 # The files are loaded from a subdirectory of /etc/escenic/engine/host
@@ -430,66 +419,66 @@ depot=./Files" > $assemblytool_home/conf/layers/common/Layer.properties
 #   * the environment variable \"HOSTNAME\" or \"COMPUTERNAME\"
 #   otherwise the default value of \"localhost\"
 fileSystemRoot = /etc/escenic/engine/host/\${hostname env:HOSTNAME env:COMPUTERNAME \"localhost\"}/" >  $assemblytool_home/conf/layers/host/Files.properties
-       echo "# This configuration layer consists of properties files
+            echo "# This configuration layer consists of properties files
 \$class=neo.nursery.PropertyFileConfigurator
 depot=./Files" > $assemblytool_home/conf/layers/host/Layer.properties
-    else
-       print_and_log "Host layer already exists no need to create again"
-    fi
-   #Update environment layer configuration
-     if [ ! -d $assemblytool_home/conf/layers/environment ]; then
-          make_dir  $assemblytool_home/conf/layers/environment
-          echo "\$class=neo.nursery.FileSystemDepot
+        else
+            print_and_log "Host layer already exists no need to create again"
+        fi
+        #Update environment layer configuration
+        if [ ! -d $assemblytool_home/conf/layers/environment ]; then
+            make_dir  $assemblytool_home/conf/layers/environment
+            echo "\$class=neo.nursery.FileSystemDepot
 fileSystemRoot = /etc/escenic/engine/environment/\${com.escenic.environment \"unknown\"}/" > $assemblytool_home/conf/layers/environment/Files.properties
-          echo "# This configuration layer consists of properties files
+            echo "# This configuration layer consists of properties files
 \$class=neo.nursery.PropertyFileConfigurator
 depot=./Files" > $assemblytool_home/conf/layers/environment/Layer.properties
-     else
-          print_and_log "Envirnoment layer already exists no need to create again"
-     fi
-   #Update instance layer configuration
-    if [ ! -d  $assemblytool_home/conf/layers/instance ]; then
-         make_dir  $assemblytool_home/conf/layers/instance
-         echo "\$class=neo.nursery.FileSystemDepot
+        else
+            print_and_log "Envirnoment layer already exists no need to create again"
+        fi
+        #Update instance layer configuration
+        if [ ! -d  $assemblytool_home/conf/layers/instance ]; then
+            make_dir  $assemblytool_home/conf/layers/instance
+            echo "\$class=neo.nursery.FileSystemDepot
 fileSystemRoot = /etc/escenic/engine/instance/\${com.escenic.instance \"default\"}" > $assemblytool_home/conf/layers/instance/Files.properties
-        echo "# This configuration layer consists of properties files
+            echo "# This configuration layer consists of properties files
 \$class=neo.nursery.PropertyFileConfigurator
 depot=./Files" > $assemblytool_home/conf/layers/instance/Layer.properties
-   else
-         print_and_log "Instance layer already exists no need to create again"
-   fi
-  #Update server layer configuration
-    if [ ! -d  $assemblytool_home/conf/layers/server ]; then
-         make_dir  $assemblytool_home/conf/layers/server
-         echo "# The host configuration is read from the file system hierarchy standard for configuration
+        else
+            print_and_log "Instance layer already exists no need to create again"
+        fi
+        #Update server layer configuration
+        if [ ! -d  $assemblytool_home/conf/layers/server ]; then
+            make_dir  $assemblytool_home/conf/layers/server
+            echo "# The host configuration is read from the file system hierarchy standard for configuration
 \$class=neo.nursery.FileSystemDepot
 
 # The files are loaded from a subdirectory of /etc/escenic/engine/host-instance
 #   named after the hostname and instance name it's running as.
 fileSystemRoot = /etc/escenic/engine/server/\${escenic.server \"default\"}/" > $assemblytool_home/conf/layers/server/Files.properties
-        echo "# This configuration layer consists of properties files
+            echo "# This configuration layer consists of properties files
 \$class=neo.nursery.PropertyFileConfigurator
 depot=./Files" > $assemblytool_home/conf/layers/server/Layer.properties
-   else
-       print_and_log "Server layer already exists no need to create again"
-   fi
-  #Update vosa layer configuration
-   if [ ! -d   $assemblytool_home/conf/layers/vosa ]; then
-       mkdir  $assemblytool_home/conf/layers/vosa
-       echo "\$class=neo.nursery.FileSystemDepot
+        else
+            print_and_log "Server layer already exists no need to create again"
+        fi
+        #Update vosa layer configuration
+        if [ ! -d   $assemblytool_home/conf/layers/vosa ]; then
+            mkdir  $assemblytool_home/conf/layers/vosa
+            echo "\$class=neo.nursery.FileSystemDepot
 fileSystemRoot = /etc/escenic/engine/vosa/" > $assemblytool_home/conf/layers/vosa/Files.properties
-       echo "# This configuration layer consists of properties files
+            echo "# This configuration layer consists of properties files
 \$class=neo.nursery.PropertyFileConfigurator
 depot=./Files" > $assemblytool_home/conf/layers/vosa/Layer.properties
-   else
-       print_and_log "Vosa layer already exists no need to create again"
-   fi
-  fi
-
-  # setup maven settings.xml skel
-  if [ ! -d "$m2_home" ]; then
-    mkdir $m2_home
-    echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+        else
+            print_and_log "Vosa layer already exists no need to create again"
+        fi
+    fi
+
+    # setup maven settings.xml skel
+    if [ ! -d "$m2_home" ]; then
+        mkdir $m2_home
+        echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
 <settings xmlns=\"http://maven.apache.org/settings/1.0.0\"
           xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"
           xsi:schemaLocation=\"http://maven.apache.org/SETTINGS/1.0.0
@@ -552,78 +541,78 @@ depot=./Files" > $assemblytool_home/conf/layers/vosa/Layer.properties
     <activeProfile>builder</activeProfile>
   </activeProfiles>
 </settings>" > $m2_home/settings.xml
-  fi
+    fi
 
-  # setup subversion config skel
-  if [ ! -d "$subversion_dir" ]; then
-    run mkdir $subversion_dir
-    echo "[groups]
+    # setup subversion config skel
+    if [ ! -d "$subversion_dir" ]; then
+        run mkdir $subversion_dir
+        echo "[groups]
 
 [global]
 # Password / passphrase caching parameters:
 store-passwords = yes
 store-plaintext-passwords = yes" > $subversion_dir/servers
-  fi
+    fi
 
-  # setup .vim.rc skel 
-  if [ ! -e "$skel_dir/.vimrc" ]; then
-    echo "set background=dark
+    # setup .vim.rc skel 
+    if [ ! -e "$skel_dir/.vimrc" ]; then
+        echo "set background=dark
 syntax on
 set nocompatible
 set backspace=2" > $skel_dir/.vimrc
-  fi
+    fi
 }
 
 ##
 function verify_builder_exist 
 {
-  if [ ! -d $root_dir ]; then
-    print_and_log "Builder has not been initialized, please run this script with the -i flag and provide a valid config file!"
-    remove_pid_and_exit_in_error
-  fi
+    if [ ! -d $root_dir ]; then
+        print_and_log "Builder has not been initialized, please run this script with the -i flag and provide a valid config file!"
+        remove_pid_and_exit_in_error
+    fi
 }
 
 ##
 function verify_user_options() {
-  if [ $add_customer -eq 1 ]; then
-      if [ -z $builder_system_user ]; then
-         builder_system_user=$customer_name
-      fi
-  else 
-      print_and_log "Don't you want to create customer builder. Missing some required options ..."
-      usages
-      remove_pid_and_exit_in_error
-  fi
+    if [ $add_customer -eq 1 ]; then
+        if [ -z $builder_system_user ]; then
+            builder_system_user=$customer_name
+        fi
+    else 
+        print_and_log "Don't you want to create customer builder. Missing some required options ..."
+        usages
+        remove_pid_and_exit_in_error
+    fi
 }
 
 ##
 function ensure_no_user_conflict
 {
-  if [ $given_skip_user_creation -eq 1 ]; then
-    if [  -z "$(getent passwd $1)" ]; then
-      print_and_log "User $1 does not exist but you want to skip user creation!!!! Are you gone nuts ...."
-      remove_pid_and_exit_in_error
-    fi
-    if [ ! -d /home/$1 ]; then
-     print_and_log "User $1 does not exist, but has a home folder!"
-     remove_pid_and_exit_in_error
-   fi
-     print_and_log "I will skipping builder system user creation ..."
-  else 
-
-    if [ ! -z "$(getent passwd $1)" ]; then
-      print_and_log "User $1 already exist!"
-      remove_pid_and_exit_in_error
+    if [ $given_skip_user_creation -eq 1 ]; then
+        if [  -z "$(getent passwd $1)" ]; then
+            print_and_log "User $1 does not exist but you want to skip user creation!!!! Are you gone nuts ...."
+            remove_pid_and_exit_in_error
+        fi
+        if [ ! -d /home/$1 ]; then
+            print_and_log "User $1 does not exist, but has a home folder!"
+            remove_pid_and_exit_in_error
+        fi
+        print_and_log "I will skipping builder system user creation ..."
+    else 
+
+        if [ ! -z "$(getent passwd $1)" ]; then
+            print_and_log "User $1 already exist!"
+            remove_pid_and_exit_in_error
+        fi
+        if [ -d /home/$1 ]; then
+            print_and_log "User $1 does not exist, but has a home folder!"
+            remove_pid_and_exit_in_error
+        fi
+        if [ -d /var/www/$2 ]; then
+            print_and_log "Project $2 does not exist, but has a web root under /var/www/$2"
+            remove_pid_and_exit_in_error
+        fi
     fi
-    if [ -d /home/$1 ]; then
-     print_and_log "User $1 does not exist, but has a home folder!"
-     remove_pid_and_exit_in_error
-   fi
-   if [ -d /var/www/$2 ]; then
-     print_and_log "Project $2 does not exist, but has a web root under /var/www/$2"
-     remove_pid_and_exit_in_error
-   fi
-fi
 }
 
 
@@ -631,17 +620,17 @@ fi
 function add_customer
 {
 
-# Check if user want's to skip user creation
-  if [ $given_skip_user_creation -eq 1 ];then
-       print_and_log " Skipping builder system user $1 creation ..."
-  else
-     run useradd -m -s /bin/bash $1
-  fi
-  git_protocol=`echo $git_url | cut -d':' -f1`
-  git_user=`echo $git_url | awk -F"//" '{print $2;}' | cut -d'@' -f1`
-  git_base=`echo $git_url | cut -d'@' -f2`
-  make_dir /home/$1/.build
-  echo "customer=$2
+    # Check if user want's to skip user creation
+    if [ $given_skip_user_creation -eq 1 ];then
+        print_and_log " Skipping builder system user $1 creation ..."
+    else
+        run useradd -m -s /bin/bash $1
+    fi
+    git_protocol=`echo $git_url | cut -d':' -f1`
+    git_user=`echo $git_url | awk -F"//" '{print $2;}' | cut -d'@' -f1`
+    git_base=`echo $git_url | cut -d'@' -f2`
+    make_dir /home/$1/.build
+    echo "customer=$2
 src_control=git
 git_user=$git_user
 git_protocol=$git_protocol
@@ -655,55 +644,55 @@ deploy_conf=$deploy_conf
 update_resources=$update_resources
 do_force=$do_force
 branch_name=$branch_name" > /home/$1/.build/build.conf
-  run chown $1:$1 /home/$1/.build/build.conf
-  run rsync -av $skel_dir/ /home/$1
-  run chown -R $1:$1 /home/$1
-  if [ ! -d /var/www/$1 ]; then
-    make_dir /var/www/$1
-    run chown www-data:www-data /var/www/$1
-  else
-    print_and_log "Failed to add web root /var/www/$1"
-  fi
-  if [ ! -h /var/www/$1/releases ]; then
-    run ln -s /home/$1/releases /var/www/$1/releases
-  else
-    print_and_log "Failed to add symlink for /var/www/$1/releases"
-    remove_pid_and_exit_in_error
-  fi
+    run chown $1:$1 /home/$1/.build/build.conf
+    run rsync -av $skel_dir/ /home/$1
+    run chown -R $1:$1 /home/$1
+    if [ ! -d /var/www/$1 ]; then
+        make_dir /var/www/$1
+        run chown www-data:www-data /var/www/$1
+    else
+        print_and_log "Failed to add web root /var/www/$1"
+    fi
+    if [ ! -h /var/www/$1/releases ]; then
+        run ln -s /home/$1/releases /var/www/$1/releases
+    else
+        print_and_log "Failed to add symlink for /var/www/$1/releases"
+        remove_pid_and_exit_in_error
+    fi
 }
 
 function setup_nginx
 {
-  local exists=$(dpkg -l | grep nginx)
-  if [ -z "$exists" ]; then
-     run apt-get -y install nginx
-  fi
-  if [ ! -d /etc/nginx/default-site ]; then
-    #We are trying to install in a fresh vm with out sdp.xml
-    run mkdir /etc/nginx/default-site
-    run rm /etc/nginx/sites-available/default
-    tee > /etc/nginx/sites-available/default << EOF
+    local exists=$(dpkg -l | grep nginx)
+    if [ -z "$exists" ]; then
+        run apt-get -y install nginx
+    fi
+    if [ ! -d /etc/nginx/default-site ]; then
+        #We are trying to install in a fresh vm with out sdp.xml
+        run mkdir /etc/nginx/default-site
+        run rm /etc/nginx/sites-available/default
+        tee > /etc/nginx/sites-available/default << EOF
 server {
   listen 81 default;
   include /etc/nginx/default-site/*.conf;
 }
 
 EOF
-  fi
+    fi
 
-  if [ ! -e /etc/nginx/default-site/$1.conf ]; then
-    echo "location /$2/releases/ {
+    if [ ! -e /etc/nginx/default-site/$1.conf ]; then
+        echo "location /$2/releases/ {
         alias /var/www/$1/releases/;
         expires modified +310s;
 }" > /etc/nginx/default-site/$1.conf
-  fi
-  service nginx restart
+    fi
+    service nginx restart
 }
 
 function disable_host_key_checking
 {
-local git_host=$(echo "$git_base" | cut -d '/' -f1)
-tee > /home/$1/.ssh/config << EOF
+    local git_host=$(echo "$git_base" | cut -d '/' -f1)
+    tee > /home/$1/.ssh/config << EOF
 Host $git_host
     StrictHostKeyChecking no
 EOF
@@ -712,10 +701,10 @@ chown $builder_system_user:$builder_system_user /home/$1/.ssh/config
 
 function setup_maven
 {
-local temdir=/tmp
-run wget --quiet $maven_download_url -O /tmp/$(basename $maven_download_url)
-run unzip /tmp/$(basename $maven_download_url) -d /usr/local/maven
-tee /etc/profile.d/envmaven.sh << EOF
+    local temdir=/tmp
+    run wget --quiet $maven_download_url -O /tmp/$(basename $maven_download_url)
+    run unzip /tmp/$(basename $maven_download_url) -d /usr/local/maven
+    tee /etc/profile.d/envmaven.sh << EOF
 M2_HOME=/usr/local/maven/$(echo "$(basename $maven_download_url)" | cut -d'-' -f1-3)
 M2=\$M2_HOME/bin
 PATH=\$M2:\$PATH:/usr/sbin/bin:/usr/local/sbin:/usr/sbin
@@ -726,62 +715,62 @@ run rm /tmp/$(basename $maven_download_url)
 
 function run_ece_build
 {
-run su - $builder_system_user -c 'ece-build'
+    run su - $builder_system_user -c 'ece-build'
 }
 
 function authorize_users
 {
-local home_dir=/home
-users=`ls -1 $home_dir`
-  if [ ! -d $home_dir/$builder_system_user/.ssh ];then
-    run mkdir -m 700 $home_dir/$builder_system_user/.ssh
-  fi
-  if [ ! -e $home_dir/$builder_system_user/.ssh/authorized_keys ]; then
-    run touch $home_dir/$builder_system_user/.ssh/authorized_keys
-  fi
-   for user in $users
-      do
+    local home_dir=/home
+    users=`ls -1 $home_dir`
+    if [ ! -d $home_dir/$builder_system_user/.ssh ];then
+        run mkdir -m 700 $home_dir/$builder_system_user/.ssh
+    fi
+    if [ ! -e $home_dir/$builder_system_user/.ssh/authorized_keys ]; then
+        run touch $home_dir/$builder_system_user/.ssh/authorized_keys
+    fi
+    for user in $users
+    do
         if [ "$user" == "$builder_system_user" ]; then
-          continue
+            continue
         fi
         if [ -e $home_dir/$user/.ssh/authorized_keys ]; then
-         cat $home_dir/$user/.ssh/authorized_keys >> $home_dir/$builder_system_user/.ssh/authorized_keys
+            cat $home_dir/$user/.ssh/authorized_keys >> $home_dir/$builder_system_user/.ssh/authorized_keys
         fi
-   done
-#special handling for the root user authorized keys
-  cat /root/.ssh/authorized_keys >> $home_dir/$builder_system_user/.ssh/authorized_keys
-  run chown -R $builder_system_user:$builder_system_user $home_dir/$builder_system_user/.ssh/
+    done
+    #special handling for the root user authorized keys
+    cat /root/.ssh/authorized_keys >> $home_dir/$builder_system_user/.ssh/authorized_keys
+    run chown -R $builder_system_user:$builder_system_user $home_dir/$builder_system_user/.ssh/
 }
 
 ##
 function common_post_build {
-  run rm $pid_file
+    run rm $pid_file
 }
 
 ##
 function phase_startup {
-  verify_root_privilege
-  verify_scripts
-  verify_dependencies
+    verify_root_privilege
+    verify_scripts
+    verify_dependencies
 }
 
 function pre_setup_verify {
-if [ $do_initialize -ne 1 ]; then
-  verify_builder_conf
-  verify_user_options
-fi
+    if [ $do_initialize -ne 1 ]; then
+        verify_builder_conf
+        verify_user_options
+    fi
 }
 
 ##
 function phase_execute
 {
-  execute
+    execute
 }
 
 ##
 function phase_shutdown
 {
-  common_post_build
+    common_post_build
 }
 
 #####################################################

From 03b8f66821fcba7ac84614812794bb035093bce6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 5 Feb 2016 09:32:22 +0100
Subject: [PATCH 2407/2585] Added mobile-webservice to standard webapps list

- it should be deployed into the standard webapp context along with
  the other webservices.

- Note: the mobile-webservice is a special webapp in that it's not
  included in any distribution, but is a carbon copy of
  webservice.war. The mobile-studio documentation asks the user to
  create it.
---
 usr/share/escenic/ece-scripts/common-ece.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/ece-scripts/common-ece.sh b/usr/share/escenic/ece-scripts/common-ece.sh
index 40d004f2..cae78cf6 100644
--- a/usr/share/escenic/ece-scripts/common-ece.sh
+++ b/usr/share/escenic/ece-scripts/common-ece.sh
@@ -89,6 +89,7 @@ webapps_in_standard_webapps_list="
   note-webservice
   preview-editor-ws
   mobile-studio
+  mobile-webservice
   live-center-editorial
   live-center
   live-center-presentation-webservice

From 7199edf66e05534f929afad384e39198a6a9df9e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Tue, 9 Feb 2016 09:38:04 +0100
Subject: [PATCH 2408/2585] Use 4 byte UTF-8 as default character encoding on
 MySQL databases

---
 usr/share/escenic/ece-scripts/ece-install.d/database.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 49158af4..d5189022 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -577,7 +577,7 @@ function create_schema() {
   if [ $db_product = "mysql" ]; then
     print_and_log "Creating DB $db_schema on $HOSTNAME ..."
     mysql -h $db_host << EOF
-create database $db_schema character set utf8 collate utf8_general_ci;
+create database $db_schema character set utf8mb4 collate utf8mb4_general_ci;
 grant all on $db_schema.* to $db_user@'%' identified by '$db_password';
 grant all on $db_schema.* to $db_user@'localhost' identified by '$db_password';
 EOF

From a08266cbefc186633deb04539b9e87ed188eea64 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Tue, 9 Feb 2016 09:38:04 +0100
Subject: [PATCH 2409/2585] VOSA-211 Use 4 byte UTF-8 as default character
 encoding on MySQL databases

---
 usr/share/escenic/ece-scripts/ece-install.d/database.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 49158af4..d5189022 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -577,7 +577,7 @@ function create_schema() {
   if [ $db_product = "mysql" ]; then
     print_and_log "Creating DB $db_schema on $HOSTNAME ..."
     mysql -h $db_host << EOF
-create database $db_schema character set utf8 collate utf8_general_ci;
+create database $db_schema character set utf8mb4 collate utf8mb4_general_ci;
 grant all on $db_schema.* to $db_user@'%' identified by '$db_password';
 grant all on $db_schema.* to $db_user@'localhost' identified by '$db_password';
 EOF

From 553974046a88322d6f98b9d1c2efc047afa5f28d Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Tue, 9 Feb 2016 16:15:40 +0100
Subject: [PATCH 2410/2585] Revert "VOSA-211 Use 4 byte UTF-8 as default
 character encoding on MySQL databases"

VOSA-211: This reverts commit a08266cbefc186633deb04539b9e87ed188eea64. This is because It breaks the db tables creation.
---
 usr/share/escenic/ece-scripts/ece-install.d/database.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index d5189022..49158af4 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -577,7 +577,7 @@ function create_schema() {
   if [ $db_product = "mysql" ]; then
     print_and_log "Creating DB $db_schema on $HOSTNAME ..."
     mysql -h $db_host << EOF
-create database $db_schema character set utf8mb4 collate utf8mb4_general_ci;
+create database $db_schema character set utf8 collate utf8_general_ci;
 grant all on $db_schema.* to $db_user@'%' identified by '$db_password';
 grant all on $db_schema.* to $db_user@'localhost' identified by '$db_password';
 EOF

From dc53347f7ed56f27e90ec33fe8372645fa5ae5cc Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Wed, 10 Feb 2016 09:09:38 +0100
Subject: [PATCH 2411/2585] Revert "Use 4 byte UTF-8 as default character
 encoding on MySQL databases"

This reverts commit 7199edf66e05534f929afad384e39198a6a9df9e.
---
 usr/share/escenic/ece-scripts/ece-install.d/database.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index d5189022..49158af4 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -577,7 +577,7 @@ function create_schema() {
   if [ $db_product = "mysql" ]; then
     print_and_log "Creating DB $db_schema on $HOSTNAME ..."
     mysql -h $db_host << EOF
-create database $db_schema character set utf8mb4 collate utf8mb4_general_ci;
+create database $db_schema character set utf8 collate utf8_general_ci;
 grant all on $db_schema.* to $db_user@'%' identified by '$db_password';
 grant all on $db_schema.* to $db_user@'localhost' identified by '$db_password';
 EOF

From f1af78ed6a086f84fcfd2e285a1996165e6f6b4d Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Mon, 7 Mar 2016 12:21:09 +0100
Subject: [PATCH 2412/2585] VOSA-216:Added revision-history plugin to cloud
 tools

---
 usr/share/escenic/build-scripts/ece-build   | 5 ++++-
 usr/share/escenic/ece-scripts/common-ece.sh | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index d33e9776..d372bbd0 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -79,7 +79,8 @@ note
 seo
 mobile-studio
 preview-editor
-live-center"
+live-center
+revision-history"
 
 declare -A project_distributions=()
 
@@ -116,6 +117,7 @@ declare -A maven_snapshot_coordinates=(
 ["mobile-studio"]="com.escenic.plugins.mobile-studio:mobile-studio:zip"
 ["preview-editor"]="com.escenic.plugins.preview-editor:preview-editor:zip"
 ["live-center"]="com.escenic.plugins.live-center:live-center:zip"
+["revision-history"]="com.escenic.plugins.revision-history:revision-history:zip"
 )
 
 declare -A maven_coordinates=(
@@ -159,6 +161,7 @@ com.escenic.plugins.vcpeditor:vcpeditor:zip"
 ["mobile-studio"]="com.escenic.plugins.mobile-studio:mobile-studio:zip"
 ["preview-editor"]="com.escenic.plugins.preview-editor:preview-editor:zip"
 ["live-center"]="com.escenic.plugins.live-center:live-center:zip"
+["revision-history"]="com.escenic.plugins.revision-history:revision-history:zip"
 )
 
 # root folders for engine and plugin distributions
diff --git a/usr/share/escenic/ece-scripts/common-ece.sh b/usr/share/escenic/ece-scripts/common-ece.sh
index 40d004f2..3cebd1e3 100644
--- a/usr/share/escenic/ece-scripts/common-ece.sh
+++ b/usr/share/escenic/ece-scripts/common-ece.sh
@@ -92,6 +92,7 @@ webapps_in_standard_webapps_list="
   live-center-editorial
   live-center
   live-center-presentation-webservice
+  revision-history
 "
 
 ### is_webapp_a_publication

From 47eb1f7befe2861b5264b14f849c0ec753728034 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Thu, 10 Mar 2016 16:26:26 +0100
Subject: [PATCH 2413/2585] VOSA-209: Do not deploy if the builder is running
 in local mode

---
 usr/share/escenic/build-scripts/ece-build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index d372bbd0..3bf3b593 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -1627,7 +1627,7 @@ local conf_deploy_opts="--conf"
 }
 
 function phase_deploy() {
-  if [ $auto_deploy == true ]; then
+  if [ "$local_mode" == "true" ] && [ "$auto_deploy" == "true" ]; then
     automatic_deploy
   fi
 }

From 4100036e0ad96c11f7745d830595b633628c28d3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Wed, 4 May 2016 12:47:30 +0200
Subject: [PATCH 2414/2585] VOSA-228: publication webapps now get access logs
 again

This is a regression of 702368fc8b8ed80e368fe172c44cdb68e24d28bc when
a separate HTTP connector for the publication webapps was set
up. Since the access log valve has the same prefix as the one defined
for the defualt HTTP connector, the second valve wasn't working. As a
result, access log entries for the publication webapps were no longer
available on the system.
---
 usr/share/escenic/ece-scripts/ece-install.d/app-server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 5fab6dfb..b22212e9 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -378,7 +378,7 @@ EOF
                />
     <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
       <Valve className="org.apache.catalina.valves.AccessLogValve"
-             prefix="access."
+             prefix="access-publications."
              suffix=".log"
              pattern="common"
              />

From fc337f87887be59fbdfaf8196b1caafb5349efdd Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Wed, 11 May 2016 15:12:15 +0200
Subject: [PATCH 2415/2585] VOSA-229 Fixed technet credential test + download
 list

- use maven.escenic.com instead of technet.escenic.com for checking
  credentials.

- a simple, updated download list is much better than an outdated one
  full of obsolete links
---
 usr/sbin/ece-install | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 758b37f1..3f5d6f38 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -83,25 +83,15 @@ force_packages=0
 ece_software_setup_completed=0
 
 ############################################################################
-# For ECE 5.5
+# For ECE 5.7
 ############################################################################
 technet_download_list="
-  http://technet.escenic.com/downloads/release/55/analysis-engine-2.5.0.131590.zip
-  http://technet.escenic.com/downloads/release/55/assemblytool-2.0.4.jar
-  http://technet.escenic.com/downloads/release/55/community-engine-3.8.1.132399.zip
-  http://technet.escenic.com/downloads/release/55/engine-5.5.0.131978.zip
-  http://technet.escenic.com/downloads/release/55/forum-3.2.1.132293.zip
-  http://technet.escenic.com/downloads/release/55/geocode-2.4.1.130693.zip
-  http://technet.escenic.com/downloads/release/55/lucy-4.2.1.129603.zip
-  http://technet.escenic.com/downloads/release/55/menu-editor-2.1.1.128528.zip
-  http://technet.escenic.com/downloads/release/55/online-graphics-1.0.1.133123.zip
-  http://technet.escenic.com/downloads/release/55/poll-2.3.0.128547.zip
-  http://technet.escenic.com/downloads/release/55/vcpeditor-1.0.0.132434.zip
-  http://technet.escenic.com/downloads/release/55/video-1.2.1.132710.zip
+http://maven.escenic.com/com/escenic/engine-dist/5.7.71.178665/engine-dist-5.7.71.178665-bin.zip
+https://maven.escenic.com/com/escenic/tools/assemblytool/2.0.7/assemblytool-2.0.7.zip
 "
+
 wf_download_list="
-  http://technet.escenic.com/downloads/release/55/framework-dist-2.0.2.131581.zip
-  http://technet.escenic.com/downloads/release/55/framework-community-dist-2.0.2.131581.zip
+https://maven.escenic.com/com/escenic/widget-framework/framework-dist/3.5.1.174428/framework-dist-3.5.1.174428.zip
 "
 ############################################################################
 
@@ -564,7 +554,7 @@ function check_software_credentials() {
 
   print_and_log "Verifying that Technet credentials are OK ..."
 
-  local url=http://technet.escenic.com
+  local url=http://maven.escenic.com
   local notok=$(
     is_unauthorized_to_access_url \
       ${technet_user} \

From 8f0930a7f0aec002e12a6f1e8899a93cd11201eb Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Wed, 11 May 2016 15:14:04 +0200
Subject: [PATCH 2416/2585] Updated fall back Tomcat URL

---
 usr/share/escenic/ece-scripts/common-os.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index 26a9f735..94eeb778 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -8,7 +8,7 @@
 common_bashing_is_loaded > /dev/null 2>&1 || source $(pwd)/common-bashing.sh
 
 ## Only used if the Tomcat download mirror couldn't be determined
-fallback_tomcat_url="http://apache.uib.no/tomcat/tomcat-7/v7.0.62/bin/apache-tomcat-7.0.62.tar.gz"
+fallback_tomcat_url="http://apache.uib.no/tomcat/tomcat-7/v7.0.69/bin/apache-tomcat-7.0.69.tar.gz"
 
 # Can be used like this:
 # common_io_os_loaded 2>/dev/null || source common-os.sh

From bc664a5411038560d8e190ab5a7af63cb422a877 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Mon, 23 May 2016 15:08:18 +0200
Subject: [PATCH 2417/2585] =?UTF-8?q?Updated=20URLs=20to=20ece-scripts=20r?=
 =?UTF-8?q?epo=20vizrt=20=E2=86=92=20escenic?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- also, in the installation report after a successful run of
  ece-install, listed installed Escenic related man pages.

- Example of these two changes:

   [ece-install-86] - UNIX man pages: ece ece-import
   [ece-install-86] - Guide books: http://docs.escenic.com/ece-5.7.html
---
 usr/sbin/ece-install | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 3f5d6f38..58c8d27f 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -58,7 +58,7 @@ db_vendor=percona
 download_dir=${escenic_cache_dir}/$(basename $0)
 log=${escenic_log_dir}/$(basename $0).log
 conf_file=$HOME/ece-install.conf
-ece_scripts_git_source=https://github.com/vizrt/ece-scripts.git
+ece_scripts_git_source=https://github.com/escenic/ece-scripts.git
 maven_opts="--batch-mode"
 wget_opts="--continue --inet4-only --quiet"
 apt_opts="--no-install-recommends"
@@ -407,8 +407,8 @@ function print_status_and_next_steps()
     if [ $install_profile_number -ne $PROFILE_RESTORE_FROM_BACKUP -a \
         $install_profile_number -ne $PROFILE_CACHE_SERVER -a \
         $install_profile_number -ne $PROFILE_WIDGET_FRAMEWORK ]; then
-        add_next_step "Install info: "\ "/usr/share/doc/escenic/ece-install-guide.txt"
-        add_next_step "Guide books: http://documentation.vizrt.com/ece-5.5.html"
+        add_next_step "UNIX man pages: $(man -k escenic | awk '{print $1;}')"
+        add_next_step "Guide books: http://docs.escenic.com/ece-5.7.html"
     fi
 
     print_next_step_list

From ec806161edd0c3f478961df8804efe79c54c02c3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Tue, 24 May 2016 10:45:58 +0200
Subject: [PATCH 2418/2585] Added support for new git hosted ECE/develop

- now possible to use ece-install to install a develop-SNAPSHOT build
  of ECE (in addition to p4 hosted trunk-SNAPSHOT builds).
---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 09f2c27c..ce93d994 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -320,7 +320,7 @@ function set_up_engine_and_plugins() {
     verify_that_archive_is_ok $download_dir/$file
 
     if [ $(echo $file | \
-      grep -E "^engine-[0-9]|^engine-trunk-SNAPSHOT|^engine-dist" | \
+      grep -E "^engine-[0-9]|^engine-trunk-SNAPSHOT|^engine-develop-SNAPSHOT|^engine-dist" | \
       wc -l) -gt 0 ]; then
       engine_dir=$(get_base_dir_from_bundle $download_dir/$file)
       engine_file=$file

From c8459608c9e458257f2e0ebb66b3ffd79d19b3a5 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Tue, 24 May 2016 15:24:12 +0200
Subject: [PATCH 2419/2585] Added common-bashing::pretty_print_xml

- Pretty prints the passed XML file
---
 usr/share/escenic/ece-scripts/common-bashing.sh | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index e0e7304b..aca338c4 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -588,3 +588,16 @@ function common_bashing_user_cancelled_hook() {
 function lowercase() {
   echo "$@" | tr [A-Z] [a-z]
 }
+
+### pretty_print_xml
+## Pretty prints the passed XML file
+##
+## $1 :: xml file
+function pretty_print_xml() {
+  local file=$1
+  local tmp_file=
+  tmp_file=$(mktemp)
+
+  xmllint --format "${file}" > "${tmp_file}"
+  run mv "${tmp_file}" "${file}"
+}

From 5b0eed835cf15ff010e7d747ed24e2a80a110164 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Wed, 11 May 2016 16:27:32 +0200
Subject: [PATCH 2420/2585] VOSA-229 ece-install now installs multi core Solr 6

- some fixing of old code as well, like using ece_user and ece_group
  instead of hard coding the UNIX user and group

- this version of ece-install assumes ECE6, specifically VF-6357, as
  this contains updated solrconfig.xml and schema.xml for Solr 6. To run
  ece-install on ECE 5.7 that only ships with Solr files for Solr < 6
  (in fact, Solr 4) set the following in ece-install.conf:

    fai_search_legacy=1

  With this set, the old solr setup code is run instead, using the ECE
  shipped solr.war and so on.

- sets up init.d script for solr

- configures solr to put its PID files in /var/run/escenic (or
  escenic_run_dir to be precise)

- configures search components in Nursery
  for use with multi core solr 6 setup

- backwards compatibility with ECE 5.7 and below kept when
  the ece-install.conf contains

    fai_search_legacy=1

- fixed stupid bug in common-bashing

- fixed long standing bug that created multiple, wrong entries in the
  search related Nursery configuration files, like
  /etc/escenic/engine/common/com/escenic/webservice/search/DelegatingSearchEngine.properties
  where there would be two solrURI entries , one where there was no
  search host and port and another with correct solrURI set.

  Since the last line takes precendence, this wasn't a problem when ECE
  ran, but the configuation file looked unnecesarily messy with a
  an invalid configuration line

- Don't create ECE shipped solr.xml, just use the one from solr

- solved a chicken and the  egg problem WRT to search conf

  Since 2013-09-05 (e6958fb9) we've had a a chicken and the egg problem,
  set_up_app_server is dependent on Nursery configuration to be there, but
  set_up_basic_nursery_configuration (which again calls
  set_up_search_client_nursery_conf) is dependent on values set in
  set_up_app_server. Without these, the search related Nursery components
  get faulty entries.

- solr6 setup now works end to end
---
 .../ece-scripts/ece-install.d/app-server.sh   |  15 +-
 .../ece-install.d/content-engine.sh           |  47 ++++-
 .../ece-install.d/search-server.sh            | 177 +++++++++++++++---
 3 files changed, 200 insertions(+), 39 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 5fab6dfb..90bdcbb6 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -133,9 +133,11 @@ function set_up_app_server() {
       search_host=$(echo $user_search | cut -d':' -f1)
       search_port=$(echo $user_search | cut -d':' -f2)
     fi
+
   else
     search_host=${fai_search_host-$HOSTNAME}
     search_port=${fai_search_port-$default_app_server_port}
+    solr_port=${fai_solr_port-8983}
   fi
 
   download_tomcat $download_dir
@@ -476,11 +478,16 @@ EOF
     done
   fi
 
+  local solr_editorial_url=http://${search_host}:${solr_port}/solr/editorial
+  if [ ${fai_search_legacy-0} -eq 1 ]; then
+    solr_editorial_url=http://${search_host}:${search_port}/solr/collection1
+  fi
+
   if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER ]; then
     xmlstarlet ed -P -L \
        -s /Context -t elem -n TMP -v '' \
        -i //TMP -t attr -n name -v escenic/solr-base-uri \
-       -i //TMP -t attr -n value -v http://${search_host}:${search_port}/solr/collection1 \
+       -i //TMP -t attr -n value -v "${solr_editorial_url}" \
        -i //TMP -t attr -n type -v java.lang.String \
        -i //TMP -t attr -n override -v false \
        -r //TMP -v Environment \
@@ -499,7 +506,7 @@ EOF
        -r //TMP -v Environment \
        -s /Context -t elem -n TMP -v '' \
        -i /Context/TMP -t attr -n name -v escenic/index-update-uri \
-       -i /Context/TMP -t attr -n value -v http://${search_host}:${search_port}/solr/collection1/update/ \
+       -i /Context/TMP -t attr -n value -v ${solr_editorial_url}/update/ \
        -i /Context/TMP -t attr -n type -v java.lang.String \
        -i /Context/TMP -t attr -n override -v true \
        -r //TMP -v Environment \
@@ -523,9 +530,9 @@ EOF
 
      cat >> $tomcat_base/conf/Catalina/localhost/indexer-webapp-presentation.xml <<EOF
     <Context docBase="$\\{catalina.base}/webapps/indexer-webapp">
-      <Environment name="escenic/solr-base-uri" value="http://${search_host}:${search_port}/solr/presentation/" type="java.lang.String" override="true"/>
+      <Environment name="escenic/solr-base-uri" value="http://${search_host}:${solr_port}/solr/presentation/" type="java.lang.String" override="true"/>
       <Environment name="escenic/indexer-webservice" value="${presentation_indexer_ws_uri}" type="java.lang.String" override="true"/>
-      <Environment name="escenic/index-update-uri" value="http://${search_host}:${search_port}/solr/presentation/update/" type="java.lang.String" override="true"/>
+      <Environment name="escenic/index-update-uri" value="http://${search_host}:${solr_port}/solr/presentation/update/" type="java.lang.String" override="true"/>
       <Environment name="escenic/head-tail-storage-file" value="$escenic_data_dir/engine/head-tail-presentation.index" type="java.lang.String" override="true"/>
       <Environment name="escenic/failing-documents-storage-file" value="$escenic_data_dir/engine/failures-presentation.index" type="java.lang.String" override="true"/>
    </Context>
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index ce93d994..51c5345e 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -5,7 +5,7 @@ function get_deploy_white_list() {
   local deploy_white_list=""
   local presentation_deploy_white_list="escenic-admin $(get_publication_short_name_list)"
   local editor_deploy_white_list="escenic-admin escenic studio indexer-webservice webservice webservice-extensions preview-editor-ws"
-  local search_deploy_white_list="solr indexer-webapp"
+  local search_deploy_white_list="indexer-webapp"
 
   # user's deploy white list, if present, takes precedence.
   if [ $fai_enabled -eq 1 ]; then
@@ -114,6 +114,14 @@ function deploy_conf_package() {
     --install $conf_file
 }
 
+function set_search_host_and_ports() {
+  if [ ${fai_enabled-0} -eq 1 ]; then
+    search_host=${fai_search_host-$HOSTNAME}
+    search_port=${fai_search_port-$default_app_server_port}
+    solr_port=${fai_solr_port-8983}
+  fi
+}
+
 ## $1=<default instance name>
 function install_ece_instance() {
   install_ece_third_party_packages
@@ -142,10 +150,24 @@ function install_ece_instance() {
       $ece_instance_conf_archive
   fi
 
-  if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER ]; then
+  if [[ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ||
+        $install_profile_number -eq $PROFILE_EDITORIAL_SERVER ||
+        $install_profile_number -eq $PROFILE_ALL_IN_ONE
+      ]]; then
+
+    ## Since 2013-09-05 (e6958fb9) we've had a a chicken and the egg
+    ## problem, set_up_app_server is dependent on Nursery
+    ## configuration to be there, but
+    ## set_up_basic_nursery_configuration (which again calls
+    ## set_up_search_client_nursery_conf) is dependent on values set
+    ## in set_up_app_server. Without these, the search related Nursery
+    ## components get faulty entries.
+    set_search_host_and_ports
+
     set_up_basic_nursery_configuration
     set_up_instance_specific_nursery_configuration
   fi
+
   set_up_app_server
 
   # We set a WAR white list for all profiles except all in one
@@ -881,23 +903,36 @@ function stop_and_clear_instance_if_requested() {
 function set_up_search_client_nursery_conf() {
   local dir=$common_nursery_dir/com/escenic/framework/search/solr
   make_dir $dir
-  echo "solrServerURI=http://${search_host}:${search_port}/solr" \
+  echo "solrServerURI=http://${search_host}:${solr_port}/solr" \
     >>  $dir/SolrSearchEngine.properties
 
   dir=$common_nursery_dir/com/escenic/webservice/search
   make_dir $dir
-  echo "solrURI=http://${search_host}:${search_port}/solr/select" \
+  local solr_search_url=
+
+  if [ ${fai_search_legacy-0} -eq 1 ]; then
+    sorl_search_url=http://${search_host}:${search_port}/solr/select
+  else
+    if [ $install_profile_number -eq $PROFILE_EDITORIAL_SERVER ]; then
+      solr_search_url=http://${search_host}:${solr_port}/solr/editorial/select
+    else
+      solr_search_url=http://${search_host}:${solr_port}/solr/presentation/select
+    fi
+  fi
+
+  echo "solrURI=${solr_search_url}" \
     >> $dir/DelegatingSearchEngine.properties
 
   dir=$common_nursery_dir/com/escenic/lucy
   make_dir $dir
-  echo "solrURI=http://${search_host}:${search_port}/solr" \
+  echo "solrURI=http://${solr_search_url}" \
     >> $dir/LucySearchEngine.properties
 
   dir=$common_nursery_dir/com/escenic/forum/search/lucy
   make_dir $dir
-  echo "solrURI=http://${search_host}:${search_port}/solr" \
+  echo "solrURI=${solr_search_url}" \
     >> $dir/SearchEngine.properties
+
 }
 
 function set_up_content_engine_cron_jobs() {
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
index 764db03b..0c5a54d2 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
@@ -1,16 +1,28 @@
 # ece-install module for installing the search server
 
+solr_download_url=http://apache.uib.no/lucene/solr/6.0.0/solr-6.0.0.zip
+
+## Since solr itself talks about SOLR_HOME as where it has its data
+## files (solr_data_dir might have been a more suitable name), we
+## cannot use solr_home as we e.g. use java_home, but instead use
+## this:
+solr_dir=/opt/solr
+
 function install_search_server() {
   print_and_log "Installing a search server on $HOSTNAME ..."
   type=search
   install_ece_instance "search1" 0
-  
-  multicore_solr_setup 
+
+  if [ ${fai_search_legacy-0} -eq 0 ]; then
+    set_up_solr
+  else
+    multicore_solr_setup_pre_ece6
+  fi
   assemble_deploy_and_restart_type
   leave_search_server_trail
 }
 
-function multicore_solr_setup(){
+function multicore_solr_setup_pre_ece6(){
   run_hook set_up_solr.preinst
 
   print_and_log "Setting up  Multicore Solr ..."
@@ -69,7 +81,7 @@ function multicore_solr_setup(){
 
   make_dir presentation/conf
   make_dir presentation/data/index
-  chown -R escenic:escenic presentation/data/
+  run chown -R ${ece_user}:${ece_group} presentation/data/
   run cp -r $escenic_conf_dir/solr/*  presentation/conf/
 
   run xmlstarlet ed -L -s //config -t elem -n DataTMP -v "$escenic_data_dir/solr/presentation/data" \
@@ -89,11 +101,85 @@ function multicore_solr_setup(){
 
 }
 
+function download_and_install_solr() {
+  local file=
+  local solr_base_dir=
+
+  solr_base_dir=$(basename ${solr_download_url} .zip)
+  if [ -e "/opt/${solr_base_dir}" ]; then
+    print_and_log "Solr dir, /opt/${solr_base_dir}, already exists, leaving it be."
+    return
+  fi
+
+  print "Downloading Solr from ${solr_download_url} ..."
+  download_uri_target_to_dir "${solr_download_url}" "${download_dir}"
+
+  file="${download_dir}"/$(basename ${solr_download_url})
+  run unzip -q "${file}" -d /opt
+  run chown -R "${ece_user}":"${ece_group}" "/opt/${solr_base_dir}"
+
+  if [ ! -h ${solr_dir} ]; then
+    run ln -s "/opt/${solr_base_dir}" ${solr_dir}
+  fi
+}
+
+function create_global_solr_configuration() {
+  local file=/etc/default/solr.in.sh
+  if [ -e ${file} ]; then
+    print_and_log "${file} already exists, not touching it"
+  else
+    print "Creating global solr config in ${file} ..."
+    run mv ${solr_dir}/bin/solr.in.sh "${file}"
+    cat >> ${file} <<EOF
+## Added by $(basename $0) @ $(date)
+SOLR_HOME=${escenic_data_dir/solr}
+SOLR_LOGS_DIR=${escenic_log_dir}
+SOLR_PID_DIR=${escenic_run_dir}
+EOF
+  fi
+}
+
+function setup_solr_init_d_script() {
+  local init_d_file=/etc/init.d/solr
+  if [ -e "${init_d_file}" ]; then
+    print_and_log "${init_d_file} already exists, keeping my hands off"
+    return
+  fi
+
+  print_and_log "Setting up init.d script: ${init_d_file}"
+  run mv "${solr_dir}/bin/init.d/solr" "${init_d_file}"
+  run sed -i "s#RUNAS=\"solr\"#RUNAS=\"${ece_user}\"#" "${init_d_file}"
+  run chmod 755 "${init_d_file}"
+
+  if [ "${on_debian_or_derivative}" -eq 1 ]; then
+    print_and_log "Adding the solr init.d script to the default run levels ..."
+    run update-rc.d solr defaults 35
+  elif [ "${on_redhat_or_derivative}" -eq 1 ]; then
+    print_and_log "Adding the solr init.d script to the default run levels ..."
+    run chkconfig --level 35 solr on
+  fi
+}
+
+function start_solr() {
+  run /etc/init.d/solr start
+}
+
 function set_up_solr() {
   run_hook set_up_solr.preinst
-  
+
+  local solr_core_list="
+    editorial
+    presentation
+  "
+
   print_and_log "Setting up Solr ..."
+  download_and_install_solr
+  create_global_solr_configuration
+  setup_solr_init_d_script
+
   if [ ! -d $escenic_conf_dir/solr ]; then
+    make_dir "$escenic_conf_dir/solr"
+
     if [ $(is_using_conf_archive) -eq 1 ]; then
       print_and_log "Using the supplied Solr configuration from" \
         "bundle: $ece_instance_conf_archive"
@@ -109,47 +195,80 @@ function set_up_solr() {
 
       run cd $a_tmp_dir
       run tar xzf $(basename $ece_instance_conf_archive) engine/solr/conf
-      run cp -r engine/solr/conf $escenic_conf_dir/solr
 
-      run rm -r $a_tmp_dir
+      for solr_core in ${solr_core_list}; do
+        run cp -r engine/solr/conf "$escenic_conf_dir/solr/${solr_core}"
+      done
+
+      run rm -r "${a_tmp_dir}"
     else
       print_and_log "Installing default Solr conf shipped with ECE ..."
-      run cp -r $escenic_root_dir/engine/solr/conf $escenic_conf_dir/solr
-      
-      # ECE 5.6 has one additional configuration file!
-      if [ -e $escenic_root_dir/engine/solr/solr.xml ]; then
-        run cp -r $escenic_root_dir/engine/solr/solr.xml $escenic_conf_dir/. 
-      fi
 
+      for solr_core in ${solr_core_list}; do
+        run cp -r "$escenic_root_dir/engine/solr/conf" "$escenic_conf_dir/solr/${solr_core}"
+      done
     fi
   else
     print_and_log "$escenic_conf_dir/solr already exists, not touching it."
   fi
 
-  make_dir $escenic_data_dir/solr/
-  run cd $escenic_data_dir/solr/
-  if  [ ! -h conf ]; then
-    run ln -s $escenic_conf_dir/solr conf
+  local solr_xml="${escenic_data_dir}/solr.xml"
+  if [ -f "${solr_xml}" ]; then
+    print_and_log "${escenic_conf_dir}/solr.xml already exists, not touching it."
+  else
+    local target_solr_xml=/etc/escenic/solr.xml
+    print_and_log "Setting up solr.xml in ${target_solr_xml}"
+    run cp ${solr_dir}/server/solr/solr.xml "${target_solr_xml}"
+    run ln -s "${target_solr_xml}" "${escenic_data_dir}/solr.xml"
   fi
 
-  # ECE 5.6 has one additional configuration file!
-  if  [ ! -h solr.xml ]; then
-    if [ -e $escenic_conf_dir/solr.xml ]; then
-      run ln -s $escenic_conf_dir/solr.xml solr.xml
+  for solr_core in ${solr_core_list}; do
+    make_dir "$escenic_data_dir/solr/${solr_core}"
+    run cd "$escenic_data_dir/solr/${solr_core}"
+    if  [ ! -h conf ]; then
+      run ln -s "$escenic_conf_dir/solr/${solr_core}" conf
     fi
-  fi
 
-  local editorial_search_instance=${fai_search_for_editor-0}
-  local file=$escenic_conf_dir/solr/solrconfig.xml
-  if [ $editorial_search_instance -eq 1 ]; then
-    run sed -i "s#<maxTime>[0-9]*</maxTime>#<maxTime>5000</maxTime>#g" $file
-  else
-    run sed -i "s#<maxTime>[0-9]*</maxTime>#<maxTime>3000</maxTime>#g" $file
-  fi
+    create_solr_core_descriptor "${solr_core}"
+
+    ## backwards compatible: respect editorial_search_instance
+    local editorial_search_instance=${fai_search_for_editor-0}
 
+    if [ ${editorial_search_instance} -eq 0 ]; then
+      if [[ "editorial" == "${solr_core}" ]]; then
+        editorial_search_instance=1
+      fi
+    fi
+    local file=$escenic_conf_dir/solr/${solr_core}/solrconfig.xml
+    if [ ${editorial_search_instance} -eq 1 ]; then
+      run sed -i "s#<maxTime>[0-9]*</maxTime>#<maxTime>5000</maxTime>#g" $file
+    else
+      run sed -i "s#<maxTime>[0-9]*</maxTime>#<maxTime>3000</maxTime>#g" $file
+    fi
+  done
+
+  run chown -R "${ece_user}:${ece_group}" "${escenic_data_dir}/solr"
+  start_solr
   run_hook set_up_solr.postinst
 }
 
+## $1 :: solr core name
+function create_solr_core_descriptor() {
+  local solr_core=$1
+
+  ## Can't be in the conf directory as solr will then try to prepend
+  ## conf.
+  local core_descriptor="${escenic_data_dir}/solr/${solr_core}/core.properties"
+  print_and_log "Creating core descirptor: ${core_descriptor}"
+  cat > ${core_descriptor} <<EOF
+## generated by $(basename $0) @ $(date)
+name=${solr_core}
+config=solrconfig.xml
+schema=schema.xml
+dataDir=data
+EOF
+}
+
 function leave_search_server_trail() {
   if [ ${fai_search_install-0} -eq 1 ]; then
     leave_trail "trail_search_port=${fai_search_port-8080}"

From 8fb19fa58cde31633de4bfb8e17d6fb4490772b8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 27 May 2016 13:19:12 +0200
Subject: [PATCH 2421/2585] Bugfix in ece-install::install_packages_if_missing

- escenic-common-scripts failed on install on fresh systems. If the
  escenic APT repository was in the sources.list prior to running
  ece-install, it would work, but on clean systems it would not.

- the reason it would fail, is the way install_packages_if_missing()
  works: if any package it's asked to install, doesn't currently
  exist, it will do an apt-get update *once*. The state variable the
  method checks is shared across all the invocations of
  install_packages_if_missing during the entire run of
  ece-install. Hence, if an APT repository is added during the
  installation, an apt-get update *must* be invoked.

- Making only one call to apt-get for install_packages_if_missing was
  an optimisation done in 340dd2b1 to speed up the installation.
---
 usr/sbin/ece-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 58c8d27f..20d5baf0 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -277,10 +277,10 @@ function install_common_os_packages()
         apt-key add - 1>> $log 2>> $log
       local package_pool=${fai_apt_vizrt_pool-unstable}
       add_apt_source "deb http://apt.vizrt.com ${package_pool} main"
+      run apt-get update
     fi
     install_packages_if_missing escenic-common-scripts
   fi
-
 }
 
 # don't quote values when setting conf file values with

From d1d6cbc8166979393f917abcc17d88996cec69d2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 27 May 2016 12:02:43 +0200
Subject: [PATCH 2422/2585] Bugfix in get_base_dir_from_bundle

- because of the bug, it was impossible to run it in debug mode
---
 usr/share/escenic/ece-scripts/common-bashing.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index aca338c4..9bb4b2e0 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -311,8 +311,6 @@ function get_base_dir_from_bundle() {
         done
     fi
 
-    debug "get_base_dir_from_bundle file_name="$file_name $1
-
     echo $file_name
 }
 

From 2cd10069f90a15623921d6fe180ded0d96f56636 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Wed, 25 May 2016 10:30:34 +0200
Subject: [PATCH 2423/2585] Bugfix: fixed a  [: -eq: unary operator expected
 error

---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 51c5345e..4aa0a676 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -739,7 +739,7 @@ function install_ece_third_party_packages
       local version=$(lsb_release -s -r | sed "s#\.##g")
     fi
 
-    if [ $(has_oracle_java_installed) -eq 0 ]; then
+    if [ "$(has_oracle_java_installed)" -eq 0 ]; then
       install_oracle_java
     fi
 

From 71dc5792037d4a7f799e930629f47c99e13057f2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Tue, 24 May 2016 15:28:10 +0200
Subject: [PATCH 2424/2585] Bugfix no longer duplicate indexer-presentation
 <Context/>s

- when re-running ece-install with a search instance, ece-install
  would keep adding <Context/> elements for the
  indexer-webapp-presentation webapp.

- pretty printed the rather messy context.xml (because of xmlstarlet).
---
 usr/share/escenic/ece-scripts/ece-install.d/app-server.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 90bdcbb6..9b25eb7b 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -526,9 +526,9 @@ EOF
    print_and_log "Finished adding solr configuration for search"
    print_and_log "Started adding context configuration for indexer-webapp-presentation"
  
-     mkdir -p $tomcat_base/conf/Catalina/localhost/
+   mkdir -p $tomcat_base/conf/Catalina/localhost/
 
-     cat >> $tomcat_base/conf/Catalina/localhost/indexer-webapp-presentation.xml <<EOF
+   cat > $tomcat_base/conf/Catalina/localhost/indexer-webapp-presentation.xml <<EOF
     <Context docBase="$\\{catalina.base}/webapps/indexer-webapp">
       <Environment name="escenic/solr-base-uri" value="http://${search_host}:${solr_port}/solr/presentation/" type="java.lang.String" override="true"/>
       <Environment name="escenic/indexer-webservice" value="${presentation_indexer_ws_uri}" type="java.lang.String" override="true"/>
@@ -537,6 +537,7 @@ EOF
       <Environment name="escenic/failing-documents-storage-file" value="$escenic_data_dir/engine/failures-presentation.index" type="java.lang.String" override="true"/>
    </Context>
 EOF
+   pretty_print_xml $tomcat_base/conf/Catalina/localhost/indexer-webapp-presentation.xml
    print_and_log "Finished adding context for indexer-webapp-presentation"
 
   elif [ $install_profile_number -eq $PROFILE_ANALYSIS_SERVER ]; then
@@ -554,6 +555,7 @@ EOF
        $tomcat_base/conf/context.xml
   fi
 
+  pretty_print_xml $tomcat_base/conf/context.xml
   set_up_logging
 }
 

From 4a35bb2283969469e52bdf85e2691c68c132a8cc Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Tue, 21 Jun 2016 09:46:21 +0200
Subject: [PATCH 2425/2585] Used git archive to download the tar file for
 escenic-munin project.

---
 usr/share/escenic/package-scripts/create-packages | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 8e9776f8..f65763ed 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -265,14 +265,14 @@ function set_up_escenic-munin-plugins() {
   local dir=$(mktemp -d)
   (
     run cp -r ../../../../etc/munin/plugins/* $target_dir/etc/munin/plugins
-    run download_uri_target_to_dir \
-      https://github.com/mogsie/escenic-munin/tarball/master \
-      $dir
     cd $dir
-    tar xzf master
-    run cp $dir/mogsie-escenic-munin*/*_ $target_dir/usr/share/munin/plugins
-    run cp $dir/mogsie-escenic-munin*/README.md $doc_dir
-    run cp $dir/mogsie-escenic-munin*/site/* $doc_dir
+    run git archive --format=tar.gz \
+    --remote=ssh://git@cci-jira-stash.ccieurope.com:7999/vosa/escenic-munin.git master \
+    --output="master.tar.gz"
+    tar xzf master.tar.gz
+    run cp $dir/*_ $target_dir/usr/share/munin/plugins
+    run cp $dir/README.md $doc_dir
+    run cp $dir/site/* $doc_dir
 
     chmod 755 $file $target_dir/usr/share/munin/plugins
   )

From 0f076e2e4962a56d9b174e9952c93f5e698c39c3 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Tue, 21 Jun 2016 11:06:56 +0200
Subject: [PATCH 2426/2585] Changed repo for spore to stash

---
 usr/share/escenic/package-scripts/create-packages | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index f65763ed..76b8ad2b 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -314,15 +314,15 @@ function set_up_spore() {
 
   local dir=$(mktemp -d)
   (
-    download_uri_target_to_dir \
-      https://github.com/vizrt/spore/archive/master.tar.gz \
-      $dir
     cd $dir
+    run git archive --format=tar.gz \
+    --remote=ssh://git@cci-jira-stash.ccieurope.com:7999/vosa/spore.git master \
+    --output="master.tar.gz"
     run tar xzf master.tar.gz
-    run cp $dir/spore-master/bin/* $target_dir/usr/bin
-    run cp $dir/spore-master/sbin/* $target_dir/usr/sbin
-    run cp $dir/spore-master/README.md $target_dir/usr/share/doc/spore
-    run cp -r $dir/spore-master/examples $target_dir/usr/share/doc/spore/examples
+    run cp $dir/bin/* $target_dir/usr/bin
+    run cp $dir/sbin/* $target_dir/usr/sbin
+    run cp $dir/README.md $target_dir/usr/share/doc/spore
+    run cp -r $dir/examples $target_dir/usr/share/doc/spore/examples
   )
   run rm -rf $dir
 }

From 36a69f5fb5118f575a65892707d9beddcdaf0e08 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Wed, 22 Jun 2016 14:49:19 +0200
Subject: [PATCH 2427/2585] Updated Tomcat download URL

---
 usr/share/escenic/ece-scripts/common-os.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index 94eeb778..62f6897d 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -8,7 +8,7 @@
 common_bashing_is_loaded > /dev/null 2>&1 || source $(pwd)/common-bashing.sh
 
 ## Only used if the Tomcat download mirror couldn't be determined
-fallback_tomcat_url="http://apache.uib.no/tomcat/tomcat-7/v7.0.69/bin/apache-tomcat-7.0.69.tar.gz"
+fallback_tomcat_url="http://apache.uib.no/tomcat/tomcat-7/v7.0.70/bin/apache-tomcat-7.0.70.tar.gz"
 
 # Can be used like this:
 # common_io_os_loaded 2>/dev/null || source common-os.sh

From 18a501b657b89a1de91110e2a36deede604572bf Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Wed, 22 Jun 2016 15:03:38 +0200
Subject: [PATCH 2428/2585] Updated solr6 download URL

---
 usr/share/escenic/ece-scripts/ece-install.d/search-server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
index 0c5a54d2..f09a5669 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
@@ -1,6 +1,6 @@
 # ece-install module for installing the search server
 
-solr_download_url=http://apache.uib.no/lucene/solr/6.0.0/solr-6.0.0.zip
+solr_download_url=http://apache.uib.no/lucene/solr/6.1.0/solr-6.1.0.zip
 
 ## Since solr itself talks about SOLR_HOME as where it has its data
 ## files (solr_data_dir might have been a more suitable name), we

From 68e4b0e19db0ea5a459ef7d18d86ca26c838e55d Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Fri, 24 Jun 2016 09:12:17 +0200
Subject: [PATCH 2429/2585] Added solr in deployment white list for search
 instance. This is for legacy support

---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 78e942c4..87220e06 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -5,7 +5,7 @@ function get_deploy_white_list() {
   local deploy_white_list=""
   local presentation_deploy_white_list="escenic-admin $(get_publication_short_name_list)"
   local editor_deploy_white_list="escenic-admin escenic studio indexer-webservice webservice webservice-extensions preview-editor-ws"
-  local search_deploy_white_list="indexer-webapp"
+  local search_deploy_white_list="solr indexer-webapp"
 
   # user's deploy white list, if present, takes precedence.
   if [ $fai_enabled -eq 1 ]; then

From 172e58956468a21bd62f236af127e8159d4a3485 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Mon, 27 Jun 2016 09:28:59 +0200
Subject: [PATCH 2430/2585] Made presenation url legacy compatible.

---
 usr/share/escenic/ece-scripts/ece-install.d/app-server.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index a48ab9e4..d46a6308 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -479,8 +479,10 @@ EOF
   fi
 
   local solr_editorial_url=http://${search_host}:${solr_port}/solr/editorial
+  local solr_presentation_url=http://${search_host}:${solr_port}/solr/presentation
   if [ ${fai_search_legacy-0} -eq 1 ]; then
     solr_editorial_url=http://${search_host}:${search_port}/solr/collection1
+    solr_presentation_url=http://${search_host}:${search_port}/solr/presentation
   fi
 
   if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER ]; then
@@ -530,9 +532,9 @@ EOF
 
    cat > $tomcat_base/conf/Catalina/localhost/indexer-webapp-presentation.xml <<EOF
     <Context docBase="$\\{catalina.base}/webapps/indexer-webapp">
-      <Environment name="escenic/solr-base-uri" value="http://${search_host}:${solr_port}/solr/presentation/" type="java.lang.String" override="true"/>
+      <Environment name="escenic/solr-base-uri" value="${solr_presentation_url}" type="java.lang.String" override="true"/>
       <Environment name="escenic/indexer-webservice" value="${presentation_indexer_ws_uri}" type="java.lang.String" override="true"/>
-      <Environment name="escenic/index-update-uri" value="http://${search_host}:${solr_port}/solr/presentation/update/" type="java.lang.String" override="true"/>
+      <Environment name="escenic/index-update-uri" value="${solr_presentation_url}/update/" type="java.lang.String" override="true"/>
       <Environment name="escenic/head-tail-storage-file" value="$escenic_data_dir/engine/head-tail-presentation.index" type="java.lang.String" override="true"/>
       <Environment name="escenic/failing-documents-storage-file" value="$escenic_data_dir/engine/failures-presentation.index" type="java.lang.String" override="true"/>
    </Context>

From c33872fcf97ccdbaf046d49cf423c2b7cbd4831b Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Mon, 27 Jun 2016 12:27:38 +0200
Subject: [PATCH 2431/2585] Fixed typo

---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 87220e06..b355f1b3 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -932,7 +932,7 @@ function set_up_search_client_nursery_conf() {
   local solr_search_url=
 
   if [ ${fai_search_legacy-0} -eq 1 ]; then
-    sorl_search_url=http://${search_host}:${search_port}/solr/select
+    solr_search_url=http://${search_host}:${search_port}/solr/select
   else
     if [ $install_profile_number -eq $PROFILE_EDITORIAL_SERVER ]; then
       solr_search_url=http://${search_host}:${solr_port}/solr/editorial/select

From f7b7a0b9e26e53daa168d470ac8dc9004f25d5a9 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Tue, 28 Jun 2016 14:34:57 +0200
Subject: [PATCH 2432/2585] Fixed presentation solr url for ece6 for seo plugin

---
 .../ece-install.d/special-plugins.sh          | 56 ++++++++++---------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/special-plugins.sh b/usr/share/escenic/ece-scripts/ece-install.d/special-plugins.sh
index 1262f219..88408bb0 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/special-plugins.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/special-plugins.sh
@@ -2,36 +2,40 @@
 
 function configure_seo(){
     if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER -a \
-    $install_profile_number -ne $PROFILE_SEARCH_SERVER ]; then
-    print_and_log "Configuring seo plugin ..."
-    xmlstarlet ed -P -L \
-       -s /Context -t elem -n TMP -v '' \
-       -i //TMP -t attr -n name -v escenic/presentation-solr-base-uri \
-       -i //TMP -t attr -n value -v http://${search_host}:${search_port}/solr/presentation \
-       -i //TMP -t attr -n type -v java.lang.String \
-       -i //TMP -t attr -n override -v false \
-       -r //TMP -v Environment \
-       $tomcat_base/conf/context.xml
-   fi
+        $install_profile_number -ne $PROFILE_SEARCH_SERVER ]; then
+        print_and_log "Configuring seo plugin ..."
+        local solr_presentation_url=http://${search_host}:${solr_port}/solr/presentation
+        if [ ${fai_search_legacy-0} -eq 1 ]; then
+            solr_presentation_url=http://${search_host}:${search_port}/solr/presentation
+        then
+            xmlstarlet ed -P -L \
+                -s /Context -t elem -n TMP -v '' \
+                -i //TMP -t attr -n name -v escenic/presentation-solr-base-uri \
+                -i //TMP -t attr -n value -v ${solr_presentation_url}  \
+                -i //TMP -t attr -n type -v java.lang.String \
+                -i //TMP -t attr -n override -v false \
+                -r //TMP -v Environment \
+                $tomcat_base/conf/context.xml
+        fi
 }
 
 function configure_mobile_studio(){
-  print_and_log "Configuring mobile-studio ..."
-  if [ -d $tomcat_base/webapps/webservice ]; then
-     cd $tomcat_base/webapps/
-     ln -s webservice $tomcat_base/webapps/mobile-webservice
-  fi
+    print_and_log "Configuring mobile-studio ..."
+    if [ -d $tomcat_base/webapps/webservice ]; then
+        cd $tomcat_base/webapps/
+        ln -s webservice $tomcat_base/webapps/mobile-webservice
+    fi
 }
 
 function configure_special_plugins(){
-  print_and_log "Checking for special plugins ..."
-  if [[ $type == "engine" && -e $escenic_conf_dir/ece-$instance_name.conf ]]; then
-     source $escenic_conf_dir/ece-$instance_name.conf
-     if [[ "$ear_download_list" =~ "seo-" ]]; then
-        configure_seo
-     fi
-     if [[ "$ear_download_list" =~ "mobile-studio-" ]]; then
-        configure_mobile_studio
-     fi
-  fi
+    print_and_log "Checking for special plugins ..."
+    if [[ $type == "engine" && -e $escenic_conf_dir/ece-$instance_name.conf ]]; then
+        source $escenic_conf_dir/ece-$instance_name.conf
+        if [[ "$ear_download_list" =~ "seo-" ]]; then
+            configure_seo
+        fi
+        if [[ "$ear_download_list" =~ "mobile-studio-" ]]; then
+            configure_mobile_studio
+        fi
+    fi
 }

From 5ea5690fc1c395eaffa4824d7399bbeab3838a02 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Wed, 29 Jun 2016 10:00:07 +0200
Subject: [PATCH 2433/2585] Fixed build syntax error in special-plugins

---
 usr/share/escenic/ece-scripts/ece-install.d/special-plugins.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/special-plugins.sh b/usr/share/escenic/ece-scripts/ece-install.d/special-plugins.sh
index 88408bb0..12ee9a07 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/special-plugins.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/special-plugins.sh
@@ -7,7 +7,7 @@ function configure_seo(){
         local solr_presentation_url=http://${search_host}:${solr_port}/solr/presentation
         if [ ${fai_search_legacy-0} -eq 1 ]; then
             solr_presentation_url=http://${search_host}:${search_port}/solr/presentation
-        then
+        fi
             xmlstarlet ed -P -L \
                 -s /Context -t elem -n TMP -v '' \
                 -i //TMP -t attr -n name -v escenic/presentation-solr-base-uri \

From dce08143f78fc719d3f53cd4b0c4a9d4a4647030 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Thu, 30 Jun 2016 15:39:24 +0200
Subject: [PATCH 2434/2585] Fixed the legacy solr url in SolrSearchEngine
 nursery properties

---
 .../ece-scripts/ece-install.d/content-engine.sh | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index b355f1b3..cbc767c2 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -922,22 +922,29 @@ function stop_and_clear_instance_if_requested() {
 
 ## called for presentation & editorial profiles
 function set_up_search_client_nursery_conf() {
+  local solr_base_url=http://${search_host}:${solr_port}/solr
   local dir=$common_nursery_dir/com/escenic/framework/search/solr
   make_dir $dir
-  echo "solrServerURI=http://${search_host}:${solr_port}/solr" \
+
+  if [ ${fai_search_legacy-0} -eq 1 ]; then
+      solr_base_url=http://${search_host}:${search_port}/solr
+  fi
+  echo "solrServerURI=${solr_base_url}" \
     >>  $dir/SolrSearchEngine.properties
 
   dir=$common_nursery_dir/com/escenic/webservice/search
   make_dir $dir
   local solr_search_url=
-
+  #We need to get rid of this legacy search checking every time.
+  #TODO: Rename the legacy solr editorial core from collection1 to editorial so that it syncs
+  # together with the new Solr 6 implementation.
   if [ ${fai_search_legacy-0} -eq 1 ]; then
-    solr_search_url=http://${search_host}:${search_port}/solr/select
+    solr_search_url=${solr_base_url}/select
   else
     if [ $install_profile_number -eq $PROFILE_EDITORIAL_SERVER ]; then
-      solr_search_url=http://${search_host}:${solr_port}/solr/editorial/select
+      solr_search_url=http://${solr_base_url}/editorial/select
     else
-      solr_search_url=http://${search_host}:${solr_port}/solr/presentation/select
+      solr_search_url=http://${solr_base_url}/presentation/select
     fi
   fi
 

From 6abfc921c4980bd8118de34aaaba2c0e6ecec9b0 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Thu, 30 Jun 2016 17:00:32 +0200
Subject: [PATCH 2435/2585] Get rid of double http:// scheme from solr url

---
 .../ece-scripts/ece-install.d/content-engine.sh       | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index cbc767c2..533619fc 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -935,16 +935,17 @@ function set_up_search_client_nursery_conf() {
   dir=$common_nursery_dir/com/escenic/webservice/search
   make_dir $dir
   local solr_search_url=
-  #We need to get rid of this legacy search checking every time.
-  #TODO: Rename the legacy solr editorial core from collection1 to editorial so that it syncs
-  # together with the new Solr 6 implementation.
+  # We need to get rid of this legacy search checking every
+  # time. TODO: Rename the legacy solr editorial core from collection1
+  # to editorial so that it syncs together with the new Solr 6
+  # implementation.
   if [ ${fai_search_legacy-0} -eq 1 ]; then
     solr_search_url=${solr_base_url}/select
   else
     if [ $install_profile_number -eq $PROFILE_EDITORIAL_SERVER ]; then
-      solr_search_url=http://${solr_base_url}/editorial/select
+      solr_search_url=${solr_base_url}/editorial/select
     else
-      solr_search_url=http://${solr_base_url}/presentation/select
+      solr_search_url=${solr_base_url}/presentation/select
     fi
   fi
 

From 2cc9e68ecd96ca105b705f0b8c29fc97a77ea104 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Mon, 18 Jul 2016 11:22:58 +0200
Subject: [PATCH 2436/2585] Added widget-framework as a new plugin in
 build-scripts

---
 usr/share/escenic/build-scripts/ece-build | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 3bf3b593..3ada1100 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -67,6 +67,7 @@ newsgate
 vcpeditor
 online-graphics
 widget-framework-core
+widget-framework
 widget-framework-common
 widget-framework-mobile
 widget-framework-community
@@ -111,6 +112,7 @@ declare -A maven_snapshot_coordinates=(
 ["xml-editor"]="com.escenic.plugins.xml-editor:xml-editor:zip"
 ["vcpeditor"]="com.escenic.plugins.vcpeditor:vcpeditor:zip"
 ["widget-framework-core"]="com.escenic.widget-framework:framework-dist:zip"
+["widget-framework"]="com.escenic.widget-framework:widget-framework:zip"
 ["widget-framework-community"]="com.escenic.widget-framework:framework-community-dist:zip"
 ["widget-framework-mobile"]="com.escenic.widget-framework:framework-mobile-dist:zip"
 ["seo"]="com.escenic.plugins.seo:seo:zip"
@@ -155,6 +157,7 @@ com.escenic.plugins.xml-editor:xml-editor:zip"
 ["vcpeditor"]="com.escenic.plugins.vcpeditor:vcpeditor-dist:zip
 com.escenic.plugins.vcpeditor:vcpeditor:zip"
 ["widget-framework-core"]="com.escenic.widget-framework:framework-dist:zip"
+["widget-framework"]="com.escenic.widget-framework:widget-framework:zip"
 ["widget-framework-community"]="com.escenic.widget-framework:framework-community-dist:zip"
 ["widget-framework-mobile"]="com.escenic.widget-framework:framework-mobile-dist:zip"
 ["seo"]="com.escenic.plugins.seo:seo:zip"

From f4d2f4c7f0020afbf7a8210cb5d150e56abdcfdb Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Wed, 27 Jul 2016 13:30:44 +0200
Subject: [PATCH 2437/2585] VOSA-195: Added publicationType while create a
 publication in escenic. It could be default or a configuration. We can use
 fai_publication_type in configuration file to create a certain type of
 publication. By default it is content

---
 .../ece-install.d/create-publication.sh          | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
index 2a440afb..52e94e6f 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
@@ -56,7 +56,7 @@ function create_publication() {
         # the entries in the fai_publication_domain_mapping_list are on
         # the form: <publication[,pub.war]>#<domain>[#<alias1>[,<alias2>]]
         IFS='#' read publication domain aliases <<< "$el"
-        IFS=',' read publication_name publication_war <<< "$publication"
+        IFS=',' read publication_name publication_war publication_type <<< "$publication"
         IFS=$old_ifs
 
         # this is the default case were the WAR is called the same as
@@ -65,7 +65,7 @@ function create_publication() {
           publication_war=${publication_name}.war
         fi
 
-        create_the_publication $publication_name $the_tmp_dir/$publication_war
+        create_the_publication $publication_name $the_tmp_dir/$publication_war $publication_type
       done
 
       log "Cleaing up $the_tmp_dir ..."
@@ -73,6 +73,7 @@ function create_publication() {
     else
       ensure_that_instance_is_running ${fai_publication_use_instance-$default_ece_intance_name}
       local publication_name=${fai_publication_name-mypub}
+      local publication_type=${fai_publication_type-default}
 
       if [ -z "${fai_publication_war}" ]; then
         # if the user hasn't set the fai_publication_war, see if the
@@ -90,7 +91,7 @@ function create_publication() {
         publication_war=$fai_publication_war
       fi
 
-      create_the_publication $publication_name $publication_war
+      create_the_publication $publication_name $publication_war $publication_type
     fi
   fi
 }
@@ -100,13 +101,14 @@ function create_publication() {
 function create_the_publication() {
   local publication_name=$1
   local publication_war=$2
+  local publication_type=$3
 
-  print_and_log "Creating a publication with name" $publication_name \
+  print_and_log "Creating a publication with name" $publication_name of $publication_type type \
     "using the publication resources from" $(basename $publication_war)
 
   create_publication_prepare_war_file $publication_war
   local the_instance=${fai_publication_use_instance-$default_ece_intance_name}
-  create_publication_in_db $publication_name $publication_war $the_instance
+  create_publication_in_db $publication_name $publication_war $publication_type $the_instance
   add_publication_to_deployment_lists $(basename $publication_war .war)
 
   add_next_step "A publication with name" $publication_name \
@@ -169,7 +171,8 @@ function ensure_that_instance_is_running() {
 function create_publication_in_db() {
   local publication_name=$1
   local publication_war=$2
-  local instance_name=$3
+  local publication_type=$3
+  local instance_name=$4
 
   print_and_log "Creating publication" ${publication_name} \
     "using instance" $instance_name "..."
@@ -198,6 +201,7 @@ function create_publication_in_db() {
   run curl ${curl_opts}  \
     -F "name=${publication_name}" \
     -F "publisherName=Escenic" \
+    -F "publicationType=${publication_type}"
     -F "adminPassword=admin" \
     -F "adminPasswordConfirm=admin" \
     --cookie JSESSIONID="$cookie" \

From c12f5105bacecd5e864c5a8eb6885edcb28dd127 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Thu, 28 Jul 2016 12:23:30 +0200
Subject: [PATCH 2438/2585] Added missing \ to the curl command to create the
 publication

---
 .../escenic/ece-scripts/ece-install.d/create-publication.sh     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
index 52e94e6f..b0154261 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
@@ -201,7 +201,7 @@ function create_publication_in_db() {
   run curl ${curl_opts}  \
     -F "name=${publication_name}" \
     -F "publisherName=Escenic" \
-    -F "publicationType=${publication_type}"
+    -F "publicationType=${publication_type}" \
     -F "adminPassword=admin" \
     -F "adminPasswordConfirm=admin" \
     --cookie JSESSIONID="$cookie" \

From a4adb3d49ee2e9723234dec1efa764d4defb83c8 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Tue, 2 Aug 2016 18:46:02 +0200
Subject: [PATCH 2439/2585] VOSA-233: Made ece-build script compatible with
 develop-SNAPSHOT

---
 usr/share/escenic/build-scripts/ece-build | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 3ada1100..76d4ad9b 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -850,7 +850,7 @@ function fetch_distributions
     if [[ ! $dist_version = "" ]]; then
 
       # remove old trunk-SNAPSHOT if present
-      if [[ $dist_version = "trunk-SNAPSHOT" ]]; then
+      if [ "$dist_version" == "trunk-SNAPSHOT" ] || [ "$dist_version" = "develop-SNAPSHOT" ]; then
         if [ -d $dists_root_dir/$f-$dist_version ]; then
           rm -rf $dists_root_dir/$f-$dist_version
         fi
@@ -864,7 +864,7 @@ function fetch_distributions
         local artifact_version=$dist_version
         local target_path=$dists_root_dir
        
-        if [[ $dist_version = "trunk-SNAPSHOT" ]]; then
+         if [ "$dist_version" == "trunk-SNAPSHOT" ] || [ "$dist_version" = "develop-SNAPSHOT" ]; then
           for h in ${maven_snapshot_coordinates["$f"]};
           do
             local dist_path=`mvn_coordinate_to_rest_call ${h}:$dist_version`
@@ -992,7 +992,7 @@ function print_unstable_distributions
 {
   for f in ${!project_distributions[@]}; do
     local coordinate=
-    if [[ ${project_distributions["$f"]} = "trunk-SNAPSHOT" ]]; then
+    if [ "${project_distributions["$f"]}" == "trunk-SNAPSHOT" ] || [ "${project_distributions["$f"]}" == "develop-SNAPSHOT" ]; then
       for g in ${maven_snapshot_coordinates["$f"]}
       do
         local dist_path=`mvn_coordinate_to_rest_call ${g}:${project_distributions["$f"]}`

From a64c90a88c1cf5f241b3a3042f4c71738cc7653e Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Thu, 4 Aug 2016 15:17:34 +0200
Subject: [PATCH 2440/2585] Added support for engine new maven coordinate along
 with the old one

---
 usr/share/escenic/build-scripts/ece-build | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 76d4ad9b..43ae2fdb 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -89,7 +89,8 @@ project_maven_coordinates=""
 
 declare -A maven_snapshot_coordinates=(
 ["assemblytool"]="com.escenic.tools:assemblytool:jar"
-["engine"]="com.escenic:engine-dist:zip:bin"
+["engine"]="com.escenic:engine-dist:zip:bin
+com.escenic.engine:zip"
 ["analysis-engine"]="com.escenic.plugins.analysis-engine:analysis-engine:zip"
 ["changelog"]="com.escenic.changelog:changelog:zip"
 ["dashboard"]="com.escenic.plugins.dashboard:dashboard:zip"
@@ -124,7 +125,8 @@ declare -A maven_snapshot_coordinates=(
 
 declare -A maven_coordinates=(
 ["assemblytool"]="com.escenic.tools:assemblytool:jar"
-["engine"]="com.escenic:engine-dist:zip:bin"
+["engine"]="com.escenic:engine-dist:zip:bin
+com.escenic.engine:zip"
 ["analysis-engine"]="com.escenic.plugins.analysis:analysis-engine:zip
 com.escenic.plugins.analysis-engine:analysis-engine:zip"
 ["changelog"]="com.escenic.changelog:changelog:zip"

From 711ca786241333a0a11d2057714994d28b6fe544 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Mon, 8 Aug 2016 16:09:34 +0200
Subject: [PATCH 2441/2585] Fixed the search url for saas installation.

---
 .../ece-install.d/content-engine.sh           | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 533619fc..a85e232d 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -923,24 +923,29 @@ function stop_and_clear_instance_if_requested() {
 ## called for presentation & editorial profiles
 function set_up_search_client_nursery_conf() {
   local solr_base_url=http://${search_host}:${solr_port}/solr
-  local dir=$common_nursery_dir/com/escenic/framework/search/solr
+  # Need to fix this hardcoded editoral search url, when we haved 
+  # machine installation profile
+  local solr_search_url=${solr_base_url}/editorial/select
+  local  dir=$common_nursery_dir/com/escenic/webservice/search
   make_dir $dir
 
   if [ ${fai_search_legacy-0} -eq 1 ]; then
       solr_base_url=http://${search_host}:${search_port}/solr
+      solr_search_url=${solr_base_url}/select
   fi
-  echo "solrServerURI=${solr_base_url}" \
-    >>  $dir/SolrSearchEngine.properties
 
-  dir=$common_nursery_dir/com/escenic/webservice/search
+  echo "solrURI=${solr_search_url}" \
+    >> $dir/DelegatingSearchEngine.properties
+
+  dir=$common_nursery_dir/com/escenic/framework/search/solr
   make_dir $dir
-  local solr_search_url=
+  
   # We need to get rid of this legacy search checking every
   # time. TODO: Rename the legacy solr editorial core from collection1
   # to editorial so that it syncs together with the new Solr 6
   # implementation.
   if [ ${fai_search_legacy-0} -eq 1 ]; then
-    solr_search_url=${solr_base_url}/select
+    solr_search_url=${solr_base_url}/presentation/select
   else
     if [ $install_profile_number -eq $PROFILE_EDITORIAL_SERVER ]; then
       solr_search_url=${solr_base_url}/editorial/select
@@ -948,9 +953,8 @@ function set_up_search_client_nursery_conf() {
       solr_search_url=${solr_base_url}/presentation/select
     fi
   fi
-
-  echo "solrURI=${solr_search_url}" \
-    >> $dir/DelegatingSearchEngine.properties
+  echo "solrServerURI=${solr_search_url}" \
+    >>  $dir/SolrSearchEngine.properties
 
   dir=$common_nursery_dir/com/escenic/lucy
   make_dir $dir

From cff99cb67ae4fd6f5b3681d1445f78c8965fc815 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Thu, 11 Aug 2016 10:16:41 +0200
Subject: [PATCH 2442/2585] Added an check to see mysql server is running or
 not. If not then we will start the server before first creating the escenic
 db

---
 .../escenic/ece-scripts/ece-install.d/database.sh     | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 49158af4..24ff35e2 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -571,10 +571,21 @@ EOF
   fi
 }
 
+function check_mysql_is_running(){
+if [[ $(netstat -nlp | grep -w mysqld | wc -l) -gt 0 ]]; then
+   return 0
+else
+   return 1
+fi
+}
+
 function create_schema() {
     # we first create the DB (or, if drop_db_first is 1, we've just
     # dropped it above) before running the SQL scripts.
   if [ $db_product = "mysql" ]; then
+     if ! $(check_mysql_is_running) ; then
+ 	run service mysql start	
+     fi
     print_and_log "Creating DB $db_schema on $HOSTNAME ..."
     mysql -h $db_host << EOF
 create database $db_schema character set utf8 collate utf8_general_ci;

From 63516c195ef43be0c4a0652fb099d3aaa64973fc Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Thu, 11 Aug 2016 10:53:33 +0200
Subject: [PATCH 2443/2585] Added check for root user authorized_keys file,
 which is not present for a docker image. So if there is no authorized_keys
 file it will not be added under escenic user

---
 usr/share/escenic/build-scripts/ece-local-builder | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/build-scripts/ece-local-builder b/usr/share/escenic/build-scripts/ece-local-builder
index 08aae0c4..e90151fc 100755
--- a/usr/share/escenic/build-scripts/ece-local-builder
+++ b/usr/share/escenic/build-scripts/ece-local-builder
@@ -738,7 +738,9 @@ function authorize_users
         fi
     done
     #special handling for the root user authorized keys
-    cat /root/.ssh/authorized_keys >> $home_dir/$builder_system_user/.ssh/authorized_keys
+    if [ -e /root/.ssh/authorized_keys ]; then
+      cat /root/.ssh/authorized_keys >> $home_dir/$builder_system_user/.ssh/authorized_keys
+    fi
     run chown -R $builder_system_user:$builder_system_user $home_dir/$builder_system_user/.ssh/
 }
 

From 8184e513ea39fee163281171c88057c6764fbefc Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Wed, 17 Aug 2016 23:23:56 +0200
Subject: [PATCH 2444/2585] Fixed engine new maven coordinates

---
 usr/share/escenic/build-scripts/ece-build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index 43ae2fdb..d8f82db2 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -90,7 +90,7 @@ project_maven_coordinates=""
 declare -A maven_snapshot_coordinates=(
 ["assemblytool"]="com.escenic.tools:assemblytool:jar"
 ["engine"]="com.escenic:engine-dist:zip:bin
-com.escenic.engine:zip"
+com.escenic:engine:zip"
 ["analysis-engine"]="com.escenic.plugins.analysis-engine:analysis-engine:zip"
 ["changelog"]="com.escenic.changelog:changelog:zip"
 ["dashboard"]="com.escenic.plugins.dashboard:dashboard:zip"
@@ -126,7 +126,7 @@ com.escenic.engine:zip"
 declare -A maven_coordinates=(
 ["assemblytool"]="com.escenic.tools:assemblytool:jar"
 ["engine"]="com.escenic:engine-dist:zip:bin
-com.escenic.engine:zip"
+com.escenic:engine:zip"
 ["analysis-engine"]="com.escenic.plugins.analysis:analysis-engine:zip
 com.escenic.plugins.analysis-engine:analysis-engine:zip"
 ["changelog"]="com.escenic.changelog:changelog:zip"

From aebac12956f76664a4d820d2f9aaeddcc888f211 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Tue, 30 Aug 2016 10:39:49 +0200
Subject: [PATCH 2445/2585] Fixed the default broken download link for solr6

---
 usr/share/escenic/ece-scripts/ece-install.d/search-server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
index f09a5669..1ad8bc49 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
@@ -1,6 +1,6 @@
 # ece-install module for installing the search server
 
-solr_download_url=http://apache.uib.no/lucene/solr/6.1.0/solr-6.1.0.zip
+solr_download_url=https://archive.apache.org/dist/lucene/solr/6.1.0/solr-6.1.0.zip
 
 ## Since solr itself talks about SOLR_HOME as where it has its data
 ## files (solr_data_dir might have been a more suitable name), we

From ed8353f419473b91bb7abf4b035dc83cd692a525 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Sat, 10 Sep 2016 23:38:48 +0200
Subject: [PATCH 2446/2585] Changed script to consider port in git url to get
 the exact host name of git server for ssh config

---
 usr/share/escenic/build-scripts/ece-local-builder | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/usr/share/escenic/build-scripts/ece-local-builder b/usr/share/escenic/build-scripts/ece-local-builder
index e90151fc..12fc83cc 100755
--- a/usr/share/escenic/build-scripts/ece-local-builder
+++ b/usr/share/escenic/build-scripts/ece-local-builder
@@ -692,6 +692,12 @@ EOF
 function disable_host_key_checking
 {
     local git_host=$(echo "$git_base" | cut -d '/' -f1)
+    if [[ ! $(echo $git_host | grep ":" | wc -l ) -eq 0 ]]; then
+       old_ifs=$IFS
+       IFS=':' read host port <<< "$git_host"
+       IFS=$old_ifs
+       git_host=$host
+    fi
     tee > /home/$1/.ssh/config << EOF
 Host $git_host
     StrictHostKeyChecking no

From 76758aa526b88b7e3cab977a6774d3dda2e0837e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Tue, 1 Nov 2016 09:42:39 +0100
Subject: [PATCH 2447/2585] ece deploy --file now caches EAR file like it does
 with --uri

When running 'ece deploy --file <file>', a symlink to the file was
created. However, this defies the point of the cache directory
somewhat, since the cache dir is for providing data that the ece
command can re-use on later runs.

When the file in /var/cache/escenic is only a symlink, there's no
guarantee that this file can be re-used. Moreover, since this file
often resides in /tmp, it will be deleted once the machine is
restarted.

This change copies the EAR file to the cache directory, making its
behaviour consistent with what happens when ece deploy is used with an
EAR residing on a remote machine.
---
 usr/share/escenic/ece-scripts/ece.d/deploy.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/deploy.sh b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
index df3ae1c6..f170df0e 100644
--- a/usr/share/escenic/ece-scripts/ece.d/deploy.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
@@ -73,8 +73,8 @@ function deploy() {
       print_and_log "If found a healthy $ear locally so I will not fetch it again."
     elif [ -f "$file" ]; then
       print_and_log " Found a local ear file $file"
-      log "Creating a symlink of the file $file to $cache_dir"
-      run ln -s $file $ear
+      log "Copying it to to $cache_dir"
+      run cp "${file}" "${cache_dir}"
     else
       # wget_auth is needed for download_uri_target_to_dir
       wget_auth=$wget_builder_auth

From 6df6f0917b140413021d959bb7d7c953f019dc6f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 4 Nov 2016 09:51:25 +0100
Subject: [PATCH 2448/2585] Tell the JVM to use explicit encoding everywhere
 (UTF-8)

- in stead of falling back to the system default, leading to
  unpredictable results.

- UTF-8 chosen as the default as it's a Unicode encoding that works
  well for everything. Can be overriden in ece-<instance>.conf

- this value is applied to these JVM parameters:

      sun.jnu.encoding
      file.encoding
---
 etc/escenic/ece.conf | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/etc/escenic/ece.conf b/etc/escenic/ece.conf
index 46f874b7..5aca995c 100644
--- a/etc/escenic/ece.conf
+++ b/etc/escenic/ece.conf
@@ -202,6 +202,12 @@ jvm_connection_settings="
   -Dsun.net.client.defaultReadTimeout=5000
 "
 
+######################################################################
+# Tell the JVM to use this encoding everywhere (in stead of falling
+# back to the system default).
+######################################################################
+jvm_encoding=UTF-8
+
 ######################################################################
 # Java will use IPv6 if it's available on the OS. This however, can
 # cause problems with applications that insists on using IPv4

From 6de526095ad053ecbb706e251ca83179f87f8232 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Wed, 16 Nov 2016 23:49:43 +0100
Subject: [PATCH 2449/2585] VOSA-238: Changed the way we have checked supported
 Debian distribution for database providers.   - Before we used  html scraping
 to find the code name of the distribution which actually causing problem as
 Percona now uses gzip encoding to server their repo.   - Mariadb repo is as
 before which is with any encoding. So some special handle needed to be done
 for Percona.   - Now the it will check http status code by hitting the actual
 distribution repo url. If it gives 200, the return code will be 0 else 1.

---
 .../ece-scripts/ece-install.d/database.sh     | 48 +++++++++----------
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 24ff35e2..594b1fe5 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -11,21 +11,14 @@ fi
 percona_ubuntu_gpg_key=1C4CBDCDCD2EFD2A
 mariadb_ubuntu_gpg_key=CBCB082A1BB943DB
 
-function get_ubuntu_supported_list() {
-  local url=$1
-  curl -s $url | \
-      html2 | \
-      sed -n '/\/a\/@href=[A-Za-z0-9]*\/$/s/.*=//p' | \
-      sed -n '/\/$/s/\/$//p'
-}
 
-function get_percona_supported_list() {
-  get_ubuntu_supported_list "http://repo.percona.com/apt/dists/"
+function get_percona_repo_url() {
+  echo  "http://repo.percona.com/apt/dists/"
 }
 
-function get_mariadb_supported_list() {
+function get_mariadb_repo_url() {
   local distributor=$(lsb_release -i -s | tr '[A-Z]' '[a-z]')
-  get_ubuntu_supported_list "http://ftp.heanet.ie/mirrors/mariadb/repo/5.5/$distributor/dists/"
+  echo "http://ftp.heanet.ie/mirrors/mariadb/repo/5.5/$distributor/dists/"
 }
 
 function set_up_mariadb_yum_repo() {
@@ -71,22 +64,25 @@ function set_up_redhat_repository_if_possible() {
 }
 
 function is_supported() {
-  local code_name=$1
-  local supported_code_name=1
-  local supported_list=""
-
-  if [ $db_vendor = "mariadb" ]; then
-    supported_list=$(get_mariadb_supported_list)
-  else
-    supported_list=$(get_percona_supported_list)
-  fi
-
-  for el in $supported_list; do
-    if [[ $code_name == $el ]]; then
-      supported_code_name=0
+    local code_name=$1
+    local supported_code_name=1
+    local repo_url=""
+    if [[ $db_vendor == "mariadb" ]]; then
+        repo_url=$(get_mariadb_repo_url)
+    else
+        repo_url=$(get_percona_repo_url)
     fi
-  done
-  return $supported_code_name
+    if [ "$(get_http_response_code "$repo_url$code_name/")" == "200" ]; then
+        supported_code_name=0
+    fi
+    return $supported_code_name
+}
+
+function get_http_response_code(){
+    local url=$1
+    curl -I -s $url | \
+        grep HTTP | \
+        cut -d ' ' -f2
 }
 
 function add_gpg_key() {

From fe885be482ab7974014937ca40310af708e74135 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Mon, 21 Nov 2016 15:38:29 +0100
Subject: [PATCH 2450/2585] VOSA-238: Made the curl repo call to redirect if
 needed. - Made the variables {} quoted for readability. - Fixed syntax error

---
 .../escenic/ece-scripts/ece-install.d/database.sh | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 594b1fe5..5b79ffde 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -18,7 +18,7 @@ function get_percona_repo_url() {
 
 function get_mariadb_repo_url() {
   local distributor=$(lsb_release -i -s | tr '[A-Z]' '[a-z]')
-  echo "http://ftp.heanet.ie/mirrors/mariadb/repo/5.5/$distributor/dists/"
+  echo "http://ftp.heanet.ie/mirrors/mariadb/repo/5.5/${distributor}/dists/"
 }
 
 function set_up_mariadb_yum_repo() {
@@ -32,7 +32,7 @@ function set_up_mariadb_yum_repo() {
       arch=x86
     fi
     if [ $distributor = "redhatenterpriseserver" ]; then
-      $distributor=rhel
+      distributor=rhel
     fi
     local yum_url=http://yum.mariadb.org/5.5/${distributor}${release}-${arch}
     cat > $maria_db_repo <<EOF
@@ -72,17 +72,20 @@ function is_supported() {
     else
         repo_url=$(get_percona_repo_url)
     fi
-    if [ "$(get_http_response_code "$repo_url$code_name/")" == "200" ]; then
+    if [ "$(get_http_response_code "${repo_url}${code_name}/")" == "200" ]; then
         supported_code_name=0
     fi
     return $supported_code_name
 }
 
-function get_http_response_code(){
+# This function will curl the repo url and follow if there is any redirect
+# Then take the last occurance of HTTP and find the status code 
+function get_http_response_code() {
     local url=$1
-    curl -I -s $url | \
+    curl -I -L -s ${url} | \
         grep HTTP | \
-        cut -d ' ' -f2
+        tail -1 | \
+        cut -d ' ' -f2        
 }
 
 function add_gpg_key() {

From a6e814d5e2fa79ae0d52c29d5815b0f7066e7092 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Wed, 2 Nov 2016 16:54:11 +0100
Subject: [PATCH 2451/2585] VOSA-237 New command: ece repackage

This command replaces the JARs inside the original EAR file with
corresponding JARs installed on the systme through APT/RPM.

This will repackage the previously deployed EAR (if it exists) and
deploy it:

  $ ece -i engine1 stop repackage deploy start

Will repackage the other.ear and then deploy it:

  $ ece -i engine1 stop repackage deploy start --file /tmp/other.ear

Will download other.ear, repackage it and then deploy it:

  $ ece -i engine1 stop repackage deploy start --uri http://example.com/other.ear

- Added TAB-completion of repackage

- re-used common-bashing:extract_archive()
---
 etc/bash_completion.d/ece                     |   3 +-
 usr/bin/ece                                   |   3 +
 .../escenic/ece-scripts/ece.d/repackage.sh    | 251 ++++++++++++++++++
 3 files changed, 256 insertions(+), 1 deletion(-)
 create mode 100644 usr/share/escenic/ece-scripts/ece.d/repackage.sh

diff --git a/etc/bash_completion.d/ece b/etc/bash_completion.d/ece
index 6e5d8bf8..e3c4b6ec 100644
--- a/etc/bash_completion.d/ece
+++ b/etc/bash_completion.d/ece
@@ -24,6 +24,7 @@ _ece_commands()
       outlog
       package
       remove-old-log-files
+      repackage
       restart start
       status
       stop
@@ -55,7 +56,7 @@ _ece_commands()
             "
             completions="$exclude_list $commands"
             ;;
-        deploy)
+        deploy|repackage)
             completions="--file --uri $commands"
             ;;
         -t|--type)
diff --git a/usr/bin/ece b/usr/bin/ece
index 74e148fd..5db1304b 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -832,6 +832,9 @@ for el in $command; do
         deploy)
             deploy
             ;;
+        repackage)
+            repackage "${file}"
+            ;;
         assemble)
             assemble
             ;;
diff --git a/usr/share/escenic/ece-scripts/ece.d/repackage.sh b/usr/share/escenic/ece-scripts/ece.d/repackage.sh
new file mode 100644
index 00000000..50183de9
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece.d/repackage.sh
@@ -0,0 +1,251 @@
+## Module for the 'ece repackage' command.
+##
+## Repackages an EAR, which  probably will be deployed with 'ece deploy --file <ear>'.
+##
+## This command replaces the JARs inside the original EAR file with
+## the corresponding JARs installed on the systme through APT/RPM.
+##
+## by torstein@escenic.com
+
+USR_SHARE_DIR=/usr/share/escenic
+
+get_installed_packages_war_list() {
+  find "${USR_SHARE_DIR}/escenic-"* -maxdepth 1 -name "webapps" -type d | \
+    while read -r webapps_dir; do
+      find "${webapps_dir}" -name "*.war" -type f |
+        grep -w -v webservice-extensions.war
+    done
+}
+
+## $1 :: tmp dir with EAR contents
+overwrite_webapps_that_are_included_in_installed_packages() {
+  local tmp_dir=$1
+  for d in $(get_installed_packages_war_list); do
+    for package_war in $(find "${d}" -type f -name "*.war"); do
+      for ear_war in "${tmp_dir}/"*.war; do
+        if [[ $(basename "${ear_war}") == $(basename "${package_war}") ]]; then
+          log "Replacing WAR in EAR, $(basename "${ear_war}"), with ${package_war}"
+          run cp "${package_war}" "${ear_war}"
+        fi
+      done
+    done
+  done
+}
+
+## Normalises the file name so that we can compare two JARs of
+## different versions.
+##
+## $1 :: file name
+## $2 :: suffix
+get_file_base() {
+  basename "$1" "$2" |
+    sed -r \
+        -e 's#[-][0-9.-]+##' \
+        -e 's#[-][a-z]+-SNAPSHOT##' \
+        -e 's#[-][0-9]+.[0-9]+-SNAPSHOT##' \
+        -e 's#[.]$##'
+}
+
+## $1 :: tmp dir with EAR contents
+overwrite_libs_included_in_installed_packages() {
+  local tmp_dir=$1
+  find "${USR_SHARE_DIR}/escenic-"* -maxdepth 1 -name "lib" -type d | \
+    while read -r d; do
+      for package_jar in "${d}"/*.jar; do
+        package_jar_base=$(get_file_base "${package_jar}" jar)
+
+        for ear_jar in "${tmp_dir}/lib/"*.jar; do
+          ear_jar_base=$(get_file_base "${ear_jar}" jar)
+          if [[ "${ear_jar_base}" == "${package_jar_base}" ]]; then
+            debug "Replacing JAR in EAR, $(basename "${ear_jar}"), with ${package_jar}"
+            run rm "${ear_jar}"
+            run cp "${package_jar}" "$(dirname "${ear_jar}")"
+          fi
+        done
+      done
+    done
+}
+
+## $1 :: tmp dir with WAR contents
+overwrite_publication_webapp_libs_included_in_installed_packages() {
+  local tmp_dir=$1
+
+  for pub_war_jar in "${tmp_dir}/WEB-INF/lib/"*.jar; do
+    pub_war_jar_base=$(get_file_base "${pub_war_jar}" jar)
+    debug "${FUNCNAME[0]}
+      Checking pub_war_jar=$pub_war_jar
+      pub_war_jar_base=$pub_war_jar_base"
+
+    for package_dir in "${USR_SHARE_DIR}/"*; do
+      local template_lib_dir="${package_dir}/template/WEB-INF/lib"
+      if [ ! -d "${template_lib_dir}" ]; then
+        # ECE and its plugins put their publication specific libraries
+        # in different directory structures.
+        template_lib_dir="${package_dir}/publication/webapp/WEB-INF/lib"
+        if [ ! -d "${template_lib_dir}" ]; then
+          continue
+        fi
+      fi
+
+      find "${template_lib_dir}" -name "*.jar" -type f | \
+        while read -r package_jar; do
+          package_jar_base=$(get_file_base "${package_jar}" jar)
+
+          if [[ "${pub_war_jar_base}" == "${package_jar_base}" ]]; then
+            debug " -> Replacing ${pub_war_jar} with ${package_jar}"
+            run rm "${pub_war_jar}"
+            run cp "${package_jar}" "$(dirname "${pub_war_jar}")"
+          fi
+        done
+    done
+  done
+}
+
+## $1 :: the dir where the new EAR will be present
+## $2 :: the dir whose contents will form the contents of the new EAR
+## $3 :: the old EAR name or HASH
+create_new_ear_in_dir() {
+  local result_dir=$1
+  local dir=$2
+  local old_ear=$3
+
+  local new_ear=
+  new_ear="${result_dir}/$(date --iso)-$(date +%s)-repackaged-${old_ear}-created-on-${HOSTNAME}.zip"
+  (
+    run cd "${dir}"
+    run zip --quiet --recurse-paths "${new_ear}" .
+  )
+
+  log "The new EAR is ready!: ${new_ear}
+       You can deploy it with:
+       ece -i ${instance} --file ${new_ear} stop deploy start"
+
+  echo "${new_ear}"
+}
+
+## Overwrite the JAR libraries inside the EAR specific webapps,
+## most/all of which will be publication webapps.
+##
+## $1 :: the dir in which the extracted EAR resides
+overwrite_publication_webapp_libs() {
+  local dir=$1
+  local installed_package_war_list=
+  installed_package_war_list=$(get_installed_packages_war_list)
+
+  for war in ${dir}/*.war; do
+    if [[ $(echo "${installed_package_war_list}" | grep -c "$(basename "${war}")") -gt 0 ]]; then
+      log "Don't need to fix $(basename "${war}") (it's provided by a package)"
+    else
+      local start=
+      local tmp_dir=
+      tmp_dir=$(mktemp -d)
+
+      log "Fixing $(basename "${war}"), extracting it to ${tmp_dir} ..."
+      run unzip -q "${war}" -d "${tmp_dir}"
+
+      start=$(date +%s)
+      overwrite_publication_webapp_libs_included_in_installed_packages "${tmp_dir}"
+      log "Fixing $(basename "${war}") took $(( $(date +%s) - start)) seconds ..."
+
+      # to be sure it's prestine, we delete the old war
+      run rm "${war}"
+      (
+        cd "${tmp_dir}"
+        run zip --recurse-paths --quiet "${war}" .
+      )
+
+      run rm -rf "${tmp_dir}"
+    fi
+  done
+}
+
+## In case no local or URI reference to an EAR is passed, the method
+## will try to find a sane, local EAR file to use for the repackaging.
+##
+## The method reads and writes the variables:
+##   - file_or_uri and
+##   - ear_name_or_hash
+##
+## $1 :: The file or URI to an EAR, as passed to the 'ece' command
+##       with --uri or --file.
+ensure_ear_reference_and_lineage_sanity() {
+  if [ -n "${file_or_uri}" ]; then
+    ear_name_or_hash=$(basename "${file_or_uri}")
+    return
+  fi
+
+  # this is the fallback ear
+  local default_cached_engine_ear=${cache_dir}/engine.ear
+
+  # The deployment log is updated whenever 'ece deploy' is used.
+  local deployment_log=
+  deployment_log=$(get_deployment_log)
+
+  if [ -r "${deployment_log}" ]; then
+    local last_deployed_ear=
+    last_deployed_ear=$(awk '{print $7;}' "${deployment_log}" | tail -1)
+    ear_name_or_hash=$(awk '{print $8;}' "${deployment_log}" | tail -1)
+    file_or_uri=${cache_dir}/${last_deployed_ear}
+  elif [ -r "${default_cached_engine_ear}" ]; then
+    file_or_uri=${default_cached_engine_ear}
+    ear_name_or_hash=$(basename "${default_cached_engine_ear}")
+  else
+    print_and_log "
+      You must either specify an EAR to be repackaged
+      using --file <ear> or --uri <ear>, or the previously
+      deployed EAR must be available in ${cache_dir}."
+    exit 1
+  fi
+}
+
+## $1 :: file_or_uri
+get_local_ear_reference() {
+  local file_or_uri=$1
+
+  if [ -f "${file_or_uri}" ]; then
+    echo "${file_or_uri}"
+  else
+    export wget_auth=${wget_builder_auth}
+
+    local file_name=
+    file_name=$(basename "${file_or_uri}")
+
+    download_uri_target_to_dir "${file_or_uri}" "${cache_dir}" "${file_name}"
+
+    echo "${cache_dir}/${file_name}"
+  fi
+}
+
+## $1 :: EAR file or URI
+repackage() {
+  local ear=
+  local file_or_uri=$1
+
+  ensure_ear_reference_and_lineage_sanity "${file_or_uri}"
+  ear=$(get_local_ear_reference "${file_or_uri}")
+
+  local tmp_dir=
+  tmp_dir=$(mktemp -d)
+
+  print "Repackaging ${ear} with OS package installed JARs and WARs ..."
+  start_time=$(date +%s)
+  extract_archive "${ear}" "${tmp_dir}"
+  overwrite_webapps_that_are_included_in_installed_packages "${tmp_dir}"
+  overwrite_libs_included_in_installed_packages "${tmp_dir}"
+  overwrite_publication_webapp_libs "${tmp_dir}"
+
+  # The ${file} variable is used by deploy.sh::deploy()
+  export file=$(
+    create_new_ear_in_dir \
+      /tmp \
+      "${tmp_dir}" \
+      "${ear_name_or_hash}")
+
+  log "Deleting ${tmp_dir} ..."
+  run rm -rf "${tmp_dir}"
+
+  local took=
+  took=$(($(date +%s) - start_time))
+  print_and_log "Repackaging ${ear} took ${took} seconds,
+                 new EAR created: ${file}"
+}

From 900f49a32496d002eeee7a4bfa3c0edfa5b7e99b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Thu, 3 Nov 2016 16:34:28 +0100
Subject: [PATCH 2452/2585] VOSA-237 Added support for extracting EAR archives

- common-bashing::extract_archive() will now fail if it's asked to
  extract something it doesn't know how to extract
---
 usr/share/escenic/ece-scripts/common-bashing.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index 9bb4b2e0..76ed1f34 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -373,12 +373,15 @@ function extract_archive() {
     else
       run tar xjf $1
     fi
-  elif [[ "$1" == *".zip" ]]; then
+  elif [[ "$1" == *".zip" || "$1" == *".ear" ]]; then
     if [[ -n "$2" && -d "$2" ]]; then
       run unzip -q $1 -d $2
     else
       run unzip -q $1
     fi
+  else
+    print_and_log "Don't know how to extract $1"
+    exit 1
   fi
 }
 

From fc4ec057809822c5ea7976059949c41bf200a389 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Tue, 8 Nov 2016 13:57:42 +0100
Subject: [PATCH 2453/2585] Added merging of webservice.war and
 webservice-extensions.war

- separated removal of product/package WARs and JARs into remove_* and
  copy_* so that EARs that don't have a plugin in them, but that
  plugin is installed on the machine, will still get that new plugin.

  This makes for logical behaviour: when you've got the live center
  plugin installed on the machine, live center should be deployed on
  the ECE instance(s).
---
 .../escenic/ece-scripts/ece.d/repackage.sh    | 131 +++++++++++++++---
 1 file changed, 109 insertions(+), 22 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/repackage.sh b/usr/share/escenic/ece-scripts/ece.d/repackage.sh
index 50183de9..6072804e 100644
--- a/usr/share/escenic/ece-scripts/ece.d/repackage.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/repackage.sh
@@ -12,26 +12,49 @@ USR_SHARE_DIR=/usr/share/escenic
 get_installed_packages_war_list() {
   find "${USR_SHARE_DIR}/escenic-"* -maxdepth 1 -name "webapps" -type d | \
     while read -r webapps_dir; do
-      find "${webapps_dir}" -name "*.war" -type f |
-        grep -w -v webservice-extensions.war
+      find "${webapps_dir}" -name "*.war" -type f
     done
 }
 
+get_installed_packages_lib_list() {
+  find "${USR_SHARE_DIR}/escenic-"* -maxdepth 1 -name "lib" -type d | \
+    while read -r lib_dir; do
+      find "${lib_dir}" -name "*.jar" -type f
+    done
+}
+
+get_installed_packages_webservice_extensions_list() {
+  find "${USR_SHARE_DIR}/escenic-"* -maxdepth 1 \
+       -name "webservice-extensions" -type d
+}
+
+get_installed_packages_webservice_list() {
+  find "${USR_SHARE_DIR}/escenic-"* -maxdepth 1 \
+       -name "webservice" -type d
+}
+
 ## $1 :: tmp dir with EAR contents
-overwrite_webapps_that_are_included_in_installed_packages() {
+remove_webapps_that_are_included_in_installed_packages() {
   local tmp_dir=$1
   for d in $(get_installed_packages_war_list); do
     for package_war in $(find "${d}" -type f -name "*.war"); do
       for ear_war in "${tmp_dir}/"*.war; do
         if [[ $(basename "${ear_war}") == $(basename "${package_war}") ]]; then
-          log "Replacing WAR in EAR, $(basename "${ear_war}"), with ${package_war}"
-          run cp "${package_war}" "${ear_war}"
+          run rm "${ear_war}"
         fi
       done
     done
   done
 }
 
+## $1 :: tmp dir with EAR contents
+copy_webapps_that_are_included_in_installed_packages() {
+  local tmp_dir=$1
+  for war in $(get_installed_packages_war_list); do
+    run cp "${war}" "${tmp_dir}"
+  done
+}
+
 ## Normalises the file name so that we can compare two JARs of
 ## different versions.
 ##
@@ -47,23 +70,31 @@ get_file_base() {
 }
 
 ## $1 :: tmp dir with EAR contents
-overwrite_libs_included_in_installed_packages() {
+remove_libs_included_in_installed_packages() {
   local tmp_dir=$1
-  find "${USR_SHARE_DIR}/escenic-"* -maxdepth 1 -name "lib" -type d | \
-    while read -r d; do
-      for package_jar in "${d}"/*.jar; do
-        package_jar_base=$(get_file_base "${package_jar}" jar)
-
-        for ear_jar in "${tmp_dir}/lib/"*.jar; do
-          ear_jar_base=$(get_file_base "${ear_jar}" jar)
-          if [[ "${ear_jar_base}" == "${package_jar_base}" ]]; then
-            debug "Replacing JAR in EAR, $(basename "${ear_jar}"), with ${package_jar}"
-            run rm "${ear_jar}"
-            run cp "${package_jar}" "$(dirname "${ear_jar}")"
-          fi
-        done
-      done
+  for package_jar in $(get_installed_packages_lib_list); do
+    package_jar_base=$(get_file_base "${package_jar}" jar)
+
+    for ear_jar in "${tmp_dir}/lib/"*.jar; do
+      ear_jar_base=$(get_file_base "${ear_jar}" jar)
+      if [[ "${ear_jar_base}" == "${package_jar_base}" ]]; then
+        debug "Removing JAR in EAR, $(basename "${ear_jar}"),
+               will be replaced with ${package_jar}"
+        run rm "${ear_jar}"
+      fi
     done
+  done
+}
+
+## $1 :: tmp dir with EAR contents
+copy_libs_included_in_installed_packages() {
+  local tmp_dir=$1
+  make_dir "${tmp_dir}/lib"
+
+  for package_jar in $(get_installed_packages_lib_list); do
+    debug "Including JAR ${package_jar} in EAR ..."
+    run cp "${package_jar}" "${tmp_dir}/lib"
+  done
 }
 
 ## $1 :: tmp dir with WAR contents
@@ -216,6 +247,55 @@ get_local_ear_reference() {
   fi
 }
 
+## $1 : WAR to update
+## $2 : directories whose contents should be merged with that of the
+##      WAR
+merge_all_dirs_to_war() {
+  local war=$1
+  local dir_list=${*:2}
+  log "Merging all $(basename "${war}")s ..."
+
+  if [ ! -e "${war}" ]; then
+    print_and_log "${war} doesn't exist!"
+    exit 1
+  fi
+
+  for dir in ${dir_list}; do
+    if [ ! -d "${dir}/webapp" ]; then
+      continue
+    fi
+    (
+      cd "${dir}/webapp"
+      zip -q -r -u "${war}" . || {
+        # see 'man zip' for more details
+        if [ $? -eq 12 ]; then
+          log "${war} already contained the contents of ${dir}/webapp"
+        else
+          remove_pid_and_exit_in_error
+        fi
+      }
+    )
+  done
+}
+
+## $1 :: tmp dir with EAR contents
+merge_all_webservice_extension_webapps() {
+  local tmp_dir=$1
+  local war=${tmp_dir}/webservice-extensions.war
+  merge_all_dirs_to_war \
+    "${war}" \
+    "$(get_installed_packages_webservice_extensions_list)"
+}
+
+## $1 :: tmp dir with EAR contents
+merge_all_webservice_webapps() {
+  local tmp_dir=$1
+  local war=${tmp_dir}/webservice.war
+  merge_all_dirs_to_war \
+    "${war}" \
+    "$(get_installed_packages_webservice_list)"
+}
+
 ## $1 :: EAR file or URI
 repackage() {
   local ear=
@@ -230,9 +310,16 @@ repackage() {
   print "Repackaging ${ear} with OS package installed JARs and WARs ..."
   start_time=$(date +%s)
   extract_archive "${ear}" "${tmp_dir}"
-  overwrite_webapps_that_are_included_in_installed_packages "${tmp_dir}"
-  overwrite_libs_included_in_installed_packages "${tmp_dir}"
+
+  remove_webapps_that_are_included_in_installed_packages "${tmp_dir}"
+  copy_webapps_that_are_included_in_installed_packages "${tmp_dir}"
+
+  remove_libs_included_in_installed_packages "${tmp_dir}"
+  copy_libs_included_in_installed_packages "${tmp_dir}"
+
   overwrite_publication_webapp_libs "${tmp_dir}"
+  merge_all_webservice_extension_webapps "${tmp_dir}"
+  merge_all_webservice_webapps "${tmp_dir}"
 
   # The ${file} variable is used by deploy.sh::deploy()
   export file=$(

From 8c0fd3b5c31c157e465e784cab26ad70b348954a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 18 Nov 2016 14:57:30 +0100
Subject: [PATCH 2454/2585] Fail fast if there are no installed OS packages

---
 usr/share/escenic/ece-scripts/ece.d/repackage.sh | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece.d/repackage.sh b/usr/share/escenic/ece-scripts/ece.d/repackage.sh
index 6072804e..fd72c9e6 100644
--- a/usr/share/escenic/ece-scripts/ece.d/repackage.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/repackage.sh
@@ -296,11 +296,24 @@ merge_all_webservice_webapps() {
     "$(get_installed_packages_webservice_list)"
 }
 
+exit_if_no_os_packages_are_installed() {
+  local packages_installed=
+  packages_installed=$(
+    find "${USR_SHARE_DIR}" -maxdepth 1 -name "escenic-*"  -type d | wc -l)
+
+  if [ "${packages_installed}" -eq 0 ]; then
+    print_and_log "No escenic packages installed on ${HOSTNAME} ☹"
+    remove_pid_and_exit_in_error
+  fi
+}
+
 ## $1 :: EAR file or URI
 repackage() {
   local ear=
   local file_or_uri=$1
 
+  exit_if_no_os_packages_are_installed
+
   ensure_ear_reference_and_lineage_sanity "${file_or_uri}"
   ear=$(get_local_ear_reference "${file_or_uri}")
 

From 7b83df172442968177dcc1a131e303976281e665 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Mon, 21 Nov 2016 14:26:19 +0100
Subject: [PATCH 2455/2585] If no EAR is passed, repackage is now idempotent

If the user didn't pass any EAR to repackage, we want, if possible, to
pick the previous EAR and re-package that. This is because we want to
be able to make apt-get install/upgrade/remove idempotent, not to
repackage a repackaged EAR.

Goal: apt-get install <package> && apt-get remove <package> should
leave you in the same step as before you started.
---
 .../escenic/ece-scripts/ece.d/repackage.sh    | 53 ++++++++++++++++---
 1 file changed, 46 insertions(+), 7 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/repackage.sh b/usr/share/escenic/ece-scripts/ece.d/repackage.sh
index fd72c9e6..81d9e826 100644
--- a/usr/share/escenic/ece-scripts/ece.d/repackage.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/repackage.sh
@@ -141,6 +141,8 @@ create_new_ear_in_dir() {
   local old_ear=$3
 
   local new_ear=
+  old_ear=${old_ear//-created-on-${HOSTNAME}.zip}
+
   new_ear="${result_dir}/$(date --iso)-$(date +%s)-repackaged-${old_ear}-created-on-${HOSTNAME}.zip"
   (
     run cd "${dir}"
@@ -181,7 +183,7 @@ overwrite_publication_webapp_libs() {
       # to be sure it's prestine, we delete the old war
       run rm "${war}"
       (
-        cd "${tmp_dir}"
+        cd "${tmp_dir}" || exit 1
         run zip --recurse-paths --quiet "${war}" .
       )
 
@@ -200,6 +202,7 @@ overwrite_publication_webapp_libs() {
 ## $1 :: The file or URI to an EAR, as passed to the 'ece' command
 ##       with --uri or --file.
 ensure_ear_reference_and_lineage_sanity() {
+  ## user passed a file or uri, that's easy.
   if [ -n "${file_or_uri}" ]; then
     ear_name_or_hash=$(basename "${file_or_uri}")
     return
@@ -215,9 +218,44 @@ ensure_ear_reference_and_lineage_sanity() {
   if [ -r "${deployment_log}" ]; then
     local last_deployed_ear=
     last_deployed_ear=$(awk '{print $7;}' "${deployment_log}" | tail -1)
-    ear_name_or_hash=$(awk '{print $8;}' "${deployment_log}" | tail -1)
-    file_or_uri=${cache_dir}/${last_deployed_ear}
+    last_deployed_hash=$(awk '{print $8;}' "${deployment_log}" | tail -1)
+    parent_sha_of_last=$(sed -rn  's#.*repackaged-(.*)-created-on.*#\1#p' \
+                             <<< "${last_deployed_ear}")
+    # If the user didn't pass any EAR to repackage, we want, if
+    # possible, to pick the previous EAR and re-package that. This is
+    # because we want to be able to make apt-get
+    # install/upgrade/remove idempotent, not to repackage a repackaged
+    # EAR.
+    if [ -n "${parent_sha_of_last}" ]; then
+      parent_ear_of_last=$(awk "{if (\$8 == \"${parent_sha_of_last}\") print \$7;}" \
+                               "${deployment_log}")
+      if [ -z "${parent_ear_of_last}" ]; then
+        parent_ear_of_last="does--not--exist"
+      fi
+
+      file=${cache_dir}/${parent_ear_of_last}
+      if [ -r "${file}" ]; then
+        print_and_log "Repackaging EAR ${parent_sha_of_last}
+          (parent of last deployment) ... "
+        ear_name_or_hash="${parent_sha_of_last}"
+        file_or_uri=${file}
+        return
+      fi
+    fi
+
+    # If we couldn't find the parent of the previous deployment, try
+    # to use the previously deployed EAR.
+    local file=${cache_dir}/${last_deployed_ear}
+    if [[ -z "${ear_name_or_hash}" && -r "${file}" ]]; then
+      print_and_log "Repackaging EAR ${last_deployed_ear}
+        (last deployment) ... "
+      ear_name_or_hash=${last_deployed_hash}
+      file_or_uri=${file}
+      return
+    fi
+
   elif [ -r "${default_cached_engine_ear}" ]; then
+    print_and_log "Repackaging EAR ${default_cached_engine_ear} ... "
     file_or_uri=${default_cached_engine_ear}
     ear_name_or_hash=$(basename "${default_cached_engine_ear}")
   else
@@ -236,7 +274,7 @@ get_local_ear_reference() {
   if [ -f "${file_or_uri}" ]; then
     echo "${file_or_uri}"
   else
-    export wget_auth=${wget_builder_auth}
+    export wget_auth=${wget_builder_auth-""}
 
     local file_name=
     file_name=$(basename "${file_or_uri}")
@@ -256,8 +294,9 @@ merge_all_dirs_to_war() {
   log "Merging all $(basename "${war}")s ..."
 
   if [ ! -e "${war}" ]; then
-    print_and_log "${war} doesn't exist!"
-    exit 1
+    print_and_log "${war} doesn't exist 💀
+      (perhaps you need to install the escenic-content-engine package ?)"
+    remove_pid_and_exit_in_error
   fi
 
   for dir in ${dir_list}; do
@@ -265,7 +304,7 @@ merge_all_dirs_to_war() {
       continue
     fi
     (
-      cd "${dir}/webapp"
+      cd "${dir}/webapp" || exit 1
       zip -q -r -u "${war}" . || {
         # see 'man zip' for more details
         if [ $? -eq 12 ]; then

From a36c4bc2e462c69b8e192022e9cb324520aea69f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Wed, 23 Nov 2016 15:30:35 +0100
Subject: [PATCH 2456/2585] Introduced unit testing with shunit2

- added test runner, run-tests.sh which downloads shunit2 (if needed)
  and runs all files with suffix "-test.sh".

- used TDD to find and fix bugs for repackage:get_file_base()

- removed common-test.sh which wasn't really doing anything
---
 usr/local/src/unit-tests/common-test.sh       | 17 ----
 .../src/unit-tests/ece-repackage-test.sh      | 92 +++++++++++++++++++
 usr/local/src/unit-tests/run-tests.sh         | 41 +++++++++
 .../escenic/ece-scripts/ece.d/repackage.sh    |  6 +-
 4 files changed, 136 insertions(+), 20 deletions(-)
 delete mode 100644 usr/local/src/unit-tests/common-test.sh
 create mode 100644 usr/local/src/unit-tests/ece-repackage-test.sh
 create mode 100644 usr/local/src/unit-tests/run-tests.sh

diff --git a/usr/local/src/unit-tests/common-test.sh b/usr/local/src/unit-tests/common-test.sh
deleted file mode 100644
index 76de94c9..00000000
--- a/usr/local/src/unit-tests/common-test.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /usr/bin/env bash
-
-# by tkj@vizrt.com
-
-if [ ! -e bash_unit ]; then
-  wget --quiet https://raw.github.com/skybert/my-little-friends/master/bash/bash_unit
-fi
-if [ ! -e alexandria ]; then
-  wget --quiet https://raw.github.com/skybert/my-little-friends/master/bash/alexandria
-fi
-
-source bash_unit
-
-function common_test_is_loaded() {
-  echo 1
-}
-
diff --git a/usr/local/src/unit-tests/ece-repackage-test.sh b/usr/local/src/unit-tests/ece-repackage-test.sh
new file mode 100644
index 00000000..f36bd4a6
--- /dev/null
+++ b/usr/local/src/unit-tests/ece-repackage-test.sh
@@ -0,0 +1,92 @@
+#! /usr/bin/env bash
+
+# by torstein@escenic.com
+
+test_can_get_base_name_of_snapshot_dependency() {
+  local file=base-2.0-SNAPSHOT.jar
+  local expected=base
+  local actual=
+  actual=$(get_file_base ${file} .jar)
+  assertEquals "${expected}" "${actual}"
+}
+
+test_can_get_base_name_of_regular_major_minor_dependency() {
+  local file=base-2.0.1.jar
+  local expected=base
+  local actual=
+  actual=$(get_file_base ${file} .jar)
+  assertEquals "${expected}" "${actual}"
+}
+
+test_can_get_base_name_of_date_stamp_version() {
+  local file=relaxngDatatype-20020414.jar
+  local expected=relaxngDatatype
+  local actual=
+  actual=$(get_file_base ${file} .jar)
+  assertEquals "${expected}" "${actual}"
+}
+
+test_can_get_base_name_of_regular_major_minor_dependency_with_build_number() {
+  local file=base-2.0.1-23.jar
+  local expected=base
+  local actual=
+  actual=$(get_file_base ${file} .jar)
+  assertEquals "${expected}" "${actual}"
+}
+
+test_can_get_base_name_of_alpha_dependency() {
+  local file=base-2.0.4-alpha-2.jar
+  local expected=base
+  local actual=
+  actual=$(get_file_base ${file} .jar)
+  assertEquals "${expected}" "${actual}"
+
+  file=base-2.0.4-beta-2.jar
+  local expected=base
+  local actual=
+  actual=$(get_file_base ${file} .jar)
+  assertEquals "${expected}" "${actual}"
+
+  file=base-2.0.4-rc-2.jar
+  local expected=base
+  local actual=
+  actual=$(get_file_base ${file} .jar)
+  assertEquals "${expected}" "${actual}"
+}
+
+test_can_get_base_name_of_alpha_dependency_semver() {
+  local file=base-2.0.4-alpha.2.jar
+  local expected=base
+  local actual=
+  actual=$(get_file_base ${file} .jar)
+  assertEquals "${expected}" "${actual}"
+
+  file=base-2.0.4-beta.2.jar
+  local expected=base
+  local actual=
+  actual=$(get_file_base ${file} .jar)
+  assertEquals "${expected}" "${actual}"
+
+  file=base-2.0.4-rc.2.jar
+  local expected=base
+  local actual=
+  actual=$(get_file_base ${file} .jar)
+  assertEquals "${expected}" "${actual}"
+}
+
+
+## @override shunit2
+setUp() {
+  source "$(dirname "$0")/../../../share/escenic/ece-scripts/ece.d/repackage.sh"
+}
+
+## @override shunit2
+tearDown() {
+  :
+}
+
+main() {
+  . "$(dirname "$0")"/shunit2/source/2.1/src/shunit2
+}
+
+main "$@"
diff --git a/usr/local/src/unit-tests/run-tests.sh b/usr/local/src/unit-tests/run-tests.sh
new file mode 100644
index 00000000..68a69458
--- /dev/null
+++ b/usr/local/src/unit-tests/run-tests.sh
@@ -0,0 +1,41 @@
+#! /usr/bin/env bash
+
+# by torstein@gmail.com
+set -o errexit
+set -o nounset
+set -o pipefail
+shopt -s nullglob
+
+id="[$(basename "$0")]"
+
+print() {
+  echo "${id} $*"
+}
+
+run_tests() {
+  for el in $(dirname "$0")/*test.sh; do
+    print "Running ${el} ..."
+    local shell=bash
+    (
+      exec ${shell} "${el}" 2>&1
+    )
+  done
+}
+
+ensure_shunit_is_available() {
+  (
+    cd "$(dirname "$0")"
+
+    if [ ! -d shunit2 ]; then
+      print "Downloading shunit ..."
+      git clone https://github.com/kward/shunit2.git
+    fi
+  )
+}
+
+main() {
+  ensure_shunit_is_available
+  run_tests
+}
+
+main "$@"
diff --git a/usr/share/escenic/ece-scripts/ece.d/repackage.sh b/usr/share/escenic/ece-scripts/ece.d/repackage.sh
index 81d9e826..8a1228aa 100644
--- a/usr/share/escenic/ece-scripts/ece.d/repackage.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/repackage.sh
@@ -64,9 +64,9 @@ get_file_base() {
   basename "$1" "$2" |
     sed -r \
         -e 's#[-][0-9.-]+##' \
-        -e 's#[-][a-z]+-SNAPSHOT##' \
-        -e 's#[-][0-9]+.[0-9]+-SNAPSHOT##' \
-        -e 's#[.]$##'
+        -e 's#SNAPSHOT##' \
+        -e 's#[.]$##' \
+        -e 's#(alpha|beta|rc)[.-][0-9]+##'
 }
 
 ## $1 :: tmp dir with EAR contents

From 4d1ed58c494087812ea4b8f1640a972db2fd04d7 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Tue, 6 Dec 2016 09:42:24 +0100
Subject: [PATCH 2457/2585] Changed reference of apt.vizrt.com to
 apt.escenic.com

---
 usr/sbin/ece-install                             |  4 ++--
 usr/share/doc/escenic/ece-install-guide.org      | 16 ++++++++--------
 .../etc/apt/sources.list.d/vizrt.list.erb        |  2 +-
 .../post-install-hook-install-ece-install.sh     |  6 +++---
 .../hooks/post-install-hook-add-vizrt-repo.sh    |  6 +++---
 ...-install-hook-install-and-apply-spore.sh.tmpl |  2 +-
 .../post-install-hooks/add-vizrt-apt-repo.sh     |  6 +++---
 .../post-install-hooks/run-sdp-bootstrapper.sh   |  4 ++--
 8 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 20d5baf0..f1a15c5e 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -273,10 +273,10 @@ function install_common_os_packages()
   # ther systems through git.
   if [ $on_debian_or_derivative -eq 1 ]; then
     if [ ${fai_offline_mode-0} -eq 0 ]; then
-      curl -s http://apt.vizrt.com/archive.key 2>> $log | \
+      curl -s http://apt.escenic.com/archive.key 2>> $log | \
         apt-key add - 1>> $log 2>> $log
       local package_pool=${fai_apt_vizrt_pool-unstable}
-      add_apt_source "deb http://apt.vizrt.com ${package_pool} main"
+      add_apt_source "deb http://apt.escenic.com ${package_pool} main"
       run apt-get update
     fi
     install_packages_if_missing escenic-common-scripts
diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 2d60a5a2..23ac5058 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -146,12 +146,12 @@ is as follows:
       profile (see Run ece-install).
 
 ** <<<Get ece-install>>>
-On Debian based systems, such as Ubuntu, you can use the [[http://apt.vizrt.com][Vizrt APT
+On Debian based systems, such as Ubuntu, you can use the [[http://apt.escenic.com][Escenic APT
 repository]] and install the package *escenic-content-engine-installer*
 to get the *ece-install* command.
 
 On RedHat based systems, such as CentOS, you can use the RPMs
-available from http://yum.vizrt.com/rpm and install the RPM
+available from http://yum.escenic.com/rpm and install the RPM
 *escenic-common-scripts* and *escenic-content-engine-installer* to
 get the *ece-install* command.
 
@@ -159,7 +159,7 @@ If you have any problems installing using the DEB or RPM packages, or
 if you're system is neither Debian nor RedHat based, you can also
 download a ZIP archive of all the *ece-scripts*, which *ece-install*
 is a part of, here:
-https://github.com/vizrt/ece-scripts/zipball/master
+https://github.com/escenic/ece-scripts/zipball/master
 
 ** <<<Become Root>>>
 You must be the root user to run *ece-install*. If you try to run it as
@@ -1083,7 +1083,7 @@ the *ece-install.conf*:
 - *fai\_analysis\_stop\_and\_clear* :: After installation, stop the
      instances and clear its work & log files. Default is 0.
 
-- *fai\_apt\_vizrt\_pool* :: Which package pool in the Vizrt APT to
+- *fai\_apt\_escenic\_pool* :: Which package pool in the Escenic APT to
      install package from.. Default is stable.
 
 - *fai\_cache\_backends* :: Space separated, e.g. "app1:8080
@@ -1723,7 +1723,7 @@ main executable:
 *ece-install* started out as a purely interactive command, where the
 user was prompted for all the choices on what to install (most of
 which he/she could just hit ENTER to complete). Once this the
-interactive command was shown to customers and Vizrt employees, the
+interactive command was shown to customers and Escenic employees, the
 need for a fully automatic version became apparent and *ece-install*
 got the *fai_enabled* parameter to make the switch.
 
@@ -1753,7 +1753,7 @@ high performance. In the middle of 2011, Torstein Krause Johansen set
 out to remedy this and created *ece-install* as a personal side
 project.
 
-In February 2012, he joined the Vizrt Online SaaS team and was allowed
+In February 2012, he joined the Escenic Online SaaS team and was allowed
 to work on *ece-install* full time. The command has since then been
 used to install several full scale production environments, as well as
 being used for full scale automatic integration tests, development
@@ -1763,9 +1763,9 @@ the preferred way of installing new Escenic systems.
 From February 2013, it has been maintained by Erik Mogensen.
 
 * BUGS
-Report any bugs found on https://github.com/vizrt/ece-scripts/issues.
+Report any bugs found on https://github.com/escenic/ece-scripts/issues.
 and be sure to check
-https://github.com/vizrt/ece-scripts/known-issues.org before
+https://github.com/escenic/ece-scripts/known-issues.org before
 using *ece-install*.
 
 * SEE ALSO
diff --git a/usr/share/puppet/modules/vosa/templates/etc/apt/sources.list.d/vizrt.list.erb b/usr/share/puppet/modules/vosa/templates/etc/apt/sources.list.d/vizrt.list.erb
index d413d2e2..e71d2058 100644
--- a/usr/share/puppet/modules/vosa/templates/etc/apt/sources.list.d/vizrt.list.erb
+++ b/usr/share/puppet/modules/vosa/templates/etc/apt/sources.list.d/vizrt.list.erb
@@ -1 +1 @@
-deb http://<%= apt_vizrt_user %>:<%= apt_vizrt_password %>@apt.vizrt.com stable main
+deb http://<%= apt_vizrt_user %>:<%= apt_vizrt_password %>@apt.escenic.com stable main
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/hooks/post-install-hook-install-ece-install.sh b/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/hooks/post-install-hook-install-ece-install.sh
index bf429535..0f9a5272 100755
--- a/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/hooks/post-install-hook-install-ece-install.sh
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/hooks/post-install-hook-install-ece-install.sh
@@ -2,11 +2,11 @@
 
 echo "--- START : post install hook - install ece install ---"
 
-# add archive key for apt.vizrt.com
-curl -s http://apt.vizrt.com/archive.key | ssh -F $2/ssh.conf guest 'sudo apt-key add -'
+# add archive key for apt.escenic.com
+curl -s http://apt.escenic.com/archive.key | ssh -F $2/ssh.conf guest 'sudo apt-key add -'
 
 # add repo to sources list
-echo "deb http://apt.vizrt.com unstable main" | ssh -F $2/ssh.conf guest 'sudo tee > /dev/null /etc/apt/sources.list.d/vizrt.list'
+echo "deb http://apt.escenic.com unstable main" | ssh -F $2/ssh.conf guest 'sudo tee > /dev/null /etc/apt/sources.list.d/vizrt.list'
 
 # install escenic scripts
 ssh -F $2/ssh.conf guest 'sudo apt-get update && sudo apt-get -y install escenic-content-engine-installer'
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-add-vizrt-repo.sh b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-add-vizrt-repo.sh
index c4c3ef99..839596af 100755
--- a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-add-vizrt-repo.sh
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-add-vizrt-repo.sh
@@ -2,11 +2,11 @@
 
 echo "--- START : post install hook - add vizrt repo ---"
 
-# add archive key for apt.vizrt.com
-curl -s http://apt.vizrt.com/archive.key | ssh -F $2/ssh.conf guest 'sudo apt-key add -'
+# add archive key for apt.escenic.com
+curl -s http://apt.escenic.com/archive.key | ssh -F $2/ssh.conf guest 'sudo apt-key add -'
 
 # add repo to sources list
-echo "deb http://apt.vizrt.com unstable main" | ssh -F $2/ssh.conf guest 'sudo tee > /dev/null /etc/apt/sources.list.d/vizrt.list'
+echo "deb http://apt.escenic.com unstable main" | ssh -F $2/ssh.conf guest 'sudo tee > /dev/null /etc/apt/sources.list.d/escenic.list'
 
 # update package lists
 ssh -F $2/ssh.conf guest 'sudo apt-get update'
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-and-apply-spore.sh.tmpl b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-and-apply-spore.sh.tmpl
index 471ee2eb..0d62bb57 100755
--- a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-and-apply-spore.sh.tmpl
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/hooks/post-install-hook-install-and-apply-spore.sh.tmpl
@@ -3,7 +3,7 @@
 echo "--- START : post install hook - install and apply spore ---"
 
 # import spores.key
-ssh -F \$2/ssh.conf root@guest 'curl http://apt.vizrt.com/spores.key | gpg --import'
+ssh -F \$2/ssh.conf root@guest 'curl http://apt.escenic.com/spores.key | gpg --import'
 
 # install spore
 ssh -F \$2/ssh.conf root@guest 'apt-get install spore'
diff --git a/usr/share/vizrt/vosa/post-install-hooks/add-vizrt-apt-repo.sh b/usr/share/vizrt/vosa/post-install-hooks/add-vizrt-apt-repo.sh
index 4c4492c6..9bbfcaeb 100644
--- a/usr/share/vizrt/vosa/post-install-hooks/add-vizrt-apt-repo.sh
+++ b/usr/share/vizrt/vosa/post-install-hooks/add-vizrt-apt-repo.sh
@@ -1,11 +1,11 @@
 #! /usr/bin/env bash
 
 ## Adds the Vizrt APT repository
-echo deb http://apt.vizrt.com unstable main | \
-  ssh -F $2/ssh.conf guest sudo tee /etc/apt/sources.list.d/apt-vizrt-com.list \
+echo deb http://apt.escenic.com unstable main | \
+  ssh -F $2/ssh.conf guest sudo tee /etc/apt/sources.list.d/apt.escenic.com.list \
   > /dev/null
 
-curl -s http://apt.vizrt.com/archive.key | \
+curl -s http://apt.escenic.com/archive.key | \
   ssh -F $2/ssh.conf guest sudo apt-key add - \
   > /dev/null
 
diff --git a/usr/share/vizrt/vosa/post-install-hooks/run-sdp-bootstrapper.sh b/usr/share/vizrt/vosa/post-install-hooks/run-sdp-bootstrapper.sh
index bcd33d57..b3fa915f 100755
--- a/usr/share/vizrt/vosa/post-install-hooks/run-sdp-bootstrapper.sh
+++ b/usr/share/vizrt/vosa/post-install-hooks/run-sdp-bootstrapper.sh
@@ -32,8 +32,8 @@ fi
 guest="ssh -F $2/ssh.conf root@guest"
 
 if $guest [ -d /etc/apt/sources.list.d ] ; then
-  $guest tee /etc/apt/sources.list.d/vizrt.list <<EOF
-deb http://apt.vizrt.com/ akita main non-free
+  $guest tee /etc/apt/sources.list.d/escenic.list <<EOF
+deb http://apt.escenic.com/ unstable main non-free
 EOF
 
   $guest tee /etc/apt/preferences.d/30prefer-vizrt-akita-packages <<EOF

From 5219555887674060480ced2cfa59947d795d50e5 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Tue, 13 Dec 2016 13:15:40 +0100
Subject: [PATCH 2458/2585] Replaced maven.vizrt.com with maven.escenic.com

---
 usr/sbin/ece-install                        |  2 +-
 usr/share/escenic/build-scripts/ece-build   | 16 ++++++++--------
 usr/share/escenic/build-scripts/ece-builder |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 20d5baf0..6f13a2ae 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -575,7 +575,7 @@ function check_software_credentials() {
   # if the WF credentials are set, we check to see if they're OK
   if [ -n "${wf_user}" -a -n "${wf_password}" ]; then
     print_and_log "Verifying that Widget Framework credentials are OK ..."
-    local url=http://maven.vizrt.com
+    local url=http://maven.escenic.com
     local notok=$(
       is_unauthorized_to_access_url \
         ${wf_user} \
diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index d8f82db2..abd03ff3 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -936,15 +936,15 @@ function request_distribution
 {
   local dist_path=$1
   if [ ! -z $dist_path ]; then
-    distribution_exists http://maven.vizrt.com/$dist_path  
+    distribution_exists http://maven.escenic.com/$dist_path
     local ret_val=$?
     if [ $ret_val -eq 0 ]; then
-      download_distribution http://maven.vizrt.com/$dist_path
+      download_distribution http://maven.escenic.com/$dist_path
     else
-      distribution_exists http://maven.vizrt.com/unstable/$dist_path
+      distribution_exists http://maven.escenic.com/unstable/$dist_path
       local ret_val=$?
       if [ $ret_val -eq 0 ]; then
-        download_distribution http://maven.vizrt.com/unstable/$dist_path
+        download_distribution http://maven.escenic.com/unstable/$dist_path
       fi      
     fi
   fi
@@ -1011,9 +1011,9 @@ function print_unstable_distributions
       do
         local dist_path=`mvn_coordinate_to_url ${g}:${project_distributions["$f"]}`
         if [ ! -z $dist_path ]; then
-          distribution_exists http://maven.vizrt.com/$dist_path
+          distribution_exists http://maven.escenic.com/$dist_path
           if [ $? -ne 0 ]; then
-            distribution_exists http://maven.vizrt.com/unstable/$dist_path
+            distribution_exists http://maven.escenic.com/unstable/$dist_path
             if [ $? -eq 0 ]; then
               print_and_log "WARNING - $f version ${project_distributions["$f"]} is not supported!"
               local coordinate=$g
@@ -1103,10 +1103,10 @@ function verify_maven_proxy
       if [ $maven_build_offline -eq 1 ]; then
         print_and_log "Skipping maven proxy verification as you've chosen offline mode!"
       else
-        wget --http-user $maven_user --http-password $maven_password http://maven.vizrt.com -qO /dev/null
+        wget --http-user $maven_user --http-password $maven_password http://maven.escenic.com -qO /dev/null
         RETVAL=$?
         if [ $RETVAL -ne 0 ]; then
-          print_and_log "Your user can't reach http://maven.vizrt.com, exiting!"
+          print_and_log "Your user can't reach http://maven.escenic.com, exiting!"
           exit 1
         fi
       fi
diff --git a/usr/share/escenic/build-scripts/ece-builder b/usr/share/escenic/build-scripts/ece-builder
index b8c183f7..d7f67e90 100755
--- a/usr/share/escenic/build-scripts/ece-builder
+++ b/usr/share/escenic/build-scripts/ece-builder
@@ -606,7 +606,7 @@ function process_artifact
   fi
 
   # fetch and unpack resource
-  if [[ "${artifact_path}" == *maven.vizrt.com* ]] || [[ "$artifact_path" =~ "maven.escenic.com" ]] ; then
+  if [[ "${artifact_path}" == *maven.escenic.com* ]] || [[ "$artifact_path" =~ "maven.escenic.com" ]] ; then
     local http_user=$maven_vizrt_user
     local http_password=$maven_vizrt_password
   elif [[ "${artifact_path}" == *technet* ]]; then

From 61b6ea2f1bda1a6459613c4ec9c74fab90083fd0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Wed, 14 Dec 2016 14:56:13 +0100
Subject: [PATCH 2459/2585] Provided default values for /etc/init.d/ece's
 configuration

- the init.d script reads its conf from /etc/default/ece. It uses this
  file to know which ECE and search instances to start and stop, as
  well as which UNIX user and group to run the process as.

- with this change the customer doesn't have to specify anything but
  which instances to start and stop. The rest of the values are taken
  from defaults. These may of course be overridden as before.

- This change is backwards compatible.

- With this change, a minimal /etc/default/ece may look like this:

  engine_instance_list="engine1"
  search_instance_list="search1"
---
 etc/init.d/ece | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/etc/init.d/ece b/etc/init.d/ece
index 8315cef9..c6602280 100755
--- a/etc/init.d/ece
+++ b/etc/init.d/ece
@@ -79,9 +79,9 @@ function ensure_dirs_are_ok()
         fi
 
         if [[ ${el} == "/var/cache"* || ${el} == "/var/lib"* ]]; then
-            chown --changes $ece_unix_user:$ece_unix_group $el
+            chown --changes "${ece_unix_user-escenic}:${ece_unix_group-escenic}" $el
         else
-            chown --recursive --changes $ece_unix_user:$ece_unix_group $el
+            chown --recursive --changes "${ece_unix_user-escenic}:${ece_unix_group-escenic}" $el
         fi
     done
 }
@@ -100,20 +100,20 @@ function ensure_ece_script_is_ok()
 
 function execute_command()
 {
-    if [ $enable_rmi_hub -eq 1 ]; then
-        su - $ece_unix_user -c "$ece_script -t rmi-hub $1"
+    if [ "${enable_rmi_hub-0}" -eq 1 ]; then
+        su - ${ece_unix_user-escenic} -c "$ece_script -t rmi-hub $1"
     fi
 
     for el in $engine_instance_list; do
-        su - $ece_unix_user -c "$ece_script -t engine -i $el $1"
+        su - "${ece_unix_user-escenic}" -c "$ece_script -t engine -i $el $1"
     done
 
     for el in $search_instance_list; do
-        su - $ece_unix_user -c "$ece_script -t search -i $el $1"
+        su - "${ece_unix_user-escenic}" -c "$ece_script -t search -i $el $1"
     done
 
     for el in $analysis_instance_list; do
-        su - $ece_unix_user -c "$ece_script -t analysis -i $el $1"
+        su - "${ece_unix_user-escenic}" -c "$ece_script -t analysis -i $el $1"
     done
 }
 

From ee1ad54794fb0efbc6aeba83d29da929677c3f69 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Mon, 19 Dec 2016 10:40:31 +0100
Subject: [PATCH 2460/2585] VOSA-239 ece repackage now includes CS plugins

Some ECE plugins like video, poll and geocode have Content Studio
extensions which reside in:

    <plugin dir>/studio

e.g.:

    /usr/share/escenic/escenic-video/studio/lib/video-studio-4.1.0-5.jar

These files are now included in the EAR repackaged with the `ece
repackage` command. Here's an example of having the video, poll and geocode
plugins installed and running 'ece repackage':

    $ ece -i engine1 repackage stop deploy start
    $ find /opt/tomcat-engine1/webapps/studio/studio/plugin
    /opt/tomcat-engine1/webapps/studio/studio/plugin/
    /opt/tomcat-engine1/webapps/studio/studio/plugin/escenic-video
    /opt/tomcat-engine1/webapps/studio/studio/plugin/escenic-video/lib
    /opt/tomcat-engine1/webapps/studio/studio/plugin/escenic-video/lib/video-studio-4.1.0-5.jar
    /opt/tomcat-engine1/webapps/studio/studio/plugin/escenic-geocode
    /opt/tomcat-engine1/webapps/studio/studio/plugin/escenic-geocode/lib
    /opt/tomcat-engine1/webapps/studio/studio/plugin/escenic-geocode/lib/geocode-studio-3.0.0-6.jar
    /opt/tomcat-engine1/webapps/studio/studio/plugin/escenic-geocode/lib/geocode-api-3.0.0-6.jar.pack.gz
    /opt/tomcat-engine1/webapps/studio/studio/plugin/escenic-geocode/lib/lucene-core-4.6.0.jar.pack.gz
    /opt/tomcat-engine1/webapps/studio/studio/plugin/escenic-geocode/lib/launch.jnlp
    /opt/tomcat-engine1/webapps/studio/studio/plugin/escenic-geocode/lib/lucene-core-4.6.0.jar
    /opt/tomcat-engine1/webapps/studio/studio/plugin/escenic-geocode/lib/geocode-api-3.0.0-6.jar
    /opt/tomcat-engine1/webapps/studio/studio/plugin/escenic-geocode/lib/geocode-studio-3.0.0-6.jar.pack.gz
    /opt/tomcat-engine1/webapps/studio/studio/plugin/escenic-poll
    /opt/tomcat-engine1/webapps/studio/studio/plugin/escenic-poll/lib
    /opt/tomcat-engine1/webapps/studio/studio/plugin/escenic-poll/lib/poll-studio-3.0.0-5.jar
---
 .../escenic/ece-scripts/ece.d/repackage.sh    | 55 +++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece.d/repackage.sh b/usr/share/escenic/ece-scripts/ece.d/repackage.sh
index 8a1228aa..3578525a 100644
--- a/usr/share/escenic/ece-scripts/ece.d/repackage.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/repackage.sh
@@ -33,6 +33,11 @@ get_installed_packages_webservice_list() {
        -name "webservice" -type d
 }
 
+get_installed_packages_studio_list() {
+  find "${USR_SHARE_DIR}/escenic-"* -maxdepth 1 \
+       -name "studio" -type d
+}
+
 ## $1 :: tmp dir with EAR contents
 remove_webapps_that_are_included_in_installed_packages() {
   local tmp_dir=$1
@@ -317,6 +322,46 @@ merge_all_dirs_to_war() {
   done
 }
 
+## Updates studio.war with available studio plugins
+##
+## $1 : studio WAR to update
+## $2 : studio plugin directories
+merge_all_plugins_with_studio_war() {
+  local war=$1
+  local dir_list=${*:2}
+
+  if [ ! -e "${war}" ]; then
+    print_and_log "${war} doesn't exist 💀
+      (perhaps you need to install the escenic-content-engine package ?)"
+    remove_pid_and_exit_in_error
+  fi
+
+  for dir in ${dir_list}; do
+    log "Adding studio plugin in ${dir} ..."
+    local plugin_name=
+    plugin_name=$(basename $(dirname "${dir}"))
+
+    local tmp_dir=
+    tmp_dir=$(mktemp -d)
+    local plugin_dir_in_war="${tmp_dir}/studio/plugin/${plugin_name}"
+    run mkdir -p "${plugin_dir_in_war}"
+    run cp -r "${dir}"/* "${plugin_dir_in_war}"
+
+    (
+      cd "${tmp_dir}" || exit 1
+      zip -q -r -u "${war}" . || {
+        # see 'man zip' for more details
+        if [ $? -eq 12 ]; then
+          log "${war} already contained the contents of ${dir}"
+        else
+          remove_pid_and_exit_in_error
+        fi
+      }
+    )
+    rm -r "${tmp_dir}"
+  done
+}
+
 ## $1 :: tmp dir with EAR contents
 merge_all_webservice_extension_webapps() {
   local tmp_dir=$1
@@ -335,6 +380,15 @@ merge_all_webservice_webapps() {
     "$(get_installed_packages_webservice_list)"
 }
 
+## $1 :: tmp dir with EAR contents
+merge_all_studio_plugins() {
+  local tmp_dir=$1
+  local war=${tmp_dir}/studio.war
+  merge_all_plugins_with_studio_war \
+    "${war}" \
+    "$(get_installed_packages_studio_list)"
+}
+
 exit_if_no_os_packages_are_installed() {
   local packages_installed=
   packages_installed=$(
@@ -372,6 +426,7 @@ repackage() {
   overwrite_publication_webapp_libs "${tmp_dir}"
   merge_all_webservice_extension_webapps "${tmp_dir}"
   merge_all_webservice_webapps "${tmp_dir}"
+  merge_all_studio_plugins "${tmp_dir}"
 
   # The ${file} variable is used by deploy.sh::deploy()
   export file=$(

From 61ffca992df14a15bafedb89a0c0bbcbd838fad6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 6 Jan 2017 11:23:05 +0100
Subject: [PATCH 2461/2585] VOSA-240 ece repackage now patches all WARs (also
 ECE's)

- before this change, WARs provided by ECE & plugins were not patched,
  just copied as they were provided by the package.  For some WARs,
  like live-center-editorial, live-presentation-webservice.war and
  live-center.war, this was an issue.  These WARs needed the
  publication WAR related files in engine/template.

- added support for having files in the EAR file, either in the global
  lib directory or in the <war>/WEB-INF/lib which contains files that
  are not present in the corresponding WAR of a package installed
  dependency.  For example: if the EAR contains webservice.war and
  this webservice.war contains:

  webservice.war:/WEB-INF/lib/extension2.jar
  webservice.war:/WEB-INF/lib/engine-servletsupport-4.3.2.jar

  And the EAR also contains:

  lib/extension.jar
  lib/engine-core-4.3.2.jar

  And the machine has installed escenic-content-engine-6.0, which
  means that these files exist:

  /usr/share/escenic/escenic-content-engine-6.0/lib/engine-core-6.0.1-3.jar
  /usr/share/escenic/escenic-content-engine-6.0/webapps/webservice.war:/WEB-INF/lib/engine-servletsupport-6.0.1-3.jar

  Then lib/extension.jar and lib/extension2.jar will both be kept since
  these JARs don't exist on the machine, whereas the global library engine-core-4.3.2.jar
  and the engine-servletsupport-4.3.2.jar inside the webservice.war
  will be replaced with the 6.0.1-3 versions.

- added unit tests to document intended behaviour and prove that the
  new features work.
---
 .../src/unit-tests/ece-repackage-test.sh      | 223 +++++++++++++++++-
 .../escenic/ece-scripts/ece.d/repackage.sh    | 150 +++++++-----
 2 files changed, 310 insertions(+), 63 deletions(-)

diff --git a/usr/local/src/unit-tests/ece-repackage-test.sh b/usr/local/src/unit-tests/ece-repackage-test.sh
index f36bd4a6..4de715e8 100644
--- a/usr/local/src/unit-tests/ece-repackage-test.sh
+++ b/usr/local/src/unit-tests/ece-repackage-test.sh
@@ -2,6 +2,14 @@
 
 # by torstein@escenic.com
 
+test_can_get_base_name_of_develop_snapshot_dependency() {
+  local file=base-develop-SNAPSHOT.jar
+  local expected=base
+  local actual=
+  actual=$(get_file_base ${file} .jar)
+  assertEquals "${expected}" "${actual}"
+}
+
 test_can_get_base_name_of_snapshot_dependency() {
   local file=base-2.0-SNAPSHOT.jar
   local expected=base
@@ -74,15 +82,228 @@ test_can_get_base_name_of_alpha_dependency_semver() {
   assertEquals "${expected}" "${actual}"
 }
 
+test_can_detect_that_escenic_admin_doesnt_need_patching() {
+  local expected=1
+  local actual=
+  should_patch_war "/path/to/escenic-admin.war" && actual=$? || actual=$?
+  assertEquals "${expected}" "${actual}"
+}
+
+test_can_detect_that_live_center_need_patching() {
+  local expected=0
+  local actual=
+  should_patch_war "/path/to/live-center.war" && actual=$? || actual=$?
+  assertEquals "${expected}" "${actual}"
+}
+
+test_can_repackage_an_ear() {
+  local repackaged_ear=
+  repackaged_ear=$(quiet=1 repackage "${ear}" | tail -1)
+  local expected=0
+  local actual=
+  test -f "${repackaged_ear}" && actual=$? || actual=$?
+  assertEquals "${expected}" "${actual}"
+}
+
+test_can_patch_war_inside_ear() {
+  local repackaged_ear=
+  repackaged_ear=$(quiet=1 repackage "${ear}" | tail -1)
+
+  local ear_extract_tmp_dir=
+  ear_extract_tmp_dir=$(mktemp -d)
+  (cd "${ear_extract_tmp_dir}" && jar xf "${repackaged_ear}")
+
+  for war in "${ear_extract_tmp_dir}"/*.war; do
+    skip=0
+    for ece_war in $(get_ece_package_webapp_names); do
+      if [[ $(basename "${war}") == "${ece_war}" ]]; then
+        skip=1
+        break
+      fi
+    done
+    if [ "${skip-0}" -eq 1 ]; then
+      continue
+    fi
+
+    for ele in $(get_ece_package_template_files); do
+      local expected=1
+      local actual=
+      actual=$(unzip -v "${war}" | grep -c "${ele}")
+      assertEquals "${expected}" "${actual}"
+    done
+  done
+  rm -r "${ear_extract_tmp_dir}"
+}
+
+test_can_merge_webservice_war_in_ear_keep_extensions_only_in_ear() {
+  local repackaged_ear=
+  repackaged_ear=$(quiet=1 repackage "${ear}" | tail -1)
+
+  local ear_extract_tmp_dir=
+  ear_extract_tmp_dir=$(mktemp -d)
+  (cd "${ear_extract_tmp_dir}" && jar xf "${repackaged_ear}")
+
+  local expected=1
+  actual=$(
+    unzip -v "${ear_extract_tmp_dir}/webservice.war" |
+      grep -c "${EAR_WEBSERVICE_WAR_EXTENSION_FILE}")
+  assertEquals "${expected}" "${actual}"
+}
+
+test_can_keep_lib_extension_only_in_ear() {
+  local repackaged_ear=
+  repackaged_ear=$(quiet=1 repackage "${ear}" | tail -1)
+
+  local expected=1
+  actual=$(
+    unzip -v "${repackaged_ear}" |
+      grep -c "${EAR_LIB_EXTENSION_FILE}")
+  assertEquals "${expected}" "${actual}"
+}
+
+test_can_merge_webservice_war_in_ear_replace_libraries_present_on_machine() {
+  local repackaged_ear=
+  repackaged_ear=$(quiet=1 repackage "${ear}" | tail -1)
+
+  local ear_extract_tmp_dir=
+  ear_extract_tmp_dir=$(mktemp -d)
+  (cd "${ear_extract_tmp_dir}" && jar xf "${repackaged_ear}")
+
+  local expected=0
+  actual=$(unzip -v "${ear_extract_tmp_dir}/webservice.war" |
+             grep -c "engine-servletsupport-${ECE_VERSION_IN_EAR}")
+  assertEquals "Version in EAR should be replaced with package version" \
+               "${expected}" \
+               "${actual}"
+
+  local expected=1
+  actual=$(unzip -v "${ear_extract_tmp_dir}/webservice.war" |
+             grep -c "engine-servletsupport-${ECE_VERSION}")
+  assertEquals "Version in EAR should be replaced with package version" \
+               "${expected}" \
+               "${actual}"
+}
+
+test_can_repackage_ear_no_duplicates_in_lib() {
+  local repackaged_ear=
+  repackaged_ear=$(quiet=1 repackage "${ear}" | tail -1)
+
+  local expected=1
+  local actual=
+  actual=$(unzip -v "${repackaged_ear}" | grep -c engine-core)
+  assertEquals "${expected}" "${actual}"
+}
+
+get_ece_package_template_files() {
+  cat <<EOF
+WEB-INF/lib/common-nursery-servlet-${ECE_VERSION}.jar
+WEB-INF/lib/engine-presentation-${ECE_VERSION}.jar
+WEB-INF/lib/engine-servletsupport-${ECE_VERSION}.jar
+WEB-INF/lib/engine-taglib-${ECE_VERSION}.jar
+WEB-INF/lib/jcaptcha-all-1.0-RC5.jar
+WEB-INF/lib/recaptcha4j-0.0.7.jar
+WEB-INF/lib/servlet-3.3.jar
+EOF
+}
+
+get_ece_package_webapp_names() {
+  cat <<EOF
+studio.war
+webservice.war
+webservice-extensions.war
+EOF
+}
+
+## $1 :: tmp dir in which to create the package installation
+create_ece_package_installation() {
+  local tmp_dir=$1
+
+  export USR_SHARE_DIR="${tmp_dir}/escenic"
+  local ece_share_dir="${USR_SHARE_DIR}/escenic-content-engine-6.0"
+  mkdir -p "${ece_share_dir}/webapps"
+  for el in $(get_ece_package_webapp_names); do
+    (
+      local a_tmp_dir=
+      a_tmp_dir=$(mktemp -d)
+      cd "${a_tmp_dir}" && jar cf "${ece_share_dir}/webapps/${el}" .
+      rm -r "${a_tmp_dir}"
+    )
+  done
+
+  local ece_lib_dir="${ece_share_dir}/lib"
+  mkdir -p "${ece_lib_dir}"
+  touch "${ece_lib_dir}/engine-core-${ECE_VERSION}.jar"
+
+  local ece_template_dir="${ece_share_dir}/template"
+  mkdir -p "${ece_template_dir}"
+  for el in $(get_ece_package_template_files); do
+    local dir="${ece_template_dir}/$(dirname "${el}")"
+    mkdir -p "${dir}"
+    # create jar
+    local jar="${dir}/$(basename "${el}")"
+    local f_tmp_dir=
+    f_tmp_dir=$(mktemp -d)
+    (cd "${f_tmp_dir}" && jar cf "${jar}" .)
+    rm -r "${f_tmp_dir}"
+  done
+}
+
+create_ear_that_will_be_repackaged() {
+  local ear_dir="${tmp_dir}/ear"
+  mkdir "${ear_dir}"
+
+  EAR_LIB_EXTENSION_FILE=
+  EAR_LIB_EXTENSION_FILE=global-lib-extension.file
+
+  local ear_lib_dir="${ear_dir}/lib"
+  mkdir "${ear_lib_dir}"
+  touch "${ear_lib_dir}/engine-core-${ECE_VERSION_IN_EAR}.jar"
+  touch "${ear_lib_dir}/${EAR_LIB_EXTENSION_FILE}"
+
+  # create a pub war
+  local war="${ear_dir}/${FUNCNAME[0]}.war"
+  local war_tmp_dir=
+  war_tmp_dir=$(mktemp -d)
+  (cd "${war_tmp_dir}" && jar cf "${war}" .)
+  rm -r "${war_tmp_dir}"
+
+  # create webservice war
+  EAR_WEBSERVICE_WAR_EXTENSION_FILE=
+  EAR_WEBSERVICE_WAR_EXTENSION_FILE=webservice-war-extension.file
+  war="${ear_dir}/webservice.war"
+  war_tmp_dir=$(mktemp -d)
+  touch "${war_tmp_dir}/${EAR_WEBSERVICE_WAR_EXTENSION_FILE}"
+  mkdir -p "${war_tmp_dir}/WEB-INF/lib"
+  touch "${war_tmp_dir}/WEB-INF/lib/engine-servletsupport-${ECE_VERSION_IN_EAR}.jar"
+  (cd "${war_tmp_dir}" && jar cf "${war}" .)
+  rm -r "${war_tmp_dir}"
+
+  ear="${tmp_dir}/${BASH_SOURCE[0]}.ear"
+  (cd "${ear_dir}" && jar cf "${ear}" .)
+}
 
 ## @override shunit2
 setUp() {
   source "$(dirname "$0")/../../../share/escenic/ece-scripts/ece.d/repackage.sh"
+  source "$(dirname "$0")/../../../share/escenic/ece-scripts/common-bashing.sh"
+  source "$(dirname "$0")/../../../share/escenic/ece-scripts/common-io.sh"
+  log=/tmp/${BASH_SOURCE[0]}.$$.log
+
+  tmp_dir=$(mktemp -d)
+  cache_dir=${tmp_dir}/var/lib/escenic
+  data_dir=${tmp_dir}/var/lib/escenic
+  log_dir=${tmp_dir}/var/log/escenic
+  run_dir=${tmp_dir}/var/run/escenic
+
+  ECE_VERSION=6.7.5
+  ECE_VERSION_IN_EAR=6.2.0
+  create_ece_package_installation "${tmp_dir}"
+  create_ear_that_will_be_repackaged "${tmp_dir}"
 }
 
 ## @override shunit2
 tearDown() {
-  :
+  rm -r "${tmp_dir}"
 }
 
 main() {
diff --git a/usr/share/escenic/ece-scripts/ece.d/repackage.sh b/usr/share/escenic/ece-scripts/ece.d/repackage.sh
index 3578525a..93e5b1d0 100644
--- a/usr/share/escenic/ece-scripts/ece.d/repackage.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/repackage.sh
@@ -39,24 +39,18 @@ get_installed_packages_studio_list() {
 }
 
 ## $1 :: tmp dir with EAR contents
-remove_webapps_that_are_included_in_installed_packages() {
-  local tmp_dir=$1
-  for d in $(get_installed_packages_war_list); do
-    for package_war in $(find "${d}" -type f -name "*.war"); do
-      for ear_war in "${tmp_dir}/"*.war; do
-        if [[ $(basename "${ear_war}") == $(basename "${package_war}") ]]; then
-          run rm "${ear_war}"
-        fi
-      done
-    done
-  done
-}
-
-## $1 :: tmp dir with EAR contents
-copy_webapps_that_are_included_in_installed_packages() {
+copy_webapps_included_in_installed_packages_if_not_exists() {
   local tmp_dir=$1
+  local war=
   for war in $(get_installed_packages_war_list); do
-    run cp "${war}" "${tmp_dir}"
+    local war_base=
+    war_base=$(basename "${war}")
+    if [[ ! -e "${tmp_dir}/${war_base}" ]]; then
+      run cp "${war}" "${tmp_dir}"
+    else
+      debug "EAR already has ${war_base}, will patch it"
+      # will be patched in overwrite_webapp_libs(), see main()
+    fi
   done
 }
 
@@ -69,6 +63,7 @@ get_file_base() {
   basename "$1" "$2" |
     sed -r \
         -e 's#[-][0-9.-]+##' \
+        -e 's#-develop-SNAPSHOT##' \
         -e 's#SNAPSHOT##' \
         -e 's#[.]$##' \
         -e 's#(alpha|beta|rc)[.-][0-9]+##'
@@ -77,9 +72,12 @@ get_file_base() {
 ## $1 :: tmp dir with EAR contents
 remove_libs_included_in_installed_packages() {
   local tmp_dir=$1
+
+  local package_jar=
   for package_jar in $(get_installed_packages_lib_list); do
     package_jar_base=$(get_file_base "${package_jar}" jar)
 
+    local ear_jar=
     for ear_jar in "${tmp_dir}/lib/"*.jar; do
       ear_jar_base=$(get_file_base "${ear_jar}" jar)
       if [[ "${ear_jar_base}" == "${package_jar_base}" ]]; then
@@ -96,6 +94,7 @@ copy_libs_included_in_installed_packages() {
   local tmp_dir=$1
   make_dir "${tmp_dir}/lib"
 
+  local package_jar=
   for package_jar in $(get_installed_packages_lib_list); do
     debug "Including JAR ${package_jar} in EAR ..."
     run cp "${package_jar}" "${tmp_dir}/lib"
@@ -103,37 +102,45 @@ copy_libs_included_in_installed_packages() {
 }
 
 ## $1 :: tmp dir with WAR contents
-overwrite_publication_webapp_libs_included_in_installed_packages() {
+overwrite_webapp_libs_included_in_installed_packages() {
   local tmp_dir=$1
 
-  for pub_war_jar in "${tmp_dir}/WEB-INF/lib/"*.jar; do
-    pub_war_jar_base=$(get_file_base "${pub_war_jar}" jar)
-    debug "${FUNCNAME[0]}
-      Checking pub_war_jar=$pub_war_jar
-      pub_war_jar_base=$pub_war_jar_base"
-
-    for package_dir in "${USR_SHARE_DIR}/"*; do
-      local template_lib_dir="${package_dir}/template/WEB-INF/lib"
+  local package_dir=
+  for package_dir in "${USR_SHARE_DIR}/"*; do
+    local template_lib_dir="${package_dir}/template/WEB-INF/lib"
+    if [ ! -d "${template_lib_dir}" ]; then
+      # ECE and its plugins put their publication specific libraries
+      # in different directory structures.
+      template_lib_dir="${package_dir}/publication/webapp/WEB-INF/lib"
       if [ ! -d "${template_lib_dir}" ]; then
-        # ECE and its plugins put their publication specific libraries
-        # in different directory structures.
-        template_lib_dir="${package_dir}/publication/webapp/WEB-INF/lib"
-        if [ ! -d "${template_lib_dir}" ]; then
-          continue
-        fi
+        continue
       fi
+    fi
 
-      find "${template_lib_dir}" -name "*.jar" -type f | \
-        while read -r package_jar; do
-          package_jar_base=$(get_file_base "${package_jar}" jar)
+    find "${template_lib_dir}" -name "*.jar" -type f | \
+      while read -r package_jar; do
+        package_jar_base=$(get_file_base "${package_jar}" jar)
+
+        local pub_war_jar=
+        for pub_war_jar in "${tmp_dir}/WEB-INF/lib/"*.jar; do
+          pub_war_jar_base=$(get_file_base "${pub_war_jar}" jar)
+          debug "${FUNCNAME[0]}
+                  Checking pub_war_jar=$pub_war_jar
+                  pub_war_jar_base=$pub_war_jar_base"
 
           if [[ "${pub_war_jar_base}" == "${package_jar_base}" ]]; then
             debug " -> Replacing ${pub_war_jar} with ${package_jar}"
             run rm "${pub_war_jar}"
             run cp "${package_jar}" "$(dirname "${pub_war_jar}")"
+          else
+            debug " -> ${pub_war} doesn't have ${package_jar}, adding it"
+            local dir=
+            dir="$(dirname "${pub_war_jar}")"
+            make_dir "${dir}"
+            run cp "${package_jar}" "${dir}/."
           fi
         done
-    done
+      done
   done
 }
 
@@ -161,39 +168,58 @@ create_new_ear_in_dir() {
   echo "${new_ear}"
 }
 
-## Overwrite the JAR libraries inside the EAR specific webapps,
-## most/all of which will be publication webapps.
+## $1 :: war
+should_patch_war() {
+  local war=$1
+  local war_base=
+  war_base=$(basename "${war}")
+
+  local -a should_not_be_patched=(
+    "escenic-admin.war"
+    "escenic.war"
+  )
+
+  local el=
+  for el in "${should_not_be_patched[@]}"; do
+    if [[ "${el}" == "${war_base}" ]]; then
+      return 1
+    fi
+  done
+
+  return 0
+}
+
+## Overwrite the JAR libraries inside the EAR specific webapps.
 ##
 ## $1 :: the dir in which the extracted EAR resides
-overwrite_publication_webapp_libs() {
+overwrite_webapp_libs() {
   local dir=$1
   local installed_package_war_list=
   installed_package_war_list=$(get_installed_packages_war_list)
 
-  for war in ${dir}/*.war; do
-    if [[ $(echo "${installed_package_war_list}" | grep -c "$(basename "${war}")") -gt 0 ]]; then
-      log "Don't need to fix $(basename "${war}") (it's provided by a package)"
-    else
-      local start=
-      local tmp_dir=
-      tmp_dir=$(mktemp -d)
+  find "${dir}" -name "*.war" | while read -r war; do
+    if ! should_patch_war "${war}"; then
+      continue
+    fi
+    local start=
+    local tmp_dir=
+    tmp_dir=$(mktemp -d)
 
-      log "Fixing $(basename "${war}"), extracting it to ${tmp_dir} ..."
-      run unzip -q "${war}" -d "${tmp_dir}"
+    log "Fixing $(basename "${war}"), extracting it to ${tmp_dir} ..."
+    run unzip -q "${war}" -d "${tmp_dir}"
 
-      start=$(date +%s)
-      overwrite_publication_webapp_libs_included_in_installed_packages "${tmp_dir}"
-      log "Fixing $(basename "${war}") took $(( $(date +%s) - start)) seconds ..."
+    start=$(date +%s)
+    overwrite_webapp_libs_included_in_installed_packages "${tmp_dir}"
+    log "Fixing $(basename "${war}") took $(( $(date +%s) - start)) seconds ..."
 
-      # to be sure it's prestine, we delete the old war
-      run rm "${war}"
-      (
-        cd "${tmp_dir}" || exit 1
-        run zip --recurse-paths --quiet "${war}" .
-      )
+    # to be sure it's prestine, we delete the old war
+    run rm "${war}"
+    (
+      cd "${tmp_dir}" || exit 1
+      run zip --recurse-paths --quiet "${war}" .
+    )
 
-      run rm -rf "${tmp_dir}"
-    fi
+    run rm -rf "${tmp_dir}"
   done
 }
 
@@ -304,6 +330,7 @@ merge_all_dirs_to_war() {
     remove_pid_and_exit_in_error
   fi
 
+  local dir=
   for dir in ${dir_list}; do
     if [ ! -d "${dir}/webapp" ]; then
       continue
@@ -336,6 +363,7 @@ merge_all_plugins_with_studio_war() {
     remove_pid_and_exit_in_error
   fi
 
+  local dir=
   for dir in ${dir_list}; do
     log "Adding studio plugin in ${dir} ..."
     local plugin_name=
@@ -417,13 +445,11 @@ repackage() {
   start_time=$(date +%s)
   extract_archive "${ear}" "${tmp_dir}"
 
-  remove_webapps_that_are_included_in_installed_packages "${tmp_dir}"
-  copy_webapps_that_are_included_in_installed_packages "${tmp_dir}"
-
   remove_libs_included_in_installed_packages "${tmp_dir}"
   copy_libs_included_in_installed_packages "${tmp_dir}"
 
-  overwrite_publication_webapp_libs "${tmp_dir}"
+  copy_webapps_included_in_installed_packages_if_not_exists "${tmp_dir}"
+  overwrite_webapp_libs "${tmp_dir}"
   merge_all_webservice_extension_webapps "${tmp_dir}"
   merge_all_webservice_webapps "${tmp_dir}"
   merge_all_studio_plugins "${tmp_dir}"

From 4cf198da760d4f0926b82ffaa8fd9336b7387397 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 6 Jan 2017 15:24:35 +0100
Subject: [PATCH 2462/2585] =?UTF-8?q?Updated=20email=20address:=20tkj@vizr?=
 =?UTF-8?q?t.com=20=E2=86=92=20torstein@escenic.com?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 usr/bin/ece                                                   | 2 +-
 usr/local/src/unit-tests/test-ece-install-content-engine      | 2 +-
 usr/sbin/ece-install                                          | 2 +-
 .../presentations/ece-install-introduction/presentation.org   | 2 +-
 usr/share/doc/vizrt/vosa-handbook/create-handbook.sh          | 2 +-
 usr/share/escenic/ece-scripts/common-bashing.sh               | 2 +-
 usr/share/escenic/ece-scripts/common-ece.sh                   | 2 +-
 usr/share/escenic/ece-scripts/common-io.sh                    | 2 +-
 usr/share/escenic/ece-scripts/common-os.sh                    | 2 +-
 usr/share/escenic/ece-scripts/common-pulse.sh                 | 2 +-
 usr/share/escenic/ece-scripts/ece.d/kill.sh                   | 2 +-
 usr/share/escenic/ece-scripts/ece.d/package.sh                | 2 +-
 usr/share/escenic/ece-scripts/ece.d/restart.sh                | 2 +-
 usr/share/escenic/ece-scripts/ece.d/start.sh                  | 2 +-
 usr/share/escenic/ece-scripts/ece.d/stop.sh                   | 2 +-
 .../escenic/ece-scripts/system-info.d/11-list-ece-overview.sh | 2 +-
 usr/share/escenic/ece-scripts/system-info.d/44-db-info.sh     | 2 +-
 .../escenic/ece-scripts/system-info.d/66-list-os-info.sh      | 2 +-
 usr/share/escenic/import-scripts/import-error-log-analyzer    | 2 +-
 usr/share/escenic/package-scripts/create-conf-packages        | 2 +-
 usr/share/escenic/package-scripts/create-packages             | 4 ++--
 21 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 5db1304b..4d9d5afe 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -4,7 +4,7 @@
 # the RMI hub and the indexer standalone instances. Type "ece help"
 # for a complete list of supported operations.
 #
-# echo comments and suggestions > tkj@vizrt.com
+# echo comments and suggestions > torstein@escenic.com
 
 ######################################################################
 # Needs to be here to bootstrap the ece script itself when it looks
diff --git a/usr/local/src/unit-tests/test-ece-install-content-engine b/usr/local/src/unit-tests/test-ece-install-content-engine
index 6537a253..20e69f06 100644
--- a/usr/local/src/unit-tests/test-ece-install-content-engine
+++ b/usr/local/src/unit-tests/test-ece-install-content-engine
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-# by tkj@vizrt.com
+# by torstein@escenic.com
 
 common_test_is_loaded > /dev/null 2>&1 || source common-test.sh
 
diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 65986240..8bd58cfd 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -9,7 +9,7 @@
 # Always check for the latest version at
 # http://github.com/vizrt/ece-scripts
 
-# echo comments and suggestions > tkj@vizrt.com
+# echo comments and suggestions > torstein@escenic.com
 # echo frustrations > /dev/null
 
 #####################################################################
diff --git a/usr/share/doc/escenic/presentations/ece-install-introduction/presentation.org b/usr/share/doc/escenic/presentations/ece-install-introduction/presentation.org
index 676fb6d3..779ecc09 100644
--- a/usr/share/doc/escenic/presentations/ece-install-introduction/presentation.org
+++ b/usr/share/doc/escenic/presentations/ece-install-introduction/presentation.org
@@ -122,7 +122,7 @@ Yes, that's it.
 
 * 問題?
 
-- Questions to tkj@vizrt.com
+- Questions to torstein@escenic.com
 - Or ask on the SaaS mailing list: saas@lists.escenic.com
 - Or pop by the SaaS chat room: saas@conference.ardendo.se
 
diff --git a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
index aff25785..ae146fae 100755
--- a/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
+++ b/usr/share/doc/vizrt/vosa-handbook/create-handbook.sh
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-# by tkj@vizrt.com
+# by torstein@escenic.com
 
 handbook_org=vosa-handbook.org
 target_dir=$HOME/tmp/$(basename $0 .sh)-$(date --iso)
diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index 76ed1f34..c59a60d4 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -6,7 +6,7 @@
 # * pid_file
 # * log
 #
-# by tkj@vizrt.com
+# by torstein@escenic.com
 
 debug=0
 
diff --git a/usr/share/escenic/ece-scripts/common-ece.sh b/usr/share/escenic/ece-scripts/common-ece.sh
index 30549e5e..eb8c0dc0 100644
--- a/usr/share/escenic/ece-scripts/common-ece.sh
+++ b/usr/share/escenic/ece-scripts/common-ece.sh
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-# by tkj@vizrt.com
+# by torstein@escenic.com
 
 ### get_instance_list
 ## If the system is installed using the recommended paths, the method
diff --git a/usr/share/escenic/ece-scripts/common-io.sh b/usr/share/escenic/ece-scripts/common-io.sh
index becc5ea9..70185ca5 100644
--- a/usr/share/escenic/ece-scripts/common-io.sh
+++ b/usr/share/escenic/ece-scripts/common-io.sh
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-# by tkj@vizrt.com
+# by torstein@escenic.com
 
 # depends on common-bashing
 common_bashing_is_loaded > /dev/null 2>&1 || source common-bashing.sh
diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index 62f6897d..dde23d0c 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -2,7 +2,7 @@
 
 # Platform/OS specific methods.
 #
-# by tkj@vizrt.com
+# by torstein@escenic.com
 
 # depends on common-bashing
 common_bashing_is_loaded > /dev/null 2>&1 || source $(pwd)/common-bashing.sh
diff --git a/usr/share/escenic/ece-scripts/common-pulse.sh b/usr/share/escenic/ece-scripts/common-pulse.sh
index a8cdeab9..445dd866 100644
--- a/usr/share/escenic/ece-scripts/common-pulse.sh
+++ b/usr/share/escenic/ece-scripts/common-pulse.sh
@@ -1,4 +1,4 @@
-# by tkj@vizrt.com
+# by torstein@escenic.com
 
 # depends on common-bashing
 common_bashing_is_loaded > /dev/null 2>&1 || source common-bashing.sh
diff --git a/usr/share/escenic/ece-scripts/ece.d/kill.sh b/usr/share/escenic/ece-scripts/ece.d/kill.sh
index 82564e49..901fa27a 100644
--- a/usr/share/escenic/ece-scripts/ece.d/kill.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/kill.sh
@@ -1,4 +1,4 @@
-# by tkj@vizrt.com
+# by torstein@escenic.com
 function kill_type() {
   if [ -n "$type_pid" ]; then
     message="Using force to stop the $instance instance of $type on $HOSTNAME ..."
diff --git a/usr/share/escenic/ece-scripts/ece.d/package.sh b/usr/share/escenic/ece-scripts/ece.d/package.sh
index 14a9b2c1..cef0a809 100644
--- a/usr/share/escenic/ece-scripts/ece.d/package.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/package.sh
@@ -33,7 +33,7 @@ Version: $version
 Section: base
 Priority: optional
 Architecture: all
-Maintainer: Torstein Krause Johansen <tkj@vizrt.com>
+Maintainer: Torstein Krause Johansen <torstein@escenic.com>
 Description: The Escenic Content Engine of type ${type}
   for the ${instance} instance. Built on $HOSTNAME
 EOF
diff --git a/usr/share/escenic/ece-scripts/ece.d/restart.sh b/usr/share/escenic/ece-scripts/ece.d/restart.sh
index 8afec933..cc11ddf0 100644
--- a/usr/share/escenic/ece-scripts/ece.d/restart.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/restart.sh
@@ -1,4 +1,4 @@
-# by tkj@vizrt.com
+# by torstein@escenic.com
 function restart_type() {
   stop_type
 
diff --git a/usr/share/escenic/ece-scripts/ece.d/start.sh b/usr/share/escenic/ece-scripts/ece.d/start.sh
index 7e691190..3d9392b3 100644
--- a/usr/share/escenic/ece-scripts/ece.d/start.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/start.sh
@@ -1,4 +1,4 @@
-# by tkj@vizrt.com
+# by torstein@escenic.com
 
 function start_type() {
   unset CLASSPATH
diff --git a/usr/share/escenic/ece-scripts/ece.d/stop.sh b/usr/share/escenic/ece-scripts/ece.d/stop.sh
index 2fbaf041..d54d0906 100644
--- a/usr/share/escenic/ece-scripts/ece.d/stop.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/stop.sh
@@ -1,4 +1,4 @@
-# by tkj@vizrt.com
+# by torstein@escenic.com
 function stop_type() {
   local message="Stopping the $instance instance of $type on $HOSTNAME ..."
 
diff --git a/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh b/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
index 2274457c..74afa0c5 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/11-list-ece-overview.sh
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-# by tkj@vizrt.com
+# by torstein@escenic.com
 
 ## $1 is the instance name
 function create_ece_overview() {
diff --git a/usr/share/escenic/ece-scripts/system-info.d/44-db-info.sh b/usr/share/escenic/ece-scripts/system-info.d/44-db-info.sh
index 8d66bc0b..ece85011 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/44-db-info.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/44-db-info.sh
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-# by tkj@vizrt.com
+# by torstein@escenic.com
 
 if [ "$(which mysqld 2>/dev/null)x" != "x" ]; then
   print_h2_header "DB information"
diff --git a/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
index 7e2d8965..ced6260a 100644
--- a/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
+++ b/usr/share/escenic/ece-scripts/system-info.d/66-list-os-info.sh
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-# by tkj@vizrt.com
+# by torstein@escenic.com
 
 print_h2_header "Operating system"
 
diff --git a/usr/share/escenic/import-scripts/import-error-log-analyzer b/usr/share/escenic/import-scripts/import-error-log-analyzer
index 322073c9..28d9c046 100644
--- a/usr/share/escenic/import-scripts/import-error-log-analyzer
+++ b/usr/share/escenic/import-scripts/import-error-log-analyzer
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-# by tkj@vizrt.com
+# by torstein@escenic.com
 
 ## Will check the passed log4j for import related errors and attempt
 ## to provide useful information on which actions to take to remedy
diff --git a/usr/share/escenic/package-scripts/create-conf-packages b/usr/share/escenic/package-scripts/create-conf-packages
index 0768d3de..656ef523 100755
--- a/usr/share/escenic/package-scripts/create-conf-packages
+++ b/usr/share/escenic/package-scripts/create-conf-packages
@@ -25,7 +25,7 @@ build_dir=/tmp/$(basename $0)-$(date --iso)
 package_name=escenic-content-engine-installer
 package_version=$(date +%Y-%m-%d.%H%M%S)
 default_maintainer_name="Torstein Krause Johansen"
-default_maintainer_email=tkj@vizrt.com
+default_maintainer_email=torstein@escenic.com
 server_admin_dir=~/src/nie/server-admin
 customer=nie
 habitat=prod
diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 76b8ad2b..6fa57eb1 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -3,13 +3,13 @@
 # script for creating DEB and RPM packages of the vosa, ece-install
 # and ece scripts.
 
-# by tkj@vizrt.com
+# by torstein@escenic.com
 
 target_dir=/tmp/$(basename $0)-$(date --iso)
 package_name=escenic-content-engine-installer
 package_version=$(date +%Y-%m-%d.%H%M%S)
 default_maintainer_name="Torstein Krause Johansen"
-default_maintainer_email=tkj@vizrt.com
+default_maintainer_email=torstein@escenic.com
 log=$HOME/.$(basename $0).log
 
 function clean_up() {

From 70c05aacbf117f4d28697fae6245c2198b7a3610 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 27 Jan 2017 15:46:06 +0100
Subject: [PATCH 2463/2585] ece repackage now deals with ancient trunk-SNAPSHOT
 dependencies too

- if the EAR to repackage contains trunk-SNAPSHOT dependencies, these
  will be replaced with OS installed package versions if
  available (just like if it contains older, released versions or
  develop-SNAPSHOT versions).

- added unit test to prove this
---
 usr/local/src/unit-tests/ece-repackage-test.sh   | 8 ++++++++
 usr/share/escenic/ece-scripts/ece.d/repackage.sh | 1 +
 2 files changed, 9 insertions(+)

diff --git a/usr/local/src/unit-tests/ece-repackage-test.sh b/usr/local/src/unit-tests/ece-repackage-test.sh
index 4de715e8..c4cfede2 100644
--- a/usr/local/src/unit-tests/ece-repackage-test.sh
+++ b/usr/local/src/unit-tests/ece-repackage-test.sh
@@ -10,6 +10,14 @@ test_can_get_base_name_of_develop_snapshot_dependency() {
   assertEquals "${expected}" "${actual}"
 }
 
+test_can_get_base_name_of_trunk_snapshot_dependency() {
+  local file=base-trunk-SNAPSHOT.jar
+  local expected=base
+  local actual=
+  actual=$(get_file_base ${file} .jar)
+  assertEquals "${expected}" "${actual}"
+}
+
 test_can_get_base_name_of_snapshot_dependency() {
   local file=base-2.0-SNAPSHOT.jar
   local expected=base
diff --git a/usr/share/escenic/ece-scripts/ece.d/repackage.sh b/usr/share/escenic/ece-scripts/ece.d/repackage.sh
index 93e5b1d0..20288003 100644
--- a/usr/share/escenic/ece-scripts/ece.d/repackage.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/repackage.sh
@@ -63,6 +63,7 @@ get_file_base() {
   basename "$1" "$2" |
     sed -r \
         -e 's#[-][0-9.-]+##' \
+        -e 's#-trunk-SNAPSHOT##' \
         -e 's#-develop-SNAPSHOT##' \
         -e 's#SNAPSHOT##' \
         -e 's#[.]$##' \

From ee24448fb716ab9a537d24bfa1666ce36ad545a8 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 3 Feb 2017 12:57:12 +0100
Subject: [PATCH 2464/2585] Added .gitignore witth shunit2 library

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..b0c519bf
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+usr/local/src/unit-tests/shunit2

From cd6da784185da9a71706fff8a70a94cfa88a5a83 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 3 Feb 2017 13:41:50 +0100
Subject: [PATCH 2465/2585] VOSA-242 escenic-content-engine-scripts now
 includes all conf files it needs

Before, escenic-content-engine-scripts didn't include two files that
were crucial:

/etc/escenic/ece.conf     # needed by /usr/bin/ece
/etc/default/ece          # needed by /etc/init.d/ece

The reason why we excluded can be read in
faeee24ec9ba7c4edc86905dba420b87f8867db6, that these were included in
the vosa-conf packages.

However, this severely reduced the usefulness of the package. This
meant that users had to read documentation to know that they had to
manually copy these files from an example directory to the right
locations to make /usr/bin/ece and /etc/init.d/ece work.

Furthermore, it made it impossible to get new additions to these files
when apt-get upgrading the package as these files are manually
copied. If we changed /usr/bin/ece to use a new default value in
/etc/escenic/ece.conf, the user would not get it and the command will
fail when upgrading the package.

What needs to be changed in vosa-conf DEB packages:

0) These two files must be removed from the vosa-conf packages

1) All changes from the default ece.conf needs to be put in
   ece-<instance>.conf. A file that we already have for most/all
   customers since we always run two instances on each machine (one
   ECE, one search).  Changes that the cloud tools does to
   /etc/default/ece will be kept when apt-get upgrading to a newer
   version of escenic-content-engine-scripts (that's standard
   dpkg/deb/apt functionality).
---
 usr/share/escenic/package-scripts/create-packages | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 6fa57eb1..69fc862d 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -137,7 +137,7 @@ function set_up_escenic-content-engine-scripts() {
   make_dir $doc_dir
   make_dir $target_dir/usr/share/escenic/ece-scripts
   make_dir $target_dir/usr/{bin,sbin,share/doc}
-  make_dir $target_dir/{etc,usr,/etc/default}
+  make_dir $target_dir/{etc/escenic,usr,/etc/default}
 
   # bin
   local bin_list='ece ece-import'
@@ -153,9 +153,8 @@ function set_up_escenic-content-engine-scripts() {
   # conf
   run cp ../../../../etc/bash_completion.d/{ece,ece-import,ece-deploy} \
     $target_dir/etc/bash_completion.d
-  # we don't include /etc/default/ece as this file often is also
-  # included in the conf packages.
-  # run cp -r ../../../../etc/default/ece $target_dir/etc/default/
+  run cp -r ../../../../etc/default/ece $target_dir/etc/default/
+  run cp -r ../../../../etc/escenic/ece.conf $target_dir/etc/escenic/
   run cp -r ../../../../etc/init.d/ece $target_dir/etc/init.d/
 
   # doc

From 33186be532587d4c1e7697b255618942f5c6e212 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Fri, 17 Feb 2017 14:53:53 +0100
Subject: [PATCH 2466/2585] Added resolver war in standard webapp list for
 dpres publication to work

---
 usr/share/escenic/ece-scripts/common-ece.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/ece-scripts/common-ece.sh b/usr/share/escenic/ece-scripts/common-ece.sh
index eb8c0dc0..0d238c27 100644
--- a/usr/share/escenic/ece-scripts/common-ece.sh
+++ b/usr/share/escenic/ece-scripts/common-ece.sh
@@ -94,6 +94,7 @@ webapps_in_standard_webapps_list="
   live-center
   live-center-presentation-webservice
   revision-history
+  resolver
 "
 
 ### is_webapp_a_publication

From 8b860821d715d7ddccc778dcc0ae06eea71e89f9 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 17 Feb 2017 09:28:50 +0100
Subject: [PATCH 2467/2585] Speed boost to common-bashing::debug

Use BASH string function instead of sub shell call to basename
---
 usr/share/escenic/ece-scripts/common-bashing.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index c59a60d4..fc4bd7c3 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -55,7 +55,7 @@ function get_id() {
 ## $@ :: as many strings as you want
 function debug() {
   if [ $debug -eq 1 ]; then
-    echo "[$(basename $0)-debug]" "$@"
+    echo "[${0##*/}-debug]" "$@"
   fi
 }
 

From e3d2674c38781654170b7b443c6db5708aefe4b9 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 10 Feb 2017 15:56:25 +0100
Subject: [PATCH 2468/2585] New strategy of dealing with merging (or copying)
 of package WARs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Bug fix in 'ece repackage': consider installed webservice webapps first

- when the EAR contains webservice.war and webservice-extensions.war,
  take the package installed WAR as a basis and just add the files
  unique to the version of the WAR inside the EAR file.

- added unit tests to prove that this works.

- fixed get_file_base() to also normalize timestamped snapshot JARs,
  like engine-jersey-develop-20170126.051354-372.jar,
  which is the Maven timestamp version the
  engine-jersey-develop-SNAPSHOT.jar

- added unit test for get_file_base fix

- added support for /usr/share/escenica being a symlink

- Replaced all use of basename and almost all of dirname → speed boost

- added profiling

- Improved merge_all_dirs_to_war

  -- If any of the past list of directories contain the same JARs as the
     WAR has, the version in the directory will take precedence.

  -- added unit test: Be sure that it uses the webservice.war install
     with the escenic-content-engine-<version> as a basis.

- Exclude other plugin webapp libs when patching plugin package webapp
  e.g. poll-ws shouldn't get the wf-taglib JARs.

- Now handles merging of jar.pack.gz files in studio.war too

- Fixed studio plugin location

- Fixed bugs WRT re-packaging studio.war with plugins and core studio
  -- now merges studio plugins correctly
  -- now handles pack.gz artifacts properly.
  -- added unit tests to document and prove fixes

- Fixed subtle bug in merging top dog webservice-extensions.war (index.jsp
  in plugins' webservice-extensions went missing).

- Added proof that webservice-extension plugins with index.jsp are merged correctly
---
 .../src/unit-tests/ece-repackage-test.sh      | 324 ++++++++++++++-
 .../escenic/ece-scripts/ece.d/repackage.sh    | 389 +++++++++++++++---
 2 files changed, 628 insertions(+), 85 deletions(-)
 mode change 100644 => 100755 usr/local/src/unit-tests/ece-repackage-test.sh

diff --git a/usr/local/src/unit-tests/ece-repackage-test.sh b/usr/local/src/unit-tests/ece-repackage-test.sh
old mode 100644
new mode 100755
index c4cfede2..8c11f4f7
--- a/usr/local/src/unit-tests/ece-repackage-test.sh
+++ b/usr/local/src/unit-tests/ece-repackage-test.sh
@@ -3,10 +3,26 @@
 # by torstein@escenic.com
 
 test_can_get_base_name_of_develop_snapshot_dependency() {
-  local file=base-develop-SNAPSHOT.jar
+  local file=/tmp/var/base-develop-SNAPSHOT.jar
   local expected=base
   local actual=
-  actual=$(get_file_base ${file} .jar)
+  actual=$(get_file_base ${file} jar)
+  assertEquals "${expected}" "${actual}"
+}
+
+test_can_get_base_name_jar_pack_gz() {
+  local file=/tmp/var/base-develop-SNAPSHOT.jar.pack.gz
+  local expected=base
+  local actual=
+  actual=$(get_file_base ${file} gz)
+  assertEquals "${expected}" "${actual}"
+}
+
+test_can_get_base_name_of_develop_timestamp_dependency() {
+  local file=base-develop-20170126.051354-372.jar
+  local expected=base
+  local actual=
+  actual=$(get_file_base ${file} jar)
   assertEquals "${expected}" "${actual}"
 }
 
@@ -14,7 +30,7 @@ test_can_get_base_name_of_trunk_snapshot_dependency() {
   local file=base-trunk-SNAPSHOT.jar
   local expected=base
   local actual=
-  actual=$(get_file_base ${file} .jar)
+  actual=$(get_file_base ${file} jar)
   assertEquals "${expected}" "${actual}"
 }
 
@@ -22,7 +38,7 @@ test_can_get_base_name_of_snapshot_dependency() {
   local file=base-2.0-SNAPSHOT.jar
   local expected=base
   local actual=
-  actual=$(get_file_base ${file} .jar)
+  actual=$(get_file_base ${file} jar)
   assertEquals "${expected}" "${actual}"
 }
 
@@ -30,7 +46,7 @@ test_can_get_base_name_of_regular_major_minor_dependency() {
   local file=base-2.0.1.jar
   local expected=base
   local actual=
-  actual=$(get_file_base ${file} .jar)
+  actual=$(get_file_base ${file} jar)
   assertEquals "${expected}" "${actual}"
 }
 
@@ -38,7 +54,7 @@ test_can_get_base_name_of_date_stamp_version() {
   local file=relaxngDatatype-20020414.jar
   local expected=relaxngDatatype
   local actual=
-  actual=$(get_file_base ${file} .jar)
+  actual=$(get_file_base ${file} jar)
   assertEquals "${expected}" "${actual}"
 }
 
@@ -46,7 +62,7 @@ test_can_get_base_name_of_regular_major_minor_dependency_with_build_number() {
   local file=base-2.0.1-23.jar
   local expected=base
   local actual=
-  actual=$(get_file_base ${file} .jar)
+  actual=$(get_file_base ${file} jar)
   assertEquals "${expected}" "${actual}"
 }
 
@@ -54,19 +70,19 @@ test_can_get_base_name_of_alpha_dependency() {
   local file=base-2.0.4-alpha-2.jar
   local expected=base
   local actual=
-  actual=$(get_file_base ${file} .jar)
+  actual=$(get_file_base ${file} jar)
   assertEquals "${expected}" "${actual}"
 
   file=base-2.0.4-beta-2.jar
   local expected=base
   local actual=
-  actual=$(get_file_base ${file} .jar)
+  actual=$(get_file_base ${file} jar)
   assertEquals "${expected}" "${actual}"
 
   file=base-2.0.4-rc-2.jar
   local expected=base
   local actual=
-  actual=$(get_file_base ${file} .jar)
+  actual=$(get_file_base ${file} jar)
   assertEquals "${expected}" "${actual}"
 }
 
@@ -74,33 +90,33 @@ test_can_get_base_name_of_alpha_dependency_semver() {
   local file=base-2.0.4-alpha.2.jar
   local expected=base
   local actual=
-  actual=$(get_file_base ${file} .jar)
+  actual=$(get_file_base ${file} jar)
   assertEquals "${expected}" "${actual}"
 
   file=base-2.0.4-beta.2.jar
   local expected=base
   local actual=
-  actual=$(get_file_base ${file} .jar)
+  actual=$(get_file_base ${file} jar)
   assertEquals "${expected}" "${actual}"
 
   file=base-2.0.4-rc.2.jar
   local expected=base
   local actual=
-  actual=$(get_file_base ${file} .jar)
+  actual=$(get_file_base ${file} jar)
   assertEquals "${expected}" "${actual}"
 }
 
 test_can_detect_that_escenic_admin_doesnt_need_patching() {
   local expected=1
   local actual=
-  should_patch_war "/path/to/escenic-admin.war" && actual=$? || actual=$?
+  should_patch_war_with_template_libs "/path/to/escenic-admin.war" && actual=$? || actual=$?
   assertEquals "${expected}" "${actual}"
 }
 
 test_can_detect_that_live_center_need_patching() {
   local expected=0
   local actual=
-  should_patch_war "/path/to/live-center.war" && actual=$? || actual=$?
+  should_patch_war_with_template_libs "/path/to/live-center.war" && actual=$? || actual=$?
   assertEquals "${expected}" "${actual}"
 }
 
@@ -192,6 +208,183 @@ test_can_merge_webservice_war_in_ear_replace_libraries_present_on_machine() {
                "${actual}"
 }
 
+## be sure that it uses the webservice.war install with the
+## escenic-content-engine-<version> as a basis.
+test_can_merge_webservice_war_include_all_files_in_package_war() {
+  local repackaged_ear=
+  repackaged_ear=$(quiet=1 repackage "${ear}" | tail -1)
+
+  local ear_extract_tmp_dir=
+  ear_extract_tmp_dir=$(mktemp -d)
+  (cd "${ear_extract_tmp_dir}" && jar xf "${repackaged_ear}")
+
+  local expected=0
+  actual=$(unzip -v "${ear_extract_tmp_dir}/webservice.war" |
+             grep -c "engine-jersey-${ECE_VERSION_IN_EAR}")
+  assertEquals "Version of engine-jersey (lib in webservice.war) in EAR should be replaced with package version" \
+               "${expected}" \
+               "${actual}"
+
+  expected=1
+  actual=$(unzip -v "${ear_extract_tmp_dir}/webservice.war" |
+             grep -c "engine-jersey-${ECE_VERSION}")
+  assertEquals "Version of engine-jersey (lib in webservice.war) in EAR should be replaced with package version" \
+               "${expected}" \
+               "${actual}"
+
+  expected=1
+  actual=$(unzip -v "${ear_extract_tmp_dir}/webservice.war" |
+             grep -c "engine-servletsupport-${ECE_VERSION}")
+  assertEquals "Version of engine-servletsupport (template lib) in EAR should be replaced with package version" \
+               "${expected}" \
+               "${actual}"
+
+}
+
+## be sure that it uses the webservice.war install with the
+## escenic-content-engine-<version> as a basis.
+test_can_merge_webservice_war_replace_plugin_jars() {
+  local repackaged_ear=
+  repackaged_ear=$(quiet=1 repackage "${ear}" | tail -1)
+
+  local ear_extract_tmp_dir=
+  ear_extract_tmp_dir=$(mktemp -d)
+  (cd "${ear_extract_tmp_dir}" && jar xf "${repackaged_ear}")
+
+  local expected=1
+  actual=$(unzip -v "${ear_extract_tmp_dir}/webservice.war" |
+             grep -c "plugin-webservice")
+  assertEquals "Should only be one plugin-webservice in webservice.war" \
+               "${expected}" \
+               "${actual}"
+  expected=1
+  local looking_for=${EAR_WEBSERVICE_WAR_PLUGIN_WEBSERVICE_LIB}-${PACKAGE_WEBSERVICE_WAR_PLUGIN_WEBSERVICE_LIB_VERSION}.jar
+  actual=$(unzip -v "${ear_extract_tmp_dir}/webservice.war" |
+             grep -c "${looking_for}")
+  assertEquals "Didn't find ${looking_for}" "${expected}" "${actual}"
+}
+
+test_can_merge_files_with_same_base_but_different_suffix() {
+  local repackaged_ear=
+  repackaged_ear=$(quiet=1 repackage "${ear}" | tail -1)
+
+  local tmp_dir=
+  tmp_dir=$(mktemp -d)
+
+  unzip -q "${repackaged_ear}" webservice.war -d "${tmp_dir}"
+  local expected=2
+  local actual=
+  actual=$(unzip -v "${tmp_dir}/webservice.war" |
+             grep -c "${EAR_WEBSERVICE_WAR_FILE_BOTH_CSS_AND_PDF}")
+  assertEquals "${expected}" "${actual}"
+
+  expected=1
+  actual=$(unzip -v "${tmp_dir}/webservice.war" |
+             grep -c "${EAR_WEBSERVICE_WAR_FILE_BOTH_CSS_AND_PDF}.css")
+  assertEquals "${expected}" "${actual}"
+
+  expected=1
+  actual=$(unzip -v "${tmp_dir}/webservice.war" |
+             grep -c "${EAR_WEBSERVICE_WAR_FILE_BOTH_CSS_AND_PDF}.pdf")
+  assertEquals "${expected}" "${actual}"
+
+  rm -r "${tmp_dir}"
+}
+
+## <plugin>/webapps/*.war should get patched with ECE's template libs,
+## but not with template libs from other plugins.
+test_can_exclude_other_plugin_webapp_libs_when_patching_plugin_package_webapp() {
+  local repackaged_ear=
+  repackaged_ear=$(quiet=1 repackage "${ear}" | tail -1)
+
+  local tmp_dir=
+  tmp_dir=$(mktemp -d)
+
+  unzip -q "${repackaged_ear}" "${EAR_PLUGIN2_WEBAPP}".war -d "${tmp_dir}"
+
+  local expected=0
+  local actual=
+  actual=$(unzip -v "${tmp_dir}/${EAR_PLUGIN2_WEBAPP}.war" |
+             grep -c "${EAR_PLUGIN_TEMPLATE_LIB}")
+  assertEquals "${expected}" "${actual}"
+}
+
+test_can_merge_webapp_extensions_index_jsp() {
+  local repackaged_ear=
+  repackaged_ear=$(quiet=1 repackage "${ear}" | tail -1)
+
+  local tmp_dir=
+  tmp_dir=$(mktemp -d)
+  unzip -q "${repackaged_ear}" "webservice-extensions.war" -d "${tmp_dir}"
+
+  local expected=1
+  local actual=
+  actual=$(unzip -v "${tmp_dir}/webservice-extensions.war" |
+             grep -c "${WEBSERVICE_EXTENSION_INDEX_JSP_REL_DIR}/index.jsp")
+  assertEquals "${expected}" "${actual}"
+
+  expected=${WEBSERVICE_EXTENSION_INDEX_JSP_CONTENTS_PACKAGE}
+  unzip -q "${tmp_dir}/webservice-extensions.war" \
+        "${WEBSERVICE_EXTENSION_INDEX_JSP_REL_DIR}/index.jsp" \
+        -d "${tmp_dir}"
+  actual=$(cat "${tmp_dir}/${EAR_PLUGIN_NAME}/datasource/index.jsp")
+  assertEquals "${expected}" "${actual}"
+}
+
+test_can_merge_studio_pack_gz_files() {
+  local repackaged_ear=
+  repackaged_ear=$(quiet=1 repackage "${ear}" | tail -1)
+
+  local tmp_dir=
+  tmp_dir=$(mktemp -d)
+
+  unzip -q "${repackaged_ear}" studio.war -d "${tmp_dir}"
+
+  local expected=0
+  local actual=
+
+  actual=$(unzip -v "${tmp_dir}/studio.war" |
+             grep -c "studio/lib/studio-core-${ECE_VERSION_IN_EAR}.jar.pack.gz")
+  assertEquals "Should merge CS library merged with correct version, no EAR version" \
+               "${expected}" \
+               "${actual}"
+
+  expected=1
+  actual=
+  actual=$(unzip -v "${tmp_dir}/studio.war" |
+             grep -c "studio/lib/studio-core-${ECE_VERSION}.jar.pack.gz")
+  assertEquals "Should merge CS library merged with correct version, include package version" \
+               "${expected}" \
+               "${actual}"
+}
+
+test_can_merge_studio_plugin_libaries_replace_version_ear() {
+  local repackaged_ear=
+  repackaged_ear=$(quiet=1 repackage "${ear}" | tail -1)
+
+  local tmp_dir=
+  tmp_dir=$(mktemp -d)
+
+  unzip -q "${repackaged_ear}" studio.war -d "${tmp_dir}"
+
+  local expected=0
+  local actual=
+
+  actual=$(unzip -v "${tmp_dir}/studio.war" |
+             grep -c "studio/plugin/${EAR_PLUGIN_NAME}/lib/${EAR_PLUGIN_NAME}-studio-${ECE_VERSION_IN_EAR}.jar")
+  assertEquals "Should merge CS plugin library correctly, not version in EAR." \
+               "${expected}" \
+               "${actual}"
+
+  expected=1
+  actual=
+  actual=$(unzip -v "${tmp_dir}/studio.war" |
+             grep -c "studio/plugin/${EAR_PLUGIN_NAME}/lib/${EAR_PLUGIN_NAME}-studio-${ECE_VERSION}.jar")
+  assertEquals "Should merge CS plugin library correctly, package version." \
+               "${expected}" \
+               "${actual}"
+}
+
 test_can_repackage_ear_no_duplicates_in_lib() {
   local repackaged_ear=
   repackaged_ear=$(quiet=1 repackage "${ear}" | tail -1)
@@ -216,6 +409,7 @@ EOF
 
 get_ece_package_webapp_names() {
   cat <<EOF
+escenic-admin.war
 studio.war
 webservice.war
 webservice-extensions.war
@@ -238,22 +432,78 @@ create_ece_package_installation() {
     )
   done
 
+  # webservice.war
+  local webservice_war_tmp="${tmp_dir}/webservice_tmp"
+  mkdir -p "${webservice_war_tmp}/WEB-INF/lib"
+  touch "${webservice_war_tmp}/WEB-INF/lib/engine-jersey-${ECE_VERSION}.jar"
+  touch "${webservice_war_tmp}/WEB-INF/lib/engine-servletsupport-${ECE_VERSION}.jar"
+  touch "${webservice_war_tmp}/WEB-INF/lib/${EAR_WEBSERVICE_WAR_FILE_BOTH_CSS_AND_PDF}.pdf"
+  (cd "${webservice_war_tmp}" &&
+     zip -q -u -r "${ece_share_dir}/webapps/webservice.war" .)
+
+  # webservice-extensions.war
+  local webservice_extensions_war_tmp="${tmp_dir}/webservice_extensions_tmp"
+  mkdir -p "${webservice_extensions_war_tmp}/WEB-INF/lib"
+  touch "${webservice_extensions_war_tmp}/index.jsp"
+  (cd "${webservice_extensions_war_tmp}" &&
+     zip -q -u -r "${ece_share_dir}/webapps/webservice-extensions.war" .)
+
+  # studio.war
+  local studio_war_tmp="${tmp_dir}/studio_tmp"
+  mkdir -p "${studio_war_tmp}/studio/lib"
+  touch "${studio_war_tmp}/studio/lib/studio-core-${ECE_VERSION}.jar.pack.gz"
+  (cd "${studio_war_tmp}" &&
+     zip -q -u -r "${ece_share_dir}/webapps/studio.war" .)
+
+  # global lib
   local ece_lib_dir="${ece_share_dir}/lib"
   mkdir -p "${ece_lib_dir}"
   touch "${ece_lib_dir}/engine-core-${ECE_VERSION}.jar"
 
+  # template lib
   local ece_template_dir="${ece_share_dir}/template"
   mkdir -p "${ece_template_dir}"
   for el in $(get_ece_package_template_files); do
-    local dir="${ece_template_dir}/$(dirname "${el}")"
+    local dir=
+    dir="${ece_template_dir}/$(dirname "${el}")"
     mkdir -p "${dir}"
     # create jar
-    local jar="${dir}/$(basename "${el}")"
+    local jar=
+    jar="${dir}/$(basename "${el}")"
     local f_tmp_dir=
     f_tmp_dir=$(mktemp -d)
     (cd "${f_tmp_dir}" && jar cf "${jar}" .)
     rm -r "${f_tmp_dir}"
   done
+
+  # a plugin
+  # - with a JAR to be added to webservice.war
+  # - with a JAR to be added to publication webapps
+  # - with a JAR to be added to studio.war
+  # - with an index.jsp to be added to webservice-extensions.war
+  local plugin_share_dir="${USR_SHARE_DIR}/escenic-${EAR_PLUGIN_NAME}"
+  local plugin_template_web_inf_lib="${plugin_share_dir}/publication/webapp/WEB-INF/lib"
+  local plugin_web_inf_lib="${plugin_share_dir}/webservice/webapp/WEB-INF/lib"
+  mkdir -p "${plugin_web_inf_lib}"
+  mkdir -p "${plugin_template_web_inf_lib}"
+  touch "${plugin_web_inf_lib}/${EAR_WEBSERVICE_WAR_PLUGIN_WEBSERVICE_LIB}-${PACKAGE_WEBSERVICE_WAR_PLUGIN_WEBSERVICE_LIB_VERSION}.jar"
+  touch "${plugin_template_web_inf_lib}/${EAR_PLUGIN_TEMPLATE_LIB}.jar"
+  local plugin_studio_lib_dir="${plugin_share_dir}/studio/lib"
+  mkdir -p "${plugin_studio_lib_dir}"
+  touch "${plugin_studio_lib_dir}/${EAR_PLUGIN_NAME}-studio-${ECE_VERSION}.jar"
+  export PLUGIN_INDEX_JSP="${plugin_share_dir}/webservice-extensions/webapp/${WEBSERVICE_EXTENSION_INDEX_JSP_REL_DIR}/index.jsp"
+  mkdir -p "${PLUGIN_INDEX_JSP%/*}"
+  echo "${WEBSERVICE_EXTENSION_INDEX_JSP_CONTENTS_PACKAGE}" > "${PLUGIN_INDEX_JSP}"
+
+  # another plugin
+  # - with a JAR to be added to studio.war
+  plugin_share_dir="${USR_SHARE_DIR}/escenic-${EAR_PLUGIN2_NAME}"
+  plugin_webapps_dir="${plugin_share_dir}/webapps"
+  mkdir -p "${plugin_webapps_dir}"
+  local plugin_ws_tmp_dir=
+  plugin_ws_tmp_dir=$(mktemp -d)
+  (cd "${plugin_ws_tmp_dir}" && jar cf "${plugin_webapps_dir}/${EAR_PLUGIN2_WEBAPP}.war" .)
+  rm -r "${plugin_ws_tmp_dir}"
 }
 
 create_ear_that_will_be_repackaged() {
@@ -283,10 +533,33 @@ create_ear_that_will_be_repackaged() {
   touch "${war_tmp_dir}/${EAR_WEBSERVICE_WAR_EXTENSION_FILE}"
   mkdir -p "${war_tmp_dir}/WEB-INF/lib"
   touch "${war_tmp_dir}/WEB-INF/lib/engine-servletsupport-${ECE_VERSION_IN_EAR}.jar"
+  touch "${war_tmp_dir}/WEB-INF/lib/engine-jersey-${ECE_VERSION_IN_EAR}.jar"
+  touch "${war_tmp_dir}/WEB-INF/lib/${EAR_WEBSERVICE_WAR_PLUGIN_WEBSERVICE_LIB}-${EAR_WEBSERVICE_WAR_PLUGIN_WEBSERVICE_LIB_VERSION}.jar"
+  touch "${war_tmp_dir}/WEB-INF/lib/${EAR_WEBSERVICE_WAR_FILE_BOTH_CSS_AND_PDF}.css"
+  (cd "${war_tmp_dir}" && jar cf "${war}" .)
+  rm -r "${war_tmp_dir}"
+
+  # create webservice-extensions.war
+  war_tmp_dir=$(mktemp -d)
+  local index_jsp_in_we_war="${war_tmp_dir}/${WEBSERVICE_EXTENSION_INDEX_JSP_REL_DIR}/index.jsp"
+  mkdir -p "${index_jsp_in_we_war%/*}"
+  echo "${WEBSERVICE_EXTENSION_INDEX_JSP_CONTENTS_EAR}" > "${index_jsp_in_we_war}"
+  (cd "${war_tmp_dir}" && jar cf "${ear_dir}/webservice-extensions.war" .)
+  rm -r "${war_tmp_dir}"
+
+  # create studio.war
+  war_tmp_dir=$(mktemp -d)
+  local studio_lib_dir="${war_tmp_dir}/studio/lib"
+  mkdir -p "${studio_lib_dir}"
+  touch "${studio_lib_dir}/studio-core-${ECE_VERSION_IN_EAR}.jar.pack.gz"
+  mkdir -p "${war_tmp_dir}/studio/plugin/${EAR_PLUGIN_NAME}/lib"
+  touch "${war_tmp_dir}/studio/plugin/${EAR_PLUGIN_NAME}/lib/${EAR_PLUGIN_NAME}-studio-${ECE_VERSION_IN_EAR}.jar"
+
+  war="${ear_dir}/studio.war"
   (cd "${war_tmp_dir}" && jar cf "${war}" .)
   rm -r "${war_tmp_dir}"
 
-  ear="${tmp_dir}/${BASH_SOURCE[0]}.ear"
+  ear="${tmp_dir}/$(basename "$0").ear"
   (cd "${ear_dir}" && jar cf "${ear}" .)
 }
 
@@ -305,6 +578,21 @@ setUp() {
 
   ECE_VERSION=6.7.5
   ECE_VERSION_IN_EAR=6.2.0
+
+  EAR_PLUGIN_NAME=foo-some-plugin
+  EAR_PLUGIN2_NAME=bar-some-other-plugin
+  EAR_PLUGIN2_WEBAPP=${EAR_PLUGIN2_NAME}-ws
+
+  WEBSERVICE_EXTENSION_INDEX_JSP_REL_DIR=${EAR_PLUGIN_NAME}/datasource
+  WEBSERVICE_EXTENSION_INDEX_JSP_CONTENTS_PACKAGE="<h1>hello from package</h1>"
+  WEBSERVICE_EXTENSION_INDEX_JSP_CONTENTS_EAR="<h2>Hello from ear</h2>"
+
+  EAR_WEBSERVICE_WAR_PLUGIN_WEBSERVICE_LIB=${EAR_PLUGIN_NAME}-webservice-lib
+  EAR_PLUGIN_TEMPLATE_LIB=${EAR_PLUGIN_NAME}-presentation
+  EAR_WEBSERVICE_WAR_PLUGIN_WEBSERVICE_LIB_VERSION=1.2.3
+  EAR_WEBSERVICE_WAR_FILE_BOTH_CSS_AND_PDF=hello-world
+  PACKAGE_WEBSERVICE_WAR_PLUGIN_WEBSERVICE_LIB_VERSION=5.3.1
+
   create_ece_package_installation "${tmp_dir}"
   create_ear_that_will_be_repackaged "${tmp_dir}"
 }
diff --git a/usr/share/escenic/ece-scripts/ece.d/repackage.sh b/usr/share/escenic/ece-scripts/ece.d/repackage.sh
index 20288003..d1d6cd73 100644
--- a/usr/share/escenic/ece-scripts/ece.d/repackage.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/repackage.sh
@@ -16,6 +16,10 @@ get_installed_packages_war_list() {
     done
 }
 
+get_installed_packages_war_name_list() {
+  get_installed_packages_war_list | sed 's#.*[/]##'
+}
+
 get_installed_packages_lib_list() {
   find "${USR_SHARE_DIR}/escenic-"* -maxdepth 1 -name "lib" -type d | \
     while read -r lib_dir; do
@@ -38,20 +42,29 @@ get_installed_packages_studio_list() {
        -name "studio" -type d
 }
 
-## $1 :: tmp dir with EAR contents
-copy_webapps_included_in_installed_packages_if_not_exists() {
-  local tmp_dir=$1
-  local war=
-  for war in $(get_installed_packages_war_list); do
-    local war_base=
-    war_base=$(basename "${war}")
-    if [[ ! -e "${tmp_dir}/${war_base}" ]]; then
-      run cp "${war}" "${tmp_dir}"
-    else
-      debug "EAR already has ${war_base}, will patch it"
-      # will be patched in overwrite_webapp_libs(), see main()
-    fi
-  done
+get_installed_package_webservice_war() {
+  find "${USR_SHARE_DIR}/escenic-content-engine-"* -maxdepth 2 \
+       -name "webservice.war" -type f
+}
+
+get_installed_package_studio_war() {
+  find "${USR_SHARE_DIR}/escenic-content-engine-"* -maxdepth 2 \
+       -name "studio.war" -type f
+}
+
+get_installed_package_webservice_extensions_war() {
+  find "${USR_SHARE_DIR}/escenic-content-engine-"* -maxdepth 2 \
+       -name "webservice-extensions.war" -type f
+}
+
+get_installed_package_content_engine_war_list() {
+  find "${USR_SHARE_DIR}/escenic-content-engine-"* -maxdepth 2 \
+       -name "*.war" -type f
+}
+
+get_installed_package_content_engine_war_name_list() {
+  get_installed_package_content_engine_war_list |
+    sed 's#.*[/]##'
 }
 
 ## Normalises the file name so that we can compare two JARs of
@@ -60,8 +73,22 @@ copy_webapps_included_in_installed_packages_if_not_exists() {
 ## $1 :: file name
 ## $2 :: suffix
 get_file_base() {
-  basename "$1" "$2" |
+  local file_name=$1
+  local suffix=${2:-}
+
+  file_name=${file_name##*/}
+
+  if [ -n "${suffix}" ]; then
+    file_name=${file_name//.${suffix}}
+  fi
+
+  # special handling of jar.pack.gz, the gz is removed in the above
+  # logic.
+  file_name=${file_name//jar.pack}
+
+  printf "%s\n" "${file_name}" |
     sed -r \
+        -e 's#-develop-[-\.0-9]+##' \
         -e 's#[-][0-9.-]+##' \
         -e 's#-trunk-SNAPSHOT##' \
         -e 's#-develop-SNAPSHOT##' \
@@ -82,7 +109,7 @@ remove_libs_included_in_installed_packages() {
     for ear_jar in "${tmp_dir}/lib/"*.jar; do
       ear_jar_base=$(get_file_base "${ear_jar}" jar)
       if [[ "${ear_jar_base}" == "${package_jar_base}" ]]; then
-        debug "Removing JAR in EAR, $(basename "${ear_jar}"),
+        debug "Removing JAR in EAR, ${ear_jar##*/},
                will be replaced with ${package_jar}"
         run rm "${ear_jar}"
       fi
@@ -103,16 +130,30 @@ copy_libs_included_in_installed_packages() {
 }
 
 ## $1 :: tmp dir with WAR contents
+## $2 :: base name of WAR file
 overwrite_webapp_libs_included_in_installed_packages() {
   local tmp_dir=$1
+  local war_name=$2
+
+  local is_a_package_war=0
+  is_a_package_war=$(
+    get_installed_packages_war_name_list |
+      grep -c -w "${war_name}" || true)
 
   local package_dir=
   for package_dir in "${USR_SHARE_DIR}/"*; do
     local template_lib_dir="${package_dir}/template/WEB-INF/lib"
-    if [ ! -d "${template_lib_dir}" ]; then
-      # ECE and its plugins put their publication specific libraries
-      # in different directory structures.
-      template_lib_dir="${package_dir}/publication/webapp/WEB-INF/lib"
+    if [[ ! -d "${template_lib_dir}" ]]; then
+
+      # Only patch the WAR with plugin template libraries if the WAR
+      # isn't a plugin webapp (e.g. poll-ws).
+      if [ "${is_a_package_war-0}" -eq 0 ]; then
+        # ECE and its plugins put their publication specific libraries
+        # in different directory structures. This is the location
+        # plugins use.
+        template_lib_dir="${package_dir}/publication/webapp/WEB-INF/lib"
+      fi
+
       if [ ! -d "${template_lib_dir}" ]; then
         continue
       fi
@@ -132,11 +173,10 @@ overwrite_webapp_libs_included_in_installed_packages() {
           if [[ "${pub_war_jar_base}" == "${package_jar_base}" ]]; then
             debug " -> Replacing ${pub_war_jar} with ${package_jar}"
             run rm "${pub_war_jar}"
-            run cp "${package_jar}" "$(dirname "${pub_war_jar}")"
+            run cp "${package_jar}" "${pub_war_jar%/*}/."
           else
             debug " -> ${pub_war} doesn't have ${package_jar}, adding it"
-            local dir=
-            dir="$(dirname "${pub_war_jar}")"
+            local dir="${pub_war_jar%/*}"
             make_dir "${dir}"
             run cp "${package_jar}" "${dir}/."
           fi
@@ -170,14 +210,12 @@ create_new_ear_in_dir() {
 }
 
 ## $1 :: war
-should_patch_war() {
+should_patch_war_with_template_libs() {
   local war=$1
-  local war_base=
-  war_base=$(basename "${war}")
+  local war_base=${war##*/}
 
   local -a should_not_be_patched=(
-    "escenic-admin.war"
-    "escenic.war"
+    $(get_installed_package_content_engine_war_name_list)
   )
 
   local el=
@@ -195,23 +233,21 @@ should_patch_war() {
 ## $1 :: the dir in which the extracted EAR resides
 overwrite_webapp_libs() {
   local dir=$1
-  local installed_package_war_list=
-  installed_package_war_list=$(get_installed_packages_war_list)
 
   find "${dir}" -name "*.war" | while read -r war; do
-    if ! should_patch_war "${war}"; then
+    if ! should_patch_war_with_template_libs "${war}"; then
       continue
     fi
-    local start=
     local tmp_dir=
     tmp_dir=$(mktemp -d)
 
-    log "Fixing $(basename "${war}"), extracting it to ${tmp_dir} ..."
-    run unzip -q "${war}" -d "${tmp_dir}"
-
+    local start=
     start=$(date +%s)
-    overwrite_webapp_libs_included_in_installed_packages "${tmp_dir}"
-    log "Fixing $(basename "${war}") took $(( $(date +%s) - start)) seconds ..."
+
+    run unzip -q "${war}" -d "${tmp_dir}"
+    overwrite_webapp_libs_included_in_installed_packages \
+      "${tmp_dir}" \
+      "${war##*/}"
 
     # to be sure it's prestine, we delete the old war
     run rm "${war}"
@@ -221,6 +257,7 @@ overwrite_webapp_libs() {
     )
 
     run rm -rf "${tmp_dir}"
+    log_profile "Fixing webapp libs for ${war##*/}" "${start}"
   done
 }
 
@@ -236,7 +273,7 @@ overwrite_webapp_libs() {
 ensure_ear_reference_and_lineage_sanity() {
   ## user passed a file or uri, that's easy.
   if [ -n "${file_or_uri}" ]; then
-    ear_name_or_hash=$(basename "${file_or_uri}")
+    ear_name_or_hash=${file_or_uri##*/}
     return
   fi
 
@@ -289,7 +326,7 @@ ensure_ear_reference_and_lineage_sanity() {
   elif [ -r "${default_cached_engine_ear}" ]; then
     print_and_log "Repackaging EAR ${default_cached_engine_ear} ... "
     file_or_uri=${default_cached_engine_ear}
-    ear_name_or_hash=$(basename "${default_cached_engine_ear}")
+    ear_name_or_hash=${default_cached_engine_ear##*/}
   else
     print_and_log "
       You must either specify an EAR to be repackaged
@@ -309,7 +346,7 @@ get_local_ear_reference() {
     export wget_auth=${wget_builder_auth-""}
 
     local file_name=
-    file_name=$(basename "${file_or_uri}")
+    file_name=${file_or_uri##*/}
 
     download_uri_target_to_dir "${file_or_uri}" "${cache_dir}" "${file_name}"
 
@@ -319,11 +356,12 @@ get_local_ear_reference() {
 
 ## $1 : WAR to update
 ## $2 : directories whose contents should be merged with that of the
-##      WAR
+##      WAR. If any of these contain the same JARs as the WAR has, the
+##      version in the directory will take precedence.
 merge_all_dirs_to_war() {
   local war=$1
   local dir_list=${*:2}
-  log "Merging all $(basename "${war}")s ..."
+  debug "Merging all ${war##*/}s ..."
 
   if [ ! -e "${war}" ]; then
     print_and_log "${war} doesn't exist 💀
@@ -331,23 +369,66 @@ merge_all_dirs_to_war() {
     remove_pid_and_exit_in_error
   fi
 
+  local tmp_dir=
+  tmp_dir=$(mktemp -d)
+  run unzip -q "${war}" -d "${tmp_dir}"
+
   local dir=
   for dir in ${dir_list}; do
     if [ ! -d "${dir}/webapp" ]; then
       continue
     fi
-    (
-      cd "${dir}/webapp" || exit 1
-      zip -q -r -u "${war}" . || {
-        # see 'man zip' for more details
-        if [ $? -eq 12 ]; then
-          log "${war} already contained the contents of ${dir}/webapp"
-        else
-          remove_pid_and_exit_in_error
-        fi
-      }
-    )
+
+    ## Look through all files, JARs and others, and see if they should
+    ## overwrite what's in the ${war} variable.
+    for f in $(find "${dir}" -type f); do
+      # Using builtin BASH string manipulation to save subshell
+      # calls. Need two steps to get a subset of the dir path.
+      local dir_inside_webapp=${f##*webapp/}
+      dir_inside_webapp=${dir_inside_webapp%/*}
+
+      local file_name="${f##*/}"
+      local file_suffix="${file_name##*.}"
+      local dir_inside_war="${tmp_dir}/${dir_inside_webapp}"
+
+      ## the the exploded WAR doesn't contain the file at all, create
+      ## the directory and copy the file.
+      if [ ! -d "${dir_inside_war}" ]; then
+        run mkdir -p "${dir_inside_war}"
+        run cp "${f}" "${dir_inside_war}"
+      else
+        # ok, so the WAR contains the directory of the current file
+        # being checked. Let's see if the WAR has (a different version
+        # of) that file.
+        local package_file_base=
+        package_file_base=$(get_file_base "${f}" "${file_suffix}")
+
+        local file_in_war=
+        for file_in_war in $(find "${dir_inside_war}" -type f); do
+          local file_in_war_name="${file_in_war##*/}"
+          local file_in_war_suffix="${file_in_war_name##*.}"
+
+          local file_in_war_base=
+          file_in_war_base=$(get_file_base "${file_in_war}" "${file_in_war_suffix}")
+
+          if [[ "${package_file_base}" == "${file_in_war_base}" &&
+                  "${file_suffix}" == "${file_in_war_suffix}" ]]; then
+            debug "Removing ${file_in_war} from ${war##*/} since" \
+                  "a different version exists in ${f}."
+            run rm "${file_in_war}"
+          fi
+        done
+
+        # Finally, copy the JAR from the package to the appropriate
+        # place in the WAR tmp dir.
+        debug "Adding ${f} to ${war##*/}"
+        run cp "${f}" "${dir_inside_war}"
+      fi
+    done
   done
+
+  run jar cf "${war}" -C "${tmp_dir}" .
+  run rm -r "${tmp_dir}"
 }
 
 ## Updates studio.war with available studio plugins
@@ -368,25 +449,39 @@ merge_all_plugins_with_studio_war() {
   for dir in ${dir_list}; do
     log "Adding studio plugin in ${dir} ..."
     local plugin_name=
-    plugin_name=$(basename $(dirname "${dir}"))
+    plugin_name=$(basename "${dir%/*}")
+    # our packages are called escenic-<plugin-name>, removing the prefix
+    plugin_name=${plugin_name//escenic[-]}
 
     local tmp_dir=
     tmp_dir=$(mktemp -d)
-    local plugin_dir_in_war="${tmp_dir}/studio/plugin/${plugin_name}"
+    run unzip -q "${war}" -d "${tmp_dir}"
+    local plugin_dir_in_war="${tmp_dir}/studio/plugin/${plugin_name}/lib"
     run mkdir -p "${plugin_dir_in_war}"
-    run cp -r "${dir}"/* "${plugin_dir_in_war}"
 
+    # Check if any of the files in dir exist with a different
+    # version in the target dir.
+    local file=
+    for file in $(find "${dir}" -type f); do
+      local file_suffix=${file##*.}
+      local file_base=
+      file_base=$(get_file_base "${file}" "${file_suffix}")
+
+      find "${plugin_dir_in_war}" \
+           -maxdepth 1 \
+           -type f \
+           -name "${file_base}*${file_suffix}" \
+           -delete
+      run cp "${file}" "${plugin_dir_in_war}/."
+    done
+
+    # to be sure it's prestine, we delete the old war
+    run rm "${war}"
     (
       cd "${tmp_dir}" || exit 1
-      zip -q -r -u "${war}" . || {
-        # see 'man zip' for more details
-        if [ $? -eq 12 ]; then
-          log "${war} already contained the contents of ${dir}"
-        else
-          remove_pid_and_exit_in_error
-        fi
-      }
+      run zip --recurse-paths --quiet "${war}" .
     )
+
     rm -r "${tmp_dir}"
   done
 }
@@ -395,6 +490,11 @@ merge_all_plugins_with_studio_war() {
 merge_all_webservice_extension_webapps() {
   local tmp_dir=$1
   local war=${tmp_dir}/webservice-extensions.war
+  if [ ! -e "${war}" ]; then
+    ## The EAR doesn't contain the war, copy it from the installed
+    ## package.
+    run cp "$(get_installed_package_webservice_extensions_war)" "${war}"
+  fi
   merge_all_dirs_to_war \
     "${war}" \
     "$(get_installed_packages_webservice_extensions_list)"
@@ -404,15 +504,90 @@ merge_all_webservice_extension_webapps() {
 merge_all_webservice_webapps() {
   local tmp_dir=$1
   local war=${tmp_dir}/webservice.war
+  if [ ! -e "${war}" ]; then
+    ## The EAR doesn't contain the war, copy it from the installed
+    ## package.
+    run cp "$(get_installed_package_webservice_war)" "${war}"
+  fi
   merge_all_dirs_to_war \
     "${war}" \
     "$(get_installed_packages_webservice_list)"
 }
 
+## $1 :: top dog WAR Takes precendence when there are libraries in
+##       both WARs. e.g. ECE's webservice.war
+##
+## $2 :: under dog WAR. e.g. the EAR's webservice.war. The file will
+##       be replaced with a ready patched WAR based on the top dog
+##       WAR, with additions in the EAR's webservice.war
+merge_wars_let_first_one_win() {
+  local topdog_war=$1
+  local underdog_war=$2
+
+  log "Replacing ${underdog_war##*/} in the EAR with ${topdog_war}" \
+      "just adding unique files from the version of the WAR inside" \
+      "the EAR."
+  local topdog_tmp_dir=
+  topdog_tmp_dir=$(mktemp -d)
+  local underdog_tmp_dir=
+  underdog_tmp_dir=$(mktemp -d)
+
+  run unzip -q "${topdog_war}" -d "${topdog_tmp_dir}"
+  run unzip -q "${underdog_war}" -d "${underdog_tmp_dir}"
+
+  local topdog_file=
+  local underdog_file=
+  local topdog_file_base=
+  local underdog_file_base=
+
+  # Remove any underdog file that topdog has a (different) version
+  # of. What's left in the underdog WAR will be added to the
+  # uppderog WAR, see below.
+  find "${topdog_tmp_dir}" -type f | while read topdog_file; do
+    local topdog_basename=${topdog_file##*/}
+    local topdog_file_suffix=${topdog_file##*.}
+    local topdog_dirname=${topdog_file%/*}
+    topdog_dirname=${topdog_dirname//${topdog_tmp_dir}}
+    topdog_file_base=$(get_file_base "${topdog_basename}" "${topdog_file_suffix}")
+
+    find "${underdog_tmp_dir}/${topdog_dirname}" \
+         -maxdepth 1 \
+         -name "${topdog_file_base}*${topdog_file_suffix}" \
+         -delete
+  done
+
+  # Use the topdog WAR as base and add any file from underdog WAR that
+  # the topdog doesn't have. The common libraries (but different
+  # version) has been removed in the foor loop above.
+  local tmp_result_war="${underdog_war}".tmp
+  run cp "${topdog_war}" "${tmp_result_war}"
+  (
+    cd "${underdog_tmp_dir}" || exit 1
+    zip -q -r -u "${tmp_result_war}" . || {
+      # see 'man zip' for more details
+      if [ $? -eq 12 ]; then
+        log "${tmp_result_war} already contained the contents of ${underdog_tmp_dir}"
+      else
+        remove_pid_and_exit_in_error
+      fi
+    }
+  )
+
+  run cp "${tmp_result_war}" "${underdog_war}"
+  run rm "${tmp_result_war}"
+  run rm -r "${underdog_tmp_dir}"
+  run rm -r "${topdog_tmp_dir}"
+}
+
 ## $1 :: tmp dir with EAR contents
 merge_all_studio_plugins() {
   local tmp_dir=$1
   local war=${tmp_dir}/studio.war
+  if [ ! -e "${war}" ]; then
+    ## The EAR doesn't contain the war, copy it from the installed
+    ## package.
+    cp "$(get_installed_package_studio_war)" "${war}"
+  fi
   merge_all_plugins_with_studio_war \
     "${war}" \
     "$(get_installed_packages_studio_list)"
@@ -421,7 +596,7 @@ merge_all_studio_plugins() {
 exit_if_no_os_packages_are_installed() {
   local packages_installed=
   packages_installed=$(
-    find "${USR_SHARE_DIR}" -maxdepth 1 -name "escenic-*"  -type d | wc -l)
+    find -L "${USR_SHARE_DIR}" -maxdepth 1 -name "escenic-*"  -type d | wc -l)
 
   if [ "${packages_installed}" -eq 0 ]; then
     print_and_log "No escenic packages installed on ${HOSTNAME} ☹"
@@ -429,6 +604,62 @@ exit_if_no_os_packages_are_installed() {
   fi
 }
 
+## Returns 0 if the passed WAR should be merged with that of the
+## package installed version.
+##
+## $1 :: The war, with full path or just file name. Only the basename
+##       will of the war will be compared.
+should_merge_package_war() {
+  local war=$1
+
+  if [ ! -e "${war}" ]; then
+    return 1
+  fi
+
+  declare -a should_be_merged_list=(
+    "webservice.war"
+    "webservice-extensions.war"
+    "studio.war"
+  )
+
+  local el=
+  for el in "${should_be_merged_list[@]}"; do
+    if [[ "${war##*/}" == "${el}"  ]]; then
+      return 0
+    fi
+  done
+
+  return 1
+}
+
+merge_or_overwrite_webapps_provided_by_packages() {
+  local tmp_dir=$1
+
+  local package_war_list=
+  package_war_list=$(get_installed_packages_war_list)
+
+  local package_war=
+  for package_war in ${package_war_list}; do
+    local war_name=${package_war##*/}
+    local ear_war="${tmp_dir}/${war_name}"
+
+    if should_merge_package_war "${package_war}"; then
+      merge_wars_let_first_one_win "${package_war}" "${ear_war}"
+    else
+      log "Overwriting WAR in EAR with ${package_war} ..."
+      run cp "${package_war}" "${tmp_dir}"
+    fi
+  done
+}
+
+## $1 :: string to be printed (what was being profile)
+## $2 :: start time, seconds since epoch, as in $(date +%s)
+log_profile() {
+  local what=$1
+  local start_time=$2
+  log "Profiling: ${what} took $(($(date +%s) - start_time)) seconds"
+}
+
 ## $1 :: EAR file or URI
 repackage() {
   local ear=
@@ -444,16 +675,40 @@ repackage() {
 
   print "Repackaging ${ear} with OS package installed JARs and WARs ..."
   start_time=$(date +%s)
+
+  local method_start=
+
+  method_start=$(date +%s)
   extract_archive "${ear}" "${tmp_dir}"
+  log_profile "extract_archive ${ear}" "${method_start}"
 
+  method_start=$(date +%s)
   remove_libs_included_in_installed_packages "${tmp_dir}"
+  log_profile "remove_libs_included_in_installed_packages" "${method_start}"
+
+  method_start=$(date +%s)
   copy_libs_included_in_installed_packages "${tmp_dir}"
+  log_profile "copy_libs_included_in_installed_packages" "${method_start}"
 
-  copy_webapps_included_in_installed_packages_if_not_exists "${tmp_dir}"
-  overwrite_webapp_libs "${tmp_dir}"
+  method_start=$(date +%s)
   merge_all_webservice_extension_webapps "${tmp_dir}"
+  log_profile "merge_all_webservice_extension_webapps" "${method_start}"
+
+  method_start=$(date +%s)
   merge_all_webservice_webapps "${tmp_dir}"
+  log_profile "merge_all_webservice_webapps" "${method_start}"
+
+  method_start=$(date +%s)
   merge_all_studio_plugins "${tmp_dir}"
+  log_profile "merge_all_studio_plugins" "${method_start}"
+
+  method_start=$(date +%s)
+  merge_or_overwrite_webapps_provided_by_packages "${tmp_dir}"
+  log_profile "merge_or_overwrite_webapps_provided_by_packages" "${method_start}"
+
+  method_start=$(date +%s)
+  overwrite_webapp_libs "${tmp_dir}"
+  log_profile "overwrite_webapp_libs" "${method_start}"
 
   # The ${file} variable is used by deploy.sh::deploy()
   export file=$(

From 575c49637ae2acb3d6fa82a3298fea1e9e68dece Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Mon, 27 Feb 2017 11:35:47 +0100
Subject: [PATCH 2469/2585] ece -i search1 -t search deploy now works with EARs
 without engine-config

Search instances should not have the engine-config JAR as this will
bootstrap the Nursery framework, which the search doesn't need. This will
just generate loads of errors in the logs.

deploy would therefore remove this JAR file. However, if the EAR doesn't
contain this config jar, the deployment should still work. This fix
fulfils this scenario  having an EAR file tailored for the search
instance.
---
 usr/share/escenic/ece-scripts/ece.d/deploy.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/deploy.sh b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
index f170df0e..f2ef04d3 100644
--- a/usr/share/escenic/ece-scripts/ece.d/deploy.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
@@ -281,5 +281,5 @@ function remove_unwanted_libraries() {
   fi
 
   log "Removing $1/engine-config-*.jar since this is a search instance"
-  run rm $1/engine-config-*.jar
+  run find "${1}/." -maxdepth 1 -name "engine-config-*.jar" -delete
 }

From 239a2da6d135166bdf97484da2d9fda88783a996 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Mon, 27 Feb 2017 15:30:39 +0100
Subject: [PATCH 2470/2585] ece-install can now figure out the latest Tomcat
 release again

- the Tomcat download matrix queried was still the 6.0 one (duh!)
- there should no need to set tomcat_download= in ece-install.conf
  anymore.
---
 usr/share/escenic/ece-scripts/common-os.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index dde23d0c..a663e29e 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -138,7 +138,7 @@ function get_tomcat_download_url() {
     local url=$tomcat_download
   else
     local url=$(
-        curl -s http://tomcat.apache.org/download-60.cgi | \
+        curl -s http://tomcat.apache.org/download-70.cgi | \
             grep tar.gz | \
             head -1 | \
             cut -d'"' -f2

From 7ae4c22b199ce7bab02e46567cb15fabc9bf52c0 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Fri, 3 Mar 2017 00:42:13 +0100
Subject: [PATCH 2471/2585] Made ece-install to generate right nursery
 component with correct class and package name

---
 usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh b/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
index bc3ef32d..264d2d1a 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
@@ -17,10 +17,10 @@ function install_memory_cache()
 }
 
 function memcached_set_up_common_nursery() {
-  local dir=$common_nursery_dir/com/danga
+  local dir=$common_nursery_dir/com/whalin/
   make_dir $dir
   cat > $dir/SockIOPool.properties <<EOF
-\$class=com.danga.MemCached.SockIOPool
+\$class=com.whalin.MemCached.SockIOPool
 # fill in memcached servers here.
 servers=${fai_memcached_node_list-localhost:11211}
 
@@ -41,6 +41,6 @@ EOF
   cat >> $common_nursery_dir/Initial.properties <<EOF
 
 # using memcached, added by $(basename $0) @ $(date --iso)
-service.0.0-memcached-socket-pool=/com/danga/SockIOPool
+service.0.0-memcached-socket-pool=/com/whalin/SockIOPool
 EOF
 }

From d2b7dfa2c6fbd878f875345b283a82b027157ab2 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Fri, 3 Mar 2017 00:46:18 +0100
Subject: [PATCH 2472/2585] Removed the trailing slash from directroy path for
 nursery component

---
 usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh b/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
index 264d2d1a..2fb2be5c 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
@@ -17,7 +17,7 @@ function install_memory_cache()
 }
 
 function memcached_set_up_common_nursery() {
-  local dir=$common_nursery_dir/com/whalin/
+  local dir=$common_nursery_dir/com/whalin
   make_dir $dir
   cat > $dir/SockIOPool.properties <<EOF
 \$class=com.whalin.MemCached.SockIOPool

From d26e46d2940ad7884cb771cae067f5d7e7d7c01a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Tue, 28 Feb 2017 16:08:08 +0100
Subject: [PATCH 2473/2585] Removed interactive mode from ece-install

- removed original read_user_input()
  there were two methods, the latter overriding the former (!)
- removed parsing of user non-FAI input + main()
- grouped all root level method calls into main()
- removed all usages of fai_enabled
- View diff without whitespace changes (-w) to see the actual changes
  here.
- removed usage of fai_enabled everywhere, including Puppet files,
  example configuration and documentation.
- updated the installation guide with historic information on the
  fai_enabled variable, why it was introduced and why it was removed.
- simplified ece-install::ask_for_instance_name()
---
 usr/sbin/ece-install                          | 140 ++++--------------
 usr/share/doc/escenic/ece-install-guide.org   |  14 +-
 .../examples/ece-install-all-in-one.conf      |   1 -
 .../examples/ece-install-analysis-engine.conf |   1 -
 .../ece-install-cache-and-content-engine.conf |   1 -
 .../escenic/examples/ece-install-cache.conf   |   1 -
 .../examples/ece-install-db-master.conf       |   1 -
 .../examples/ece-install-db-slave.conf        |   1 -
 .../ece-install-dev-environment-from-ear.conf |   3 -
 .../examples/ece-install-editorial.conf       |   3 -
 .../examples/ece-install-nfs-client.conf      |   1 -
 .../examples/ece-install-nfs-server.conf      |   1 -
 ...resentation-server-with-assembly-tool.conf |   2 -
 .../ece-scripts/ece-install.d/app-server.sh   | 126 +++++-----------
 .../ece-scripts/ece-install.d/cache-server.sh |  15 +-
 .../ece-install.d/content-engine.sh           |  60 +++-----
 .../ece-install.d/create-publication.sh       | 116 +++++++--------
 .../ece-install.d/restore-from-backup.sh      |  62 +-------
 .../modules/escenic/manifests/engine.pp       |   1 -
 .../skeleton-amazon/ece-install.conf.tmpl     |   3 -
 .../skeleton-dev/ece-install.conf.tmpl        |   3 -
 21 files changed, 145 insertions(+), 411 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 8bd58cfd..58c2537b 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -483,42 +483,6 @@ EOF
   fi
 }
 
-function read_user_input()
-{
-    installation_profiles=(
-        "$PROFILE_ALL_IN_ONE - All in one, full stack on one host,"\
-" suitable for dev & test environments"
-"$PROFILE_EDITORIAL_SERVER - Editorial (publication) server"
-"$PROFILE_PRESENTATION_SERVER - Presentation server (ECE + memcached)."
-"$PROFILE_DB_SERVER - Database server"
-"$PROFILE_CACHE_SERVER - Cache server (cache and web server)"
-"$PROFILE_RMI_HUB - RMI hub"
-"$PROFILE_SEARCH_SERVER - Search server (Solr + indexer-webapp)"
-"$PROFILE_WIDGET_FRAMEWORK - Install Widget Framework."
-"$PROFILE_RESTORE_FROM_BACKUP - Restore from backup"\
-" (DB, data files, binaries, conf & publications)"
-    )
-
-    echo "Hi, which server profile do you wish to install?"$'\n'
-
-    for (( i = 0; i < ${#installation_profiles[@]}; i++ )); do
-        echo "  " ${installation_profiles[$i]}
-    done
-
-    echo $'\n'"Select 1-${#installation_profiles[@]} and press ENTER"
-    echo -n "Your choice [1]> "
-    read install_profile_number
-
-    if [ -z "$install_profile_number" ]; then
-        install_profile_number=$PROFILE_ALL_IN_ONE
-    fi
-
-    if [ $(is_number $install_profile_number) -eq 0 ]; then
-        print_and_log "Profile number, $install_profile_number, is not a number"
-        remove_pid_and_exit_in_error
-    fi
-}
-
 function assert_correct_runtime_environment()
 {
     if [ $(whoami) != "root" ]; then
@@ -587,13 +551,11 @@ function check_software_credentials() {
       print_and_log "are insufficient to access ${url} :-("
       remove_pid_and_exit_in_error
     fi
-  elif [ ${fai_enabled-0} -eq 1 ]; then
-    if [[ ${fai_wf_install-0} -eq 1 || ${fai_all_install-0} -eq 1 ]]; then
-      print_and_log "You must have a valid wf_user & wf_password"
-      print_and_log "in your ${conf_file}. If you don't have these,"
-      print_and_log "please contact support@escenic.com"
-      remove_pid_and_exit_in_error
-    fi
+  elif [[ ${fai_wf_install-0} -eq 1 || ${fai_all_install-0} -eq 1 ]]; then
+    print_and_log "You must have a valid wf_user & wf_password"
+    print_and_log "in your ${conf_file}. If you don't have these,"
+    print_and_log "please contact support@escenic.com"
+    remove_pid_and_exit_in_error
   fi
 }
 
@@ -678,24 +640,17 @@ function common_pre_install() {
 # setting this.
 function ask_for_instance_name()
 {
-    if [ ${fai_enabled-0} -eq 0 ]; then
-        print "What do you want to call this ECE instance?"
-        print "Press ENTER to accept the default instance name, $1."
-        echo -n "Your choice [$1]> "
-        read instance_name
-    else
-        if [ $install_profile_number -eq $PROFILE_EDITORIAL_SERVER ]; then
-            instance_name=${fai_editor_name-$1}
-        elif [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ]; then
-            instance_name=${fai_presentation_name-$1}
-        elif [ $install_profile_number -eq $PROFILE_SEARCH_SERVER ]; then
-            instance_name=${fai_search_name-$1}
-        elif [ $install_profile_number -eq $PROFILE_ALL_IN_ONE ]; then
-            instance_name=${fai_all_name-$1}
-        elif [ $install_profile_number -eq $PROFILE_ANALYSIS_SERVER ]; then
-            instance_name=${fai_analysis_name-$1}
-        fi
-    fi
+    if [ $install_profile_number -eq $PROFILE_EDITORIAL_SERVER ]; then
+        instance_name=${fai_editor_name-$1}
+     elif [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ]; then
+        instance_name=${fai_presentation_name-$1}
+     elif [ $install_profile_number -eq $PROFILE_SEARCH_SERVER ]; then
+        instance_name=${fai_search_name-$1}
+     elif [ $install_profile_number -eq $PROFILE_ALL_IN_ONE ]; then
+         instance_name=${fai_all_name-$1}
+     elif [ $install_profile_number -eq $PROFILE_ANALYSIS_SERVER ]; then
+         instance_name=${fai_analysis_name-$1}
+     fi
 
     if [ -z "$instance_name" ]; then
         instance_name=$1
@@ -986,13 +941,14 @@ function get_java_package_name() {
   fi
 }
 
-read_user_input "$@"
-init
-assert_correct_runtime_environment
-get_java_package_name
 
-if [ ${fai_enabled-0} -eq 1 ]; then
-    print_and_log "Full Automatic Install (FAI) enabled."
+function main() {
+    read_user_input "$@"
+    init
+    assert_correct_runtime_environment
+    get_java_package_name
+
+    print_and_log "Full Automatic Install (FAI)."
     print_and_log "All user input will be read from $conf_file"
 
     common_pre_install
@@ -1120,53 +1076,7 @@ if [ ${fai_enabled-0} -eq 1 ]; then
     fi
 
     common_post_install
-else
-    read_user_input
-    common_pre_install
-
-    case $install_profile_number in
-        $PROFILE_ALL_IN_ONE)
-            install_all_in_one_environment
-            ;;
-        $PROFILE_CACHE_SERVER)
-            install_cache_server
-            ;;
-        $PROFILE_DB_SERVER)
-            install_database_server
-            ;;
-        $PROFILE_EDITORIAL_SERVER)
-            install_editorial_server
-            ;;
-        $PROFILE_PRESENTATION_SERVER)
-            install_presentation_server
-            ;;
-        $PROFILE_SEARCH_SERVER)
-            install_search_server
-            ;;
-        $PROFILE_RMI_HUB)
-            install_rmi_hub
-            ;;
-        $PROFILE_WIDGET_FRAMEWORK)
-            install_widget_framework
-            ;;
-        $PROFILE_CREATE_PUBLICATION)
-            create_publication
-            ;;
-        $PROFILE_RESTORE_FROM_BACKUP)
-            restore_from_backup
-            ;;
-        $PROFILE_VIP_PROVIDER)
-            install_vip_provider
-            ;;
-        $PROFILE_DB_BACKUP_SERVER)
-            set_up_db_backup
-            ;;
-        *)
-            print "Invalid profile number $install_profile_number, must be 1-11"
-            remove_pid_and_exit_in_error
-            ;;
-    esac
-    common_post_install
-fi
+}
 
+main "$@"
 exit 0
diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 23ac5058..f2bd5778 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -212,7 +212,6 @@ For example:
 #+BEGIN_SRC conf
 technet_user=<user>
 technet_password=<password>
-fai_enabled=1
 fai_<profile>_install=1
 fai_server_java_version=1.7
 #+END_SRC
@@ -451,7 +450,6 @@ on different hosts.
 
 First create the master database using these *ece-install.conf* settings:
 #+BEGIN_SRC conf
-fai_enabled=1
 fai_db_install=1
 fai_db_master=1
 fai_db_replication=1
@@ -471,7 +469,6 @@ database:
 On the slave database host you can then use these values in your
 *ece-install.conf* file as follows:
 #+BEGIN_SRC conf
-fai_enabled=1
 fai_db_install=1
 fai_db_replication=1
 fai_db_master=0
@@ -640,7 +637,6 @@ to specify what you want to restore are:
 So to restore everything in a specified backup file, you would need
 something like this in your *ece-install.conf* file:
 #+BEGIN_SRC conf
-fai_enabled=1
 fai_restore_from_backup=1
 fai_restore_all=1
 fai_restore_from_file=/var/backups/escenic/backup-2011-10-10.tar
@@ -712,7 +708,6 @@ mount under */mnt*.
 The following example shows the ece-install.conf settings required to
 mount the Escenic multimedia archive on the NFS server:
 #+BEGIN_SRC conf
-fai_enabled=1
 fai_nfs_client_install=1
 fai_nfs_server_address=192.168.1.200
 fai_nfs_export_list="/var/exports/multimedia"
@@ -753,7 +748,6 @@ Both providers are configured to expose the NFS service on the VIP
 
 #+BEGIN_SRC conf
 # install the NFS server
-fai_enabled=1
 fai_nfs_server_install=1
 fai_nfs_export_list="/var/exports/multimedia"
 fai_nfs_allowed_client_network="192.168.1.0/255.255.255.0"
@@ -1344,7 +1338,6 @@ To automatically install an editorial server and create a publication
 called "jollygood", run *ece-install* with the following settings:
 
 #+BEGIN_SRC conf
-fai_enabled=1
 fai_editor_install=1
 fai_publication_create=1
 fai_publication_name=jollygood
@@ -1354,14 +1347,12 @@ fai_publication_name=jollygood
 To install two presentation servers called *engine1* and
 *engine2* on the same host,  first run *ece-install* with the following settings:
 #+BEGIN_SRC conf
-fai_enabled=1
 fai_presentation_install=1
 fai_presentation_name=engine1
 #+END_SRC
 
 Then run it a second time with the following settings:
 #+BEGIN_SRC conf
-fai_enabled=1
 fai_presentation_install=1
 fai_presentation_name=engine2
 fai_presentation_port=8081
@@ -1725,7 +1716,10 @@ user was prompted for all the choices on what to install (most of
 which he/she could just hit ENTER to complete). Once this the
 interactive command was shown to customers and Escenic employees, the
 need for a fully automatic version became apparent and *ece-install*
-got the *fai_enabled* parameter to make the switch.
+got the *fai_enabled* parameter to make the switch. After the a number
+of years, we saw however, that pretty much everyone ran *ece-install*
+in its fully automatic mode, so in March 2017, we removed the
+interactive mode, making the *fai_enabled* parameter obsolete.
 
 For this reason, the *ece-install.conf* options which have a *fai_*
 prefix only applies when running *ece-install* in non-interactive
diff --git a/usr/share/doc/escenic/examples/ece-install-all-in-one.conf b/usr/share/doc/escenic/examples/ece-install-all-in-one.conf
index f45c27e5..e336f329 100644
--- a/usr/share/doc/escenic/examples/ece-install-all-in-one.conf
+++ b/usr/share/doc/escenic/examples/ece-install-all-in-one.conf
@@ -8,7 +8,6 @@ technet_password=
 wf_user=
 wf_password=
 
-fai_enabled=1
 fai_all_install=1
 
 ## This setting is useful if you're constantly re-running ece-install
diff --git a/usr/share/doc/escenic/examples/ece-install-analysis-engine.conf b/usr/share/doc/escenic/examples/ece-install-analysis-engine.conf
index b0c563f4..d4e46683 100644
--- a/usr/share/doc/escenic/examples/ece-install-analysis-engine.conf
+++ b/usr/share/doc/escenic/examples/ece-install-analysis-engine.conf
@@ -4,7 +4,6 @@
 technet_user=
 technet_password=
 
-fai_enabled=1
 fai_analysis_install=1
 fai_analysis_db_install=1
 fai_analysis_db_schema=analysisdb
diff --git a/usr/share/doc/escenic/examples/ece-install-cache-and-content-engine.conf b/usr/share/doc/escenic/examples/ece-install-cache-and-content-engine.conf
index 4be72c05..317f8468 100644
--- a/usr/share/doc/escenic/examples/ece-install-cache-and-content-engine.conf
+++ b/usr/share/doc/escenic/examples/ece-install-cache-and-content-engine.conf
@@ -13,7 +13,6 @@ technet_password=
 wf_user=
 wf_password=
 
-fai_enabled=1
 fai_cache_install=1
 fai_presentation_install=1
 fai_presentation_ear=http://my.buildserver.com/mypub-trunk-rev3568-2012-05-28_1213.ear
diff --git a/usr/share/doc/escenic/examples/ece-install-cache.conf b/usr/share/doc/escenic/examples/ece-install-cache.conf
index 82f4a93f..62358150 100644
--- a/usr/share/doc/escenic/examples/ece-install-cache.conf
+++ b/usr/share/doc/escenic/examples/ece-install-cache.conf
@@ -11,6 +11,5 @@ technet_password=
 wf_user=
 wf_password=
 
-fai_enabled=1
 fai_cache_install=1
 fai_cache_backends="app1:8080 app2:8080 app3:8080"
diff --git a/usr/share/doc/escenic/examples/ece-install-db-master.conf b/usr/share/doc/escenic/examples/ece-install-db-master.conf
index 670878c0..e274b02c 100644
--- a/usr/share/doc/escenic/examples/ece-install-db-master.conf
+++ b/usr/share/doc/escenic/examples/ece-install-db-master.conf
@@ -9,7 +9,6 @@ technet_password=
 wf_user=
 wf_password=
 
-fai_enabled=1
 fai_db_install=1
 fai_db_master=1
 fai_db_replication=1
diff --git a/usr/share/doc/escenic/examples/ece-install-db-slave.conf b/usr/share/doc/escenic/examples/ece-install-db-slave.conf
index fb589d49..ea60c956 100644
--- a/usr/share/doc/escenic/examples/ece-install-db-slave.conf
+++ b/usr/share/doc/escenic/examples/ece-install-db-slave.conf
@@ -9,7 +9,6 @@ technet_password=
 wf_user=
 wf_password=
 
-fai_enabled=1
 fai_db_install=1
 fai_db_master=0
 fai_db_replication=1
diff --git a/usr/share/doc/escenic/examples/ece-install-dev-environment-from-ear.conf b/usr/share/doc/escenic/examples/ece-install-dev-environment-from-ear.conf
index 59b195c4..80c73c8b 100644
--- a/usr/share/doc/escenic/examples/ece-install-dev-environment-from-ear.conf
+++ b/usr/share/doc/escenic/examples/ece-install-dev-environment-from-ear.conf
@@ -31,9 +31,6 @@ wf_download_list="
   http://download.escenic.com/release/release/54/widget-framework-community-2.0.1.126521.zip
 "
 
-# FAI enabled
-fai_enabled=1
-
 # Install a seperate search instance making us look cool, just like a
 # production environment.
 fai_search_install=1
diff --git a/usr/share/doc/escenic/examples/ece-install-editorial.conf b/usr/share/doc/escenic/examples/ece-install-editorial.conf
index e0598435..bab26c78 100644
--- a/usr/share/doc/escenic/examples/ece-install-editorial.conf
+++ b/usr/share/doc/escenic/examples/ece-install-editorial.conf
@@ -9,9 +9,6 @@ technet_password=
 wf_user=
 wf_password=
 
-# FAI enabled
-fai_enabled=1
-
 # Java
 fai_server_java_version=1.6
 
diff --git a/usr/share/doc/escenic/examples/ece-install-nfs-client.conf b/usr/share/doc/escenic/examples/ece-install-nfs-client.conf
index ee3f6b8a..849e6e9f 100644
--- a/usr/share/doc/escenic/examples/ece-install-nfs-client.conf
+++ b/usr/share/doc/escenic/examples/ece-install-nfs-client.conf
@@ -12,7 +12,6 @@ technet_password=
 wf_user=
 wf_password=
 
-fai_enabled=1
 fai_nfs_client_install=1
 fai_nfs_server_address=192.168.1.200
 fai_nfs_export_list="/var/exports/multimedia"  
diff --git a/usr/share/doc/escenic/examples/ece-install-nfs-server.conf b/usr/share/doc/escenic/examples/ece-install-nfs-server.conf
index 881bc10f..630e98f7 100644
--- a/usr/share/doc/escenic/examples/ece-install-nfs-server.conf
+++ b/usr/share/doc/escenic/examples/ece-install-nfs-server.conf
@@ -10,7 +10,6 @@ technet_password=
 wf_user=
 wf_password=
 
-fai_enabled=1
 fai_nfs_server_install=1
 fai_nfs_export_list="/var/exports/multimedia"
 fai_nfs_allowed_client_network="192.168.1.0/255.255.255.0"
diff --git a/usr/share/doc/escenic/examples/ece-install-presentation-server-with-assembly-tool.conf b/usr/share/doc/escenic/examples/ece-install-presentation-server-with-assembly-tool.conf
index a899d84e..d08fab99 100644
--- a/usr/share/doc/escenic/examples/ece-install-presentation-server-with-assembly-tool.conf
+++ b/usr/share/doc/escenic/examples/ece-install-presentation-server-with-assembly-tool.conf
@@ -3,8 +3,6 @@ technet_password=
 wf_user=
 wf_password=
 
-fai_enabled=1
-
 # This will set up a presentation server, downloading ECE & plugins +
 # Assembly Tool from Technet.
 fai_presentation_install=1
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index d46a6308..563a1453 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -16,45 +16,33 @@ function set_up_jdbc_library() {
 function set_up_app_server() {
   print_and_log "Setting up the application server ..."
 
-  if [ $fai_enabled -eq 0 ]; then
-    print "On which ports do you wish to run the app server on?"
-    print "Press ENTER to accept the default ports"
-    print "or enter: <port> <shutdown port> <redirect port>:"
-    echo -n "Your choice [${default_app_server_port} ${default_app_server_shutdown} ${default_app_server_redirect}]> "
-    read user_ports
-
-    if [ -n "$user_ports" ]; then
-      read appserver_port shutdown_port redirect_port <<< $user_ports
-    fi
-  else
-    if [ $install_profile_number -eq $PROFILE_EDITORIAL_SERVER ]; then
-      appserver_port=${fai_editor_port-${default_app_server_port}}
-      shutdown_port=${fai_editor_shutdown-${default_app_server_shutdown}}
-      redirect_port=${fai_editor_redirect-${default_app_server_redirect}}
-      leave_trail "trail_editor_host=${HOSTNAME}"
-      leave_trail "trail_editor_port=${fai_editor_port-${default_app_server_port}}"
-    elif [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ]; then
-      appserver_port=${fai_presentation_port-${default_app_server_port}}
-      shutdown_port=${fai_presentation_shutdown-${default_app_server_shutdown}}
-      redirect_port=${fai_presentation_redirect-${default_app_server_redirect}}
-      leave_trail "trail_presentation_host=${HOSTNAME}"
-      leave_trail "trail_presentation_port=${fai_presentation_port-${default_app_server_port}}"
-    elif [ $install_profile_number -eq $PROFILE_SEARCH_SERVER ]; then
-      appserver_port=${fai_search_port-${default_app_server_port}}
-      shutdown_port=${fai_search_shutdown-${default_app_server_shutdown}}
-      redirect_port=${fai_search_redirect-${default_app_server_redirect}}
-      leave_trail "trail_search_host=${HOSTNAME}"
-      leave_trail "trail_search_port=${fai_search_port-${default_app_server_port}}"
-    elif [ $install_profile_number -eq $PROFILE_ANALYSIS_SERVER ]; then
-      appserver_port=${fai_analysis_port-${default_app_server_port}}
-      shutdown_port=${fai_analysis_shutdown-${default_app_server_shutdown}}
-      redirect_port=${fai_analysis_redirect-${default_app_server_redirect}}
-      leave_trail "trail_analysis_host=${HOSTNAME}"
-      leave_trail "trail_analysis_port=${fai_analysis_port-${default_app_server_port}}"
-    elif [ $install_profile_number -eq $PROFILE_ALL_IN_ONE ]; then
-      leave_trail "trail_all_port=${default_app_server_port}"
-      leave_trail "trail_all_shutdown=${default_app_server_shutdown}"
-    fi
+  if [ $install_profile_number -eq $PROFILE_EDITORIAL_SERVER ]; then
+    appserver_port=${fai_editor_port-${default_app_server_port}}
+    shutdown_port=${fai_editor_shutdown-${default_app_server_shutdown}}
+    redirect_port=${fai_editor_redirect-${default_app_server_redirect}}
+    leave_trail "trail_editor_host=${HOSTNAME}"
+    leave_trail "trail_editor_port=${fai_editor_port-${default_app_server_port}}"
+  elif [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ]; then
+    appserver_port=${fai_presentation_port-${default_app_server_port}}
+    shutdown_port=${fai_presentation_shutdown-${default_app_server_shutdown}}
+    redirect_port=${fai_presentation_redirect-${default_app_server_redirect}}
+    leave_trail "trail_presentation_host=${HOSTNAME}"
+    leave_trail "trail_presentation_port=${fai_presentation_port-${default_app_server_port}}"
+  elif [ $install_profile_number -eq $PROFILE_SEARCH_SERVER ]; then
+    appserver_port=${fai_search_port-${default_app_server_port}}
+    shutdown_port=${fai_search_shutdown-${default_app_server_shutdown}}
+    redirect_port=${fai_search_redirect-${default_app_server_redirect}}
+    leave_trail "trail_search_host=${HOSTNAME}"
+    leave_trail "trail_search_port=${fai_search_port-${default_app_server_port}}"
+  elif [ $install_profile_number -eq $PROFILE_ANALYSIS_SERVER ]; then
+    appserver_port=${fai_analysis_port-${default_app_server_port}}
+    shutdown_port=${fai_analysis_shutdown-${default_app_server_shutdown}}
+    redirect_port=${fai_analysis_redirect-${default_app_server_redirect}}
+    leave_trail "trail_analysis_host=${HOSTNAME}"
+    leave_trail "trail_analysis_port=${fai_analysis_port-${default_app_server_port}}"
+  elif [ $install_profile_number -eq $PROFILE_ALL_IN_ONE ]; then
+    leave_trail "trail_all_port=${default_app_server_port}"
+    leave_trail "trail_all_shutdown=${default_app_server_shutdown}"
   fi
 
   if [ -z "$appserver_port" ]; then
@@ -67,32 +55,10 @@ function set_up_app_server() {
     redirect_port=${default_app_server_redirect}
   fi
 
-  if [ $fai_enabled -eq 0 ]; then
-    print "Another question: Where does the database run?"
-    print "Press ENTER to accept the default " \
-      "($HOSTNAME:${default_db_port}:${default_db_schema})"
-    print "Or enter: <host>:<port>:<schema>, e.g.: 'db1:${default_db_port}:mydb'"
-    echo -n "Your choice [$HOSTNAME:${default_db_port}:${default_db_schema}]> "
-    read user_database
-
-    db_host=$(echo $user_database | cut -d':' -f1)
-    db_port=$(echo $user_database | cut -d':' -f2)
-    db_schema=$(echo $user_database | cut -d':' -f3)
-  else
-    set_db_settings_from_fai_conf
-  fi
-
+  set_db_settings_from_fai_conf
   set_db_defaults_if_not_set
 
-  if [ $fai_enabled -eq 0 ]; then
-    print "Awfully sorry to bug you with so many questions, but:"
-    print "What's the URI to the indexer-webservice? (this is typically"
-    print "something like http://editor1/indexer-webservice/index/)"
-    echo -n "Your choice [http://${HOSTNAME}:${default_app_server_port}/indexer-webservice/index/]> "
-    read user_indexer_ws_uri
-  else
-    user_indexer_ws_uri=${fai_search_indexer_ws_uri}
-  fi
+  user_indexer_ws_uri=${fai_search_indexer_ws_uri}
 
   if [ -n "$user_indexer_ws_uri" ]; then
     indexer_ws_uri=$user_indexer_ws_uri
@@ -100,15 +66,7 @@ function set_up_app_server() {
     indexer_ws_uri=http://${HOSTNAME}:${appserver_port}/indexer-webservice/index/
   fi
 
-  if [ $fai_enabled -eq 0 ]; then
-    print "Really sorry to bug you again with a similar question:"
-    print "What's the URI to the indexer-webservice for presentation search? (this is typically"
-    print "something like http://editor1/indexer-webservice/presentation-index/)"
-    echo -n "Your choice [http://${HOSTNAME}:${default_app_server_port}/indexer-webservice/presentation-index/]> "
-    read user_presentation_indexer_ws_uri
-  else
-    user_presentation_indexer_ws_uri=${fai_presentation_search_indexer_ws_uri}
-  fi
+  user_presentation_indexer_ws_uri=${fai_presentation_search_indexer_ws_uri}
 
   if [ -n "$user_presentation_indexer_ws_uri" ]; then
     presentation_indexer_ws_uri=$user_presentation_indexer_ws_uri
@@ -118,27 +76,9 @@ function set_up_app_server() {
 
   leave_trail "trail_presentation_indexer_ws_uri=${presentation_indexer_ws_uri}"
 
-  if [ $fai_enabled -eq 0 ]; then
-    print "Last question, I promise!: Where does the search instance run?"
-    print "Press ENTER to accept the default ($HOSTNAME:${default_app_server_port})"
-    print "or enter: <host>:<port>, e.g.: 'search1:${default_app_server_port}'"
-    print "If you're in doubt, just press ENTER :-)"
-    echo -n "Your choice [$HOSTNAME:${default_app_server_port}]> "
-    read user_search
-
-    if [ -z "$user_search" ]; then
-      search_host=$HOSTNAME
-      search_port=${default_app_server_port}
-    else
-      search_host=$(echo $user_search | cut -d':' -f1)
-      search_port=$(echo $user_search | cut -d':' -f2)
-    fi
-
-  else
-    search_host=${fai_search_host-$HOSTNAME}
-    search_port=${fai_search_port-$default_app_server_port}
-    solr_port=${fai_solr_port-8983}
-  fi
+  search_host=${fai_search_host-$HOSTNAME}
+  search_port=${fai_search_port-$default_app_server_port}
+  solr_port=${fai_solr_port-8983}
 
   download_tomcat $download_dir
   local tomcat_archive=$(
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
index f6c79a1a..eeb47753 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
@@ -70,19 +70,8 @@ function install_cache_server() {
 
   install_varnish_software
 
-  if [ $fai_enabled -eq 0 ]; then
-    print "You must now list your backend servers."
-    print "These must be host names (not IPs) and must all be resolvable"
-    print "by your cache host ($HOSTNAME), preferably from /etc/hosts"
-    print "Seperate the entries with a space. e.g.: app1:8080 app2:8080."
-    print "Press ENTER to accept the default: ${HOSTNAME}:${appserver_port}"
-    echo -n "Your choice [${HOSTNAME}:${appserver_port}]> "
-    read backend_servers
-    cache_port=$default_cache_port
-  else
-    backend_servers=(${fai_cache_backends})
-    cache_port=${fai_cache_port-$default_cache_port}
-  fi
+  backend_servers=(${fai_cache_backends})
+  cache_port=${fai_cache_port-$default_cache_port}
 
   if [ -z "$backend_servers" ]; then
     backend_servers=("localhost:${appserver_port}")
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index a85e232d..4cd1c320 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -1,3 +1,4 @@
+# -*- mode: sh; sh-shell: bash; -*-
 # ece-install module Content Engine specific code.
 
 function get_deploy_white_list() {
@@ -8,23 +9,21 @@ function get_deploy_white_list() {
   local search_deploy_white_list="solr indexer-webapp"
 
   # user's deploy white list, if present, takes precedence.
-  if [ $fai_enabled -eq 1 ]; then
-    if [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ]; then
-      deploy_white_list=${fai_presentation_deploy_white_list-$presentation_deploy_white_list}
-    elif [ $install_profile_number -eq $PROFILE_EDITORIAL_SERVER ]; then
-      deploy_white_list=${fai_editor_deploy_white_list-$editor_deploy_white_list}
-    elif [ $install_profile_number -eq $PROFILE_SEARCH_SERVER ]; then
-      deploy_white_list=${fai_search_deploy_white_list-$search_deploy_white_list}
-    elif [ $install_profile_number -eq $PROFILE_ALL_IN_ONE ]; then
-      local default_all_deploy_white_list="
+  if [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ]; then
+    deploy_white_list=${fai_presentation_deploy_white_list-$presentation_deploy_white_list}
+  elif [ $install_profile_number -eq $PROFILE_EDITORIAL_SERVER ]; then
+    deploy_white_list=${fai_editor_deploy_white_list-$editor_deploy_white_list}
+  elif [ $install_profile_number -eq $PROFILE_SEARCH_SERVER ]; then
+    deploy_white_list=${fai_search_deploy_white_list-$search_deploy_white_list}
+  elif [ $install_profile_number -eq $PROFILE_ALL_IN_ONE ]; then
+    local default_all_deploy_white_list="
         ${presentation_deploy_white_list}
         ${editor_deploy_white_list}
         ${search_deploy_white_list}
       "
-      deploy_white_list=${fai_all_deploy_white_list-$default_all_deploy_white_list}
-    else
-      deploy_white_list=${fai_publication_deploy_white_list-""}
-    fi
+    deploy_white_list=${fai_all_deploy_white_list-$default_all_deploy_white_list}
+  else
+    deploy_white_list=${fai_publication_deploy_white_list-""}
   fi
 
   echo ${deploy_white_list}
@@ -34,12 +33,10 @@ function get_publications_webapps_list() {
 
   local publication_webapps=""
   # Publication service webapp mappping
-  if [ $fai_enabled -eq 1 ]; then
-    if [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ] || [ $install_profile_number -eq $PROFILE_ALL_IN_ONE ]; then
-      publication_webapps=${fai_publications_webapps-""}
-    else
-      publication_webapps=""
-    fi
+  if [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ] || [ $install_profile_number -eq $PROFILE_ALL_IN_ONE ]; then
+    publication_webapps=${fai_publications_webapps-""}
+  else
+    publication_webapps=""
   fi
   echo ${publication_webapps}
 }
@@ -129,11 +126,9 @@ function deploy_conf_package() {
 }
 
 function set_search_host_and_ports() {
-  if [ ${fai_enabled-0} -eq 1 ]; then
-    search_host=${fai_search_host-$HOSTNAME}
-    search_port=${fai_search_port-$default_app_server_port}
-    solr_port=${fai_solr_port-8983}
-  fi
+  search_host=${fai_search_host-$HOSTNAME}
+  search_port=${fai_search_port-$default_app_server_port}
+  solr_port=${fai_solr_port-8983}
 }
 
 ## $1=<default instance name>
@@ -598,15 +593,8 @@ function set_up_basic_nursery_configuration() {
   fi
 
   public_host_name=$HOSTNAME:${appserver_port}
-  if [ $fai_enabled -eq 1 ]; then
-    if [ -n "$fai_public_host_name" ]; then
-      public_host_name=$fai_public_host_name
-    fi
-  else
-    print "What is the public address of your website?"
-    print "Press ENTER to use the default ($public_host_name)"
-    echo -n "Your choice [$public_host_name]> "
-    read user_host_name
+  if [ -n "$fai_public_host_name" ]; then
+    public_host_name=$fai_public_host_name
   fi
 
   if [ -n "$user_host_name" ]; then
@@ -830,8 +818,7 @@ function is_installing_from_ear()
   log install_profile_number=$install_profile_number
   log ece_instance_ear_file=$ece_instance_ear_file
 
-  if [[ -z "$ece_instance_ear_file" || \
-    $fai_enabled -eq 0 ]]; then
+  if [[ -z "$ece_instance_ear_file" ]]; then
     echo 0
     return
   fi
@@ -844,8 +831,7 @@ function is_using_conf_archive(){
   log install_profile_number=$install_profile_number
   log ece_instance_conf_archive=$ece_instance_conf_archive
 
-  if [[ -z "$ece_instance_conf_archive" || \
-    $fai_enabled -eq 0 ]]; then
+  if [[ -z "$ece_instance_conf_archive" ]]; then
     echo 0
     return
   fi
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
index b0154261..3933fe6a 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
@@ -25,74 +25,72 @@ function create_publication_prepare_war_file() {
 function create_publication() {
   print_and_log "Preparing publication creation ..."
 
-  if [ ${fai_enabled-0} -eq 1 ]; then
-    # figure out which WAR to use for the publication creation
-    local publication_war=""
-    if [ -n "${fai_publication_ear}" ]; then
-      print_and_log "I will create all publications in" \
-        $fai_publication_ear "using the the domain mapping list ..."
-
-      ensure_variable_is_set fai_publication_domain_mapping_list
-      local the_tmp_dir=$(mktemp -d)
-
-      # we're using the builder HTTP crendentials, if set, for
-      # downloading the EAR.
-      if [[ -n "${fai_builder_http_user}" && \
-        -n "${fai_builder_http_password}" ]]; then
-        wget_auth="
+  # figure out which WAR to use for the publication creation
+  local publication_war=""
+  if [ -n "${fai_publication_ear}" ]; then
+    print_and_log "I will create all publications in" \
+                  $fai_publication_ear "using the the domain mapping list ..."
+
+    ensure_variable_is_set fai_publication_domain_mapping_list
+    local the_tmp_dir=$(mktemp -d)
+
+    # we're using the builder HTTP crendentials, if set, for
+    # downloading the EAR.
+    if [[ -n "${fai_builder_http_user}" && \
+            -n "${fai_builder_http_password}" ]]; then
+      wget_auth="
           --http-user $fai_builder_http_user
           --http-password $fai_builder_http_password
         "
+    fi
+    download_uri_target_to_dir $fai_publication_ear $download_dir
+    (
+      run cd $the_tmp_dir
+      run jar xf $download_dir/$(basename $fai_publication_ear)
+    )
+
+    ensure_that_instance_is_running ${fai_publication_use_instance-$default_ece_intance_name}
+    for el in ${fai_publication_domain_mapping_list}; do
+      local old_ifs=$IFS
+      # the entries in the fai_publication_domain_mapping_list are on
+      # the form: <publication[,pub.war]>#<domain>[#<alias1>[,<alias2>]]
+      IFS='#' read publication domain aliases <<< "$el"
+      IFS=',' read publication_name publication_war publication_type <<< "$publication"
+      IFS=$old_ifs
+
+      # this is the default case were the WAR is called the same as
+      # the publication name with the .war suffix.
+      if [ -z "${publication_war}" ]; then
+        publication_war=${publication_name}.war
       fi
-      download_uri_target_to_dir $fai_publication_ear $download_dir
-      (
-        run cd $the_tmp_dir
-        run jar xf $download_dir/$(basename $fai_publication_ear)
-      )
-
-      ensure_that_instance_is_running ${fai_publication_use_instance-$default_ece_intance_name}
-      for el in ${fai_publication_domain_mapping_list}; do
-        local old_ifs=$IFS
-        # the entries in the fai_publication_domain_mapping_list are on
-        # the form: <publication[,pub.war]>#<domain>[#<alias1>[,<alias2>]]
-        IFS='#' read publication domain aliases <<< "$el"
-        IFS=',' read publication_name publication_war publication_type <<< "$publication"
-        IFS=$old_ifs
-
-        # this is the default case were the WAR is called the same as
-        # the publication name with the .war suffix.
-        if [ -z "${publication_war}" ]; then
-          publication_war=${publication_name}.war
-        fi
 
-        create_the_publication $publication_name $the_tmp_dir/$publication_war $publication_type
-      done
+      create_the_publication $publication_name $the_tmp_dir/$publication_war $publication_type
+    done
 
-      log "Cleaing up $the_tmp_dir ..."
-      run rm -rf $the_tmp_dir
-    else
-      ensure_that_instance_is_running ${fai_publication_use_instance-$default_ece_intance_name}
-      local publication_name=${fai_publication_name-mypub}
-      local publication_type=${fai_publication_type-default}
-
-      if [ -z "${fai_publication_war}" ]; then
-        # if the user hasn't set the fai_publication_war, see if the
-        # demo-clean.war is available on the system.
-        local file=$escenic_root_dir/engine/contrib/wars/demo-clean.war
-        if [ -e $file ]; then
-          publication_war=$file
-        else
-          # if neither fai_publication_war nor demo-clean.war are
-          # available make the installation fail and inform the user
-          # of the need to set fai_publication_war
-          ensure_variable_is_set fai_publication_war
-        fi
+    log "Cleaing up $the_tmp_dir ..."
+    run rm -rf $the_tmp_dir
+  else
+    ensure_that_instance_is_running ${fai_publication_use_instance-$default_ece_intance_name}
+    local publication_name=${fai_publication_name-mypub}
+    local publication_type=${fai_publication_type-default}
+
+    if [ -z "${fai_publication_war}" ]; then
+      # if the user hasn't set the fai_publication_war, see if the
+      # demo-clean.war is available on the system.
+      local file=$escenic_root_dir/engine/contrib/wars/demo-clean.war
+      if [ -e $file ]; then
+        publication_war=$file
       else
-        publication_war=$fai_publication_war
+        # if neither fai_publication_war nor demo-clean.war are
+        # available make the installation fail and inform the user
+        # of the need to set fai_publication_war
+        ensure_variable_is_set fai_publication_war
       fi
-
-      create_the_publication $publication_name $publication_war $publication_type
+    else
+      publication_war=$fai_publication_war
     fi
+
+    create_the_publication $publication_name $publication_war $publication_type
   fi
 }
 
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/restore-from-backup.sh b/usr/share/escenic/ece-scripts/ece-install.d/restore-from-backup.sh
index 142e2821..aad2c23f 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/restore-from-backup.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/restore-from-backup.sh
@@ -42,8 +42,7 @@ function restore_from_backup()
 
   wipe_the_slate_clean
   
-  if [ ${fai_enabled-0} -eq 1 -a \
-    ${fai_restore_from_backup-0} -eq 1 ]; then
+  if [ ${fai_restore_from_backup-0} -eq 1 ]; then
     print_and_log "Restoring from backup on $HOSTNAME ..."
     
     backup_file=${fai_restore_from_file}
@@ -73,65 +72,6 @@ function restore_from_backup()
     if [ ${fai_restore_configuration-0} -eq 1 ]; then
       restore_conf=1
     fi
-  elif [ ${fai_enabled-0} -eq 0 ]; then
-    print "From which dataset do you wish to restore?"
-    if [ ! -d $backup_dir ]; then
-      print_and_log "Directory $backup_dir doesn't exist or isn't readable"
-      remove_pid_and_exit_in_error
-    fi
-
-    if [ $(ls $backup_dir | grep ".tar$" | wc -l) -lt 1 ]; then
-      print_and_log "No backup files (.tar) found in $backup_dir, exiting."
-      exit 0
-    fi
-    
-    local tarball_array=($(ls -t $backup_dir/*.tar))
-    
-    for (( i = 0; i <${#tarball_array[@]}; i++ )); do
-      echo "   " $(( ${i} + 1 )) "-" $(basename  ${tarball_array[$i]})
-    done
-    
-    print "Enter the number next to the tarball, from 1 to $i"
-    echo -n "Your choice [1]> "
-    read user_tarball
-
-    if [ -z "$user_tarball" ]; then
-      user_tarball=1
-    fi
-
-    backup_file=${tarball_array[$(( ${user_tarball} - 1 ))]}
-
-    print "Which part of the system do you wish to restore?"
-    restore_profiles=(
-      "The database"
-      "The Solr and ECE data files (multimedia archive)"
-      "The ECE configuration files"
-      "The Escenic and Tomcat software binaries + publication templates"
-      "Restore everything of the above"
-    )
-    for (( i = 0; i <${#restore_profiles[@]}; i++ )); do
-      echo "   " $(( ${i} + 1 )) "-" ${restore_profiles[$i]}
-    done
-    
-    print "Enter the number next to the tarball, from 1 to $i"
-    echo -n "Your choice [1]> "
-    read user_restore_profile
-
-    if [ -z "$user_restore_profile" ]; then
-      user_restore_profile=1
-    fi
-
-    if [ $user_restore_profile -eq 1 ]; then
-      restore_db=1
-    elif [ $user_restore_profile -eq 2 ]; then
-      restore_data_files=1
-    elif [ $user_restore_profile -eq 3 ]; then
-      restore_conf=1
-    elif [ $user_restore_profile -eq 4 ]; then
-      restore_binaries=1
-    elif [ $user_restore_profile -eq 5 ]; then
-      restore_all=1
-    fi
   fi
 
   if [ ! -r "$backup_file" ]; then
diff --git a/usr/share/puppet/modules/escenic/manifests/engine.pp b/usr/share/puppet/modules/escenic/manifests/engine.pp
index 7a95c77a..72de4a7d 100644
--- a/usr/share/puppet/modules/escenic/manifests/engine.pp
+++ b/usr/share/puppet/modules/escenic/manifests/engine.pp
@@ -15,7 +15,6 @@
 fai_db_password=$db_password
 fai_db_schema=$db_schema
 fai_db_user=$db_user
-fai_enabled=1
 fai_keep_off_etc_hosts=1
 fai_monitoring_server_ip=$monitoring_server_ip
 "
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/ece-install.conf.tmpl b/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/ece-install.conf.tmpl
index 532be81a..31b72c15 100644
--- a/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/ece-install.conf.tmpl
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-amazon/ece-install.conf.tmpl
@@ -9,9 +9,6 @@ technet_download_list=$TECHNET_DOWNLOAD_LIST
 nop=
 wf_download_list=
 
-# FAI enabled
-fai_enabled=1
-
 # add tomcat instance for search + analysis engine
 fai_search_install=1
 fai_search_port=8180
diff --git a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/ece-install.conf.tmpl b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/ece-install.conf.tmpl
index e5204c78..30d9453c 100644
--- a/usr/share/vizrt/vosa/generated-servers/skeleton-dev/ece-install.conf.tmpl
+++ b/usr/share/vizrt/vosa/generated-servers/skeleton-dev/ece-install.conf.tmpl
@@ -9,9 +9,6 @@ technet_download_list=\"$technet_download_list\"
 nop=
 wf_download_list=
 
-# FAI enabled
-fai_enabled=1
-
 # add tomcat instance for search + analysis engine
 fai_search_install=1
 fai_search_port=8180

From dba57c94e87933e903788e0b5059a4f5a5d90166 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Tue, 28 Feb 2017 16:21:25 +0100
Subject: [PATCH 2474/2585] Default name of an editorial instance is now
 engine1

- the default instance name for presentation instances was engine1 and
  this is what we're using all over the places anyway, regardless of
  the instance being editorial or presentation.

- no need to set fai_editor_name=engine1 anymore.
---
 usr/sbin/ece-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 58c2537b..84e9bd21 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -730,7 +730,7 @@ function install_editorial_server()
 {
     print_and_log "Installing an editorial server on $HOSTNAME ..."
     type=engine
-    install_ece_instance "editor1" 0
+    install_ece_instance "${default_ece_intance_name}" 0
 }
 
 function run_hook()

From 683e5d09134bd41c3783314bf4a241e0c3d9f2d4 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Wed, 1 Mar 2017 10:29:11 +0100
Subject: [PATCH 2475/2585] Added a TODO file with a simple road map

- Updated TODO list with a DONE item (remove interactive mode)
---
 TODO.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 TODO.md

diff --git a/TODO.md b/TODO.md
new file mode 100644
index 00000000..ab14616b
--- /dev/null
+++ b/TODO.md
@@ -0,0 +1,21 @@
+
+# Version 3.x aka "akbash"
+
+## /usr/sbin/ece-install
+
+- Support for installing ECE & plugins using the escenic APT
+  repositories.
+- YAML based configuration file format
+- Easier to extend `ece-install`. Preferably in any language. Put a
+  file in a directory and `ece-install` will execute that file at a
+  predictable point in time.
+- ✔ Remove the interactive mode. It's rarely used and complicates the
+  source code and configuration options unnecessarily.
+
+## /usr/bin/ece
+
+- Easier to extend, e.g. put `create-publication.sh` in a directory,
+  e.g.`ece.d`, and get `ece create-publication`. The
+  `create-publication` sub command is then included in TAB completion,
+  help screens and `man` pages.
+  

From 8deda4fae11fca6b6aa1816f5c882f004d899793 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Thu, 2 Mar 2017 14:45:23 +0100
Subject: [PATCH 2476/2585] Fixed regression in
 common-os::get_tomcat_download_url()

- the regression bug made ece-install skip looking up the correct
  Tomcat download URL, instead always falling back to the
  fallback_tomcat_url. Because of this, we had to update the
  fallback_url all the time, or provide one in the ece-install.conf
  file. This is no longer needed.

- the regression was introduced in
  75989b29bfbe3b6ffdb6f1554641d39d449f1846
---
 usr/local/src/unit-tests/common-os-test.sh | 26 ++++++++++++++++++++++
 usr/share/escenic/ece-scripts/common-os.sh | 12 +++++-----
 2 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100644 usr/local/src/unit-tests/common-os-test.sh

diff --git a/usr/local/src/unit-tests/common-os-test.sh b/usr/local/src/unit-tests/common-os-test.sh
new file mode 100644
index 00000000..57c74947
--- /dev/null
+++ b/usr/local/src/unit-tests/common-os-test.sh
@@ -0,0 +1,26 @@
+#! /usr/bin/env bash
+## author: torstein@escenic.com
+
+test_can_get_tomcat_download_url_should_not_get_fallback() {
+  unset tomcat_download
+  local actual=
+  actual=$(get_tomcat_download_url)
+
+  assertNotEquals "Shouldn't get the fallback url" "${fallback_tomcat_url}" "${actual}"
+}
+
+## @override shunit2
+setUp() {
+  source "$(dirname "$0")/../../../share/escenic/ece-scripts/common-os.sh"
+}
+
+## @override shunit2
+tearDown() {
+  :
+}
+
+main() {
+  . "$(dirname "$0")"/shunit2/source/2.1/src/shunit2
+}
+
+main "$@"
diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index a663e29e..0bc18188 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -5,7 +5,8 @@
 # by torstein@escenic.com
 
 # depends on common-bashing
-common_bashing_is_loaded > /dev/null 2>&1 || source $(pwd)/common-bashing.sh
+common_bashing_is_loaded > /dev/null 2>&1 ||
+  source "${BASH_SOURCE[0]%/*}/common-bashing.sh"
 
 ## Only used if the Tomcat download mirror couldn't be determined
 fallback_tomcat_url="http://apache.uib.no/tomcat/tomcat-7/v7.0.70/bin/apache-tomcat-7.0.70.tar.gz"
@@ -134,10 +135,11 @@ function assert_commands_available() {
 }
 
 function get_tomcat_download_url() {
-  if [ -n $tomcat_download ]; then
-    local url=$tomcat_download
+  local url=
+  if [ -n "${tomcat_download}" ]; then
+    url=$tomcat_download
   else
-    local url=$(
+    url=$(
         curl -s http://tomcat.apache.org/download-70.cgi | \
             grep tar.gz | \
             head -1 | \
@@ -145,7 +147,7 @@ function get_tomcat_download_url() {
     )
   fi
 
-  if [ -z $url ]; then
+  if [ -z "${url}" ]; then
     url=$fallback_tomcat_url
     log "Failed to get Tomcat mirror URL, will use fallback URL $url"
   fi

From 9e6003abc14a036261f942fa92ef9289e81a4928 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Thu, 2 Mar 2017 16:59:57 +0100
Subject: [PATCH 2477/2585] The zip command is needed by 'ece repackage'

---
 usr/sbin/ece-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 84e9bd21..32ec31a6 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -251,7 +251,7 @@ function install_packages_if_missing() {
 function install_common_os_packages()
 {
   print_and_log "Installing common OS packages ..."
-  local packages="curl wget unzip bc ca-certificates xml2"
+  local packages="curl wget unzip bc ca-certificates xml2 zip"
   local git_package=git
 
   if [ $on_debian_or_derivative -eq 1 ]; then

From 0c14a4ad50f83843c7b78766f986a31a08d818c2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Tue, 7 Mar 2017 13:56:29 +0100
Subject: [PATCH 2478/2585] Support for using APT instead of zip for escenic
 archives (WIP)

- Can now install ECE (profile=editor)

- ECE dir/home is now dynamically set depending on deb or zip install
  method

- Set owner on ECE directories as we create them: this makes
  ece-install more robust when extending it (earlier, we set the
  correct directory owner in a call to set_correct_permissions()
  change in content-engine::set_up_engine_directories()

- yaml-conf: WIP: Support for most used profiles & credentials

  -- editor
  -- presentation
  -- cache
  -- maven/technet credentials
  -- TDDed everything
  -- What's currently supported:

    ```
    credentials:
      - site: maven.escenic.com
        user: foo
        password: bar

    profiles:
      - editor: yes
      - search: yes
      - db: no

    environment:
      - java_home: /usr/lib/jvm/oracle-java8-jdk-amd64
      - use_escenic_packages: yes
    ```

- Simplified creation of tomcat_base/conf in app-server::set_up_app_server.
  There's no need to get too complicated about Tomcat instance
  configuration as long as we keep the -n flag (no clobber).
---
 .../ece-install-conf-file-reader-test.sh      | 288 ++++++++++++++++++
 usr/sbin/ece-install                          |  55 +++-
 .../ece-scripts/ece-install.d/app-server.sh   |   4 +-
 .../ece-install.d/conf-file-reader.sh         | 162 ++++++++++
 .../ece-install.d/content-engine.sh           |  68 ++++-
 .../ece-install.d/create-publication.sh       |   2 +-
 .../ece-install.d/package-based-install.sh    |  48 +++
 .../ece-scripts/ece-install.d/rmi-hub.sh      |   2 +-
 .../ece-install.d/search-server.sh            |  10 +-
 9 files changed, 606 insertions(+), 33 deletions(-)
 create mode 100644 usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
 create mode 100644 usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
 create mode 100644 usr/share/escenic/ece-scripts/ece-install.d/package-based-install.sh

diff --git a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
new file mode 100644
index 00000000..fea18f3f
--- /dev/null
+++ b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
@@ -0,0 +1,288 @@
+#! /usr/bin/env bash
+## author: torstein@escenic.com
+
+test_can_parse_yaml_conf_credentials() {
+  local yaml_file=
+  yaml_file=$(mktemp)
+  local escenic_download_user=foouser
+  local escenic_download_password=barpassword
+
+  cat > "${yaml_file}" <<EOF
+---
+credentials:
+  - site: maven.escenic.com
+    user: ${escenic_download_user}
+    password: ${escenic_download_password}
+EOF
+
+  unset technet_user
+  unset technet_password
+  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
+  assertNotNull "Should set technet_user" "${technet_user}"
+  assertEquals "Should set technet_user" "${escenic_download_user}" "${technet_user}"
+
+  assertNotNull "Should set technet_password" "${technet_password}"
+  assertEquals "Should set technet_password" "${escenic_download_password}" "${technet_password}"
+
+  rm -rf "${yaml_file}"
+}
+
+test_can_parse_yaml_conf_packages() {
+  local yaml_file=
+  yaml_file=$(mktemp)
+  local package_name=escenic-content-engine
+  local package_version=6.1.0-2
+
+  cat > "${yaml_file}" <<EOF
+---
+packages:
+  - name: ${package_name}
+    version: ${package_version}
+EOF
+  unset fai_package_map
+  declare -A fai_package_map
+  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
+
+  for name in "${!fai_package_map[@]}"; do
+    local version=${fai_package_map[${name}]}
+    assertEquals "Should have parsed package name" "${package_name}" "${name}"
+    assertEquals "Should have parsed package version" "${package_version}" "${version}"
+  done
+
+  rm -rf "${yaml_file}"
+}
+
+test_can_parse_yaml_conf_packages_multiple() {
+  local yaml_file=
+  yaml_file=$(mktemp)
+
+  local package_name=escenic-content-engine
+  local package_version=6.1.0-2
+  local package_name_without_version=escenic-video
+
+  cat > "${yaml_file}" <<EOF
+---
+packages:
+  - name: ${package_name}
+    version: ${package_version}
+  - name: ${package_name_without_version}
+EOF
+  unset fai_package_map
+  declare -A fai_package_map
+  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
+
+  for name in "${!fai_package_map[@]}"; do
+    local version=${fai_package_map[${name}]}
+
+    if [[ "${name}" == "${package_name_without_version}" ]]; then
+      assertNull "Package without version should have no version" \
+                 "${version}"
+    else
+      assertEquals "Should have parsed package version" "${package_version}" "${version}"
+    fi
+  done
+
+  rm -rf "${yaml_file}"
+}
+
+test_can_parse_yaml_conf_java_home() {
+  local yaml_file=
+  yaml_file=$(mktemp)
+  local foo_java_home=/usr/lib/jvm/foo-java-sdk
+
+  cat > "${yaml_file}" <<EOF
+---
+environment:
+  - java_home: ${foo_java_home}
+EOF
+
+  unset java_home
+  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
+  assertNotNull "Should set java_home" "${java_home}"
+  assertEquals "Should set java_home" "${foo_java_home}" "${java_home}"
+  rm -rf "${yaml_file}"
+}
+
+test_can_parse_yaml_conf_use_escenic_packages() {
+  local yaml_file=
+  yaml_file=$(mktemp)
+  local foo_java_home=/usr/lib/jvm/foo-java-sdk
+
+  cat > "${yaml_file}" <<EOF
+---
+environment:
+  - use_escenic_packages: yes
+EOF
+
+  unset fai_package_enabled
+  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
+  assertNotNull "Should set fai_package_enabled" "${fai_package_enabled}"
+  assertEquals "Should set fai_package_enabled" 1 "${fai_package_enabled}"
+  rm -rf "${yaml_file}"
+}
+
+test_can_parse_yaml_conf_presentation_install() {
+  local yaml_file=
+  yaml_file=$(mktemp)
+  cat > "${yaml_file}" <<EOF
+---
+profiles:
+  - presentation: yes
+EOF
+
+  unset fai_presentation_install
+  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
+  assertNotNull "Should set fai_presentation_install" "${fai_presentation_install}"
+  assertEquals "Should set fai_presentation_install" 1 "${fai_presentation_install}"
+
+  rm -rf "${yaml_file}"
+}
+
+test_can_parse_yaml_conf_search_install() {
+  local yaml_file=
+  yaml_file=$(mktemp)
+  cat > "${yaml_file}" <<EOF
+---
+profiles:
+  - search: yes
+EOF
+
+  unset fai_search_install
+  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
+  assertNotNull "Should set fai_search_install" "${fai_search_install}"
+  assertEquals "Should set fai_search_install" 1 "${fai_search_install}"
+
+  rm -rf "${yaml_file}"
+}
+
+test_can_parse_yaml_conf_editor_install() {
+  local yaml_file=
+  yaml_file=$(mktemp)
+  cat > "${yaml_file}" <<EOF
+---
+profiles:
+  - editor: yes
+    port: 8080
+    name: engine1
+EOF
+
+  unset fai_editor_install
+  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
+  assertNotNull "Should set fai_editor_install" "${fai_editor_install}"
+  assertEquals "Should set fai_editor_install" 1 "${fai_editor_install}"
+
+  rm -rf "${yaml_file}"
+}
+
+test_can_parse_yaml_conf_editor_install_multi_profiles() {
+  local yaml_file=
+  yaml_file=$(mktemp)
+  cat > "${yaml_file}" <<EOF
+profiles:
+  - editor: yes
+  - search: yes
+  - db: no
+EOF
+
+  unset fai_editor_install
+  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
+  assertNotNull "Should set fai_editor_install" "${fai_editor_install}"
+  assertEquals "Should set fai_editor_install" 1 "${fai_editor_install}"
+
+  rm -rf "${yaml_file}"
+}
+
+test_can_parse_yaml_conf_db_install() {
+  local yaml_file=
+  yaml_file=$(mktemp)
+  cat > "${yaml_file}" <<EOF
+---
+profiles:
+  - db: yes
+    port: 8080
+    name: engine1
+EOF
+
+  unset fai_db_install
+  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
+  assertNotNull "Should set fai_db_install" "${fai_db_install}"
+  assertEquals "Should set fai_db_install" 1 "${fai_db_install}"
+
+  rm -rf "${yaml_file}"
+}
+
+test_can_parse_yaml_conf_cache_install() {
+  local yaml_file=
+  yaml_file=$(mktemp)
+  cat > "${yaml_file}" <<EOF
+---
+profiles:
+  - cache: yes
+EOF
+
+  unset fai_cache_install
+  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
+  assertNotNull "Should set fai_cache_install" "${fai_cache_install}"
+  assertEquals "Should set fai_cache_install" 1 "${fai_cache_install}"
+
+  rm -rf "${yaml_file}"
+}
+
+test_can_recognise_a_yaml_conf_file() {
+  local yaml_file=
+  yaml_file=$(mktemp)
+  cat > "${yaml_file}" <<EOF
+---
+foo: bar
+EOF
+
+  local expected=0
+  is_yaml "${yaml_file}" && actual=$? || actual=$?
+  assertEquals "${expected}" "${actual}"
+
+  rm -rf "${yaml_file}"
+}
+
+test_can_recognise_a_conf_file_thats_not_yaml_xml() {
+  local yaml_file=
+  yaml_file=$(mktemp)
+  cat > "${yaml_file}" <<EOF
+<foo>bar</foo>
+EOF
+
+  local expected=1
+  is_yaml "${yaml_file}" && actual=$? || actual=$?
+  assertEquals "${expected}" "${actual}"
+
+  rm -rf "${yaml_file}"
+}
+
+test_can_recognise_a_conf_file_thats_not_yaml_conf() {
+  local yaml_file=
+  yaml_file=$(mktemp)
+  cat > "${yaml_file}" <<EOF
+<foo>bar</foo>
+EOF
+
+  local expected=1
+  is_yaml "${yaml_file}" && actual=$? || actual=$?
+  assertEquals "${expected}" "${actual}"
+
+  rm -rf "${yaml_file}"
+}
+
+## @override shunit2
+setUp() {
+  source "$(dirname "$0")/../../../share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh"
+}
+
+## @override shunit2
+tearDown() {
+  :
+}
+
+main() {
+  . "$(dirname "$0")"/shunit2/source/2.1/src/shunit2
+}
+
+main "$@"
diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 32ec31a6..c2257c6e 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -53,6 +53,9 @@ ece_scripts_version="straight-from-github"
 #Set the default database vendor. Possible values are mariadb and percona
 db_vendor=percona
 
+## Map with package name to version entries. The version can be empty.
+declare -A fai_package_map
+
 #####################################################################
 
 download_dir=${escenic_cache_dir}/$(basename $0)
@@ -61,7 +64,7 @@ conf_file=$HOME/ece-install.conf
 ece_scripts_git_source=https://github.com/escenic/ece-scripts.git
 maven_opts="--batch-mode"
 wget_opts="--continue --inet4-only --quiet"
-apt_opts="--no-install-recommends"
+apt_opts='--no-install-recommends -o Dpkg::Options::=--force-confold'
 curl_opts="--silent"
 
 # hook scripts
@@ -149,12 +152,27 @@ function init() {
   trap common_bashing_user_cancelled_hook SIGINT SIGHUP
 }
 
+function get_content_engine_dir() {
+  if [ "${fai_package_enabled-0}" -eq 1 ]; then
+    find "${escenic_root_dir}"/escenic-content-engine-* -maxdepth 0 |
+      tail -n 1
+  else
+    printf "%s\n" "${escenic_root_dir}/engine"
+  fi
+}
+
 function download_escenic_components()
 {
     if [ $ece_software_setup_completed -eq 1 ]; then
         return
     fi
 
+    if [ "${fai_package_enabled-0}" -eq 1 ]; then
+      escenic_root_dir=/usr/share/escenic
+      install_configured_escenic_packages
+      return
+    fi
+
     print_and_log "Downloading software from technet.escenic.com ..."
     run cd $download_dir
 
@@ -359,8 +377,8 @@ function set_correct_permissions()
         -user ${ece_user} | \
         wc -l)
       if [ $correct_permission -gt 0 ]; then
-        log "Data directory root, $el,"
-        log "has correct permissions, skiping sub directories."
+        log "Data directory root, $el," \
+            "has correct permissions, skiping sub directories."
         continue
       fi
     fi
@@ -422,6 +440,9 @@ function check_for_required_downloads()
   if [ $ece_software_setup_completed -eq 1 ]; then
     return
   fi
+  if [ "${fai_package_enabled-0}" -eq 1 ]; then
+    return
+  fi
 
   print_and_log "Asserting that required downloads succeeded ..."
   local required_escenic_packages="engine"
@@ -498,8 +519,6 @@ function assert_correct_runtime_environment()
       print_and_log $conf_file "doesn't exist." \
         "I cannot live without it, so I'm exiting :-("
       remove_pid_and_exit_in_error
-    else
-      source $conf_file
     fi
 }
 
@@ -562,8 +581,6 @@ function check_software_credentials() {
 function common_pre_install() {
     print "I'm logging to $log"
 
-    run source $conf_file
-
     # These variables are placed here as all the directories can be
     # overridden in ece-install.conf
     common_nursery_dir=$escenic_conf_dir/engine/common
@@ -586,23 +603,26 @@ function common_pre_install() {
       $escenic_spool_dir/import
     "
     ece_install_env=${escenic_run_dir}/$(basename $0).env
-    ensure_variable_is_set technet_user technet_password
-    wget_auth="--http-user ${technet_user} --http-password ${technet_password}"
-
     if [ -e /etc/debian_version -a -x /usr/bin/dpkg ]; then
         on_debian_or_derivative=1
         export DEBIAN_FRONTEND=noninteractive
 
-      # chicken and the egg problem, we need lsb_release to install the
-      # packages later on, hence as soon as we know we've got a Debian
-      # based platform, we install lsb-release. Also note, the
-      # executable, lsb_release, is in the list of required binaries in
-      # install_common_os_packages.
-      install_packages_if_missing "lsb-release"
+        # chicken and the egg problem, we need lsb_release to install
+        # the packages later on, hence as soon as we know we've got a
+        # Debian based platform, we install lsb-release. Also note,
+        # the executable, lsb_release, is in the list of required
+        # binaries in install_common_os_packages.
+        #
+        # Same goes for json_xs and jq which are required for parsing
+        # YAML conf files.
+        install_packages_if_missing "lsb-release libjson-xs-perl libyaml-perl jq"
     fi
 
     if [ -e /etc/redhat-release ]; then
       on_redhat_or_derivative=1
+      # TODO: ensure provides json_xs and that it's in the default
+      # CentOS & Redhat repos: perl-Cpanel-JSON-XS, jq. Need to add
+      # the EPEL repo.
       install_packages_if_missing "redhat-lsb"
 
       if [ $(lsb_release -i | grep RedHat | wc -l) -gt 0 ]; then
@@ -610,6 +630,9 @@ function common_pre_install() {
       fi
     fi
 
+    parse_yaml_conf_file_or_source_if_sh_conf "${conf_file}"
+    ensure_variable_is_set technet_user technet_password
+    wget_auth="--http-user ${technet_user} --http-password ${technet_password}"
     check_software_credentials
     assert_commands_available lsb_release
 
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 563a1453..529b6cee 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -101,10 +101,8 @@ function set_up_app_server() {
 
   if [ ! -d $tomcat_base ] ; then
     make_dir $tomcat_base
-    run cp -r ${appserver_parent_dir}/${tomcat_dir}/conf $tomcat_base
-  elif [ -d $tomcat_base/conf ]; then 
-    run cp -nr ${appserver_parent_dir}/${tomcat_dir}/conf/* $tomcat_base/conf/
   fi
+  run cp -rn ${appserver_parent_dir}/${tomcat_dir}/conf ${tomcat_base}/.
 
   for el in bin escenic/lib lib work logs temp webapps; do
     make_dir $tomcat_base/$el
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
new file mode 100644
index 00000000..849319e7
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
@@ -0,0 +1,162 @@
+# -*- mode: sh; sh-shell: bash; -*-
+
+## imports
+source "${BASH_SOURCE[0]%/*}/../common-os.sh"
+
+## $1 :; YAML file
+is_yaml() {
+  local yaml_file=$1
+  json_xs < "${yaml_file}" -f yaml -t json &> /dev/null || {
+    return 1
+  }
+
+  return 0
+}
+
+
+## Will parse the YAML file and set the corresponding fai_ parameters
+## that ece-install uses internally. Old ece-install.conf style files
+## are still supported: if ece-install cannot recognoise the file as
+## YAML it'll assume it's in the old format and will source it.
+##
+## $1 :: YAML file.
+parse_yaml_conf_file_or_source_if_sh_conf() {
+  assert_commands_available json_xs jq
+
+  local yaml_file=$1
+  if ! is_yaml "${yaml_file}"; then
+    source "${yaml_file}"
+    return
+  fi
+
+  _parse_yaml_conf_file_editor "${yaml_file}"
+  _parse_yaml_conf_file_presentation "${yaml_file}"
+  _parse_yaml_conf_file_search "${yaml_file}"
+  _parse_yaml_conf_file_db "${yaml_file}"
+  _parse_yaml_conf_file_cache "${yaml_file}"
+  _parse_yaml_conf_file_credentials "${yaml_file}"
+  _parse_yaml_conf_file_packages "${yaml_file}"
+  _parse_yaml_conf_file_environment "${yaml_file}"
+}
+
+_parse_yaml_conf_file_credentials() {
+  local yaml_file=$1
+  local count=0
+  count=$(_jq "${yaml_file}" ".credentials | length")
+  for ((i = 0; i < count; i++)); do
+    local user=
+    local password=
+    local site=
+    site=$(_jq "${yaml_file}" .credentials["${i}"].site)
+    user=$(_jq "${yaml_file}" .credentials["${i}"].user)
+    password=$(_jq "${yaml_file}" .credentials["${i}"].password)
+    if [[ "${site}" == maven.escenic.com ]]; then
+      export technet_user=${user}
+      export technet_password=${password}
+    fi
+  done
+
+}
+
+## Populates the global variable fai_package_map with package names
+## and (optionally) versions.
+##
+## Developer's note: This associative array is declared in this
+## module, but if it for reason is unset by the caller, the caller
+## must re-initialise it too (as is done in the unit tests).
+_parse_yaml_conf_file_packages() {
+  local yaml_file=$1
+  local count=0
+  count=$(_jq "${yaml_file}" ".packages | length")
+
+  for ((i = 0; i < count; i++)); do
+    local name=
+    local version=
+    name=$(_jq "${yaml_file}" .packages["${i}"].name)
+    version=$(_jq "${yaml_file}" .packages["${i}"].version)
+    fai_package_map[${name}]=${version}
+  done
+
+  for p in "${!fai_package_map[@]}"; do
+    echo p="$p" v="${fai_package_map[${p}]}"
+  done
+
+}
+
+_parse_yaml_conf_file_editor() {
+  local yaml_file=$1
+
+  local install_editor=no
+  install_editor=$(_jq "${yaml_file}" .profiles[].editor)
+  if [[ "${install_editor}" == "yes" ]]; then
+    export fai_editor_install=1
+  fi
+}
+
+_parse_yaml_conf_file_environment() {
+  local yaml_file=$1
+
+  local configured_java_home=
+  configured_java_home=$(_jq "${yaml_file}" .environment[].java_home)
+  if [[ -n "${configured_java_home}" ]]; then
+    export java_home=${configured_java_home}
+  fi
+
+  ## TODO tkj: if there's a 'packages:' stanza, can just set
+  ## fai_package_enabled=1
+  local configured_use_escenic_packages=
+  configured_use_escenic_packages=$(_jq "${yaml_file}" .environment[].use_escenic_packages)
+  if [[ "${configured_use_escenic_packages}" == "yes" ]]; then
+    export fai_package_enabled=1
+  fi
+}
+
+_parse_yaml_conf_file_presentation() {
+  local yaml_file=$1
+
+  local install_presentation=no
+  install_presentation=$(_jq "${yaml_file}" .profiles[].presentation)
+  if [[ "${install_presentation}" == "yes" ]]; then
+    export fai_presentation_install=1
+  fi
+}
+
+_parse_yaml_conf_file_search() {
+  local yaml_file=$1
+
+  local install_search=no
+  install_search=$(_jq "${yaml_file}" .profiles[].search)
+  if [[ "${install_search}" == "yes" ]]; then
+    export fai_search_install=1
+  fi
+}
+
+_parse_yaml_conf_file_cache() {
+  local yaml_file=$1
+
+  local install_cache=no
+  install_cache=$(_jq "${yaml_file}" .profiles[].cache)
+  if [[ "${install_cache}" == "yes" ]]; then
+    export fai_cache_install=1
+  fi
+}
+
+_parse_yaml_conf_file_db() {
+  local yaml_file=$1
+
+  local install_db=no
+  install_db=$(_jq "${yaml_file}" .profiles[].db)
+  if [[ "${install_db}" == "yes" ]]; then
+    export fai_db_install=1
+  fi
+}
+
+_jq() {
+  local yaml_file=$1
+  local key=$2
+
+  local json=
+  json=$(json_xs < "${yaml_file}" -f yaml -t json)
+  jq --raw-output --exit-status <<< "${json}" "${key}" 2>/dev/null |
+    grep -v null
+}
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 4cd1c320..d619e428 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -137,7 +137,6 @@ function install_ece_instance() {
 
   ask_for_instance_name $1
   set_up_engine_directories
-  set_up_ece_scripts
 
   set_archive_files_depending_on_profile
 
@@ -145,6 +144,7 @@ function install_ece_instance() {
 
   download_escenic_components
   check_for_required_downloads
+  set_up_ece_scripts
   set_up_engine_and_plugins
 
   # most likely, the user is _not_ installing from archives (EAR +
@@ -336,6 +336,9 @@ function set_up_engine_and_plugins() {
   if [ $ece_software_setup_completed -eq 1 ]; then
     return
   fi
+  if [ "${fai_package_enabled-0}" -eq 1 ]; then
+    return
+  fi
 
   print_and_log "Setting up the Escenic Content Engine & its plugins ..."
   make_dir $escenic_root_dir
@@ -397,6 +400,11 @@ function set_up_engine_and_plugins() {
 }
 
 function set_up_assembly_tool() {
+  ## TODO tkj, we still need AT with non-DPRES
+  if [ "${fai_package_enabled-0}" -eq 1 ]; then
+    return
+  fi
+
   print_and_log "Setting up the Assembly Tool ..."
 
   make_dir $escenic_root_dir/assemblytool/
@@ -409,7 +417,7 @@ function set_up_assembly_tool() {
   fi
 
   # adding an instance layer to the Nursery configuration
-  run cp -r $escenic_root_dir/engine/siteconfig/bootstrap-skeleton \
+  run cp -r $(get_content_engine_dir)/siteconfig/bootstrap-skeleton \
     $escenic_root_dir/assemblytool/conf
   run cd $escenic_root_dir/assemblytool/conf/
   run cp -r layers/host layers/environment
@@ -537,6 +545,10 @@ EOF
 }
 
 function set_up_basic_nursery_configuration() {
+  if [ "${fai_package_enabled-0}" -eq 1 ]; then
+    return
+  fi
+
   print_and_log "Setting up basic Nursery configuration ..."
 
   # we always copy the default plugin configuration (even if there is
@@ -572,16 +584,16 @@ function set_up_basic_nursery_configuration() {
     else
       print "Archive $ece_instance_conf_archive doesn't have JAAS config,"
       print "I'll use standard JAAS (engine/security) instead."
-      run cp -r $escenic_root_dir/engine/security/ $common_nursery_dir/
+      run cp -r $(get_content_engine_dir)/security/ $common_nursery_dir/
     fi
 
     run cp -rn engine/siteconfig/config-skeleton/* $common_nursery_dir/
-  elif [ -d $escenic_root_dir/engine/siteconfig/config-skeleton ] ; then
+  elif [ -d $(get_content_engine_dir)/siteconfig/config-skeleton ] ; then
     print_and_log "I'm using Nursery & JAAS configuration (skeleton) " \
-      "from $escenic_root_dir/engine"
-    run cp -rn $escenic_root_dir/engine/siteconfig/config-skeleton/* \
+      "from $(get_content_engine_dir)"
+    run cp -rn $(get_content_engine_dir)/siteconfig/config-skeleton/* \
       $common_nursery_dir/
-    run cp -r $escenic_root_dir/engine/security/ $common_nursery_dir/
+    run cp -r $(get_content_engine_dir)/security/ $common_nursery_dir/
   else
     print_and_log "I'm creating an empty config tree for you, since" \
       "no content engine was downloaded."
@@ -691,6 +703,10 @@ EOF
 }
 
 function set_up_instance_specific_nursery_configuration() {
+  if [ "${fai_package_enabled-0}" -eq 1 ]; then
+    return
+  fi
+
   print_and_log "Setting up instance specific Nursery configuration ..."
 
   for el in $escenic_conf_dir/engine/instance/*; do
@@ -839,10 +855,44 @@ function is_using_conf_archive(){
   echo 1
 }
 
+function _repackage_deploy_and_restart_type()
+{
+  if [ "$(is_using_conf_archive)" -eq 1 ]; then
+    local ece_command="
+      ece \
+        -i ${instance_name} \
+        -t ${type} \
+        repackage \
+        stop \
+        deploy \
+        start \
+        --uri ${ece_instance_ear_file}
+     "
+  else
+    local ece_command="
+      ece \
+        -i ${instance_name} \
+        -t ${type} \
+        repackage \
+        stop \
+        deploy \
+        start
+    "
+  fi
+
+  su - "${ece_user}" -c "${ece_command}" &>> "${log}"
+  exit_on_error "su - ${ece_user} -c ${ece_command}"
+}
+
 function assemble_deploy_and_restart_type()
 {
   set_correct_permissions
 
+  if [ "${fai_package_enabled-0}" -eq 1 ]; then
+    _repackage_deploy_and_restart_type
+    return
+  fi
+
   # need to run clean here since we might be running multiple profiles
   # in the same ece-install process.
   ece_command="ece -i $instance_name -t $type clean assemble deploy restart"
@@ -862,8 +912,10 @@ function assemble_deploy_and_restart_type()
 }
 
 function set_up_engine_directories() {
+  local el=
   for el in $engine_dir_list; do
-    make_dir $el
+    make_dir "${el}"
+    run chown -R "${ece_user}:${ece_group}" "${el}"
   done
 }
 
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
index 3933fe6a..a66256ae 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
@@ -77,7 +77,7 @@ function create_publication() {
     if [ -z "${fai_publication_war}" ]; then
       # if the user hasn't set the fai_publication_war, see if the
       # demo-clean.war is available on the system.
-      local file=$escenic_root_dir/engine/contrib/wars/demo-clean.war
+      local file=$(get_content_engine_dir)/contrib/wars/demo-clean.war
       if [ -e $file ]; then
         publication_war=$file
       else
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/package-based-install.sh b/usr/share/escenic/ece-scripts/ece-install.d/package-based-install.sh
new file mode 100644
index 00000000..fc05485f
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece-install.d/package-based-install.sh
@@ -0,0 +1,48 @@
+# -*- mode: sh; sh-shell: bash; -*-
+
+## Component handling package based installation of Escenic
+## components. Code specific to install Escenic sofftware using APT,
+## dpkg, YUM and or RPM goes here.
+##
+## author: torstein@escenic.com
+
+## Since the updater package assumes a working ECE environment and we
+## install it as a part of ece-install, it's a chicken and and egg
+## problem. Therefore, we must here set up a few pre-requisites for
+## the updater package to install smoothly.
+_install_prerequisites_for_updater_package() {
+  local the_tomcat_base=${appserver_parent_dir}/tomcat-${instance_name-engine1}
+  set_ece_instance_conf java_home "${java_home}"
+  set_ece_instance_conf tomcat_home "${appserver_parent_dir}/tomcat"
+  set_ece_instance_conf tomcat_base "${the_tomcat_base}"
+
+  make_dir "${the_tomcat_base}/webapps" \
+           "${the_tomcat_base}/escenic/lib"
+  run chown -R "${ece_user}:${ece_group}" "${the_tomcat_base}"
+}
+
+## Installs the configured escenic packages. If none were configured,
+## just ECE will be installed.
+install_configured_escenic_packages() {
+  _install_prerequisites_for_updater_package
+
+  if [ "${on_debian_or_derivative}" -eq 1 ]; then
+    local escenic_deb_packages=
+    local package=
+    for package in "${!fai_package_map[@]}"; do
+      local version=${fai_package_map[${package}]}
+      if [ -n "${version}" ]; then
+        escenic_deb_packages="${package}=${version} ${escenic_deb_packages}"
+      else
+        escenic_deb_packages="${package} ${escenic_deb_packages}"
+      fi
+    done
+
+    run apt-get install ${apt_opts} \
+        --assume-yes \
+        --force-yes \
+        ${escenic_deb_packages-escenic-content-engine}
+  elif [ "${on_redhat_or_derivative}" -eq 1 ]; then
+    :
+  fi
+}
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/rmi-hub.sh b/usr/share/escenic/ece-scripts/ece-install.d/rmi-hub.sh
index ffaa4cc6..2cb647e7 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/rmi-hub.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/rmi-hub.sh
@@ -4,7 +4,7 @@ function install_rmi_hub()
 {
   make_dir $escenic_conf_dir/rmi-hub
   
-  run cp -r $escenic_root_dir/engine/contrib/rmi-hub/config/* \
+  run cp -r $(get_content_engine_dir)/contrib/rmi-hub/config/* \
     $escenic_conf_dir/rmi-hub/
 
   hub_host=$HOSTNAME
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
index 1ad8bc49..fd6e3257 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
@@ -48,11 +48,13 @@ function multicore_solr_setup_pre_ece6(){
       run rm -r $a_tmp_dir
     else
       print_and_log "Installing default Solr conf shipped with ECE ..."
-      run cp -r $escenic_root_dir/engine/solr/conf $escenic_conf_dir/solr
+      local engine_dir=
+      engine_dir=$(get_content_engine_dir)
+      run cp -r ${engine_dir}/solr/conf $escenic_conf_dir/solr
       
       # ECE 5.6 has one additional configuration file!
-      if [ -e $escenic_root_dir/engine/solr/solr.xml ]; then
-        run cp -r $escenic_root_dir/engine/solr/solr.xml $escenic_conf_dir/. 
+      if [ -e ${engine_dir}/solr/solr.xml ]; then
+        run cp -r ${engine_dir}/solr/solr.xml $escenic_conf_dir/.
       fi
     fi
   else
@@ -205,7 +207,7 @@ function set_up_solr() {
       print_and_log "Installing default Solr conf shipped with ECE ..."
 
       for solr_core in ${solr_core_list}; do
-        run cp -r "$escenic_root_dir/engine/solr/conf" "$escenic_conf_dir/solr/${solr_core}"
+        run cp -r "$(get_content_engine_dir)/solr/conf" "$escenic_conf_dir/solr/${solr_core}"
       done
     fi
   else

From d4b8d79680612b0f506c9aa67633316058b8fe89 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Tue, 7 Mar 2017 12:48:46 +0100
Subject: [PATCH 2479/2585] ece list-deployments: Fixed message when listing
 all deployments

...for four years it's been saying the wrong thing.
---
 usr/bin/ece | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 4d9d5afe..ca8ee42a 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -775,7 +775,7 @@ function show_all_publications() {
 }
 
 function show_all_deployments() {
-  print "These are all the publications on ${instance}:"
+  print "These are all the deployments on ${instance}:"
   cat $(get_deployment_log)
 }
 

From 395a64fcd044763e5ba15695799349515eb832d2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Tue, 7 Mar 2017 14:54:36 +0100
Subject: [PATCH 2480/2585] ece repackage: Repackaging only makes sense for
 engine instances

- not search
- not analysis
- or RMI hub (help us) for that mattter
---
 usr/share/escenic/ece-scripts/ece.d/repackage.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece.d/repackage.sh b/usr/share/escenic/ece-scripts/ece.d/repackage.sh
index d1d6cd73..a5cba7e9 100644
--- a/usr/share/escenic/ece-scripts/ece.d/repackage.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/repackage.sh
@@ -667,6 +667,13 @@ repackage() {
 
   exit_if_no_os_packages_are_installed
 
+  if [[ "${type}" != "engine" ]]; then
+    print_and_log \
+      "Doesn't make sense to repackge ${type} instances →" \
+      "not repackaging EAR for ${instance}"
+    return
+  fi
+
   ensure_ear_reference_and_lineage_sanity "${file_or_uri}"
   ear=$(get_local_ear_reference "${file_or_uri}")
 

From f67d5830caa6c988aa0ffd2b588ef21c8937a54d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Tue, 7 Mar 2017 16:12:37 +0100
Subject: [PATCH 2481/2585] common::is_installing_post_ece6() + unit tests to
 doc usage

---
 usr/local/src/unit-tests/common-ece-test.sh | 60 +++++++++++++++++++++
 usr/share/escenic/ece-scripts/common-ece.sh | 13 +++++
 2 files changed, 73 insertions(+)
 create mode 100644 usr/local/src/unit-tests/common-ece-test.sh

diff --git a/usr/local/src/unit-tests/common-ece-test.sh b/usr/local/src/unit-tests/common-ece-test.sh
new file mode 100644
index 00000000..2e9e1b06
--- /dev/null
+++ b/usr/local/src/unit-tests/common-ece-test.sh
@@ -0,0 +1,60 @@
+#! /usr/bin/env bash
+## author: torstein@escenic.com
+
+test_can_determine_ece6_from_package_enabled_is_true() {
+  export fai_package_enabled=1
+
+  local expected=0
+  local actual=
+  is_installing_post_ece6 && actual=$? || actual=$?
+  assertEquals "Cand etermine ECE6 by fai_package_enabled" "${expected}" "${actual}"
+}
+
+test_can_determine_ece6_from_download_list_with_61() {
+  unset fai_package_enabled
+  export technet_download_list="
+    engine-6.1.3-234.zip
+  "
+
+  local expected=0
+  local actual=
+  is_installing_post_ece6 && actual=$? || actual=$?
+  assertEquals "Cand etermine ECE6 by download list" "${expected}" "${actual}"
+}
+
+test_can_determine_ece6_from_download_list_with_57() {
+  unset fai_package_enabled
+  export technet_download_list="
+    engine-5.7.3-234.zip
+  "
+
+  local expected=1
+  local actual=
+  is_installing_post_ece6 && actual=$? || actual=$?
+  assertEquals "Cand etermine ECE6 by download list" "${expected}" "${actual}"
+}
+
+test_can_determine_ece6_from_package_enabled_is_false() {
+  export fai_package_enabled=0
+
+  local expected=1
+  local actual=
+  is_installing_post_ece6 && actual=$? || actual=$?
+  assertEquals "Cand etermine ECE6 by fai_package_enabled" "${expected}" "${actual}"
+}
+
+## @OVERRIDE shunit2
+setUp() {
+  source "$(dirname "$0")/../../../share/escenic/ece-scripts/common-ece.sh"
+}
+
+## @override shunit2
+tearDown() {
+  :
+}
+
+main() {
+  . "$(dirname "$0")"/shunit2/source/2.1/src/shunit2
+}
+
+main "$@"
diff --git a/usr/share/escenic/ece-scripts/common-ece.sh b/usr/share/escenic/ece-scripts/common-ece.sh
index eb8c0dc0..22743e58 100644
--- a/usr/share/escenic/ece-scripts/common-ece.sh
+++ b/usr/share/escenic/ece-scripts/common-ece.sh
@@ -164,3 +164,16 @@ function is_escenic_xml_ok() {
 
   echo 1
 }
+
+## Returns 0 if we're installing ECE6 or later. 1 otherwise
+function is_installing_post_ece6() {
+  if [[ "${fai_package_enabled}" -eq 1 ]]; then
+    ## Either, we've got fai_package_enabled which implies ECE >= 6.
+    return 0
+  else
+    ## ...or we've got a download list with ECE6 in it. All other
+    ## cases mean 5.7
+    echo "${technet_download_list}" |
+      grep -c "engine-6." > /dev/null
+  fi
+}

From a321d80e4fd7f49343b0b411d3ba5e2f6c98c52c Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Tue, 21 Mar 2017 11:45:02 +0100
Subject: [PATCH 2482/2585] Added video-presentation-webservice as standard
 webapp

---
 usr/share/escenic/ece-scripts/common-ece.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/ece-scripts/common-ece.sh b/usr/share/escenic/ece-scripts/common-ece.sh
index eb8c0dc0..88500e56 100644
--- a/usr/share/escenic/ece-scripts/common-ece.sh
+++ b/usr/share/escenic/ece-scripts/common-ece.sh
@@ -93,6 +93,7 @@ webapps_in_standard_webapps_list="
   live-center-editorial
   live-center
   live-center-presentation-webservice
+  video-presentation-webservice
   revision-history
 "
 

From 5d0fb6abf23eb5778acf191ba4f3c5ab0b58b94b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Wed, 8 Mar 2017 11:32:16 +0100
Subject: [PATCH 2483/2585] ece deploy: now creates minimal EAR if none is
 available

- if the user passes --uri/--file with the EAR to deploy, this will be
  used (as before). If the passed EAR cannot be found, the deployment
  will fail (as before)

- if no EAR is passed, ece will try to use
  /var/cache/escenic/engine.ear. If it doesn't exist, it'll now try to
  create an EAR based on the package installed ECE. If
  /usr/share/escenic/escenic-content-engine-<version> isn't available,
  no EAR will be created and the deployment will fail.

- hardened the deploy:: remove_unwanted_libraries(), would fail on
  systems where engine-config for some reason wasn't deployed in
  tomcat/escenic/lib. This is important now that we're repackaging
  EARs and where we have logic to make EARs taylored for engine or
  search instance types.
---
 usr/share/escenic/ece-scripts/ece.d/deploy.sh | 232 +++++++++++++++++-
 1 file changed, 227 insertions(+), 5 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/deploy.sh b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
index f170df0e..e157cfa5 100644
--- a/usr/share/escenic/ece-scripts/ece.d/deploy.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/deploy.sh
@@ -1,3 +1,5 @@
+# Emacs: -*- mode: sh; sh-shell: bash; -*-
+
 # Module for the 'ece deploy' command.
 
 function get_state_file() {
@@ -59,6 +61,226 @@ EOF
   print_and_log "Deployment log file updated:" $(get_deployment_log_file)
 }
 
+## Finds the ECE webapps directory with webservice.war++
+##
+## If there are more than one ECE package installed, the latest is
+## picked. This, however, will (probably) never happens since the ECE
+## packages have conflict markers in place to prevent having multiple
+## ECE installed (which will be a problem since they all contain some
+## of the same files, especially in /etc/escenic).
+function _find_ece_webapps_dir() {
+  find -L /usr/share/escenic/escenic-content-engine-* \
+       -maxdepth 1 \
+       -name webapps \
+       -type d |
+    tail -n 1
+}
+
+function _create_engine_bootstrap_jar_in_dir() {
+  local dir=$1
+  local tmp_dir=
+  tmp_dir=$(mktemp -d)
+  local -a layers=(
+    family
+    vosa
+    common
+    host
+    addon
+    default
+    instance
+    server
+    environment
+  )
+
+  local bootstrap_dir="${tmp_dir}/com/escenic/configuration/bootstrap"
+  local layers_dir="${bootstrap_dir}/layers"
+  for layer in "${layers[@]}"; do
+    local layer_dir="${layers_dir}/${layer}"
+    mkdir -p "${layer_dir}"
+    cat > "${layer_dir}/Layer.properties" <<'EOF'
+$class=neo.nursery.PropertyFileConfigurator
+depot=./Files
+EOF
+  done
+
+  cat > "${layers_dir}/family/Files.properties" <<'EOF'
+# The family configuration is read from the file system hierarchy standard for configuration
+$class=neo.nursery.FileSystemDepot
+
+# The files are loaded from a subdirectory of /etc/escenic/engine/host
+# either from the system property "com.escenic.config.engine.family"
+# or the family name "default" if that system property is null
+fileSystemRoot = /etc/escenic/engine/family/${com.escenic.config.engine.family "default"}
+EOF
+  cat > "${layers_dir}/vosa/Files.properties" <<'EOF'
+$class=neo.nursery.FileSystemDepot
+fileSystemRoot = /etc/escenic/engine/vosa/
+EOF
+  cat > "${layers_dir}/common/Files.properties" <<'EOF'
+# The common configuration is read from the file system hierarchy standard location for configuration files
+$class=neo.nursery.FileSystemDepot
+fileSystemRoot = /etc/escenic/engine/common/
+
+EOF
+  cat > "${layers_dir}/host/Files.properties" <<'EOF'
+# The host configuration is read from the file system hierarchy standard for configuration
+$class=neo.nursery.FileSystemDepot
+
+# The files are loaded from a subdirectory of /etc/escenic/engine/host
+#   * the system property "hostname" if specified
+#   * the environment variable "HOSTNAME" or "COMPUTERNAME"
+#   otherwise the default value of "localhost"
+fileSystemRoot = /etc/escenic/engine/host/${hostname env:HOSTNAME env:COMPUTERNAME "localhost"}/
+EOF
+
+  cat > "${layers_dir}/addon/Files.properties" <<'EOF'
+# The addon configuration is read from the classpath with no prefix
+$class=neo.nursery.ResourceDepot
+EOF
+  cat > "${layers_dir}/default/Files.properties" <<'EOF'
+# The Escenic default configuration is read from the classpath with a prefix of com/escenic/configuration/default
+$class=neo.nursery.ResourceDepot
+prefix=com/escenic/configuration/default
+EOF
+  cat > "${layers_dir}/instance/Files.properties" <<'EOF'
+$class=neo.nursery.FileSystemDepot
+fileSystemRoot = /etc/escenic/engine/instance/${com.escenic.instance "default"}
+EOF
+  cat > "${layers_dir}/server/Files.properties" <<'EOF'
+# The host configuration is read from the file system hierarchy
+# standard for configuration
+$class=neo.nursery.FileSystemDepot
+
+# The files are loaded from a subdirectory of /etc/escenic/engine/host-instance
+# named after the hostname and instance name it's running as.
+fileSystemRoot = /etc/escenic/engine/server/${escenic.server "default"}/
+
+EOF
+  cat > "${layers_dir}/environment/Files.properties" <<'EOF'
+$class=neo.nursery.FileSystemDepot
+fileSystemRoot = /etc/escenic/engine/environment/${com.escenic.environment "unknown"}/
+EOF
+
+  cat > "${bootstrap_dir}/Nursery.properties" <<'EOF'
+########################################################
+# Site Wide Nursery configuration file.
+########################################################
+# The purpose of this file is to set up the nursery,
+# and all of the other configuration layers that are
+# to be used by this configuration.
+#
+# This Nursery component will bootstrap the Nursery.
+#
+# Therefore, it is vital that all files needed to
+# configure the nursery are available in _this_
+# configuration layer.
+#
+# Only after loading the Nursery component, will the
+# other configuration layers be visible to any other
+# Nursery component.
+#
+# After bootstrapping itself, it will  turn bootstrap
+# the rest of Escenic.
+#
+# It is possible to do System property substitution
+# in all configuration layers, even this configuration
+# layer:
+#   someProperty=${some.system.property}
+# will expand to the value of the system property
+# called "some.system.property".
+#
+# Note: There is only one nursery per Java process.
+########################################################
+
+$class=neo.nursery.Bootstrapper
+
+########################################################
+# CONFIGURATION LAYERS
+########################################################
+# Each referenced component must have its own
+# properties file; they _must_ reside in this
+# configuration layer.
+#
+# Content Engine ships with three default layers
+# layer.01 = /layers/default/Layer
+# layer.02 = /layers/addon/Layer
+# layer.03 = /layers/common/Layer
+########################################################
+
+# ECE :: default layer
+layer.01 = /layers/default/Layer
+
+# ECE :: plugins layer
+layer.02 = /layers/addon/Layer
+
+# VOSA :: common VOSA/SaaS layer
+layer.03 = /layers/vosa/Layer
+
+# Customer :: common layer
+layer.04 = /layers/common/Layer
+
+# Customer :: family/group layer (e.g. presentation, editorial)
+layer.05 = /layers/family/Layer
+
+# Customer :: environment layer (e.g. testing, staging, production)
+layer.06 = /layers/environment/Layer
+
+# Customer :: host specific layer
+layer.07 = /layers/host/Layer
+
+# Customer :: instance specific layer
+layer.08 = /layers/instance/Layer
+
+# Customer :: "escenic.server" specific layer
+layer.09 = /layers/server/Layer
+EOF
+
+  jar cf "${dir}/engine-bootstrap-config.jar" -C "${tmp_dir}" .
+  rm -r "${tmp_dir}"
+}
+
+## Assumes the variable ear is set (with the EAR to be deployed).
+##
+## If the file in 'ear' doesn't exist, the method will create a
+## default EAR.
+##
+## Finally, the method will update the ear global variable with that
+## of the newly created EAR.
+function _if_no_ear_try_to_create_a_default_one() {
+  if [ -e "${ear}" ]; then
+    return
+  fi
+
+  local ece_webapps_dir=
+  ece_webapps_dir=$(_find_ece_webapps_dir)
+
+  if [ ! -d "${ece_webapps_dir}" ]; then
+    return
+  fi
+
+  print_and_log "${ear} doesn't exist, will create a default,
+    minimal EAR based on ${ece_webapps_dir//\/webapps}"
+  local tmp_dir=
+  tmp_dir=$(mktemp -d)
+  mkdir -p "${tmp_dir}"/{jar,ear/lib}
+
+  # lib
+  run cp "${ece_webapps_dir}/../lib/"*.jar "${tmp_dir}/ear/lib"
+
+  # war
+  if [ "${type}" == engine ]; then
+    _create_engine_bootstrap_jar_in_dir "${tmp_dir}/ear/lib"
+  fi
+  run cp "${ece_webapps_dir}/"*.war "${tmp_dir}"/ear
+
+  local ear_fn=
+  ear_fn="${cache_dir}/minimal-$(date +%s).ear"
+  jar cf "${ear_fn}" -C "${tmp_dir}/ear" .
+  chmod -R 755 "${tmp_dir}"
+
+  ear=${ear_fn}
+}
+
 function deploy() {
   local ear=$cache_dir/engine.ear
 
@@ -66,11 +288,9 @@ function deploy() {
     print_and_log "Deploying $file on $instance ..."
 
     #Check if the file is a cached file, then will just install the file.
-    # If it is not cached and a local file then create a symlink of that file in cache directory otherwise
-    #We we wil consider it is a url and will try to download the file.
     ear=$cache_dir/$(basename $file)
     if [ -e "$ear" ] && [ $(is_archive_healthy $ear) -eq 1 ]; then
-      print_and_log "If found a healthy $ear locally so I will not fetch it again."
+      print_and_log "I found a healthy $ear locally so I will not try to fetch it (again)."
     elif [ -f "$file" ]; then
       print_and_log " Found a local ear file $file"
       log "Copying it to to $cache_dir"
@@ -86,6 +306,8 @@ function deploy() {
         "not be retrieved. I will exit now. :-("
       exit 1
     fi
+  else
+    _if_no_ear_try_to_create_a_default_one "${ear}"
   fi
 
   if [ ! -e "$ear" ]; then
@@ -107,7 +329,7 @@ function deploy() {
     run unzip -q $ear < /dev/null
   )
 
-  print "Deploying $ear on $appserver ..."
+  print "Deploying $ear on ${instance} (${appserver}) ..."
 
   case $appserver in
     tomcat)
@@ -281,5 +503,5 @@ function remove_unwanted_libraries() {
   fi
 
   log "Removing $1/engine-config-*.jar since this is a search instance"
-  run rm $1/engine-config-*.jar
+  run find ${1}/. -maxdepth 1 -name engine-config-*.jar -delete
 }

From 599541260f6ae2a94082eb40ae1efb796a3f5367 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Wed, 8 Mar 2017 11:34:31 +0100
Subject: [PATCH 2484/2585] ece repackage: Handle missing EAR gracefully

- if repackage cannot find the currently deployed EAR, it'll give
  a detailed message about what happened, but it will no longer
  fail. This makes it safe to run 'ece repackage' always if the user
  so wishes.

- Additional note: Since 'ece deploy' now create a default EAR if
  needed, it's less of a problem that repackage doesn't create an EAR.
---
 usr/share/escenic/ece-scripts/ece.d/repackage.sh | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/repackage.sh b/usr/share/escenic/ece-scripts/ece.d/repackage.sh
index a5cba7e9..6081592c 100644
--- a/usr/share/escenic/ece-scripts/ece.d/repackage.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/repackage.sh
@@ -321,6 +321,12 @@ ensure_ear_reference_and_lineage_sanity() {
       ear_name_or_hash=${last_deployed_hash}
       file_or_uri=${file}
       return
+    else
+      print_and_log "
+        Will NOT repackage: I couldn't find a previously deployed EAR
+        and you didn't specify an EAR to be repackaged using --file
+        <ear> or --uri <ear>."
+      return 1
     fi
 
   elif [ -r "${default_cached_engine_ear}" ]; then
@@ -329,10 +335,10 @@ ensure_ear_reference_and_lineage_sanity() {
     ear_name_or_hash=${default_cached_engine_ear##*/}
   else
     print_and_log "
-      You must either specify an EAR to be repackaged
-      using --file <ear> or --uri <ear>, or the previously
+      Will NOT repackage: You must either specify an EAR to be
+      repackaged using --file <ear> or --uri <ear>, or the previously
       deployed EAR must be available in ${cache_dir}."
-    exit 1
+    return 1
   fi
 }
 
@@ -674,7 +680,9 @@ repackage() {
     return
   fi
 
-  ensure_ear_reference_and_lineage_sanity "${file_or_uri}"
+  ensure_ear_reference_and_lineage_sanity "${file_or_uri}" || {
+    return
+  }
   ear=$(get_local_ear_reference "${file_or_uri}")
 
   local tmp_dir=

From 9f8f81b52677b2e3c3aee5fdb615058606b35a8d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Wed, 8 Mar 2017 11:35:24 +0100
Subject: [PATCH 2485/2585] Solr6 is best installed with lsof available on the
 system

- the solr6 init.d script uses lsof to determine whether or a Solr
  instance is running.
---
 usr/share/escenic/ece-scripts/ece-install.d/search-server.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
index fd6e3257..a7063a56 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
@@ -175,6 +175,7 @@ function set_up_solr() {
   "
 
   print_and_log "Setting up Solr ..."
+  install_packages_if_missing lsof
   download_and_install_solr
   create_global_solr_configuration
   setup_solr_init_d_script

From 020166dc8cbc076d6580ea23fdb2c2a86d6dbec4 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Wed, 8 Mar 2017 11:36:48 +0100
Subject: [PATCH 2486/2585] ece-install/search: Adjust deployment white list
 for ECE >= 6

---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index d619e428..197abdf2 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -8,6 +8,10 @@ function get_deploy_white_list() {
   local editor_deploy_white_list="escenic-admin escenic studio indexer-webservice webservice webservice-extensions preview-editor-ws"
   local search_deploy_white_list="solr indexer-webapp"
 
+  if is_installing_post_ece6; then
+    search_deploy_white_list="indexer-webapp"
+  fi
+
   # user's deploy white list, if present, takes precedence.
   if [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ]; then
     deploy_white_list=${fai_presentation_deploy_white_list-$presentation_deploy_white_list}

From 19e7091fb643174daef50329be37377a66d890b1 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Wed, 8 Mar 2017 14:42:30 +0100
Subject: [PATCH 2487/2585] Updated Percona APT public key

---
 usr/share/escenic/ece-scripts/ece-install.d/database.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 5b79ffde..43577f72 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -8,7 +8,7 @@ if [[ $(uname -m) != "x86_64" ]]; then
   percona_rpm_release_url=http://www.percona.com/downloads/percona-release/$percona_rpm_release_package_name.i386.rpm
 fi
 
-percona_ubuntu_gpg_key=1C4CBDCDCD2EFD2A
+percona_ubuntu_gpg_key=9334A25F8507EFA5
 mariadb_ubuntu_gpg_key=CBCB082A1BB943DB
 
 

From 38a93199ebf989cca1609c29b850286a4546e6af Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Thu, 9 Mar 2017 09:29:53 +0100
Subject: [PATCH 2488/2585] Can now install the DB profile

- Support for configuring db host and port

- changed format of YAML
---
 .../ece-install-conf-file-reader-test.sh      | 106 ++++++++++++++++--
 .../ece-install.d/conf-file-reader.sh         |  63 ++++++++---
 .../ece-install.d/content-engine.sh           |  14 ++-
 .../ece-scripts/ece-install.d/database.sh     |  32 +++++-
 .../ece-scripts/ece-install.d/ece-scripts.sh  |   3 +-
 .../ece-install.d/package-based-install.sh    |   6 +-
 6 files changed, 185 insertions(+), 39 deletions(-)

diff --git a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
index fea18f3f..4c96cde8 100644
--- a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
+++ b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
@@ -1,6 +1,58 @@
 #! /usr/bin/env bash
 ## author: torstein@escenic.com
 
+test_can_parse_yaml_conf_db() {
+  local yaml_file=
+  yaml_file=$(mktemp)
+  local db_user=foodbuser
+  local db_password=foodbpassword
+  local db_schema=foodbdb
+  local db_host=foodbhost
+  local db_port=foodbport
+  local db_install=yes
+
+  cat > "${yaml_file}" <<EOF
+---
+profiles:
+  db:
+    install: ${db_install}
+    user: ${db_user}
+    password: ${db_password}
+    schema: ${db_schema}
+    host: ${db_host}
+    port: ${db_port}
+EOF
+
+  unset fai_db_install
+  unset fai_db_user
+  unset fai_db_password
+  unset fai_db_schema
+  unset fai_db_host
+  unset fai_db_port
+
+  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
+
+  assertNotNull "Should set fai_db_install" "${fai_db_install}"
+  assertEquals "Should set fai_db_install" 1 "${fai_db_install}"
+
+  assertNotNull "Should set fai_db_user" "${fai_db_user}"
+  assertEquals "Should set fai_db_user" "${db_user}" "${fai_db_user}"
+
+  assertNotNull "Should set fai_db_password" "${fai_db_password}"
+  assertEquals "Should set fai_db_password" "${db_password}" "${fai_db_password}"
+
+  assertNotNull "Should set fai_db_schema" "${fai_db_schema}"
+  assertEquals "Should set fai_db_schema" "${db_schema}" "${fai_db_schema}"
+
+  assertNotNull "Should set fai_db_host" "${fai_db_host}"
+  assertEquals "Should set fai_db_host" "${db_host}" "${fai_db_host}"
+
+  assertNotNull "Should set fai_db_port" "${fai_db_port}"
+  assertEquals "Should set fai_db_port" "${db_port}" "${fai_db_port}"
+
+  rm -rf "${yaml_file}"
+}
+
 test_can_parse_yaml_conf_credentials() {
   local yaml_file=
   yaml_file=$(mktemp)
@@ -127,7 +179,8 @@ test_can_parse_yaml_conf_presentation_install() {
   cat > "${yaml_file}" <<EOF
 ---
 profiles:
-  - presentation: yes
+  presentation:
+    install: yes
 EOF
 
   unset fai_presentation_install
@@ -144,7 +197,8 @@ test_can_parse_yaml_conf_search_install() {
   cat > "${yaml_file}" <<EOF
 ---
 profiles:
-  - search: yes
+  search:
+    install: yes
 EOF
 
   unset fai_search_install
@@ -161,7 +215,8 @@ test_can_parse_yaml_conf_editor_install() {
   cat > "${yaml_file}" <<EOF
 ---
 profiles:
-  - editor: yes
+  editor:
+    install: yes
     port: 8080
     name: engine1
 EOF
@@ -179,15 +234,23 @@ test_can_parse_yaml_conf_editor_install_multi_profiles() {
   yaml_file=$(mktemp)
   cat > "${yaml_file}" <<EOF
 profiles:
-  - editor: yes
-  - search: yes
-  - db: no
+  editor:
+    install: yes
+  search:
+    install: yes
+  db:
+    install: no
 EOF
 
   unset fai_editor_install
+  unset fai_search_install
+  unset fai_db_install
+
   parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
   assertNotNull "Should set fai_editor_install" "${fai_editor_install}"
   assertEquals "Should set fai_editor_install" 1 "${fai_editor_install}"
+  assertEquals "Should set fai_search_install" 1 "${fai_search_install}"
+  assertNull "Should not have set fai_db_install" "${fai_db_install}"
 
   rm -rf "${yaml_file}"
 }
@@ -198,9 +261,8 @@ test_can_parse_yaml_conf_db_install() {
   cat > "${yaml_file}" <<EOF
 ---
 profiles:
-  - db: yes
-    port: 8080
-    name: engine1
+  db:
+    install: yes
 EOF
 
   unset fai_db_install
@@ -208,6 +270,29 @@ EOF
   assertNotNull "Should set fai_db_install" "${fai_db_install}"
   assertEquals "Should set fai_db_install" 1 "${fai_db_install}"
 
+  # now, try to set it to true
+  cat > "${yaml_file}" <<EOF
+---
+profiles:
+  db:
+    install: true
+EOF
+  unset fai_db_install
+  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
+  assertNotNull "Should set fai_db_install" "${fai_db_install}"
+  assertEquals "Should set fai_db_install" 1 "${fai_db_install}"
+
+  # now, try to set it to false
+  cat > "${yaml_file}" <<EOF
+---
+profiles:
+  db:
+    install: false
+EOF
+  unset fai_db_install
+  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
+  assertNull "Should not have set fai_db_install" "${fai_db_install}"
+
   rm -rf "${yaml_file}"
 }
 
@@ -217,7 +302,8 @@ test_can_parse_yaml_conf_cache_install() {
   cat > "${yaml_file}" <<EOF
 ---
 profiles:
-  - cache: yes
+  cache:
+    install: yes
 EOF
 
   unset fai_cache_install
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
index 849319e7..dd6ea1e5 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
@@ -76,19 +76,15 @@ _parse_yaml_conf_file_packages() {
     version=$(_jq "${yaml_file}" .packages["${i}"].version)
     fai_package_map[${name}]=${version}
   done
-
-  for p in "${!fai_package_map[@]}"; do
-    echo p="$p" v="${fai_package_map[${p}]}"
-  done
-
 }
 
 _parse_yaml_conf_file_editor() {
   local yaml_file=$1
 
   local install_editor=no
-  install_editor=$(_jq "${yaml_file}" .profiles[].editor)
-  if [[ "${install_editor}" == "yes" ]]; then
+  install_editor=$(_jq "${yaml_file}" .profiles.editor.install)
+  if [[ "${install_editor}" == "yes" ||
+          "${install_editor}" == "true" ]]; then
     export fai_editor_install=1
   fi
 }
@@ -106,7 +102,8 @@ _parse_yaml_conf_file_environment() {
   ## fai_package_enabled=1
   local configured_use_escenic_packages=
   configured_use_escenic_packages=$(_jq "${yaml_file}" .environment[].use_escenic_packages)
-  if [[ "${configured_use_escenic_packages}" == "yes" ]]; then
+  if [[ "${configured_use_escenic_packages}" == "yes" ||
+          "${configured_use_escenic_packages}" == "true" ]]; then
     export fai_package_enabled=1
   fi
 }
@@ -115,8 +112,9 @@ _parse_yaml_conf_file_presentation() {
   local yaml_file=$1
 
   local install_presentation=no
-  install_presentation=$(_jq "${yaml_file}" .profiles[].presentation)
-  if [[ "${install_presentation}" == "yes" ]]; then
+  install_presentation=$(_jq "${yaml_file}" .profiles.presentation.install)
+  if [[ "${install_presentation}" == "yes" ||
+          "${install_presentation}" == "true" ]]; then
     export fai_presentation_install=1
   fi
 }
@@ -125,8 +123,9 @@ _parse_yaml_conf_file_search() {
   local yaml_file=$1
 
   local install_search=no
-  install_search=$(_jq "${yaml_file}" .profiles[].search)
-  if [[ "${install_search}" == "yes" ]]; then
+  install_search=$(_jq "${yaml_file}" .profiles.search.install)
+  if [[ "${install_search}" == "yes" ||
+          "${install_search}" == "true" ]]; then
     export fai_search_install=1
   fi
 }
@@ -135,8 +134,9 @@ _parse_yaml_conf_file_cache() {
   local yaml_file=$1
 
   local install_cache=no
-  install_cache=$(_jq "${yaml_file}" .profiles[].cache)
-  if [[ "${install_cache}" == "yes" ]]; then
+  install_cache=$(_jq "${yaml_file}" .profiles.cache.install)
+  if [[ "${install_cache}" == "yes" ||
+          "${install_cache}" == "true" ]]; then
     export fai_cache_install=1
   fi
 }
@@ -145,10 +145,41 @@ _parse_yaml_conf_file_db() {
   local yaml_file=$1
 
   local install_db=no
-  install_db=$(_jq "${yaml_file}" .profiles[].db)
-  if [[ "${install_db}" == "yes" ]]; then
+  install_db=$(_jq "${yaml_file}" .profiles.db.install)
+  if [[ "${install_db}" == "yes" ||
+          "${install_db}" == "true" ]]; then
     export fai_db_install=1
   fi
+
+  local install_db_user=
+  install_db_user=$(_jq "${yaml_file}" .profiles.db.user)
+  if [ -n "${install_db_user}" ]; then
+    export fai_db_user=${install_db_user}
+  fi
+
+  local install_db_password=
+  install_db_password=$(_jq "${yaml_file}" .profiles.db.password)
+  if [ -n "${install_db_password}" ]; then
+    export fai_db_password=${install_db_password}
+  fi
+
+  local install_db_schema=
+  install_db_schema=$(_jq "${yaml_file}" .profiles.db.schema)
+  if [ -n "${install_db_schema}" ]; then
+    export fai_db_schema=${install_db_schema}
+  fi
+
+  local install_db_host=
+  install_db_host=$(_jq "${yaml_file}" .profiles.db.host)
+  if [ -n "${install_db_host}" ]; then
+    export fai_db_host=${install_db_host}
+  fi
+
+  local install_db_port=
+  install_db_port=$(_jq "${yaml_file}" .profiles.db.port)
+  if [ -n "${install_db_port}" ]; then
+    export fai_db_port=${install_db_port}
+  fi
 }
 
 _jq() {
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 197abdf2..d12fbbc8 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -548,11 +548,7 @@ EOF
   fi
 }
 
-function set_up_basic_nursery_configuration() {
-  if [ "${fai_package_enabled-0}" -eq 1 ]; then
-    return
-  fi
-
+function _set_up_basic_nursery_configuration_by_copying() {
   print_and_log "Setting up basic Nursery configuration ..."
 
   # we always copy the default plugin configuration (even if there is
@@ -607,6 +603,14 @@ function set_up_basic_nursery_configuration() {
   if [ -n "${a_tmp_dir}" ]; then
     run rm -rf ${a_tmp_dir}
   fi
+}
+
+function set_up_basic_nursery_configuration() {
+  print_and_log "Setting up basic Nursery configuration ..."
+
+  if [ "${fai_package_enabled-0}" -eq 0 ]; then
+    _set_up_basic_nursery_configuration_by_copying
+  fi
 
   public_host_name=$HOSTNAME:${appserver_port}
   if [ -n "$fai_public_host_name" ]; then
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 43577f72..361e8ad8 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -503,7 +503,6 @@ db_user=ece5user
 db_password=ece5password
 db_schema=ece5db
 db_host=localhost
-ece_home=/opt/escenic/engine
 db_product=mysql
 
 # oracle specific settings
@@ -579,8 +578,8 @@ fi
 }
 
 function create_schema() {
-    # we first create the DB (or, if drop_db_first is 1, we've just
-    # dropped it above) before running the SQL scripts.
+    # we first create the DB or, if drop_db_first is 1, we've just
+    # dropped it above before running the SQL scripts.
   if [ $db_product = "mysql" ]; then
      if ! $(check_mysql_is_running) ; then
  	run service mysql start	
@@ -638,9 +637,13 @@ function create_ecedb() {
   fi
 
   # first the ECE SQL ...
-  run_db_scripts $ece_home/database/$db_product
+  run_db_scripts $(get_content_engine_dir)/database/$db_product
+  _run_db_scripts_for_installed_plugins
 
-  # ... then, find the plugins and run their SQL scripts
+  log "${id} ${db_product}://${db_host}/${db_schema} is now ready for ${db_user}/${db_password}"
+}
+
+function _run_db_scripts_for_installed_plugins_pre_ece6() {
   for archive in $technet_download_list $ear_download_list; do
     # don't re-run the engine scripts
     if [[ $(basename ${archive}) == engine* ]]; then
@@ -663,8 +666,25 @@ function create_ecedb() {
     fi
     run_db_scripts ${escenic_root_dir}/${archive_sql_dir}
   done
+}
 
-  log "${id} ${db_product}://${db_host}/${db_schema} is now ready for ${db_user}/${db_password}"
+function _run_db_scripts_for_installed_plugins_post_ece6() {
+  find /usr/share -maxdepth 2 -name "escenic-*" -type d |
+    while read dir; do
+      local plugin_db_sql_dir=${dir}/misc/database/${db_product}
+      if [ ! -d "${plugin_db_sql_dir}" ]; then
+        continue
+      fi
+      run_db_scripts "${plugin_db_sql_dir}"
+    done
+}
+
+function _run_db_scripts_for_installed_plugins() {
+  if is_installing_post_ece6; then
+    _run_db_scripts_for_installed_plugins_post_ece6
+  else
+    _run_db_scripts_for_installed_plugins_pre_ece6
+  fi
 }
 
 ## will run the EAE scripts if they are availabe.
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh b/usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh
index 1ca3b2ad..0a64f2b5 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh
@@ -41,7 +41,8 @@ function set_up_ece_scripts()
   print_and_log 'Setting up the ece UNIX scripts ...'
 
   if [ $on_debian_or_derivative -eq 1 ]; then
-    install_packages_if_missing escenic-content-engine-scripts
+    # TODO tkj remove echo
+    echo install_packages_if_missing escenic-content-engine-scripts
   else
     install_ece_scripts_with_git
   fi
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/package-based-install.sh b/usr/share/escenic/ece-scripts/ece-install.d/package-based-install.sh
index fc05485f..11e037a3 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/package-based-install.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/package-based-install.sh
@@ -24,12 +24,16 @@ _install_prerequisites_for_updater_package() {
 ## Installs the configured escenic packages. If none were configured,
 ## just ECE will be installed.
 install_configured_escenic_packages() {
-  _install_prerequisites_for_updater_package
 
   if [ "${on_debian_or_derivative}" -eq 1 ]; then
     local escenic_deb_packages=
     local package=
     for package in "${!fai_package_map[@]}"; do
+
+      if [[ "${package}" =~ "escenic-content-engine-updater-"* ]]; then
+        _install_prerequisites_for_updater_package
+      fi
+
       local version=${fai_package_map[${package}]}
       if [ -n "${version}" ]; then
         escenic_deb_packages="${package}=${version} ${escenic_deb_packages}"

From e007dea2bec5686cd1dddb3e7f0878a58fc57de1 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Thu, 9 Mar 2017 14:51:30 +0100
Subject: [PATCH 2489/2585] Updated TODO with branch progress

Updated TODO

Updated TODO with example of implementation features

Updated TODO
---
 TODO.md | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 93 insertions(+), 8 deletions(-)

diff --git a/TODO.md b/TODO.md
index ab14616b..b07375a4 100644
--- a/TODO.md
+++ b/TODO.md
@@ -3,14 +3,92 @@
 
 ## /usr/sbin/ece-install
 
-- Support for installing ECE & plugins using the escenic APT
-  repositories.
-- YAML based configuration file format
-- Easier to extend `ece-install`. Preferably in any language. Put a
-  file in a directory and `ece-install` will execute that file at a
-  predictable point in time.
-- ✔ Remove the interactive mode. It's rarely used and complicates the
-  source code and configuration options unnecessarily.
+### Install ECE from APT 
+Support for installing ECE & plugins using the escenic APT
+repositories.
+
+- ✔ Editor profile
+- ✔ Presentation profile
+- ✔ Search profile
+- ✔ DB profile, ECE
+- ✔ DB profile, ECE plugins
+- Create publication(s) profile
+- Cache server profile
+
+### YAML configuration file format
+
+#### ✔ Credentials (good old `technet_user`++)
+```
+credentials:
+  - site: maven.example.com
+    user: foo
+    password: bar
+```
+
+#### ✔ Editor profile
+```
+profiles:
+  editor:
+    install: yes
+```
+
+#### ✔ Presentation profile
+```
+profiles:
+  presentation:
+    install: yes
+```
+#### ✔ Search profile
+```
+profiles:
+  search:
+    install: yes
+```
+#### ✔ DB profile
+Minimum:
+```
+profiles:
+  db:
+    install: yes
+```
+
+All supported options
+```
+profiles:
+  db:
+    install: yes
+    user: dbuser
+    password: dbpassword
+    schema: dbpassword
+    host: db1
+    port: 3396
+```
+
+#### ✔ Create publication(s) profile
+```
+profiles:
+   create_publications:
+     - name: apple
+       war: apple.war
+       domain: apple.domain.com
+       aliases:
+         - apple_alias1
+         - apple_alias2
+     - name: orange
+       war: orange.war
+       domain: orange.domain.com
+       aliases:
+          - orange_alias1
+          - orange_alias2
+```
+#### Cache server profile
+#### Monitoring settings
+#### EAR to deploy
+
+###  ✔ Remove the interactive mode. 
+
+It's rarely used and complicates the source code and configuration
+options unnecessarily.
 
 ## /usr/bin/ece
 
@@ -19,3 +97,10 @@
   `create-publication` sub command is then included in TAB completion,
   help screens and `man` pages.
   
+
+## Version 4.x
+###  Easier to extend `ece-install`
+
+Preferably in any language. Put a file in a directory and
+`ece-install` will execute that file at a predictable point in time.
+

From 35ca1b08ce08512b3a6d4260410c185f968743f0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Thu, 9 Mar 2017 16:45:43 +0100
Subject: [PATCH 2490/2585] Partial support for creating publication using
 apt.escenic.com

---
 .../ece-install-conf-file-reader-test.sh      | 141 +++++++++++++++++-
 usr/sbin/ece-install                          |   1 -
 .../ece-install.d/conf-file-reader.sh         |  59 ++++++--
 3 files changed, 189 insertions(+), 12 deletions(-)

diff --git a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
index 4c96cde8..1d6ae3f6 100644
--- a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
+++ b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
@@ -79,6 +79,133 @@ EOF
   rm -rf "${yaml_file}"
 }
 
+test_can_parse_yaml_conf_create_publication() {
+  local yaml_file=
+  yaml_file=$(mktemp)
+  local publication1_name=foopub
+  local publication1_war=pub.war
+  local publication1_domain=foo.example.com
+  local publication1_alias1=fooalias1.example.com
+  local publication1_alias2=fooalias2.example.com
+
+  cat > "${yaml_file}" <<EOF
+---
+profiles:
+   publication:
+     - name: ${publication1_name}
+       war: ${publication1_war}
+       domain: ${publication1_domain}
+       aliases:
+         - ${publication1_alias1}
+         - ${publication1_alias2}
+EOF
+
+  unset fai_publication_domain_mapping_list
+  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
+  assertEquals "Having pubs defined, sets enabled flag" \
+               1 \
+               "${fai_publication_create}"
+
+
+  assertNotNull "Able to parse info for creating publications" \
+                "${fai_publication_domain_mapping_list}"
+  for el in ${fai_publication_domain_mapping_list}; do
+    IFS='#' read -r publication domain aliases <<< "${el}"
+    IFS=',' read -r name war <<< "$publication"
+    assertEquals "publication name from map" \
+                 "${publication1_name}" \
+                 "${name}"
+    assertEquals "publication war from map" \
+                 "${publication1_war}" \
+                 "${war}"
+    assertEquals "publication domain from map" \
+                 "${publication1_domain}" \
+                 "${domain}"
+    assertEquals "publication aliases from map" \
+                 "${publication1_alias1},${publication1_alias2}" \
+                 "${aliases}"
+  done
+
+  rm -rf "${yaml_file}"
+}
+
+test_can_parse_yaml_conf_publication() {
+  local yaml_file=
+  yaml_file=$(mktemp)
+  local publication1_name=foopub
+  local publication1_war=pub.war
+  local publication1_domain=foo.example.com
+  local publication1_alias1=fooalias1.example.com
+  local publication1_alias2=fooalias2.example.com
+  local publication1_aliases=${publication1_alias1},${publication1_alias2}
+
+  local publication2_name=barpub
+  local publication2_war=bar.war
+  local publication2_domain=bar.example.com
+  local publication2_alias1=baralias1.example.com
+  local publication2_alias2=baralias2.example.com
+  local publication2_aliases=${publication2_alias1},${publication2_alias2}
+
+  cat > "${yaml_file}" <<EOF
+---
+profiles:
+   publications:
+     - name: ${publication1_name}
+       war: ${publication1_war}
+       domain: ${publication1_domain}
+       aliases:
+         - ${publication1_alias1}
+         - ${publication1_alias2}
+     - name: ${publication2_name}
+       war: ${publication2_war}
+       domain: ${publication2_domain}
+       aliases:
+          - ${publication2_alias1}
+          - ${publication2_alias2}
+EOF
+
+  unset fai_publication_domain_mapping_list
+  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
+  assertNotNull "Able to parse info for creating publications" \
+                "${fai_publication_domain_mapping_list}"
+  for el in ${fai_publication_domain_mapping_list}; do
+    IFS='#' read -r publication domain aliases <<< "${el}"
+    IFS=',' read -r name war <<< "$publication"
+
+    if [[ "${name}" == "${publication1_name}" ]]; then
+      found_publication1_name=1
+    elif [[ "${name}" == "${publication2_name}" ]]; then
+      found_publication2_name=1
+    fi
+    if [[ "${war}" == "${publication1_war}" ]]; then
+      found_publication1_war=1
+    elif [[ "${war}" == "${publication2_war}" ]]; then
+      found_publication2_war=1
+    fi
+    if [[ "${domain}" == "${publication1_domain}" ]]; then
+      found_publication1_domain=1
+    elif [[ "${domain}" == "${publication2_domain}" ]]; then
+      found_publication2_domain=1
+    fi
+    if [[ "${aliases}" == "${publication1_aliases}" ]]; then
+      found_publication1_aliases=1
+    elif [[ "${aliases}" == "${publication2_aliases}" ]]; then
+      found_publication2_aliases=1
+    fi
+  done
+
+  assertEquals "Can configure both pubs, name" 1 "${found_publication1_name}"
+  assertEquals "Can configure both pubs, name" 1 "${found_publication2_name}"
+  assertEquals "Can configure both pubs, war" 1 "${found_publication1_war}"
+  assertEquals "Can configure both pubs, war" 1 "${found_publication2_war}"
+  assertEquals "Can configure both pubs, domain" 1 "${found_publication1_domain}"
+  assertEquals "Can configure both pubs, domain" 1 "${found_publication2_domain}"
+  assertEquals "Can configure both pubs, aliases" 1 "${found_publication1_aliases}"
+  assertEquals "Can configure both pubs, aliases" 1 "${found_publication2_aliases}"
+
+  rm -rf "${yaml_file}"
+}
+
 test_can_parse_yaml_conf_packages() {
   local yaml_file=
   yaml_file=$(mktemp)
@@ -162,14 +289,24 @@ test_can_parse_yaml_conf_use_escenic_packages() {
 
   cat > "${yaml_file}" <<EOF
 ---
-environment:
-  - use_escenic_packages: yes
+packages:
+  foo: 1
 EOF
 
   unset fai_package_enabled
   parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
   assertNotNull "Should set fai_package_enabled" "${fai_package_enabled}"
   assertEquals "Should set fai_package_enabled" 1 "${fai_package_enabled}"
+
+  # no packages: block means don't use packages
+  cat > "${yaml_file}" <<EOF
+---
+foo:
+EOF
+
+  unset fai_package_enabled
+  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
+  assertNull "Should NOT set fai_package_enabled" "${fai_package_enabled}"
   rm -rf "${yaml_file}"
 }
 
diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index c2257c6e..79e00ca5 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -168,7 +168,6 @@ function download_escenic_components()
     fi
 
     if [ "${fai_package_enabled-0}" -eq 1 ]; then
-      escenic_root_dir=/usr/share/escenic
       install_configured_escenic_packages
       return
     fi
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
index dd6ea1e5..0162a77b 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
@@ -35,6 +35,7 @@ parse_yaml_conf_file_or_source_if_sh_conf() {
   _parse_yaml_conf_file_db "${yaml_file}"
   _parse_yaml_conf_file_cache "${yaml_file}"
   _parse_yaml_conf_file_credentials "${yaml_file}"
+  _parse_yaml_conf_file_publications "${yaml_file}"
   _parse_yaml_conf_file_packages "${yaml_file}"
   _parse_yaml_conf_file_environment "${yaml_file}"
 }
@@ -58,6 +59,53 @@ _parse_yaml_conf_file_credentials() {
 
 }
 
+_parse_yaml_conf_file_publications() {
+  local yaml_file=$1
+  local count=0
+  count=$(_jq "${yaml_file}" ".profiles.publications | length")
+
+  fai_publication_domain_mapping_list=""
+
+  for ((i = 0; i < count; i++)); do
+    # If there are one or more publications defined in
+    # 'publications', we assume the user wants to create these.
+    export fai_publication_create=1
+
+    local name=
+    local war=
+    local domain=
+    local aliases=
+
+    name=$(_jq "${yaml_file}" .profiles.publications["${i}"].name)
+    war=$(_jq "${yaml_file}" .profiles.publications["${i}"].war)
+
+    if [ -z "${war}" ]; then
+      war=${name}.war
+    fi
+
+    domain=$(_jq "${yaml_file}" .profiles.publications["${i}"].domain)
+    alias_count=$(_jq "${yaml_file}" ".profiles.publications[${i}].aliases | length")
+
+    for ((j = 0; j < alias_count; j++)); do
+      if [ -n "${aliases}" ]; then
+        aliases="${aliases},"
+      fi
+      aliases=${aliases}$(_jq "${yaml_file}" .profiles.publications["${i}"].aliases["${j}"])
+    done
+
+    fai_publication_domain_mapping_list="
+      ${fai_publication_domain_mapping_list}
+      ${name},${war}#${domain}"
+
+    if [ -n "${aliases}" ]; then
+      fai_publication_domain_mapping_list=${fai_publication_domain_mapping_list}"#${aliases}"
+    fi
+  done
+
+  export fai_publication_domain_mapping_list
+
+}
+
 ## Populates the global variable fai_package_map with package names
 ## and (optionally) versions.
 ##
@@ -75,6 +123,8 @@ _parse_yaml_conf_file_packages() {
     name=$(_jq "${yaml_file}" .packages["${i}"].name)
     version=$(_jq "${yaml_file}" .packages["${i}"].version)
     fai_package_map[${name}]=${version}
+    export fai_package_enabled=1
+    export escenic_root_dir=/usr/share/escenic
   done
 }
 
@@ -97,15 +147,6 @@ _parse_yaml_conf_file_environment() {
   if [[ -n "${configured_java_home}" ]]; then
     export java_home=${configured_java_home}
   fi
-
-  ## TODO tkj: if there's a 'packages:' stanza, can just set
-  ## fai_package_enabled=1
-  local configured_use_escenic_packages=
-  configured_use_escenic_packages=$(_jq "${yaml_file}" .environment[].use_escenic_packages)
-  if [[ "${configured_use_escenic_packages}" == "yes" ||
-          "${configured_use_escenic_packages}" == "true" ]]; then
-    export fai_package_enabled=1
-  fi
 }
 
 _parse_yaml_conf_file_presentation() {

From 08936adba32d2a5a921769a8ce851c2b4099dcee Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Thu, 9 Mar 2017 16:52:29 +0100
Subject: [PATCH 2491/2585] YAML support for SDP's needs is feature complete

- Updated tests to show that we support cache installation via YAML conf
---
 TODO.md                                       |  81 +--
 .../ece-install-conf-file-reader-test.sh      | 464 +++++++++++++++++-
 .../ece-install.d/conf-file-reader.sh         | 460 ++++++++++++++++-
 3 files changed, 920 insertions(+), 85 deletions(-)

diff --git a/TODO.md b/TODO.md
index b07375a4..9b0a16bc 100644
--- a/TODO.md
+++ b/TODO.md
@@ -7,83 +7,20 @@
 Support for installing ECE & plugins using the escenic APT
 repositories.
 
-- ✔ Editor profile
-- ✔ Presentation profile
-- ✔ Search profile
+- ✔ Editor profile (Escenic Content Engine) 
+- ✔ Presentation profile (Escenic Content Engine)
+- ✔ Search profile (ECE's indexer-webapp + Solr)
 - ✔ DB profile, ECE
 - ✔ DB profile, ECE plugins
-- Create publication(s) profile
+- Analysis profile (Escenic Analysis Engine)
+- Analysis DB profile
+- Create publication(s) profile → Move to `/usr/bin/ece`
 - Cache server profile
 
-### YAML configuration file format
+### ✔ YAML configuration file format
 
-#### ✔ Credentials (good old `technet_user`++)
-```
-credentials:
-  - site: maven.example.com
-    user: foo
-    password: bar
-```
-
-#### ✔ Editor profile
-```
-profiles:
-  editor:
-    install: yes
-```
-
-#### ✔ Presentation profile
-```
-profiles:
-  presentation:
-    install: yes
-```
-#### ✔ Search profile
-```
-profiles:
-  search:
-    install: yes
-```
-#### ✔ DB profile
-Minimum:
-```
-profiles:
-  db:
-    install: yes
-```
-
-All supported options
-```
-profiles:
-  db:
-    install: yes
-    user: dbuser
-    password: dbpassword
-    schema: dbpassword
-    host: db1
-    port: 3396
-```
-
-#### ✔ Create publication(s) profile
-```
-profiles:
-   create_publications:
-     - name: apple
-       war: apple.war
-       domain: apple.domain.com
-       aliases:
-         - apple_alias1
-         - apple_alias2
-     - name: orange
-       war: orange.war
-       domain: orange.domain.com
-       aliases:
-          - orange_alias1
-          - orange_alias2
-```
-#### Cache server profile
-#### Monitoring settings
-#### EAR to deploy
+See the [unit tests](usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh) for
+configuration examples.
 
 ###  ✔ Remove the interactive mode. 
 
diff --git a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
index 1d6ae3f6..67cfeb51 100644
--- a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
+++ b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
@@ -1,6 +1,24 @@
 #! /usr/bin/env bash
 ## author: torstein@escenic.com
 
+test_can_parse_yaml_conf_monitoring() {
+  local yaml_file=
+  yaml_file=$(mktemp)
+  local monitoring_install=1
+  cat > "${yaml_file}" <<EOF
+---
+profiles:
+  monitoring:
+    install: yes
+EOF
+
+  unset fai_monitoring_install
+  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
+  assertEquals "Wrong fai_monitoring_install" \
+               "${monitoring_install}" \
+               "${fai_monitoring_install}"
+}
+
 test_can_parse_yaml_conf_db() {
   local yaml_file=
   yaml_file=$(mktemp)
@@ -10,34 +28,58 @@ test_can_parse_yaml_conf_db() {
   local db_host=foodbhost
   local db_port=foodbport
   local db_install=yes
+  local db_ear=db.ear
+  local db_master=1
+  local db_drop_old_db_first=1
+  local db_replication=1
 
   cat > "${yaml_file}" <<EOF
 ---
 profiles:
   db:
     install: ${db_install}
+    master: true
     user: ${db_user}
+    ear: ${db_ear}
     password: ${db_password}
     schema: ${db_schema}
     host: ${db_host}
     port: ${db_port}
+    drop_old_db_first: yes
+    replication: yes
 EOF
 
   unset fai_db_install
+  unset fai_db_master
   unset fai_db_user
   unset fai_db_password
   unset fai_db_schema
   unset fai_db_host
   unset fai_db_port
-
+  unset fai_db_ear
+  unset fai_db_drop_old_db_first
+  unset fai_db_replication
   parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
 
   assertNotNull "Should set fai_db_install" "${fai_db_install}"
   assertEquals "Should set fai_db_install" 1 "${fai_db_install}"
 
+  assertEquals "Should set fai_db_master" "${db_master}" "${fai_db_master}"
+
+  assertEquals "Should set fai_db_drop_old_db_first" \
+               "${db_drop_old_db_first}" \
+               "${fai_db_drop_old_db_first}"
+
+  assertEquals "Should set fai_db_replication" \
+               "${db_replication}" \
+               "${fai_db_replication}"
+
   assertNotNull "Should set fai_db_user" "${fai_db_user}"
   assertEquals "Should set fai_db_user" "${db_user}" "${fai_db_user}"
 
+  assertNotNull "Should set fai_db_ear" "${fai_db_ear}"
+  assertEquals "Should set fai_db_ear" "${db_ear}" "${fai_db_ear}"
+
   assertNotNull "Should set fai_db_password" "${fai_db_password}"
   assertEquals "Should set fai_db_password" "${db_password}" "${fai_db_password}"
 
@@ -58,6 +100,8 @@ test_can_parse_yaml_conf_credentials() {
   yaml_file=$(mktemp)
   local escenic_download_user=foouser
   local escenic_download_password=barpassword
+  local builder_download_user=buildy
+  local builder_download_password=boo
 
   cat > "${yaml_file}" <<EOF
 ---
@@ -65,10 +109,18 @@ credentials:
   - site: maven.escenic.com
     user: ${escenic_download_user}
     password: ${escenic_download_password}
+  - site: builder
+    user: ${builder_download_user}
+    password: ${builder_download_password}
 EOF
 
   unset technet_user
   unset technet_password
+  unset fai_builder_http_user
+  unset fai_builder_http_password
+  unset fai_conf_builder_http_user
+  unset fai_conf_builder_http_password
+
   parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
   assertNotNull "Should set technet_user" "${technet_user}"
   assertEquals "Should set technet_user" "${escenic_download_user}" "${technet_user}"
@@ -76,13 +128,33 @@ EOF
   assertNotNull "Should set technet_password" "${technet_password}"
   assertEquals "Should set technet_password" "${escenic_download_password}" "${technet_password}"
 
+  assertEquals "Should set fai_builder_http_user" \
+               "${builder_download_user}" \
+               "${fai_builder_http_user}"
+  assertEquals "Should set fai_builder_http_password" \
+               "${builder_download_password}" \
+               "${fai_builder_http_password}"
+  assertEquals "Should set fai_conf_builder_http_user" \
+               "${builder_download_user}" \
+               "${fai_conf_builder_http_user}"
+  assertEquals "Should set fai_conf_builder_http_password" \
+               "${builder_download_password}" \
+               "${fai_conf_builder_http_password}"
+
   rm -rf "${yaml_file}"
 }
 
 test_can_parse_yaml_conf_create_publication() {
   local yaml_file=
   yaml_file=$(mktemp)
+  local publication_ear=http://builder/engine.ear
+  local publication_webapp1=pub.war
+  local publication_webapp2=loc.war
+
   local publication1_name=foopub
+  local publication1_remove_file1=stoo.pid
+  local publication1_remove_file2=does.it
+  local publication1_environment=testing
   local publication1_war=pub.war
   local publication1_domain=foo.example.com
   local publication1_alias1=fooalias1.example.com
@@ -91,24 +163,52 @@ test_can_parse_yaml_conf_create_publication() {
   cat > "${yaml_file}" <<EOF
 ---
 profiles:
-   publication:
+   publications:
      - name: ${publication1_name}
        war: ${publication1_war}
+       war_remove_list:
+         - ${publication1_remove_file1}
+         - ${publication1_remove_file2}
+       webapps:
+         - ${publication_webapp1}
+         - ${publication_webapp2}
        domain: ${publication1_domain}
+       ear: ${publication_ear}
+       environment: ${publication1_environment}
        aliases:
          - ${publication1_alias1}
          - ${publication1_alias2}
 EOF
 
   unset fai_publication_domain_mapping_list
+  unset fai_publication_ear
+  unset fai_publication_war_remove_file_list
+  unset fai_publication_environment
+  unset fai_publication_webapps
+  unset fai_publications_webapps # arg, the plural
+
   parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
   assertEquals "Having pubs defined, sets enabled flag" \
                1 \
                "${fai_publication_create}"
-
-
+  assertEquals "fai_publication_ear should have been set" \
+               "${publication_ear}" \
+               "${fai_publication_ear}"
+  assertEquals "fai_publication_webapps should have been set" \
+               "${publication_webapp1} ${publication_webapp2}" \
+               "${fai_publication_webapps}"
+  assertEquals "fai_publications_webapps should have been set" \
+               "${fai_publication_webapps}" \
+               "${fai_publications_webapps}"
+  assertEquals "fai_publication_environment should have been set" \
+               "${publication1_environment}" \
+               "${fai_publication_environment}"
+  assertEquals "fai_publication_war_remove_file_list should have been set" \
+               "${publication1_remove_file1} ${publication1_remove_file2}" \
+               "${fai_publication_war_remove_file_list}"
   assertNotNull "Able to parse info for creating publications" \
                 "${fai_publication_domain_mapping_list}"
+
   for el in ${fai_publication_domain_mapping_list}; do
     IFS='#' read -r publication domain aliases <<< "${el}"
     IFS=',' read -r name war <<< "$publication"
@@ -257,28 +357,70 @@ EOF
       assertNull "Package without version should have no version" \
                  "${version}"
     else
-      assertEquals "Should have parsed package version" "${package_version}" "${version}"
+      assertEquals "Should have parsed package version" \
+                   "${package_version}" \
+                   "${version}"
     fi
   done
 
   rm -rf "${yaml_file}"
 }
 
-test_can_parse_yaml_conf_java_home() {
+test_can_parse_yaml_conf_environment() {
   local yaml_file=
   yaml_file=$(mktemp)
   local foo_java_home=/usr/lib/jvm/foo-java-sdk
+  local environment_type=production
+  local foo_java_version=1.8
+  local skip_password_checks=1
+  local apt_pool=testing
+  local mvn_repo1=repo1.example.com
+  local mvn_repo2=repo2.example.com
+  local conf_url=http://build.example.com/machine-conf-1.2.3.deb
 
   cat > "${yaml_file}" <<EOF
 ---
 environment:
-  - java_home: ${foo_java_home}
+  type: ${environment_type}
+  java_home: ${foo_java_home}
+  java_version: ${foo_java_version}
+  skip_password_checks: true
+  conf_url: ${conf_url}
+  apt:
+    escenic:
+      pool: ${apt_pool}
+  maven:
+    repositories:
+      - ${mvn_repo1}
+      - ${mvn_repo2}
 EOF
 
   unset java_home
+  unset fai_environment
+  unset fai_server_java_version
+  unset fai_maven_repositories
+  unset fai_conf_url
   parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
+
   assertNotNull "Should set java_home" "${java_home}"
   assertEquals "Should set java_home" "${foo_java_home}" "${java_home}"
+  assertEquals "Should set fai_server_java_version" \
+               "${foo_java_version}" \
+               "${fai_server_java_version}"
+  assertEquals "Should set fai_environment (type)" \
+               "${environment_type}" \
+               "${fai_environment}"
+  assertEquals "Should set fai_apt_vizrt_pool" \
+               "${apt_pool}" \
+               "${fai_apt_vizrt_pool}"
+  assertEquals "Should set fai_skip_password_checks" \
+               "${skip_password_checks}" \
+               "${fai_skip_password_checks}"
+  assertEquals "Should set fai_maven_repositories" \
+               "${mvn_repo1} ${mvn_repo2}" \
+               "${fai_maven_repositories}"
+  assertEquals "Should set fai_conf_url" "${conf_url}" "${fai_conf_url}"
+
   rm -rf "${yaml_file}"
 }
 
@@ -310,7 +452,99 @@ EOF
   rm -rf "${yaml_file}"
 }
 
+test_can_parse_yaml_conf_restore() {
+  local restore_pre_wipe_solr=1
+  local restore_pre_wipe_all=1
+  local restore_pre_wipe_logs=1
+  local restore_pre_wipe_cache=1
+  local restore_pre_wipe_crash=1
+  local restore_from_backup=1
+  local restore_data_files=1
+  local restore_software_binaries=1
+  local restore_db=1
+  local restore_configuration=1
+  local restore_from_file=/var/backups/backup.tar.gz
+
+  local yaml_file=
+  yaml_file=$(mktemp)
+  cat > "${yaml_file}" <<EOF
+---
+profiles:
+  restore:
+    pre_wipe_solr: true
+    pre_wipe_all: true
+    pre_wipe_logs: true
+    pre_wipe_cache: true
+    pre_wipe_crash: true
+    from_backup: true
+    data_files: true
+    software_binaries: true
+    db: true
+    configuration: true
+    from_file: ${restore_from_file}
+EOF
+  unset fai_restore_pre_wipe_solr
+  unset fai_restore_pre_wipe_all
+  unset fai_restore_pre_wipe_logs
+  unset fai_restore_pre_wipe_cache
+  unset fai_restore_pre_wipe_crash
+  unset fai_restore_from_backup
+  unset fai_restore_data_files
+  unset fai_restore_software_binaries
+  unset fai_restore_db
+  unset fai_restore_configuration
+  unset fai_restore_from_file
+  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
+
+  assertEquals "Wrong fai_restore_pre_wipe_solr" \
+               "${restore_pre_wipe_solr}" \
+               "${fai_restore_pre_wipe_solr}"
+  assertEquals "Wrong fai_restore_pre_wipe_all" \
+               "${restore_pre_wipe_all}" \
+               "${fai_restore_pre_wipe_all}"
+  assertEquals "Wrong fai_restore_pre_wipe_logs" \
+               "${restore_pre_wipe_logs}" \
+               "${fai_restore_pre_wipe_logs}"
+  assertEquals "Wrong fai_restore_pre_wipe_cache" \
+               "${restore_pre_wipe_cache}" \
+               "${fai_restore_pre_wipe_cache}"
+  assertEquals "Wrong fai_restore_pre_wipe_crash" \
+               "${restore_pre_wipe_crash}" \
+               "${fai_restore_pre_wipe_crash}"
+  assertEquals "Wrong fai_restore_from_backup" \
+               "${restore_from_backup}" \
+               "${fai_restore_from_backup}"
+  assertEquals "Wrong fai_restore_data_files" \
+               "${restore_data_files}" \
+               "${fai_restore_data_files}"
+  assertEquals "Wrong fai_restore_software_binaries" \
+               "${restore_software_binaries}" \
+               "${fai_restore_software_binaries}"
+  assertEquals "Wrong fai_restore_db" \
+               "${restore_db}" \
+               "${fai_restore_db}"
+  assertEquals "Wrong fai_restore_configuration" \
+               "${restore_configuration}" \
+               "${fai_restore_configuration}"
+  assertEquals "Wrong fai_restore_from_file" \
+               "${restore_from_file}" \
+               "${fai_restore_from_file}"
+
+  rm -rf "${yaml_file}"
+}
+
+
 test_can_parse_yaml_conf_presentation_install() {
+  local presentation_port=8000
+  local presentation_shutdown=5000
+  local presentation_redirect=4333
+  local presentation_name=presentation1
+  local presentation_host=presapp1
+  local presentation_ear=http://builder/engine.ear
+  local presentation_environment=testing
+  local presentation_deploy_white_list=foo
+  local presentation_search_indexer_ws_uri=http://engine1/indexer-webservice
+
   local yaml_file=
   yaml_file=$(mktemp)
   cat > "${yaml_file}" <<EOF
@@ -318,17 +552,163 @@ test_can_parse_yaml_conf_presentation_install() {
 profiles:
   presentation:
     install: yes
+    ear: ${presentation_ear}
+    environment: ${presentation_environment}
+    host: ${presentation_host}
+    name: ${presentation_name}
+    port: ${presentation_port}
+    redirect: ${presentation_redirect}
+    shutdown: ${presentation_shutdown}
+    deploy_white_list: ${presentation_deploy_white_list}
+    search_indexer_ws_uri: ${presentation_search_indexer_ws_uri}
 EOF
 
+  unset fai_presentation_ear
+  unset fai_presentation_environment
   unset fai_presentation_install
+  unset fai_presentation_name
+  unset fai_presentation_port
+  unset fai_presentation_redirect
+  unset fai_presentation_shutdown
+  unset fai_presentation_deploy_white_list
+  unset fai_presentation_search_indexer_ws_uri
+
   parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
   assertNotNull "Should set fai_presentation_install" "${fai_presentation_install}"
   assertEquals "Should set fai_presentation_install" 1 "${fai_presentation_install}"
+  assertEquals "Should set fai_presentation_ear" "${presentation_ear}" "${fai_presentation_ear}"
+  assertEquals "Should set fai_presentation_environment" \
+               "${presentation_environment}" \
+               "${fai_presentation_environment}"
+  assertEquals "Should set fai_presentation_host" \
+               "${presentation_host}" \
+               "${fai_presentation_host}"
+  assertEquals "Should set fai_presentation_name" \
+               "${presentation_name}" \
+               "${fai_presentation_name}"
+  assertEquals "Should set fai_presentation_port" \
+               "${presentation_port}" \
+               "${fai_presentation_port}"
+  assertEquals "Should set fai_presentation_redirect" \
+               "${presentation_redirect}" \
+               "${fai_presentation_redirect}"
+  assertEquals "Should set fai_presentation_shutdown" \
+               "${presentation_shutdown}" \
+               "${fai_presentation_shutdown}"
+  assertEquals "Should set fai_presentation_search_indexer_ws_uri" \
+               "${presentation_search_indexer_ws_uri}" \
+               "${fai_presentation_search_indexer_ws_uri}"
+  assertEquals "Should set fai_presentation_deploy_white_list" \
+               "${presentation_deploy_white_list}" \
+               "${fai_presentation_deploy_white_list}"
+
+  rm -rf "${yaml_file}"
+}
+
+test_can_parse_yaml_conf_cache_install() {
+  local yaml_file=
+  yaml_file=$(mktemp)
+  cat > "${yaml_file}" <<EOF
+---
+profiles:
+  cache:
+    install: yes
+EOF
+
+  unset fai_presentation_install
+  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
+  assertNotNull "Should set fai_cache_install" "${fai_cache_install}"
+  assertEquals "Should set fai_cache_install" 1 "${fai_cache_install}"
+
+  rm -rf "${yaml_file}"
+}
+
+test_can_parse_yaml_conf_analysis_install() {
+  local yaml_file=
+  yaml_file=$(mktemp)
+
+  local analysis_port=9000
+  local analysis_name=stats1
+  local analysis_shutdown=5553
+  local analysis_redirect=4553
+  local analysis_host=stats1
+
+  cat > "${yaml_file}" <<EOF
+---
+profiles:
+  analysis:
+    install: yes
+    name: ${analysis_name}
+    port: ${analysis_port}
+    host: ${analysis_host}
+    shutdown: ${analysis_shutdown}
+    redirect: ${analysis_redirect}
+EOF
+
+  unset fai_analysis_install
+  unset fai_analysis_name
+  unset fai_analysis_port
+  unset fai_analysis_host
+  unset fai_analysis_shutdown
+  unset fai_analysis_redirect
+  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
+
+  assertNotNull "Should set fai_analysis_install" "${fai_analysis_install}"
+  assertEquals "Should set fai_analysis_install" 1 "${fai_analysis_install}"
+  assertEquals "Should set fai_analysis_name" "${analysis_name}" "${fai_analysis_name}"
+  assertEquals "Should set fai_analysis_port" "${analysis_port}" "${fai_analysis_port}"
+  assertEquals "Should set fai_analysis_host" "${analysis_host}" "${fai_analysis_host}"
+  assertEquals "Should set fai_analysis_shutdown" "${analysis_shutdown}" "${fai_analysis_shutdown}"
+  assertEquals "Should set fai_analysis_redirect" "${analysis_redirect}" "${fai_analysis_redirect}"
+
+  rm -rf "${yaml_file}"
+}
+
+test_can_parse_yaml_conf_analysis_db_install() {
+  local yaml_file=
+  yaml_file=$(mktemp)
+
+  local analysis_db_user=foouser
+  local analysis_db_password=foopass
+  local analysis_db_schema=fooanalysis_db
+
+  cat > "${yaml_file}" <<EOF
+---
+profiles:
+  analysis_db:
+    install: yes
+    user: ${analysis_db_user}
+    password: ${analysis_db_password}
+    schema: ${analysis_db_schema}
+EOF
+
+  unset fai_analysis_db_install
+  unset fai_analysis_db_user
+  unset fai_analysis_db_password
+  unset fai_analysis_db_schema
+  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
+
+  assertNotNull "Should set fai_analysis_install" "${fai_analysis_install}"
+  assertEquals "Should set fai_analysis_install" 1 "${fai_analysis_install}"
+  assertEquals "Should set fai_analysis_db_user" "${analysis_db_user}" "${fai_analysis_db_user}"
+  assertEquals "Should set fai_analysis_db_password" "${analysis_db_password}" "${fai_analysis_db_password}"
+  assertEquals "Should set fai_analysis_db_schema" "${analysis_db_schema}" "${fai_analysis_db_schema}"
 
   rm -rf "${yaml_file}"
 }
 
 test_can_parse_yaml_conf_search_install() {
+  local search_port=8000
+  local search_shutdown=5000
+  local search_redirect=4333
+  local search_name=search1
+  local search_host=searchhost
+  local search_legacy=1
+  local search_for_editor=1
+  local search_legacy=1
+  local search_ear=http://builder/engine.ear
+  local search_indexer_ws_uri=http://engine/indexer-webservice
+
   local yaml_file=
   yaml_file=$(mktemp)
   cat > "${yaml_file}" <<EOF
@@ -336,17 +716,52 @@ test_can_parse_yaml_conf_search_install() {
 profiles:
   search:
     install: yes
+    legacy: yes
+    ear: ${search_ear}
+    for_editor: true
+    indexer_ws_uri: ${search_indexer_ws_uri}
+    port: ${search_port}
+    host: ${search_host}
+    name: ${search_name}
+    redirect: ${search_redirect}
+    shutdown: ${search_shutdown}
 EOF
 
   unset fai_search_install
+  unset fai_search_host
+  unset fai_search_port
+  unset fai_search_shutdown
+  unset fai_search_redirect
+  unset fai_search_name
+  unset fai_search_legacy
+  unset fai_search_for_editor
+  unset fai_search_ear
+  unset fai_search_indexer_ws_uri
+
   parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
   assertNotNull "Should set fai_search_install" "${fai_search_install}"
   assertEquals "Should set fai_search_install" 1 "${fai_search_install}"
 
+  assertEquals "Should set fai_search_host" "${search_host}" "${fai_search_host}"
+  assertEquals "Should set fai_search_port" "${search_port}" "${fai_search_port}"
+  assertEquals "Should set fai_search_shutdown" "${search_shutdown}" "${fai_search_shutdown}"
+  assertEquals "Should set fai_search_redirect" "${search_redirect}" "${fai_search_redirect}"
+  assertEquals "Should set fai_search_name" "${search_name}" "${fai_search_name}"
+  assertEquals "Should set fai_search_legacy" "${search_legacy}" "${fai_search_legacy}"
+  assertEquals "Should set fai_search_for_editor" "${search_for_editor}" "${fai_search_for_editor}"
+  assertEquals "Should set fai_search_ear" "${search_ear}" "${fai_search_ear}"
+  assertEquals "Should set fai_search_indexer_ws_uri" "${search_indexer_ws_uri}" "${fai_search_indexer_ws_uri}"
+
   rm -rf "${yaml_file}"
 }
 
 test_can_parse_yaml_conf_editor_install() {
+  local editor_port=8000
+  local editor_shutdown=5000
+  local editor_redirect=4333
+  local editor_name=fooeditor1
+  local editor_host=edapp1
+
   local yaml_file=
   yaml_file=$(mktemp)
   cat > "${yaml_file}" <<EOF
@@ -354,14 +769,27 @@ test_can_parse_yaml_conf_editor_install() {
 profiles:
   editor:
     install: yes
-    port: 8080
-    name: engine1
+    port: ${editor_port}
+    host: ${editor_host}
+    name: ${editor_name}
+    redirect: ${editor_redirect}
+    shutdown: ${editor_shutdown}
 EOF
 
   unset fai_editor_install
+  unset fai_editor_port
+  unset fai_editor_shutdown
+  unset fai_editor_redirect
+  unset fai_editor_name
+
   parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
   assertNotNull "Should set fai_editor_install" "${fai_editor_install}"
   assertEquals "Should set fai_editor_install" 1 "${fai_editor_install}"
+  assertEquals "Should set fai_editor_port" "${editor_port}" "${fai_editor_port}"
+  assertEquals "Should set fai_editor_host" "${editor_host}" "${fai_editor_host}"
+  assertEquals "Should set fai_editor_shutdown" "${editor_shutdown}" "${fai_editor_shutdown}"
+  assertEquals "Should set fai_editor_redirect" "${editor_redirect}" "${fai_editor_redirect}"
+  assertEquals "Should set fai_editor_name" "${editor_name}" "${fai_editor_name}"
 
   rm -rf "${yaml_file}"
 }
@@ -434,6 +862,11 @@ EOF
 }
 
 test_can_parse_yaml_conf_cache_install() {
+  local cache_port=80
+  local cache_conf_dir=/opt/etc/varnish
+  local cache_be1=pres1
+  local cache_be2=pres2
+
   local yaml_file=
   yaml_file=$(mktemp)
   cat > "${yaml_file}" <<EOF
@@ -441,13 +874,24 @@ test_can_parse_yaml_conf_cache_install() {
 profiles:
   cache:
     install: yes
+    port: ${cache_port}
+    conf_dir: ${cache_conf_dir}
+    backends:
+      - ${cache_be1}
+      - ${cache_be2}
 EOF
 
   unset fai_cache_install
+  unset fai_cache_backends
+  unset fai_cache_conf_dir
+  unset fai_cache_port
+
   parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
   assertNotNull "Should set fai_cache_install" "${fai_cache_install}"
   assertEquals "Should set fai_cache_install" 1 "${fai_cache_install}"
-
+  assertEquals "Should set fai_cache_backends" "${cache_be1} ${cache_be2}" "${fai_cache_backends}"
+  assertEquals "Should set fai_cache_port" "${cache_port}" "${fai_cache_port}"
+  assertEquals "Should set fai_cache_conf_dir" "${cache_conf_dir}" "${fai_cache_conf_dir}"
   rm -rf "${yaml_file}"
 }
 
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
index 0162a77b..186ae3a9 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
@@ -33,11 +33,15 @@ parse_yaml_conf_file_or_source_if_sh_conf() {
   _parse_yaml_conf_file_presentation "${yaml_file}"
   _parse_yaml_conf_file_search "${yaml_file}"
   _parse_yaml_conf_file_db "${yaml_file}"
+  _parse_yaml_conf_file_analysis_db "${yaml_file}"
   _parse_yaml_conf_file_cache "${yaml_file}"
+  _parse_yaml_conf_file_analysis "${yaml_file}"
   _parse_yaml_conf_file_credentials "${yaml_file}"
   _parse_yaml_conf_file_publications "${yaml_file}"
   _parse_yaml_conf_file_packages "${yaml_file}"
   _parse_yaml_conf_file_environment "${yaml_file}"
+  _parse_yaml_conf_file_monitoring "${yaml_file}"
+  _parse_yaml_conf_file_restore "${yaml_file}"
 }
 
 _parse_yaml_conf_file_credentials() {
@@ -55,8 +59,13 @@ _parse_yaml_conf_file_credentials() {
       export technet_user=${user}
       export technet_password=${password}
     fi
+    if [[ "${site}" == builder ]]; then
+      export fai_builder_http_user=${user}
+      export fai_builder_http_password=${password}
+      export fai_conf_builder_http_user=${user}
+      export fai_conf_builder_http_password=${password}
+    fi
   done
-
 }
 
 _parse_yaml_conf_file_publications() {
@@ -73,19 +82,30 @@ _parse_yaml_conf_file_publications() {
 
     local name=
     local war=
+    local ear=
+    local webapps=
     local domain=
     local aliases=
+    local environment=
+    local war_remove_list=
 
+    ear=$(_jq "${yaml_file}" .profiles.publications["${i}"].ear)
     name=$(_jq "${yaml_file}" .profiles.publications["${i}"].name)
     war=$(_jq "${yaml_file}" .profiles.publications["${i}"].war)
+    environment=$(_jq "${yaml_file}" .profiles.publications["${i}"].environment)
 
     if [ -z "${war}" ]; then
       war=${name}.war
     fi
+    if [ -n "${ear}" ]; then
+      export fai_publication_ear=${ear}
+    fi
+    if [ -n "${environment}" ]; then
+      export fai_publication_environment="${environment}"
+    fi
 
     domain=$(_jq "${yaml_file}" .profiles.publications["${i}"].domain)
     alias_count=$(_jq "${yaml_file}" ".profiles.publications[${i}].aliases | length")
-
     for ((j = 0; j < alias_count; j++)); do
       if [ -n "${aliases}" ]; then
         aliases="${aliases},"
@@ -93,6 +113,27 @@ _parse_yaml_conf_file_publications() {
       aliases=${aliases}$(_jq "${yaml_file}" .profiles.publications["${i}"].aliases["${j}"])
     done
 
+    webapps_count=$(_jq "${yaml_file}" ".profiles.publications[${i}].webapps | length")
+    for ((j = 0; j < webapps_count; j++)); do
+      if [ -n "${webapps}" ]; then
+        webapps="${webapps} "
+      fi
+      webapps=${webapps}$(_jq "${yaml_file}" .profiles.publications["${i}"].webapps["${j}"])
+    done
+    export fai_publication_webapps=${webapps}
+    export fai_publications_webapps=${fai_publication_webapps}
+
+    war_remove_list_count=$(
+      _jq "${yaml_file}" ".profiles.publications[${i}].war_remove_list | length")
+    for ((j = 0; j < war_remove_list_count; j++)); do
+      if [ -n "${war_remove_list}" ]; then
+        war_remove_list="${war_remove_list} "
+      fi
+      war_remove_list=${war_remove_list}$(
+        _jq "${yaml_file}" .profiles.publications["${i}"].war_remove_list["${j}"])
+    done
+    export fai_publication_war_remove_file_list=${war_remove_list}
+
     fai_publication_domain_mapping_list="
       ${fai_publication_domain_mapping_list}
       ${name},${war}#${domain}"
@@ -137,16 +178,101 @@ _parse_yaml_conf_file_editor() {
           "${install_editor}" == "true" ]]; then
     export fai_editor_install=1
   fi
+
+  local install_editor_name=
+  install_editor_name=$(_jq "${yaml_file}" .profiles.editor.name)
+  if [ -n "${install_editor_name}" ]; then
+    export fai_editor_name=${install_editor_name}
+  fi
+
+  local install_editor_host=
+  install_editor_host=$(_jq "${yaml_file}" .profiles.editor.host)
+  if [ -n "${install_editor_host}" ]; then
+    export fai_editor_host=${install_editor_host}
+  fi
+
+  local install_editor_port=
+  install_editor_port=$(_jq "${yaml_file}" .profiles.editor.port)
+  if [ -n "${install_editor_port}" ]; then
+    export fai_editor_port=${install_editor_port}
+  fi
+
+  local install_editor_shutdown=
+  install_editor_shutdown=$(_jq "${yaml_file}" .profiles.editor.shutdown)
+  if [ -n "${install_editor_shutdown}" ]; then
+    export fai_editor_shutdown=${install_editor_shutdown}
+  fi
+
+  local install_editor_redirect=
+  install_editor_redirect=$(_jq "${yaml_file}" .profiles.editor.redirect)
+  if [ -n "${install_editor_redirect}" ]; then
+    export fai_editor_redirect=${install_editor_redirect}
+  fi
 }
 
 _parse_yaml_conf_file_environment() {
   local yaml_file=$1
 
   local configured_java_home=
-  configured_java_home=$(_jq "${yaml_file}" .environment[].java_home)
+  configured_java_home=$(_jq "${yaml_file}" .environment.java_home)
   if [[ -n "${configured_java_home}" ]]; then
     export java_home=${configured_java_home}
   fi
+
+  local configured_java_version=
+  configured_java_version=$(_jq "${yaml_file}" .environment.java_version)
+  if [[ -n "${configured_java_version}" ]]; then
+    export fai_server_java_version=${configured_java_version}
+  fi
+
+  local configured_environment=
+  configured_environment=$(_jq "${yaml_file}" .environment.type)
+  if [[ -n "${configured_environment}" ]]; then
+    export fai_environment=${configured_environment}
+  fi
+
+  local configured_apt_pool=
+  configured_apt_pool=$(_jq "${yaml_file}" .environment.apt.escenic.pool)
+  if [[ -n "${configured_apt_pool}" ]]; then
+    export fai_apt_vizrt_pool=${configured_apt_pool}
+  fi
+
+  local skip_password_checks=
+  skip_password_checks=$(
+    _jq "${yaml_file}" .environment.skip_password_checks)
+  if [[ "${skip_password_checks}" == "yes" ||
+          "${skip_password_checks}" == "true" ]]; then
+    export fai_skip_password_checks=1
+  fi
+
+  local count=0
+  count=$(_jq "${yaml_file}" ".environment.maven.repositories | length")
+  for ((i = 0; i < count; i++)); do
+    local maven_repo=
+    maven_repo=$(_jq "${yaml_file}" .environment.maven.repositories["${i}"])
+    if [ -n "${fai_maven_repositories}" ]; then
+      export fai_maven_repositories=${fai_maven_repositories}" "${maven_repo}
+    else
+      export fai_maven_repositories=${maven_repo}
+    fi
+  done
+
+  local configured_conf_url=
+  configured_conf_url=$(_jq "${yaml_file}" .environment.conf_url)
+  if [ -n "${configured_conf_url}" ]; then
+    export fai_conf_url=${configured_conf_url}
+  fi
+}
+
+_parse_yaml_conf_file_monitoring() {
+  local yaml_file=$1
+
+  local install_monitoring=
+  install_monitoring=$(_jq "${yaml_file}" .profiles.monitoring.install)
+  if [[ "${install_monitoring}" == "yes" ||
+          "${install_monitoring}" == "true" ]]; then
+    export fai_monitoring_install=1
+  fi
 }
 
 _parse_yaml_conf_file_presentation() {
@@ -158,6 +284,64 @@ _parse_yaml_conf_file_presentation() {
           "${install_presentation}" == "true" ]]; then
     export fai_presentation_install=1
   fi
+
+  local install_presentation_name=
+  install_presentation_name=$(_jq "${yaml_file}" .profiles.presentation.name)
+  if [ -n "${install_presentation_name}" ]; then
+    export fai_presentation_name=${install_presentation_name}
+  fi
+
+  local install_presentation_host=
+  install_presentation_host=$(_jq "${yaml_file}" .profiles.presentation.host)
+  if [ -n "${install_presentation_host}" ]; then
+    export fai_presentation_host=${install_presentation_host}
+  fi
+
+  local install_presentation_port=
+  install_presentation_port=$(_jq "${yaml_file}" .profiles.presentation.port)
+  if [ -n "${install_presentation_port}" ]; then
+    export fai_presentation_port=${install_presentation_port}
+  fi
+
+  local install_presentation_shutdown=
+  install_presentation_shutdown=$(_jq "${yaml_file}" .profiles.presentation.shutdown)
+  if [ -n "${install_presentation_shutdown}" ]; then
+    export fai_presentation_shutdown=${install_presentation_shutdown}
+  fi
+
+  local install_presentation_redirect=
+  install_presentation_redirect=$(
+    _jq "${yaml_file}" .profiles.presentation.redirect)
+  if [ -n "${install_presentation_redirect}" ]; then
+    export fai_presentation_redirect=${install_presentation_redirect}
+  fi
+
+  local install_presentation_ear=
+  install_presentation_ear=$(_jq "${yaml_file}" .profiles.presentation.ear)
+  if [ -n "${install_presentation_ear}" ]; then
+    export fai_presentation_ear=${install_presentation_ear}
+  fi
+
+  local install_presentation_environment=
+  install_presentation_environment=$(
+    _jq "${yaml_file}" .profiles.presentation.environment)
+  if [ -n "${install_presentation_environment}" ]; then
+    export fai_presentation_environment=${install_presentation_environment}
+  fi
+
+  local install_presentation_deploy_white_list=
+  install_presentation_deploy_white_list=$(
+    _jq "${yaml_file}" .profiles.presentation.deploy_white_list)
+  if [ -n "${install_presentation_deploy_white_list}" ]; then
+    export fai_presentation_deploy_white_list=${install_presentation_deploy_white_list}
+  fi
+
+  local install_presentation_search_indexer_ws_uri=
+  install_presentation_search_indexer_ws_uri=$(
+    _jq "${yaml_file}" .profiles.presentation.search_indexer_ws_uri)
+  if [ -n "${install_presentation_search_indexer_ws_uri}" ]; then
+    export fai_presentation_search_indexer_ws_uri=${install_presentation_search_indexer_ws_uri}
+  fi
 }
 
 _parse_yaml_conf_file_search() {
@@ -169,6 +353,62 @@ _parse_yaml_conf_file_search() {
           "${install_search}" == "true" ]]; then
     export fai_search_install=1
   fi
+
+  local search_legacy=no
+  search_legacy=$(_jq "${yaml_file}" .profiles.search.legacy)
+  if [[ "${search_legacy}" == "yes" ||
+          "${search_legacy}" == "true" ]]; then
+    export fai_search_legacy=1
+  fi
+
+  local search_for_editor=no
+  search_for_editor=$(_jq "${yaml_file}" .profiles.search.for_editor)
+  if [[ "${search_for_editor}" == "yes" ||
+          "${search_for_editor}" == "true" ]]; then
+    export fai_search_for_editor=1
+  fi
+
+  local install_search_name=
+  install_search_name=$(_jq "${yaml_file}" .profiles.search.name)
+  if [ -n "${install_search_name}" ]; then
+    export fai_search_name=${install_search_name}
+  fi
+
+  local install_search_ear=
+  install_search_ear=$(_jq "${yaml_file}" .profiles.search.ear)
+  if [ -n "${install_search_ear}" ]; then
+    export fai_search_ear=${install_search_ear}
+  fi
+
+  local install_search_host=
+  install_search_host=$(_jq "${yaml_file}" .profiles.search.host)
+  if [ -n "${install_search_host}" ]; then
+    export fai_search_host=${install_search_host}
+  fi
+
+  local install_search_port=
+  install_search_port=$(_jq "${yaml_file}" .profiles.search.port)
+  if [ -n "${install_search_port}" ]; then
+    export fai_search_port=${install_search_port}
+  fi
+
+  local install_search_shutdown=
+  install_search_shutdown=$(_jq "${yaml_file}" .profiles.search.shutdown)
+  if [ -n "${install_search_shutdown}" ]; then
+    export fai_search_shutdown=${install_search_shutdown}
+  fi
+
+  local install_search_redirect=
+  install_search_redirect=$(_jq "${yaml_file}" .profiles.search.redirect)
+  if [ -n "${install_search_redirect}" ]; then
+    export fai_search_redirect=${install_search_redirect}
+  fi
+
+  local install_search_indexer_ws_uri=
+  install_search_indexer_ws_uri=$(_jq "${yaml_file}" .profiles.search.indexer_ws_uri)
+  if [ -n "${install_search_indexer_ws_uri}" ]; then
+    export fai_search_indexer_ws_uri=${install_search_indexer_ws_uri}
+  fi
 }
 
 _parse_yaml_conf_file_cache() {
@@ -180,6 +420,152 @@ _parse_yaml_conf_file_cache() {
           "${install_cache}" == "true" ]]; then
     export fai_cache_install=1
   fi
+
+  local install_cache_port=
+  install_cache_port=$(_jq "${yaml_file}" .profiles.cache.port)
+  if [ -n "${install_cache_port}" ]; then
+    export fai_cache_port=${install_cache_port}
+  fi
+
+  local install_cache_conf_dir=
+  install_cache_conf_dir=$(_jq "${yaml_file}" .profiles.cache.conf_dir)
+  if [ -n "${install_cache_conf_dir}" ]; then
+    export fai_cache_conf_dir=${install_cache_conf_dir}
+  fi
+
+  local count=0
+  count=$(_jq "${yaml_file}" ".profiles.cache.backends | length")
+  for ((i = 0; i < count; i++)); do
+    local cache_backend=
+    cache_backend=$(_jq "${yaml_file}" .profiles.cache.backends["${i}"])
+    if [ -n "${fai_cache_backends}" ]; then
+      export fai_cache_backends=${fai_cache_backends}" "${cache_backend}
+    else
+      export fai_cache_backends=${cache_backend}
+    fi
+  done
+}
+
+_parse_yaml_conf_file_analysis() {
+  local yaml_file=$1
+
+  local install_analysis=no
+  install_analysis=$(_jq "${yaml_file}" .profiles.analysis.install)
+  if [[ "${install_analysis}" == "yes" ||
+          "${install_analysis}" == "true" ]]; then
+    export fai_analysis_install=1
+  fi
+
+  local install_analysis_name=
+  install_analysis_name=$(_jq "${yaml_file}" .profiles.analysis.name)
+  if [ -n "${install_analysis_name}" ]; then
+    export fai_analysis_name=${install_analysis_name}
+  fi
+
+  local install_analysis_host=
+  install_analysis_host=$(_jq "${yaml_file}" .profiles.analysis.host)
+  if [ -n "${install_analysis_host}" ]; then
+    export fai_analysis_host=${install_analysis_host}
+  fi
+
+  local install_analysis_port=
+  install_analysis_port=$(_jq "${yaml_file}" .profiles.analysis.port)
+  if [ -n "${install_analysis_port}" ]; then
+    export fai_analysis_port=${install_analysis_port}
+  fi
+
+  local install_analysis_shutdown=
+  install_analysis_shutdown=$(_jq "${yaml_file}" .profiles.analysis.shutdown)
+  if [ -n "${install_analysis_shutdown}" ]; then
+    export fai_analysis_shutdown=${install_analysis_shutdown}
+  fi
+
+  local install_analysis_redirect=
+  install_analysis_redirect=$(_jq "${yaml_file}" .profiles.analysis.redirect)
+  if [ -n "${install_analysis_redirect}" ]; then
+    export fai_analysis_redirect=${install_analysis_redirect}
+  fi
+}
+
+_parse_yaml_conf_file_restore() {
+  local yaml_file=$1
+
+  local pre_wipe_solr=no
+  pre_wipe_solr=$(_jq "${yaml_file}" .profiles.restore.pre_wipe_solr)
+  if [[ "${pre_wipe_solr}" == "yes" ||
+          "${pre_wipe_solr}" == "true" ]]; then
+    export fai_restore_pre_wipe_solr=1
+  fi
+  local pre_wipe_logs=no
+  pre_wipe_logs=$(_jq "${yaml_file}" .profiles.restore.pre_wipe_logs)
+  if [[ "${pre_wipe_logs}" == "yes" ||
+          "${pre_wipe_logs}" == "true" ]]; then
+    export fai_restore_pre_wipe_logs=1
+  fi
+  local pre_wipe_cache=no
+  pre_wipe_cache=$(_jq "${yaml_file}" .profiles.restore.pre_wipe_cache)
+  if [[ "${pre_wipe_cache}" == "yes" ||
+          "${pre_wipe_cache}" == "true" ]]; then
+    export fai_restore_pre_wipe_cache=1
+  fi
+
+  local pre_wipe_crash=no
+  pre_wipe_crash=$(_jq "${yaml_file}" .profiles.restore.pre_wipe_crash)
+  if [[ "${pre_wipe_crash}" == "yes" ||
+          "${pre_wipe_crash}" == "true" ]]; then
+    export fai_restore_pre_wipe_crash=1
+  fi
+
+  local pre_wipe_all=no
+  pre_wipe_all=$(_jq "${yaml_file}" .profiles.restore.pre_wipe_all)
+  if [[ "${pre_wipe_all}" == "yes" ||
+          "${pre_wipe_all}" == "true" ]]; then
+    export fai_restore_pre_wipe_all=1
+  fi
+
+  local from_backup=no
+  from_backup=$(_jq "${yaml_file}" .profiles.restore.from_backup)
+  if [[ "${from_backup}" == "yes" ||
+          "${from_backup}" == "true" ]]; then
+    export fai_restore_from_backup=1
+  fi
+
+  local data_files=no
+  data_files=$(_jq "${yaml_file}" .profiles.restore.data_files)
+  if [[ "${data_files}" == "yes" ||
+          "${data_files}" == "true" ]]; then
+    export fai_restore_data_files=1
+  fi
+
+  local data_db=no
+  data_db=$(_jq "${yaml_file}" .profiles.restore.db)
+  if [[ "${data_db}" == "yes" ||
+          "${data_db}" == "true" ]]; then
+    export fai_restore_db=1
+  fi
+
+  local software_binaries=no
+  software_binaries=$(
+    _jq "${yaml_file}" .profiles.restore.software_binaries)
+  if [[ "${software_binaries}" == "yes" ||
+          "${software_binaries}" == "true" ]]; then
+    export fai_restore_software_binaries=1
+  fi
+
+  local configuration=no
+  configuration=$(
+    _jq "${yaml_file}" .profiles.restore.configuration)
+  if [[ "${configuration}" == "yes" ||
+          "${configuration}" == "true" ]]; then
+    export fai_restore_configuration=1
+  fi
+
+  local from_file=
+  from_file=$(_jq "${yaml_file}" .profiles.restore.from_file)
+  if [ -n "${from_file}" ]; then
+    export fai_restore_from_file=${from_file}
+  fi
+
 }
 
 _parse_yaml_conf_file_db() {
@@ -192,6 +578,27 @@ _parse_yaml_conf_file_db() {
     export fai_db_install=1
   fi
 
+  local db_master=no
+  db_master=$(_jq "${yaml_file}" .profiles.db.master)
+  if [[ "${db_master}" == "yes" ||
+          "${db_master}" == "true" ]]; then
+    export fai_db_master=1
+  fi
+
+  local db_drop_old_db_first=no
+  db_drop_old_db_first=$(_jq "${yaml_file}" .profiles.db.drop_old_db_first)
+  if [[ "${db_drop_old_db_first}" == "yes" ||
+          "${db_drop_old_db_first}" == "true" ]]; then
+    export fai_db_drop_old_db_first=1
+  fi
+
+  local db_replication=no
+  db_replication=$(_jq "${yaml_file}" .profiles.db.replication)
+  if [[ "${db_replication}" == "yes" ||
+          "${db_replication}" == "true" ]]; then
+    export fai_db_replication=1
+  fi
+
   local install_db_user=
   install_db_user=$(_jq "${yaml_file}" .profiles.db.user)
   if [ -n "${install_db_user}" ]; then
@@ -221,6 +628,53 @@ _parse_yaml_conf_file_db() {
   if [ -n "${install_db_port}" ]; then
     export fai_db_port=${install_db_port}
   fi
+
+  local install_db_ear=
+  install_db_ear=$(_jq "${yaml_file}" .profiles.db.ear)
+  if [ -n "${install_db_ear}" ]; then
+    export fai_db_ear=${install_db_ear}
+  fi
+}
+
+_parse_yaml_conf_file_analysis_db() {
+  local yaml_file=$1
+
+  local install_db=no
+  install_analysis_db=$(_jq "${yaml_file}" .profiles.analysis_db.install)
+  if [[ "${install_analysis_db}" == "yes" ||
+          "${install_analysis_db}" == "true" ]]; then
+    export fai_analysis_db_install=1
+  fi
+
+  local install_analysis_db_user=
+  install_analysis_db_user=$(_jq "${yaml_file}" .profiles.analysis_db.user)
+  if [ -n "${install_analysis_db_user}" ]; then
+    export fai_analysis_db_user=${install_analysis_db_user}
+  fi
+
+  local install_analysis_db_password=
+  install_analysis_db_password=$(_jq "${yaml_file}" .profiles.analysis_db.password)
+  if [ -n "${install_analysis_db_password}" ]; then
+    export fai_analysis_db_password=${install_analysis_db_password}
+  fi
+
+  local install_analysis_db_schema=
+  install_analysis_db_schema=$(_jq "${yaml_file}" .profiles.analysis_db.schema)
+  if [ -n "${install_analysis_db_schema}" ]; then
+    export fai_analysis_db_schema=${install_analysis_db_schema}
+  fi
+
+  local install_analysis_db_host=
+  install_analysis_db_host=$(_jq "${yaml_file}" .profiles.analysis_db.host)
+  if [ -n "${install_analysis_db_host}" ]; then
+    export fai_analysis_db_host=${install_analysis_db_host}
+  fi
+
+  local install_analysis_db_port=
+  install_analysis_db_port=$(_jq "${yaml_file}" .profiles.analysis_db.port)
+  if [ -n "${install_analysis_db_port}" ]; then
+    export fai_analysis_db_port=${install_analysis_db_port}
+  fi
 }
 
 _jq() {

From f261d4875283f8ab87888c1c9c2e2ee6439b42bc Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 10 Mar 2017 15:39:00 +0100
Subject: [PATCH 2492/2585] Now, fai_publication_webapps on the same format as
 other publication options

- fai_publications_webapps was the only one sticking out with a plural
  publication<s>.

- Backwards compatible change, fai_publications_webapps is still
  supported, but the default is to look for fai_publication_webapps.
---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index d12fbbc8..feb44927 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -38,7 +38,7 @@ function get_publications_webapps_list() {
   local publication_webapps=""
   # Publication service webapp mappping
   if [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ] || [ $install_profile_number -eq $PROFILE_ALL_IN_ONE ]; then
-    publication_webapps=${fai_publications_webapps-""}
+    publication_webapps=${fai_publication_webapps-${fai_publications_webapps-""}}
   else
     publication_webapps=""
   fi

From 6ba9597a49bfc80cdfba2093b01ff3f1a390af9e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Mon, 13 Mar 2017 11:34:20 +0100
Subject: [PATCH 2493/2585] Added script to generate ece-install reference from
 unit test

Run it like this to update the reference:

   $ bash ece-install-conf-file-reader-extract-doc.sh > \
      ~/src/ece-scripts/usr/share/doc/escenic/ece-install-reference.md

- Added (generated) conf reference

- Adjusted method names for improved doc

- Re-ordered tests for better doc

- Renamed the reference to doc reference as that's what it is
---
 ...ce-install-conf-file-reader-extract-doc.sh |  53 +++
 .../ece-install-conf-file-reader-test.sh      | 398 +++++++++---------
 .../doc/escenic/ece-install-conf-reference.md | 373 ++++++++++++++++
 3 files changed, 625 insertions(+), 199 deletions(-)
 create mode 100644 usr/local/src/unit-tests/ece-install-conf-file-reader-extract-doc.sh
 create mode 100644 usr/share/doc/escenic/ece-install-conf-reference.md

diff --git a/usr/local/src/unit-tests/ece-install-conf-file-reader-extract-doc.sh b/usr/local/src/unit-tests/ece-install-conf-file-reader-extract-doc.sh
new file mode 100644
index 00000000..02e7246b
--- /dev/null
+++ b/usr/local/src/unit-tests/ece-install-conf-file-reader-extract-doc.sh
@@ -0,0 +1,53 @@
+#! /usr/bin/env bash
+
+## author: torstein@escenic.com
+set -o errexit
+set -o nounset
+set -o pipefail
+shopt -s nullglob
+
+print_doc_header() {
+  cat << 'EOF'
+# Configuration Reference for ece-install
+
+`ece-install` can be configured either in YAML (new) or `.conf`
+(old). You pass the file the same way regardless of format:
+```
+# ece-install -f <file>.yaml
+# ece-install -f <file>.conf
+```
+
+Both versions are listed below, grouped by topic.
+EOF
+}
+
+print_doc_footer() {
+  cat <<EOF
+---
+Reference guide generated: $(LC_ALL=C date)
+EOF
+}
+
+main() {
+  print_doc_header
+
+  cat ece-install-conf-file-reader-test.sh |
+    sed -n '/test_can_parse_yaml_conf_.*() {/,/parse_yaml_conf_file_or_source_if_sh_conf/{
+  /[ ]*local /d
+  /yaml_file=$(mktemp)/d
+  /cat > "${yaml_file}" <<EOF/d
+  /parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"/d
+
+  s#test_can_parse_yaml_conf_\(.*\)() {#\n\#\# \1#
+  s#---#```#
+  s#EOF#```#
+  s#  unset \(.*\)#- `ece-install.conf` equivalent: `\1`#
+  p
+}'
+
+  print_doc_footer
+}
+
+
+
+main "$@"
diff --git a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
index 67cfeb51..35a79193 100644
--- a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
+++ b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
@@ -1,22 +1,172 @@
 #! /usr/bin/env bash
 ## author: torstein@escenic.com
 
-test_can_parse_yaml_conf_monitoring() {
+test_can_parse_yaml_conf_environment() {
+  local yaml_file=
+  yaml_file=$(mktemp)
+  local foo_java_home=/usr/lib/jvm/foo-java-sdk
+  local environment_type=production
+  local foo_java_version=1.8
+  local skip_password_checks=1
+  local apt_pool=testing
+  local mvn_repo1=repo1.example.com
+  local mvn_repo2=repo2.example.com
+  local conf_url=http://build.example.com/machine-conf-1.2.3.deb
+
+  cat > "${yaml_file}" <<EOF
+---
+environment:
+  type: ${environment_type}
+  java_home: ${foo_java_home}
+  java_version: ${foo_java_version}
+  skip_password_checks: true
+  conf_url: ${conf_url}
+  apt:
+    escenic:
+      pool: ${apt_pool}
+  maven:
+    repositories:
+      - ${mvn_repo1}
+      - ${mvn_repo2}
+EOF
+
+  unset java_home
+  unset fai_environment
+  unset fai_server_java_version
+  unset fai_maven_repositories
+  unset fai_conf_url
+  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
+
+  assertNotNull "Should set java_home" "${java_home}"
+  assertEquals "Should set java_home" "${foo_java_home}" "${java_home}"
+  assertEquals "Should set fai_server_java_version" \
+               "${foo_java_version}" \
+               "${fai_server_java_version}"
+  assertEquals "Should set fai_environment (type)" \
+               "${environment_type}" \
+               "${fai_environment}"
+  assertEquals "Should set fai_apt_vizrt_pool" \
+               "${apt_pool}" \
+               "${fai_apt_vizrt_pool}"
+  assertEquals "Should set fai_skip_password_checks" \
+               "${skip_password_checks}" \
+               "${fai_skip_password_checks}"
+  assertEquals "Should set fai_maven_repositories" \
+               "${mvn_repo1} ${mvn_repo2}" \
+               "${fai_maven_repositories}"
+  assertEquals "Should set fai_conf_url" "${conf_url}" "${fai_conf_url}"
+
+  rm -rf "${yaml_file}"
+}
+
+test_can_parse_yaml_conf_editor() {
+  local editor_port=8000
+  local editor_shutdown=5000
+  local editor_redirect=4333
+  local editor_name=fooeditor1
+  local editor_host=edapp1
+
   local yaml_file=
   yaml_file=$(mktemp)
-  local monitoring_install=1
   cat > "${yaml_file}" <<EOF
 ---
 profiles:
-  monitoring:
+  editor:
     install: yes
+    port: ${editor_port}
+    host: ${editor_host}
+    name: ${editor_name}
+    redirect: ${editor_redirect}
+    shutdown: ${editor_shutdown}
 EOF
 
-  unset fai_monitoring_install
+  unset fai_editor_install
+  unset fai_editor_port
+  unset fai_editor_shutdown
+  unset fai_editor_redirect
+  unset fai_editor_name
+
   parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
-  assertEquals "Wrong fai_monitoring_install" \
-               "${monitoring_install}" \
-               "${fai_monitoring_install}"
+  assertNotNull "Should set fai_editor_install" "${fai_editor_install}"
+  assertEquals "Should set fai_editor_install" 1 "${fai_editor_install}"
+  assertEquals "Should set fai_editor_port" "${editor_port}" "${fai_editor_port}"
+  assertEquals "Should set fai_editor_host" "${editor_host}" "${fai_editor_host}"
+  assertEquals "Should set fai_editor_shutdown" "${editor_shutdown}" "${fai_editor_shutdown}"
+  assertEquals "Should set fai_editor_redirect" "${editor_redirect}" "${fai_editor_redirect}"
+  assertEquals "Should set fai_editor_name" "${editor_name}" "${fai_editor_name}"
+
+  rm -rf "${yaml_file}"
+}
+
+test_can_parse_yaml_conf_presentation() {
+  local presentation_port=8000
+  local presentation_shutdown=5000
+  local presentation_redirect=4333
+  local presentation_name=presentation1
+  local presentation_host=presapp1
+  local presentation_ear=http://builder/engine.ear
+  local presentation_environment=testing
+  local presentation_deploy_white_list=foo
+  local presentation_search_indexer_ws_uri=http://engine1/indexer-webservice
+
+  local yaml_file=
+  yaml_file=$(mktemp)
+  cat > "${yaml_file}" <<EOF
+---
+profiles:
+  presentation:
+    install: yes
+    ear: ${presentation_ear}
+    environment: ${presentation_environment}
+    host: ${presentation_host}
+    name: ${presentation_name}
+    port: ${presentation_port}
+    redirect: ${presentation_redirect}
+    shutdown: ${presentation_shutdown}
+    deploy_white_list: ${presentation_deploy_white_list}
+    search_indexer_ws_uri: ${presentation_search_indexer_ws_uri}
+EOF
+
+  unset fai_presentation_ear
+  unset fai_presentation_environment
+  unset fai_presentation_install
+  unset fai_presentation_name
+  unset fai_presentation_port
+  unset fai_presentation_redirect
+  unset fai_presentation_shutdown
+  unset fai_presentation_deploy_white_list
+  unset fai_presentation_search_indexer_ws_uri
+
+  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
+  assertNotNull "Should set fai_presentation_install" "${fai_presentation_install}"
+  assertEquals "Should set fai_presentation_install" 1 "${fai_presentation_install}"
+  assertEquals "Should set fai_presentation_ear" "${presentation_ear}" "${fai_presentation_ear}"
+  assertEquals "Should set fai_presentation_environment" \
+               "${presentation_environment}" \
+               "${fai_presentation_environment}"
+  assertEquals "Should set fai_presentation_host" \
+               "${presentation_host}" \
+               "${fai_presentation_host}"
+  assertEquals "Should set fai_presentation_name" \
+               "${presentation_name}" \
+               "${fai_presentation_name}"
+  assertEquals "Should set fai_presentation_port" \
+               "${presentation_port}" \
+               "${fai_presentation_port}"
+  assertEquals "Should set fai_presentation_redirect" \
+               "${presentation_redirect}" \
+               "${fai_presentation_redirect}"
+  assertEquals "Should set fai_presentation_shutdown" \
+               "${presentation_shutdown}" \
+               "${fai_presentation_shutdown}"
+  assertEquals "Should set fai_presentation_search_indexer_ws_uri" \
+               "${presentation_search_indexer_ws_uri}" \
+               "${fai_presentation_search_indexer_ws_uri}"
+  assertEquals "Should set fai_presentation_deploy_white_list" \
+               "${presentation_deploy_white_list}" \
+               "${presentation_deploy_white_list}"
+
+  rm -rf "${yaml_file}"
 }
 
 test_can_parse_yaml_conf_db() {
@@ -95,6 +245,42 @@ EOF
   rm -rf "${yaml_file}"
 }
 
+test_can_parse_yaml_conf_cache() {
+  local yaml_file=
+  yaml_file=$(mktemp)
+  cat > "${yaml_file}" <<EOF
+---
+profiles:
+  cache:
+    install: yes
+EOF
+
+  unset fai_presentation_install
+  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
+  assertNotNull "Should set fai_cache_install" "${fai_cache_install}"
+  assertEquals "Should set fai_cache_install" 1 "${fai_cache_install}"
+
+  rm -rf "${yaml_file}"
+}
+
+test_can_parse_yaml_conf_monitoring() {
+  local yaml_file=
+  yaml_file=$(mktemp)
+  local monitoring_install=1
+  cat > "${yaml_file}" <<EOF
+---
+profiles:
+  monitoring:
+    install: yes
+EOF
+
+  unset fai_monitoring_install
+  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
+  assertEquals "Wrong fai_monitoring_install" \
+               "${monitoring_install}" \
+               "${fai_monitoring_install}"
+}
+
 test_can_parse_yaml_conf_credentials() {
   local yaml_file=
   yaml_file=$(mktemp)
@@ -366,64 +552,6 @@ EOF
   rm -rf "${yaml_file}"
 }
 
-test_can_parse_yaml_conf_environment() {
-  local yaml_file=
-  yaml_file=$(mktemp)
-  local foo_java_home=/usr/lib/jvm/foo-java-sdk
-  local environment_type=production
-  local foo_java_version=1.8
-  local skip_password_checks=1
-  local apt_pool=testing
-  local mvn_repo1=repo1.example.com
-  local mvn_repo2=repo2.example.com
-  local conf_url=http://build.example.com/machine-conf-1.2.3.deb
-
-  cat > "${yaml_file}" <<EOF
----
-environment:
-  type: ${environment_type}
-  java_home: ${foo_java_home}
-  java_version: ${foo_java_version}
-  skip_password_checks: true
-  conf_url: ${conf_url}
-  apt:
-    escenic:
-      pool: ${apt_pool}
-  maven:
-    repositories:
-      - ${mvn_repo1}
-      - ${mvn_repo2}
-EOF
-
-  unset java_home
-  unset fai_environment
-  unset fai_server_java_version
-  unset fai_maven_repositories
-  unset fai_conf_url
-  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
-
-  assertNotNull "Should set java_home" "${java_home}"
-  assertEquals "Should set java_home" "${foo_java_home}" "${java_home}"
-  assertEquals "Should set fai_server_java_version" \
-               "${foo_java_version}" \
-               "${fai_server_java_version}"
-  assertEquals "Should set fai_environment (type)" \
-               "${environment_type}" \
-               "${fai_environment}"
-  assertEquals "Should set fai_apt_vizrt_pool" \
-               "${apt_pool}" \
-               "${fai_apt_vizrt_pool}"
-  assertEquals "Should set fai_skip_password_checks" \
-               "${skip_password_checks}" \
-               "${fai_skip_password_checks}"
-  assertEquals "Should set fai_maven_repositories" \
-               "${mvn_repo1} ${mvn_repo2}" \
-               "${fai_maven_repositories}"
-  assertEquals "Should set fai_conf_url" "${conf_url}" "${fai_conf_url}"
-
-  rm -rf "${yaml_file}"
-}
-
 test_can_parse_yaml_conf_use_escenic_packages() {
   local yaml_file=
   yaml_file=$(mktemp)
@@ -533,97 +661,7 @@ EOF
   rm -rf "${yaml_file}"
 }
 
-
-test_can_parse_yaml_conf_presentation_install() {
-  local presentation_port=8000
-  local presentation_shutdown=5000
-  local presentation_redirect=4333
-  local presentation_name=presentation1
-  local presentation_host=presapp1
-  local presentation_ear=http://builder/engine.ear
-  local presentation_environment=testing
-  local presentation_deploy_white_list=foo
-  local presentation_search_indexer_ws_uri=http://engine1/indexer-webservice
-
-  local yaml_file=
-  yaml_file=$(mktemp)
-  cat > "${yaml_file}" <<EOF
----
-profiles:
-  presentation:
-    install: yes
-    ear: ${presentation_ear}
-    environment: ${presentation_environment}
-    host: ${presentation_host}
-    name: ${presentation_name}
-    port: ${presentation_port}
-    redirect: ${presentation_redirect}
-    shutdown: ${presentation_shutdown}
-    deploy_white_list: ${presentation_deploy_white_list}
-    search_indexer_ws_uri: ${presentation_search_indexer_ws_uri}
-EOF
-
-  unset fai_presentation_ear
-  unset fai_presentation_environment
-  unset fai_presentation_install
-  unset fai_presentation_name
-  unset fai_presentation_port
-  unset fai_presentation_redirect
-  unset fai_presentation_shutdown
-  unset fai_presentation_deploy_white_list
-  unset fai_presentation_search_indexer_ws_uri
-
-  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
-  assertNotNull "Should set fai_presentation_install" "${fai_presentation_install}"
-  assertEquals "Should set fai_presentation_install" 1 "${fai_presentation_install}"
-  assertEquals "Should set fai_presentation_ear" "${presentation_ear}" "${fai_presentation_ear}"
-  assertEquals "Should set fai_presentation_environment" \
-               "${presentation_environment}" \
-               "${fai_presentation_environment}"
-  assertEquals "Should set fai_presentation_host" \
-               "${presentation_host}" \
-               "${fai_presentation_host}"
-  assertEquals "Should set fai_presentation_name" \
-               "${presentation_name}" \
-               "${fai_presentation_name}"
-  assertEquals "Should set fai_presentation_port" \
-               "${presentation_port}" \
-               "${fai_presentation_port}"
-  assertEquals "Should set fai_presentation_redirect" \
-               "${presentation_redirect}" \
-               "${fai_presentation_redirect}"
-  assertEquals "Should set fai_presentation_shutdown" \
-               "${presentation_shutdown}" \
-               "${fai_presentation_shutdown}"
-  assertEquals "Should set fai_presentation_search_indexer_ws_uri" \
-               "${presentation_search_indexer_ws_uri}" \
-               "${fai_presentation_search_indexer_ws_uri}"
-  assertEquals "Should set fai_presentation_deploy_white_list" \
-               "${presentation_deploy_white_list}" \
-               "${fai_presentation_deploy_white_list}"
-
-  rm -rf "${yaml_file}"
-}
-
-test_can_parse_yaml_conf_cache_install() {
-  local yaml_file=
-  yaml_file=$(mktemp)
-  cat > "${yaml_file}" <<EOF
----
-profiles:
-  cache:
-    install: yes
-EOF
-
-  unset fai_presentation_install
-  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
-  assertNotNull "Should set fai_cache_install" "${fai_cache_install}"
-  assertEquals "Should set fai_cache_install" 1 "${fai_cache_install}"
-
-  rm -rf "${yaml_file}"
-}
-
-test_can_parse_yaml_conf_analysis_install() {
+test_can_parse_yaml_conf_analysis() {
   local yaml_file=
   yaml_file=$(mktemp)
 
@@ -664,7 +702,7 @@ EOF
   rm -rf "${yaml_file}"
 }
 
-test_can_parse_yaml_conf_analysis_db_install() {
+test_can_parse_yaml_conf_analysis_db() {
   local yaml_file=
   yaml_file=$(mktemp)
 
@@ -697,7 +735,7 @@ EOF
   rm -rf "${yaml_file}"
 }
 
-test_can_parse_yaml_conf_search_install() {
+test_can_parse_yaml_conf_search() {
   local search_port=8000
   local search_shutdown=5000
   local search_redirect=4333
@@ -755,49 +793,11 @@ EOF
   rm -rf "${yaml_file}"
 }
 
-test_can_parse_yaml_conf_editor_install() {
-  local editor_port=8000
-  local editor_shutdown=5000
-  local editor_redirect=4333
-  local editor_name=fooeditor1
-  local editor_host=edapp1
-
-  local yaml_file=
-  yaml_file=$(mktemp)
-  cat > "${yaml_file}" <<EOF
----
-profiles:
-  editor:
-    install: yes
-    port: ${editor_port}
-    host: ${editor_host}
-    name: ${editor_name}
-    redirect: ${editor_redirect}
-    shutdown: ${editor_shutdown}
-EOF
-
-  unset fai_editor_install
-  unset fai_editor_port
-  unset fai_editor_shutdown
-  unset fai_editor_redirect
-  unset fai_editor_name
-
-  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
-  assertNotNull "Should set fai_editor_install" "${fai_editor_install}"
-  assertEquals "Should set fai_editor_install" 1 "${fai_editor_install}"
-  assertEquals "Should set fai_editor_port" "${editor_port}" "${fai_editor_port}"
-  assertEquals "Should set fai_editor_host" "${editor_host}" "${fai_editor_host}"
-  assertEquals "Should set fai_editor_shutdown" "${editor_shutdown}" "${fai_editor_shutdown}"
-  assertEquals "Should set fai_editor_redirect" "${editor_redirect}" "${fai_editor_redirect}"
-  assertEquals "Should set fai_editor_name" "${editor_name}" "${fai_editor_name}"
-
-  rm -rf "${yaml_file}"
-}
-
 test_can_parse_yaml_conf_editor_install_multi_profiles() {
   local yaml_file=
   yaml_file=$(mktemp)
   cat > "${yaml_file}" <<EOF
+---
 profiles:
   editor:
     install: yes
@@ -820,7 +820,7 @@ EOF
   rm -rf "${yaml_file}"
 }
 
-test_can_parse_yaml_conf_db_install() {
+test_can_parse_yaml_conf_db() {
   local yaml_file=
   yaml_file=$(mktemp)
   cat > "${yaml_file}" <<EOF
@@ -861,7 +861,7 @@ EOF
   rm -rf "${yaml_file}"
 }
 
-test_can_parse_yaml_conf_cache_install() {
+test_can_parse_yaml_conf_cache() {
   local cache_port=80
   local cache_conf_dir=/opt/etc/varnish
   local cache_be1=pres1
diff --git a/usr/share/doc/escenic/ece-install-conf-reference.md b/usr/share/doc/escenic/ece-install-conf-reference.md
new file mode 100644
index 00000000..afd0a9c6
--- /dev/null
+++ b/usr/share/doc/escenic/ece-install-conf-reference.md
@@ -0,0 +1,373 @@
+# Configuration Reference for ece-install
+
+`ece-install` can be configured either in YAML (new) or `.conf`
+(old). You pass the file the same way regardless of format:
+```
+# ece-install -f <file>.yaml
+# ece-install -f <file>.conf
+```
+
+Both versions are listed below, grouped by topic.
+
+## environment
+
+```
+environment:
+  type: ${environment_type}
+  java_home: ${foo_java_home}
+  java_version: ${foo_java_version}
+  skip_password_checks: true
+  conf_url: ${conf_url}
+  apt:
+    escenic:
+      pool: ${apt_pool}
+  maven:
+    repositories:
+      - ${mvn_repo1}
+      - ${mvn_repo2}
+```
+
+- `ece-install.conf` equivalent: `java_home`
+- `ece-install.conf` equivalent: `fai_environment`
+- `ece-install.conf` equivalent: `fai_server_java_version`
+- `ece-install.conf` equivalent: `fai_maven_repositories`
+- `ece-install.conf` equivalent: `fai_conf_url`
+
+## editor
+
+```
+profiles:
+  editor:
+    install: yes
+    port: ${editor_port}
+    host: ${editor_host}
+    name: ${editor_name}
+    redirect: ${editor_redirect}
+    shutdown: ${editor_shutdown}
+```
+
+- `ece-install.conf` equivalent: `fai_editor_install`
+- `ece-install.conf` equivalent: `fai_editor_port`
+- `ece-install.conf` equivalent: `fai_editor_shutdown`
+- `ece-install.conf` equivalent: `fai_editor_redirect`
+- `ece-install.conf` equivalent: `fai_editor_name`
+
+
+## presentation
+
+```
+profiles:
+  presentation:
+    install: yes
+    ear: ${presentation_ear}
+    environment: ${presentation_environment}
+    host: ${presentation_host}
+    name: ${presentation_name}
+    port: ${presentation_port}
+    redirect: ${presentation_redirect}
+    shutdown: ${presentation_shutdown}
+    deploy_white_list: ${presentation_deploy_white_list}
+    search_indexer_ws_uri: ${presentation_search_indexer_ws_uri}
+```
+
+- `ece-install.conf` equivalent: `fai_presentation_ear`
+- `ece-install.conf` equivalent: `fai_presentation_environment`
+- `ece-install.conf` equivalent: `fai_presentation_install`
+- `ece-install.conf` equivalent: `fai_presentation_name`
+- `ece-install.conf` equivalent: `fai_presentation_port`
+- `ece-install.conf` equivalent: `fai_presentation_redirect`
+- `ece-install.conf` equivalent: `fai_presentation_shutdown`
+- `ece-install.conf` equivalent: `fai_presentation_deploy_white_list`
+- `ece-install.conf` equivalent: `fai_presentation_search_indexer_ws_uri`
+
+
+## db
+
+```
+profiles:
+  db:
+    install: ${db_install}
+    master: true
+    user: ${db_user}
+    ear: ${db_ear}
+    password: ${db_password}
+    schema: ${db_schema}
+    host: ${db_host}
+    port: ${db_port}
+    drop_old_db_first: yes
+    replication: yes
+```
+
+- `ece-install.conf` equivalent: `fai_db_install`
+- `ece-install.conf` equivalent: `fai_db_master`
+- `ece-install.conf` equivalent: `fai_db_user`
+- `ece-install.conf` equivalent: `fai_db_password`
+- `ece-install.conf` equivalent: `fai_db_schema`
+- `ece-install.conf` equivalent: `fai_db_host`
+- `ece-install.conf` equivalent: `fai_db_port`
+- `ece-install.conf` equivalent: `fai_db_ear`
+- `ece-install.conf` equivalent: `fai_db_drop_old_db_first`
+- `ece-install.conf` equivalent: `fai_db_replication`
+
+## cache
+```
+profiles:
+  cache:
+    install: yes
+```
+
+- `ece-install.conf` equivalent: `fai_presentation_install`
+
+## monitoring
+```
+profiles:
+  monitoring:
+    install: yes
+```
+
+- `ece-install.conf` equivalent: `fai_monitoring_install`
+
+## credentials
+
+```
+credentials:
+  - site: maven.escenic.com
+    user: ${escenic_download_user}
+    password: ${escenic_download_password}
+  - site: builder
+    user: ${builder_download_user}
+    password: ${builder_download_password}
+```
+
+- `ece-install.conf` equivalent: `technet_user`
+- `ece-install.conf` equivalent: `technet_password`
+- `ece-install.conf` equivalent: `fai_builder_http_user`
+- `ece-install.conf` equivalent: `fai_builder_http_password`
+- `ece-install.conf` equivalent: `fai_conf_builder_http_user`
+- `ece-install.conf` equivalent: `fai_conf_builder_http_password`
+
+
+## create_publication
+
+
+```
+profiles:
+   publications:
+     - name: ${publication1_name}
+       war: ${publication1_war}
+       war_remove_list:
+         - ${publication1_remove_file1}
+         - ${publication1_remove_file2}
+       webapps:
+         - ${publication_webapp1}
+         - ${publication_webapp2}
+       domain: ${publication1_domain}
+       ear: ${publication_ear}
+       environment: ${publication1_environment}
+       aliases:
+         - ${publication1_alias1}
+         - ${publication1_alias2}
+```
+
+- `ece-install.conf` equivalent: `fai_publication_domain_mapping_list`
+- `ece-install.conf` equivalent: `fai_publication_ear`
+- `ece-install.conf` equivalent: `fai_publication_war_remove_file_list`
+- `ece-install.conf` equivalent: `fai_publication_environment`
+- `ece-install.conf` equivalent: `fai_publication_webapps`
+- `ece-install.conf` equivalent: `fai_publications_webapps # arg, the plural`
+
+
+## publication
+
+
+```
+profiles:
+   publications:
+     - name: ${publication1_name}
+       war: ${publication1_war}
+       domain: ${publication1_domain}
+       aliases:
+         - ${publication1_alias1}
+         - ${publication1_alias2}
+     - name: ${publication2_name}
+       war: ${publication2_war}
+       domain: ${publication2_domain}
+       aliases:
+          - ${publication2_alias1}
+          - ${publication2_alias2}
+```
+
+- `ece-install.conf` equivalent: `fai_publication_domain_mapping_list`
+
+## packages
+
+```
+packages:
+  - name: ${package_name}
+    version: ${package_version}
+```
+- `ece-install.conf` equivalent: `fai_package_map`
+  declare -A fai_package_map
+
+## packages_multiple
+
+
+```
+packages:
+  - name: ${package_name}
+    version: ${package_version}
+  - name: ${package_name_without_version}
+```
+- `ece-install.conf` equivalent: `fai_package_map`
+  declare -A fai_package_map
+
+## use_escenic_packages
+
+```
+packages:
+  foo: 1
+```
+
+- `ece-install.conf` equivalent: `fai_package_enabled`
+
+## restore
+
+```
+profiles:
+  restore:
+    pre_wipe_solr: true
+    pre_wipe_all: true
+    pre_wipe_logs: true
+    pre_wipe_cache: true
+    pre_wipe_crash: true
+    from_backup: true
+    data_files: true
+    software_binaries: true
+    db: true
+    configuration: true
+    from_file: ${restore_from_file}
+```
+- `ece-install.conf` equivalent: `fai_restore_pre_wipe_solr`
+- `ece-install.conf` equivalent: `fai_restore_pre_wipe_all`
+- `ece-install.conf` equivalent: `fai_restore_pre_wipe_logs`
+- `ece-install.conf` equivalent: `fai_restore_pre_wipe_cache`
+- `ece-install.conf` equivalent: `fai_restore_pre_wipe_crash`
+- `ece-install.conf` equivalent: `fai_restore_from_backup`
+- `ece-install.conf` equivalent: `fai_restore_data_files`
+- `ece-install.conf` equivalent: `fai_restore_software_binaries`
+- `ece-install.conf` equivalent: `fai_restore_db`
+- `ece-install.conf` equivalent: `fai_restore_configuration`
+- `ece-install.conf` equivalent: `fai_restore_from_file`
+
+## analysis
+
+
+```
+profiles:
+  analysis:
+    install: yes
+    name: ${analysis_name}
+    port: ${analysis_port}
+    host: ${analysis_host}
+    shutdown: ${analysis_shutdown}
+    redirect: ${analysis_redirect}
+```
+
+- `ece-install.conf` equivalent: `fai_analysis_install`
+- `ece-install.conf` equivalent: `fai_analysis_name`
+- `ece-install.conf` equivalent: `fai_analysis_port`
+- `ece-install.conf` equivalent: `fai_analysis_host`
+- `ece-install.conf` equivalent: `fai_analysis_shutdown`
+- `ece-install.conf` equivalent: `fai_analysis_redirect`
+
+## analysis_db
+
+
+```
+profiles:
+  analysis_db:
+    install: yes
+    user: ${analysis_db_user}
+    password: ${analysis_db_password}
+    schema: ${analysis_db_schema}
+```
+
+- `ece-install.conf` equivalent: `fai_analysis_db_install`
+- `ece-install.conf` equivalent: `fai_analysis_db_user`
+- `ece-install.conf` equivalent: `fai_analysis_db_password`
+- `ece-install.conf` equivalent: `fai_analysis_db_schema`
+
+## search
+
+```
+profiles:
+  search:
+    install: yes
+    legacy: yes
+    ear: ${search_ear}
+    for_editor: true
+    indexer_ws_uri: ${search_indexer_ws_uri}
+    port: ${search_port}
+    host: ${search_host}
+    name: ${search_name}
+    redirect: ${search_redirect}
+    shutdown: ${search_shutdown}
+```
+
+- `ece-install.conf` equivalent: `fai_search_install`
+- `ece-install.conf` equivalent: `fai_search_host`
+- `ece-install.conf` equivalent: `fai_search_port`
+- `ece-install.conf` equivalent: `fai_search_shutdown`
+- `ece-install.conf` equivalent: `fai_search_redirect`
+- `ece-install.conf` equivalent: `fai_search_name`
+- `ece-install.conf` equivalent: `fai_search_legacy`
+- `ece-install.conf` equivalent: `fai_search_for_editor`
+- `ece-install.conf` equivalent: `fai_search_ear`
+- `ece-install.conf` equivalent: `fai_search_indexer_ws_uri`
+
+
+## editor_install_multi_profiles
+```
+profiles:
+  editor:
+    install: yes
+  search:
+    install: yes
+  db:
+    install: no
+```
+
+- `ece-install.conf` equivalent: `fai_editor_install`
+- `ece-install.conf` equivalent: `fai_search_install`
+- `ece-install.conf` equivalent: `fai_db_install`
+
+
+## db
+```
+profiles:
+  db:
+    install: yes
+```
+
+- `ece-install.conf` equivalent: `fai_db_install`
+
+## cache
+
+```
+profiles:
+  cache:
+    install: yes
+    port: ${cache_port}
+    conf_dir: ${cache_conf_dir}
+    backends:
+      - ${cache_be1}
+      - ${cache_be2}
+```
+
+- `ece-install.conf` equivalent: `fai_cache_install`
+- `ece-install.conf` equivalent: `fai_cache_backends`
+- `ece-install.conf` equivalent: `fai_cache_conf_dir`
+- `ece-install.conf` equivalent: `fai_cache_port`
+
+---
+Reference guide generated: Mon Mar 13 11:47:16 CET 2017

From daad6ff65a91dbccea49ae1964e80c0a7a2f403b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Mon, 13 Mar 2017 13:00:14 +0100
Subject: [PATCH 2494/2585] Added dynamic command lookup to /usr/bin/ece

To add a new sub command to /usr/bin/ece, do:

- add the code to a file in ece.d,
  e.g. usr/share/escenic/ece-scripts/ece.d/create-publication.sh

- call the main method of that module `cmd_create_publication()`. You
  will now have a sub command to /usr/bin/ece called
  create-publication.

  Rule: the method name is: To get a command to expand, prefix the
  command with cmd_ and replace all hyphens with underscores.
---
 usr/bin/ece | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index ca8ee42a..444009c4 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -779,9 +779,23 @@ function show_all_deployments() {
   cat $(get_deployment_log)
 }
 
+## $1 :: command
+## $..n :: the rest of the arguments passed to /usr/bin/ece
+function lookup_and_execute_dynamic_command_if_found() {
+  local command=$1
+  local requested_cmd=cmd_${command//-/_}
+  local actual_cmd=
+  actual_cmd=$(declare -F | grep -w "${requested_cmd}" | cut -d' ' -f3)
+  if [ -n "${actual_cmd}" ]; then
+    shift 1
+    "${actual_cmd}" "$@"
+    exit 0
+  fi
+}
+
 init
 read_rc_file_if_present
-set_type_command_and_instance $@
+set_type_command_and_instance "$@"
 set_id
 set_common_settings
 set_type_settings
@@ -872,6 +886,7 @@ for el in $command; do
             print_help
             ;;
         *)
+            lookup_and_execute_dynamic_command_if_found "${el}" "$@"
             print "Invalid command: '$el' :-("
             print "Try 'ece help' to get a list of all commands available."
             exit 1

From 2724b79652f09a7df81ebfec04edc0bcecbd01c5 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Mon, 13 Mar 2017 14:20:10 +0100
Subject: [PATCH 2495/2585] New /usr/bin/ece sub command: create-publication

- creates publication in DB

- if no WAR has been specified, try to lookup any demo-clean.war on
  the system and use that.

- By default, it'll only create the publication in the database. To ask
  it to do more, add the appropriate switches:

    --update-app-server-conf : If missing, adds <Host/> block to
      server.xml (if on Tomcat)

    --update-nursery-conf : If missing, adds a Pub-<pub>.properties to
      the common Nursery layer.

    --update-ece-conf : If missing, adds the publication to the
      deployment white list in /etc/escenic/ece-<instance>.conf. This
      supports multiple ECE instances on the same host.

- The command is safe to re-run. If the desired action is already
  carried out, the command will not do anything.
---
 .../ece-scripts/ece.d/create-publication.sh   | 317 ++++++++++++++++++
 1 file changed, 317 insertions(+)
 create mode 100644 usr/share/escenic/ece-scripts/ece.d/create-publication.sh

diff --git a/usr/share/escenic/ece-scripts/ece.d/create-publication.sh b/usr/share/escenic/ece-scripts/ece.d/create-publication.sh
new file mode 100644
index 00000000..59c893b0
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece.d/create-publication.sh
@@ -0,0 +1,317 @@
+# -*- mode: sh; sh-shell: bash; -*-
+
+## Sub comamnd for /usr/bin/ece
+##
+## Creates a publication in the ECE DB and optionally:
+## - configures Tomcat's server.xml
+## - configures Nursery
+##
+## author: torstein@escenic.com
+
+_create_publication_tmp_dir=/tmp
+
+## Method that tries to ensure that there's a valid publication
+## archive from which to create the publication.
+##
+## Reads and writes the global variable 'file'.
+_create_publication_find_par_if_none_has_been_specified() {
+  if [ -n "${file}" ]; then
+    return
+  fi
+
+  local par=
+  par=$(
+    find /usr/share/escenic/escenic-content-engine-* \
+         -maxdepth 3 \
+         -name demo-clean.war)
+
+  if [ -r "${par}" ]; then
+    file=${par}
+  fi
+}
+
+## Adding the publication to the deployment white list of all ECE
+## instances on the machine.
+##
+## $1 : publication name
+_create_publication_add_publication_to_deployment_lists() {
+  run source /etc/default/ece
+  local please_add=1
+  local el=
+
+  for el in ${engine_instance_list}; do
+    local instance_conf=/etc/escenic/ece-${el}.conf
+    run source ${instance_conf}
+
+    for ele in $deploy_webapp_white_list; do
+      if [[ "$ele" == "$1" ]]; then
+        please_add=0
+      fi
+    done
+
+    if [ $please_add -eq 1 ]; then
+      print_and_log "Adding $1 to the deploy white list of" \
+                    "instance" $el
+      deploy_webapp_white_list="$deploy_webapp_white_list $1"
+    fi
+
+    set_conf_file_value \
+      deploy_webapp_white_list \
+      $deploy_webapp_white_list \
+      $instance_conf
+  done
+}
+
+## $@ :: args passed to /usr/bin/ece
+_create_publication_parse_use_input() {
+  ## Only parsing options that are special to us. The common ones have
+  ## already been parsed
+  local user_options=$(
+    getopt -o \
+           a:nd:es \
+           --long help \
+           --long publication-domain: \
+           --long publication-aliases: \
+           --long update-app-server-conf \
+           --long update-ece-conf \
+           --long update-nursery-conf \
+           -n 'parse-options' \
+           --quiet \
+           -- "$@")
+
+  if [ $? != 0 ] ; then print "Failed parsing options." ; exit 1 ; fi
+  eval set -- "$user_options"
+
+  while true; do
+    case "$1" in
+      -s | --update-app-server-conf)
+        update_app_server_conf=1
+        shift 1;;
+      -d | --publication-domain)
+        publication_domain="$2";
+        shift 2;;
+      -a | --publication-aliases)
+        publication_aliases="$2";
+        shift 2;;
+      -n | --update-nursery-conf)
+        update_nursery_conf=1
+        shift 1;;
+      -e | --update-ece-conf)
+        update_ece_conf=1
+        shift 1;;
+      -- ) shift; break ;;
+      * ) break ;;
+    esac
+  done
+
+  if [ -z "${publication}" ]; then
+    print "You must specify --publication <name>"
+    exit 1
+  fi
+
+  _create_publication_find_par_if_none_has_been_specified "${file}"
+
+  if [ -z "${file}" ]; then
+    print "You must specify --file <name> or --uri <uri>"
+    exit 1
+  else
+    download_uri_target_to_dir "${file}" "${_create_publication_tmp_dir}"
+    publication_war="${_create_publication_tmp_dir}/${file##*/}"
+  fi
+}
+
+## $1 :: publication name
+## $2 :: instance name
+_create_publication_already_exists() {
+  local publication_name=$1
+  local instance_name=$2
+  ece -i "${instance_name}" list-publications |
+    grep --silent --word-regexp "${publication_name}"
+}
+
+
+## Uses /escenic-admin of a running ECE instance to create the
+## publication. If the publication already exists, this method will do
+## nothing (i.e. it'll not fail, just silently refrain from doing any
+## actual change. This decision is done on /escenic-admin).
+##
+## Based on Erik Mogensen's work:
+## //depot/branches/personal/mogsie/fromscratch/create-publication.sh
+##
+## $1 :: publication name
+## $2 :: publication war
+## $3 :: instance type
+## $4 :: instance name
+_create_publication_create_publication_in_db() {
+  local publication_name=$1
+  local publication_war=$2
+  local publication_type=$3
+  local instance_name=$4
+
+  if _create_publication_already_exists "${publication_name}" "${instance_name}"; then
+    return
+  fi
+
+  if [ ! -e "${publication_war}" ]; then
+    print_and_log "Need valid publication WAR/PAR to create publication," \
+                  "you passed publication_war=${publication_war}"
+    exit 1
+  fi
+
+  print "Creating publication ${publication} ..."
+  log "Creating publication ${publication} using instance ${instance_name}" \
+      "and ${publication_war}"
+
+  # sourcing the instance's ECE configuration to get the app server
+  # port.
+  run source "/etc/escenic/ece-${instance_name}.conf"
+  local ece_admin_uri=http://localhost:${appserver_port}/escenic-admin
+  local cookie=
+  cookie=$(
+    curl --head "${ece_admin_uri}"/ --silent |
+      grep -i "^Set-Cookie" |
+      sed s/.*'JSESSIONID=\([^;]*\).*'/'\1'/)
+
+  if [[ "$cookie" == "" ]] ; then
+    print_and_log "Unable to get a session cookie from instance $instance_name"
+    exit 1
+  fi
+
+  run curl \
+      -F "type=webapp" \
+      -F "resourceFile=@${publication_war}" \
+      --cookie JSESSIONID="${cookie}" \
+      "${ece_admin_uri}/do/publication/resource"
+
+  run curl  \
+      -F "name=${publication_name}" \
+      -F "publisherName=Escenic" \
+      -F "publicationType=${publication_type}" \
+      -F "adminPassword=admin" \
+      -F "adminPasswordConfirm=admin" \
+      --cookie JSESSIONID="${cookie}" \
+      "${ece_admin_uri}/do/publication/insert"
+}
+
+
+_create_publication_update_app_server_conf() {
+  server_xml=/opt/tomcat-${instance}/conf/server.xml
+  if [ ! -e "${server_xml}" ]; then
+    return
+  fi
+
+  local current_pub_conf_in_app_server=
+  current_pub_conf_in_app_server=$(
+    lookup_in_xml_file \
+      "${server_xml}" \
+      "/Server/Service/Engine/Host/Context[@displayName='${publication}']" \
+      2>/dev/null)
+
+  if [ -n "${current_pub_conf_in_app_server}" ]; then
+    log "App server for ${instance} already has conf for ${publication}"
+    return
+  fi
+
+  print_and_log "Updating app server config of instance ${instance} ..."
+  xmlstarlet \
+    ed \
+    -P \
+    -L \
+    -s /Server/Service/Engine -t elem -n TMP -v '' \
+    -i /Server/Service/Engine/TMP -t attr -n name -v "${publication}.${HOSTNAME}" \
+    -i /Server/Service/Engine/TMP -t attr -n appBase -v "webapps-${publication}" \
+    -i /Server/Service/Engine/TMP -t attr -n autoDeploy -v "true" \
+    -i /Server/Service/Engine/TMP -t attr -n startStopThreads -v "0" \
+    -r //TMP -v Host \
+    -s "/Server/Service/Engine/Host[@name='${publication}.${HOSTNAME}']" -t elem -n TMP -v "${publication}.${HOSTNAME}" \
+    -r //TMP -v Alias \
+    -s "/Server/Service/Engine/Host[@name='${publication}.${HOSTNAME}']" -t elem -n TMP -v '' \
+    -i //TMP -t attr -n displayName -v "${publication}" \
+    -i //TMP -t attr -n docBase -v "${publication}" \
+    -i //TMP -t attr -n path -v "" \
+    -r //TMP -v Context \
+    "${server_xml}"
+
+  local old_ifs=$IFS
+  local an_alias=
+  IFS=,
+  for an_alias in ${publication_aliases}; do
+    xmlstarlet \
+      ed \
+      -P \
+      -L \
+      -s "/Server/Service/Engine/Host[@name='${publication}.${HOSTNAME}']" -t elem -n TMP -v "${an_alias}" \
+      -r //TMP -v Alias \
+      "${server_xml}"
+  done
+  IFS=$old_ifs
+
+  # make it pretty
+  xmllint --format "${server_xml}" > "${server_xml}.pretty"
+  run mv "${server_xml}.pretty" "${server_xml}"
+}
+
+_create_publication_create_nursery_conf() {
+  local nursery_file=${escenic_conf_dir-/etc/escenic}/engine/common/neo/publications/Pub-${publication}.properties
+  if [ -e "${nursery_file}" ]; then
+    log "Nursery component ${nursery_file} already exists, hands off."
+    return
+  fi
+
+  if [ -z "${publication_domain}" ]; then
+    print_and_log "INFO: No publication domain speciced, not creating Nursery" \
+                  "component, if you wish to add one, specify it with" \
+                  "--publication-domain <domain>"
+    return
+  else
+    print_and_log "Creating Nursery component ${nursery_file}"
+  fi
+
+  run mkdir -p "${nursery_file%/*}"
+
+  cat > "${nursery_file}" <<EOF
+# Created by ${BASH_SOURCE[0]##*/} @ $(date)
+\$class=neo.xredsys.config.SimplePublicationSupport
+url=http://${publication_domain}/
+EOF
+}
+
+## Provides auto completion options for this command. Should match
+## what's in _create_publication_parse_use_input
+complete_create_publication() {
+  cat <<EOF
+--update-app-server-conf
+--update-ece-conf
+--update-nursery-conf
+--publication-aliases
+--file
+--uri
+-a
+-d
+-e
+-n
+-s
+EOF
+}
+
+## Main method called from /usr/bin/ece
+##
+## $@ :: the arg list from /usr/bin/ece
+cmd_create_publication() {
+  _create_publication_parse_use_input "${@}"
+  _create_publication_create_publication_in_db \
+    "${publication}" \
+    "${publication_war}" \
+    "${publication_type-default}" \
+    "${instance}"
+
+  if [ ${update_app_server_conf-0} -eq 1 ]; then
+    _create_publication_update_app_server_conf
+  fi
+  if [ ${update_nursery_conf-0} -eq 1 ]; then
+    _create_publication_create_nursery_conf
+  fi
+  if [ ${update_ece_conf-0} -eq 1 ]; then
+    _create_publication_add_publication_to_deployment_lists "${publication}"
+  fi
+}

From 65974901eb3b4fff677ad54c3fcf93b38c1380a6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Mon, 13 Mar 2017 15:59:07 +0100
Subject: [PATCH 2496/2585] Added common-bashing::look_up_in_xml_file()

---
 usr/share/escenic/ece-scripts/common-bashing.sh | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/common-bashing.sh b/usr/share/escenic/ece-scripts/common-bashing.sh
index fc4bd7c3..15a4b0f3 100644
--- a/usr/share/escenic/ece-scripts/common-bashing.sh
+++ b/usr/share/escenic/ece-scripts/common-bashing.sh
@@ -602,3 +602,16 @@ function pretty_print_xml() {
   xmllint --format "${file}" > "${tmp_file}"
   run mv "${tmp_file}" "${file}"
 }
+
+## Lookup XPath in XML file.
+##
+## $1 :: XML file
+## $2 :: XPATH xpression
+lookup_in_xml_file() {
+  local file=$1
+  local xpath=$2
+
+  # xmllint doesn't work too well with namespaces
+  sed 's#xmlns=".*"##' "${file}" | \
+    xmllint --xpath "${xpath}" -
+}

From 50a17e20c066bef4e5b3fa044f1ae9590aafe983 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Mon, 13 Mar 2017 15:59:36 +0100
Subject: [PATCH 2497/2585] Made common-io::set_conf_file_value work without
 global state

---
 usr/share/escenic/ece-scripts/common-io.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/common-io.sh b/usr/share/escenic/ece-scripts/common-io.sh
index 70185ca5..f38f8c88 100644
--- a/usr/share/escenic/ece-scripts/common-io.sh
+++ b/usr/share/escenic/ece-scripts/common-io.sh
@@ -34,7 +34,7 @@ function set_conf_file_value() {
 
   if [ -r $file ]; then
     if [ $(grep ^$1 $file | wc -l) -gt 0 ]; then
-      if [ $dont_quote_conf_values -eq 0 ]; then
+      if [ "${dont_quote_conf_values-0}" -eq 0 ]; then
         sed -i "s~$key=.*~$key=\"$value\"~g" $file
       else
         sed -i "s~$key=.*~$key=$value~g" $file

From d0cd98c70e87164ec078c8886c0007c9e3030bd1 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Tue, 14 Mar 2017 09:56:00 +0100
Subject: [PATCH 2498/2585] Dynamic auto completion for /usr/bin/ece sub
 commands

- Will auto complete the sub command if a
  cmd_<command_with_underscores> exists,
  e.g. cmd_create_publications() will provide an auto completion
  option list-publications (no cmd_ prefix and hyphens instead of
  underscores.

- Will auto complete options the sub command if the sub command
  provides a complete_<command_with_underscores,
  e.g. complete_create_publication().
---
 etc/bash_completion.d/ece | 60 +++++++++++++++++++++++++++++++++------
 1 file changed, 51 insertions(+), 9 deletions(-)

diff --git a/etc/bash_completion.d/ece b/etc/bash_completion.d/ece
index e3c4b6ec..14f48308 100644
--- a/etc/bash_completion.d/ece
+++ b/etc/bash_completion.d/ece
@@ -1,11 +1,7 @@
 # auto completion for the /usr/bin/ece command.       Emacs: -*- sh -*- mode
 
-_ece_commands()
-{
-    local cur=${COMP_WORDS[COMP_CWORD]}
-    local prev=${COMP_WORDS[COMP_CWORD-1]}
-
-    commands="
+_get_sub_commands_for_ece() {
+  cat <<EOF
       applog
       assemble
       backup
@@ -32,8 +28,32 @@ _ece_commands()
       top
       update
       versions
-    "
-    
+EOF
+
+  # Dynamic lookup of available sub commands for /usr/bin/ece
+  (
+    local cmd_dir=/usr/share/escenic/ece-scripts/ece.d
+    if [ ! -d "${cmd_dir}" ]; then
+      return
+    fi
+
+    for el in "${cmd_dir}"/*.sh; do
+      source "${el}"
+    done
+    declare -F |
+      awk '{print $3}' |
+      sed -n 's#^cmd_##p' |
+      sed 's#_#-#g'
+  )
+}
+
+_get_completions_for_ece_command()
+{
+    local cur=${COMP_WORDS[COMP_CWORD]}
+    local prev=${COMP_WORDS[COMP_CWORD-1]}
+
+    commands=$(_get_sub_commands_for_ece)
+
     options="-i --instance -p --publication -r --publication-resource
              -t --type -u --user -w --password"
     resources="content-type feature layout layout-group image-version menu
@@ -77,11 +97,33 @@ _ece_commands()
         -r|--publication-resource)
             completions=$resources
             ;;
+        *)
+          if [[ "${prev}" != "$1" ]]; then
+            completions=${completions}" "$(get_completions_for_cmd "${prev}")
+          fi
+        #   ;;
     esac
   
     COMPREPLY=( $(compgen -W "$completions" -- $cur) )
 }
 
-complete -F _ece_commands ece
+## $1 :: cmd name
+get_completions_for_cmd() {
+  local cmd=$1
+  local cmd_completion_function=complete_${cmd//-/_}
+
+  local cmd_dir=/usr/share/escenic/ece-scripts/ece.d
+  if [ ! -d "${cmd_dir}" ]; then
+    return
+  fi
 
+  for el in "${cmd_dir}"/*.sh; do
+    source "${el}" 2>/dev/null
+  done
+
+  declare -F |
+    grep -q -w "${cmd_completion_function}" &&
+    "${cmd_completion_function}"
+}
 
+complete -F _get_completions_for_ece_command ece

From ed37d3d43694a8ac92eaaaeccde923ccf53b51bb Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Tue, 14 Mar 2017 14:41:47 +0100
Subject: [PATCH 2499/2585] ece-install::create_publication now uses
 /usr/bin/ece clean-publication

---
 .../ece-scripts/ece-install.d/app-server.sh   |  53 +-------
 .../ece-install.d/content-engine.sh           |  34 -----
 .../ece-install.d/create-publication.sh       | 120 +++++-------------
 3 files changed, 34 insertions(+), 173 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 529b6cee..4e6f503f 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -303,8 +303,7 @@ EOF
 EOF
   if [[ ($install_profile_number == $PROFILE_EDITORIAL_SERVER || \
     $install_profile_number == $PROFILE_PRESENTATION_SERVER || \
-    $install_profile_number == $PROFILE_ALL_IN_ONE) && \
-    -n "$fai_publication_domain_mapping_list" ]]; then
+    $install_profile_number == $PROFILE_ALL_IN_ONE) ]]; then
     cat >> $tomcat_base/conf/server.xml <<EOF
         </Engine>
   </Service>
@@ -326,56 +325,6 @@ EOF
              digest="md5"
              resourceName="UserDatabase"/>
 EOF
-    for el in ${fai_publication_domain_mapping_list}; do
-      local old_ifs=$IFS
-      # the entries in the fai_publication_domain_mapping_list are on
-      # the form: <publication[,pub.war]>#<domain>[#<alias1>[,<alias2>]]
-      IFS='#'
-      read publication domain aliases <<< "$el"
-      IFS=','
-      read publication_name publication_war <<< "$publication"
-      IFS=$old_ifs
-
-      # normally the WAR is called the same as the publication, in
-      # which case we set the publication_war to the same as the
-      # publication_name.
-      if [ -z "${publication_war}" ]; then
-        publication_war=$publication_name
-      fi
-
-      ensure_domain_is_known_to_local_host ${domain}
-
-      local file=$tomcat_base/conf/server.xml
-
-      # We are using the WAR and not the publication as the base for
-      # the appBase and docBase variables here to make it possible for
-      # 'ece deploy' to figure out the same location for deploying the
-      # WARs. As 'ece deploy' doesn't have any concept of which
-      # publication the WARs belong to, we must use a scheme were it's
-      # the WAR file name which determines the webapp context.
-      cat >> $file <<EOF
-      <Host
-        name="${domain}"
-        appBase="$(get_app_base $publication_war)"
-        autoDeploy="false">
-EOF
-
-      # add the host aliases (if available)
-      for ele in $(split_string ',' $aliases); do
-        cat >> $file <<EOF
-        <Alias>$ele</Alias>
-EOF
-      done
-
-      cat >> $file <<EOF
-        <Context displayName="${domain}"
-                 docBase="$(basename ${publication_war} .war)"
-                 path=""
-        />
-      </Host>
-EOF
-      leave_trail "trail_virtual_host_${publication_name}=${domain}:${appserver_port}"
-    done
   fi
 
   cat >> $tomcat_base/conf/server.xml <<EOF
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index feb44927..2602db99 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -673,43 +673,9 @@ property.com.escenic.studio.font.windowsvista=Arial Unicode MS
 property.jnlp.packEnabled=true
 EOF
 
-  set_up_publication_nursery_conf
   set_up_search_client_nursery_conf
 }
 
-## Set publication specific configuration, set here and not in
-## set_up_instance_specific_nursery_configuration as this
-## configuration will be the same on two instaces running on the same
-## host.
-function set_up_publication_nursery_conf() {
-  if [ -n "$fai_publication_domain_mapping_list" ]; then
-    local publication_name=""
-    local publication_domain=""
-    local publication_aliases=""
-
-    for el in $fai_publication_domain_mapping_list; do
-      local old_ifs=$IFS
-      IFS='#'
-      read publication publication_domain publication_aliases <<< "$el"
-      IFS=','
-      read publication_name publication_war <<< "$publication"
-      IFS=$old_ifs
-
-      local file=$escenic_conf_dir/engine/environment/${fai_publication_environment-production}/neo/publications/Pub-${publication_name}.properties
-
-      print_and_log "Creating Nursery component" \
-        $(basename $file .properties) \
-        "for publication $publication_name"
-      make_dir $(dirname $file)
-      cat > $file <<EOF
-# Created by $(basename $0) @ $(date)
-\$class=neo.xredsys.config.SimplePublicationSupport
-url=http://${publication_domain}/
-EOF
-    done
-  fi
-}
-
 function set_up_instance_specific_nursery_configuration() {
   if [ "${fai_package_enabled-0}" -eq 1 ]; then
     return
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
index a66256ae..56ecbb87 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
@@ -64,7 +64,12 @@ function create_publication() {
         publication_war=${publication_name}.war
       fi
 
-      create_the_publication $publication_name $the_tmp_dir/$publication_war $publication_type
+      create_the_publication \
+        $publication_name \
+        $the_tmp_dir/$publication_war \
+        $publication_type \
+        "${domain}" \
+        "${aliases}"
     done
 
     log "Cleaing up $the_tmp_dir ..."
@@ -96,52 +101,38 @@ function create_publication() {
 
 ## $1 :: publication name
 ## $2 :: publication war
+## $3 :: publication type
+## $4 :: publication domain, optional
+## $5 :: publication aliases, optional
 function create_the_publication() {
   local publication_name=$1
   local publication_war=$2
   local publication_type=$3
+  local publication_domain=$4
+  local publication_aliases=$5
+
+  local the_instance=${fai_publication_use_instance-${default_ece_intance_name}}
+
+  local ece_command="
+    ece -i ${the_instance} \
+        create-publication \
+        --publication ${publication_name} \
+        --update-app-server-conf \
+        --update-nursery-conf \
+        --update-ece-conf \
+        --publication-type ${publication_type} \
+        --file ${publication_war}
+  "
+
+  if [ -n "${publication_domain}" ]; then
+    ece_command=${ece_command}" --publication-domain ${publication_domain}"
+  fi
+  if [ -n "${publication_aliases}" ]; then
+    ece_command=${ece_command}" --publication-aliases ${publication_aliases}"
+  fi
 
-  print_and_log "Creating a publication with name" $publication_name of $publication_type type \
-    "using the publication resources from" $(basename $publication_war)
-
-  create_publication_prepare_war_file $publication_war
-  local the_instance=${fai_publication_use_instance-$default_ece_intance_name}
-  create_publication_in_db $publication_name $publication_war $publication_type $the_instance
-  add_publication_to_deployment_lists $(basename $publication_war .war)
-
-  add_next_step "A publication with name" $publication_name \
-    "has been created using the publication resources in" \
-    $publication_war "The WAR has been added to the deployment" \
-    "white list, so that it will be included next time you do" \
-    "ece -i ${the_instance} deploy"
-}
-
-## $1 : publication WAR name
-function add_publication_to_deployment_lists() {
-  run source /etc/default/ece
-  local please_add=1
-
-  for el in $engine_instance_list; do
-    local file=/etc/escenic/ece-${el}.conf
-    run source $file
-
-    for ele in $deploy_webapp_white_list; do
-      if [[ "$ele" == "$1" ]]; then
-        please_add=0
-      fi
-    done
-
-    if [ $please_add -eq 1 ]; then
-      print_and_log "Adding $1 to the deploy white list of" \
-        "instance" $el
-      deploy_webapp_white_list="$deploy_webapp_white_list $1"
-    fi
-
-    set_conf_file_value \
-      deploy_webapp_white_list \
-      $deploy_webapp_white_list \
-      $file
-  done
+  su - "${ece_user}" -c "$ece_command" &>> "${log}"
+  exit_on_error su - "${ece_user}" -c "$ece_command"
 }
 
 ## $1 :: the instance name
@@ -160,48 +151,3 @@ function ensure_that_instance_is_running() {
   sleep 60
 }
 
-## $1 :: publication name
-## $2 :: publication war
-## $3 :: instance name
-##
-## Based on Erik Mogensen's work:
-## //depot/branches/personal/mogsie/fromscratch/create-publication.sh
-function create_publication_in_db() {
-  local publication_name=$1
-  local publication_war=$2
-  local publication_type=$3
-  local instance_name=$4
-
-  print_and_log "Creating publication" ${publication_name} \
-    "using instance" $instance_name "..."
-
-  # sourcing the instance's ECE configuration to get the app server
-  # port.
-  run source /etc/escenic/ece-${instance_name}.conf
-
-  local ece_admin_uri=http://localhost:${appserver_port}/escenic-admin
-
-  local cookie=$(curl ${curl_opts} -I ${ece_admin_uri}/ | \
-    grep -i "^Set-Cookie" | \
-    sed s/.*'JSESSIONID=\([^;]*\).*'/'\1'/)
-
-  if [[ "$cookie" == "" ]] ; then
-    print_and_log "Unable to get a session cookie from instance $instance_name"
-    exit 1
-  fi
-
-  run curl ${curl_opts} \
-    -F "type=webapp" \
-    -F "resourceFile=@${publication_war}" \
-    --cookie JSESSIONID="$cookie" \
-    "${ece_admin_uri}/do/publication/resource"
-
-  run curl ${curl_opts}  \
-    -F "name=${publication_name}" \
-    -F "publisherName=Escenic" \
-    -F "publicationType=${publication_type}" \
-    -F "adminPassword=admin" \
-    -F "adminPasswordConfirm=admin" \
-    --cookie JSESSIONID="$cookie" \
-    "${ece_admin_uri}/do/publication/insert"
-}

From 0639494914f41c88d200b616115777e2cc4a0eb9 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Tue, 14 Mar 2017 15:46:54 +0100
Subject: [PATCH 2500/2585] EAE can now be installed from DEB packages

- Updated TODO
---
 TODO.md                                       | 12 ++++----
 .../ece-install.d/analysis-engine.sh          | 30 ++++++++++++++++---
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/TODO.md b/TODO.md
index 9b0a16bc..40b26f92 100644
--- a/TODO.md
+++ b/TODO.md
@@ -12,9 +12,9 @@ repositories.
 - ✔ Search profile (ECE's indexer-webapp + Solr)
 - ✔ DB profile, ECE
 - ✔ DB profile, ECE plugins
-- Analysis profile (Escenic Analysis Engine)
+- ✔ Create publication(s) profile → Move to `/usr/bin/ece`
+- ✔ Analysis profile (Escenic Analysis Engine)
 - Analysis DB profile
-- Create publication(s) profile → Move to `/usr/bin/ece`
 - Cache server profile
 
 ### ✔ YAML configuration file format
@@ -27,13 +27,15 @@ configuration examples.
 It's rarely used and complicates the source code and configuration
 options unnecessarily.
 
-## /usr/bin/ece
+## ✔ /usr/bin/ece
 
-- Easier to extend, e.g. put `create-publication.sh` in a directory,
+- ✔ New sub command: /usr/bin/ece create-publication
+
+- ✔ Easy to extend, e.g. put `create-publication.sh` in a directory,
   e.g.`ece.d`, and get `ece create-publication`. The
   `create-publication` sub command is then included in TAB completion,
   help screens and `man` pages.
-  
+
 
 ## Version 4.x
 ###  Easier to extend `ece-install`
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh
index 52d142b3..168c1c51 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/analysis-engine.sh
@@ -1,10 +1,32 @@
+# -*- mode: sh; sh-shell: bash; -*-
+#
 # ece-install module for installing Escenic Analysis Engine (EAE),
 # also known as "Stats".
 
+_analysis_install_package_if_missing() {
+  if [ "${fai_package_enabled-0}" -eq 0 ]; then
+    return
+  fi
+
+  install_packages_if_missing escenic-analysis-engine
+}
+
+_analysis_get_analysis_engine_dir() {
+  if [ "${fai_package_enabled-0}" -eq 1 ]; then
+    find "${escenic_root_dir}" -name "escenic-analysis-engine*" |
+      tail -n -1
+  else
+    find "${escenic_root_dir}" -maxdepth 1 -name "analysis-engine*" -type d
+  fi
+}
+
+
 function install_analysis_server() {
   run_hook install_analysis_server.preinst
   print_and_log "Installing an analysis server on $HOSTNAME ..."
 
+  _analysis_install_package_if_missing
+
   if [ -n "${fai_analysis_host}" ]; then
     appserver_host=${fai_analysis_host}
   fi
@@ -16,7 +38,7 @@ function install_analysis_server() {
   install_ece_instance "analysis1"
 
   # deploy the EAE WARs
-  run cp ${escenic_root_dir}/analysis-engine-*/wars/*.war \
+  run cp $(_analysis_get_analysis_engine_dir)/wars/*.war \
     ${tomcat_base}/webapps
 
   set_correct_permissions
@@ -59,7 +81,7 @@ function set_up_analysis_conf() {
   # extract cfg files if the don't exist already
   local file=${escenic_conf_dir}/analysis/reports.cfg
   local path=WEB-INF/config/reports.cfg
-  local war=${escenic_root_dir}/analysis-engine-*/wars/analysis-reports.war
+  local war=$(_analysis_get_analysis_engine_dir)/wars/analysis-reports.war
   extract_path_from_war_if_target_file_doesnt_exist $war $path $file
 
   set_conf_file_value queryServiceUrl \
@@ -68,7 +90,7 @@ function set_up_analysis_conf() {
 
   # Second, configure EAE Logger
   print_and_log "Configuring EAE Logger ..."
-  local war=${escenic_root_dir}/analysis-engine-*/wars/analysis-logger.war
+  local war=$(_analysis_get_analysis_engine_dir)/wars/analysis-logger.war
   local path=WEB-INF/config/logger.cfg
   local file=${escenic_conf_dir}/analysis/logger.cfg
   extract_path_from_war_if_target_file_doesnt_exist $war $path $file
@@ -87,7 +109,7 @@ function set_up_analysis_conf() {
 
   # Third, configure the EAE query service
   print_and_log "Configuring EAE query service ..."
-  local war=${escenic_root_dir}/analysis-engine-*/wars/analysis-qs.war
+  local war=$(_analysis_get_analysis_engine_dir)/wars/analysis-qs.war
   local path=WEB-INF/config/qs.cfg
   local file=${escenic_conf_dir}/analysis/qs.cfg
   extract_path_from_war_if_target_file_doesnt_exist $war $path $file

From 68a80ba1d2abfb689bdf7f075aacf8fa2df74312 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Wed, 15 Mar 2017 14:09:37 +0100
Subject: [PATCH 2501/2585] Added more unit tests for the cache profile

- the YAML conf support is complete.
---
 .../ece-install-conf-file-reader-test.sh      | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
index 35a79193..9ab77175 100644
--- a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
+++ b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
@@ -246,6 +246,11 @@ EOF
 }
 
 test_can_parse_yaml_conf_cache() {
+  local be1="app1"
+  local be2="app2"
+  local conf_dir=/opt/etc/varnish
+  local port=81
+
   local yaml_file=
   yaml_file=$(mktemp)
   cat > "${yaml_file}" <<EOF
@@ -253,12 +258,24 @@ test_can_parse_yaml_conf_cache() {
 profiles:
   cache:
     install: yes
+    conf_dir: ${conf_dir}
+    port: ${port}
+    backends:
+      - ${be1}
+      - ${be2}
 EOF
 
-  unset fai_presentation_install
+  unset fai_cache_install
+  unset fai_cache_backends
+  unset fai_cache_port
+  unset fai_cache_conf_dir
+
   parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
   assertNotNull "Should set fai_cache_install" "${fai_cache_install}"
   assertEquals "Should set fai_cache_install" 1 "${fai_cache_install}"
+  assertEquals "fai_cache_backends" "${be1} ${be2}" "${fai_cache_backends}"
+  assertEquals "fai_cache_conf_dir" "${conf_dir}" "${fai_cache_conf_dir}"
+  assertEquals "fai_cache_port" "${port}" "${fai_cache_port}"
 
   rm -rf "${yaml_file}"
 }

From 97247b0793a92f1caedc36b15cff9fc3e07a0901 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Wed, 15 Mar 2017 14:10:22 +0100
Subject: [PATCH 2502/2585] Updated TODO with APT status

---
 TODO.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/TODO.md b/TODO.md
index 40b26f92..cbc79e89 100644
--- a/TODO.md
+++ b/TODO.md
@@ -3,7 +3,7 @@
 
 ## /usr/sbin/ece-install
 
-### Install ECE from APT 
+### ✔ Install ECE from APT 
 Support for installing ECE & plugins using the escenic APT
 repositories.
 
@@ -14,8 +14,9 @@ repositories.
 - ✔ DB profile, ECE plugins
 - ✔ Create publication(s) profile → Move to `/usr/bin/ece`
 - ✔ Analysis profile (Escenic Analysis Engine)
-- Analysis DB profile
-- Cache server profile
+- ✔ Analysis DB profile
+- ✔ Cache server profile
+- ✔ Assembly Tool
 
 ### ✔ YAML configuration file format
 

From 7262880e90a910e3cdd8860d4503720508a470dd Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Wed, 15 Mar 2017 14:44:17 +0100
Subject: [PATCH 2503/2585] Can now install assembly tool using APT packages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- the world rejoice, I'm sure 😉
---
 .../ece-install-conf-file-reader-test.sh      | 18 +++++
 usr/sbin/ece-install                          |  5 ++
 .../ece-install.d/conf-file-reader.sh         | 12 ++++
 .../ece-install.d/content-engine.sh           | 72 +++++++++++++------
 4 files changed, 87 insertions(+), 20 deletions(-)

diff --git a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
index 9ab77175..36dc6bd7 100644
--- a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
+++ b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
@@ -298,6 +298,24 @@ EOF
                "${fai_monitoring_install}"
 }
 
+test_can_parse_yaml_conf_assembly_tool() {
+  local yaml_file=
+  yaml_file=$(mktemp)
+  local assembly_tool_install=1
+  cat > "${yaml_file}" <<EOF
+---
+profiles:
+  assembly_tool:
+    install: yes
+EOF
+
+  unset fai_assembly_tool_install
+  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
+  assertEquals "Wrong fai_assembly_tool_install" \
+               "${assembly_tool_install}" \
+               "${fai_assembly_tool_install}"
+}
+
 test_can_parse_yaml_conf_credentials() {
   local yaml_file=
   yaml_file=$(mktemp)
diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 79e00ca5..b80d8838 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -1091,6 +1091,11 @@ function main() {
       no_fai_profile=0
     fi
 
+    if [ ${fai_assembly_tool_install-0} -eq 1 ]; then
+      set_up_assembly_tool
+      no_fai_profile=0
+    fi
+
     if [ $no_fai_profile -eq 1 ]; then
         print_and_log "No install profile selected, be sure to have one of the "
         print_and_log "fai_<profile>_install=1 in your $conf_file"
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
index 186ae3a9..42299071 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
@@ -41,6 +41,7 @@ parse_yaml_conf_file_or_source_if_sh_conf() {
   _parse_yaml_conf_file_packages "${yaml_file}"
   _parse_yaml_conf_file_environment "${yaml_file}"
   _parse_yaml_conf_file_monitoring "${yaml_file}"
+  _parse_yaml_conf_file_assembly_tool "${yaml_file}"
   _parse_yaml_conf_file_restore "${yaml_file}"
 }
 
@@ -275,6 +276,17 @@ _parse_yaml_conf_file_monitoring() {
   fi
 }
 
+_parse_yaml_conf_file_assembly_tool() {
+  local yaml_file=$1
+
+  local install_assembly_tool=
+  install_assembly_tool=$(_jq "${yaml_file}" .profiles.assembly_tool.install)
+  if [[ "${install_assembly_tool}" == "yes" ||
+          "${install_assembly_tool}" == "true" ]]; then
+    export fai_assembly_tool_install=1
+  fi
+}
+
 _parse_yaml_conf_file_presentation() {
   local yaml_file=$1
 
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 2602db99..559b1f44 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -403,27 +403,47 @@ function set_up_engine_and_plugins() {
   ece_software_setup_completed=1
 }
 
-function set_up_assembly_tool() {
-  ## TODO tkj, we still need AT with non-DPRES
-  if [ "${fai_package_enabled-0}" -eq 1 ]; then
-    return
+function _assembly_tool_should_set_up() {
+  if [ "${fai_package_enabled-0}" -eq 0 ]; then
+    return 0
+  elif [[ "${fai_assembly_tool_install-0}" -eq 1 ]]; then
+    return 0
   fi
 
-  print_and_log "Setting up the Assembly Tool ..."
+  return 1
+}
+
+function _assembly_tool_install_binaries() {
+  make_dir $(_assembly_tool_get_dir)/
 
-  make_dir $escenic_root_dir/assemblytool/
-  cd $escenic_root_dir/assemblytool/
+  if [ "${fai_package_enabled-0}" -eq 1 ]; then
+    # The user defines the packages/versions he/she wants in the YAML
+    # file.
+    :
+  else
+    if [ -e $download_dir/assemblytool*zip ]; then
+      run unzip -q -u -o $download_dir/assemblytool*zip \
+          -d "${escenic_root_dir}/assemblytool/"
+    elif [ -e ${download}_dir/assemblytool*jar ]; then
+      run unzip -q -u -o ${download_dir}/assemblytool*jar \
+          -d "${escenic_root_dir}/assemblytool/"
+    fi
+  fi
+}
 
-  if [ -e $download_dir/assemblytool*zip ]; then
-    run unzip -q -u -o $download_dir/assemblytool*zip
-  elif [ -e $download_dir/assemblytool*jar ]; then
-    run unzip -q -u -o $download_dir/assemblytool*jar
+function _assembly_tool_get_dir() {
+  if [ "${fai_package_enabled-0}" -eq 0 ]; then
+    echo "${escenic_root_dir}/assemblytool"
+  else
+    echo "${escenic_root_dir}/escenic-assemblytool"
   fi
+}
 
+function _assembly_tool_set_up_bootstrap_conf() {
   # adding an instance layer to the Nursery configuration
   run cp -r $(get_content_engine_dir)/siteconfig/bootstrap-skeleton \
-    $escenic_root_dir/assemblytool/conf
-  run cd $escenic_root_dir/assemblytool/conf/
+    $(_assembly_tool_get_dir)/conf
+  run cd $(_assembly_tool_get_dir)/conf/
   run cp -r layers/host layers/environment
   run cp -r layers/host layers/instance
   run cp -r layers/host layers/vosa
@@ -482,13 +502,25 @@ EOF
 
   # fixing the path to the Nursery configuration according to
   # escenic_conf_dir which may have been overridden by the user.
-  for el in $(find $escenic_root_dir/assemblytool/conf -name Files.properties)
+  for el in $(find $(_assembly_tool_get_dir)/conf -name Files.properties)
   do
     sed -i "s#/etc/escenic#${escenic_conf_dir}#g" $el
   done
+}
+
+
+function set_up_assembly_tool() {
+  if ! _assembly_tool_should_set_up; then
+    return
+  fi
+
+  print_and_log "Setting up the Assembly Tool ..."
+
+  _assembly_tool_install_binaries
+  _assembly_tool_set_up_bootstrap_conf
 
   # set up which plugins to use
-  run cd $escenic_root_dir/assemblytool/
+  run cd $(_assembly_tool_get_dir)/
   make_dir plugins
   run cd plugins
   find ../../ -maxdepth 1 -type d | \
@@ -511,7 +543,7 @@ EOF
     make_ln $directory
   done
 
-  run cd $escenic_root_dir/assemblytool/
+  run cd $(_assembly_tool_get_dir)/
   run ant -q initialize
   sed -i "s~#\ engine.root\ =\ \.~engine.root=${escenic_root_dir}/engine~g" \
     assemble.properties \
@@ -523,7 +555,7 @@ EOF
     1>>$log 2>>$log
   exit_on_error "sed on assemble.properties"
 
-  make_dir $escenic_root_dir/assemblytool/publications
+  make_dir $(_assembly_tool_get_dir)/publications
 
   # Set up a publication definition
   #
@@ -535,11 +567,11 @@ EOF
   # fai_<presentation|editor>_ear for creating publication definitions
   # and WARs.
   if [[ -n "${fai_publication_name}" && -n "${fai_publication_war}" ]]; then
-    local file=$escenic_root_dir/assemblytool/publications/${fai_publication_name}.properties
+    local file=$(_assembly_tool_get_dir)/publications/${fai_publication_name}.properties
     print_and_log "Creating a publication definition for publication" \
       $fai_publication_name "..."
     run cp ${fai_publication_war} \
-      $escenic_root_dir/assemblytool/publications/${fai_publication_name}.war
+      $(_assembly_tool_get_dir)/publications/${fai_publication_name}.war
     cat > $file <<EOF
 name: ${fai_publication_name}
 source-war: ${fai_publication_name}.war
@@ -553,7 +585,7 @@ function _set_up_basic_nursery_configuration_by_copying() {
 
   # we always copy the default plugin configuration (even if there is
   # an archive)
-  for el in $escenic_root_dir/assemblytool/plugins/*; do
+  for el in $(_assembly_tool_get_dir)/plugins/*; do
     if [ ! -d $el/misc/siteconfig/ ]; then
       continue
     fi

From d1cee02cc6b2c1867dafc4f8a99818c7c735870c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Thu, 16 Mar 2017 08:54:11 +0100
Subject: [PATCH 2504/2585] Fixed Maria DB install on Ubuntu 16.04.2 LTS
 (xenial)

- mariadb is now in the official repositories of all major
  distributions so there's no reason to add dedicated repos for
  installing it.

- made mariadb the default MySQL flavour (db_vendor)

- removed method call to non existent method.
---
 usr/sbin/ece-install                          |  4 ++--
 .../ece-scripts/ece-install.d/database.sh     | 19 ++++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index b80d8838..5f615c9c 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -50,8 +50,8 @@ java_package_name=""
 # This variable is updated by the package build scripts.
 ece_scripts_version="straight-from-github"
 
-#Set the default database vendor. Possible values are mariadb and percona
-db_vendor=percona
+# Set the default database vendor. Possible values are mariadb and percona
+db_vendor=mariadb
 
 ## Map with package name to version entries. The version can be empty.
 declare -A fai_package_map
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 361e8ad8..bb166638 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -146,22 +146,23 @@ function set_up_repository_if_possible() {
       run rm /var/lib/mysql/debian-*.flag
     fi
 
-    if is_supported $code_name; then
+    # mariadb is now (2017-03-15) in offical repos in both Ubuntu and
+    # Debian - and pretty much everwhere else.
+    if [[ "${db_vendor}" == "mariadb" ]]; then
+      mysql_server_packages="mariadb-server"
+      mysql_client_packages="mariadb-client"
+      leave_trail "trail_db_vendor=mariadb"
+
+    elif is_supported $code_name; then
       add_gpg_key
 
-      if [ $db_vendor = "mariadb" ]; then
-        local distributor=$(lsb_release -i -s | tr '[A-Z]' '[a-z]')
-        add_apt_source "deb http://ftp.heanet.ie/mirrors/mariadb/repo/5.5/$distributor ${code_name} main"
-        mysql_server_packages="mariadb-server"
-        mysql_client_packages="mariadb-client"
-        leave_trail "trail_db_vendor=mariadb"
-      else
+      if [[ $db_vendor == "percona" ]]; then
         add_apt_source "deb http://repo.percona.com/apt ${code_name} main"
         mysql_server_packages="percona-server-server"
         mysql_client_packages="percona-server-client"
         leave_trail "trail_db_vendor=percona"
       fi
-      pin
+
       if ! apt-cache > /dev/null show $mysql_server_packages; then
         print_and_log "Setting Up the $db_vendor Repository ..."
         run apt-get update

From f77e72185805dc42d5a6a75d4e8ca386e9175bb9 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Thu, 16 Mar 2017 09:40:09 +0100
Subject: [PATCH 2505/2585] Most explicitly state publication creation

profiles:
  publications:
    - name: mypub
      create: yes

This is to be able to re-use the publication block for other (re) runs
of ece-install where you need the publication specification. For
instance for re-running the cache profile after creating a new
publication.
---
 .../unit-tests/ece-install-conf-file-reader-test.sh |  1 +
 .../ece-scripts/ece-install.d/conf-file-reader.sh   | 13 ++++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
index 36dc6bd7..04174bbd 100644
--- a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
+++ b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
@@ -386,6 +386,7 @@ test_can_parse_yaml_conf_create_publication() {
 profiles:
    publications:
      - name: ${publication1_name}
+       create: true
        war: ${publication1_war}
        war_remove_list:
          - ${publication1_remove_file1}
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
index 42299071..f08c5672 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
@@ -77,9 +77,6 @@ _parse_yaml_conf_file_publications() {
   fai_publication_domain_mapping_list=""
 
   for ((i = 0; i < count; i++)); do
-    # If there are one or more publications defined in
-    # 'publications', we assume the user wants to create these.
-    export fai_publication_create=1
 
     local name=
     local war=
@@ -90,11 +87,21 @@ _parse_yaml_conf_file_publications() {
     local environment=
     local war_remove_list=
 
+    create=$(_jq "${yaml_file}" .profiles.publications["${i}"].create)
+    ear=$(_jq "${yaml_file}" .profiles.publications["${i}"].ear)
     ear=$(_jq "${yaml_file}" .profiles.publications["${i}"].ear)
     name=$(_jq "${yaml_file}" .profiles.publications["${i}"].name)
     war=$(_jq "${yaml_file}" .profiles.publications["${i}"].war)
     environment=$(_jq "${yaml_file}" .profiles.publications["${i}"].environment)
 
+    # If there are one or more publications defined in 'publications'
+    # with create set to true, we assume the user wants to create all
+    # publications. It's safe to re-run creation for existing
+    # publications.
+    if [[ "${create}" == true || "${create}" == yes ]]; then
+      export fai_publication_create=1
+    fi
+
     if [ -z "${war}" ]; then
       war=${name}.war
     fi

From b48d89ed438847a473eb29e897da1a3f0f187a0a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Thu, 16 Mar 2017 15:44:38 +0100
Subject: [PATCH 2506/2585] Removed duplicate publication ear parsing

---
 usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
index f08c5672..e2335aa3 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
@@ -89,7 +89,6 @@ _parse_yaml_conf_file_publications() {
 
     create=$(_jq "${yaml_file}" .profiles.publications["${i}"].create)
     ear=$(_jq "${yaml_file}" .profiles.publications["${i}"].ear)
-    ear=$(_jq "${yaml_file}" .profiles.publications["${i}"].ear)
     name=$(_jq "${yaml_file}" .profiles.publications["${i}"].name)
     war=$(_jq "${yaml_file}" .profiles.publications["${i}"].war)
     environment=$(_jq "${yaml_file}" .profiles.publications["${i}"].environment)

From fbd8f7d044f102c6e0f27abc4f2f58962b96982f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Thu, 16 Mar 2017 16:01:06 +0100
Subject: [PATCH 2507/2585] Removed method & call to
 content-engine::get_publications_webapps_list

- The method re-wrote the instance conf (ece-engine1.conf) with the
  deployment white list corresponding to all publications in the
  database.  This file already was written by
  ece-install::create-publication.

- The method led to writing all publications defined in the database
  to be included in the white list, which isn't always what the user
  wants.

- The method, or its context, also had a bug which made it write the
  white list without quotes around the value, rendering the conf
  invalid:

     deploy_webapp_white_list=escenic-admin snow mypub

  instead of:

     deploy_webapp_white_list="escenic-admin snow mypub"
---
 .../ece-install.d/content-engine.sh           | 20 -------------------
 1 file changed, 20 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 559b1f44..33fd8032 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -33,18 +33,6 @@ function get_deploy_white_list() {
   echo ${deploy_white_list}
 }
 
-function get_publications_webapps_list() {
-
-  local publication_webapps=""
-  # Publication service webapp mappping
-  if [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ] || [ $install_profile_number -eq $PROFILE_ALL_IN_ONE ]; then
-    publication_webapps=${fai_publication_webapps-${fai_publications_webapps-""}}
-  else
-    publication_webapps=""
-  fi
-  echo ${publication_webapps}
-}
-
 function get_publication_short_name_list() {
   local deploy_white_list=""
 
@@ -198,14 +186,6 @@ function install_ece_instance() {
         $file
     fi
   fi
-  if [ $install_profile_number -eq $PROFILE_PRESENTATION_SERVER ] || [ $install_profile_number -eq $PROFILE_ALL_IN_ONE ]; then
-    local file=$escenic_conf_dir/ece-${instance_name}.conf
-    print_and_log "Added publications service webapps in $file ..."
-    set_conf_file_value \
-      publications_webapps \
-      $(get_publications_webapps_list) \
-      $file
-  fi
   if [ $install_profile_number -ne $PROFILE_ANALYSIS_SERVER -a \
     $install_profile_number -ne $PROFILE_SEARCH_SERVER ]; then
     set_up_content_engine_cron_jobs

From 9b8232ba0d8952154fa8f3b1a5312927d3ed5b27 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 17 Mar 2017 09:13:08 +0100
Subject: [PATCH 2508/2585] /usr/bin/ece now uses instance engine1 if no -i
 <instance>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

/usr/bin/ece now uses instance engine1 if no -i <instance>  is passed
to it. The previous default was "default", which hardly any
installation has these days.

Funny to think about that having the default instance name "default"
made sense in 2011 😉
---
 usr/bin/ece                                | 34 ++++------------------
 usr/share/escenic/ece-scripts/common-io.sh |  2 +-
 2 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 444009c4..6c5b5489 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -29,7 +29,7 @@ everything_but_the_kitchen_sink=0
 ######################################################################
 ece_scripts_version="straight-from-github"
 type=engine
-instance=default
+instance=engine1
 command=""
 backup_exclude_binaries=0
 backup_exclude_conf=0
@@ -292,7 +292,7 @@ function set_instance_settings() {
     # We respect ece_server if it's set in any of the configuration
     # files. If it's not set there, it sets some sensible defaults.
     if [ -z "$ece_server" ]; then
-        if [ "$instance" == "default" ]; then
+        if [ "$instance" == "engine1" ]; then
             ece_server=${HOSTNAME}
         else
             ece_server=${HOSTNAME}-${instance}
@@ -319,6 +319,7 @@ function set_instance_settings() {
     #   when running in production.
     ece_args="
       -Descenic.server=$ece_server
+      -Dcom.escenic.instance=$instance
       -Djava.awt.headless=true
       -Djava.security.auth.login.config=$ece_security_configuration_dir/jaas.config
       -Djava.security.policy=$ece_security_configuration_dir/java.policy
@@ -350,10 +351,6 @@ function set_instance_settings() {
       ece_args=$ece_args" "$jvm_connection_settings
     fi
 
-    if [ "$instance" != "default" ]; then
-        ece_args=$ece_args" -Dcom.escenic.instance=$instance"
-    fi
-
     if [ -n "$ece_environment" ]; then
         ece_args=$ece_args" -Dcom.escenic.environment=${ece_environment}"
     fi
@@ -477,21 +474,6 @@ function sanity_check() {
     fi
 
     local instance_list=$(get_instance_list)
-    # checks if the user is using the default instance when he/she
-    # really wants to start one of the instances installed on the
-    # system.
-    if [ "$instance" == "default" -a \
-        "$type" == "engine" -a \
-        $(echo $command | egrep 'help' | wc -l) -eq 0 ]; then
-        if [[ -n "$instance_list" && \
-            $(echo $instance_list | grep ' ' | wc -l) -gt 0 ]]; then
-            print "You must specify the instance with -i <instance>"
-            print "e.g. ece -i $(echo $instance_list | cut -d' ' -f1) $command"
-            print "Instances available on $HOSTNAME: $instance_list"
-            exit 1
-        fi
-    fi
-
     local instance_exists=0
     for el in $instance_list; do
       if [ $el == $instance ]; then
@@ -698,14 +680,14 @@ function set_type_command_and_instance() {
     # If the user didn't specify which instance to use and if there's
     # only one available instance, use that instead of asking the user
     # to provide it in sanity_check.
-    if [ "$instance" == "default" ]; then
+    if [ "$instance" == "engine1" ]; then
         debug "Trying to determine instance name"
         local instance_list=$(get_instance_list)
 
         if [ $(echo $instance_list | grep ' ' | wc -l) -eq 0 ]; then
             instance=$instance_list
             if [ -z "$instance" ] ; then
-              instance=default
+              instance=engine1
             fi
             debug "setting instance=$instance as there's only one"
         fi
@@ -713,11 +695,7 @@ function set_type_command_and_instance() {
 }
 
 function set_id() {
-    if [ "$instance" == "default" ]; then
-        id="["$(basename $0)"#${type}]"
-    else
-        id="["$(basename $0)"#${type}-${instance}]"
-    fi
+    id="["$(basename $0)"#${type}-${instance}]"
 
     debug type is $type \
         and command is $command \
diff --git a/usr/share/escenic/ece-scripts/common-io.sh b/usr/share/escenic/ece-scripts/common-io.sh
index f38f8c88..7db1cf47 100644
--- a/usr/share/escenic/ece-scripts/common-io.sh
+++ b/usr/share/escenic/ece-scripts/common-io.sh
@@ -34,7 +34,7 @@ function set_conf_file_value() {
 
   if [ -r $file ]; then
     if [ $(grep ^$1 $file | wc -l) -gt 0 ]; then
-      if [ "${dont_quote_conf_values-0}" -eq 0 ]; then
+      if [ ${dont_quote_conf_values-0} -eq 0 ]; then
         sed -i "s~$key=.*~$key=\"$value\"~g" $file
       else
         sed -i "s~$key=.*~$key=$value~g" $file

From e03176646a38e5ce569069d181eec86b4245628b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 17 Mar 2017 09:44:18 +0100
Subject: [PATCH 2509/2585] Sub commands can allow root user execution

- If the sub command defines root_allowed_<command> root will be allowed
  to execute it.

- For instance:

  The command 'ece create-publication' is defined in
  ece.d/create-publication.sh, which has:

  export root_allowed_create_publication=1

  The /usr/bin/ece command will then allow root to execute this sub
  command only.

- CAUTION it's important that the sub command takes heed and don't
  let the root user take ownership of files that the ece user
  typically write to like the files in /var/run/escenic,
  /var/cache/escenic and /var/log/escenic.
---
 usr/bin/ece | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/usr/bin/ece b/usr/bin/ece
index 6c5b5489..15a56f13 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -456,9 +456,28 @@ function set_instance_settings() {
 
 function sanity_check() {
     if [ "$(whoami)" == "root" ]; then
-        print "Sorry, you cannot be root when running $(basename $0)"
-        print "The root user can only use /etc/init.d/ece"
-        exit 1
+        local next_is_ok=0
+        for subcommand in ${command}; do
+            # ignore options, i.e. things starting with a hyphen.
+            if [[ "${subcommand}" =~ ^-.* ]]; then
+              # Allow values to options, must use this since not
+              # everything is using getopt (yet)
+              next_is_ok=1
+              continue
+            fi
+
+            if [ ${next_is_ok-0} -eq 1 ]; then
+              next_is_ok=0
+              continue
+            fi
+
+            declare | grep -q -w root_allowed_${subcommand//-/_} || {
+              print "Sorry, you cannot be root when running " \
+                    "'${BASH_SOURCE[0]##*/} ${subcommand}'." \
+                    "root can only use /etc/init.d/ece"
+              exit 1
+            }
+        done
     fi
 
     if [ "$(echo $command)" == "list-instances" ]; then
@@ -674,7 +693,11 @@ function set_type_command_and_instance() {
         fi
 
         # the only thing left at this point, is the command
-        command="$command $el"
+        if [ -n "${command}" ]; then
+          command="$command $el"
+        else
+          command=${el}
+        fi
     done
 
     # If the user didn't specify which instance to use and if there's

From fba4d357dbc8e8b9b7d34a676b21d636474de53a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 17 Mar 2017 11:35:32 +0100
Subject: [PATCH 2510/2585] Allow root to run 'ece list-instances
 list-publications create-publication'

- this makes sense as /etc/escenic and /opt/tomcat-<instance>/conf
  should be writable only to root (as all other server configuration
  files are).
---
 usr/bin/ece                                               | 2 ++
 usr/share/escenic/ece-scripts/ece.d/create-publication.sh | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/usr/bin/ece b/usr/bin/ece
index 15a56f13..fdef0539 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -152,6 +152,7 @@ function read_conf_file() {
 ## If the system is installed using the recommended paths, the method
 ## will return a list of the instances configured in
 ## ${escenic_conf_dir}/ece-*.conf
+export root_allowed_list_instances=1
 function get_instance_list() {
     local allowed_types="engine analysis changelogd search rmi-hub"
     instance_list=""
@@ -769,6 +770,7 @@ function get_escenic_admin_url() {
     echo ${url}
 }
 
+export root_allowed_list_publications=1
 function show_all_publications() {
   set_type_port
   print "These are all the publications on ${instance}:"
diff --git a/usr/share/escenic/ece-scripts/ece.d/create-publication.sh b/usr/share/escenic/ece-scripts/ece.d/create-publication.sh
index 59c893b0..cd8c2240 100644
--- a/usr/share/escenic/ece-scripts/ece.d/create-publication.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/create-publication.sh
@@ -315,3 +315,6 @@ cmd_create_publication() {
     _create_publication_add_publication_to_deployment_lists "${publication}"
   fi
 }
+
+# root is allowed to run this command
+export root_allowed_create_publication=1

From f6bdee5ff0fd57077ac5deef67fede23df4da8a2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 17 Mar 2017 14:45:49 +0100
Subject: [PATCH 2511/2585] YAML support for which files to update when
 creating a publication

---
 .../ece-install-conf-file-reader-test.sh      | 20 +++++++++++++
 .../ece-install.d/conf-file-reader.sh         | 29 +++++++++++++++++--
 2 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
index 04174bbd..43a96dc4 100644
--- a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
+++ b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
@@ -372,6 +372,11 @@ test_can_parse_yaml_conf_create_publication() {
   local publication_webapp1=pub.war
   local publication_webapp2=loc.war
 
+  local publication1_name=foopub
+  local publication1_update_app_server_conf=1
+  local publication1_update_ece_conf=1
+  local publication1_update_nursery_conf=1
+  local publication1_name=foopub
   local publication1_name=foopub
   local publication1_remove_file1=stoo.pid
   local publication1_remove_file2=does.it
@@ -387,6 +392,9 @@ profiles:
    publications:
      - name: ${publication1_name}
        create: true
+       update_app_server_conf: true
+       update_ece_conf: true
+       update_nursery_conf: true
        war: ${publication1_war}
        war_remove_list:
          - ${publication1_remove_file1}
@@ -404,6 +412,9 @@ EOF
 
   unset fai_publication_domain_mapping_list
   unset fai_publication_ear
+  unset fai_publication_update_app_server_conf
+  unset fai_publication_update_ece_conf
+  unset fai_publication_update_nursery_conf
   unset fai_publication_war_remove_file_list
   unset fai_publication_environment
   unset fai_publication_webapps
@@ -416,6 +427,15 @@ EOF
   assertEquals "fai_publication_ear should have been set" \
                "${publication_ear}" \
                "${fai_publication_ear}"
+  assertEquals "fai_publication_update_app_server_conf should have been set" \
+               "${publication1_update_app_server_conf}" \
+               "${fai_publication_update_app_server_conf}"
+  assertEquals "fai_publication_update_nursery_conf should have been set" \
+               "${publication1_update_nursery_conf}" \
+               "${fai_publication_update_nursery_conf}"
+  assertEquals "fai_publication_update_ece_conf should have been set" \
+               "${publication1_update_ece_conf}" \
+               "${fai_publication_update_ece_conf}"
   assertEquals "fai_publication_webapps should have been set" \
                "${publication_webapp1} ${publication_webapp2}" \
                "${fai_publication_webapps}"
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
index e2335aa3..ec6a5b99 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
@@ -86,6 +86,9 @@ _parse_yaml_conf_file_publications() {
     local aliases=
     local environment=
     local war_remove_list=
+    local update_app_server_conf=
+    local update_ece_conf=
+    local update_nursery_conf=
 
     create=$(_jq "${yaml_file}" .profiles.publications["${i}"].create)
     ear=$(_jq "${yaml_file}" .profiles.publications["${i}"].ear)
@@ -93,16 +96,36 @@ _parse_yaml_conf_file_publications() {
     war=$(_jq "${yaml_file}" .profiles.publications["${i}"].war)
     environment=$(_jq "${yaml_file}" .profiles.publications["${i}"].environment)
 
+    update_app_server_conf=$(
+      _jq "${yaml_file}" .profiles.publications["${i}"].update_app_server_conf)
+    update_ece_conf=$(
+      _jq "${yaml_file}" .profiles.publications["${i}"].update_ece_conf)
+    update_nursery_conf=$(
+      _jq "${yaml_file}" .profiles.publications["${i}"].update_nursery_conf)
+
     # If there are one or more publications defined in 'publications'
-    # with create set to true, we assume the user wants to create all
-    # publications. It's safe to re-run creation for existing
+    # with these settings, we assume the user wants to create all
     # publications.
+    #
+    # FYI: It's safe to re-run creation for existing publications.
     if [[ "${create}" == true || "${create}" == yes ]]; then
       export fai_publication_create=1
     fi
+    if [[ "${update_nursery_conf}" == true ||
+            "${update_nursery_conf}" == yes ]]; then
+      export fai_publication_update_nursery_conf=1
+    fi
+    if [[ "${update_ece_conf}" == true ||
+            "${update_ece_conf}" == yes ]]; then
+      export fai_publication_update_ece_conf=1
+    fi
+    if [[ "${update_app_server_conf}" == true ||
+            "${update_app_server_conf}" == yes ]]; then
+      export fai_publication_update_app_server_conf=1
+    fi
 
     if [ -z "${war}" ]; then
-      war=${name}.war
+      export war=${name}.war
     fi
     if [ -n "${ear}" ]; then
       export fai_publication_ear=${ear}

From bd14748f30175ab5022561602216d9b1edefe089 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 17 Mar 2017 14:46:13 +0100
Subject: [PATCH 2512/2585] Can now create publication(s) without provided EAR
 file

- example YAML:

  profiles:
     publications:
       - name: mypub
         create: true
         update_ece_conf: true
         update_nursery_conf: true

Important not to have `update_app_server_conf: true` as you will not
have an WAR for that publication since you, well, didn't provide an
EAR.
---
 .../ece-install.d/create-publication.sh       | 68 +++++++++++++------
 1 file changed, 46 insertions(+), 22 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
index 56ecbb87..b54b626f 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
@@ -22,17 +22,13 @@ function create_publication_prepare_war_file() {
   fi
 }
 
-function create_publication() {
-  print_and_log "Preparing publication creation ..."
-
-  # figure out which WAR to use for the publication creation
+function _create_publication_if_passed_extract_ear_to_dir() {
   local publication_war=""
   if [ -n "${fai_publication_ear}" ]; then
     print_and_log "I will create all publications in" \
                   $fai_publication_ear "using the the domain mapping list ..."
 
     ensure_variable_is_set fai_publication_domain_mapping_list
-    local the_tmp_dir=$(mktemp -d)
 
     # we're using the builder HTTP crendentials, if set, for
     # downloading the EAR.
@@ -48,15 +44,28 @@ function create_publication() {
       run cd $the_tmp_dir
       run jar xf $download_dir/$(basename $fai_publication_ear)
     )
+  fi
+}
+
+function create_publication() {
+  print_and_log "Preparing publication creation ..."
+
+  local the_tmp_dir=
+  the_tmp_dir=$(mktemp -d)
+
+  # figure out which WAR to use for the publication creation
+  _create_publication_if_passed_extract_ear_to_dir "${the_tmp_dir}"
+
+  local publication_type=${fai_publication_type-default}
 
+  if [ -n "${fai_publication_domain_mapping_list}" ]; then
     ensure_that_instance_is_running ${fai_publication_use_instance-$default_ece_intance_name}
     for el in ${fai_publication_domain_mapping_list}; do
-      local old_ifs=$IFS
       # the entries in the fai_publication_domain_mapping_list are on
       # the form: <publication[,pub.war]>#<domain>[#<alias1>[,<alias2>]]
       IFS='#' read publication domain aliases <<< "$el"
-      IFS=',' read publication_name publication_war publication_type <<< "$publication"
-      IFS=$old_ifs
+      IFS=',' read publication_name publication_war <<< "${publication}"
+      <<< "$publication"
 
       # this is the default case were the WAR is called the same as
       # the publication name with the .war suffix.
@@ -64,20 +73,24 @@ function create_publication() {
         publication_war=${publication_name}.war
       fi
 
+      ## If the WAR was provided in fai_publication_ear
+      if [ -e "${the_tmp_dir}/${publication_war}" ]; then
+        publication_war_to_use=${the_tmp_dir}/${publication_war}
+      else
+        local file=$(get_content_engine_dir)/contrib/wars/demo-clean.war
+        publication_war_to_use=${file}
+      fi
+
       create_the_publication \
-        $publication_name \
-        $the_tmp_dir/$publication_war \
-        $publication_type \
+        "${publication_name}" \
+        "${publication_war_to_use}" \
+        "${publication_type}" \
         "${domain}" \
         "${aliases}"
     done
-
-    log "Cleaing up $the_tmp_dir ..."
-    run rm -rf $the_tmp_dir
   else
     ensure_that_instance_is_running ${fai_publication_use_instance-$default_ece_intance_name}
     local publication_name=${fai_publication_name-mypub}
-    local publication_type=${fai_publication_type-default}
 
     if [ -z "${fai_publication_war}" ]; then
       # if the user hasn't set the fai_publication_war, see if the
@@ -97,6 +110,9 @@ function create_publication() {
 
     create_the_publication $publication_name $publication_war $publication_type
   fi
+
+  log "Cleaing up $the_tmp_dir ..."
+  run rm -rf $the_tmp_dir
 }
 
 ## $1 :: publication name
@@ -117,22 +133,30 @@ function create_the_publication() {
     ece -i ${the_instance} \
         create-publication \
         --publication ${publication_name} \
-        --update-app-server-conf \
-        --update-nursery-conf \
-        --update-ece-conf \
-        --publication-type ${publication_type} \
         --file ${publication_war}
   "
-
+  if [ "${fai_publication_update_nursery_conf-0}" -eq 1 ]; then
+    ece_command=${ece_command}" --update-nursery-conf"
+  fi
+  if [ "${fai_publication_update_ece_conf-0}" -eq 1 ]; then
+    ece_command=${ece_command}" --update-ece-conf"
+  fi
+  if [ "${fai_publication_update_app_server_conf-0}" -eq 1 ]; then
+    ece_command=${ece_command}" --update-app-server-conf"
+  fi
   if [ -n "${publication_domain}" ]; then
     ece_command=${ece_command}" --publication-domain ${publication_domain}"
   fi
   if [ -n "${publication_aliases}" ]; then
     ece_command=${ece_command}" --publication-aliases ${publication_aliases}"
   fi
+  if [ -n "${publication_type}" ]; then
+    ece_command=${ece_command}" --publication-type ${publication_type}"
+  fi
 
-  su - "${ece_user}" -c "$ece_command" &>> "${log}"
-  exit_on_error su - "${ece_user}" -c "$ece_command"
+  # 'ece create-publication' can be run as root
+  run ${ece_command}
+  exit_on_error "$ece_command"
 }
 
 ## $1 :: the instance name

From 5e4e29695d74cb11a3249f609c2049ccbdc40b63 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Mon, 20 Mar 2017 09:22:36 +0100
Subject: [PATCH 2513/2585] Added TODO steps for RedHat

- Updated RedHat status
---
 TODO.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/TODO.md b/TODO.md
index cbc79e89..615e54b1 100644
--- a/TODO.md
+++ b/TODO.md
@@ -18,6 +18,20 @@ repositories.
 - ✔ Cache server profile
 - ✔ Assembly Tool
 
+### Install ECE from RPMs
+Support for installing ECE & plugins using the escenic RPM packages.
+
+- ✔ Editor profile (Escenic Content Engine) 
+- ✔ Presentation profile (Escenic Content Engine)
+- ✔ Search profile (ECE's indexer-webapp + Solr)
+- ✔ DB profile, ECE
+- DB profile, ECE plugins
+- ✔ Create publication(s) profile → Move to `/usr/bin/ece`
+- Analysis profile (Escenic Analysis Engine)
+- Analysis DB profile
+- Cache server profile
+- Assembly Tool
+
 ### ✔ YAML configuration file format
 
 See the [unit tests](usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh) for

From 76c6b86ca013ab17a8c022250812ed61f544aa64 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Mon, 20 Mar 2017 09:23:02 +0100
Subject: [PATCH 2514/2585] Installing Java on RedHat now works (again)

- Made memcached work on RedHat (again)

- tested on CentOS 7.3.1611

- Added Emacs header
---
 usr/sbin/ece-install                          |  7 ++-
 .../escenic/ece-scripts/ece-install.d/java.sh | 53 +++++--------------
 .../ece-scripts/ece-install.d/memory-cache.sh |  4 +-
 .../ece-scripts/ece-install.d/redhat.sh       | 20 +++++++
 4 files changed, 38 insertions(+), 46 deletions(-)
 create mode 100644 usr/share/escenic/ece-scripts/ece-install.d/redhat.sh

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 5f615c9c..cd45b7ee 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -619,10 +619,9 @@ function common_pre_install() {
 
     if [ -e /etc/redhat-release ]; then
       on_redhat_or_derivative=1
-      # TODO: ensure provides json_xs and that it's in the default
-      # CentOS & Redhat repos: perl-Cpanel-JSON-XS, jq. Need to add
-      # the EPEL repo.
-      install_packages_if_missing "redhat-lsb"
+
+      rh_add_epel_repo
+      install_packages_if_missing "redhat-lsb jq perl-JSON-XS perl-YAML"
 
       if [ $(lsb_release -i | grep RedHat | wc -l) -gt 0 ]; then
         on_redhat=1
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/java.sh b/usr/share/escenic/ece-scripts/ece-install.d/java.sh
index 75c80259..9d00f822 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/java.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/java.sh
@@ -1,7 +1,7 @@
 default_java_version=1.6
 sun_java_bin_url=http://download.oracle.com/otn-pub/java/jdk/6u39-b04/jdk-6u39-linux-i586.bin
 if [[ $(uname -m) == "x86_64" ]]; then
-  sun_java_bin_url=http://download.oracle.com/otn-pub/java/jdk/6u39-b04/jdk-6u39-linux-x64.bin
+  sun_java_bin_url=http://download.oracle.com/otn-pub/java/jdk/8u121-b13/e9e7ea248e2c4826b92b3f075a80e441/jdk-8u121-linux-x64.rpm
 fi
   
 # Install oracle java from webupd8
@@ -40,50 +40,21 @@ function install_sun_java_on_redhat() {
     return
   fi
   
-  print_and_log "Downloading Sun Java from download.oracle.com ..."
-  run cd $download_dir
-  local file_name=$(basename $sun_java_bin_url)
-  run wget --no-cookies --header "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com" -O $file_name $wget_opts $sun_java_bin_url
+  print_and_log "Downloading Oracle Java from download.oracle.com ..."
+  local file_name=${download_dir}/${sun_java_bin_url##*/}
+  run wget \
+      --no-cookies \
+      --header "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com ; oraclelicense=accept-securebackup-cookie" \
+      -O $file_name \
+      $wget_opts \
+      $sun_java_bin_url
 
-  # calculating start and stop offset from where to extract the zip
-  # from the java data blob. calculation taken from
-  # git://github.com/rraptorr/sun-java6.git
-  local tmp_jdk=jdk-tmp.zip
-  local binsize=$(wc -c $file_name | awk '{print $1}');
-  local zipstart=$(unzip -ql $file_name 2>&1 >/dev/null | \
-      sed -n -e 's/.* \([0-9][0-9]*\) extra bytes.*/\1/p');
-  tail -c $(expr $binsize - $zipstart) $file_name > $tmp_jdk
-  
-  run cd /opt
-  run unzip -q -o $download_dir/$tmp_jdk
-  local latest_jdk=$(find . -maxdepth 1 -type d -name "jdk*" | sort -r | head -1)
-  run rm -f /opt/jdk
-  run ln -s $latest_jdk jdk
-
-  # generate jar files from the .pack files
-  for el in $(find /opt/jdk/ -name "*.pack"); do
-    file_name=$(basename $el .pack)
-    local dir=$(dirname $el)
-    run /opt/jdk/bin/unpack200 $el $dir/$file_name.jar
-  done
+  run rpm -Uvh "${file_name}"
 
-  # update RedHat's alternatives system to use Sun Java as its
-  # default.
-  for el in java javac jar; do
-    if [ ! -e /usr/bin/$el ]; then
-      ln -s /usr/bin/$el /etc/alternatives/$el
-    fi
-    # doesn't seem to like running inside the run wrapper
-    alternatives --set $el /opt/jdk/bin/$el 1>>$log 2>>$log
-  done
-
-  # setting java_home to the newly installed location
-  java_home=/opt/jdk
-  
   local version=$(java -version 2>&1 | grep version | cut -d'"' -f2)
-  print_and_log "Sun Java $version is now installed in /opt/jdk"
+  print_and_log "Oracle Java $version is now installed"
 
-  add_next_step "By using Sun Java, you must accept this license: " \
+  add_next_step "By using Oracle Java, you must accept this license: " \
     "http://www.oracle.com/technetwork/java/javase/terms/license/"
 }
 
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh b/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
index bc3ef32d..e254e6c7 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
@@ -1,3 +1,5 @@
+# -*- mode: sh; sh-shell: bash; -*-
+
 # ece-install module for installing the memory cache
 
 function install_memory_cache()
@@ -6,7 +8,7 @@ function install_memory_cache()
 
   install_packages_if_missing "memcached"
   if [ $on_redhat_or_derivative -eq 1 ]; then
-    run /etc/init.d/memcached restart
+    run service memcached restart
   fi
   
   assert_commands_available memcached
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/redhat.sh b/usr/share/escenic/ece-scripts/ece-install.d/redhat.sh
new file mode 100644
index 00000000..abb5e386
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece-install.d/redhat.sh
@@ -0,0 +1,20 @@
+# -*- mode: sh; sh-shell: bash; -*-
+#
+## Functions specific to RedHat and derivatives like CentOS
+##
+## author: torstein@escenic.com
+##
+
+## EPEL is a high quality repo for packages that we're dependent on,
+## like jq.
+rh_add_epel_repo() {
+  if [ "${on_redhat_or_derivative-0}" -eq 0 ]; then
+    return
+  fi
+
+  local major=7
+  major=$(lsb_release -r |
+            sed -n -r 's#Release:[^0-9]*([0-9]+)\..*#\1#p')
+  local url=https://dl.fedoraproject.org/pub/epel/epel-release-latest-${major}.noarch.rpm
+  run rpm -Uvh "${url}"
+}

From 38dadd1df6e6f377b4a2a9348ffca4b6a14fcede Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Tue, 21 Mar 2017 08:43:01 +0100
Subject: [PATCH 2515/2585] Hardening: fail fast if ece-install.yaml isn't
 valid YAML

- added conf support for package architecture:

   packages:
     - name: foo
       version: 1.2.3
       arch: i386

- only applies to RPMs (for now).

- The default, x86_64, should suffice for most usecases
---
 .../ece-install-conf-file-reader-test.sh         |  6 ++++++
 .../ece-install.d/conf-file-reader.sh            | 16 ++++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
index 43a96dc4..c6735106 100644
--- a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
+++ b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
@@ -553,21 +553,27 @@ test_can_parse_yaml_conf_packages() {
   yaml_file=$(mktemp)
   local package_name=escenic-content-engine
   local package_version=6.1.0-2
+  local package_arch=i386
 
   cat > "${yaml_file}" <<EOF
 ---
 packages:
   - name: ${package_name}
     version: ${package_version}
+    arch: ${package_arch}
 EOF
   unset fai_package_map
+  unset fai_package_arch_map
   declare -A fai_package_map
+  declare -A fai_package_arch_map
   parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
 
   for name in "${!fai_package_map[@]}"; do
     local version=${fai_package_map[${name}]}
+    local arch=${fai_package_arch_map[${name}]}
     assertEquals "Should have parsed package name" "${package_name}" "${name}"
     assertEquals "Should have parsed package version" "${package_version}" "${version}"
+    assertEquals "Should have parsed package version" "${package_arch}" "${arch}"
   done
 
   rm -rf "${yaml_file}"
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
index ec6a5b99..4239a786 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
@@ -24,8 +24,17 @@ parse_yaml_conf_file_or_source_if_sh_conf() {
   assert_commands_available json_xs jq
 
   local yaml_file=$1
-  if ! is_yaml "${yaml_file}"; then
-    source "${yaml_file}"
+
+  if ! is_yaml "${yaml_file}" ; then
+    local suffix=${yaml_file##*.}
+    if [[ "${suffix}" == yaml ]]; then
+      print_and_log "Conf file ${yaml_file} isn't valid YAML," \
+                    "see ${log} for further details"
+      json_xs < "${yaml_file}" -f yaml -t json &>> "${log}"
+      remove_pid_and_exit_in_error
+    else
+      source "${yaml_file}"
+    fi
     return
   fi
 
@@ -191,9 +200,12 @@ _parse_yaml_conf_file_packages() {
   for ((i = 0; i < count; i++)); do
     local name=
     local version=
+    local arch=
     name=$(_jq "${yaml_file}" .packages["${i}"].name)
     version=$(_jq "${yaml_file}" .packages["${i}"].version)
+    arch=$(_jq "${yaml_file}" .packages["${i}"].arch)
     fai_package_map[${name}]=${version}
+    fai_package_arch_map[${name}]=${arch}
     export fai_package_enabled=1
     export escenic_root_dir=/usr/share/escenic
   done

From 580130e7dfa151a619121c29b13133ec7f70f79d Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Fri, 3 Mar 2017 00:42:13 +0100
Subject: [PATCH 2516/2585] Made ece-install to generate right nursery
 component with correct class and package name

---
 usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh b/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
index e254e6c7..11455986 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
@@ -19,10 +19,10 @@ function install_memory_cache()
 }
 
 function memcached_set_up_common_nursery() {
-  local dir=$common_nursery_dir/com/danga
+  local dir=$common_nursery_dir/com/whalin/
   make_dir $dir
   cat > $dir/SockIOPool.properties <<EOF
-\$class=com.danga.MemCached.SockIOPool
+\$class=com.whalin.MemCached.SockIOPool
 # fill in memcached servers here.
 servers=${fai_memcached_node_list-localhost:11211}
 
@@ -43,6 +43,6 @@ EOF
   cat >> $common_nursery_dir/Initial.properties <<EOF
 
 # using memcached, added by $(basename $0) @ $(date --iso)
-service.0.0-memcached-socket-pool=/com/danga/SockIOPool
+service.0.0-memcached-socket-pool=/com/whalin/SockIOPool
 EOF
 }

From 1bb7792bac190dca002578d9d3893c6bf80afacc Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Tue, 21 Mar 2017 10:49:20 +0100
Subject: [PATCH 2517/2585] Major ece-install profiles now work on RedHat
 (again)

Currently, the following works:

- editorial ECE
- presentation ECE
- MariaDB
- Solr6
- search instance (Tomcat/indexer-webapp)
- Java, automatically downloaded from oracle.com
- ece-scripts installed with packages (with git/github fallback, as
  before)
- creating publications

Tested on:

$ lsb_release -a
Distributor ID:	CentOS
Description:	CentOS Linux release 7.3.1611 (Core)
Release:	7.3.1611
Codename:	Core

- New method: common-os::is_rpm_already_installed()

- Can now configure RPM repo base URI & credentials
  -- added unit tests to document this
  -- Fixed example/test data to be production like;
     there's power in code examples
---
 .../ece-install-conf-file-reader-test.sh      | 54 +++++++++++++-
 usr/sbin/ece-install                          | 13 ++--
 usr/share/escenic/ece-scripts/common-os.sh    | 16 +++++
 .../ece-install.d/conf-file-reader.sh         | 11 +++
 .../ece-scripts/ece-install.d/ece-scripts.sh  | 31 ++++++--
 .../escenic/ece-scripts/ece-install.d/java.sh | 70 ++++++++++++++++++-
 .../ece-install.d/package-based-install.sh    | 31 +++++++-
 7 files changed, 211 insertions(+), 15 deletions(-)

diff --git a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
index c6735106..22e6c18f 100644
--- a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
+++ b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
@@ -12,6 +12,7 @@ test_can_parse_yaml_conf_environment() {
   local mvn_repo1=repo1.example.com
   local mvn_repo2=repo2.example.com
   local conf_url=http://build.example.com/machine-conf-1.2.3.deb
+  local rpm_base_url=http://unstable.yum.escenic.com/rpm
 
   cat > "${yaml_file}" <<EOF
 ---
@@ -24,6 +25,10 @@ environment:
   apt:
     escenic:
       pool: ${apt_pool}
+  rpm:
+    escenic:
+      base_url: ${rpm_base_url}
+
   maven:
     repositories:
       - ${mvn_repo1}
@@ -35,6 +40,7 @@ EOF
   unset fai_server_java_version
   unset fai_maven_repositories
   unset fai_conf_url
+  unset fai_package_rpm_base_url
   parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
 
   assertNotNull "Should set java_home" "${java_home}"
@@ -55,6 +61,9 @@ EOF
                "${mvn_repo1} ${mvn_repo2}" \
                "${fai_maven_repositories}"
   assertEquals "Should set fai_conf_url" "${conf_url}" "${fai_conf_url}"
+  assertEquals "Should set fai_package_rpm_base_url" \
+               "${rpm_base_url}" \
+               "${fai_package_rpm_base_url}"
 
   rm -rf "${yaml_file}"
 }
@@ -107,7 +116,7 @@ test_can_parse_yaml_conf_presentation() {
   local presentation_ear=http://builder/engine.ear
   local presentation_environment=testing
   local presentation_deploy_white_list=foo
-  local presentation_search_indexer_ws_uri=http://engine1/indexer-webservice
+  local presentation_search_indexer_ws_uri=http://engine1/indexer-webservice/index/
 
   local yaml_file=
   yaml_file=$(mktemp)
@@ -323,6 +332,8 @@ test_can_parse_yaml_conf_credentials() {
   local escenic_download_password=barpassword
   local builder_download_user=buildy
   local builder_download_password=boo
+  local unstable_yum_user=once
+  local unstable_yum_password=coming
 
   cat > "${yaml_file}" <<EOF
 ---
@@ -333,10 +344,15 @@ credentials:
   - site: builder
     user: ${builder_download_user}
     password: ${builder_download_password}
+  - site: unstable.yum.escenic.com
+    user: ${unstable_yum_user}
+    password: ${unstable_yum_password}
 EOF
 
   unset technet_user
   unset technet_password
+  unset fai_package_rpm_user
+  unset fai_package_rpm_password
   unset fai_builder_http_user
   unset fai_builder_http_password
   unset fai_conf_builder_http_user
@@ -361,6 +377,40 @@ EOF
   assertEquals "Should set fai_conf_builder_http_password" \
                "${builder_download_password}" \
                "${fai_conf_builder_http_password}"
+  assertEquals "Should set fai_package_rpm_user" \
+               "${unstable_yum_user}" \
+               "${fai_package_rpm_user}"
+  assertEquals "Should set fai_package_rpm_password" \
+               "${unstable_yum_password}" \
+               "${fai_package_rpm_password}"
+
+  rm -rf "${yaml_file}"
+}
+
+test_can_parse_yaml_conf_credentials_stable_yum() {
+  local yaml_file=
+  yaml_file=$(mktemp)
+  local stable_yum_user=always
+  local stable_yum_password=there
+
+  cat > "${yaml_file}" <<EOF
+---
+credentials:
+  - site: yum.escenic.com
+    user: ${stable_yum_user}
+    password: ${stable_yum_password}
+EOF
+
+  unset fai_package_rpm_user
+  unset fai_package_rpm_password
+
+  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
+  assertEquals "Should set fai_package_rpm_user" \
+               "${stable_yum_user}" \
+               "${fai_package_rpm_user}"
+  assertEquals "Should set fai_package_rpm_password" \
+               "${stable_yum_password}" \
+               "${fai_package_rpm_password}"
 
   rm -rf "${yaml_file}"
 }
@@ -807,7 +857,7 @@ test_can_parse_yaml_conf_search() {
   local search_for_editor=1
   local search_legacy=1
   local search_ear=http://builder/engine.ear
-  local search_indexer_ws_uri=http://engine/indexer-webservice
+  local search_indexer_ws_uri=http://engine/indexer-webservice/index/
 
   local yaml_file=
   yaml_file=$(mktemp)
diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index cd45b7ee..ea354507 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -55,6 +55,8 @@ db_vendor=mariadb
 
 ## Map with package name to version entries. The version can be empty.
 declare -A fai_package_map
+## Map with package name to arch entries. The arch can be empty.
+declare -A fai_package_arch_map
 
 #####################################################################
 
@@ -425,7 +427,7 @@ function print_status_and_next_steps()
         $install_profile_number -ne $PROFILE_CACHE_SERVER -a \
         $install_profile_number -ne $PROFILE_WIDGET_FRAMEWORK ]; then
         add_next_step "UNIX man pages: $(man -k escenic | awk '{print $1;}')"
-        add_next_step "Guide books: http://docs.escenic.com/ece-5.7.html"
+        add_next_step "Guide books: http://docs.escenic.com/ece-6.0.html"
     fi
 
     print_next_step_list
@@ -620,11 +622,14 @@ function common_pre_install() {
     if [ -e /etc/redhat-release ]; then
       on_redhat_or_derivative=1
 
+      # Chicken and egg problem: we need the lsb_release command
+      # before doing anything else.
+      install_packages_if_missing "redhat-lsb"
       rh_add_epel_repo
-      install_packages_if_missing "redhat-lsb jq perl-JSON-XS perl-YAML"
+      install_packages_if_missing "jq perl-JSON-XS perl-YAML"
 
-      if [ $(lsb_release -i | grep RedHat | wc -l) -gt 0 ]; then
-        on_redhat=1
+      if [ "$(lsb_release -i | grep -c RedHat)" -gt 0 ]; then
+        export on_redhat=1
       fi
     fi
 
diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index 0bc18188..99a21e6b 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -253,3 +253,19 @@ function get_memory_summary_of_pid() {
 
   echo "${size} (peaked at: $peak)"
 }
+
+### Returns 0 (ok) if the passed RPM file has been installed on the
+### current machine, 1 if not.
+##
+## $1 :: RPM file reference
+function is_rpm_already_installed() {
+  local file=$1
+
+  if [ ! -e "${file}" ]; then
+    return 1
+  fi
+
+  local package_name=
+  package_name=$(rpm -qp --queryformat "%{Name}\n" "${file}")
+  rpm -q "${package_name}" &> /dev/null
+}
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
index 4239a786..de67b14d 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
@@ -75,6 +75,11 @@ _parse_yaml_conf_file_credentials() {
       export fai_conf_builder_http_user=${user}
       export fai_conf_builder_http_password=${password}
     fi
+    if [[ "${site}" == yum.escenic.com ||
+            "${site}" == unstable.yum.escenic.com ]]; then
+      export fai_package_rpm_user=${user}
+      export fai_package_rpm_password=${password}
+    fi
   done
 }
 
@@ -279,6 +284,12 @@ _parse_yaml_conf_file_environment() {
     export fai_apt_vizrt_pool=${configured_apt_pool}
   fi
 
+  local configured_rpm_base_url=
+  configured_rpm_base_url=$(_jq "${yaml_file}" .environment.rpm.escenic.base_url)
+  if [[ -n "${configured_rpm_base_url}" ]]; then
+    export fai_package_rpm_base_url=${configured_rpm_base_url}
+  fi
+
   local skip_password_checks=
   skip_password_checks=$(
     _jq "${yaml_file}" .environment.skip_password_checks)
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh b/usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh
index 0a64f2b5..addd4101 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/ece-scripts.sh
@@ -36,16 +36,37 @@ function install_ece_scripts_with_git() {
   done
 }
 
-function set_up_ece_scripts()
-{
-  print_and_log 'Setting up the ece UNIX scripts ...'
+function _ece_scripts_install_if_necesary() {
+  local -a must_have_list=(
+    /etc/default/ece
+    /etc/init.d/ece
+    /usr/bin/ece
+    /usr/share/escenic/ece-scripts
+  )
+
+  local missing_anything=0
+  for must_have in "${must_have_list[@]}"; do
+    if [ ! -e "${must_have}" ]; then
+      missing_anything=1
+    fi
+  done
+
+  if [ "${missing_anything}" -eq 0 ]; then
+    return
+  fi
 
   if [ $on_debian_or_derivative -eq 1 ]; then
-    # TODO tkj remove echo
-    echo install_packages_if_missing escenic-content-engine-scripts
+    install_packages_if_missing escenic-content-engine-scripts
   else
     install_ece_scripts_with_git
   fi
+}
+
+function set_up_ece_scripts()
+{
+  print_and_log 'Setting up the ece UNIX scripts ...'
+
+  _ece_scripts_install_if_necesary
 
   local file=${escenic_conf_dir}/ece.conf
   local example_ece_conf=/usr/share/doc/escenic/escenic-content-engine-scripts/examples/etc/ece.conf
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/java.sh b/usr/share/escenic/ece-scripts/ece-install.d/java.sh
index 9d00f822..c666ceba 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/java.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/java.sh
@@ -33,10 +33,70 @@ function install_oracle_java(){
   install_packages_if_missing $debian_package_name
 }
 
+## Returns 0 if Oracle Java is installed, 1 if it's not (in PATH).
+function _java_is_sun_java_already_installed() {
+  if [ -e "${java_home}/bin/java" ]; then
+    "${java_home}/bin/java" -version 2>&1 | grep -q -w HotSpot
+  elif [ -x /usr/bin/java ]; then
+    /usr/bin/java -version -version 2>&1 | grep -q -w HotSpot
+  else
+    return 1
+  fi
+}
+
+## $1 :: dir of the JDK
+function _java_update_java_env_from_jdk_dir() {
+  local dir=$1
+  update-alternatives --set java "${dir}/jre/bin/java"
+  for cmd in javac jar javap javah jstat; do
+    update-alternatives --set "${cmd}" "${dir}/bin/${cmd}"
+  done
+
+  export java_home=${dir}
+}
+
+function _java_update_java_env_from_jdk_rpm() {
+  local rpm=$1
+  local rpm_java_home=
+  rpm_java_home=$(
+    rpm -qlp "${rpm}" |
+      grep bin/javac |
+      sed 's#/bin/javac##')
+
+  _java_update_java_env_from_jdk_dir "${rpm_java_home}"
+}
+
+function _java_update_java_env_from_java_bin() {
+  local java_bin=
+  java_bin=$(which java)
+  local real_java_bin=
+
+  # the alternatives system is only two link deep:
+  #
+  # /usr/bin/java -> /etc/alternatives/java -> /actual/bin/java
+  if [ -h "${java_bin}" ]; then
+    java_bin=$(readlink "${java_bin}")
+    if [ -h "${java_bin}" ]; then
+      java_bin=$(readlink "${java_bin}")
+    fi
+  fi
+
+  real_java_bin=${java_bin}
+
+  local jdk_dir=${real_java_bin%/*}
+  # Remove jre/bin
+  jdk_dir=${jdk_dir//\/jre\/bin}
+  # If this wasn't a <jdk>/jre/bin/java reference, it's probably
+  # <jdk?>/bin/java, hence remove the bin again.
+  jdk_dir=${jdk_dir//\/bin}
+
+  _java_update_java_env_from_jdk_dir "${jdk_dir}"
+}
+
 function install_sun_java_on_redhat() {
-  if [[ $(${java_home}/bin/java -version 2>&1 | \
-    grep HotSpot | wc -l) -gt 0 ]]; then
+  if _java_is_sun_java_already_installed; then
     print_and_log "Sun Java is already installed on $HOSTNAME"
+    _java_update_java_env_from_java_bin
     return
   fi
   
@@ -49,7 +109,11 @@ function install_sun_java_on_redhat() {
       $wget_opts \
       $sun_java_bin_url
 
-  run rpm -Uvh "${file_name}"
+  if ! is_rpm_already_installed "${file_name}"; then
+    run rpm -Uvh "${file_name}"
+  fi
+
+  _java_update_java_env_from_jdk_rpm "${file_name}"
 
   local version=$(java -version 2>&1 | grep version | cut -d'"' -f2)
   print_and_log "Oracle Java $version is now installed"
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/package-based-install.sh b/usr/share/escenic/ece-scripts/ece-install.d/package-based-install.sh
index 11e037a3..9149b2d0 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/package-based-install.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/package-based-install.sh
@@ -46,7 +46,36 @@ install_configured_escenic_packages() {
         --assume-yes \
         --force-yes \
         ${escenic_deb_packages-escenic-content-engine}
+
   elif [ "${on_redhat_or_derivative}" -eq 1 ]; then
-    :
+    local package=
+    for package in "${!fai_package_map[@]}"; do
+      local version=${fai_package_map[${package}]}
+
+      if [ -z "${version}" ]; then
+        print_and_log "You must specify version of RPM package ${package}"
+        remove_pid_and_exit_in_error
+      fi
+
+      local arch=x86_64
+      if [ -n "${fai_package_arch_map[${package}]}" ]; then
+        arch=${fai_package_arch_map[${package}]}
+      fi
+
+      local rpm_url=${fai_package_rpm_base_url-http://yum.escenic.com/rpm}/${package}-${version}.${arch}.rpm
+
+      local rpm_file="${download_dir}/${rpm_url##*/}"
+      run wget \
+          --http-user "${fai_package_rpm_user}" \
+          --http-password "${fai_package_rpm_password}" \
+          --continue \
+          --output-document "${rpm_file}" \
+          "${rpm_url}"
+
+      if ! is_rpm_already_installed "${rpm_file}"; then
+        run rpm -Uvh "${rpm_file}"
+      fi
+    done
+
   fi
 }

From 4741306ebfb4ee280c889bb401bdb64a051670c5 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Tue, 21 Mar 2017 14:18:26 +0100
Subject: [PATCH 2518/2585] Simplified database::check_mysql_is_running()

---
 usr/share/escenic/ece-scripts/ece-install.d/database.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index bb166638..45ae1777 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -571,11 +571,7 @@ EOF
 }
 
 function check_mysql_is_running(){
-if [[ $(netstat -nlp | grep -w mysqld | wc -l) -gt 0 ]]; then
-   return 0
-else
-   return 1
-fi
+  netstat -nlp | grep -q -c -w mysqld
 }
 
 function create_schema() {

From 10a7643ea026ae40237e45d711918993c0112504 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Wed, 22 Mar 2017 11:12:09 +0100
Subject: [PATCH 2519/2585] Less output from wget please

---
 TODO.md                                                   | 8 ++++----
 .../ece-scripts/ece-install.d/package-based-install.sh    | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/TODO.md b/TODO.md
index 615e54b1..5adca25d 100644
--- a/TODO.md
+++ b/TODO.md
@@ -25,12 +25,12 @@ Support for installing ECE & plugins using the escenic RPM packages.
 - ✔ Presentation profile (Escenic Content Engine)
 - ✔ Search profile (ECE's indexer-webapp + Solr)
 - ✔ DB profile, ECE
-- DB profile, ECE plugins
+- ✔ DB profile, ECE plugins
 - ✔ Create publication(s) profile → Move to `/usr/bin/ece`
-- Analysis profile (Escenic Analysis Engine)
-- Analysis DB profile
+- ✔ Analysis profile (Escenic Analysis Engine)
+- ✔ Analysis DB profile
 - Cache server profile
-- Assembly Tool
+- ✔ Assembly Tool
 
 ### ✔ YAML configuration file format
 
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/package-based-install.sh b/usr/share/escenic/ece-scripts/ece-install.d/package-based-install.sh
index 9149b2d0..56409a08 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/package-based-install.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/package-based-install.sh
@@ -69,6 +69,7 @@ install_configured_escenic_packages() {
           --http-user "${fai_package_rpm_user}" \
           --http-password "${fai_package_rpm_password}" \
           --continue \
+          --quiet \
           --output-document "${rpm_file}" \
           "${rpm_url}"
 

From 7d6fa50b0bc7b0ec9c5157f63e267dd528af31d7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Wed, 22 Mar 2017 11:17:20 +0100
Subject: [PATCH 2520/2585] cache-server: Install Varnish from official
 repositories

- significantly simplifies the cache-server.sh module
---
 .../ece-scripts/ece-install.d/cache-server.sh | 64 +------------------
 1 file changed, 3 insertions(+), 61 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
index eeb47753..33d1c434 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
@@ -1,67 +1,9 @@
-# ece-install module for installing the cache server
-
-varnish_redhat_rpm_url=http://repo.varnish-cache.org/redhat/varnish-3.0/el5/noarch/varnish-release-3.0-1.noarch.rpm
+# -*- mode: sh; sh-shell: bash; -*-
 
-function get_supported_varnish_dist_list() {
-  # list taken from http://repo.varnish-cache.org/debian/dists/, which
-  # is the same as http://repo.varnish-cache.org/ubuntu/dists/
-  curl --connect-timeout 5 \
-    --silent http://repo.varnish-cache.org/ubuntu/dists/ | \
-    grep href | \
-    cut -d'"' -f8- | \
-    grep ^[a-z] | \
-    cut -d'/' -f1
-}
+# ece-install module for installing the cache server
 
 function install_varnish_software() {
-  if [ $on_debian_or_derivative -eq 1 ]; then
-
-    if [ $(apt-key list | grep varnish-software.com | wc -l) -eq 0 ]; then
-      curl ${curl_opts} \
-        http://repo.varnish-cache.org/debian/GPG-key.txt \
-        2>> $log | \
-        apt-key add - \
-        1>>$log 2>>$log
-      run apt-get update
-    fi
-
-    local code_name=$(lsb_release -s -c)
-    local supported_code_name=0
-    local supported_list="$(get_supported_varnish_dist_list)"
-    for el in $supported_list; do
-      if [ $code_name = $el ]; then
-        supported_code_name=1
-      fi
-    done
-
-    local dist_name=$(lsb_release -i -s | tr [A-Z] [a-z])
-    if [ $supported_code_name -eq 1 ]; then
-      add_apt_source "deb http://repo.varnish-cache.org/${dist_name}/ ${code_name} varnish-3.0"
-    elif [ $supported_code_name -eq 1 ]; then
-      add_apt_source "deb http://repo.varnish-cache.org/${dist_name}/ ${code_name} varnish-3.0"
-    else
-      print_and_log "Your distribution ${code_name} isn't supported" \
-        "by the Varnish repositories. I'll use version Varnish from your" \
-        "distribution's repositories instead"
-    fi
-
-  elif [[ $on_redhat_or_derivative -eq 1 &&
-        $(rpm -qa | grep varnish-release | wc -l) -lt 1 ]]; then
-    print "Installing the Varnish repository RPM"
-    run rpm --nosignature -i $varnish_redhat_rpm_url
-  fi
-
-  if [[ ${code_name} == "precise" ]]; then
-    # currently, 2012-10-09, the precise packages are not signed by
-    # the Varnish key.
-    local old_force_packages=${force_packages-0}
-    force_packages=1
-    install_packages_if_missing varnish
-    force_packages=${old_force_packages}
-  else
-    install_packages_if_missing varnish
-  fi
-
+  install_packages_if_missing varnish
   assert_commands_available varnishd
 }
 

From 3ce33fa8d84b33fbe12c53cd2d08519877a338f1 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Wed, 22 Mar 2017 11:39:20 +0100
Subject: [PATCH 2521/2585] Varnish v4 now installs on RedHat

- it's been migrated to systemd since cache-server.sh first was
  implemented, the changes reflect this.

- TODO: the VCL is written for v3, thus the Varnish server doesn't
  serve ECE sites until that's fixed. However, the software itself is
  installed without any fuss now.
---
 .../escenic/ece-scripts/ece-install.d/cache-server.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
index 33d1c434..0e4a794f 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
@@ -30,10 +30,11 @@ function set_varnish_port() {
 
   local file=/etc/default/varnish
   if [ $on_redhat_or_derivative -eq 1 ]; then
-    file=/etc/sysconfig/varnish
+    # Varnish RedHat package has migrated from /etc/sysconfig/varnish
+    file=/etc/varnish/varnish.params
   fi
 
-  run sed -i -e "s/6081/${cache_port}/g" -e 's/^START=no$/START=yes/' $file
+  run sed -i -e "s/6081/${cache_port}/g" "${file}"
 }
 
 function create_varnish_conf_main() {
@@ -613,10 +614,12 @@ function create_varnish_conf() {
 
 function set_up_varnish() {
   print_and_log "Setting up Varnish to match your environment ..."
-  run /etc/init.d/varnish stop
+  run service varnish stop
   set_varnish_port
   create_varnish_conf
-  run /etc/init.d/varnish start
+
+  run systemctl enable varnish
+  run systemctl start varnish
 }
 
 function leave_cache_trails() {

From a3bd91cf4fdb08d247c7c2f593756967e4e5ae82 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Wed, 22 Mar 2017 13:49:07 +0100
Subject: [PATCH 2522/2585] Updated TODO on v3 progress

---
 TODO.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/TODO.md b/TODO.md
index 5adca25d..b5e5b961 100644
--- a/TODO.md
+++ b/TODO.md
@@ -29,9 +29,14 @@ Support for installing ECE & plugins using the escenic RPM packages.
 - ✔ Create publication(s) profile → Move to `/usr/bin/ece`
 - ✔ Analysis profile (Escenic Analysis Engine)
 - ✔ Analysis DB profile
-- Cache server profile
+- ✔ Cache server profile
 - ✔ Assembly Tool
 
+### Support for Varnish 4
+
+Varnish 3 has reached its end of life and Varnish 4 is in the official
+repositories of Debian stable, Ubuntu LTS and CentOS 7.
+
 ### ✔ YAML configuration file format
 
 See the [unit tests](usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh) for

From 3363a3a6ec919a8e5ab8bbf6977ff8c503810e89 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Wed, 22 Mar 2017 13:49:29 +0100
Subject: [PATCH 2523/2585] Tomcat native APR is now setup on RedHat based
 systems

- tested on CentOS 7.3
---
 usr/share/escenic/ece-scripts/ece-install.d/app-server.sh | 8 ++++++++
 .../escenic/ece-scripts/ece-install.d/content-engine.sh   | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 4e6f503f..e1636c0e 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -13,6 +13,13 @@ function set_up_jdbc_library() {
   fi
 }
 
+function set_apr_lib_dir_in_ece_instance_conf_if_needed() {
+  find /usr/lib* -maxdepth 3 -name libtcnative-1.so.0 |
+    while read -r apr_lib; do
+      set_ece_instance_conf apr_lib_dir "${apr_lib%/*}"
+    done
+}
+
 function set_up_app_server() {
   print_and_log "Setting up the application server ..."
 
@@ -113,6 +120,7 @@ function set_up_app_server() {
   set_ece_instance_conf appserver_port $appserver_port
   set_appropriate_jvm_heap_sizes
   set_http_auth_credentials_if_needed
+  set_apr_lib_dir_in_ece_instance_conf_if_needed
 
   run cd $tomcat_base/lib
 
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 33fd8032..9986e3c1 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -774,11 +774,11 @@ function install_ece_third_party_packages
       apr
       memcached
       mysql-connector-java
+      tomcat-native
       wget
       xmlstarlet
     "
 
-    # TODO no tomcat APR wrappers in official repositories
     install_sun_java_on_redhat
   fi
 

From c56b65921a9b0aa8d2feb3887233ace8c36b1ec1 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Thu, 23 Mar 2017 15:48:50 +0100
Subject: [PATCH 2524/2585] ece-install now supports Varnish 4

- have removed Varnish 3 support as version 4 is in the current Debian
  stable (Jessie), Ubuntu LTS (xenial) and CentOS (7).

- Do the request HTTP header cleaning in vcl_pipe
  -- needed to make it work on Varnish 4
  -- it didn't make sense to do this in vcl_miss (?!!). vcl_miss is
     called just before the request is sent to the backend, so it should
     be the right place.

- Setting backend HTTP header using vcl_backend_response instead of
  vcl_deliver, which is a must for Varnish 4.

- Re-wrote the handling of HTTP robots using vcl_synth()

- Simplified normalising the Host header, works on Varnish 4.

- vcl_fetch -> vcl_backend_response

- Simplified grace setup + removed saint mode
  -- saint mode is not a part of Varnsh 4 anymore and since we normally
     have the cache server on the same machine as the app server, having
     multiple backends doesn't make any sense.
  -- we'll revisit saint mode if/when we get cache servers with multiple
     backends.

- Client director is gone in Varnish 4, using hash director instead

- Updated TODO. We're now feature complete for version 4.
---
 TODO.md                                       |   6 +-
 .../ece-scripts/ece-install.d/cache-server.sh | 368 +++++++++---------
 2 files changed, 181 insertions(+), 193 deletions(-)

diff --git a/TODO.md b/TODO.md
index b5e5b961..4c039a9f 100644
--- a/TODO.md
+++ b/TODO.md
@@ -18,7 +18,7 @@ repositories.
 - ✔ Cache server profile
 - ✔ Assembly Tool
 
-### Install ECE from RPMs
+### ✔ Install ECE from RPMs
 Support for installing ECE & plugins using the escenic RPM packages.
 
 - ✔ Editor profile (Escenic Content Engine) 
@@ -32,10 +32,10 @@ Support for installing ECE & plugins using the escenic RPM packages.
 - ✔ Cache server profile
 - ✔ Assembly Tool
 
-### Support for Varnish 4
+### ✔ Support for Varnish 4
 
 Varnish 3 has reached its end of life and Varnish 4 is in the official
-repositories of Debian stable, Ubuntu LTS and CentOS 7.
+repositories of Debian stable, Ubuntu LTS and CentOS 7 and RedHat 7.
 
 ### ✔ YAML configuration file format
 
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
index 0e4a794f..5032f659 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
@@ -29,9 +29,25 @@ function set_varnish_port() {
   log "Setting Varnish to listen on port" ${cache_port} "..."
 
   local file=/etc/default/varnish
+
   if [ $on_redhat_or_derivative -eq 1 ]; then
     # Varnish RedHat package has migrated from /etc/sysconfig/varnish
     file=/etc/varnish/varnish.params
+  else
+    # Debian/Ubuntu now (15.04+) insists on configuring this in a
+    # systemd fragment:
+    local file=/etc/systemd/system/varnish.service.d/custom-exec.conf
+    mkdir -p "${file%/*}"
+    cat > "${file}" << 'EOF'
+    [Service]
+ExecStart=
+ExecStart=/usr/sbin/varnishd \
+  -a :80 \
+  -T localhost:6082 \
+  -f /etc/varnish/default.vcl \
+  -S /etc/varnish/secret \
+  -s malloc,256m
+EOF
   fi
 
   run sed -i -e "s/6081/${cache_port}/g" "${file}"
@@ -45,6 +61,8 @@ function create_varnish_conf_main() {
  *
  * The order of the VCL file inclusion is significant.
  */
+vcl 4.0;
+
 include "host-specific.vcl";
 include "backends.vcl";
 include "access-control.vcl";
@@ -75,7 +93,10 @@ EOF
 function create_varnish_conf_backends() {
 
   local file=${varnish_conf_dir}/backends.vcl
-  echo > $file
+  cat > "${file}" <<EOF
+import directors;
+
+EOF
 
   # first, define the ECE and EAE backends
   for (( i=0 ; i < ${#backend_servers[@]}; i++ )); do
@@ -105,32 +126,30 @@ backend analysis {
 EOF
   fi
 
-  # define a load balacner with session binding
-  cat >> $file <<EOF
-/* The client director gives us session stickiness based on client
- * IP. */
-director webdirector client {
+  # define a load balancer with session binding
+  cat >> "${file}" <<EOF
+/* Session stickiness based on client IP. */
+sub vcl_init {
+  new hash_director = directors.hash();
 EOF
 
   for (( i=0 ; i < ${#backend_servers[@]}; i++ )); do
 	  appserver_id=$(echo ${backend_servers[$i]} | cut -d':' -f1 | sed 's/-/_/g')
     cat >> $file <<EOF
-  {
-     .backend = ${appserver_id}${i};
-     .weight = 1;
-  }
+  hash_director.add_backend(${appserver_id}${i}, 1);
 EOF
   done
 
-  # make use of the backends
-  cat >> $file <<EOF
+  # first, end the vcl_init, then make use of the backends
+  cat >> "${file}" <<EOF
 }
+
 sub vcl_recv {
   /* This is the default backend */
-  set req.backend = webdirector;
+  set req.backend_hint = hash_director.backend(client.identity);
 
   if (req.url == "/.well-known/backend-health.txt") {
-    error 200 "OK";
+    return (synth(200, "OK"));
   }
 
 EOF
@@ -138,13 +157,15 @@ EOF
   if [ -n "${fai_analysis_host}" ]; then
     cat >> $file <<EOF
   if (req.url ~ "^/analysis-logger/Logger" || req.url == "/analysis-logger/") {
-    set req.backend = analysis;
+    set req.backend_hint = analysis;
     return(pass);
   }
 EOF
   fi
 
-  echo "}" >> $file
+  cat >> "${file}" <<EOF
+}
+EOF
 }
 
 function create_varnish_conf_access_control() {
@@ -164,7 +185,7 @@ sub vcl_recv {
        req.url ~ "^/webservice/" ||
        req.url ~ "^/webservice-extensions/" ||
        req.url ~ "^/escenic-admin/")) {
-    error 405 "Not allowed.";
+    return (synth(405, "Not allowed."));
   }
 }
 EOF
@@ -222,108 +243,108 @@ sub vcl_recv {
  * through the use of buckets. Hence, we must remove all headers that
  * backend software (such as Mobiletech) may use to determine the
  * client and by that deliver web content. */
-sub vcl_miss {
-  remove bereq.http.accept-charset;
-  remove bereq.http.accept-encoding;
-  remove bereq.http.accept-language;
-  remove bereq.http.accept-ranges;
-  remove bereq.http.accounting-session-id;
-  remove bereq.http.apn;
-  remove bereq.http.authorization;
-  remove bereq.http.bearer-type;
-  remove bereq.http.cache-control;
-  remove bereq.http.charging-characteristics;
-  remove bereq.http.clientip;
-  remove bereq.http.client-ip;
-  remove bereq.http.connection;
-  remove bereq.http.content-disposition;
-  remove bereq.http.content-length;
-  remove bereq.http.content-range;
-  remove bereq.http.content-type;
-  remove bereq.http.cookie;
-  remove bereq.http.cookie2;
-  remove bereq.http.cuda_cliip;
-  remove bereq.http.date;
-  remove bereq.http.device-stock-ua;
-  remove bereq.http.dnt;
-  remove bereq.http.drm-version;
-  remove bereq.http.etag;
-  remove bereq.http.expires;
-  remove bereq.http.from;
-  remove bereq.http.if-modified-since;
-  remove bereq.http.if-none-match;
-  remove bereq.http.if-range;
-  remove bereq.http.ip-address;
-  remove bereq.http.last-modified;
-  remove bereq.http.location;
-  remove bereq.http.msisdn;
-  remove bereq.http.mt-proxy-id;
-  remove bereq.http.nas-ip-address;
-  remove bereq.http.origin;
-  remove bereq.http.pnp;
-  remove bereq.http.pragma;
-  remove bereq.http.proxy-connection;
-  remove bereq.http.range;
-  remove bereq.http.server;
-  remove bereq.http.set-cookie;
-  remove bereq.http.sgsn-ip-address;
-  remove bereq.http.transfer-encoding;
-  remove bereq.http.ua-cpu;
-  remove bereq.http.unless-modified-since;
-  remove bereq.http.vary;
-  remove bereq.http.via;
-  remove bereq.http.wap-connection;
-  remove bereq.http.x-amz-cf-id;
-  remove bereq.http.x-att-deviceid;
-  remove bereq.http.x-bluecoat-via;
-  remove bereq.http.x-cnection;
-  remove bereq.http.x-country-code;
-  remove bereq.http.x-d-forwarder;
-  remove bereq.http.x-ebo-ua;
-  remove bereq.http.x-ee-brand-id;
-  remove bereq.http.x-ee-client-ip;
-  remove bereq.http.x-flash-version;
-  remove bereq.http.x-forwarded-port;
-  remove bereq.http.x-forwarded-proto;
-  remove bereq.http.x-imforwards;
-  remove bereq.http.x-mcproxyfilter;
-  remove bereq.http.x-mobile-gateway;
-  remove bereq.http.x-network-type;
-  remove bereq.http.x-nokia-bearer;
-  remove bereq.http.x-nokiabrowser-features;
-  remove bereq.http.x-nokia-device-type;
-  remove bereq.http.x-nokia-ipaddress;
-  remove bereq.http.x-nokia-musicshop-bearer;
-  remove bereq.http.x-nokia-musicshop-version;
-  remove bereq.http.x-nokia-upgradeid;
-  remove bereq.http.x-ob;
-  remove bereq.http.x-online-host;
-  remove bereq.http.x-opera-id;
-  remove bereq.http.x-opera-info;
-  remove bereq.http.x-operamini-features;
-  remove bereq.http.x-operamini-phone;
-  remove bereq.http.x-operamini-route;
-  remove bereq.http.x-operator-domain;
-  remove bereq.http.x-orange-rat;
-  remove bereq.http.x-orange-roaming;
-  remove bereq.http.x-p2p-peerdist;
-  remove bereq.http.x-p2p-peerdistex;
-  remove bereq.http.x-piper-id;
-  remove bereq.http.x-powered-by;
-  remove bereq.http.x-proxy-id;
-  remove bereq.http.x-proxyuser-ip;
-  remove bereq.http.x-purpose;
-  remove bereq.http.x-rbt-optimized-by;
-  remove bereq.http.x-requested-with;
-  remove bereq.http.x-ucbrowser-phone;
-  remove bereq.http.x-ucbrowser-phone-ua;
-  remove bereq.http.x-ucbrowser-ua;
-  remove bereq.http.x-up-calling-line-id;
-  remove bereq.http.x-up_devcap-screendepth;
-  remove bereq.http.x-view-mode;
-  remove bereq.http.x-wap-network-client-msisdn;
-  remove bereq.http.x-wap-profile;
-  remove bereq.http.x-wap-profile-diff;
+sub vcl_pipe {
+  unset bereq.http.accept-charset;
+  unset bereq.http.accept-encoding;
+  unset bereq.http.accept-language;
+  unset bereq.http.accept-ranges;
+  unset bereq.http.accounting-session-id;
+  unset bereq.http.apn;
+  unset bereq.http.authorization;
+  unset bereq.http.bearer-type;
+  unset bereq.http.cache-control;
+  unset bereq.http.charging-characteristics;
+  unset bereq.http.clientip;
+  unset bereq.http.client-ip;
+  unset bereq.http.connection;
+  unset bereq.http.content-disposition;
+  unset bereq.http.content-length;
+  unset bereq.http.content-range;
+  unset bereq.http.content-type;
+  unset bereq.http.cookie;
+  unset bereq.http.cookie2;
+  unset bereq.http.cuda_cliip;
+  unset bereq.http.date;
+  unset bereq.http.device-stock-ua;
+  unset bereq.http.dnt;
+  unset bereq.http.drm-version;
+  unset bereq.http.etag;
+  unset bereq.http.expires;
+  unset bereq.http.from;
+  unset bereq.http.if-modified-since;
+  unset bereq.http.if-none-match;
+  unset bereq.http.if-range;
+  unset bereq.http.ip-address;
+  unset bereq.http.last-modified;
+  unset bereq.http.location;
+  unset bereq.http.msisdn;
+  unset bereq.http.mt-proxy-id;
+  unset bereq.http.nas-ip-address;
+  unset bereq.http.origin;
+  unset bereq.http.pnp;
+  unset bereq.http.pragma;
+  unset bereq.http.proxy-connection;
+  unset bereq.http.range;
+  unset bereq.http.server;
+  unset bereq.http.set-cookie;
+  unset bereq.http.sgsn-ip-address;
+  unset bereq.http.transfer-encoding;
+  unset bereq.http.ua-cpu;
+  unset bereq.http.unless-modified-since;
+  unset bereq.http.vary;
+  unset bereq.http.via;
+  unset bereq.http.wap-connection;
+  unset bereq.http.x-amz-cf-id;
+  unset bereq.http.x-att-deviceid;
+  unset bereq.http.x-bluecoat-via;
+  unset bereq.http.x-cnection;
+  unset bereq.http.x-country-code;
+  unset bereq.http.x-d-forwarder;
+  unset bereq.http.x-ebo-ua;
+  unset bereq.http.x-ee-brand-id;
+  unset bereq.http.x-ee-client-ip;
+  unset bereq.http.x-flash-version;
+  unset bereq.http.x-forwarded-port;
+  unset bereq.http.x-forwarded-proto;
+  unset bereq.http.x-imforwards;
+  unset bereq.http.x-mcproxyfilter;
+  unset bereq.http.x-mobile-gateway;
+  unset bereq.http.x-network-type;
+  unset bereq.http.x-nokia-bearer;
+  unset bereq.http.x-nokiabrowser-features;
+  unset bereq.http.x-nokia-device-type;
+  unset bereq.http.x-nokia-ipaddress;
+  unset bereq.http.x-nokia-musicshop-bearer;
+  unset bereq.http.x-nokia-musicshop-version;
+  unset bereq.http.x-nokia-upgradeid;
+  unset bereq.http.x-ob;
+  unset bereq.http.x-online-host;
+  unset bereq.http.x-opera-id;
+  unset bereq.http.x-opera-info;
+  unset bereq.http.x-operamini-features;
+  unset bereq.http.x-operamini-phone;
+  unset bereq.http.x-operamini-route;
+  unset bereq.http.x-operator-domain;
+  unset bereq.http.x-orange-rat;
+  unset bereq.http.x-orange-roaming;
+  unset bereq.http.x-p2p-peerdist;
+  unset bereq.http.x-p2p-peerdistex;
+  unset bereq.http.x-piper-id;
+  unset bereq.http.x-powered-by;
+  unset bereq.http.x-proxy-id;
+  unset bereq.http.x-proxyuser-ip;
+  unset bereq.http.x-purpose;
+  unset bereq.http.x-rbt-optimized-by;
+  unset bereq.http.x-requested-with;
+  unset bereq.http.x-ucbrowser-phone;
+  unset bereq.http.x-ucbrowser-phone-ua;
+  unset bereq.http.x-ucbrowser-ua;
+  unset bereq.http.x-up-calling-line-id;
+  unset bereq.http.x-up_devcap-screendepth;
+  unset bereq.http.x-view-mode;
+  unset bereq.http.x-wap-network-client-msisdn;
+  unset bereq.http.x-wap-profile;
+  unset bereq.http.x-wap-profile-diff;
 }
 EOF
 }
@@ -343,56 +364,14 @@ EOF
 function create_varnish_conf_serve_stale_content() {
   local file=${varnish_conf_dir}/serve-stale-content.vcl
   cat > $file <<EOF
-backend unhealthy {
-  .host = "127.0.0.1";
-  .port = "1";
-  .probe = {
-    .url = "/fake.html";
-    .interval = 600s;
-    .timeout = 0.1s;
-    .window = 1;
-    .threshold = 1;
-    .initial = 1;
-  }
-}
-
-sub vcl_recv {
-  /* We accept up to this old data, if backends for some reason
-   * don't deliver (fresh) content, typically when they're down */
-  set req.grace = 2h;
-
-  if (req.http.unhealthy && req.http.unhealthy == "true" ) {
-    set req.backend = unhealthy;
-  }
-}
-
-sub vcl_fetch {
+sub vcl_backend_response {
   /* Store objects 1 hour after they are due to be purged for
    * grace-purposes (this means that we've got 1 hour to serve stale
    * content in case of failing backends).
-  */
+   */
   if (beresp.status == 200) {
     set beresp.grace = 1h;
   }
-  else if (beresp.status == 503) {
-    /* For this URL, don't ask the backend again for this amount of
-     * time. */
-    set beresp.saintmode = 60s;
-    return(restart);
-  }
-}
-
-sub vcl_error {
-  /* If we're serving a 503 and haven't restarted (this means the
-   * backend is down, 503 is the typical Varnish 'guru meditation',
-   * try to invoke grace mode. We do this by setting the backend to be
-   * the unhealthy, phony packend. This will never work, so Varnish
-   * will invoke grace mode, i.e. serve stale/old content from the
-   * previous status=200 for that URL.  */
-  if (obj.status == 503 && req.restarts == 0) {
-    set req.http.unhealthy = "true";
-    return(restart);
-  }
 }
 EOF
 }
@@ -400,7 +379,7 @@ EOF
 function create_varnish_conf_compression() {
   local file=${varnish_conf_dir}/compression.vcl
   cat > $file <<EOF
-sub vcl_fetch {
+sub vcl_backend_response {
   if (beresp.http.content-type ~ "^text/" || 
       beresp.http.content-type == "application/javascript") {
     set beresp.do_gzip = true;
@@ -415,16 +394,16 @@ function create_varnish_conf_robots_on_beta() {
 sub vcl_recv {
   if (req.http.host ~ "^beta\." && req.url == "/robots.txt") {
     set req.http.marker-robots = "true";
-    error 200 "OK";
+    return (synth(200, "OK"));
   }
 }
 
-sub vcl_error {
-  if (obj.status == 200 && req.http.marker-robots == "true") {
-    remove req.http.marker-robots;
-    synthetic {"User-Agent: *
+sub vcl_synth {
+  if (resp.status == 200 && req.http.marker-robots == "true") {
+    unset resp.http.marker-robots;
+    synthetic({"User-Agent: *
 Disallow /
-"};
+"});
     return(deliver);
   }
 }
@@ -435,7 +414,7 @@ function create_varnish_conf_cookie_cleaner() {
   local file=${varnish_conf_dir}/cookie-cleaner.vcl
   cat > $file <<EOF
 sub vcl_recv {
-  /* remove all cookies, except the poll cookie see
+  /* unset all cookies, except the poll cookie see
    * https://www.varnish-cache.org/trac/wiki/VCLExampleRemovingSomeCookies#RemovingallBUTsomecookies */
   if (req.http.Cookie) {
     set req.http.Cookie = ";" + req.http.Cookie;
@@ -445,14 +424,14 @@ sub vcl_recv {
     set req.http.Cookie = regsuball(req.http.Cookie, "^[; ]+|[; ]+$", "");
 
     if (req.http.Cookie == "") {
-      remove req.http.Cookie;
+      unset req.http.Cookie;
     }
   }
 }
 
-sub vcl_fetch {
+sub vcl_backend_response {
   if (beresp.status == 200) {
-    remove beresp.http.Set-Cookie;
+    unset beresp.http.Set-Cookie;
   }
 }
 EOF
@@ -461,7 +440,7 @@ EOF
 function create_varnish_conf_caching_policies() {
   local file=${varnish_conf_dir}/caching-policies.vcl
   cat > $file <<EOF
-sub vcl_fetch {
+sub vcl_backend_response {
   /*   Cache everything for 2 minutes. */
   if (beresp.status == 200) {
     set beresp.ttl = 2m;
@@ -469,8 +448,8 @@ sub vcl_fetch {
 
   /* Remove cookies from these resource types and cache them for a
    * long time */
-  if (req.url ~ "\.(png|gif|jpg|css|js)$" || beresp.http.content-type ~ "^image/" ||
-      req.url == "/favicon.ico" && beresp.status == 200) {
+  if (bereq.url ~ "\.(png|gif|jpg|css|js)$" || beresp.http.content-type ~ "^image/" ||
+      bereq.url == "/favicon.ico" && beresp.status == 200) {
     set beresp.ttl = 5h;
   }
 }
@@ -520,10 +499,12 @@ function get_from_domain() {
 
 function create_varnish_conf_redirects() {
   local file=${varnish_conf_dir}/redirects.vcl
-  echo "" > $file
+  echo "" > "${file}"
 
   if [ -n "${fai_publication_domain_mapping_list}" ]; then
-    echo "sub vcl_recv {" > $file
+    cat > "${file}" <<EOF
+sub vcl_recv {
+EOF
 
     for el in $fai_publication_domain_mapping_list; do
       local old_ifs=$IFS
@@ -531,22 +512,23 @@ function create_varnish_conf_redirects() {
       read publication publication_domain publication_aliases <<< "$el"
       IFS=$old_ifs
 
-      local from_domain=$(get_from_domain $publication_domain)
+      local from_domain=
+      from_domain=$(get_from_domain "${publication_domain}")
 
       cat >> $file <<EOF
   if (req.http.host == "${from_domain}") {
-    error 301 "Moved Temporarily";
+    return (synth(301, "Moved Permanently"));
   }
 EOF
     done
 
-    cat >> $file <<EOF
+    cat >> "${file}" <<EOF
 }
 
-sub vcl_error {
+sub vcl_synth {
   /* We want both web sites to be identified by one URL, hence we make
    * an HTTP re-direct here. See vcl_recv for how these 301 error
-   * directives.
+   * directives are initiated.
    */
 EOF
     for el in $fai_publication_domain_mapping_list; do
@@ -555,17 +537,19 @@ EOF
       read publication publication_domain publication_aliases <<< "$el"
       IFS=$old_ifs
 
-      local from_domain=$(get_from_domain $publication_domain)
+      local from_domain=
+      from_domain=$(get_from_domain "${publication_domain}")
 
-      cat >> $file <<EOF
-  if (obj.status == 301 && req.http.host == "${from_domain}") {
-    set obj.http.Location = "http://${publication_domain}" + req.url;
+      cat >> "${file}" <<EOF
+  if (resp.status == 301 &&
+      req.http.host == "${from_domain}") {
+    set resp.http.Location = req.proto + "://${publication_domain}" + req.url;
     return (deliver);
   }
 EOF
     done
 
-    echo "}" >> $file
+    echo "}" >> "${file}"
   fi
 }
 
@@ -582,8 +566,12 @@ sub vcl_deliver {
   else if (resp.status == 200) {
     set resp.http.X-Cache = "MISS";
   }
-  set resp.http.X-Cache-Backend = req.backend;
 }
+
+sub vcl_backend_response {
+  set beresp.http.X-Cache-Backend = beresp.backend.name;
+}
+
 EOF
 }
 

From 3266d007809d53ce42a63c9359636b6a896bdd2d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 24 Mar 2017 11:59:46 +0100
Subject: [PATCH 2525/2585] Possible to re-run ece-install endless times on
 RedHat

- new method: common-os::is_rpm_already_installed_by_name
---
 usr/share/escenic/ece-scripts/common-os.sh            | 5 +++++
 usr/share/escenic/ece-scripts/ece-install.d/redhat.sh | 8 ++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index 99a21e6b..b615b768 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -267,5 +267,10 @@ function is_rpm_already_installed() {
 
   local package_name=
   package_name=$(rpm -qp --queryformat "%{Name}\n" "${file}")
+  is_rpm_already_installed_by_name "${package_name}"
+}
+
+function is_rpm_already_installed_by_name() {
+  local package_name=$1
   rpm -q "${package_name}" &> /dev/null
 }
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/redhat.sh b/usr/share/escenic/ece-scripts/ece-install.d/redhat.sh
index abb5e386..d8efba99 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/redhat.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/redhat.sh
@@ -15,6 +15,10 @@ rh_add_epel_repo() {
   local major=7
   major=$(lsb_release -r |
             sed -n -r 's#Release:[^0-9]*([0-9]+)\..*#\1#p')
-  local url=https://dl.fedoraproject.org/pub/epel/epel-release-latest-${major}.noarch.rpm
-  run rpm -Uvh "${url}"
+  local package_name=epel-release
+  local url=https://dl.fedoraproject.org/pub/epel/${package_name}-latest-${major}.noarch.rpm
+
+  if ! is_rpm_already_installed_by_name "${package_name}"; then
+    run rpm -Uvh "${url}"
+  fi
 }

From 55acb494016eb34e37ec12868dc0c9f9dba5d2cf Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 24 Mar 2017 13:23:22 +0100
Subject: [PATCH 2526/2585] Move info message about EAE backend, it was in the
 wrong place

- printed print_and_log "Found anaysis engine host :
  $fai_analysis_host" regardless of EAE being found or not.
---
 usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
index 5032f659..02b88cd8 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
@@ -114,8 +114,8 @@ backend ${appserver_id}${i} {
 
 EOF
   done
-print_and_log "Found anaysis engine host : $fai_analysis_host"
   if [ -n "${fai_analysis_host}" ]; then
+    print_and_log "Found anaysis engine host : $fai_analysis_host"
     cat >> $file <<EOF
 backend analysis {
   .host = "${fai_analysis_host}";

From 105553e580d8ffe8bdb2cf01a8752965e4979078 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 24 Mar 2017 15:53:43 +0100
Subject: [PATCH 2527/2585] Hardened installation of the MariaDB JDBC driver

- now caches the JDBC driver in /var/cache/escenic/ece-install
  together with the other downloads. This means that consecutive runs
  of ece-install will use the old version if it already exists.

- it would often fail, especially when installing two profiles in one
  go. This *could* be because we were requesting the same JDBC driver
  several times from the same IP within a short time span.

- app-server::set_up_jdbc_library() is no longer dependent on PWD
---
 .../escenic/ece-scripts/ece-install.d/app-server.sh   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index e1636c0e..b9493605 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -3,11 +3,14 @@ function set_up_jdbc_library() {
   if [ -n "$jdbc_driver" -a -e "$jdbc_driver" ]; then
     make_ln $jdbc_driver
   elif [ $db_vendor = "mariadb" ]; then
-    print_and_log "Downloading MariaDB jdbc driver."
+    local mariadb_jdbc_url=https://downloads.mariadb.org/f/mariadb-java-client-1.1.0/mariadb-java-client-1.1.0.jar
+    print_and_log "Downloading MariaDB jdbc driver ${mariadb_jdbc_url}"
+    local mariadb_jdbc_jar=${mariadb_jdbc_url##*/}
     download_uri_target_to_dir \
-        https://downloads.mariadb.org/f/mariadb-java-client-1.1.0/mariadb-java-client-1.1.0.jar/from/http:/ftp.heanet.ie/mirrors/mariadb \
-        .
-    mv mariadb mariadb-java-client-1.1.0.jar
+      "${mariadb_jdbc_url}" \
+      "${download_dir}" \
+      "${mariadb_jdbc_jar}"
+    run cp "${download_dir}/${mariadb_jdbc_jar}" "${tomcat_base}/lib"
   else
     make_ln /usr/share/java/mysql-connector-java.jar      
   fi

From 0080309dd09c3b737ebdac5eac92a6f493b51238 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Mon, 27 Mar 2017 12:15:56 +0200
Subject: [PATCH 2528/2585] On RedHat based systems, install MariaDB from
 official sources

- MariaDB is the default MySQL flavour in RedHat from RHEL 7, see
  https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/7.0_Release_Notes/chap-Red_Hat_Enterprise_Linux-7.0_Release_Notes-Web_Servers_and_Services.html,
  so the DB gets a lot of attention and is guaranteed to be available.

- less code for us to maintain
---
 .../ece-scripts/ece-install.d/database.sh     | 60 ++++++-------------
 1 file changed, 19 insertions(+), 41 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/database.sh b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
index 45ae1777..b111b36c 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/database.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/database.sh
@@ -21,37 +21,10 @@ function get_mariadb_repo_url() {
   echo "http://ftp.heanet.ie/mirrors/mariadb/repo/5.5/${distributor}/dists/"
 }
 
-function set_up_mariadb_yum_repo() {
-  local maria_db_repo=/etc/yum.repos.d/mariadb.repo
-  if [ ! -e $maria_db_repo ]; then
-    print_and_log "Setting up the MariaDB repository ..."
-    local distributor=$(lsb_release -i -s | tr '[A-Z]' '[a-z]')
-    local release=$(lsb_release -r -s | sed -e 's/\([0-9]*\).*/\1/')
-    local arch=amd64
-    if [[ $(uname -m) != "x86_64" ]]; then
-      arch=x86
-    fi
-    if [ $distributor = "redhatenterpriseserver" ]; then
-      distributor=rhel
-    fi
-    local yum_url=http://yum.mariadb.org/5.5/${distributor}${release}-${arch}
-    cat > $maria_db_repo <<EOF
-# Created by $(basename $0) @ $(date)
-# http://downloads.mariadb.org/mariadb/repositories/
-[mariadb]
-name = MariaDB
-baseurl = ${yum_url}
-gpgkey=https://yum.mariadb.org/RPM-GPG-KEY-MariaDB
-gpgcheck=1
-EOF
-  fi
-}
-
-function set_up_redhat_repository_if_possible() {
+function set_up_redhat_mariadb_repository_if_necessary() {
   if [ $db_vendor = "mariadb" ]; then
-    set_up_mariadb_yum_repo
-    mysql_server_packages="MariaDB-server"
-    mysql_client_packages="MariaDB-client"
+    mysql_server_packages="mariadb-server"
+    mysql_client_packages="mariadb"
   else
     print_and_log "Setting up the Percona repository ..."
 
@@ -179,7 +152,7 @@ function set_up_repository_if_possible() {
       leave_trail "trail_db_vendor=mysql"
     fi
   elif [ $on_redhat_or_derivative -eq 1 ]; then
-    set_up_redhat_repository_if_possible
+    set_up_redhat_mariadb_repository_if_necessary
   fi
 }
 
@@ -190,12 +163,10 @@ function install_mysql_server_software() {
     install_packages_if_missing $mysql_server_packages
     force_packages=0
 
-    if [ $on_redhat_or_derivative -eq 1 ]; then
-      run chkconfig --level 35 mysql on
-      run /etc/init.d/mysql restart
+    if [ $on_debian_or_derivative -eq 1 ]; then
+      assert_commands_available mysqld
     fi
 
-    assert_commands_available mysqld
   else
     # when only running the SQL scripts, typically when using Amazon
     # RDS, we need the mysql-client.
@@ -220,11 +191,14 @@ function install_database_server() {
     force_packages=0
 
     if [ $on_redhat_or_derivative -eq 1 ]; then
-      run chkconfig --level 35 mysql on
-      run /etc/init.d/mysql restart
+      if [[ "${db_vendor}" == mariadb ]]; then
+        run systemctl enable mariadb
+        run systemctl start mariadb
+      fi
+    else
+      assert_commands_available mysqld
     fi
 
-    assert_commands_available mysqld
   else
     # when only running the SQL scripts, typically when using Amazon
     # RDS, we need the mysql-client.
@@ -578,9 +552,13 @@ function create_schema() {
     # we first create the DB or, if drop_db_first is 1, we've just
     # dropped it above before running the SQL scripts.
   if [ $db_product = "mysql" ]; then
-     if ! $(check_mysql_is_running) ; then
- 	run service mysql start	
-     fi
+    if ! $(check_mysql_is_running) ; then
+      if [[ "${db_vendor}" == mariadb ]]; then
+ 	run service mariadb start
+      else
+ 	run service mysql start
+      fi
+    fi
     print_and_log "Creating DB $db_schema on $HOSTNAME ..."
     mysql -h $db_host << EOF
 create database $db_schema character set utf8 collate utf8_general_ci;

From cbab14641f33d879dcbbbcc4e4d351d2b10f4a5d Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Tue, 28 Mar 2017 11:45:15 +0200
Subject: [PATCH 2529/2585] =?UTF-8?q?After=205=20years,=20it's=20about=20t?=
 =?UTF-8?q?ime=20ece-install=20promotes=20the=20stable=20package=20pool=20?=
 =?UTF-8?q?=F0=9F=98=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- this changes the default package pool from unstable to stable and is
  thus a fix related to this change from 2012:

     commit 85318406603a1c08575ecc228fc213b4dca21b7a
     Author: Torstein Krause Johansen <tkj@vizrt.com>
     Date:   Mon Jun 25 16:31:59 2012 +0200

         - changed the default package pool to unstable until we've got sane
           stable packages.

           As always, this can be overrriden with:

              fai_apt_vizrt_pool=stable
---
 usr/sbin/ece-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index ea354507..df734f5e 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -294,7 +294,7 @@ function install_common_os_packages()
     if [ ${fai_offline_mode-0} -eq 0 ]; then
       curl -s http://apt.escenic.com/archive.key 2>> $log | \
         apt-key add - 1>> $log 2>> $log
-      local package_pool=${fai_apt_vizrt_pool-unstable}
+      local package_pool=${fai_apt_vizrt_pool-stable}
       add_apt_source "deb http://apt.escenic.com ${package_pool} main"
       run apt-get update
     fi

From 4e99117c5da7843d257e9df87972b39c8950b78b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Tue, 28 Mar 2017 14:25:26 +0200
Subject: [PATCH 2530/2585] Re-installing the search profile now works (again)

- re-installing the search profile would fail if it already had a Solr
  instance and this instance was running. This has now been fixed.
---
 usr/share/escenic/ece-scripts/ece-install.d/search-server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
index a7063a56..38ba0797 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
@@ -163,7 +163,7 @@ function setup_solr_init_d_script() {
 }
 
 function start_solr() {
-  run /etc/init.d/solr start
+  run /etc/init.d/solr restart
 }
 
 function set_up_solr() {

From bcf147f14fcc5d005c03ef3c19886511edaf5556 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Tue, 28 Mar 2017 15:06:24 +0200
Subject: [PATCH 2531/2585] ece-install can now upgrade/downgrade DEBs (instead
 of APT)

- the user can specify in the ece-install.yaml conf file that he/she
  wants to use DEBs directly instead of APT for installing Escenic
  software. To do this, add this block to the YAML (the base_url is
  optional, if omitted, the official stable repo is used):

    environment:
      deb:
        escenic:
          use_deb_not_apt: yes
          base_url: http://unstable.apt.escenic.com

- as with RPM based installation, version then becomes a required field:

  packages:
    - name: escenic-content-engine-6.1
      version: 6.1.0-3

- as with RPM based installation, arch then becomes an optional
  field (currently, all our packages are arch: all since they're multi
  platform):

    packages:
      - name: escenic-content-engine-6.1
        version: 6.1.0-3
        arch: all

- the default is to use APT based installation

- added unit tests to document new configuration options.

- re-factored package-based-install.sh to make it easier to read code
  dealing with RPM, DEB and APT based installations.
---
 .../ece-install-conf-file-reader-test.sh      |  55 +++++++
 .../ece-install.d/conf-file-reader.sh         |  18 +++
 .../ece-install.d/package-based-install.sh    | 144 +++++++++++-------
 3 files changed, 166 insertions(+), 51 deletions(-)

diff --git a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
index 22e6c18f..791c08bc 100644
--- a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
+++ b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
@@ -13,6 +13,8 @@ test_can_parse_yaml_conf_environment() {
   local mvn_repo2=repo2.example.com
   local conf_url=http://build.example.com/machine-conf-1.2.3.deb
   local rpm_base_url=http://unstable.yum.escenic.com/rpm
+  local deb_base_url=http://unstable.apt.escenic.com
+  local deb_not_apt=1
 
   cat > "${yaml_file}" <<EOF
 ---
@@ -25,6 +27,10 @@ environment:
   apt:
     escenic:
       pool: ${apt_pool}
+  deb:
+    escenic:
+      use_deb_not_apt: true
+      base_url: ${deb_base_url}
   rpm:
     escenic:
       base_url: ${rpm_base_url}
@@ -41,6 +47,8 @@ EOF
   unset fai_maven_repositories
   unset fai_conf_url
   unset fai_package_rpm_base_url
+  unset fai_package_deb_not_apt
+
   parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
 
   assertNotNull "Should set java_home" "${java_home}"
@@ -64,6 +72,12 @@ EOF
   assertEquals "Should set fai_package_rpm_base_url" \
                "${rpm_base_url}" \
                "${fai_package_rpm_base_url}"
+  assertEquals "Should set fai_package_deb_base_url" \
+               "${deb_base_url}" \
+               "${fai_package_deb_base_url}"
+  assertEquals "Should set fai_package_deb_not_apt" \
+               "${deb_not_apt}" \
+               "${fai_package_deb_not_apt}"
 
   rm -rf "${yaml_file}"
 }
@@ -334,6 +348,8 @@ test_can_parse_yaml_conf_credentials() {
   local builder_download_password=boo
   local unstable_yum_user=once
   local unstable_yum_password=coming
+  local unstable_apt_user=two
+  local unstable_apt_password=twice
 
   cat > "${yaml_file}" <<EOF
 ---
@@ -347,12 +363,17 @@ credentials:
   - site: unstable.yum.escenic.com
     user: ${unstable_yum_user}
     password: ${unstable_yum_password}
+  - site: unstable.apt.escenic.com
+    user: ${unstable_apt_user}
+    password: ${unstable_apt_password}
 EOF
 
   unset technet_user
   unset technet_password
   unset fai_package_rpm_user
   unset fai_package_rpm_password
+  unset fai_package_apt_user
+  unset fai_package_apt_password
   unset fai_builder_http_user
   unset fai_builder_http_password
   unset fai_conf_builder_http_user
@@ -383,6 +404,12 @@ EOF
   assertEquals "Should set fai_package_rpm_password" \
                "${unstable_yum_password}" \
                "${fai_package_rpm_password}"
+  assertEquals "Should set fai_package_apt_user" \
+               "${unstable_apt_user}" \
+               "${fai_package_apt_user}"
+  assertEquals "Should set fai_package_apt_password" \
+               "${unstable_apt_password}" \
+               "${fai_package_apt_password}"
 
   rm -rf "${yaml_file}"
 }
@@ -415,6 +442,34 @@ EOF
   rm -rf "${yaml_file}"
 }
 
+test_can_parse_yaml_conf_credentials_stable_apt() {
+  local yaml_file=
+  yaml_file=$(mktemp)
+  local stable_apt_user=always
+  local stable_apt_password=there
+
+  cat > "${yaml_file}" <<EOF
+---
+credentials:
+  - site: apt.escenic.com
+    user: ${stable_apt_user}
+    password: ${stable_apt_password}
+EOF
+
+  unset fai_package_apt_user
+  unset fai_package_apt_password
+
+  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
+  assertEquals "Should set fai_package_apt_user" \
+               "${stable_apt_user}" \
+               "${fai_package_apt_user}"
+  assertEquals "Should set fai_package_apt_password" \
+               "${stable_apt_password}" \
+               "${fai_package_apt_password}"
+
+  rm -rf "${yaml_file}"
+}
+
 test_can_parse_yaml_conf_create_publication() {
   local yaml_file=
   yaml_file=$(mktemp)
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
index de67b14d..7ac921f8 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
@@ -80,6 +80,11 @@ _parse_yaml_conf_file_credentials() {
       export fai_package_rpm_user=${user}
       export fai_package_rpm_password=${password}
     fi
+    if [[ "${site}" == apt.escenic.com ||
+            "${site}" == unstable.apt.escenic.com ]]; then
+      export fai_package_apt_user=${user}
+      export fai_package_apt_password=${password}
+    fi
   done
 }
 
@@ -284,12 +289,25 @@ _parse_yaml_conf_file_environment() {
     export fai_apt_vizrt_pool=${configured_apt_pool}
   fi
 
+  local configured_deb_not_apt=
+  configured_deb_not_apt=$(_jq "${yaml_file}" .environment.deb.escenic.use_deb_not_apt)
+  if [[ "${configured_deb_not_apt}" == "yes" ||
+          "${configured_deb_not_apt}" == "true" ]]; then
+    export fai_package_deb_not_apt=1
+  fi
+
   local configured_rpm_base_url=
   configured_rpm_base_url=$(_jq "${yaml_file}" .environment.rpm.escenic.base_url)
   if [[ -n "${configured_rpm_base_url}" ]]; then
     export fai_package_rpm_base_url=${configured_rpm_base_url}
   fi
 
+  local configured_deb_base_url=
+  configured_deb_base_url=$(_jq "${yaml_file}" .environment.deb.escenic.base_url)
+  if [[ -n "${configured_deb_base_url}" ]]; then
+    export fai_package_deb_base_url=${configured_deb_base_url}
+  fi
+
   local skip_password_checks=
   skip_password_checks=$(
     _jq "${yaml_file}" .environment.skip_password_checks)
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/package-based-install.sh b/usr/share/escenic/ece-scripts/ece-install.d/package-based-install.sh
index 56409a08..0ad32bfe 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/package-based-install.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/package-based-install.sh
@@ -26,57 +26,99 @@ _install_prerequisites_for_updater_package() {
 install_configured_escenic_packages() {
 
   if [ "${on_debian_or_derivative}" -eq 1 ]; then
-    local escenic_deb_packages=
-    local package=
-    for package in "${!fai_package_map[@]}"; do
-
-      if [[ "${package}" =~ "escenic-content-engine-updater-"* ]]; then
-        _install_prerequisites_for_updater_package
-      fi
-
-      local version=${fai_package_map[${package}]}
-      if [ -n "${version}" ]; then
-        escenic_deb_packages="${package}=${version} ${escenic_deb_packages}"
-      else
-        escenic_deb_packages="${package} ${escenic_deb_packages}"
-      fi
-    done
-
-    run apt-get install ${apt_opts} \
-        --assume-yes \
-        --force-yes \
-        ${escenic_deb_packages-escenic-content-engine}
-
+    if [ "${fai_package_deb_not_apt-0}" -eq 0 ]; then
+      print_and_log "Will use APT for installing Escenic packages"
+      _install_configured_escenic_packages_apt
+    else
+      print_and_log "Will use DEBs directly (not APT) for installing Escenic packages"
+      _install_configured_escenic_packages_deb
+    fi
   elif [ "${on_redhat_or_derivative}" -eq 1 ]; then
-    local package=
-    for package in "${!fai_package_map[@]}"; do
-      local version=${fai_package_map[${package}]}
-
-      if [ -z "${version}" ]; then
-        print_and_log "You must specify version of RPM package ${package}"
-        remove_pid_and_exit_in_error
-      fi
-
-      local arch=x86_64
-      if [ -n "${fai_package_arch_map[${package}]}" ]; then
-        arch=${fai_package_arch_map[${package}]}
-      fi
-
-      local rpm_url=${fai_package_rpm_base_url-http://yum.escenic.com/rpm}/${package}-${version}.${arch}.rpm
-
-      local rpm_file="${download_dir}/${rpm_url##*/}"
-      run wget \
-          --http-user "${fai_package_rpm_user}" \
-          --http-password "${fai_package_rpm_password}" \
-          --continue \
-          --quiet \
-          --output-document "${rpm_file}" \
-          "${rpm_url}"
-
-      if ! is_rpm_already_installed "${rpm_file}"; then
-        run rpm -Uvh "${rpm_file}"
-      fi
-    done
-
+    print_and_log "Will use RPM for installing Escenic packages"
+    _install_configured_escenic_packages_rpm
   fi
 }
+
+_install_configured_escenic_packages_apt() {
+  local escenic_deb_packages=
+  local package=
+  for package in "${!fai_package_map[@]}"; do
+
+    if [[ "${package}" =~ "escenic-content-engine-updater-"* ]]; then
+      _install_prerequisites_for_updater_package
+    fi
+
+    local version=${fai_package_map[${package}]}
+    if [ -n "${version}" ]; then
+      escenic_deb_packages="${package}=${version} ${escenic_deb_packages}"
+    else
+      escenic_deb_packages="${package} ${escenic_deb_packages}"
+    fi
+  done
+
+  run apt-get install ${apt_opts} \
+      --assume-yes \
+      --force-yes \
+      ${escenic_deb_packages-escenic-content-engine}
+}
+
+_install_configured_escenic_packages_deb() {
+  local package=
+  for package in "${!fai_package_map[@]}"; do
+    local version=${fai_package_map[${package}]}
+
+    if [ -z "${version}" ]; then
+      print_and_log "Must specify version of DEB ${package} when using DEBs instead of APT"
+      remove_pid_and_exit_in_error
+    fi
+
+    local arch=all
+    if [ -n "${fai_package_arch_map[${package}]}" ]; then
+      arch=${fai_package_arch_map[${package}]}
+    fi
+
+    local deb_url=${fai_package_deb_base_url-http://apt.escenic.com}/pool/non-free/${package:0:1}/${package}/${package}_${version}_${arch}.deb
+    local deb_file="${download_dir}/${deb_url##*/}"
+    run wget \
+        --http-user "${fai_package_apt_user}" \
+        --http-password "${fai_package_apt_password}" \
+        --continue \
+        --quiet \
+        --output-document "${deb_file}" \
+        "${deb_url}"
+
+    run dpkg -i "${deb_file}"
+  done
+}
+
+_install_configured_escenic_packages_rpm() {
+  local package=
+  for package in "${!fai_package_map[@]}"; do
+    local version=${fai_package_map[${package}]}
+
+    if [ -z "${version}" ]; then
+      print_and_log "You must specify version of RPM package ${package}"
+      remove_pid_and_exit_in_error
+    fi
+
+    local arch=x86_64
+    if [ -n "${fai_package_arch_map[${package}]}" ]; then
+      arch=${fai_package_arch_map[${package}]}
+    fi
+
+    local rpm_url=${fai_package_rpm_base_url-http://yum.escenic.com/rpm}/${package}-${version}.${arch}.rpm
+
+    local rpm_file="${download_dir}/${rpm_url##*/}"
+    run wget \
+        --http-user "${fai_package_rpm_user}" \
+        --http-password "${fai_package_rpm_password}" \
+        --continue \
+        --quiet \
+        --output-document "${rpm_file}" \
+        "${rpm_url}"
+
+    if ! is_rpm_already_installed "${rpm_file}"; then
+      run rpm -Uvh "${rpm_file}"
+    fi
+  done
+}

From 80dc0b6e3b16124e5d9de87e53730fc2bb843d15 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 31 Mar 2017 15:22:49 +0200
Subject: [PATCH 2532/2585] Quote wget auth parameter values

---
 .../escenic/ece-scripts/ece-install.d/create-publication.sh   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
index b54b626f..13dbd0b9 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
@@ -35,8 +35,8 @@ function _create_publication_if_passed_extract_ear_to_dir() {
     if [[ -n "${fai_builder_http_user}" && \
             -n "${fai_builder_http_password}" ]]; then
       wget_auth="
-          --http-user $fai_builder_http_user
-          --http-password $fai_builder_http_password
+          --http-user \"${fai_builder_http_user}\"
+          --http-password \"${fai_builder_http_password}\"
         "
     fi
     download_uri_target_to_dir $fai_publication_ear $download_dir

From 9f0efe232b371d8bd900d9c9b27a20d651cace55 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Mon, 3 Apr 2017 11:49:38 +0200
Subject: [PATCH 2533/2585] common-os::add_apt_source only add source if URL
 doesn't exist

- before, the method checked all the arguments to the method, but this
  would make it possible to get multiple entries for the same
  repository, just with different APT suites or components, e.g.:

  deb http://example.com stable main non-free
  deb http://example.com stable non-free

- this would make apt-get update return non-zero.

- this has now been fixed, if the URL already exists in
  /etc/apt/sources.list[.d]*, more entries will not be added.
---
 usr/share/escenic/ece-scripts/common-os.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index b615b768..fce93f90 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -217,7 +217,7 @@ function add_apt_source() {
     return
   fi
 
-  if [ $(grep -r "$@" /etc/apt/sources.list* | wc -l) -lt 1 ]; then
+  if [ "$(grep -r "${url}" /etc/apt/sources.list* | wc -l)" -lt 1 ]; then
     echo "# added by $(basename $0) @ $(date)" >> $escenic_sources
     echo "$@" >> $escenic_sources
   fi

From 0cb5cd33963c02d6a337c0a8785ed125d67b17fd Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Mon, 3 Apr 2017 16:12:09 +0200
Subject: [PATCH 2534/2585] Allow manually installed escenic-common-scripts

---
 usr/sbin/ece-install | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index df734f5e..debab36a 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -298,7 +298,11 @@ function install_common_os_packages()
       add_apt_source "deb http://apt.escenic.com ${package_pool} main"
       run apt-get update
     fi
-    install_packages_if_missing escenic-common-scripts
+
+    # Allow manually installed escenic-common-scripts
+    if [ ! -e /usr/share/escenic/ece-scripts/common-bashing.sh ]; then
+      install_packages_if_missing escenic-common-scripts
+    fi
   fi
 }
 

From 16ab28016a73c59a018ab67e4d3014f4481861ef Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Wed, 19 Apr 2017 16:50:53 +0200
Subject: [PATCH 2535/2585] ece create-publication now support password
 protected /escenic-admin webapps

---
 usr/share/escenic/ece-scripts/ece.d/create-publication.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/create-publication.sh b/usr/share/escenic/ece-scripts/ece.d/create-publication.sh
index cd8c2240..bdf87b69 100644
--- a/usr/share/escenic/ece-scripts/ece.d/create-publication.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/create-publication.sh
@@ -168,7 +168,10 @@ _create_publication_create_publication_in_db() {
   local ece_admin_uri=http://localhost:${appserver_port}/escenic-admin
   local cookie=
   cookie=$(
-    curl --head "${ece_admin_uri}"/ --silent |
+    curl \
+      "${curl_appserver_auth}" \
+      --head "${ece_admin_uri}"/ \
+      --silent |
       grep -i "^Set-Cookie" |
       sed s/.*'JSESSIONID=\([^;]*\).*'/'\1'/)
 
@@ -178,12 +181,14 @@ _create_publication_create_publication_in_db() {
   fi
 
   run curl \
+      "${curl_appserver_auth}" \
       -F "type=webapp" \
       -F "resourceFile=@${publication_war}" \
       --cookie JSESSIONID="${cookie}" \
       "${ece_admin_uri}/do/publication/resource"
 
   run curl  \
+      "${curl_appserver_auth}" \
       -F "name=${publication_name}" \
       -F "publisherName=Escenic" \
       -F "publicationType=${publication_type}" \

From 9d03e192157f62cd896b6ae8f387045a939fabc2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Thu, 27 Apr 2017 15:25:50 +0200
Subject: [PATCH 2536/2585] Long needed update to the documentation + generated
 ref doc

- Updated supported distro list + removed interactive mode doc

- Generated YAML (and conf) reference + updated (parts of) doc to use YAML

- Added a header to explain to the reader why the doc looks so spartan

- Removed duplicate db test + re-arranged tests since we generate doc
  from the tests, the most important ones should come at the
  top/logical order.

- Removed doc on un-install everything in this day and age of
  automatic provisioning/installation, a restore or clean slate
  re-install is just a click away

- Removed a reference to the RMI hub, we don't use that anymore
---
 ...ce-install-conf-file-reader-extract-doc.sh |  44 +-
 .../ece-install-conf-file-reader-test.sh      | 343 +++----
 .../escenic/ece-install-conf-reference.org    | 493 ++++++++++
 usr/share/doc/escenic/ece-install-guide.org   | 894 +++++-------------
 4 files changed, 931 insertions(+), 843 deletions(-)
 mode change 100644 => 100755 usr/local/src/unit-tests/ece-install-conf-file-reader-extract-doc.sh
 create mode 100644 usr/share/doc/escenic/ece-install-conf-reference.org

diff --git a/usr/local/src/unit-tests/ece-install-conf-file-reader-extract-doc.sh b/usr/local/src/unit-tests/ece-install-conf-file-reader-extract-doc.sh
old mode 100644
new mode 100755
index 02e7246b..3e0242a7
--- a/usr/local/src/unit-tests/ece-install-conf-file-reader-extract-doc.sh
+++ b/usr/local/src/unit-tests/ece-install-conf-file-reader-extract-doc.sh
@@ -6,7 +6,7 @@ set -o nounset
 set -o pipefail
 shopt -s nullglob
 
-print_doc_header() {
+print_doc_header_md() {
   cat << 'EOF'
 # Configuration Reference for ece-install
 
@@ -21,15 +21,26 @@ Both versions are listed below, grouped by topic.
 EOF
 }
 
-print_doc_footer() {
+print_doc_header_org() {
+  cat <<EOF
+Overview of =ece-install='s configuration options. Generated from the
+configuration file parser's unit tests @ $(LC_ALL=C date).
+EOF
+}
+
+print_doc_footer_md() {
   cat <<EOF
 ---
 Reference guide generated: $(LC_ALL=C date)
 EOF
 }
 
-main() {
-  print_doc_header
+print_doc_footer_org() {
+  :
+}
+
+create_doc_md() {
+  print_doc_header_md
 
   cat ece-install-conf-file-reader-test.sh |
     sed -n '/test_can_parse_yaml_conf_.*() {/,/parse_yaml_conf_file_or_source_if_sh_conf/{
@@ -45,9 +56,30 @@ main() {
   p
 }'
 
-  print_doc_footer
+  print_doc_footer_md
+}
+
+create_doc_org() {
+  print_doc_header_org
+
+  cat ece-install-conf-file-reader-test.sh |
+    sed -n '/test_can_parse_yaml_conf_.*() {/,/parse_yaml_conf_file_or_source_if_sh_conf/{
+  /[ ]*local /d
+  /yaml_file=$(mktemp)/d
+  /cat > "${yaml_file}" <<EOF/d
+
+  s#test_can_parse_yaml_conf_\(.*\)() {#\n*** \1#
+  s#---#\#+begin_src yaml#
+  s#EOF#\#+end_src\n=ece-install.conf= equivalent:\n\#+begin_src: text#
+  s#  unset \(.*\)#\1=#
+  s#[ ]*parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"#\#+end_src#
+  p
+}'
+
+  print_doc_footer_org
 }
 
 
 
-main "$@"
+# create_doc_md "$@"
+create_doc_org "$@"
diff --git a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
index 791c08bc..c3e9049c 100644
--- a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
+++ b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
@@ -192,6 +192,64 @@ EOF
   rm -rf "${yaml_file}"
 }
 
+test_can_parse_yaml_conf_search() {
+  local search_port=8000
+  local search_shutdown=5000
+  local search_redirect=4333
+  local search_name=search1
+  local search_host=searchhost
+  local search_legacy=1
+  local search_for_editor=1
+  local search_legacy=1
+  local search_ear=http://builder/engine.ear
+  local search_indexer_ws_uri=http://engine/indexer-webservice/index/
+
+  local yaml_file=
+  yaml_file=$(mktemp)
+  cat > "${yaml_file}" <<EOF
+---
+profiles:
+  search:
+    install: yes
+    legacy: yes
+    ear: ${search_ear}
+    for_editor: true
+    indexer_ws_uri: ${search_indexer_ws_uri}
+    port: ${search_port}
+    host: ${search_host}
+    name: ${search_name}
+    redirect: ${search_redirect}
+    shutdown: ${search_shutdown}
+EOF
+
+  unset fai_search_install
+  unset fai_search_host
+  unset fai_search_port
+  unset fai_search_shutdown
+  unset fai_search_redirect
+  unset fai_search_name
+  unset fai_search_legacy
+  unset fai_search_for_editor
+  unset fai_search_ear
+  unset fai_search_indexer_ws_uri
+
+  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
+  assertNotNull "Should set fai_search_install" "${fai_search_install}"
+  assertEquals "Should set fai_search_install" 1 "${fai_search_install}"
+
+  assertEquals "Should set fai_search_host" "${search_host}" "${fai_search_host}"
+  assertEquals "Should set fai_search_port" "${search_port}" "${fai_search_port}"
+  assertEquals "Should set fai_search_shutdown" "${search_shutdown}" "${fai_search_shutdown}"
+  assertEquals "Should set fai_search_redirect" "${search_redirect}" "${fai_search_redirect}"
+  assertEquals "Should set fai_search_name" "${search_name}" "${fai_search_name}"
+  assertEquals "Should set fai_search_legacy" "${search_legacy}" "${fai_search_legacy}"
+  assertEquals "Should set fai_search_for_editor" "${search_for_editor}" "${fai_search_for_editor}"
+  assertEquals "Should set fai_search_ear" "${search_ear}" "${fai_search_ear}"
+  assertEquals "Should set fai_search_indexer_ws_uri" "${search_indexer_ws_uri}" "${fai_search_indexer_ws_uri}"
+
+  rm -rf "${yaml_file}"
+}
+
 test_can_parse_yaml_conf_db() {
   local yaml_file=
   yaml_file=$(mktemp)
@@ -303,24 +361,6 @@ EOF
   rm -rf "${yaml_file}"
 }
 
-test_can_parse_yaml_conf_monitoring() {
-  local yaml_file=
-  yaml_file=$(mktemp)
-  local monitoring_install=1
-  cat > "${yaml_file}" <<EOF
----
-profiles:
-  monitoring:
-    install: yes
-EOF
-
-  unset fai_monitoring_install
-  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
-  assertEquals "Wrong fai_monitoring_install" \
-               "${monitoring_install}" \
-               "${fai_monitoring_install}"
-}
-
 test_can_parse_yaml_conf_assembly_tool() {
   local yaml_file=
   yaml_file=$(mktemp)
@@ -719,7 +759,81 @@ EOF
   rm -rf "${yaml_file}"
 }
 
-test_can_parse_yaml_conf_use_escenic_packages() {
+test_can_parse_yaml_conf_analysis() {
+  local yaml_file=
+  yaml_file=$(mktemp)
+
+  local analysis_port=9000
+  local analysis_name=stats1
+  local analysis_shutdown=5553
+  local analysis_redirect=4553
+  local analysis_host=stats1
+
+  cat > "${yaml_file}" <<EOF
+---
+profiles:
+  analysis:
+    install: yes
+    name: ${analysis_name}
+    port: ${analysis_port}
+    host: ${analysis_host}
+    shutdown: ${analysis_shutdown}
+    redirect: ${analysis_redirect}
+EOF
+
+  unset fai_analysis_install
+  unset fai_analysis_name
+  unset fai_analysis_port
+  unset fai_analysis_host
+  unset fai_analysis_shutdown
+  unset fai_analysis_redirect
+  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
+
+  assertNotNull "Should set fai_analysis_install" "${fai_analysis_install}"
+  assertEquals "Should set fai_analysis_install" 1 "${fai_analysis_install}"
+  assertEquals "Should set fai_analysis_name" "${analysis_name}" "${fai_analysis_name}"
+  assertEquals "Should set fai_analysis_port" "${analysis_port}" "${fai_analysis_port}"
+  assertEquals "Should set fai_analysis_host" "${analysis_host}" "${fai_analysis_host}"
+  assertEquals "Should set fai_analysis_shutdown" "${analysis_shutdown}" "${fai_analysis_shutdown}"
+  assertEquals "Should set fai_analysis_redirect" "${analysis_redirect}" "${fai_analysis_redirect}"
+
+  rm -rf "${yaml_file}"
+}
+
+test_can_parse_yaml_conf_analysis_db() {
+  local yaml_file=
+  yaml_file=$(mktemp)
+
+  local analysis_db_user=foouser
+  local analysis_db_password=foopass
+  local analysis_db_schema=fooanalysis_db
+
+  cat > "${yaml_file}" <<EOF
+---
+profiles:
+  analysis_db:
+    install: yes
+    user: ${analysis_db_user}
+    password: ${analysis_db_password}
+    schema: ${analysis_db_schema}
+EOF
+
+  unset fai_analysis_db_install
+  unset fai_analysis_db_user
+  unset fai_analysis_db_password
+  unset fai_analysis_db_schema
+  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
+
+  assertNotNull "Should set fai_analysis_install" "${fai_analysis_install}"
+  assertEquals "Should set fai_analysis_install" 1 "${fai_analysis_install}"
+  assertEquals "Should set fai_analysis_db_user" "${analysis_db_user}" "${fai_analysis_db_user}"
+  assertEquals "Should set fai_analysis_db_password" "${analysis_db_password}" "${fai_analysis_db_password}"
+  assertEquals "Should set fai_analysis_db_schema" "${analysis_db_schema}" "${fai_analysis_db_schema}"
+
+  rm -rf "${yaml_file}"
+}
+
+_test_can_parse_yaml_conf_use_escenic_packages() {
   local yaml_file=
   yaml_file=$(mktemp)
   local foo_java_home=/usr/lib/jvm/foo-java-sdk
@@ -828,138 +942,6 @@ EOF
   rm -rf "${yaml_file}"
 }
 
-test_can_parse_yaml_conf_analysis() {
-  local yaml_file=
-  yaml_file=$(mktemp)
-
-  local analysis_port=9000
-  local analysis_name=stats1
-  local analysis_shutdown=5553
-  local analysis_redirect=4553
-  local analysis_host=stats1
-
-  cat > "${yaml_file}" <<EOF
----
-profiles:
-  analysis:
-    install: yes
-    name: ${analysis_name}
-    port: ${analysis_port}
-    host: ${analysis_host}
-    shutdown: ${analysis_shutdown}
-    redirect: ${analysis_redirect}
-EOF
-
-  unset fai_analysis_install
-  unset fai_analysis_name
-  unset fai_analysis_port
-  unset fai_analysis_host
-  unset fai_analysis_shutdown
-  unset fai_analysis_redirect
-  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
-
-  assertNotNull "Should set fai_analysis_install" "${fai_analysis_install}"
-  assertEquals "Should set fai_analysis_install" 1 "${fai_analysis_install}"
-  assertEquals "Should set fai_analysis_name" "${analysis_name}" "${fai_analysis_name}"
-  assertEquals "Should set fai_analysis_port" "${analysis_port}" "${fai_analysis_port}"
-  assertEquals "Should set fai_analysis_host" "${analysis_host}" "${fai_analysis_host}"
-  assertEquals "Should set fai_analysis_shutdown" "${analysis_shutdown}" "${fai_analysis_shutdown}"
-  assertEquals "Should set fai_analysis_redirect" "${analysis_redirect}" "${fai_analysis_redirect}"
-
-  rm -rf "${yaml_file}"
-}
-
-test_can_parse_yaml_conf_analysis_db() {
-  local yaml_file=
-  yaml_file=$(mktemp)
-
-  local analysis_db_user=foouser
-  local analysis_db_password=foopass
-  local analysis_db_schema=fooanalysis_db
-
-  cat > "${yaml_file}" <<EOF
----
-profiles:
-  analysis_db:
-    install: yes
-    user: ${analysis_db_user}
-    password: ${analysis_db_password}
-    schema: ${analysis_db_schema}
-EOF
-
-  unset fai_analysis_db_install
-  unset fai_analysis_db_user
-  unset fai_analysis_db_password
-  unset fai_analysis_db_schema
-  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
-
-  assertNotNull "Should set fai_analysis_install" "${fai_analysis_install}"
-  assertEquals "Should set fai_analysis_install" 1 "${fai_analysis_install}"
-  assertEquals "Should set fai_analysis_db_user" "${analysis_db_user}" "${fai_analysis_db_user}"
-  assertEquals "Should set fai_analysis_db_password" "${analysis_db_password}" "${fai_analysis_db_password}"
-  assertEquals "Should set fai_analysis_db_schema" "${analysis_db_schema}" "${fai_analysis_db_schema}"
-
-  rm -rf "${yaml_file}"
-}
-
-test_can_parse_yaml_conf_search() {
-  local search_port=8000
-  local search_shutdown=5000
-  local search_redirect=4333
-  local search_name=search1
-  local search_host=searchhost
-  local search_legacy=1
-  local search_for_editor=1
-  local search_legacy=1
-  local search_ear=http://builder/engine.ear
-  local search_indexer_ws_uri=http://engine/indexer-webservice/index/
-
-  local yaml_file=
-  yaml_file=$(mktemp)
-  cat > "${yaml_file}" <<EOF
----
-profiles:
-  search:
-    install: yes
-    legacy: yes
-    ear: ${search_ear}
-    for_editor: true
-    indexer_ws_uri: ${search_indexer_ws_uri}
-    port: ${search_port}
-    host: ${search_host}
-    name: ${search_name}
-    redirect: ${search_redirect}
-    shutdown: ${search_shutdown}
-EOF
-
-  unset fai_search_install
-  unset fai_search_host
-  unset fai_search_port
-  unset fai_search_shutdown
-  unset fai_search_redirect
-  unset fai_search_name
-  unset fai_search_legacy
-  unset fai_search_for_editor
-  unset fai_search_ear
-  unset fai_search_indexer_ws_uri
-
-  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
-  assertNotNull "Should set fai_search_install" "${fai_search_install}"
-  assertEquals "Should set fai_search_install" 1 "${fai_search_install}"
-
-  assertEquals "Should set fai_search_host" "${search_host}" "${fai_search_host}"
-  assertEquals "Should set fai_search_port" "${search_port}" "${fai_search_port}"
-  assertEquals "Should set fai_search_shutdown" "${search_shutdown}" "${fai_search_shutdown}"
-  assertEquals "Should set fai_search_redirect" "${search_redirect}" "${fai_search_redirect}"
-  assertEquals "Should set fai_search_name" "${search_name}" "${fai_search_name}"
-  assertEquals "Should set fai_search_legacy" "${search_legacy}" "${fai_search_legacy}"
-  assertEquals "Should set fai_search_for_editor" "${search_for_editor}" "${fai_search_for_editor}"
-  assertEquals "Should set fai_search_ear" "${search_ear}" "${fai_search_ear}"
-  assertEquals "Should set fai_search_indexer_ws_uri" "${search_indexer_ws_uri}" "${fai_search_indexer_ws_uri}"
-
-  rm -rf "${yaml_file}"
-}
-
 test_can_parse_yaml_conf_editor_install_multi_profiles() {
   local yaml_file=
   yaml_file=$(mktemp)
@@ -987,47 +969,6 @@ EOF
   rm -rf "${yaml_file}"
 }
 
-test_can_parse_yaml_conf_db() {
-  local yaml_file=
-  yaml_file=$(mktemp)
-  cat > "${yaml_file}" <<EOF
----
-profiles:
-  db:
-    install: yes
-EOF
-
-  unset fai_db_install
-  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
-  assertNotNull "Should set fai_db_install" "${fai_db_install}"
-  assertEquals "Should set fai_db_install" 1 "${fai_db_install}"
-
-  # now, try to set it to true
-  cat > "${yaml_file}" <<EOF
----
-profiles:
-  db:
-    install: true
-EOF
-  unset fai_db_install
-  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
-  assertNotNull "Should set fai_db_install" "${fai_db_install}"
-  assertEquals "Should set fai_db_install" 1 "${fai_db_install}"
-
-  # now, try to set it to false
-  cat > "${yaml_file}" <<EOF
----
-profiles:
-  db:
-    install: false
-EOF
-  unset fai_db_install
-  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
-  assertNull "Should not have set fai_db_install" "${fai_db_install}"
-
-  rm -rf "${yaml_file}"
-}
-
 test_can_parse_yaml_conf_cache() {
   local cache_port=80
   local cache_conf_dir=/opt/etc/varnish
@@ -1105,6 +1046,24 @@ EOF
   rm -rf "${yaml_file}"
 }
 
+test_can_parse_yaml_conf_monitoring() {
+  local yaml_file=
+  yaml_file=$(mktemp)
+  local monitoring_install=1
+  cat > "${yaml_file}" <<EOF
+---
+profiles:
+  monitoring:
+    install: yes
+EOF
+
+  unset fai_monitoring_install
+  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
+  assertEquals "Wrong fai_monitoring_install" \
+               "${monitoring_install}" \
+               "${fai_monitoring_install}"
+}
+
 ## @override shunit2
 setUp() {
   source "$(dirname "$0")/../../../share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh"
diff --git a/usr/share/doc/escenic/ece-install-conf-reference.org b/usr/share/doc/escenic/ece-install-conf-reference.org
new file mode 100644
index 00000000..13975a16
--- /dev/null
+++ b/usr/share/doc/escenic/ece-install-conf-reference.org
@@ -0,0 +1,493 @@
+Overview of =ece-install='s configuration options. Generated from the
+configuration file parser's unit tests @ Tue May  2 09:01:11 CEST 2017.
+
+*** environment
+
+#+begin_src yaml
+environment:
+  type: ${environment_type}
+  java_home: ${foo_java_home}
+  java_version: ${foo_java_version}
+  skip_password_checks: true
+  conf_url: ${conf_url}
+  apt:
+    escenic:
+      pool: ${apt_pool}
+  deb:
+    escenic:
+      use_deb_not_apt: true
+      base_url: ${deb_base_url}
+  rpm:
+    escenic:
+      base_url: ${rpm_base_url}
+
+  maven:
+    repositories:
+      - ${mvn_repo1}
+      - ${mvn_repo2}
+#+end_src
+=ece-install.conf= equivalent:
+#+begin_src: text
+
+java_home=
+fai_environment=
+fai_server_java_version=
+fai_maven_repositories=
+fai_conf_url=
+fai_package_rpm_base_url=
+fai_package_deb_not_apt=
+
+#+end_src
+
+*** editor
+
+#+begin_src yaml
+profiles:
+  editor:
+    install: yes
+    port: ${editor_port}
+    host: ${editor_host}
+    name: ${editor_name}
+    redirect: ${editor_redirect}
+    shutdown: ${editor_shutdown}
+#+end_src
+=ece-install.conf= equivalent:
+#+begin_src: text
+
+fai_editor_install=
+fai_editor_port=
+fai_editor_shutdown=
+fai_editor_redirect=
+fai_editor_name=
+
+#+end_src
+
+*** presentation
+
+#+begin_src yaml
+profiles:
+  presentation:
+    install: yes
+    ear: ${presentation_ear}
+    environment: ${presentation_environment}
+    host: ${presentation_host}
+    name: ${presentation_name}
+    port: ${presentation_port}
+    redirect: ${presentation_redirect}
+    shutdown: ${presentation_shutdown}
+    deploy_white_list: ${presentation_deploy_white_list}
+    search_indexer_ws_uri: ${presentation_search_indexer_ws_uri}
+#+end_src
+=ece-install.conf= equivalent:
+#+begin_src: text
+
+fai_presentation_ear=
+fai_presentation_environment=
+fai_presentation_install=
+fai_presentation_name=
+fai_presentation_port=
+fai_presentation_redirect=
+fai_presentation_shutdown=
+fai_presentation_deploy_white_list=
+fai_presentation_search_indexer_ws_uri=
+
+#+end_src
+
+*** search
+
+#+begin_src yaml
+profiles:
+  search:
+    install: yes
+    legacy: yes
+    ear: ${search_ear}
+    for_editor: true
+    indexer_ws_uri: ${search_indexer_ws_uri}
+    port: ${search_port}
+    host: ${search_host}
+    name: ${search_name}
+    redirect: ${search_redirect}
+    shutdown: ${search_shutdown}
+#+end_src
+=ece-install.conf= equivalent:
+#+begin_src: text
+
+fai_search_install=
+fai_search_host=
+fai_search_port=
+fai_search_shutdown=
+fai_search_redirect=
+fai_search_name=
+fai_search_legacy=
+fai_search_for_editor=
+fai_search_ear=
+fai_search_indexer_ws_uri=
+
+#+end_src
+
+*** db
+
+#+begin_src yaml
+profiles:
+  db:
+    install: ${db_install}
+    master: true
+    user: ${db_user}
+    ear: ${db_ear}
+    password: ${db_password}
+    schema: ${db_schema}
+    host: ${db_host}
+    port: ${db_port}
+    drop_old_db_first: yes
+    replication: yes
+#+end_src
+=ece-install.conf= equivalent:
+#+begin_src: text
+
+fai_db_install=
+fai_db_master=
+fai_db_user=
+fai_db_password=
+fai_db_schema=
+fai_db_host=
+fai_db_port=
+fai_db_ear=
+fai_db_drop_old_db_first=
+fai_db_replication=
+#+end_src
+
+*** cache
+
+#+begin_src yaml
+profiles:
+  cache:
+    install: yes
+    conf_dir: ${conf_dir}
+    port: ${port}
+    backends:
+      - ${be1}
+      - ${be2}
+#+end_src
+=ece-install.conf= equivalent:
+#+begin_src: text
+
+fai_cache_install=
+fai_cache_backends=
+fai_cache_port=
+fai_cache_conf_dir=
+
+#+end_src
+
+*** assembly_tool
+#+begin_src yaml
+profiles:
+  assembly_tool:
+    install: yes
+#+end_src
+=ece-install.conf= equivalent:
+#+begin_src: text
+
+fai_assembly_tool_install=
+#+end_src
+
+*** credentials
+
+#+begin_src yaml
+credentials:
+  - site: maven.escenic.com
+    user: ${escenic_download_user}
+    password: ${escenic_download_password}
+  - site: builder
+    user: ${builder_download_user}
+    password: ${builder_download_password}
+  - site: unstable.yum.escenic.com
+    user: ${unstable_yum_user}
+    password: ${unstable_yum_password}
+  - site: unstable.apt.escenic.com
+    user: ${unstable_apt_user}
+    password: ${unstable_apt_password}
+#+end_src
+=ece-install.conf= equivalent:
+#+begin_src: text
+
+technet_user=
+technet_password=
+fai_package_rpm_user=
+fai_package_rpm_password=
+fai_package_apt_user=
+fai_package_apt_password=
+fai_builder_http_user=
+fai_builder_http_password=
+fai_conf_builder_http_user=
+fai_conf_builder_http_password=
+
+#+end_src
+
+*** credentials_stable_yum
+
+#+begin_src yaml
+credentials:
+  - site: yum.escenic.com
+    user: ${stable_yum_user}
+    password: ${stable_yum_password}
+#+end_src
+=ece-install.conf= equivalent:
+#+begin_src: text
+
+fai_package_rpm_user=
+fai_package_rpm_password=
+
+#+end_src
+
+*** credentials_stable_apt
+
+#+begin_src yaml
+credentials:
+  - site: apt.escenic.com
+    user: ${stable_apt_user}
+    password: ${stable_apt_password}
+#+end_src
+=ece-install.conf= equivalent:
+#+begin_src: text
+
+fai_package_apt_user=
+fai_package_apt_password=
+
+#+end_src
+
+*** create_publication
+
+
+#+begin_src yaml
+profiles:
+   publications:
+     - name: ${publication1_name}
+       create: true
+       update_app_server_conf: true
+       update_ece_conf: true
+       update_nursery_conf: true
+       war: ${publication1_war}
+       war_remove_list:
+         - ${publication1_remove_file1}
+         - ${publication1_remove_file2}
+       webapps:
+         - ${publication_webapp1}
+         - ${publication_webapp2}
+       domain: ${publication1_domain}
+       ear: ${publication_ear}
+       environment: ${publication1_environment}
+       aliases:
+         - ${publication1_alias1}
+         - ${publication1_alias2}
+#+end_src
+=ece-install.conf= equivalent:
+#+begin_src: text
+
+fai_publication_domain_mapping_list=
+fai_publication_ear=
+fai_publication_update_app_server_conf=
+fai_publication_update_ece_conf=
+fai_publication_update_nursery_conf=
+fai_publication_war_remove_file_list=
+fai_publication_environment=
+fai_publication_webapps=
+fai_publications_webapps # arg, the plural=
+
+#+end_src
+
+*** publication
+
+
+#+begin_src yaml
+profiles:
+   publications:
+     - name: ${publication1_name}
+       war: ${publication1_war}
+       domain: ${publication1_domain}
+       aliases:
+         - ${publication1_alias1}
+         - ${publication1_alias2}
+     - name: ${publication2_name}
+       war: ${publication2_war}
+       domain: ${publication2_domain}
+       aliases:
+          - ${publication2_alias1}
+          - ${publication2_alias2}
+#+end_src
+=ece-install.conf= equivalent:
+#+begin_src: text
+
+fai_publication_domain_mapping_list=
+#+end_src
+
+*** packages
+
+#+begin_src yaml
+packages:
+  - name: ${package_name}
+    version: ${package_version}
+    arch: ${package_arch}
+#+end_src
+=ece-install.conf= equivalent:
+#+begin_src: text
+fai_package_map=
+fai_package_arch_map=
+  declare -A fai_package_map
+  declare -A fai_package_arch_map
+#+end_src
+
+*** packages_multiple
+
+
+#+begin_src yaml
+packages:
+  - name: ${package_name}
+    version: ${package_version}
+  - name: ${package_name_without_version}
+#+end_src
+=ece-install.conf= equivalent:
+#+begin_src: text
+fai_package_map=
+  declare -A fai_package_map
+#+end_src
+
+*** analysis
+
+
+#+begin_src yaml
+profiles:
+  analysis:
+    install: yes
+    name: ${analysis_name}
+    port: ${analysis_port}
+    host: ${analysis_host}
+    shutdown: ${analysis_shutdown}
+    redirect: ${analysis_redirect}
+#+end_src
+=ece-install.conf= equivalent:
+#+begin_src: text
+
+fai_analysis_install=
+fai_analysis_name=
+fai_analysis_port=
+fai_analysis_host=
+fai_analysis_shutdown=
+fai_analysis_redirect=
+#+end_src
+
+*** analysis_db
+
+
+#+begin_src yaml
+profiles:
+  analysis_db:
+    install: yes
+    user: ${analysis_db_user}
+    password: ${analysis_db_password}
+    schema: ${analysis_db_schema}
+#+end_src
+=ece-install.conf= equivalent:
+#+begin_src: text
+
+fai_analysis_db_install=
+fai_analysis_db_user=
+fai_analysis_db_password=
+fai_analysis_db_schema=
+#+end_src
+_
+*** use_escenic_packages
+
+#+begin_src yaml
+packages:
+  foo: 1
+#+end_src
+=ece-install.conf= equivalent:
+#+begin_src: text
+
+fai_package_enabled=
+#+end_src
+
+*** restore
+
+#+begin_src yaml
+profiles:
+  restore:
+    pre_wipe_solr: true
+    pre_wipe_all: true
+    pre_wipe_logs: true
+    pre_wipe_cache: true
+    pre_wipe_crash: true
+    from_backup: true
+    data_files: true
+    software_binaries: true
+    db: true
+    configuration: true
+    from_file: ${restore_from_file}
+#+end_src
+=ece-install.conf= equivalent:
+#+begin_src: text
+fai_restore_pre_wipe_solr=
+fai_restore_pre_wipe_all=
+fai_restore_pre_wipe_logs=
+fai_restore_pre_wipe_cache=
+fai_restore_pre_wipe_crash=
+fai_restore_from_backup=
+fai_restore_data_files=
+fai_restore_software_binaries=
+fai_restore_db=
+fai_restore_configuration=
+fai_restore_from_file=
+#+end_src
+
+*** editor_install_multi_profiles
+#+begin_src yaml
+profiles:
+  editor:
+    install: yes
+  search:
+    install: yes
+  db:
+    install: no
+#+end_src
+=ece-install.conf= equivalent:
+#+begin_src: text
+
+fai_editor_install=
+fai_search_install=
+fai_db_install=
+
+#+end_src
+
+*** cache
+
+#+begin_src yaml
+profiles:
+  cache:
+    install: yes
+    port: ${cache_port}
+    conf_dir: ${cache_conf_dir}
+    backends:
+      - ${cache_be1}
+      - ${cache_be2}
+#+end_src
+=ece-install.conf= equivalent:
+#+begin_src: text
+
+fai_cache_install=
+fai_cache_backends=
+fai_cache_conf_dir=
+fai_cache_port=
+
+#+end_src
+
+*** monitoring
+#+begin_src yaml
+profiles:
+  monitoring:
+    install: yes
+#+end_src
+=ece-install.conf= equivalent:
+#+begin_src: text
+
+fai_monitoring_install=
+#+end_src
diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index f2bd5778..6f3f86a4 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -13,7 +13,7 @@ ece-install [[[-f|--file conf-file]]] [[[-V|--version]]] [[[-v|--verbose]]]
 * OPTIONS
 ** -f|--file conf-file
 Instructs *ece-install* to read configuration data from the specified
-file.
+file. This can either be a `.conf` or `.yaml` file.
 
 ** -v|--verbose
 Requests verbose output from *ece-install*.
@@ -53,32 +53,17 @@ need to install manually, and it still handles the configuration of
 these components for you.
 
 ** Supported Operating Systems
-*ece-install* works best on Debian 6.0 (Squeeze) or later. It should,
-however, work on any UNIX-like system that provides a BASH command
-shell (version 4.2 or later).
-
-Here is an overview of the situation on some of the most popular
-platforms:
-
- - Debian-based operating systems :: On Debian 6.0 or later,
-     installation is fully automated. *ece-install* installs and
-     configures all required components. This may also be the case on
-     some Debian-based distributions. On recent Ubuntu distributions,
-     however, you will need to manually install some components. For
-      details, see Tested Operating Systems.
-
- - RedHat-based operating systems :: *ece-install* support for
-      RedHat-based operating systems is constantly improving. However,
-      since the public RedHat software repositories are significantly smaller
-      than the Debian ones, it may often be necessary to manually
-      install some components. For
-      details, see Tested Operating Systems.
-
- - Other GNU/Linux and UNIX systems :: *ece-install* does not currently support
-      automated installation of third-party components on these
-      platforms, so you will need to install them manually. It will,
-      of course, tell you which components you need to install, and
-      configure them for you.
+| Operating system            | Status                       |
+|-----------------------------+------------------------------|
+| Debian 8.7 (jessie)         | Everything is 100% automatic |
+| Ubuntu LTS 16.04            | Everything is 100% automatic |
+| RedHat Enterprise Linux 7.3 | Everything is 100% automatic |
+| CentOS 7.3                  | Everything is 100% automatic |
+
+Other Unix operating systems may work, given that the required
+binaries (=curl=, =varnishd=, =mysqld=++) are already available in
+PATH and that the configuration files exist in familiar
+locations. However this is untested. YMMV.
 
 ** Requirements
 Whichever operating system(s) you will be installing on, you must ensure
@@ -115,14 +100,6 @@ Platforms on which you will need to do this include:
  - Any BSD-based system (including Mac OS X)
  - Solaris
 
-** <<<Tested Operating Systems>>>
-| Operating system     | Status                                     |
-|----------------------+--------------------------------------------|
-| CentOS 6.2           | HA, APR & monitoring are not automatic     |
-| Debian 6.0 (squeeze) | Everything is 100% automatic               |
-| Ubuntu 11.10         | Everything except Tomcat/APR are automatic |
-| Ubuntu LTS 10.04     | Everything except Tomcat/APR are automatic |
-| Ubuntu LTS 12.04     | Everything except Tomcat/APR are automatic |
 
 * Using ece-install
 The various software components required to run an Escenic-powered web
@@ -185,67 +162,34 @@ before running *ece-install*.
 #+END_QUOTE
 
 ** <<<Create a Configuration File>>>
-*ece-install* expects to find a configuration file called
-*ece-install.conf* in the root user's home directory, which is usually
-*/root*. If you wish to call your configuration file something else,
-you need to specify it with the *-f* parameter, e.g. *ece-install -f
-ece-install-db-master.conf=.
-
-If you forget to provide such a file before running *ece-install*,
-then *ece-install* will complain:
-#+BEGIN_SRC text
-[ece-install] /root/ece-install.conf doesn't exist,
-I cannot live without it :-(
-#+END_SRC
+*ece-install* can use configuration files in either =.conf= (old) or
+*=.yaml= (new) format. This manual describes first and foremost the
+*YAML format.
 
-*/root/ece-install.conf*. may contain a large number of configuration
+*ece-install.yaml*. may contain a large number of configuration
 parameters, but the minimum requirement is that it contains:
 
- * A user name and password for downloading software from Escenic
-   Technet.
- * The parameter *fai\_enabled=1*.
- * A parameter of the form *fai\_<profile>\_install=1* where *<profile>*
-   is the name of the *profile* you want to install (see Server
-   Profiles for information about profiles).
+ * A user name and password for downloading software from Escenic.
+ * A profile to install
 
 For example:
-#+BEGIN_SRC conf
-technet_user=<user>
-technet_password=<password>
-fai_<profile>_install=1
-fai_server_java_version=1.7
-#+END_SRC
-
-If the configuration file does not contain these settings then
-*ece-install* will complain. For example:
-#+BEGIN_SRC text
-[ece-install] Be sure to set technet_user and technet_password
-[ece-install] in /root/ece-install.conf
+#+BEGIN_SRC yaml
+credentials:
+  - site: maven.escenic.com
+    user: foo
+    password: bar
+  - site: apt.escenic.com
+    user: foo
+    password: bar
+profiles:
+  editor:
+    install: yes
 #+END_SRC
 
 Depending on what components you are installing on the server, you may
-need to include other configuration parameters in the file. If you are
-installing the Widget Framework, for example, you will need to specify
-additional download credentials (see [[fai_wf_install]]). In most cases,
-however, parameters have default settings that enable *ece-install* to
-complete installation with very few settings.
-
-****** Interactive Mode
-The setting *fai\_enabled=1* tells *ece-install* to run in *fully
-automated install (FAI)* mode. In this mode *ece-install* reads
-parameters from *ece-install.conf*. If it cannot find all the
-parameters it needs in the configuration file, then it fails. This is
-the recommended way to use *ece-install*.
-
-If you omit this parameter then *ece-install* will not read any
-*fai\_???* parameters from *ece-install.conf* and will prompt for them
-interactively instead. You are, however, *strongly advised* not to run
-*ece-install* in interactive mode:
-
- * Interactive mode is much less flexible than FAI mode.
- * Interactive mode is not actively maintained and may therefore be
-   unreliable.
- * Use of interactive mode is therefore not supported.
+need to include other configuration parameters in the file. In most
+cases, however, parameters have default settings that enable
+*ece-install* to complete installation with very few settings.
 
 ** <<<Run ece-install>>>
 To run *ece-install*, enter:
@@ -329,41 +273,49 @@ role in an Escenic installation.
 The profile to be installed by *ece-install* is determined by setting
 one of the following parameters in *ece-install.conf*:
 
-- *fai\_editor\_install=1* :: Installs all the components that need to
+- *profiles: editor* :: Installs all the components that need to
      be installed to create an Escenic *editorial server*.
-- *fai\_presentation\_install=1* :: Installs all the components that
+- *profiles: presentation* :: Installs all the components that
      need to be installed to create an Escenic *presentation server*.
-- *fai\_wf\_install=1* :: Installs the Widget Framework on an editorial
-     or presentation server.
-- *fai\_db\_install=1* :: Installs a Database Server.
-- *fai\_cache\_install=1* :: Installs a Cache Server.
-- *fai\_search\_install=1* :: Installs a Search Server.
-- *fai\_rmi\_install=1* :: Installs an RMI Hub.
-- *fai\_monitoring\_install=1* :: Installs a Monitoring Server.
-- *fai\_publication\_create=1* :: Creates an Escenic publication.
-- *fai\_all\_install=1* :: Installs all of the above on one host
+- *profiles: db* :: Installs a Database Server.
+- *profiles: cache* :: Installs a Cache Server.
+- *profiles: search* :: Installs a Search Server.
+- *profiles: publication* :: Creates an Escenic publication.
+- *profiles: all* :: Installs all of the above on one host
      machine.
-- *fai\_restore\_from\_backup=1* :: Restores a backup created with *ece*.
-- *fai\_analysis\_install=1* :: Installs and configures an Escenic Analysis Engine.
-- *fai\_nfs\_server\_install=1* :: Installs an NFS server.
-- *fai\_nfs\_client\_install=1* :: Installs an NFS client.
-- *fai\_vip\_install=1* :: Installs virtual IP (VIP) providers.
+- *profiles: restorebackup* :: Restores a backup created with *ece*.
+- *profiles: analysis* :: Installs and configures an Escenic Analysis Engine.
+- *profiles: nfs* :: Installs an NFS server.
+- *profiles: nfs* :: Installs an NFS client.
+- *profiles: vip* :: Installs virtual IP (VIP) providers.
 
 There are a number of common components that are included in all or
 most of the profiles. These are described below.
 
-** <<<fai\_editor\_install>>>
-To use this profile add *fai\_editor\_install=1* to your
-*ece-install.conf* file.
+** <<<profiles: editor>>>
+To use this profile add:
+#+begin_src yaml
+profiles:
+  editor:
+    create: true
+#+end_src
+
+to your *ece-install.yaml* file.
 
 This profile contains all the components that need to be installed to
 create an Escenic *editorial server*. An editorial server (sometimes
 also called a publication server) hosts a Content Engine used for editorial
 purposes (primarily Content Studio sessions).
 
-** <<<fai\_presentation\_install>>>
-To use this profile, add *fai\_presentation\_install=1* to your
-*ece-install.conf* file.
+** <<<profiles: presentation>>>
+To use this profile, add:
+#+begin_src yaml
+profiles:
+  presentation:
+    create: true
+#+end_src
+
+to your *ece-install.yaml* file.
 
 This profile contains all the components that need to be installed to
 create an Escenic *presentation server*. A presentation server hosts a
@@ -375,46 +327,26 @@ users. Differences between this and an editorial server include:
    required.
  * Memcached, the distributed memory cache is installed.
 
-** <<<fai\_wf\_install>>>
-To use this profile, add the following settings:
-#+BEGIN_SRC text
-fai_wf_install=1
-wf_user=<user-name>
-wf_password=<password>
-#+END_SRC
-
-to your *ece-install.conf* file.
-
-*wf\_user* and *wf\_password* must contain your Widget Framework Maven
-repository credentials (supplied when you purchased the Widget
-Framework). If you do not have these credentials, please contact
-support@escenic.com.
+** <<<profiles: db>>>
+To use this profile, add:
 
-This profile installs the Escenic Widget Framework. It should be
-installed on a machine where you have already installed either an
-editorial or presentation profile. Exactly which machines you install
-the Widget Framework on depends on your deployment strategy.
-
-** <<<fai\_db\_install>>>
-To use this profile, add *fai\_db\_install=1* to your
-*ece-install.conf* file.
+#+begin_src yaml
+profiles:
+  db:
+    create: true
+#+end_src
 
-When this profile is used on a supported version of Debian or Ubuntu,
-*ece-install* installs all the components needed to create an Escenic
-database, based on the MariaDB fork of MySQL or the Percona
-distribution of MySQL. On any other platform you must install either
-MariaDB, Percona or a standard MySQL distribution yourself before running
-*ece-install*.
+to your *ece-install.yaml* file.
 
-The default is to install MariaDB unless this setting is added to to
-*ece-install.conf* before you run *ece-install*.
+When this profile is used on a supported version of Debian, Ubuntu,
+CentOS or RedHat, *ece-install* installs will install all the
+components needed to create an Escenic database, based on the MariaDB
+fork of MySQL or the Percona distribution of MySQL.
 
-#+BEGIN_SRC conf
-db_vendor=percona
-#+END_SRC
+The default is to install MariaDB.
 
-Otherwise, this profile contains all the Escenic components needed on
-a database server plus the correct database schema for the Content
+Furthermore, this profile contains all the Escenic components needed
+on a database server plus the correct database schema for the Content
 Engine version and plug-in versions you are installing.
 
 If an Escenic database has already been installed on the machine, then
@@ -430,29 +362,31 @@ If an Escenic database has already been installed on the machine, then
 #+END_SRC
 
 If you actually want to re-install the database you can do so by
-adding this setting to *ece-install.conf* before you run *ece-install*:
+adding this setting to *ece-install.yaml* before you run *ece-install*:
 
-#+BEGIN_SRC conf
-fai_db_drop_old_db_first=1
+#+BEGIN_SRC yaml
+profiles:
+  db:
+    install: true
+    drop_old_db_first: true
 #+END_SRC
 
 Given that *mysqld* is installed, this profile will download all the
-Escenic components and install the ECE database schema based from the
-SQL files contained inside the distribution bundles specified with in
-the *technet\_download\_list* and *wf\_dowload\_list* variables. The
-defaults are inside the *ece-install* command itself, but you can
-overrides these in your *ece-install.conf* if you wish different minor
-versions of the ECE and plugins.
+Escenic components that you have defined in the configuration file and
+install the ECE database schema based from the SQL files contained
+inside the individual packages.
 
 *** Master & slave setup
 You can easily use *ece-install* to set up master and slave databases
 on different hosts.
 
-First create the master database using these *ece-install.conf* settings:
-#+BEGIN_SRC conf
-fai_db_install=1
-fai_db_master=1
-fai_db_replication=1
+First create the master database using these *ece-install.yaml* settings:
+#+BEGIN_SRC yaml
+profiles:
+  db:
+    install: true
+    master: true
+    replication: true
 #+END_SRC
 
 When you run *ece-install* with these settings, the output log
@@ -467,14 +401,16 @@ database:
 #+END_SRC
 
 On the slave database host you can then use these values in your
-*ece-install.conf* file as follows:
-#+BEGIN_SRC conf
-fai_db_install=1
-fai_db_replication=1
-fai_db_master=0
-fai_db_master_host=my-db-master
-fai_db_master_log_file=mysql-bin.000013
-fai_db_master_log_position=106
+*ece-install.yaml* file as follows:
+#+BEGIN_SRC yaml
+profiles:
+  db:
+    install: true
+    master: false
+    replication: true
+    master_host: "my-db-master"
+    master_log_file: "mysql-bin.000013"
+    master_log_position: "106"
 #+END_SRC
 
 *ece-install* uses internal defaults to create a replication user and
@@ -482,14 +418,21 @@ credentials. You can override these defaults by setting additional
 parameters in *ece-install.conf*. For details, see [[Overview of All FAI
 Parameters]].
 
-** <<<fai\_cache\_install>>>
-To use this profile, add *fai\_cache\_install=1* to your
-*ece-install.conf* file.
+** <<<profiles: cache>>>
+To use this profile, add:
+
+#+begin_src yaml
+profiles:
+  cache:
+    install: true
+#+end_src
+
+
+to your *ece-install.yaml* file.
 
 When this profile is used on a supported version of Debian or Ubuntu,
-*ece-install* installs the latest Varnish 3.x caching server from the
-Varnish APT repository. On any other platform you must install Varnish 3.x
-yourself before running *ece-install*.
+*ece-install* installs the latest Varnish caching server from the
+official distro repositories.
 
 Once Varnish is installed, *ece-install* configures it to suit the
 typical requirements of an Escenic site:
@@ -519,71 +462,68 @@ TBD:
   configuration.
 #+END_COMMENT
 
-** <<<fai\_search\_install>>>
-To use this profile, add *fai\_search\_install=1* to your
-*ece-install.conf* file.
+** <<<profiles: search>>>
+To use this profile, add
 
-This profile installs search components (Apache Solr plus the Escenic
-*indexer* web app.
+#+begin_src yaml
+profiles:
+  search:
+    install: true
+#+end_src
 
-** <<<fai\_rmi\_install>>>
-To use this profile, add *fai\_rmi\_install=1* to your
-*ece-install.conf* file.
 
-This profile installs an RMI hub. This is only necessary on systems
-using ECE < 5.3
+to your *ece-install.yaml* file.
 
-** <<<fai\_monitoring\_install>>>
-To use this profile, add *fai\_monitoring\_install=1* to your
-*ece-install.conf* file.
+This profile installs a standalone Solr instance and an app server
+with the Escenic *indexer* web app.
 
-This profile installs a Munin gatherer, a Icinga (an enhanced Nagios)
-server plus a web server for providing access to Icinga and the
-reports Munin generates.
+** <<<profiles: publications>>>
+To use this profile, add
 
-** <<<fai\_publication\_create>>>
-To use this profile, add *fai\_publication\_create=1* to your
-*ece-install.conf* file.
+#+begin_src yaml
+profiles:
+  publications:
+    - name: mypub
+      create: true
+#+end_src
+
+
+to your *ece-install.yaml* file.
 
 This profile creates a publication for you. It should be used on a
 machine where you have already installed either an editorial or
 presentation profile.
 
-If the Widget Framework is installed on the machine, then the
-create publication is based on the Widget Framework. Otherwise the
-publication is based on the clean demo WAR supplied with the Content
-Engine.
-
 *ece-install* will create publications of all the publication WAR
 files in your EAR file if you also
-define *fai\_publication\_domain\_mapping\_list*
-and *fai\_publication\_ear*.
-#+BEGIN_SRC text
-fai_publication_create=1
-fai_publication_ear=/tmp/stoppok-rev6195-2012-12-04_1134.ear
-fai_publication_domain_mapping_list="
-  stoppok,st.war#stoppok.example.com#newindian.example.com
-  helden#dinamani.example.com#helden.example.com
-"
+define domain (and optionally, aliases):
+#+BEGIN_SRC yaml
+profiles:
+  publications:
+    - name: stoppok
+      domain: stoppok.example.com
+      aliases:
+        - s.exampel.com
+        - o.exampel.com
+      ear: /tmp/stoppok-rev6195-2012-12-04_1134.ear
+    - name: helden
+      domain: helden.example.com
+      ear: /tmp/stoppok-rev6195-2012-12-04_1134.ear
 #+END_SRC
 
 See [[Overview of All Configuration Parameters]] for further details on the format
 of the domain mapping list.
 
-** <<<fai\_all\_install>>>
-To use this profile, add *fai\_all\_install=1* to your
-*ece-install.conf* file.
+** <<<profiles: restore>>>
+To use this profile, add:
 
-This profile is primarily intended for use by developers and system
-administrators as a test environment. It is *not* considered suitable
-for production purposes. A complete stack including caching
-server, application server, Escenic Content Engine, assembly host,
-database and Widget Framework is installed. In addition, a publication
-is created.
+#+begin_src yaml
+profiles:
+  restore:
+    from_file: /var/backups/backup.tar.gz
+#+end_src
 
-** <<<fai\_restore\_from\_backup>>>
-To use this profile, add *fai\_restore\_from\_backup=1* to your
-*ece-install.conf* file.
+to your *ece-install.yaml* file.
 
 Unlike all the other profiles, this profile does not install anything
 or create anything new. Instead, it restores a backup you have
@@ -614,48 +554,49 @@ parameters in *ece-install.conf* in order to specify the location of
 the backup file you want to restore and the specific items you want to
 restore from the file.
 
-The parameters you can use together with *fai\_restore\_from\_backup*
+The parameters you can use together with *profiles: restore*
 to specify what you want to restore are:
 
-- *fai\_restore\_all* :: Restore all backup items. Requires a full
-     backup tarball. Default is 1.
+#+begin_src yaml
+profiles:
+  restore:
+    # The *.tar* file produced by *ece -i <instance> backup*. Default is "".
+    from_file:
+    from_backup: true
 
-- *fai\_restore\_db* :: Install the database server and restore its
-     contents. Default is 0
+    # Restore the Solr and Content Engine data files. Default is false.
+    data_files: true
 
-- *fai\_restore\_data\_files* :: Restore the Solr and Content Engine
-     data files. Default is 0
+    # Restore the Escenic and Apache Tomcat software. Default is false.
+    software_binaries: true
 
-- *fai\_restore\_configuration* :: Restore the Solr and content Engine
-     configuration files. Default is 0.
-- *fai\_restore\_software\_binaries* :: Restore the Escenic and Apache
-     Tomcat software. Default is 0.
+    # Install the database server and restore its. Default false
+    db: true
 
-- *fai\_restore\_from\_file* :: The *.tar* file produced by *ece -i
-     <instance> backup*. Default is "".
+    # Restore the Solr and content Engine configuration files. Default is  false
+    configuration: true
+#+end_src
 
-So to restore everything in a specified backup file, you would need
-something like this in your *ece-install.conf* file:
-#+BEGIN_SRC conf
-fai_restore_from_backup=1
-fai_restore_all=1
-fai_restore_from_file=/var/backups/escenic/backup-2011-10-10.tar
-#+END_SRC
 
 *ece-install* can also remove unwanted files from an existing
 installation prior to restoring from a backup. You can specify the
 files you would like to remove using the following parameters:
 
-- *fai\_restore\_pre\_wipe\_all* :: Remove all data/state & log
-     files. Default is 0.
-- *fai\_restore\_pre\_wipe\_cache* :: Remove the cache files. Default
-     is 0.
-- *fai\_restore\_pre\_wipe\_crash* :: Remove the crash files. Default
-     is 0.
-- *fai\_restore\_pre\_wipe\_logs*  :: Remove all log files. Default
-     is 0.
-- *fai\_restore\_pre\_wipe\_solr*  :: Remove the solr data/state
-     files. Default is 0.
+#+begin_src yaml
+profiles:
+  restore:
+    # Remove the solr data/state files. Default is false.
+    pre_wipe_solr: true
+    # Remove all log files. Default is false.
+    pre_wipe_logs: true
+    # Remove the cache files. Default is false.
+    pre_wipe_cache: true
+    # Remove the crash files. Default is false.
+    pre_wipe_crash: true
+
+    # Remove all of the above
+    pre_wipe_all: true
+#+end_src
 
 *** Data security
 You must be careful when restoring backups that you don't
@@ -680,9 +621,16 @@ restore will fail as follows:
   details.
 #+END_SRC
 
-** <<<fai\_analysis\_install>>>
-To use this profile, add *fai\_analysis\_install=1* to your
-*ece-install.conf* file.
+** <<<profiles: analysis>>>
+To use this profile, add:
+
+#+begin_src yaml
+profiles:
+  analysis:
+    create: true
+#+end_src
+
+to your *ece-install.yaml* file.
 
 This profile installs the Escenic Analysis Engine, and configures it
 for production use with a sensible set of defaults.
@@ -697,6 +645,8 @@ To use this profile, add *fai\_nfs\_server\_install=1* to your
 
 This profile installs an NFS server.
 
+This feature is not yet supported with YAML configuration files.
+
 ** <<<fai\_nfs\_client\_install>>>
 To use this profile, add *fai\_nfs\_client\_install=1* to your
 *ece-install.conf* file.
@@ -713,6 +663,8 @@ fai_nfs_server_address=192.168.1.200
 fai_nfs_export_list="/var/exports/multimedia"
 #+END_SRC
 
+This feature is not yet supported with YAML configuration files.
+
 ** <<<fai\_vip\_install>>>
 [[file:images/nfs-vip.png]]
 
@@ -886,11 +838,16 @@ application servers if the profile is *editor*, *all* or
 
 To use this feature, you must define one domain for each publication
 in the following FAI parameter:
-#+BEGIN_SRC conf
-fai_publication_domain_mapping_list="
-  firepub#fire.escenic.com
-  ildpub#ild.escenic.com#feuer.escenic.com,fuego.escenic.com
-"
+#+BEGIN_SRC yaml
+profiles:
+  publications:
+    - name: firepub
+      domain: fire.escenic.com
+    - name: ildpub
+      domain: ild.escenic.com
+      aliases:
+        - feuer.example.com
+        - fuego.example.com
 #+END_SRC
 
 This will produce the following stanzas in *server.xml*:
@@ -940,11 +897,16 @@ application servers if the profile is *editor*, *all* or
 
 To use this feature, you must define one domain for each publication
 in the following FAI parameter:
-#+BEGIN_SRC conf
-fai_publication_domain_mapping_list="
-  firepub#fire.escenic.com
-  ildpub#ild.escenic.com#feuer.escenic.com,fuego.escenic.com
-"
+#+BEGIN_SRC yaml
+profiles:
+  publications:
+    - name: firepub
+      domain: fire.escenic.com
+    - name: ildpub
+      domain: ild.escenic.com
+      aliases:
+        - feuer.example.com
+        - fuego.example.com
 #+END_SRC
 
 This will produce the following stanzas in *server.xml*:
@@ -1011,322 +973,9 @@ If you do not want ece-install to touch your */etc/hosts*, you can set
 
 ** Overview of All Configuration Parameters
 The *ece-install* command understands the following settings in
-the *ece-install.conf*:
-
-- *technet\_user* and *technet\_password* The user name and password
-  used to access Technet for downloading Escenic software.
-
-- *wf\_user* and *wf\_password* The user name and password used for
-  downloading the Widget Framework.
-
-- *keep\_off\_wget\_user\_agent* Whenever *ece-install* uses *wget* to
-  download software, *ece-install* will add something to the user
-  agent string of *wget* so that it's possible to identify what
-  the *ece-install* command downloads. If you wish to turn this
-  feature off, set this to *0*.
-
-- *fai\_server\_java\_version* The java version to use.
-  Only allowable values are 1.6 and 1.7.
-  The default is 1.6
-
-- *fai\_all\_conf\_archive* :: *conf.tar.gz* to use for Nursery & JAAS
-     configuration. Default is "".
-
-- *fai\_all\_ear* :: EAR to use instead of the Escenic
-     binaries. Default is "".
-
-- *fai\_all\_install* :: Install all components on your
-     server.. Default is 0.
-
-- *fai\_all\_name* :: Instance name for the all install
-     server.. Default is engine1.
-
-- *fai\_all\_stop\_and\_clear* :: After installation, stop the
-     instance and clear its work & log files.. Default is 0.
-
-- *fai\_analysis\_db\_host* :: For the EAE DB (different from
-     ECE's). Default is localhost.
-
-- *fai\_analysis\_db\_install* :: Install DB profile. Default is 0.
-
-- *fai\_analysis\_db\_password* :: For the EAE DB (different from
-     ECE's). Default is read-the-source-luke.
-
-- *fai\_analysis\_db\_port* :: For the EAE DB (different from
-     ECE's). Default is 3306.
-
-- *fai\_analysis\_db\_schema* :: For the EAE DB (different from
-     ECE's). Default is ece5db.
-
-- *fai\_analysis\_db\_user* :: For the EAE DB (different from
-     ECE's). Default is ece5user.
-
-- *fai\_analysis\_heap\_size* :: The JVM heap size in megabytes. The
-     default is *2048*.
-
-- *fai\_analysis\_install* :: Will install the Escenic Analysis
-     Engine, aka Stats, EAE.. Default is 0.
-
-- *fai\_analysis\_name* :: EAE instance name. Default is analysis1.
-
-- *fai\_analysis\_port* :: Port of the EAE. Default is 8080.
-
-- *fai\_analysis\_shutdown* :: Shutdown port for the EAE app
-     server. Default is 8005.
-
-- *fai\_analysis\_stop\_and\_clear* :: After installation, stop the
-     instances and clear its work & log files. Default is 0.
-
-- *fai\_apt\_escenic\_pool* :: Which package pool in the Escenic APT to
-     install package from.. Default is stable.
-
-- *fai\_cache\_backends* :: Space separated, e.g. "app1:8080
-     app2:8080". Default is ${HOSTNAME}:8080.
-
-- *fai\_cache\_install* :: Install cache server profile. Default is 0.
-
-- *fai\_db\_daily\_backup* :: Sets up daily backup of the DB.. Default
-     is 0.
-
-- *fai\_db\_drop\_old\_db\_first* :: Warning: this will drop the old
-     database before installing a new one. Default is 0.
-
-- *fai\_db\_host* :: Useful for editor & presentation
-     profiles. Default is *$HOSTNAME*.
-
-- *fai\_db\_install* :: Install db profile. Default is 0.
-
-- *fai\_db\_password* :: Useful for DB installation profile. Default
-     is read-the-source-luke.
-
-- *fai\_db\_port* :: Useful for editor & presentation
-     profiles. Default is 3306.
-
-- *fai\_db\_schema* :: Useful for DB installation profile. Default is
-     ece5db.
-
-- *fai\_db\_user* :: Useful for DB installation profile. Default is
-     ece5user.
+the *ece-install.yaml*:
 
-- *fai\_dry\_run* :: ece-install will download Escenic archives and
-     install OS packages, but will not configure anything.. Default
-     is 0.
-
-- *fai\_editor\_conf\_archive* :: *conf.tar.gz* :: to use for Nursery
-     & JAAS configuration. Default is "".
-
-- *fai\_editor\_deploy\_white\_list* :: The list of WARs to be
-     deployed on this instance.. Default is "escenic-admin escenic
-     studio indexer-webservice webservice".
-
-- *fai\_editor\_ear* :: EAR to use instead of the Escenic
-     binaries. Default is "".
-
-- *fai\_editor\_heap\_size* :: The JVM heap size in megabytes. The
-     default is *2048*.
-
-- *fai\_editor\_install* :: Install the editorial profile. Default
-     is 0.
-
-- *fai\_editor\_name* :: Name of the editor instance. Default is
-     editor1.
-
-- *fai\_editor\_port* :: HTTP port of the editor instance. Default
-     is 8080.
-
-- *fai\_editor\_shutdown* :: Shutdown port of the editor
-     instance. Default is 8005.
-
-- *fai\_editor\_stop\_and\_clear* :: After installation, stop the
-     instances and clear its work & log files. Default is 0.
-
-- *fai\_enabled* :: Whether or not to run ece-install in FAI
-                    mode. Default is 0.
-
-- *fai\_keep\_off\_etc\_hosts* :: Set this to 1 if you don't
-     want *ece-install* adding entries to */etc/hosts*. Default is 0.
-
-- *fai\_monitoring\_admin\_password* :: The admin password of the web
-     interface(s). Currenlty only set for Icinga.. Default is No
-     telling you here ;-).
-
-- *fai\_monitoring\_ece\_host\_list* :: Hosts running one or more ECE
-     instance. Default is "".
-
-- *fai\_monitoring\_host\_list* :: Quoted, space separated list of
-     <host>#<ip> pairs, e.g.:
-     #+BEGIN_SRC text
-     pres1#10.72.227.250
-     pres2#10.72.227.251.
-     #+END_SRC
-     Default is "".
-
-- *fai\_monitoring\_install* :: Install the monitoring server
-     profile.. Default is 0.
-
-- *fai\_monitoring\_munin\_node\_list* :: Set this to a whitespace
-     separated list of nodes that munin should monitor. Default is "".
-
-- *fai\_monitoring\_search\_host\_list* :: Hosts running search
-     instance(s) (Solr + indexer). Default is "".
-
-- *fai\_monitoring\_server\_ip* :: The IP of the monitoring
-     server.. Default is *127.0.0.1*.
-
-- *fai\_nfs\_allowed\_client\_network* :: IP/netmask of allowed NFS
-     clients, example: *192.168.1.0/255.255.255.0*. Default is "".
-
-- *fai\_nfs\_client\_install* :: Installs an NFS client. Default is 0.
-
-- *fai\_nfs\_client\_mount\_point\_parent* :: Mount point parent
-     directory. Default is */mnt*.
-
-- *fai\_nfs\_export\_list* :: Space separated list of NFS export
-     directories, full paths as seen on the NFS server.. Default is
-     "".
-
-- *fai\_nfs\_server\_address* :: Address of the NFS server, useful for
-     the NFS client profile. Default is "".
-
-- *fai\_nfs\_server\_install* :: Install an NFS server. Default is 0.
-
-- *fai\_presentation\_conf\_archive* :: *conf.tar.gz* :: to use for
-     Nursery & JAAS configuration. Default is "".
-
-- *fai\_presentation\_ear* :: EAR to use instead of the Escenic
-     binaries. Default is "".
-
-- *fai\_presentation\_heap\_size* :: The JVM heap size in megabytes. The
-     default is *2048*.
-
-- *fai\_presentation\_install* :: Install the presentation server
-     profile. Default is 0.
-
-- *fai\_presentation\_name* :: Name of the presentation server
-     instance. Default is engine1.
-
-- *fai\_presentation\_port* :: HTTP port of the presentation server
-     instance. Default is 8080.
-
-- *fai\_presentation\_deploy\_white\_list* :: The list of WARs to be
-     deployed on this instance.. Default is "escenic-admin".
-
-- *fai\_presentation\_shutdown* :: Shutdown port of the presentation
-     instance. Default is 8005.
-
-- *fai\_presentation\_stop\_and\_clear* :: After installation, stop
-     the instances and clear its work & log files. Default is 0.
-
-- *fai\_public\_host\_name* :: The public address for your
-     website. Default is *${HOSTNAME}:8080*.
-
-- *fai\_publication\_create* :: Create a new publication. Default
-     is 0.
-
-- *fai\_publication\_domain\_mapping\_list* :: Mapping between
-     publications and domains:
-     #+BEGIN_SRC text
-     "<pub>[,pub.war]#<domain>[#,<alias1>,<alias2>]"
-     #+END_SRC
-     Default is "".
-
-- *fai\_publication\_ear* :: All publications WARs inside will be used
-     for publication creation
-     (requires that *fai\_publication\_create* is 1). Default is "".
-
-- *fai\_publication\_environment* :: The kind of
-     environment/habitat. Typical values are: production, staging,
-     testing, development.. Default is "production".
-
-- *fai\_publication\_name* :: Name of the publication. Default
-     is *mypub*. When installing an editorial or presentation server
-     and not using an EAR, you can specify *fai\_publication\_name*
-     and *fai\_publication\_war* to have *ece-install* set up the
-     correct publication definition for your Assembly Tool
-     environment.
-
-- *fai\_publication\_use\_instance* :: Name of local instance to use
-     for creation. Default is *engine1*.
-
-- *fai\_publication\_war* :: WAR to base the new publication
-     on. Default is WF demo WAR (if present) or the ECE demo
-     WAR. When installing an editorial or presentation server and
-     not using an EAR, you can specify *fai\_publication\_name*
-     and *fai\_publication\_war* to have *ece-install* set up the
-     correct publication definition for your Assembly Tool environment.
-
-- *fai\_publication\_war\_remove\_file\_list* :: File list that should
-     be removed from all WARs inside *fai\_publication\_ear*
-     or *fai\_publication\_war*. Default is "".
-
-- *fai\_rmi\_install* :: Install the RMI hub profile. Default is 0.
-
-- *fai\_search\_conf\_archive* :: *conf.tar.gz* :: to use for Nursery
-     & JAAS configuration. Default is "".
-
-- *fai\_search\_deploy\_white\_list* :: The list of WARs to be
-     deployed on this instance.. Default is "solr indexer-webapp".
-
-- *fai\_search\_ear* :: EAR to use instead of the Escenic
-     binaries. Default is "".
-
-- *fai\_search\_for\_editor* :: If 1, will configure Solr for use with
-     an editorial server, if not for presentation servers.. Default
-     is 0.
-
-- *fai\_search\_heap\_size* :: The JVM heap size in megabytes. The
-     default is *2048*.
-
-- *fai\_search\_indexer\_ws\_uri* :: URI of the indexer-webservice
-     that the search instance shall use for knowing what to
-     index.. Default is
-     http://${HOSTNAME}:8080/indexer-webservice/index/.
-
-- *fai\_search\_install* :: Install the search server profile (Solr +
-     indexer). Default is 0.
-
-- *fai\_search\_name* :: Name of the search instance. Default is
-     search1.
-
-- *fai\_search\_port* :: HTTP port of the search instance. Default
-  is 8080.
-
-- *fai\_search\_shutdown* :: Shutdown port of the search
-  instance. Default is 8005.
-
-- *fai\_vip\_address* :: The virtual IP the provider will
-     claim. Default is "".
-
-- *fai\_vip\_install* :: Install a VIP provider. Default is 0.
-
-- *fai\_vip\_primary\_node\_auth\_key* :: Optional, but useful to set
-     to make conf files consistent. Will be generated if not
-     set. Default is "".
-
-- *fai\_vip\_primary\_node\_ip* :: Primary node IP. Default is "".
-
-- *fai\_vip\_primary\_node\_name* :: Primary node name, must be what
-     $(uname -n) returns. Default is "".
-
-- *fai\_vip\_secondary\_node\_ip* :: Secondary node IP. Default is "".
-
-- *fai\_vip\_secondary\_node\_name* :: Secondary node name, must be
-     what $(uname -n) returns. Default is "".
-
-- *fai\_vip\_service\_list* :: List of init.d scripts to invoke when
-     the VIP is acclaimed/revoked, script must support start &
-     stop. Default is "".
-
-- *fai\_vip\_sibling\_ip* :: The IP of the other node offering the
-  VIP. Default is "".
-
-- *fai\_wf\_install* :: Install Widget Framework profile. Default is 0.
-
-- *fallback\_tomcat\_url* :: Override url used to download Tomcat. As old
-    releases are removed from Tomcat download mirrors this can be used to
-    point to the updated versions. Use the link for the .tar.gz file.
-
-As you've probably already found out, *0* means "false" and *1* means "true".
+#+include: "ece-install-conf-reference.org"
 
 ** Example Configurations
 Here are a few simple example configurations, you can find more under
@@ -1337,26 +986,32 @@ Here are a few simple example configurations, you can find more under
 To automatically install an editorial server and create a publication
 called "jollygood", run *ece-install* with the following settings:
 
-#+BEGIN_SRC conf
-fai_editor_install=1
-fai_publication_create=1
-fai_publication_name=jollygood
+#+BEGIN_SRC yaml
+profiles:
+  editor:
+    install: true
+  publications:
+    - name: jollygood
+      create: true
 #+END_SRC
 
 ****** Install Two Presentation Servers On a Single Host
 To install two presentation servers called *engine1* and
 *engine2* on the same host,  first run *ece-install* with the following settings:
-#+BEGIN_SRC conf
-fai_presentation_install=1
-fai_presentation_name=engine1
+#+BEGIN_SRC yaml
+profiles:
+  presentation:
+    install: true
 #+END_SRC
 
 Then run it a second time with the following settings:
-#+BEGIN_SRC conf
-fai_presentation_install=1
-fai_presentation_name=engine2
-fai_presentation_port=8081
-fai_presentation_shutdown=8105
+#+BEGIN_SRC yaml
+profiles:
+  presentation:
+    install: true
+    name: engine2
+    port: 8081
+    shutdown: 8105
 #+END_SRC
 More parameters are required the second time. On the first run,
 defaults could be used, but the second time you need to override the
@@ -1404,7 +1059,7 @@ bundle, see the FAI section.
 * Using a Custom Configuration File for ece-install
 You can specify a different configuration by using the -f parameter:
 #+BEGIN_SRC text
-# ece-install -f ece-install-presentation-server.conf
+# ece-install -f ece-install-presentation-server.yaml
 #+END_SRC
 
 * Overview of File Paths Used by the ece-install command
@@ -1479,7 +1134,7 @@ but these should be the most interesting ones.
 
 * Overriding the Escenic directories
 All of the Escenic specific directories may be overwritten in
-ece-install.conf. Here's an example of changing all the paths possible
+=ece-install.conf=. Here's an example of changing all the paths possible
 with the same suffix.
 
 #+BEGIN_SRC conf
@@ -1503,6 +1158,9 @@ and plugins. Another usecase is if you want to test out a new minor
 version of ECE, e.g. you're currently running 5.4, but want to try
 out 5.5 in parallel on the same boxes.
 
+This feature is currently only available through the use of
+=.conf= configuration files.
+
 * Extending ece-install by Writing Hooks
 ece-install  has a number of hooks on which you can hook on your own
 scripts. The scripts are to reside in $HOME/ece-conf.d/ and have names
@@ -1551,60 +1209,6 @@ set_up_solr.preinst
 set_up_solr.postinst
 #+END_SRC
 
-* Uninstalling Everything that the ece-install Set Up
-#+BEGIN_QUOTE
-WARNING: this is potentially dangerous as some of these components may
-be used by other pieces of software you have running on your
-host. However, this may be useful if you're installing a clean
-environment and want to e.g. undo your previous install to install a
-different profile.
-#+END_QUOTE
-
-You trigger this by setting the following in your *ece-install.conf*:
-#+BEGIN_SRC conf
-fai_un_install_everything=1
-#+END_SRC
-
-*ece-install* will then prompt the user to type a confirmation
-sentence. Once the un-installation is done, a summary is printed to
-the user.
-
-*ece-install* will then continue with the other tasks and installation
-profiles if so defined. The fai_un_install_everything=1 is processed
-before any other FAI profile, hence, on a system where you want to
-wipe the slate clean before starting over, you can for instance do:
-
-#+BEGIN_SRC conf
-fai_un_install_everything=1
-fai_presentation_install=1
-#+END_SRC
-
-The output will be similar to:
-#+BEGIN_SRC text
-[ece-install-5] You have set fai_un_install_everything=1 in your
-  /root/ece-install.conf
-[ece-install-5] This will uninstall the following on raven:
-[ece-install-5] Packages to be removed: ant ant-contrib
-  ant-optional escenic-content-engine-scripts
-  escenic-munin-plugins escenic-munin-plugins libmysql-java maven2
-  memcached munin munin-node munin-plugins-extra
-  munin-java-extra nginx percona-server-client
-  percona-server-client-5.5 percona-server-common-5.5
-  percona-server-server percona-server-server-5.5
-  varnish sun-java6-jdk
-[ece-install-5] Files & directories to be removed: /etc/escenic
-  /opt/*tomcat* /opt/escenic /var/lib/escenic /var/run/escenic
-/etc/escenic /var/log/escenic /etc/apt/sources.list.d/escenic.list
-[ece-install-5] APT keys to be removed: C4DEFFEB CD2EFD2A
-[ece-install-5] If you're absolutely sure about this, type:
-[ece-install-5] I know what I'm doing, please do as I say.
-I know what I'm doing, please do as I say.
-[ece-install-11] OK, I'll do as you wish:
-[ece-install-11] I will uninstall everything from ece-install
-[ece-install-11] Everything (well, most) set up by ece-install
-[ece-install-11] should now have been removed from raven.
-#+END_SRC
-
 * GOALS & DESIGN CHOICES
 If you are a power user of *ece-install*, if you're just curious or
 indeed wish to extend it, you will find it interesting to read this
@@ -1770,7 +1374,7 @@ using *ece-install*.
 Torstein Krause Johansen, Erik Mogsensen
 
 * COPYRIGHT
-Copyright 2011-2015 Escenic
+Copyright 2011-2017 Escenic
 
 Licensed under the Apache License, Version 2.0, see
 https://github.com/escenic/ece-scripts/COPYING for further details.

From c2e27f6ecf0065759ff6913b1e8886671d06cc29 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Tue, 2 May 2017 09:44:41 +0200
Subject: [PATCH 2537/2585] Full support for deployment white list through YAML

---
 .../src/unit-tests/ece-install-conf-file-reader-test.sh   | 8 +++++++-
 .../escenic/ece-scripts/ece-install.d/conf-file-reader.sh | 7 +++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
index c3e9049c..5e7c37ee 100644
--- a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
+++ b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
@@ -88,6 +88,7 @@ test_can_parse_yaml_conf_editor() {
   local editor_redirect=4333
   local editor_name=fooeditor1
   local editor_host=edapp1
+  local editor_deploy_white_list=foo
 
   local yaml_file=
   yaml_file=$(mktemp)
@@ -101,6 +102,7 @@ profiles:
     name: ${editor_name}
     redirect: ${editor_redirect}
     shutdown: ${editor_shutdown}
+    deploy_white_list: ${editor_deploy_white_list}
 EOF
 
   unset fai_editor_install
@@ -108,6 +110,7 @@ EOF
   unset fai_editor_shutdown
   unset fai_editor_redirect
   unset fai_editor_name
+  unset fai_editor_deploy_white_list
 
   parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
   assertNotNull "Should set fai_editor_install" "${fai_editor_install}"
@@ -117,6 +120,9 @@ EOF
   assertEquals "Should set fai_editor_shutdown" "${editor_shutdown}" "${fai_editor_shutdown}"
   assertEquals "Should set fai_editor_redirect" "${editor_redirect}" "${fai_editor_redirect}"
   assertEquals "Should set fai_editor_name" "${editor_name}" "${fai_editor_name}"
+  assertEquals "Should set fai_editor_deploy_white_list" \
+               "${editor_deploy_white_list}" \
+               "${fai_editor_deploy_white_list}"
 
   rm -rf "${yaml_file}"
 }
@@ -187,7 +193,7 @@ EOF
                "${fai_presentation_search_indexer_ws_uri}"
   assertEquals "Should set fai_presentation_deploy_white_list" \
                "${presentation_deploy_white_list}" \
-               "${presentation_deploy_white_list}"
+               "${fai_presentation_deploy_white_list}"
 
   rm -rf "${yaml_file}"
 }
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
index 7ac921f8..aea4756f 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
@@ -260,6 +260,13 @@ _parse_yaml_conf_file_editor() {
   if [ -n "${install_editor_redirect}" ]; then
     export fai_editor_redirect=${install_editor_redirect}
   fi
+
+  local install_editor_deploy_white_list=
+  install_editor_deploy_white_list=$(
+    _jq "${yaml_file}" .profiles.editor.deploy_white_list)
+  if [ -n "${install_editor_deploy_white_list}" ]; then
+    export fai_editor_deploy_white_list=${install_editor_deploy_white_list}
+  fi
 }
 
 _parse_yaml_conf_file_environment() {

From aad4a4a580758052d4b0e271fc040ab129e1ffc7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Tue, 2 May 2017 09:55:24 +0200
Subject: [PATCH 2538/2585] YAML support for specifying the DB vendor

---
 .../src/unit-tests/ece-install-conf-file-reader-test.sh    | 7 +++++++
 .../escenic/ece-scripts/ece-install.d/conf-file-reader.sh  | 6 ++++++
 2 files changed, 13 insertions(+)
 mode change 100644 => 100755 usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh

diff --git a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
old mode 100644
new mode 100755
index 5e7c37ee..4fdfbfc0
--- a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
+++ b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
@@ -269,6 +269,7 @@ test_can_parse_yaml_conf_db() {
   local db_master=1
   local db_drop_old_db_first=1
   local db_replication=1
+  local _db_vendor=foodb
 
   cat > "${yaml_file}" <<EOF
 ---
@@ -284,6 +285,7 @@ profiles:
     port: ${db_port}
     drop_old_db_first: yes
     replication: yes
+    vendor: ${_db_vendor}
 EOF
 
   unset fai_db_install
@@ -296,6 +298,8 @@ EOF
   unset fai_db_ear
   unset fai_db_drop_old_db_first
   unset fai_db_replication
+  unset db_vendor
+
   parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
 
   assertNotNull "Should set fai_db_install" "${fai_db_install}"
@@ -329,6 +333,9 @@ EOF
   assertNotNull "Should set fai_db_port" "${fai_db_port}"
   assertEquals "Should set fai_db_port" "${db_port}" "${fai_db_port}"
 
+  assertNotNull "Should set db_vendor" "${db_vendor}"
+  assertEquals "Should set db_vendor" "${_db_vendor}" "${db_vendor}"
+
   rm -rf "${yaml_file}"
 }
 
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
index aea4756f..79b5f037 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
@@ -723,6 +723,12 @@ _parse_yaml_conf_file_db() {
   if [ -n "${install_db_ear}" ]; then
     export fai_db_ear=${install_db_ear}
   fi
+
+  local install_db_vendor=
+  install_db_vendor=$(_jq "${yaml_file}" .profiles.db.vendor)
+  if [ -n "${install_db_vendor}" ]; then
+    export db_vendor=${install_db_vendor}
+  fi
 }
 
 _parse_yaml_conf_file_analysis_db() {

From 4a44a557d7a4b6ad63dff111845f14c2f0e95e3f Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 5 May 2017 15:42:24 +0200
Subject: [PATCH 2539/2585] YAML support for fai_editor_ear + basic CUE config

---
 .../ece-install-conf-file-reader-test.sh      | 32 +++++++++++++++++++
 .../ece-install.d/conf-file-reader.sh         | 30 +++++++++++++++++
 2 files changed, 62 insertions(+)

diff --git a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
index c3e9049c..c530eb86 100644
--- a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
+++ b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
@@ -88,6 +88,7 @@ test_can_parse_yaml_conf_editor() {
   local editor_redirect=4333
   local editor_name=fooeditor1
   local editor_host=edapp1
+  local editor_ear=http://builder/engine.ear
 
   local yaml_file=
   yaml_file=$(mktemp)
@@ -101,6 +102,7 @@ profiles:
     name: ${editor_name}
     redirect: ${editor_redirect}
     shutdown: ${editor_shutdown}
+    ear: ${editor_ear}
 EOF
 
   unset fai_editor_install
@@ -108,6 +110,7 @@ EOF
   unset fai_editor_shutdown
   unset fai_editor_redirect
   unset fai_editor_name
+  unset fai_editor_ear
 
   parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
   assertNotNull "Should set fai_editor_install" "${fai_editor_install}"
@@ -117,6 +120,7 @@ EOF
   assertEquals "Should set fai_editor_shutdown" "${editor_shutdown}" "${fai_editor_shutdown}"
   assertEquals "Should set fai_editor_redirect" "${editor_redirect}" "${fai_editor_redirect}"
   assertEquals "Should set fai_editor_name" "${editor_name}" "${fai_editor_name}"
+  assertEquals "Should set fai_editor_ear" "${editor_ear}" "${fai_editor_ear}"
 
   rm -rf "${yaml_file}"
 }
@@ -361,6 +365,34 @@ EOF
   rm -rf "${yaml_file}"
 }
 
+test_can_parse_yaml_conf_cue() {
+  local cue_backend_ece=http://ece.example.com
+  local cue_backend_ng=http://ng.example.com
+
+  local yaml_file=
+  yaml_file=$(mktemp)
+  cat > "${yaml_file}" <<EOF
+---
+profiles:
+  cue:
+    install: yes
+    backend_ece: ${cue_backend_ece}
+    backend_ng: ${cue_backend_ng}
+EOF
+
+  unset fai_cue_install
+  unset fai_cue_backend_ece
+  unset fai_cue_backend_ng
+
+  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
+  assertNotNull "Should set fai_cue_install" "${fai_cue_install}"
+  assertEquals "Should set fai_cue_install" 1 "${fai_cue_install}"
+  assertEquals "fai_cue_backend_ece" "${cue_backend_ece}" "${fai_cue_backend_ece}"
+  assertEquals "fai_cue_backend_ng" "${cue_backend_ng}" "${fai_cue_backend_ng}"
+
+  rm -rf "${yaml_file}"
+}
+
 test_can_parse_yaml_conf_assembly_tool() {
   local yaml_file=
   yaml_file=$(mktemp)
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
index 7ac921f8..902be257 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
@@ -52,6 +52,7 @@ parse_yaml_conf_file_or_source_if_sh_conf() {
   _parse_yaml_conf_file_monitoring "${yaml_file}"
   _parse_yaml_conf_file_assembly_tool "${yaml_file}"
   _parse_yaml_conf_file_restore "${yaml_file}"
+  _parse_yaml_conf_file_cue "${yaml_file}"
 }
 
 _parse_yaml_conf_file_credentials() {
@@ -260,6 +261,12 @@ _parse_yaml_conf_file_editor() {
   if [ -n "${install_editor_redirect}" ]; then
     export fai_editor_redirect=${install_editor_redirect}
   fi
+
+  local install_editor_ear=
+  install_editor_ear=$(_jq "${yaml_file}" .profiles.editor.ear)
+  if [ -n "${install_editor_ear}" ]; then
+    export fai_editor_ear=${install_editor_ear}
+  fi
 }
 
 _parse_yaml_conf_file_environment() {
@@ -759,6 +766,29 @@ _parse_yaml_conf_file_analysis_db() {
   fi
 }
 
+_parse_yaml_conf_file_cue() {
+  local yaml_file=$1
+
+  local install_cue=no
+  install_cue=$(_jq "${yaml_file}" .profiles.cue.install)
+  if [[ "${install_cue}" == "yes" ||
+          "${install_cue}" == "true" ]]; then
+    export fai_cue_install=1
+  fi
+
+  local install_cue_backend_ece=
+  install_cue_backend_ece=$(_jq "${yaml_file}" .profiles.cue.backend_ece)
+  if [ -n "${install_cue_backend_ece}" ]; then
+    export fai_cue_backend_ece=${install_cue_backend_ece}
+  fi
+
+  local install_cue_backend_ng=
+  install_cue_backend_ng=$(_jq "${yaml_file}" .profiles.cue.backend_ng)
+  if [ -n "${install_cue_backend_ng}" ]; then
+    export fai_cue_backend_ng=${install_cue_backend_ng}
+  fi
+}
+
 _jq() {
   local yaml_file=$1
   local key=$2

From 81c903c6471800f09fe4ca3c3fb581e5900617e4 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 5 May 2017 15:43:11 +0200
Subject: [PATCH 2540/2585] Bit of hardening to /usr/bin/ece create-publication

---
 usr/share/escenic/ece-scripts/ece.d/create-publication.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/create-publication.sh b/usr/share/escenic/ece-scripts/ece.d/create-publication.sh
index bdf87b69..d6ce3543 100644
--- a/usr/share/escenic/ece-scripts/ece.d/create-publication.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/create-publication.sh
@@ -23,9 +23,9 @@ _create_publication_find_par_if_none_has_been_specified() {
   par=$(
     find /usr/share/escenic/escenic-content-engine-* \
          -maxdepth 3 \
-         -name demo-clean.war)
+         -name demo-clean.war 2>/dev/null)
 
-  if [ -r "${par}" ]; then
+  if [[ -n "${par}" && -r "${par}" ]]; then
     file=${par}
   fi
 }

From 1e87c7ac8479e6f35a4416f0e7389cd3a2c653df Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 5 May 2017 16:02:29 +0200
Subject: [PATCH 2541/2585] VOSA-251 ece-install can now install CUE

- sets up nginx with CORS. Assumes nginx version >= 1.10.x. This is
  the version in Ubuntu LTS and Debian Stretch, as well as CentOS 7.3

- if the user hasn't specified trusted origins (CORS), ece-install
  will set up the following:
  -- the machine's hostname is trusted (e.g. if the machine is called
     "cue-editor", users can access CUE in their browser with that
      name (if that name is in their (company) DNS
  -- all the machine's IPs are trusted (except 127.0.0.1)
  -- localhost is trusted

- if the user hasn't configured Escenic backend, ece-install assumes
  ECE runs on the same machine, accessible through port 8080.

- configuration options can be viewed in the unit tests:
  usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
---
 .../ece-install-conf-file-reader-test.sh      |   7 +
 usr/sbin/ece-install                          |  17 +-
 .../ece-install.d/conf-file-reader.sh         |  12 ++
 .../escenic/ece-scripts/ece-install.d/cue.sh  | 178 ++++++++++++++++++
 4 files changed, 211 insertions(+), 3 deletions(-)
 create mode 100644 usr/share/escenic/ece-scripts/ece-install.d/cue.sh

diff --git a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
index c530eb86..af522619 100644
--- a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
+++ b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
@@ -368,6 +368,8 @@ EOF
 test_can_parse_yaml_conf_cue() {
   local cue_backend_ece=http://ece.example.com
   local cue_backend_ng=http://ng.example.com
+  local cue_cors_origin1=editor.example.com
+  local cue_cors_origin2=cue.example.com
 
   local yaml_file=
   yaml_file=$(mktemp)
@@ -378,17 +380,22 @@ profiles:
     install: yes
     backend_ece: ${cue_backend_ece}
     backend_ng: ${cue_backend_ng}
+    cors_origins:
+      - ${cue_cors_origin1}
+      - ${cue_cors_origin2}
 EOF
 
   unset fai_cue_install
   unset fai_cue_backend_ece
   unset fai_cue_backend_ng
+  unset fai_cue_cors_origins
 
   parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
   assertNotNull "Should set fai_cue_install" "${fai_cue_install}"
   assertEquals "Should set fai_cue_install" 1 "${fai_cue_install}"
   assertEquals "fai_cue_backend_ece" "${cue_backend_ece}" "${fai_cue_backend_ece}"
   assertEquals "fai_cue_backend_ng" "${cue_backend_ng}" "${fai_cue_backend_ng}"
+  assertEquals "fai_cue_cors_origins" "${cue_cors_origin1} ${cue_cors_origin2}" "${fai_cue_cors_origins}"
 
   rm -rf "${yaml_file}"
 }
diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index debab36a..fef785b7 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -294,9 +294,15 @@ function install_common_os_packages()
     if [ ${fai_offline_mode-0} -eq 0 ]; then
       curl -s http://apt.escenic.com/archive.key 2>> $log | \
         apt-key add - 1>> $log 2>> $log
-      local package_pool=${fai_apt_vizrt_pool-stable}
-      add_apt_source "deb http://apt.escenic.com ${package_pool} main"
       run apt-get update
+
+      # Only add our repo if there's no other entry (from our pool or
+      # not), there
+      if ! grep -q apt.escenic.com /etc/apt/sources.list.d/escenic.list; then
+        local package_pool=${fai_apt_vizrt_pool-stable}
+        add_apt_source "deb http://apt.escenic.com ${package_pool} main non-free"
+        run apt-get update
+      fi
     fi
 
     # Allow manually installed escenic-common-scripts
@@ -420,7 +426,7 @@ function print_status_and_next_steps()
     local minutes=$(( seconds_left / 60 ))
     local seconds_left=$(( seconds_left - $minutes * 60 ))
 
-    if [ $install_profile_number -ne $PROFILE_RESTORE_FROM_BACKUP ]; then
+    if [ "${install_profile_number-42}" -ne "${PROFILE_RESTORE_FROM_BACKUP}" ]; then
       local message="The installation is now $(green complete)!"
     else
       local message="The restore is now $(green complete)!"
@@ -1104,6 +1110,11 @@ function main() {
       no_fai_profile=0
     fi
 
+    if [ "${fai_cue_install-0}" -eq 1 ]; then
+      install_cue
+      no_fai_profile=0
+    fi
+
     if [ $no_fai_profile -eq 1 ]; then
         print_and_log "No install profile selected, be sure to have one of the "
         print_and_log "fai_<profile>_install=1 in your $conf_file"
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
index 902be257..6072b67d 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
@@ -787,6 +787,18 @@ _parse_yaml_conf_file_cue() {
   if [ -n "${install_cue_backend_ng}" ]; then
     export fai_cue_backend_ng=${install_cue_backend_ng}
   fi
+
+  local count=0
+  count=$(_jq "${yaml_file}" ".profiles.cue.cors_origins | length")
+  for ((i = 0; i < count; i++)); do
+    local cors_origin=
+    cors_origin=$(_jq "${yaml_file}" .profiles.cue.cors_origins["${i}"])
+    if [ -n "${fai_cue_cors_origins}" ]; then
+      export fai_cue_cors_origins=${fai_cue_cors_origins}" "${cors_origin}
+    else
+      export fai_cue_cors_origins=${cors_origin}
+    fi
+  done
 }
 
 _jq() {
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cue.sh b/usr/share/escenic/ece-scripts/ece-install.d/cue.sh
new file mode 100644
index 00000000..6a4bdb7c
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cue.sh
@@ -0,0 +1,178 @@
+# -*- mode: sh; sh-shell: bash; -*-
+
+## ece-install module that installs and configures all CUE and CUE
+## plugins defined in the configuration file. Furthermore, it sets up
+## CORS and a web server.
+##
+## by torstein@escenic.com
+
+default_cue_backend_ece=http://localhost:8080
+
+_cue_setup_cors() {
+  print_and_log "Configuring the CUE editor: CORS ..."
+  _cue_setup_cors_nginx
+}
+
+_cue_setup_cors_nginx() {
+  if [ "${on_debian_or_derivative-0}" -eq 1 ]; then
+    _cue_setup_cors_nginx_debian
+  elif [ "${on_redhat_or_derivative-0}" -eq 1 ]; then
+    _cue_setup_cors_nginx_redhat
+  fi
+}
+
+_cue_setup_cors_nginx_redhat() {
+  local file=/etc/nginx/default.d/cue
+  _cue_setup_cors_nginx_create_cors_setup_in_file "${file}"
+}
+
+_cue_setup_cors_get_allowed_origins() {
+  local result=
+  if [ -n "${fai_cue_cors_origins}" ]; then
+    result=${fai_cue_cors_origins}
+  else
+    result=$(
+      ifconfig |
+        sed -r  -n 's#inet addr:([^ ]*) .*#\1#p' |
+        grep -v 127.0.0.1
+      )
+    result="${HOSTNAME} ${result}"
+  fi
+
+  echo "${result}"
+}
+
+## $1 :; file
+_cue_setup_cors_nginx_create_cors_setup_in_file() {
+  local file=$1
+  cat >> "${file}" <<EOF
+server {
+  location ~ "/(escenic|studio|webservice|webservice-extensions)/(.*)" {
+EOF
+
+  for origin in $(_cue_setup_cors_get_allowed_origins); do
+    cat >> "${file}" <<EOF
+    if (\$http_origin ~* (://${origin}(:[0-9]+)?)\$) {
+      set \$cors "true";
+    }
+EOF
+  done
+
+  cat >> "${file}" <<EOF
+    if (\$http_origin ~* (http://localhost(:[0-9]+)?)\$) {
+      set \$cors "true";
+    }
+    if (\$request_method = 'OPTIONS') {
+      set \$cors "\${cors}options";
+    }
+    if (\$request_method = 'GET') {
+      set \$cors "\${cors}get";
+    }
+    if (\$request_method = 'HEAD') {
+      set \$cors "\${cors}get";
+    }
+    if (\$request_method = 'POST') {
+      set \$cors "\${cors}post";
+    }
+    if (\$request_method = 'PUT') {
+      set \$cors "\${cors}post";
+    }
+    if (\$request_method = 'DELETE') {
+      set \$cors "\${cors}post";
+    }
+    if (\$cors = "trueget") {
+      add_header "Access-Control-Allow-Origin" "\$http_origin";
+      add_header "Access-Control-Allow-Credentials" "true";
+      add_header "Access-Control-Expose-Headers" "Link,X-ECE-Active-Connections,Location,ETag";
+    }
+    if (\$cors = "truepost") {
+      add_header "Access-Control-Allow-Origin" "\$http_origin";
+      add_header "Access-Control-Allow-Credentials" "true";
+      add_header "Access-Control-Expose-Headers"
+        "Link,X-ECE-Active-Connections,Location,ETag";
+    }
+    if (\$cors = "trueoptions") {
+      add_header 'Access-Control-Allow-Origin' "\$http_origin";
+      add_header 'Access-Control-Allow-Credentials' 'true';
+      add_header 'Access-Control-Max-Age' 1728000;
+      add_header 'Access-Control-Allow-Methods' 'GET, POST, HEAD, OPTIONS, PUT, DELETE';
+      add_header 'Access-Control-Allow-Headers' 'Authorization,Content-Type,Accept,Origin,User-Agent,DNT,Cache-Control,X-Mx-ReqToken,Keep-Alive,X-Requested-With,If-Modified-Since,If-Match,If-None-Match,X-Escenic-Locks,X-Escenic-media-filename';
+      add_header 'Content-Length' 0;
+      add_header 'Content-Type' 'text/plain charset=UTF-8';
+      return 204;
+    }
+
+    proxy_set_header Host \$http_host;
+    proxy_pass ${fai_cue_backend_ece-${default_cue_backend_ece}};
+  }
+EOF
+}
+
+_cue_setup_cors_nginx_debian() {
+  local file=/etc/nginx/sites-available/cue
+  _cue_setup_cors_nginx_create_cors_setup_in_file "${file}"
+  cat >> "${file}" <<EOF
+  location ~ "/cue-web" {
+    root /var/www/html;
+  }
+}
+EOF
+
+  local link_target=
+  link_target="/etc/nginx/sites-enabled/$(basename "${file}")"
+  if [ -h "${link_target}" ]; then
+    rm "${link_target}"
+  fi
+  run ln -s "${file}" "${link_target}"
+
+  local default=/etc/nginx/sites-enabled/default
+  if [ -h "${default}" ]; then
+    print_and_log "Configuring the CUE editor: disabling default nginx conf ..."
+    run rm "${default}"
+  fi
+
+  run service nginx reload
+}
+
+_cue_install_web_server() {
+  install_packages_if_missing nginx
+}
+
+_cue_configure() {
+  print_and_log "Configuring the CUE editor: backends ..."
+  find /etc/escenic/cue-web-* -maxdepth 0 -type d 2>/dev/null |
+    while read -r d; do
+      local file="${d}/backends.yml"
+      cat > "${file}" <<EOF
+# ${file} generated by $(basename "$0") @ $(date)
+
+endpoints:
+  escenic: ${fai_cue_backend_ece-/webservice/index.xml}
+EOF
+      if [ -n "${fai_cue_backend_ng}" ]; then
+        echo "  newsgate: ${fai_cue_backend_ece}" >> "${file}"
+      fi
+    done
+
+  if [ "${on_debian_or_derivative-0}" -eq 1 ]; then
+    _cue_configure_debian
+  fi
+
+}
+
+_cue_configure_debian() {
+  dpkg -l 'cue-web-*' |
+    awk '/cue-web/{print $2}' |
+    while read -r package; do
+      print_and_log "Configuring the CUE editor: ${package} ..."
+      run dpkg-reconfigure "${package}"
+    done
+}
+
+install_cue() {
+  print_and_log "Installing the CUE editor on ${HOSTNAME} ..."
+  download_escenic_components
+  _cue_install_web_server
+  _cue_configure
+  _cue_setup_cors
+}

From 973732d26e68493ac13daed7356a6d3893d7dbf2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Wed, 10 May 2017 11:10:00 +0200
Subject: [PATCH 2542/2585] ece-install now supports YAML conf of NFS client
 and server profiles

---
 .../ece-install-conf-file-reader-test.sh      | 72 +++++++++++++++++++
 .../escenic/ece-install-conf-reference.org    | 46 +++++++++++-
 .../ece-install.d/conf-file-reader.sh         | 72 +++++++++++++++++++
 3 files changed, 189 insertions(+), 1 deletion(-)

diff --git a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
index c3e9049c..86a5be33 100644
--- a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
+++ b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
@@ -361,6 +361,78 @@ EOF
   rm -rf "${yaml_file}"
 }
 
+test_can_parse_yaml_conf_nfs_server() {
+  local nfs_server_address="nfs.example.com"
+  local nfs_allowed_client_network="10.0.0.1/24"
+  local nfs_export_list="/var/exports/app1 /var/exports/app2"
+  local nfs_client_mount_point_parent=/mnt
+  local port=81
+
+  local yaml_file=
+  yaml_file=$(mktemp)
+  cat > "${yaml_file}" <<EOF
+---
+profiles:
+  nfs_server:
+    install: yes
+    server_address: ${nfs_server_address}
+    allowed_client_network: ${nfs_allowed_client_network}
+    export_list: ${nfs_export_list}
+    client_mount_point_parent: ${nfs_client_mount_point_parent}
+EOF
+
+  unset fai_nfs_export_list
+  unset fai_nfs_server_address
+  unset fai_nfs_server_install
+  unset fai_nfs_allowed_client_network
+  unset fai_nfs_client_mount_point_parent
+
+  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
+  assertNotNull "Should set fai_nfs_server_install" "${fai_nfs_server_install}"
+  assertEquals "Should set fai_nfs_server_install" 1 "${fai_nfs_server_install}"
+  assertEquals "fai_nfs_server_address" "${nfs_server_address}" "${fai_nfs_server_address}"
+  assertEquals "fai_nfs_allowed_client_network" "${nfs_allowed_client_network}" "${fai_nfs_allowed_client_network}"
+  assertEquals "fai_nfs_export_list" "${nfs_export_list}" "${fai_nfs_export_list}"
+
+  rm -rf "${yaml_file}"
+}
+
+test_can_parse_yaml_conf_nfs_client() {
+  local nfs_server_address="nfs.example.com"
+  local nfs_allowed_client_network="10.0.0.1/24"
+  local nfs_export_list="/var/exports/app1 /var/exports/app2"
+  local nfs_client_mount_point_parent=/mnt
+  local port=81
+
+  local yaml_file=
+  yaml_file=$(mktemp)
+  cat > "${yaml_file}" <<EOF
+---
+profiles:
+  nfs_client:
+    install: yes
+    server_address: ${nfs_server_address}
+    allowed_client_network: ${nfs_allowed_client_network}
+    export_list: ${nfs_export_list}
+    client_mount_point_parent: ${nfs_client_mount_point_parent}
+EOF
+
+  unset fai_nfs_export_list
+  unset fai_nfs_server_address
+  unset fai_nfs_client_install
+  unset fai_nfs_allowed_client_network
+  unset fai_nfs_client_mount_point_parent
+
+  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
+  assertNotNull "Should set fai_nfs_client_install" "${fai_nfs_client_install}"
+  assertEquals "Should set fai_nfs_client_install" 1 "${fai_nfs_client_install}"
+  assertEquals "fai_nfs_server_address" "${nfs_server_address}" "${fai_nfs_server_address}"
+  assertEquals "fai_nfs_allowed_client_network" "${nfs_allowed_client_network}" "${fai_nfs_allowed_client_network}"
+  assertEquals "fai_nfs_export_list" "${nfs_export_list}" "${fai_nfs_export_list}"
+
+  rm -rf "${yaml_file}"
+}
+
 test_can_parse_yaml_conf_assembly_tool() {
   local yaml_file=
   yaml_file=$(mktemp)
diff --git a/usr/share/doc/escenic/ece-install-conf-reference.org b/usr/share/doc/escenic/ece-install-conf-reference.org
index 13975a16..910ee09b 100644
--- a/usr/share/doc/escenic/ece-install-conf-reference.org
+++ b/usr/share/doc/escenic/ece-install-conf-reference.org
@@ -1,5 +1,5 @@
 Overview of =ece-install='s configuration options. Generated from the
-configuration file parser's unit tests @ Tue May  2 09:01:11 CEST 2017.
+configuration file parser's unit tests @ Wed May 10 11:10:41 CEST 2017.
 
 *** environment
 
@@ -178,6 +178,50 @@ fai_cache_conf_dir=
 
 #+end_src
 
+*** nfs_server
+
+#+begin_src yaml
+profiles:
+  nfs_server:
+    install: yes
+    server_address: ${nfs_server_address}
+    allowed_client_network: ${nfs_allowed_client_network}
+    export_list: ${nfs_export_list}
+    client_mount_point_parent: ${nfs_client_mount_point_parent}
+#+end_src
+=ece-install.conf= equivalent:
+#+begin_src: text
+
+fai_nfs_export_list=
+fai_nfs_server_address=
+fai_nfs_server_install=
+fai_nfs_allowed_client_network=
+fai_nfs_client_mount_point_parent=
+
+#+end_src
+
+*** nfs_client
+
+#+begin_src yaml
+profiles:
+  nfs_client:
+    install: yes
+    server_address: ${nfs_server_address}
+    allowed_client_network: ${nfs_allowed_client_network}
+    export_list: ${nfs_export_list}
+    client_mount_point_parent: ${nfs_client_mount_point_parent}
+#+end_src
+=ece-install.conf= equivalent:
+#+begin_src: text
+
+fai_nfs_export_list=
+fai_nfs_server_address=
+fai_nfs_client_install=
+fai_nfs_allowed_client_network=
+fai_nfs_client_mount_point_parent=
+
+#+end_src
+
 *** assembly_tool
 #+begin_src yaml
 profiles:
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
index 7ac921f8..3cf935dd 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
@@ -52,6 +52,8 @@ parse_yaml_conf_file_or_source_if_sh_conf() {
   _parse_yaml_conf_file_monitoring "${yaml_file}"
   _parse_yaml_conf_file_assembly_tool "${yaml_file}"
   _parse_yaml_conf_file_restore "${yaml_file}"
+  _parse_yaml_conf_file_nfs_server "${yaml_file}"
+  _parse_yaml_conf_file_nfs_client "${yaml_file}"
 }
 
 _parse_yaml_conf_file_credentials() {
@@ -357,6 +359,76 @@ _parse_yaml_conf_file_assembly_tool() {
   fi
 }
 
+_parse_yaml_conf_file_nfs_server() {
+  local yaml_file=$1
+
+  local install_nfs=
+  install_server_nfs=$(_jq "${yaml_file}" .profiles.nfs_server.install)
+  if [[ "${install_server_nfs}" == "yes" ||
+          "${install_server_nfs}" == "true" ]]; then
+    export fai_nfs_server_install=1
+  fi
+
+  local nfs_server_address=
+  nfs_server_address=$(_jq "${yaml_file}" .profiles.nfs_server.server_address)
+  if [ -n "${nfs_server_address}" ]; then
+    export fai_nfs_server_address=${nfs_server_address}
+  fi
+
+  local nfs_allowed_client_network=
+  nfs_allowed_client_network=$(_jq "${yaml_file}" .profiles.nfs_server.allowed_client_network)
+  if [ -n "${nfs_allowed_client_network}" ]; then
+    export fai_nfs_allowed_client_network=${nfs_allowed_client_network}
+  fi
+
+  local nfs_client_mount_point_parent=
+  nfs_client_mount_point_parent=$(_jq "${yaml_file}" .profiles.nfs_server.client_mount_point_parent)
+  if [ -n "${nfs_client_mount_point_parent}" ]; then
+    export fai_nfs_client_mount_point_parent=${nfs_client_mount_point_parent}
+  fi
+
+  local nfs_export_list=
+  nfs_export_list=$(_jq "${yaml_file}" .profiles.nfs_server.export_list)
+  if [ -n "${nfs_export_list}" ]; then
+    export fai_nfs_export_list=${nfs_export_list}
+  fi
+}
+
+_parse_yaml_conf_file_nfs_client() {
+  local yaml_file=$1
+
+  local install_client_nfs=
+  install_client_nfs=$(_jq "${yaml_file}" .profiles.nfs_client.install)
+  if [[ "${install_client_nfs}" == "yes" ||
+          "${install_client_nfs}" == "true" ]]; then
+    export fai_nfs_client_install=1
+  fi
+
+  local nfs_server_address=
+  nfs_server_address=$(_jq "${yaml_file}" .profiles.nfs_client.server_address)
+  if [ -n "${nfs_server_address}" ]; then
+    export fai_nfs_server_address=${nfs_server_address}
+  fi
+
+  local nfs_allowed_client_network=
+  nfs_allowed_client_network=$(_jq "${yaml_file}" .profiles.nfs_client.allowed_client_network)
+  if [ -n "${nfs_allowed_client_network}" ]; then
+    export fai_nfs_allowed_client_network=${nfs_allowed_client_network}
+  fi
+
+  local nfs_client_mount_point_parent=
+  nfs_client_mount_point_parent=$(_jq "${yaml_file}" .profiles.nfs_client.client_mount_point_parent)
+  if [ -n "${nfs_client_mount_point_parent}" ]; then
+    export fai_nfs_client_mount_point_parent=${nfs_client_mount_point_parent}
+  fi
+
+  local nfs_export_list=
+  nfs_export_list=$(_jq "${yaml_file}" .profiles.nfs_client.export_list)
+  if [ -n "${nfs_export_list}" ]; then
+    export fai_nfs_export_list=${nfs_export_list}
+  fi
+}
+
 _parse_yaml_conf_file_presentation() {
   local yaml_file=$1
 

From 740b16cfcabf87a7f5d02662fecc36c51356833e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 12 May 2017 14:02:43 +0200
Subject: [PATCH 2543/2585] Now installs Oracle JDK on Debian & Ubuntu

- pre-seeding a machine with the JDK is no longer necessary
- from before, RedHat/CentOS machines install JDK without
  pre-seeding.
- removed + rewrote large parts of old java installation code
- no need to set java_home anymore, however, a new conf entry is needed:

environment:
  # Setting this to true means you've read & accepted
  # http://www.oracle.com/technetwork/java/javase/terms/license/index.html
  java_oracle_licence_accepted: true
---
 .../ece-install-conf-file-reader-test.sh      |  11 +-
 usr/sbin/ece-install                          |  21 ---
 usr/share/escenic/ece-scripts/common-os.sh    |   7 +-
 .../ece-install.d/conf-file-reader.sh         |  10 +-
 .../escenic/ece-scripts/ece-install.d/java.sh | 120 ++++++++++++------
 5 files changed, 104 insertions(+), 65 deletions(-)

diff --git a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
index 4fdfbfc0..2840211b 100755
--- a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
+++ b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
@@ -22,6 +22,7 @@ environment:
   type: ${environment_type}
   java_home: ${foo_java_home}
   java_version: ${foo_java_version}
+  java_oracle_licence_accepted: true
   skip_password_checks: true
   conf_url: ${conf_url}
   apt:
@@ -43,7 +44,8 @@ EOF
 
   unset java_home
   unset fai_environment
-  unset fai_server_java_version
+  unset fai_java_version
+  unset fai_java_oracle_licence_accepted
   unset fai_maven_repositories
   unset fai_conf_url
   unset fai_package_rpm_base_url
@@ -53,9 +55,12 @@ EOF
 
   assertNotNull "Should set java_home" "${java_home}"
   assertEquals "Should set java_home" "${foo_java_home}" "${java_home}"
-  assertEquals "Should set fai_server_java_version" \
+  assertEquals "Should set fai_java_version" \
                "${foo_java_version}" \
-               "${fai_server_java_version}"
+               "${fai_java_version}"
+  assertEquals "Should set fai_java_oracle_licence_accepted" \
+               1 \
+               "${fai_java_oracle_licence_accepted}"
   assertEquals "Should set fai_environment (type)" \
                "${environment_type}" \
                "${fai_environment}"
diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index debab36a..aeb92e31 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -952,31 +952,10 @@ function read_user_input() {
   done
 }
 
-function get_java_package_name() {
-  # The script will install oracle java installer package on Debian based
-  # systems and this is the path of the JAVA home with this package. If
-  # you're using a different system or have other preferences, change
-  # java_home in your ece-install.conf
-  default_java_version=1.6
-  server_java_version=${fai_server_java_version-${default_java_version}}
-  if [ $server_java_version = "1.6" ]; then
-    java_package_name="oracle-java6-installer"
-  elif [ $server_java_version = "1.7" ]; then
-    java_package_name="oracle-java7-installer"
-  #elif [ $server_java_version = "1.8" ]; then
-  #  java_package_name="oracle-java8-installer"
-  else
-    # Setting it back to default
-    java_package_name=""
-  fi
-}
-
-
 function main() {
     read_user_input "$@"
     init
     assert_correct_runtime_environment
-    get_java_package_name
 
     print_and_log "Full Automatic Install (FAI)."
     print_and_log "All user input will be read from $conf_file"
diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index fce93f90..7f4933a9 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -217,7 +217,12 @@ function add_apt_source() {
     return
   fi
 
-  if [ "$(grep -r "${url}" /etc/apt/sources.list* | wc -l)" -lt 1 ]; then
+  # Remove HTTP scheme and user/pass when checking if the source
+  # already exists.
+  local url_fragment=${url##*://}
+  url_fragment=${url_fragment##*@}
+
+  if [ "$(grep -r "${url_fragment}" /etc/apt/sources.list* | wc -l)" -lt 1 ]; then
     echo "# added by $(basename $0) @ $(date)" >> $escenic_sources
     echo "$@" >> $escenic_sources
   fi
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
index 79b5f037..b0c70aa2 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
@@ -278,10 +278,18 @@ _parse_yaml_conf_file_environment() {
     export java_home=${configured_java_home}
   fi
 
+  local configured_java_oracle_licence_accepted=
+  configured_java_oracle_licence_accepted=$(
+    _jq "${yaml_file}" .environment.java_oracle_licence_accepted)
+  if [[ "${configured_java_oracle_licence_accepted}" == "yes" ||
+          "${configured_java_oracle_licence_accepted}" == "true" ]]; then
+    export fai_java_oracle_licence_accepted=1
+  fi
+
   local configured_java_version=
   configured_java_version=$(_jq "${yaml_file}" .environment.java_version)
   if [[ -n "${configured_java_version}" ]]; then
-    export fai_server_java_version=${configured_java_version}
+    export fai_java_version=${configured_java_version}
   fi
 
   local configured_environment=
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/java.sh b/usr/share/escenic/ece-scripts/ece-install.d/java.sh
index c666ceba..6c4486b4 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/java.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/java.sh
@@ -1,36 +1,36 @@
-default_java_version=1.6
+default_java_version=1.8
+_java_version_with_build_number=${fai_java_version-${fai_server_java_version-8u121-b13}}
+_java_version=${_java_version_with_build_number%-*}
 sun_java_bin_url=http://download.oracle.com/otn-pub/java/jdk/6u39-b04/jdk-6u39-linux-i586.bin
 if [[ $(uname -m) == "x86_64" ]]; then
-  sun_java_bin_url=http://download.oracle.com/otn-pub/java/jdk/8u121-b13/e9e7ea248e2c4826b92b3f075a80e441/jdk-8u121-linux-x64.rpm
+  sun_java_bin_url=http://download.oracle.com/otn-pub/java/jdk/${_java_version_with_build_number}/e9e7ea248e2c4826b92b3f075a80e441/jdk-${_java_version}-linux-x64.rpm
 fi
   
-# Install oracle java from webupd8
-# http://www.webupd8.org/2012/01/install-oracle-java-jdk-7-in-ubuntu-via.html
-function install_oracle_java(){
-  # First get the java version
+function install_oracle_java() {
+  if _java_is_sun_java_already_installed; then
+    print_and_log "Oracle Java is already installed on $HOSTNAME"
+    _java_update_java_env_from_java_bin
+    return
+  fi
+
+  if [ "${fai_java_oracle_licence_accepted-0}" -eq 0 ]; then
+    print_and_log \
+      "You must accept Oracle's licence:" \
+      "http://www.oracle.com/technetwork/java/javase/terms/license/index.html" \
+      "YAML conf: environment.java_oracle_licence_accpted = true" \
+      "Conf: fai_java_oracle_licence_accepted=1"
+    remove_pid_and_exit_in_error
+  fi
+
+  print_and_log "Downloading Oracle Java from download.oracle.com ..."
   server_java_version=${fai_server_java_version-${default_java_version}}
   debian_package_name=""
 
-  if [ $server_java_version = "1.6" ]; then
-    debian_package_name="oracle-java6-installer"
-    java_home="/usr/lib/jvm/java-6-oracle"
-  elif [ $server_java_version = "1.7" ]; then
-    debian_package_name="oracle-java7-installer"
-    java_home="/usr/lib/jvm/java-7-oracle"
-  #elif [ $server_java_version = "1.8" ]; then
-  #  debian_package_name="oracle-java8-installer"
-  #  java_home="/usr/lib/jvm/java-8-oracle"
-  else
-    # Error: Invalid java version
-    print_and_log "Unsupported Java version. Cannot proceed. Exiting ...."
-    return 0
+  if [ "${on_debian_or_derivative-0}" -eq 1 ]; then
+    _install_oracle_java_debian
+  elif [ "${on_redhat_or_derivative-0}" -eq 1 ]; then
+    _install_oracle_java_redhat
   fi
-
-  install_packages_if_missing python-software-properties software-properties-common
-  run add-apt-repository -y ppa:webupd8team/java
-  run apt-get update
-  echo "$debian_package_name shared/accepted-oracle-license-v1-1 boolean true" | debconf-set-selections
-  install_packages_if_missing $debian_package_name
 }
 
 ## Returns 0 if Oracle Java is installed, 1 if it's not (in PATH).
@@ -66,6 +66,17 @@ function _java_update_java_env_from_jdk_rpm() {
   _java_update_java_env_from_jdk_dir "${rpm_java_home}"
 }
 
+function _java_update_java_env_from_jdk_deb() {
+  local deb=$1
+  local deb_java_home=
+  deb_java_home=$(
+    dpkg -c "${deb}" |
+      sed -n 's#/bin/javac##p' |
+      sed 's#.*[.]##')
+
+  _java_update_java_env_from_jdk_dir "${deb_java_home}"
+}
+
 function _java_update_java_env_from_java_bin() {
   local java_bin=
   java_bin=$(which java)
@@ -93,21 +104,54 @@ function _java_update_java_env_from_java_bin() {
   _java_update_java_env_from_jdk_dir "${jdk_dir}"
 }
 
-function install_sun_java_on_redhat() {
-  if _java_is_sun_java_already_installed; then
-    print_and_log "Sun Java is already installed on $HOSTNAME"
-    _java_update_java_env_from_java_bin
-    return
-  fi
-  
+## $1 :: uri
+## $2 :: target file
+function _download_oracle_file() {
   print_and_log "Downloading Oracle Java from download.oracle.com ..."
-  local file_name=${download_dir}/${sun_java_bin_url##*/}
+  local uri=$1
+  local target_file=$2
   run wget \
       --no-cookies \
-      --header "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com ; oraclelicense=accept-securebackup-cookie" \
-      -O $file_name \
-      $wget_opts \
-      $sun_java_bin_url
+      --header 'Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com ; oraclelicense=accept-securebackup-cookie' \
+      -O "${target_file}" \
+      --inet4-only \
+      --continue \
+      "${uri}"
+}
+
+function _install_oracle_java_debian() {
+  print_and_log "Creating a DEB package from the Oracle JDK tarball ..."
+  sun_java_bin_url=${sun_java_bin_url//.rpm/.tar.gz}
+  local file_name=${download_dir}/${sun_java_bin_url##*/}
+  _download_oracle_file "${sun_java_bin_url}" "${file_name}"
+
+  # dependencies for make-jpkg (which the package currently doesn't
+  # define as such)
+  install_packages_if_missing "
+    build-essential
+    fakeroot
+    gcc
+    java-common
+    java-package
+    libgtk2.0-0
+  "
+
+  # make-jpkg doesn't heed DEBIAN_FRONTEND=noninteractive. Also, old
+  # versions (jessie) of make-jpkg insists on using fakeroot, so we
+  # use ${ece_user} for this as this user has been created in
+  # ece-install::common_pre_install
+  run su - ${ece_user} -c "make-jpkg ${file_name} <<< Y"
+  run mv $(getent passwd ${ece_user} | cut -d: -f6)/*${_java_version}*.deb \
+      "${download_dir}/."
+  run dpkg -i "${download_dir}/"*${_java_version}*.deb
+
+  _java_update_java_env_from_jdk_deb "${download_dir}/"*${_java_version}*.deb
+}
+
+function _install_oracle_java_redhat() {
+  print_and_log "Downloading & installing Oracle JDK RPM ..."
+  local file_name=${download_dir}/${sun_java_bin_url##*/}
+  _download_oracle_file "${sun_java_bin_url}" "${file_name}"
 
   if ! is_rpm_already_installed "${file_name}"; then
     run rpm -Uvh "${file_name}"
@@ -122,5 +166,3 @@ function install_sun_java_on_redhat() {
     "http://www.oracle.com/technetwork/java/javase/terms/license/"
 }
 
-
-

From 6fe1d34d5e204c107058df9381bd99cf402bc340 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Mon, 15 May 2017 13:44:25 +0200
Subject: [PATCH 2544/2585] Install libxml2 to be sure xmllint is available

- for users not using the escenic-content-engine-scripts package, but
  instead downloads ece-install manually, will not necessarily have
  libxml2 installed, this change makes sure it's always installed.

- code for RedHat and Debian based systems provided.
---
 usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 9986e3c1..e331999f 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -761,6 +761,7 @@ function install_ece_third_party_packages
       libapr1
       libtcnative-1
       libmysql-java
+      libxml2-utils
       memcached
       xml-twig-tools
       wget
@@ -772,6 +773,7 @@ function install_ece_third_party_packages
       ant-contrib
       ant-nodeps
       apr
+      libxml2
       memcached
       mysql-connector-java
       tomcat-native

From e7e31ce55e21dd5c2cf51f2b5419d1d4acc1f44c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Mon, 15 May 2017 14:05:47 +0200
Subject: [PATCH 2545/2585] Removed dead code

---
 .../escenic/ece-scripts/ece-install.d/content-engine.sh   | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index e331999f..55e1d4fc 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -723,10 +723,6 @@ function install_ece_third_party_packages
 
   if [ $on_debian_or_derivative -eq 1 ]; then
     if [ $on_ubuntu -eq 1 ]; then
-      # Sun Java was removed in Ubuntu in 11.10 and later also from
-      # LTS 10.04, hence Hardy is the last one with these package now
-      # (2012-02-20 11:22)
-      local version_needs_local_java_deb=1004
       local version=$(lsb_release -s -r | sed "s#\.##g")
 
       add_apt_source \
@@ -743,10 +739,6 @@ function install_ece_third_party_packages
         add_apt_source "deb http://ftp.${mirror_country_suffix}.debian.org/debian/ $(lsb_release -s -c) contrib non-free"
       fi
 
-      # Sun Java will be removed in the next Debian stable,
-      # wheezy (either 6.1 or 7.0 not announced yet, current in
-      # squeeze/6.0, hence setting 6.1 here).
-      local version_needs_local_java_deb=610
       local version=$(lsb_release -s -r | sed "s#\.##g")
     fi
 

From c13f5b1bbf25ef0cad03b2a0799a2c1cdf320394 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Mon, 22 May 2017 15:47:55 +0200
Subject: [PATCH 2546/2585] =?UTF-8?q?Changed=20Vizrt=20=E2=86=92=20Escenic?=
 =?UTF-8?q?=20in=20message=20given=20after=20installing=20the=20installer?=
 =?UTF-8?q?=20package?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../debian/escenic-content-engine-installer/postinst        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/share/escenic/package-scripts/debian/escenic-content-engine-installer/postinst b/usr/share/escenic/package-scripts/debian/escenic-content-engine-installer/postinst
index 88833e16..4eafe2f7 100755
--- a/usr/share/escenic/package-scripts/debian/escenic-content-engine-installer/postinst
+++ b/usr/share/escenic/package-scripts/debian/escenic-content-engine-installer/postinst
@@ -6,12 +6,12 @@ cat <<EOF
 Thank you for installing ece-install. This is currently un-supported
 software as it's undergoing heavy development. Be sure to check out
 known issues at
-https://github.com/vizrt/ece-scripts/blob/master/known-issues.org and
-report any issues to https://github.com/vizrt/ece-scripts/issues
+https://github.com/escenic/ece-scripts/blob/master/known-issues.org and
+report any issues to https://github.com/escenic/ece-scripts/issues
 
 Have fun!
 
--Vizrt Online
+-Escenic
 EOF
 
 exit 0

From 08a08f02d18fe125d317d4e94c683e37361818a5 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Tue, 23 May 2017 13:55:48 +0200
Subject: [PATCH 2547/2585] Updated Tomcat fall back URL

---
 usr/share/escenic/ece-scripts/common-os.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index 7f4933a9..f54c6307 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -9,7 +9,7 @@ common_bashing_is_loaded > /dev/null 2>&1 ||
   source "${BASH_SOURCE[0]%/*}/common-bashing.sh"
 
 ## Only used if the Tomcat download mirror couldn't be determined
-fallback_tomcat_url="http://apache.uib.no/tomcat/tomcat-7/v7.0.70/bin/apache-tomcat-7.0.70.tar.gz"
+fallback_tomcat_url="http://apache.uib.no/tomcat/tomcat-7/v7.0.78/bin/apache-tomcat-7.0.78.tar.gz"
 
 # Can be used like this:
 # common_io_os_loaded 2>/dev/null || source common-os.sh

From 15ae766f4b99861fdd4548dfee67b35e9111bf97 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 26 May 2017 11:27:57 +0200
Subject: [PATCH 2548/2585] Updated Java support for 8u131-b11

- removed dead code
- made java version override-able through:

  environment:
    java_version:

  However, this still has some issues.
---
 .../escenic/ece-scripts/ece-install.d/java.sh | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/java.sh b/usr/share/escenic/ece-scripts/ece-install.d/java.sh
index 6c4486b4..592174f8 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/java.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/java.sh
@@ -1,12 +1,14 @@
-default_java_version=1.8
-_java_version_with_build_number=${fai_java_version-${fai_server_java_version-8u121-b13}}
-_java_version=${_java_version_with_build_number%-*}
-sun_java_bin_url=http://download.oracle.com/otn-pub/java/jdk/6u39-b04/jdk-6u39-linux-i586.bin
-if [[ $(uname -m) == "x86_64" ]]; then
-  sun_java_bin_url=http://download.oracle.com/otn-pub/java/jdk/${_java_version_with_build_number}/e9e7ea248e2c4826b92b3f075a80e441/jdk-${_java_version}-linux-x64.rpm
-fi
-  
+# -*- mode: sh; sh-shell: bash; -*-
+
 function install_oracle_java() {
+  local default_java_version=1.8
+  local _java_version_with_build_number=${fai_java_version-${fai_server_java_version-8u131-b11}}
+  _java_version=${_java_version_with_build_number%-*}
+  sun_java_bin_url=http://download.oracle.com/otn-pub/java/jdk/6u39-b04/jdk-6u39-linux-i586.bin
+  if [[ $(uname -m) == "x86_64" ]]; then
+    sun_java_bin_url=http://download.oracle.com/otn-pub/java/jdk/${_java_version_with_build_number}/d54c1d3a095b4ff2b6607d096fa80163/jdk-${_java_version}-linux-x64.rpm
+  fi
+
   if _java_is_sun_java_already_installed; then
     print_and_log "Oracle Java is already installed on $HOSTNAME"
     _java_update_java_env_from_java_bin
@@ -22,10 +24,6 @@ function install_oracle_java() {
     remove_pid_and_exit_in_error
   fi
 
-  print_and_log "Downloading Oracle Java from download.oracle.com ..."
-  server_java_version=${fai_server_java_version-${default_java_version}}
-  debian_package_name=""
-
   if [ "${on_debian_or_derivative-0}" -eq 1 ]; then
     _install_oracle_java_debian
   elif [ "${on_redhat_or_derivative-0}" -eq 1 ]; then
@@ -107,9 +105,14 @@ function _java_update_java_env_from_java_bin() {
 ## $1 :: uri
 ## $2 :: target file
 function _download_oracle_file() {
-  print_and_log "Downloading Oracle Java from download.oracle.com ..."
   local uri=$1
   local target_file=$2
+
+  print_and_log \
+    "Downloading Oracle Java" \
+    "${_java_version_with_build_number}" \
+    "from download.oracle.com ..."
+
   run wget \
       --no-cookies \
       --header 'Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com ; oraclelicense=accept-securebackup-cookie' \

From 3771a127386c8f1089b206794e3416ea4282ddf6 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 26 May 2017 13:17:57 +0200
Subject: [PATCH 2549/2585] Java tarball URL is now dynamically figured out

- in case this fails, the user can override this with:

  environment:
    java_download_url: http://....tar.gz

  or
     fai_java_download_url=http://...tar.gz

- removed fai_java_version, it's impossible to use these days.

- updated unit tests
---
 .../ece-install-conf-file-reader-test.sh      | 12 +++----
 .../ece-install.d/conf-file-reader.sh         |  8 ++---
 .../escenic/ece-scripts/ece-install.d/java.sh | 31 +++++++++++--------
 3 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
index bcfc5121..8557a307 100755
--- a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
+++ b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
@@ -6,7 +6,7 @@ test_can_parse_yaml_conf_environment() {
   yaml_file=$(mktemp)
   local foo_java_home=/usr/lib/jvm/foo-java-sdk
   local environment_type=production
-  local foo_java_version=1.8
+  local foo_java_download_url=http://example.com/java-1.8.tar.gz
   local skip_password_checks=1
   local apt_pool=testing
   local mvn_repo1=repo1.example.com
@@ -21,7 +21,7 @@ test_can_parse_yaml_conf_environment() {
 environment:
   type: ${environment_type}
   java_home: ${foo_java_home}
-  java_version: ${foo_java_version}
+  java_download_url: ${foo_java_download_url}
   java_oracle_licence_accepted: true
   skip_password_checks: true
   conf_url: ${conf_url}
@@ -44,7 +44,7 @@ EOF
 
   unset java_home
   unset fai_environment
-  unset fai_java_version
+  unset fai_java_download_url
   unset fai_java_oracle_licence_accepted
   unset fai_maven_repositories
   unset fai_conf_url
@@ -55,9 +55,9 @@ EOF
 
   assertNotNull "Should set java_home" "${java_home}"
   assertEquals "Should set java_home" "${foo_java_home}" "${java_home}"
-  assertEquals "Should set fai_java_version" \
-               "${foo_java_version}" \
-               "${fai_java_version}"
+  assertEquals "Should set fai_java_download_url" \
+               "${foo_java_download_url}" \
+               "${fai_java_download_url}"
   assertEquals "Should set fai_java_oracle_licence_accepted" \
                1 \
                "${fai_java_oracle_licence_accepted}"
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
index 196ede93..ee73e124 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
@@ -295,10 +295,10 @@ _parse_yaml_conf_file_environment() {
     export fai_java_oracle_licence_accepted=1
   fi
 
-  local configured_java_version=
-  configured_java_version=$(_jq "${yaml_file}" .environment.java_version)
-  if [[ -n "${configured_java_version}" ]]; then
-    export fai_java_version=${configured_java_version}
+  local configured_java_download_url=
+  configured_java_download_url=$(_jq "${yaml_file}" .environment.java_download_url)
+  if [[ -n "${configured_java_download_url}" ]]; then
+    export fai_java_download_url=${configured_java_download_url}
   fi
 
   local configured_environment=
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/java.sh b/usr/share/escenic/ece-scripts/ece-install.d/java.sh
index 592174f8..0a58f125 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/java.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/java.sh
@@ -1,14 +1,20 @@
 # -*- mode: sh; sh-shell: bash; -*-
 
-function install_oracle_java() {
-  local default_java_version=1.8
-  local _java_version_with_build_number=${fai_java_version-${fai_server_java_version-8u131-b11}}
-  _java_version=${_java_version_with_build_number%-*}
-  sun_java_bin_url=http://download.oracle.com/otn-pub/java/jdk/6u39-b04/jdk-6u39-linux-i586.bin
-  if [[ $(uname -m) == "x86_64" ]]; then
-    sun_java_bin_url=http://download.oracle.com/otn-pub/java/jdk/${_java_version_with_build_number}/d54c1d3a095b4ff2b6607d096fa80163/jdk-${_java_version}-linux-x64.rpm
+function _java_get_oracle_tarball_url() {
+  if [ -n "${fai_java_download_url-""}" ]; then
+    echo "${fai_java_download_url}"
+    return
   fi
 
+  local url=http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html
+  curl -s  "${url}" |
+    grep "$(uname -s) x64" |
+    grep .tar.gz |
+    grep -v demos |
+    sed -n -r  's#.*filepath":"(.*)", "MD5".*#\1#p'
+}
+
+function install_oracle_java() {
   if _java_is_sun_java_already_installed; then
     print_and_log "Oracle Java is already installed on $HOSTNAME"
     _java_update_java_env_from_java_bin
@@ -24,6 +30,9 @@ function install_oracle_java() {
     remove_pid_and_exit_in_error
   fi
 
+  local sun_java_bin_url=
+  sun_java_bin_url=$(_java_get_oracle_tarball_url)
+
   if [ "${on_debian_or_derivative-0}" -eq 1 ]; then
     _install_oracle_java_debian
   elif [ "${on_redhat_or_derivative-0}" -eq 1 ]; then
@@ -108,10 +117,7 @@ function _download_oracle_file() {
   local uri=$1
   local target_file=$2
 
-  print_and_log \
-    "Downloading Oracle Java" \
-    "${_java_version_with_build_number}" \
-    "from download.oracle.com ..."
+  print_and_log "Downloading Oracle Java from download.oracle.com ..."
 
   run wget \
       --no-cookies \
@@ -166,6 +172,5 @@ function _install_oracle_java_redhat() {
   print_and_log "Oracle Java $version is now installed"
 
   add_next_step "By using Oracle Java, you must accept this license: " \
-    "http://www.oracle.com/technetwork/java/javase/terms/license/"
+                "http://www.oracle.com/technetwork/java/javase/terms/license/"
 }
-

From 31215a0429e9a25e7973db21903054aa885b26d9 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 26 May 2017 13:21:01 +0200
Subject: [PATCH 2550/2585] Updated reference doc

---
 .../escenic/ece-install-conf-reference.org    | 37 +++++++++++++++++--
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-conf-reference.org b/usr/share/doc/escenic/ece-install-conf-reference.org
index 910ee09b..325ab6c4 100644
--- a/usr/share/doc/escenic/ece-install-conf-reference.org
+++ b/usr/share/doc/escenic/ece-install-conf-reference.org
@@ -1,5 +1,5 @@
 Overview of =ece-install='s configuration options. Generated from the
-configuration file parser's unit tests @ Wed May 10 11:10:41 CEST 2017.
+configuration file parser's unit tests @ Fri May 26 13:20:40 CEST 2017.
 
 *** environment
 
@@ -7,7 +7,8 @@ configuration file parser's unit tests @ Wed May 10 11:10:41 CEST 2017.
 environment:
   type: ${environment_type}
   java_home: ${foo_java_home}
-  java_version: ${foo_java_version}
+  java_download_url: ${foo_java_download_url}
+  java_oracle_licence_accepted: true
   skip_password_checks: true
   conf_url: ${conf_url}
   apt:
@@ -31,7 +32,8 @@ environment:
 
 java_home=
 fai_environment=
-fai_server_java_version=
+fai_java_download_url=
+fai_java_oracle_licence_accepted=
 fai_maven_repositories=
 fai_conf_url=
 fai_package_rpm_base_url=
@@ -50,6 +52,8 @@ profiles:
     name: ${editor_name}
     redirect: ${editor_redirect}
     shutdown: ${editor_shutdown}
+    ear: ${editor_ear}
+    deploy_white_list: ${editor_deploy_white_list}
 #+end_src
 =ece-install.conf= equivalent:
 #+begin_src: text
@@ -59,6 +63,8 @@ fai_editor_port=
 fai_editor_shutdown=
 fai_editor_redirect=
 fai_editor_name=
+fai_editor_ear=
+fai_editor_deploy_white_list=
 
 #+end_src
 
@@ -140,6 +146,7 @@ profiles:
     port: ${db_port}
     drop_old_db_first: yes
     replication: yes
+    vendor: ${_db_vendor}
 #+end_src
 =ece-install.conf= equivalent:
 #+begin_src: text
@@ -154,6 +161,8 @@ fai_db_port=
 fai_db_ear=
 fai_db_drop_old_db_first=
 fai_db_replication=
+db_vendor=
+
 #+end_src
 
 *** cache
@@ -178,6 +187,28 @@ fai_cache_conf_dir=
 
 #+end_src
 
+*** cue
+
+#+begin_src yaml
+profiles:
+  cue:
+    install: yes
+    backend_ece: ${cue_backend_ece}
+    backend_ng: ${cue_backend_ng}
+    cors_origins:
+      - ${cue_cors_origin1}
+      - ${cue_cors_origin2}
+#+end_src
+=ece-install.conf= equivalent:
+#+begin_src: text
+
+fai_cue_install=
+fai_cue_backend_ece=
+fai_cue_backend_ng=
+fai_cue_cors_origins=
+
+#+end_src
+
 *** nfs_server
 
 #+begin_src yaml

From f87745ce08dd303a0e7e8cdfd696443b4bbf098e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Tue, 30 May 2017 14:27:40 +0200
Subject: [PATCH 2551/2585] Updated Solr URL to the latest 6.5.1 release
 (tested & works)

---
 usr/share/escenic/ece-scripts/ece-install.d/search-server.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
index 38ba0797..2f9792a5 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/search-server.sh
@@ -1,6 +1,7 @@
+#                                             -*- mode: sh; sh-shell: bash; -*-
 # ece-install module for installing the search server
 
-solr_download_url=https://archive.apache.org/dist/lucene/solr/6.1.0/solr-6.1.0.zip
+solr_download_url=https://archive.apache.org/dist/lucene/solr/6.5.1/solr-6.5.1.zip
 
 ## Since solr itself talks about SOLR_HOME as where it has its data
 ## files (solr_data_dir might have been a more suitable name), we

From 99993e087cdbbed46f7df59bfd26a075edd3fced Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Wed, 31 May 2017 10:33:03 +0200
Subject: [PATCH 2552/2585] CORS fix: must expose error code of failed requests

---
 usr/share/escenic/ece-scripts/ece-install.d/cue.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cue.sh b/usr/share/escenic/ece-scripts/ece-install.d/cue.sh
index 6a4bdb7c..21a83a4f 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cue.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cue.sh
@@ -81,15 +81,15 @@ EOF
       set \$cors "\${cors}post";
     }
     if (\$cors = "trueget") {
-      add_header "Access-Control-Allow-Origin" "\$http_origin";
-      add_header "Access-Control-Allow-Credentials" "true";
-      add_header "Access-Control-Expose-Headers" "Link,X-ECE-Active-Connections,Location,ETag";
+      add_header "Access-Control-Allow-Origin" "\$http_origin" always;
+      add_header "Access-Control-Allow-Credentials" "true" always;
+      add_header "Access-Control-Expose-Headers" "Link,X-ECE-Active-Connections,Location,ETag" always;
     }
     if (\$cors = "truepost") {
-      add_header "Access-Control-Allow-Origin" "\$http_origin";
-      add_header "Access-Control-Allow-Credentials" "true";
+      add_header "Access-Control-Allow-Origin" "\$http_origin" always;
+      add_header "Access-Control-Allow-Credentials" "true" always;
       add_header "Access-Control-Expose-Headers"
-        "Link,X-ECE-Active-Connections,Location,ETag";
+        "Link,X-ECE-Active-Connections,Location,ETag" always;
     }
     if (\$cors = "trueoptions") {
       add_header 'Access-Control-Allow-Origin' "\$http_origin";

From 2f0e64bd51af929ca834bdeb1354a4edc401403e Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Wed, 31 May 2017 10:35:55 +0200
Subject: [PATCH 2553/2585] Fixed quoting of builder credentials.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- BASH nested quoting is confusing → fixed
---
 .../escenic/ece-scripts/ece-install.d/create-publication.sh   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
index 13dbd0b9..f95af411 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
@@ -35,8 +35,8 @@ function _create_publication_if_passed_extract_ear_to_dir() {
     if [[ -n "${fai_builder_http_user}" && \
             -n "${fai_builder_http_password}" ]]; then
       wget_auth="
-          --http-user \"${fai_builder_http_user}\"
-          --http-password \"${fai_builder_http_password}\"
+          --http-user "${fai_builder_http_user}"
+          --http-password "${fai_builder_http_password}"
         "
     fi
     download_uri_target_to_dir $fai_publication_ear $download_dir

From c0d07559969d47fb4b2eb142b81016d03285e768 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Thu, 1 Jun 2017 14:26:06 +0200
Subject: [PATCH 2554/2585] Bug fix: can now set Newsgate backend correctly
 from fai_cue_backend_ng

---
 usr/share/escenic/ece-scripts/ece-install.d/cue.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cue.sh b/usr/share/escenic/ece-scripts/ece-install.d/cue.sh
index 21a83a4f..2409abac 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cue.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cue.sh
@@ -150,7 +150,7 @@ endpoints:
   escenic: ${fai_cue_backend_ece-/webservice/index.xml}
 EOF
       if [ -n "${fai_cue_backend_ng}" ]; then
-        echo "  newsgate: ${fai_cue_backend_ece}" >> "${file}"
+        echo "  newsgate: ${fai_cue_backend_ng}" >> "${file}"
       fi
     done
 

From f0ba3e7f3514ff59497edd57f2559e3b118e6cf7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 2 Jun 2017 16:18:36 +0200
Subject: [PATCH 2555/2585] Regression fix: consider publication type in
 fai_publication_domain_mapping_list

- the entries in fai_publication_domain_mapping_list are on the form:

  <publication[,pub.war][,type]>#<domain>[#<alias1>[,<alias2>]]

  The type, when set, wasn't consumed by the parser, so the WAR
  reference became "pub.war,type" instead of "pub.war". This lead to

- the publication type is optional in these entries. Users that don't
  specify the publication type were not affected by this bug.

- updated inline comment to reflect reality
---
 .../ece-scripts/ece-install.d/create-publication.sh        | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
index f95af411..7c3b0923 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
@@ -62,10 +62,9 @@ function create_publication() {
     ensure_that_instance_is_running ${fai_publication_use_instance-$default_ece_intance_name}
     for el in ${fai_publication_domain_mapping_list}; do
       # the entries in the fai_publication_domain_mapping_list are on
-      # the form: <publication[,pub.war]>#<domain>[#<alias1>[,<alias2>]]
+      # the form: <publication[,pub.war][,type]>#<domain>[#<alias1>[,<alias2>]]
       IFS='#' read publication domain aliases <<< "$el"
-      IFS=',' read publication_name publication_war <<< "${publication}"
-      <<< "$publication"
+      IFS=',' read publication_name publication_war publication_type <<< "${publication}"
 
       # this is the default case were the WAR is called the same as
       # the publication name with the .war suffix.
@@ -84,7 +83,7 @@ function create_publication() {
       create_the_publication \
         "${publication_name}" \
         "${publication_war_to_use}" \
-        "${publication_type}" \
+        "${publication_type-default}" \
         "${domain}" \
         "${aliases}"
     done

From be6aba01e6e262f9ff2982707809a938a60446d0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Wed, 7 Jun 2017 09:56:15 +0200
Subject: [PATCH 2556/2585] Added --publication-type parameter to 'ece
 create-publication'

---
 .../escenic/ece-scripts/ece.d/create-publication.sh    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/create-publication.sh b/usr/share/escenic/ece-scripts/ece.d/create-publication.sh
index d6ce3543..f58c0ad8 100644
--- a/usr/share/escenic/ece-scripts/ece.d/create-publication.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/create-publication.sh
@@ -68,9 +68,10 @@ _create_publication_parse_use_input() {
   ## already been parsed
   local user_options=$(
     getopt -o \
-           a:nd:es \
+           a:nd:est: \
            --long help \
            --long publication-domain: \
+           --long publication-type: \
            --long publication-aliases: \
            --long update-app-server-conf \
            --long update-ece-conf \
@@ -90,6 +91,9 @@ _create_publication_parse_use_input() {
       -d | --publication-domain)
         publication_domain="$2";
         shift 2;;
+      -t | --publication-type)
+        publication_type="$2";
+        shift 2;;
       -a | --publication-aliases)
         publication_aliases="$2";
         shift 2;;
@@ -285,10 +289,12 @@ EOF
 ## what's in _create_publication_parse_use_input
 complete_create_publication() {
   cat <<EOF
+--publication-aliases
+--publication-domain
+--publication-type
 --update-app-server-conf
 --update-ece-conf
 --update-nursery-conf
---publication-aliases
 --file
 --uri
 -a

From 9f4822ac07da361cb0a4c19ad2572a27207b25d7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Wed, 7 Jun 2017 10:26:40 +0200
Subject: [PATCH 2557/2585] With Varnish 4, there's no reason for date hack

In Varnish 3, date was incorrectly always set to "now" making it hard
to do the right thing with the Age header, setting it to 0 was our
only solution, see
https://www.varnish-cache.org/lists/pipermail/varnish-commit/2014-April/011368.html

However, this has been fixed in Varnish 4, so that the date header
from origin is kept. This means we can remove the hard coded Age: 0
response header.
---
 .../ece-scripts/ece-install.d/cache-server.sh       | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
index 02b88cd8..22aa5510 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
@@ -477,18 +477,6 @@ EOF
   # at the end of the vcl_deliver above.
 }
 
-function create_varnish_conf_hacks() {
-  local file=${varnish_conf_dir}/varnish-hacks.vcl
-  cat > $file <<EOF
-sub vcl_deliver {
-  /* It seems that Varnish changes the Date header and the age header
-   * becomes wrong because of this. For this reason, we set the Age
-   * header to 0 to be standards compliant. */
-  set resp.http.Age = "0";
-}
-EOF
-}
-
 function get_from_domain() {
   if [[ $1 == "^www." ]]; then
     echo $1 | sed 's/^www.//g'
@@ -594,7 +582,6 @@ function create_varnish_conf() {
   create_varnish_conf_robots_on_beta
   create_varnish_conf_cookie_cleaner
   create_varnish_conf_caching_policies
-  create_varnish_conf_hacks
   create_varnish_conf_redirects
   create_varnish_conf_cache_statistics
   create_varnish_conf_error_pages

From 39b19903f3060ea3ae33a9ccb00288ce09e0558a Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Wed, 7 Jun 2017 14:54:21 +0200
Subject: [PATCH 2558/2585] Updated Maria JDBC driver version to 2.0.1

- the old 1.0 version had issues with truncating bytes when writing
  strings to the database (!).

- This bug could, among other tings, lead to invalid section page XML
  blobs.
---
 usr/share/escenic/ece-scripts/ece-install.d/app-server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index b9493605..04f36330 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -3,7 +3,7 @@ function set_up_jdbc_library() {
   if [ -n "$jdbc_driver" -a -e "$jdbc_driver" ]; then
     make_ln $jdbc_driver
   elif [ $db_vendor = "mariadb" ]; then
-    local mariadb_jdbc_url=https://downloads.mariadb.org/f/mariadb-java-client-1.1.0/mariadb-java-client-1.1.0.jar
+    local mariadb_jdbc_url= https://downloads.mariadb.com/Connectors/java/connector-java-2.0.1/mariadb-java-client-2.0.1.jar
     print_and_log "Downloading MariaDB jdbc driver ${mariadb_jdbc_url}"
     local mariadb_jdbc_jar=${mariadb_jdbc_url##*/}
     download_uri_target_to_dir \

From bde5cf888afa557e9e59d7999f24871e23c0e883 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Thu, 8 Jun 2017 10:37:53 +0200
Subject: [PATCH 2559/2585] One, 1!, space broke the code.

- regression introduced in 39b19903f3060ea3ae33a9ccb00288ce09e0558a
---
 usr/share/escenic/ece-scripts/ece-install.d/app-server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 04f36330..58b9bd8e 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -3,7 +3,7 @@ function set_up_jdbc_library() {
   if [ -n "$jdbc_driver" -a -e "$jdbc_driver" ]; then
     make_ln $jdbc_driver
   elif [ $db_vendor = "mariadb" ]; then
-    local mariadb_jdbc_url= https://downloads.mariadb.com/Connectors/java/connector-java-2.0.1/mariadb-java-client-2.0.1.jar
+    local mariadb_jdbc_url=https://downloads.mariadb.com/Connectors/java/connector-java-2.0.1/mariadb-java-client-2.0.1.jar
     print_and_log "Downloading MariaDB jdbc driver ${mariadb_jdbc_url}"
     local mariadb_jdbc_jar=${mariadb_jdbc_url##*/}
     download_uri_target_to_dir \

From 0b96de112ef5b97a717c88c64a8eaf971e3ef53b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 9 Jun 2017 10:11:57 +0200
Subject: [PATCH 2560/2585] Add Live Center web services to the CORS setup

---
 usr/share/escenic/ece-scripts/ece-install.d/cue.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cue.sh b/usr/share/escenic/ece-scripts/ece-install.d/cue.sh
index 2409abac..bc99b1da 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cue.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cue.sh
@@ -47,7 +47,7 @@ _cue_setup_cors_nginx_create_cors_setup_in_file() {
   local file=$1
   cat >> "${file}" <<EOF
 server {
-  location ~ "/(escenic|studio|webservice|webservice-extensions)/(.*)" {
+  location ~ "/(escenic|studio|webservice|webservice-extensions|live-center-presentation-webservice|live-center-editorial)/(.*)" {
 EOF
 
   for origin in $(_cue_setup_cors_get_allowed_origins); do

From e9e5051bc6fb629e0a2d8bf742799ce4f916ffa3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 9 Jun 2017 11:46:04 +0200
Subject: [PATCH 2561/2585] menu now has its own webservice, not a webservice
 extension

- which is a good thing
- should go into the standard webapps dir
---
 usr/share/escenic/ece-scripts/common-ece.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/share/escenic/ece-scripts/common-ece.sh b/usr/share/escenic/ece-scripts/common-ece.sh
index 8ca84c7b..caa611a8 100644
--- a/usr/share/escenic/ece-scripts/common-ece.sh
+++ b/usr/share/escenic/ece-scripts/common-ece.sh
@@ -87,6 +87,7 @@ webapps_in_standard_webapps_list="
   video-webservice-extensions
   poll-ws
   note-webservice
+  menu-webservice
   preview-editor-ws
   mobile-studio
   mobile-webservice

From a79c8de4a6f8ab5b796387c327cc4ee363d17317 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 9 Jun 2017 11:50:41 +0200
Subject: [PATCH 2562/2585] Add Menu web services to the CORS setup

- it's its own webservice now, see MENU-68
---
 usr/share/escenic/ece-scripts/ece-install.d/cue.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cue.sh b/usr/share/escenic/ece-scripts/ece-install.d/cue.sh
index bc99b1da..2dae3884 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cue.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cue.sh
@@ -47,7 +47,7 @@ _cue_setup_cors_nginx_create_cors_setup_in_file() {
   local file=$1
   cat >> "${file}" <<EOF
 server {
-  location ~ "/(escenic|studio|webservice|webservice-extensions|live-center-presentation-webservice|live-center-editorial)/(.*)" {
+  location ~ "/(escenic|studio|webservice|webservice-extensions|live-center-presentation-webservice|live-center-editorial|menu-webservice)/(.*)" {
 EOF
 
   for origin in $(_cue_setup_cors_get_allowed_origins); do

From e9dc382543ee623be57d00c3429392ff57421a63 Mon Sep 17 00:00:00 2001
From: Sk Mohd Anwarul Islam <anwar@escenic.com>
Date: Fri, 16 Jun 2017 12:50:20 +0200
Subject: [PATCH 2563/2585] Added live-center--->live plugin name change in
 ece-script. Also added new maven cooridnates to download it

---
 usr/share/escenic/build-scripts/ece-build | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/usr/share/escenic/build-scripts/ece-build b/usr/share/escenic/build-scripts/ece-build
index abd03ff3..f93834f8 100755
--- a/usr/share/escenic/build-scripts/ece-build
+++ b/usr/share/escenic/build-scripts/ece-build
@@ -81,6 +81,7 @@ seo
 mobile-studio
 preview-editor
 live-center
+live
 revision-history"
 
 declare -A project_distributions=()
@@ -120,6 +121,7 @@ com.escenic:engine:zip"
 ["mobile-studio"]="com.escenic.plugins.mobile-studio:mobile-studio:zip"
 ["preview-editor"]="com.escenic.plugins.preview-editor:preview-editor:zip"
 ["live-center"]="com.escenic.plugins.live-center:live-center:zip"
+["live"]="com.escenic.plugins.live:live:zip"
 ["revision-history"]="com.escenic.plugins.revision-history:revision-history:zip"
 )
 
@@ -166,6 +168,7 @@ com.escenic.plugins.vcpeditor:vcpeditor:zip"
 ["mobile-studio"]="com.escenic.plugins.mobile-studio:mobile-studio:zip"
 ["preview-editor"]="com.escenic.plugins.preview-editor:preview-editor:zip"
 ["live-center"]="com.escenic.plugins.live-center:live-center:zip"
+["live"]="com.escenic.plugins.live:live:zip"
 ["revision-history"]="com.escenic.plugins.revision-history:revision-history:zip"
 )
 

From 9e65c00e09e313f55d60dbba8052b645d8fb3074 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 23 Jun 2017 12:40:13 +0800
Subject: [PATCH 2564/2585] Bug fix in 'ece create-publication': only add
 <Host/> elements to pub connector

- We often set up (as in, ece-install does this) two Engine/Service
  elements, one for each Engine, which again has its own HTTP
  connector to serve different webapps from different ports.

  If so (there's strictly speaking no need to have multiple Services
  to have multiple connectors, so we cannot assume this is always the
  case), the correct <Service/> element for the publication <Host/>
  elements is the second Service element, in other cases, the the
  first one.

- FYI: Since both /Server/Service/Engine elements are the same XPATH wise,
  we have to access the correct Engine element by the index of the
  containing Service element.
---
 .../ece-scripts/ece.d/create-publication.sh   | 38 ++++++++++++++-----
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/create-publication.sh b/usr/share/escenic/ece-scripts/ece.d/create-publication.sh
index f58c0ad8..18d46950 100644
--- a/usr/share/escenic/ece-scripts/ece.d/create-publication.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/create-publication.sh
@@ -202,6 +202,23 @@ _create_publication_create_publication_in_db() {
       "${ece_admin_uri}/do/publication/insert"
 }
 
+## Returns the index (1 based, XPATH likes it this way) of the
+## /Service/Service element under which we shall add the publication
+## Host elements (sa in /Service/Service/Engine/Host).
+##
+## $1 :: server.xml
+_create_publication_get_index_of_pub_service_element() {
+  local server_xml=$1
+
+  # We often set up (ece-install) two Engine/Service elements, one for
+  # each Engine, which again has its own HTTP connector to serve
+  # different webapps from different ports.
+  #
+  # If so (there's no need to have multiple Services to have multiple
+  # connectors), the correct <Service/> element for the publication
+  # <Host/> elements is the last Service element.
+  xmlstarlet sel -t -v 'count(/Server/Service)' "${server_xml}"
+}
 
 _create_publication_update_app_server_conf() {
   server_xml=/opt/tomcat-${instance}/conf/server.xml
@@ -209,11 +226,14 @@ _create_publication_update_app_server_conf() {
     return
   fi
 
+  local index=
+  index=$(_create_publication_get_index_of_pub_service_element "${server_xml}")
+
   local current_pub_conf_in_app_server=
   current_pub_conf_in_app_server=$(
     lookup_in_xml_file \
       "${server_xml}" \
-      "/Server/Service/Engine/Host/Context[@displayName='${publication}']" \
+      "/Server/Service[${index}]/Engine/Host/Context[@displayName='${publication}']" \
       2>/dev/null)
 
   if [ -n "${current_pub_conf_in_app_server}" ]; then
@@ -226,15 +246,15 @@ _create_publication_update_app_server_conf() {
     ed \
     -P \
     -L \
-    -s /Server/Service/Engine -t elem -n TMP -v '' \
-    -i /Server/Service/Engine/TMP -t attr -n name -v "${publication}.${HOSTNAME}" \
-    -i /Server/Service/Engine/TMP -t attr -n appBase -v "webapps-${publication}" \
-    -i /Server/Service/Engine/TMP -t attr -n autoDeploy -v "true" \
-    -i /Server/Service/Engine/TMP -t attr -n startStopThreads -v "0" \
+    -s /Server/Service[${index}]/Engine -t elem -n TMP -v '' \
+    -i /Server/Service[${index}]/Engine/TMP -t attr -n name -v "${publication}.${HOSTNAME}" \
+    -i /Server/Service[${index}]/Engine/TMP -t attr -n appBase -v "webapps-${publication}" \
+    -i /Server/Service[${index}]/Engine/TMP -t attr -n autoDeploy -v "true" \
+    -i /Server/Service[${index}]/Engine/TMP -t attr -n startStopThreads -v "0" \
     -r //TMP -v Host \
-    -s "/Server/Service/Engine/Host[@name='${publication}.${HOSTNAME}']" -t elem -n TMP -v "${publication}.${HOSTNAME}" \
+    -s "/Server/Service[${index}]/Engine/Host[@name='${publication}.${HOSTNAME}']" -t elem -n TMP -v "${publication}.${HOSTNAME}" \
     -r //TMP -v Alias \
-    -s "/Server/Service/Engine/Host[@name='${publication}.${HOSTNAME}']" -t elem -n TMP -v '' \
+    -s "/Server/Service[${index}]/Engine/Host[@name='${publication}.${HOSTNAME}']" -t elem -n TMP -v '' \
     -i //TMP -t attr -n displayName -v "${publication}" \
     -i //TMP -t attr -n docBase -v "${publication}" \
     -i //TMP -t attr -n path -v "" \
@@ -249,7 +269,7 @@ _create_publication_update_app_server_conf() {
       ed \
       -P \
       -L \
-      -s "/Server/Service/Engine/Host[@name='${publication}.${HOSTNAME}']" -t elem -n TMP -v "${an_alias}" \
+      -s "/Server/Service[${index}]/Engine/Host[@name='${publication}.${HOSTNAME}']" -t elem -n TMP -v "${an_alias}" \
       -r //TMP -v Alias \
       "${server_xml}"
   done

From b06805f53f5aa5b2e3266dfb5df3094e68526518 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 23 Jun 2017 13:41:02 +0800
Subject: [PATCH 2565/2585] Fixed regression:
 ece-install.d/create-publication::ensure_that_instance_is_running()

- this method should ensure that the instance used for creating the
  publication is running, however, this method was broken, perhaps in
  ed37d3d43694a8ac92eaaaeccde923ccf53b51bb, perhaps much longer ago.

  The symptom of this method failing was these strange messages in
  /var/log/escenic/ece-install.log:

  [ece#start-engine1] You must specificy a command, see 'ece help'.
  [ece#versions-engine1] You must specificy a command, see 'ece help'.

- Improved the algorithm while I was at it. It now checks every second
  to see if ECE is bootstrapped, instead of just sleeping for a
  whopping 60 seconds regardless of the ECE running or not.
---
 .../ece-install.d/create-publication.sh       | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
index 7c3b0923..d862c7b7 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/create-publication.sh
@@ -160,17 +160,31 @@ function create_the_publication() {
 
 ## $1 :: the instance name
 function ensure_that_instance_is_running() {
-  local ece_command="ece -i $1 -t $type status"
+  printf "$(get_id) Ensuring %s is up " "${1}"
+
+  local ece_command="ece -i $1 -t ${type-engine} status"
   if [ $(su - $ece_user -c "$ece_command" | grep UP | wc -l) -lt 1 ]; then
-    ece_command="ece -i $1 -t $type start"
+    ece_command="ece -i $1 -t ${type-engine1} start"
     su - $ece_user -c "$ece_command" 1>>$log 2>>$log
   fi
 
   # This is a hack, but this ensures that the ECE is bootstrapped
   # properly and can respond fast enough to the session setup for the
   # publication creation.
-  ece_command="ece -i $1 -t $type versions"
-  su - $ece_user -c "$ece_command" 1>>$log 2>>$log
-  sleep 60
+  ece_command="ece -i $1 -t ${type-engine} versions"
+
+  local wait_count=60
+  for ((i=0; i < ${wait_count}; i++)); do
+    printf "."
+    up=$(su - ${ece_user} -c "$ece_command" | grep -c content-engine)
+
+    if [ "${up}" -eq 1 ]; then
+      printf "it's up!\n"
+      break
+    fi
+
+    sleep 1
+  done
+
 }
 

From 1713da03c1826c3dee6423d96af39428d96497a5 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Thu, 29 Jun 2017 16:28:05 +0800
Subject: [PATCH 2566/2585] ece-install: CORS/nginx fix for ECE on different
 host than CUE

cue:
  backend_ece: http://otherhost:8080

Is used both for nginx/cors setup as well as the backends.yml
configuration for CUE. Thus, it needs to get /webservice/index.xml
dynamically appended. This has now been fixed.
---
 usr/share/escenic/ece-scripts/ece-install.d/cue.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cue.sh b/usr/share/escenic/ece-scripts/ece-install.d/cue.sh
index 2dae3884..1e267890 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cue.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cue.sh
@@ -140,6 +140,12 @@ _cue_install_web_server() {
 
 _cue_configure() {
   print_and_log "Configuring the CUE editor: backends ..."
+
+  local _cue_backend_ece=${fai_cue_backend_ece-/webservice/index.xml}
+  if [[ "${_cue_backend_ece}" != *"/webservice/index.xml" ]]; then
+    _cue_backend_ece=${_cue_backend_ece}/webservice/index.xml
+  fi
+
   find /etc/escenic/cue-web-* -maxdepth 0 -type d 2>/dev/null |
     while read -r d; do
       local file="${d}/backends.yml"
@@ -147,7 +153,7 @@ _cue_configure() {
 # ${file} generated by $(basename "$0") @ $(date)
 
 endpoints:
-  escenic: ${fai_cue_backend_ece-/webservice/index.xml}
+  escenic: ${_cue_backend_ece}
 EOF
       if [ -n "${fai_cue_backend_ng}" ]; then
         echo "  newsgate: ${fai_cue_backend_ng}" >> "${file}"

From c83f317cd5040f34f32a9bee7612d1a587d471a0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Mon, 3 Jul 2017 17:32:04 +0800
Subject: [PATCH 2567/2585] Optional fai_cue_backend_ece_local to use case
 where ECE is local to CUE

- YAML equivalent:

profiles:
  cue:
    install: yes
    backend_ece: http://ece.example.com;
    backend_ece_local: http://localhost:8080;
    backend_ng: http://ng.example.com;

- This _local setting is only needed if CUE and ECE run on the same
  machine (and you use Live). If ECE runs on a separate machine, you
  don't need the extra _local value.

- Longer explanation: If ECE runs on the same machine as CUE and
  you've got CUE Live, you must specify backend_ece and this cannot be
  a local reference since Live will use this value in the CUE plugin,
  which runs in the browser and must thus be resolvable by the outside
  world.

  However, since ece-install will setup nginx forwarding using the
  value of ECE's whereabouts, it must be able to differentiate between
  the two addresses
---
 .../src/unit-tests/ece-install-conf-file-reader-test.sh     | 4 ++++
 .../escenic/ece-scripts/ece-install.d/conf-file-reader.sh   | 6 ++++++
 usr/share/escenic/ece-scripts/ece-install.d/cue.sh          | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
index 8557a307..18a193f6 100755
--- a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
+++ b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
@@ -385,6 +385,7 @@ EOF
 
 test_can_parse_yaml_conf_cue() {
   local cue_backend_ece=http://ece.example.com
+  local cue_backend_ece_local=http://localhost:8080
   local cue_backend_ng=http://ng.example.com
   local cue_cors_origin1=editor.example.com
   local cue_cors_origin2=cue.example.com
@@ -397,6 +398,7 @@ profiles:
   cue:
     install: yes
     backend_ece: ${cue_backend_ece}
+    backend_ece_local: ${cue_backend_ece_local}
     backend_ng: ${cue_backend_ng}
     cors_origins:
       - ${cue_cors_origin1}
@@ -405,6 +407,7 @@ EOF
 
   unset fai_cue_install
   unset fai_cue_backend_ece
+  unset fai_cue_backend_ece_local
   unset fai_cue_backend_ng
   unset fai_cue_cors_origins
 
@@ -412,6 +415,7 @@ EOF
   assertNotNull "Should set fai_cue_install" "${fai_cue_install}"
   assertEquals "Should set fai_cue_install" 1 "${fai_cue_install}"
   assertEquals "fai_cue_backend_ece" "${cue_backend_ece}" "${fai_cue_backend_ece}"
+  assertEquals "fai_cue_backend_ece_local" "${cue_backend_ece_local}" "${fai_cue_backend_ece_local}"
   assertEquals "fai_cue_backend_ng" "${cue_backend_ng}" "${fai_cue_backend_ng}"
   assertEquals "fai_cue_cors_origins" "${cue_cors_origin1} ${cue_cors_origin2}" "${fai_cue_cors_origins}"
 
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
index ee73e124..f522dc21 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
@@ -875,6 +875,12 @@ _parse_yaml_conf_file_cue() {
     export fai_cue_backend_ece=${install_cue_backend_ece}
   fi
 
+  local install_cue_backend_ece_local=
+  install_cue_backend_ece_local=$(_jq "${yaml_file}" .profiles.cue.backend_ece_local)
+  if [ -n "${install_cue_backend_ece_local}" ]; then
+    export fai_cue_backend_ece_local=${install_cue_backend_ece_local}
+  fi
+
   local install_cue_backend_ng=
   install_cue_backend_ng=$(_jq "${yaml_file}" .profiles.cue.backend_ng)
   if [ -n "${install_cue_backend_ng}" ]; then
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cue.sh b/usr/share/escenic/ece-scripts/ece-install.d/cue.sh
index 1e267890..e868c46b 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cue.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cue.sh
@@ -103,7 +103,7 @@ EOF
     }
 
     proxy_set_header Host \$http_host;
-    proxy_pass ${fai_cue_backend_ece-${default_cue_backend_ece}};
+    proxy_pass ${fai_cue_backend_ece_local-${fai_cue_backend_ece-${default_cue_backend_ece}}};
   }
 EOF
 }

From ccbae92e6f0c4d6fab4bbe6df3a416f4f7eea85b Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Mon, 3 Jul 2017 17:49:01 +0800
Subject: [PATCH 2568/2585] Regression fix: varnish-hacks.vcl are no longer
 needed

- regression introduced in 9f4822ac07da361cb0a4c19ad2572a27207b25d7
---
 usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
index 22aa5510..6f8e9886 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
@@ -73,7 +73,6 @@ include "compression.vcl";
 include "robots-on-beta.vcl";
 include "cookie-cleaner.vcl";
 include "caching-policies.vcl";
-include "varnish-hacks.vcl";
 include "redirects.vcl";
 include "cache-statistics.vcl";
 include "error-pages.vcl";

From e0a2ee74e6ac44a19cfd3c836032c6197ec53cbd Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Tue, 4 Jul 2017 11:17:21 +0800
Subject: [PATCH 2569/2585] Added document of how users can help us help them

---
 usr/share/doc/escenic/help-us-help-you.md | 42 +++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 usr/share/doc/escenic/help-us-help-you.md

diff --git a/usr/share/doc/escenic/help-us-help-you.md b/usr/share/doc/escenic/help-us-help-you.md
new file mode 100644
index 00000000..136442fa
--- /dev/null
+++ b/usr/share/doc/escenic/help-us-help-you.md
@@ -0,0 +1,42 @@
+# Help Us Help You
+
+When you have problems with `/usr/bin/ece`, `/usr/sbin/ece-install` or
+any of the other commands on this repository, please provide us with a
+couple of things:
+
+## The versions of ece and ece-install
+
+```
+$ grep ^ece_scripts_version= /usr/{sbin/ece-install,bin/ece}
+```
+
+## The version of your operating system
+
+Just run these three commands and give us the output:
+```
+$ lsb_release -a
+$ cat /etc/debian_version
+$ cat /etc/redhat-release
+```
+
+## For ece-install problems
+Your `ece-install.conf` or `ece-install.yaml` file.
+
+The contents of your sources.list (if you're on Debian/Ubuntu):
+```
+$ grep -r escenic /etc/apt/sources.list*
+```
+
+The log files of both `ece-install` and the instances you're setting up
+(here, `engine1` is the instance):
+
+```
+/var/log/escenic/ece-install.log
+
+/var/log/escenic/engine1.out
+/var/log/escenic/engine1-catalina.out
+/var/log/escenic/engine1-tomcat
+/var/log/escenic/engine1-messages
+```
+
+

From 4033fb237933a9b0fb52e54d680816324112baf7 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Tue, 4 Jul 2017 11:24:15 +0800
Subject: [PATCH 2570/2585] Explained how to help us help you with the ece
 command and init.d

---
 usr/share/doc/escenic/help-us-help-you.md | 29 ++++++++++++++++++-----
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/usr/share/doc/escenic/help-us-help-you.md b/usr/share/doc/escenic/help-us-help-you.md
index 136442fa..611427f9 100644
--- a/usr/share/doc/escenic/help-us-help-you.md
+++ b/usr/share/doc/escenic/help-us-help-you.md
@@ -4,13 +4,13 @@ When you have problems with `/usr/bin/ece`, `/usr/sbin/ece-install` or
 any of the other commands on this repository, please provide us with a
 couple of things:
 
-## The versions of ece and ece-install
+## 1 — The versions of ece and ece-install
 
 ```
 $ grep ^ece_scripts_version= /usr/{sbin/ece-install,bin/ece}
 ```
 
-## The version of your operating system
+## 2 — The version of your operating system
 
 Just run these three commands and give us the output:
 ```
@@ -19,15 +19,15 @@ $ cat /etc/debian_version
 $ cat /etc/redhat-release
 ```
 
-## For ece-install problems
-Your `ece-install.conf` or `ece-install.yaml` file.
+## 3 — For ece-install problems
+3.1) Your `ece-install.conf` or `ece-install.yaml` file.
 
-The contents of your sources.list (if you're on Debian/Ubuntu):
+3.2) The contents of your sources.list (if you're on Debian/Ubuntu):
 ```
 $ grep -r escenic /etc/apt/sources.list*
 ```
 
-The log files of both `ece-install` and the instances you're setting up
+3.3) The log files of both `ece-install` and the instances you're setting up
 (here, `engine1` is the instance):
 
 ```
@@ -39,4 +39,21 @@ The log files of both `ece-install` and the instances you're setting up
 /var/log/escenic/engine1-messages
 ```
 
+## 4 - For `/usr/bin/ece` or `/etc/init.d/ece` problems
+4.1 — The configuration files for your ece command
+```
+/etc/default/ece
+/ece/escenic/ece.conf
+/etc/escenic/ece-engine1.conf
+```
+
+4.2 The log files of the instance you're working with (`engine1` is the
+default):
+
+```
+/var/log/escenic/engine1.out
+/var/log/escenic/engine1-catalina.out
+/var/log/escenic/engine1-tomcat
+/var/log/escenic/engine1-messages
+```
 

From af7ccb15cf85ba3922b5806c36457237d797c952 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Tue, 4 Jul 2017 11:51:49 +0800
Subject: [PATCH 2571/2585] Made a copy & paste-able code block: I don't want
 to think!

"I just want to copy and paste a bunch of commands and send them to
you"
---
 usr/share/doc/escenic/help-us-help-you.md | 30 +++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/usr/share/doc/escenic/help-us-help-you.md b/usr/share/doc/escenic/help-us-help-you.md
index 611427f9..7779600e 100644
--- a/usr/share/doc/escenic/help-us-help-you.md
+++ b/usr/share/doc/escenic/help-us-help-you.md
@@ -57,3 +57,33 @@ default):
 /var/log/escenic/engine1-messages
 ```
 
+## I don't want to think!
+
+> "I just want to copy and paste a bunch of commands and send them to
+> you"
+
+```
+# Versions
+grep ^ece_scripts_version= /usr/{sbin/ece-install,bin/ece}
+lsb_release -a
+cat /etc/debian_version
+cat /etc/redhat-release
+
+# Sources list(s):
+grep -r escenic /etc/apt/sources.list*
+
+tar czf /tmp/$(date --iso)-debug-files.tar.gz \
+  /var/log/escenic/ece-install.log \
+  /var/log/escenic/engine1.out \
+  /var/log/escenic/engine1-catalina.out \
+  /var/log/escenic/engine1-tomcat \
+  /var/log/escenic/engine1-messages \
+  /etc/default/ece \
+  /ece/escenic/ece.conf \
+  /etc/escenic/ece-engine1.conf \
+  /root/ece-install.conf \
+  /root/ece-install.yaml
+  
+echo "Now, send this archive to us:" /tmp/$(date --iso)-debug-files.tar.gz
+
+```

From abe48c2bc10ada32a7964b286a7b02135fda1d9c Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Tue, 4 Jul 2017 11:52:53 +0800
Subject: [PATCH 2572/2585] Added heading to conf and log files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Improved introduction

- Include all .conf and .yaml files in root's home directory
  → greater chances of hitting something useful 😉
---
 usr/share/doc/escenic/help-us-help-you.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/usr/share/doc/escenic/help-us-help-you.md b/usr/share/doc/escenic/help-us-help-you.md
index 7779600e..90bceed0 100644
--- a/usr/share/doc/escenic/help-us-help-you.md
+++ b/usr/share/doc/escenic/help-us-help-you.md
@@ -2,7 +2,7 @@
 
 When you have problems with `/usr/bin/ece`, `/usr/sbin/ece-install` or
 any of the other commands on this repository, please provide us with a
-couple of things:
+couple of things so that we can help you in the best way possible:
 
 ## 1 — The versions of ece and ece-install
 
@@ -72,6 +72,7 @@ cat /etc/redhat-release
 # Sources list(s):
 grep -r escenic /etc/apt/sources.list*
 
+# Conf and log files:
 tar czf /tmp/$(date --iso)-debug-files.tar.gz \
   /var/log/escenic/ece-install.log \
   /var/log/escenic/engine1.out \
@@ -81,8 +82,8 @@ tar czf /tmp/$(date --iso)-debug-files.tar.gz \
   /etc/default/ece \
   /ece/escenic/ece.conf \
   /etc/escenic/ece-engine1.conf \
-  /root/ece-install.conf \
-  /root/ece-install.yaml
+  /root/*.conf \
+  /root/*.yaml
   
 echo "Now, send this archive to us:" /tmp/$(date --iso)-debug-files.tar.gz
 

From a1d94111bab571498c8152d024490c5415e45879 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Tue, 4 Jul 2017 12:58:46 +0800
Subject: [PATCH 2573/2585] Cache port should also be configurable for systemd
 systems

- Debian/Ubuntu now (15.04+) uses systemd and this must respect
  fai_cache_port too
---
 usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
index 6f8e9886..94b82e22 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cache-server.sh
@@ -42,7 +42,7 @@ function set_varnish_port() {
     [Service]
 ExecStart=
 ExecStart=/usr/sbin/varnishd \
-  -a :80 \
+  -a :${cache_port} \
   -T localhost:6082 \
   -f /etc/varnish/default.vcl \
   -S /etc/varnish/secret \

From ef8fb98fdfd0a76efa9903d6a588974790e22fbb Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Thu, 6 Jul 2017 12:53:03 +0800
Subject: [PATCH 2574/2585] ece can now create publication resources, including
 section feed

- not only edit and update  them
- added support for editing/updating/creating section feed publication
  resources.

- example:

  $ ece --publication-resource section-feed --publication mypub create
---
 etc/bash_completion.d/ece                            |  2 +-
 usr/bin/ece                                          |  3 +++
 .../ece-scripts/ece.d/publication-resources.sh       | 12 ++++++++++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/etc/bash_completion.d/ece b/etc/bash_completion.d/ece
index 14f48308..0db3f9b4 100644
--- a/etc/bash_completion.d/ece
+++ b/etc/bash_completion.d/ece
@@ -57,7 +57,7 @@ _get_completions_for_ece_command()
     options="-i --instance -p --publication -r --publication-resource
              -t --type -u --user -w --password"
     resources="content-type feature layout layout-group image-version menu
-               security root-section-parameters"
+               section-feed security root-section-parameters"
     types="engine search analysis rmi-hub"
 
     # default completions is the list of commands
diff --git a/usr/bin/ece b/usr/bin/ece
index fdef0539..acd98e55 100755
--- a/usr/bin/ece
+++ b/usr/bin/ece
@@ -876,6 +876,9 @@ for el in $command; do
         edit)
             update_publication_resources "edit_first"
             ;;
+        create)
+            update_publication_resources "create_first"
+            ;;
         backup)
             backup_type
             ;;
diff --git a/usr/share/escenic/ece-scripts/ece.d/publication-resources.sh b/usr/share/escenic/ece-scripts/ece.d/publication-resources.sh
index 4d18ce9d..4eca8728 100644
--- a/usr/share/escenic/ece-scripts/ece.d/publication-resources.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/publication-resources.sh
@@ -47,6 +47,9 @@ function update_publication_resources() {
     menu)
       url=${url}/${publication}/escenic/plugin/menu
       ;;
+    section-feed)
+      url=${url}/${publication}/escenic/plugin/section-feed
+      ;;
     security)
       url=${url}/${publication}/escenic/plugin/community/security
       ;;
@@ -70,8 +73,13 @@ function update_publication_resources() {
 
     run cd $tmp_dir;
 
-    # adding auth credentials for the appserver (if set)
-    run wget $wget_appserver_auth $url -O ${resource}
+    if [[ "${command}" == edit ]]; then
+      # adding auth credentials for the appserver (if set)
+      run wget $wget_appserver_auth $url -O ${resource}
+    elif [[ "${command}" == create ]]; then
+      touch "${resource}"
+    fi
+
     md5sum ${resource} > ${resource}.md5sum
     exit_on_error "md5sum ${resource}"
 

From 42891ba3ccf43ff4e950953bdc9116441a49c333 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Wed, 12 Jul 2017 12:12:39 +0800
Subject: [PATCH 2575/2585] Mark everything the package provides in /etc as a
 conf file

This should fix the cases where upgrading
e.g. escenic-content-engine-scripts will remove any local changes to
/etc/default/ece by the user
---
 usr/share/escenic/package-scripts/create-packages | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/usr/share/escenic/package-scripts/create-packages b/usr/share/escenic/package-scripts/create-packages
index 69fc862d..0632f62b 100755
--- a/usr/share/escenic/package-scripts/create-packages
+++ b/usr/share/escenic/package-scripts/create-packages
@@ -343,6 +343,13 @@ function create_packages() {
       $f
   done
 
+  # Mark everything the package provides in /etc as a conf file
+  find "${target_dir}" -type f |
+    egrep "etc|conf" |
+    egrep -v "DEBIAN|/doc/" |
+    sed "s#${target_dir}##" \
+        > "${debian_dir}/conffiles"
+
   # fix permissions
   if [ -e $debian_dir/postinst ]; then
     run chmod 755 $debian_dir/postinst

From e3ebc2c45fdd8a6728028c3605c838648e9caa45 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Mon, 24 Jul 2017 10:13:32 +0800
Subject: [PATCH 2576/2585] Update Tomcat fallback URL

---
 usr/share/escenic/ece-scripts/common-os.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/common-os.sh b/usr/share/escenic/ece-scripts/common-os.sh
index f54c6307..8432107a 100644
--- a/usr/share/escenic/ece-scripts/common-os.sh
+++ b/usr/share/escenic/ece-scripts/common-os.sh
@@ -9,7 +9,7 @@ common_bashing_is_loaded > /dev/null 2>&1 ||
   source "${BASH_SOURCE[0]%/*}/common-bashing.sh"
 
 ## Only used if the Tomcat download mirror couldn't be determined
-fallback_tomcat_url="http://apache.uib.no/tomcat/tomcat-7/v7.0.78/bin/apache-tomcat-7.0.78.tar.gz"
+fallback_tomcat_url="http://apache.uib.no/tomcat/tomcat-7/v7.0.79/bin/apache-tomcat-7.0.79.tar.gz"
 
 # Can be used like this:
 # common_io_os_loaded 2>/dev/null || source common-os.sh

From 3e15698fd5a6f42eef9424b782b180105b3e5c64 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Tue, 25 Jul 2017 17:07:59 +0800
Subject: [PATCH 2577/2585] ece repackage: follow links in /usr/share/escenic

Background: This allows /usr/share/escenic/escenc-video to be a link
to a e..g /usr/share/escenic/escenic-video-323232 where
/usr/share/escenic/escenic-video-323232 is a non-package installed.
---
 .../escenic/ece-scripts/ece.d/repackage.sh     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece.d/repackage.sh b/usr/share/escenic/ece-scripts/ece.d/repackage.sh
index 6081592c..9ff3205f 100644
--- a/usr/share/escenic/ece-scripts/ece.d/repackage.sh
+++ b/usr/share/escenic/ece-scripts/ece.d/repackage.sh
@@ -10,7 +10,7 @@
 USR_SHARE_DIR=/usr/share/escenic
 
 get_installed_packages_war_list() {
-  find "${USR_SHARE_DIR}/escenic-"* -maxdepth 1 -name "webapps" -type d | \
+  find -L "${USR_SHARE_DIR}/escenic-"* -maxdepth 1 -name "webapps" -type d | \
     while read -r webapps_dir; do
       find "${webapps_dir}" -name "*.war" -type f
     done
@@ -21,44 +21,44 @@ get_installed_packages_war_name_list() {
 }
 
 get_installed_packages_lib_list() {
-  find "${USR_SHARE_DIR}/escenic-"* -maxdepth 1 -name "lib" -type d | \
+  find -L "${USR_SHARE_DIR}/escenic-"* -maxdepth 1 -name "lib" -type d | \
     while read -r lib_dir; do
       find "${lib_dir}" -name "*.jar" -type f
     done
 }
 
 get_installed_packages_webservice_extensions_list() {
-  find "${USR_SHARE_DIR}/escenic-"* -maxdepth 1 \
+  find -L "${USR_SHARE_DIR}/escenic-"* -maxdepth 1 \
        -name "webservice-extensions" -type d
 }
 
 get_installed_packages_webservice_list() {
-  find "${USR_SHARE_DIR}/escenic-"* -maxdepth 1 \
+  find -L "${USR_SHARE_DIR}/escenic-"* -maxdepth 1 \
        -name "webservice" -type d
 }
 
 get_installed_packages_studio_list() {
-  find "${USR_SHARE_DIR}/escenic-"* -maxdepth 1 \
+  find -L "${USR_SHARE_DIR}/escenic-"* -maxdepth 1 \
        -name "studio" -type d
 }
 
 get_installed_package_webservice_war() {
-  find "${USR_SHARE_DIR}/escenic-content-engine-"* -maxdepth 2 \
+  find -L "${USR_SHARE_DIR}/escenic-content-engine-"* -maxdepth 2 \
        -name "webservice.war" -type f
 }
 
 get_installed_package_studio_war() {
-  find "${USR_SHARE_DIR}/escenic-content-engine-"* -maxdepth 2 \
+  find -L "${USR_SHARE_DIR}/escenic-content-engine-"* -maxdepth 2 \
        -name "studio.war" -type f
 }
 
 get_installed_package_webservice_extensions_war() {
-  find "${USR_SHARE_DIR}/escenic-content-engine-"* -maxdepth 2 \
+  find -L "${USR_SHARE_DIR}/escenic-content-engine-"* -maxdepth 2 \
        -name "webservice-extensions.war" -type f
 }
 
 get_installed_package_content_engine_war_list() {
-  find "${USR_SHARE_DIR}/escenic-content-engine-"* -maxdepth 2 \
+  find -L "${USR_SHARE_DIR}/escenic-content-engine-"* -maxdepth 2 \
        -name "*.war" -type f
 }
 

From c9b63692d96634af2d1dd567db39cdab603763b2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Tue, 15 Aug 2017 11:19:05 +0800
Subject: [PATCH 2578/2585] ece-install can now install & configure SSE proxy

- installs and configures the SSE proxy itself, it may have many
  backends (typical ones for an Escenic architecture are ECE, Live and
  Video).
- sets up nginx to proxy SSE proxy requests
- configures ECE to expose the changelog through the SSE proxy
- configures Live too
- added unit tests for the new configuration options
- The editor & presentation profiles now sets up an extra connector
  for the SSE proxy

  Configuration items:
  -- fai_editor_install=1
  -- fai_presentation_install=1

  Will set up an extra Tomcat connector needed for the SSE proxy to
  work. No configuration is necessary, it'll set up the default:

  <Connector
    port="8083"
    protocol="HTTP/1.1"
    connectionTimeout="20000"
    URIEncoding="UTF-8"
    compression="off"
    redirectPort="8443"
    proxyPort="80"
  />

- Example ece-install.yaml configuration:

  profiles:
    sse_proxy:
      install: yes
      exposed_host: proxy.quanah
      backends:
        - uri: http://localhost:8083/webservice/escenic/changelog/sse
          user: foo_admin
          password: foo

- Full list of options (equivalent entries to the older ece-install.conf
  format):

  fai_sse_proxy_exposed_host=   # default is the machine name (which is
                                # probably not what you want), typically
                                # proxy.example.com
  fai_sse_proxy_exposed_port=   # optional, default is 80
  fai_sse_proxy_install=
  fai_sse_proxy_backends=       # required
  fai_sse_proxy_ece_port=       # optional, used for tomcat conf
  fai_sse_proxy_ece_redirect=   # optional, used for editor & presentation

- updated reference doc

- SSE proxy can also be installed on RedHat
---
 .../ece-install-conf-file-reader-test.sh      |  55 ++++++
 usr/sbin/ece-install                          |   5 +
 .../escenic/ece-install-conf-reference.org    |  38 +++-
 .../ece-scripts/ece-install.d/app-server.sh   |  17 ++
 .../ece-install.d/conf-file-reader.sh         |  52 ++++++
 .../ece-scripts/ece-install.d/sse-proxy.sh    | 162 ++++++++++++++++++
 6 files changed, 328 insertions(+), 1 deletion(-)
 create mode 100644 usr/share/escenic/ece-scripts/ece-install.d/sse-proxy.sh

diff --git a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
index 18a193f6..7a945f68 100755
--- a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
+++ b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
@@ -422,6 +422,61 @@ EOF
   rm -rf "${yaml_file}"
 }
 
+test_can_parse_yaml_conf_sse_proxy() {
+  local exposed_port=80
+  local exposed_host=proxy.example.com
+  local sse_proxy_ece_port=8083
+  local sse_proxy_ece_redirect=8443
+  local sse_proxy_backend1_uri=http://foo
+  local sse_proxy_backend1_user=foo
+  local sse_proxy_backend1_password=p
+  local sse_proxy_backend2_uri=http://bar
+  local sse_proxy_backend2_user=bar
+  local sse_proxy_backend2_password=b
+
+  local yaml_file=
+  yaml_file=$(mktemp)
+  cat > "${yaml_file}" <<EOF
+---
+profiles:
+  sse_proxy:
+    install: yes
+    exposed_host: ${exposed_host}
+    exposed_port: ${exposed_port}
+    ece_port: ${sse_proxy_ece_port}
+    ece_redirect: ${sse_proxy_ece_redirect}
+    backends:
+      - uri: ${sse_proxy_backend1_uri}
+        user: ${sse_proxy_backend1_user}
+        password: ${sse_proxy_backend1_password}
+      - uri: ${sse_proxy_backend2_uri}
+        user: ${sse_proxy_backend2_user}
+        password: ${sse_proxy_backend2_password}
+EOF
+
+  unset fai_sse_proxy_backends
+  unset fai_sse_proxy_ece_port
+  unset fai_sse_proxy_ece_redirect
+  unset fai_sse_proxy_exposed_host
+  unset fai_sse_proxy_exposed_port
+  unset fai_sse_proxy_install
+
+  sse_proxy_backends="${sse_proxy_backend2_uri} ${sse_proxy_backend2_user} ${sse_proxy_backend2_password}
+${sse_proxy_backend1_uri} ${sse_proxy_backend1_user} ${sse_proxy_backend1_password}
+"
+
+  parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
+  assertNotNull "Should set fai_sse_install" "${fai_sse_proxy_install}"
+  assertEquals "Should set fai_sse_proxy_install" 1 "${fai_sse_proxy_install}"
+  assertEquals "Should set fai_sse_proxy_exposed_host" "${exposed_host}" "${fai_sse_proxy_exposed_host}"
+  assertEquals "Should set fai_sse_proxy_exposed_port" "${exposed_port}" "${fai_sse_proxy_exposed_port}"
+  assertEquals "Should set fai_sse_proxy_ece_port" "${sse_proxy_ece_port}" "${fai_sse_proxy_ece_port}"
+  assertEquals "Should set fai_sse_proxy_ece_redirect" "${sse_proxy_ece_redirect}" "${fai_sse_proxy_ece_redirect}"
+  assertEquals "Should set fai_sse_proxy_backends" "${sse_proxy_backends}" "${fai_sse_proxy_backends}"
+
+  rm -rf "${yaml_file}"
+}
+
 test_can_parse_yaml_conf_nfs_server() {
   local nfs_server_address="nfs.example.com"
   local nfs_allowed_client_network="10.0.0.1/24"
diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index d1363284..7403de6e 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -1094,6 +1094,11 @@ function main() {
       no_fai_profile=0
     fi
 
+    if [ "${fai_sse_proxy_install-0}" -eq 1 ]; then
+      install_sse_proxy
+      no_fai_profile=0
+    fi
+
     if [ $no_fai_profile -eq 1 ]; then
         print_and_log "No install profile selected, be sure to have one of the "
         print_and_log "fai_<profile>_install=1 in your $conf_file"
diff --git a/usr/share/doc/escenic/ece-install-conf-reference.org b/usr/share/doc/escenic/ece-install-conf-reference.org
index 325ab6c4..2539d9ac 100644
--- a/usr/share/doc/escenic/ece-install-conf-reference.org
+++ b/usr/share/doc/escenic/ece-install-conf-reference.org
@@ -1,5 +1,5 @@
 Overview of =ece-install='s configuration options. Generated from the
-configuration file parser's unit tests @ Fri May 26 13:20:40 CEST 2017.
+configuration file parser's unit tests @ Thu Aug 17 16:02:10 CST 2017.
 
 *** environment
 
@@ -194,6 +194,7 @@ profiles:
   cue:
     install: yes
     backend_ece: ${cue_backend_ece}
+    backend_ece_local: ${cue_backend_ece_local}
     backend_ng: ${cue_backend_ng}
     cors_origins:
       - ${cue_cors_origin1}
@@ -204,11 +205,46 @@ profiles:
 
 fai_cue_install=
 fai_cue_backend_ece=
+fai_cue_backend_ece_local=
 fai_cue_backend_ng=
 fai_cue_cors_origins=
 
 #+end_src
 
+*** sse_proxy
+
+#+begin_src yaml
+profiles:
+  sse_proxy:
+    install: yes
+    exposed_host: ${exposed_host}
+    exposed_port: ${exposed_port}
+    ece_port: ${sse_proxy_ece_port}
+    ece_redirect: ${sse_proxy_ece_redirect}
+    backends:
+      - uri: ${sse_proxy_backend1_uri}
+        user: ${sse_proxy_backend1_user}
+        password: ${sse_proxy_backend1_password}
+      - uri: ${sse_proxy_backend2_uri}
+        user: ${sse_proxy_backend2_user}
+        password: ${sse_proxy_backend2_password}
+#+end_src
+=ece-install.conf= equivalent:
+#+begin_src: text
+
+fai_sse_proxy_backends=
+fai_sse_proxy_ece_port=
+fai_sse_proxy_ece_redirect=
+fai_sse_proxy_exposed_host=
+fai_sse_proxy_exposed_port=
+fai_sse_proxy_install=
+
+  sse_proxy_backends="${sse_proxy_backend2_uri} ${sse_proxy_backend2_user} ${sse_proxy_backend2_password}
+${sse_proxy_backend1_uri} ${sse_proxy_backend1_user} ${sse_proxy_backend1_password}
+"
+
+#+end_src
+
 *** nfs_server
 
 #+begin_src yaml
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
index 58b9bd8e..dd647ca9 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/app-server.sh
@@ -296,6 +296,23 @@ EOF
                proxyPort="443"
                scheme="https"
     />
+EOF
+
+  if [[ ${fai_editor_install-0} -eq 1 ||
+        ${fai_presentation_install-0} -eq 1 ]]; then
+    cat >> $tomcat_base/conf/server.xml <<EOF
+    <Connector port="${fai_sse_proxy_ece_port-8083}"
+               protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               URIEncoding="UTF-8"
+               compression="off"
+               redirectPort="${fai_sse_proxy_ece_redirect-8443}"
+               proxyPort="${fai_sse_proxy_exposed_port-80}"
+    />
+EOF
+  fi
+
+  cat >> $tomcat_base/conf/server.xml <<EOF
     <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
       <Valve className="org.apache.catalina.valves.AccessLogValve"
              prefix="access."
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
index f522dc21..fca4d0fd 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
@@ -53,6 +53,7 @@ parse_yaml_conf_file_or_source_if_sh_conf() {
   _parse_yaml_conf_file_assembly_tool "${yaml_file}"
   _parse_yaml_conf_file_restore "${yaml_file}"
   _parse_yaml_conf_file_cue "${yaml_file}"
+  _parse_yaml_conf_file_sse_proxy "${yaml_file}"
   _parse_yaml_conf_file_nfs_server "${yaml_file}"
   _parse_yaml_conf_file_nfs_client "${yaml_file}"
 }
@@ -900,6 +901,57 @@ _parse_yaml_conf_file_cue() {
   done
 }
 
+_parse_yaml_conf_file_sse_proxy() {
+  local yaml_file=$1
+
+  local install_sse_proxy=no
+  install_sse_proxy=$(_jq "${yaml_file}" .profiles.sse_proxy.install)
+  if [[ "${install_sse_proxy}" == "yes" ||
+          "${install_sse_proxy}" == "true" ]]; then
+    export fai_sse_proxy_install=1
+  fi
+
+  local install_sse_proxy_exposed_host=
+  install_sse_proxy_exposed_host=$(_jq "${yaml_file}" .profiles.sse_proxy.exposed_host)
+  if [ -n "${install_sse_proxy_exposed_host}" ]; then
+    export fai_sse_proxy_exposed_host=${install_sse_proxy_exposed_host}
+  fi
+
+  local install_sse_proxy_exposed_port=
+  install_sse_proxy_exposed_port=$(_jq "${yaml_file}" .profiles.sse_proxy.exposed_port)
+  if [ -n "${install_sse_proxy_exposed_port}" ]; then
+    export fai_sse_proxy_exposed_port=${install_sse_proxy_exposed_port}
+  fi
+
+  local install_sse_proxy_ece_port=
+  install_sse_proxy_ece_port=$(_jq "${yaml_file}" .profiles.sse_proxy.ece_port)
+  if [ -n "${install_sse_proxy_ece_port}" ]; then
+    export fai_sse_proxy_ece_port=${install_sse_proxy_ece_port}
+  fi
+
+  local install_sse_proxy_ece_redirect=
+  install_sse_proxy_ece_redirect=$(_jq "${yaml_file}" .profiles.sse_proxy.ece_redirect)
+  if [ -n "${install_sse_proxy_ece_redirect}" ]; then
+    export fai_sse_proxy_ece_redirect=${install_sse_proxy_ece_redirect}
+  fi
+
+  local sse_backends=
+  local sse_backends_count=0
+  sse_backends_count=$(_jq "${yaml_file}" ".profiles.sse_proxy.backends | length")
+  for ((i = 0; i < sse_backends_count; i++)); do
+    local uri=
+    local user=
+    local password=
+    uri=$(_jq "${yaml_file}" .profiles.sse_proxy.backends["${i}"].uri)
+    user=$(_jq "${yaml_file}" .profiles.sse_proxy.backends["${i}"].user)
+    password=$(_jq "${yaml_file}" .profiles.sse_proxy.backends["${i}"].password)
+    sse_backends="${uri} ${user} ${password}
+${sse_backends}"
+  done
+  export fai_sse_proxy_backends=${sse_backends}
+
+}
+
 _jq() {
   local yaml_file=$1
   local key=$2
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/sse-proxy.sh b/usr/share/escenic/ece-scripts/ece-install.d/sse-proxy.sh
new file mode 100644
index 00000000..2f0bca30
--- /dev/null
+++ b/usr/share/escenic/ece-scripts/ece-install.d/sse-proxy.sh
@@ -0,0 +1,162 @@
+# -*- mode: sh; sh-shell: bash; -*-
+
+## ece-install module that installs and configures the SSE proxy and
+## configures the web server to route its requests through the
+## standard web port.
+##
+## by torstein@escenic.com
+
+_sse_install_web_server() {
+  install_packages_if_missing nginx
+}
+
+_sse_configure_nginx() {
+  print_and_log "SSE proxy: configuring nginx to expose the SSE proxy ..."
+
+  if [ "${on_debian_or_derivative}" -eq 1 ]; then
+    local file=/etc/nginx/sites-available/sse-proxy
+  elif [ "${on_redhat_or_derivative}" -eq 1 ]; then
+    local file=/etc/nginx/default.d/sse-proxy
+  else
+    local file=/etc/nginx/nginx.conf.add
+  fi
+
+  log "SSE proxy: Writing nginx conf to ${file}"
+
+  # We only support exposing the proxy through port 80 in the web
+  # server.  fai_sse_proxy_exposed_port= is in this case, ignored (but
+  # used elsewhere).
+  cat > "${file}" <<EOF
+server {
+  server_name ${fai_sse_proxy_exposed_host-${HOSTNAME}};
+
+  location / {
+    proxy_pass http://${fai_sse_proxy_host-localhost}:${fai_sse_proxy_port-9080};
+    proxy_set_header Host \$host;
+    proxy_set_header X-Forwarded-For \$remote_addr;
+    proxy_set_header Connection '';
+    proxy_http_version 1.1;
+    proxy_buffering off;
+    proxy_cache off;
+    chunked_transfer_encoding off;
+
+  }
+}
+EOF
+
+  local target=
+  target=/etc/nginx/sites-enabled/$(basename "${file}")
+  if [ "${on_debian_or_derivative}" -eq 1 ] && [ ! -e "${target}" ]; then
+    ln -s "${file}" "${target}"
+  elif [ "${on_redhat_or_derivative}" -eq 1 ]; then
+    # Don't need to do anything since we're not using
+    # available/enabled
+    :
+  fi
+}
+
+_sse_configure_nursery() {
+  print_and_log "SSE proxy: configuring Nursery ..."
+  exposed_proxy_uri=http://${fai_sse_proxy_exposed_host-${HOSTNAME}}:${fai_sse_proxy_exposed_port-80}
+
+  local file=/etc/escenic/engine/common/com/escenic/livecenter/Configuration.properties
+  mkdir -p $(dirname "${file}")
+  if [ -e "${file}" ]; then
+    run sed -i "s#presentationSseProxyUri=.*#presentationSseProxyUri=${exposed_proxy_uri}#" "${file}"
+  else
+    cat > "${file}" <<EOF
+presentationSseProxyUri=${exposed_proxy_uri}
+EOF
+  fi
+
+  file=/etc/escenic/engine/webapp/webservice/com/escenic/webservice/resources/ChangelogFeed.properties
+  mkdir -p $(dirname "${file}")
+  if [ -e "${file}" ]; then
+    run sed -i "s#sseEndpoint=.*#sseEndpoint=${exposed_proxy_uri}#" "${file}"
+  else
+    cat > "${file}" <<EOF
+sseEndpoint=${exposed_proxy_uri}
+EOF
+  fi
+}
+
+_sse_configure_sse_proxy() {
+  print_and_log "SSE proxy: configuring the proxy itself ..."
+  local file=/etc/escenic/sse-proxy/sse-proxy.yaml
+  cat > "${file}" <<EOF
+server:
+  applicationConnectors:
+    - type: http
+      port: ${fai_sse_proxy_port-9080}
+
+  adminConnectors:
+    - type : http
+      port : ${fai_sse_proxy_admin_port-7090}
+
+  gzip:
+    enabled: false
+
+backends:
+EOF
+
+  old_ifs=$IFS
+  IFS=$'\n'
+  for el in ${fai_sse_proxy_backends}; do
+    IFS=' ' read -r uri user password <<< "${el}"
+    cat >> "${file}" <<EOF
+  - uri: ${uri}
+    credentials:
+      username: ${user}
+      password: ${password}
+EOF
+  done
+  IFS=$old_ifs
+
+
+  cat >> "${file}" <<EOF
+cors:
+  allowedOrigins   : "*"
+  allowedHeaders   : "X-Requested-With,Content-Type,Accept,Origin"
+  allowedMethods   : "GET,POST,HEAD"
+  preflightMaxAge  : "1800"
+  allowCredentials : "true"
+  exposedHeaders   : ""
+  chainPreflight   : "true"
+
+logging:
+  level: INFO
+  loggers:
+    io.dropwizard: INFO
+    com.escenic.sse.proxy: INFO
+    com.escenic.common.broadcast.SynchronousBroadcaster: INFO
+    com.escenic.sse.proxy.ProtectedHttpEndpoint: INFO
+  appenders:
+    - type: console
+EOF
+}
+
+_sse_configure() {
+  _sse_configure_nginx
+  _sse_configure_nursery
+  _sse_configure_sse_proxy
+}
+
+_sse_restart_services() {
+  print_and_log "SSE proxy: Restarting all related services ..."
+  run /etc/init.d/sse-proxy restart
+
+  # Works on Debian and  RedHat based systems.
+  if [ -x /usr/sbin/service ]; then
+    run service nginx reload
+  else
+    run /etc/init.d/nginx restart
+  fi
+}
+
+install_sse_proxy() {
+  print_and_log "Installing SSE proxy on ${HOSTNAME} ..."
+  download_escenic_components
+  _sse_install_web_server
+  _sse_configure
+  _sse_restart_services
+}

From e4463cbc39b83fedbf209ae9bd314e3777783fd3 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Tue, 15 Aug 2017 16:22:41 +0800
Subject: [PATCH 2579/2585] Fixed a 'too many arguments error' when installing
 CUE or SSE proxy

- also fixed an error message coming if there are no Escenic related
  man pages on the system.

- none of these two errors caused any real problem, but they were
  false warnings/errors and were thus confusing to the user.
---
 usr/sbin/ece-install                          | 21 ++++++++++++-------
 .../ece-scripts/ece-install.d/sse-proxy.sh    |  7 ++++---
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/usr/sbin/ece-install b/usr/sbin/ece-install
index 7403de6e..bac981f1 100755
--- a/usr/sbin/ece-install
+++ b/usr/sbin/ece-install
@@ -249,9 +249,14 @@ function install_packages_if_missing() {
     if [ $some_are_missing -eq 0 ]; then
       return
     elif [ $one_time_apt_update_done -eq 0 ]; then
-      log "First running APT update to ensure fresh package list, " \
-        "then continuing the above"
-      run apt-get update
+      # Systemd may be running an update process on boot of new
+      # machines. Therefore, if there's a current apt-get process,
+      # don't do anything.
+      pgrep apt-get &> /dev/null || {
+        log "First running APT update to ensure fresh package list, " \
+            "then continuing the above"
+        run apt-get update
+      }
       one_time_apt_update_done=1
     fi
 
@@ -433,10 +438,10 @@ function print_status_and_next_steps()
     fi
     print_and_log "${message} It took" ${days}d ${hours}h ${minutes}m ${seconds_left}s
 
-    if [ $install_profile_number -ne $PROFILE_RESTORE_FROM_BACKUP -a \
-        $install_profile_number -ne $PROFILE_CACHE_SERVER -a \
-        $install_profile_number -ne $PROFILE_WIDGET_FRAMEWORK ]; then
-        add_next_step "UNIX man pages: $(man -k escenic | awk '{print $1;}')"
+    if [[ ${install_profile_number-42} -ne $PROFILE_RESTORE_FROM_BACKUP &&
+            ${install_profile_number-42} -ne $PROFILE_CACHE_SERVER &&
+            ${install_profile_number-42} -ne $PROFILE_WIDGET_FRAMEWORK ]]; then
+        add_next_step "UNIX man pages: $(man -k escenic 2>/dev/null | awk '{print $1;}')"
         add_next_step "Guide books: http://docs.escenic.com/ece-6.0.html"
     fi
 
@@ -458,7 +463,7 @@ function check_for_required_downloads()
   print_and_log "Asserting that required downloads succeeded ..."
   local required_escenic_packages="engine"
   # TODO: make assembly tool required if not using an EAR.
-  if [ $install_profile_number -eq $PROFILE_ANALYSIS_SERVER ]; then
+  if [ ${install_profile_number-42} -eq $PROFILE_ANALYSIS_SERVER ]; then
     required_escenic_packages="analysis-engine"
   fi
 
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/sse-proxy.sh b/usr/share/escenic/ece-scripts/ece-install.d/sse-proxy.sh
index 2f0bca30..1af35ef2 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/sse-proxy.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/sse-proxy.sh
@@ -60,7 +60,7 @@ _sse_configure_nursery() {
   exposed_proxy_uri=http://${fai_sse_proxy_exposed_host-${HOSTNAME}}:${fai_sse_proxy_exposed_port-80}
 
   local file=/etc/escenic/engine/common/com/escenic/livecenter/Configuration.properties
-  mkdir -p $(dirname "${file}")
+  make_dir $(dirname "${file}")
   if [ -e "${file}" ]; then
     run sed -i "s#presentationSseProxyUri=.*#presentationSseProxyUri=${exposed_proxy_uri}#" "${file}"
   else
@@ -70,7 +70,7 @@ EOF
   fi
 
   file=/etc/escenic/engine/webapp/webservice/com/escenic/webservice/resources/ChangelogFeed.properties
-  mkdir -p $(dirname "${file}")
+  make_dir $(dirname "${file}")
   if [ -e "${file}" ]; then
     run sed -i "s#sseEndpoint=.*#sseEndpoint=${exposed_proxy_uri}#" "${file}"
   else
@@ -143,7 +143,8 @@ _sse_configure() {
 
 _sse_restart_services() {
   print_and_log "SSE proxy: Restarting all related services ..."
-  run /etc/init.d/sse-proxy restart
+  /etc/init.d/sse-proxy stop &>> "${log}" || true
+  run /etc/init.d/sse-proxy start
 
   # Works on Debian and  RedHat based systems.
   if [ -x /usr/sbin/service ]; then

From d3a839a1872a0985bab6f281515493664f441cf0 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Thu, 17 Aug 2017 13:39:15 +0800
Subject: [PATCH 2580/2585] Fixed RPM install of CUE & Front related artifacts

- Since some packages, with various logic, have been moved to to a cue
  sub directory (2017), we'll try again with 'cue' appended to the
  base URL
---
 .../ece-install.d/package-based-install.sh    | 32 ++++++++++++++-----
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/package-based-install.sh b/usr/share/escenic/ece-scripts/ece-install.d/package-based-install.sh
index 0ad32bfe..aa6afee3 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/package-based-install.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/package-based-install.sh
@@ -106,16 +106,32 @@ _install_configured_escenic_packages_rpm() {
       arch=${fai_package_arch_map[${package}]}
     fi
 
+    print "Downloading ${package}-${version}.${arch}.rpm ..."
     local rpm_url=${fai_package_rpm_base_url-http://yum.escenic.com/rpm}/${package}-${version}.${arch}.rpm
-
     local rpm_file="${download_dir}/${rpm_url##*/}"
-    run wget \
-        --http-user "${fai_package_rpm_user}" \
-        --http-password "${fai_package_rpm_password}" \
-        --continue \
-        --quiet \
-        --output-document "${rpm_file}" \
-        "${rpm_url}"
+    wget \
+      --http-user "${fai_package_rpm_user}" \
+      --http-password "${fai_package_rpm_password}" \
+      --continue \
+      --quiet \
+      --output-document "${rpm_file}" \
+      "${rpm_url}" &>> "${log}" || {
+
+      log "Couldn't download ${package} using ${rpm_url}"
+      # Since some packages, with various logic, have been moved to to
+      # a cue sub directory (2017), we'll try again with 'cue'
+      # appended to the base URL:
+      local rpm_url=${fai_package_rpm_base_url-http://yum.escenic.com/rpm}/cue/${package}-${version}.${arch}.rpm
+      local rpm_file="${download_dir}/${rpm_url##*/}"
+      log "Trying to download ${package} using ${rpm_url} instead"
+      run wget \
+          --http-user "${fai_package_rpm_user}" \
+          --http-password "${fai_package_rpm_password}" \
+          --continue \
+          --quiet \
+          --output-document "${rpm_file}" \
+          "${rpm_url}"
+    }
 
     if ! is_rpm_already_installed "${rpm_file}"; then
       run rpm -Uvh "${rpm_file}"

From 9680d377374b26d638e435d87904f24ac6d67035 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Thu, 17 Aug 2017 17:48:04 +0800
Subject: [PATCH 2581/2585] Now installs Oracle Java on RedHat systems (again)

- fixes regression introduced in
  740b16cfcabf87a7f5d02662fecc36c51356833e
---
 .../ece-install.d/content-engine.sh           |  2 +-
 .../escenic/ece-scripts/ece-install.d/java.sh | 29 +++++++++++++++----
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
index 55e1d4fc..ce5cbd90 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/content-engine.sh
@@ -773,7 +773,7 @@ function install_ece_third_party_packages
       xmlstarlet
     "
 
-    install_sun_java_on_redhat
+    install_oracle_java
   fi
 
   install_packages_if_missing $packages
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/java.sh b/usr/share/escenic/ece-scripts/ece-install.d/java.sh
index 0a58f125..73891d19 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/java.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/java.sh
@@ -1,19 +1,33 @@
 # -*- mode: sh; sh-shell: bash; -*-
 
+oracle_jdk_download_url=http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html
+
 function _java_get_oracle_tarball_url() {
   if [ -n "${fai_java_download_url-""}" ]; then
     echo "${fai_java_download_url}"
     return
   fi
 
-  local url=http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html
-  curl -s  "${url}" |
+  curl -s  "${oracle_jdk_download_url}" |
     grep "$(uname -s) x64" |
     grep .tar.gz |
     grep -v demos |
     sed -n -r  's#.*filepath":"(.*)", "MD5".*#\1#p'
 }
 
+function _java_get_oracle_rpm_url() {
+  if [ -n "${fai_java_download_url-""}" ]; then
+    echo "${fai_java_download_url}"
+    return
+  fi
+
+  curl -s  "${oracle_jdk_download_url}" |
+    grep "$(uname -s) x64" |
+    grep .rpm |
+    grep -v demos |
+    sed -n -r  's#.*filepath":"(.*)", "MD5".*#\1#p'
+}
+
 function install_oracle_java() {
   if _java_is_sun_java_already_installed; then
     print_and_log "Oracle Java is already installed on $HOSTNAME"
@@ -159,8 +173,12 @@ function _install_oracle_java_debian() {
 
 function _install_oracle_java_redhat() {
   print_and_log "Downloading & installing Oracle JDK RPM ..."
-  local file_name=${download_dir}/${sun_java_bin_url##*/}
-  _download_oracle_file "${sun_java_bin_url}" "${file_name}"
+
+  local oracle_java_rpm_url=
+  oracle_java_rpm_url=$(_java_get_oracle_rpm_url)
+
+  local file_name=${download_dir}/${oracle_java_rpm_url##*/}
+  _download_oracle_file "${oracle_java_rpm_url}" "${file_name}"
 
   if ! is_rpm_already_installed "${file_name}"; then
     run rpm -Uvh "${file_name}"
@@ -168,7 +186,8 @@ function _install_oracle_java_redhat() {
 
   _java_update_java_env_from_jdk_rpm "${file_name}"
 
-  local version=$(java -version 2>&1 | grep version | cut -d'"' -f2)
+  local version=
+  version=$(java -version 2>&1 | grep version | cut -d'"' -f2)
   print_and_log "Oracle Java $version is now installed"
 
   add_next_step "By using Oracle Java, you must accept this license: " \

From 423f49dfbbfb0df317666d411c24d5d88b3cd2dc Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 18 Aug 2017 15:25:32 +0800
Subject: [PATCH 2582/2585] Updated documentation WRT lock file

---
 usr/share/doc/escenic/ece-install-guide.org | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/usr/share/doc/escenic/ece-install-guide.org b/usr/share/doc/escenic/ece-install-guide.org
index 6f3f86a4..93d51de1 100644
--- a/usr/share/doc/escenic/ece-install-guide.org
+++ b/usr/share/doc/escenic/ece-install-guide.org
@@ -253,13 +253,12 @@ escenic-related purposes.
 You can ensure that *ece-install* is not executed accidentally by
 creating a *lock file*. Simply create a file with this path:
 #+BEGIN_SRC text
-/var/lock/ece-install.lock
+/var/run/escenic/ece-install.lock
 #+END_SRC
 
 If this file is present then *ece-install* will fail fast as follows:
 #+BEGIN_SRC text
-The lock file is present: /var/lock/ece-install.lock and
-ece-install will therefore refuse to run.
+/var/run/escenic/ece-install.lock exists, I'll exit.
 #+END_SRC
 
 The lock file does not need to contain anything, it just needs to exist.

From c1762f418544f752b8ae93d632f5b0f6e284e891 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 18 Aug 2017 15:53:39 +0800
Subject: [PATCH 2583/2585] Installation of memcached on RedHat and CentOS
 works again

- support for 'service memcached' has been pulled (seems broken to be
  honest).
- RedHat are firm believers in systemd now
---
 usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh b/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
index 6827302d..f92e3df3 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/memory-cache.sh
@@ -8,7 +8,8 @@ function install_memory_cache()
 
   install_packages_if_missing "memcached"
   if [ $on_redhat_or_derivative -eq 1 ]; then
-    run service memcached restart
+    run systemctl enable memcached
+    run systemctl start memcached
   fi
   
   assert_commands_available memcached

From f84a7a2cecfba8d5abd7e3049fa3535f2cfde6c2 Mon Sep 17 00:00:00 2001
From: Torstein Krause Johansen <torstein@escenic.com>
Date: Fri, 18 Aug 2017 17:06:09 +0800
Subject: [PATCH 2584/2585] centos has gone all systmedy

---
 usr/share/escenic/ece-scripts/ece-install.d/sse-proxy.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/usr/share/escenic/ece-scripts/ece-install.d/sse-proxy.sh b/usr/share/escenic/ece-scripts/ece-install.d/sse-proxy.sh
index 1af35ef2..73a5e938 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/sse-proxy.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/sse-proxy.sh
@@ -147,8 +147,10 @@ _sse_restart_services() {
   run /etc/init.d/sse-proxy start
 
   # Works on Debian and  RedHat based systems.
-  if [ -x /usr/sbin/service ]; then
+  if [ "${on_debian_or_derivative}" -eq 1 ]; then
     run service nginx reload
+  elif [ "${on_redhat_or_derivative}" -eq 1 ]; then
+    run systemctl restart nginx
   else
     run /etc/init.d/nginx restart
   fi

From 24ce72fb6f9e613e378cd0a14a897c638de018d8 Mon Sep 17 00:00:00 2001
From: Mahmudul Hassan Rony <mah@escenic.com>
Date: Wed, 30 Aug 2017 10:51:15 +0600
Subject: [PATCH 2585/2585] Added CUE endpoint bridge

- An optional backend bridge option has been added to the CUE profile to
  support the new bridge endpoint.
- If set, the generated `backend.yml` file gets an entry like:
  cue:
    backend:
      bridge: http://bridge.example.com
---
 .../src/unit-tests/ece-install-conf-file-reader-test.sh     | 4 ++++
 usr/share/doc/escenic/ece-install-conf-reference.org        | 2 ++
 .../escenic/ece-scripts/ece-install.d/conf-file-reader.sh   | 6 ++++++
 usr/share/escenic/ece-scripts/ece-install.d/cue.sh          | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
index 7a945f68..c2d759ae 100755
--- a/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
+++ b/usr/local/src/unit-tests/ece-install-conf-file-reader-test.sh
@@ -387,6 +387,7 @@ test_can_parse_yaml_conf_cue() {
   local cue_backend_ece=http://ece.example.com
   local cue_backend_ece_local=http://localhost:8080
   local cue_backend_ng=http://ng.example.com
+  local cue_backend_bridge=http://bridge.example.com
   local cue_cors_origin1=editor.example.com
   local cue_cors_origin2=cue.example.com
 
@@ -400,6 +401,7 @@ profiles:
     backend_ece: ${cue_backend_ece}
     backend_ece_local: ${cue_backend_ece_local}
     backend_ng: ${cue_backend_ng}
+    backend_bridge: ${cue_backend_bridge}
     cors_origins:
       - ${cue_cors_origin1}
       - ${cue_cors_origin2}
@@ -409,6 +411,7 @@ EOF
   unset fai_cue_backend_ece
   unset fai_cue_backend_ece_local
   unset fai_cue_backend_ng
+  unset fai_cue_backend_bridge
   unset fai_cue_cors_origins
 
   parse_yaml_conf_file_or_source_if_sh_conf "${yaml_file}"
@@ -417,6 +420,7 @@ EOF
   assertEquals "fai_cue_backend_ece" "${cue_backend_ece}" "${fai_cue_backend_ece}"
   assertEquals "fai_cue_backend_ece_local" "${cue_backend_ece_local}" "${fai_cue_backend_ece_local}"
   assertEquals "fai_cue_backend_ng" "${cue_backend_ng}" "${fai_cue_backend_ng}"
+  assertEquals "fai_cue_backend_bridge" "${cue_backend_bridge}" "${fai_cue_backend_bridge}"
   assertEquals "fai_cue_cors_origins" "${cue_cors_origin1} ${cue_cors_origin2}" "${fai_cue_cors_origins}"
 
   rm -rf "${yaml_file}"
diff --git a/usr/share/doc/escenic/ece-install-conf-reference.org b/usr/share/doc/escenic/ece-install-conf-reference.org
index 2539d9ac..3f884e6e 100644
--- a/usr/share/doc/escenic/ece-install-conf-reference.org
+++ b/usr/share/doc/escenic/ece-install-conf-reference.org
@@ -196,6 +196,7 @@ profiles:
     backend_ece: ${cue_backend_ece}
     backend_ece_local: ${cue_backend_ece_local}
     backend_ng: ${cue_backend_ng}
+    backend_bridge: ${cue_backend_bridge}
     cors_origins:
       - ${cue_cors_origin1}
       - ${cue_cors_origin2}
@@ -207,6 +208,7 @@ fai_cue_install=
 fai_cue_backend_ece=
 fai_cue_backend_ece_local=
 fai_cue_backend_ng=
+fai_cue_backend_bridge=
 fai_cue_cors_origins=
 
 #+end_src
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
index fca4d0fd..b05a4454 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/conf-file-reader.sh
@@ -888,6 +888,12 @@ _parse_yaml_conf_file_cue() {
     export fai_cue_backend_ng=${install_cue_backend_ng}
   fi
 
+  local install_cue_backend_bridge=
+  install_cue_backend_bridge=$(_jq "${yaml_file}" .profiles.cue.backend_bridge)
+  if [ -n "${install_cue_backend_bridge}" ]; then
+    export fai_cue_backend_bridge=${install_cue_backend_bridge}
+  fi
+
   local count=0
   count=$(_jq "${yaml_file}" ".profiles.cue.cors_origins | length")
   for ((i = 0; i < count; i++)); do
diff --git a/usr/share/escenic/ece-scripts/ece-install.d/cue.sh b/usr/share/escenic/ece-scripts/ece-install.d/cue.sh
index e868c46b..46469017 100644
--- a/usr/share/escenic/ece-scripts/ece-install.d/cue.sh
+++ b/usr/share/escenic/ece-scripts/ece-install.d/cue.sh
@@ -158,6 +158,10 @@ EOF
       if [ -n "${fai_cue_backend_ng}" ]; then
         echo "  newsgate: ${fai_cue_backend_ng}" >> "${file}"
       fi
+
+      if [ -n "${fai_cue_backend_bridge}" ]; then
+        echo "  bridge: ${fai_cue_backend_bridge}" >> "${file}"
+      fi
     done
 
   if [ "${on_debian_or_derivative-0}" -eq 1 ]; then